From 3e9af2ef4cd032a8ff027408f6873d70f3fd2d1b Mon Sep 17 00:00:00 2001 From: Gentleman-Bird Date: Mon, 12 May 2025 13:52:04 -0400 Subject: [PATCH] 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 --- .../Prototypes/Catalog/Fills/Boxes/general.yml | 17 +++++++++++++++++ .../Prototypes/Catalog/Fills/Crates/food.yml | 8 ++++---- .../Objects/Storage/boxes.rsi/meta.json | 7 +++++-- .../Objects/Storage/boxes.rsi/utensils.png | Bin 0 -> 157 bytes 4 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/utensils.png diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 478aea4cc0..257dd2ea5e 100644 --- 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 23d1b2f795..54e94c6ca5 100644 --- 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 dbe80371d4..ea483851b7 100644 --- 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 index 0000000000000000000000000000000000000000..60bdbbe1fe6de78e26804dbb83541357e6c60846 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R};hrvzArY-_ zFB)