mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
[EARLY MIRROR] [FIX] Various emote fixes (#1481)
https://github.com/Skyrat-SS13/Skyrat-tg/pull/27595 Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
This commit is contained in:
@@ -265,14 +265,13 @@
|
||||
//SKYRAT EDIT CHANGE BEGIN - EMOTES - GLOBAL COOLDOWN
|
||||
//if(user.emotes_used && user.emotes_used[src] + cooldown > world.time) - SKYRAT EDIT - ORIGINAL
|
||||
if(user.nextsoundemote > world.time)
|
||||
var/datum/emote/default_emote = /datum/emote
|
||||
var/datum/emote/default_emote = new /datum/emote
|
||||
if(cooldown > initial(default_emote.cooldown)) // only worry about longer-than-normal emotes
|
||||
to_chat(user, span_danger("You must wait another [DisplayTimeText(user.nextsoundemote - world.time)] before using that emote."))
|
||||
return FALSE
|
||||
//if(!user.emotes_used)
|
||||
// user.emotes_used = list()
|
||||
//user.emotes_used[src] = world.time - SKYRAT EDIT - ORIGINAL
|
||||
user.nextsoundemote = world.time + cooldown
|
||||
//SKYRAT EDIT CHANGE END
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
if(P.run_emote(src, param, m_type, intentional))
|
||||
SEND_SIGNAL(src, COMSIG_MOB_EMOTE, P, act, m_type, message, intentional)
|
||||
SEND_SIGNAL(src, COMSIG_MOB_EMOTED(P.key))
|
||||
src.nextsoundemote = world.time + P.cooldown // SKYRAT EDIT - EMOTE COOLDOWNS
|
||||
return TRUE
|
||||
if(intentional && !silenced && !force_silence)
|
||||
to_chat(src, span_notice("Unusable emote '[act]'. Say *help for a list."))
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
message_mime = "mumbles silently!"
|
||||
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
|
||||
|
||||
|
||||
/* - SKYRAT EDIT REMOVAL: EMOTES
|
||||
/datum/emote/living/carbon/human/scream
|
||||
key = "scream"
|
||||
key_third_person = "screams"
|
||||
@@ -120,7 +120,7 @@
|
||||
only_forced_audio = TRUE
|
||||
vary = TRUE
|
||||
|
||||
/* - SKYRAT EDIT REMOVAL: EMOTES
|
||||
|
||||
/datum/emote/carbon/human/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
|
||||
if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user