From 02716044ba41fbf9d7ea7acdafce7c53da838bc6 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Fri, 19 Apr 2024 17:12:52 +0300 Subject: [PATCH] [s] Encryption key trick no more (#25137) * Encryption key trick no more * Update code/game/objects/items/devices/radio/headset.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/devices/radio/headset.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --- .../game/objects/items/devices/radio/headset.dm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index f04502612d6..c268ee73404 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -387,21 +387,22 @@ return FALSE return ..() -/obj/item/radio/headset/attackby(obj/item/W as obj, mob/user as mob) - if(istype(W, /obj/item/encryptionkey/)) +/obj/item/radio/headset/attackby(obj/item/key, mob/user) + if(istype(key, /obj/item/encryptionkey/)) if(keyslot1 && keyslot2) to_chat(user, "The headset can't hold another key!") return + if(!user.unEquip(key)) + to_chat(user, "[key] is stuck to your hand, you can't insert it in [src].") + return + + key.forceMove(src) if(!keyslot1) - user.drop_item() - W.loc = src - keyslot1 = W + keyslot1 = key else - user.drop_item() - W.loc = src - keyslot2 = W + keyslot2 = key recalculateChannels() return