Merge pull request #7190 from Citadel-Station-13/upstream-merge-38577

[MIRROR] PDA can be ctrl-clicked to remove the item in its pen slot
This commit is contained in:
LetterJay
2018-06-24 15:07:54 -05:00
committed by GitHub
+15 -2
View File
@@ -92,8 +92,12 @@ GLOBAL_LIST_EMPTY(PDAs)
..()
if(!id && !inserted_item)
return
else
to_chat(user, "<span class='notice'>Alt-click to remove contents.</span>")
if(id)
to_chat(user, "<span class='notice'>Alt-click to remove the id.</span>")
if(inserted_item && (!isturf(loc)))
to_chat(user, "<span class='notice'>Ctrl-click to remove [inserted_item].</span>")
/obj/item/pda/Initialize()
. = ..()
@@ -712,6 +716,15 @@ GLOBAL_LIST_EMPTY(PDAs)
else
remove_pen()
/obj/item/pda/CtrlClick()
..()
if(issilicon(usr))
return
if(usr.canUseTopic(src) && !isturf(loc))
remove_pen()
/obj/item/pda/verb/verb_remove_id()
set category = "Object"
set name = "Eject ID"