diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 32bfaf02d02..16ec25f1710 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")
@@ -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,7 +557,7 @@ 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(600)//One minute cooldown
ai_message_cooldown = 0
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 308da4adc37..fd8c3a3e653 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