From 8efbb58ca6cbda86816659abb07392033b29c105 Mon Sep 17 00:00:00 2001 From: Kenionatus Date: Thu, 19 Sep 2024 04:26:30 +0200 Subject: [PATCH] fix too much squeaking (#26813) * fix too much squeaking fixes bug #26805 that was introduced in PR #26709 that caused squeaky things to squeak even when something was simply moved within the turf (e.g. into a storage container). * make double sure it works --- code/datums/components/squeak.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index 31dbb4897d1..908ab5130f9 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -72,6 +72,8 @@ steps++ /datum/component/squeak/proc/play_squeak_crossed(atom/source, atom/movable/crossing) + if(!isturf(crossing.loc) || !isturf(source.loc)) + return if(istype(crossing, /obj/effect)) return if(ismob(crossing))