Skip to content

Commit

Permalink
Merge pull request #4637 from MistakeNot4892/fix/meat2
Browse files Browse the repository at this point in the history
Meat and nutriment should no longer cause organ damage on ingestion.
  • Loading branch information
out-of-phaze authored Dec 13, 2024
2 parents 5291d29 + 0e8657c commit 66be40f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
reagent_overlay = "soup_chunks"
nutriment_factor = 10
allergen_flags = ALLERGEN_MEAT
affect_blood_on_ingest = 0
affect_blood_on_inhale = 0

/decl/material/solid/organic/meat/egg
name = "egg yolk"
Expand Down
1 change: 1 addition & 0 deletions code/modules/reagents/chems/chems_drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
nutriment_factor = 0
hydration_factor = 6
affect_blood_on_ingest = FALSE
affect_blood_on_inhale = FALSE

var/adj_dizzy = 0 // Per tick
var/adj_drowsy = 0
Expand Down
2 changes: 2 additions & 0 deletions code/modules/reagents/chems/chems_nutriment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
fishing_bait_value = 0.65
compost_value = 1
nutriment_factor = 10
affect_blood_on_ingest = 0
affect_blood_on_inhale = 0

// Technically a room-temperature solid, but saves
// repathing it to /solid all over the codebase.
Expand Down

0 comments on commit 66be40f

Please sign in to comment.