Merge branch 'master' into slime-puddle

code/modules/surgery/bodyparts/_bodyparts.dm

@@ -581,7 +581,7 @@
 		C = owner
 		no_update = FALSE
 
-	if(HAS_TRAIT(C, TRAIT_HUSK) && is_organic_limb())
+	if(HAS_TRAIT(C, TRAIT_HUSK) && (is_organic_limb() || render_like_organic))
 		species_id = "husk" //overrides species_id
 		dmg_overlay_type = "" //no damage overlay shown when husked
 		should_draw_gender = FALSE
@@ -619,7 +619,10 @@
 			skin_tone = ""
 
 		body_gender = H.dna.features["body_model"]
-		should_draw_gender = S.sexes
+		if(GLOB.nongendered_limb_types[species_id])
+			should_draw_gender = FALSE
+		else
+			should_draw_gender = S.sexes
 
 		var/mut_colors = (MUTCOLORS in S.species_traits)
 		if(mut_colors)

code/modules/surgery/bodyparts/dismemberment.dm

@@ -434,5 +434,8 @@
 		var/datum/scar/scaries = new
 		var/datum/wound/loss/phantom_loss = new // stolen valor, really
 		scaries.generate(L, phantom_loss)
+		if(HAS_TRAIT(src, ROBOTIC_LIMBS)) //Snowflake trait moment, but needed.
+			L.render_like_organic = TRUE
+			L.change_bodypart_status(BODYPART_ROBOTIC, FALSE, TRUE) //Haha what if IPC-lings actually regenerated the right limbs instead of organic ones? That'd be pretty cool, right?
 		L.attach_limb(src, 1)
 		return TRUE

code/modules/surgery/bodyparts/head.dm

@@ -161,7 +161,7 @@
 					debrain_overlay.icon = 'icons/mob/animal_parts.dmi'
 					debrain_overlay.icon_state = "debrained_larva"
 				else if(!(NOBLOOD in species_flags_list))
-					debrain_overlay.icon = 'icons/mob/human_face.dmi'
+					debrain_overlay.icon = 'icons/mob/human_parts.dmi'
 					debrain_overlay.icon_state = "debrained"
 				. += debrain_overlay
 			else
@@ -175,21 +175,31 @@
 
 		// lipstick
 		if(lip_style)
-			var/image/lips_overlay = image('icons/mob/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, SOUTH)
+			var/image/lips_overlay = image('icons/mob/lips.dmi', "lips_[lip_style]", -BODY_LAYER, SOUTH)
 			lips_overlay.color = lip_color
 			. += lips_overlay
 
 		// eyes
 		if(eyes)
-			var/image/left_eye = image('icons/mob/human_face.dmi', "left_eye", -BODY_LAYER, SOUTH)
-			var/image/right_eye = image('icons/mob/human_face.dmi', "right_eye", -BODY_LAYER, SOUTH)
-			if(eyes.left_eye_color && eyes.right_eye_color)
-				left_eye.color = "#" + eyes.left_eye_color
-				right_eye.color = "#" + eyes.right_eye_color
-			. += left_eye
-			. += right_eye
+			var/left_state = DEFAULT_LEFT_EYE_STATE
+			var/right_state = DEFAULT_RIGHT_EYE_STATE
+			if(owner && owner.dna.species)
+				var/eye_type = owner.dna.species.eye_type
+				if(GLOB.eye_types[eye_type])
+					left_state = eye_type + "_left_eye"
+					right_state = eye_type + "_right_eye"
+			if(left_state != DEFAULT_NO_EYE_STATE)
+				var/image/left_eye = image('icons/mob/hair.dmi', left_state, -BODY_LAYER, SOUTH)
+				if(eyes.left_eye_color)
+					left_eye.color = "#" + eyes.left_eye_color
+				. += left_eye
+			if(right_state != DEFAULT_NO_EYE_STATE)
+				var/image/right_eye = image('icons/mob/hair.dmi', right_state, -BODY_LAYER, SOUTH)
+				if(eyes.right_eye_color)
+					right_eye.color = "#" + eyes.right_eye_color
+				. += right_eye
 		else
-			var/eyes_overlay = image('icons/mob/human_face.dmi', "eyes_missing", -BODY_LAYER, SOUTH)
+			var/eyes_overlay = image('icons/mob/hair.dmi', "eyes_missing", -BODY_LAYER, SOUTH)
 			. += eyes_overlay
 
 /obj/item/bodypart/head/monkey

code/modules/surgery/organs/eyes.dm

@@ -248,7 +248,7 @@
 
 /obj/item/organ/eyes/robotic/glow/Initialize()
 	. = ..()
-	mob_overlay = image('icons/mob/human_face.dmi', "eyes_glow_gs")
+	mob_overlay = image('icons/mob/eyes.dmi', "eyes_glow_gs")
 
 /obj/item/organ/eyes/robotic/glow/Destroy()
 	terminate_effects()