Merge pull request #3538 from Citadel-Station-13/upstream-merge-31913

[MIRROR] Blob fixes

code/game/gamemodes/blob/blobs/core.dm

@@ -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."
 

code/game/gamemodes/blob/overmind.dm

@@ -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))

code/modules/admin/player_panel.dm

@@ -441,7 +441,7 @@
 					dat += "<tr><td><a href='?_src_=vars;[HrefToken()];Vars=\ref[N]'>[N.name]([N.key])</a><i>Head body destroyed!</i></td>"
 					dat += "<td><A href='?priv_msg=[N.key]'>PM</A></td></tr>"
 			dat += "</table>"
-      
+
 		if(SSticker.mode.changelings.len > 0)
 			dat += "<br><table cellspacing=5><tr><td><B>Changelings</B></td><td></td><td></td></tr>"
 			for(var/datum/mind/changeling in SSticker.mode.changelings)
@@ -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)

code/modules/events/blob.dm

@@ -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()

code/modules/mob/transform_procs.dm

@@ -376,8 +376,6 @@
 		if(!transfer_after)
 			mind.active = FALSE
 		mind.transfer_to(R)
-		if(mind.special_role)
-			R.mind.store_memory("In case you look at this after being borged, the objectives are only here until I find a way to make them not show up for you, as I can't simply delete them without screwing up round-end reporting. --NeoFite")
 	else if(transfer_after)
 		R.key = key
 
@@ -464,10 +462,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)