git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2536 316c924e-a436-60f5-8080-3fe189b3f50e

This commit is contained in:
rockdtben
2011-11-20 15:53:23 +00:00
parent f733c08847
commit 84888d5ec3
57 changed files with 222 additions and 245 deletions
+2 -2
View File
@@ -10,8 +10,8 @@
usr << text("\red [src.name] looks slightly dented")
else
usr << text("\red <B>[src.name] looks severely dented!</B>")
if (src.fireloss)
if (src.fireloss < 75)
if (src.getFireLoss())
if (src.getFireLoss() < 75)
usr << text("\red [src.name] looks slightly burnt!")
else
usr << text("\red <B>[src.name] looks severely burnt!</B>")
+8 -11
View File
@@ -68,24 +68,21 @@
del(src)
return
var/b_loss = src.getBruteLoss()
var/f_loss = src.fireloss
switch(severity)
if(1.0)
if (src.stat != 2)
b_loss += 100
f_loss += 100
adjustBruteLoss(100)
adjustFireLoss(100)
src.gib(1)
return
if(2.0)
if (src.stat != 2)
b_loss += 60
f_loss += 60
adjustBruteLoss(60)
adjustFireLoss(60)
if(3.0)
if (src.stat != 2)
b_loss += 30
src.bruteloss = b_loss
src.fireloss = f_loss
adjustBruteLoss(30)
src.updatehealth()
/mob/living/silicon/hivebot/meteorhit(obj/O as obj)
@@ -93,9 +90,9 @@
M.show_message(text("\red [src] has been hit by [O]"), 1)
//Foreach goto(19)
if (src.health > 0)
src.bruteloss += 30
src.adjustBruteLoss(30)
if ((O.icon_state == "flaming"))
src.fireloss += 40
src.adjustFireLoss(40)
src.updatehealth()
return
+2 -2
View File
@@ -35,7 +35,7 @@
bruteloss = max(getBruteLoss(), 0)
toxloss = 0
oxyloss = 0
fireloss = max(fireloss, 0)
adjustFireLoss(0)
use_power()
@@ -70,7 +70,7 @@
handle_regular_status_updates()
health = src.health_max - (fireloss + getBruteLoss())
health = src.health_max - (getFireLoss() + getBruteLoss())
if(health <= 0)
death()
+1 -1
View File
@@ -34,7 +34,7 @@
/mob/living/silicon/hive_mainframe/updatehealth()
if (src.nodamage == 0)
src.health = 100 - src.fireloss - src.getBruteLoss()
src.health = 100 - src.getFireLoss() - src.getBruteLoss()
else
src.health = 100
src.stat = 0
+1 -1
View File
@@ -38,7 +38,7 @@
var/dat = "\blue Analyzing Results for [C]:\n"
dat += "\blue \t Overall Status: [C.stat > 1 ? "dead" : "[C.health]% healthy"]\n"
dat += "\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.getToxLoss() > 50 ? "\red" : "\blue"][C.getToxLoss()]-[C.fireloss > 50 ? "\red" : "\blue"][C.fireloss]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]\n"
dat += "\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.getToxLoss() > 50 ? "\red" : "\blue"][C.getToxLoss()]-[C.getFireLoss() > 50 ? "\red" : "\blue"][C.getFireLoss()]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]\n"
dat += "\blue \t Key: Suffocation/Toxin/Burns/Brute\n"
dat += "\blue \t Body Temperature: [C.bodytemperature-T0C]&deg;C ([C.bodytemperature*1.8-459.67]&deg;F)"
if(C.virus)