From 015bc387e63b254bbdbae54bf0252d09d968acaa Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Fri, 13 Feb 2026 22:52:49 +0300
Subject: [PATCH] fix wizmerge

---
 Resources/Locale/en-US/traits/traits.ftl                       | 3 +++
 Resources/Prototypes/Catalog/Cargo/cargo_security.yml          | 2 +-
 .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml     | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index bbe11817be..24b3e2dfcc 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -103,6 +103,9 @@ trait-description-SpanishAccent = You speak with a Spanish accent.
 trait-name-PainNumbness = Numb
 trait-description-PainNumbness = You lack any sense of feeling pain, being unaware of how hurt you may be.
 
+trait-name-SouthernAccent = Southern drawl
+trait-description-SouthernAccent = You have a different way of speakin'.
+
 trait-name-Snoring = Snoring
 trait-description-Snoring = You tend to snore loudly while sleeping.
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index 3fa03ea2e3..4267fbf0c1 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -4,7 +4,7 @@
     sprite: Clothing/OuterClothing/Armor/security.rsi
     state: icon
   product: CrateSecurityArmor
-  cost: 725
+  cost: 800 # WD EDIT: 725 -> 800
   category: cargoproduct-category-name-security
   group: market
 
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 0346dbb42d..feaf4524b4 100644
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -25,6 +25,8 @@
     maxCharge: 500
     startingCharge: 500
   - type: MagazineVisuals
+    magState: mag
+    steps: 5
     zeroVisible: true
 
 - type: entity