From cb5a97c3d62dad6eeb9f00e121133daa57f6e5d8 Mon Sep 17 00:00:00 2001 From: Jacquerel Date: Wed, 29 May 2024 19:22:25 +0100 Subject: [PATCH] [no GBP] Corrupt organs check patient for Holy Water, not surgeon (#83500) ## About The Pull Request Was looking into #83493 and I have no idea how that happens but I _did_ notice this unrelated runtime and logic error. Due to the args being incorrect, we were checking the status of the surgeon performing the operation rather than the person the organ was being removed from. ## Changelog :cl: fix: When removing a corrupted organ from a patient, the patient will now be checked for Holy Water or magic resistance, rather than the person performing the surgery. /:cl: --- code/datums/elements/corrupted_organ.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/elements/corrupted_organ.dm b/code/datums/elements/corrupted_organ.dm index e7f8524b851..666ca3460fc 100644 --- a/code/datums/elements/corrupted_organ.dm +++ b/code/datums/elements/corrupted_organ.dm @@ -27,7 +27,7 @@ return ..() /// When we're taken out of someone, do something spooky -/datum/element/corrupted_organ/proc/on_removed(atom/organ, mob/living/carbon/loser) +/datum/element/corrupted_organ/proc/on_removed(atom/organ, mob/living/remover, mob/living/carbon/loser) SIGNAL_HANDLER if (loser.has_reagent(/datum/reagent/water/holywater) || loser.can_block_magic(MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY) || prob(20)) return