From 6b7473c54112db52fc2f9d5eb9ebd3c3bed2e3cc Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 20 May 2023 19:21:06 +0100 Subject: [PATCH] [MIRROR] Fix SHOULD_NOT_SLEEP hit in borg adjustable tracer bolts [MDB IGNORE] (#21292) * Fix SHOULD_NOT_SLEEP hit in borg adjustable tracer bolts (#75512) See #75232 * Fix SHOULD_NOT_SLEEP hit in borg adjustable tracer bolts --------- Co-authored-by: Jordan Dominion --- .../projectiles/guns/energy/kinetic_accelerator.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 786ec9c9454..2b2a17c27ef 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -586,5 +586,13 @@ name = "adjustable tracer bolts" desc = "Causes kinetic accelerator bolts to have an adjustable-colored tracer trail and explosion. Use in-hand to change color." -/obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user) - bolt_color = input(user,"","Choose Color",bolt_color) as color|null +/obj/item/borg/upgrade/modkit/tracer/adjustable/interact(mob/user) + ..() + choose_bolt_color(user) + +/obj/item/borg/upgrade/modkit/tracer/adjustable/proc/choose_bolt_color(mob/user) + set waitfor = FALSE + + var/new_color = input(user,"","Choose Color",bolt_color) as color|null + bolt_color = new_color || bolt_color +