[MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2023-10-04 18:37:41 -04:00
committed by GitHub
co-authored by Heroman3003 Nadyr
parent 00a5f09ad4
commit d2e66e6410
310 changed files with 1035 additions and 944 deletions
+2 -2
View File
@@ -43,8 +43,8 @@
. += "\n It reads \"[message]\"."
/obj/effect/decal/writing/attackby(var/obj/item/thing, var/mob/user)
if(istype(thing, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/welder = thing
if(thing.has_tool_quality(TOOL_WELDER))
var/obj/item/weapon/weldingtool/welder = thing.get_welder()
if(welder.isOn() && welder.remove_fuel(0,user) && do_after(user, 5, src) && !QDELETED(src))
playsound(src.loc, welder.usesound, 50, 1)
user.visible_message("<b>\The [user]</b> clears away some graffiti.")
+4 -4
View File
@@ -55,7 +55,7 @@
icon_state = "[base_icon_state][LAZYLEN(notices)]"
/obj/structure/noticeboard/attackby(obj/item/I, mob/user)
if(I.is_screwdriver())
if(I.has_tool_quality(TOOL_SCREWDRIVER))
var/choice = tgui_input_list(usr, "Which direction do you wish to place the noticeboard?", "Noticeboard Offset", list("North", "South", "East", "West", "No Offset"))
if(choice && Adjacent(user) && I.loc == user && !user.incapacitated())
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
@@ -75,7 +75,7 @@
if("No Offset")
return
return
else if(I.is_wrench())
else if(I.has_tool_quality(TOOL_WRENCH))
visible_message("<span class='warning'>[user] begins dismantling [src].</span>")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 50, src))
@@ -114,8 +114,8 @@
/obj/structure/noticeboard/tgui_data(mob/user)
var/list/data = ..()
var/list/tgui_notices = list()
for(var/obj/item/I in src.notices)
tgui_notices.Add(list(list(