From fdc0ade169e6a75b2dd5b412047a0fbeb83b73ac Mon Sep 17 00:00:00 2001
From: Whatstone <whatston3@gmail.com>
Date: Fri, 27 Dec 2024 15:27:48 -0500
Subject: [PATCH] mag states for "any" mags

---
 .../Weapons/Guns/Ammunition/Magazines/light_rifle.yml       | 2 ++
 .../Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml    | 4 ++++
 .../Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml    | 6 ++++++
 .../Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml     | 2 ++
 .../Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml | 2 ++
 .../Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml    | 2 ++
 6 files changed, 18 insertions(+)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
index 9c183920731..207e4098bbc 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -80,6 +80,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # Frontier
+      map: ["enum.GunVisualLayers.Mag"] # Frontier
 
 - type: entity
   id: MagazineLightRiflePractice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index cd800e13b1a..53818688024 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -59,6 +59,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # Frontier
+      map: ["enum.GunVisualLayers.Mag"] # Frontier
 
 - type: entity
   id: MagazineMagnum
@@ -128,6 +130,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # Frontier
+      map: ["enum.GunVisualLayers.Mag"] # Frontier
 
 - type: entity
   id: MagazineMagnumSubMachineGun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index dccc6f016f3..51fe399ac71 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -162,6 +162,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # Frontier
+      map: ["enum.GunVisualLayers.Mag"] # Frontier
 
 
 - type: entity
@@ -212,6 +214,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # Frontier
+      map: ["enum.GunVisualLayers.Mag"] # Frontier
 
 - type: entity
   id: MagazinePistolHighCapacity
@@ -287,6 +291,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # Frontier
+      map: ["enum.GunVisualLayers.Mag"] # Frontier
 
 - type: entity
   id: MagazinePistolSubMachineGunPractice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
index 24b7df3b70b..7e36286d3de 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -59,6 +59,8 @@
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1 # Frontier
+      map: ["enum.GunVisualLayers.Mag"] # Frontier
 
 - type: entity
   id: MagazineRifleIncendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
index 9391ca52d8e..e1380d0b19e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -57,6 +57,8 @@
     layers:
       - state: base
         map: [ "enum.GunVisualLayers.Base" ]
+      - state: base-6 # Frontier
+        map: [ "enum.GunVisualLayers.Mag" ] # Frontier
 
 - type: entity
   id: SpeedLoaderMagnumIncendiary
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml
index de5c79ba318..38e98a0b890 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml
@@ -57,6 +57,8 @@
     layers:
       - state: base
         map: [ "enum.GunVisualLayers.Base" ]
+      - state: base-8
+        map: [ "enum.GunVisualLayers.Mag" ]
 
 - type: entity
   id: SpeedLoaderRifleHeavyIncendiary