MRE boxes (#7726)

Resources/Prototypes/Catalog/Cargo/cargo_food.yml

@@ -9,3 +9,15 @@
   cost: 1000
   category: Food
   group: market
+
+- type: cargoProduct
+  name: "MRE crate"
+  id: FoodMRE
+  description: A military style meal fit to feed a whole department.
+  icon:
+    sprite: Objects/Consumable/Food/snacks.rsi
+    state: nutribrick
+  product: CrateFoodMRE
+  cost: 4000
+  category: Food
+  group: market

Resources/Prototypes/Catalog/Fills/Boxes/general.yml

@@ -134,6 +134,58 @@
       - state: box
       - state: meson
 
+- type: entity
+  name: survival box
+  parent: BoxCardboard
+  id: BoxSurvival
+  description: It's a box with basic internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskBreath
+      - id: EmergencyOxygenTankFilled
+      - id: EmergencyMedipen
+      - id: Flare
+      - id: FoodSnackChocolate
+  - type: Sprite
+    layers:
+      - state: box
+      - state: writing
+
+- type: entity
+  name: M.R.E.
+  parent: BoxCardboard
+  id: BoxMRE
+  description: A box of decades old military surplus rations. It is surprisingly not rotten.
+  components:
+  - type: StorageFill
+    contents:
+      - id: DrinkMREFlask
+      - id: FoodSnackNutribrick
+      - id: FoodSnackMREBrownie
+      - id: FoodCondimentPacketKetchup
+  - type: Sprite
+    layers:
+      - state: box_olive
+      - state: writing
+
+- type: entity
+  name: box of hugs
+  parent: BoxCardboard
+  id: BoxHug
+  description: A special box for sensitive people.
+  components:
+  - type: Sprite
+    layers:
+      - state: box_hug
+      - state: heart
+  - type: Item
+    HeldPrefix: hug
+  - type: StorageFill
+    contents:
+      - id: Brutepack
+        amount: 6
+
 - type: entity
   name: inflatable wall box
   parent: BoxCardboard

Resources/Prototypes/Catalog/Fills/Crates/food.yml

@@ -8,4 +8,15 @@
     contents:
     - id: FoodBoxPizzaFilled
       amount: 4
-    - id: KnifePlastic
+    - id: KnifePlastic
+
+- type: entity
+  id: CrateFoodMRE
+  name: MRE crate
+  description: A military style meal fit to feed a whole department.
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxMRE
+      amount: 6

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -24,6 +24,8 @@
         prob: 0.2
       - id: FlareGun
         prob: 0.05
+      - id: BoxMRE
+        prob: 0.1
         
 - type: entity
   id: ClosetFireFilled

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml

@@ -8,6 +8,22 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shinyflask.rsi
 
+- type: entity
+  parent: DrinkBase
+  id: DrinkMREFlask
+  name: MRE flask
+  description: An old military flask, filled with the finest contents for soldiers
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/mreflask.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Water
+          Quantity: 50
+
 - type: entity
   parent: DrinkBase
   id: DrinkDetFlask

Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

@@ -190,6 +190,74 @@
   - type: Food
     trash: FoodPacketSyndiTrash
 
+- type: entity
+  name: nutribrick
+  parent: FoodSnackBase
+  id: FoodSnackNutribrick
+  description: A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit.
+  components:
+  - type: Item
+    size: 10
+  - type: Sprite
+    state: nutribrick
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodPacketMRETrash
+      - id: FoodSnackNutribrickOpen
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 25
+
+- type: entity
+  name: nutribrick
+  parent: FoodSnackNutribrick
+  id: FoodSnackNutribrickOpen
+  components:
+  - type: Sprite
+    state: nutribrick-open
+  - type: Food
+
+- type: entity
+  name: brownie
+  parent: FoodSnackBase
+  id: FoodSnackMREBrownie
+  description: A precisely mixed brownie, made to withstand blunt trauma and harsh conditions. Tastes like shit.
+  components:
+  - type: Item
+    size: 10
+  - type: Sprite
+    state: mre-brownie
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodPacketMRETrash
+      - id: FoodSnackMREBrownieOpen
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+        - ReagentId: Theobromine
+          Quantity: 3
+
+- type: entity
+  name: brownie
+  parent: FoodSnackMREBrownie
+  id: FoodSnackMREBrownieOpen
+  components:
+  - type: Sprite
+    state: mre-brownie-open
+  - type: Food
+
 # Trash
 
 - type: entity
@@ -330,3 +398,13 @@
     state: syndicakes-trash
   - type: Item
     color: white
+
+- type: entity
+  noSpawn: true
+  parent: FoodPacketTrash
+  id: FoodPacketMRETrash
+  name: MRE wrapper
+  description: A general purpose wrapper for a variety of military food goods.
+  components:
+  - type: Sprite
+    state: mre-wrapper

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -376,6 +376,7 @@
       - LivestockDuck
       - LivestockGoat
       - FoodPizza
+      - FoodMRE
       - ServiceJanitorial
       - ServiceLightsReplacement
       - ServiceSmokeables

Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json

@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Created by EmoGarbage", "states": [{"name": "icon"}]}

Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json

@@ -60,6 +60,21 @@
     {
       "name": "energybar-trash"
     },
+    {
+      "name": "mre-brownie"
+    },
+    {
+      "name": "mre-brownie-open"
+    },
+    {
+      "name": "mre-wrapper"
+    },
+    {
+      "name": "nutribrick"
+    },
+    {
+      "name": "nutribrick-open"
+    },
     {
       "name": "packet-inhand-right",
       "directions": 4

Resources/Textures/Objects/Storage/boxes.rsi/meta.json

@@ -55,6 +55,9 @@
         {
             "name": "box_security"
         },
+        {
+            "name": "box_olive"
+        },
         {
             "name": "circuit"
         },