diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index e09beadd5af..b7bb18e5981 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -145,14 +145,16 @@ if(isnull(affecting) || !IS_ROBOTIC_LIMB(affecting)) return NONE - if(!use_tool(attacked_humanoid, user, 0, volume=50, amount=1)) - return ITEM_INTERACT_BLOCKING + var/use_delay = 0 if(user == attacked_humanoid) user.visible_message(span_notice("[user] starts to fix some of the dents on [attacked_humanoid]'s [affecting.name]."), span_notice("You start fixing some of the dents on [attacked_humanoid == user ? "your" : "[attacked_humanoid]'s"] [affecting.name].")) - if(!do_after(user, self_delay, attacked_humanoid)) // SKYRAT EDIT CHANGE - ORIGINAL: if(!do_after(user, 5 SECONDS, attacked_humanoid)) - return ITEM_INTERACT_BLOCKING + use_delay = 5 SECONDS + + if(!use_tool(attacked_humanoid, user, use_delay, volume=50, amount=1)) + return ITEM_INTERACT_BLOCKING + // SKYRAT EDIT ADDITION START if(!do_after(user, other_delay, attacked_humanoid)) return ITEM_INTERACT_BLOCKING diff --git a/modular_skyrat/master_files/code/game/objects/items/tools/weldingtool.dm b/modular_skyrat/master_files/code/game/objects/items/tools/weldingtool.dm index fecef3acdaf..1379f6adf0a 100644 --- a/modular_skyrat/master_files/code/game/objects/items/tools/weldingtool.dm +++ b/modular_skyrat/master_files/code/game/objects/items/tools/weldingtool.dm @@ -1,6 +1,4 @@ /obj/item/weldingtool - /// How long it takes to weld someone else's robotic limbs. - var/self_delay = 5 SECONDS /// How long it takes to weld your own robotic limbs. var/other_delay = 1 SECONDS