From 8b9c20a608becb51fc6293c1ad0b627fde0f8c71 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 15 Oct 2020 08:38:40 +0200
Subject: [PATCH] [MIRROR] Fixes bolt action guns getting phantom bullets
 chambered upon initialization. (#1319)

* Fixes weapons with standard bolts, like Mosin Nagants, getting a chambered bullet when they shouldn't. (#54290)

Fixes bolt action guns getting phantom bullets chambered upon initialization.

* Fixes bolt action guns getting phantom bullets chambered upon initialization.

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
---
 code/modules/projectiles/guns/ballistic.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 818fc8734bb..8dd659aeb21 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -98,7 +98,10 @@
 		return
 	if (!magazine)
 		magazine = new mag_type(src)
-	chamber_round(replace_new_round = TRUE)
+	if(bolt_type == BOLT_TYPE_STANDARD)
+		chamber_round()
+	else
+		chamber_round(replace_new_round = TRUE)
 	update_icon()
 
 /obj/item/gun/ballistic/vv_edit_var(vname, vval)