From f8b3ec3efe5889cff1c4bd4bd13536b89abc8ef7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 29 Feb 2024 23:26:48 +0100 Subject: [PATCH] [MIRROR] Fixes bows not loosening their strings once fired (#26697) * Fixes bows not loosening their strings once fired (#81724) ## About The Pull Request So, there's this one place that could have just called `clear_chambered` because it does the exact same operations, but didn't. Here's `gun/ballistic/proc/clear_chambered()`: https://github.com/tgstation/tgstation/blob/ce04e2b7ee279e025bd53e87296e7dfd70b9474a/code/modules/projectiles/guns/ballistic.dm#L285-L288 and here's `gun/ballistic/bow/clear_chambered()`, which is responsible for setting `drawn` to false: https://github.com/tgstation/tgstation/blob/ce04e2b7ee279e025bd53e87296e7dfd70b9474a/code/modules/projectiles/guns/ballistic/bows/_bow.dm#L52-L54 You can connect the dots. * Fixes bows not loosening their strings once fired --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/projectiles/guns/ballistic.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index b5525bb8703..5f512813182 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -264,8 +264,7 @@ casing.bounce_away(TRUE) SEND_SIGNAL(casing, COMSIG_CASING_EJECTED) else if(empty_chamber) - UnregisterSignal(chambered, COMSIG_MOVABLE_MOVED) - chambered = null + clear_chambered() if (chamber_next_round && (magazine?.max_ammo > 1)) chamber_round()