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

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm

code/modules/organs/wound.dm

@@ -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 **/