cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fire-safety and Emergency Closets' Contents Tweak (#29223)

Browse Source 
* bleh

+ added crowbars into fireclosets
+ wall emergency locker's contents now match the contents of the common one

* Update code/game/objects/structures/crates_lockers/walllocker.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* Update code/game/objects/structures/crates_lockers/walllocker.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
This commit is contained in:
Osetrokarasek
2025-05-13 09:07:48 +05:00
committed by GitHub
parent d3e09bcb76
commit 9f6ff3a204
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+2
View File
@@ -66,6 +66,7 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/clothing/head/hardhat/red(src)
new /obj/item/crowbar/red(src)
/obj/structure/closet/firecloset/full/populate_contents()
new /obj/item/extinguisher(src)
@@ -74,6 +75,7 @@
new /obj/item/flashlight(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/clothing/head/hardhat/red(src)
new /obj/item/crowbar/red(src)
/*
code/game/objects/structures/crates_lockers/walllocker.dm
+22 -9
View File
@@ -26,14 +26,27 @@
icon_opened = "emerg_open"
/obj/structure/closet/walllocker/emerglocker/populate_contents()
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/crowbar(src)
new /obj/item/crowbar(src)
new /obj/item/crowbar(src)
switch(pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
if("small")
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/mask/breath(src)
if("aid")
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/storage/toolbox/emergency(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/storage/firstaid/o2(src)
if("tank")
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/breath(src)
if("both")
new /obj/item/storage/toolbox/emergency(src)
new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/storage/firstaid/o2(src)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/walllocker/emerglocker, 32, 32)