From 514ae6f1211628d8675bebcd5e2f84c81dc032e2 Mon Sep 17 00:00:00 2001 From: CapybaraExtravagante <110635252+CapybaraExtravagante@users.noreply.github.com> Date: Sat, 6 Aug 2022 11:05:30 +0200 Subject: [PATCH] Fixes "Burning rust off walls doesn't blind you" (#68986) * Fixes rust element not correctly using tool procs, now welding rust off will properly blind the user. Co-authored-by: Capybara --- code/datums/elements/rust.dm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/code/datums/elements/rust.dm b/code/datums/elements/rust.dm index dd39ca52a85..6f85e0e4e69 100644 --- a/code/datums/elements/rust.dm +++ b/code/datums/elements/rust.dm @@ -47,16 +47,23 @@ /datum/element/rust/proc/handle_tool_use(atom/source, mob/user, obj/item/item) switch(item.tool_behaviour) if(TOOL_WELDER) - if(item.use(5)) - user.balloon_alert(user, "burning off rust...") - if(!do_after(user, 5 SECONDS * item.toolspeed, source)) - return - user.balloon_alert(user, "burned off rust") - Detach(source) + if(!item.tool_start_check(user, amount=5)) return + + user.balloon_alert(user, "burning off rust...") + + if(!item.use_tool(source, user, 5 SECONDS)) + return + user.balloon_alert(user, "burned off rust") + Detach(source) + return + + if(TOOL_RUSTSCRAPER) + if(!item.tool_start_check(user)) + return user.balloon_alert(user, "scraping off rust...") - if(!do_after(user, 2 SECONDS * item.toolspeed, source)) + if(!item.use_tool(source, user, 2 SECONDS)) return user.balloon_alert(user, "scraped off rust") Detach(source)