From: Aexxie Date: Thu, 29 Feb 2024 21:39:52 +0000 (-0600) Subject: survival nutribricks, lizzers can eat nutribricks, moffs can eat the leftovers (... X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e4d98f1ab94d08f7db457b538e857c0732ab0c0d;p=space-station-14.git survival nutribricks, lizzers can eat nutribricks, moffs can eat the leftovers (#25659) * I forgot to commit, damn it * Adds the brick to survival kit --- diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml index 993f90e1c6..f8423582cc 100644 --- a/Resources/Prototypes/Body/Organs/reptilian.yml +++ b/Resources/Prototypes/Body/Organs/reptilian.yml @@ -7,6 +7,7 @@ specialDigestible: tags: - Fruit + - ReptilianFood - Meat - Pill - Crayon diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index 68fe54d857..4812b890a2 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -10,7 +10,7 @@ - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodTinMRE + - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 27f2bdbce2..a234d23b5e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -383,6 +383,9 @@ - nutribrick - type: Item size: Small + - type: Tag + tags: + - ReptilianFood - type: Sprite state: nutribrick-open - type: Food @@ -608,5 +611,17 @@ name: MRE wrapper description: A general purpose wrapper for a variety of military food goods. components: + - type: Food + requiresSpecialDigestion: true + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Fiber + Quantity: 40 + - type: Tag + tags: + - ClothMade - type: Sprite state: mre-wrapper diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index ec5a1aa2a6..f8ae8f4c5e 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -261,16 +261,16 @@ - type: Tag id: CarpetOrange - + - type: Tag id: CarpetPurple - type: Tag id: CarpetPink - + - type: Tag id: CarpetRed - + - type: Tag id: CarpetWhite @@ -992,6 +992,9 @@ - type: Tag id: ReinforcedGlassShard +- type: Tag + id: ReptilianFood + - type: Tag id: RifleStock