From 9f6ff3a2043a08373957f13183fdbacdc2ee32d8 Mon Sep 17 00:00:00 2001 From: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com> Date: Tue, 13 May 2025 09:07:48 +0500 Subject: [PATCH] Fire-safety and Emergency Closets' Contents Tweak (#29223) * 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 Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com> * Update code/game/objects/structures/crates_lockers/walllocker.dm Co-authored-by: warriorstar-orion 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 --- .../crates_lockers/closets/utility_closets.dm | 2 ++ .../structures/crates_lockers/walllocker.dm | 31 +++++++++++++------ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index ca2feacb1a3..3bef407d733 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -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) /* diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 4b2ec513afe..c9da80f8132 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -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)