Skip to content

Commit

Permalink
Changelog.
Browse files Browse the repository at this point in the history
Removes a rogue else.
  • Loading branch information
MistakeNot4892 committed Feb 6, 2017
1 parent b0a8fc9 commit b958d56
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
6 changes: 1 addition & 5 deletions code/game/objects/items/weapons/defib.dm
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,7 @@
return FALSE

var/obj/item/organ/internal/heart/heart = H.get_organ(BP_HEART)
if(!heart)
return TRUE

var/blood_volume = round((H.vessel.get_reagent_amount("blood")/heart.species.blood_volume)*100)
if(blood_volume < BLOOD_VOLUME_SURVIVE)
if(!heart || H.get_effective_blood_volume() < BLOOD_VOLUME_SURVIVE)
return TRUE

return FALSE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/organs/internal/brain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,5 @@
if(prob(15))
owner.Paralyse(3,5)
to_chat(owner, "<span class='warning'>You feel extremely [pick("dizzy","woosey","faint")]</span>")
else if(blood_volume < BLOOD_VOLUME_SURVIVE)
if(-(INFINITY) to BLOOD_VOLUME_SURVIVE)
owner.setOxyLoss(max(owner.getOxyLoss(), owner.maxHealth+10))
4 changes: 2 additions & 2 deletions code/modules/organs/internal/heart.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ var/const/BLOOD_VOLUME_SURVIVE = 40

switch(pulse)
if(PULSE_SLOW)
blood_max *= 0.75
blood_max *= 0.8
if(PULSE_FAST)
blood_max *= 1.25
if(PULSE_2FAST)
blood_max *= 1.5

if(CE_STABLE in owner.chem_effects) // inaprovaline
blood_max *= 0.5
blood_max *= 0.8

if(world.time >= next_blood_squirt && istype(owner.loc, /turf) && do_spray.len)
owner.visible_message("<span class='danger'>Blood squirts from [pick(do_spray)]!</span>")
Expand Down
8 changes: 8 additions & 0 deletions html/changelogs/zuhayr-limbstuff.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
author: Zuhayr
delete-after: True
changes:
- tweak: "Bleed-out rate now depends on pulse rate and size of bleeding limb."
- tweak: "This means that potassium chlorophoride, which stops the heart, and inaprovaline, which now slows the heart, are both suitable for emergency treatment of bleeding."
- rscadd: "Cautery surgery with no preceeding steps will now cauterize a cut artery in a stump."
- tweak: "Arterial bleeding and stumps are now more informative about where the bleed is."
- tweak: "Arterial sprays can now splatter/blind people and use the correct icons."

0 comments on commit b958d56

Please sign in to comment.