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

[MIRROR] Dying people (and stunned borgies) can gasp and deathgasp again (#606)

Browse Source 
* Dying people (and stunned borgies) can gasp and deathgasp again (#53320)

* Dying people (and stunned borgies) can gasp and deathgasp again

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-09-02 03:02:50 +02:00
committed by GitHub
co-authored by Ryll Ryll
parent 28b2ac6aa4
commit f412521569
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/emote.dm
+2 -2
View File
@@ -80,7 +80,7 @@
message_monkey = "lets out a faint chimper as it collapses and stops moving..."
message_simple = "stops moving..."
cooldown = (15 SECONDS)
stat_allowed = UNCONSCIOUS
stat_allowed = HARD_CRIT
/datum/emote/living/deathgasp/run_emote(mob/user, params, type_override, intentional)
var/mob/living/simple_animal/S = user
@@ -155,7 +155,7 @@
key_third_person = "gasps"
message = "gasps!"
emote_type = EMOTE_AUDIBLE
stat_allowed = UNCONSCIOUS
stat_allowed = HARD_CRIT
/datum/emote/living/giggle
key = "giggle"
code/modules/mob/living/living_say.dm
+6 -3
View File
@@ -113,20 +113,23 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
client?.dsay(message)
return
switch(stat)
if(SOFT_CRIT)
if(check_emote(original_message, forced))
return
message_mods[WHISPER_MODE] = MODE_WHISPER
if(UNCONSCIOUS)
if(!(message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
if(check_emote(original_message, forced) || !(message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
return
if(HARD_CRIT)
if(!(message_mods[WHISPER_MODE] || message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
if(check_emote(original_message, forced) || !(message_mods[WHISPER_MODE] || message_mods[MODE_CHANGELING] || message_mods[MODE_ALIEN]))
return
if(DEAD)
say_dead(original_message)
return
if(check_emote(original_message, forced) || !can_speak_basic(original_message, ignore_spam, forced))
if(!can_speak_basic(original_message, ignore_spam, forced))
return
language = message_mods[LANGUAGE_EXTENSION]