Merge pull request #570 from Citadel-Station-13/upstream-merge-26539

[MIRROR] The blood loss change everyone's been raving about
2017-04-26 06:30:00 -05:00
parent 417b80bb42 5f09fa4de8
commit dbaca1843d
3 changed files with 11 additions and 7 deletions
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -65,12 +65,8 @@
 			listclearnulls(BP.embedded_objects)
 			temp_bleed += 0.5*BP.embedded_objects.len

-			if(brutedamage > 30)
-				temp_bleed += 0.5
-			if(brutedamage > 50)
-				temp_bleed += 1
-			if(brutedamage > 70)
-				temp_bleed += 2
+			if(brutedamage >= 20)
+				temp_bleed += (brutedamage * 0.013)

 		bleed_rate = max(bleed_rate - 0.5, temp_bleed)//if no wounds, other bleed effects (heparin) naturally decreases