Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

FIX telekinesis unable to interact with things #22881

Merged
ToasterBiome merged 4 commits into from
Jan 20, 2025
Merged

FIX telekinesis unable to interact with things #22881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4eea0e
unga bungaaaaaaaaaaaaaaaaaaaa
warface1234455 Dec 21, 2024
1ef3aa9
eh
warface1234455 Dec 22, 2024
624d668
doomedwwwa
warface1234455 Dec 22, 2024
4870d00
Update code/_onclick/telekinesis.dm
warface1234455 Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/_onclick/telekinesis.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions code/game/machinery/_machinery.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
Loading