Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fixes there being 3 progressbars when welding self as a synth #1542

Merged
merged 1 commit into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading