From 594de23c1f3802af1ddbcf772a526f8e4aec6d8b Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Wed, 10 Jan 2018 04:46:56 -0500 Subject: [PATCH 1/2] Fixes buckled message spam for ghosts inside talking scythes (#34111) * Fixes buckled message spam for ghosts * params --- code/game/objects/items/holy_weapons.dm | 3 +++ code/modules/mob/living/brain/MMI.dm | 2 +- code/modules/mob/living/inhand_holder.dm | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 21e3f26cd7..d31d37ee96 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -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 diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index e090592ba3..5d51024adc 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -198,7 +198,7 @@ else to_chat(user, "The MMI indicates the brain is active.") -/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 diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm index 6a2308b621..7e9b434e1f 100644 --- a/code/modules/mob/living/inhand_holder.dm +++ b/code/modules/mob/living/inhand_holder.dm @@ -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()