From 3b787a1f3d7ed0b7e2a4edda01bea4f5c9b5295a Mon Sep 17 00:00:00 2001 From: kosticia Date: Sun, 19 Jan 2025 12:52:20 +0300 Subject: [PATCH 1/3] Moth-pockets --- .../Consumable/Food/Baked/donkpocket.yml | 51 ++++++++++++++++++ .../Consumable/Food/Containers/box.yml | 14 +++++ .../Recipes/Cooking/meal_recipes.yml | 7 +++ .../Food/Baked/donkpocket.rsi/meta.json | 8 ++- .../Food/Baked/donkpocket.rsi/moth-box.png | Bin 0 -> 670 bytes .../Food/Baked/donkpocket.rsi/moth.png | Bin 0 -> 403 bytes 6 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth-box.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index c7e46d9a94a0..e1c4431bbab9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -386,3 +386,54 @@ Quantity: 1 - type: Sprite state: dink + +- type: entity + name: moth-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketMoth + description: Buzzy edition of donk-pocket that was created during mass protests ab-... Actually who cares? Just donk-pockets for moths. + components: + - type: FlavorProfile + flavors: + - cotton + - cheap + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Fiber + Quantity: 5 + - type: Sprite + state: moth + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - ClothMade + - DonkPocket + +- type: entity + name: warm moth-pocket + parent: FoodDonkpocketMoth + id: FoodDonkpocketMothWarm + components: + - type: FlavorProfile + flavors: + - cotton + - cheap + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Fiber + Quantity: 5 + - ReagentId: Omnizine + Quantity: 2 + - type: Tag + tags: + - ClothMade + - DonkPocket diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 22488bd4369e..b8280d625835 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -470,6 +470,20 @@ - id: FoodDonkpocketDink amount: 6 +- type: entity + parent: FoodBoxDonkpocket + id: FoodBoxDonkpocketMoth + name: box of moth-pockets + components: + - type: Sprite + state: moth-box + - type: Item + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + - type: StorageFill + contents: + - id: FoodDonkpocketMoth + amount: 6 + - type: entity id: HappyHonk parent: [ BoxCardboard, BaseBagOpenClose ] diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 5dc7f81ac22b..8f4fe6fbeba5 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1625,6 +1625,13 @@ solids: FoodDonkpocketCarp: 1 +- type: microwaveMealRecipe + id: RecipeDonkpocketMoth + name: warm moth-pocket recipe + result: FoodDonkpocketMothWarm + time: 5 + solids: + FoodDonkpocketMoth: 1 - type: microwaveMealRecipe id: RecipeHotChili diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json index a2228b340ede..e7ffacc04e36 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub). Moth pocket by kosticia on GitHub", "size": { "x": 32, "y": 32 @@ -64,6 +64,12 @@ { "name": "carp" }, + { + "name": "moth-box" + }, + { + "name": "moth" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth-box.png new file mode 100644 index 0000000000000000000000000000000000000000..f124d79214a3009ee534883e559b8beb62c0c1bd GIT binary patch literal 670 zcmV;P0%84$P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0y9ZOK~z{rW4wO- zI>SH$CMZ2%VAKJl4j6U7r~?R=g#9%U|DjB>Kw--YMko_2Aj$!X!oL`z1FRSrcvTq~ zKHo;AK>!PT>EeY9_usM+bO32l05TjMAUg;Ku&KiV2!_Dywz&V|;$l!9Y2f9{R}86D zi|~d33zWtQ1b8?YL50OQT8_c7ePevg5j zm6@S+&RGUAISqz}X(t%|{QAvs`oI~6)eAR*)q(VY^b!I@C&D++AAm6@^FIc4JvD~H zswE81-u+^D{qZN5&Z^tUpl7bbzzp;+NFA|&Xa~STz#%4&;r-hW46erF3{paD3}ON- zV7fNhnBnQOHw?i!m0)$m0)lDa@|Mc~y!;{zLJ}%a5eN|H`@(Sh(rut`Uo+TxIx>9x z^q%3%KSXYM_u>x2=Z|j~bbZ>XQx3pF0EYi^>o7a^?0+3y11OI)aOLs^2Hmj5lsRBSf6#v?BT*=i zG_dd7YleWrb(A{*$|MU=>;PH=qRRnVfl&txumczv09!lvI6;>1s;*b3=DjSL74G){)!Z!1`SUa$B+p3WC_;A2_ijBfd(oEm-)_?THs@G zK+TOOq2-baS2nCMNk~g$+a_^W@cR0AbxYm}ZyLh+&;R}Z`L*=w*+$aJOde+6i!Fp z*m2;; Date: Sun, 19 Jan 2025 13:04:04 +0300 Subject: [PATCH 2/3] Add to random spawners --- .../Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml | 1 + Resources/Prototypes/Entities/Objects/Decoration/present.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml index fb52cd1c40d2..05ad0ba725e4 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml @@ -18,5 +18,6 @@ - FoodBoxDonkpocketBerry - FoodBoxDonkpocketHonk - FoodBoxDonkpocketDink + - FoodBoxDonkpocketMoth chance: 0.5 offset: 0.0 diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index e9ddd3b517da..9a08e3983e65 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -276,6 +276,8 @@ orGroup: GiftPool - id: FoodBoxDonkpocketHonk orGroup: GiftPool + - id: FoodBoxDonkpocketMoth + orGroup: GiftPool - id: ClothingHandsGlovesColorPurple orGroup: GiftPool - id: ClothingHandsGlovesColorYellow From db7de5d4b150697046f13f66968cc3c01cd62393 Mon Sep 17 00:00:00 2001 From: kosticia Date: Sun, 19 Jan 2025 20:43:14 +0300 Subject: [PATCH 3/3] Meta fix --- .../Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json index e7ffacc04e36..209ae7b4095a 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub). Moth pocket by kosticia on GitHub", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub). 'moth-box' and 'moth' states by kosticia on GitHub", "size": { "x": 32, "y": 32