diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm index 04055a745b7b..4abc32082e11 100644 --- a/code/__DEFINES/power.dm +++ b/code/__DEFINES/power.dm @@ -13,8 +13,7 @@ #define TESLA_DEFAULT_POWER 1738260 #define TESLA_MINI_POWER 869130 -#define LIGHT_DRAW 5 // mulitplied by brightness, which is 4-8 - +#define LIGHT_DRAW 5 // mulitplied by brightness, typically 4-8 #define IDLE_DRAW_MINIMAL 50 // 20x = 1kw, used for small things and computers on stand-by #define IDLE_DRAW_LOW 200 //5x = 1kw, used for always-active computers diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index e86d4ae9f0f9..9d6f15be3719 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -403,6 +403,7 @@ uv = TRUE locked = TRUE update_appearance() + use_power(100) if(occupant) if(uv_super) mob_occupant.adjustFireLoss(rand(20, 36)) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index eb10d429dbb2..1b6df20c721e 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -83,7 +83,7 @@ var/temperature_delta= abs(old_temperature - air_contents.return_temperature()) if(temperature_delta > 1) - active_power_usage = (heat_capacity * temperature_delta) / 10 + idle_power_usage //FIXLATER + active_power_usage = (heat_capacity * temperature_delta) / 10 + idle_power_usage update_parents() else active_power_usage = idle_power_usage diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 07b8bf137ca3..332d74bc6bbd 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -113,7 +113,7 @@ name = "huge air scrubber" icon_state = "scrubber:0" anchored = TRUE - idle_power_usage = ACTIVE_DRAW_MINIMAL + idle_power_usage = IDLE_DRAW_MINIMAL active_power_usage = ACTIVE_DRAW_MEDIUM overpressure_m = 200 diff --git a/code/modules/food_and_drinks/kitchen_machinery/coffeemaker.dm b/code/modules/food_and_drinks/kitchen_machinery/coffeemaker.dm index 18a0a46617b1..a0f4d57bf0a0 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/coffeemaker.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/coffeemaker.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/machines/coffeemaker.dmi' icon_state = "coffeemaker_nopot_nocart" base_icon_state = "coffeemaker" + active_power_usage = ACTIVE_DRAW_MINIMAL resistance_flags = FIRE_PROOF | ACID_PROOF circuit = /obj/item/circuitboard/machine/coffeemaker var/obj/item/reagent_containers/food/drinks/bottle/coffeepot/coffeepot = null diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index e5708ae0593b..39a4bc527a59 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -325,7 +325,7 @@ and clear when youre done! if you dont i will use :newspaper2: on you for(var/_effect in effects) var/obj/effect/holodeck_effect/holo_effect = _effect holo_effect.tick() - active_power_usage = 50 + spawned.len * 3 + effects.len * 5 //FIXLATER + active_power_usage = 50 + spawned.len * 3 + effects.len * 5 /obj/machinery/computer/holodeck/proc/toggle_power(toggleOn = FALSE) if(active == toggleOn) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 3e770805b8b1..7063207255f5 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -6,7 +6,7 @@ pixel_z = 1 obj_flags = CAN_BE_HIT | UNIQUE_RENAME circuit = /obj/item/circuitboard/machine/hydroponics - idle_power_usage = 0 //FIXLATER + idle_power_usage = 0 var/waterlevel = 100 //The amount of water in the tray (max 100) var/maxwater = 100 //The maximum amount of water in the tray var/nutridrain = 1 // How many units of nutrient will be drained in the tray diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index fd36a4bb4ab1..ea44ee9afb31 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -7,6 +7,8 @@ icon = 'icons/obj/machines/orm.dmi' // WS Edit - Directional ORM Sprites icon_state = "ore_redemption" density = TRUE + use_power = IDLE_POWER_USE + idle_power_usage = IDLE_DRAW_MEDIUM input_dir = NORTH output_dir = SOUTH layer = BELOW_OBJ_LAYER diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index caf9b6afa757..2be791e86dec 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -47,6 +47,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_state = "generic" layer = BELOW_OBJ_LAYER density = TRUE + use_power = IDLE_POWER_USE + idle_power_usage = IDLE_DRAW_MINIMAL verb_say = "beeps" verb_ask = "beeps" verb_exclaim = "beeps"