shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6902 from Citadel-Station-13/upstream-merge-38045

Browse Source 
[MIRROR] Security console fixes
This commit is contained in:
LetterJay
2018-05-26 21:39:54 -05:00
committed by GitHub
parent 724c1a1549 25dc1e2ae7
commit ec9b4ef955
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/security.dm
+11 -8
View File
@@ -831,18 +831,21 @@ What a mess.*/
return 0
/obj/machinery/computer/secure_data/AltClick(mob/user)
if(user.canUseTopic(src) && scan)
if(user.canUseTopic(src))
eject_id(user)
/obj/machinery/computer/secure_data/proc/eject_id(mob/user)
if(scan)
user.put_in_hands(scan)
scan.forceMove(drop_location())
if(!issilicon(user) && Adjacent(user))
user.put_in_hands(scan)
scan = null
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
else //switching the ID with the one you're holding
var/obj/item/I = user.is_holding_item_of_type(/obj/item/card/id)
if(I)
if(!user.transferItemToLoc(I, src))
return
scan = I
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
if(issilicon(user) || !Adjacent(user))
return
var/obj/item/card/id/held_id = user.is_holding_item_of_type(/obj/item/card/id)
if(QDELETED(held_id) || !user.transferItemToLoc(held_id, src))
return
scan = held_id
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)