From dc2067d215cd2caf4eb34bb87e5698debcdc8251 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Mon, 10 Mar 2025 22:10:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=B0=D1=80=D0=BD=D0=B8=D1=82=D1=83?= =?UTF-8?q?=D1=80=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=B5=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D1=86=D0=B5=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/clothing/ears/headsets.ftl | 8 +++ Resources/Locale/ru-RU/_white/radio/radio.ftl | 10 +++ .../Entities/Mobs/Player/humanoid.yml | 3 + .../Roles/Jobs/Fun/misc_startinggear.yml | 22 +++--- .../Entities/Clothing/Ears/headsets.yml | 59 ++++++++++++++++ .../Objects/Devices/encryption_keys.yml | 67 +++++++++++++++++++ 6 files changed, 158 insertions(+), 11 deletions(-) create mode 100644 Resources/Locale/ru-RU/_white/prototypes/entities/clothing/ears/headsets.ftl create mode 100644 Resources/Locale/ru-RU/_white/radio/radio.ftl create mode 100644 Resources/Prototypes/_White/Entities/Clothing/Ears/headsets.yml create mode 100644 Resources/Prototypes/_White/Entities/Objects/Devices/encryption_keys.yml diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/ears/headsets.ftl new file mode 100644 index 0000000000..15527f40fa --- /dev/null +++ b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/ears/headsets.ftl @@ -0,0 +1,8 @@ +ent-ClothingHeadsetAltCommandAnotherSector = { ent-ClothingHeadsetAltCommand } + .desc = { ent-ClothingHeadsetAltCommand.desc } +ent-ClothingHeadsetCMOAnotherSector = { ent-ClothingHeadsetCMO } + .desc = { ent-ClothingHeadsetCMO.desc } +ent-ClothingHeadsetRDAnotherSector = { ent-ClothingHeadsetRD } + .desc = { ent-ClothingHeadsetRD.desc } +ent-ClothingHeadsetCargoAnotherSector = { ent-ClothingHeadsetCargo } + .desc = { ent-ClothingHeadsetCargo.desc } diff --git a/Resources/Locale/ru-RU/_white/radio/radio.ftl b/Resources/Locale/ru-RU/_white/radio/radio.ftl new file mode 100644 index 0000000000..d717050b37 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/radio/radio.ftl @@ -0,0 +1,10 @@ +ent-EncryptionKeyStationMasterAnotherSector = { ent-EncryptionKeyStationMaster } + .desc = { ent-EncryptionKeyStationMaster.desc } К сожалению, коды шифрования в этом секторе другие. +ent-EncryptionKeyMedicalAnotherSector = { ent-EncryptionKeyMedical } + .desc = { ent-EncryptionKeyMedical.desc } К сожалению, коды шифрования в этом секторе другие. +ent-EncryptionKeyCommandAnotherSector = { ent-EncryptionKeyCommand } + .desc = { ent-EncryptionKeyCommand.desc } К сожалению, коды шифрования в этом секторе другие. +ent-EncryptionKeyScienceAnotherSector = { ent-EncryptionKeyScience } + .desc = { ent-EncryptionKeyScience.desc } К сожалению, коды шифрования в этом секторе другие. +ent-EncryptionKeyCargoAnotherSector = { ent-EncryptionKeyCargo } + .desc = { ent-EncryptionKeyCargo.desc } К сожалению, коды шифрования в этом секторе другие. diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 1ddebceb4f..20883af760 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -814,6 +814,7 @@ settings: DisasterVictimCaptain - type: randomHumanoidSettings + parent: Nanotrasen # WD id: DisasterVictimResearchDirector randomizeName: false components: @@ -832,6 +833,7 @@ - names_last - type: randomHumanoidSettings + parent: Nanotrasen # WD id: DisasterVictimCMO randomizeName: false components: @@ -850,6 +852,7 @@ - names_last - type: randomHumanoidSettings + parent: Nanotrasen # WD id: DisasterVictimCaptain randomizeName: false components: diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index a13d0e6a58..967f131e8e 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -318,7 +318,7 @@ shoes: ClothingShoesClownBanana jumpsuit: ClothingUniformJumpsuitClownBanana mask: ClothingMaskClownBanana - ears: ClothingHeadsetService + ears: ClothingHeadsetGrey # WD pocket1: BikeHorn pocket2: ClownRecorder @@ -330,7 +330,7 @@ shoes: ClothingShoesClown id: ClownPDA back: ClothingBackpackClown - ears: ClothingHeadsetService + ears: ClothingHeadsetGrey # WD mask: ClothingMaskClown pocket1: BikeHorn pocket2: ClownRecorder @@ -344,7 +344,7 @@ head: ClothingHeadHatCargosoft id: CargoPDA back: ClothingBackpackCargo - ears: ClothingHeadsetCargo + ears: ClothingHeadsetCargoAnotherSector # WD pocket1: AppraisalTool - type: startingGear @@ -352,7 +352,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitCargo shoes: ClothingShoesBootsWinterCargo - head: ClothingHeadHatCargosoft + head: ClothingHeadHatCargosoftAnotherSector # WD id: CargoPDA back: ClothingBackpackDuffelCargo ears: ClothingHeadsetCargo @@ -367,7 +367,7 @@ shoes: ClothingShoesColorWhite id: ChefPDA back: ClothingBackpackSatchel - ears: ClothingHeadsetService + # ears: ClothingHeadsetService # WD belt: ClothingBeltChef #CMO Disaster Victim @@ -380,7 +380,7 @@ neck: ClothingCloakCmo id: CMOPDA back: ClothingBackpackMedical - ears: ClothingHeadsetCMO + ears: ClothingHeadsetCMOAnotherSector # WD belt: ClothingBeltMedical outerClothing: ClothingOuterCoatLabCmo @@ -393,7 +393,7 @@ neck: ClothingNeckMantleCMO id: CMOPDA back: ClothingBackpackSatchelMedical - ears: ClothingHeadsetCMO + ears: ClothingHeadsetCMOAnotherSector # WD belt: ClothingBeltMedical outerClothing: ClothingOuterCoatLabCmo @@ -409,7 +409,7 @@ neck: ClothingNeckCloakCap id: CaptainPDA back: ClothingBackpackCaptain - ears: ClothingHeadsetAltCommand + ears: ClothingHeadsetAltCommandAnotherSector # WD outerClothing: ClothingOuterArmorCaptainCarapace - type: startingGear @@ -423,7 +423,7 @@ neck: ClothingNeckMantleCap id: CaptainPDA back: ClothingBackpackSatchelCaptain - ears: ClothingHeadsetAltCommand + ears: ClothingHeadsetAltCommandAnotherSector # WD outerClothing: ClothingOuterArmorCaptainCarapace #RD Disaster Victim @@ -436,7 +436,7 @@ neck: ClothingNeckCloakRd id: RnDPDA back: ClothingBackpackScience - ears: ClothingHeadsetRD + ears: ClothingHeadsetRDAnotherSector # WD outerClothing: ClothingOuterCoatRD - type: startingGear @@ -448,5 +448,5 @@ neck: ClothingNeckMantleRD id: RnDPDA back: ClothingBackpackSatchelScience - ears: ClothingHeadsetRD + ears: ClothingHeadsetRDAnotherSector # WD outerClothing: ClothingOuterCoatRD diff --git a/Resources/Prototypes/_White/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_White/Entities/Clothing/Ears/headsets.yml new file mode 100644 index 0000000000..3ca7e87343 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Clothing/Ears/headsets.yml @@ -0,0 +1,59 @@ +- type: entity + parent: ClothingHeadsetAlt + id: ClothingHeadsetAltCommandAnotherSector + name: command over-ear headset + suffix: Another Sector + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyStationMasterAnotherSector + - type: Sprite + sprite: Clothing/Ears/Headsets/command.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/command.rsi + +- type: entity + parent: ClothingHeadsetMedical + id: ClothingHeadsetCMOAnotherSector + name: cmo headset + description: A headset used by the CMO. + suffix: Another Sector + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyMedicalAnotherSector + - EncryptionKeyCommandAnotherSector + - EncryptionKeyCommon + +- type: entity + parent: ClothingHeadsetScience + id: ClothingHeadsetRDAnotherSector + name: rd headset + description: Lamarr used to love chewing on this... + suffix: Another Sector + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyScienceAnotherSector + - EncryptionKeyCommandAnotherSector + - EncryptionKeyCommon + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetCargoAnotherSector + name: cargo headset + description: A headset used by supply employees. + suffix: Another Sector + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyCargoAnotherSector + - EncryptionKeyCommon + - type: Sprite + sprite: Clothing/Ears/Headsets/cargo.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/cargo.rsi diff --git a/Resources/Prototypes/_White/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_White/Entities/Objects/Devices/encryption_keys.yml new file mode 100644 index 0000000000..ac056ecfda --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Devices/encryption_keys.yml @@ -0,0 +1,67 @@ +- type: entity + parent: EncryptionKey + id: EncryptionKeyStationMasterAnotherSector + name: station master encryption key + description: An encryption key used by station's bosses. Unfortunately, the encryption codes in this sector are different. + suffix: Another Sector + components: + - type: EncryptionKey + channels: + - Common + defaultChannel: Common + - type: Sprite + layers: + - state: crypt_gold + - state: cap_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeyMedicalAnotherSector + name: medical encryption key + description: An encryption key used by those who save lives. Unfortunately, the encryption codes in this sector are different. + suffix: Another Sector + components: + - type: EncryptionKey + - type: Sprite + layers: + - state: crypt_gray + - state: med_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeyCommandAnotherSector + name: command encryption key + description: An encryption key used by crew's bosses. Unfortunately, the encryption codes in this sector are different. + suffix: Another Sector + components: + - type: EncryptionKey + - type: Sprite + layers: + - state: crypt_silver + - state: com_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeyScienceAnotherSector + name: science encryption key + description: An encryption key used by scientists. Maybe it is plasmaproof? Unfortunately, the encryption codes in this sector are different. + suffix: Another Sector + components: + - type: EncryptionKey + - type: Sprite + layers: + - state: crypt_gray + - state: sci_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeyCargoAnotherSector + name: cargo encryption key + description: An encryption key used by supply employees. Unfortunately, the encryption codes in this sector are different. + suffix: Another Sector + components: + - type: EncryptionKey + - type: Sprite + layers: + - state: crypt_gray + - state: cargo_label