Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the ability to microwave inert flesh anomaly cores to turn into an anomalous meat mass #33223

Merged
merged 41 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b44a913
First round of anomaly core functionalities added
Sep 29, 2024
2c3fc27
Added sliceTime to anom meat mass and cooked version
Sep 29, 2024
4cc2aaf
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Sep 29, 2024
7e60b4e
Adds SmokeOnUse component, system and shared system, adds new functio…
Oct 7, 2024
8555ab3
Merge branch 'anomaly-core-added-functions-pt-2' into anomaly-core-ad…
Oct 9, 2024
9bff19d
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Oct 14, 2024
12173ea
Added more functions
Oct 15, 2024
9bbae68
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Oct 15, 2024
291cc74
Final touches to branch
Oct 16, 2024
200a801
Cleaning up some of the metadata for sprites and component definitions
Oct 16, 2024
bd23f2d
Merge branch 'space-wizards:master' into anomaly-core-added-functions…
august-sun Oct 16, 2024
29b78ec
PR_Changes_v2_rev.0_Final_FINALFORREALTHISTIME.yml
Oct 16, 2024
aee67e6
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Oct 16, 2024
e9f67b4
Merge branch 'space-wizards:master' into anomaly-core-added-functions…
august-sun Oct 16, 2024
0101a00
Merge branch 'anomaly-core-added-functions-pt-1' of https://github.co…
Oct 16, 2024
ba2a417
Lol jk these goddamn tests why me
Oct 16, 2024
9f4c41b
Merge branch 'space-wizards:master' into anomaly-core-added-functions…
august-sun Oct 19, 2024
cb74399
Quick updates based on feedback
august-sun Oct 19, 2024
04f9a57
more changes to improve
Oct 20, 2024
0d48793
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Oct 20, 2024
3b85a5c
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Oct 21, 2024
588dc38
Merge branch 'anomaly-core-added-functions-pt-1' of https://github.co…
Oct 21, 2024
de72229
additional fixes and edits
Oct 27, 2024
be8ed40
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Oct 27, 2024
560599d
Changed tech core functionality
Oct 29, 2024
e5c3d1a
Merge branch 'master' of https://github.com/space-wizards/space-stati…
Nov 5, 2024
fa50522
added magboot functionality to grav core
Nov 5, 2024
735fbe3
fixed issue with bluespace core sizing
Nov 6, 2024
0b3f721
Reverting changes per request
Nov 8, 2024
8b62713
extra file to be deleted
Nov 8, 2024
e492fb8
File cleanup
Nov 8, 2024
c244b3c
Update chemicals.ftl
august-sun Nov 8, 2024
a018709
Update cores.yml
august-sun Nov 8, 2024
45a3eb2
Update cores.yml
august-sun Nov 8, 2024
3d685c1
Update meta.json
august-sun Nov 8, 2024
c43f085
Update chemicals.yml
august-sun Nov 8, 2024
0c9e5ba
Merge branch 'space-wizards:master' into meat-anomaly-microwave
august-sun Nov 8, 2024
9865160
Update Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
august-sun Nov 12, 2024
9d3e885
Update meal_recipes.yml
august-sun Nov 12, 2024
e2bba26
Update cores.yml
august-sun Nov 12, 2024
951e670
Merge branch 'space-wizards:master' into meat-anomaly-microwave
august-sun Nov 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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: anomaly 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 @@ -241,7 +241,7 @@

- type: entity
parent: BaseAnomalyInertCore
id: AnomalyCoreFleshInert
id: AnomalyCoreFleshInert # Can be microwaved to turn it into a massive piece of meat
suffix: Flesh, Inert
components:
- type: Sprite
Expand Down Expand Up @@ -306,7 +306,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
16 changes: 16 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,19 @@
FoodCroissantRaw: 1
FoodButterSlice: 1
ShardGlass: 1

- type: microwaveMealRecipe
id: RecipeAnomalyMeat
name: meat anomaly recipe
result: FoodMeatAnomaly
time: 5
solids:
AnomalyCoreFleshInert: 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"
}
]
}
Loading