Merge branch 'KabKebab:master' into random_junk

This commit is contained in:
GDLW
2023-03-16 18:05:23 +01:00
committed by GitHub
51 changed files with 861 additions and 132 deletions
@@ -135,7 +135,7 @@
pH = 8
/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_FAT))
if(HAS_TRAIT(M, TRAIT_BLOB))
M.gib()
return ..()
@@ -623,7 +623,7 @@
M.nutrition = max(M.nutrition - 3, 0) // making the chef more valuable, one meme trap at a time
else
M.adjust_fatness(-10, FATTENING_TYPE_WEIGHT_LOSS)
M.overeatduration = 0
return ..()