Merge pull request #725 from Erthilo/master

New Engineering Space Suits, health analysers detect bone fractures, pulling lying down people is slower, and some fixes
This commit is contained in:
CIB
2012-03-21 13:00:31 -07:00
15 changed files with 3272 additions and 3225 deletions
@@ -166,6 +166,7 @@
/mob/living/carbon/human/movement_delay()
var/tally = 0
var/mob/M = pulling
if(reagents.has_reagent("hyperzine")) return -1
@@ -192,10 +193,10 @@
/*if(mutations & FAT)
tally += 1.5*/
if (bodytemperature < 283.222)
if(bodytemperature < 283.222)
tally += (283.222 - bodytemperature) / 10 * 1.75
if (shock_stage >= 10) tally += 3
if(shock_stage >= 10) tally += 3
if(tally < 0)
tally = 0
@@ -203,6 +204,9 @@
if(mutations & mRun)
tally = 0
if(istype(M) && M.lying) //Pulling lying down people is slower
tally += 3
return tally
/mob/living/carbon/human/Stat()
@@ -350,7 +350,10 @@
/mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/weldingtool) && W:welding)
if (W:remove_fuel(0))
if(getBruteLoss() == 0)
user << "There are no dents to fix here!"
return
else if (W:remove_fuel(0))
bruteloss -= 30
if(getBruteLoss() < 0) bruteloss = 0
updatehealth()
@@ -363,8 +366,11 @@
else if(istype(W, /obj/item/weapon/cable_coil) && wiresexposed)
var/obj/item/weapon/cable_coil/coil = W
if(getFireLoss() == 0)
user << "There are no burnt wires here!"
return
else if(getFireLoss() < 0) adjustFireLoss(0)
adjustFireLoss(-30)
if(getFireLoss() < 0) adjustFireLoss(0)
updatehealth()
coil.use(1)
for(var/mob/O in viewers(user, null))