Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"

This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
This commit is contained in:
SandPoot
2021-02-18 15:04:46 -03:00
parent 2e29f30fdf
commit f738023097
223 changed files with 741 additions and 1462 deletions
+5 -5
View File
@@ -170,13 +170,13 @@
/obj/structure/table/attackby(obj/item/I, mob/user, params)
if(!(flags_1 & NODECONSTRUCT_1))
if(I.tool_behaviour == TOOL_SCREWDRIVER && deconstruction_ready)
if(istype(I, /obj/item/screwdriver) && deconstruction_ready)
to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
if(I.use_tool(src, user, 20, volume=50))
deconstruct(TRUE)
return
if(I.tool_behaviour == TOOL_WRENCH && deconstruction_ready)
if(istype(I, /obj/item/wrench) && deconstruction_ready)
to_chat(user, "<span class='notice'>You start deconstructing [src]...</span>")
if(I.use_tool(src, user, 40, volume=50))
playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
@@ -538,7 +538,7 @@
return "<span class='notice'>The top cover is firmly <b>welded</b> on.</span>"
/obj/structure/table/reinforced/attackby(obj/item/W, mob/user, params)
if(W.tool_behaviour == TOOL_WELDER)
if(istype(W, /obj/item/weldingtool))
if(!W.tool_start_check(user, amount=0))
return
@@ -689,7 +689,7 @@
step(O, get_dir(O, src))
/obj/structure/rack/attackby(obj/item/W, mob/user, params)
if(W.tool_behaviour == TOOL_WRENCH && !(flags_1 & NODECONSTRUCT_1))
if (istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
W.play_tool_sound(src)
deconstruct(TRUE)
return
@@ -747,7 +747,7 @@
var/building = FALSE
/obj/item/rack_parts/attackby(obj/item/W, mob/user, params)
if(W.tool_behaviour == TOOL_WRENCH)
if (istype(W, /obj/item/wrench))
new /obj/item/stack/sheet/metal(user.loc)
qdel(src)
else