Merge branch 'master' into upstream-merge-29105

code/modules/mob/dead/new_player/new_player.dm

@@ -4,7 +4,7 @@
 	var/ready = 0
 	var/spawning = 0//Referenced when you want to delete the new_player later on in the code.
 
-	flags = NONE
+	flags_1 = NONE
 
 	invisibility = INVISIBILITY_ABSTRACT
 
@@ -109,7 +109,7 @@
 	if(href_list["ready"])
 		var/tready = text2num(href_list["ready"])
 		//Avoid updating ready if we're after PREGAME (they should use latejoin instead)
-		//This is likely not an actual issue but I don't have time to prove that this 
+		//This is likely not an actual issue but I don't have time to prove that this
 		//no longer is required
 		if(SSticker.current_state <= GAME_STATE_PREGAME)
 			ready = tready

code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm

@@ -592,6 +592,7 @@
 	extra = 1
 	extra2 = 1
 	icon = 'icons/mob/mam_body_markings.dmi'
+	gender_specific = 1
 
 	/datum/sprite_accessory/mam_body_markings/xeno
 	name = "Xeno"