From bd2d0ee5e593606da094804f5822cf740a1f1084 Mon Sep 17 00:00:00 2001 From: August Sun <45527070+august-sun@users.noreply.github.com> Date: Tue, 12 Nov 2024 19:59:47 -0700 Subject: [PATCH] Added the ability to microwave inert flesh anomaly cores to turn into an anomalous meat mass (#33223) * First round of anomaly core functionalities added * Added sliceTime to anom meat mass and cooked version * Adds SmokeOnUse component, system and shared system, adds new functions to inert electrical anom core * Added more functions * Final touches to branch * Cleaning up some of the metadata for sprites and component definitions * PR_Changes_v2_rev.0_Final_FINALFORREALTHISTIME.yml * Lol jk these goddamn tests why me * Quick updates based on feedback * more changes to improve * additional fixes and edits * Changed tech core functionality * added magboot functionality to grav core * fixed issue with bluespace core sizing * Reverting changes per request * extra file to be deleted * File cleanup * Update chemicals.ftl * Update cores.yml * Update cores.yml * Update meta.json * Update chemicals.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> * Update meal_recipes.yml * Update cores.yml --------- Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> --- .../Entities/Objects/Consumable/Food/meat.yml | 59 ++++++++++++++++++ .../Structures/Specific/Anomaly/cores.yml | 6 +- .../Construction/Graphs/food/steak.yml | 18 +++++- .../Recipes/Cooking/meal_recipes.yml | 24 +++++++ .../Food/meat.rsi/anomalymeat-cooked.png | Bin 0 -> 618 bytes .../Consumable/Food/meat.rsi/anomalymeat.png | Bin 0 -> 642 bytes .../Consumable/Food/meat.rsi/meta.json | 8 ++- 7 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat-cooked.png create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 612f7da047..48968b80c1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -701,6 +701,36 @@ - ReagentId: Water Quantity: 4 #It makes saline if you add salt! +- type: entity + name: anomalous meat mass + parent: FoodMeatRawBase + id: FoodMeatAnomaly + description: An impossibly dense slab of meat. Just looking at it makes you uncomfortable. + components: + - type: Sprite + state: anomalymeat + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 90 + - ReagentId: Fat + Quantity: 90 + - type: SliceableFood + count: 10 + sliceTime: 5 + slice: FoodMeat #That's... So much meat + - type: InternalTemperature + conductivity: 0.43 + - type: Construction + graph: AnomalyMeatSteak + node: start + defaultTarget: anomaly steak + - type: Tag + tags: + - Meat + # Cooked - type: entity @@ -1173,6 +1203,35 @@ Burger: MeatSnail Taco: MeatSnail +- type: entity + name: anomalous steak + parent: FoodMeatBase + id: FoodMeatAnomalyCooked + description: A gigantic mass of cooked meat. A meal for a dinner party, or someone REALLY hungry. + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + layers: + - state: anomalymeat-cooked #Kinda hard to cook this... thing evenly + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 100 + - ReagentId: Protein + Quantity: 50 + - type: SliceableFood + count: 10 + sliceTime: 5 + slice: FoodMeatCooked + - type: Construction + graph: AnomalyMeatSteak + node: anomaly steak + # Cutlets # Raw diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index 315505b81e..568a133749 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -79,6 +79,7 @@ - type: entity parent: BaseAnomalyCore id: AnomalyCoreFlesh + description: The core of a destroyed flesh anomaly. Pulsates sickeningly, but might be a hearty meal if cooked. suffix: Flesh components: - type: Sprite @@ -241,7 +242,8 @@ - type: entity parent: BaseAnomalyInertCore - id: AnomalyCoreFleshInert + id: AnomalyCoreFleshInert # Can be microwaved to turn it into a massive piece of meat + description: The inert core of a destroyed flesh anomaly. Pulsates sickeningly, but might be good food in the right hands? suffix: Flesh, Inert components: - type: Sprite @@ -306,7 +308,7 @@ - type: entity parent: BaseAnomalyInertCore - id: AnomalyCoreFloraInert + id: AnomalyCoreFloraInert #Turns into a seed that grows into artifexium suffix: Flora, Inert components: - type: Seed diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml index 4c10400331..61cb844037 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml @@ -174,6 +174,22 @@ - node: bacon entity: FoodMeatBaconCooked +# anomaly meat steak +- type: constructionGraph + id: AnomalyMeatSteak + start: start + graph: + - node: start + edges: + - to: anomaly steak + completed: + - !type:PlaySound + sound: /Audio/Effects/sizzle.ogg + steps: + - minTemperature: 335 + - node: anomaly steak + entity: FoodMeatAnomalyCooked + # cutlets - type: constructionGraph @@ -294,4 +310,4 @@ steps: - minTemperature: 345 - node: xeno cutlet - entity: FoodMeatXenoCutletCooked \ No newline at end of file + entity: FoodMeatXenoCutletCooked diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 173cf9e9db..da66f7a0d8 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -2050,3 +2050,27 @@ FoodCroissantRaw: 1 FoodButterSlice: 1 ShardGlass: 1 + +- type: microwaveMealRecipe + id: RecipeInertAnomalyMeat + name: inert meat anomaly recipe + result: FoodMeatAnomaly + time: 5 + solids: + AnomalyCoreFleshInert: 1 + +- type: microwaveMealRecipe + id: RecipeAnomalyMeat + name: meat anomaly recipe + result: FoodMeatAnomaly + time: 5 + solids: + AnomalyCoreFlesh: 1 + +- type: microwaveMealRecipe + id: RecipeAnomalyMeatCooked + name: cooked meat anomaly recipe + result: FoodMeatAnomalyCooked + time: 5 + solids: + FoodMeatAnomaly: 1 diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat-cooked.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat-cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..19c0040f3a150fb1b247ff901673516605618e39 GIT binary patch literal 618 zcmV-w0+s!VP)Px%BuPX;R9J=Wl+SA0KoG`%7HMS3rIEcd#E_HmCE%7op_c@FF!U+>6n%mAVfq3+ zmmCbu!8cPIdT5$MNogULt+uv>NRWD1X(QS4pSrnK9|*BCyEET>GrN!@M~?p;g>(-!=iM16Pc^kC>2t>3RwT4d8A7;A=QzkCle1&8Hi;4_T@M3 z+yvm=`!OGeGXT05*J`UfHqx95FmfKJ)~(Ycl`O6d1P)JJx~%0>;CoYeZE!2>_i}oP@{TxZ}7CG z!Ae%VDe+$uh)F=C2H6sCoA{s5saxSOT=+9=l}o!07*qoM6N<$ Ef@X&iumAu6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/anomalymeat.png new file mode 100644 index 0000000000000000000000000000000000000000..005107ab4ec5e066f292c3d6a163174d11c9e7e7 GIT binary patch literal 642 zcmV-|0)737P)Px%JV``BR9J=WmBDM%P#niURU4tC5L+}p8Nv>0DPk$&c^8WpFN1kddZ_<_3S*A3 zlN6Eu37*=)4vM>Y@Z_mS5tLq}-C-9Yq+kuUC`%9V(7xBCOS^1(GhYbF`@JN;@Avz@ zFM${_V*Kw&oaLcLHs|@rkG^*kvvdC1KOrDrY~bRcVc>GOew$1CZFP@-&OwVr;#^b$ z0C}OQb8=&i-0~6z?y=@_90idGNcFZg#1uNVH3T5D_W@Jr7`T{1R|EkZv|~#Zh6{@t zN|YYo=l7d;z_dZ(<}F&*d!^j5T&3C+IwsJuPIh6g19>sF)4=8DwG`&dO6z<+(&^{ntTv7Ew`v4$NlXZKmu3VTG z$j~K_O5|DtIL~%jx_X^fwFZnGvaKNwno=*D!qlm}(CAn$jcm>fBM~WtrqEe!?$D~% z$O}z{O$M-4ttn?DY3ZJA4ap0Qo|g)J_gn&g_5Dg2d#kQg`wu?}fMWA`Abbwm!Z3ys z=y@r+o`HjgDRjDr-vXqhy4f>~vvBWolYXVF8uz>u&gdwVKxhUw`(G0EOvy8Fu`QS7 z{ZH5vHRIaU9eHg`#vk`ytGTXwesUGw92R_v>zPtu`&>!<3e5ZWyd;s_SerJVxc2nb z+l8Ow$p3=vbip%{7XyT5gXN5lxcu-&q{gQvAV~m7B4O+LV(|4$f7nxDJ6-T3nHVu* c#Q0nM0h_}40T=^O)c^nh07*qoM6N<$f|m*~VgLXD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json index 4ad75849d1..99084d8c95 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, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, snail by IproduceWidgets (github) and Kezu (discord)", + "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, snail by IproduceWidgets (github) and Kezu (discord), anomalymeat/cooked by august-sun", "size": { "x": 32, "y": 32 @@ -200,6 +200,12 @@ }, { "name": "rouny-cooked" + }, + { + "name": "anomalymeat" + }, + { + "name": "anomalymeat-cooked" } ] } -- 2.52.0