Merge pull request #5425 from Kilmented/master

fixes garand and thus SKS
ARF-SS13 · Oct 5, 2024 · 8985a35 · 8985a35
2 parents 431b732 + b3ef90c
commit 8985a35
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/modular_coyote/code/modules/znuguns/code/guns/tier3.dm b/modular_coyote/code/modules/znuguns/code/guns/tier3.dm
@@ -97,7 +97,7 @@
 	gun_accuracy_zone_type = ZONE_WEIGHT_PRECISION
 	gun_tags = list(GUN_SCOPE)
 	en_bloc = 1
-	auto_eject = 1
+	auto_eject = FALSE
 	can_bayonet = TRUE
 	bayonet_state = "bayonet"
 	knife_x_offset = 22

diff --git a/tgui/packages/tgui/interfaces/WeaponInfo.js b/tgui/packages/tgui/interfaces/WeaponInfo.js
@@ -401,15 +401,6 @@ export const ProjectileInfo = (props, context) => {
           </Table.Cell>
         </Table.Row>
 
-        <Table.Row>
-          <Table.Cell bold textAlign="right" color="label">
-            <Tooltipify name="Stamina:" tip="Base stamina (non-lethal) damage." />
-          </Table.Cell>
-          <Table.Cell>
-            {projectile_stamina} <Tooltipify name="R3Bs" tip="Rubber Beany Baby Bags (at 200 meters)" fade={1} />
-          </Table.Cell>
-        </Table.Row>
-
         <Table.Row>
           <Table.Cell bold textAlign="right" color="label">
             <Tooltipify name="Spread" tip="Base inaccuracy in degrees from straight ahead, before recoil is factored in." />

diff --git a/tgui/public/tgui.bundle.js b/tgui/public/tgui.bundle.js