From 48eb4a0a49a35d8ded90fe1b487d8f3cc66469f9 Mon Sep 17 00:00:00 2001 From: Leshana Date: Thu, 18 May 2017 19:30:54 -0400 Subject: [PATCH] Prevent speech duplicating through zshadow mobs --- code/modules/multiz/zshadow.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/multiz/zshadow.dm b/code/modules/multiz/zshadow.dm index 9a537578757..c7a04a5cf55 100644 --- a/code/modules/multiz/zshadow.dm +++ b/code/modules/multiz/zshadow.dm @@ -35,6 +35,8 @@ // Relay some stuff they hear /mob/zshadow/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "", var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol) + if(speaker && speaker.z != src.z) + return // Only relay speech on our acutal z, otherwise we might relay sounds that were themselves relayed up! if(isliving(owner)) verb += " from above" return owner.hear_say(message, verb, language, alt_name, italics, speaker, speech_sound, sound_vol)