Merge pull request #392 from CIB/master

Fixes to shock-crit and co
This commit is contained in:
SkyMarshal
2012-02-09 14:45:47 -08:00

View File

@@ -115,17 +115,14 @@
handle_health_updates()
// if the mob has enough health, she should slowly heal
if(health >= 0)
var/pr = 5
var/pr = 10
if(stat == 1) // sleeping means faster healing
pr += 3
pr += 5
if(prob(pr))
heal_organ_damage(1,1)
adjustToxLoss(-1)
else if(health < 0)
var/pr = 8
// sleeping means slower damage
if(stat == 1)
pr = 3
var/pr = 80
if(prob(pr))
adjustToxLoss(1)
@@ -1203,4 +1200,4 @@
else if(shock_stage == 40)
src << "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
else if(shock_stage == 80)
src << "<font color='red'><b>"+pick("You see a light at the end of the tunnel!", "You feel like you could die any moment now.", "You're about to lose consciousness.")
src << "<font color='red'><b>"+pick("You see a light at the end of the tunnel!", "You feel like you could die any moment now.", "You're about to lose consciousness.")