Blob fixes

code/modules/admin/player_panel.dm

@@ -593,6 +593,7 @@
 		var/list/blob_minds = list()
 		for(var/mob/camera/blob/B in GLOB.mob_list)
 			blob_minds |= B.mind
+<<<<<<< HEAD
 
 		if(istype(SSticker.mode, /datum/game_mode/blob) || blob_minds.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Blob</B></td><td></td><td></td></tr>"
@@ -601,6 +602,10 @@
 				blob_minds |= mode.blob_overminds
 				dat += "<tr><td><i>Progress: [GLOB.blobs_legit.len]/[mode.blobwincount]</i></td></tr>"
 
+=======
+			if(blob_minds.len)
+				dat += "<br><table cellspacing=5><tr><td><B>Blob</B></td><td></td><td></td></tr>"
+>>>>>>> 7034a22... Blob fixes (#31913)
 			for(var/datum/mind/blob in blob_minds)
 				var/mob/M = blob.current
 				if(M)

code/modules/events/blob.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /datum/round_event_control/blob
 	name = "Blob"
 	typepath = /datum/round_event/ghost_role/blob
@@ -36,3 +37,34 @@
 	message_admins("[key_name_admin(BC.overmind)] has been made into a blob overmind by an event.")
 	log_game("[key_name(BC.overmind)] was spawned as a blob overmind by an event.")
 	return SUCCESSFUL_SPAWN
+=======
+/datum/round_event_control/blob
+	name = "Blob"
+	typepath = /datum/round_event/ghost_role/blob
+	weight = 10
+	max_occurrences = 1
+
+	min_players = 20
+
+	gamemode_blacklist = list("blob") //Just in case a blob survives that long
+
+/datum/round_event/ghost_role/blob
+	announceWhen	= -1
+	role_name = "blob overmind"
+
+/datum/round_event/ghost_role/blob/announce()
+	priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg')
+
+/datum/round_event/ghost_role/blob/spawn_role()
+	if(!GLOB.blobstart.len)
+		return MAP_ERROR
+	var/list/candidates = get_candidates("blob", null, ROLE_BLOB)
+	if(!candidates.len)
+		return NOT_ENOUGH_PLAYERS
+	var/mob/dead/observer/new_blob = pick(candidates)
+	var/mob/camera/blob/BC = new_blob.become_overmind()
+	spawned_mobs += BC
+	message_admins("[key_name_admin(BC)] has been made into a blob overmind by an event.")
+	log_game("[key_name(BC)] was spawned as a blob overmind by an event.")
+	return SUCCESSFUL_SPAWN
+>>>>>>> 7034a22... Blob fixes (#31913)

code/modules/mob/transform_procs.dm

@@ -462,12 +462,18 @@
 	. = new_slime
 	qdel(src)
 
+<<<<<<< HEAD
 /mob/proc/become_overmind(mode_made, starting_points = 60)
 	var/mob/camera/blob/B = new /mob/camera/blob(loc, 0, mode_made, starting_points)
 	if(mind)
 		mind.transfer_to(B)
 	else
 		B.key = key
+=======
+/mob/proc/become_overmind(starting_points = 60)
+	var/mob/camera/blob/B = new /mob/camera/blob(loc, starting_points)
+	B.key = key
+>>>>>>> 7034a22... Blob fixes (#31913)
 	. = B
 	qdel(src)