Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

This commit is contained in:
Roxy
2025-11-12 16:42:38 -05:00
379 changed files with 37535 additions and 33147 deletions
@@ -334,7 +334,7 @@
if (isliving(nomnom)) // NO VORE ALLOWED
return 0
// Yeah maybe don't, if something edible ended up here it should either handle itself or not be digested
if (IsEdible(nomnom))
if (IS_EDIBLE(nomnom))
return 0
if (HAS_TRAIT(owner, TRAIT_STRONG_STOMACH))
return 10
@@ -523,7 +523,7 @@
/obj/item/organ/stomach/cybernetic/tier2/stomach_acid_power(atom/movable/nomnom)
if (isliving(nomnom))
return 0
if (IsEdible(nomnom))
if (IS_EDIBLE(nomnom))
return 0
return 20
@@ -539,7 +539,7 @@
/obj/item/organ/stomach/cybernetic/tier3/stomach_acid_power(atom/movable/nomnom)
if (isliving(nomnom))
return 0
if (IsEdible(nomnom))
if (IS_EDIBLE(nomnom))
return 0
return 35