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

[MIRROR] The blood loss change everyone's been raving about

code/__DEFINES/mobs.dm

@@ -10,7 +10,7 @@
 #define BLOOD_VOLUME_MAXIMUM		2000
 #define BLOOD_VOLUME_SLIME_SPLIT	1120
 #define BLOOD_VOLUME_NORMAL			560
-#define BLOOD_VOLUME_SAFE			501
+#define BLOOD_VOLUME_SAFE			475
 #define BLOOD_VOLUME_OKAY			336
 #define BLOOD_VOLUME_BAD			224
 #define BLOOD_VOLUME_SURVIVE		122

code/__DEFINES/mobs.dm.rej

@@ -0,0 +1,8 @@
+diff a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm	(rejected hunks)
+@@ -107,4 +107,4 @@
+ #define INDIVIDUAL_SAY_LOG "Say log"
+ #define INDIVIDUAL_EMOTE_LOG "Emote log"
+ #define INDIVIDUAL_OOC_LOG "OOC log"
+-#define INDIVIDUAL_SHOW_ALL_LOG "All logs"
+\ No newline at end of file
++#define INDIVIDUAL_SHOW_ALL_LOG "All logs"

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