mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-31 09:08:30 +01:00
[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 🆑 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. /🆑
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user