cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Scream emote running the wrong emote (#84943)

Browse Source 
## About The Pull Request

Blacklisted `/datum/emote/living/scream` for humans, since humans have
their better version

Also fixes a typo for `/datum/emote/carbon/human/scream`

~~So, we have two emotes for `key = "scream"`,
`/datum/emote/living/scream` and
`/datum/emote/living/carbon/human/scream`.~~

~~Since `/datum/emote/living/scream` is the first in the
GLOB.emote_list, it plays (and successfully) first in the list of two.~~

~~I'm not really sure how to "override" available emotes other than
restricting the "lesser" emote. So, any suggestions welcome...~~

## Why It's Good For The Game
Correct emote plays when a human scream

## Changelog
🆑
fix: Correct emote plays when a human scream. Should have sound now.
/🆑
This commit is contained in:
larentoun
2024-07-15 02:37:21 +02:00
committed by GitHub
parent cfe76b155b
commit eb2b0fda8e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+1 -1
View File
@@ -66,7 +66,7 @@
only_forced_audio = TRUE
vary = TRUE
/datum/emote/carbon/human/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
/datum/emote/living/carbon/human/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
return
return ..()
code/modules/mob/living/emote.dm
+1
View File
@@ -355,6 +355,7 @@
message = "screams!"
message_mime = "acts out a scream!"
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
mob_type_blacklist_typecache = list(/mob/living/brain, /mob/living/carbon/human)
/datum/emote/living/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))