AdventureTimeSS14 · PyotrIgn · Mar 9, 2024 · Mar 8, 2024 · Mar 8, 2024
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -1415,7 +1415,7 @@ Entries:
   - {message: "Пистолет киборга СБ можно персонализировать.", type: Add}
   id: 55702 #костыль отображения в Обновлениях
   time: '2024-03-08T08:20:00.0000000+00:00'
-
+  
 - author: Котя
   changes:
   - {message: "Добавлена способность жала ослепления генокраду.", type: Add}
@@ -1427,3 +1427,10 @@ Entries:
   - {message: "Максимальное количество сохранённых ДНК генокрада теперь - 7. Для поглощения новых ДНК при достижении лимита придётся очистить старые.", type: Tweak}
   id: 55703 #костыль отображения в Обновлениях
   time: '2024-03-02T14:14:00.0000000+00:00'
+
+- author: Петр Игнатьевич
+  changes:
+  - {message: "Унатхи и фелиниды теперь могут есть все виды шаурмы, хачапури, гипоаллергенный шоколад и некоторые типы наших мясных блюд, которые ранее им были недоступны", type: Tweak}
+  - {message: "Нианы теперь могут есть хлеб, тофу, сыр, гипоаллергенный шоколад, круассаны и вафли", type: Tweak}
+  id: 55704 #костыль отображения в Обновлениях
+  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
@@ -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
@@ -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
@@ -23,4 +23,8 @@
         - ReagentId: CocoaPowder
           Quantity: 1
   - type: Extractable
-    grindableSolutionName: food
+    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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+    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
@@ -20,4 +20,8 @@
         - ReagentId: Nutriment
           Quantity: 5
         - ReagentId: Vitamin
-          Quantity: 3
+          Quantity: 3
+  - type: Tag
+    tags:
+    - Cooked
+    - ADTCarnivoreFriendlyFood
diff --git 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
+    - id: Narcotic
diff --git 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
+    - id: Narcotic
diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,3 +20,4 @@ @@
       - type: Tag
         tags:
         - Fish
+        - ADTCarnivoreFriendlyFood