cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added colour hints to the sleepers about overdoses. Removed absorption overdose in favour of amount overdose.

Browse Source
This commit is contained in:
Ren Erthilo
2012-03-24 04:36:25 +00:00
parent 97f94187ff
commit 7eae871ece
2 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/Sleeper.dm
+3 -3
View File
@@ -68,9 +68,9 @@
dat += text("<HR>Paralysis Summary %: [] ([] seconds left!)<BR>", occupant.paralysis, round(occupant.paralysis / 4))
dat += text("Inaprovaline units: [] units<BR>", occupant.reagents.get_reagent_amount("inaprovaline"))
dat += text("Soporific: [] units<BR>", occupant.reagents.get_reagent_amount("stoxin"))
dat += text("Dermaline: [] units<BR>", occupant.reagents.get_reagent_amount("dermaline"))
dat += text("Bicaridine: [] units<BR>", occupant.reagents.get_reagent_amount("bicaridine"))
dat += text("Dexalin: [] units<BR>", occupant.reagents.get_reagent_amount("dexalin"))
dat += text("[]\tDermaline: [] units</FONT><BR>", (occupant.reagents.get_reagent_amount("dermaline") < 30 ? "<font color='black'>" : "<font color='red'>"), occupant.reagents.get_reagent_amount("dermaline"))
dat += text("[]\tBicaridine: [] units<BR>", (occupant.reagents.get_reagent_amount("bicaridine") < 30 ? "<font color='black'>" : "<font color='red'>"), occupant.reagents.get_reagent_amount("bicaridine"))
dat += text("[]\tDexalin: [] units<BR>", (occupant.reagents.get_reagent_amount("dexalin") < 30 ? "<font color='black'>" : "<font color='red'>"), occupant.reagents.get_reagent_amount("dexalin"))
dat += text("<HR><A href='?src=\ref[];refresh=1'>Refresh meter readings each second</A><BR><A href='?src=\ref[];inap=1'>Inject Inaprovaline</A><BR><A href='?src=\ref[];stox=1'>Inject Soporific</A><BR><A href='?src=\ref[];derm=1'>Inject Dermaline</A><BR><A href='?src=\ref[];bic=1'>Inject Bicaridine</A><BR><A href='?src=\ref[];dex=1'>Inject Dexalin</A>", src, src, src, src, src, src)
else
dat += "The sleeper is empty."
code/modules/chemical/Chemistry-Reagents.dm
+41 -33
View File
@@ -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