Printable Special and Empty Mags for Autolathes (#27396)

* Change emag recipes to print mags instead of single ammo

* Get rid of useless single ammo printing recipes

* Add in submachine gun mags

* missing magazine shotgun beanbag in nonlethal research

* Sort lathes that use ammo crafting recipes alphabetically

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 318f880ab98b6229d1174e701c3a0d2e6674049a..b237fc88ed2e25833e6cffce20c38361667153eb 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -163,44 +163,55 @@
       - ClothingHeadHatWelding
   - type: EmagLatheRecipes
     emagStaticRecipes:
-       - CartridgePistol
-       - CartridgeMagnum
-       - ShellShotgun
-       - ShellShotgunFlare
-       - ShellTranquilizer
-       - CartridgeLightRifle
-       - CartridgeRifle
-       - MagazineBoxPistol
-       - MagazineBoxMagnum
-       - MagazineBoxRifle
-       - MagazineBoxLightRifle
-       - GrenadeBlast
+      - BoxLethalshot
+      - BoxShotgunFlare
+      - GrenadeBlast
+      - MagazineBoxLightRifle
+      - MagazineBoxMagnum
+      - MagazineBoxPistol
+      - MagazineBoxRifle
+      - MagazineLightRifle
+      - MagazineLightRifleEmpty
+      - MagazinePistol 
+      - MagazinePistolEmpty
+      - MagazinePistolSubMachineGun
+      - MagazinePistolSubMachineGunEmpty
+      - MagazineRifle
+      - MagazineRifleEmpty
+      - MagazineShotgun
+      - MagazineShotgunEmpty
+      - ShellTranquilizer
+      - SpeedLoaderMagnum
+      - SpeedLoaderMagnumEmpty
     emagDynamicRecipes:
-      - ShellShotgunBeanbag
-      - ShellShotgunIncendiary
-      - CartridgePistolIncendiary
-      - CartridgeMagnumIncendiary
-      - CartridgeLightRifleIncendiary
-      - CartridgeRifleIncendiary
-      - MagazineBoxPistolIncendiary
-      - MagazineBoxMagnumIncendiary
+      - BoxBeanbag
+      - BoxShotgunIncendiary
+      - BoxShotgunUranium
+      - GrenadeEMP
+      - GrenadeFlash
       - MagazineBoxLightRifleIncendiary
-      - MagazineBoxRifleIncendiary
-      - ShellShotgunUranium
-      - CartridgePistolUranium
-      - CartridgeMagnumUranium
-      - CartridgeLightRifleUranium
-      - CartridgeRifleUranium
-      - MagazineBoxPistolUranium
-      - MagazineBoxMagnumUranium
       - MagazineBoxLightRifleUranium
+      - MagazineBoxMagnumIncendiary
+      - MagazineBoxMagnumUranium
+      - MagazineBoxPistolIncendiary
+      - MagazineBoxPistolUranium
+      - MagazineBoxRifleIncendiary
       - MagazineBoxRifleUranium
-      - PowerCageSmall
-      - PowerCageMedium
-      - PowerCageHigh
       - MagazineGrenadeEmpty
-      - GrenadeEMP
-      - GrenadeFlash
+      - MagazineLightRifleIncendiary
+      - MagazineLightRifleUranium
+      - MagazinePistolIncendiary
+      - MagazinePistolUranium
+      - MagazineRifleIncendiary
+      - MagazineRifleUranium
+      - MagazineShotgunBeanbag
+      - MagazineShotgunIncendiary
+      - MagazineShotgunIncendiary
+      - PowerCageHigh
+      - PowerCageMedium
+      - PowerCageSmall
+      - SpeedLoaderMagnumIncendiary
+      - SpeedLoaderMagnumUranium
 
 - type: entity
   id: AutolatheHyperConvection
@@ -639,16 +650,24 @@
     idleState: icon
     runningState: icon
     staticRecipes:
+      - BoxLethalshot
+      - BoxShotgunFlare
+      - BoxShotgunPractice 
+      - BoxShotgunSlug
       - ClothingEyesHudSecurity
       - Flash
-      - Handcuffs
-      - Zipties
-      - Stunbaton
       - ForensicPad
-      - RiotShield
-      - BoxShotgunSlug
-      - BoxLethalshot
-      - BoxShotgunFlare
+      - Handcuffs
+      - MagazineBoxLightRifle
+      - MagazineBoxLightRiflePractice
+      - MagazineBoxMagnum
+      - MagazineBoxMagnumPractice
+      - MagazineBoxPistol
+      - MagazineBoxPistolPractice
+      - MagazineBoxRifle
+      - MagazineBoxRiflePractice
+      - MagazineLightRifle
+      - MagazineLightRifleEmpty
       - MagazinePistol 
       - MagazinePistolEmpty
       - MagazinePistolSubMachineGun
@@ -657,58 +676,57 @@
       - MagazinePistolSubMachineGunTopMountedEmpty
       - MagazineRifle
       - MagazineRifleEmpty
-      - MagazineLightRifle
-      - MagazineLightRifleEmpty
-      - MagazineShotgunEmpty
       - MagazineShotgun
+      - MagazineShotgunEmpty
       - MagazineShotgunSlug
-      - MagazineBoxPistol
-      - MagazineBoxMagnum
-      - MagazineBoxRifle
-      - MagazineBoxLightRifle
+      - RiotShield
       - SpeedLoaderMagnum
       - SpeedLoaderMagnumEmpty
+      - Stunbaton
+      - TargetClown
       - TargetHuman
       - TargetSyndicate
-      - TargetClown
-      - MagazineBoxLightRiflePractice
-      - MagazineBoxMagnumPractice
-      - MagazineBoxPistolPractice
-      - MagazineBoxRiflePractice
-      - WeaponLaserCarbinePractice
       - WeaponDisablerPractice
-      - BoxShotgunPractice 
+      - WeaponLaserCarbinePractice
+      - Zipties
     dynamicRecipes:
-      - MagazineLightRifleIncendiary
-      - SpeedLoaderMagnumIncendiary
-      - MagazinePistolIncendiary
-      - MagazineRifleIncendiary
-      - MagazineShotgunIncendiary
-      - MagazineLightRifleUranium
-      - SpeedLoaderMagnumUranium
-      - MagazinePistolUranium
-      - MagazineRifleUranium
-      - MagazineShotgunBeanbag
-      - ShellTranquilizer
+      - BoxBeanbag
+      - BoxShotgunIncendiary
+      - BoxShotgunUranium
       - ExplosivePayload
       - FlashPayload
+      - GrenadeEMP
+      - GrenadeFlash
       - HoloprojectorSecurity
       - MagazineBoxLightRifleIncendiary
-      - MagazineBoxMagnumIncendiary
-      - MagazineBoxPistolIncendiary
-      - MagazineBoxRifleIncendiary
-      - BoxShotgunIncendiary
       - MagazineBoxLightRifleUranium
+      - MagazineBoxMagnumIncendiary
       - MagazineBoxMagnumUranium
+      - MagazineBoxPistolIncendiary
       - MagazineBoxPistolUranium
+      - MagazineBoxRifleIncendiary
       - MagazineBoxRifleUranium
-      - BoxShotgunUranium
-      - BoxBeanbag
       - MagazineGrenadeEmpty
-      - GrenadeEMP
-      - GrenadeFlash
+      - MagazineLightRifleIncendiary
+      - MagazineLightRifleUranium
+      - MagazinePistolIncendiary
+      - MagazinePistolUranium
+      - MagazineRifleIncendiary
+      - MagazineRifleUranium
+      - MagazineShotgunBeanbag
+      - MagazineShotgunIncendiary
+      - PowerCageHigh
+      - PowerCageMedium
+      - PowerCageSmall
+      - ShellTranquilizer
+      - ShuttleGunDusterCircuitboard
+      - ShuttleGunFriendshipCircuitboard
+      - ShuttleGunPerforatorCircuitboard
+      - ShuttleGunSvalinnMachineGunCircuitboard
       - Signaller
       - SignalTrigger
+      - SpeedLoaderMagnumIncendiary
+      - SpeedLoaderMagnumUranium
       - TelescopicShield
       - TimerTrigger
       - Truncheon
@@ -719,13 +737,6 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon
-      - PowerCageSmall
-      - PowerCageMedium
-      - PowerCageHigh
-      - ShuttleGunSvalinnMachineGunCircuitboard
-      - ShuttleGunPerforatorCircuitboard
-      - ShuttleGunFriendshipCircuitboard
-      - ShuttleGunDusterCircuitboard
   - type: MaterialStorage
     whitelist:
       tags:
@@ -758,18 +769,25 @@
       idleState: icon
       runningState: icon
       staticRecipes:
-        - CartridgePistol
-        - CartridgeMagnum
-        - ShellShotgun
-        - ShellShotgunSlug
-        - ShellShotgunFlare
-        - ShellTranquilizer
-        - CartridgeLightRifle
-        - CartridgeRifle
-        - MagazineBoxPistol
+        - BoxLethalshot
+        - BoxShotgunFlare
+        - BoxShotgunSlug
+        - MagazineBoxLightRifle
         - MagazineBoxMagnum
+        - MagazineBoxPistol
         - MagazineBoxRifle
-        - MagazineBoxLightRifle
+        - MagazineLightRifle
+        - MagazineLightRifleEmpty
+        - MagazinePistol 
+        - MagazinePistolEmpty 
+        - MagazineRifle
+        - MagazineRifleEmpty
+        - MagazineShotgun
+        - MagazineShotgunEmpty
+        - MagazineShotgunSlug
+        - ShellTranquilizer
+        - SpeedLoaderMagnum
+        - SpeedLoaderMagnumEmpty
     - type: MaterialStorage
       whitelist:
         tags:

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index f5d538618b0b097846ca965bd7b1644d9c2ae8ed..bad38fc99f498c7f6c06a49477e38c568227e6c3 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -138,71 +138,6 @@
     Plastic: 200
     Steel: 100
 
-- type: latheRecipe
-  id: ShellShotgunBeanbag
-  result: ShellShotgunBeanbag
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 15
-    Steel: 10
-
-- type: latheRecipe
-  id: CartridgeRifle
-  result: CartridgeRifle
-  category: Ammo
-  completetime: 2
-  materials:
-    Steel: 15
-
-- type: latheRecipe
-  id: CartridgePistol
-  result: CartridgePistol
-  category: Ammo
-  completetime: 2
-  materials:
-    Steel: 10
-
-- type: latheRecipe
-  id: ShellShotgun
-  result: ShellShotgun
-  category: Ammo
-  completetime: 2
-  materials:
-    Steel: 20
-
-- type: latheRecipe
-  id: ShellShotgunSlug
-  result: ShellShotgunSlug
-  completetime: 2
-  materials:
-    Steel: 25
-
-- type: latheRecipe
-  id: CartridgeMagnum
-  result: CartridgeMagnum
-  category: Ammo
-  completetime: 2
-  materials:
-    Steel: 20
-
-- type: latheRecipe
-  id: CartridgeLightRifle
-  result: CartridgeLightRifle
-  category: Ammo
-  completetime: 2
-  materials:
-    Steel: 30
-
-- type: latheRecipe
-  id: ShellShotgunFlare
-  result: ShellShotgunFlare
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 20
-    Steel: 5
-
 - type: latheRecipe
   id: ShellTranquilizer
   result: ShellTranquilizer
@@ -546,46 +481,6 @@
     Steel: 100
     Plastic: 190
 
-- type: latheRecipe
-  id: ShellShotgunIncendiary
-  result: ShellShotgunIncendiary
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 20
-
-- type: latheRecipe
-  id: CartridgePistolIncendiary
-  result: CartridgePistolIncendiary
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 10
-
-- type: latheRecipe
-  id: CartridgeMagnumIncendiary
-  result: CartridgeMagnumIncendiary
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 20
-
-- type: latheRecipe
-  id: CartridgeLightRifleIncendiary
-  result: CartridgeLightRifleIncendiary
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 15
-
-- type: latheRecipe
-  id: CartridgeRifleIncendiary
-  result: CartridgeRifleIncendiary
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 15
-
 - type: latheRecipe
   id: MagazineBoxPistolIncendiary
   result: MagazineBoxPistolIncendiary
@@ -636,14 +531,6 @@
     Steel: 80
     Plastic: 320
 
-- type: latheRecipe
-  id: ShellShotgunPractice
-  result: ShellShotgunPractice
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 20
-
 - type: latheRecipe
   id: MagazineBoxPistolPractice
   result: MagazineBoxPistolPractice
@@ -704,51 +591,6 @@
   materials:
     Steel: 80
 
-- type: latheRecipe
-  id: ShellShotgunUranium
-  result: ShellShotgunUranium
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 20
-    Uranium: 15
-
-- type: latheRecipe
-  id: CartridgePistolUranium
-  result: CartridgePistolUranium
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 5
-    Uranium: 10
-
-- type: latheRecipe
-  id: CartridgeMagnumUranium
-  result: CartridgeMagnumUranium
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 20
-    Uranium: 15
-
-- type: latheRecipe
-  id: CartridgeLightRifleUranium
-  result: CartridgeLightRifleUranium
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 10
-    Uranium: 10
-
-- type: latheRecipe
-  id: CartridgeRifleUranium
-  result: CartridgeRifleUranium
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 10
-    Uranium: 10
-
 - type: latheRecipe
   id: MagazineBoxPistolUranium
   result: MagazineBoxPistolUranium

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 264a7df1094c4dd00bfa148c3e0eadbaf6208545..2daa3fdcc0f6caaa3dc25b0359f14ae1ba662e27 100644 (file)
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -57,6 +57,7 @@
   tier: 1
   cost: 5000
   recipeUnlocks:
+  - MagazineShotgunBeanbag
   - ShellTranquilizer 
   - BoxBeanbag 
   - WeaponDisabler