Merge pull request #25830 from ExcessiveUseOfCobblestone/patch-4

fixes #25754 [what is this new meme title req]
This commit is contained in:
duncathan salt
2017-04-03 22:44:53 -06:00
committed by GitHub
+2 -2
View File
@@ -90,7 +90,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")
var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombie")
var/list/choosable_races = list()
/obj/structure/mirror/magic/New()
@@ -223,4 +223,4 @@
curse(user)
/obj/structure/mirror/magic/proc/curse(mob/living/user)
return
return