Skip to content

Commit

Permalink
Handle_Blood now checks all organs, arterial severity for limbs no lo…
Browse files Browse the repository at this point in the history
…nger rounded down to zero.
  • Loading branch information
EJDenton committed Jul 18, 2024
1 parent 4c2937c commit 7b832af
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/organs/internal/heart.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
var/blood_max = 0
var/open_wound
var/list/do_spray = list()
for(var/obj/item/organ/external/temp in owner.bad_external_organs)
for(var/obj/item/organ/external/temp in owner.organs)
if((temp.status & ORGAN_BLEEDING) && !BP_IS_ROBOTIC(temp))
for(var/datum/wound/W in temp.wounds)
if(W.bleeding())
Expand All @@ -146,7 +146,7 @@
blood_max += ((W.damage / 40) * species.bleed_mod)

if(temp.status & ORGAN_ARTERY_CUT)
var/bleed_amount = FLOOR((owner.vessel.total_volume / (temp.applied_pressure || !open_wound ? 450 : 250)) * temp.arterial_bleed_severity, 1)
var/bleed_amount = FLOOR((owner.vessel.total_volume / (temp.applied_pressure || !open_wound ? 450 : 250)) * temp.arterial_bleed_severity, 0.1)
if(bleed_amount)
if((CE_BLOODCLOT in owner.chem_effects) && !(owner.chem_effects[CE_BLOODTHIN]))
bleed_amount *= 0.8 // won't do much, but it'll help
Expand Down
59 changes: 59 additions & 0 deletions html/changelogs/Evandorf-Arterialbleedfix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: Evandorf

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "The handle_blood proc will now check all organs, not just damaged ones, and apply bloodloss accurately; including arterials where the external wounds are healed."
- bugfix: "Arterial severity which applies less than 1u of bloodloss is now accounted for properly and is no longer rounded down to 0."

0 comments on commit 7b832af

Please sign in to comment.