mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Automute shouldn't go off if you didn't type anything
This commit is contained in:
@@ -37,7 +37,8 @@
|
|||||||
|
|
||||||
log_ooc("[mob.name]/[key] : [msg]")
|
log_ooc("[mob.name]/[key] : [msg]")
|
||||||
|
|
||||||
handle_spam_prevention(MUTE_OOC)
|
if(msg)
|
||||||
|
handle_spam_prevention(MUTE_OOC)
|
||||||
|
|
||||||
var/ooc_style = "everyone"
|
var/ooc_style = "everyone"
|
||||||
if(holder && !holder.fakekey)
|
if(holder && !holder.fakekey)
|
||||||
@@ -107,7 +108,8 @@
|
|||||||
|
|
||||||
log_ooc("(LOCAL) [mob.name]/[key] : [msg]")
|
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/mob/source = mob.get_looc_source()
|
||||||
var/turf/T = get_turf(source)
|
var/turf/T = get_turf(source)
|
||||||
|
|||||||
@@ -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.
|
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
|
//clean the input msg
|
||||||
if(!msg)
|
if(!msg)
|
||||||
|
|||||||
@@ -10,10 +10,11 @@
|
|||||||
if(!msg) return
|
if(!msg) return
|
||||||
|
|
||||||
if(usr.client)
|
if(usr.client)
|
||||||
client.handle_spam_prevention(MUTE_PRAY)
|
if(msg)
|
||||||
if(usr.client.prefs.muted & MUTE_PRAY)
|
client.handle_spam_prevention(MUTE_PRAY)
|
||||||
usr << "\red You cannot pray (muted)."
|
if(usr.client.prefs.muted & MUTE_PRAY)
|
||||||
return
|
usr << "\red You cannot pray (muted)."
|
||||||
|
return
|
||||||
|
|
||||||
var/image/cross = image('icons/obj/storage.dmi',"bible")
|
var/image/cross = image('icons/obj/storage.dmi',"bible")
|
||||||
msg = "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"
|
msg = "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"
|
||||||
|
|||||||
@@ -7,10 +7,11 @@
|
|||||||
log_say("Ghost/[src.key] : [message]")
|
log_say("Ghost/[src.key] : [message]")
|
||||||
|
|
||||||
if (src.client)
|
if (src.client)
|
||||||
client.handle_spam_prevention(MUTE_DEADCHAT)
|
if(message)
|
||||||
if(src.client.prefs.muted & MUTE_DEADCHAT)
|
client.handle_spam_prevention(MUTE_DEADCHAT)
|
||||||
src << "\red You cannot talk in deadchat (muted)."
|
if(src.client.prefs.muted & MUTE_DEADCHAT)
|
||||||
return
|
src << "\red You cannot talk in deadchat (muted)."
|
||||||
|
return
|
||||||
|
|
||||||
. = src.say_dead(message)
|
. = src.say_dead(message)
|
||||||
|
|
||||||
@@ -27,10 +28,11 @@
|
|||||||
log_emote("Ghost/[src.key] : [message]")
|
log_emote("Ghost/[src.key] : [message]")
|
||||||
|
|
||||||
if(src.client)
|
if(src.client)
|
||||||
client.handle_spam_prevention(MUTE_DEADCHAT)
|
if(message)
|
||||||
if(src.client.prefs.muted & MUTE_DEADCHAT)
|
client.handle_spam_prevention(MUTE_DEADCHAT)
|
||||||
src << "\red You cannot emote in deadchat (muted)."
|
if(src.client.prefs.muted & MUTE_DEADCHAT)
|
||||||
return
|
src << "\red You cannot emote in deadchat (muted)."
|
||||||
|
return
|
||||||
|
|
||||||
. = src.emote_dead(message)
|
. = src.emote_dead(message)
|
||||||
|
|
||||||
|
|||||||
@@ -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)
|
/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 you're muted for IC chat
|
||||||
if(client)
|
if(client)
|
||||||
client.handle_spam_prevention(MUTE_IC)
|
if(message)
|
||||||
if((client.prefs.muted & MUTE_IC) || say_disabled)
|
client.handle_spam_prevention(MUTE_IC)
|
||||||
src << "<span class='warning'>You cannot speak in IC (Muted).</span>"
|
if((client.prefs.muted & MUTE_IC) || say_disabled)
|
||||||
return
|
src << "<span class='warning'>You cannot speak in IC (Muted).</span>"
|
||||||
|
return
|
||||||
|
|
||||||
//Redirect to say_dead if talker is dead
|
//Redirect to say_dead if talker is dead
|
||||||
if(stat)
|
if(stat)
|
||||||
|
|||||||
36
html/changelogs/Anewbe - Automute.yml
Normal file
36
html/changelogs/Anewbe - Automute.yml
Normal file
@@ -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."
|
||||||
Reference in New Issue
Block a user