From 85da2351c811f794709e89b9b3947b095f353d03 Mon Sep 17 00:00:00 2001 From: pathetic meowmeow Date: Wed, 22 Jan 2025 18:54:03 -0500 Subject: [PATCH] Give the chef access to cloth boxes (#34403) * Give the chef access to fiber bags * Update Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Prototypes/Catalog/Fills/Crates/food.yml | 2 ++ .../Catalog/Fills/Lockers/service.yml | 2 ++ .../Random/Food_Drinks/food_ingredients.yml | 1 + .../Consumable/Food/Containers/box.yml | 22 ++++++++++++++++++ .../Food/ingredients.rsi/cloth-box.png | Bin 0 -> 491 bytes .../Consumable/Food/ingredients.rsi/meta.json | 5 +++- 6 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cloth-box.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index cbce467cf7..5e1834316f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -49,6 +49,8 @@ amount: 3 - id: ReagentContainerRice amount: 3 + - id: FoodBoxCloth + amount: 1 - id: DrinkMilkCarton amount: 4 - id: DrinkSoyMilkCarton diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 6d0577a16e..2d564e0eb0 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -41,6 +41,8 @@ - id: SprayBottleWater - id: ReagentContainerFlour amount: 2 + - id: FoodBoxCloth + amount: 1 - id: ReagentContainerSugar - id: FoodCondimentPacketSalt amount: 3 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 846e058c9e..0373b18388 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 @@ -41,6 +41,7 @@ - !type:GroupSelector children: - id: ReagentContainerFlour + - id: FoodBoxCloth - id: ReagentContainerCornmeal - id: ReagentContainerRice - id: ReagentContainerSugar diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index f613cddaaf..236cf6f27f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -769,3 +769,25 @@ - id: GoldenBikeHorn prob: 0.1 orGroup: GiftPool + +- type: entity + parent: BoxCardboard + id: FoodBoxCloth + name: box of FlutterSoft-brand cloth + description: Fiber is the most important moth meal of the day! Don't skip it or use bottom-of-the-locker junk, buy high-quality FlutterSoft-brand cloth instead. + components: + - type: Sprite + sprite: Objects/Consumable/Food/ingredients.rsi + state: cloth-box + - type: Storage + grid: + - 0,0,1,1 + maxItemSize: Normal + whitelist: + tags: + - ClothMade + - type: Item + size: Normal + - type: StorageFill + contents: + - id: MaterialCloth10 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cloth-box.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cloth-box.png new file mode 100644 index 0000000000000000000000000000000000000000..6bdb547078ffadd9f46f132998b81f81b59257d8 GIT binary patch literal 491 zcmVPx$rAb6VR9J=WmA^|uQ545NMUav$f>#F-BIpssTcRn#AuJFYYHSI?e?f2w9<&5) z&5=aV+R)e(5d>{6Q4q+} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index dd802fb59f..2e8d13abd4 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska", + "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska, cloth-box by Janet Blackquill 2024", "size": { "x": 32, "y": 32 @@ -132,6 +132,9 @@ }, { "name": "croissant-raw-cotton" + }, + { + "name": "cloth-box" } ] } -- 2.51.2