Makes false alarm use more explicit in event code.

This commit is contained in:
AnturK
2017-11-11 14:36:36 -06:00
committed by CitadelStationBot
parent 662c42b450
commit f6e07cf824
47 changed files with 952 additions and 47 deletions
+7 -6
View File
@@ -13,10 +13,8 @@
var/list/possible_types = list()
for(var/datum/round_event_control/E in SSevents.control)
if(istype(E, /datum/round_event_control/falsealarm))
continue
var/datum/round_event/event = E.typepath
if(initial(event.announceWhen) <= 0)
if(!initial(event.fakeable))
continue
possible_types += E
@@ -28,8 +26,11 @@
/datum/round_event/falsealarm
announceWhen = 0
endWhen = 1
fakeable = FALSE
/datum/round_event/falsealarm/announce()
/datum/round_event/falsealarm/announce(fake)
if(fake) //What are you doing
return
var/players_amt = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1)
var/gamemode = SSticker.mode.config_tag
@@ -45,7 +46,7 @@
var/datum/round_event/Event = new event_control.typepath()
message_admins("False Alarm: [Event]")
Event.kill() //do not process this event - no starts, no ticks, no ends
Event.announce() //just announce it like it's happening
Event.announce(TRUE) //just announce it like it's happening
/proc/gather_false_events(players_amt, gamemode)
. = list()
@@ -56,6 +57,6 @@
continue
var/datum/round_event/event = E.typepath
if(initial(event.announceWhen) <= 0)
if(!initial(event.fakeable))
continue
. += E