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

reverts the bleed changes till they can be better tuned

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
-8
View File
@@ -334,10 +334,6 @@
if(ghost)
ghost.reenter_corpse()
L.revive(1, 1)
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.bleed_rate)
H.bleed_rate = 0 // just a double check, since it's a full heal.
var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
animate(V, alpha = 0, transform = matrix()*2, time = 8)
playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
@@ -365,10 +361,6 @@
vitality_for_cycle = 2
vitality_for_cycle = min(GLOB.clockwork_vitality, vitality_for_cycle)
var/vitality_used = L.heal_ordered_damage(vitality_for_cycle, damage_heal_order)
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.bleed_rate)
H.bleed_rate -= vitality_for_cycle //might as well make this reduce bleeding as per the healing too.
if(!vitality_used)
break
code/modules/antagonists/cult/blood_magic.dm
-2
View File
@@ -687,8 +687,6 @@
H.adjustToxLoss((overall_damage*ratio) * (H.getToxLoss() / overall_damage), 0)
H.adjustFireLoss((overall_damage*ratio) * (H.getFireLoss() / overall_damage), 0)
H.adjustBruteLoss((overall_damage*ratio) * (H.getBruteLoss() / overall_damage), 0)
if(H.bleed_rate)
H.bleed_rate -= 20
H.updatehealth()
playsound(get_turf(H), 'sound/magic/staff_healing.ogg', 25)
new /obj/effect/temp_visual/cult/sparks(get_turf(H))
code/modules/mob/living/blood.dm
+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
code/modules/mob/living/carbon/human/human.dm
-2
View File
@@ -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)
..()
code/modules/mob/living/carbon/human/species.dm
+1 -1
View File
@@ -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)
code/modules/projectiles/guns/misc/medbeam.dm
-6
View File
@@ -118,12 +118,6 @@
target.adjustFireLoss(-4)
target.adjustToxLoss(-1, forced = TRUE)
target.adjustOxyLoss(-1)
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.bleed_rate)
H.bleed_rate -= 1
if(H.radiation)
H.radiation -= 10 //it heals toxin, why wouldn't it also heal radiation?
return
/obj/item/gun/medbeam/proc/on_beam_release(var/mob/living/target)
code/modules/projectiles/projectile.dm
+3 -19
View File
@@ -176,27 +176,11 @@
new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir, bloodtype_to_color())
if(iscarbon(L))
if(ishuman(L))
var/mob/living/carbon/human/H = L
var/armorsave
if(flag == "bullet")
armorsave = H.getarmor(B, "bullet")
else if(flag == "energy")
armorsave = H.getarmor(B, "energy")
else if(flag == "magic")
armorsave = H.getarmor(B, "magic")
if(armorsave >= 30) // armor is useful again, yay.
H.bleed_rate += (damage * 0.15) // a tiny bit of shrapnel and internal bleeding, I guess.
else
H.bleed_rate += (damage * 0.50) //it's not a 1:1 deletion of blood, but it's worrysome enough that you should get treated asap
else
var/mob/living/carbon/C = L
C.bleed(damage)
if(prob(33))
var/mob/living/carbon/C = L
C.bleed(damage)
else
L.add_splatter_floor(target_loca)
else if(impact_effect_type && !hitscan)
new impact_effect_type(target_loca, hitx, hity)
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+13 -77
View File
@@ -63,10 +63,6 @@
M.cure_all_traumas(TRAUMA_RESILIENCE_MAGIC)
if(M.blood_volume < (BLOOD_VOLUME_NORMAL*M.blood_ratio))
M.blood_volume = (BLOOD_VOLUME_NORMAL*M.blood_ratio)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate = 0
for(var/thing in M.diseases)
var/datum/disease/D = thing
@@ -148,10 +144,6 @@
M.adjustFireLoss(-power, 0)
M.adjustToxLoss(-power, 0, TRUE) //heals TOXINLOVERs
M.adjustCloneLoss(-power, 0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 5
REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration
. = 1
metabolization_rate = REAGENTS_METABOLISM * (0.00001 * (M.bodytemperature ** 2) + 0.5)
@@ -304,10 +296,6 @@
to_chat(M, "<span class='warning'>You don't feel so good...</span>")
else if(M.getBruteLoss())
M.adjustBruteLoss(-reac_volume)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= reac_volume
if(show_message)
to_chat(M, "<span class='danger'>You feel your bruises healing! It stings like hell!</span>")
M.emote("scream")
@@ -377,10 +365,6 @@
C.adjustBruteLoss(-0.25*REM, 0)
C.adjustFireLoss(-0.25*REM, 0)
C.adjustStaminaLoss(-0.5*REM, 0)
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(H.bleed_rate)
H.bleed_rate -= 0.25
..()
return TRUE
@@ -422,10 +406,6 @@
if(method in list(PATCH, TOUCH))
M.adjustBruteLoss(-1.25 * reac_volume)
M.adjustFireLoss(-1.25 * reac_volume)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= (1.25 * reac_volume)
if(show_message)
to_chat(M, "<span class='danger'>You feel your burns and bruises healing! It stings like hell!</span>")
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
@@ -464,10 +444,6 @@
M.adjustOxyLoss(-0.5*REM, 0)
M.adjustBruteLoss(-0.5*REM, 0)
M.adjustFireLoss(-0.5*REM, 0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 0.25
..()
. = 1
@@ -609,10 +585,6 @@
if(prob(33))
M.adjustBruteLoss(-0.5*REM, 0)
M.adjustFireLoss(-0.5*REM, 0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 0.25
..()
return TRUE
@@ -807,10 +779,6 @@
M.adjustBruteLoss(-2*REM, 0)
M.adjustFireLoss(-2*REM, 0)
M.adjustOxyLoss(-5*REM, 0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 5
. = 1
M.losebreath = 0
if(prob(20))
@@ -847,10 +815,6 @@
if(M.losebreath < 0)
M.losebreath = 0
M.adjustStaminaLoss(-0.5*REM, 0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 0.5 //basically doubles natural clotting for reasons
. = 1
if(prob(20))
M.AdjustStun(-20, 0)
@@ -1030,10 +994,6 @@
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-2*REM, 0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 2
..()
. = 1
@@ -1131,10 +1091,6 @@
M.adjustOxyLoss(-1*REM, 0)
M.adjustToxLoss(-1*REM, 0)
. = 1
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 0.5
..()
/datum/reagent/medicine/tricordrazine/overdose_process(mob/living/M)
@@ -1158,10 +1114,6 @@
M.adjustFireLoss(-1.5*REM, 0)
M.adjustOxyLoss(-1.5*REM, 0)
M.adjustToxLoss(-1.5*REM, 0, TRUE) //heals TOXINLOVERs
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 2
. = 1
..()
@@ -1181,10 +1133,6 @@
M.adjustBrainLoss(-15*REM)
M.adjustCloneLoss(-3*REM, 0)
M.adjustStaminaLoss(-20*REM,0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 10
..()
. = 1
@@ -1200,23 +1148,19 @@
pH = 11.8
/datum/reagent/medicine/neo_jelly/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-1.5*REM, 0)
M.adjustFireLoss(-1.5*REM, 0)
M.adjustOxyLoss(-1.5*REM, 0)
M.adjustToxLoss(-1.5*REM, 0, TRUE) //heals TOXINLOVERs
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 2
. = 1
..()
M.adjustBruteLoss(-1.5*REM, 0)
M.adjustFireLoss(-1.5*REM, 0)
M.adjustOxyLoss(-1.5*REM, 0)
M.adjustToxLoss(-1.5*REM, 0, TRUE) //heals TOXINLOVERs
. = 1
..()
/datum/reagent/medicine/neo_jelly/overdose_process(mob/living/M)
M.adjustOxyLoss(2.6*REM, 0)
M.adjustBruteLoss(3.5*REM, 0)
M.adjustFireLoss(3.5*REM, 0)
..()
. = 1
M.adjustOxyLoss(2.6*REM, 0)
M.adjustBruteLoss(3.5*REM, 0)
M.adjustFireLoss(3.5*REM, 0)
..()
. = 1
/datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
name = "Earthsblood"
@@ -1233,13 +1177,9 @@
M.adjustToxLoss(-3 * REM, 0, TRUE) //Heals TOXINLOVERS
M.adjustBrainLoss(2 * REM, 150) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
M.adjustCloneLoss(-1 * REM, 0)
M.adjustStaminaLoss(-30 * REM, 0)
M.adjustStaminaLoss(-13 * REM, 0)
M.jitteriness = min(max(0, M.jitteriness + 3), 30)
M.druggy = min(max(0, M.druggy + 10), 15) //See above
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 5
..()
. = 1
@@ -1283,10 +1223,6 @@
/datum/reagent/medicine/lavaland_extract/on_mob_life(mob/living/carbon/M)
M.heal_bodypart_damage(5,5)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate -= 20
..()
return TRUE
@@ -1471,4 +1407,4 @@
M.hallucination = min(max(0, M.hallucination + 5), 60)
M.adjustToxLoss(1, 0)
..()
. = 1
. = 1
code/modules/reagents/chemistry/reagents/other_reagents.dm
-4
View File
@@ -421,10 +421,6 @@
M.adjustOxyLoss(-3, 0)
M.adjustBruteLoss(-3, 0)
M.adjustFireLoss(-5, 0)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.bleed_rate)
H.bleed_rate = 0
if(iscultist(M))
M.AdjustUnconscious(1, 0)
M.AdjustStun(10, 0)
code/modules/surgery/bodyparts/dismemberment.dm
-4
View File
@@ -27,8 +27,6 @@
return 1
add_mob_blood(C)
C.bleed(40)
var/mob/living/carbon/human/H = C
H.bleed_rate += 40
var/direction = pick(GLOB.cardinals)
var/t_range = rand(2,max(throw_range/2, 2))
var/turf/target_turf = get_turf(src)
@@ -55,8 +53,6 @@
var/organ_spilled = 0
var/turf/T = get_turf(C)
C.bleed(50)
var/mob/living/carbon/human/H = C
H.bleed_rate += 60
playsound(get_turf(C), 'sound/misc/splort.ogg', 80, 1)
for(var/X in C.internal_organs)
var/obj/item/organ/O = X