From 283ccceb24a6a396e6f155fedcd5ee91d831226a Mon Sep 17 00:00:00 2001 From: KathrinBailey Date: Mon, 30 Dec 2019 09:25:03 +0000 Subject: [PATCH 1/4] CE Locker Exodus: The Removaling Removes junk from the CE locker. Adds empty engineering lockers. I don't know how to do this as a child and not have populate contents fill the child. --- .../closets/secure/engineering.dm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 8da50d488f..b3adae577b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -12,18 +12,12 @@ new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/hardhat/weldhat/white(src) new /obj/item/clothing/gloves/color/yellow(src) - new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/tank/jetpack/suit(src) new /obj/item/cartridge/ce(src) new /obj/item/radio/headset/heads/ce(src) - new /obj/item/storage/toolbox/mechanical(src) - new /obj/item/clothing/suit/hazardvest(src) new /obj/item/megaphone/command(src) new /obj/item/areaeditor/blueprints(src) - new /obj/item/airlock_painter(src) new /obj/item/holosign_creator/engineering(src) - new /obj/item/clothing/mask/gas(src) - new /obj/item/multitool(src) new /obj/item/assembly/flash/handheld(src) new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/door_remote/chief_engineer(src) @@ -56,6 +50,12 @@ for(var/i in 1 to 3) new /obj/item/multitool(src) +/obj/structure/closet/secure_closet/engineering_electrical_empty + name = "electrical supplies locker" + req_access = list(ACCESS_ENGINE_EQUIP) + icon_state = "eng" + icon_door = "eng_elec" + /obj/structure/closet/secure_closet/engineering_welding name = "welding supplies locker" req_access = list(ACCESS_ENGINE_EQUIP) @@ -67,7 +67,7 @@ for(var/i in 1 to 3) new /obj/item/clothing/head/welding(src) for(var/i in 1 to 3) - new /obj/item/weldingtool(src) + new /obj/item/weldingtool/largetank(src) /obj/structure/closet/secure_closet/engineering_personal name = "engineer's locker" @@ -84,6 +84,10 @@ new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/storage/box/emptysandbags(src) +/obj/structure/closet/secure_closet/engineering_personal_empty + name = "engineer's locker" + req_access = list(ACCESS_ENGINE_EQUIP) + icon_state = "eng_secure" /obj/structure/closet/secure_closet/atmospherics name = "\proper atmospheric technician's locker" From f2e9ba2a8e895b870ada8da119f7e0e24f1739de Mon Sep 17 00:00:00 2001 From: KathrinBailey Date: Tue, 31 Dec 2019 16:41:23 +0000 Subject: [PATCH 2/4] Makes lockers into subtypes Adds new lockers cleanly at the bottom instead and as subtypes. --- .../closets/secure/engineering.dm | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index b3adae577b..44fbd7b461 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -50,12 +50,6 @@ for(var/i in 1 to 3) new /obj/item/multitool(src) -/obj/structure/closet/secure_closet/engineering_electrical_empty - name = "electrical supplies locker" - req_access = list(ACCESS_ENGINE_EQUIP) - icon_state = "eng" - icon_door = "eng_elec" - /obj/structure/closet/secure_closet/engineering_welding name = "welding supplies locker" req_access = list(ACCESS_ENGINE_EQUIP) @@ -84,11 +78,6 @@ new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/storage/box/emptysandbags(src) -/obj/structure/closet/secure_closet/engineering_personal_empty - name = "engineer's locker" - req_access = list(ACCESS_ENGINE_EQUIP) - icon_state = "eng_secure" - /obj/structure/closet/secure_closet/atmospherics name = "\proper atmospheric technician's locker" req_access = list(ACCESS_ATMOSPHERICS) @@ -107,3 +96,34 @@ new /obj/item/clothing/head/hardhat/atmos(src) new /obj/item/clothing/glasses/meson/engine/tray(src) new /obj/item/extinguisher/advanced(src) + +/* + * Empty lockers + * Some of the lockers are filled with junk, and sometimes its nice to just fill it with your own set-up for your own map gimmicks. + */ + +/obj/structure/closet/secure_closet/engineering_chief/empty + +/obj/structure/closet/secure_closet/engineering_electrical/empty + +/obj/structure/closet/secure_closet/engineering_welding/empty + +/obj/structure/closet/secure_closet/engineering_personal/empty + +/obj/structure/closet/secure_closet/atmospherics/empty + + +/obj/structure/closet/secure_closet/engineering_chief/empty/PopulateContents() + return + +/obj/structure/closet/secure_closet/engineering_electrical/empty/PopulateContents() + return + +/obj/structure/closet/secure_closet/engineering_welding/empty/PopulateContents() + return + +/obj/structure/closet/secure_closet/engineering_personal/empty/PopulateContents() + return + +/obj/structure/closet/secure_closet/atmospherics/empty/PopulateContents() + return \ No newline at end of file From 0a19f62fa973d751574ce8d421327a61c8679c60 Mon Sep 17 00:00:00 2001 From: KathrinBailey Date: Tue, 31 Dec 2019 16:45:06 +0000 Subject: [PATCH 3/4] dab --- .../structures/crates_lockers/closets/secure/engineering.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 44fbd7b461..fde5725329 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -126,4 +126,4 @@ return /obj/structure/closet/secure_closet/atmospherics/empty/PopulateContents() - return \ No newline at end of file + return From 243aebe12ae1b6e967a79be36de2b3b59b377c39 Mon Sep 17 00:00:00 2001 From: KathrinBailey Date: Tue, 31 Dec 2019 16:54:59 +0000 Subject: [PATCH 4/4] dab 2x --- .../closets/secure/engineering.dm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index fde5725329..579b1444a5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -104,26 +104,25 @@ /obj/structure/closet/secure_closet/engineering_chief/empty -/obj/structure/closet/secure_closet/engineering_electrical/empty - -/obj/structure/closet/secure_closet/engineering_welding/empty - -/obj/structure/closet/secure_closet/engineering_personal/empty - -/obj/structure/closet/secure_closet/atmospherics/empty - - /obj/structure/closet/secure_closet/engineering_chief/empty/PopulateContents() return +/obj/structure/closet/secure_closet/engineering_electrical/empty + /obj/structure/closet/secure_closet/engineering_electrical/empty/PopulateContents() return +/obj/structure/closet/secure_closet/engineering_welding/empty + /obj/structure/closet/secure_closet/engineering_welding/empty/PopulateContents() return +/obj/structure/closet/secure_closet/engineering_personal/empty + /obj/structure/closet/secure_closet/engineering_personal/empty/PopulateContents() return +/obj/structure/closet/secure_closet/atmospherics/empty + /obj/structure/closet/secure_closet/atmospherics/empty/PopulateContents() return