From 6ad8664d8d08166874c81355ba05477cfff7ba45 Mon Sep 17 00:00:00 2001 From: Vile Beggar Date: Tue, 6 Feb 2024 11:50:52 +0100 Subject: [PATCH] fix logical inconsistency with reverting firemodes --- code/modules/projectiles/gun_attachables.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 67e11c12c35e..caa8c2221438 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3341,7 +3341,7 @@ Defined in conflicts.dm of the #defines folder. burst_scatter_mod = 0 delay_mod = FIRE_DELAY_TIER_12 //if we are no longer on full auto, don't bother switching back to the old firemode - if(full_auto_switch && gun.gun_firemode == GUN_FIREMODE_AUTOMATIC) + if(full_auto_switch && gun.gun_firemode == GUN_FIREMODE_AUTOMATIC && gun.gun_firemode != old_firemode) gun.do_toggle_firemode(user, null, old_firemode) gun.recalculate_attachment_bonuses() @@ -3397,8 +3397,8 @@ Defined in conflicts.dm of the #defines folder. if(heavy_bipod) user.anchored = TRUE + old_firemode = gun.gun_firemode if(full_auto_switch && gun.gun_firemode != GUN_FIREMODE_AUTOMATIC) - old_firemode = gun.gun_firemode gun.do_toggle_firemode(user, null, GUN_FIREMODE_AUTOMATIC) else