From 841f3596b83dcfccc7bc0291e502c263bfe5fd4b Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 27 Jul 2023 22:22:38 +0200 Subject: [PATCH] [MIRROR] fixes SM crystals dusting themselves after falling [MDB IGNORE] (#22729) * fixes SM crystals dusting themselves after falling (#77128) ## About The Pull Request get_z_move_affected always returns src which is something that wasnt exactly accounted in this case ## Why It's Good For The Game fixes #76811 ## Changelog :cl: fix: shoving a crystal down a hole no longer makes it dust itself /:cl: * fixes SM crystals dusting themselves after falling --------- Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com> --- code/datums/components/supermatter_crystal.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/components/supermatter_crystal.dm b/code/datums/components/supermatter_crystal.dm index 39373e98036..6337b729923 100644 --- a/code/datums/components/supermatter_crystal.dm +++ b/code/datums/components/supermatter_crystal.dm @@ -213,6 +213,8 @@ /datum/component/supermatter_crystal/proc/intercept_z_fall(datum/source, list/falling_movables, levels) SIGNAL_HANDLER for(var/atom/movable/hit_object as anything in falling_movables) + if(hit_object == source) + continue bumped_hit(parent, hit_object) return FALL_INTERCEPTED | FALL_NO_MESSAGE