From ebb7f54f0f130d02233a6cc7b607ee67e64febb4 Mon Sep 17 00:00:00 2001 From: Aligotess13 <89031914+Aligotess13@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:06:23 -0400 Subject: [PATCH] Makes Drying Rack Operational without Power. (#22620) * Makes Drying Racks operational without power. * Removes power requirments for drying rack * Removes power requirments for drying rack * Can this work * requires_power = FALSE * Update code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * References to power removed * Removes drying rack off * Removes Drying Rack Off --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- .../kitchen_machinery/smartfridge.dm | 17 +---------------- icons/obj/hydroponics/equipment.dmi | Bin 24375 -> 24286 bytes 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index c41d71f9bcd..55aafcf89cd 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -809,8 +809,7 @@ desc = "A wooden contraption, used to dry plant products, food and leather." icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "drying_rack" - idle_power_consumption = 5 - active_power_consumption = 200 + requires_power = FALSE can_dry = TRUE visible_contents = FALSE light_range_on = null @@ -836,14 +835,6 @@ /obj/machinery/smartfridge/drying_rack/RefreshParts() return -/obj/machinery/smartfridge/drying_rack/power_change() - if(has_power() && anchored) - stat &= ~NOPOWER - else - stat |= NOPOWER - toggle_drying(TRUE) - update_icon(UPDATE_OVERLAYS) - /obj/machinery/smartfridge/drying_rack/screwdriver_act(mob/living/user, obj/item/I) return @@ -866,13 +857,9 @@ switch(action) if("drying") drying = !drying - change_power_mode(drying ? ACTIVE_POWER_USE : IDLE_POWER_USE) update_icon(UPDATE_OVERLAYS) /obj/machinery/smartfridge/drying_rack/update_overlays() - if(stat & NOPOWER) - . += "drying_rack_off" - return if(drying) . += "drying_rack_drying" if(length(contents)) @@ -900,10 +887,8 @@ /obj/machinery/smartfridge/drying_rack/proc/toggle_drying(forceoff) if(drying || forceoff) drying = FALSE - change_power_mode(IDLE_POWER_USE) else drying = TRUE - change_power_mode(ACTIVE_POWER_USE) update_icon(UPDATE_OVERLAYS) /** diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi index 96e49013d53f3bc40b7d1827d058dc61e0d74d30..306e62de5f8582ce6eedb418f710b6afaddfb76e 100644 GIT binary patch delta 3253 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 delta 3340 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