reverts the bleed changes till they can be better tuned

This commit is contained in:
Poojawa
2019-09-12 00:14:26 -05:00
parent 4408d1b684
commit 65a89030eb
13 changed files with 28 additions and 152 deletions
+4 -6
View File
@@ -96,11 +96,9 @@
if(brutedamage >= 20)
temp_bleed += (brutedamage * 0.013)
bleed_rate = max(bleed_rate - 0.25, temp_bleed)//if no wounds, other bleed effects (heparin) naturally decreases //since blood loss is capped, reduced the heal rate
bleed_rate = max(bleed_rate - 0.50, temp_bleed)//if no wounds, other bleed effects (heparin) naturally decreases
if(bleed_rate && !bleedsuppress && !(HAS_TRAIT(src, TRAIT_FAKEDEATH)))
if(bleed_rate >= 30) //let's cap blood loss.
bleed_rate = 30
bleed(bleed_rate)
//Makes a blood drop, leaking amt units of blood from the mob
@@ -287,7 +285,7 @@
drop.drips++
drop.add_overlay(pick(drop.random_icon_states))
drop.transfer_mob_blood_dna(src)
src.transfer_blood_to(drop, 2)
// src.transfer_blood_to(drop, 2)
drop.update_icon()
return
else
@@ -297,7 +295,7 @@
else
drop = new(T, get_static_viruses())
drop.transfer_mob_blood_dna(src)
src.transfer_blood_to(drop, 2)
// src.transfer_blood_to(drop, 2)
drop.update_icon()
return
@@ -308,7 +306,7 @@
if(B.bloodiness < MAX_SHOE_BLOODINESS) //add more blood, up to a limit
B.bloodiness += BLOOD_AMOUNT_PER_DECAL
B.transfer_mob_blood_dna(src) //give blood info to the blood decal.
src.transfer_blood_to(B, 10) //very heavy bleeding, should logically leave larger pools
// src.transfer_blood_to(B, 10) //very heavy bleeding, should logically leave larger pools
if(temp_blood_DNA)
B.blood_DNA |= temp_blood_DNA
@@ -813,8 +813,6 @@
for(var/datum/mutation/human/HM in dna.mutations)
if(HM.quality != POSITIVE)
dna.remove_mutation(HM.name)
if(bleed_rate)
bleed_rate = 0
if(blood_volume < (BLOOD_VOLUME_NORMAL*blood_ratio))
blood_volume = (BLOOD_VOLUME_NORMAL*blood_ratio)
..()
@@ -1687,7 +1687,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
bloody = 1
var/turf/location = H.loc
if(istype(location))
H.bleed_rate += 2 //This usually stacks pretty quickly, death by a thousand cuts, etc etc.
H.bleed(totitemdamage)
if(get_dist(user, H) <= 1) //people with TK won't get smeared with blood
user.add_mob_blood(H)