Merging SkyMarshal's stuff.

This commit is contained in:
Ren Erthilo
2012-03-30 16:26:04 +01:00
54 changed files with 3110 additions and 2211 deletions
+9 -1
View File
@@ -503,7 +503,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
e.brute_dam = 0.0
e.burn_dam = 0.0
e.bandaged = 0.0
e.wound_size = 0.0
e.max_damage = initial(e.max_damage)
e.bleeding = 0
e.open = 0
@@ -511,6 +510,15 @@ Traitors and the like can also be revived with the previous role mostly intact.
e.destroyed = 0
e.perma_injury = 0
e.update_icon()
for(var/datum/organ/wound/W in e.wounds)
if(W.bleeding)
W.stopbleeding()
H.vessel = new/datum/reagents(560)
H.vessel.my_atom = H
H.vessel.add_reagent("blood",560)
spawn(1)
H.fixblood()
H.pale = 0
H.update_body()
H.update_face()
H.UpdateDamageIcon()