mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 12:41:09 +01:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user