Skyrat-SS13 / Skyrat-tg

A Skyrat downstream of /tg/station SS13.
GNU Affero General Public License v3.0
122 stars 685 forks source link

[MIRROR] Fix Scream emote running the wrong emote #28836

Closed SkyratBot closed 1 month ago

SkyratBot commented 1 month ago

Original PR: https://github.com/tgstation/tgstation/pull/84943

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

:cl: fix: Correct emote plays when a human scream. Should have sound now. /:cl: