Fire extinguisher, burnt limbs, spectating improvements, option to disable spectating, jumpsuits for engi & mech, fireproof items, stuff

2015-11-18 20:02:45 +02:00
parent 7b6d92bb27
commit 9b08201972
36 changed files with 429 additions and 85 deletions
@@ -272,6 +272,7 @@ namespace Barotrauma
            DeathMsg[(int)CauseOfDeath.Drowning] = "drowned";
            DeathMsg[(int)CauseOfDeath.Suffocation] = "suffocated";
            DeathMsg[(int)CauseOfDeath.Pressure] = "been crushed by water pressure";
+            DeathMsg[(int)CauseOfDeath.Burn] = "burnt to death";
        }

        public Character(string file) : this(file, Vector2.Zero, null)
@@ -1030,6 +1031,8 @@ namespace Barotrauma

            AttackResult attackResult = closestLimb.AddDamage(simPosition, damageType, amount, bleedingAmount, playSound);
            health -= attackResult.Damage;
+            if (health <= 0.0f && damageType == DamageType.Burn) Kill(CauseOfDeath.Burn);
+
            bleeding += attackResult.Bleeding;

            return attackResult;