TGS Test Merge (#6133)

code/controllers/subsystem/mapping/_mapping.dm

@@ -18,6 +18,10 @@ SUBSYSTEM_DEF(mapping)
 	// this is an acceptable lazy lookup but we need to standardize what this means / look at how this is generated.
 	var/list/areas_in_z = list()
 
+	//! if you are seeing this, someone merged a testmerge only PR. shame on them.
+	/// reservation to avoid 515 bug
+	var/datum/turf_reservation/awful_515_hack
+
 /datum/controller/subsystem/mapping/Initialize(timeofday)
 	// load data
 	// todo: refactor
@@ -46,6 +50,10 @@ SUBSYSTEM_DEF(mapping)
 	// todo: refactor
 	repopulate_sorted_areas()
 
+	//! if you are seeing this, someone merged a testmerge only PR. shame on them.
+	/// allocate a reservation to avoid a 515 bug
+	awful_515_hack = request_block_reservation(1, 1)
+
 	return ..()
 
 //

code/modules/mob/new_player/login.dm

@@ -12,7 +12,15 @@
 		mind.active = 1
 		mind.current = src
 
-	loc = null
+	//! if you are seeing this, someone merged a testmerge only PR. shame on them.
+	if(!isnull(SSmapping.awful_515_hack))
+		var/datum/turf_reservation/awful_ass_hack = SSmapping.awful_515_hack
+		var/list/target_coords = awful_ass_hack.bottom_left_coords
+		if(length(target_coords) == 3)
+			loc = locate(target_coords[1], target_coords[2], target_coords[3])
+	else
+		loc = null
+
 	GLOB.player_list |= src
 
 	new_player_panel()