From 71649a88a59adb9d1bcb42de9ab9e5bdcd9a326c Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 15 Jul 2024 12:48:46 +0300 Subject: [PATCH 1/2] init --- .../construction/graphs/structures.ftl | 2 ++ .../_sunrise/headset/headset-component.ftl | 1 + .../entities/clothing/ears/headsets.ftl | 2 ++ .../objects/devices/encryption_keys.ftl | 2 ++ .../objects/devices/encryption_keys.ftl | 2 -- .../Piping/Atmospherics/special.yml | 3 +++ .../Entities/Clothing/Ears/headsets.yml | 21 ++++++++++++++- .../Objects/Devices/encryption_keys.yml | 10 +++---- .../Graphs/structures/fan_tiny.yml | 26 +++++++++++++++++++ .../Recipes/Construction/structures.yml | 17 ++++++++++++ .../_Sunrise/Roles/Jobs/Law/Magistrat.yml | 2 +- .../Prototypes/_Sunrise/radio_channels.yml | 6 +++++ 12 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 Resources/Locale/ru-RU/_sunrise/headset/headset-component.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/ears/headsets.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/encryption_keys.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/encryption_keys.ftl create mode 100644 Resources/Prototypes/_Sunrise/Recipes/Construction/Graphs/structures/fan_tiny.yml create mode 100644 Resources/Prototypes/_Sunrise/Recipes/Construction/structures.yml create mode 100644 Resources/Prototypes/_Sunrise/radio_channels.yml diff --git a/Resources/Locale/ru-RU/_sunrise/construction/graphs/structures.ftl b/Resources/Locale/ru-RU/_sunrise/construction/graphs/structures.ftl index 17adfd61204..f58a8d77bb1 100644 --- a/Resources/Locale/ru-RU/_sunrise/construction/graphs/structures.ftl +++ b/Resources/Locale/ru-RU/_sunrise/construction/graphs/structures.ftl @@ -192,3 +192,5 @@ recipe-BananiumAltar-name = бананиумовый алтарь recipe-BananiumAltar-description = Бананиумовый алтарь, посвящённый Хонкоматери. recipe-SolidSecretDoor-name = потайная дверь recipe-SolidSecretDoor-description = Потайная дверь в стене. +recipe-FanTiny-name = маленький вентилятор +recipe-FanTiny-description = Маленький вентилятор, создающий лёгкий поток воздуха. diff --git a/Resources/Locale/ru-RU/_sunrise/headset/headset-component.ftl b/Resources/Locale/ru-RU/_sunrise/headset/headset-component.ftl new file mode 100644 index 00000000000..ba13d71bb29 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/headset/headset-component.ftl @@ -0,0 +1 @@ +chat-radio-law = Юридический \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/ears/headsets.ftl new file mode 100644 index 00000000000..27890f7c177 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/ears/headsets.ftl @@ -0,0 +1,2 @@ +ent-ClothingHeadsetMagistrate = гарнитура Магистрата + .desc = Гарнитура магистрата, чтобы услышать последние слова зеков. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/encryption_keys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/encryption_keys.ftl new file mode 100644 index 00000000000..a69c1ef024d --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/devices/encryption_keys.ftl @@ -0,0 +1,2 @@ +ent-EncryptionKeyLaw = ключ шифрования юридического отдела + .desc = Ключ шифрования, используемый самыми дотошными персонами. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/encryption_keys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/encryption_keys.ftl deleted file mode 100644 index f1b32d9d160..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/encryption_keys.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-EncryptionKeyIAA = ключ шифрования агента внутренних дел - .desc = Ключ шифрования, используемый самой дотошной персоной. diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml index 4eec014f11b..cb06f9dd913 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml @@ -25,3 +25,6 @@ - type: Tag tags: - SpreaderIgnore + - type: Construction + graph: AtmosDeviceFanTiny + node: fantiny diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Ears/headsets.yml index 160f5a4c172..b4bafc3973a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Ears/headsets.yml @@ -7,6 +7,25 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyIAA + - EncryptionKeyLaw + - EncryptionKeySecurity + - EncryptionKeyCommon + - EncryptionKeyCommand + - type: Sprite + sprite: Clothing/Ears/Headsets/servicesecurity.rsi + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetMagistrate + name: magistrate headset + description: A headset for internal affairs agent to hear the captain's last words. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyLaw + - EncryptionKeySecurity + - EncryptionKeyCommon + - EncryptionKeyCommand - type: Sprite sprite: Clothing/Ears/Headsets/servicesecurity.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/encryption_keys.yml index c1bc2bb03a7..81e2d0f05ee 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/encryption_keys.yml @@ -1,15 +1,13 @@ - type: entity parent: EncryptionKey - id: EncryptionKeyIAA - name: iaa encryption key + id: EncryptionKeyLaw + name: law encryption key description: An encryption key used by the most meticulous person. components: - type: EncryptionKey channels: - - Common - - Command - - Security - defaultChannel: Command + - Law + defaultChannel: Law - type: Sprite layers: - state: crypt_silver diff --git a/Resources/Prototypes/_Sunrise/Recipes/Construction/Graphs/structures/fan_tiny.yml b/Resources/Prototypes/_Sunrise/Recipes/Construction/Graphs/structures/fan_tiny.yml new file mode 100644 index 00000000000..2ab1c9b342c --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Recipes/Construction/Graphs/structures/fan_tiny.yml @@ -0,0 +1,26 @@ +- type: constructionGraph + id: AtmosDeviceFanTiny + start: start + graph: + - node: start + edges: + - to: fantiny + completed: + - !type:SnapToGrid { } + steps: + - material: Steel + amount: 2 + doAfter: 1 + + - node: fantiny + entity: AtmosDeviceFanTiny + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + - !type:DeleteEntity + steps: + - tool: Screwing + doAfter: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Recipes/Construction/structures.yml b/Resources/Prototypes/_Sunrise/Recipes/Construction/structures.yml new file mode 100644 index 00000000000..74b905fe915 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Recipes/Construction/structures.yml @@ -0,0 +1,17 @@ +- type: construction + name: fan-tiny + id: FanTiny + graph: AtmosDeviceFanTiny + startNode: start + targetNode: fantiny + category: construction-category-structures + description: A large structural assembly made out of metal. + icon: + sprite: Structures/Piping/Atmospherics/tinyfan.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml index ed69badd1c8..58e90177285 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Law/Magistrat.yml @@ -49,7 +49,7 @@ gloves: ClothingHandsGlovesColorWhite outerClothing: ClothingOuterRobesJudge id: MagistratPDA - ears: ClothingHeadsetAltCommand + ears: ClothingHeadsetMagistrate head: ClothingHeadHatPwig storage: back: diff --git a/Resources/Prototypes/_Sunrise/radio_channels.yml b/Resources/Prototypes/_Sunrise/radio_channels.yml new file mode 100644 index 00000000000..eb743c3822d --- /dev/null +++ b/Resources/Prototypes/_Sunrise/radio_channels.yml @@ -0,0 +1,6 @@ +- type: radioChannel + id: Law + name: chat-radio-law + keycode: "ю" + frequency: 1780 + color: "#ff178b" \ No newline at end of file From da76254f536a32482b452df0601eafc013f44ac5 Mon Sep 17 00:00:00 2001 From: Rinary Date: Mon, 15 Jul 2024 17:15:11 +0300 Subject: [PATCH 2/2] remove fan recipe --- .../construction/graphs/structures.ftl | 2 -- .../Piping/Atmospherics/special.yml | 3 --- .../Graphs/structures/fan_tiny.yml | 26 ------------------- .../Recipes/Construction/structures.yml | 17 ------------ 4 files changed, 48 deletions(-) delete mode 100644 Resources/Prototypes/_Sunrise/Recipes/Construction/Graphs/structures/fan_tiny.yml delete mode 100644 Resources/Prototypes/_Sunrise/Recipes/Construction/structures.yml diff --git a/Resources/Locale/ru-RU/_sunrise/construction/graphs/structures.ftl b/Resources/Locale/ru-RU/_sunrise/construction/graphs/structures.ftl index f58a8d77bb1..17adfd61204 100644 --- a/Resources/Locale/ru-RU/_sunrise/construction/graphs/structures.ftl +++ b/Resources/Locale/ru-RU/_sunrise/construction/graphs/structures.ftl @@ -192,5 +192,3 @@ recipe-BananiumAltar-name = бананиумовый алтарь recipe-BananiumAltar-description = Бананиумовый алтарь, посвящённый Хонкоматери. recipe-SolidSecretDoor-name = потайная дверь recipe-SolidSecretDoor-description = Потайная дверь в стене. -recipe-FanTiny-name = маленький вентилятор -recipe-FanTiny-description = Маленький вентилятор, создающий лёгкий поток воздуха. diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml index cb06f9dd913..4eec014f11b 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml @@ -25,6 +25,3 @@ - type: Tag tags: - SpreaderIgnore - - type: Construction - graph: AtmosDeviceFanTiny - node: fantiny diff --git a/Resources/Prototypes/_Sunrise/Recipes/Construction/Graphs/structures/fan_tiny.yml b/Resources/Prototypes/_Sunrise/Recipes/Construction/Graphs/structures/fan_tiny.yml deleted file mode 100644 index 2ab1c9b342c..00000000000 --- a/Resources/Prototypes/_Sunrise/Recipes/Construction/Graphs/structures/fan_tiny.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: constructionGraph - id: AtmosDeviceFanTiny - start: start - graph: - - node: start - edges: - - to: fantiny - completed: - - !type:SnapToGrid { } - steps: - - material: Steel - amount: 2 - doAfter: 1 - - - node: fantiny - entity: AtmosDeviceFanTiny - edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: SheetSteel1 - amount: 2 - - !type:DeleteEntity - steps: - - tool: Screwing - doAfter: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Recipes/Construction/structures.yml b/Resources/Prototypes/_Sunrise/Recipes/Construction/structures.yml deleted file mode 100644 index 74b905fe915..00000000000 --- a/Resources/Prototypes/_Sunrise/Recipes/Construction/structures.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: construction - name: fan-tiny - id: FanTiny - graph: AtmosDeviceFanTiny - startNode: start - targetNode: fantiny - category: construction-category-structures - description: A large structural assembly made out of metal. - icon: - sprite: Structures/Piping/Atmospherics/tinyfan.rsi - state: icon - objectType: Structure - placementMode: SnapgridCenter - canRotate: false - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked \ No newline at end of file