shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[MIRROR] The blood loss change everyone's been raving about
This commit is contained in:
LetterJay
2017-04-26 06:30:00 -05:00
committed by GitHub
parent 417b80bb42 5f09fa4de8
commit dbaca1843d
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/mobs.dm
+1 -1
View File
@@ -10,7 +10,7 @@
#define BLOOD_VOLUME_MAXIMUM 2000 #define BLOOD_VOLUME_MAXIMUM 2000
#define BLOOD_VOLUME_SLIME_SPLIT 1120 #define BLOOD_VOLUME_SLIME_SPLIT 1120
#define BLOOD_VOLUME_NORMAL 560 #define BLOOD_VOLUME_NORMAL 560
#define BLOOD_VOLUME_SAFE 501 #define BLOOD_VOLUME_SAFE 475
#define BLOOD_VOLUME_OKAY 336 #define BLOOD_VOLUME_OKAY 336
#define BLOOD_VOLUME_BAD 224 #define BLOOD_VOLUME_BAD 224
#define BLOOD_VOLUME_SURVIVE 122 #define BLOOD_VOLUME_SURVIVE 122
code/__DEFINES/mobs.dm.rej
+8
View File
@@ -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
+2 -6
View File
@@ -65,12 +65,8 @@
listclearnulls(BP.embedded_objects) listclearnulls(BP.embedded_objects)
temp_bleed += 0.5*BP.embedded_objects.len temp_bleed += 0.5*BP.embedded_objects.len
if(brutedamage > 30) if(brutedamage >= 20)
temp_bleed += 0.5 temp_bleed += (brutedamage * 0.013)
if(brutedamage > 50)
temp_bleed += 1
if(brutedamage > 70)
temp_bleed += 2
bleed_rate = max(bleed_rate - 0.5, temp_bleed)//if no wounds, other bleed effects (heparin) naturally decreases bleed_rate = max(bleed_rate - 0.5, temp_bleed)//if no wounds, other bleed effects (heparin) naturally decreases