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

[MIRROR] Fixes buckled message spam for ghosts inside talking scythes
This commit is contained in:
deathride58
2018-01-10 19:58:18 +00:00
committed by GitHub
3 changed files with 5 additions and 2 deletions
+1 -1
View File
@@ -198,7 +198,7 @@
else
to_chat(user, "<span class='notice'>The MMI indicates the brain is active.</span>")
/obj/item/device/mmi/relaymove()
/obj/item/device/mmi/relaymove(mob/user)
return //so that the MMI won't get a warning about not being able to move if it tries to move
/obj/item/device/mmi/syndie
+1 -1
View File
@@ -63,7 +63,7 @@
qdel(src)
return TRUE
/obj/item/clothing/head/mob_holder/relaymove()
/obj/item/clothing/head/mob_holder/relaymove(mob/user)
release()
/obj/item/clothing/head/mob_holder/container_resist()