From 7fd605fa7d52df6b06c90d15a32feede206afdd2 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 30 Mar 2022 07:27:27 -0500 Subject: [PATCH] Fix plants hurting user when using telekinesis (#65759) Fixes #65454 Using telekinesis with harmful plants won't harm them anymore since they aren't in physical contact. --- code/datums/elements/plant_backfire.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/elements/plant_backfire.dm b/code/datums/elements/plant_backfire.dm index 512cfd0b613..f753947e9ea 100644 --- a/code/datums/elements/plant_backfire.dm +++ b/code/datums/elements/plant_backfire.dm @@ -40,6 +40,7 @@ if(plant_safety_check(source, user)) return + SEND_SIGNAL(source, COMSIG_PLANT_ON_BACKFIRE, user) if(cancel_action) return COMPONENT_CANCEL_ATTACK_CHAIN @@ -89,6 +90,9 @@ if(!istype(user)) return TRUE + if(istype(source, /obj/item/tk_grab)) // since we aren't actually touching the plant + return TRUE + if(HAS_TRAIT(user, TRAIT_PLANT_SAFE)) return TRUE