From 233657d8beccb02b6326a190f248b26ecad84cbe Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Mon, 3 Oct 2022 00:10:12 -0300 Subject: [PATCH] ATM and id console will use your inactive hand for giving items (#19164) --- code/game/machinery/computer/card.dm | 4 ++-- code/modules/economy/ATM.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 9de4bede1f6..03cd4aab9a9 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -389,7 +389,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if(scan) if(ishuman(usr)) scan.forceMove(get_turf(src)) - if(!usr.get_active_hand() && Adjacent(usr)) + if(Adjacent(usr)) usr.put_in_hands(scan) scan = null playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) @@ -415,7 +415,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) regenerate_id_name() if(ishuman(usr)) modify.forceMove(get_turf(src)) - if(!usr.get_active_hand() && Adjacent(usr)) + if(Adjacent(usr)) usr.put_in_hands(modify) modify = null playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 7acc368380d..17c9bfb77bd 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -306,7 +306,7 @@ log transactions if(held_card) held_card.forceMove(loc) authenticated_account = null - if(ishuman(usr) && !usr.get_active_hand()) + if(ishuman(usr)) usr.put_in_hands(held_card) held_card = null else