Merge pull request #1609 from VOREStation/polaris-sync-2017-06-01

Polaris sync 2017 06 01
This commit is contained in:
Arokha Sieyes
2017-06-03 00:43:51 -04:00
committed by GitHub
90 changed files with 1776 additions and 1273 deletions
+1 -2
View File
@@ -44,7 +44,7 @@
var/damage_type = CUT
// whether this wound needs a bandage/salve to heal at all
// the maximum amount of damage that this wound can have and still autoheal
var/autoheal_cutoff = 15
var/autoheal_cutoff = 10
@@ -336,7 +336,6 @@ datum/wound/puncture/massive
"moderate bruise" = 20, "small bruise" = 10, "tiny bruise" = 5)
bleed_threshold = 20
max_bleeding_stage = 2 //only huge bruise and above can bleed.
autoheal_cutoff = 30
damage_type = BRUISE
/** BURNS **/