From 09bba250508cc219796032fba5b50afa38e4eade Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Wed, 19 Aug 2020 12:02:45 +1000 Subject: [PATCH] Update code/modules/projectiles/boxes_magazines/_box_magazine.dm Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 2406b09c45..78ca6e9280 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -86,9 +86,7 @@ var/obj/item/ammo_box/AM = A for(var/obj/item/ammo_casing/AC in AM.stored_ammo) if(load_delay || AM.load_delay) - var/loadtime = load_delay - if(AM.load_delay > load_delay) - loadtime = AM.load_delay + var/loadtime = max(AM.load_delay, load_delay) if(!do_after(user, loadtime, target = src)) return FALSE var/did_load = give_round(AC, replace_spent)