Mercfab and NFSDfab QoL

Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml

@@ -525,6 +525,13 @@
       - TargetHuman
       - TargetSyndicate
       - WeaponDisablerPractice
+      - SpeedLoaderRifleHeavyRubber
+      - SpeedLoaderMagnumRubber
+      - MagazineRifleRubber
+      - MagazineShotgunBeanbag
+      - MagazineShotgunSlug
+      - MagazinePistolRubber
+      - MagazineLightRifleRubber
 #      - WeaponFlareGunSecurity
       - WeaponLaserCarbinePractice
       - Zipties
@@ -706,11 +713,19 @@
       - MagazineBoxRifle
       - CrossbowBolt
       - CrossbowBoltBroadhead
+      - BoxBeanbag
+      - BoxShotgunSlug
+      - MagazineBoxLightRifleRubber
+      - MagazineBoxMagnumRubber
+      - MagazineBoxPistolRubber
+      - MagazineBoxRifleRubber
     ## Mags / Speedloaders / Clips
       - MagazineNovaliteC1Empty
       - MagazineNovaliteC1
+      - MagazineNovaliteC1Rubber
       - MagazineLightRifleLowCapacityEmpty
       - MagazineLightRifleLowCapacity
+      - MagazineLightRifleLowCapacityRubber
       - MagazineLightRifle
       - MagazineLightRifleEmpty
       - MagazineRifle
@@ -719,6 +734,13 @@
       - MagazinePistolEmpty
       - SpeedLoaderRifleHeavy
       - SpeedLoaderRifleHeavyEmpty
+      - SpeedLoaderRifleHeavyRubber
+      - SpeedLoaderMagnumRubber
+      - MagazineRifleRubber
+      - MagazineShotgunSlug
+      - MagazinePistolRubber
+      - MagazineLightRifleRubber
+      - MagazineShotgunBeanbag
     dynamicRecipes:
     # Shared lathe recipes
     ## Advanced tools

Resources/Prototypes/_NF/Recipes/Lathes/security.yml

@@ -30,12 +30,27 @@
   materials:
     Steel: 245 # 20 [Steel per empty mag] + 15 [bullets] * 15 [Steel per bullet]
 
+- type: latheRecipe # novalite rubber mag
+  id: MagazineNovaliteC1Rubber
+  parent: BaseAmmoRecipe
+  result: MagazineNovaliteC1Rubber
+  materials:
+    Steel: 82 #33% of 245 in steel
+    Plastic: 163 #66% of 245
+
 - type: latheRecipe # gestio mag empty
   id: MagazineLightRifleLowCapacityEmpty
   parent: BaseEmptyAmmoRecipe
   result: MagazineLightRifleLowCapacityEmpty
   materials:
     Steel: 20
+- type: latheRecipe # Gestio small rubber mag
+  id: MagazineLightRifleLowCapacityRubber
+  parent: BaseAmmoRecipe
+  result: MagazineLightRifleLowCapacityRubber
+  materials:
+    Steel: 82 #33% of cost in steel
+    Plastic: 163 #66% of 245
 
 - type: latheRecipe # gestio mag
   id: MagazineLightRifleLowCapacity
@@ -58,6 +73,14 @@
   materials:
     Steel: 140 # 25 [Steel per empty mag] + 8 [bullets] * 15 [Steel per bullet]
 
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavyRubber #Argenti rubber loader
+  parent: BaseAmmoRecipe
+  result: SpeedLoaderRifleHeavyRubber
+  materials:
+    Steel: 47 #33% of cost in Steel
+    Plastic: 93 #66% of cost in Plastic
+
 - type: latheRecipe
   id: SpeedLoaderRifleHeavyPractice
   parent: BaseAmmoRecipe
@@ -82,6 +105,14 @@
     Steel: 25 # 25 [Steel per empty mag]
     Plastic: 120 # 8 [bullets] * 15 [Plastic per bullet]
 
+- type: latheRecipe
+  id: MagazinePistolRubber
+  parent: BaseAmmoRecipe
+  result: MagazinePistolRubber
+  materials:
+    Steel: 100 #50% of box cost
+    Plastic: 200 #50% of box cost
+
 - type: latheRecipe
   id: MagazineBoxLightRifleRubber
   parent: BaseAmmoRecipe
@@ -90,6 +121,14 @@
     Steel: 300
     Plastic: 600
 
+- type: latheRecipe
+  id: MagazineLightRifleRubber
+  parent: BaseAmmoRecipe
+  result: MagazineLightRifleRubber
+  materials:
+    Steel: 150 #50% of ammo box
+    Plastic: 300 #50% of ammo box
+
 - type: latheRecipe
   id: MagazineBoxMagnumRubber
   parent: BaseAmmoRecipe
@@ -98,6 +137,14 @@
     Steel: 80
     Plastic: 160
 
+- type: latheRecipe
+  id: SpeedLoaderMagnumRubber
+  parent: BaseAmmoRecipe
+  result: SpeedLoaderMagnumRubber
+  materials:
+    Steel: 40 #50% of ammo box
+    Plastic: 80 #50% of ammo box
+
 - type: latheRecipe
   id: MagazineBoxPistolRubber
   parent: BaseAmmoRecipe
@@ -113,6 +160,13 @@
   materials:
     Steel: 250
     Plastic: 500
+- type: latheRecipe
+  id: MagazineRifleRubber
+  parent: BaseAmmoRecipe
+  result: MagazineRifleRubber
+  materials:
+    Steel: 125 #50% of ammo box
+    Plastic: 250 #50% of ammo box
 
 - type: latheRecipe
   id: ShellTranquilizer # Removed upstream
@@ -133,4 +187,4 @@
 - type: latheRecipe
   id: HoloprojectorNfsd
   parent: ClothingEyesHudSecurity
-  result: HoloprojectorNfsdEmpty
+  result: HoloprojectorNfsdEmpty