diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 51001f9f6c5..d6b2d3cbc85 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -189,9 +189,21 @@ var/global/datum/controller/gameticker/ticker
 				world << "<b>[aiPlayer.name]'s laws at the end of the game were:</b>"
 			else
 				world << "<b>[aiPlayer.name]'s laws when it was deactivated were:</b>"
-
 			aiPlayer.show_laws(1)
 
+			var/robolist = "The AI's loyal minions were: "
+			for(var/mob/living/silicon/robot/robo in world)
+				if (robo.connected_ai == aiPlayer)
+					robolist += "[robo.name][robo.stat == 2?" (Deactivated), ":", "]"
+
+	for (var/mob/living/silicon/robot/robo in world)
+		if (!robo.connected_ai)
+			if (robo.stat != 2)
+				world << "<b>[robo.name] survived as an AI-less borg! Its laws were:</b>"
+			else
+				world << "<b>[robo.name] was unable to survive the rigors of being a cyborg without an AI. Its laws were:</b>"
+			robo.show_laws(1)
+
 	mode.declare_completion()
 
 	return 1
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 8b958753fbf..2a3511894b6 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -13,6 +13,7 @@
 		src.verbs += /mob/dead/observer/proc/reenter_corpse
 
 /mob/proc/ghostize()
+	set category = "Special Verbs"
 	set name = "Ghost"
 	set desc = "You cannot be revived as a ghost"
 	if(src.client)