]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Give the chef access to cloth boxes (#34403)
authorpathetic meowmeow <uhhadd@gmail.com>
Wed, 22 Jan 2025 23:54:03 +0000 (18:54 -0500)
committerGitHub <noreply@github.com>
Wed, 22 Jan 2025 23:54:03 +0000 (00:54 +0100)
* 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>
Resources/Prototypes/Catalog/Fills/Crates/food.yml
Resources/Prototypes/Catalog/Fills/Lockers/service.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cloth-box.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json

index cbce467cf71a1794fd417406505e46e263a7a7d3..5e1834316fe71a3d248b9d568a7737586f31922d 100644 (file)
@@ -49,6 +49,8 @@
       amount: 3
     - id: ReagentContainerRice
       amount: 3
+    - id: FoodBoxCloth
+      amount: 1
     - id: DrinkMilkCarton
       amount: 4
     - id: DrinkSoyMilkCarton
index 6d0577a16eb00212529bc4987a02b81fa50e85ab..2d564e0eb0d284043aacf2918e90ee262e3b0fbb 100644 (file)
@@ -41,6 +41,8 @@
       - id: SprayBottleWater
       - id: ReagentContainerFlour
         amount: 2
+      - id: FoodBoxCloth
+        amount: 1
       - id: ReagentContainerSugar
       - id: FoodCondimentPacketSalt
         amount: 3
index 846e058c9e858dc6bb1757a15ae7ee7dcda161c5..0373b183887b2a8f437449c62d8e0a9f5637e938 100644 (file)
@@ -41,6 +41,7 @@
       - !type:GroupSelector
         children:
         - id: ReagentContainerFlour
+        - id: FoodBoxCloth
         - id: ReagentContainerCornmeal
         - id: ReagentContainerRice
         - id: ReagentContainerSugar
index f613cddaafd82c8c006f7d902c8591689a08184e..236cf6f27f524d7c5c71c83202c80d64c31a51a2 100644 (file)
       - 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 (file)
index 0000000..6bdb547
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cloth-box.png differ
index dd802fb59fd741612b79e403b1c8102c83109c0c..2e8d13abd4c73aa06ae81a7de2fb4f90c562fef4 100644 (file)
@@ -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 <uhhadd@gmail.com> 2024",
   "size": {
     "x": 32,
     "y": 32
     },
     {
       "name": "croissant-raw-cotton"
+    },
+    {
+      "name": "cloth-box"
     }
   ]
 }