Merge branch 'master' into upstream-merge-32161

code/modules/awaymissions/corpse.dm

@@ -130,6 +130,10 @@
 	var/backpack_contents = -1
 	var/suit_store = -1
 
+	var/hair_style
+	var/facial_hair_style
+	var/skin_tone
+
 /obj/effect/mob_spawn/human/Initialize()
 	if(ispath(outfit))
 		outfit = new outfit()
@@ -147,6 +151,20 @@
 	H.underwear = "Nude"
 	H.undershirt = "Nude"
 	H.socks = "Nude"
+	if(hair_style)
+		H.hair_style = hair_style
+	else
+		H.hair_style = random_hair_style(gender)
+	if(facial_hair_style)
+		H.facial_hair_style = facial_hair_style
+	else
+		H.facial_hair_style = random_facial_hair_style(gender)
+	if(skin_tone)
+		H.skin_tone = skin_tone
+	else
+		H.skin_tone = random_skin_tone()
+	H.update_hair()
+	H.update_body()
 	if(outfit)
 		var/static/list/slots = list("uniform", "r_hand", "l_hand", "suit", "shoes", "gloves", "ears", "glasses", "mask", "head", "belt", "r_pocket", "l_pocket", "back", "id", "neck", "backpack_contents", "suit_store")
 		for(var/slot in slots)

code/modules/awaymissions/gateway.dm

@@ -170,7 +170,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 	density = TRUE
 	icon_state = "offcenter"
 	use_power = NO_POWER_USE
-	var/obj/machinery/gateway/centeraway/stationgate = null
+	var/obj/machinery/gateway/centerstation/stationgate = null
 	can_link = TRUE
 
 
@@ -233,6 +233,18 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 			M.client.move_delay = max(world.time + 5, M.client.move_delay)
 
 
+/obj/machinery/gateway/centeraway/admin
+	desc = "A mysterious gateway built by unknown hands, this one seems more compact."
+
+/obj/machinery/gateway/centeraway/admin/Initialize()
+	. = ..()
+	if(stationgate && !stationgate.awaygate)
+		stationgate.awaygate = src
+
+/obj/machinery/gateway/centeraway/admin/detect()
+	return TRUE
+
+
 /obj/item/paper/fluff/gateway
 	info = "Congratulations,<br><br>Your station has been selected to carry out the Gateway Project.<br><br>The equipment will be shipped to you at the start of the next quarter.<br> You are to prepare a secure location to house the equipment as outlined in the attached documents.<br><br>--Nanotrasen Blue Space Research"
 	name = "Confidential Correspondence, Pg 1"