Merge pull request #3551 from Citadel-Station-13/upstream-merge-31922

[MIRROR] Adds admin override for false alarm event.
2017-10-23 03:44:25 -04:00
parent 0eb828c603 5d20c88a5c
commit 58ef2f1872
3 changed files with 65 additions and 36 deletions
@@ -165,6 +165,7 @@
 			return
 		var/datum/round_event_control/E = locate(href_list["forceevent"]) in SSevents.control
 		if(E)
+			E.admin_setup(usr)
 			var/datum/round_event/event = E.runEvent()
 			if(event.announceWhen>0)
 				event.processing = FALSE