diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 5b0bdbc11e..21740c1b2b 100644 --- a/code/__DEFINES/mobs.dm +++ b/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 diff --git a/code/__DEFINES/mobs.dm.rej b/code/__DEFINES/mobs.dm.rej new file mode 100644 index 0000000000..9df0109926 --- /dev/null +++ b/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" diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index c83ebe90d3..ca380170f7 100644 --- 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