cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

disabled simultaneous admin PM warning

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-02-13 17:49:48 +10:00
parent 7cc207583a
commit e6e4b89819
4 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/configuration.dm
View File

@@ -395,9 +395,6 @@
if("ghost_interaction") if("ghost_interaction")
config.ghost_interaction = 1 config.ghost_interaction = 1
if("simultaneous_pm_warning_timeout")
simultaneous_pm_warning_timeout = text2num(value) * 10
else else
diary << "Unknown setting in configuration: '[name]'" diary << "Unknown setting in configuration: '[name]'"

8
code/modules/admin/verbs/adminpm.dm
View File

@@ -45,13 +45,13 @@
else adminhelp(msg) //admin we are replying to left. adminhelp instead else adminhelp(msg) //admin we are replying to left. adminhelp instead
return return
if(C && C.last_pm_recieved + config.simultaneous_pm_warning_timeout > world.time && holder) /*if(C && C.last_pm_recieved + config.simultaneous_pm_warning_timeout > world.time && holder)
//send a warning to admins, but have a delay popup for mods //send a warning to admins, but have a delay popup for mods
if(holder.rights & R_ADMIN) if(holder.rights & R_ADMIN)
src << "\red <b>Simultaneous PMs warning:</b> that player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]" src << "\red <b>Simultaneous PMs warning:</b> that player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]"
else else
if(alert("That player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]","Simultaneous PMs warning","Continue","Cancel") == "Cancel") if(alert("That player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]","Simultaneous PMs warning","Continue","Cancel") == "Cancel")
return return*/
//get message text, limit it's length.and clean/escape html //get message text, limit it's length.and clean/escape html
if(!msg) if(!msg)
@@ -112,9 +112,9 @@
C << recieve_message C << recieve_message
src << "<font color='blue'>[send_pm_type] PM to-<b>[key_name(C, src, 1)]</b>: [msg]</font>" src << "<font color='blue'>[send_pm_type] PM to-<b>[key_name(C, src, 1)]</b>: [msg]</font>"
if(holder && !C.holder) /*if(holder && !C.holder)
C.last_pm_recieved = world.time C.last_pm_recieved = world.time
C.ckey_last_pm = ckey C.ckey_last_pm = ckey*/
//play the recieving admin the adminhelp sound (if they have them enabled) //play the recieving admin the adminhelp sound (if they have them enabled)
//non-admins shouldn't be able to disable this //non-admins shouldn't be able to disable this

3
code/modules/client/client defines.dm
View File

@@ -8,9 +8,6 @@
var/last_message = "" //Contains the last message sent by this client - used to protect against copy-paste spamming. var/last_message = "" //Contains the last message sent by this client - used to protect against copy-paste spamming.
var/last_message_count = 0 //contins a number of how many times a message identical to last_message was sent. var/last_message_count = 0 //contins a number of how many times a message identical to last_message was sent.
var/last_pm_recieved = 0 //world.time of the last PM this mob recieved, so that mods/admins recieve warnings if a player is getting spammed
var/ckey_last_pm = ""
///////// /////////
//OTHER// //OTHER//
///////// /////////

4
config/config.txt
View File

@@ -213,7 +213,3 @@ ALIEN_PLAYER_RATIO 0.2
##Remove the # to let ghosts spin chairs ##Remove the # to let ghosts spin chairs
#GHOST_INTERACTION #GHOST_INTERACTION
#Seconds after a player recieves a PM that other admins will recieve warnings for trying to message
SIMULTANEOUS_PM_WARNING_TIMEOUT 10