cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX telekinesis unable to interact with things (#22881)

Browse Source
This commit is contained in:
Bop
2025-01-20 11:31:22 +07:00
committed by GitHub
parent 7f9098455f
commit 84ad6a4d30
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/telekinesis.dm
View File

@@ -19,7 +19,7 @@
if(user.stat || !tkMaxRangeCheck(user, src))
return
new /obj/effect/temp_visual/telekinesis(get_turf(src))
user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc
user.UnarmedAttack(src, FALSE, list()) // attack_hand, attack_paw, etc
add_hiddenprint(user)
return

8
code/game/machinery/_machinery.dm
View File

@@ -299,10 +299,6 @@ Class Procs:
return user.can_interact_with(src) //AIs don't care about petty mortal concerns like needing to be next to a machine to use it, but borgs do care somewhat
. = ..()
if(!.)
return FALSE
if(panel_open && !(interaction_flags_machine & INTERACT_MACHINE_OPEN))
return FALSE
@@ -395,6 +391,10 @@ Class Procs:
return FALSE
return _try_interact(user, modifiers)
/obj/machinery/attack_tk(mob/user, modifiers)
new /obj/effect/temp_visual/telekinesis(get_turf(src))
return attack_hand(user, modifiers)
/obj/machinery/attack_ai(mob/user, modifiers)
if(!(interaction_flags_machine & INTERACT_MACHINE_ALLOW_SILICON) && !IsAdminGhost(user))
return FALSE