From 2e6b1fe6dc24b5ca0660efdb9df1e59283e86839 Mon Sep 17 00:00:00 2001 From: Charlie Nolan Date: Fri, 4 Jul 2025 22:46:10 -0700 Subject: [PATCH] Add timeouts to several move_away calls (#29714) * Timeouts are important. * Update code/game/objects/items/weapons/grenades/clusterbuster.dm Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/game/objects/items/weapons/grenades/clusterbuster.dm Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/modules/surgery/organs/organ_internal.dm Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> --------- Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> --- code/game/mecha/equipment/weapons/weapons.dm | 5 +---- code/game/objects/items/weapons/grenades/clusterbuster.dm | 4 ++-- code/modules/surgery/organs/organ_internal.dm | 5 +---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 9b3ff37da45..9fe357f6d03 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -233,10 +233,7 @@ if(isobj(H.shoes) && !(H.shoes.flags & NODROP)) var/thingy = H.shoes H.drop_item_to_ground(thingy) - GLOB.move_manager.move_away(thingy, chassis, 15, 2) - spawn(20) - if(thingy) - GLOB.move_manager.stop_looping(thingy) + GLOB.move_manager.move_away(thingy, chassis, 15, 2, timeout=20) for(var/obj/mecha/combat/reticence/R in oview(6, chassis)) R.occupant_message("\The [R] has protected you from [chassis]'s HONK at the cost of some power.") R.use_power(R.get_charge() / 4) diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm index 2a4a30a6b6c..e1ad9530e9e 100644 --- a/code/game/objects/items/weapons/grenades/clusterbuster.dm +++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm @@ -47,7 +47,7 @@ icon_state = "clusterbang_segment_active" payload = payload_type active = TRUE - GLOB.move_manager.move_away(src, loc, rand(1,4)) + GLOB.move_manager.move_away(src, loc, rand(1, 4), timeout = 20) spawn(rand(15,60)) prime() @@ -69,7 +69,7 @@ var/obj/item/grenade/P = new type(loc) if(istype(P, /obj/item/grenade)) P.active = TRUE - GLOB.move_manager.move_away(P,loc,rand(1,4)) + GLOB.move_manager.move_away(P, loc, rand(1, 4), timeout = 20) spawn(rand(15,60)) if(!QDELETED(P)) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index b173beed71e..a97ef8daecf 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -340,10 +340,7 @@ if(isobj(H.shoes)) var/thingy = H.shoes if(H.drop_item_to_ground(H.shoes)) - GLOB.move_manager.move_away(thingy, H, 15, 2) - spawn(20) - if(thingy) - GLOB.move_manager.stop_looping(thingy) + GLOB.move_manager.move_away(thingy, H, 15, 2, timeout = 20) /obj/item/organ/internal/honktumor/cursed unremovable = TRUE