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.

Sign up for GitHub

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

Fix a few exploits allowing safe consumption of mutant meat #35573

Merged
merged 2 commits into from
Nov 18, 2019
Merged

Fix a few exploits allowing safe consumption of mutant meat #35573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46483bf
Change cooked meat's copy-from value
Davi-DeGanne Nov 17, 2019
c50e018
Remove NUTRIENT_OVERRIDE from
Davi-DeGanne Nov 17, 2019
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
9 changes: 5 additions & 4 deletions data/json/items/comestibles/carnivore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,16 @@
},
{
"id": "meat_cooked",
"copy-from": "meat",
"copy-from": "flesh",
"weight": "296 g",
"volume": "250 ml",
"spoils_in": "1 day",
"type": "COMESTIBLE",
"name": "cooked meat",
"description": "This is a chunk of freshly cooked meat. It's filling and nutritious, but unseasoned and a bit bland.",
"proportional": { "price": 1.5 },
"price": 750,
"parasites": 0,
"calories": 402,
"healthy": 0,
"fun": 0,
"vitamins": [ [ "vitC", 16 ], [ "calcium", 2 ], [ "iron", 69 ], [ "vitB", 778 ] ],
"flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
},
Expand Down
3 changes: 3 additions & 0 deletions data/json/items/comestibles/meat_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,7 @@
"description": "Meat slices cured in brine. Salty but tasty in a pinch.",
"price": 500,
"material": "flesh",
"delete": { "flags": [ "NUTRIENT_OVERRIDE" ] },
"primary_material": "cured_meat",
"fun": 2
},
Expand Down Expand Up @@ -966,6 +967,7 @@
"healthy": 1,
"description": "This is a serving of crisply brined and canned meat. Tasty and nutritious.",
"price": 250,
"delete": { "flags": [ "NUTRIENT_OVERRIDE" ] },
"fun": 6
},
{
Expand All @@ -992,6 +994,7 @@
"color": "light_red",
"description": "Reconstituted meat flakes, which are much more enjoyable to eat now that they have been rehydrated.",
"price": 900,
"delete": { "flags": [ "NUTRIENT_OVERRIDE" ] },
"fun": 2
},
{
Expand Down