Fixes maploading so that the cyberiad and space hotel load cleanly again

code/modules/awaymissions/map_rng.dm

@@ -20,7 +20,7 @@
 		template = map_templates[template_name]
 
 /obj/effect/landmark/map_loader/Initialize()
-	..()
+	. = ..()
 	if(template)
 		load(template)
 

code/modules/awaymissions/maploader/reader.dm

@@ -57,8 +57,6 @@ var/global/dmm_suite/preloader/_preloader = new
 	var/list/grid_models = list()
 	var/key_len = 0
 
-
-
 	var/dmm_suite/loaded_map/LM = new
 	// This try-catch is used as a budget "Finally" clause, as the dirt count
 	// needs to be reset
@@ -128,7 +126,6 @@ var/global/dmm_suite/preloader/_preloader = new
 					bounds[MAP_MAXY] = max(bounds[MAP_MAXY], min(ycrd, world.maxy))
 
 				var/maxx = xcrdStart
-				log_debug("[xcrdStart]")
 				if(measureOnly)
 					for(var/line in gridLines)
 						maxx = max(maxx, xcrdStart + length(line) / key_len - 1)

code/modules/awaymissions/mission_code/spacehotel_npcs.dm

@@ -4,7 +4,7 @@
 	chattyness = SNPC_CHANCE_TALK / 4
 
 /mob/living/carbon/human/interactive/away/hotel/Initialize(mapload)
-	..(loc, /datum/species/skrell)
+	. = ..(mapload, /datum/species/skrell)
 
 /mob/living/carbon/human/interactive/away/hotel/doSetup()
 	..()
@@ -24,12 +24,6 @@
 	for(var/obj/item/I in get_all_slots())
 		I.flags |= NODROP
 
-	// FIXME(crazylemon) a hack to prevent guards from running around with an
-	// extra security jumpsuit like a goof
-	for(var/obj/item/clothing/under/U in get_all_slots())
-		if(w_uniform != U)
-			qdel(U)
-
 /mob/living/carbon/human/interactive/away/hotel/guard/KnockOut()
 	// you'll never take me alive (this triggers the implant)
 	emote("deathgasp")

code/modules/awaymissions/snpc.dm

@@ -5,14 +5,18 @@
 	var/home_z
 
 /mob/living/carbon/human/interactive/away/Initialize(mapload)
-	..()
+	. = ..()
 	TRAITS |= TRAIT_ROBUST
 	faction += "away"
 
 /mob/living/carbon/human/interactive/away/random()
-	if(ispath(override_under, /obj/item/clothing/under))
-		equip_to_slot(new override_under(src), slot_w_uniform)
 	..()
+	// a little hacky but it should prevent doubled uniforms
+	if(ispath(override_under, /obj/item/clothing/under))
+		var/old_under = w_uniform
+		w_uniform = null
+		equip_to_slot(new override_under(src), slot_w_uniform)
+		qdel(old_under)
 
 /mob/living/carbon/human/interactive/away/doSetup()
 	..()
@@ -78,4 +82,4 @@
 	if(living < squad_size && !length(viewers(src, world.view)))
 		var/mob/living/carbon/human/interactive/away/A = new squad_type(loc)
 		squad += A
-		A.squad_member = 1
+		A.squad_member = 1