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

Commit 4df7562

Browse files
committed
fix telekinesis
1 parent 3f44f82 commit 4df7562

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

code/modules/psionics/equipment/psipower.dm

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,10 @@
3030
user.dropItemToGround(src)
3131

3232
/obj/item/psychic_power/process()
33-
if(istype(owner))
34-
if(!owner?.psi?.spend_power(maintain_cost))
35-
qdel(src)
3633
if(!owner || loc != owner || !(src in owner.held_items))
3734
if(ishuman(loc))
3835
var/mob/living/carbon/human/host = loc
3936
host.remove_embedded_object(src)
40-
host.dropItemToGround(src)
41-
else
42-
qdel(src)
37+
qdel(src)
38+
else if(istype(owner) && !owner?.psi?.spend_power(maintain_cost))
39+
qdel(src)

code/modules/psionics/equipment/psipower_tk.dm

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
/obj/item/psychic_power/telekinesis/process()
1212
if(!focus || !isturf(focus.loc) || !valid_distance(owner, focus))
13-
owner.dropItemToGround(src)
13+
qdel(src)
1414
return
1515
. = ..()
1616

@@ -59,12 +59,15 @@
5959
return
6060

6161
if(!valid_distance(user, target))
62-
owner.dropItemToGround(src)
6362
to_chat(user, span_warning("Your telekinetic power won't reach that far."))
63+
qdel(src)
64+
return
65+
66+
if(!user.psi || !user.psi.can_use())
6467
return
6568

66-
if(!user.psi || !user.psi.can_use() || !user.psi.spend_power(5))
67-
owner.dropItemToGround(src)
69+
if(!user.psi.spend_power(5))
70+
qdel(src)
6871
return
6972

7073
user.psi.set_cooldown(5)
@@ -87,7 +90,7 @@
8790
/obj/item/psychic_power/telekinesis/proc/end_throw()
8891
sparkle()
8992
if(!focus || !isturf(focus.loc) || !valid_distance(owner, focus))
90-
owner.dropItemToGround(src)
93+
qdel(src)
9194

9295
/obj/item/psychic_power/telekinesis/proc/sparkle()
9396
set waitfor = 0

0 commit comments

Comments
 (0)