diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 489d6488650..c13cc24d12c 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -213,7 +213,7 @@ var/global/datum/shuttle_controller/shuttle_controller "Mining asteroid" = locate(/area/skipjack_station/mining) ) - VS.announcer = "NSV Icarus" + VS.announcer = "NDV Icarus" VS.arrival_message = "Attention, Exodus, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not." VS.departure_message = "Your guests are pulling away, Exodus - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip." VS.interim = locate(/area/skipjack_station/transit) @@ -244,7 +244,7 @@ var/global/datum/shuttle_controller/shuttle_controller "Arrivals dock" = "nuke_shuttle_dock_airlock", ) - MS.announcer = "NSV Icarus" + MS.announcer = "NDV Icarus" MS.arrival_message = "Attention, Exodus, you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors." MS.departure_message = "Your visitors are on their way out of the system, Exodus, burning delta-v like it's nothing. Good riddance." MS.interim = locate(/area/syndicate_station/transit) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 078e4568dbc..8cd4c55d288 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -25,32 +25,45 @@ skipface |= wear_mask.flags_inv & HIDEFACE // crappy hacks because you can't do \his[src] etc. I'm sorry this proc is so unreadable, blame the text macros :< - var/t_He = "It" //capitalised for use at the start of each line. - var/t_his = "its" - var/t_him = "it" - var/t_has = "has" - var/t_is = "is" + var/t_He = "They" //capitalised for use at the start of each line. + var/t_he = "they" + var/t_his = "their" + var/t_him = "them" + var/t_has = "have" + var/t_is = "are" + var/t_does = "do" var/msg = "*---------*\nThis is " - if( skipjumpsuit && skipface ) //big suits/masks/helmets make it hard to tell their gender - t_He = "They" - t_his = "their" - t_him = "them" - t_has = "have" - t_is = "are" - else + //big suits/masks/helmets make it hard to tell their gender + if(!skipjumpsuit || !skipface) if(icon) msg += "\icon[icon] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated switch(gender) if(MALE) t_He = "He" + t_he = "he" t_his = "his" t_him = "him" + t_has = "has" + t_is = "is" + t_does = "does" if(FEMALE) t_He = "She" + t_he = "she" t_his = "her" t_him = "her" + t_has = "has" + t_is = "is" + t_does = "does" + if(NEUTER) + t_He = "It" + t_he = "it" + t_his = "its" + t_him = "it" + t_has = "has" + t_is = "is" + t_does = "does" msg += "[src.name]" if(species.name != "Human") @@ -214,15 +227,15 @@ if (src.stat) msg += "[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.\n" if((stat == 2 || src.losebreath) && distance <= 3) - msg += "[t_He] does not appear to be breathing.\n" + msg += "[t_He] [t_does] not appear to be breathing.\n" if(istype(usr, /mob/living/carbon/human) && !usr.stat && Adjacent(usr)) usr.visible_message("[usr] checks [src]'s pulse.", "You check [src]'s pulse.") spawn(15) if(distance <= 1 && usr.stat != 1) if(pulse == PULSE_NONE) - usr << "[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]..." + usr << "[t_He] [t_has] no pulse[src.client ? "" : " and [t_his] soul has departed"]..." else - usr << "[t_He] has a pulse!" + usr << "[t_He] [t_has] a pulse!" if(fire_stacks) msg += "[t_He] [t_is] covered in some liquid.\n" if(on_fire) @@ -244,7 +257,7 @@ if(species.show_ssd && (!species.has_organ["brain"] || has_brain()) && stat != DEAD) if(!key) - msg += "[t_He] [t_is] [species.show_ssd]. It doesn't look like they are waking up anytime soon.\n" + msg += "[t_He] [t_is] fast asleep. It doesn't look like [t_he] [t_is] waking up anytime soon.\n" else if(!client) msg += "[t_He] [t_is] [species.show_ssd].\n" @@ -269,10 +282,14 @@ for(var/obj/item/organ/external/temp in organs) if(temp) + if(temp.status & ORGAN_DESTROYED) + is_destroyed["[temp.name]"] = 1 + wound_flavor_text["[temp.name]"] = "[t_He] [t_is] missing [t_his] [temp.name].\n" + continue if(temp.status & ORGAN_ROBOT) if(!(temp.brute_dam + temp.burn_dam)) if(!species.flags & IS_SYNTHETIC) - wound_flavor_text["[temp.name]"] = "[t_He] has a robot [temp.name]!\n" + wound_flavor_text["[temp.name]"] = "[t_He] [t_has] a robot [temp.name]!\n" continue else wound_flavor_text["[temp.name]"] = "[t_He] has a robot [temp.name]. It has[temp.get_wounds_desc()]!\n" @@ -302,7 +319,7 @@ if(wound_flavor_text["head"] && (is_destroyed["head"] || (!skipmask && !(wear_mask && istype(wear_mask, /obj/item/clothing/mask/gas))))) msg += wound_flavor_text["head"] else if(is_bleeding["head"]) - msg += "[src] has blood running down [t_his] face!\n" + msg += "[src] [t_has] blood running down [t_his] face!\n" if(wound_flavor_text["upper body"] && !w_uniform && !skipjumpsuit) //No need. A missing chest gibs you. msg += wound_flavor_text["upper body"] @@ -353,11 +370,11 @@ display_shoes = 1 if(display_chest) - msg += "[src] has blood soaking through from under [t_his] clothing!\n" + msg += "[src] [t_has] blood soaking through from under [t_his] clothing!\n" if(display_shoes) - msg += "[src] has blood running from [t_his] shoes!\n" + msg += "[src] [t_has] blood running from [t_his] shoes!\n" if(display_gloves) - msg += "[src] has blood running from under [t_his] gloves!\n" + msg += "[src] [t_has] blood running from under [t_his] gloves!\n" */ for(var/limb in wound_flavor_text) @@ -366,7 +383,7 @@ for(var/limb in is_bleeding) msg += is_bleeding[limb] for(var/implant in get_visible_implants(0)) - msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n" + msg += "[src] [t_has] \a [implant] sticking out of [t_his] flesh!\n" if(digitalcamo) msg += "[t_He] [t_is] repulsively uncanny!\n" @@ -422,7 +439,7 @@ if (pose) if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 ) pose = addtext(pose,".") //Makes sure all emotes end with a period. - msg += "\n[t_He] is [pose]" + msg += "\n[t_He] [t_is] [pose]" user << msg