Tech

new-frontiers-14 · Mar 9, 2024 · 4e5af71 · 4e5af71
1 parent 4152b87
commit 4e5af71
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 25 deletions.
diff --git a/Resources/Locale/en-US/_NF/research/technologies.ftl b/Resources/Locale/en-US/_NF/research/technologies.ftl
@@ -1 +1,2 @@
-research-techology-advanced-personal-propulsion = Advanced Personal Propulsion
+research-techology-advanced-personal-propulsion = Advanced Personal Propulsion
+research-technology-food-service-advanced = Advanced Food Service
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -471,17 +471,16 @@
       - SodaDispenserMachineCircuitboard
       - TelecomServerCircuitboard
       - MassMediaCircuitboard
-    # Begin Nyano additions
-      - DoorElectronics
-      - FireAlarmElectronics
-      - FirelockElectronics
-      - IntercomElectronics
-      - MailingUnitElectronics
-      - StationMapElectronics
-      - DeepFryerMachineCircuitboard
-    # End Nyano additions
+      - DoorElectronics # Nyano
+      - FireAlarmElectronics # Nyano
+      - FirelockElectronics # Nyano
+      - IntercomElectronics # Nyano
+      - MailingUnitElectronics # Nyano
+      - StationMapElectronics # Nyano
+      - DeepFryerMachineCircuitboard # Nyano
       - SmallThrusterMachineCircuitboard # Frontier
       - SmallGyroscopeMachineCircuitboard # Frontier
+      - AdvancedReagentGrinderMachineCircuitboard # Frontier
   - type: MaterialStorage
     whitelist:
       tags:

diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
@@ -50,7 +50,6 @@
   - ElectricGrillMachineCircuitboard
   - BoozeDispenserMachineCircuitboard
   - SodaDispenserMachineCircuitboard
-  - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board to service research.
 
 - type: technology
   id: AudioVisualCommunication

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
@@ -67,3 +67,20 @@
         Manipulator: 2
       materialRequirements:
         Glass: 1
+
+- type: entity
+  id: AdvancedReagentGrinderMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: advanced reagent grinder machine board
+  description: A machine printed circuit board for a advanced reagent grinder.
+  components:
+    - type: MachineBoard
+      prototype: AdvancedReagentGrinder
+      requirements:
+        MatterBin: 2
+        Manipulator: 2
+      tagRequirements:
+        GlassBeaker:
+          Amount: 1
+          DefaultPrototype: Beaker
+          ExamineName: Glass Beaker
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/reagent_grinder.yml
@@ -7,22 +7,10 @@
   components:
   - type: Sprite
     sprite: _NF/Structures/Machines/advancedjuicer.rsi
-    drawdepth: SmallObjects
-    snapCardinals: true
-    offset: "0.0,0.4"
-    layers:
-    - map: [ "grinder" ]
-      state: "juicer0"
   - type: ApcPowerReceiver
     powerLoad: 600
-  - type: ItemSlots
-    slots:
-      beakerSlot:
-        whitelist:
-          components:
-          - FitsInDispenser
   - type: Machine
-#    board: AdvancedReagentGrinderMachineCircuitboard
-    board: ReagentGrinderMachineCircuitboard
+    board: AdvancedReagentGrinderMachineCircuitboard
   - type: ReagentGrinder
     advanced: true
+    baseStorageMaxEntities: 6
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
@@ -37,3 +37,12 @@
   materials:
     Steel: 700
     Glass: 900
+
+- type: latheRecipe
+  id: AdvancedReagentGrinderMachineCircuitboard
+  result: AdvancedReagentGrinderMachineCircuitboard
+  category: Circuitry
+  completetime: 4
+  materials:
+     Steel: 400
+     Glass: 900
diff --git a/Resources/Prototypes/_NF/Research/civilianservices.yml b/Resources/Prototypes/_NF/Research/civilianservices.yml
@@ -1,3 +1,20 @@
+# Tier 2
+
+- type: technology
+  id: AdvancedFoodService
+  name: research-technology-food-service-advanced
+  icon:
+    sprite: _NF/Structures/Machines/juicer.rsi
+    state: juicer1
+  discipline: CivilianServices
+  tier: 2
+  cost: 10000
+  recipeUnlocks: #remove all of these once we have more kitchen equipment
+  - AdvancedReagentGrinderMachineCircuitboard
+  - DeepFryerMachineCircuitboard # Nyano - Summary: adds deep fryer circuit board to service research.
+  technologyPrerequisites:
+  - FoodService
+
 # Tier 3
 
 - type: technology