From 72a58419e6a3ebd7c7afb9f8d8bf4d566f87a57f Mon Sep 17 00:00:00 2001 From: ne4to2 Date: Sat, 14 Oct 2023 18:20:06 +0500 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D0=B4=D0=BE=D0=BB=D0=B0=D0=B7?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B3=D0=BB=D0=B0=D0=B2=20(=D0=A2=D0=B5=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=89=D0=B8=20=D0=9E=D0=BA=D1=82=D0=BE=D0=B1=D0=B5?= =?UTF-8?q?=D1=80=D1=84=D0=B5=D1=81=D1=82=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl | 45 +++++++++- .../Entities/Clothing/Uniforms/Jumpskirt.yml | 87 +++++++++++++++++- .../Entities/Clothing/Uniforms/Jumpsuit.yml | 89 ++++++++++++++++++- 3 files changed, 218 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl index 58a4057dccc..4ca3e80b07f 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl @@ -17,7 +17,7 @@ ent-ADTClothingUniformRedgiJumpskirt = юбка-костюм заведующе .desc = Потёртый, но от того не менее стильный, костюм для женской половины персонала .suffix = { "" } ent-ADTClothingUniformRedgiSuit = костюм заведующего отелем - .desc = Потёртый, но от того не менее стильный, костюм + .desc = Потёртый, но от того не менее стильный, костюм .suffix = { "" } ent-ADTClothingUniformNewBarmanSuit = обновлённый костюм бармена .desc = Обновлённый комплект одежды для более изысканого разлития напитков @@ -108,4 +108,47 @@ ent-ADTClothingUniformBlackBreeches = черные бриджи .desc = Черные бриджи для отдыха. .suffix = { "" } +ent-ADTClothingUniformOktoberfestWhite = костюм для Октоберфеста с белой рубашкой + .desc = Традиционный баварский мужской костюм с короткими штанами и белой рубашкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestBlueCheckered = костюм для Октоберфеста в голубую клетку + .desc = Традиционный баварский мужской костюм с короткими штанами и рубашкой в голубую клетку. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestGreenCheckered = костюм для Октоберфеста в зеленую клетку + .desc = Традиционный баварский мужской костюм с короткими штанами и рубашкой в зеленую клетку. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestRedCheckered = костюм для Октоберфеста в красную клетку + .desc = Традиционный баварский мужской костюм с короткими штанами и рубашкой в красную клетку. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestGreenVest = костюм для Октоберфеста с зеленой жилеткой + .desc = Традиционный баварский мужской костюм с короткими штанами и зеленой жилеткой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestBlueVest = костюм для Октоберфеста с синей жилеткой + .desc = Традиционный баварский мужской костюм с короткими штанами и синей жилеткой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestRedVest = костюм для Октоберфеста с красной жилеткой + .desc = Традиционный баварский мужской костюм с короткими штанами и красной жилеткой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlShort = дирндль с короткой юбкой + .desc = Стилизованное под традиционный наряд платье с короткой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlShortGreen = дирндль с зеленой короткой юбкой + .desc = Стилизованное под традиционный наряд платье с зеленой короткой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlShortRed = дирндль с красной короткой юбкой + .desc = Стилизованное под традиционный наряд платье с красной короткой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlShortBlue = дирндль с синей короткой юбкой + .desc = Стилизованное под традиционный наряд платье с синей короткой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlBlue = дирндль с синей юбкой + .desc = Стилизованное под традиционный наряд платье с синей юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlGreen = дирндль с зеленой юбкой + .desc = Стилизованное под традиционный наряд платье с зеленой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlRed = дирндль с красной юбкой + .desc = Стилизованное под традиционный наряд платье с красной юбкой. + .suffix = { "Октоберфест" } + diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml index 26f5c121fe6..8215968343d 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -258,7 +258,92 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/yuna_black_dress.rsi +#октоберфест +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestDirndlShort + name: dirndl short + description: Traditional German dress with a short skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlshort.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlshort.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestDirndlShortGreen + name: dirndl short green + description: Traditional German dress with a green short skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlshortgreen.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlshortgreen.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestDirndlShortRed + name: dirndl short red + description: Traditional German dress with a red short skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlshortred.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlshortred.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestDirndlShortBlue + name: dirndl short blue + description: Traditional German dress with a blue short skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlshortblue.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlshortblue.rsi #спрайты от SHIONE + + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestDirndlBlue + name: dirndl blue + description: Traditional German dress with a blue skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlblue.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlblue.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestDirndlRed + name: dirndl red + description: Traditional German dress with a red skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlred.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlred.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestDirndlGreen + name: dirndl green + description: Traditional German dress with a green skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlgreen.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/Oktoberfest/oktoberfest_dirndlgreen.rsi #спрайты от SHIONE #костюмы от Празата - type: entity @@ -303,4 +388,4 @@ - type: Sprite sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_qm.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_qm.rsi \ No newline at end of file + sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_qm.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml index f9390e3068e..da03d0c1d8b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -277,6 +277,93 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/black_breeches.rsi +#октоберфест + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestWhite + name: oktoberfest white suit + description: Traditional Bavarian men's suit with short trousers and a white shirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_white.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_white.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestBlueCheckered + name: oktoberfest blue checkered suit + description: Traditional Bavarian men's suit with short trousers and a blue checkered shirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_bluecheck.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_bluecheck.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestGreenVest + name: oktoberfest suit with a green vest + description: Traditional Bavarian men's suit with short trousers and a green vest. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_greenvest.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_greenvest.rsi #спрайты от SHIONE + + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestRedCheckered + name: oktoberfest red checkered suit + description: Traditional Bavarian men's suit with short trousers and a red checkered shirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_redcheck.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_redcheck.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestGreenCheckered + name: oktoberfest green checkered suit + description: Traditional Bavarian men's suit with short trousers and a green checkered shirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_greencheck.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_greencheck.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestBlueVest + name: oktoberfest suit with a blue vest + description: Traditional Bavarian men's suit with short trousers and a blue vest. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_bluevest.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_bluevest.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestRedVest + name: oktoberfest suit with a red vest + description: Traditional Bavarian men's suit with short trousers and a red vest. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_redvest.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Oktoberfest/oktoberfest_male_redvest.rsi #спрайты от SHIONE + #костюмы от Празата - type: entity @@ -322,4 +409,4 @@ - type: Sprite sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi \ No newline at end of file + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi