diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 8d49626319f..9225c031d28 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -904,25 +904,28 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
var/obj/item/I = user.get_active_hand()
if (istype(I, /obj/item/weapon/card/id))
- user.drop_item()
+ if(!user.drop_item())
+ return 0
I.loc = src
id = I
else
var/obj/item/weapon/card/I = user.get_active_hand()
if (istype(I, /obj/item/weapon/card/id) && I:registered_name)
var/obj/old_id = id
- user.drop_item()
+ if(!user.drop_item())
+ return 0
I.loc = src
id = I
user.put_in_hands(old_id)
- return
+ return 1
// access to status display signals
/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob, params)
..()
if(istype(C, /obj/item/weapon/cartridge) && !cartridge)
cartridge = C
- user.drop_item()
+ if(!user.drop_item())
+ return
cartridge.loc = src
user << "You insert [cartridge] into [src]."
if(cartridge.radio)
@@ -942,13 +945,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
//Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand.
if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) )
if( can_use(user) )//If they can still act.
- id_check(user, 2)
+ if(!id_check(user, 2))
+ return
user << "You put the ID into \the [src]'s slot."
updateSelfDialog()//Update self dialog on success.
return //Return in case of failed check or when successful.
updateSelfDialog()//For the non-input related code.
else if(istype(C, /obj/item/device/paicard) && !src.pai)
- user.drop_item()
+ if(!user.drop_item())
+ return
C.loc = src
pai = C
user << "You slot \the [C] into [src]."
@@ -958,7 +963,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(O)
user << "There is already a pen in \the [src]!"
else
- user.drop_item()
+ if(!user.drop_item())
+ return
C.loc = src
user << "You slide \the [C] into \the [src]."
return