From ec967cbaa7b3d96ce2bd0e726e514e5e04ebb30c Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Tue, 29 Jun 2021 07:23:33 -0400 Subject: [PATCH] Prevents TK moving objects with people in or buckled to it (#16160) * Prevents TK moving objects with people in or buckled to it * Better proc for mob checking Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/_onclick/telekinesis.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 342af86c0b6..7b9dc898399 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -139,6 +139,12 @@ else + if(focus.buckled_mobs) + to_chat(user, "This object is too heavy to move with something buckled to it!") + return + if(length(focus.client_mobs_in_contents)) + to_chat(user, "This object is too heavy to move with something inside of it!") + return apply_focus_overlay() focus.throw_at(target, 10, 1, user) last_throw = world.time