cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-13 17:14:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] fix modular id console telekinesis+ai (#3276)

Browse Source 
* fix modular id console telekinesis+ai (#56787)

* fix modular id console telekinesis+ai

Co-authored-by: Fhaxaris <Chrisamcculler@gmail.com>
This commit is contained in:
SkyratBot
2021-02-11 01:05:49 +01:00
committed by GitHub
parent 7fd024ab80
commit cd2f7ed397
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/card.dm
+1 -1
View File
@@ -161,7 +161,7 @@
else
var/obj/item/I = user.get_active_held_item()
if(istype(I, /obj/item/card/id))
return card_slot2.try_insert(I)
return card_slot2.try_insert(I, user)
return FALSE
if("PRG_terminate")
if(!computer || !authenticated)
code/modules/modular_computers/hardware/card_slot.dm
+6 -1
View File
@@ -47,6 +47,11 @@
if(stored_card)
return FALSE
// item instead of player is checked so telekinesis will still work if the item itself is close
if(!in_range(src, I))
return FALSE
if(user)
if(!user.transferItemToLoc(I, src))
return FALSE
@@ -68,7 +73,7 @@
to_chat(user, "<span class='warning'>There are no cards in \the [src].</span>")
return FALSE
if(user)
if(user && !issilicon(user) && in_range(src, user))
user.put_in_hands(stored_card)
else
stored_card.forceMove(drop_location())