From 00ed22ba90464c6bb74a73015075147b2c6abd6c Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:10:10 +0300 Subject: [PATCH] Puts an extra set of gear into the Detective Locker. Yippee! (#1005) * Fixed typo in synth liver emp_act proc * makes PopulateContents proc twice for det lockers * removes the extra det locker from blueshift * actually ticks the security.dm file * Update modular_skyrat/master_files/code/game/objects/structures/crates_lockers/secure/security.dm --------- Co-authored-by: Hypertorus Fusion Reactor <109750345+MrDerpi@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- _maps/map_files/NSVBlueshift/Blueshift.dmm | 2 +- .../game/objects/structures/crates_lockers/secure/security.dm | 3 +++ tgstation.dme | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 modular_skyrat/master_files/code/game/objects/structures/crates_lockers/secure/security.dm diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index d5f29b1110d..097db5270ea 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -46946,7 +46946,6 @@ /turf/open/floor/wood, /area/station/maintenance/abandon_art_studio) "iYN" = ( -/obj/structure/closet/secure_closet/detective, /obj/item/clothing/under/rank/security/detective, /obj/item/clothing/suit/jacket/det_suit{ icon_state = "curator" @@ -46957,6 +46956,7 @@ /obj/machinery/camera/directional/east{ c_tag = "Detective's Study" }, +/obj/structure/filingcabinet/security, /turf/open/floor/wood/parquet, /area/station/security/detectives_office) "iYT" = ( diff --git a/modular_skyrat/master_files/code/game/objects/structures/crates_lockers/secure/security.dm b/modular_skyrat/master_files/code/game/objects/structures/crates_lockers/secure/security.dm new file mode 100644 index 00000000000..8dbe242e57f --- /dev/null +++ b/modular_skyrat/master_files/code/game/objects/structures/crates_lockers/secure/security.dm @@ -0,0 +1,3 @@ +/obj/structure/closet/secure_closet/detective/PopulateContents() + ..() + ..() // Spawn the full set of gear, twice diff --git a/tgstation.dme b/tgstation.dme index 0315b8064a1..e7c81ef08fb 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6201,6 +6201,7 @@ #include "modular_skyrat\master_files\code\game\objects\structures\trash_pile.dm" #include "modular_skyrat\master_files\code\game\objects\structures\watercloset.dm" #include "modular_skyrat\master_files\code\game\objects\structures\crates_lockers\secure\cargo.dm" +#include "modular_skyrat\master_files\code\game\objects\structures\crates_lockers\secure\security.dm" #include "modular_skyrat\master_files\code\game\turfs\closed\_closed.dm" #include "modular_skyrat\master_files\code\game\turfs\open\floor\iron_floor.dm" #include "modular_skyrat\master_files\code\game\turfs\open\space\space.dm"