From 0d22d2d1f20012c94aeb5701d6d385153b451253 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 28 Sep 2023 05:07:08 +0100 Subject: [PATCH] rouny meat and steak (#20526) * lost friendship flavor * add rouny steak * rouny special meat * rouny meat textures --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../Prototypes/Entities/Mobs/NPCs/xeno.yml | 5 ++ .../Entities/Objects/Consumable/Food/meat.yml | 56 ++++++++++++++++++ Resources/Prototypes/Flavors/flavors.yml | 7 ++- .../Construction/Graphs/food/steak.yml | 13 ++++ .../Consumable/Food/meat.rsi/meta.json | 8 ++- .../Consumable/Food/meat.rsi/rouny-cooked.png | Bin 0 -> 654 bytes .../Consumable/Food/meat.rsi/rouny.png | Bin 0 -> 628 bytes 8 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny-cooked.png create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny.png diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 145e2aa51f..8ecf4cb13e 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -148,6 +148,7 @@ flavor-complex-parents = like someone's parents flavor-complex-plastic = like plastic flavor-complex-glue = like glue flavor-complex-spaceshroom-cooked = like space umami +flavor-complex-lost-friendship = like lost friendship # Drink-specific flavors. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 1c81d57e69..47ea55278f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -305,6 +305,11 @@ drawdepth: Mobs sprite: Mobs/Aliens/Xenos/rouny.rsi offset: 0,0.6 + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeatRouny + amount: 3 - type: entity name: Spitter diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 44f2b668e4..1c003df38e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -494,6 +494,34 @@ count: 3 slice: FoodMeatXenoCutlet +- type: entity + name: raw rouny meat + # not raw since rouny best + parent: FoodMeatBase + id: FoodMeatRouny + description: A slab of meat from an innocent red friend. + components: + - type: FlavorProfile + flavors: + - meaty + - acid + - lostfriendship + - type: Tag + tags: + - Raw + - type: Sprite + state: rouny + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: SulfuricAcid + Quantity: 20 + - type: Construction + graph: RounySteak + node: start + defaultTarget: rouny steak + - type: entity name: killer tomato meat parent: FoodMeatBase @@ -848,6 +876,34 @@ graph: GoliathSteak node: goliath steak +- type: entity + name: rouny steak + parent: FoodMeatBase + id: FoodMeatRounyCooked + description: Some kill to survive. You on the other hand, kill for fun. + components: + - type: FlavorProfile + flavors: + - meaty + - lostfriendship + - type: Tag + tags: + - Cooked + - type: Sprite + layers: + - state: rouny-cooked + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 10 + - type: Construction + graph: RounySteak + node: rouny steak + - type: entity name: lizard steak parent: FoodMeatBase diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 2b8e2b0e2f..fc3b0ba577 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -837,4 +837,9 @@ - type: flavor id: spaceshroomcooked flavorType: Complex - description: flavor-complex-spaceshroom-cooked \ No newline at end of file + description: flavor-complex-spaceshroom-cooked + +- type: flavor + id: lostfriendship + flavorType: Complex + description: flavor-complex-lost-friendship diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml index 76159ec5ac..74854084f5 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml @@ -117,3 +117,16 @@ - node: goliath steak entity: FoodMeatGoliathCooked + +# rouny steak +- type: constructionGraph + id: RounySteak + start: start + graph: + - node: start + edges: + - to: rouny steak + steps: + - minTemperature: 445 #rouny + - node: rouny steak + entity: FoodMeatRounyCooked diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json index 2bbe89d1f9..f1aa4d3446 100644 --- a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept and potato1234x at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", "size": { "x": 32, "y": 32 @@ -188,6 +188,12 @@ }, { "name": "dragon_veins" + }, + { + "name": "rouny" + }, + { + "name": "rouny-cooked" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/rouny-cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..cba050d693c63459fe5d208383cf9cde057d2fdb GIT binary patch literal 654 zcmV;90&)F`P)$`wePiwn9j{W3BALe^W(esJDm9j?4hidGh3!1moFNTV8F8&Tk^EM z(1Dvi1{jKKralu6hiJM!@35(Q>sP&+-)p$KR+FX%wszr3O*e|dG7X{iqON#bxL3=> zSA`FSeTEDue5Le6m7f)-tNgCmh(>0?u6laXb)2YUEo0<_M}@t)Y)Si@M}3JinO~Tf z>Xto-NrWH)JR~TwMwTLesd>q)v2X0xH%CD{n!I(&7~)8i5wB0wl5|Zj z?85mL^grlvBmOHnWZP3Ics+&g81&pg=W;cxzjIFRA-W;I=o2sDyE(_@rR^vV51 z)MK90D2GZGWngfmUc%fGFf%O1trZG|yF(bKwY3kjZB7h*&hizO__;iO?63E32Di?A zeYFUgA@+nsg0+B-$j1N{!RQlJ$4f*k0Zi7KC^~~$(6eP7|DWHw$4o0I0h!*9LOfWv zpl625Bk?MLY;XoLJ!SpqJ>cD8=9;0*(ZUjDgP|;=7NN$`wePiwn9j{W3BALe^W(esJDm9j?4hidGh3!1moFNTV8F8&Tk^EM z(1Dvi1{jKKralu6hiJM!@35(Q>sP&+-)p$KR+FX%wszr3O*e|dG7X{iqON#bxL3=> zSA`FSeTEDue5Le6m7f)-tNgCmh(>0?u6laXb)2YUEo0<_M}@t)Y)Si@M}3JinO~Tf z>Xto-NrWH)JR~TwMwTLesd>q)v2X0xH%CD{n!I(&7~)8i5wB0wl5|Zj z?85mL^grlvBmOHnWZP3Ics+&g81&pg=W;cxzjIFRA-W;I=o-Jec?~632_SISp z0hZtvNDmkTEL^xGSOdu^k2chFiR^&JXas2Xo{Bq}^u^>EZ@mQx)=OATrFG&tpnZa# zaM2v_fN;adGzmR}$qdl@3os0I*-9q^G%am?O4?u(fCQ*GJwu^TXu4hmsYady#3yI~ O0000