Merge remote-tracking branch 'origin/master'

Resources/Changelog/ChangelogSunrise.yml

@@ -10582,3 +10582,15 @@
   id: 732
   time: '2025-01-13T18:31:46.0000000+00:00'
   url: https://github.com/space-sunrise/space-station-14/pull/1103
+- author: KaiserMaus
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0433\u0438\u043F\u0435\
+      \u0440\u043A\u043E\u043D\u0432\u0435\u043A\u0446\u0438\u043E\u043D\u043D\u044B\
+      \u0439 \u0444\u0430\u0431\u0440\u0438\u043A\u0430\u0442\u043E\u0440 \u044D\u043A\
+      \u0437\u043E\u043A\u043E\u0441\u0442\u044E\u043C\u043E\u0432 \u0438 \u0435\u0433\
+      \u043E \u0442\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u044F \u0432 \u0420\
+      \u041D\u0414."
+    type: Add
+  id: 733
+  time: '2025-01-14T17:11:14.0000000+00:00'
+  url: https://github.com/space-sunrise/space-station-14/pull/1113

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl

@@ -4,3 +4,5 @@ ent-PacificatorCircuitboard = pacifism generator machine board
     .desc = Makes all sentient beings within range pacifists.
 ent-ReflectorMachineCircuitboard = reflector machine board
     .desc = { ent-BaseMachineCircuitboard.desc }
+ent-ExosuitFabricatorHyperConvectionMachineCircuitboard = hyper convection exosuit fabricator machine board
+    .desc = { ent-BaseMachineCircuitboard.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/printer.ftl

@@ -1,2 +1,4 @@
 ent-PrinterDoc = document printer
     .desc = Bureaucratic perfection. Stores a database of all Nanotrasen documents, and lets you print them as long as you have paper.
+ent-ExosuitFabricatorHyperConvection = hyper convection exosuit fabricator
+    .desc = A highly-experimental Exosuit Fabricator that harnesses the power of extreme heat to slowly create objects more cost-effectively.

Resources/Locale/en-US/_strings/research/technologies.ftl

@@ -61,6 +61,7 @@ research-technology-advanced-anomaly-research = Advanced Anomaly Research
 research-technology-rped = Rapid Part Exchange
 research-technology-super-parts = Super Parts
 research-technology-deterrence = Deterrence Technologies
+research-technology-industrial-robotics = Industrial Robotics
 
 research-technology-janitorial-equipment = Janitorial Equipment
 research-technology-laundry-tech = Laundry Tech

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl

@@ -0,0 +1,2 @@
+ent-ExosuitFabricatorHyperConvectionMachineCircuitboard = гиперконвекционный фабрикатор экзокостюмов (машинная плата)
+    .desc = { ent-BaseMachineCircuitboard.desc }

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/printer.ftl

@@ -1,2 +1,4 @@
 ent-PrinterDoc = принтер документов
     .desc = Бюрократическое совершенство. Хранит базу данных всех документов Nanotrasen и позволяет печатать их, пока хватает бумаги.
+ent-ExosuitFabricatorHyperConvection = гиперконвекционный фабрикатор экзокостюмов
+    .desc = Экспериментальный фабрикатор экзокостюмов, использующий технологию экстремального нагрева для замедленного, но гораздо более экономичного создания предметов.

Resources/Locale/ru-RU/_strings/research/technologies.ftl

@@ -61,6 +61,7 @@ research-technology-advanced-anomaly-research = Продвинутое изуч
 research-technology-rped = Быстрая замена компонентов
 research-technology-super-parts = Суперкомпоненты
 research-technology-deterrence = Технология сдерживания
+research-technology-industrial-robotics = Промышленная робототехника
 research-technology-janitorial-equipment = Уборочное оборудование
 research-technology-laundry-tech = Прачечная технология
 research-technology-critter-mechs = Мехи для животных

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -593,6 +593,7 @@
       - SMESAdvancedMachineCircuitboard
       - HolopadMachineCircuitboard
       - ImplantExtractorMachineCircuitboard #Sunrise-Edit
+      - ExosuitFabricatorHyperConvectionMachineCircuitboard  #Sunrise-Edit
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ShuttleGunDusterCircuitboard

Resources/Prototypes/Recipes/Lathes/electronics.yml

@@ -665,6 +665,11 @@
   id: HolopadMachineCircuitboard
   result: HolopadMachineCircuitboard
 
+- type: latheRecipe
+  parent: BaseGoldCircuitboardRecipe
+  id: ExosuitFabricatorHyperConvectionMachineCircuitboard
+  result: ExosuitFabricatorHyperConvectionMachineCircuitboard
+
 - type: latheRecipe #sunrise-start
   parent: BaseGoldCircuitboardRecipe
   id: ImplantExtractorMachineCircuitboard

Resources/Prototypes/Research/experimental.yml

@@ -125,6 +125,22 @@
   - WeaponParticleDecelerator
   - HoloprojectorField
 
+- type: technology
+  id: IndustrialRobotic
+  name: research-technology-industrial-robotics
+  icon:
+    sprite: _Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi
+    state: fab-idle
+  discipline: Experimental
+  tier: 2
+  cost: 7500
+  recipeUnlocks:
+  - ExosuitFabricatorHyperConvectionMachineCircuitboard
+  technologyPrerequisites:
+  - BasicRobotics
+  - IndustrialEngineering
+
+
 # Tier 3
 
 - type: technology

Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -37,3 +37,22 @@
       Manipulator: 2
       MatterBin: 1
       Steel: 1
+
+- type: entity
+  parent: BaseMachineCircuitboard
+  id: ExosuitFabricatorHyperConvectionMachineCircuitboard
+  name: hyper convection exosuit fabricator machine board
+  description: A machine printed circuit board for a hyper convection fabricator.
+  components:
+  - type: Sprite
+    state: science
+  - type: MachineBoard
+    prototype: ExosuitFabricatorHyperConvection
+    stackRequirements:
+      MatterBin: 1
+      Manipulator: 3
+      Glass: 5
+    tagRequirements:
+      Igniter:
+        amount: 1
+        defaultPrototype: Igniter

Resources/Prototypes/_Sunrise/Entities/Structures/Machines/printer.yml

@@ -108,3 +108,14 @@
       - Document
     storage:
       SheetPrinter: 0
+
+- type: entity
+  id: ExosuitFabricatorHyperConvection
+  parent: [ExosuitFabricator, BaseHyperlathe]
+  name: hyper convection exosuit fabricator
+  description: A highly-experimental Exosuit Fabricator that harnesses the power of extreme heat to slowly create objects more cost-effectively.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi
+  - type: Machine
+    board: ExosuitFabricatorHyperConvectionMachineCircuitboard

Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/meta.json

@@ -0,0 +1,62 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1da0b5547e02db0db48d0bc93926c26bd8888347 Resprited by KaiserMaus",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "fab-active",
+      "delays": [
+        [
+          1.5,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.05,
+          0.1,
+          0.3,
+          0.1,
+          0.05,
+          0.1,
+          0.3,
+          0.1,
+          0.05,
+          0.1,
+          0.3,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "fab-idle"
+    },
+    {
+      "name": "fab-o"
+    },
+    {
+      "name": "fab-load",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.2,
+          0.3
+        ]
+      ]
+    }
+  ]
+}