diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 75a31925c33..aa3466fdcae 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -154,8 +154,6 @@ SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE, user, .) -//SKYRAT EDIT REMOVAL - MOVED - MEDICAL - carbon_examine.dm -/* /mob/living/carbon/examine_more(mob/user) . = ..() . += span_notice("You examine [src] closer, and note the following...") @@ -182,4 +180,3 @@ . += "[scar_text]" return . -*/ diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 1fc148e7b64..3de1c08d49c 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -491,7 +491,7 @@ var/datum/sprite_accessory/genital/G = GLOB.sprite_accessories[genital][dna.species.mutant_bodyparts[genital][MUTANT_INDEX_NAME]] if(G) if(!(G.is_hidden(src))) - . += "[t_He] [t_has] exposed genitals... Look closer..." + . += "[t_He] [t_has] exposed genitals... \[Look closer...\]" break var/flavor_text_link @@ -501,9 +501,9 @@ var/face_obscured = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) if (!(face_obscured)) - flavor_text_link = span_notice("[preview_text]... Look closer?") + flavor_text_link = span_notice("[preview_text]... \[Look closer?\]") else - flavor_text_link = span_notice("Examine closely...") + flavor_text_link = span_notice("\[Examine closely...\]") if (flavor_text_link) . += flavor_text_link diff --git a/modular_skyrat/modules/medical/code/carbon_examine.dm b/modular_skyrat/modules/medical/code/carbon_examine.dm index e86ed9f9267..b4e385badfb 100644 --- a/modular_skyrat/modules/medical/code/carbon_examine.dm +++ b/modular_skyrat/modules/medical/code/carbon_examine.dm @@ -1,6 +1,5 @@ /mob/living/carbon/examine_more(mob/user) . = ..() - var/msg = list(span_notice("You examine [src] closer, and note the following...")) var/t_His = p_Their() var/t_He = p_They() var/t_Has = p_have() @@ -34,25 +33,25 @@ if(status) any_bodypart_damage = TRUE - msg += "\t[t_His] [LB.name] is [status]." + . += "\t[t_His] [LB.name] is [status]." for(var/thing in LB.wounds) any_bodypart_damage = TRUE var/datum/wound/W = thing switch(W.severity) if(WOUND_SEVERITY_TRIVIAL) - msg += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]." + . += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]." if(WOUND_SEVERITY_MODERATE) - msg += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!" + . += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!" if(WOUND_SEVERITY_SEVERE) - msg += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!" + . += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!" if(WOUND_SEVERITY_CRITICAL) - msg += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!!" + . += "\t[t_His] [LB.name] is suffering [W.a_or_from] [W.get_topic_name(user)]!!" if(LB.current_gauze) - msg += "\t[t_His] [LB.name] is [LB.current_gauze.get_gauze_usage_prefix()] with [LB.current_gauze.get_gauze_description()]." + . += "\t[t_His] [LB.name] is [LB.current_gauze.get_gauze_usage_prefix()] with [LB.current_gauze.get_gauze_description()]." if(!any_bodypart_damage) - msg += "\t[t_He] [t_Has] no significantly damaged bodyparts." + . += "\t[t_He] [t_Has] no significantly damaged bodyparts." var/list/visible_scars if(all_scars) @@ -62,23 +61,6 @@ LAZYADD(visible_scars, S) if(!visible_scars) - msg |= "\t[t_He] [t_Has] no visible scars." - else - for(var/i in visible_scars) - var/datum/scar/S = i - var/scar_text = S.get_examine_description(user) - if(scar_text) - msg += "[scar_text]" - - - if(dna) //not all carbons have it. eg - xenos - //On closer inspection, this man isnt a man at all! - var/list/covered_zones = get_covered_body_zones() - for(var/obj/item/bodypart/part as anything in bodyparts) - if(part.body_zone in covered_zones) - continue - if(part.limb_id != (dna.species.examine_limb_id ? dna.species.examine_limb_id : dna.species.id)) - . += "[span_info("[p_They()] [p_have()] \an [part.name].")]" - + . += "\t[t_He] [t_Has] no visible scars." - return msg + return .