Chisel (Update and Revamp) (#1206)

* tweaks * more thrusters * some tweaks * QM locker is back * tweaking * Update suit_storage.yml * Update suit_storage.yml * Update lathe.yml * Update lathe.yml --------- Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Apr 26, 2024 · 7bafc38 · 7bafc38
1 parent e9fbc93
commit 7bafc38
Show file tree

Hide file tree

Showing 6 changed files with 1,576 additions and 1,447 deletions.
diff --git a/Resources/Maps/_NF/Shuttles/chisel.yml b/Resources/Maps/_NF/Shuttles/chisel.yml
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -7,15 +7,12 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitVoidParamed
         - id: ClothingMaskBreathMedical
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
   - type: AccessReader
-#    access: [["Medical"]]
 
 #Hydroponics EVA
 - type: entity
@@ -25,16 +22,13 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterEVASuitHydro
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
 #        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
   - type: AccessReader
-    # access: [[ "Hydroponics" ]]
 
 #HARDSUITS
 #Quartermaster hardsuit
@@ -45,16 +39,29 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingShoesBootsMag
         - id: ClothingOuterHardsuitLuxury
         - id: ClothingMaskGasExplorer
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
   - type: AccessReader
-    # access: [["Quartermaster"]]
+
+#Mining hardsuit
+- type: entity
+  id: SuitStorageMining
+  parent: SuitStorageBase
+  suffix: Mining
+  components:
+  - type: StorageFill
+    contents:
+        - id: AirTankFilled
+        - id: ClothingShoesBootsMag
+        - id: ClothingOuterHardsuitSalvage
+        - id: ClothingMaskGasExplorer
+        - id: JetpackMiniFilled
+        - id: HandheldGPSBasic
+  - type: AccessReader
 
 #Mercenary hardsuit
 - type: entity
@@ -64,8 +71,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitMercenary
         - id: ClothingMaskGasMercenary
@@ -83,8 +88,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitScaf
         - id: ClothingMaskGasMercenary
@@ -102,14 +105,11 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitPilot
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
   - type: AccessReader
     access: [["Captain"], ["Pilot"]]
 
@@ -121,16 +121,12 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitClown
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
-#        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
   - type: AccessReader
-#    access: [["Captain"], ["Pilot"]]
 
 #Cadet hardsuit
 - type: entity
@@ -140,8 +136,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdBronze # Frontier
         - id: ClothingMaskGasNfsd
@@ -159,8 +153,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdSilver # Frontier
         - id: ClothingMaskGasNfsd 
@@ -178,8 +170,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdBrigmedic # Frontier
         - id: ClothingMaskGasNfsd 
@@ -197,8 +187,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdGold # Frontier
         - id: ClothingMaskGasNfsd 
@@ -216,8 +204,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdGold # Frontier
         - id: ClothingMaskGasNfsd 
@@ -235,8 +221,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdSheriff # Frontier
         - id: ClothingMaskGasSheriff
@@ -254,8 +238,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdCombat # Frontier
         - id: ClothingMaskGasNfsd 
@@ -273,8 +255,6 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled
-#        - id: OxygenTankFilled
         - id: AirTankFilled
         - id: ClothingOuterHardsuitNfsdCommand # Frontier
         - id: ClothingMaskGasNfsd 

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
@@ -15,6 +15,11 @@
   id: SuitStorageWallmountQuartermaster
   parent: [SuitStorageWallmount, SuitStorageQuartermaster]
 
+#Mining hardsuit
+- type: entity
+  id: SuitStorageWallmountMining
+  parent: [SuitStorageWallmount, SuitStorageMining]
+
 #Mercenary hardsuit
 - type: entity
   id: SuitStorageWallmountMercenary

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -254,14 +254,15 @@
     idleState: icon
     runningState: icon
     staticRecipes:
-      - Durathread
-      - Plasteel
-      - SheetSteel
-      - SheetPlasteel
-      - SheetPlasma
-      - SheetGlass1
-      - SheetRGlass
-      - SheetPlastic
+      #- Durathread
+      #- Plasteel
+      #- SheetSteel
+      #- SheetPlasteel
+      #- SheetPlasma30
+      #- SheetUranium30
+      #- SheetGlass30
+      #- SheetRGlass
+      #- SheetPlastic
       - ClothingOuterSuitEmergency
       - ClothingHeadHelmetEVA
       - ClothingOuterHardsuitEVA
@@ -305,26 +306,21 @@
       - GlowstickPurple
       - GlowstickRedLathe
       - GlowstickYellow
-    dynamicRecipes:
+      - OreBag
       - MiningDrill
+      - WeaponProtoKineticAccelerator
+    dynamicRecipes:
       - Bucket
       - MopItem
       - SprayBottle
       - FireExtinguisher
-      - LightTube
-      - LightBulb
-      - CableStack
       - CableMVStack
       - CableHVStack
-      - Signaller
-      - PowerCellMedium
       - PowerCellHigh
       - PowerCellMicroreactor
       - WeaponCrusher
       - WeaponCrusherDagger
       - WeaponCrusherGlaive
-      - WeaponProtoKineticAccelerator
-      - WeaponTetherGun
       - WeaponGrapplingGun
       - ClothingBackpackHolding
       - ClothingBackpackSatchelHolding
@@ -364,6 +360,7 @@
         - Sheet
         - RawMaterial
         - Ingot
+#        - Ore
 
 - type: entity
   id: NfsdTechFab

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
@@ -88,3 +88,12 @@
   category: Tools
   materials:
     Steel: 500
+
+- type: latheRecipe
+  id: OreBag
+  result: OreBag
+  completetime: 1
+  category: Tools
+  materials:
+    Steel: 500
+    Cloth: 500
diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml
@@ -12,7 +12,7 @@
   id: Chisel
   name: ICR Chisel
   description: Standard small size multipurpose vessel , originally meant to aid in ship scrapping.
-  price: 31340
+  price: 34615 # on init 30100$, 15% markup 4515$
   category: Small
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/chisel.yml