From d0bd26d575a1d5f07467d8381de4e7eebd982124 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 18 Aug 2024 23:55:41 +0200 Subject: [PATCH] pizza and pizza box tweaks (#31171) --- Resources/Prototypes/Catalog/Fills/Crates/food.yml | 3 --- .../Entities/Objects/Consumable/Food/Baked/pizza.yml | 2 ++ .../Objects/Consumable/Food/Containers/box.yml | 10 ++++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 2e750ed450..527c2595dd 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -8,7 +8,6 @@ contents: - id: FoodBoxPizzaFilled amount: 4 - - id: KnifePlastic - id: LidSalami prob: 0.01 @@ -22,8 +21,6 @@ contents: - id: FoodBoxPizzaFilled amount: 16 - - id: KnifePlastic - amount: 4 - id: LidSalami prob: 0.04 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 20b03fcb67..652c60722d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -26,6 +26,8 @@ count: 8 - type: Item size: Normal + shape: + - 0,0,2,1 - type: Tag tags: - Pizza diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 9890023c3b..66189b1dd3 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -209,13 +209,18 @@ # TODO make these entitystorage again + placeablesurface after entity storage ECS gets merged. - type: Storage grid: - - 0,0,1,1 + - 0,0,3,1 maxItemSize: Normal + whitelist: + components: + - Utensil + tags: + - Pizza - type: Item sprite: Objects/Consumable/Food/Baked/pizza.rsi heldPrefix: box shape: - - 0,0,1,1 + - 0,0,2,1 - type: Appearance - type: EntityStorageVisuals stateDoorOpen: box-open @@ -263,6 +268,7 @@ - id: FoodPizzaDonkpocket prob: 0.10 orGroup: Pizza + - id: KnifePlastic # Nugget -- 2.52.0