Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms

Conflicts:
	_maps/map_files/RandomZLevels/moonoutpost19.dmm
	_maps/map_files/cyberiad/cyberiad.dmm
	code/controllers/master_controller.dm
	code/game/machinery/alarm.dm
	code/modules/power/apc.dm

code/controllers/Processes/machinery.dm

@@ -7,6 +7,7 @@
 /datum/controller/process/machinery/doWork()
 	process_sort()
 	process_power()
+	process_power_drain()
 	process_machines()
 
 /datum/controller/process/machinery/proc/process_sort()
@@ -48,5 +49,12 @@
 			powerNetwork.reset()
 			scheck()
 			continue
-		else
-			powernets -= powerNetwork
+			
+		powernets.Remove(powerNetwork)
+		
+/datum/controller/process/machinery/proc/process_power_drain()
+	// Currently only used by powersinks. These items get priority processed before machinery
+	for(var/obj/item/I in processing_power_items)
+		if(!I.pwr_drain()) // 0 = Process Kill, remove from processing list.
+			processing_power_items.Remove(I)
+		scheck()