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.

Sign up for GitHub

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

Advanced wirebrush fix and small tweak #9872

Merged
merged 1 commit into from
Sep 23, 2023
Merged

Advanced wirebrush fix and small tweak #9872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion code/datums/elements/rust.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
user.balloon_alert(user, "You start scraping off the rust...")
if(!do_after(user, 2 SECONDS * item.toolspeed, target = source))
return
user.balloon_alert(user, "Sucessfully scraped off the rust!")
if(istype(item, /obj/item/wirebrush/advanced))
var/obj/item/wirebrush/advanced/brush = item
brush.irradiate(user)
else
user.balloon_alert(user, "Sucessfully scraped off the rust!")
Detach(source)
return
4 changes: 1 addition & 3 deletions code/game/objects/items/tools/wirebrush.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@
. = ..()
. += "<span class='danger'>There is a warning label that indicates extended use of [src] may result in loss of hair, yellowing skin, and death.</span>"

/obj/item/wirebrush/advanced/pre_attack(atom/A, mob/living/user)
. = ..()

/obj/item/wirebrush/advanced/proc/irradiate(mob/living/user)
if(!istype(user))
return

Expand Down