From c346d1a8f7a6ee0572e420122ba5b82cc46c10df Mon Sep 17 00:00:00 2001 From: Roudenn Date: Sat, 17 Feb 2024 15:14:00 +0300 Subject: [PATCH] Metempsyhotic machine fix + teleporter fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Метепсихотическая машина: * Фикс локализации для машинной платы * Вместо подарка есть её машинная плата * Бонусом в шкафу ГВ теперь есть 100 биомассы. * Метемпсихотическая машина теперь изучаема и её можно скрафтить Телепортер: * Блюспейс кристаллы теперь можно вставить в протолат (был очень тупой баг, пофикшено) * Крафт телепортера теперь более дорогой и долгий Другое: * Блюспейс баночка для таблеток снова в технологии с БС химией, крафт немного удешевлён. --- .../objects/devices/circuitboards/production.ftl | 4 ++-- .../Entities/Objects/Materials/materials.yml | 7 ++----- .../Backmen/Recipes/Lathes/bluespace.yml | 14 +++++++------- .../Prototypes/Backmen/Research/biochemical.yml | 16 ---------------- .../Prototypes/Backmen/Research/experimental.yml | 15 +++++++++++++++ .../Prototypes/Catalog/Fills/Lockers/heads.yml | 6 ++++-- .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Research/civilianservices.yml | 1 + 8 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 Resources/Prototypes/Backmen/Research/biochemical.yml diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/devices/circuitboards/production.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/devices/circuitboards/production.ftl index 5defec90200..377081abca3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/devices/circuitboards/production.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/backmen/entities/objects/devices/circuitboards/production.ftl @@ -1,2 +1,2 @@ -ent-MetempsychoticMachineCircuitboard = Метемпсихотическая машина, машинная доска - .desc = Машинная печатная плата для модуля клонирования. +ent-MetempsychoticMachineCircuitboard = метемпсихотическая машина (машинная плата) + .desc = { ent-BaseMachineCircuitboard.desc } diff --git a/Resources/Prototypes/Backmen/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Backmen/Entities/Objects/Materials/materials.yml index caabd9e5d05..cd154204d16 100644 --- a/Resources/Prototypes/Backmen/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Backmen/Entities/Objects/Materials/materials.yml @@ -35,16 +35,13 @@ name: bluespace crystal suffix: 1 components: - - type: Sprite - state: bluespace - type: Stack stackType: Bluespace count: 1 - - type: Item - size: Tiny - type: Tag tags: - - Ore + - BluespaceCrystal + - RawMaterial - type: entity diff --git a/Resources/Prototypes/Backmen/Recipes/Lathes/bluespace.yml b/Resources/Prototypes/Backmen/Recipes/Lathes/bluespace.yml index ccd18d90ed2..28deccaf727 100644 --- a/Resources/Prototypes/Backmen/Recipes/Lathes/bluespace.yml +++ b/Resources/Prototypes/Backmen/Recipes/Lathes/bluespace.yml @@ -28,13 +28,13 @@ sprite: /Textures/Objects/Devices/hand_teleporter.rsi state: icon result: HandTeleporter - completetime: 8 + completetime: 15 materials: - Bluespace: 600 - Steel: 200 - Plastic: 200 - Gold: 200 - Bananium: 500 + Steel: 1000 + Plastic: 500 + Gold: 300 + Bananium: 600 + Bluespace: 500 #- type: latheRecipe # id: BluespaceBeaker1 @@ -68,4 +68,4 @@ Steel: 250 Plastic: 250 Plasma: 100 - Bluespace: 100 + Bluespace: 50 diff --git a/Resources/Prototypes/Backmen/Research/biochemical.yml b/Resources/Prototypes/Backmen/Research/biochemical.yml deleted file mode 100644 index edf70e7d73c..00000000000 --- a/Resources/Prototypes/Backmen/Research/biochemical.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Tier 2 - -- type: technology - id: Metempsychosis - name: research-technology-metempsychosis - icon: - sprite: Backmen/Structures/Machines/metempsychotic.rsi - state: pod_0 - discipline: Experimental - tier: 2 - cost: 15000 - recipeUnlocks: - - BiomassReclaimerMachineCircuitboard - - CloningConsoleComputerCircuitboard - - MedicalScannerMachineCircuitboard -# - MetempsychoticMachineCircuitboard diff --git a/Resources/Prototypes/Backmen/Research/experimental.yml b/Resources/Prototypes/Backmen/Research/experimental.yml index 85445aa79b3..85cac82f11c 100644 --- a/Resources/Prototypes/Backmen/Research/experimental.yml +++ b/Resources/Prototypes/Backmen/Research/experimental.yml @@ -14,6 +14,21 @@ - InsulativeHeadcage - ShellSoulbreaker +- type: technology + id: Metempsychosis + name: research-technology-metempsychosis + icon: + sprite: Backmen/Structures/Machines/metempsychotic.rsi + state: pod_0 + discipline: Experimental + tier: 2 + cost: 15000 + recipeUnlocks: + - BiomassReclaimerMachineCircuitboard + - CloningConsoleComputerCircuitboard + - MedicalScannerMachineCircuitboard + - MetempsychoticMachineCircuitboard + # Tier 3 - type: technology diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 608220c7cb4..814435c36e8 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -227,7 +227,8 @@ - id: BoxEncryptionKeyMedical - id: AntiPsychicKnife # backmen - id: ClothingHeadCage # backmen - - id: PresentMetempsychoticMachine # backmen + - id: MetempsychoticMachineCircuitboard # backmen + - id: MaterialBiomass # backmen - type: entity id: LockerChiefMedicalOfficerFilled @@ -251,7 +252,8 @@ - id: BoxEncryptionKeyMedical - id: AntiPsychicKnife # backmen - id: ClothingHeadCage # backmen - - id: PresentMetempsychoticMachine # backmen + - id: MetempsychoticMachineCircuitboard # backmen + - id: MaterialBiomass # backmen - type: entity id: LockerResearchDirectorFilledHardsuit diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 92d9227214f..7df3814892b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -464,6 +464,7 @@ - TelecomServerCircuitboard - MassMediaCircuitboard - ShipyardCircuitboard # backmen + - MetempsychoticMachineCircuitboard # backmen - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index d45e65e83bd..58c0dafd415 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -240,3 +240,4 @@ recipeUnlocks: - BluespaceBeaker - SyringeBluespace + - BluespacePillCanister # backmen