Resolves further merge conflicts

code/controllers/Processes/air.dm

@@ -101,8 +101,7 @@ var/global/datum/controller/process/air_system/air_master
 	for(var/turf/simulated/T in turfs_in)
 		T.CalculateAdjacentTurfs()
 		if(!T.blocks_air)
-			if(T.air.check_tile_graphic())
-				T.update_visuals(T.air)
+			T.update_visuals()
 			for(var/direction in cardinal)
 				if(!(T.atmos_adjacent_turfs & direction))
 					continue
@@ -124,6 +123,7 @@ var/global/datum/controller/process/air_system/air_master
 		EG.breakdown_cooldown ++
 		if(EG.breakdown_cooldown == 10)
 			EG.self_breakdown()
+			scheck()
 			return
 		if(EG.breakdown_cooldown > 20)
 			EG.dismantle()

code/controllers/Processes/alarm.dm

@@ -0,0 +1,6 @@
+/datum/controller/process/alarm/setup()
+	name = "alarm"
+	schedule_interval = 20 // every 2 seconds
+
+/datum/controller/process/alarm/doWork()
+	alarm_manager.fire()

code/controllers/Processes/event.dm

@@ -35,7 +35,7 @@ var/global/datum/controller/holiday/holiday_master //This has to be defined befo
 	var/MM = text2num(time2text(world.timeofday, "MM")) 	// get the current month
 	var/DD = text2num(time2text(world.timeofday, "DD")) 	// get the current day
 
-	for(var/H in typesof(/datum/holiday) - /datum/holiday)
+	for(var/H in subtypesof(/datum/holiday))
 		var/datum/holiday/holiday = new H()
 		if(holiday.shouldCelebrate(DD, MM, YY))
 			holiday.celebrate()

code/controllers/Processes/machinery.dm

@@ -1,3 +1,5 @@
+/var/global/machinery_sort_required = 0
+
 /datum/controller/process/machinery/setup()
 	name = "machinery"
 	schedule_interval = 20 // every 2 seconds
@@ -9,9 +11,16 @@
 	stat(null, "[powernets.len] powernets")
 
 /datum/controller/process/machinery/doWork()
+	process_sort()
 	process_power()
+	process_power_drain()
 	process_machines()
 
+/datum/controller/process/machinery/proc/process_sort()
+	if(machinery_sort_required)
+		machinery_sort_required = 0
+		machines = dd_sortedObjectList(machines)	
+	
 /datum/controller/process/machinery/proc/process_machines()
 	for(var/obj/machinery/M in machines)
 		if(M && isnull(M.gcDestroyed))
@@ -53,5 +62,12 @@
 			// Use src explicitly after a try/catch, or BYOND messes src up. I have no idea why.
 			src.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()