diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index c3e8d10ec8d..ff953fb8e3e 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -584,7 +584,12 @@
 
 	var/list/mob_list = list()
 	for(var/mob/living/silicon/ai/M in world)
-		mob_list.Add(M)
+		if(ticker)
+			if(ticker.mode == "AI malfunction")
+				var/datum/game_mode/malfunction/malf = ticker.mode
+				for (var/datum/mind/B in malf.malf_ai)
+					if (M.mind == B)
+					else mob_list.Add(M)
 	for(var/mob/living/silicon/robot/M in world)
 		mob_list.Add(M)
 	for(var/mob/living/carbon/human/M in world)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 73620715df8..64a1f64d2f5 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1324,6 +1324,17 @@
 			namecounts[name] = 1
 		creatures[name] = B
 
+	for (var/mob/living/silicon/decoy/D in world)
+		var/name = "[D.name]"
+		if (name in names)
+			namecounts[name]++
+			name = "[name] ([namecounts[name]])"
+		else
+			names.Add(name)
+			namecounts[name] = 1
+		creatures[name] = D
+
+
 
 
 //THIS IS HOW YOU ADD OBJECTS TO BE OBSERVED