From 12d7d5660f1b7845c050fc08d0fb7191f6ff7811 Mon Sep 17 00:00:00 2001 From: TheDZD Date: Tue, 8 Mar 2016 18:52:44 -0500 Subject: [PATCH] Replaces flag check with canUnEquip --- code/game/machinery/recharger.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index d02bc2ca794..73ef3b1d945 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -17,9 +17,10 @@ if(istype(user,/mob/living/silicon)) return - if(G.flags & NODROP) - user << "you can drop it to charge it!" + if(!user.canUnEquip(G, 0)) + user << "[G] is stuck to your hand, you can't put it in [src]!" return + if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G,/obj/item/device/laptop) || istype(G, /obj/item/weapon/rcs)) if(charging) return