Merge pull request tgstation#6382 from HippieStation/upstream-merge-3…

…5147 [MIRROR] Blacklists servant golems from the magic mirror
asskek · Feb 1, 2018 · 7844d82 · 7844d82
2 parents be93c5b + d37efc8
commit 7844d82
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
@@ -89,7 +89,7 @@
 	name = "magic mirror"
 	desc = "Turn and face the strange... face."
 	icon_state = "magic_mirror"
-	var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombies")
+	var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombies", "clockwork golem servant")
 	var/list/choosable_races = list()
 
 /obj/structure/mirror/magic/New()