fixlater fixes

shiptest-ss13 · Jan 12, 2024 · 478d0db · 478d0db
1 parent 8a1d1be
commit 478d0db
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm
@@ -49,7 +49,7 @@ SUBSYSTEM_DEF(machines)
 		currentrun.len--
 		if(!QDELETED(thing) && thing.process(seconds) != PROCESS_KILL)
 			//if(thing.use_power)
-				//thing.auto_use_power() //add back the power state
+				//thing.auto_use_power() //add back the power state //need help deciding what to do here other than commenting this out. if still it it doubles a lot of idle machine draws.
 		else
 			processing -= thing
 			if (!QDELETED(thing))

diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm
@@ -5,8 +5,8 @@
 	Or you can just drop your plates on the floor, like civilized folk."
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "synthesizer"
-	idle_power_usage = 8 //5 with default parts FIXLATER
-	active_power_usage = 13 //10 with default parts
+	idle_power_usage = IDLE_DRAW_MINIMAL //lower
+	active_power_usage = ACTIVE_DRAW_MINIMAL //lower ingame because stockparts
 	density = FALSE
 	circuit = /obj/item/circuitboard/machine/dish_drive
 	pass_flags = PASSTABLE

diff --git 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"
+	idle_power_usage = IDLE_DRAW_MINIMAL
 	active_power_usage = ACTIVE_DRAW_MINIMAL
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	circuit = /obj/item/circuitboard/machine/coffeemaker
@@ -376,11 +377,12 @@
 	if(!silent)
 		playsound(src, 'sound/machines/coffeemaker_brew.ogg', 20, vary = TRUE)
 	toggle_steam()
-	use_power(active_power_usage * time * 0.1) // .1 needed here to convert time (in deciseconds) to seconds such that watts * seconds = joules //FIXLATER
+	set_active_power()
 	addtimer(CALLBACK(src, PROC_REF(stop_operating)), time / speed)
 
 /obj/machinery/coffeemaker/proc/stop_operating()
 	brewing = FALSE
+	set_idle_power()
 	toggle_steam()
 
 /obj/machinery/coffeemaker/proc/brew()

diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
@@ -219,7 +219,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/light_construct/small, 28)
 	max_integrity = 100
 	use_power = ACTIVE_POWER_USE
 	idle_power_usage = 0
-	active_power_usage = LIGHT_DRAW * 2 //seemingly unused? //FIXLATER
+	active_power_usage = LIGHT_DRAW * 2
 	power_channel = AREA_USAGE_LIGHT //Lights are calc'd via area so they dont need to be in the machine list
 	var/on = FALSE					// 1 if on, 0 if off
 	var/on_gs = FALSE