From 7eae871ece0f69c8525c4173ea91c57e1824f603 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Sat, 24 Mar 2012 04:36:25 +0000 Subject: [PATCH] Added colour hints to the sleepers about overdoses. Removed absorption overdose in favour of amount overdose. --- code/game/machinery/Sleeper.dm | 6 +- code/modules/chemical/Chemistry-Reagents.dm | 74 ++++++++++++--------- 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 32ff757a2ad..2b28618e3ae 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -68,9 +68,9 @@ dat += text("
Paralysis Summary %: [] ([] seconds left!)
", occupant.paralysis, round(occupant.paralysis / 4)) dat += text("Inaprovaline units: [] units
", occupant.reagents.get_reagent_amount("inaprovaline")) dat += text("Soporific: [] units
", occupant.reagents.get_reagent_amount("stoxin")) - dat += text("Dermaline: [] units
", occupant.reagents.get_reagent_amount("dermaline")) - dat += text("Bicaridine: [] units
", occupant.reagents.get_reagent_amount("bicaridine")) - dat += text("Dexalin: [] units
", occupant.reagents.get_reagent_amount("dexalin")) + dat += text("[]\tDermaline: [] units
", (occupant.reagents.get_reagent_amount("dermaline") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("dermaline")) + dat += text("[]\tBicaridine: [] units
", (occupant.reagents.get_reagent_amount("bicaridine") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("bicaridine")) + dat += text("[]\tDexalin: [] units
", (occupant.reagents.get_reagent_amount("dexalin") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("dexalin")) dat += text("
Refresh meter readings each second
Inject Inaprovaline
Inject Soporific
Inject Dermaline
Inject Bicaridine
Inject Dexalin", src, src, src, src, src, src) else dat += "The sleeper is empty." diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 4e4d505766a..a1602f1192a 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -447,8 +447,8 @@ datum M.slurring = 0 M.confused = 0 M.jitteriness = 0 - if(125 to INFINITY) - M:adjustToxLoss(0.1) +// if(125 to INFINITY) +// M:adjustToxLoss(0.1) ..() return @@ -876,9 +876,11 @@ datum data++ M.mutations = 0 M.disabilities = 0 - switch(data) - if(100 to INFINITY) - M:adjustToxLoss(0.2) + if(volume > REAGENTS_OVERDOSE) + M:adjustToxLoss(1) +// switch(data) +// if(100 to INFINITY) +// M:adjustToxLoss(0.2) ..() return @@ -1186,8 +1188,10 @@ datum M.bodytemperature = max(310, M.bodytemperature-20) else if(M.bodytemperature < 311) M.bodytemperature = min(310, M.bodytemperature+20) - if(data >= 100) - M:adjustToxLoss(0.2) + if(volume > REAGENTS_OVERDOSE) + M:adjustToxLoss(1) +// if(data >= 100) +// M:adjustToxLoss(0.2) //This takes like 5 units now. ..() return @@ -1206,8 +1210,10 @@ datum if(!M.confused) M.confused = 1 M.confused = max(M.confused, 20) holder.remove_reagent(src.id, 0.2) - if(data >= 50) - M:adjustToxLoss(0.2) + if(volume > REAGENTS_OVERDOSE) + M:adjustToxLoss(1) +// if(data >= 50) +// M:adjustToxLoss(0.2) ..() return @@ -1245,8 +1251,8 @@ datum M:heal_organ_damage(0,1) if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 125) - M:adjustToxLoss(0.1) +// if(data >= 125) +// M:adjustToxLoss(0.1) ..() return @@ -1266,8 +1272,8 @@ datum M:heal_organ_damage(0,3) if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 125) - M:adjustToxLoss(0.2) +// if(data >= 125) +// M:adjustToxLoss(0.2) ..() return @@ -1289,8 +1295,8 @@ datum holder.remove_reagent("lexorin", 2) if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 125) - M:adjustToxLoss(0.2) +// if(data >= 125) +// M:adjustToxLoss(0.2) ..() return @@ -1312,8 +1318,8 @@ datum holder.remove_reagent("lexorin", 2) if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 50) - M:adjustToxLoss(0.2) +// if(data >= 50) +// M:adjustToxLoss(0.2) ..() return @@ -1448,8 +1454,8 @@ datum if(prob(10)) M:emote("drool") if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 50) - M:adjustToxLoss(0.4) +// if(data >= 50) +// M:adjustToxLoss(0.4) ..() return @@ -1465,8 +1471,8 @@ datum M:radiation = max(M:radiation-3,0) if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 50) - M:adjustToxLoss(0.2) +// if(data >= 50) +// M:adjustToxLoss(0.2) ..() return @@ -1490,8 +1496,8 @@ datum ..() if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 50) - M:adjustToxLoss(0.3) +// if(data >= 50) +// M:adjustToxLoss(0.3) return alkysine @@ -1526,8 +1532,8 @@ datum M:disabilities &= ~1 if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 100) - M:adjustToxLoss(0.2) +// if(data >= 100) +// M:adjustToxLoss(0.2) ..() return @@ -1547,8 +1553,8 @@ datum M:heal_organ_damage(2,0) if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 125) - M:adjustToxLoss(0.2) +// if(data >= 125) +// M:adjustToxLoss(0.2) ..() return @@ -1567,8 +1573,8 @@ datum holder.remove_reagent(src.id, 0.2) if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 50) - M:adjustToxLoss(0.2) +// if(data >= 50) +// M:adjustToxLoss(0.2) ..() return @@ -1621,8 +1627,8 @@ datum holder.remove_reagent(src.id, 0.1) if(volume > REAGENTS_OVERDOSE) M:adjustToxLoss(1) - if(data >= 100) - M:adjustToxLoss(0.1) +// if(data >= 100) +// M:adjustToxLoss(0.1) return carpotoxin @@ -1687,8 +1693,10 @@ datum if(!data) data = 1 data++ M:hallucination += 5 - if(data >= 100) - M:adjustToxLoss(0.1) + if(volume > REAGENTS_OVERDOSE) + M:adjustToxLoss(1) +// if(data >= 100) +// M:adjustToxLoss(0.1) ..() return