From 75335cb30b04d597ee7bd90893fab9f2ef9efbbc Mon Sep 17 00:00:00 2001 From: Irafas Date: Tue, 19 Jun 2018 15:49:04 +0100 Subject: [PATCH] PDA can be ctrl-clicked to remove the item in its pen slot (#38577) * Makes pens ez to remove from pda Players can now ctrl click on the PDA to remove the pen without having to remove the ID first. * added instructions when examined. Like how it tells the user they can use alt-click to remove contents, it now says they can use ctrl-click to remove items from the pen slot. * PDA can now be dragged without dropping the pen. When ctrl-clicked it now checks to see if the PDA is on a turf and will only output the pen if its not. * quick change to examine text. * comma * Improved the examine --- code/game/objects/items/devices/PDA/PDA.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 5ab8000402..6731caffd7 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -92,8 +92,12 @@ GLOBAL_LIST_EMPTY(PDAs) ..() if(!id && !inserted_item) return - else - to_chat(user, "Alt-click to remove contents.") + + if(id) + to_chat(user, "Alt-click to remove the id.") + + if(inserted_item && (!isturf(loc))) + to_chat(user, "Ctrl-click to remove [inserted_item].") /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"