From 06afd6db58662f39da0419db76a73802c342382d Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Sun, 18 Aug 2024 20:12:12 +0300 Subject: [PATCH] =?UTF-8?q?[=D0=9F=D0=95=D0=A0=D0=95=D0=9D=D0=9E=D0=A1]=20?= =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=B8,=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=8F=D0=BB=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8E=20=D0=B3=D0=BE=D1=80=D0=B8=D0=BB=D1=8B,?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=20=D0=BA=D0=B0=D1=80=D1=82=D0=B5=20=D1=81?= =?UTF-8?q?=D0=B8=D0=BD=D0=B4=D0=B8=D0=BA=D0=B0=D1=82=D0=B0=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B4?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=BE=D0=B2=20=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20=D0=B8=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D0=BA=D1=83=20=D1=80=D0=BE=D0=BB=D0=B8=20=D0=9E=D0=A1=D0=A9=20?= =?UTF-8?q?(#301)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR **Медиа** **Проверки** - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** - add: Добавлена прическа "Герой" - add: Добавлена прическа "Распущенные волосы( жен)" - tweak: Изменена локализация горилы на Пётр - tweak: Изменена иконка роли ОСЩ - fix: Исправил возможность копирования доступов --------- Co-authored-by: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> --- .../corvax/entities/markers/spawners/mobs.ftl | 2 +- .../corvax/entities/mobs/npcs/pets.ftl | 4 +- .../Mobs/Customization/Markings/hair.yml | 15 +++++ .../Objects/Misc/identification_cards.yml | 52 ++++++++++++++++++ .../job_icons.rsi/ADTBlueShieldOfficer.png | Bin 534 -> 171 bytes .../Customization/Hair/hair.rsi/honor.png | Bin 0 -> 1927 bytes .../Customization/Hair/hair.rsi/meta.json | 19 +++++++ .../Hair/hair.rsi/shaved_female.png | Bin 0 -> 1155 bytes 8 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/hair.yml create mode 100644 Resources/Textures/ADT/Mobs/Customization/Hair/hair.rsi/honor.png create mode 100644 Resources/Textures/ADT/Mobs/Customization/Hair/hair.rsi/meta.json create mode 100644 Resources/Textures/ADT/Mobs/Customization/Hair/hair.rsi/shaved_female.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/mobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/mobs.ftl index ae26afef02c..7fd2e8c3c41 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/mobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/mobs.ftl @@ -1,2 +1,2 @@ -ent-SpawnMobGorillaLargo = спавнер горилла Ларго +ent-SpawnMobGorillaLargo = спавнер горилла Пётр # ADT Tweak .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/npcs/pets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/npcs/pets.ftl index d0d7c63d0ce..a866af4b6f9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/npcs/pets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/npcs/pets.ftl @@ -1,2 +1,2 @@ -ent-MobGorillaLargo = Ларго - .desc = Питомец карго, участвовал в первой революции. Кажется, у него есть татуировка "Я люблю маму". +ent-MobGorillaLargo = Пётр + .desc = Питомец карго, участвовал в первой революции. Кажется, у него есть татуировка "Я люблю маму". # ADT Tweak diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/hair.yml new file mode 100644 index 00000000000..9d92960a7c2 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/hair.yml @@ -0,0 +1,15 @@ +- type: marking + id: ADTAllhonor + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: ADT/Mobs/Customization/Hair/hair.rsi + state: honor + +- type: marking + id: ADTAllShavedFemale + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: ADT/Mobs/Customization/Hair/hair.rsi + state: shaved_female \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 7de4bdba5fd..095135b4210 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -715,6 +715,58 @@ tags: - NuclearOperative - SyndicateAgent + #ADT Start + - type: AgentIDCard + icons: + # TODO figure out a better way of doing this. + # Probably by adding a bool or icon-category data-field to the icon prototype? + - JobIconMagistrat + - JobIconDetective + - JobIconQuarterMaster + - JobIconBotanist + - JobIconBoxer + - JobIconAtmosphericTechnician + - JobIconNanotrasen + - JobIconPrisoner + - JobIconJanitor + - JobIconChemist + - JobIconStationEngineer + - JobIconSecurityOfficer + - JobIconChiefMedicalOfficer + - JobIconRoboticist + - JobIconChaplain + - JobIconLawyer + - JobIconUnknown + - JobIconLibrarian + - JobIconCargoTechnician + - JobIconScientist + - JobIconResearchAssistant + - JobIconGeneticist + - JobIconClown + - JobIconCaptain + - JobIconHeadOfPersonnel + - JobIconVirologist + - JobIconShaftMiner + - JobIconPassenger + - JobIconChiefEngineer + - JobIconBartender + - JobIconHeadOfSecurity + - JobIconMedicalDoctor + - JobIconParamedic + - JobIconChef + - JobIconWarden + - JobIconResearchDirector + - JobIconMime + - JobIconMusician + - JobIconReporter + - JobIconPsychologist + - JobIconMedicalIntern + - JobIconTechnicalAssistant + - JobIconServiceWorker + - JobIconSecurityCadet + - JobIconZookeeper + - JobIconVisitor + #ADT End - type: entity parent: IDCardStandard diff --git a/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/ADTBlueShieldOfficer.png b/Resources/Textures/ADT/Interface/Misc/job_icons.rsi/ADTBlueShieldOfficer.png index 6a66a5d9a2e9a603b0cbd42603f28e999d960bbe..710b8f2fd9257d5b44611426e0e652e9dd865889 100644 GIT binary patch delta 144 zcmbQnvYK&%ay>(Yr;B5VhG=pE5D4(*{5roj?YsP3wv&bpDoZX;Pdci=n{fC4|NrdT z3>Os`E-^4EoJ|luV57s*#ToHLQ0+jEOBjn#^K6D<6(7bP{xaq>>M!D0UbA^IF?@VH qcc*o9(PRb&2ENn?&op0O1}z|)1BgN3QZPt{lfl!~&t;ucLK6VjmoGj5 delta 509 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 Vn5zoW@0b7p002ovPDHLkV1ga6A&>w7 literal 0 HcmV?d00001