diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 15c989956e8..fa4ce9d0ac9 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1,4 +1,7 @@
+var/global/BSACooldown = 0
+
+
////////////////////////////////
/proc/message_admins(var/text, var/admin_ref = 0)
var/rendered = "ADMIN LOG: [text]"
@@ -1125,6 +1128,10 @@
sleep(2)
cl.jumptomob(M)
+
+
+
+
if (href_list["BlueSpaceArtillery"])
var/mob/M = locate(href_list["BlueSpaceArtillery"])
if(!M)
@@ -1134,6 +1141,15 @@
if (choice == "No")
return
+ if(BSACooldown)
+ src.owner << "Standby! Reload cycle in progress! Gunnary crews ready in five seconds!"
+ return
+
+ BSACooldown = 1
+ spawn(50)
+ BSACooldown = 0
+
+
M << "You've been hit by bluespace artillery!"
log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]")
message_admins("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]")
@@ -1172,8 +1188,13 @@
var/input = input(src.owner, "Please enter a message to reply to [key_name(M)] via their headset.","Outgoing message from Centcomm", "")
if(!input)
return
+
+ src.owner << "You sent [input] to [M] via a secure channel."
+ log_admin("[src.owner] replied to [key_name(M)]'s Centcomm message with the message [input].")
M << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\""
+ return
+
if (href_list["SyndicateReply"])
var/mob/M = locate(href_list["SyndicateReply"])
if(!M)
@@ -1187,8 +1208,12 @@
var/input = input(src.owner, "Please enter a message to reply to [key_name(M)] via their headset.","Outgoing message from The Syndicate", "")
if(!input)
return
+
+ src.owner << "You sent [input] to [M] via a secure channel."
+ log_admin("[src.owner] replied to [key_name(M)]'s Syndicate message with the message [input].")
M << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. [input]. Message ends.\""
+ return
if (href_list["jumpto"])
if(rank in list("Badmin", "Game Admin", "Game Master"))
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 1a86832226f..8f9de74638f 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -27,16 +27,19 @@
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+// log_admin("[key_name(Sender)] sent a message to Centcomm! The message was [msg]") // Handled somewhere else
for (var/mob/M in world)
if (M.client && M.client.holder)
- M << "\blue CENTCOMM:[key_name(Sender, M)] (PP) (VV) (SM) (JMP) (CA) (RPLY): [msg]"
- // (BSA)
+ M << "\blue CENTCOMM:[key_name(Sender, M)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]"
+ //
/proc/Syndicate_announce(var/text , var/mob/Sender)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
+// log_admin("[key_name(Sender)] sent a message to the Syndicate! The message was [msg]") // Handled somewhere else
+
for (var/mob/M in world)
if (M.client && M.client.holder)
- M << "\blue SYNDICATE:[key_name(Sender, M)] (PP) (VV) (SM) (JMP) (CA) (RPLY): [msg]"
- // (BSA)
+ M << "\blue SYNDICATE:[key_name(Sender, M)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]"
+ //