Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935

[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
parent 6fd18b363c aaeb9331f5
commit 216b0931d1
41 changed files with 1122 additions and 401 deletions
@@ -962,7 +962,7 @@
 	playsound(src, 'sound/magic/clockwork/fellowship_armory.ogg', 75, TRUE)
 	var/mob/living/simple_animal/parrot/clock_hawk/H = new(loc)
 	H.setDir(dir)
-	dust()
+	qdel(src)

 /mob/living/simple_animal/parrot/Poly/ghost
 	name = "The Ghost of Poly"