diff --git a/GainStation13/code/obj/structure/scale.dm b/GainStation13/code/obj/structure/scale.dm index 10efaa1a..85b1753e 100644 --- a/GainStation13/code/obj/structure/scale.dm +++ b/GainStation13/code/obj/structure/scale.dm @@ -12,6 +12,8 @@ layer = OBJ_LAYER //stores the weight of the last person to step on in Lbs var/lastreading = 0 + //the conversion ratio for how much a point of fatness weighs on a 6' person + var/fatnessToWeight = 0.25 /obj/structure/scale/deconstruct() // If we have materials, and don't have the NOCONSTRUCT flag @@ -68,7 +70,7 @@ weighperson(HM) /obj/structure/scale/proc/weighperson(mob/living/carbon/human/fatty) - src.lastreading = round((140 + (fatty.fatness/2))*(fatty.size_multiplier**2)) + src.lastreading = round((140 + (fatty.fatness/src.fatnessToWeight))*(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/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ff53ba39..2a5801a2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3759,7 +3759,7 @@ "buJ" = (/obj/effect/turf_decal/tile/blue{dir = 4},/obj/machinery/newscaster{pixel_x = 28; pixel_y = 1},/turf/open/floor/plasteel/white/corner,/area/hallway/secondary/entry) "buK" = (/obj/structure/chair/comfy{dir = 4},/turf/open/floor/plasteel/grimy,/area/hallway/primary/port) "buL" = (/obj/structure/chair/comfy{dir = 8},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/grimy,/area/hallway/primary/port) -"buM" = (/obj/machinery/vending/mealdor,/obj/machinery/vending/mealdor,/turf/open/floor/plasteel/dark,/area/hallway/primary/port) +"buM" = (/obj/machinery/vending/mealdor,/turf/open/floor/plasteel/dark,/area/hallway/primary/port) "buN" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/port) "buO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/hallway/primary/port) "buP" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -28},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/port) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index f48d2ef1..e8986756 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 1720 -#define FATNESS_LEVEL_IMMOBILE 920 -#define FATNESS_LEVEL_MORBIDLY_OBESE 620 -#define FATNESS_LEVEL_OBESE 220 -#define FATNESS_LEVEL_FAT 100 +#define FATNESS_LEVEL_BLOB 3440 +#define FATNESS_LEVEL_IMMOBILE 1840 +#define FATNESS_LEVEL_MORBIDLY_OBESE 1240 +#define FATNESS_LEVEL_OBESE 440 +#define FATNESS_LEVEL_FAT 200 //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 6783d1db..74570991 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 = 15 //GS13 what percentage of the excess nutrition should go to fat (total nutrition to transfer can't be under 1) + 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