Fixes ghost role / admin events announcing after they failed to spawn the antagonist. Admin spawned blobs will no longer announce immediately. (#69671)

* Fixes ghost role / admin events announcing after they failed to spawn the antagonist.

* Actually, this isn't even needed
This commit is contained in:
ShizCalev
2022-09-04 20:05:00 -07:00
committed by GitHub
parent 89daba4f88
commit 1fd1271c8f
2 changed files with 6 additions and 0 deletions
+2
View File
@@ -22,6 +22,8 @@
fakeable = TRUE
/datum/round_event/ghost_role/blob/announce(fake)
if(!fake)
return //the mob itself handles this.
priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", ANNOUNCER_OUTBREAK5)
/datum/round_event/ghost_role/blob/spawn_role()
+4
View File
@@ -8,6 +8,7 @@
var/role_name = "debug rat with cancer" // Q U A L I T Y M E M E S
var/list/spawned_mobs = list()
var/status
var/cached_announcement_chance
fakeable = FALSE
/datum/round_event/ghost_role/start()
@@ -19,6 +20,9 @@
processing = FALSE
status = spawn_role()
if(isnull(cached_announcement_chance))
cached_announcement_chance = announce_chance //only announce once we've finished the spawning loop.
announce_chance = (status == SUCCESSFUL_SPAWN ? cached_announcement_chance : 0)
if((status == WAITING_FOR_SOMETHING))
if(retry >= MAX_SPAWN_ATTEMPT)
message_admins("[role_name] event has exceeded maximum spawn attempts. Aborting and refunding.")