Merge remote-tracking branch 'citadel/master' into combat_patches_1

code/controllers/subsystem/acid.dm

@@ -1,37 +0,0 @@
-SUBSYSTEM_DEF(acid)
-	name = "Acid"
-	priority = FIRE_PRIORITY_ACID
-	flags = SS_NO_INIT|SS_BACKGROUND
-	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
-
-	var/list/currentrun = list()
-	var/list/processing = list()
-
-/datum/controller/subsystem/acid/stat_entry(msg)
-	msg = "P:[length(processing)]"
-	return ..()
-
-
-/datum/controller/subsystem/acid/fire(resumed = 0)
-	if (!resumed)
-		src.currentrun = processing.Copy()
-
-	//cache for sanic speed (lists are references anyways)
-	var/list/currentrun = src.currentrun
-
-	while (currentrun.len)
-		var/obj/O = currentrun[currentrun.len]
-		currentrun.len--
-		if (!O || QDELETED(O))
-			processing -= O
-			if (MC_TICK_CHECK)
-				return
-			continue
-
-		if(O.acid_level && O.acid_processing())
-		else
-			O.update_icon()
-			processing -= O
-
-		if (MC_TICK_CHECK)
-			return

code/controllers/subsystem/fluid.dm

@@ -1,5 +1,5 @@
 PROCESSING_SUBSYSTEM_DEF(fluids)
 	name = "Fluids"
-	wait = 20
+	wait = 10
 	stat_tag = "FD" //its actually Fluid Ducts
-	flags = SS_NO_INIT | SS_TICKER
+	flags = SS_NO_INIT

code/controllers/subsystem/nightshift.dm

@@ -42,6 +42,7 @@ SUBSYSTEM_DEF(nightshift)
 		update_nightshift(night_time, announcing)
 
 /datum/controller/subsystem/nightshift/proc/update_nightshift(active, announce = TRUE, max_level_override)
+	set waitfor = FALSE
 	nightshift_active = active
 	if(announce)
 		if (active)

code/controllers/subsystem/processing/processing.dm

@@ -47,5 +47,5 @@ SUBSYSTEM_DEF(processing)
  * If you override this do not call parent, as it will return PROCESS_KILL. This is done to prevent objects that dont override process() from staying in the processing list
  */
 /datum/proc/process(delta_time)
-	// SHOULD_NOT_SLEEP(TRUE)
+	SHOULD_NOT_SLEEP(TRUE)
 	return PROCESS_KILL