Skip to content

Commit

Permalink
Merge pull request #15 from Constellado/SIlicons-Need-Rights
Browse files Browse the repository at this point in the history
Fixes cyborgs not being able to interact with a carbon at all.
  • Loading branch information
Constellado authored Jul 21, 2024
2 parents 6431c52 + 4bc6815 commit 5cca91d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/carbon_defense.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/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
return ..()
if(user.a_intent != INTENT_HELP || !W.get_temperature() || !BP.can_bandage()) //this will also catch low damage synthetic welding
return ..()
. = TRUE
var/heal_time = 2 SECONDS
var/has_painkillers = user.reagents.has_reagent(/datum/reagent/medicine/morphine, needs_metabolizing = TRUE)
playsound(user, 'sound/surgery/cautery1.ogg', 20)
balloon_alert(user, "cauterizing...")
if(src == user && !has_painkillers)
Expand Down

0 comments on commit 5cca91d

Please sign in to comment.