From 1e7bf50a4ce15e58f99b0aa52d4314e7035ffb46 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 3 Apr 2017 14:14:52 -0500 Subject: [PATCH] Automute shouldn't go off if you didn't type anything --- code/game/verbs/ooc.dm | 6 +++-- code/modules/admin/verbs/adminhelp.dm | 3 ++- code/modules/admin/verbs/pray.dm | 9 ++++--- code/modules/mob/dead/observer/say.dm | 18 ++++++++------ code/modules/mob/living/say.dm | 9 ++++--- html/changelogs/Anewbe - Automute.yml | 36 +++++++++++++++++++++++++++ 6 files changed, 62 insertions(+), 19 deletions(-) create mode 100644 html/changelogs/Anewbe - Automute.yml diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 793df9dc43..fa6dec5715 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -37,7 +37,8 @@ log_ooc("[mob.name]/[key] : [msg]") - handle_spam_prevention(MUTE_OOC) + if(msg) + handle_spam_prevention(MUTE_OOC) var/ooc_style = "everyone" if(holder && !holder.fakekey) @@ -107,7 +108,8 @@ log_ooc("(LOCAL) [mob.name]/[key] : [msg]") - handle_spam_prevention(MUTE_OOC) + if(msg) + handle_spam_prevention(MUTE_OOC) var/mob/source = mob.get_looc_source() var/turf/T = get_turf(source) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 90d9c9d275..753094deba 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -17,7 +17,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," adminhelped = 1 //Determines if they get the message to reply by clicking the name. - handle_spam_prevention(MUTE_ADMINHELP) + if(msg) + handle_spam_prevention(MUTE_ADMINHELP) //clean the input msg if(!msg) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index c5eb60a94b..9fcb834774 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -10,10 +10,11 @@ if(!msg) return if(usr.client) - client.handle_spam_prevention(MUTE_PRAY) - if(usr.client.prefs.muted & MUTE_PRAY) - usr << "\red You cannot pray (muted)." - return + if(msg) + client.handle_spam_prevention(MUTE_PRAY) + if(usr.client.prefs.muted & MUTE_PRAY) + usr << "\red You cannot pray (muted)." + return var/image/cross = image('icons/obj/storage.dmi',"bible") msg = "\blue \icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC): [msg]" diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 4d348c8d71..45f4c11cde 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -7,10 +7,11 @@ log_say("Ghost/[src.key] : [message]") if (src.client) - client.handle_spam_prevention(MUTE_DEADCHAT) - if(src.client.prefs.muted & MUTE_DEADCHAT) - src << "\red You cannot talk in deadchat (muted)." - return + if(message) + client.handle_spam_prevention(MUTE_DEADCHAT) + if(src.client.prefs.muted & MUTE_DEADCHAT) + src << "\red You cannot talk in deadchat (muted)." + return . = src.say_dead(message) @@ -27,10 +28,11 @@ log_emote("Ghost/[src.key] : [message]") if(src.client) - client.handle_spam_prevention(MUTE_DEADCHAT) - if(src.client.prefs.muted & MUTE_DEADCHAT) - src << "\red You cannot emote in deadchat (muted)." - return + if(message) + client.handle_spam_prevention(MUTE_DEADCHAT) + if(src.client.prefs.muted & MUTE_DEADCHAT) + src << "\red You cannot emote in deadchat (muted)." + return . = src.emote_dead(message) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index fd4f706b15..1aef4eca81 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -133,10 +133,11 @@ proc/get_radio_key_from_channel(var/channel) /mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/whispering = 0) //If you're muted for IC chat if(client) - client.handle_spam_prevention(MUTE_IC) - if((client.prefs.muted & MUTE_IC) || say_disabled) - src << "You cannot speak in IC (Muted)." - return + if(message) + client.handle_spam_prevention(MUTE_IC) + if((client.prefs.muted & MUTE_IC) || say_disabled) + src << "You cannot speak in IC (Muted)." + return //Redirect to say_dead if talker is dead if(stat) diff --git a/html/changelogs/Anewbe - Automute.yml b/html/changelogs/Anewbe - Automute.yml new file mode 100644 index 0000000000..6ff5086037 --- /dev/null +++ b/html/changelogs/Anewbe - Automute.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Automute shouldn't trigger if you don't type anything." \ No newline at end of file