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/modules/assembly/doorcontrol.dm

@@ -76,7 +76,6 @@
 		if (M.id == src.id)
 			spawn( 0 )
 				M.open()
-				return
 
 	sleep(10)
 
@@ -90,7 +89,6 @@
 		if (M.id == src.id)
 			spawn( 0 )
 				M.close()
-				return
 
 	sleep(10)
 	cooldown = 0

code/modules/assembly/health.dm

@@ -74,7 +74,7 @@
 	if(!secured)
 		user.show_message("<span class='warning'>The [name] is unsecured!</span>")
 		return 0
-	var/dat = text("<TT><B>Health Sensor</B> <A href='?src=\ref[src];scanning=1'>[scanning?"On":"Off"]</A>")
+	var/dat = "<TT><B>Health Sensor</B> <A href='?src=\ref[src];scanning=1'>[scanning?"On":"Off"]</A>"
 	if(scanning && health_scan)
 		dat += "<BR>Health: [health_scan]"
 	user << browse(dat, "window=hscan")

code/modules/assembly/proximity.dm

@@ -56,7 +56,6 @@
 	cooldown = 2
 	spawn(10)
 		process_cooldown()
-	return
 
 
 /obj/item/device/assembly/prox_sensor/process()
@@ -71,15 +70,13 @@
 /obj/item/device/assembly/prox_sensor/dropped()
 	spawn(0)
 		sense()
-		return
-	return
 
 
 /obj/item/device/assembly/prox_sensor/toggle_scan()
 	if(!secured)	return 0
 	scanning = !scanning
 	update_icon()
-	return
+
 
 
 /obj/item/device/assembly/prox_sensor/update_icon()

code/modules/assembly/signaler.dm

@@ -17,7 +17,7 @@
 	..()
 	spawn(40)
 		set_frequency(frequency)
-	return
+
 
 /obj/item/device/assembly/signaler/Destroy()
 	if(SSradio)