Skip to content

Commit

Permalink
Added the ability to microwave inert flesh anomaly cores to turn into…
Browse files Browse the repository at this point in the history
… 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 <[email protected]>

* Update meal_recipes.yml

* Update cores.yml

---------

Co-authored-by: august-sun <[email protected]>
Co-authored-by: chromiumboy <[email protected]>
  • Loading branch information
3 people authored Nov 13, 2024
1 parent af3593a commit bd2d0ee
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 4 deletions.
59 changes: 59 additions & 0 deletions Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
18 changes: 17 additions & 1 deletion Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -294,4 +310,4 @@
steps:
- minTemperature: 345
- node: xeno cutlet
entity: FoodMeatXenoCutletCooked
entity: FoodMeatXenoCutletCooked
24 changes: 24 additions & 0 deletions Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -200,6 +200,12 @@
},
{
"name": "rouny-cooked"
},
{
"name": "anomalymeat"
},
{
"name": "anomalymeat-cooked"
}
]
}

0 comments on commit bd2d0ee

Please sign in to comment.