From 720e312647707da9b4b9183f564912800bfa43f2 Mon Sep 17 00:00:00 2001
From: SomeGuyEatingPie <seandavidjohnson132@gmail.com>
Date: Thu, 11 Aug 2022 17:38:59 +0100
Subject: [PATCH] Final Tweaks

Finishing touches
---
 GainStation13/code/obj/structure/scale.dm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/GainStation13/code/obj/structure/scale.dm b/GainStation13/code/obj/structure/scale.dm
index 3ea75032..aed3bf0b 100644
--- a/GainStation13/code/obj/structure/scale.dm
+++ b/GainStation13/code/obj/structure/scale.dm
@@ -46,8 +46,11 @@
 	to_chat(fatty, "<span class='notice'>You weigh yourself.</span>")
 	to_chat(fatty, "<span class='notice'>The numbers on the screen tick up and eventually settle on:</span>")
 	//The appearance of the numbers changes with the fat level of the character
-	if (HAS_TRAIT(fatty, TRAIT_IMMOBILE) || HAS_TRAIT(fatty, TRAIT_BLOB))
-		to_chat(fatty, "<span class='alert'> <span class='big'>[src.lastreading/2000]TONS!!!</span></span>")
+	if (HAS_TRAIT(fatty, TRAIT_BLOB))
+		to_chat(fatty, "<span class='userdanger'><span class='big'>[round(src.lastreading/2000, 0.01)]TONS!!!</span></span>")
+	
+	else if (HAS_TRAIT(fatty, TRAIT_IMMOBILE))
+		to_chat(fatty, "<span class='boldannounce'>[src.lastreading]Lbs!</span>")
 
 	else if(HAS_TRAIT(fatty, TRAIT_OBESE) || HAS_TRAIT(fatty, TRAIT_MORBIDLYOBESE))
 		to_chat(fatty, "<span class='alert'>[src.lastreading]Lbs!</span>")
@@ -65,7 +68,7 @@
 				weighperson(HM)
 
 /obj/structure/scale/proc/weighperson(mob/living/carbon/human/fatty)
-	src.lastreading = (100 + (fatty.fatness))*(fatty.size_multiplier**2)
+	src.lastreading = round((100 + (fatty.fatness))*(fatty.size_multiplier**2))
 	weighEffect(fatty)
-	visible_message("<span class='notice'>[fatty] Weighs themselves.</span>")
+	visible_message("<span class='notice'>[fatty] weighs themselves.</span>")
 	visible_message("<span class='notice'>The numbers on the screen settle on: [src.lastreading]Lbs.</span>")