From 98cf2559c3ed235f9ddbc89e60f850e56b518327 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Mon, 25 Aug 2014 21:12:00 -0600 Subject: [PATCH 1/2] Console Cooldown Tweaks -Cooldown for sending messages to centcom reduced to a minute. Often times conversations between the messenger and centcom are cut short by the very long cooldown time. -Cooldown for AI priority announcements increased to 5 minutes. The fear I had when I implemented it was AIs misusing it by announcing pointless things for what should be reserved for actual important things. -Ferry move request cooldown increased to a minute. Stop spamming us admins please. --- code/game/machinery/computer/communications.dm | 6 +++--- code/modules/shuttle/shuttle.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 859a9d4802c..71f9821302b 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -209,7 +209,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 usr << "Message transmitted." log_say("[key_name(usr)] has made a Centcom announcement: [input]") centcom_message_cooldown = 1 - spawn(6000)//10 minute cooldown + spawn(600)//One minute cooldown centcom_message_cooldown = 0 @@ -226,7 +226,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 usr << "Message transmitted." log_say("[key_name(usr)] has made a Syndicate announcement: [input]") centcom_message_cooldown = 1 - spawn(6000)//10 minute cooldown + spawn(600)//One minute cooldown centcom_message_cooldown = 0 if("RestoreBackup") @@ -559,7 +559,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(is_silicon) priority_announce(input, null, null, "Priority") ai_message_cooldown = 1 - spawn(600)//One minute cooldown + spawn(3000)//Five minute cooldown ai_message_cooldown = 0 else priority_announce(input, null, 'sound/misc/announce.ogg', "Captain") diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 7ab751c1b46..d8b42775804 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -115,5 +115,5 @@ datum/shuttle_manager/proc/move_shuttle(var/override_delay) usr << "Docking locks are engaged. Sending request to leave..." var/datum/shuttle_manager/s = shuttles["ferry"] admins << "FERRY: [key_name(usr)] (?) (Move) is requesting to move the transport ferry to [s.location == /area/shuttle/transport1/centcom ? "the station" : "Centcom"]." - spawn(100) + spawn(600) //One minute cooldown cooldown = 0 \ No newline at end of file From 9cd7234fbf24fb2322a797fa1b918724c56159e6 Mon Sep 17 00:00:00 2001 From: ikarrus Date: Tue, 26 Aug 2014 10:33:47 -0600 Subject: [PATCH 2/2] -Reverted AI announcement cooldown change -AI announcements are now minor announcements --- code/game/machinery/computer/communications.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 71f9821302b..83fabe9a06b 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -496,7 +496,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 dat += "
\[ Call Emergency Shuttle \]" dat += "
\[ Set Status Display \]" dat += "

Special Functions" - dat += "
\[ Make a Priority Announcement \]" + dat += "
\[ Make an Announcement \]" dat += "
\[ Change Alert Level \]" dat += "
\[ Emergency Maintenance Access \]" if(STATE_CALLSHUTTLE) @@ -557,9 +557,9 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(!input || !user.canUseTopic(src)) return if(is_silicon) - priority_announce(input, null, null, "Priority") + minor_announce(input) ai_message_cooldown = 1 - spawn(3000)//Five minute cooldown + spawn(600)//One minute cooldown ai_message_cooldown = 0 else priority_announce(input, null, 'sound/misc/announce.ogg', "Captain")