From 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat, 6 Nov 2021 20:42:47 +0000 Subject: [PATCH] Fixes open crate sprites (#17050) * fakin underscores * more crates * sneak this one in too --- .../miniantags/abduction/abduction_gear.dm | 2 +- .../structures/crates_lockers/crates.dm | 49 +++++++++---------- .../structures/crates_lockers/crittercrate.dm | 2 +- .../mining/lavaland/necropolis_chests.dm | 2 +- code/modules/mining/mine_items.dm | 2 +- .../mob/living/simple_animal/hostile/mimic.dm | 2 +- 6 files changed, 28 insertions(+), 31 deletions(-) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 1c5db6ccfab..83277765444 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -736,7 +736,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} desc = "Contains secrets of the universe." icon_state = "abductor" icon_closed = "abductor" - icon_opened = "abductoropen" + icon_opened = "abductor_open" material_drop = /obj/item/stack/sheet/mineral/abductor /obj/structure/door_assembly/door_assembly_abductor diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index b5149bdecbb..dba7fba182c 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -3,7 +3,7 @@ desc = "A rectangular steel crate." icon = 'icons/obj/crates.dmi' icon_state = "crate" - icon_opened = "crateopen" + icon_opened = "crate_open" icon_closed = "crate" climbable = TRUE var/rigged = FALSE @@ -162,7 +162,7 @@ desc = "A secure crate." name = "Secure crate" icon_state = "securecrate" - icon_opened = "securecrateopen" + icon_opened = "securecrate_open" icon_closed = "securecrate" var/redlight = "securecrater" var/greenlight = "securecrateg" @@ -287,21 +287,21 @@ name = "plastic crate" desc = "A rectangular plastic crate." icon_state = "plasticcrate" - icon_opened = "plasticcrateopen" + icon_opened = "plasticcrate_open" icon_closed = "plasticcrate" /obj/structure/closet/crate/internals desc = "A internals crate." name = "internals crate" icon_state = "o2crate" - icon_opened = "o2crateopen" + icon_opened = "o2crate_open" icon_closed = "o2crate" /obj/structure/closet/crate/trashcart desc = "A heavy, metal trashcart with wheels." name = "trash Cart" icon_state = "trashcart" - icon_opened = "trashcartopen" + icon_opened = "trashcart_open" icon_closed = "trashcart" /*these aren't needed anymore @@ -324,15 +324,12 @@ desc = "A medical crate." name = "medical crate" icon_state = "medicalcrate" - icon_opened = "medicalcrateopen" + icon_opened = "medicalcrate_open" icon_closed = "medicalcrate" /obj/structure/closet/crate/rcd desc = "A crate for the storage of the RCD." name = "\improper RCD crate" - icon_state = "crate" - icon_opened = "crateopen" - icon_closed = "crate" /obj/structure/closet/crate/rcd/populate_contents() new /obj/item/rcd_ammo(src) @@ -344,7 +341,7 @@ desc = "A freezer." name = "Freezer" icon_state = "freezer" - icon_opened = "freezeropen" + icon_opened = "freezer_open" icon_closed = "freezer" var/target_temp = T0C - 40 var/cooling_power = 40 @@ -388,7 +385,7 @@ desc = "A large can, looks like a bin to me." name = "garbage can" icon_state = "largebin" - icon_opened = "largebinopen" + icon_opened = "largebin_open" icon_closed = "largebin" anchored = TRUE open_sound = 'sound/effects/bin_open.ogg' @@ -404,42 +401,42 @@ desc = "A crate with a radiation sign on it." name = "radioactive gear crate" icon_state = "radiation" - icon_opened = "radiationopen" + icon_opened = "radiation_open" icon_closed = "radiation" /obj/structure/closet/crate/secure/weapon desc = "A secure weapons crate." name = "weapons crate" icon_state = "weaponcrate" - icon_opened = "weaponcrateopen" + icon_opened = "weaponcrate_open" icon_closed = "weaponcrate" /obj/structure/closet/crate/secure/plasma desc = "A secure plasma crate." name = "plasma crate" icon_state = "plasmacrate" - icon_opened = "plasmacrateopen" + icon_opened = "plasmacrate_open" icon_closed = "plasmacrate" /obj/structure/closet/crate/secure/gear desc = "A secure gear crate." name = "gear crate" icon_state = "secgearcrate" - icon_opened = "secgearcrateopen" + icon_opened = "secgearcrate_open" icon_closed = "secgearcrate" /obj/structure/closet/crate/secure/hydrosec desc = "A crate with a lock on it, painted in the scheme of the station's botanists." name = "secure hydroponics crate" icon_state = "hydrosecurecrate" - icon_opened = "hydrosecurecrateopen" + icon_opened = "hydrosecurecrate_open" icon_closed = "hydrosecurecrate" /obj/structure/closet/crate/secure/bin desc = "A secure bin." name = "secure bin" icon_state = "largebins" - icon_opened = "largebinsopen" + icon_opened = "largebins_open" icon_closed = "largebins" redlight = "largebinr" greenlight = "largebing" @@ -452,7 +449,7 @@ name = "large crate" desc = "A hefty metal crate." icon_state = "largemetal" - icon_opened = "largemetalopen" + icon_opened = "largemetal_open" icon_closed = "largemetal" integrity_failure = 0 //Makes the crate break when integrity reaches 0, instead of opening and becoming an invisible sprite. @@ -477,7 +474,7 @@ name = "large crate" desc = "A hefty metal crate with an electronic locking system." icon_state = "largemetal" - icon_opened = "largemetalopen" + icon_opened = "largemetal_open" icon_closed = "largemetal" redlight = "largemetalr" greenlight = "largemetalg" @@ -503,14 +500,14 @@ /obj/structure/closet/crate/secure/large/reinforced desc = "A hefty, reinforced metal crate with an electronic locking system." icon_state = "largermetal" - icon_opened = "largermetalopen" + icon_opened = "largermetal_open" icon_closed = "largermetal" /obj/structure/closet/crate/hydroponics name = "hydroponics crate" desc = "All you need to destroy those pesky weeds and pests." icon_state = "hydrocrate" - icon_opened = "hydrocrateopen" + icon_opened = "hydrocrate_open" icon_closed = "hydrocrate" /obj/structure/closet/crate/hydroponics/prespawned @@ -537,35 +534,35 @@ name = "science crate" desc = "A science crate." icon_state = "scicrate" - icon_opened = "scicrateopen" + icon_opened = "scicrate_open" icon_closed = "scicrate" /obj/structure/closet/crate/secure/scisec name = "secure science crate" desc = "A crate with a lock on it, painted in the scheme of the station's scientists." icon_state = "scisecurecrate" - icon_opened = "scisecurecrateopen" + icon_opened = "scisecurecrate_open" icon_closed = "scisecurecrate" /obj/structure/closet/crate/engineering name = "engineering crate" desc = "An engineering crate." icon_state = "engicrate" - icon_opened = "engicrateopen" + icon_opened = "engicrate_open" icon_closed = "engicrate" /obj/structure/closet/crate/secure/engineering name = "secure engineering crate" desc = "A crate with a lock on it, painted in the scheme of the station's engineers." icon_state = "engisecurecrate" - icon_opened = "engisecurecrateopen" + icon_opened = "engisecurecrate_open" icon_closed = "engisecurecrate" /obj/structure/closet/crate/engineering/electrical name = "electrical engineering crate" desc = "An electrical engineering crate." icon_state = "electricalcrate" - icon_opened = "electricalcrateopen" + icon_opened = "electricalcrate_open" icon_closed = "electricalcrate" /obj/structure/closet/crate/tape/populate_contents() diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index 66dc2964494..8baa64d3ac9 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -2,7 +2,7 @@ name = "critter crate" desc = "A crate designed for safe transport of animals. Only openable from the the outside." icon_state = "critter" - icon_opened = "critteropen" + icon_opened = "critter_open" icon_closed = "critter" open_door_sprite = null var/already_opened = 0 diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 1eb2fa6ca0c..e402ef96010 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -4,7 +4,7 @@ name = "necropolis chest" desc = "It's watching you closely." icon_state = "necrocrate" - icon_opened = "necrocrateopen" + icon_opened = "necrocrate_open" icon_closed = "necrocrate" resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 775146e5c68..87937aa2169 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -84,5 +84,5 @@ name = "mining car (not for rails)" icon_state = "miningcar" density = 1 - icon_opened = "miningcaropen" + icon_opened = "miningcar_open" icon_closed = "miningcar" diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index a7a13aec62a..76ab8295142 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -58,7 +58,7 @@ /mob/living/simple_animal/hostile/mimic/crate/DestroyPathToTarget() ..() if(prob(90)) - icon_state = "[initial(icon_state)]open" + icon_state = "[initial(icon_state)]_open" else icon_state = initial(icon_state)