cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 18:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(blood): Creates fallback for non-existent blood datum.

Browse Source 
Also stops processing blood loss at 2.1. This allows the mob to regenerate some blood without losing any more, but I doubt anyone would farm a human mob for blood at a rate of 0.1 per multiple ticks. 2.1 is defined as a preprocessor #define to make it easier to sync stuff and avoid magic numbers.

The fallback essentially follows the same procedures as a staff member would do to fix this issue: creates blood, sets their blood volume at species amount if wrong, fixes datums around blood. It logs failures and occurances.
This commit is contained in:
Runa Dacino
2023-08-13 20:58:39 +02:00
parent 12bb4f00bf
commit f1b5e812ce
1 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
code/modules/organs/blood.dm
View File

@@ -1,3 +1,4 @@
#define BLOOD_MINIMUM_STOP_PROCESS 2.1 // Define to avoid hitting 0 blood.
/****************************************************
BLOOD SYSTEM
****************************************************/
@@ -14,8 +15,12 @@ var/const/CE_STABLE_THRESHOLD = 0.5
/mob/living/carbon/human/var/datum/reagents/vessel // Container for blood and BLOOD ONLY. Do not transfer other chems here.
/mob/living/carbon/human/var/var/pale = 0 // Should affect how mob sprite is drawn, but currently doesn't.
//Initializes blood vessels
/mob/living/carbon/human/proc/make_blood()
/***Initializes blood vessels
* Called code/modules/mob/living/carbon/human/human.dm#L1259 set_species procedure with 0 args
* Also called by inject_blood as fallback with amt = injected_amount
* MUST be followed by calling fixblood() allways.
***/
/mob/living/carbon/human/proc/make_blood(var/amt = 0)
if(vessel)
return
@@ -29,7 +34,11 @@ var/const/CE_STABLE_THRESHOLD = 0.5
if(!should_have_organ(O_HEART)) //We want the var for safety but we can do without the actual blood.
return
vessel.add_reagent("blood",species.blood_volume)
if(!amt)
vessel.add_reagent("blood",species.blood_volume)
else
vessel.add_reagent("blood", clamp(amt, 1, species.blood_volume))
//Resets blood data
/mob/living/carbon/human/proc/fixblood()
@@ -212,8 +221,12 @@ var/const/CE_STABLE_THRESHOLD = 0.5
amt = amt * (src.mob_size/MOB_MEDIUM)
if(amt > vessel.get_reagent_amount("blood"))
amt = vessel.get_reagent_amount("blood") - 1 // Bit of a safety net; it's impossible to add blood if there's not blood already in the vessel.
var/current_blood = vessel.get_reagent_amount("blood")
if(current_blood < BLOOD_MINIMUM_STOP_PROCESS)
return 0 //We stop processing under 3 units of blood because apparently weird shit can make it overflowrandomly.
if(amt > current_blood)
amt = current_blood - 2 // Bit of a safety net; it's impossible to add blood if there's not blood already in the vessel.
return vessel.remove_reagent("blood",amt)
@@ -258,7 +271,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
if(!should_have_organ(O_HEART))
return null
if(vessel.get_reagent_amount("blood") < amount)
if(vessel.get_reagent_amount("blood") < amount || vessel.get_reagent_amount("blood") < BLOOD_MINIMUM_STOP_PROCESS)
return null
. = ..()
@@ -290,8 +303,28 @@ var/const/CE_STABLE_THRESHOLD = 0.5
var/datum/reagent/blood/our = get_blood(vessel)
if (!injected || !our)
if (!injected)
return
if(!our)
log_debug("[src] has no blood reagent, proceeding with fallback reinitialization.")
var/vessel_old = vessel
vessel = null
qdel(vessel_old)
make_blood(amount)
if(!vessel)
log_debug("Failed to re-initialize blood datums on [src]!")
return
if(vessel.total_volume < species.blood_volume)
vessel.add_reagent("blood", species.blood_volume - vessel.total_volume)
else if(vessel.total_volume > species.blood_volume)
vessel.maximum_volume = species.blood_volume
fixblood()
our = get_blood(vessel)
if(!our)
log_debug("Failed to re-initialize blood datums on [src]!")
return
if(blood_incompatible(injected.data["blood_type"],our.data["blood_type"],injected.data["species"],our.data["species"]) )
reagents.add_reagent("toxin",amount * 0.5)
reagents.update_total()