diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 351b7845205..a19901fa6fc 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -549,9 +549,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/type = input(usr, "Pick a type of report to send", "Report Type", "") as anything in MsgType
var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null
- var/customname = input(usr, "Pick a title for the report.", "Title") as text|null
if(!input)
return
+ var/customname = input(usr, "Pick a title for the report.", "Title") as text|null
+ if(!customname)
+ return
if(type == "Enemy Communications")
if(!customname)
@@ -560,11 +562,13 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/from = input(usr, "What kind of report? Example: Syndicate Communique", "From") as text|null
if(!from)
from = "Syndicate Communique"
- switch(alert("Should this be announced to the general population?",,"Yes","No"))
+ switch(alert("Should this be announced to the general population?",,"Yes","No", "Cancel"))
if("Yes")
communications_announcement.Announce(input, customname, , , , from);
- if("No")
+ else if("No")
to_chat(world, "[from] available at all communications consoles.")
+ else
+ return
print_command_report(input, from)
@@ -918,4 +922,4 @@ Traitors and the like can also be revived with the previous role mostly intact.
for(var/datum/station_goal/S in ticker.mode.station_goals)
dat += "[S.name] - Announce | Remove
"
dat += "
Add New Goal"
- usr << browse(dat, "window=goals;size=400x400")
\ No newline at end of file
+ usr << browse(dat, "window=goals;size=400x400")