Skip to content

Commit

Permalink
Fixes there being 3 progressbars when welding self as a synth (#1542)
Browse files Browse the repository at this point in the history
Co-authored-by: Bloop <[email protected]>
  • Loading branch information
Steals-The-PRs and vinylspiders authored Jan 14, 2024
1 parent 402486c commit ad394a7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
8 changes: 3 additions & 5 deletions code/game/objects/items/tools/weldingtool.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,10 @@
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)) // NOVA EDIT CHANGE - ORIGINAL: if(!do_after(user, 5 SECONDS, attacked_humanoid))
return ITEM_INTERACT_BLOCKING
use_delay = 5 SECONDS
use_delay = self_delay // NOVA EDIT CHANGE - ORIGINAL: use_delay = 5 SECONDS
// NOVA EDIT ADDITION START
if(!do_after(user, other_delay, attacked_humanoid))
return ITEM_INTERACT_BLOCKING
else
use_delay = other_delay
// NOVA EDIT ADDITION END

if(!use_tool(attacked_humanoid, user, use_delay, volume=50, amount=1))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/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/self_delay = 5 SECONDS
/// How long it takes to weld someone else's robotic limbs.
var/other_delay = 1 SECONDS

/obj/item/weldingtool/Initialize(mapload)
Expand Down

0 comments on commit ad394a7

Please sign in to comment.