Merge pull request #8480 from AstatorDem/processingTheProcess

Added a check to process() to recognize machines that use auto_use_power

code/game/machinery/ai_slipper.dm

@@ -4,6 +4,8 @@
 	icon_state = "motion0"
 	layer = 3
 	anchored = 1.0
+	use_power = 1
+	idle_power_usage = 10
 	var/uses = 20
 	var/disabled = 1
 	var/lethal = 0
@@ -13,6 +15,7 @@
 	var/cooldown_on = 0
 	req_access = list(access_ai_upload)
 
+
 /obj/machinery/ai_slipper/New()
 	..()
 	update_icon()

code/game/machinery/autolathe.dm

@@ -6,7 +6,7 @@
 	anchored = 1
 	use_power = 1
 	idle_power_usage = 10
-	active_power_usage = 100
+	active_power_usage = 2000
 
 	var/list/machine_recipes
 	var/list/stored_material =  list("metal" = 0, "glass" = 0)
@@ -23,6 +23,7 @@
 
 	var/datum/wires/autolathe/wires = null
 
+
 /obj/machinery/autolathe/New()
 
 	..()
@@ -233,8 +234,7 @@
 			return
 
 		busy = 1
-		//This needs some work.
-		use_power(max(2000, (making.power_use*multiplier)))
+		update_use_power(2)
 
 		//Check if we still have the materials.
 		for(var/material in making.resources)
@@ -253,6 +253,7 @@
 		sleep(build_time)
 
 		busy = 0
+		update_use_power(1)
 
 		//Sanity check.
 		if(!making || !src) return

code/game/machinery/biogenerator.dm

@@ -14,6 +14,7 @@
 	var/build_eff = 1
 	var/eat_eff = 1
 
+
 /obj/machinery/biogenerator/New()
 	..()
 	var/datum/reagents/R = new/datum/reagents(1000)

code/game/machinery/bioprinter.dm

@@ -7,6 +7,8 @@
 
 	anchored = 1
 	density = 1
+	use_power = 1
+	idle_power_usage = 40
 
 	icon_state = "bioprinter"
 

code/game/machinery/buttons.dm

@@ -10,6 +10,7 @@
 	idle_power_usage = 2
 	active_power_usage = 4
 
+
 /obj/machinery/button/attack_ai(mob/user as mob)
 	return src.attack_hand(user)
 

code/game/machinery/door_control.dm

@@ -34,6 +34,7 @@
 	idle_power_usage = 2
 	active_power_usage = 4
 
+
 /obj/machinery/door_control/attack_ai(mob/user as mob)
 	if(wires & 2)
 		return src.attack_hand(user)

code/game/machinery/doppler_array.dm

@@ -13,9 +13,6 @@ var/list/doppler_arrays = list()
 	doppler_arrays -= src
 	..()
 
-/obj/machinery/doppler_array/process()
-	return PROCESS_KILL
-
 /obj/machinery/doppler_array/proc/sense_explosion(var/x0,var/y0,var/z0,var/devastation_range,var/heavy_impact_range,var/light_impact_range,var/took)
 	if(stat & NOPOWER)	return
 	if(z != z0)			return

code/game/machinery/flasher.dm

@@ -12,6 +12,8 @@
 	var/strength = 10 //How weakened targets are when flashed.
 	var/base_state = "mflash"
 	anchored = 1
+	use_power = 1
+	idle_power_usage = 2
 
 /obj/machinery/flasher/portable //Portable version of the flasher. Only flashes when anchored
 	name = "portable flasher"
@@ -133,7 +135,7 @@
 	active = 1
 	icon_state = "launcheract"
 
-	for(var/obj/machinery/flasher/M in world)
+	for(var/obj/machinery/flasher/M in machines)
 		if(M.id == src.id)
 			spawn()
 				M.flash()

code/game/machinery/holosign.dm

@@ -5,7 +5,9 @@
 	icon = 'icons/obj/holosign.dmi'
 	icon_state = "sign_off"
 	layer = 4
+	use_power = 1
 	idle_power_usage = 2
+	active_power_usage = 4
 	var/lit = 0
 	var/id = null
 	var/on_icon = "sign_on"
@@ -14,12 +16,9 @@
 	if (stat & (BROKEN|NOPOWER))
 		return
 	lit = !lit
-	use_power = lit ? 1 : 0
+	use_power = lit ? 2 : 1
 	update_icon()
 
-/obj/machinery/holosign/process()
-	return
-
 /obj/machinery/holosign/update_icon()
 	if (!lit)
 		icon_state = "sign_off"

code/game/machinery/igniter.dm

@@ -53,6 +53,10 @@
 	var/last_spark = 0
 	var/base_state = "migniter"
 	anchored = 1
+	use_power = 1
+	idle_power_usage = 2
+	active_power_usage = 4
+
 
 /obj/machinery/sparker/New()
 	..()
@@ -129,12 +133,12 @@
 	active = 1
 	icon_state = "launcheract"
 
-	for(var/obj/machinery/sparker/M in world)
+	for(var/obj/machinery/sparker/M in machines)
 		if (M.id == src.id)
 			spawn( 0 )
 				M.ignite()
 
-	for(var/obj/machinery/igniter/M in world)
+	for(var/obj/machinery/igniter/M in machines)
 		if(M.id == src.id)
 			use_power(50)
 			M.on = !( M.on )

code/game/machinery/jukebox.dm

@@ -16,6 +16,9 @@ datum/track/New(var/title_name, var/audio)
 	anchored = 1
 	density = 1
 	power_channel = EQUIP
+	use_power = 1
+	idle_power_usage = 10
+	active_power_usage = 100
 
 	var/playing = 0
 
@@ -32,6 +35,7 @@ datum/track/New(var/title_name, var/audio)
 		new/datum/track("Trai`Tor", 'sound/music/traitor.ogg'),
 	)
 
+
 /obj/machinery/media/jukebox/Del()
 	StopPlaying()
 	..()
@@ -189,6 +193,7 @@ datum/track/New(var/title_name, var/audio)
 
 	A.forced_ambience = null
 	playing = 0
+	update_use_power(1)
 	update_icon()
 
 
@@ -205,4 +210,5 @@ datum/track/New(var/title_name, var/audio)
 			A.play_ambience(M)
 
 	playing = 1
+	update_use_power(2)
 	update_icon()

code/game/machinery/machinery.dm

@@ -126,7 +126,10 @@ Class Procs:
 	..()
 
 /obj/machinery/process()//If you dont use process or power why are you here
-	return PROCESS_KILL
+	if(!(use_power || idle_power_usage || active_power_usage))
+		return PROCESS_KILL
+
+	return
 
 /obj/machinery/emp_act(severity)
 	if(use_power && stat == 0)

code/game/machinery/mass_driver.dm

@@ -39,7 +39,4 @@
 	if(stat & (BROKEN|NOPOWER))
 		return
 	drive()
-	..(severity)
-
-/obj/machinery/mass_driver/process()
-	return
+	..(severity)

code/game/machinery/teleporter.dm

@@ -86,7 +86,7 @@
 
 /obj/machinery/computer/teleporter/attack_hand(user as mob)
 	if(..()) return
-	
+
 	/* Ghosts can't use this one because it's a direct selection */
 	if(istype(user, /mob/dead/observer)) return
 
@@ -175,6 +175,7 @@
 	active_power_usage = 2000
 	var/obj/machinery/computer/teleporter/com
 
+
 /obj/machinery/teleport/hub/New()
 	..()
 	underlays.Cut()
@@ -335,6 +336,8 @@
 	if (com)
 		com.icon_state = "tele1"
 		use_power(5000)
+		update_use_power(2)
+		com.update_use_power(2)
 		for(var/mob/O in hearers(src, null))
 			O.show_message("\blue Teleporter engaged!", 2)
 	src.add_fingerprint(usr)
@@ -348,6 +351,8 @@
 	if (com)
 		com.icon_state = "tele0"
 		com.accurate = 0
+		com.update_use_power(1)
+		update_use_power(1)
 		for(var/mob/O in hearers(src, null))
 			O.show_message("\blue Teleporter disengaged!", 2)
 	src.add_fingerprint(usr)