From d819bb498482e5e6a87f26e2a3757d277c622341 Mon Sep 17 00:00:00 2001 From: endr_animet Date: Sat, 20 Jul 2024 15:49:18 +0400 Subject: [PATCH 1/5] underwear loadouts --- .../Loadouts/Miscellaneous/loadout_groups.yml | 90 ++++ .../Stray/Loadouts/Miscellaneous/socks.yml | 261 +++++++++++ .../Loadouts/Miscellaneous/underpants.yml | 108 +++++ .../Loadouts/Miscellaneous/undershirt.yml | 423 ++++++++++++++++++ 4 files changed, 882 insertions(+) diff --git a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/loadout_groups.yml b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/loadout_groups.yml index 693c7a5c203..01513e1eeff 100644 --- a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/loadout_groups.yml +++ b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/loadout_groups.yml @@ -14,6 +14,54 @@ - tanktop - tanktop2 - tanktop3 + - bowlinga + - bee_shirt + - blueshirtsport + - bra_assblastusa + - bra_bee-kini + - bra_binder_strapless + - bra_commie + - bra_swimming_alt + - bra_swimming + - bra_uk + - cowboyshirt_navy + - cowboyshirt_navys + - cowboyshirt_red + - cowboyshirt_reds + - cowboyshirt_s + - cowboyshirt_whites + - cowboyshirt_white + - greenshirtsport + - Underian + - ilovent + - Underljont + - longstripe_blue + - longstripe + - matroska + - peace + - pogoman + - redshirtsport + - shirt_alien + - shirt_assblastusa + - shirt_bluejersey + - shirt_clown + - shirt_commie + - shirt_meat + - shirt_nano + - shirt_question + - shirt_redjersey + - shirt_skull + - shirt_ss13 + - shirt_stripes + - shirt_tiedye + - swimming_black + - swimming_blue + - swimming_blue + - swimming_red + - tank_fire + - tank_rainbow + - tank_sun + - Underuk - type: loadoutGroup id: Underpants @@ -29,6 +77,18 @@ - briefs6 - boxers - boxers2 + - bee_shorts + - bee-kini + - ljonb + - boxers_heart + - striped_panties + - Underboxers_striped + - boxers_assblastusa + - panties_assblastusa + - boxers_commie + - panties_commie + - boxers_uk + - panties_uk - type: loadoutGroup id: Socks @@ -43,3 +103,33 @@ - Socks_thigh2 - Socks_thigh3 - Socks_thigh4 + - Stockings_lpink + - Stockings_blue + - Stockings_orange + - Stockings_purple + - Stockings_cyan + - Stockings_dpink + - Stockings_green + - Stockings_yellow + - CandyCaneg_norm + - CandyCaneg_knee + - CandyCaneg_thigh + - CandyCaner_norm + - CandyCaner_knee + - CandyCaner_thigh + - Bee_norm + - Bee_knee + - Bee_thigh + - Christmas_norm + - Christmas_knee + - Christmas_thigh + - USA_knee + - USA_thigh + - Commie_knee + - Commie_thigh + - Rainbow_knee + - Rainbow_thigh + - UK_knee + - UK_thigh + - WBStriped_knee + - WBStriped_thigh \ No newline at end of file diff --git a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/socks.yml b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/socks.yml index 7381a77b291..5d26377f076 100644 --- a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/socks.yml +++ b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/socks.yml @@ -69,3 +69,264 @@ id: ClothingUnderGarter equipment: socks: ClothingUnderGarter + +- type: loadout + id: Stockings_lpink + equipment: Stockings_lpink + +- type: startingGear + id: Stockings_lpink + equipment: + socks: ClothingUnderStockings_lpink + +- type: loadout + id: Stockings_blue + equipment: Stockings_blue + +- type: startingGear + id: Stockings_blue + equipment: + socks: ClothingUnderStockings_blue + +- type: loadout + id: Stockings_orange + equipment: Stockings_orange + +- type: startingGear + id: Stockings_orange + equipment: + socks: ClothingUnderStockings_orange + +- type: loadout + id: Stockings_purple + equipment: Stockings_purple + +- type: startingGear + id: Stockings_purple + equipment: + socks: ClothingUnderStockings_purple + +- type: loadout + id: Stockings_cyan + equipment: Stockings_cyan + +- type: startingGear + id: Stockings_cyan + equipment: + socks: ClothingUnderStockings_cyan + +- type: loadout + id: Stockings_dpink + equipment: Stockings_dpink + +- type: startingGear + id: Stockings_dpink + equipment: + socks: ClothingUnderStockings_dpink + +- type: loadout + id: Stockings_green + equipment: Stockings_green + +- type: startingGear + id: Stockings_green + equipment: + socks: ClothingUnderStockings_green + +- type: loadout + id: Stockings_yellow + equipment: Stockings_yellow + +- type: startingGear + id: Stockings_yellow + equipment: + socks: ClothingUnderStockings_yellow + +- type: loadout + id: CandyCaneg_norm + equipment: CandyCaneg_norm + +- type: startingGear + id: CandyCaneg_norm + equipment: + socks: ClothingUnderCandyCaneg_norm + +- type: loadout + id: CandyCaneg_knee + equipment: CandyCaneg_knee + +- type: startingGear + id: CandyCaneg_knee + equipment: + socks: ClothingUnderCandyCaneg_knee + +- type: loadout + id: CandyCaneg_thigh + equipment: CandyCaneg_thigh + +- type: startingGear + id: CandyCaneg_thigh + equipment: + socks: ClothingUnderCandyCaneg_thigh + +- type: loadout + id: CandyCaner_norm + equipment: CandyCaner_norm + +- type: startingGear + id: CandyCaner_norm + equipment: + socks: ClothingUnderCandyCaner_norm + +- type: loadout + id: CandyCaner_knee + equipment: CandyCaner_knee + +- type: startingGear + id: CandyCaner_knee + equipment: + socks: ClothingUnderCandyCaner_knee + +- type: loadout + id: Bee_norm + equipment: Bee_norm + +- type: startingGear + id: Bee_norm + equipment: + socks: ClothingUnderBee_norm + +- type: loadout + id: Bee_knee + equipment: Bee_knee + +- type: startingGear + id: Bee_knee + equipment: + socks: ClothingUnderBee_knee + +- type: loadout + id: Bee_thigh + equipment: Bee_thigh + +- type: startingGear + id: Bee_thigh + equipment: + socks: ClothingUnderBee_thigh + +- type: loadout + id: Christmas_norm + equipment: Christmas_norm + +- type: startingGear + id: Christmas_norm + equipment: + socks: ClothingUnderChristmas_norm + +- type: loadout + id: Christmas_knee + equipment: Christmas_knee + +- type: startingGear + id: Christmas_knee + equipment: + socks: ClothingUnderChristmas_knee + +- type: loadout + id: Christmas_thigh + equipment: Christmas_thigh + +- type: startingGear + id: Christmas_thigh + equipment: + socks: ClothingUnderChristmas_thigh + +- type: loadout + id: USA_knee + equipment: USA_knee + +- type: startingGear + id: USA_knee + equipment: + socks: ClothingUnderAssBlastUSA_knee + +- type: loadout + id: USA_thigh + equipment: USA_thigh + +- type: startingGear + id: USA_thigh + equipment: + socks: ClothingUnderAssBlastUSA_thigh + +- type: loadout + id: Commie_knee + equipment: Commie_knee + +- type: startingGear + id: Commie_knee + equipment: + socks: ClothingUnderCommie_knee + +- type: loadout + id: Commie_thigh + equipment: Commie_thigh + +- type: startingGear + id: Commie_thigh + equipment: + socks: ClothingUnderCommie_thigh + +- type: loadout + id: Rainbow_knee + equipment: Rainbow_knee + +- type: startingGear + id: Rainbow_knee + equipment: + socks: ClothingUnderRainbow_knee + +- type: loadout + id: Rainbow_thigh + equipment: Rainbow_thigh + +- type: startingGear + id: Rainbow_thigh + equipment: + socks: ClothingUnderRainbow_thigh + +- type: loadout + id: UK_knee + equipment: UK_knee + +- type: startingGear + id: UK_knee + equipment: + socks: ClothingUnderUK_knee + +- type: loadout + id: UK_thigh + equipment: UK_thigh + +- type: startingGear + id: UK_thigh + equipment: + socks: ClothingUnderUK_thigh + +- type: loadout + id: WBStriped_knee + equipment: WBStriped_knee + +- type: startingGear + id: WBStriped_knee + equipment: + socks: ClothingUnderStriped_knee + +- type: loadout + id: WBStriped_thigh + equipment: WBStriped_thigh + +- type: startingGear + id: WBStriped_thigh + equipment: + socks: ClothingUnderStriped_thigh diff --git a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/underpants.yml b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/underpants.yml index 81cadabd77e..d94b67d2249 100644 --- a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/underpants.yml +++ b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/underpants.yml @@ -78,3 +78,111 @@ id: ClothingUnderpanties_slim equipment: underpants: ClothingUnderpanties_slim + +- type: loadout + id: bee_shorts + equipment: bee_shorts + +- type: startingGear + id: bee_shorts + equipment: + underpants: ClothingUnderbee_shorts + +- type: loadout + id: bee-kini + equipment: bee-kini + +- type: startingGear + id: bee-kini + equipment: + underpants: ClothingUnderpanties_bee-kini + +- type: loadout + id: ljonb + equipment: Underljonb + +- type: startingGear + id: Underljonb + equipment: + underpants: ClothingUnderljonb + +- type: loadout + id: boxers_heart + equipment: boxers_heart + +- type: startingGear + id: boxers_heart + equipment: + underpants: ClothingUnderboxers_heart + +- type: loadout + id: striped_panties + equipment: striped_panties + +- type: startingGear + id: Understriped_panties + equipment: + underpants: ClothingUnderstriped_panties + +- type: loadout + id: boxers_striped + equipment: Underboxers_striped + +- type: startingGear + id: Underboxers_striped + equipment: + underpants: ClothingUnderboxers_striped + +- type: loadout + id: boxers_assblastusa + equipment: boxers_assblastusa + +- type: startingGear + id: boxers_assblastusa + equipment: + underpants: ClothingUnderboxers_assblastusa + +- type: loadout + id: panties_assblastusa + equipment: panties_assblastusa + +- type: startingGear + id: panties_assblastusa + equipment: + underpants: ClothingUnderpanties_assblastusa + +- type: loadout + id: boxers_commie + equipment: boxers_commie + +- type: startingGear + id: boxers_commie + equipment: + underpants: ClothingUnderboxers_commie + +- type: loadout + id: panties_commie + equipment: panties_commie + +- type: startingGear + id: panties_commie + equipment: + underpants: ClothingUnderpanties_commie + +- type: loadout + id: boxers_uk + equipment: boxers_uk + +- type: startingGear + id: boxers_uk + equipment: + underpants: ClothingUnderboxers_uk + +- type: loadout + id: panties_uk + equipment: panties_uk + +- type: startingGear + id: panties_uk + equipment: + underpants: ClothingUnderpanties_uk \ No newline at end of file diff --git a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/undershirt.yml b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/undershirt.yml index f71aded7f5b..d76a76bd2fd 100644 --- a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/undershirt.yml +++ b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/undershirt.yml @@ -96,3 +96,426 @@ id: ClothingUndercowboyshirt_white equipment: undershirt: ClothingUndercowboyshirt_white + +- type: loadout + id: bowlinga + equipment: bowlinga + +- type: startingGear + id: bowlinga + equipment: + undershirt: ClothingUnderbowlinga + +- type: loadout + id: bee_shirt + equipment: bee_shirt + +- type: startingGear + id: bee_shirt + equipment: + undershirt: ClothingUnderbee_shirt + +- type: loadout + id: blueshirtsport + equipment: blueshirtsport + +- type: startingGear + id: blueshirtsport + equipment: + undershirt: ClothingUnderblueshirtsport + +- type: loadout + id: bra_assblastusa + equipment: bra_assblastusa + +- type: startingGear + id: bra_assblastusa + equipment: + undershirt: ClothingUnderbra_assblastusa + +- type: loadout + id: bra_bee-kini + equipment: bra_bee-kini + +- type: startingGear + id: bra_bee-kini + equipment: + undershirt: ClothingUnderbra_bee-kini + +- type: loadout + id: bra_binder_strapless + equipment: bra_binder_strapless + +- type: startingGear + id: bra_binder_strapless + equipment: + undershirt: ClothingUnderbra_binder_strapless + +- type: loadout + id: bra_commie + equipment: bra_commie + +- type: startingGear + id: bra_commie + equipment: + undershirt: ClothingUnderbra_commie + +- type: loadout + id: bra_swimming_alt + equipment: bra_swimming_alt + +- type: startingGear + id: bra_swimming_alt + equipment: + undershirt: ClothingUnderbra_swimming_alt + +- type: loadout + id: bra_swimming + equipment: bra_swimming + +- type: startingGear + id: bra_swimming + equipment: + undershirt: ClothingUnderbra_swimming + +- type: loadout + id: bra_uk + equipment: bra_uk + +- type: startingGear + id: bra_uk + equipment: + undershirt: ClothingUnderbra_uk + +- type: loadout + id: cowboyshirt_navy + equipment: cowboyshirt_navy + +- type: startingGear + id: cowboyshirt_navy + equipment: + undershirt: ClothingUndercowboyshirt_navy + +- type: loadout + id: cowboyshirt_navys + equipment: cowboyshirt_navys + +- type: startingGear + id: cowboyshirt_navys + equipment: + undershirt: ClothingUndercowboyshirt_navys + +- type: loadout + id: cowboyshirt_red + equipment: cowboyshirt_red + +- type: startingGear + id: cowboyshirt_red + equipment: + undershirt: ClothingUndercowboyshirt_red + +- type: loadout + id: cowboyshirt_reds + equipment: cowboyshirt_reds + +- type: startingGear + id: cowboyshirt_reds + equipment: + undershirt: ClothingUndercowboyshirt_reds + +- type: loadout + id: cowboyshirt_s + equipment: cowboyshirt_s + +- type: startingGear + id: cowboyshirt_s + equipment: + undershirt: ClothingUndercowboyshirt_s + +- type: loadout + id: cowboyshirt_whites + equipment: cowboyshirt_whites + +- type: startingGear + id: cowboyshirt_whites + equipment: + undershirt: ClothingUndercowboyshirt_whites + +- type: loadout + id: cowboyshirt_white + equipment: cowboyshirt_white + +- type: startingGear + id: cowboyshirt_white + equipment: + undershirt: ClothingUndercowboyshirt_white + +- type: loadout + id: greenshirtsport + equipment: greenshirtsport + +- type: startingGear + id: greenshirtsport + equipment: + undershirt: ClothingUndergreenshirtsport + +- type: loadout + id: Underian + equipment: Underian + +- type: startingGear + id: Underian + equipment: + undershirt: ClothingUnderian + +- type: loadout + id: ilovent + equipment: ilovent + +- type: startingGear + id: ilovent + equipment: + undershirt: ClothingUnderilovent + +- type: loadout + id: Underljont + equipment: Underljont + +- type: startingGear + id: Underljont + equipment: + undershirt: ClothingUnderljont + +- type: loadout + id: longstripe_blue + equipment: longstripe_blue + +- type: startingGear + id: longstripe_blue + equipment: + undershirt: ClothingUnderlongstripe_blue + +- type: loadout + id: longstripe + equipment: longstripe + +- type: startingGear + id: longstripe + equipment: + undershirt: ClothingUnderlongstripe + +- type: loadout + id: matroska + equipment: matroska + +- type: startingGear + id: matroska + equipment: + undershirt: ClothingUndermatroska + +- type: loadout + id: peace + equipment: peace + +- type: startingGear + id: peace + equipment: + undershirt: ClothingUnderpeace + +- type: loadout + id: pogoman + equipment: pogoman + +- type: startingGear + id: pogoman + equipment: + undershirt: ClothingUnderpogoman + +- type: loadout + id: redshirtsport + equipment: redshirtsport + +- type: startingGear + id: redshirtsport + equipment: + undershirt: ClothingUnderredshirtsport + +- type: loadout + id: shirt_alien + equipment: shirt_alien + +- type: startingGear + id: shirt_alien + equipment: + undershirt: ClothingUndershirt_alien + +- type: loadout + id: shirt_assblastusa + equipment: shirt_assblastusa + +- type: startingGear + id: shirt_assblastusa + equipment: + undershirt: ClothingUndershirt_assblastusa + +- type: loadout + id: shirt_bluejersey + equipment: shirt_bluejersey + +- type: startingGear + id: shirt_bluejersey + equipment: + undershirt: ClothingUndershirt_bluejersey + +- type: loadout + id: shirt_clown + equipment: shirt_clown + +- type: startingGear + id: shirt_clown + equipment: + undershirt: ClothingUndershirt_clown + +- type: loadout + id: shirt_commie + equipment: shirt_commie + +- type: startingGear + id: shirt_commie + equipment: + undershirt: ClothingUndershirt_commie + +- type: loadout + id: shirt_meat + equipment: shirt_meat + +- type: startingGear + id: shirt_meat + equipment: + undershirt: ClothingUndershirt_meat + +- type: loadout + id: shirt_nano + equipment: shirt_nano + +- type: startingGear + id: shirt_nano + equipment: + undershirt: ClothingUndershirt_nano + +- type: loadout + id: shirt_question + equipment: shirt_question + +- type: startingGear + id: shirt_question + equipment: + undershirt: ClothingUndershirt_question + +- type: loadout + id: shirt_redjersey + equipment: shirt_redjersey + +- type: startingGear + id: shirt_redjersey + equipment: + undershirt: ClothingUndershirt_redjersey + +- type: loadout + id: shirt_skull + equipment: shirt_skull + +- type: startingGear + id: shirt_skull + equipment: + undershirt: ClothingUndershirt_skull + +- type: loadout + id: shirt_ss13 + equipment: shirt_ss13 + +- type: startingGear + id: shirt_ss13 + equipment: + undershirt: ClothingUndershirt_ss13 + +- type: loadout + id: shirt_stripes + equipment: shirt_stripes + +- type: startingGear + id: shirt_stripes + equipment: + undershirt: ClothingUndershirt_stripes + +- type: loadout + id: shirt_tiedye + equipment: shirt_tiedye + +- type: startingGear + id: shirt_tiedye + equipment: + undershirt: ClothingUndershirt_tiedye + +- type: loadout + id: swimming_black + equipment: swimming_black + +- type: startingGear + id: swimming_black + equipment: + undershirt: ClothingUnderswimming_black + +- type: loadout + id: swimming_blue + equipment: swimming_blue + +- type: startingGear + id: swimming_blue + equipment: + undershirt: ClothingUnderswimming_blue + +- type: loadout + id: swimming_red + equipment: swimming_red + +- type: startingGear + id: swimming_red + equipment: + undershirt: ClothingUnderswimming_red + +- type: loadout + id: tank_fire + equipment: tank_fire + +- type: startingGear + id: tank_fire + equipment: + undershirt: ClothingUndertank_fire + +- type: loadout + id: tank_rainbow + equipment: tank_rainbow + +- type: startingGear + id: tank_rainbow + equipment: + undershirt: ClothingUndertank_rainbow + +- type: loadout + id: tank_sun + equipment: tank_sun + +- type: startingGear + id: tank_sun + equipment: + undershirt: ClothingUndertank_sun + +- type: loadout + id: Underuk + equipment: Underuk + +- type: startingGear + id: Underuk + equipment: + undershirt: ClothingUnderuk From 7f2ab61f98f96a11c82adfee52bc20ea9748ed23 Mon Sep 17 00:00:00 2001 From: endr_animet Date: Sat, 20 Jul 2024 18:57:33 +0400 Subject: [PATCH 2/5] little translate fix --- .../ru-RU/stray/clothing/under/pants.ftl | 46 +++++++-------- .../ru-RU/stray/clothing/under/shirts.ftl | 58 +++++++++---------- .../ru-RU/stray/clothing/under/socks.ftl | 2 +- .../Loadouts/Miscellaneous/loadout_groups.yml | 1 - 4 files changed, 53 insertions(+), 54 deletions(-) diff --git a/Resources/Locale/ru-RU/stray/clothing/under/pants.ftl b/Resources/Locale/ru-RU/stray/clothing/under/pants.ftl index 4e27405a03e..7305c25c6ad 100644 --- a/Resources/Locale/ru-RU/stray/clothing/under/pants.ftl +++ b/Resources/Locale/ru-RU/stray/clothing/under/pants.ftl @@ -1,27 +1,27 @@ -ent-ClothingUnderbee_shorts = пчелиные шорты - .desc = Пара Пчелиных шорт — достойный выбор для летнего дня. -ent-ClothingUnderboxer_briefs = трусы-боксеры - .desc = Пара трусов-боксеров — идеальное сочетание комфорта и поддержки. -ent-ClothingUnderboxers_assblastusa = американские трусы-боксеры - .desc = Пара трусов-боксеров с американским флагом, демонстрирующих ваш патриотический дух со звездами и полосами. -ent-ClothingUnderboxers_commie = комуничтические трусы-боксеры - .desc = Пара коммунистических трусов-боксеров, делающих политическое заявление в твоих штанах. -ent-ClothingUnderboxers_heart = трусы-боксеры с сердцем - .desc = Пара боксеров с сердцем, любовное письмо вашей второй половинке, написанное на вашем нижнем белье. -ent-ClothingUnderboxers_striped = полосатые трусы-боксеры - .desc = Пара полосатых боксеров с классическим узором. -ent-ClothingUnderboxers_uk = британские трусы-боксеры - .desc = Пара коммунистических трусов-боксеров, делающих политическое заявление в твоих штанах. -ent-ClothingUnderboxers = Мужские трусы-боксеры - .desc = Пара классических боксеров, таких же удобных, как у дедушки. +ent-ClothingUnderbee_shorts = пчелиные трусиков + .desc = Пчелиных трусиков — достойный выбор для летнего дня. +ent-ClothingUnderboxer_briefs = трусы + .desc = Трусы-шорты — идеальное сочетание комфорта и поддержки. +ent-ClothingUnderboxers_assblastusa = американские трусы + .desc = Трусы с американским флагом, демонстрирующих ваш патриотический дух со звездами и полосами. +ent-ClothingUnderboxers_commie = комуничтические трусы + .desc = Коммунистические трусы, делающих политическое заявление в твоих штанах. +ent-ClothingUnderboxers_heart = трусы с сердечками + .desc = Полосатые трусы с сердцем, любовное письмо вашей второй половинке, написанное на вашем нижнем белье. +ent-ClothingUnderboxers_striped = полосатые трусы + .desc = Полосатые трусы с классическим узором. +ent-ClothingUnderboxers_uk = британские трусы + .desc = Коммунистические трусы, делающих политическое заявление в твоих штанах. +ent-ClothingUnderboxers = Мужские трусы + .desc = Классические трусы, таких же удобных, как у дедушки. ent-ClothingUnderbriefs = трусы - .desc = Пара трусов для тех, кто хочет, чтобы они плотно прилегали во всех нужных местах. + .desc = Трусы для тех, кто хочет, чтобы они плотно прилегали во всех нужных местах. # ent-ClothingUnderfishnet_lower = нижнее белье в клеточку # .desc = Выглядит так, будто это нижнее белье в клеточку. ent-ClothingUnderjockstrap = бандаж .desc = Бандаж для любителей спорта и приключений. -ent-ClothingUnderljonb = длинные брюки - .desc = Пара длинных брюк, чтобы согреться в этом классическом длинном нижнем белье. +ent-ClothingUnderljonb = длинные трусы + .desc = Длинные трусы, чтобы согреться в этом классическом длинном нижнем белье. ent-ClothingUnderpanties_alt = трусики .desc = Пара обычных трусиков, старого образца. ent-ClothingUnderpanties_assblastusa = трусики с американским флагом @@ -35,13 +35,13 @@ ent-ClothingUnderpanties_commie = коммунистические трусик ent-ClothingUnderpanties_neko = трусики неко .desc = Трусики неко с милым принтом неко для любителей кошек. ent-ClothingUnderpanties_slim = тонкие трусики - .desc = Пара тонких трусиков для любителей минимализма, облегающей и удобной посадки. + .desc = Тонкие трусики для любителей минимализма, облегающей и удобной посадки. ent-ClothingUnderpanties_swimming = плавки - .desc = Пара плавок для стильного плавания в бассейне. + .desc = Плавки для стильного плавания в бассейне. ent-ClothingUnderpanties_uk = британские трусики - .desc = Пара британских трусиков, демонстрирующих любовь к Великобритании благодаря своему дизайну. + .desc = Британскик трусики, демонстрирующих любовь к Великобритании благодаря своему дизайну. ent-ClothingUnderpanties = трусики - .desc = Пара обычных трусиков, старого образца. + .desc = Обычнык трусики, старого образца. # ent-ClothingUnderpantyhose_ripped = рваные колготки # .desc = Выглядит так, будто это рваные колготки. ent-ClothingUnderpantyhose = колготки diff --git a/Resources/Locale/ru-RU/stray/clothing/under/shirts.ftl b/Resources/Locale/ru-RU/stray/clothing/under/shirts.ftl index b3a55428707..3e2def8d3cf 100644 --- a/Resources/Locale/ru-RU/stray/clothing/under/shirts.ftl +++ b/Resources/Locale/ru-RU/stray/clothing/under/shirts.ftl @@ -1,19 +1,19 @@ ent-ClothingUnderbabydoll = рубашка-бэбидолл .desc = Рубашка в стиле бэби-долл, идеально подходящая для того, чтобы почувствовать себя кокетливой и сказочной. -ent-ClothingUnderband = рубашка для группы - .desc = Классная рубашка для группы, готовая к концертам или просто для игры дома. -ent-ClothingUnderbee_shirt = пчелиная рубашка - .desc = Рубашка с пчелиной тематикой, излучающая стиль. -ent-ClothingUnderblueshirtsport = спортивная синяя рубашка - .desc = Спортивная синяя рубашка идеальна для тренировки или отдыха. -ent-ClothingUnderbowling = красная рубашка для боулинга - .desc = Красная рубашка для боулинга, готовая стильно сбить кегли. -ent-ClothingUnderbowlinga = темно-синяя рубашка для боулинга - .desc = Темно-синяя рубашка для боулинга, которая заявит о себе на дорожках. -ent-ClothingUnderbowlingp = розовая рубашка для боулинга - .desc = Розовая рубашка для боулинга, демонстрирующая вашу игривую сторону. -ent-ClothingUnderbowlingw = белая рубашка для боулинга - .desc = Белая рубашка для боулинга — простая и стильная. +ent-ClothingUnderband = футболка группы + .desc = Классная футболка группы, готовая к концертам или просто для игры дома. +ent-ClothingUnderbee_shirt = пчелиная футболка + .desc = Футболка с пчелиной тематикой, излучающая стиль. +ent-ClothingUnderblueshirtsport = спортивная синяя футболка + .desc = Спортивная синяя футболка идеальна для тренировки или отдыха. +ent-ClothingUnderbowling = красная футболка для боулинга + .desc = Красная футболка для боулинга, готовая стильно сбить кегли. +ent-ClothingUnderbowlinga = темно-синяя футболка для боулинга + .desc = Темно-синяя футболка для боулинга, которая заявит о себе на дорожках. +ent-ClothingUnderbowlingp = розовая футболка для боулинга + .desc = Розовая футболка для боулинга, демонстрирующая вашу игривую сторону. +ent-ClothingUnderbowlingw = белая футболка для боулинга + .desc = Белая футболка для боулинга — простая и стильная. ent-ClothingUnderbra_alt = бюстгальтер .desc = Базовый бюстгальтер, обеспечивающий комфорт и поддержку для повседневного ношения. ent-ClothingUnderbra_assblastusa = бюстгальтер с американским флагом @@ -68,13 +68,13 @@ ent-ClothingUnderljont = длинная рубашка .desc = Длинная рубашка идеально подходит для того, чтобы чувствовать себя уютно на холоде. ent-ClothingUnderlongstripe_blue = рубашка в синюю полоску .desc = Рубашка в стиле подиума, в которой вы почувствуете, что всегда ходите по подиуму. -ent-ClothingUnderlongstripe = полосатая рубашка +ent-ClothingUnderlongstripe = полосатая футболка .desc = Майка в яркую полоску, идеально подходящая для модного образа. ent-ClothingUnderlover = любовная рубашка .desc = Милая и сентиментальная майка, идеально подходящая для того, чтобы носить свое сердце на груди. -ent-ClothingUndermatroska = рубашка матрёшки - .desc = Необычная и уникальная рубашка в виде матрёшки. -ent-ClothingUnderpeace = мировая рубашка +ent-ClothingUndermatroska = рубашка матроса + .desc = Необычная и уникальная рубашка. +ent-ClothingUnderpeace = рубашка с пациификом .desc = Привлекательная рубашка с мирным посланием ent-ClothingUnderpogoman = рубашка погомана .desc = Яркая и необычная майка, готовая к любой вечеринке. @@ -92,20 +92,20 @@ ent-ClothingUndershirt_clown = клоунская рубашка .desc = Клоун её оценит! ent-ClothingUndershirt_commie = комунистическая рубашка .desc = Коммунистическая рубашка, делающая политическое заявление! -ent-ClothingUndershirt_meat = мясная рубашка - .desc = Рубашка идеально подходит для людей, предпочитающих мясо и картофель. -ent-ClothingUndershirt_nano = нано рубашка - .desc = Элегантная и стильная рубашка, идеально подходящая для хакинга или для того, чтобы выглядеть круто -ent-ClothingUndershirt_question = рубашка с вопросительным знаком +ent-ClothingUndershirt_meat = мясная футболка + .desc = Футболка идеально подходит для людей, предпочитающих мясо и картофель. +ent-ClothingUndershirt_nano = нано футболка + .desc = Элегантная и стильная футболка, идеально подходящая для хакинга или для того, чтобы выглядеть круто +ent-ClothingUndershirt_question = футболка с вопросительным знаком .desc = Рубашка, в которой больше вопросов, чем ответов. ent-ClothingUndershirt_redjersey = красная майка .desc = Стильная красная майка идеально подходит для набора очков за стиль. -ent-ClothingUndershirt_skull = рубашка с черепом - .desc = Рубашка, ведущая статистику о смертности. -ent-ClothingUndershirt_ss13 = рубашка с космической станции 13 - .desc = Рубашка с изображением вашей любимой игры на космическую тематику. +ent-ClothingUndershirt_skull = футболка с черепом + .desc = Футболка, ведущая статистику о смертности. +ent-ClothingUndershirt_ss13 = рубашка с числом 13 + .desc = Футболка с изображением 13. ent-ClothingUndershirt_stripes = полосатая рубашка - .desc = Полосатая рубашка идеально подходит для общения со своим внутренним моряком. + .desc = Полосатая футболка идеально подходит для общения со своим внутренним моряком. ent-ClothingUndershirt_tiedye = рубашка тай-дай .desc = Яркая и смелая рубашка тай-дай, заявляющая о себе ent-ClothingUndershortsleeve = футболка @@ -132,7 +132,7 @@ ent-ClothingUndertank_rainbow = радужная майка .desc = Майка для распространения позитива и хорошего настроения. ent-ClothingUndertank_stripes = полосатая майка .desc = Модная майка с головами и полосками. -ent-ClothingUndertank_sun = солнечная майка +ent-ClothingUndertank_sun = майка с солнцем .desc = Солнечная майка, сияющая ярко, как солнце. ent-ClothingUndertanktop_alt = майка .desc = Классическая и стильная майка. diff --git a/Resources/Locale/ru-RU/stray/clothing/under/socks.ftl b/Resources/Locale/ru-RU/stray/clothing/under/socks.ftl index f6cdaa3a338..dbec0a6078e 100644 --- a/Resources/Locale/ru-RU/stray/clothing/under/socks.ftl +++ b/Resources/Locale/ru-RU/stray/clothing/under/socks.ftl @@ -52,7 +52,7 @@ ent-ClothingUnderStockings_dpink = темно-розовые гольфы .desc = Пара темно-розовых гольфов идеально подойдет для ночной прогулки по городу. ent-ClothingUnderStockings_green = зеленые гольфы .desc = Пара зеленых гольфов, идеально подходящих для того, чтобы заставить всех позеленеть от зависти. -ent-ClothingUnderStockings_lpink = носки для программиста +ent-ClothingUnderStockings_lpink = носки для программистов .desc = Пара носков с кодовым фиксом. ent-ClothingUnderStockings_orange = оранжевые гольфы .desc = Пара ярких гольфов идеально подойдет для смелой модницы. diff --git a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/loadout_groups.yml b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/loadout_groups.yml index 01513e1eeff..564983a0e1e 100644 --- a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/loadout_groups.yml +++ b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/loadout_groups.yml @@ -56,7 +56,6 @@ - shirt_tiedye - swimming_black - swimming_blue - - swimming_blue - swimming_red - tank_fire - tank_rainbow From 91160530c36c7f1ad50a0a28875c9224213f7396 Mon Sep 17 00:00:00 2001 From: endr_animet Date: Sat, 20 Jul 2024 19:15:37 +0400 Subject: [PATCH 3/5] LittleFix --- .../Prototypes/Stray/Loadouts/Miscellaneous/socks.yml | 9 +++++++++ .../Stray/Loadouts/Miscellaneous/underpants.yml | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/socks.yml b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/socks.yml index 5d26377f076..6ef46878fdc 100644 --- a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/socks.yml +++ b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/socks.yml @@ -187,6 +187,15 @@ equipment: socks: ClothingUnderCandyCaner_knee +- type: loadout + id: CandyCaner_thigh + equipment: CandyCaner_thigh + +- type: startingGear + id: CandyCaner_thigh + equipment: + socks: ClothingUnderCandyCaner_thigh + - type: loadout id: Bee_norm equipment: Bee_norm diff --git a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/underpants.yml b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/underpants.yml index d94b67d2249..89d54f0da08 100644 --- a/Resources/Prototypes/Stray/Loadouts/Miscellaneous/underpants.yml +++ b/Resources/Prototypes/Stray/Loadouts/Miscellaneous/underpants.yml @@ -117,7 +117,7 @@ - type: loadout id: striped_panties - equipment: striped_panties + equipment: Understriped_panties - type: startingGear id: Understriped_panties @@ -125,7 +125,7 @@ underpants: ClothingUnderstriped_panties - type: loadout - id: boxers_striped + id: Underboxers_striped equipment: Underboxers_striped - type: startingGear @@ -185,4 +185,4 @@ - type: startingGear id: panties_uk equipment: - underpants: ClothingUnderpanties_uk \ No newline at end of file + underpants: ClothingUnderpanties_uk From ecc6f71039f01f920391a15f622c05e564154fbd Mon Sep 17 00:00:00 2001 From: endr_animet Date: Sat, 20 Jul 2024 20:09:37 +0400 Subject: [PATCH 4/5] RespriteSawDustSoup --- .../Locale/ru-RU/stray/flavors/flavors.ftl | 1 + .../Locale/ru-RU/stray/reagents/chemicals.ftl | 5 +- .../Entities/Objects/Consumable/Food/soup.yml | 18 +++---- .../Prototypes/Stray/Flavors/flavors.yml | 4 ++ .../Prototypes/Stray/Reagents/chemicals.yml | 49 +++++++++++++++++- .../Consumable/Food/bowl.rsi/meta.json | 3 ++ .../Consumable/Food/bowl.rsi/sawdust.png | Bin 0 -> 1868 bytes 7 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 Resources/Locale/ru-RU/stray/flavors/flavors.ftl create mode 100644 Resources/Prototypes/Stray/Flavors/flavors.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/bowl.rsi/sawdust.png diff --git a/Resources/Locale/ru-RU/stray/flavors/flavors.ftl b/Resources/Locale/ru-RU/stray/flavors/flavors.ftl new file mode 100644 index 00000000000..1c8b40304e3 --- /dev/null +++ b/Resources/Locale/ru-RU/stray/flavors/flavors.ftl @@ -0,0 +1 @@ +flavor-complex-frostpunk = как будто вы выживаете в -70 \ No newline at end of file diff --git a/Resources/Locale/ru-RU/stray/reagents/chemicals.ftl b/Resources/Locale/ru-RU/stray/reagents/chemicals.ftl index 85f4bd4f70b..a8867914a23 100644 --- a/Resources/Locale/ru-RU/stray/reagents/chemicals.ftl +++ b/Resources/Locale/ru-RU/stray/reagents/chemicals.ftl @@ -1,2 +1,5 @@ reagent-name-sawdust = опилки -reagent-desc-sawdust = измельчённая древисина. \ No newline at end of file +reagent-desc-sawdust = измельчённая древисина. + +reagent-name-sawdustsoup = суп из опилок +reagent-desc-sawdustsoup = Нагретые опилки в воде. diff --git a/Resources/Prototypes/Stray/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Stray/Entities/Objects/Consumable/Food/soup.yml index 30a7cf3dbd7..be10cf8faa8 100644 --- a/Resources/Prototypes/Stray/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Stray/Entities/Objects/Consumable/Food/soup.yml @@ -6,25 +6,19 @@ components: - type: FlavorProfile flavors: - - bread + - sawdustsoup - type: Sprite sprite: Objects/Consumable/Food/bowl.rsi layers: - state: bowl - - state: mystery + - state: sawdust - type: SolutionContainerManager solutions: food: - maxVol: 30 + maxVol: 50 reagents: - - ReagentId: Nutriment - Quantity: 15 - - ReagentId: Water - Quantity: 5 - - ReagentId: Vitamin - Quantity: 4 - - ReagentId: Omnizine - Quantity: 6 + - ReagentId: SawdustSoupReagent + Quantity: 35 - type: Tag tags: - - Fruit \ No newline at end of file + - Fruit diff --git a/Resources/Prototypes/Stray/Flavors/flavors.yml b/Resources/Prototypes/Stray/Flavors/flavors.yml new file mode 100644 index 00000000000..f4003b2b6f2 --- /dev/null +++ b/Resources/Prototypes/Stray/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: sawdustsoup + flavorType: Complex + description: flavor-complex-frostpunk \ No newline at end of file diff --git a/Resources/Prototypes/Stray/Reagents/chemicals.yml b/Resources/Prototypes/Stray/Reagents/chemicals.yml index 3c2e3d11743..e28f02993d7 100644 --- a/Resources/Prototypes/Stray/Reagents/chemicals.yml +++ b/Resources/Prototypes/Stray/Reagents/chemicals.yml @@ -6,4 +6,51 @@ flavor: bitter color: "#8B4513" physicalDesc: reagent-physical-desc-pulpy - slippery: false \ No newline at end of file + slippery: false + metabolisms: + Drink: + effects: + - !type:SatiateHunger + factor: 1.5 + - !type:SatiateThirst + factor: -0.5 + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 0.05 + + + +- type: reagent + id: SawdustSoupReagent + name: reagent-name-sawdustsoup + group: Biological + desc: reagent-desc-sawdustsoup + flavor: bitter + color: "#8B4513" + physicalDesc: reagent-physical-desc-pulpy + slippery: false + metabolisms: + Food: + effects: + - !type:SatiateHunger + factor: 3 + - !type:SatiateThirst + factor: 1.5 + - !type:HealthChange + probability: 0.5 + damage: + groups: + Brute: -1.5 + Burn: -1 + Toxin: -2 + - !type:ModifyBleedAmount + amount: -0.25 + plantMetabolism: + - !type:PlantAdjustNutrition + amount: 0.5 + - !type:PlantAdjustHealth + amount: 1.5 + pricePerUnit: 2.5 diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json index 8e2c4444fc4..c3bae6bcb25 100644 --- a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json @@ -136,6 +136,9 @@ { "name": "rice-pudding" }, + { + "name": "sawdust" + }, { "name": "slime" }, diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/sawdust.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/sawdust.png new file mode 100644 index 0000000000000000000000000000000000000000..428335138d96cce6a4a2470d008659870e98797f GIT binary patch literal 1868 zcmbVMdu$VR9RHQV7*8vU8!RTCH^Dt*+(iu~Wrvd082!L5TU6R%4}Rnzok# zPPYo%<`*XRA- zz9aRx>&34o?LD=)_}Vg4X}Ru;mpd+%&i%l?HF%-gY@9eevV6a-33-wRP}9(Up|-q=wRR5yElK=I&bjM-htlEVahN%ItuEV!Rof82P`cHKV19v z=+UFpEO6vx*A&EDtom!~5$1sbviql6ZXHIbDUy4&0>HEaZR$YZ8?ynJcv}dpQdfCb zFq{}Qv06AyiKv9o04!LPkXWt-s#p+)g_r~X<=7yO3A_VusPvLv$qAbU_XZi(Z>SA$ z8(KJ;#}_Tc79C8Cj-!XzAchL=HW?U=x^3`A{l;A8o-%Im|Nq71Q0lg-GP zt(906Z8F;|R+^rVQKZ>UkaogsF`8|Rm1HOi%MKh#llc(icRiPtg?0|SSyd&5AmZ`3 zDQ+=|a+pB5NfRVRP?QlNj7l=5vI%2MDH&&QL4}hANfpExrZKWXu}yX0NYgPBqEe1F zrexiO97ZHqi7=Z;&7=&F=W;lyO^#%Q^Be&qFbZR;g0SWsR%#YiQE3+chB|kBp8(`q zuQw;-p}It)IT4Cl(~iu@I^>~fC6JUL;fIRYCUdZ+9jRHOStBt{8M3M<2ShP49w^_q z%9zus1%}2-8-y4y#+9;r-ar?tLI+Nfl+{R987VSgrWwl2m~9oLl_AM7s8{5LQ1YQr zD^qE?4~nveXI1uJ!92%=L^;YLn}sMFhJ+Lg<5+6wpCRb=^(`#Ep{tu3|4U=qm8svR4^2Tl+`x=-X(HvT5!kT^Z)aG zoh+c@Vk3{tqm`VN6^vU@P`r}aqNsaaMTX8Wv&mQO|Fx{7;0ZK z>QnihP7d`rugA3{VE^prS6Akx7f*NnHvRS4SML&+yXQaO`{xVMXS$N1>Y Date: Sat, 20 Jul 2024 20:18:44 +0400 Subject: [PATCH 5/5] FixSawdustSoupUpdate --- Resources/Prototypes/Stray/Reagents/chemicals.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Resources/Prototypes/Stray/Reagents/chemicals.yml b/Resources/Prototypes/Stray/Reagents/chemicals.yml index e28f02993d7..2fb58d68c69 100644 --- a/Resources/Prototypes/Stray/Reagents/chemicals.yml +++ b/Resources/Prototypes/Stray/Reagents/chemicals.yml @@ -8,21 +8,17 @@ physicalDesc: reagent-physical-desc-pulpy slippery: false metabolisms: - Drink: + Food: effects: - !type:SatiateHunger factor: 1.5 - !type:SatiateThirst factor: -0.5 - Poison: - effects: - !type:HealthChange damage: types: Poison: 0.05 - - - type: reagent id: SawdustSoupReagent name: reagent-name-sawdustsoup