Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780

[MIRROR] Disentangles blob from blob mode/removes blob mode

code/modules/admin/player_panel.dm

@@ -594,19 +594,13 @@
 		for(var/mob/camera/blob/B in GLOB.mob_list)
 			blob_minds |= B.mind
 
-		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>"
-			if(istype(SSticker.mode, /datum/game_mode/blob))
-				var/datum/game_mode/blob/mode = SSticker.mode
-				blob_minds |= mode.blob_overminds
-				dat += "<tr><td><i>Progress: [GLOB.blobs_legit.len]/[mode.blobwincount]</i></td></tr>"
-
 			for(var/datum/mind/blob in blob_minds)
-				var/mob/M = blob.current
+				var/mob/camera/blob/M = blob.current
 				if(M)
 					dat += "<tr><td><a href='?_src_=holder;[HrefToken()];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(No Client)</i>"][M.stat == DEAD ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
 					dat += "<td><A href='?priv_msg=[M.ckey]'>PM</A></td>"
 					dat += "<td><A href='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[M]'>FLW</a></td></tr>"
+					dat += "<tr><td><i>Progress: [M.blobs_legit.len]/[M.blobwincount]</i></td></tr>"
 				else
 					dat += "<tr><td><a href='?_src_=vars;[HrefToken()];Vars=\ref[blob]'>[blob.name]([blob.key])</a><i>Blob not found!</i></td>"
 					dat += "<td><A href='?priv_msg=[blob.key]'>PM</A></td></tr>"

code/modules/admin/verbs/debug.dm

@@ -262,10 +262,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
 	if(ishuman(M))
 		log_admin("[key_name(src)] has blobized [M.key].")
 		var/mob/living/carbon/human/H = M
-		spawn(0)
-			var/mob/camera/blob/B = H.become_overmind(FALSE)
-			B.place_blob_core(B.base_point_rate, -1) //place them wherever they are
-
+		H.become_overmind()
 	else
 		alert("Invalid mob")