cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 23:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed telekinesis putting beaker in hand when swapped (#26130)

Browse Source 
* fixes beaker telekinesis

* removed unneeded spacing

* commenting

* user to usr
This commit is contained in:
Kyani
2024-07-08 16:01:49 -04:00
committed by GitHub
parent ca93f6bc77
commit b287cdb7bf
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+5 -2
View File
@@ -251,8 +251,11 @@
return
I.forceMove(src)
if(beaker)
user.put_in_hands(beaker)
to_chat(user, "<span class='notice'>You swap [I] with [beaker].</span>")
to_chat(usr, "<span class='notice'>You swap [I] with [beaker].</span>")
if(Adjacent(usr) && !issilicon(usr)) //Prevents telekinesis from putting in hand
user.put_in_hands(beaker)
else
beaker.forceMove(loc)
else
to_chat(user, "<span class='notice'>You set [I] on the machine.</span>")
beaker = I
code/modules/reagents/chemistry/machinery/chem_master.dm
+5 -2
View File
@@ -125,8 +125,11 @@
return
I.forceMove(src)
if(beaker)
user.put_in_hands(beaker)
to_chat(user, "<span class='notice'>You swap [I] with [beaker] inside.</span>")
to_chat(usr, "<span class='notice'>You swap [I] with [beaker] inside.</span>")
if(Adjacent(usr) && !issilicon(usr)) //Prevents telekinesis from putting in hand
user.put_in_hands(beaker)
else
beaker.forceMove(loc)
else
to_chat(user, "<span class='notice'>You add [I] to the machine.</span>")
beaker = I