From 2471235ca7757ed355e71a4f8c8f789e7c39b94c Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 15 Sep 2025 08:15:05 -0400 Subject: [PATCH] Bioaug Fixes (#21361) This PR fixes some issues with bioaugs not working as intended due to having the wrong order and amount of arguments. It also fixes "Bad pointer" error spam. I've also verified that it fixes the "Platelets make you starve to death" bug. Before: image image After: image image --- .../organs/subtypes/augment/augments/auxiliary_heart.dm | 2 +- code/modules/organs/subtypes/augment/augments/mind_blanker.dm | 4 ++-- .../organs/subtypes/augment/augments/platelet_factories.dm | 4 ++-- html/changelogs/hellfirejag-bioaugfixes.yml | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/hellfirejag-bioaugfixes.yml diff --git a/code/modules/organs/subtypes/augment/augments/auxiliary_heart.dm b/code/modules/organs/subtypes/augment/augments/auxiliary_heart.dm index 32c386b2763..af45630f3f7 100644 --- a/code/modules/organs/subtypes/augment/augments/auxiliary_heart.dm +++ b/code/modules/organs/subtypes/augment/augments/auxiliary_heart.dm @@ -28,7 +28,7 @@ UnregisterSignal(owner, COMSIG_HEART_PUMP_EVENT) -/obj/item/organ/internal/augment/bioaug/auxiliary_heart/proc/stabilize_circulation(var/obj/item/organ/internal/heart/heart, var/blood_volume, var/recent_pump, var/pulse_mod, var/min_efficiency) +/obj/item/organ/internal/augment/bioaug/auxiliary_heart/proc/stabilize_circulation(var/implantee, var/obj/item/organ/internal/heart/heart, var/blood_volume, var/recent_pump, var/pulse_mod, var/min_efficiency) SIGNAL_HANDLER *min_efficiency *= 1.5 *blood_volume += 2.5 // This doesn't affect actual blood volume, only the "effective" volume used for calculating thresholds. diff --git a/code/modules/organs/subtypes/augment/augments/mind_blanker.dm b/code/modules/organs/subtypes/augment/augments/mind_blanker.dm index 627881c1217..4af61eaee66 100644 --- a/code/modules/organs/subtypes/augment/augments/mind_blanker.dm +++ b/code/modules/organs/subtypes/augment/augments/mind_blanker.dm @@ -27,7 +27,7 @@ UnregisterSignal(owner, COMSIG_PSI_MIND_POWER) -/obj/item/organ/internal/augment/bioaug/mind_blanker/proc/cancel_power(mob/caster, var/cancelled) +/obj/item/organ/internal/augment/bioaug/mind_blanker/proc/cancel_power(var/implantee, var/caster, var/cancelled) SIGNAL_HANDLER *cancelled = TRUE @@ -60,7 +60,7 @@ UnregisterSignal(owner, COMSIG_PSI_MIND_POWER) -/obj/item/organ/internal/augment/bioaug/mind_blanker_lethal/proc/cancel_power_lethal(mob/caster, var/cancelled) +/obj/item/organ/internal/augment/bioaug/mind_blanker_lethal/proc/cancel_power_lethal(var/implantee, var/caster, var/cancelled) SIGNAL_HANDLER *cancelled = TRUE if(isliving(caster)) diff --git a/code/modules/organs/subtypes/augment/augments/platelet_factories.dm b/code/modules/organs/subtypes/augment/augments/platelet_factories.dm index a4b69955fc7..50de3ef94ee 100644 --- a/code/modules/organs/subtypes/augment/augments/platelet_factories.dm +++ b/code/modules/organs/subtypes/augment/augments/platelet_factories.dm @@ -31,12 +31,12 @@ UnregisterSignal(owner, COMSIG_HEART_PUMP_EVENT) UnregisterSignal(owner, COMSIG_HEART_BLEED_EVENT) -/obj/item/organ/internal/augment/bioaug/platelet_factories/proc/stroke_risk(var/obj/item/organ/internal/heart/heart, var/blood_volume, var/recent_pump, var/pulse_mod, var/min_efficiency) +/obj/item/organ/internal/augment/bioaug/platelet_factories/proc/stroke_risk(var/implantee, var/obj/item/organ/internal/heart/heart, var/blood_volume, var/recent_pump, var/pulse_mod, var/min_efficiency) SIGNAL_HANDLER *min_efficiency *= 0.85 *pulse_mod *= 0.95 -/obj/item/organ/internal/augment/bioaug/platelet_factories/proc/reduce_bloodloss(var/blood_volume, var/cut_bloodloss_modifier, var/arterial_bloodloss_modifier) +/obj/item/organ/internal/augment/bioaug/platelet_factories/proc/reduce_bloodloss(var/implantee, var/blood_volume, var/cut_bloodloss_modifier, var/arterial_bloodloss_modifier) SIGNAL_HANDLER *cut_bloodloss_modifier *= 0.1 *arterial_bloodloss_modifier *= 0.25 diff --git a/html/changelogs/hellfirejag-bioaugfixes.yml b/html/changelogs/hellfirejag-bioaugfixes.yml new file mode 100644 index 00000000000..100032810dc --- /dev/null +++ b/html/changelogs/hellfirejag-bioaugfixes.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed mindblankers, auxiliary heart, and platelet factory implants not working as intended."