shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into kevinz000-patch-48

Browse Source
This commit is contained in:
kevinz000
2019-06-08 19:10:59 -07:00
parent bf431155b7 4a6f2d2b5a
commit ec9ae5348f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -283,7 +283,7 @@
if(isliving(user))
var/mob/living/L = user
if(src != user && L.has_trait(TRAIT_EMPATH) && !appears_dead)
if(src != user && HAS_TRAIT(L, TRAIT_EMPATH) && !appears_dead)
if (a_intent != INTENT_HELP)
msg += "[t_He] seem[p_s()] to be on guard.\n"
if (getOxyLoss() >= 10)
@@ -297,9 +297,9 @@
if(mood.mood >= 5) //So roundstart people aren't all "happy"
msg += "[t_He] seem[p_s()] to have had something nice happen to them recently.\n"
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empathH", /datum/mood_event/happy_empath, src)
if (has_trait(TRAIT_BLIND))
if (HAS_TRAIT(src, TRAIT_BLIND))
msg += "[t_He] appear[p_s()] to be staring off into space.\n"
if (has_trait(TRAIT_DEAF))
if (HAS_TRAIT(src, TRAIT_DEAF))
msg += "[t_He] appear[p_s()] to not be responding to noises.\n"
msg += "</span>"