diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index b88550a0b5..2a7f3a5061 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -458,36 +458,19 @@ if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help") return ..() - if(S.brute_dam) - S.heal_damage(15,0,0,1) - if(user != M) - user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src]",\ - "\red You patch some dents on \the [M]'s [S.display_name]",\ - "You hear a welder.") - else - user.visible_message("\red \The [user] patches some dents on their [S.display_name] with \the [src]",\ - "\red You patch some dents on your [S.display_name]",\ - "You hear a welder.") - return - if(istype(M,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(H.species.flags & IS_SYNTHETIC) - - if(H.getBruteLoss() > 0) - - if(M == user) - user << "\red You can't repair damage to your own body - it's against OH&S." - return - - user.visible_message("\red \The [user] patches some dents on \the [M] with \the [src]",\ - "\red You patch some of the dents on \the [M].",\ - "You hear a welder.") - H.heal_overall_damage(5,0) + if(M == user) + user << "\red You can't repair damage to your own body - it's against OH&S." return - user << "Nothing to fix!" + if(S.brute_dam) + S.heal_damage(15,0,0,1) + user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src].") + return + else + user << "Nothing to fix!" + else - return ..() + return ..() \ No newline at end of file diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 93d196942f..0c143c28a4 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -640,39 +640,19 @@ obj/structure/cable/proc/cableColor(var/colorC) if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help") return ..() - if(S.burn_dam > 0 && use(1)) - S.heal_damage(0,15,0,1) - - if(user != M) - user.visible_message("\The [user] repairs some burn damage on [M]'s [S.display_name] with \the [src]",\ - "\The [user] repairs some burn damage on your [S.display_name]",\ - "You hear wires being cut.") - else - user.visible_message("\The [user] repairs some burn damage on their [S.display_name] with \the [src]",\ - "You repair some burn damage on your [S.display_name]",\ - "You hear wires being cut.") - - return - if(istype(M,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(H.species.flags & IS_SYNTHETIC) - - if(H.getFireLoss() > 0) - - if(M == user) - user << "\red You can't repair damage to your own body - it's against OH&S." - return - - user.visible_message("\The [user] repairs some burn damage on [M] with \the [src]",\ - "You repair some of \the [M]'s burn damage.",\ - "You hear wires being cut.") - H.heal_overall_damage(0,5) + if(M == user) + user << "\red You can't repair damage to your own body - it's against OH&S." return - user << "Nothing to fix!" + if(S.burn_dam > 0 && use(1)) + S.heal_damage(0,15,0,1) + user.visible_message("\red \The [user] repairs some burn damage on \the [M]'s [S.display_name] with \the [src].") + return + else + user << "Nothing to fix!" else return ..()