diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index b401646e183..62f3d883200 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -86,7 +86,10 @@ //back if (src.back) - msg += "[t_He] [t_has] \icon[src.back] \a [src.back] on [t_his] back.\n" + if (src.back.blood_DNA) + msg += "[t_He] [t_has] \icon[src.back] [src.back.gender==PLURAL?"some":"a"] blood-stained [src.back] on [t_his] back.\n" + else + msg += "[t_He] [t_has] \icon[src.back] \a [src.back] on [t_his] back.\n" //left hand if (src.l_hand) @@ -154,7 +157,8 @@ var/obj/item/device/pda/pda = src.wear_id id = pda.owner else if(istype(src.wear_id, /obj/item/weapon/card/id)) //just in case something other than a PDA/ID card somehow gets in the ID slot :[ - id = src.wear_id.registered + var/obj/item/weapon/card/id/idcard = src.wear_id + id = idcard.registered if (id && (id != src.real_name) && (get_dist(src, usr) <= 1) && prob(10)) msg += "[t_He] [t_is] wearing \icon[src.wear_id] \a [src.wear_id] yet something doesn't seem right...\n" else @@ -173,7 +177,7 @@ msg += "[t_He] [t_has] bitten off [t_his] own tongue and [t_has] suffered major bloodloss!\n" if (src.stat == DEAD || (changeling && (changeling.changeling_fakedeath == 1))) - msg += "[t_He] [t_is] limp and unresponsive; there are no signs of life...\n" + msg += "[t_He] [t_is] limp and unresponsive; there are no signs of life" if(!src.client) var/foundghost = 0 @@ -183,7 +187,8 @@ foundghost++ break if(!foundghost) - msg += "[t_He] [t_is] empty; his soul has vanished...\n" + msg += "and [t_his] soul has departed" + msg += "...\n" else msg += "" @@ -228,7 +233,7 @@ msg += "[t_He] [t_has] a vacant, braindead stare...\n" if (src.digitalcamo) - msg += "[t_He] looks replusingly uncanny!\n" + msg += "[t_He] [t_is] repulsively uncanny!\n" msg += "*---------*" diff --git a/code/modules/mob/living/carbon/metroid/examine.dm b/code/modules/mob/living/carbon/metroid/examine.dm index 6fd157cdec5..5785a378c5e 100644 --- a/code/modules/mob/living/carbon/metroid/examine.dm +++ b/code/modules/mob/living/carbon/metroid/examine.dm @@ -2,7 +2,7 @@ set src in oview() if(!usr || !src) return - if((usr.sdisabilities & 1) || usr.blinded || usr.stat) + if(((usr.sdisabilities & 1) || usr.blinded || usr.stat) && !(istype(usr,/mob/dead/observer/))) usr << "Something is there but you can't see it." return diff --git a/code/modules/mob/living/carbon/monkey/examine.dm b/code/modules/mob/living/carbon/monkey/examine.dm index 2f6eadb9f3f..2a096cb755a 100644 --- a/code/modules/mob/living/carbon/monkey/examine.dm +++ b/code/modules/mob/living/carbon/monkey/examine.dm @@ -2,7 +2,7 @@ set src in oview() if(!usr || !src) return - if((usr.sdisabilities & 1) || usr.blinded || usr.stat) + if(((usr.sdisabilities & 1) || usr.blinded || usr.stat) && !(istype(usr,/mob/dead/observer/))) usr << "Something is there but you can't see it." return diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index 781846f361b..c4e9d1ddbcc 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -2,7 +2,7 @@ set src in oview() if(!usr || !src) return - if((usr.sdisabilities & 1) || usr.blinded || usr.stat) + if(((usr.sdisabilities & 1) || usr.blinded || usr.stat) && !(istype(usr,/mob/dead/observer/))) usr << "Something is there but you can't see it." return diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 11f4da029c5..c29674a6f27 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -2,7 +2,7 @@ set src in oview() if(!usr || !src) return - if((usr.sdisabilities & 1) || usr.blinded || usr.stat) + if(((usr.sdisabilities & 1) || usr.blinded || usr.stat) && !(istype(usr,/mob/dead/observer/))) usr << "Something is there but you can't see it." return