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
+1 -1
View File
@@ -25,7 +25,7 @@
return list("title" = title, "message" = message)
/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args)
command_announcement.Announce(args["message"], args["title"])
command_announcement.Announce(args["message"], args["title"], do_newscast=1, do_print=1)
return 1
/datum/uplink_item/abstract/announcements/fake_crew_arrival