Merge remote-tracking branch 'upstream/master' into purges-assisted-organs

This commit is contained in:
Fox McCloud
2018-07-09 03:13:10 -04:00
10 changed files with 23 additions and 15 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
var/dead_icon
var/mob/living/carbon/human/owner = null
var/status = 0
var/vital //Lose a vital limb, die immediately.
var/vital = FALSE //Lose a vital limb, die immediately.
var/damage = 0 // amount of damage to the organ
var/min_bruised_damage = 10