From a71d39c67900d471450d5de4176cfd4bc2f882c5 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 6 Apr 2017 11:04:35 -0400 Subject: [PATCH] Fixes template loaded closets (#25901) --- .../structures/crates_lockers/closets.dm | 5 ++ .../crates_lockers/closets/fitness.dm | 10 ++-- .../crates_lockers/closets/gimmick.dm | 10 ++-- .../crates_lockers/closets/job_closets.dm | 56 ++++++------------- .../crates_lockers/closets/l3closet.dm | 18 ++---- .../crates_lockers/closets/secure/bar.dm | 2 +- .../crates_lockers/closets/secure/cargo.dm | 2 +- .../closets/secure/engineering.dm | 10 ++-- .../crates_lockers/closets/secure/freezer.dm | 12 ++-- .../closets/secure/hydroponics.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 12 ++-- .../crates_lockers/closets/secure/misc.dm | 8 +-- .../crates_lockers/closets/secure/personal.dm | 10 +--- .../closets/secure/scientist.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 38 ++++++------- .../crates_lockers/closets/syndicate.dm | 12 ++-- .../crates_lockers/closets/utility_closets.dm | 21 +++---- .../crates_lockers/closets/wardrobe.dm | 38 ++++--------- .../structures/crates_lockers/crates.dm | 6 +- 19 files changed, 108 insertions(+), 166 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 116e6ee21d9..e37db32e245 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -41,6 +41,11 @@ addtimer(CALLBACK(src, .proc/take_contents), 0) ..() update_icon() + PopulateContents() + +//USE THIS TO FILL IT, NOT INITIALIZE OR NEW +/obj/structure/closet/proc/PopulateContents() + return /obj/structure/closet/Destroy() dump_contents() diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index 7c01cb0b18f..4e3be4eb073 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -3,7 +3,7 @@ desc = "It's a storage unit for athletic wear." icon_door = "mixed" -/obj/structure/closet/athletic_mixed/New() +/obj/structure/closet/athletic_mixed/PopulateContents() ..() new /obj/item/clothing/under/shorts/purple(src) new /obj/item/clothing/under/shorts/grey(src) @@ -19,7 +19,7 @@ name = "boxing gloves" desc = "It's a storage unit for gloves for use in the boxing ring." -/obj/structure/closet/boxinggloves/New() +/obj/structure/closet/boxinggloves/PopulateContents() ..() new /obj/item/clothing/gloves/boxing/blue(src) new /obj/item/clothing/gloves/boxing/green(src) @@ -31,7 +31,7 @@ name = "mask closet" desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!" -/obj/structure/closet/masks/New() +/obj/structure/closet/masks/PopulateContents() ..() new /obj/item/clothing/mask/luchador(src) new /obj/item/clothing/mask/luchador/rudos(src) @@ -43,7 +43,7 @@ desc = "It's a storage unit for laser tag equipment." icon_door = "red" -/obj/structure/closet/lasertag/red/New() +/obj/structure/closet/lasertag/red/PopulateContents() ..() for(var/i in 1 to 3) new /obj/item/weapon/gun/energy/laser/redtag(src) @@ -57,7 +57,7 @@ desc = "It's a storage unit for laser tag equipment." icon_door = "blue" -/obj/structure/closet/lasertag/blue/New() +/obj/structure/closet/lasertag/blue/PopulateContents() ..() for(var/i in 1 to 3) new /obj/item/weapon/gun/energy/laser/bluetag(src) diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 72a4c988a4c..b2280f50950 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -21,7 +21,7 @@ name = "russian surplus closet" desc = "It's a storage unit for Russian standard-issue surplus." -/obj/structure/closet/gimmick/russian/New() +/obj/structure/closet/gimmick/russian/PopulateContents() ..() for(var/i in 1 to 5) new /obj/item/clothing/head/ushanka(src) @@ -32,7 +32,7 @@ name = "tacticool gear closet" desc = "It's a storage unit for Tacticool gear." -/obj/structure/closet/gimmick/tacticool/New() +/obj/structure/closet/gimmick/tacticool/PopulateContents() ..() new /obj/item/clothing/glasses/eyepatch(src) new /obj/item/clothing/glasses/sunglasses(src) @@ -59,7 +59,7 @@ name = "red-team Thunderdome closet" icon_door = "red" -/obj/structure/closet/thunderdome/tdred/New() +/obj/structure/closet/thunderdome/tdred/PopulateContents() ..() for(var/i in 1 to 3) new /obj/item/clothing/suit/armor/tdome/red(src) @@ -78,7 +78,7 @@ name = "green-team Thunderdome closet" icon_door = "green" -/obj/structure/closet/thunderdome/tdgreen/New() +/obj/structure/closet/thunderdome/tdgreen/PopulateContents() ..() for(var/i in 1 to 3) new /obj/item/clothing/suit/armor/tdome/green(src) @@ -97,7 +97,7 @@ desc = "It's a storage unit for operational gear." icon_state = "syndicate" -/obj/structure/closet/malf/suits/New() +/obj/structure/closet/malf/suits/PopulateContents() ..() new /obj/item/weapon/tank/jetpack/void(src) new /obj/item/clothing/mask/breath(src) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index e589ec167af..67a7a0f0801 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -5,7 +5,7 @@ desc = "It's a storage unit for formal clothing." icon_door = "black" -/obj/structure/closet/gmcloset/New() +/obj/structure/closet/gmcloset/PopulateContents() ..() new /obj/item/clothing/head/that(src) new /obj/item/device/radio/headset/headset_srv(src) @@ -33,7 +33,7 @@ desc = "It's a storage unit for foodservice garments and mouse traps." icon_door = "black" -/obj/structure/closet/chefcloset/New() +/obj/structure/closet/chefcloset/PopulateContents() ..() new /obj/item/clothing/under/waiter(src) new /obj/item/clothing/under/waiter(src) @@ -57,7 +57,7 @@ desc = "It's a storage unit for janitorial clothes and gear." icon_door = "mixed" -/obj/structure/closet/jcloset/New() +/obj/structure/closet/jcloset/PopulateContents() ..() new /obj/item/clothing/under/rank/janitor(src) new /obj/item/weapon/cartridge/janitor(src) @@ -81,7 +81,7 @@ desc = "It's a storage unit for courtroom apparel and items." icon_door = "blue" -/obj/structure/closet/lawcloset/New() +/obj/structure/closet/lawcloset/PopulateContents() ..() new /obj/item/clothing/under/lawyer/female(src) new /obj/item/clothing/under/lawyer/black(src) @@ -102,9 +102,7 @@ desc = "It's a storage unit for Nanotrasen-approved religious attire." icon_door = "black" -/obj/structure/closet/wardrobe/chaplain_black/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/chaplain_black/PopulateContents() new /obj/item/clothing/under/rank/chaplain(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/suit/nun(src) @@ -138,9 +136,7 @@ name = "security wardrobe" icon_door = "red" -/obj/structure/closet/wardrobe/red/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/red/PopulateContents() new /obj/item/clothing/suit/hooded/wintercoat/security(src) new /obj/item/weapon/storage/backpack/security(src) new /obj/item/weapon/storage/backpack/satchel/sec(src) @@ -163,9 +159,7 @@ name = "cargo wardrobe" icon_door = "orange" -/obj/structure/closet/wardrobe/cargotech/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/cargotech/PopulateContents() new /obj/item/clothing/suit/hooded/wintercoat/cargo(src) for(var/i in 1 to 3) new /obj/item/clothing/under/rank/cargotech(src) @@ -181,9 +175,7 @@ name = "atmospherics wardrobe" icon_door = "atmos_wardrobe" -/obj/structure/closet/wardrobe/atmospherics_yellow/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/atmospherics_yellow/PopulateContents() new /obj/item/weapon/storage/backpack/dufflebag/engineering(src) new /obj/item/weapon/storage/backpack/satchel/eng(src) new /obj/item/weapon/storage/backpack/industrial(src) @@ -199,9 +191,7 @@ name = "engineering wardrobe" icon_door = "yellow" -/obj/structure/closet/wardrobe/engineering_yellow/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/engineering_yellow/PopulateContents() new /obj/item/weapon/storage/backpack/dufflebag/engineering(src) new /obj/item/weapon/storage/backpack/industrial(src) new /obj/item/weapon/storage/backpack/satchel/eng(src) @@ -219,9 +209,7 @@ /obj/structure/closet/wardrobe/white/medical name = "medical doctor's wardrobe" -/obj/structure/closet/wardrobe/white/medical/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/white/medical/PopulateContents() new /obj/item/weapon/storage/backpack/dufflebag/med(src) new /obj/item/weapon/storage/backpack/medic(src) new /obj/item/weapon/storage/backpack/satchel/med(src) @@ -247,9 +235,7 @@ name = "robotics wardrobe" icon_door = "black" -/obj/structure/closet/wardrobe/robotics_black/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/robotics_black/PopulateContents() new /obj/item/clothing/glasses/hud/diagnostic(src) new /obj/item/clothing/glasses/hud/diagnostic(src) new /obj/item/clothing/under/rank/roboticist(src) @@ -273,9 +259,7 @@ name = "chemistry wardrobe" icon_door = "white" -/obj/structure/closet/wardrobe/chemistry_white/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/chemistry_white/PopulateContents() new /obj/item/clothing/under/rank/chemist(src) new /obj/item/clothing/under/rank/chemist(src) new /obj/item/clothing/shoes/sneakers/white(src) @@ -295,9 +279,7 @@ name = "genetics wardrobe" icon_door = "white" -/obj/structure/closet/wardrobe/genetics_white/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/genetics_white/PopulateContents() new /obj/item/clothing/under/rank/geneticist(src) new /obj/item/clothing/under/rank/geneticist(src) new /obj/item/clothing/shoes/sneakers/white(src) @@ -315,9 +297,7 @@ name = "virology wardrobe" icon_door = "white" -/obj/structure/closet/wardrobe/virology_white/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/virology_white/PopulateContents() new /obj/item/clothing/under/rank/virologist(src) new /obj/item/clothing/under/rank/virologist(src) new /obj/item/clothing/shoes/sneakers/white(src) @@ -336,9 +316,7 @@ name = "science wardrobe" icon_door = "white" -/obj/structure/closet/wardrobe/science_white/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/science_white/PopulateContents() new /obj/item/weapon/storage/backpack/science(src) new /obj/item/weapon/storage/backpack/science(src) new /obj/item/weapon/storage/backpack/satchel/tox(src) @@ -360,9 +338,7 @@ name = "botanist wardrobe" icon_door = "green" -/obj/structure/closet/wardrobe/botanist/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/botanist/PopulateContents() new /obj/item/weapon/storage/backpack/botany(src) new /obj/item/weapon/storage/backpack/botany(src) new /obj/item/weapon/storage/backpack/satchel/hyd(src) diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index 34f4d09415c..abbc233776b 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -3,7 +3,7 @@ desc = "It's a storage unit for level-3 biohazard gear." icon_state = "bio" -/obj/structure/closet/l3closet/New() +/obj/structure/closet/l3closet/PopulateContents() ..() new /obj/item/weapon/storage/bag/bio( src ) new /obj/item/clothing/suit/bio_suit/general( src ) @@ -13,9 +13,7 @@ /obj/structure/closet/l3closet/virology icon_state = "bio_viro" -/obj/structure/closet/l3closet/virology/New() - ..() - contents = list() +/obj/structure/closet/l3closet/virology/PopulateContents() new /obj/item/weapon/storage/bag/bio( src ) new /obj/item/clothing/suit/bio_suit/virology( src ) new /obj/item/clothing/head/bio_hood/virology( src ) @@ -24,9 +22,7 @@ /obj/structure/closet/l3closet/security icon_state = "bio_sec" -/obj/structure/closet/l3closet/security/New() - ..() - contents = list() +/obj/structure/closet/l3closet/security/PopulateContents() new /obj/item/clothing/suit/bio_suit/security( src ) new /obj/item/clothing/head/bio_hood/security( src ) @@ -34,9 +30,7 @@ /obj/structure/closet/l3closet/janitor icon_state = "bio_jan" -/obj/structure/closet/l3closet/janitor/New() - ..() - contents = list() +/obj/structure/closet/l3closet/janitor/PopulateContents() new /obj/item/clothing/suit/bio_suit/janitor( src ) new /obj/item/clothing/head/bio_hood/janitor( src ) @@ -44,9 +38,7 @@ /obj/structure/closet/l3closet/scientist icon_state = "bio_viro" -/obj/structure/closet/l3closet/scientist/New() - ..() - contents = list() +/obj/structure/closet/l3closet/scientist/PopulateContents() new /obj/item/weapon/storage/bag/bio( src ) new /obj/item/clothing/suit/bio_suit/scientist( src ) new /obj/item/clothing/head/bio_hood/scientist( src ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index ec8952b8524..c97b08e8322 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -6,7 +6,7 @@ obj_integrity = 70 max_integrity = 70 -/obj/structure/closet/secure_closet/bar/New() +/obj/structure/closet/secure_closet/bar/PopulateContents() ..() for(var/i in 1 to 10) new /obj/item/weapon/reagent_containers/food/drinks/beer( src ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 7fdcc626778..5f450053199 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -3,7 +3,7 @@ req_access = list(access_qm) icon_state = "qm" -/obj/structure/closet/secure_closet/quartermaster/New() +/obj/structure/closet/secure_closet/quartermaster/PopulateContents() ..() new /obj/item/clothing/neck/cloak/qm(src) new /obj/item/clothing/under/rank/cargo(src) 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 a3ca6805bff..6c75822ceae 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -3,7 +3,7 @@ req_access = list(access_ce) icon_state = "ce" -/obj/structure/closet/secure_closet/engineering_chief/New() +/obj/structure/closet/secure_closet/engineering_chief/PopulateContents() ..() new /obj/item/clothing/neck/cloak/ce(src) new /obj/item/clothing/under/rank/chief_engineer(src) @@ -33,7 +33,7 @@ icon_state = "eng" icon_door = "eng_elec" -/obj/structure/closet/secure_closet/engineering_electrical/New() +/obj/structure/closet/secure_closet/engineering_electrical/PopulateContents() ..() new /obj/item/clothing/gloves/color/yellow(src) new /obj/item/clothing/gloves/color/yellow(src) @@ -50,7 +50,7 @@ icon_state = "eng" icon_door = "eng_weld" -/obj/structure/closet/secure_closet/engineering_welding/New() +/obj/structure/closet/secure_closet/engineering_welding/PopulateContents() ..() for(var/i in 1 to 3) new /obj/item/clothing/head/welding(src) @@ -62,7 +62,7 @@ req_access = list(access_engine_equip) icon_state = "eng_secure" -/obj/structure/closet/secure_closet/engineering_personal/New() +/obj/structure/closet/secure_closet/engineering_personal/PopulateContents() ..() new /obj/item/device/radio/headset/headset_eng(src) new /obj/item/weapon/storage/toolbox/mechanical(src) @@ -78,7 +78,7 @@ req_access = list(access_atmospherics) icon_state = "atmos" -/obj/structure/closet/secure_closet/atmospherics/New() +/obj/structure/closet/secure_closet/atmospherics/PopulateContents() ..() new /obj/item/device/radio/headset/headset_eng(src) new /obj/item/weapon/pipe_dispenser(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 88cb7d65b73..17666ddbded 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -5,7 +5,7 @@ name = "kitchen Cabinet" req_access = list(access_kitchen) -/obj/structure/closet/secure_closet/freezer/kitchen/New() +/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents() ..() for(var/i = 0, i < 3, i++) new /obj/item/weapon/reagent_containers/food/condiment/flour(src) @@ -17,7 +17,7 @@ desc = "This refrigerator looks quite dusty, is there anything edible still inside?" req_access = list() -/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/New() +/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents() ..() for(var/i = 0, i < 5, i++) new /obj/item/weapon/reagent_containers/food/condiment/milk(src) @@ -32,14 +32,14 @@ /obj/structure/closet/secure_closet/freezer/meat name = "meat fridge" -/obj/structure/closet/secure_closet/freezer/meat/New() +/obj/structure/closet/secure_closet/freezer/meat/PopulateContents() ..() for(var/i = 0, i < 4, i++) new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey(src) /obj/structure/closet/secure_closet/freezer/fridge name = "refrigerator" -/obj/structure/closet/secure_closet/freezer/fridge/New() +/obj/structure/closet/secure_closet/freezer/fridge/PopulateContents() ..() for(var/i = 0, i < 5, i++) new /obj/item/weapon/reagent_containers/food/condiment/milk(src) @@ -53,7 +53,7 @@ desc = "This contains cold hard cash." req_access = list(access_heads_vault) -/obj/structure/closet/secure_closet/freezer/money/New() +/obj/structure/closet/secure_closet/freezer/money/PopulateContents() ..() for(var/i = 0, i < 3, i++) new /obj/item/stack/spacecash/c1000(src) @@ -67,6 +67,6 @@ desc = "Contains pies filled with cream and/or custard, you sickos." req_access = list(access_theatre) -/obj/structure/closet/secure_closet/freezer/pie/New() +/obj/structure/closet/secure_closet/freezer/pie/PopulateContents() ..() new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index d607fcb7a27..4cbbc46b629 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -3,7 +3,7 @@ req_access = list(access_hydroponics) icon_state = "hydro" -/obj/structure/closet/secure_closet/hydroponics/New() +/obj/structure/closet/secure_closet/hydroponics/PopulateContents() ..() new /obj/item/weapon/storage/bag/plants/portaseeder(src) new /obj/item/device/plant_analyzer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 1b9c50b78d5..f0ff0c92d40 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -4,7 +4,7 @@ icon_state = "med" req_access = list(access_medical) -/obj/structure/closet/secure_closet/medical1/New() +/obj/structure/closet/secure_closet/medical1/PopulateContents() ..() new /obj/item/weapon/reagent_containers/glass/beaker(src) new /obj/item/weapon/reagent_containers/glass/beaker(src) @@ -26,7 +26,7 @@ desc = "Used to knock people out." req_access = list(access_surgery) -/obj/structure/closet/secure_closet/medical2/New() +/obj/structure/closet/secure_closet/medical2/PopulateContents() ..() for(var/i in 1 to 3) new /obj/item/weapon/tank/internals/anesthetic(src) @@ -38,7 +38,7 @@ req_access = list(access_surgery) icon_state = "med_secure" -/obj/structure/closet/secure_closet/medical3/New() +/obj/structure/closet/secure_closet/medical3/PopulateContents() ..() new /obj/item/device/radio/headset/headset_med(src) new /obj/item/weapon/defibrillator/loaded(src) @@ -52,7 +52,7 @@ req_access = list(access_cmo) icon_state = "cmo" -/obj/structure/closet/secure_closet/CMO/New() +/obj/structure/closet/secure_closet/CMO/PopulateContents() ..() new /obj/item/clothing/neck/cloak/cmo(src) new /obj/item/weapon/storage/backpack/dufflebag/med(src) @@ -76,7 +76,7 @@ name = "animal control" req_access = list(access_surgery) -/obj/structure/closet/secure_closet/animal/New() +/obj/structure/closet/secure_closet/animal/PopulateContents() ..() new /obj/item/device/assembly/signaler(src) for(var/i in 1 to 3) @@ -87,7 +87,7 @@ desc = "Store dangerous chemicals in here." icon_door = "chemical" -/obj/structure/closet/secure_closet/chemical/New() +/obj/structure/closet/secure_closet/chemical/PopulateContents() ..() new /obj/item/weapon/storage/box/pillbottles(src) new /obj/item/weapon/storage/box/pillbottles(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm index 5ce6d85262c..20cbea2f22d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm @@ -4,7 +4,7 @@ req_access = list(access_cent_captain) icon_state = "cap" -/obj/structure/closet/secure_closet/ertCom/New() +/obj/structure/closet/secure_closet/ertCom/PopulateContents() ..() new /obj/item/weapon/storage/firstaid/regular(src) new /obj/item/weapon/storage/box/handcuffs(src) @@ -25,7 +25,7 @@ req_access = list(access_cent_specops) icon_state = "hos" -/obj/structure/closet/secure_closet/ertSec/New() +/obj/structure/closet/secure_closet/ertSec/PopulateContents() ..() new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/box/teargas(src) @@ -39,7 +39,7 @@ req_access = list(access_cent_medical) icon_state = "cmo" -/obj/structure/closet/secure_closet/ertMed/New() +/obj/structure/closet/secure_closet/ertMed/PopulateContents() ..() new /obj/item/weapon/storage/firstaid/o2(src) new /obj/item/weapon/storage/firstaid/toxin(src) @@ -55,7 +55,7 @@ req_access = list(access_cent_storage) icon_state = "ce" -/obj/structure/closet/secure_closet/ertEngi/New() +/obj/structure/closet/secure_closet/ertEngi/PopulateContents() ..() new /obj/item/stack/sheet/plasteel(src, 50) new /obj/item/stack/sheet/metal(src, 50) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 8372da4e0c4..a7f7b4b74b4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -4,7 +4,7 @@ req_access = list(access_all_personal_lockers) var/registered_name = null -/obj/structure/closet/secure_closet/personal/New() +/obj/structure/closet/secure_closet/personal/PopulateContents() ..() if(prob(50)) new /obj/item/weapon/storage/backpack/dufflebag(src) @@ -17,9 +17,7 @@ /obj/structure/closet/secure_closet/personal/patient name = "patient's closet" -/obj/structure/closet/secure_closet/personal/patient/New() - ..() - contents.Cut() +/obj/structure/closet/secure_closet/personal/patient/PopulateContents() new /obj/item/clothing/under/color/white( src ) new /obj/item/clothing/shoes/sneakers/white( src ) @@ -29,9 +27,7 @@ obj_integrity = 70 max_integrity = 70 -/obj/structure/closet/secure_closet/personal/cabinet/New() - ..() - contents = list() +/obj/structure/closet/secure_closet/personal/cabinet/PopulateContents() new /obj/item/weapon/storage/backpack/satchel/leather/withwallet( src ) new /obj/item/device/radio/headset( src ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 4ed65937977..0363907169d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -3,7 +3,7 @@ req_access = list(access_rd) icon_state = "rd" -/obj/structure/closet/secure_closet/RD/New() +/obj/structure/closet/secure_closet/RD/PopulateContents() ..() new /obj/item/clothing/neck/cloak/rd(src) new /obj/item/clothing/suit/bio_suit/scientist(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 06db2173e46..3b6ccb47403 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -3,7 +3,7 @@ req_access = list(access_captain) icon_state = "cap" -/obj/structure/closet/secure_closet/captains/New() +/obj/structure/closet/secure_closet/captains/PopulateContents() ..() new /obj/item/clothing/suit/hooded/wintercoat/captain(src) if(prob(50)) @@ -35,7 +35,7 @@ req_access = list(access_hop) icon_state = "hop" -/obj/structure/closet/secure_closet/hop/New() +/obj/structure/closet/secure_closet/hop/PopulateContents() ..() new /obj/item/clothing/neck/cloak/hop(src) new /obj/item/clothing/under/rank/head_of_personnel(src) @@ -59,7 +59,7 @@ req_access = list(access_hos) icon_state = "hos" -/obj/structure/closet/secure_closet/hos/New() +/obj/structure/closet/secure_closet/hos/PopulateContents() ..() new /obj/item/clothing/neck/cloak/hos(src) new /obj/item/weapon/cartridge/hos(src) @@ -88,7 +88,7 @@ req_access = list(access_armory) icon_state = "warden" -/obj/structure/closet/secure_closet/warden/New() +/obj/structure/closet/secure_closet/warden/PopulateContents() ..() new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/clothing/suit/armor/vest/warden(src) @@ -112,7 +112,7 @@ req_access = list(access_security) icon_state = "sec" -/obj/structure/closet/secure_closet/security/New() +/obj/structure/closet/secure_closet/security/PopulateContents() ..() new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/head/helmet/sec(src) @@ -123,34 +123,34 @@ /obj/structure/closet/secure_closet/security/sec -/obj/structure/closet/secure_closet/security/sec/New() +/obj/structure/closet/secure_closet/security/sec/PopulateContents() ..() new /obj/item/weapon/storage/belt/security/full(src) /obj/structure/closet/secure_closet/security/cargo -/obj/structure/closet/secure_closet/security/cargo/New() +/obj/structure/closet/secure_closet/security/cargo/PopulateContents() ..() new /obj/item/clothing/tie/armband/cargo(src) new /obj/item/device/encryptionkey/headset_cargo(src) /obj/structure/closet/secure_closet/security/engine -/obj/structure/closet/secure_closet/security/engine/New() +/obj/structure/closet/secure_closet/security/engine/PopulateContents() ..() new /obj/item/clothing/tie/armband/engine(src) new /obj/item/device/encryptionkey/headset_eng(src) /obj/structure/closet/secure_closet/security/science -/obj/structure/closet/secure_closet/security/science/New() +/obj/structure/closet/secure_closet/security/science/PopulateContents() ..() new /obj/item/clothing/tie/armband/science(src) new /obj/item/device/encryptionkey/headset_sci(src) /obj/structure/closet/secure_closet/security/med -/obj/structure/closet/secure_closet/security/med/New() +/obj/structure/closet/secure_closet/security/med/PopulateContents() ..() new /obj/item/clothing/tie/armband/medblue(src) new /obj/item/device/encryptionkey/headset_med(src) @@ -163,7 +163,7 @@ obj_integrity = 70 max_integrity = 70 -/obj/structure/closet/secure_closet/detective/New() +/obj/structure/closet/secure_closet/detective/PopulateContents() ..() new /obj/item/clothing/under/rank/det(src) new /obj/item/clothing/suit/det_suit(src) @@ -187,7 +187,7 @@ name = "lethal injections" req_access = list(access_hos) -/obj/structure/closet/secure_closet/injection/New() +/obj/structure/closet/secure_closet/injection/PopulateContents() ..() for(var/i in 1 to 5) new /obj/item/weapon/reagent_containers/syringe/lethal/execution(src) @@ -198,7 +198,7 @@ anchored = 1 var/id = null -/obj/structure/closet/secure_closet/brig/New() +/obj/structure/closet/secure_closet/brig/PopulateContents() ..() new /obj/item/clothing/under/rank/prisoner( src ) new /obj/item/clothing/shoes/sneakers/orange( src ) @@ -207,7 +207,7 @@ name = "courtroom locker" req_access = list(access_court) -/obj/structure/closet/secure_closet/courtroom/New() +/obj/structure/closet/secure_closet/courtroom/PopulateContents() ..() new /obj/item/clothing/shoes/sneakers/brown(src) for(var/i in 1 to 3) @@ -222,7 +222,7 @@ req_access = list(access_armory) icon_state = "armory" -/obj/structure/closet/secure_closet/armory1/New() +/obj/structure/closet/secure_closet/armory1/PopulateContents() ..() new /obj/item/clothing/suit/armor/laserproof(src) for(var/i in 1 to 3) @@ -237,7 +237,7 @@ req_access = list(access_armory) icon_state = "armory" -/obj/structure/closet/secure_closet/armory2/New() +/obj/structure/closet/secure_closet/armory2/PopulateContents() ..() new /obj/item/weapon/storage/box/firingpins(src) for(var/i in 1 to 3) @@ -250,7 +250,7 @@ req_access = list(access_armory) icon_state = "armory" -/obj/structure/closet/secure_closet/armory3/New() +/obj/structure/closet/secure_closet/armory3/PopulateContents() ..() new /obj/item/weapon/storage/box/firingpins(src) new /obj/item/weapon/gun/energy/ionrifle(src) @@ -264,7 +264,7 @@ req_access = list(access_armory) icon_state = "tac" -/obj/structure/closet/secure_closet/tac/New() +/obj/structure/closet/secure_closet/tac/PopulateContents() ..() new /obj/item/weapon/gun/ballistic/automatic/wt550(src) new /obj/item/clothing/head/helmet/alt(src) @@ -276,7 +276,7 @@ req_access = list(access_armory) icon_state = "tac" -/obj/structure/closet/secure_closet/lethalshots/New() +/obj/structure/closet/secure_closet/lethalshots/PopulateContents() ..() for(var/i in 1 to 3) new /obj/item/weapon/storage/box/lethalshot(src) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 637df32ab18..030aa373eab 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -6,7 +6,7 @@ /obj/structure/closet/syndicate/personal desc = "It's a personal storage unit for operative gear." -/obj/structure/closet/syndicate/personal/New() +/obj/structure/closet/syndicate/personal/PopulateContents() ..() new /obj/item/clothing/under/syndicate(src) new /obj/item/clothing/shoes/sneakers/black(src) @@ -20,9 +20,7 @@ /obj/structure/closet/syndicate/nuclear desc = "It's a storage unit for a Syndicate boarding party." -/obj/structure/closet/syndicate/nuclear/New() - ..() - contents = list() +/obj/structure/closet/syndicate/nuclear/PopulateContents() for(var/i in 1 to 5) new /obj/item/ammo_box/magazine/m10mm(src) new /obj/item/weapon/storage/box/flashbangs(src) @@ -34,7 +32,7 @@ /obj/structure/closet/syndicate/resources desc = "An old, dusty locker." -/obj/structure/closet/syndicate/resources/New() +/obj/structure/closet/syndicate/resources/PopulateContents() ..() var/common_min = 30 //Minimum amount of minerals in the stack for common minerals var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals @@ -99,9 +97,7 @@ /obj/structure/closet/syndicate/resources/everything desc = "It's an emergency storage closet for repairs." -/obj/structure/closet/syndicate/resources/everything/New() - ..() - contents = list() +/obj/structure/closet/syndicate/resources/everything/PopulateContents() var/list/resources = list( /obj/item/stack/sheet/metal, /obj/item/stack/sheet/glass, 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 439c5b32fbc..f77c9a072e4 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -17,7 +17,7 @@ desc = "It's a storage unit for emergency breath masks and O2 tanks." icon_state = "emergency" -/obj/structure/closet/emcloset/New() +/obj/structure/closet/emcloset/PopulateContents() ..() if (prob(40)) @@ -63,7 +63,7 @@ desc = "It's a storage unit for fire-fighting supplies." icon_state = "fire" -/obj/structure/closet/firecloset/New() +/obj/structure/closet/firecloset/PopulateContents() ..() new /obj/item/clothing/suit/fire/firefighter(src) @@ -72,10 +72,7 @@ new /obj/item/weapon/extinguisher(src) new /obj/item/clothing/head/hardhat/red(src) -/obj/structure/closet/firecloset/full/New() - ..() - contents = list() - +/obj/structure/closet/firecloset/full/PopulateContents() new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/clothing/mask/gas(src) new /obj/item/device/flashlight(src) @@ -92,7 +89,7 @@ icon_state = "eng" icon_door = "eng_tool" -/obj/structure/closet/toolcloset/New() +/obj/structure/closet/toolcloset/PopulateContents() ..() if(prob(40)) new /obj/item/clothing/suit/hazardvest(src) @@ -135,7 +132,7 @@ icon_state = "eng" icon_door = "eng_rad" -/obj/structure/closet/radiation/New() +/obj/structure/closet/radiation/PopulateContents() ..() new /obj/item/device/geiger_counter(src) new /obj/item/clothing/suit/radiation(src) @@ -149,7 +146,7 @@ desc = "It's a storage unit for explosion-protective suits." icon_state = "bomb" -/obj/structure/closet/bombcloset/New() +/obj/structure/closet/bombcloset/PopulateContents() ..() new /obj/item/clothing/suit/bomb_suit( src ) new /obj/item/clothing/under/color/black( src ) @@ -162,9 +159,7 @@ desc = "It's a storage unit for explosion-protective suits." icon_state = "bomb" -/obj/structure/closet/bombclosetsecurity/New() - ..() - contents = list() +/obj/structure/closet/bombclosetsecurity/PopulateContents() new /obj/item/clothing/suit/bomb_suit/security( src ) new /obj/item/clothing/under/rank/security( src ) new /obj/item/clothing/shoes/sneakers/brown( src ) @@ -176,7 +171,7 @@ /obj/structure/closet/ammunitionlocker name = "ammunition locker" -/obj/structure/closet/ammunitionlocker/New() +/obj/structure/closet/ammunitionlocker/PopulateContents() ..() for(var/i in 1 to 8) new /obj/item/ammo_casing/shotgun/beanbag(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index d4d6d2d71e7..a173a20dc0c 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -3,7 +3,7 @@ desc = "It's a storage unit for standard-issue Nanotrasen attire." icon_door = "blue" -/obj/structure/closet/wardrobe/New() +/obj/structure/closet/wardrobe/PopulateContents() ..() for(var/i in 1 to 3) new /obj/item/clothing/under/color/blue(src) @@ -15,9 +15,7 @@ name = "pink wardrobe" icon_door = "pink" -/obj/structure/closet/wardrobe/pink/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/pink/PopulateContents() for(var/i in 1 to 3) new /obj/item/clothing/under/color/pink(src) for(var/i in 1 to 3) @@ -28,9 +26,7 @@ name = "black wardrobe" icon_door = "black" -/obj/structure/closet/wardrobe/black/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/black/PopulateContents() for(var/i in 1 to 3) new /obj/item/clothing/under/color/black(src) if(prob(25)) @@ -54,9 +50,7 @@ name = "green wardrobe" icon_door = "green" -/obj/structure/closet/wardrobe/green/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/green/PopulateContents() for(var/i in 1 to 3) new /obj/item/clothing/under/color/green(src) for(var/i in 1 to 3) @@ -71,9 +65,7 @@ desc = "It's a storage unit for Nanotrasen-regulation prisoner attire." icon_door = "orange" -/obj/structure/closet/wardrobe/orange/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/orange/PopulateContents() for(var/i in 1 to 3) new /obj/item/clothing/under/rank/prisoner(src) for(var/i in 1 to 3) @@ -85,9 +77,7 @@ name = "yellow wardrobe" icon_door = "yellow" -/obj/structure/closet/wardrobe/yellow/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/yellow/PopulateContents() for(var/i in 1 to 3) new /obj/item/clothing/under/color/yellow(src) for(var/i in 1 to 3) @@ -101,9 +91,7 @@ name = "white wardrobe" icon_door = "white" -/obj/structure/closet/wardrobe/white/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/white/PopulateContents() for(var/i in 1 to 3) new /obj/item/clothing/under/color/white(src) for(var/i in 1 to 3) @@ -116,9 +104,7 @@ name = "pajama wardrobe" icon_door = "white" -/obj/structure/closet/wardrobe/pjs/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/pjs/PopulateContents() new /obj/item/clothing/under/pj/red(src) new /obj/item/clothing/under/pj/red(src) new /obj/item/clothing/under/pj/blue(src) @@ -132,9 +118,7 @@ name = "grey wardrobe" icon_door = "grey" -/obj/structure/closet/wardrobe/grey/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/grey/PopulateContents() for(var/i in 1 to 3) new /obj/item/clothing/under/color/grey(src) for(var/i in 1 to 3) @@ -160,9 +144,7 @@ name = "mixed wardrobe" icon_door = "mixed" -/obj/structure/closet/wardrobe/mixed/New() - ..() - contents = list() +/obj/structure/closet/wardrobe/mixed/PopulateContents() if(prob(40)) new /obj/item/clothing/suit/jacket(src) if(prob(40)) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 4fd14a70912..4270e765a29 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -85,7 +85,7 @@ name = "blood freezer" desc = "A freezer containing packs of blood." -/obj/structure/closet/crate/freezer/blood/New() +/obj/structure/closet/crate/freezer/blood/PopulateContents() . = ..() new /obj/item/weapon/reagent_containers/blood/empty(src) new /obj/item/weapon/reagent_containers/blood/empty(src) @@ -102,7 +102,7 @@ name = "surplus prosthetic limbs" desc = "A crate containing an assortment of cheap prosthetic limbs." -/obj/structure/closet/crate/freezer/surplus_limbs/New() +/obj/structure/closet/crate/freezer/surplus_limbs/PopulateContents() . = ..() new /obj/item/bodypart/l_arm/robot/surplus(src) new /obj/item/bodypart/l_arm/robot/surplus(src) @@ -135,7 +135,7 @@ name = "\improper RCD crate" icon_state = "engi_crate" -/obj/structure/closet/crate/rcd/New() +/obj/structure/closet/crate/rcd/PopulateContents() ..() for(var/i in 1 to 4) new /obj/item/weapon/rcd_ammo(src)