From 46eb618f02816b8fe9623b2e5d23224c674a4760 Mon Sep 17 00:00:00 2001
From: DeltaFire <andreoxgrievous@gmail.com>
Date: Mon, 3 Jan 2022 02:36:03 +0100
Subject: [PATCH] more hud stuff

color coding
percentage instead of blood volume
indicator for if active cooling or not (small + and the bar changes to blue)
---
 code/_onclick/hud/human.dm |  34 +++++++++++++++++++++++-----------
 icons/mob/screen_synth.dmi | Bin 672 -> 806 bytes
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index fe8a716234..eb3016a06f 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -101,10 +101,10 @@
 
 /atom/movable/screen/synth/coolant_counter/update_counter(mob/living/carbon/owner)
 	..()
-	var/valuecolor = "#FF6666"
+	var/valuecolor = "#ff2525"
 	if(owner.stat == DEAD)
 		maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='[valuecolor]'>ERR-0F</font></div>"
-		icon_state = "coolant-3"
+		icon_state = "coolant-31"
 		return
 	var/coolant_efficiency
 	var/coolant
@@ -115,23 +115,35 @@
 		coolant_efficiency = rand(1, 15) / 10
 		coolant = rand(1, 600)
 		jammed--
-	if(coolant > BLOOD_VOLUME_SAFE * owner.blood_ratio)
-		valuecolor =  "#FFDDDD"
+	if(coolant > BLOOD_VOLUME_SAFE * owner.blood_ratio)	//I unfortunately have to use this else-if stack because switch doesn't support variables.
+		valuecolor =  "#4bbd34"
+	else if(coolant > BLOOD_VOLUME_OKAY * owner.blood_ratio)
+		valuecolor = "#dabb0d"
 	else if(coolant > BLOOD_VOLUME_BAD * owner.blood_ratio)
-		valuecolor =  "#FFAAAA"
-	maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='[valuecolor]'>[round(coolant,1)]</font></div>"
+		valuecolor =  "#dd8109"
+	else if(coolant > BLOOD_VOLUME_SURVIVE * owner.blood_ratio)
+		valuecolor = "#e7520d"
+	maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='[valuecolor]'>[round((coolant / (BLOOD_VOLUME_NORMAL * owner.blood_ratio)) * 100, 1)]</font></div>"
 
+	var/efficiency_suffix
+	var/state_suffix
 	switch(coolant_efficiency)
 		if(-INFINITY to 0.4)
-			icon_state = "coolant-1"
+			efficiency_suffix = "1"
 		if(0.4 to 0.75)
-			icon_state = "coolant-2"
+			efficiency_suffix = "2"
 		if(0.75 to 0.95)
-			icon_state = "coolant-3"
+			efficiency_suffix = "3"
 		if(0.95 to 1.3)
-			icon_state = "coolant-4"
+			efficiency_suffix = "4"
 		else
-			icon_state = "coolant-5"
+			efficiency_suffix = "5"
+	var/obj/item/organ/lungs/ipc/L = owner.getorganslot(ORGAN_SLOT_LUNGS)
+	if(istype(L) && L.is_cooling)
+		state_suffix = "2"
+	else
+		state_suffix = "1"
+	icon_state = "coolant-[efficiency_suffix]-[state_suffix]"
 
 /atom/movable/screen/synth/coolant_counter/examine(mob/user)
 	. = ..()
diff --git a/icons/mob/screen_synth.dmi b/icons/mob/screen_synth.dmi
index 6c3e6b3e79d7199bc8f7e8552e91b1ed48cd5d4b..95ecc5e2bbd6bde1dd25425c50d77c23fdd07ed7 100644
GIT binary patch
delta 737
zcmV<70v`RK1*QgHiBL{Q4GJ0x0000DNk~Le0001h0001B1Oos704G#udH?_bAy7<I
zMZmzow6wH~i;G#p|AK;oE-o%@ZEdfAE5SiF0Dlg^z`%Xk1~>o!00DGTPE!Ct=GbNc
z005AYTvC76P>G8(C9|j)C~C;XnO2mTn+joLQENoBS|bw7H6p=WV-n0YCc#`263jIr
z!CX@k%r(VruCjuwp9?sm0dGZ$Y6Oms=>Px%7fD1xR9J=Wmc35HFc5&<yn!Q%U_6%r
zMwB-|yZ}N`VXTl+7~3T?9Z**yG30Hr^Mill_<VnDkvin2esOZ~Ij+BB?95`u59b+g
z;$Y^fPyseCAZk2Ozi%EN`WrN7_i^K(CX@DWFn9q`<9wdWcv6>u&P?#4i}nJQ6Uh7E
z>H?LSxGV~t63EPSLRpr)K;;B<!eS+W$}E{18S@mV%o3v{Srky&oWZgzOY;rSS(X7d
zZq9#T-Q1x0tx154pLPwtiXBkd+*tYkMczPUxsi0n_r2OEL}tP$YNxg;k<G36DRvOz
zl@LQ#fA7DVZq)<h-2NLKmNf|8tSskOZB3)xod*uHS=t^^@`P$?3b638JYd`3qCYgL
z+#T^3`qZWJX~Z&A)ge3uoBD&PKj>11`+<MT!<O$ij{hBgtvzh|eqGxBce(zk25h;p
zTy7!6KY2CasXuV~gL1uv5c}7__^!+5vyHRr3thJQgJNU*f50mbTfR>n|Hm-ue@cJg
z^*^OQ@cW<AA9(#g^#?Sbf*rR=ai3{Cu>K$znE&zTd*4@%|Es7OXy0Ggw*Om3L;HEY
zzN=u!=mhjJ`z<OMFg^jy|5#xD$1Bh;^!gu7U>x&a|Dy>o_Yr2`_dj6<e*aU}!0Z42
zUjx+tSfKvL0`)&$gYiP2|Iq}f|Ir#S|6_ss9}C?7=p3T_AC=_@vGh-c`5faHu3U9%
Tjj}zi00000NkvXXu0mjfpf6#U

delta 602
zcmV-g0;T<?2A~C8iBL{Q4GJ0x0000DNk~Le0001B0000$1Oos702dl>Jpcdz9#BkF
zMZmzow6wH~i;IGSf-WvDZEbC@e=EU3Ho(BZ0DlhP`1fW20004WQchC<K<3zH0001d
zkzZ1OiHkEOv#1y-X2`{vR+N~V3SncYG$LB1G0`ebh*oKeOQo`ctDg%v2mmlxOB4FU
zpk4p~0jNntK~zYI-IY5|#4r$soxOp>B1CCZAX+#9QWUi177n7^E!-1nm2(i$<hIz(
z!xMYrNkH0ysq$H#S8UJE*p)5g>pA1jRx{6kr8TjNclPt)<#}A7S=eOx7=dQKFO0p~
zB|$TjTn*MQP`nexXxuJP%;c?7K7=5d`2eO&vykGG%jg5BqZBEwv~}2n2t_VZtjn`;
z0416t1;sE!skIgq!wi+%K=7s>EYEtls9L00SLfM57R{U4kl<3ggYyyI8+%a8tWNHK
zYJehZdleF#_m^)9@G0xr(I2IZ*<Sal=11$`xxcLeo0=qde}eP7#??6S@E!tYS>8WE
z^8jtlkR`@uAoSmIeB=}lBj?6X1&V(+$hMEle`8ykT=yHjQTi}5N)O`wOM1|v4$FFQ
z-=Pl6deA+!h(kgTz9i-V=YJdM0ons~m^+7Vt_KIK2RQ$`k5+^nJAkqCU9=+P*a4J`
z>Omp{t_O(>xE`c>K=t77Jp{TOa^%1QU5+@iaQ;Vn5Z43(VtNocka`f+MCn0jv>t>;
o>p_%bl^&p88wT09E6vxiA7{UQcUpqhO8@`>07*qoM6N<$f^QBEVE_OC