From ae47859febde027a980f1ed2691418f7196adad4 Mon Sep 17 00:00:00 2001
From: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date: Thu, 9 Jan 2025 20:01:59 +0100
Subject: [PATCH 1/6] adds magnum mags to techfab (N1984)

---
 .../Guns/Ammunition/Magazines/magnum.yml      | 14 ++++++++
 .../Entities/Structures/Machines/lathe.yml    |  4 +++
 .../Prototypes/Recipes/Lathes/security.yml    | 35 +++++++++++++++++++
 Resources/Prototypes/Research/arsenal.yml     |  2 ++
 4 files changed, 55 insertions(+)

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 fc506ec594a..c71a58a82b1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -102,6 +102,20 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
+- type: entity
+  id: MagazineMagnumIncendiary
+  name: pistol magazine (.45 magnum incendiary)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumIncendiary
+  - type: Sprite
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
 - type: entity
   id: MagazineMagnumUranium
   name: pistol magazine (.45 magnum uranium)
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index adf6bd94aa8..fb7f3dac0c7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -805,6 +805,8 @@
       - MagazinePistolSubMachineGunEmpty
       - MagazinePistolSubMachineGunTopMounted
       - MagazinePistolSubMachineGunTopMountedEmpty
+      - MagazineMagnum
+      - MagazineMagnumEmpty
       - MagazineRifle
       - MagazineRifleEmpty
       - MagazineShotgun
@@ -872,6 +874,8 @@
       - MagazineLightRifleUranium
       - MagazinePistolIncendiary
       - MagazinePistolUranium
+      - MagazineMagnumIncendiary
+      - MagazineMagnumUranium
       - MagazineRifleIncendiary
       - MagazineRifleUranium
       - MagazineShotgunBeanbag
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 5b126f76973..8f4144fae17 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -423,6 +423,41 @@
     Steel: 25
     Plastic: 540
 
+- type: latheRecipe
+  id: MagazineMagnumEmpty
+  result: MagazineMagnumEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 30
+
+- type: latheRecipe
+  id: MagazineMagnum
+  result: MagazineMagnum
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 150
+
+- type: latheRecipe
+  id: MagazineMagnumUranium
+  result: MagazineMagnumUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 30
+    Plastic: 75
+    Uranium: 150
+
+- type: latheRecipe
+  id: MagazineMagnumIncendiary
+  result: MagazineMagnumIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 30
+    Plastic: 150
+
 - type: latheRecipe
   id: MagazineBoxRifle
   result: MagazineBoxRifle
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index ee2be33c831..fc0762d1361 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -27,6 +27,7 @@
   - BoxShotgunIncendiary
   - MagazineRifleIncendiary
   - MagazinePistolIncendiary
+  - MagazineMagnumIncendiary
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
   - MagazineShotgunIncendiary
@@ -91,6 +92,7 @@
   - MagazineLightRifleUranium
   - SpeedLoaderMagnumUranium
   - MagazineBoxPistolUranium
+  - MagazineBoxPistolMagnumUranium
   - MagazineBoxMagnumUranium
   - MagazineBoxLightRifleUranium
   - MagazineBoxRifleUranium

From b0d76e7bfcfec1db9c730009d733e76fcebc1079 Mon Sep 17 00:00:00 2001
From: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date: Thu, 9 Jan 2025 20:10:46 +0100
Subject: [PATCH 2/6] woops

---
 Resources/Prototypes/Research/arsenal.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index fc0762d1361..39eed376204 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -89,10 +89,10 @@
   recipeUnlocks:
   - MagazineRifleUranium
   - MagazinePistolUranium
+  - MagazineMagnumUranium
   - MagazineLightRifleUranium
   - SpeedLoaderMagnumUranium
   - MagazineBoxPistolUranium
-  - MagazineBoxPistolMagnumUranium
   - MagazineBoxMagnumUranium
   - MagazineBoxLightRifleUranium
   - MagazineBoxRifleUranium

From 465392221b58a352be744eb8ec470fd4d3f1659b Mon Sep 17 00:00:00 2001
From: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date: Fri, 10 Jan 2025 00:34:05 +0100
Subject: [PATCH 3/6] adds magnum rubber, missing smg and cleans

---
 .../Entities/Structures/Machines/lathe.yml    |  8 ++
 .../Prototypes/Recipes/Lathes/security.yml    | 96 +++++++++++++++----
 Resources/Prototypes/Research/arsenal.yml     |  7 ++
 3 files changed, 94 insertions(+), 17 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index fb7f3dac0c7..0521bbcd88a 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -870,12 +870,20 @@
       - MagazineBoxPistolRubber
       - MagazineBoxRifleRubber
       - MagazineGrenadeEmpty
+      - MagazineLightRifleRubber
       - MagazineLightRifleIncendiary
       - MagazineLightRifleUranium
+      - MagazinePistolRubber
       - MagazinePistolIncendiary
       - MagazinePistolUranium
+      - MagazinePistolSubMachineGunRubber
+      - MagazinePistolSubMachineGunIncendiary
+      - MagazinePistolSubMachineGunRubberUranium
+      - MagazineMagnumRubber
       - MagazineMagnumIncendiary
       - MagazineMagnumUranium
+      - SpeedLoaderMagnumRubber
+      - MagazineRifleRubber
       - MagazineRifleIncendiary
       - MagazineRifleUranium
       - MagazineShotgunBeanbag
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 8f4144fae17..ea07f466628 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -242,6 +242,15 @@
   materials:
     Steel: 145
 
+- type: latheRecipe
+  id: MagazinePistolRubber
+  result: MagazinePistolRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 45
+    Plastic: 100
+
 - type: latheRecipe
   id: MagazinePistolPractice
   result: MagazinePistolPractice
@@ -285,6 +294,34 @@
   materials:
     Steel: 300
 
+- type: latheRecipe
+  id: MagazinePistolSubMachineGunRubber
+  result: MagazinePistolSubMachineGunRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 100
+    Plastic: 200
+
+- type: latheRecipe
+  id: MagazinePistolSubMachineGunUranium
+  result: MagazinePistolSubMachineGunUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 225
+    Uranium: 225
+
+- type: latheRecipe
+  id: MagazinePistolSubMachineGunIncendiary
+  result: MagazinePistolSubMachineGunIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+    Plastic: 400
+
 - type: latheRecipe
   id: MagazinePistolSubMachineGunTopMountedEmpty
   result: MagazinePistolSubMachineGunTopMountedEmpty
@@ -351,6 +388,14 @@
   materials:
     Steel: 475
 
+- type: latheRecipe
+  id: MagazineRifleRubber
+  result: MagazineRifleRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 150
+    Plastic: 325
 
 - type: latheRecipe
   id: MagazineRiflePractice
@@ -395,6 +440,15 @@
   materials:
     Steel: 565
 
+- type: latheRecipe
+  id: MagazineLightRifleRubber
+  result: MagazineLightRifleRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 125
+    Plastic: 350
+
 - type: latheRecipe
   id: MagazineLightRiflePractice
   result: MagazineLightRiflePractice
@@ -403,7 +457,6 @@
   materials:
     Steel: 205
 
-
 - type: latheRecipe
   id: MagazineLightRifleUranium
   result: MagazineLightRifleUranium
@@ -439,6 +492,15 @@
   materials:
     Steel: 150
 
+- type: latheRecipe
+  id: MagazineMagnumRubber
+  result: MagazineMagnumRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+    Plastic: 100
+
 - type: latheRecipe
   id: MagazineMagnumUranium
   result: MagazineMagnumUranium
@@ -793,46 +855,46 @@
   result: MagazineGrenadeEmpty
   completetime: 3
   materials:
-     Steel: 150
-     Plastic: 50
+    Steel: 150
+    Plastic: 50
 
 - type: latheRecipe
   id: GrenadeEMP
   result: GrenadeEMP
   completetime: 3
   materials:
-     Steel: 150
-     Plastic: 100
-     Glass: 20
+    Steel: 150
+    Plastic: 100
+    Glass: 20
 
 - type: latheRecipe
   id: GrenadeBlast
   result: GrenadeBlast
   completetime: 3
   materials:
-     Steel: 150
-     Plastic: 100
-     Gold: 50
+    Steel: 150
+    Plastic: 100
+    Gold: 50
 
 - type: latheRecipe
   id: GrenadeFlash
   result: GrenadeFlash
   completetime: 3
   materials:
-     Steel: 150
-     Plastic: 100
-     Glass: 20
+    Steel: 150
+    Plastic: 100
+    Glass: 20
 
 - type: latheRecipe
   id: PortableRecharger
   result: PortableRecharger
   completetime: 15
   materials:
-     Steel: 2000
-     Uranium: 2000
-     Plastic: 1000
-     Plasma: 500
-     Glass: 500
+    Steel: 2000
+    Uranium: 2000
+    Plastic: 1000
+    Plasma: 500
+    Glass: 500
 
 - type: latheRecipe
   id: ShellShotgun
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 39eed376204..f3f5cbe4b9b 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -27,6 +27,7 @@
   - BoxShotgunIncendiary
   - MagazineRifleIncendiary
   - MagazinePistolIncendiary
+  - MagazinePistolSubMachineGunIncendiary
   - MagazineMagnumIncendiary
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
@@ -69,6 +70,11 @@
   - CartridgeMagnumRubber
   - CartridgeLightRifleRubber
   - CartridgeRifleRubber
+  - MagazineRifleRubber
+  - MagazinePistolRubber
+  - MagazineMagnumRubber
+  - MagazineLightRifleRubber
+  - SpeedLoaderMagnumRubber
   - MagazineBoxPistolRubber
   - MagazineBoxMagnumRubber
   - MagazineBoxLightRifleRubber
@@ -89,6 +95,7 @@
   recipeUnlocks:
   - MagazineRifleUranium
   - MagazinePistolUranium
+  - MagazinePistolSubMachineGunIncendiary
   - MagazineMagnumUranium
   - MagazineLightRifleUranium
   - SpeedLoaderMagnumUranium

From 5f7e6b11e002e37bcf15e0c30defb1aaba010bdc Mon Sep 17 00:00:00 2001
From: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date: Fri, 10 Jan 2025 00:43:24 +0100
Subject: [PATCH 4/6] missing items

---
 .../Guns/Ammunition/Magazines/pistol.yml      | 14 +++++++++++
 .../Prototypes/Recipes/Lathes/security.yml    | 23 +++++++++++++------
 2 files changed, 30 insertions(+), 7 deletions(-)

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 c57a8adaa5f..a74d259ce82 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -330,6 +330,20 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
+- type: entity
+  id: MagazinePistolSubMachineGunIncendiary
+  name: SMG magazine (.35 auto incendiary)
+  parent: BaseMagazinePistolSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolIncendiary
+  - type: Sprite
+    layers:
+    - state: red
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
 - type: entity
   id: MagazinePistolSubMachineGunUranium
   name: SMG magazine (.35 auto uranium)
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index ea07f466628..6d00f40ce21 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -572,21 +572,21 @@
     Plastic: 160
 
 - type: latheRecipe
-  id: SpeedLoaderMagnumEmpty
-  result: SpeedLoaderMagnumEmpty
+  id: MagazineBoxLightRifleRubber
+  result: MagazineBoxLightRifleRubber
   category: Ammo
   completetime: 5
   materials:
-    Steel: 50
+    Steel: 350
+    Plastic: 600
 
 - type: latheRecipe
-  id: MagazineBoxLightRifleRubber
-  result: MagazineBoxLightRifleRubber
+  id: SpeedLoaderMagnumEmpty
+  result: SpeedLoaderMagnumEmpty
   category: Ammo
   completetime: 5
   materials:
-    Steel: 350
-    Plastic: 600
+    Steel: 50
 
 - type: latheRecipe
   id: SpeedLoaderMagnum
@@ -596,6 +596,15 @@
   materials:
     Steel: 190
 
+- type: latheRecipe
+  id: SpeedLoaderMagnumRubber
+  result: SpeedLoaderMagnumRubber
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+    Plastic: 70
+
 - type: latheRecipe
   id: SpeedLoaderMagnumPractice
   result: SpeedLoaderMagnumPractice

From 91389c4ec21b48fb8e51706ef87e712fe501b16d Mon Sep 17 00:00:00 2001
From: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date: Fri, 10 Jan 2025 00:51:50 +0100
Subject: [PATCH 5/6] woops

---
 Resources/Prototypes/Research/arsenal.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index f3f5cbe4b9b..6a1d1e37730 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -72,6 +72,7 @@
   - CartridgeRifleRubber
   - MagazineRifleRubber
   - MagazinePistolRubber
+  - MagazinePistolSubMachineGunRubber
   - MagazineMagnumRubber
   - MagazineLightRifleRubber
   - SpeedLoaderMagnumRubber
@@ -95,7 +96,7 @@
   recipeUnlocks:
   - MagazineRifleUranium
   - MagazinePistolUranium
-  - MagazinePistolSubMachineGunIncendiary
+  - MagazinePistolSubMachineGunUranium
   - MagazineMagnumUranium
   - MagazineLightRifleUranium
   - SpeedLoaderMagnumUranium

From 8d2af806744625f043934d863642fc15f98abd8d Mon Sep 17 00:00:00 2001
From: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date: Fri, 10 Jan 2025 00:57:56 +0100
Subject: [PATCH 6/6] Can't type for shit
 `MagazinePistolSubMachineGunRubberUranium`

---
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 0521bbcd88a..850b2c0d74f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -878,11 +878,10 @@
       - MagazinePistolUranium
       - MagazinePistolSubMachineGunRubber
       - MagazinePistolSubMachineGunIncendiary
-      - MagazinePistolSubMachineGunRubberUranium
+      - MagazinePistolSubMachineGunUranium
       - MagazineMagnumRubber
       - MagazineMagnumIncendiary
       - MagazineMagnumUranium
-      - SpeedLoaderMagnumRubber
       - MagazineRifleRubber
       - MagazineRifleIncendiary
       - MagazineRifleUranium
@@ -899,6 +898,7 @@
       - ShuttleGunSvalinnMachineGunCircuitboard
       - Signaller
       - SignalTrigger
+      - SpeedLoaderMagnumRubber
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
       - TelescopicShield