Fixes some more bugs with the SELF insurgent ipc (#22393)

* fixes

* Update IPC.dm

* Update IPC.dm

* Update IPC.dm

* Update examine.dm

Author: Moltijoe

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

@@ -13,7 +13,7 @@
 	var/t_is = p_are()
 	var/obscure_name
 	var/robotic = FALSE //robotic mobs look different under certain circumstances
-	if(mob_biotypes & MOB_ROBOTIC)//please someone tell me this is stupid and i can do it all in one line
+	if(mob_biotypes & MOB_ROBOTIC && !HAS_TRAIT(src, TRAIT_DISGUISED)) //if someone's trying to disguise, always use the default text, it's less obvious because people are used to it
 		robotic = TRUE
 
 	if(isliving(user))
@@ -489,14 +489,14 @@
 	// What examine_tgui.dm uses to determine if flavor text appears as "Obscured".
 	var/face_obscured = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
 
-	if(HAS_TRAIT(src, TRAIT_HUSK))
+	if(HAS_TRAIT(src, TRAIT_HUSK)) //can't identify husk
 		flavor_text_link = span_notice("This person has been husked, and is unrecognizable!")
-	else if ((HAS_TRAIT(src, TRAIT_DISFIGURED)))
+	else if (HAS_TRAIT(src, TRAIT_DISFIGURED)) //can't identify disfigured
 		flavor_text_link = span_notice("This person has been horribly disfigured, and is unrecognizable!")
-	else if (!(face_obscured))
-		flavor_text_link = span_notice("[preview_text]... <a href='?src=[REF(src)];lookup_info=open_examine_panel'>\[Look closer?\]</a>")
-	else
+	else if (face_obscured || HAS_TRAIT(src, TRAIT_DISGUISED)) //won't print flavour text of hidden
 		flavor_text_link = span_notice("<a href='?src=[REF(src)];lookup_info=open_examine_panel'>\[Examine closely...\]</a>")
+	else //do it normally
+		flavor_text_link = span_notice("[preview_text]... <a href='?src=[REF(src)];lookup_info=open_examine_panel'>\[Look closer?\]</a>")
 	if (flavor_text_link)
 		. += flavor_text_link
 

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

@@ -55,7 +55,7 @@
 
 	if(ishuman(holder))
 		var/mob/living/carbon/human/holder_human = holder
-		obscured = (holder_human.wear_mask && (holder_human.wear_mask.flags_inv & HIDEFACE)) || (holder_human.head && (holder_human.head.flags_inv & HIDEFACE))
+		obscured = (holder_human.wear_mask && (holder_human.wear_mask.flags_inv & HIDEFACE)) || (holder_human.head && (holder_human.head.flags_inv & HIDEFACE)) || HAS_TRAIT(holder_human, TRAIT_DISGUISED)
 		flavor_text = obscured ? "Obscured" :  holder_human.dna.features["flavor_text"]
 		if(!obscured)
 			headshot += holder_human.dna.features["headshot"]

code/modules/mob/living/carbon/human/species_types/IPC.dm

@@ -410,7 +410,23 @@ ipc martial arts stuff
 	punchdamagelow = 5
 	punchdamagehigh = 12
 	punchstunthreshold = 12
-	inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_NOBREATH,TRAIT_LIMBATTACHMENT,TRAIT_NODISMEMBER,TRAIT_NOLIMBDISABLE,TRAIT_NOCRITDAMAGE,TRAIT_GENELESS,TRAIT_MEDICALIGNORE,TRAIT_NOCLONE,TRAIT_TOXIMMUNE,TRAIT_EASILY_WOUNDED,TRAIT_NODEFIB,TRAIT_POWERHUNGRY)
+	mutant_organs = list()
+	inherent_traits = list(
+		TRAIT_RESISTCOLD,
+		TRAIT_RADIMMUNE,
+		TRAIT_NOBREATH,
+		TRAIT_LIMBATTACHMENT,
+		TRAIT_NODISMEMBER,
+		TRAIT_NOLIMBDISABLE,
+		TRAIT_NOCRITDAMAGE,
+		TRAIT_GENELESS,
+		TRAIT_MEDICALIGNORE,
+		TRAIT_NOCLONE,
+		TRAIT_TOXIMMUNE,
+		TRAIT_EASILY_WOUNDED,
+		TRAIT_NODEFIB,
+		TRAIT_NOHUNGER //nuclear powered or some shit, idk
+		)
 
 //infiltrators
 /datum/species/ipc/self/insurgent
@@ -423,7 +439,13 @@ ipc martial arts stuff
 	var/list/initial_step_sounds
 	var/list/initial_walk_sounds
 	var/list/initial_genders
-	var/list/blacklisted_species = list(/datum/species/ethereal, /datum/species/moth, /datum/species/gorilla)//species that really don't work with this system (lizards aren't quite right either, but whatever)
+	var/list/blacklisted_species = list(
+		/datum/species/ethereal, //glow 
+		/datum/species/moth, //wings
+		/datum/species/gorilla, //breaks human shapes
+		/datum/species/vox, //has weird clothing
+		/datum/species/abductor //not exactly sneaky
+		)//species that really don't work with this system (lizards aren't quite right either, but whatever)
 	var/list/old_features
 	var/old_gender
 	var/ipc_color
@@ -451,8 +473,6 @@ ipc martial arts stuff
 	else
 		old_features["mcolor"] = skintone2hex(random_skin_tone())
 	..()
-	for(var/obj/item/bodypart/O in H.bodyparts)
-		O.render_like_organic = TRUE // Makes limbs render like organic limbs instead of augmented limbs, check bodyparts.dm
 	assume_disguise(H)
 
 /datum/species/ipc/self/insurgent/spec_fully_heal(mob/living/carbon/human/H)
@@ -476,6 +496,8 @@ ipc martial arts stuff
 	special_step_sounds = null
 	special_walk_sounds = null
 	species_traits |= fake_species.species_traits
+	if(!(MUTCOLORS in fake_species.species_traits)) //some species don't have mutcolors
+		species_traits -= MUTCOLORS
 	inherent_traits |= fake_species.inherent_traits
 	if(!(NO_UNDERWEAR in fake_species.species_traits))
 		species_traits -= NO_UNDERWEAR
@@ -485,12 +507,19 @@ ipc martial arts stuff
 	attack_sound = fake_species.attack_sound
 	miss_sound = fake_species.miss_sound
 	nojumpsuit = fake_species.nojumpsuit
-	limbs_id = fake_species.limbs_id
+	limbs_id = fake_species.limbs_id || fake_species.id
+	limb_icon_file = fake_species.limb_icon_file
+	is_dimorphic = fake_species.is_dimorphic
 	use_skintones = fake_species.use_skintones
 	fixed_mut_color = fake_species.fixed_mut_color
-	bubble_icon = fake_species.bubble_icon
+	H.bubble_icon = fake_species.bubble_icon
 	yogs_draw_robot_hair = TRUE
+	var/robotic = (fake_species.inherent_biotypes & MOB_ROBOTIC)
+	for(var/obj/item/bodypart/O in H.bodyparts)
+		O.render_like_organic = robotic //make sure to copy limbs as normal
 
+	ADD_TRAIT(H, TRAIT_DISGUISED, type)
+	H.update_body_parts()
 	H.regenerate_icons() //to update limb icon cache with the new damage overlays
 
 /datum/species/ipc/self/insurgent/proc/break_disguise(mob/living/carbon/human/H)
@@ -514,12 +543,17 @@ ipc martial arts stuff
 	miss_sound = initial(miss_sound)
 	nojumpsuit = initial(nojumpsuit)
 	limbs_id = initial(limbs_id)
+	is_dimorphic = initial(is_dimorphic)
+	limb_icon_file = initial(limb_icon_file)
 	use_skintones = initial(use_skintones)
-	bubble_icon = initial(bubble_icon)
+	H.bubble_icon = initial(bubble_icon)
 	yogs_draw_robot_hair = FALSE
 
 	for(var/obj/item/bodypart/O in H.bodyparts)
 		O.render_like_organic = TRUE // Makes limbs render like organic limbs instead of augmented limbs, check bodyparts.dm
+		
+	REMOVE_TRAIT(H, TRAIT_DISGUISED, type)
+	H.update_body_parts()
 	H.regenerate_icons()
 
 /datum/species/ipc/self/insurgent/get_scream_sound(mob/living/carbon/human/H)