Blob fixes (#31913)

* Blob alarm sounds

* Fixes antag panel and blob report being sent too early

* Assigning fix

* Keeps announcement for use in false alarm
This commit is contained in:
KorPhaeron
2017-10-21 14:07:55 -05:00
committed by AnturK
parent d95865656f
commit 7034a22e78
5 changed files with 11 additions and 7 deletions

View File

@@ -23,8 +23,12 @@
if(overmind)
update_icon()
point_rate = new_rate
addtimer(CALLBACK(src, .proc/generate_announcement), 1800)
. = ..()
/obj/structure/blob/core/proc/generate_announcement()
priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg')
/obj/structure/blob/core/scannerreport()
return "Directs the blob's expansion, gradually expands, and sustains nearby blob spores and blobbernauts."

View File

@@ -72,11 +72,13 @@ GLOBAL_LIST_EMPTY(blob_nodes)
set_security_level("delta")
max_blob_points = INFINITY
blob_points = INFINITY
addtimer(CALLBACK(src, .proc/victory), 660)
addtimer(CALLBACK(src, .proc/victory), 450)
..()
/mob/camera/blob/proc/victory()
sound_to_playing_players('sound/machines/alarm.ogg')
sleep(100)
for(var/mob/living/L in GLOB.mob_list)
var/turf/T = get_turf(L)
if(!T || !(T.z in GLOB.station_z_levels))

View File

@@ -593,7 +593,8 @@
var/list/blob_minds = list()
for(var/mob/camera/blob/B in GLOB.mob_list)
blob_minds |= B.mind
if(blob_minds.len)
dat += "<br><table cellspacing=5><tr><td><B>Blob</B></td><td></td><td></td></tr>"
for(var/datum/mind/blob in blob_minds)
var/mob/camera/blob/M = blob.current
if(M)

View File

@@ -9,7 +9,7 @@
gamemode_blacklist = list("blob") //Just in case a blob survives that long
/datum/round_event/ghost_role/blob
announceWhen = 12
announceWhen = -1
role_name = "blob overmind"
/datum/round_event/ghost_role/blob/announce()

View File

@@ -464,10 +464,7 @@
/mob/proc/become_overmind(starting_points = 60)
var/mob/camera/blob/B = new /mob/camera/blob(loc, starting_points)
if(mind)
mind.transfer_to(B)
else
B.key = key
B.key = key
. = B
qdel(src)