Industrial Reagent Grinder (#25020)

* all work done

* adress whitespace

* millions must factorio

* conflict fix

* i forgot

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 093c0524b4a913dbcbfcf608d4275633fefacf4b..7a9e60ac566d10512a873e0ce655918d1bf3427c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1357,3 +1357,16 @@
     materialRequirements:
       Steel: 5
       CableHV: 2
+
+- type: entity
+  parent: BaseMachineCircuitboard
+  id: ReagentGrinderIndustrialMachineCircuitboard
+  name: industrial reagent grinder machine board
+  components:
+  - type: MachineBoard
+    prototype: ReagentGrinderIndustrial
+    requirements:
+      MatterBin: 1
+      Manipulator: 3
+    materialRequirements:
+      Glass: 1
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 28bc62894e5eb7c26ee307db8a19311827a34351..5fbe84a3fe733543908fe12dcf1120a14fe66c74 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -451,6 +451,7 @@
       - ArtifactCrusherMachineCircuitboard
       - TelecomServerCircuitboard
       - MassMediaCircuitboard
+      - ReagentGrinderIndustrialMachineCircuitboard
   - type: MaterialStorage
     whitelist:
       tags:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index d19e2379972127f305b84e8c3de02a49bc61a0c0..3bb1458b8c503736f05b87ec7852924858b998ae 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -56,3 +56,45 @@
       inputContainer: !type:Container
       machine_board: !type:Container
       machine_parts: !type:Container
+
+- type: entity
+  parent: Recycler #too different so different parent
+  id: ReagentGrinderIndustrial
+  name: industrial reagent grinder
+  description: An industrial reagent grinder.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      output:
+        maxVol: 400 #*slaps roof of machine* This baby can fit so much omnizine in it
+  - type: MaterialReclaimer
+    whitelist:
+      components:
+      - Extractable #same as reagent grinder
+    blacklist:
+      tags:
+      - HighRiskItem #ian meat
+    efficiency: 0.9
+  - type: Sprite
+    sprite: Structures/Machines/recycling.rsi
+    layers:
+      - state: grinder-b0
+  - type: Machine
+    board: ReagentGrinderIndustrialMachineCircuitboard
+  - type: GenericVisualizer
+    visuals:
+      enum.ConveyorVisuals.State:
+        enum.RecyclerVisualLayers.Main:
+          Forward: { state: grinder-b1 }
+          Reverse: { state: grinder-b1 }
+          Off: { state: grinder-b0 }
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
+  - type: Construction
+    graph: Machine
+    node: machine
+    containers:
+    - machine_parts
+    - machine_board
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
index 814852125a005ebe99c910c8d4d5c71ca83015ca..138795cbf132caeece5e9730fa67236635adbbd6 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -116,4 +116,4 @@
     interactSuccessString: petting-success-recycler
     interactFailureString: petting-failure-generic
     interactSuccessSound:
-      path: /Audio/Items/drill_hit.ogg
+      path: /Audio/Items/drill_hit.ogg
\ No newline at end of file

diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index f0c59a0bdf9151a811c3ff24ef14574624eb8966..c4417f868b56ab601488f287402d2a86b1471851 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -956,3 +956,12 @@
      Steel: 100
      Glass: 900
      Gold: 100
+
+- type: latheRecipe
+  id: ReagentGrinderIndustrialMachineCircuitboard
+  result: ReagentGrinderIndustrialMachineCircuitboard
+  completetime: 5
+  materials:
+     Steel: 100
+     Glass: 900
+     Gold: 100

diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 61f95894ee69ef8db6a4b950223291b4bc40fbe8..79dac2751010dac221a96b55e74ff3c604401466 100644 (file)
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -14,6 +14,7 @@
   - BorgModuleHarvesting
   - SeedExtractorMachineCircuitboard
   - HydroponicsTrayMachineCircuitboard
+  - ReagentGrinderIndustrialMachineCircuitboard
 
 - type: technology
   id: CritterMechs