diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 7343233b6b9..cfdf146d9db 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -21,3 +21,6 @@ FoodCheese: 1 FoodMeat: 6 LunchboxGenericFilledRandom: 5 # Delta-V Adds Lunchbox + ReagentContainerSalt: 1 # DeltaV adds big containers + ReagentContainerPepper: 1 # DeltaV adds big containers + ReagentContainerChocolate: 1 # DeltaV adds big containers diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/ingredients.yml new file mode 100644 index 00000000000..936daf952f0 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/ingredients.yml @@ -0,0 +1,53 @@ +- type: entity + parent: ReagentPacketBase + id: ReagentContainerSalt + name: salt container + description: A big container of salt. Good for cooking! + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Food/ingredients.rsi + state: salt-big + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: TableSalt + Quantity: 50 + - type: Drink + solution: food + useSound: + path: /Audio/Items/eating_1.ogg + +- type: entity + parent: ReagentPacketBase + id: ReagentContainerPepper + name: pepper container + description: A big container of pepper. Good for cooking! + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Food/ingredients.rsi + state: pepper-big + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: Blackpepper + Quantity: 50 + +- type: entity + parent: ReagentPacketBase + id: ReagentContainerChocolate + name: cocoa powder bag + description: A big bag of cocoa powder. Good for cooking! + components: + - type: Sprite + sprite: DeltaV/Objects/Consumable/Food/ingredients.rsi + state: cocoa-chip-big + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: CocoaPowder + Quantity: 50 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml index 846e058c9e8..2580120ecc7 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml @@ -36,8 +36,8 @@ - id: FoodContainerEgg - id: FoodCondimentBottleEnzyme - id: DrinkSodaWaterBottleFull - - id: FoodShakerSalt - - id: FoodShakerPepper + - id: ReagentContainerSalt # DeltaV - Replaced salt and pepper shakers with bulk versions + - id: ReagentContainerPepper # DeltaV - Replaced salt and pepper shakers with bulk versions - !type:GroupSelector children: - id: ReagentContainerFlour @@ -50,6 +50,7 @@ - id: ReagentContainerCornmealSmall - id: ReagentContainerRiceSmall - id: ReagentContainerSugarSmall + - id: ReagentContainerChocolate # DeltaV - Adds bulk chocolate container - !type:GroupSelector children: - id: DrinkMilkCarton diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/cocoa-chip-big.png b/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/cocoa-chip-big.png new file mode 100644 index 00000000000..791c9a3dca8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/cocoa-chip-big.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/meta.json new file mode 100644 index 00000000000..6da8cf542c6 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Frontier - ghostprince & gentlebutter", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "salt-big" + }, + { + "name": "pepper-big" + }, + { + "name": "cocoa-chip-big" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/pepper-big.png b/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/pepper-big.png new file mode 100644 index 00000000000..4f7d0c58339 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/pepper-big.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/salt-big.png b/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/salt-big.png new file mode 100644 index 00000000000..9a53760e147 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/salt-big.png differ