From 2076e8b02de9371f1240ad2c92d69ff126a88ce6 Mon Sep 17 00:00:00 2001 From: kosticia Date: Wed, 23 Apr 2025 08:36:54 +0300 Subject: [PATCH] Moth-pockets (#34517) Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --- .../Random/Food_Drinks/donkpocketbox.yml | 1 + .../Consumable/Food/Baked/donkpocket.yml | 43 +++++ .../Consumable/Food/Containers/box.yml | 14 ++ .../Entities/Objects/Decoration/present.yml | 2 + .../Recipes/Cooking/meal_recipes.yml | 7 + .../Food/Baked/donkpocket.rsi/meta.json | 152 +++++++++--------- .../Food/Baked/donkpocket.rsi/moth-box.png | Bin 0 -> 502 bytes .../Food/Baked/donkpocket.rsi/moth.png | Bin 0 -> 403 bytes 8 files changed, 146 insertions(+), 73 deletions(-) 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/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml index fb52cd1c40..05ad0ba725 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/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index c7e46d9a94..78543f15e9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -386,3 +386,46 @@ 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: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Fiber + Quantity: 5 + - ReagentId: Omnizine + Quantity: 2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 7dd402ae6d..e3825ac2dd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -484,6 +484,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/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index e9ddd3b517..9a08e3983e 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 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 28a47fdc21..60c7d74c0d 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1812,6 +1812,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 3cbfe7d8e8..77d4d96eb1 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json @@ -1,76 +1,82 @@ { - "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), modified by ps3moira (GitHub)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "banana" + "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). Modified by ps3moira (GitHub). 'moth-box' and 'moth' States by kosticia on GitHub", + "size": { + "x": 32, + "y": 32 }, - { - "name": "banana-box" - }, - { - "name": "berry" - }, - { - "name": "berry-box" - }, - { - "name": "dank" - }, - { - "name": "pizza" - }, - { - "name": "pizza-box" - }, - { - "name": "plain" - }, - { - "name": "box" - }, - { - "name": "spicy" - }, - { - "name": "spicy-box" - }, - { - "name": "teriyaki" - }, - { - "name": "teriyaki-box" - }, - { - "name": "dink-box" - }, - { - "name": "dink" - }, - { - "name": "stonk-box" - }, - { - "name": "stonk" - }, - { - "name": "carp-box" - }, - { - "name": "carp" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "banana" + }, + { + "name": "banana-box" + }, + { + "name": "berry" + }, + { + "name": "berry-box" + }, + { + "name": "dank" + }, + { + "name": "pizza" + }, + { + "name": "pizza-box" + }, + { + "name": "plain" + }, + { + "name": "box" + }, + { + "name": "spicy" + }, + { + "name": "spicy-box" + }, + { + "name": "teriyaki" + }, + { + "name": "teriyaki-box" + }, + { + "name": "dink-box" + }, + { + "name": "dink" + }, + { + "name": "stonk-box" + }, + { + "name": "stonk" + }, + { + "name": "carp-box" + }, + { + "name": "carp" + }, + { + "name": "moth-box" + }, + { + "name": "moth" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "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..a9ecf9dd8b56fafe81b1e1adc3dd36db9dd8f1e9 GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!hHg(6$B+p3WC_;A2_ijBjch#uvos8L9(rp( z#Z%5%D)adD*VSOgdq<_Dzc@u|q1E-fT zi^6H$Ev=F|Iyw?5E;kNt=`so6@n}Ahm?IG|U9@G>2j)dG2M(TNN;NdF*;zc#(QOX< z88N{JESK}`YS=g5x7o+?Y%)_vSJTa}asPi--dJFB=)vRZ@jRcB_VAd??_VA#B4O=f zu&3%ro8yf3*#|EkoRs))*>9ezwr2^quDJ9!ethlUwtM>f=BpE#I?4{re$FppG4sFS ziq|U*MZ$CwE55xGKm5Ai{$NSiT{kw{Vp+Dd1@VrrJQ!W99bAGM4=SqlKm2=}pJ&~% zM?67JIXp>BItjbXZq9i4amUxc`n7&m^x)JW&S{{{MR{&D_32vde};U^0Va!-^ONrUi2t qQiWK9q_+#^e$#-4J0lAZ55unQ<$L^^LP~&f#o+1c=d#Wzp$Pz~XT_=j literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/moth.png new file mode 100644 index 0000000000000000000000000000000000000000..0f68621c4a8f7eb85dbdf6552ccfb868042415b0 GIT binary patch literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!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;;