From 3bd24f62e29a30f42ae494ff0c3ee23c8b4d59cb Mon Sep 17 00:00:00 2001 From: Theos Date: Wed, 26 Jun 2024 13:35:45 -0400 Subject: [PATCH] Fixes medical cyborgs being unable to interact with carbons (#3152) ## About The Pull Request Painkiller checks for cauterization now check the target rather than the person applying treatmenrr. This has no player-facing effects outside fixing a runtime preventing cyborgs from interacting with people Robotic limbs will now always have healing prioritized over cauterization if brute damage is present, since healing damage slows bleeding ## Why It's Good For The Game Uops :3 ## Changelog :cl: fix: cyborgs can touch people again code: robotic limbs will always have healing prioritized over being cauterized if treated with a welder /:cl: --- code/modules/mob/living/carbon/carbon_defense.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 916095ed266e..43cefa251e34 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -1,7 +1,7 @@ /mob/living/carbon/attackby(obj/item/W, mob/user, params) var/obj/item/bodypart/BP = get_bodypart(check_zone(user.zone_selected)) - var/has_painkillers = user.reagents.has_reagent(/datum/reagent/medicine/morphine, needs_metabolizing = TRUE) - if(W.tool_behaviour == TOOL_WELDER && IS_ROBOTIC_LIMB(BP) && BP.brute_dam > 5) //prioritize healing if we're synthetic + var/has_painkillers = reagents.has_reagent(/datum/reagent/medicine/morphine, needs_metabolizing = TRUE) + if(W.tool_behaviour == TOOL_WELDER && IS_ROBOTIC_LIMB(BP) && BP.brute_dam) //prioritize healing if we're synthetic return ..() if(user.a_intent != INTENT_HELP || !W.get_temperature() || !BP.can_bandage()) //this will also catch low damage synthetic welding return ..()