Merge pull request #8323 from Kyep/classified_announce

Stops announcing classified stuff
This commit is contained in:
tigercat2000
2017-11-26 12:06:22 -08:00
committed by GitHub
2 changed files with 7 additions and 1 deletions
+6
View File
@@ -8,6 +8,7 @@ var/datum/nanomanager/nanomanager = new()
var/datum/event_manager/event_manager = new()
// Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it.
var/global/obj/item/device/radio/intercom/global_announcer = create_global_announcer()
var/global/obj/item/device/radio/intercom/command/command_announcer = create_command_announcer()
// Load order issues means this can't be new'd until other code runs
// This is probably not the way I should be doing this, but I don't know how to do it right!
proc/create_global_announcer()
@@ -15,6 +16,11 @@ proc/create_global_announcer()
global_announcer = new(null)
return
proc/create_command_announcer()
spawn(0)
command_announcer = new(null)
return
var/list/paper_tag_whitelist = list("center","p","div","span","h1","h2","h3","h4","h5","h6","hr","pre", \
"big","small","font","i","u","b","s","sub","sup","tt","br","hr","ol","ul","li","caption","col", \
"table","td","th","tr")
+1 -1
View File
@@ -578,7 +578,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
print_command_report(input, "[command_name()] Update")
else if("No")
//same thing as the blob stuff - it's not public, so it's classified, dammit
command_announcement.Announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg', from = "[command_name()] Update")
command_announcer.autosay("A classified message has been printed out at all communication consoles.");
print_command_report(input, "Classified [command_name()] Update")
else
return