Skip to content

Commit

Permalink
Feat: add more emergency boxes (#2480)
Browse files Browse the repository at this point in the history
  • Loading branch information
WolfLox authored Mar 30, 2023
1 parent 466f178 commit 5c568f0
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 7 deletions.
8 changes: 7 additions & 1 deletion code/game/jobs/job/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
box = /obj/item/storage/box/survival_security/hos



Expand Down Expand Up @@ -96,6 +97,7 @@
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
box = /obj/item/storage/box/survival_security/warden



Expand Down Expand Up @@ -138,6 +140,7 @@
/obj/item/melee/classic_baton/telescopic = 1
)
satchel = /obj/item/storage/backpack/satchel_detective
box = /obj/item/storage/box/survival_security/detective

implants = list(/obj/item/implant/mindshield)

Expand Down Expand Up @@ -196,6 +199,7 @@
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
box = /obj/item/storage/box/survival_security


/datum/job/officer/cadet
Expand All @@ -222,6 +226,7 @@
l_pocket = /obj/item/reagent_containers/spray/pepper
r_pocket = /obj/item/paper/deltainfo
suit_store = /obj/item/gun/energy/gun/advtaser
box = /obj/item/storage/box/survival_security/cadet

/datum/outfit/job/officer/cadet/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
Expand Down Expand Up @@ -268,6 +273,7 @@
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel_med
dufflebag = /obj/item/storage/backpack/duffel/medical
box = /obj/item/storage/box/survival/brigphys


/datum/job/pilot
Expand Down Expand Up @@ -306,4 +312,4 @@
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
box = /obj/item/storage/box/engineer
box = /obj/item/storage/box/survival_security/pilot
2 changes: 2 additions & 0 deletions code/game/jobs/job/supervisor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
implants = list(/obj/item/implant/mindshield)
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
box = /obj/item/storage/box/survival_laws/magisraka



Expand Down Expand Up @@ -289,3 +290,4 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
implants = list(/obj/item/implant/mindshield)
satchel = /obj/item/storage/backpack/satchel_sec
dufflebag = /obj/item/storage/backpack/duffel/security
box = /obj/item/storage/box/survival_laws
4 changes: 4 additions & 0 deletions code/game/objects/items/tools/crowbar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
item_state = "crowbar_red"
force = 8

/obj/item/crowbar/red/sec
icon_state = "crowbar_sec"
item_state = "crowbar_sec"

/obj/item/crowbar/brass
name = "brass crowbar"
desc = "A brass crowbar. It feels faintly warm to the touch."
Expand Down
61 changes: 55 additions & 6 deletions code/game/objects/items/weapons/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,12 @@
new /obj/item/clothing/mask/breath( src )
new /obj/item/tank/internals/emergency_oxygen( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/flare/glowstick/emergency( src )
new /obj/item/flashlight/flare/glowstick/blue( src )
return

/obj/item/storage/box/survival/brigphys
icon_state = "box_brigphys"

/obj/item/storage/box/survival_vox
icon_state = "box_vox"

Expand All @@ -58,7 +61,7 @@
new /obj/item/clothing/mask/breath/vox(src)
new /obj/item/tank/internals/emergency_oxygen/nitrogen(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
new /obj/item/flashlight/flare/glowstick/blue(src)

/obj/item/storage/box/survival_machine
icon_state = "box_machine"
Expand All @@ -68,7 +71,7 @@
contents = list()
new /obj/item/weldingtool/mini(src)
new /obj/item/stack/cable_coil/random(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
new /obj/item/flashlight/flare/glowstick/blue(src)

/obj/item/storage/box/survival_plasmaman
icon_state = "box_plasma"
Expand All @@ -79,7 +82,7 @@
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/emergency_oxygen/plasma(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
new /obj/item/flashlight/flare/glowstick/blue(src)

/obj/item/storage/box/engineer
icon_state = "box_eng"
Expand All @@ -90,7 +93,7 @@
new /obj/item/clothing/mask/breath( src )
new /obj/item/tank/internals/emergency_oxygen/engi( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/flare/glowstick/emergency( src )
new /obj/item/flashlight/flare/glowstick/blue( src )
return

/obj/item/storage/box/survival_mining
Expand All @@ -103,7 +106,53 @@
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/crowbar/red(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
new /obj/item/flashlight/flare/glowstick/blue(src)

/obj/item/storage/box/survival_security
icon_state = "box_sec"

/obj/item/storage/box/survival_security/New()
..()
contents = list()
new /obj/item/tank/internals/emergency_oxygen/engi/sec(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/red(src)
new /obj/item/crowbar/red/sec(src)
new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/radio(src)
new /obj/item/book/manual/security_space_law(src)

/obj/item/storage/box/survival_security/hos
icon_state = "box_hos"

/obj/item/storage/box/survival_security/cadet
icon_state = "box_cadet"

/obj/item/storage/box/survival_security/warden
icon_state = "box_warden"

/obj/item/storage/box/survival_security/pilot
icon_state = "box_pilot"

/obj/item/storage/box/survival_security/detective
icon_state = "box_detective"

/obj/item/storage/box/survival_laws
icon_state = "box_avd"

/obj/item/storage/box/survival_laws/New()
..()
contents = list()
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/pink(src)
new /obj/item/book/manual/security_space_law(src)
new /obj/item/taperecorder(src)
new /obj/item/camera(src)

/obj/item/storage/box/survival_laws/magisraka
icon_state = "box_magisraka"

/obj/item/storage/box/survival_syndi
icon_state = "box_syndi"
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/items/weapons/tanks/tank_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@
icon_state = "emergency_syndi"
desc = "A dark emergency oxygen tank. The label on the back reads \"Original Oxygen Tank Design, Do Not Steal.\""

/obj/item/tank/internals/emergency_oxygen/engi/sec
name = "security extended-capacity emergency oxygen tank"
icon_state = "emergency_sec"
desc = "A black-red emergency oxygen tank. Used by corporate security departments."

/obj/item/tank/internals/emergency_oxygen/double
name = "double emergency oxygen tank"
icon_state = "emergency_double"
Expand Down
Binary file modified icons/obj/storage.dmi
Binary file not shown.
Binary file modified icons/obj/tank.dmi
Binary file not shown.
Binary file modified icons/obj/tools.dmi
Binary file not shown.

0 comments on commit 5c568f0

Please sign in to comment.