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

New traumas and some other things.

Browse Source
This commit is contained in:
GrayRachnid
2019-10-08 03:53:01 -04:00
parent 0de2a0daa8
commit 9f8ad74bf9
35 changed files with 785 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/emote.dm
+2 -2
View File
@@ -58,9 +58,9 @@
message = "coughs!"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/cough/can_run_emote(mob/user, status_check = TRUE)
/datum/emote/living/cough/can_run_emote(mob/user, status_check = TRUE , intentional)
. = ..()
if(user.reagents && (user.reagents.get_reagent("menthol") || user.reagents.get_reagent("peppermint_patty")))
if(HAS_TRAIT(user, TRAIT_SOOTHED_THROAT))
return FALSE
/datum/emote/living/dance