Merge remote-tracking branch 'upstream/master' into diagonal-movement

code/modules/power/apc.dm

@@ -1173,14 +1173,14 @@
 				environ = autoset(environ, 1)
 				autoflag = 3
 				if(report_power_alarm)
-					power_alarm.clearAlarm(loc, src)
+					SSalarms.power_alarm.clearAlarm(loc, src)
 		else if(cell.charge < 1250 && cell.charge > 750 && longtermpower < 0)                       // <30%, turn off equipment
 			if(autoflag != 2)
 				equipment = autoset(equipment, 2)
 				lighting = autoset(lighting, 1)
 				environ = autoset(environ, 1)
 				if(report_power_alarm)
-					power_alarm.triggerAlarm(loc, src)
+					SSalarms.power_alarm.triggerAlarm(loc, src)
 				autoflag = 2
 		else if(cell.charge < 750 && cell.charge > 10)        // <15%, turn off lighting & equipment
 			if((autoflag > 1 && longtermpower < 0) || (autoflag > 1 && longtermpower >= 0))
@@ -1188,7 +1188,7 @@
 				lighting = autoset(lighting, 2)
 				environ = autoset(environ, 1)
 				if(report_power_alarm)
-					power_alarm.triggerAlarm(loc, src)
+					SSalarms.power_alarm.triggerAlarm(loc, src)
 				autoflag = 1
 		else if(cell.charge <= 0)                                   // zero charge, turn all off
 			if(autoflag != 0)
@@ -1196,7 +1196,7 @@
 				lighting = autoset(lighting, 0)
 				environ = autoset(environ, 0)
 				if(report_power_alarm)
-					power_alarm.triggerAlarm(loc, src)
+					SSalarms.power_alarm.triggerAlarm(loc, src)
 				autoflag = 0
 
 		// now trickle-charge the cell
@@ -1254,7 +1254,7 @@
 		lighting = autoset(lighting, 0)
 		environ = autoset(environ, 0)
 		if(report_power_alarm)
-			power_alarm.triggerAlarm(loc, src)
+			SSalarms.power_alarm.triggerAlarm(loc, src)
 		autoflag = 0
 
 	// update icon & area power if anything changed
@@ -1353,6 +1353,11 @@
 					L.broken(0, 1)
 					stoplag()
 
+/obj/machinery/power/apc/proc/null_charge()
+	for(var/obj/machinery/light/L in area)
+		L.broken(0, 1)
+		stoplag()
+
 /obj/machinery/power/apc/proc/setsubsystem(val)
 	if(cell && cell.charge > 0)
 		return (val==1) ? 0 : val

code/modules/power/cell.dm

@@ -21,23 +21,23 @@
 
 /obj/item/stock_parts/cell/New()
 	..()
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 	charge = maxcharge
 	if(ratingdesc)
 		desc += " This one has a power rating of [DisplayPower(maxcharge)], and you should not swallow it."
 	update_icon()
 
 /obj/item/stock_parts/cell/Destroy()
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	return ..()
 
 /obj/item/stock_parts/cell/vv_edit_var(var_name, var_value)
 	switch(var_name)
 		if("self_recharge")
 			if(var_value)
-				processing_objects.Add(src)
+				START_PROCESSING(SSobj, src)
 			else
-				processing_objects.Remove(src)
+				STOP_PROCESSING(SSobj, src)
 	. = ..()
 
 /obj/item/stock_parts/cell/process()

code/modules/power/singularity/singularity.dm

@@ -35,7 +35,7 @@
 
 	src.energy = starting_energy
 	..()
-	processing_objects.Add(src)
+	START_PROCESSING(SSobj, src)
 	GLOB.poi_list |= src
 	GLOB.singularities += src
 	for(var/obj/machinery/power/singularity_beacon/singubeacon in GLOB.machines)
@@ -44,7 +44,7 @@
 			break
 
 /obj/singularity/Destroy()
-	processing_objects.Remove(src)
+	STOP_PROCESSING(SSobj, src)
 	GLOB.poi_list.Remove(src)
 	GLOB.singularities -= src
 	target = null

code/modules/power/smes.dm

@@ -13,7 +13,6 @@
 	icon_state = "smes"
 	density = 1
 	anchored = 1
-	defer_process = 1
 
 	var/capacity = 5e6 // maximum charge
 	var/charge = 0 // actual charge