Merge pull request #4394 from VictorZisthus/robobrutefix

Robotics Brute Repair Surgery Fix
This commit is contained in:
Nadyr
2022-06-22 23:13:10 -04:00
committed by GitHub

View File

@@ -152,13 +152,17 @@
max_duration = 60
/datum/surgery_step/robotics/repair_brute/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
if(..())
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if(istype(tool, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/welder = tool
if(!welder.isOn() || !welder.remove_fuel(1,user))
return 0
return affected && affected.open == 3 && (affected.disfigured || affected.brute_dam > 0) && target_zone != O_MOUTH
if(..()) //CHOMPEdit begin. Added damage check.
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if(istype(tool, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/welder = tool
if(affected.brute_dam == 0)
to_chat(user, "<span class='notice'>There is no damage to the internal structure here!</span>")
return SURGERY_FAILURE
else
if(!welder.isOn() || !welder.remove_fuel(1,user))
return 0
return affected && affected.open == 3 && (affected.disfigured || affected.brute_dam > 0) && target_zone != O_MOUTH // CHOMPEdit End.
/datum/surgery_step/robotics/repair_brute/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)