cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

More Reagent Fixes/Tweaks (#7014)

Browse Source 
Fixes service module cyborgs dispensing drinks at the wrong temperature.
    Reagents that should be at room temperature will no longer be described as lukewarm.
This commit is contained in:
MarinaGryphon
2019-09-21 20:30:11 +03:00
committed by Erki
parent 68d9f474b5
commit fd49c178dc
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/taste.dm
+7 -3
View File
@@ -22,6 +22,7 @@ calculate text size per text.
var/list/out = list()
var/list/tastes = list() //descriptor = strength
var/lukewarm = 0 // should we allow it to be lukewarm or not
if(minimum_percent <= 100)
for(var/datum/reagent/R in reagent_list)
if(!R.taste_mult)
@@ -40,6 +41,8 @@ calculate text size per text.
tastes[taste_desc] += taste_amount
else
tastes[taste_desc] = taste_amount
if(!(R.default_temperature in (T0C + 15 to T0C + 25)))
lukewarm = 1
//deal with percentages
var/total_taste = 0
@@ -72,16 +75,17 @@ calculate text size per text.
if(T0C to T0C + 15)
temp_text = "cool"
if(T0C + 15 to T0C + 25)
temp_text = "lukewarm"
if(lukewarm)
temp_text = "lukewarm"
if(T0C + 25 to T0C + 40)
temp_text = "warm"
if(T0C + 40 to T0C + 100)
temp_text = "hot"
if(T0C + 100 to T0C + 120)
temp_text = "scolding hot"
temp_text = "scalding hot"
if(T0C + 120 to T0C + 200)
temp_text = "molten hot"
if(T0C + 200 to INFINITY)
temp_text = "lethally hot"
return "[temp_text] [english_list(out, "something indescribable")]."
return "[temp_text][temp_text ? " " : ""][english_list(out, "something indescribable")]."