From 825d280ecc1d2e6f862dc4b65696a6fa6c2faf3d Mon Sep 17 00:00:00 2001 From: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat, 21 Aug 2021 20:49:28 +0100 Subject: [PATCH] Fixes flying/jaunting/floating mobs breaking glass tables. (#16583) * makes flying/jaunting things not smash tables * Update code/game/objects/structures/tables_racks.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> * Update code/game/objects/structures/tables_racks.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/objects/structures/tables_racks.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 63db6501f74..f6562d44c1f 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -408,6 +408,10 @@ return if(!isliving(AM)) return + var/mob/living/L = AM + if(L.incorporeal_move || L.flying || L.floating) + return + // Don't break if they're just flying past if(AM.throwing) addtimer(CALLBACK(src, .proc/throw_check, AM), 5)