Tg 2 11 sync (#215)

* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes

code/modules/recycling/disposal-unit.dm

@@ -62,16 +62,17 @@
 		deconstruct()
 
 /obj/machinery/disposal/Initialize(mapload)
-	..()
-	if(!mapload)
-		return
-	//this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
-	var/atom/L = loc
-	var/datum/gas_mixture/env = new
-	env.copy_from(L.return_air())
-	var/datum/gas_mixture/removed = env.remove(SEND_PRESSURE + 1)
-	air_contents.merge(removed)
-	trunk_check()
+	. = mapload	//late-initialize, we need turfs to have air
+	if(initialized)	//will only be run on late mapload initialization
+		//this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
+		var/atom/L = loc
+		var/datum/gas_mixture/env = new
+		env.copy_from(L.return_air())
+		var/datum/gas_mixture/removed = env.remove(SEND_PRESSURE + 1)
+		air_contents.merge(removed)
+		trunk_check()
+	else
+		..()
 
 /obj/machinery/disposal/attackby(obj/item/I, mob/user, params)
 	add_fingerprint(user)