diff --git a/GainStation13/code/obj/structure/scale.dm b/GainStation13/code/obj/structure/scale.dm index aed3bf0b..10efaa1a 100644 --- a/GainStation13/code/obj/structure/scale.dm +++ b/GainStation13/code/obj/structure/scale.dm @@ -68,7 +68,7 @@ weighperson(HM) /obj/structure/scale/proc/weighperson(mob/living/carbon/human/fatty) - src.lastreading = round((100 + (fatty.fatness))*(fatty.size_multiplier**2)) + src.lastreading = round((140 + (fatty.fatness/2))*(fatty.size_multiplier**2)) weighEffect(fatty) visible_message("[fatty] weighs themselves.") visible_message("The numbers on the screen settle on: [src.lastreading]Lbs.") diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 68420f82..f48d2ef1 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -157,11 +157,11 @@ #define FULLNESS_LEVEL_EMPTY 0 //Fatness levels, Here we go! -#define FATNESS_LEVEL_BLOB 900 -#define FATNESS_LEVEL_IMMOBILE 500 -#define FATNESS_LEVEL_MORBIDLY_OBESE 350 -#define FATNESS_LEVEL_OBESE 150 -#define FATNESS_LEVEL_FAT 90 +#define FATNESS_LEVEL_BLOB 1720 +#define FATNESS_LEVEL_IMMOBILE 920 +#define FATNESS_LEVEL_MORBIDLY_OBESE 620 +#define FATNESS_LEVEL_OBESE 220 +#define FATNESS_LEVEL_FAT 100 //Nutrition levels for humans #define NUTRITION_LEVEL_FULL 550 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 712917a7..6783d1db 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1332,7 +1332,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if (H.nutrition > NUTRITION_LEVEL_FULL) - var/fatConversionRate = 40 //GS13 what percentage of the excess nutrition should go to fat (total nutrition to transfer can't be under 1) + var/fatConversionRate = 15 //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 diff --git a/tgstation.dme b/tgstation.dme index 77fb1117..ab125e01 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1046,6 +1046,7 @@ #include "code\game\objects\structures\electricchair.dm" #include "code\game\objects\structures\extinguisher.dm" #include "code\game\objects\structures\false_walls.dm" +#include "code\game\objects\structures\femur_breaker.dm" #include "code\game\objects\structures\fence.dm" #include "code\game\objects\structures\fireaxe.dm" #include "code\game\objects\structures\fireplace.dm"