Merge branch 'fake-master' into development

# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm
This commit is contained in:
skull132
2017-12-09 00:08:21 +02:00
35 changed files with 9515 additions and 9309 deletions

View File

@@ -19,4 +19,4 @@
/datum/event/ccia_general_notice/announce()
if(announce)
command_announcement.Announce("[reportbody]", reporttitle, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1);
command_announcement.Announce("[reportbody]", reporttitle, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1, do_newscast=1, do_print=1);