Merge pull request #4738 from Citadel-Station-13/upstream-merge-34111

[MIRROR] Fixes buckled message spam for ghosts inside talking scythes
2018-01-10 19:58:18 +00:00
parent 400de30b93 8ea39a60cd
commit 54c87fdd15
3 changed files with 5 additions and 2 deletions
@@ -229,6 +229,9 @@
 	hitsound = 'sound/weapons/rapierhit.ogg'
 	var/possessed = FALSE

+/obj/item/nullrod/scythe/talking/relaymove(mob/user)
+	return //stops buckled message spam for the ghost.
+
 /obj/item/nullrod/scythe/talking/attack_self(mob/living/user)
 	if(possessed)
 		return