diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl index 223f8a6ca9b..072c0dcce63 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl +++ b/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 } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/printer.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/printer.ftl index c3102510d14..4135869592e 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/printer.ftl +++ b/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. \ No newline at end of file diff --git a/Resources/Locale/en-US/_strings/research/technologies.ftl b/Resources/Locale/en-US/_strings/research/technologies.ftl index f7492e4022f..a2ad588ee4d 100644 --- a/Resources/Locale/en-US/_strings/research/technologies.ftl +++ b/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 diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl new file mode 100644 index 00000000000..37ecb8a59a6 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl @@ -0,0 +1,2 @@ +ent-ExosuitFabricatorHyperConvectionMachineCircuitboard = гиперконвекционный фабрикатор экзокостюмов (машинная плата) + .desc = { ent-BaseMachineCircuitboard.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/printer.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/printer.ftl index 5c5ae67ac65..28dc66ed93e 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/printer.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/printer.ftl @@ -1,2 +1,4 @@ ent-PrinterDoc = принтер документов .desc = Бюрократическое совершенство. Хранит базу данных всех документов Nanotrasen и позволяет печатать их, пока хватает бумаги. +ent-ExosuitFabricatorHyperConvection = гиперконвекционный фабрикатор экзокостюмов + .desc = Экспериментальный фабрикатор экзокостюмов, использующий технологию экстремального нагрева для замедленного, но гораздо более экономичного создания предметов. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/research/technologies.ftl index 20f14d12037..00c25468d08 100644 --- a/Resources/Locale/ru-RU/_strings/research/technologies.ftl +++ b/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 = Мехи для животных diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 839643595ae..ef148b4474e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -593,6 +593,7 @@ - SMESAdvancedMachineCircuitboard - HolopadMachineCircuitboard - ImplantExtractorMachineCircuitboard #Sunrise-Edit + - ExosuitFabricatorHyperConvectionMachineCircuitboard #Sunrise-Edit - type: EmagLatheRecipes emagDynamicRecipes: - ShuttleGunDusterCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index b6776797e2a..4ea451e9a05 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/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 diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 2503ec63b80..8627c1bc069 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/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 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 128af4ec870..012f3bb8a33 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/printer.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/printer.yml index 385d4610eaa..722e0dda3d5 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/printer.yml +++ b/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 \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-active.png b/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-active.png new file mode 100644 index 00000000000..297aabae2e3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-active.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-idle.png b/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-idle.png new file mode 100644 index 00000000000..cba8241c05d Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-idle.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-load.png b/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-load.png new file mode 100644 index 00000000000..9b9d93d5cc1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-load.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-o.png b/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-o.png new file mode 100644 index 00000000000..b7694671e17 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/fab-o.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Machines/hyper_exosuit_fabricator.rsi/meta.json new file mode 100644 index 00000000000..f62727c6317 --- /dev/null +++ b/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 + ] + ] + } + ] +} \ No newline at end of file