diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index a0d8c510a5..283cf59104 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -21,7 +21,7 @@ //R&D tech level origin_tech = list(TECH_ENGINEERING = 1) - + tool_qualities = list(TOOL_WELDER) //Welding tool specific stuff @@ -74,19 +74,19 @@ if(S.organ_tag == BP_HEAD) if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space)) to_chat(user, "You can't apply [src] through [H.head]!") - return 1 + return TRUE else if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) to_chat(user, "You can't apply [src] through [H.wear_suit]!") - return 1 + return TRUE if(!welding) to_chat(user, "You'll need to turn [src] on to patch the damage on [H]'s [S.name]!") - return 1 + return TRUE if(S.robo_repair(15, BRUTE, "some dents", src, user)) remove_fuel(1, user) - return 1 + return TRUE return ..() diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b5cfcc180a..b741df7544 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -443,11 +443,12 @@ if("omni")src.heal_damage(repair_amount, repair_amount, 0, 1) if(damage_desc) + var/fix_verb = (damage_amount > repair_amount) ? "patches" : "finishes patching" if(user == src.owner) var/datum/gender/T = gender_datums[user.get_visible_gender()] - user.visible_message("\The [user] patches [damage_desc] on [T.his] [src.name] with [tool].") + user.visible_message("\The [user] [fix_verb] [damage_desc] on [T.his] [src.name] with [tool].") else - user.visible_message("\The [user] patches [damage_desc] on [owner]'s [src.name] with [tool].") + user.visible_message("\The [user] [fix_verb] [damage_desc] on [owner]'s [src.name] with [tool].") return 1