cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-12 00:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better spam prevention placing (#680)

Browse Source 
Removes the spam prevention procs from all background procs, and ensures that they're only placed on procs that the user can initiate.

This will remove the chance of having spam prevention trigger from automated emotes.

Fixes #613
This commit is contained in:
skull132
2016-08-05 15:21:12 +03:00
committed by GitHub
parent 0a6e48ab8a
commit 28b73e68cc
12 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/emote.dm
+1 -3
View File
@@ -18,8 +18,6 @@
if (client.prefs.muted & MUTE_IC)
src << "\red You cannot send IC messages (muted)."
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
if (stat)
return
if(!(message))
@@ -127,4 +125,4 @@
for(var/mob/O in hearers(src, null))
O.show_message(message, m_type)
//Foreach goto(746)
return
return
code/modules/mob/living/carbon/brain/emote.dm
+1 -3
View File
@@ -19,8 +19,6 @@
if (client.prefs.muted & MUTE_IC)
src << "\red You cannot send IC messages (muted)."
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
if (stat)
return
if(!(message))
@@ -79,4 +77,4 @@
O.show_message(message, m_type)
else if (m_type & 2)
for (var/mob/O in hearers(src.loc, null))
O.show_message(message, m_type)
O.show_message(message, m_type)
code/modules/mob/living/carbon/human/emote.dm
-2
View File
@@ -74,8 +74,6 @@
if (client.prefs.muted & MUTE_IC)
src << "\red You cannot send IC messages (muted)."
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
if (stat)
return
if(!(message))
code/modules/mob/living/carbon/metroid/emote.dm
+1 -3
View File
@@ -18,8 +18,6 @@
if (client.prefs.muted & MUTE_IC)
src << "\red You cannot send IC messages (muted)."
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
if (stat)
return
if(!(message))
@@ -98,4 +96,4 @@
O.show_message(message, m_type)
if(updateicon)
regenerate_icons()
return
return
code/modules/mob/living/parasite/meme_captive.dm
+1 -3
View File
@@ -9,8 +9,6 @@
if(client.prefs.muted & MUTE_IC)
src << "\red You cannot speak in IC (muted)."
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
if(istype(src.loc,/mob/living/parasite/meme))
@@ -32,4 +30,4 @@
M << "The captive mind of [src] whispers, \"[message]\""
/mob/living/parasite/captive_brain/emote(var/message)
return
return
code/modules/mob/living/silicon/pai/emote.dm
-2
View File
@@ -13,8 +13,6 @@
if(client.prefs.muted & MUTE_IC)
src << "You cannot send IC messages (muted)."
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
if (stat)
return
if(!(message))
code/modules/mob/living/silicon/robot/drone/drone_say.dm
+1 -3
View File
@@ -4,8 +4,6 @@
if(client.prefs.muted & MUTE_IC)
src << "You cannot send IC messages (muted)."
return 0
if (src.client.handle_spam_prevention(message,MUTE_IC))
return 0
message = sanitize(message)
@@ -37,4 +35,4 @@
else if(M.stat == 2 && M.client.prefs.toggles & CHAT_GHOSTEARS)
if(M.client) M << "<b>[src]</b> transmits, \"[message]\""
return 1
return ..(message, 0)
return ..(message, 0)
code/modules/mob/living/silicon/robot/emote.dm
-2
View File
@@ -14,8 +14,6 @@
if(client.prefs.muted & MUTE_IC)
src << "You cannot send IC messages (muted)."
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
if (stat)
return
if(!(message))
code/modules/mob/living/simple_animal/borer/borer_captive.dm
+2 -4
View File
@@ -9,8 +9,6 @@
if(client.prefs.muted & MUTE_IC)
src << "\red You cannot speak in IC (muted)."
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
if(istype(src.loc,/mob/living/simple_animal/borer))
@@ -53,7 +51,7 @@
verbs -= /mob/living/carbon/proc/release_control
verbs -= /mob/living/carbon/proc/punish_host
verbs -= /mob/living/carbon/proc/spawn_larvae
return
..()
code/modules/mob/living/simple_animal/borer/say.dm
+1 -3
View File
@@ -16,8 +16,6 @@
if(client.prefs.muted & MUTE_IC)
src << "\red You cannot speak in IC (muted)."
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
if (copytext(message, 1, 2) == "*")
return emote(copytext(message, 2))
@@ -39,4 +37,4 @@
if (istype(M, /mob/new_player))
continue
else if(M.stat == 2 && M.client.prefs.toggles & CHAT_GHOSTEARS)
M << "[src.truename] whispers to [host], \"[message]\""
M << "[src.truename] whispers to [host], \"[message]\""
code/modules/mob/say.dm
+8
View File
@@ -26,6 +26,10 @@
*/
set_typing_indicator(0)
if (src.client.handle_spam_prevention(message, MUTE_IC))
return
usr.say(message)
/mob/verb/me_verb(message as text)
@@ -39,6 +43,10 @@
message = sanitize(message)
set_typing_indicator(0)
if (src.client.handle_spam_prevention(message, MUTE_IC))
return
if(use_me)
usr.emote("me",usr.emote_type,message)
else