From 77ece661bad87de3e369437957e9d7baea591c74 Mon Sep 17 00:00:00 2001 From: Hypertorus Fusion Reactor <109750345+MrDerpi@users.noreply.github.com> Date: Thu, 7 Dec 2023 01:35:54 +0200 Subject: [PATCH] Gasping in shock, but for non-humans! (#25470) * makes gaspshock no longer limited to humans * Revert "makes gaspshock no longer limited to humans" This reverts commit 06e4d2d7dcce182d832d9b3e3ea9f10a2d7d5211. * makes *gaspshock no longer limited to humans * SKYRAT EDIT CHANGE comment Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update code/modules/mob/living/emote.dm * Update code/modules/mob/living/emote.dm * Update code/modules/mob/living/emote.dm --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- code/modules/mob/living/emote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index a99a7fd15b6..e489ccfc16a 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -205,7 +205,7 @@ if(!ishuman(user)) return var/mob/living/carbon/human/human_user = user - if(human_user.dna.species.id == SPECIES_HUMAN && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING)) + if(ishuman(human_user) && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING)) // SKYRAT EDIT CHANGE - Let other species gasp - ORIGINAL: if(human_user.dna.species.id == SPECIES_HUMAN && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING)) if(human_user.physique == FEMALE) return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg') else