Merge branch 'master' of https://github.com/Vonsant/corvax-next

space-syndicate · Dec 10, 2024 · dd957a8 · dd957a8
2 parents 77d1cdb + da5f87f
commit dd957a8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -224,6 +224,7 @@
     - id: HandheldCrewMonitor
     - id: Hypospray
     - id: MedicalTechFabCircuitboard
+    - id: MedicalBiofabMachineBoard #Corvax-Next-Surgery
     - id: MedkitFilled
     - id: RubberStampCMO
     - id: MedTekCartridge

diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -68,7 +68,7 @@
     rightBarePrint: "footprint-right-bare-dwarf"
   - type: InnateMiningScannerViewer # Corvax-Next-Dwarfs
     pingSound: null
-    viewRange: 5
+    viewRange: 3
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -550,6 +550,7 @@
       - ArtistCircuitBoard
       - NutimovCircuitBoard
       # Corvax-Next-MutableLaws-End
+      - MedicalBiofabMachineBoard #Corvax-Next-Surgery
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ShuttleGunDusterCircuitboard

diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
@@ -96,6 +96,7 @@
   - FatExtractorMachineCircuitboard
   - BiofabricatorMachineCircuitboard
   - BiomassReclaimerMachineCircuitboard
+  - MedicalBiofabMachineBoard #Corvax-Next-Surgery
 
 # Tier 2
 

diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Objects/Circuitboards/production.yml b/Resources/Prototypes/_CorvaxNext/Entities/Objects/Circuitboards/production.yml
@@ -8,6 +8,6 @@
       state: medical
     - type: MachineBoard
       prototype: MedicalBiofabricator
-#      requirements:
-#        MatterBin: 2
-#        Manipulator: 2
+      stackRequirements:
+        MatterBin: 2
+        Manipulator: 2
diff --git a/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/circuit_boards.yml b/Resources/Prototypes/_CorvaxNext/Recipes/Lathes/circuit_boards.yml
@@ -52,3 +52,8 @@
   parent: BaseCircuitboardRecipe
   id: NutimovCircuitBoard
   result: NutimovCircuitBoard
+
+- type: latheRecipe
+  parent: BaseCircuitboardRecipe
+  id: MedicalBiofabMachineBoard
+  result: MedicalBiofabMachineBoard
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Dwarf.xml b/Resources/ServerInfo/Guidebook/Mobs/Dwarf.xml
@@ -19,6 +19,6 @@
   - Не может быть вызвана рвота от алкоголя.
   - Дышат чаще в 2 раза, следовательно без воздуха получают по [color=red]2[/color] урона удушьем.
   - Этанол лечит дворфов на [color=green]0.66[/color] уколов и ушибов и на [color=green]0.68[/color] порезов при наличии менее 5 единиц в организме.
-  - Обладают врождённой чувствительностью к наличию рудоносных жил в радиусе [color=yellow]5[/color] метров.
+  - Обладают врождённой чувствительностью к наличию рудоносных жил в радиусе [color=yellow]3[/color] метров.
 
-</Document>
+</Document>