From b2a05ab8eccffc501e0503af9b7841d708fc217b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 6 Jul 2021 23:57:20 +0100 Subject: [PATCH] [MIRROR] fixes voice of god not giving you large text (#6743) * fixes voice of god not giving you large text (#60014) * fixes voice of god not giving you large text Co-authored-by: Fikou --- code/datums/voice_of_god_command.dm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/code/datums/voice_of_god_command.dm b/code/datums/voice_of_god_command.dm index 78a95653fe3..3a5b3ea9dc4 100644 --- a/code/datums/voice_of_god_command.dm +++ b/code/datums/voice_of_god_command.dm @@ -1,7 +1,7 @@ #define COOLDOWN_STUN 120 SECONDS #define COOLDOWN_DAMAGE 60 SECONDS #define COOLDOWN_MEME 30 SECONDS -#define COOLDOWN_NONE 1 SECONDS +#define COOLDOWN_NONE 10 SECONDS /// Used to stop listeners with silly or clown-esque (first) names such as "Honk" or "Flip" from screwing up certain commands. GLOBAL_DATUM(all_voice_of_god_triggers, /regex) @@ -33,11 +33,8 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) /proc/voice_of_god(message, mob/living/user, list/span_list, base_multiplier = 1, include_speaker = FALSE, message_admins = TRUE) var/log_message = uppertext(message) var/is_cultie = IS_CULTIST(user) - if(LAZYLEN(span_list)) - if(is_cultie) - span_list = list("narsiesmall") - else - span_list = list() + if(LAZYLEN(span_list) && is_cultie) + span_list = list("narsiesmall") if(!user.say(message, spans = span_list, sanitize = FALSE)) return