pizza and pizza box tweaks (#31171)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
index 2e750ed45008216c7e1a5ebc1ac06e8f9f310e10..527c2595dd95d3a90dffc86785aed70c82f08aab 100644 (file)
--- 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 20b03fcb67a61865e12f9e15033e9ce66932b20f..652c60722d99f9754a9c1006005de95417b94b72 100644 (file)
--- 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 9890023c3b842fa8c40ed8ea00fbacee6abc4655..66189b1dd3621c6618d57417929bd87ce46ab386 100644 (file)
--- 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