diff --git a/GainStation13/code/obj/structure/scale.dm b/GainStation13/code/obj/structure/scale.dm index 431209c0..214f28e6 100644 --- a/GainStation13/code/obj/structure/scale.dm +++ b/GainStation13/code/obj/structure/scale.dm @@ -50,14 +50,14 @@ //The appearance of the numbers changes with the fat level of the character if (HAS_TRAIT(fatty, TRAIT_BLOB)) to_chat(fatty, "[round(src.lastreading/2000, 0.01)]TONS!!!") - + else if (HAS_TRAIT(fatty, TRAIT_IMMOBILE)) to_chat(fatty, "[src.lastreading]Lbs!") else if(HAS_TRAIT(fatty, TRAIT_OBESE) || HAS_TRAIT(fatty, TRAIT_MORBIDLYOBESE)) to_chat(fatty, "[src.lastreading]Lbs!") - else + else to_chat(fatty, "[src.lastreading]Lbs.") @@ -70,7 +70,7 @@ weighperson(HM) /obj/structure/scale/proc/weighperson(mob/living/carbon/human/fatty) - src.lastreading = round((140 + (fatty.fatness*src.fatnessToWeight))*(fatty.size_multiplier**2)) + src.lastreading = round((140 + (fatty.fatness*src.fatnessToWeight))*(fatty.size_multiplier**2)*((fatty.dna.features["taur"] != "None") ? 2.5: 1)) weighEffect(fatty) visible_message("[fatty] weighs themselves.") visible_message("The numbers on the screen settle on: [src.lastreading]Lbs.")