From 97460ac0f90343b3a128e61613cd3332cd465aff Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Sat, 21 Dec 2024 16:45:12 -0600 Subject: [PATCH 1/3] Ported --- .../VendingMachines/Inventories/chefvend.yml | 3 + .../Objects/Consumable/Food/ingredients.yml | 53 ++++++++++++++++++ .../Food/ingredients.rsi/cocoa-chip-big.png | Bin 0 -> 448 bytes .../Consumable/Food/ingredients.rsi/meta.json | 20 +++++++ .../Food/ingredients.rsi/pepper-big.png | Bin 0 -> 508 bytes .../Food/ingredients.rsi/salt-big.png | Bin 0 -> 569 bytes 6 files changed, 76 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/ingredients.yml create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/cocoa-chip-big.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/pepper-big.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Food/ingredients.rsi/salt-big.png 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/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 0000000000000000000000000000000000000000..791c9a3dca893fb1220d05a11365c3c37af066cb GIT binary patch literal 448 zcmV;x0YCnUP)Px$U`a$lR9J=Wm7#0HKorKmjhF_mgNltp#h6@8MMUfZwG(5mFc}w!sI97>+@#v%TckT)`?P`l1%wI55AgbUSF3gW>J|NqR=2?Mmv~<-005TjmDc3(WH{^Q z7O1dX4LZ{Dc^;7|)1Xj=_Q#X{8e%l?gWUG9uY8j(99xosAWG|{FVYcv|oFL}X{oNZj7 qSpWb44rN$LW=%~1DgXcg2mk;800000(o>TF0000Px$oJmAMR9J=Wl|f4aK@`V-MnNQd@TQ-@ix3MH_yJPvm_*+|7V;Z(2!g&rhao8H z=wUks(rqt6mo9dQLXaXC3Op=o;9)xC>b6?Wu2vBHgN2#p&3pg%=FJR5L`3{Cu`r9O z)l2FBm(Q<<@};~;2qBZn6acridjM8emp|EbyB%!1iD4MZe&_%oSDMEq;s y0Y(RvsXgP7CjbBd4rN$LW=%~1DgXcg2mk;800000(o>TF0000=G`P)Px$*-1n}R9J=WmBDHgQ51&1!h{KeymJxhzP02mB<0Q66`v~p)MFpabZv|5l% zd=a5PubU>jfy)T}c|N?UU5$a$;W02;h5hz2Z&#lJP`$mwNB>7^acu*avEN?i-lIdl zeC_gj?M7@^2dzOdlq1*FbpT4GIX>^UP5HGklp}_6#4=s6OjkM^8&a|BQnBmtvt_zss#~Ip zHBrUdY;QtCIRX&P0sNYUBvA`a&W->Wo*&MB29o8C1P6oOgm@aX46Lp_n`&ZQyimyW zXP%Ddc@oV+avm(xjr(pWM?BBd{{;TV#JGX1;;C!ZYPF Date: Mon, 23 Dec 2024 13:28:18 -0600 Subject: [PATCH 2/3] spawners --- .../Markers/Spawners/Random/Food_Drinks/food_ingredients.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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..2608c064236 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 - !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 From 52cf7906ff308e48ea5c0ef7d2fe73424db71ffe Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Fri, 3 Jan 2025 13:05:34 -0600 Subject: [PATCH 3/3] Update food_ingredients.yml Signed-off-by: Stop-Signs --- .../Markers/Spawners/Random/Food_Drinks/food_ingredients.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2608c064236..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 @@ -37,7 +37,7 @@ - id: FoodCondimentBottleEnzyme - id: DrinkSodaWaterBottleFull - id: ReagentContainerSalt # DeltaV - Replaced salt and pepper shakers with bulk versions - - id: ReagentContainerPepper + - id: ReagentContainerPepper # DeltaV - Replaced salt and pepper shakers with bulk versions - !type:GroupSelector children: - id: ReagentContainerFlour