cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #567 from SkyMarshal/master

Browse Source 
Some fixes for traitor uplinks, added overdoses for some chems by Laser50
This commit is contained in:
Tastyfish
2012-02-29 17:00:12 -08:00
parent 2b3fbc5047 e574bf251a
commit 227a6d0541
5 changed files with 82 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Reagents.dm
+72 -6
View File
@@ -399,6 +399,9 @@ datum
if(25 to INFINITY)
M.Paralyse(20)
M.drowsyness = max(M:drowsyness, 30)
// NO.
// if(50 to INFINITY)
// M:adjustToxLoss(0.1)
data++
..()
return
@@ -434,6 +437,8 @@ datum
M.slurring = 0
M.confused = 0
M.jitteriness = 0
if(50 to INFINITY)
M:adjustToxLoss(0.1)
..()
return
@@ -460,12 +465,16 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M.druggy = max(M.druggy, 15)
if(isturf(M.loc) && !istype(M.loc, /turf/space))
if(M.canmove)
if(prob(10)) step(M, pick(cardinal))
if(prob(7)) M:emote(pick("twitch","drool","moan","giggle"))
holder.remove_reagent(src.id, 0.2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
return
serotrotium
@@ -593,6 +602,7 @@ datum
if(M.canmove && istype(M.loc, /turf/space))
step(M, pick(cardinal))
if(prob(5)) M:emote(pick("twitch","drool","moan"))
M:adjustToxLoss(1)
..()
return
@@ -831,7 +841,6 @@ datum
M.adjustToxLoss(100)
M:antibodies |= M:virus2.antigen
..()
return
@@ -851,8 +860,13 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M.mutations = 0
M.disabilities = 0
switch(data)
if(50 to INFINITY)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1153,10 +1167,14 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
if(M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature-20)
else if(M.bodytemperature < 311)
M.bodytemperature = min(310, M.bodytemperature+20)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1169,10 +1187,14 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M.make_dizzy(1)
if(!M.confused) M.confused = 1
M.confused = max(M.confused, 20)
holder.remove_reagent(src.id, 0.2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1205,7 +1227,11 @@ datum
if(M.stat == 2.0)
return
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:heal_organ_damage(0,2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1220,7 +1246,11 @@ datum
if(M.stat == 2.0) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN
return
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:heal_organ_damage(0,3)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1235,9 +1265,13 @@ datum
if(M.stat == 2.0)
return //See above, down and around. --Agouri
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:adjustOxyLoss(-2)
if(holder.has_reagent("lexorin"))
holder.remove_reagent("lexorin", 2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1252,9 +1286,13 @@ datum
if(M.stat == 2.0)
return
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:oxyloss = 0
if(holder.has_reagent("lexorin"))
holder.remove_reagent("lexorin", 2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1377,10 +1415,14 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:jitteriness = max(M:jitteriness-5,0)
if(prob(80)) M:adjustBrainLoss(1)
if(prob(50)) M:drowsyness = max(M:drowsyness, 3)
if(prob(10)) M:emote("drool")
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1394,6 +1436,8 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:radiation = max(M:radiation-3,0)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1408,11 +1452,15 @@ datum
if(M.stat == 2.0)
return //See above, down and around. --Agouri
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:radiation = max(M:radiation-7,0)
M:adjustToxLoss(-1)
if(prob(15))
M.take_organ_damage(1, 0)
..()
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
return
alkysine
@@ -1425,6 +1473,7 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:adjustBrainLoss(-3)
M:adjustToxLoss(0.1)
..()
return
@@ -1437,10 +1486,13 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:eye_blurry = max(M:eye_blurry-5 , 0)
M:eye_blind = max(M:eye_blind-5 , 0)
M:disabilities &= ~1
// M:sdisabilities &= ~1 Replaced by eye surgery
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
..()
return
@@ -1455,7 +1507,11 @@ datum
if(M.stat == 2.0)
return
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:heal_organ_damage(2,0)
if(data >= 50)
M:adjustToxLoss(0.1)
..()
return
@@ -1468,8 +1524,12 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
if(prob(5)) M:emote(pick("twitch","blink_r","shiver"))
holder.remove_reagent(src.id, 0.2)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/5),3))
..()
return
@@ -1517,7 +1577,11 @@ datum
color = "#C8A5DC" // rgb: 200, 165, 220
on_mob_life(var/mob/living/M as mob)//no more mr. panacea
if(!data) data = 1
data++
holder.remove_reagent(src.id, 0.1)
if(data >= 50)
M:adjustToxLoss(min(((data-50)/10),3))
return
carpotoxin
@@ -1557,7 +1621,7 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M:bodytemperature -= 50 //This and the following two lines need to be checked and tinkered with so that the Cryo-In-A-Syringe
M:bodytemperature = max(M:bodytemperature - 30, 100) //This and the following two lines need to be checked and tinkered with so that the Cryo-In-A-Syringe
if(prob(5)) // leaves someone at 100% healthy from anything up to in heavy crit (-75%)
M.take_organ_damage(0, 1)
if(prob(80) && istype(M, /mob/living/carbon/metroid))
@@ -1579,7 +1643,11 @@ datum
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if(!data) data = 1
data++
M:hallucination += 5
if(data >= 50)
M:adjustToxLoss(0.1)
..()
return
@@ -4043,6 +4111,4 @@ datum
else if(data >= 115 && prob(60))
M.confused = max(M:confused+15,15)
..()
return*/
return*/