From ef64f77acb701aa473570530039f6b8df8ec953c Mon Sep 17 00:00:00 2001 From: Grandmother of 50 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com> Date: Mon, 23 Jul 2018 20:25:30 -0400 Subject: [PATCH] Removes icon-on / icon-off from Smartfridge Types (#39251) Uses initial() to replace 2 vars --- .../kitchen_machinery/smartfridge.dm | 13 ++++--------- code/modules/mining/equipment/survival_pod.dm | 5 +++-- .../hostile/megafauna/colossus.dm | 2 -- icons/obj/hydroponics/equipment.dmi | Bin 25686 -> 25683 bytes 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 17ba3aa5483..61cc940b3d2 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -13,8 +13,6 @@ active_power_usage = 100 circuit = /obj/item/circuitboard/machine/smartfridge var/max_n_of_items = 1500 - var/icon_on = "smartfridge" - var/icon_off = "smartfridge-off" var/allow_ai_retrieve = FALSE var/list/initial_contents @@ -40,10 +38,11 @@ update_icon() /obj/machinery/smartfridge/update_icon() + var/startstate = initial(icon_state) if(!stat) - icon_state = icon_on + icon_state = startstate else - icon_state = icon_off + icon_state = "[startstate]-off" @@ -208,12 +207,10 @@ name = "drying rack" desc = "A wooden contraption, used to dry plant products, food and leather." icon = 'icons/obj/hydroponics/equipment.dmi' - icon_state = "drying_rack_on" + icon_state = "drying_rack" use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 200 - icon_on = "drying_rack_on" - icon_off = "drying_rack" var/drying = FALSE /obj/machinery/smartfridge/drying_rack/Initialize() @@ -418,8 +415,6 @@ name = "disk compartmentalizer" desc = "A machine capable of storing a variety of disks. Denoted by most as the DSU (disk storage unit)." icon_state = "disktoaster" - icon_on = "disktoaster" - icon_off = "disktoaster-off" /obj/machinery/smartfridge/disks/accept_check(obj/item/O) if(istype(O, /obj/item/disk/)) diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index d4b552c5783..715ecc906a2 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -175,8 +175,6 @@ desc = "A heated storage unit." icon_state = "donkvendor" icon = 'icons/obj/lavaland/donkvendor.dmi' - icon_on = "donkvendor" - icon_off = "donkvendor" light_range = 5 light_power = 1.2 light_color = "#DDFFD3" @@ -185,6 +183,9 @@ flags_1 = NODECONSTRUCT_1 var/empty = FALSE +/obj/machinery/smartfridge/survival_pod/update_icon() + return + /obj/machinery/smartfridge/survival_pod/Initialize(mapload) . = ..() if(empty) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 0edec0f2c40..2c5d004054f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -235,8 +235,6 @@ Difficulty: Very Hard desc = "A completely indestructible chunk of crystal, rumoured to predate the start of this universe. It looks like you could store things inside it." icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "blackbox" - icon_on = "blackbox" - icon_off = "blackbox" light_range = 8 max_n_of_items = INFINITY resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi index 177a0dbf564383911f48146e2afd9354f5a2d102..82dce552a788cf01a08a6873125a163ebf7a64d1 100644 GIT binary patch delta 563 zcmV-30?hr^$N|&H0gxmCG?67Be+pGYDD57&tf*ET+E<7sctX55b~HAm>C^8a&_7#@ zC!ky$={KLpp3h_7ir>$FR|*j9MjqB^Dx^CZh_~rtHB)+h&s^yAYZ^JFAZLnjtuIzE11 zbgE90^#omX#t$;?=?^rEqt>CD#2w#rag+BPBSq`bO}P2ZnA`)Cn=`pbCileTesTAi zT@Y?XQf^67ZcS2dQPOx-f1Fi13N;#xFCcKxzJiuKI7G>4LUxaoYulQgr+61U(k*Zr z+>x#jw6A!01++)!c`#_C0Q&IRchd3U3#>X&@W&Ghr&U_;NY|+xmVI?9{Z?Nm0~+b_ zOg5k(FElzAyc2$SdSgxeMbM!0uHoDiEu!R+#%d@~^I(bKD<0|^e}b+7^6|%lG{9l< za;M`hV!b0&b)&&>&Zjg`+rU*n`*CmoAIE!z9MA?0m*s2-fswY(3&g^{MQJ8hS%Y0( z64Y@s7S@!C*j(NM)oj?BJS;vxc>;qXxiTJ&3y7WXl1C{DndAh!A;s{i!#7W`_BLSB zr$Cz-pVY|1_L_dPAo2Gub-qbupOM)(8)wO_cz#`q<;yDh2dmijE3DMYe6wT%@?o8& B60HCL delta 566 zcmV-60?GZ;$N|>K0gxmCH<2YEe;QT|P})6kSy8Pxw673N@Pv5l*wNUKrcb|zl>UwJ z1msI1{pR!7^LgxR@#o?1=1Hs{H^~9XDQm<^EPmZ2lU7MziIteol1YVXSNZTI z=^q$1PMsCei;qcUToO@QQm4!=r;%)K%_zK7TB95l(ti(!ER%^u4V_qtS$Z6wbgE90 z^#omX#&34JJ}0d9XzA6%Ta{LDvBJfB0KL8sIQ_x!3U) zvE37@y3t@b=TjP}ZQ!b3{J6Kj$4zZnGN+i@1{trAp5<%^fswY(3&g^{L}?~gS%Y0( z64Y@s7S@!C*j(NM)oj?BJS@H(Jb^)xTp5qX1;kEw$)gm7OftakNHKis@Wm5sy$zW3 zKG0^;L5)0Yuh|zHBY*8ur<>ILBXXY3(|MYGAIY_Ncv_3~<0knJWSjX!M_qU|vta`A EVKiDBMF0Q*