Add utensil box, add muffin tins to Kitchen Dinnerware Crate (#36948)

* Adds muffin tins to dinnerware crate

* removed forks and spoons

* Added utensile box, added utensile box to dinnerware crate

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 478aea4cc04de4ee62d78574690ad3979dfefe35..257dd2ea5e9b87e024eb614e931b8baf251bfb7c 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -477,3 +477,20 @@
     contents:
       - id: Envelope
         amount: 9
+
+- type: entity
+  name: utensil box
+  parent: BoxCardboard
+  id: BoxUtensil
+  description: A box filled with forks and spoons.
+  components:
+  - type: Sprite
+    layers:
+      - state: box
+      - state: utensils
+  - type: StorageFill
+    contents:
+      - id: Fork
+        amount: 2
+      - id: Spoon
+        amount: 2

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
index 23d1b2f795443998d1b26dae0bc8dc04cb734630..54e94c6ca538866c88aea0e5985790051b68207b 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
@@ -84,12 +84,12 @@
       amount: 1
     - id: DrinkGlass
       amount: 4
+    - id: FoodPlateMuffinTin
+      amount: 4
     - id: FoodPlateTin
       amount: 4
-    - id: Fork
-      amount: 2
-    - id: Spoon
-      amount: 2
+    - id: BoxUtensil
+      amount: 1
 
 - type: entity
   id: CrateFoodBarSupply

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index dbe80371d48f5b2a3361eda0497f3ec9e0ee96a8..ea483851b7d7ddb77d578d53e83971e17c4d60db 100644 (file)
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github).",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github). utensils by gentleman-bird (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -151,6 +151,9 @@
         {
             "name": "trashbag"
         },
+        {
+            "name": "utensils"
+        },
         {
             "name": "writing"
         },
@@ -200,7 +203,7 @@
         {
             "name": "france"
         },
-               {
+        {
             "name": "agrichemkit"
         }
     ]

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/utensils.png b/Resources/Textures/Objects/Storage/boxes.rsi/utensils.png
new file mode 100644 (file)
index 0000000..60bdbbe
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/utensils.png differ