survival nutribricks, lizzers can eat nutribricks, moffs can eat the leftovers (...

* 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 993f90e1c6db33a11db7034037a7914df4e470d0..f8423582cc286803ed6a529fc0989931b1141dea 100644 (file)
--- 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 68fe54d857ca05ea48a4b0da49e706f4d4e657bd..4812b890a2d8f6fb6bf28f804f069f34922cc4a2 100644 (file)
--- 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 27f2bdbce2ccf4f7e864868cd6456d2301ccf41c..a234d23b5ef29c85aa5b327539cc38a7c3294c27 100644 (file)
--- 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 ec5a1aa2a6860bb4335401af2dc191b09f872974..f8ae8f4c5ec9f4af8900955fa71553c1ffc11afa 100644 (file)
--- 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