Merge upstream

This commit is contained in:
Cyberboss
2017-04-01 23:38:37 -04:00
121 changed files with 2258 additions and 4320 deletions
@@ -16,5 +16,5 @@
message_admins("An alien egg has been delivered to [A] at [ADMIN_COORDJMP(T)].")
log_game("An alien egg has been delivered to [A] at [COORD(T)]")
var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen."
addtimer(CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time)
SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time))
qdel(src)