From 6c347a9186d46c5775227084b48ffb398dbd0848 Mon Sep 17 00:00:00 2001 From: SandPoot <43283559+SandPoot@users.noreply.github.com> Date: Tue, 22 Feb 2022 19:50:32 -0300 Subject: [PATCH] Fixes targets (#15521) * Automatic changelog compile [ci skip] * Update files Co-authored-by: Changelogs --- code/game/objects/items/shooting_range.dm | 1 + code/game/objects/structures/target_stake.dm | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index ced0ee3160..989cc5a73e 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -34,6 +34,7 @@ /obj/item/target/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) if(pinnedLoc) pinnedLoc.removeTarget(user) + . = ..() /obj/item/target/syndicate icon_state = "target_s" diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index c5f3a089f7..dc920556f7 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -58,13 +58,10 @@ pinned_target.nullPinnedLoc() nullPinnedTarget() handle_density() - if(ishuman(user)) - if(!user.get_active_held_item()) - user.put_in_hands(pinned_target) - to_chat(user, "You take the target out of the stake.") - else - pinned_target.forceMove(user.drop_location()) - to_chat(user, "You take the target out of the stake.") + pinned_target.forceMove(get_turf(src)) + to_chat(user, "You take the target out of the stake.") + if(user.can_hold_items()) + user.put_in_hands(pinned_target) /obj/structure/target_stake/bullet_act(obj/item/projectile/P) if(pinned_target)