From 5dc80d6cbaded3db4535113b697c7e8d24bfe4b6 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 2 Oct 2021 22:26:37 +0100 Subject: [PATCH] steel pass 2 --- .../objects/structures/crates_lockers/closets.dm | 10 ++-------- .../structures/crates_lockers/closets/fitness.dm | 15 ++++++++++----- .../crates_lockers/closets/job_closets.dm | 15 ++++++++++----- .../crates_lockers/closets/secure/engineering.dm | 4 ++-- .../crates_lockers/closets/secure/medical.dm | 12 ++++++------ .../crates_lockers/closets/secure/scientist.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 4 ++-- .../crates_lockers/closets/utility_closets.dm | 4 ++-- .../structures/crates_lockers/closets/wardrobe.dm | 3 ++- 9 files changed, 37 insertions(+), 32 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 59149ef0301..c055d66b540 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -9,9 +9,7 @@ armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 70, ACID = 60) var/icon_closed var/icon_opened - var/is_wardrobe var/open_door_sprite = "generic_door" - var/shared_open_sprite var/opened = FALSE var/welded = FALSE var/locked = FALSE @@ -31,12 +29,8 @@ /obj/structure/closet/Initialize(mapload) . = ..() icon_closed = "[icon_state]" - icon_opened = "[icon_state]_open" - if(shared_open_sprite) - icon_opened = shared_open_sprite - if(is_wardrobe) - icon_opened = "generic_open" - open_door_sprite = "generic_door" + if(!icon_opened) + icon_opened = "[icon_state]_open" if(mapload && !opened) // Youre probably asking, why is this a 0 seconds timer AA? // Well, I will tell you. One day, all /obj/effect/spawner will use Initialize diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index 8f0c52e227b..b148c909663 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -2,7 +2,8 @@ name = "athletic wardrobe" desc = "It's a storage unit for athletic wear." icon_state = "mixed" - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/athletic_mixed/populate_contents() new /obj/item/clothing/under/shorts/grey(src) @@ -20,7 +21,8 @@ /obj/structure/closet/boxinggloves name = "boxing gloves" desc = "It's a storage unit for gloves for use in the boxing ring." - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/boxinggloves/populate_contents() new /obj/item/clothing/gloves/boxing/blue(src) @@ -32,7 +34,8 @@ /obj/structure/closet/masks name = "mask closet" desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!" - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/masks/populate_contents() new /obj/item/clothing/mask/luchador(src) @@ -44,7 +47,8 @@ name = "red laser tag equipment" desc = "It's a storage unit for laser tag equipment." icon_state = "red" - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/lasertag/red/populate_contents() new /obj/item/gun/energy/laser/tag/red(src) @@ -59,7 +63,8 @@ name = "blue laser tag equipment" desc = "It's a storage unit for laser tag equipment." icon_state = "blue" - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/lasertag/blue/populate_contents() new /obj/item/gun/energy/laser/tag/blue(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 d8498da95b2..5ed75a726e4 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -12,7 +12,8 @@ name = "formal closet" desc = "It's a storage unit for formal clothing." icon_state = "black" - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/gmcloset/populate_contents() new /obj/item/clothing/head/that(src) @@ -39,7 +40,8 @@ name = "chef's closet" desc = "It's a storage unit for foodservice garments." icon_state = "black" - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/chefcloset/populate_contents() new /obj/item/clothing/under/waiter(src) @@ -66,7 +68,8 @@ name = "custodial closet" desc = "It's a storage unit for janitorial clothes and gear." icon_state = "mixed" - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/jcloset/populate_contents() new /obj/item/flashlight(src) @@ -106,7 +109,8 @@ name = "legal closet" desc = "It's a storage unit for courtroom apparel and items." icon_state = "blue" - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/lawcloset/populate_contents() new /obj/item/storage/box/tapes(src) @@ -131,7 +135,8 @@ name = "paramedic wardrobe" desc = "It's a storage unit for paramedic equipment." icon_state = "blue" - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" /obj/structure/closet/paramedic/populate_contents() 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 cce1b60abae..69daeb27b83 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -44,7 +44,7 @@ req_access = list(ACCESS_ENGINE_EQUIP) icon_state = "eng_elec" open_door_sprite = "eng_door" - shared_open_sprite = "eng_open" + icon_opened = "eng_open" /obj/structure/closet/secure_closet/engineering_electrical/populate_contents() new /obj/item/clothing/gloves/color/yellow(src) @@ -66,7 +66,7 @@ req_access = list(ACCESS_ENGINE_EQUIP) icon_state = "eng_weld" open_door_sprite = "eng_door" - shared_open_sprite = "eng_open" + icon_opened = "eng_open" /obj/structure/closet/secure_closet/engineering_welding/populate_contents() new /obj/item/clothing/head/welding(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 cf921d230b2..69fd45dca1c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -3,7 +3,7 @@ desc = "Filled with medical junk." icon_state = "med" open_door_sprite = "med_door" - shared_open_sprite = "med_open" + icon_opened = "med_open" req_access = list(ACCESS_MEDICAL) /obj/structure/closet/secure_closet/medical1/populate_contents() @@ -27,7 +27,7 @@ desc = "Used to knock people out." icon_state = "med" open_door_sprite = "med_door" - shared_open_sprite = "med_open" + icon_opened = "med_open" req_access = list(ACCESS_SURGERY) /obj/structure/closet/secure_closet/medical2/populate_contents() @@ -70,7 +70,7 @@ desc = "Filled with exam room materials." icon_state = "med" open_door_sprite = "med_door" - shared_open_sprite = "med_open" + icon_opened = "med_open" req_access = list(ACCESS_MEDICAL) /obj/structure/closet/secure_closet/exam/populate_contents() @@ -188,7 +188,7 @@ desc = "Store dangerous chemicals in here." icon_state = "chemical" open_door_sprite = "med_door" - shared_open_sprite = "med_open" + icon_opened = "med_open" req_access = list(ACCESS_CHEMISTRY) /obj/structure/closet/secure_closet/chemical/populate_contents() @@ -202,7 +202,7 @@ desc = "A locker with a Paramedic EVA suit." icon_state = "med" open_door_sprite = "med_door" - shared_open_sprite = "med_open" + icon_opened = "med_open" req_access = list(ACCESS_PARAMEDIC) /obj/structure/closet/secure_closet/paramedic/populate_contents() @@ -218,7 +218,7 @@ desc = "Store dangerous chemicals in here." icon_state = "chemical" open_door_sprite = "med_door" - shared_open_sprite = "med_open" + icon_opened = "med_open" req_access = list(ACCESS_CHEMISTRY) /obj/structure/closet/secure_closet/reagents/populate_contents() 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 217e1367336..87c79dba8c0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -67,7 +67,7 @@ desc = "Store dangerous chemicals in here." icon_state = "rchemical" open_door_sprite = "med_door" - shared_open_sprite = "med_open" + icon_opened = "med_open" req_access = list(ACCESS_TOX_STORAGE) /obj/structure/closet/secure_closet/research_reagents/populate_contents() 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 b64e2ddedcc..238beaf5283 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -200,7 +200,7 @@ req_access = list(ACCESS_BLUESHIELD) icon_state = "bs" open_door_sprite = "hop_door" - shared_open_sprite = "hop_open" + icon_opened = "hop_open" /obj/structure/closet/secure_closet/blueshield/populate_contents() new /obj/item/storage/briefcase(src) @@ -231,7 +231,7 @@ req_access = list(ACCESS_NTREP) icon_state = "ntr" open_door_sprite = "hop_door" - shared_open_sprite = "hop_open" + icon_opened = "hop_open" /obj/structure/closet/secure_closet/ntrep/populate_contents() new /obj/item/book/manual/faxes(src) 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 13adb84769e..dce21844391 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -88,7 +88,7 @@ desc = "It's a storage unit for tools." icon_state = "eng_tool" open_door_sprite = "eng_door" - shared_open_sprite = "eng_open" + icon_opened = "eng_open" /obj/structure/closet/toolcloset/populate_contents() if(prob(40)) @@ -131,7 +131,7 @@ desc = "It's a storage unit for rad-protective suits." icon_state = "eng_rad" open_door_sprite = "eng_door" - shared_open_sprite = "eng_open" + icon_opened = "eng_open" /obj/structure/closet/radiation/populate_contents() new /obj/item/geiger_counter(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 5b3e55da77b..c815356b217 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -1,7 +1,8 @@ /obj/structure/closet/wardrobe name = "wardrobe" desc = "It's a storage unit for standard-issue Nanotrasen attire." - is_wardrobe = TRUE + icon_opened = "generic_open" + open_door_sprite = "generic_door" icon_state = "blue" /obj/structure/closet/wardrobe/generic