Mercfab Arsenal Recipes (#2677)

* Condensed changes into one commit * Comment out Incend/uranium from NFSD and mercfab * resolved issues * Update lathe.yml * Update lathe.yml * Update lathe.yml * Update lathe.yml * Update arsenal.yml * Update arsenal.yml * Update lathe.yml * Update arsenal.yml --------- Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Jan 17, 2025 · 1c27b18 · 1c27b18
1 parent ab5ea81
commit 1c27b18
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 24 deletions.
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -33,12 +33,12 @@
   - MagazinePistolIncendiary
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
-  - SpeedLoaderRifleHeavyIncendiary # Frontier
   - MagazineShotgunIncendiary
   - MagazineBoxPistolIncendiary
   - MagazineBoxMagnumIncendiary
   - MagazineBoxLightRifleIncendiary
   - MagazineBoxRifleIncendiary
+#  - SpeedLoaderRifleHeavyIncendiary # Frontier
 
 - type: technology
   id: WeaponizedLaserManipulation
@@ -85,12 +85,12 @@
   - MagazinePistolUranium
   - MagazineLightRifleUranium
   - SpeedLoaderMagnumUranium
-  - SpeedLoaderRifleHeavyUranium # Frontier
   - MagazineBoxPistolUranium
   - MagazineBoxMagnumUranium
   - MagazineBoxLightRifleUranium
   - MagazineBoxRifleUranium
   - BoxShotgunUranium
+#  - SpeedLoaderRifleHeavyUranium # Frontier
 
 - type: technology
   id: AdvancedRiotControl

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -562,14 +562,31 @@
       - HoloprojectorNfsd
       - ClothingBackpackElectropack
     dynamicRecipes:
-      - BoxShotgunIncendiary
-      - BoxShotgunUranium
       - BoxShellTranquilizer
       - ExplosivePayload
       - FlashPayload
       - GrenadeBlast
       - GrenadeEMP
       - GrenadeFlash
+      - PortableRecharger
+      - PowerCageHigh
+      - PowerCageMedium
+      - PowerCageSmall
+      - Signaller
+      - SignalTrigger
+      - TelescopicShield
+      - TimerTrigger
+      - Truncheon
+      - VoiceTrigger
+      - WeaponAdvancedLaser
+      - WeaponDisablerSMG
+      - WeaponLaserCannon
+      - WeaponLaserCarbine
+      - WeaponXrayCannon
+  - type: EmagLatheRecipes
+    emagStaticRecipes:
+      - BoxShotgunIncendiary
+      - BoxShotgunUranium
       - MagazineBoxLightRifleIncendiary
       - MagazineBoxLightRifleUranium
       - MagazineBoxMagnumIncendiary
@@ -586,27 +603,8 @@
       - MagazineRifleIncendiary
       - MagazineRifleUranium
       - MagazineShotgunIncendiary
-      - PortableRecharger
-      - PowerCageHigh
-      - PowerCageMedium
-      - PowerCageSmall
-      - ShuttleGunDusterCircuitboard
-      - ShuttleGunFriendshipCircuitboard
-      - ShuttleGunPerforatorCircuitboard
-      - ShuttleGunSvalinnMachineGunCircuitboard
-      - Signaller
-      - SignalTrigger
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
-      - TelescopicShield
-      - TimerTrigger
-      - Truncheon
-      - VoiceTrigger
-      - WeaponAdvancedLaser
-      - WeaponDisablerSMG
-      - WeaponLaserCannon
-      - WeaponLaserCarbine
-      - WeaponXrayCannon
       - SpeedLoaderRifleHeavyIncendiary
       - SpeedLoaderRifleHeavyUranium
 
@@ -823,7 +821,6 @@
       - WeaponAntiqueLaserNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available
       - WeaponLaserCarbine
       - WeaponDisabler
-    ## Mags / Speedloaders / Clips
     ## Ammo boxes
       - BoxBeanbag
       - BoxShellTranquilizer
@@ -832,6 +829,30 @@
       - MagazineBoxPistolRubber
       - MagazineBoxRifleRubber
       - MagazineShotgunBeanbag
+  - type: EmagLatheRecipes
+    emagStaticRecipes:
+      - BoxShotgunIncendiary
+      - BoxShotgunUranium
+      - MagazineBoxLightRifleIncendiary
+      - MagazineBoxLightRifleUranium
+      - MagazineBoxMagnumIncendiary
+      - MagazineBoxMagnumUranium
+      - MagazineBoxPistolIncendiary
+      - MagazineBoxPistolUranium
+      - MagazineBoxRifleIncendiary
+      - MagazineBoxRifleUranium
+      - MagazineGrenadeEmpty
+      - MagazineLightRifleIncendiary
+      - MagazineLightRifleUranium
+      - MagazinePistolIncendiary
+      - MagazinePistolUranium
+      - MagazineRifleIncendiary
+      - MagazineRifleUranium
+      - MagazineShotgunIncendiary
+      - SpeedLoaderMagnumIncendiary
+      - SpeedLoaderMagnumUranium
+      - SpeedLoaderRifleHeavyIncendiary
+      - SpeedLoaderRifleHeavyUranium
 
 - type: entity
   id: MercenaryTechFabHacked