Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977

[MIRROR] Augment Styles/Changes

code/modules/mob/living/carbon/human/species.dm

@@ -254,6 +254,10 @@
 	var/dynamic_hair_suffix = "" //if this is non-null, and hair+suffix matches an iconstate, then we render that hair instead
 	var/dynamic_fhair_suffix = ""
 
+	//for augmented heads
+	if(HD.status == BODYPART_ROBOTIC)
+		return
+
 	//we check if our hat or helmet hides our facial hair.
 	if(H.head)
 		var/obj/item/I = H.head

code/modules/surgery/bodyparts/bodyparts.dm

@@ -306,7 +306,7 @@
 			else
 				limb.icon_state = "[animal_origin]_[body_zone]"
 		else
-			limb.icon = 'icons/mob/augments.dmi'
+			limb.icon = 'icons/mob/augmentation/augments.dmi'
 			limb.icon_state = "[animal_origin]_[body_zone]"
 		return
 

code/modules/surgery/bodyparts/robot_bodyparts.dm

@@ -165,27 +165,27 @@
 /obj/item/bodypart/l_arm/robot/surplus
 	name = "surplus prosthetic left arm"
 	desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
-	icon = 'icons/mob/surplus_augments.dmi'
+	icon = 'icons/mob/augmentation/surplus_augments.dmi'
 	icon_state = "l_arm"
 	max_damage = 20
 
 /obj/item/bodypart/r_arm/robot/surplus
 	name = "surplus prosthetic right arm"
 	desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
-	icon = 'icons/mob/surplus_augments.dmi'
+	icon = 'icons/mob/augmentation/surplus_augments.dmi'
 	icon_state = "r_arm"
 	max_damage = 20
 
 /obj/item/bodypart/l_leg/robot/surplus
 	name = "surplus prosthetic left leg"
 	desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
-	icon = 'icons/mob/surplus_augments.dmi'
+	icon = 'icons/mob/augmentation/surplus_augments.dmi'
 	icon_state = "l_leg"
 	max_damage = 20
 
 /obj/item/bodypart/r_leg/robot/surplus
 	name = "surplus prosthetic right leg"
 	desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
-	icon = 'icons/mob/surplus_augments.dmi'
+	icon = 'icons/mob/augmentation/surplus_augments.dmi'
 	icon_state = "r_leg"
 	max_damage = 20

code/modules/surgery/limb_augmentation.dm

@@ -57,6 +57,7 @@
 		qdel(tool)
 		target.update_body_parts()
 		target.updatehealth()
+		target.update_hair()
 		add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
 	else
 		to_chat(user, "<span class='warning'>[target] has no organic [parse_zone(target_zone)] there!</span>")