From 55a1e8778287840d50bb1f50541d91b78fbe0be4 Mon Sep 17 00:00:00 2001 From: Eugeny Date: Sat, 9 Mar 2024 00:57:20 +0400 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B4=D0=B8=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D1=8B=20=D1=83=D0=BD=D0=B0=D1=82=D1=85=D0=BE=D0=B2?= =?UTF-8?q?,=20=D1=84=D0=B5=D0=BB=D0=B8=D0=BD=D0=B8=D0=B4=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B8=D0=B0=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 7 +++ .../Objects/Consumable/Food/croissant.yml | 12 +++++ .../Objects/Consumable/Food/fried_egg.yml | 3 ++ .../Food/hypoallergen_chocolate.yml | 6 ++- .../Objects/Consumable/Food/khachapuri.yml | 4 ++ .../Entities/Objects/Consumable/Food/meat.yml | 4 ++ .../Objects/Consumable/Food/oktoberfest.yml | 11 ++++ .../Objects/Consumable/Food/sashimisafe.yml | 1 + .../Objects/Consumable/Food/sausage.yml | 2 + .../Objects/Consumable/Food/shawerma.yml | 4 ++ .../Objects/Consumable/Food/snacks.yml | 9 +++- .../Objects/Consumable/Food/vulpix.yml | 6 ++- Resources/Prototypes/Body/Organs/moth.yml | 4 +- .../Prototypes/Body/Organs/reptilian.yml | 3 +- .../Entities/Objects/Consumable/Food/soup.yml | 6 ++- .../Objects/Consumable/Food/Baked/bread.yml | 52 ++++++++++++++++++- .../Objects/Consumable/Food/Baked/misc.yml | 6 +++ .../Objects/Consumable/Food/burger.yml | 4 +- .../Objects/Consumable/Food/ingredients.yml | 12 +++++ Resources/Prototypes/tags.yml | 6 +++ 20 files changed, 153 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index e3f8f0dcb5b..4ad14317c95 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1409,3 +1409,10 @@ Entries: - {message: "Пистолет киборга СБ можно персонализировать.", type: Add} id: 55702 #костыль отображения в Обновлениях time: '2024-03-08T08:20:00.0000000+00:00' + +- author: Петр Игнатьевич + changes: + - {message: "Унатхи и фелиниды теперь могут есть все виды шаурмы, хачапури, гипоаллергенный шоколад и некоторые типы наших мясных блюд, которые ранее им были недоступны", type: Tweak} + - {message: "Нианы теперь могут есть хлеб, тофу, сыр, гипоаллергенный шоколад, круассаны и вафли", type: Tweak} + id: 55703 #костыль отображения в Обновлениях + time: '2024-03-09T08:20:00.0000000+00:00' diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/croissant.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/croissant.yml index eb18c035762..c5863c01be9 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/croissant.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/croissant.yml @@ -20,6 +20,9 @@ Quantity: 8 - ReagentId: Vitamin Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: croissant-choco-name @@ -43,6 +46,9 @@ Quantity: 12 - ReagentId: Vitamin Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: croissant-cheese-name @@ -66,6 +72,9 @@ Quantity: 10 - ReagentId: Vitamin Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: hot-dog-name @@ -94,5 +103,8 @@ Quantity: 1 - ReagentId: Protein Quantity: 3 + - type: Tag + tags: + - ADTCarnivoreFriendlyFood diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/fried_egg.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/fried_egg.yml index e20e2ff05c6..65a420cbb94 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/fried_egg.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/fried_egg.yml @@ -24,3 +24,6 @@ Quantity: 2 - ReagentId: Protein Quantity: 3 + - type: Tag + tags: + - ADTCarnivoreFriendlyFood diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml index 01c6308189e..4a4c53de385 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml @@ -23,4 +23,8 @@ - ReagentId: CocoaPowder Quantity: 1 - type: Extractable - grindableSolutionName: food \ No newline at end of file + grindableSolutionName: food + - type: Tag + tags: + - ADTCarnivoreFriendlyFood + - ADTMothFriendlyFood diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/khachapuri.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/khachapuri.yml index b5b4decc1f2..c946eae6817 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/khachapuri.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/khachapuri.yml @@ -20,3 +20,7 @@ Quantity: 10 - ReagentId: Vitamin Quantity: 1 + - type: Tag + tags: + - ADTCarnivoreFriendlyFood + - ADTMothFriendlyFood diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml index eec0dc2a66c..7c352c56244 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml @@ -254,6 +254,7 @@ - type: Tag tags: - Fish + - ADTCarnivoreFriendlyFood - type: Perishable rotAfter: 600 molsPerSecondPerUnitMass: 0 @@ -297,6 +298,7 @@ - Raw - Cutlet - Fish + - ADTCarnivoreFriendlyFood - type: Sprite sprite: ADT/Objects/Consumable/Food/fish.rsi state: fishcutlet @@ -327,6 +329,7 @@ tags: - Cooked - Fish + - ADTCarnivoreFriendlyFood - type: Sprite sprite: ADT/Objects/Consumable/Food/fish.rsi layers: @@ -359,6 +362,7 @@ - Cooked - Cutlet - Fish + - ADTCarnivoreFriendlyFood - type: Sprite sprite: ADT/Objects/Consumable/Food/fish.rsi state: fishcutletcooked diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/oktoberfest.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/oktoberfest.yml index 92cb4dac1a6..c5baac29a64 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/oktoberfest.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/oktoberfest.yml @@ -8,6 +8,7 @@ - type: Tag tags: - Cooked + - ADTCarnivoreFriendlyFood - type: Sprite sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайт от Празата state: weisswurst @@ -36,6 +37,7 @@ - type: Tag tags: - Cooked + - ADTCarnivoreFriendlyFood - type: Sprite sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайт от Празата state: bratwurst @@ -78,6 +80,9 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: brezel with poppy seeds @@ -104,6 +109,9 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: brezel with salt @@ -130,6 +138,9 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: brezel with chocolate diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sashimisafe.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sashimisafe.yml index 5ae882a8e21..516d771f849 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sashimisafe.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sashimisafe.yml @@ -20,3 +20,4 @@ - type: Tag tags: - Fish + - ADTCarnivoreFriendlyFood diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sausage.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sausage.yml index 48e8ca0e06b..430a1e03ca4 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sausage.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sausage.yml @@ -7,6 +7,7 @@ - type: Tag tags: - Cooked + - ADTCarnivoreFriendlyFood - type: Sprite sprite: ADT/Objects/Consumable/Food/sausage.rsi state: raw @@ -32,6 +33,7 @@ - type: Tag tags: - Cooked + - ADTCarnivoreFriendlyFood - type: Sprite sprite: ADT/Objects/Consumable/Food/sausage.rsi state: fried diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/shawerma.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/shawerma.yml index ba98bad5d9e..11ab551050a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/shawerma.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/shawerma.yml @@ -25,6 +25,10 @@ Quantity: 3 - type: Item sprite: ADT/Objects/Consumable/Food/shawerma.rsi + - type: Tag + tags: + - Cooked + - ADTCarnivoreFriendlyFood - type: entity name: shawerma-default-name diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml index 5b294ac68f4..bde145214ee 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml @@ -35,6 +35,9 @@ state: shrimp - type: Food trash: ADTFoodPacketChipsShrimpTrash + - type: Tag + tags: + - ADTCarnivoreFriendlyFood - type: entity name: chips @@ -82,6 +85,10 @@ - type: Item - type: Food trash: ADTFoodPacketBeefTrash + - type: Tag + tags: + - Cooked + - ADTCarnivoreFriendlyFood # Я однако не знаю какое им делать наполнение,по дефолту у них 10 питательных веществ, если нужно то заполните в base свои значения - type: entity @@ -230,4 +237,4 @@ description: This is rubbish. components: - type: Sprite - state: pig-trash \ No newline at end of file + state: pig-trash diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/vulpix.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/vulpix.yml index f2e8a49bbe6..861bcde20a3 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/vulpix.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/vulpix.yml @@ -20,4 +20,8 @@ - ReagentId: Nutriment Quantity: 5 - ReagentId: Vitamin - Quantity: 3 \ No newline at end of file + Quantity: 3 + - type: Tag + tags: + - Cooked + - ADTCarnivoreFriendlyFood diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml index 6ab9bbbc649..e2b905fdc92 100644 --- a/Resources/Prototypes/Body/Organs/moth.yml +++ b/Resources/Prototypes/Body/Organs/moth.yml @@ -9,8 +9,8 @@ - ClothMade - Paper - Fruit - # - Meat - Pill + - ADTMothFriendlyFood - type: SolutionContainerManager solutions: stomach: @@ -38,4 +38,4 @@ groups: - id: Medicine - id: Poison - - id: Narcotic \ No newline at end of file + - id: Narcotic diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml index f50a2131217..50c4b87bf18 100644 --- a/Resources/Prototypes/Body/Organs/reptilian.yml +++ b/Resources/Prototypes/Body/Organs/reptilian.yml @@ -11,6 +11,7 @@ - Pill - Crayon - Paper + - ADTCarnivoreFriendlyFood - type: SolutionContainerManager solutions: stomach: @@ -31,4 +32,4 @@ groups: - id: Medicine - id: Poison - - id: Narcotic \ No newline at end of file + - id: Narcotic diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml index 71ce47dd2f3..98061526275 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: pelmeni parent: FoodBowlBase id: FoodPelmeniBowl @@ -21,3 +21,7 @@ Quantity: 10 - ReagentId: Protein Quantity: 20 + - type: Tag + tags: + - Soup + - ADTCarnivoreFriendlyFood diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 56bcfff306b..200b527157d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -60,6 +60,10 @@ color: "#FF613F" - type: SliceableFood slice: FoodBreadVolcanicSlice + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread - type: entity name: volcanic slice @@ -74,6 +78,10 @@ color: "#281415" - state: alpha-slice-filling color: "#FF613F" + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread # Bread @@ -140,6 +148,10 @@ reagents: - ReagentId: Nutriment Quantity: 15 + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread # Tastes like bread, banana, nut. - type: entity @@ -163,6 +175,10 @@ reagents: - ReagentId: Nutriment Quantity: 3 + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread - type: entity name: cream cheese bread @@ -190,6 +206,10 @@ Quantity: 20 - ReagentId: Vitamin Quantity: 5 + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread # Tastes like bread, cheese. - type: entity @@ -216,6 +236,10 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 1.2 + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread - type: entity name: meat bread @@ -346,6 +370,10 @@ - state: plain - type: SliceableFood slice: FoodBreadPlainSlice + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread - type: entity name: bread slice @@ -357,6 +385,10 @@ - type: Sprite layers: - state: plain-slice + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread - type: entity name: sausage bread @@ -502,6 +534,10 @@ Quantity: 30 - ReagentId: Protein Quantity: 12 + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread # Tastes like bread, tofu. - type: entity @@ -527,6 +563,10 @@ Quantity: 6 - ReagentId: Vitamin Quantity: 2.4 + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread - type: entity name: xeno meat bread @@ -597,6 +637,8 @@ - type: Tag tags: - Baguette + - ADTMothFriendlyFood + - Bread - type: Sprite state: baguette - type: SliceableFood @@ -638,6 +680,10 @@ Quantity: 0.1 - ReagentId: Blackpepper Quantity: 0.1 + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread - type: entity name: buttered toast @@ -707,6 +753,10 @@ Quantity: 6 - ReagentId: Vitamin Quantity: 5 + - type: Tag + tags: + - ADTMothFriendlyFood + - Bread # Tastes like garlic, Italy. - type: entity @@ -834,4 +884,4 @@ hidden: true damage: groups: - Brute: 1 \ No newline at end of file + Brute: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index b1bbdfb5305..bd8664260ae 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -349,6 +349,9 @@ Quantity: 8 - ReagentId: Vitamin Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: soy waffles @@ -456,6 +459,9 @@ Quantity: 8 - ReagentId: Protein Quantity: 2 + - type: Tag + tags: + - ADTCarnivoreFriendlyFood - type: entity name: chèvre chaud diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 22e6fce8e14..75a22bf5cd5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -858,6 +858,9 @@ Quantity: 6 - ReagentId: Vitamin Quantity: 3 + - type: Tag + tags: + - ADTMothFriendlyFood # Tastes like bun, tofu. - type: entity @@ -919,4 +922,3 @@ - type: Tag tags: - Meat - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 6cca08d0087..1c3164d0d3d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -484,6 +484,9 @@ - type: SliceableFood count: 3 slice: FoodCheeseSlice + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: cheese wedge @@ -503,6 +506,9 @@ reagents: - ReagentId: Nutriment Quantity: 5 + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: chèvre log @@ -574,6 +580,9 @@ - type: SliceableFood count: 3 slice: FoodTofuSlice + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: tofu slice @@ -595,6 +604,9 @@ Quantity: 3 - ReagentId: Nutriment Quantity: 2 + - type: Tag + tags: + - ADTMothFriendlyFood - type: entity name: burned mess diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index febef8203e6..fcde06364b5 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1233,3 +1233,9 @@ - type: Tag id: ADTNanoTrasen + +- type: Tag + id: ADTMothFriendlyFood + +- type: Tag + id: ADTCarnivoreFriendlyFood