Added rubber ammo to NFSD TechFab (new-frontiers-14#2518)

* Added rubber ammo to SecurityTechFab Moved nonlethal recipes from dynamic to static for SecurityTechFab inherited by NfsdTechFab * Return and comment shotgun recipes * Moved to NFSD * Update lathe.yml * NFSD Stuff * Update arsenal.yml --------- Co-authored-by: Whatstone <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]>
whatston3 · Dec 6, 2024 · 2a92cee · 2a92cee
1 parent c3d2702
commit 2a92cee
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 24 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -791,8 +791,8 @@
   id: SecurityTechFab
   parent: BaseLatheLube
   name: security techfab
-  categories: [ HideSpawnMenu ] # Frontier
   description: Prints equipment for use by security crew.
+  categories: [ HideSpawnMenu ] # Frontier
   components:
   - type: Sprite
     sprite: Structures/Machines/techfab.rsi
@@ -845,8 +845,6 @@
       - RiotShield
       - SpeedLoaderMagnum
       - SpeedLoaderMagnumEmpty
-      - SpeedLoaderRifleHeavy # Frontier
-      - SpeedLoaderRifleHeavyEmpty # Frontier
       - Stunbaton
       - TargetClown
       - TargetHuman
@@ -855,8 +853,6 @@
       - WeaponFlareGunSecurity
       - WeaponLaserCarbinePractice
       - Zipties
-      - ThrusterSecurityMachineCircuitboard # Frontier
-      - ClothingOuterHardsuitEVAPrisoner # Frontier
     dynamicRecipes:
       - BoxBeanbag
       - BoxShotgunIncendiary
@@ -908,13 +904,6 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon
-      - ContrabandAppraisalTool # Frontier
-      - SpeedLoaderRifleHeavyIncendiary # Frontier
-      - SpeedLoaderRifleHeavyUranium # Frontier
-      - MagazineBoxLightRifleRubber # Frontier
-      - MagazineBoxMagnumRubber # Frontier
-      - MagazineBoxPistolRubber # Frontier
-      - MagazineBoxRifleRubber # Frontier
   - type: MaterialStorage
     whitelist:
       tags:

diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -165,17 +165,6 @@
     Cloth: 100
     Steel: 50
 
-# Frontier
-- type: latheRecipe
-  parent: BaseToolRecipe
-  id: UtilityBeltChiefEngineer
-  result: ClothingBeltChiefEngineer
-  completetime: 6
-  materials:
-    Silver: 400
-    Gold: 100
-# End Frontier
-
 - type: latheRecipe
   parent: BaseToolRecipe
   id: HolofanProjector

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/tools.yml
@@ -1,3 +1,12 @@
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: UtilityBeltChiefEngineer
+  result: ClothingBeltChiefEngineer
+  completetime: 6
+  materials:
+    Silver: 400
+    Gold: 100
+
 - type: entity
   name: shipyard RCD
   parent: RCD

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -571,6 +571,115 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Machine
     board: NfsdTechFabCircuitboard
+  - type: Lathe
+    idleState: icon
+    runningState: icon
+    staticRecipes:
+      - BoxLethalshot
+      - BoxShotgunPractice
+      - BoxShotgunSlug
+      - ClothingEyesHudNfsd
+      - CombatKnife
+      - Flash
+      - ForensicPad
+      - Handcuffs
+      - MagazineBoxLightRifle
+      - MagazineBoxLightRiflePractice
+      - MagazineBoxMagnum
+      - MagazineBoxMagnumPractice
+      - MagazineBoxPistol
+      - MagazineBoxPistolPractice
+      - MagazineBoxRifle
+      - MagazineBoxRiflePractice
+      - MagazineLightRifle
+      - MagazineLightRifleEmpty
+      - MagazinePistol
+      - MagazinePistolEmpty
+      - MagazinePistolSubMachineGun
+      - MagazinePistolSubMachineGunEmpty
+      - MagazinePistolSubMachineGunTopMounted
+      - MagazinePistolSubMachineGunTopMountedEmpty
+      - MagazineRifle
+      - MagazineRifleEmpty
+      - MagazineShotgun
+      - MagazineShotgunEmpty
+      - MagazineShotgunSlug
+      - RiotShield
+      - SpeedLoaderMagnum
+      - SpeedLoaderMagnumEmpty
+      - SpeedLoaderRifleHeavy
+      - SpeedLoaderRifleHeavyEmpty
+      - Stunbaton
+      - TargetClown
+      - TargetHuman
+      - TargetSyndicate
+      - WeaponDisablerPractice
+#      - WeaponFlareGunSecurity
+      - WeaponLaserCarbinePractice
+      - Zipties
+      - ThrusterNfsdMachineCircuitboard
+      - SmallThrusterMachineCircuitboard
+      - GyroscopeNfsdMachineCircuitboard
+      - SmallGyroscopeNfsdMachineCircuitboard
+      - ClothingOuterHardsuitEVAPrisoner
+      - BoxBeanbag
+      - MagazineBoxLightRifleRubber
+      - MagazineBoxMagnumRubber
+      - MagazineBoxPistolRubber
+      - MagazineBoxRifleRubber
+      - MagazineShotgunBeanbag
+      - WeaponDisabler
+      - ContrabandAppraisalTool
+      - HoloprojectorNfsd
+      - ClothingBackpackElectropack
+    dynamicRecipes:
+      - BoxShotgunIncendiary
+      - BoxShotgunUranium
+      - BoxShellTranquilizer
+      - ExplosivePayload
+      - FlashPayload
+      - GrenadeBlast
+      - GrenadeEMP
+      - GrenadeFlash
+      - MagazineBoxLightRifleIncendiary
+      - MagazineBoxLightRifleUranium
+      - MagazineBoxMagnumIncendiary
+      - MagazineBoxMagnumUranium
+      - MagazineBoxPistolIncendiary
+      - MagazineBoxPistolUranium
+      - MagazineBoxRifleIncendiary
+      - MagazineBoxRifleUranium
+      - MagazineGrenadeEmpty
+      - MagazineLightRifleIncendiary
+      - MagazineLightRifleUranium
+      - MagazinePistolIncendiary
+      - MagazinePistolUranium
+      - 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
 
 - type: entity
   id: MercenaryTechFab

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml
@@ -124,3 +124,13 @@
     Glass: 5
     Plasma: 10
     Silver: 5
+
+- type: latheRecipe
+  id: ClothingEyesHudNfsd
+  parent: ClothingEyesHudSecurity
+  result: ClothingEyesHudNfsd
+
+- type: latheRecipe
+  id: HoloprojectorNfsd
+  parent: ClothingEyesHudSecurity
+  result: HoloprojectorNfsdEmpty
diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml
@@ -15,7 +15,6 @@
   - Handcuffs
   - ClothingOuterArmorBulletproofNF
   - ClothingOuterCoatBHTrench
-  - ContrabandAppraisalTool
   - PinpointerUniversalNF
   - ClothingEyesHudBountyHunter
   - WeaponShotgunKammererNF