From 69f07f5566bf04e7ab46cd8b178572ca5adac5bd Mon Sep 17 00:00:00 2001 From: Theodore Lukin <66275205+pheenty@users.noreply.github.com> Date: Wed, 30 Oct 2024 18:42:51 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B8=20=D1=83?= =?UTF-8?q?=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=90=D0=92?= =?UTF-8?q?=D0=94=20=D0=B8=20=D1=81=D1=82=D1=80=D0=B0=D0=B6=D0=B0=20(#198)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * some iaa and jedi tweaks * авд не нужны очки --- .../_stories/loadouts/loadout-groups.ftl | 28 +-- .../Objects/Devices/encryption_keys.yml | 20 +- .../Stories/Entities/Objects/Devices/pda.yml | 77 +++++++- .../Objects/Misc/identification_cards.yml | 78 +++++++- .../Stories/Entities/Objects/Misc/stamps.yml | 17 +- .../Entities/Objects/encryption_keys.yml | 15 -- .../Entities/Objects/identification_cards.yml | 73 ------- .../Stories/Entities/Objects/pda.yml | 52 ----- .../Stories/Entities/Objects/stamps.yml | 14 -- .../Stories/Loadouts/IAA_loadouts.yml | 185 +++++++++++++++++- .../Stories/Roles/Jobs/Command/iaa.yml | 6 +- 11 files changed, 371 insertions(+), 194 deletions(-) delete mode 100644 Resources/Prototypes/Stories/Entities/Objects/encryption_keys.yml delete mode 100644 Resources/Prototypes/Stories/Entities/Objects/identification_cards.yml delete mode 100644 Resources/Prototypes/Stories/Entities/Objects/pda.yml delete mode 100644 Resources/Prototypes/Stories/Entities/Objects/stamps.yml diff --git a/Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl b/Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl index 269bd519b3..46e9968fd3 100644 --- a/Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl @@ -1,6 +1,14 @@ # АВД -loadout-group-AII-jumpsuit = Агент Внутренних Дел, комбинезон +loadout-group-iaa-head = АВД, голова + +loadout-group-iaa-jumpsuit = АВД, комбинезон + +loadout-group-iaa-gloves = АВД, перчатки + +loadout-group-iaa-shoes = АВД, обувь + +loadout-group-iaa-belt = АВД, пояс # Тюрьма @@ -24,19 +32,19 @@ loadout-group-sponsor-Backpack = Спонсор, рюкзаки # Страж -loadout-group-Jedi-head = Страж, голова +loadout-group-Jedi-head = Страж Клинка, голова -loadout-group-Jedi-mask = Страж, маска +loadout-group-Jedi-mask = Страж Клинка, маска -loadout-group-Jedi-shoes = Страж, обувь +loadout-group-Jedi-shoes = Страж Клинка, обувь -loadout-group-Jedi-belt = Страж, пояс +loadout-group-Jedi-belt = Страж Клинка, пояс -loadout-group-Jedi-neck = Страж, шея +loadout-group-Jedi-neck = Страж Клинка, шея -loadout-group-Jedi-jumpsuits = Страж, комбинезон +loadout-group-Jedi-jumpsuits = Страж Клинка, комбинезон -loadout-group-Jedi-backpack = Страж, рюкзак +loadout-group-Jedi-backpack = Страж Клинка, рюкзак loadout-group-Jedi-lightsaber = Страж Клинка, световой меч @@ -45,7 +53,3 @@ loadout-group-Jedi-outer-clothing = Страж Клинка, верхняя од # Детектив loadout-group-detective-belt = Детектив, пояс - -# АВД - -loadout-group-iaa-jumpsuit = Агент Внутренних Дел, комбинезон diff --git a/Resources/Prototypes/Stories/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Stories/Entities/Objects/Devices/encryption_keys.yml index a4f09e6bd3..d295e8e5a0 100644 --- a/Resources/Prototypes/Stories/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Stories/Entities/Objects/Devices/encryption_keys.yml @@ -1,8 +1,8 @@ - type: entity parent: EncryptionKey id: EncryptionKeyIAA - name: iaa encryption key - description: An encryption key used by the most meticulous person. + name: ключ шифрования АВД + description: Ключ шифрования, используемый самой педантичной персоной на станции. components: - type: EncryptionKey channels: @@ -15,3 +15,19 @@ layers: - state: crypt_silver - state: nano_label + +- type: entity + parent: EncryptionKey + id: PRISONEncryptionKey + name: ключ шифрования тюрьмы + description: Ключ шифрования, используемый сотрудниками космической тюрьмы. + components: + - type: EncryptionKey + channels: + - Prison + defaultChannel: Prison + - type: Sprite + sprite: Stories/Objects/Devices/encryption_keys.rsi + layers: + - state: crypt_prison + - state: prison_label diff --git a/Resources/Prototypes/Stories/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Stories/Entities/Objects/Devices/pda.yml index 425cad4918..de8e8f50fe 100644 --- a/Resources/Prototypes/Stories/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Stories/Entities/Objects/Devices/pda.yml @@ -1,30 +1,91 @@ - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: JediNtPDA name: КПК стража клинка - description: Черный, чтобы скрыть повреждения от неправильного использования светового меча. + description: Красный значит мощный. На нём имеются царапины от светового меча. components: - type: Tag tags: - ForceRecallEquipment - type: Pda id: JediNtIDCard - state: pda-bartender + state: pda-ert - type: PdaBorderColor - borderColor: "#262626" + borderColor: "#A32D26" + accentHColor: "#447987" + accentVColor: "#447987" - type: Icon - state: pda-bartender + state: pda-ert - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: IAAPDA - name: internal affairs agent PDA - description: Corporation and profit are best friends. + name: КПК агента внутрених дел + description: Корпорация и прибыль - лучшие друзья. components: - type: Pda id: IAAIDCard state: pda-lawyer + penSlot: + startingItem: PenCentcom + priority: -1 + whitelist: + tags: + - Write - type: PdaBorderColor borderColor: "#6f6192" - type: Icon state: pda-lawyer + +- type: entity + parent: BasePDA + id: PRISONPDAHeadOfPrison + name: КПК начальника тюрьмы + description: Этот КПК - ваш путь к свободе. + components: + - type: Sprite + sprite: Stories/Objects/Devices/pda.rsi + - type: Pda + id: PRISONIDCardHeadOfPrison + state: pda-hosp + - type: Icon + sprite: Stories/Objects/Devices/pda.rsi + state: pda-hosp + +- type: entity + parent: PRISONPDAHeadOfPrison + id: PRISONPDAOfficer + name: КПК офицера тюрьмы + description: Этот КПК - ваш путь к свободе. + components: + - type: Pda + id: PRISONIDCardOfficer + state: pda-spofficer + - type: Icon + state: pda-spofficer + +- type: entity + parent: PRISONPDAHeadOfPrison + id: PRISONPDAEngineer + name: КПК инженера тюрьмы + description: Этот КПК - ваш путь к свободе. + components: + - type: Pda + id: PRISONIDCardEngineer + state: pda-spengineer + - type: Icon + state: pda-spengineer + +- type: entity + parent: + - PRISONPDAHeadOfPrison + - BaseMedicalPDA + id: PRISONPDAMedic + name: КПК врача тюрьмы + description: Этот КПК - ваш путь к свободе. + components: + - type: Pda + id: PRISONIDCardMedic + state: pda-spmedic + - type: Icon + state: pda-spmedic diff --git a/Resources/Prototypes/Stories/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Stories/Entities/Objects/Misc/identification_cards.yml index 26ca70248d..67de0f3777 100644 --- a/Resources/Prototypes/Stories/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Stories/Entities/Objects/Misc/identification_cards.yml @@ -1,7 +1,7 @@ - type: entity parent: PRISONIDCardHeadOfPrison id: IAAIDCard - name: internal affairs agent ID card + name: ID карта агента внутренних дел components: - type: Sprite layers: @@ -18,10 +18,84 @@ components: - type: Sprite layers: - - state: silver + - state: centcom - state: idjedint sprite: Stories/Objects/Misc/id_cards.rsi - type: Item heldPrefix: blue - type: PresetIdCard job: JediNt + +- type: entity + parent: IDCardStandard + id: PRISONIDCardHeadOfPrison + name: ID карта начальника тюрьмы + description: Карта, необходимая для доступа в различные области станции. + components: + - type: Sprite + sprite: Stories/Objects/Misc/id_cards.rsi + layers: + - state: silver_sp + - state: idhosp + - type: PresetIdCard + job: PRISONHeadOfPrison + - type: Clothing + slots: + - idcard + sprite: Stories/Objects/Misc/id_cards.rsi + +- type: entity + parent: PRISONIDCardHeadOfPrison + id: PRISONIDCardOfficer + name: ID карта офицера тюрьмы + description: Карта, необходимая для доступа в различные области станции. + components: + - type: Sprite + layers: + - state: default_sp + - state: idspofficer + - type: PresetIdCard + job: PRISONOfficer + +- type: entity + parent: PRISONIDCardHeadOfPrison + id: PRISONIDCardEngineer + name: ID карта инженера тюрьмы + description: Карта, необходимая для доступа в различные области станции. + components: + - type: Sprite + layers: + - state: default_sp + - state: idspengineer + - type: PresetIdCard + job: PRISONEngineer + +- type: entity + parent: PRISONIDCardHeadOfPrison + id: PRISONIDCardMedic + name: ID карта врача тюрьмы + description: Карта, необходимая для доступа в различные области станции. + components: + - type: Sprite + layers: + - state: default_sp + - state: idspmedic + - type: PresetIdCard + job: PRISONMedic + +- type: entity + parent: IDCardStandard + id: PRISONIDCardPrisoner + name: ID карта заключенного тюрьмы + description: Карта, необходимая для доступа в различные области станции. + components: + - type: Sprite + sprite: Objects/Misc/id_cards.rsi + layers: + - state: orange + - type: PresetIdCard + job: PRISONPrisoner + - type: Clothing + slots: + - idcard + sprite: Objects/Misc/id_cards.rsi diff --git a/Resources/Prototypes/Stories/Entities/Objects/Misc/stamps.yml b/Resources/Prototypes/Stories/Entities/Objects/Misc/stamps.yml index 8bd02f70b7..be809fbb92 100644 --- a/Resources/Prototypes/Stories/Entities/Objects/Misc/stamps.yml +++ b/Resources/Prototypes/Stories/Entities/Objects/Misc/stamps.yml @@ -1,5 +1,5 @@ - type: entity - name: law office's rubber stamp + name: Печать агента внутренних дел parent: RubberStampBase id: RubberStampIAA suffix: DO NOT MAP @@ -11,3 +11,18 @@ - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-iaa + +- type: entity + name: печать начальника тюрьмы + description: Печать из резины, для проставления печатей на важных документах. + parent: RubberStampBase + id: PRISONRubberStamp + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: Начальник тюрьмы + stampedColor: "#0036A2" + stampState: "paper_stamp-hosp" + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: stamp-hosp diff --git a/Resources/Prototypes/Stories/Entities/Objects/encryption_keys.yml b/Resources/Prototypes/Stories/Entities/Objects/encryption_keys.yml deleted file mode 100644 index 764e20debf..0000000000 --- a/Resources/Prototypes/Stories/Entities/Objects/encryption_keys.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - parent: EncryptionKey - id: PRISONEncryptionKey - name: ключ шифрования тюрьмы - description: Небольшой шифрующий чип для гарнитуры. - components: - - type: EncryptionKey - channels: - - Prison - defaultChannel: Prison - - type: Sprite - sprite: Stories/Objects/Devices/encryption_keys.rsi - layers: - - state: crypt_prison - - state: prison_label diff --git a/Resources/Prototypes/Stories/Entities/Objects/identification_cards.yml b/Resources/Prototypes/Stories/Entities/Objects/identification_cards.yml deleted file mode 100644 index 307fafe5a0..0000000000 --- a/Resources/Prototypes/Stories/Entities/Objects/identification_cards.yml +++ /dev/null @@ -1,73 +0,0 @@ -- type: entity - parent: IDCardStandard - id: PRISONIDCardHeadOfPrison - name: ID карта начальника тюрьмы - description: Карта, необходимая для доступа в различные области станции. - components: - - type: Sprite - sprite: Stories/Objects/Misc/id_cards.rsi - layers: - - state: silver_sp - - state: idhosp - - type: PresetIdCard - job: PRISONHeadOfPrison - - type: Clothing - slots: - - idcard - sprite: Stories/Objects/Misc/id_cards.rsi - -- type: entity - parent: PRISONIDCardHeadOfPrison - id: PRISONIDCardOfficer - name: ID карта офицера тюрьмы - description: Карта, необходимая для доступа в различные области станции. - components: - - type: Sprite - layers: - - state: default_sp - - state: idspofficer - - type: PresetIdCard - job: PRISONOfficer - -- type: entity - parent: PRISONIDCardHeadOfPrison - id: PRISONIDCardEngineer - name: ID карта инженера тюрьмы - description: Карта, необходимая для доступа в различные области станции. - components: - - type: Sprite - layers: - - state: default_sp - - state: idspengineer - - type: PresetIdCard - job: PRISONEngineer - -- type: entity - parent: PRISONIDCardHeadOfPrison - id: PRISONIDCardMedic - name: ID карта врача тюрьмы - description: Карта, необходимая для доступа в различные области станции. - components: - - type: Sprite - layers: - - state: default_sp - - state: idspmedic - - type: PresetIdCard - job: PRISONMedic - -- type: entity - parent: IDCardStandard - id: PRISONIDCardPrisoner - name: ID карта заключенного тюрьмы - description: Карта, необходимая для доступа в различные области станции. - components: - - type: Sprite - sprite: Objects/Misc/id_cards.rsi - layers: - - state: orange - - type: PresetIdCard - job: PRISONPrisoner - - type: Clothing - slots: - - idcard - sprite: Objects/Misc/id_cards.rsi diff --git a/Resources/Prototypes/Stories/Entities/Objects/pda.yml b/Resources/Prototypes/Stories/Entities/Objects/pda.yml deleted file mode 100644 index 09def907e7..0000000000 --- a/Resources/Prototypes/Stories/Entities/Objects/pda.yml +++ /dev/null @@ -1,52 +0,0 @@ -- type: entity - parent: BasePDA - id: PRISONPDAHeadOfPrison - name: КПК начальника тюрьмы - description: Этот КПК - ваш путь к свободе. - components: - - type: Sprite - sprite: Stories/Objects/Devices/pda.rsi - - type: Pda - id: PRISONIDCardHeadOfPrison - state: pda-hosp - - type: Icon - sprite: Stories/Objects/Devices/pda.rsi - state: pda-hosp - -- type: entity - parent: PRISONPDAHeadOfPrison - id: PRISONPDAOfficer - name: КПК офицера тюрьмы - description: Этот КПК - ваш путь к свободе. - components: - - type: Pda - id: PRISONIDCardOfficer - state: pda-spofficer - - type: Icon - state: pda-spofficer - -- type: entity - parent: PRISONPDAHeadOfPrison - id: PRISONPDAEngineer - name: КПК инженера тюрьмы - description: Этот КПК - ваш путь к свободе. - components: - - type: Pda - id: PRISONIDCardEngineer - state: pda-spengineer - - type: Icon - state: pda-spengineer - -- type: entity - parent: - - PRISONPDAHeadOfPrison - - BaseMedicalPDA - id: PRISONPDAMedic - name: КПК врача тюрьмы - description: Этот КПК - ваш путь к свободе. - components: - - type: Pda - id: PRISONIDCardMedic - state: pda-spmedic - - type: Icon - state: pda-spmedic diff --git a/Resources/Prototypes/Stories/Entities/Objects/stamps.yml b/Resources/Prototypes/Stories/Entities/Objects/stamps.yml deleted file mode 100644 index fdd9d1bcc9..0000000000 --- a/Resources/Prototypes/Stories/Entities/Objects/stamps.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - name: печать начальника тюрьмы - description: Печать из резины, для проставления печатей на важных документах. - parent: RubberStampBase - id: PRISONRubberStamp - suffix: DO NOT MAP - components: - - type: Stamp - stampedName: Начальник тюрьмы - stampedColor: "#0036A2" - stampState: "paper_stamp-hosp" - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - state: stamp-hosp diff --git a/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml index da2e82029a..fd01b9161b 100644 --- a/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml +++ b/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml @@ -1,30 +1,195 @@ -## Вставка группы в лодаут роли +- type: loadoutEffectGroup + id: MasterIAA + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobIAA + time: 72000 #20 часов + - type: roleLoadout id: JobIAA groups: + - IAAHead + - IAAJumpsuit + - IAABelt + - IAAGloves + - IAAShoes - GroupTankHarness - - AIIJumpsuit - CommonBackpack - - Glasses - Survival - Trinkets - GroupSpeciesBreathTool -## Группы для вещей +# Комбинезон - type: loadoutGroup - id: AIIJumpsuit + id: IAAJumpsuit name: loadout-group-iaa-jumpsuit loadouts: - - AIIJumpsuit - - AIIJumpskirt + - IAAJumpsuitBlue + - IAAJumpskirtBlue + - IAAJumpsuitPurple + - IAAJumpskirtPurple + - IAAJumpsuitRed + - IAAJumpskirtRed + - IAAJumpsuitBlack + - IAAJumpskirtBlack + - IAAJumpsuitGood + - IAAJumpskirtGood + +# Синий комбинезон +- type: loadout + id: IAAJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitLawyerBlue + +# Синяя юбка +- type: loadout + id: IAAJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtLawyerBlue + +# Фиолетовый комбинезон +- type: loadout + id: IAAJumpsuitPurple + equipment: + jumpsuit: ClothingUniformJumpsuitLawyerPurple + +# Фиолетовая юбка +- type: loadout + id: IAAJumpskirtPurple + equipment: + jumpsuit: ClothingUniformJumpskirtLawyerPurple + +# Красный комбинезон +- type: loadout + id: IAAJumpsuitRed + equipment: + jumpsuit: ClothingUniformJumpsuitLawyerRed -## Сюда прописывать вещь +# Красная юбка - type: loadout - id: AIIJumpsuit + id: IAAJumpskirtRed + equipment: + jumpsuit: ClothingUniformJumpskirtLawyerRed + +# Чёрный комбинезон +- type: loadout + id: IAAJumpsuitBlack equipment: jumpsuit: ClothingUniformJumpsuitLawyerBlack +# Чёрная юбка - type: loadout - id: AIIJumpskirt + id: IAAJumpskirtBlack equipment: jumpsuit: ClothingUniformJumpskirtLawyerBlack + +# Хороший комбинезон +- type: loadout + id: IAAJumpsuitGood + equipment: + jumpsuit: ClothingUniformJumpsuitLawyerGood + +# Хорошая юбка +- type: loadout + id: IAAJumpskirtGood + equipment: + jumpsuit: ClothingUniformJumpskirtLawyerGood + +# Пояс +- type: loadoutGroup + id: IAABelt + name: loadout-group-iaa-belt + minLimit: 0 + loadouts: + - IAAClipboard + - IAAClipboardCentcom + +# Планшет +- type: loadout + id: IAAClipboard + equipment: + belt: BoxFolderClipboard + +# Планшет ЦК +- type: loadout + id: IAAClipboardCentcom + equipment: + belt: BoxFolderCentComClipboard + effects: + - !type:GroupLoadoutEffect + proto: MasterIAA + +# Перчатки +- type: loadoutGroup + id: IAAGloves + name: loadout-group-iaa-gloves + minLimit: 0 + loadouts: + - IAAGlovesWhite + - IAAGlovesGray + - IAAGlovesBlack + - IAAGlovesRed + - IAAGlovesBlue + +# Белые перчатки +- type: loadout + id: IAAGlovesWhite + equipment: + gloves: ClothingHandsGlovesColorWhite + +# Серые перчатки +- type: loadout + id: IAAGlovesGray + equipment: + gloves: ClothingHandsGlovesColorGray + +# Чёрные перчатки +- type: loadout + id: IAAGlovesBlack + equipment: + gloves: ClothingHandsGlovesColorBlack + +# Красные перчатки +- type: loadout + id: IAAGlovesRed + equipment: + gloves: ClothingHandsGlovesColorRed + +# Синие перчатки +- type: loadout + id: IAAGlovesBlue + equipment: + gloves: ClothingHandsGlovesColorBlue + +# Шляпа +- type: loadoutGroup + id: IAAHead + name: loadout-group-iaa-head + minLimit: 0 + loadouts: + - BartenderBowler + - IAAHeadOutlaw + - BartenderHead + +# Шляпа негодяя +- type: loadout + id: IAAHeadOutlaw + equipment: + head: ClothingHeadHatOutlawHat + +# Обувь +- type: loadoutGroup + id: IAAShoes + name: loadout-group-iaa-shoes + loadouts: + - BlackShoes + - WhiteShoes + - IAAShoesLaceup + +# Шнурованые туфли +- type: loadout + id: IAAShoesLaceup + equipment: + shoes: ClothingShoesBootsLaceup diff --git a/Resources/Prototypes/Stories/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Stories/Roles/Jobs/Command/iaa.yml index d3ebeb3764..d73dc9aad9 100644 --- a/Resources/Prototypes/Stories/Roles/Jobs/Command/iaa.yml +++ b/Resources/Prototypes/Stories/Roles/Jobs/Command/iaa.yml @@ -28,16 +28,12 @@ - type: startingGear id: IAAGear equipment: - shoes: ClothingShoesColorBlack id: IAAPDA eyes: ClothingEyesGlassesSunglasses ears: ClothingHeadsetIAA - pocket2: BookSpaceLaw + neck: ClothingNeckLawyerbadge inhand: - BriefcaseBrown storage: back: - - Paper - - Paper - - PenCentcom - RubberStampIAA