From 604748534ebd72efafa11344ee33d563c2ff93c3 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 3 Feb 2024 08:12:56 +0000 Subject: [PATCH] Add carp pocket (#24888) * texture * add the item * add it to present and salv loot --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../Consumable/Food/Baked/donkpocket.yml | 37 ++++++++++++++++++ .../Consumable/Food/Containers/box.yml | 12 ++++++ .../Entities/Objects/Decoration/present.yml | 2 + Resources/Prototypes/Flavors/flavors.yml | 5 +++ .../Prototypes/Procedural/salvage_loot.yml | 2 + .../Recipes/Cooking/meal_recipes.yml | 8 ++++ .../Food/Baked/donkpocket.rsi/carp-box.png | Bin 0 -> 492 bytes .../Food/Baked/donkpocket.rsi/carp.png | Bin 0 -> 321 bytes .../Food/Baked/donkpocket.rsi/meta.json | 8 +++- 10 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp.png diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 7c4242d4b3..3ff86e3875 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -166,6 +166,7 @@ flavor-complex-spaceshroom-cooked = like space umami flavor-complex-lost-friendship = like lost friendship flavor-complex-light = like a light gone out flavor-complex-profits = like profits +flavor-complex-fishops = like the dreaded fishops # Drink-specific flavors. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index 1347aa42a1..e8efb19435 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -329,6 +329,43 @@ - ReagentId: Omnizine Quantity: 2 +- type: entity + name: carp-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketCarp + description: A long-lost edition of donk pocket, made specifically for hard-working salvagers. + components: + - type: FlavorProfile + flavors: + - cheap + - fishops + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Sprite + state: carp + +- type: entity + name: warm carp-pocket + parent: FoodDonkpocketCarp + id: FoodDonkpocketCarpWarm + components: + - type: FlavorProfile + flavors: + - cheap + - fishops + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Omnizine + Quantity: 2 + - type: entity name: dink-pocket parent: FoodDonkpocketBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index e7690ecf78..2efa2a59ec 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -401,6 +401,18 @@ - id: FoodDonkpocketStonk amount: 6 +- type: entity + parent: FoodBoxDonkpocket + id: FoodBoxDonkpocketCarp + name: box of carp-pockets + components: + - type: Sprite + state: carp-box + - type: StorageFill + contents: + - id: FoodDonkpocketCarp + amount: 6 + - type: entity parent: FoodBoxDonkpocket id: FoodBoxDonkpocketBerry diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index c6b6c9b22d..5087e53980 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -262,6 +262,8 @@ orGroup: GiftPool - id: FoodBoxDonkpocketStonk orGroup: GiftPool + - id: FoodBoxDonkpocketCarp + orGroup: GiftPool - id: FoodBoxDonkpocketBerry orGroup: GiftPool - id: FoodBoxDonkpocketHonk diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 83f4272448..e08d73e834 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1003,3 +1003,8 @@ id: profits flavorType: Complex description: flavor-complex-profits + +- type: flavor + id: fishops + flavorType: Complex + description: flavor-complex-fishops diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index ed649f54b3..92b04496ba 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -27,6 +27,8 @@ - proto: CloningPodMachineCircuitboard cost: 2 - proto: CognizineChemistryBottle + - proto: FoodBoxDonkpocketCarp + prob: 0.5 - proto: CrateSalvageEquipment cost: 3 prob: 0.5 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 2eed557eaa..28761aa779 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1488,6 +1488,14 @@ solids: FoodDonkpocketStonk: 1 +- type: microwaveMealRecipe + id: RecipeDonkpocketCarp + name: warm carp-pocket recipe + result: FoodDonkpocketCarpWarm + time: 5 + solids: + FoodDonkpocketCarp: 1 + - type: microwaveMealRecipe id: RecipeHotChili diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/carp-box.png new file mode 100644 index 0000000000000000000000000000000000000000..aa82f12f19c9e1a612f97be49180115022f44308 GIT binary patch literal 492 zcmVF6XU=)mkkq#IMDKL|B`%j4lrylLXYX=K4hOjYl zFqlfYF=&}7gZcN*y<|`{5@(Q55nwpJ>Lv#J+Nrw?r=RU&`1S7xL9>~N^$8~n57-iz zZ+|{BY`Hm?vM69?VqsumVrAgx5GKj;k3Zgm z^%4RERdBFyGOz0obqHD{_6WfYB=B>10S0RSq=c{rAib$ i`EqNtjt|NA?wadPMMhj)K( z=aGN^N7PdeWJw`-O?^kLo~mlH1Q+%_ByXun`1uFxFLfBx_P&#$H9OoLXL z^_XxoPI#)56O-`g<5$}&KUlhIe}9?uEs&vzg@fDsb%QM9A%)YNtvpv{8r~F7PFj{!BboC!CVIOD9CXQ?c*dje>6I1CZU;3aSetzopr07Tb;-T(jq literal 0 HcmV?d00001 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 bd3331fa8b..a2228b340e 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", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24. Stonk pocket by Tayrtahn on GitHub. Carp pocket by deltanedas (GitHub).", "size": { "x": 32, "y": 32 @@ -58,6 +58,12 @@ { "name": "stonk" }, + { + "name": "carp-box" + }, + { + "name": "carp" + }, { "name": "inhand-left", "directions": 4 -- 2.51.2