This commit is contained in:
Pinta
2023-02-07 21:02:19 -05:00
parent bba71bcdf9
commit 8b3ee4ffe3
12 changed files with 75 additions and 32 deletions

View File

@@ -46,7 +46,7 @@
fat_burned = min(HUNGER_FACTOR/20, fatness)
nutrition_lost_divider = 5
nutrition -= (HUNGER_FACTOR/nutrition_lost_divider - fat_burned)
fatness -= fat_burned
adjust_fatness(fat_burned, FATTENING_TYPE_WEIGHT_LOSS)
if(HAS_TRAIT(src, TRAIT_NOTHIRST))

View File

@@ -1606,7 +1606,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
var/fatConversionRate = 100 //GS13 what percentage of the excess nutrition should go to fat (total nutrition to transfer can't be under 1)
var/nutritionThatBecomesFat = max((H.nutrition - NUTRITION_LEVEL_FULL)*(fatConversionRate / 100),1)
H.nutrition -= nutritionThatBecomesFat
H.fatness += nutritionThatBecomesFat
H.adjust_fatness(nutritionThatBecomesFat, FATTENING_TYPE_FOOD)
if(H.fullness > FULLNESS_LEVEL_EMPTY)//GS13 stomach-emptying routine
var/ticksToEmptyStomach = 20 // GS13 how many ticks it takes to decrease the fullness by 1
H.fullness -= 1/ticksToEmptyStomach

View File

@@ -114,6 +114,7 @@
/obj/item/gun/fatbeam/proc/on_beam_tick(var/mob/living/target)
if(target.health != target.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(target), "#FFC2F8")
if(HAS_TRAIT(target, TRAIT_GAIN_WEAPON_IMMUNE))
target.nutrition += 50
return

View File

@@ -619,9 +619,11 @@
/datum/reagent/medicine/lipolicide/on_mob_life(mob/living/carbon/M)
if(M.nutrition <= NUTRITION_LEVEL_STARVING)
M.adjustToxLoss(1*REM, 0)
M.fatness = max(M.fatness - 10, 0)
if(M.fatness == 0)
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 ..()