Merge branch 'master' into upstream-merge-31877

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

@@ -452,7 +452,8 @@
 			dat += "<a class='[position_class]' href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions])</a><br>"
 	if(!job_count) //if there's nowhere to go, assistant opens up.
 		for(var/datum/job/job in SSjob.occupations)
-			if(job.title != "Assistant") continue
+			if(job.title != "Assistant")
+				continue
 			dat += "<a class='otherPosition' href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions])</a><br>"
 			break
 	dat += "</div></div>"
@@ -479,6 +480,8 @@
 	client.prefs.copy_to(H)
 	H.dna.update_dna_identity()
 	if(mind)
+		if(transfer_after)
+			mind.late_joiner = TRUE
 		mind.active = 0					//we wish to transfer the key manually
 		mind.transfer_to(H)					//won't transfer key since the mind is not active
 

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

@@ -59,7 +59,7 @@
 	if(previewJob && !nude)
 		mannequin.job = previewJob.title
 		previewJob.equip(mannequin, TRUE)
-	mannequin.compile_overlays()
+	COMPILE_OVERLAYS(mannequin)
 	CHECK_TICK
 	preview_icon = icon('icons/effects/effects.dmi', "nothing")
 	preview_icon.Scale(48+32, 16+32)

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

@@ -39,7 +39,7 @@
 	name = "Bear"
 	icon_state = "bear"
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	
+
 /datum/sprite_accessory/tails/human/bear
 	name = "Bear"
 	icon_state = "bear"
@@ -65,7 +65,7 @@
 	icon_state = "cow"
 	icon = 'icons/mob/mam_bodyparts.dmi'
 	gender_specific = 1
-	
+
 /datum/sprite_accessory/tails/human/cow
 	name = "Cow"
 	icon_state = "cow"
@@ -175,21 +175,24 @@
 	name = "Otusian"
 	icon_state = "otie"
 	hasinner= 1
+	icon = 'icons/mob/mam_bodyparts.dmi'
 
 /datum/sprite_accessory/tails/human/otie
 	name = "Otusian"
 	icon_state = "otie"
+	icon = 'icons/mob/mam_bodyparts.dmi'
 
 /datum/sprite_accessory/tails_animated/human/otie
 	name = "Otusian"
 	icon_state = "otie"
+	icon = 'icons/mob/mam_bodyparts.dmi'
 
 /datum/sprite_accessory/ears/human/rabbit
     name = "Rabbit"
     icon_state = "rabbit"
     hasinner= 1
     icon = 'icons/mob/mam_bodyparts.dmi'
-	
+
 /datum/sprite_accessory/tails/human/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
@@ -201,10 +204,11 @@
 	icon_state = "rabbit"
 	color_src = 0
 	icon = 'icons/mob/mam_bodyparts.dmi'
-	
+
 /datum/sprite_accessory/ears/human/skunk
 	name = "skunk"
 	icon_state = "skunk"
+	icon = 'icons/mob/mam_bodyparts.dmi'
 
 /datum/sprite_accessory/tails/human/skunk
 	name = "skunk"
@@ -248,6 +252,7 @@
 	name = "Wolf"
 	icon_state = "wolf"
 	hasinner = 1
+	icon = 'icons/mob/mam_bodyparts.dmi'
 
 /datum/sprite_accessory/tails/human/wolf
 	name = "Wolf"
@@ -341,7 +346,7 @@
 /datum/sprite_accessory/mam_ears/bear
 	name = "Bear"
 	icon_state = "bear"
-	
+
 /datum/sprite_accessory/mam_tails/bear
 	name = "Bear"
 	icon_state = "bear"
@@ -352,9 +357,9 @@
 
 /datum/sprite_accessory/mam_ears/catbig
 	name = "Cat, Big"
-	icon_state = "cat"
+	icon_state = "catbig"
 	hasinner = 1
-	
+
 /datum/sprite_accessory/mam_tails/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
@@ -367,7 +372,7 @@
 	name = "Cow"
 	icon_state = "cow"
 	gender_specific = 1
-	
+
 /datum/sprite_accessory/mam_tail/cow
 	name = "Cow"
 	icon_state = "cow"
@@ -522,7 +527,7 @@
     name = "Rabbit"
     icon_state = "rabbit"
     hasinner= 1
-	
+
 /datum/sprite_accessory/mam_tails/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"