From dc7a7a58b15be984c4db5cf21f4702b75992538b Mon Sep 17 00:00:00 2001 From: Krosus777 <38509947+Krosus777@users.noreply.github.com> Date: Wed, 18 Oct 2023 16:37:37 +0200 Subject: [PATCH] migration --- .../machines/computers/computers.ftl | 8 +- .../Entities/Structures/Machines/Printer.yml | 52 +----------- .../Machines/Computers/computers.yml | 85 +++++++++---------- Resources/migration.yml | 4 + 4 files changed, 50 insertions(+), 99 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl index e3056f4e7e0..df5c13cb215 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl @@ -1,5 +1,5 @@ -ent-ComputerAlert = принтер документов - .desc = Уникальная разработка на NanoTrasen. +ent-ComputerAlert = консоль оповещений + .desc = Используется для доступа к автоматизированной системе оповещения станции. ent-ComputerEmergencyShuttle = консоль аварийного шаттла .desc = Выдает разрешение на досрочный запуск шаттла. ent-BaseComputerShuttle = консоль управления шаттлом @@ -21,8 +21,8 @@ ent-ComputerPowerMonitoring = консоль контроля питания .desc = Он отслеживает показатели энергии по всей станции. ent-ComputerMedicalRecords = консоль медицинских карт .desc = Это можно использовать для проверки медицинской истории. -ent-ComputerCriminalRecords = принтер документов - .desc = Уникальная разработка на NanoTrasen. +ent-ComputerCriminalRecords = консоль криминальных записей + .desc = Это можно использовать для проверки судимостей. ent-ComputerStationRecords = консоль станционного учёта .desc = По нему можно проверять станционные записи. ent-ComputerCrewMonitoring = консоль мониторинга экипажа diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Machines/Printer.yml b/Resources/Prototypes/Corvax/Entities/Structures/Machines/Printer.yml index 3087ea6885d..56b4c7b89c0 100644 --- a/Resources/Prototypes/Corvax/Entities/Structures/Machines/Printer.yml +++ b/Resources/Prototypes/Corvax/Entities/Structures/Machines/Printer.yml @@ -1,6 +1,6 @@ - type: entity parent: BaseLathe - id: Printer + id: PrinterDoc name: принтер документов description: Уникальная разработка на NanoTrasen. components: @@ -98,53 +98,3 @@ SheetPrinter: 1000 -- type: entity - parent: Printer - id: ComputerCriminalRecords - name: принтер документов - suffix: Консоль криминалистических записей - description: Уникальная разработка на NanoTrasen. - components: - - type: Sprite - sprite: Corvax/Structures/Machines/printer.rsi - snapCardinals: true - layers: - - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] - - state: idle - shader: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: inserting - map: ["enum.MaterialStorageVisualLayers.Inserting"] - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Lathe - producingSound: /Audio/Machines/scanning.ogg - idleState: icon - runningState: building - -- type: entity - parent: Printer - id: ComputerAlert - name: принтер документов - suffix: Консоль оповещений - description: Уникальная разработка на NanoTrasen. - components: - - type: Sprite - sprite: Corvax/Structures/Machines/printer.rsi - snapCardinals: true - layers: - - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] - - state: idle - shader: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: inserting - map: ["enum.MaterialStorageVisualLayers.Inserting"] - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Lathe - producingSound: /Audio/Machines/scanning.ogg - idleState: icon - runningState: building - diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 2ef8cc3a21d..d4cc456eda8 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -1,23 +1,21 @@ -#Corvax-Printer-Start -# - type: entity -# parent: BaseComputer -# id: ComputerAlert -# name: alerts computer -# description: Used to access the station's automated alert system. -# components: -# - type: Computer -# board: AlertsComputerCircuitboard -# - type: Sprite -# layers: -# - map: ["computerLayerBody"] -# state: computer -# - map: ["computerLayerKeyboard"] -# state: generic_keyboard -# - map: ["computerLayerScreen"] -# state: alert-2 -# - map: ["computerLayerKeys"] -# state: atmos_key -#Corvax-Printer-End +- type: entity + parent: BaseComputer + id: ComputerAlert + name: alerts computer + description: Used to access the station's automated alert system. + components: + - type: Computer + board: AlertsComputerCircuitboard + - type: Sprite + layers: + - map: ["computerLayerBody"] + state: computer + - map: ["computerLayerKeyboard"] + state: generic_keyboard + - map: ["computerLayerScreen"] + state: alert-2 + - map: ["computerLayerKeys"] + state: atmos_key - type: entity parent: BaseComputer @@ -277,30 +275,29 @@ - type: Computer board: MedicalRecordsComputerCircuitboard -#Corvax-Printer-Start -# - type: entity -# parent: BaseComputer -# id: ComputerCriminalRecords -# name: criminal records computer -# description: This can be used to check criminal records. -# components: -# - type: Sprite -# layers: -# - map: ["computerLayerBody"] -# state: computer -# - map: ["computerLayerKeyboard"] -# state: generic_keyboard -# - map: ["computerLayerScreen"] -# state: explosive -# - map: ["computerLayerKeys"] -# state: security_key -# - type: PointLight -# radius: 1.5 -# energy: 1.6 -# color: "#1f8c28" -# - type: Computer -# board: CriminalRecordsComputerCircuitboard -#Corvax-Printer-End +- type: entity + parent: BaseComputer + id: ComputerCriminalRecords + name: criminal records computer + description: This can be used to check criminal records. + components: + - type: Sprite + layers: + - map: ["computerLayerBody"] + state: computer + - map: ["computerLayerKeyboard"] + state: generic_keyboard + - map: ["computerLayerScreen"] + state: explosive + - map: ["computerLayerKeys"] + state: security_key + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#1f8c28" + - type: Computer + board: CriminalRecordsComputerCircuitboard + - type: entity parent: BaseComputer id: ComputerStationRecords diff --git a/Resources/migration.yml b/Resources/migration.yml index 94320089f35..ffed21f20df 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -8,6 +8,10 @@ # WallSolid: Window # Table: null +# 2023-10-18 +ComputerAlert: PrinterDoc +ComputerCriminalRecords: PrinterDoc + # 2023-07-03 ClothingHeadHelmetHelmet: ClothingHeadHelmetBasic ClothingHeadHelmetHelmetOld: ClothingHeadHelmetBasic