From a2373ee693da1880e85fbd7705decaf7dd674762 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Tue, 27 Aug 2024 15:37:18 -0400 Subject: [PATCH] Max ammo issue --- code/modules/projectiles/guns/shotguns.dm | 1 - code/modules/projectiles/magazines/shotguns.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 7bc834140d..0783834c96 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -154,7 +154,6 @@ can cause issues with ammo types getting mixed up during the burst. current_mag.chamber_position-- return in_chamber - /obj/item/weapon/gun/shotgun/ready_in_chamber() return ready_shotgun_tube() diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm index 26d7be46d5..e378aed3c4 100644 --- a/code/modules/projectiles/magazines/shotguns.dm +++ b/code/modules/projectiles/magazines/shotguns.dm @@ -116,7 +116,7 @@ also doesn't really matter. You can only reload them with handfuls. /obj/item/ammo_magazine/internal/shotgun/combat/riot default_ammo = /datum/ammo/bullet/shotgun/beanbag - current_rounds = 7 + current_rounds = 6 /obj/item/ammo_magazine/internal/shotgun/marsoc caliber = "12g"