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/controllers/subsystem/air.dm

@@ -39,28 +39,34 @@ var/datum/subsystem/air/SSair
 	var/list/currentrun = list()
 	var/currentpart = SSAIR_PIPENETS
 
+	var/map_loading = TRUE
+	var/list/queued_for_activation
 
 /datum/subsystem/air/New()
 	NEW_SS_GLOBAL(SSair)
 
 /datum/subsystem/air/stat_entry(msg)
 	msg += "C:{"
-	msg += "AT:[round(cost_turfs)]|"
-	msg += "EG:[round(cost_groups)]|"
-	msg += "HP:[round(cost_highpressure)]|"
-	msg += "HS:[round(cost_hotspots)]|"
-	msg += "SC:[round(cost_superconductivity)]|"
-	msg += "PN:[round(cost_pipenets)]|"
-	msg += "AM:[round(cost_atmos_machinery)]"
+	msg += "AT:[round(cost_turfs,1)]|"
+	msg += "EG:[round(cost_groups,1)]|"
+	msg += "HP:[round(cost_highpressure,1)]|"
+	msg += "HS:[round(cost_hotspots,1)]|"
+	msg += "SC:[round(cost_superconductivity,1)]|"
+	msg += "PN:[round(cost_pipenets,1)]|"
+	msg += "AM:[round(cost_atmos_machinery,1)]"
 	msg += "} "
-	msg +=  "AT:[active_turfs.len]|"
-	msg +=  "EG:[excited_groups.len]|"
-	msg +=  "HS:[hotspots.len]|"
-	msg +=  "AS:[active_super_conductivity.len]"
+	msg += "AT:[active_turfs.len]|"
+	msg += "EG:[excited_groups.len]|"
+	msg += "HS:[hotspots.len]|"
+	msg += "PN:[networks.len]|"
+	msg += "HP:[high_pressure_delta.len]|"
+	msg += "AS:[active_super_conductivity.len]|"
+	msg += "AT/MS:[round((cost ? active_turfs.len/cost : 0),0.1)]"
 	..(msg)
 
 
 /datum/subsystem/air/Initialize(timeofday)
+	map_loading = FALSE
 	setup_allturfs()
 	setup_atmos_machinery()
 	setup_pipenets()
@@ -244,7 +250,6 @@ var/datum/subsystem/air/SSair
 		if(T.excited_group)
 			T.excited_group.garbage_collect()
 
-
 /datum/subsystem/air/proc/add_to_active(turf/open/T, blockchanges = 1)
 	if(istype(T) && T.air)
 		T.excited = 1
@@ -253,10 +258,25 @@ var/datum/subsystem/air/SSair
 			currentrun |= T
 		if(blockchanges && T.excited_group)
 			T.excited_group.garbage_collect()
-	else
+	else if(T.initialized)
 		for(var/turf/S in T.atmos_adjacent_turfs)
 			add_to_active(S)
+	else if(map_loading)
+		if(queued_for_activation)
+			queued_for_activation[T] = T
+		return
+	else
+		T.requires_activation = TRUE
 
+/datum/subsystem/air/proc/begin_map_load()
+	LAZYINITLIST(queued_for_activation)
+	map_loading = TRUE
+
+/datum/subsystem/air/proc/end_map_load()
+	map_loading = FALSE
+	for(var/T in queued_for_activation)
+		add_to_active(T)
+	queued_for_activation.Cut()
 
 /datum/subsystem/air/proc/setup_allturfs()
 	var/list/turfs_to_init = block(locate(1, 1, 1), locate(world.maxx, world.maxy, world.maxz))

code/controllers/subsystem/processing/objects.dm

@@ -27,26 +27,52 @@ var/datum/subsystem/objects/SSobj
 /datum/subsystem/objects/proc/InitializeAtoms(list/objects = null)
 	if(initialized == INITIALIZATION_INSSOBJ)
 		return
+
+	var/list/late_loaders
+
 	initialized = INITIALIZATION_INNEW_MAPLOAD
+
 	if(objects)
 		for(var/I in objects)
 			var/atom/A = I
 			if(!A.initialized)	//this check is to make sure we don't call it twice on an object that was created in a previous Initialize call
 				var/start_tick = world.time
-				A.Initialize(TRUE)
+				if(A.Initialize(TRUE))
+					LAZYADD(late_loaders, A)
 				if(start_tick != world.time)
 					WARNING("[A]: [A.type] slept during it's Initialize!")
 				CHECK_TICK
+		testing("Initialized [objects.len] atoms")
 	else
+		#ifdef TESTING
+		var/count = 0
+		#endif
 		for(var/atom/A in world)
 			if(!A.initialized)	//this check is to make sure we don't call it twice on an object that was created in a previous Initialize call
 				var/start_tick = world.time
-				A.Initialize(TRUE)
+				if(A.Initialize(TRUE))
+					LAZYADD(late_loaders, A)
+				#ifdef TESTING
+				else
+					++count
+				#endif TESTING
 				if(start_tick != world.time)
 					WARNING("[A]: [A.type] slept during it's Initialize!")
 				CHECK_TICK
+		testing("Roundstart initialized [count] atoms")
+
 	initialized = INITIALIZATION_INNEW_REGULAR
 
+	if(late_loaders)
+		for(var/I in late_loaders)
+			var/atom/A = I
+			var/start_tick = world.time
+			A.Initialize(FALSE)
+			if(start_tick != world.time)
+				WARNING("[A]: [A.type] slept during it's Initialize!")
+			CHECK_TICK
+		testing("Late-initialized [late_loaders.len] atoms")
+
 /datum/subsystem/objects/proc/map_loader_begin()
 	old_initialized = initialized
 	initialized = INITIALIZATION_INSSOBJ

code/controllers/subsystem/throwing.dm

@@ -66,11 +66,11 @@ var/datum/subsystem/throwing/SSthrowing
 /datum/thrownthing/proc/tick()
 	var/atom/movable/AM = thrownthing
 	if (!isturf(AM.loc) || !AM.throwing)
-		finialize()
+		finalize()
 		return
 
 	if (dist_travelled && hitcheck()) //to catch sneaky things moving on our tile while we slept
-		finialize()
+		finalize()
 		return
 
 	var/atom/step
@@ -79,7 +79,7 @@ var/datum/subsystem/throwing/SSthrowing
 	var/tilestomove = round(min(((((world.time+world.tick_lag) - start_time) * speed) - (dist_travelled ? dist_travelled : -1)), speed*MAX_TICKS_TO_MAKE_UP) * (world.tick_lag * SSthrowing.wait))
 	while (tilestomove-- > 0)
 		if ((dist_travelled >= maxrange || AM.loc == target_turf) && AM.has_gravity(AM.loc))
-			finialize()
+			finalize()
 			return
 
 		if (dist_travelled <= max(dist_x, dist_y)) //if we haven't reached the target yet we home in on it, otherwise we use the initial direction
@@ -93,47 +93,52 @@ var/datum/subsystem/throwing/SSthrowing
 			diagonal_error += (diagonal_error < 0) ? dist_x/2 : -dist_y
 
 		if (!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
-			finialize()
+			finalize()
 			return
 
 		AM.Move(step, get_dir(AM, step))
 
 		if (!AM.throwing) // we hit something during our move
-			finialize(hit = TRUE)
+			finalize(hit = TRUE)
 			return
 
 		dist_travelled++
 
 		if (dist_travelled > MAX_THROWING_DIST)
-			finialize()
+			finalize()
 			return
 
-/datum/thrownthing/proc/finialize(hit = FALSE)
+/datum/thrownthing/proc/finalize(hit = FALSE)
 	set waitfor = 0
 	SSthrowing.processing -= thrownthing
 	//done throwing, either because it hit something or it finished moving
-	thrownthing.throwing = 0
+	thrownthing.throwing = null
 	if (!hit)
 		for (var/thing in get_turf(thrownthing)) //looking for our target on the turf we land on.
 			var/atom/A = thing
 			if (A == target)
 				hit = 1
-				thrownthing.throw_impact(A)
+				thrownthing.throw_impact(A, src)
 				break
 		if (!hit)
-			thrownthing.throw_impact(get_turf(thrownthing))  // we haven't hit something yet and we still must, let's hit the ground.
+			thrownthing.throw_impact(get_turf(thrownthing), src)  // we haven't hit something yet and we still must, let's hit the ground.
 			thrownthing.newtonian_move(init_dir)
 	else
 		thrownthing.newtonian_move(init_dir)
 	if (callback)
 		callback.Invoke()
 
+/datum/thrownthing/proc/hit_atom(atom/A)
+	thrownthing.throw_impact(A, src)
+	thrownthing.newtonian_move(init_dir)
+	finalize(TRUE)
+
 /datum/thrownthing/proc/hitcheck()
 	for (var/thing in get_turf(thrownthing))
 		var/atom/movable/AM = thing
 		if (AM == thrownthing)
 			continue
 		if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags & ON_BORDER))
-			thrownthing.throwing = 0
-			thrownthing.throw_impact(AM)
-			return 1
+			thrownthing.throwing = null
+			thrownthing.throw_impact(AM, src)
+			return TRUE