Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Lawbringer #253

Merged
merged 27 commits into from
Aug 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
db6994a
prototype testing
KittyNoodle Jul 25, 2023
c10cecb
part 1 progress
KittyNoodle Jul 25, 2023
d2f6df4
PART 1
KittyNoodle Jul 26, 2023
ce7d57b
balance
KittyNoodle Jul 26, 2023
62df9c7
Merge branch 'Monkestation:master' into hosgun
KittyNoodle Jul 26, 2023
3422131
Merge branch 'Monkestation:master' into hosgun
KittyNoodle Aug 5, 2023
0ef6ba1
biometrics take 1
KittyNoodle Aug 5, 2023
8ed8153
badvoicecontrol
KittyNoodle Aug 6, 2023
ddf9d43
its still bad
KittyNoodle Aug 7, 2023
9ee5660
pain
KittyNoodle Aug 8, 2023
3f07945
sprites and stuff
KittyNoodle Aug 10, 2023
942b629
sprite fixes
KittyNoodle Aug 10, 2023
4fb6e2c
manual
KittyNoodle Aug 11, 2023
fd6c064
whoops
KittyNoodle Aug 11, 2023
e9fe5bf
conflict fix?
KittyNoodle Aug 11, 2023
f4b7209
Merge branch 'master' into hosgun
KittyNoodle Aug 11, 2023
f50472e
some tests
KittyNoodle Aug 11, 2023
652b74a
runtime fix
KittyNoodle Aug 11, 2023
604107d
please work please work please workk
KittyNoodle Aug 11, 2023
28f0dff
testmerge ready edition
KittyNoodle Aug 11, 2023
d7ab22f
critical change
KittyNoodle Aug 11, 2023
ee0f658
Merge branch 'Monkestation:master' into hosgun
KittyNoodle Aug 11, 2023
7dea4a7
whoops
KittyNoodle Aug 12, 2023
d8d43ee
Merge branch 'Monkestation:master' into hosgun
KittyNoodle Aug 21, 2023
7982c05
ion
KittyNoodle Aug 21, 2023
d66bcd3
Merge branch 'hosgun' of https://github.com/KittyNoodle/Monkestation2…
KittyNoodle Aug 21, 2023
24d3df9
Merge branch 'Monkestation:master' into hosgun
KittyNoodle Aug 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/game/gamemodes/objective_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
/obj/item/gun/energy/laser/captain/add_stealing_item_objective()
return add_item_to_steal(src, /obj/item/gun/energy/laser/captain)

/* //monkestation removal
/datum/objective_item/steal/hoslaser
name = "the head of security's personal laser gun"
targetitem = /obj/item/gun/energy/e_gun/hos
Expand All @@ -215,7 +216,7 @@

/obj/item/gun/energy/e_gun/hos/add_stealing_item_objective()
return add_item_to_steal(src, /obj/item/gun/energy/e_gun/hos)

*/
/datum/objective_item/steal/handtele
name = "a hand teleporter"
targetitem = /obj/item/hand_tele
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
. = ..()

// Traitor steal objectives
new /obj/item/gun/energy/e_gun/hos(src)
//new /obj/item/gun/energy/e_gun/hos(src) monkestation removal
new /obj/item/pinpointer/nuke(src)

/obj/structure/closet/secure_closet/warden
Expand Down
Loading
Loading