cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 00:27:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed duplicate scream emote. (#93104)

Browse Source 
## About The Pull Request
We have two different *scream emote types, not counting the *screech
subtype, and it's a bit of a copypasta, so I merged the two together,
and made the *screech its own type, only usable by human mobs ~~with the
primitive traits, aka monkeys and ashwalkers~~ like before.

## Why It's Good For The Game
Less copypasta. You'll probably have to reset your scream hotkey after
this is merged.

~~Also screeching is simply another emote that played the scream sound,
and human scream stock sounds barely fit it anyway, so we're not losing
much by locking it to monkeys and ashwalkers.~~ Screeching is once more
back on the menu

## Changelog

🆑
code: Merged the human and living versions of the scream emote. Remember
to reset your scream hotkey if it is ever unset.
/🆑
This commit is contained in:
Ghom
2025-10-10 19:33:14 +02:00
committed by GitHub
parent a180a48e55
commit bf8b97fbae
2 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+4 -24
View File
@@ -57,37 +57,17 @@
message_mime = "mumbles silently!"
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
/datum/emote/living/carbon/human/scream
key = "scream"
key_third_person = "screams"
message = "screams!"
message_mime = "acts out a scream!"
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
specific_emote_audio_cooldown = 10 SECONDS
vary = TRUE
/datum/emote/living/carbon/human/scream/can_run_emote(mob/user, status_check = TRUE , intentional, params)
if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
return FALSE
return ..()
/datum/emote/living/carbon/human/scream/get_sound(mob/living/carbon/human/user)
if(!istype(user))
return
return user.dna.species.get_scream_sound(user)
/datum/emote/living/carbon/human/scream/screech //If a human tries to screech it'll just scream.
/datum/emote/living/carbon/human/screech // basically scream 2.0
key = "screech"
key_third_person = "screeches"
message = "screeches!"
message_mime = "screeches silently."
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
specific_emote_audio_cooldown = 10 SECONDS
vary = FALSE
/datum/emote/living/carbon/human/scream/screech/should_play_sound(mob/user, intentional)
if(ismonkey(user))
return TRUE
return ..()
/datum/emote/living/carbon/human/screech/get_sound(mob/living/carbon/human/user)
return user.dna.species.get_scream_sound(user)
/datum/emote/living/carbon/human/pale
key = "pale"
code/modules/mob/living/emote.dm
+9 -1
View File
@@ -416,8 +416,10 @@
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)
mob_type_blacklist_typecache = list(/mob/living/brain)
sound_wall_ignore = TRUE
specific_emote_audio_cooldown = 10 SECONDS
vary = TRUE
/datum/emote/living/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
@@ -429,6 +431,12 @@
if(!intentional && isanimal_or_basicmob(user))
return "makes a loud and pained whimper."
/datum/emote/living/scream/get_sound(mob/living/user)
if(!ishuman(user))
return
var/mob/living/carbon/human/humie = user
return humie.dna.species.get_scream_sound(user)
/datum/emote/living/scowl
key = "scowl"
key_third_person = "scowls"