Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract

code/controllers/master.dm

@@ -149,7 +149,7 @@ var/global/datum/controller/master/Master = new()
 							// If we caused BYOND to miss a tick, stop processing for a bit...
 							if(startingtick < world.time || start_time + 1 < world.timeofday)
 								break
-							sleep(-1)
+							sleep(0)
 
 				cost = MC_AVERAGE(cost, world.timeofday - start_time)
 				if(ran_subsystems)

code/controllers/subsystem/shuttles/emergency.dm

@@ -1,3 +1,7 @@
+#define UNLAUNCHED 0
+#define ENDGAME_LAUNCHED 1
+#define EARLY_LAUNCHED 2
+
 /obj/docking_port/mobile/emergency
 	name = "emergency shuttle"
 	id = "emergency"
@@ -116,7 +120,8 @@
 			if(time_left <= 0 && !SSshuttle.emergencyNoEscape)
 				//move each escape pod to its corresponding transit dock
 				for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile)
-					if(M.z == ZLEVEL_STATION) //Will not launch from the mine/planet(for some reason)
+					if(M.launch_status == UNLAUNCHED) //Will not launch from the mine/planet
+						M.launch_status = ENDGAME_LAUNCHED
 						M.enterTransit()
 				//now move the actual emergency shuttle to its transit dock
 				for(var/area/shuttle/escape/E in world)
@@ -129,7 +134,8 @@
 			if(time_left <= 0)
 				//move each escape pod to its corresponding escape dock
 				for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile)
-					M.dock(SSshuttle.getDock("[M.id]_away"))
+					if(M.launch_status == ENDGAME_LAUNCHED)
+						M.dock(SSshuttle.getDock("[M.id]_away"))
 				//now move the actual emergency shuttle to centcomm
 				for(var/area/shuttle/escape/E in world)
 					E << 'sound/effects/hyperspace_end.ogg'
@@ -151,9 +157,11 @@
 	dwidth = 1
 	width = 3
 	height = 4
+	var/launch_status = UNLAUNCHED
 
 /obj/docking_port/mobile/pod/request()
-	if(security_level == SEC_LEVEL_RED || security_level == SEC_LEVEL_DELTA && z == ZLEVEL_STATION)
+	if((security_level == SEC_LEVEL_RED || security_level == SEC_LEVEL_DELTA) && launch_status == UNLAUNCHED)
+		launch_status = EARLY_LAUNCHED
 		return ..()
 
 /obj/docking_port/mobile/pod/New()
@@ -241,3 +249,9 @@
 
 /obj/item/weapon/storage/pod/attack_hand(mob/user)
 	return
+
+
+
+#undef UNLAUNCHED
+#undef LAUNCHED
+#undef EARLY_LAUNCHED

code/controllers/subsystem/shuttles/supply.dm

@@ -211,6 +211,7 @@
 	var/list/blacklist = list(
 		/mob/living,
 		/obj/effect/blob,
+		/obj/effect/rune,
 		/obj/effect/spider/spiderling,
 		/obj/item/weapon/disk/nuclear,
 		/obj/machinery/nuclearbomb,

code/controllers/subsystem/tgui.dm

@@ -9,19 +9,19 @@ var/datum/subsystem/tgui/SStgui
 	can_fire = 1 // This needs to fire before round start.
 
 	var/list/open_uis = list() // A list of open UIs, grouped by src_object and ui_key.
-	var/list/processing_uis = list() // A list of processing UIs, not grouped.
-	var/html // The HTML template used by new UIs; minus initial data.
+	var/list/processing_uis = list() // A list of processing UIs, ungrouped.
+	var/basehtml // The HTML base used for all UIs.
 
 
 /datum/subsystem/tgui/New()
-	html = file2text('tgui/tgui.html') // Read the HTML from disk.
+	basehtml = file2text('tgui/tgui.html') // Read the HTML from disk.
 
 	NEW_SS_GLOBAL(SStgui)
 
 /datum/subsystem/tgui/stat_entry()
-	..("O:[open_uis.len]|P:[processing_uis.len]") // Show how many interfaces we have open/are processing.
+	..("P:[processing_uis.len]")
 
-/datum/subsystem/tgui/fire() // Process UIs.
+/datum/subsystem/tgui/fire()
 	for(var/thing in processing_uis)
 		var/datum/tgui/ui = thing
 		if(ui && ui.user && ui.src_object)

code/controllers/subsystem/ticker.dm

@@ -485,5 +485,5 @@ var/datum/subsystem/ticker/ticker
 	//map rotate chance defaults to 75% of the length of the round (in minutes)
 	if (!prob((world.time/600)*config.maprotatechancedelta))
 		return
-	spawn(-1) //compiling a map can lock up the mc for 30 to 60 seconds if we don't spawn
+	spawn(0) //compiling a map can lock up the mc for 30 to 60 seconds if we don't spawn
 		maprotate()

code/controllers/subsystem/timer.dm

@@ -26,10 +26,13 @@ var/datum/subsystem/timer/SStimer
 		if (!event.thingToCall || qdeleted(event.thingToCall))
 			qdel(event)
 		if (event.timeToRun <= world.time)
-			spawn(-1)
-				call(event.thingToCall, event.procToCall)(arglist(event.argList))
+			runevent(event)
 			qdel(event)
 
+/datum/subsystem/timer/proc/runevent(datum/timedevent/event)
+	set waitfor = 0
+	call(event.thingToCall, event.procToCall)(arglist(event.argList))
+
 /datum/timedevent
 	var/thingToCall
 	var/procToCall