Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20

This commit is contained in:
Leshana
2018-01-21 00:23:00 -05:00
15 changed files with 283 additions and 115 deletions
+1 -1
View File
@@ -141,7 +141,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
//Bleeding out
var/blood_max = 0
var/blood_loss_divisor = 30 //lower factor = more blood loss
var/blood_loss_divisor = 30.01 //lower factor = more blood loss
// Some species bleed out differently
blood_loss_divisor /= species.bloodloss_rate