diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index ee1376b4a3..aa52bb844e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index ba60767bd4..8dee0d882f 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 7d6a12d929..e12db465c5 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -8,4 +8,15 @@ contents: - id: FoodBoxPizzaFilled amount: 4 - - id: KnifePlastic \ No newline at end of file + - 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 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index f6c8957015..2200879bc5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index b104531003..b90a79bf2f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 739f49a8c7..fd7994f563 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 58f5922e33..d41a3a6531 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -376,6 +376,7 @@ - LivestockDuck - LivestockGoat - FoodPizza + - FoodMRE - ServiceJanitorial - ServiceLightsReplacement - ServiceSmokeables diff --git a/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon.png new file mode 100644 index 0000000000..8f727cf36f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json new file mode 100644 index 0000000000..ceb7ea2651 --- /dev/null +++ b/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"}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json index 32becb77d6..5bc79c8af0 100644 --- a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json +++ b/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 diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/mre-brownie-open.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/mre-brownie-open.png new file mode 100644 index 0000000000..d9ab5a5ca8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/mre-brownie-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/mre-brownie.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/mre-brownie.png new file mode 100644 index 0000000000..1cf36f0ba6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/mre-brownie.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/mre-wrapper.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/mre-wrapper.png new file mode 100644 index 0000000000..23cad8402c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/mre-wrapper.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/nutribrick-open.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/nutribrick-open.png new file mode 100644 index 0000000000..7a1f8a108a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/nutribrick-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/nutribrick.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/nutribrick.png new file mode 100644 index 0000000000..bb36d9b3d7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/nutribrick.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png new file mode 100644 index 0000000000..4ddd8ac4fb Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index ed17556473..7e8465ab1f 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -55,6 +55,9 @@ { "name": "box_security" }, + { + "name": "box_olive" + }, { "name": "circuit" },