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/holodeck/area_copy.dm

@@ -110,7 +110,7 @@
 			if(V == "air")
 				var/turf/open/O1 = B
 				var/turf/open/O2 = T
-				O1.air.copy_from(O2.air)
+				O1.air.copy_from(O2.return_air())
 				continue
 			B.vars[V] = T.vars[V]
 		toupdate += B

code/modules/holodeck/computer.dm

@@ -64,25 +64,25 @@
 	..()
 
 /obj/machinery/computer/holodeck/Initialize(mapload)
-	..()
-	if(!mapload && ticker.current_state < GAME_STATE_PLAYING)
-		return
-	program_cache = list()
-	emag_programs = list()
-	for(var/typekey in subtypesof(program_type))
-		var/area/holodeck/A = locate(typekey)
-		if(!A || A == offline_program) continue
-		if(A.contents.len == 0) continue // not loaded
-		if(A.restricted)
-			emag_programs += A
-		else
-			program_cache += A
-		if(typekey == init_program)
-			load_program(A,force=1)
-	if(random_program && program_cache.len && init_program == null)
-		load_program(pick(program_cache),force=1)
-	else if(!program)
-		load_program(offline_program)
+	. = mapload	//late-initialize, area_copy need turfs to have air
+	if(!mapload)
+		..()
+		program_cache = list()
+		emag_programs = list()
+		for(var/typekey in subtypesof(program_type))
+			var/area/holodeck/A = locate(typekey)
+			if(!A || A == offline_program) continue
+			if(A.contents.len == 0) continue // not loaded
+			if(A.restricted)
+				emag_programs += A
+			else
+				program_cache += A
+			if(typekey == init_program)
+				load_program(A,force=1)
+		if(random_program && program_cache.len && init_program == null)
+			load_program(pick(program_cache),force=1)
+		else if(!program)
+			load_program(offline_program)
 
 /obj/machinery/computer/holodeck/power_change()
 	..()

code/modules/holodeck/turfs.dm

@@ -42,7 +42,7 @@
 	name = "asteroid"
 	icon_state = "asteroid0"
 
-/turf/open/floor/holofloor/asteroid/New()
+/turf/open/floor/holofloor/asteroid/Initialize()
 	icon_state = "asteroid[pick(0,1,2,3,4,5,6,7,8,9,10,11,12)]"
 	..()
 
@@ -50,7 +50,7 @@
 	name = "basalt"
 	icon_state = "basalt0"
 
-/turf/open/floor/holofloor/basalt/New()
+/turf/open/floor/holofloor/basalt/Initialize()
 	icon_state = "basalt[pick(0,1,2,3,4,5,6,7,8,9,10,11,12)]"
 	..()
 
@@ -59,7 +59,7 @@
 	icon = 'icons/turf/space.dmi'
 	icon_state = "0"
 
-/turf/open/floor/holofloor/space/New()
+/turf/open/floor/holofloor/space/Initialize()
 	icon_state = SPACE_ICON_STATE // so realistic
 	..()
 
@@ -68,11 +68,11 @@
 	icon = 'icons/turf/space.dmi'
 	icon_state = "speedspace_ns_1"
 
-/turf/open/floor/holofloor/hyperspace/New()
+/turf/open/floor/holofloor/hyperspace/Initialize()
 	icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]"
 	..()
 
-/turf/open/floor/holofloor/hyperspace/ns/New()
+/turf/open/floor/holofloor/hyperspace/ns/Initialize()
 	..()
 	icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]"
 
@@ -86,7 +86,7 @@
 	smooth = SMOOTH_TRUE
 	canSmoothWith = null
 
-/turf/open/floor/holofloor/carpet/New()
+/turf/open/floor/holofloor/carpet/Initialize()
 	..()
 	addtimer(CALLBACK(src, .proc/update_icon), 1)