Ports use_tool proc from /tg/ (#13411)

This commit is contained in:
Wowzewow (Wezzy)
2022-05-23 14:39:00 +02:00
committed by GitHub
parent 8b8df9e309
commit eafa547b5c
140 changed files with 519 additions and 466 deletions
+2 -2
View File
@@ -207,7 +207,7 @@
to_chat(user, SPAN_WARNING("\The [src] has no resource field to draw data from!"))
return
to_chat(user, SPAN_NOTICE("You start drawing the data from \the [src]..."))
if(do_after(user, 50, TRUE))
if(O.use_tool(src, user, 50, volume = 50))
if(!length(resource_field))
to_chat(user, SPAN_WARNING("\The [src] has no resource field to draw data from!"))
return
@@ -252,7 +252,7 @@
to_chat(user, SPAN_WARNING("\The [src] doesn't have a satchel attached to it!"))
return
user.visible_message(SPAN_NOTICE("\The [user] starts detaching \the [attached_satchel]."), SPAN_NOTICE("You start detaching \the [attached_satchel]."))
if(do_after(user, 30, TRUE, src))
if(O.use_tool(src, user, 30, volume = 50))
if(!attached_satchel)
return
attached_satchel.forceMove(get_turf(user))
+5 -3
View File
@@ -380,6 +380,9 @@
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
sharp = FALSE
edge = TRUE
drop_sound = 'sound/items/drop/shovel.ogg'
pickup_sound = 'sound/items/pickup/shovel.ogg'
usesound = /decl/sound_category/shovel_sound
/obj/item/shovel/spade
name = "spade"
@@ -557,7 +560,7 @@
return
if(C.iswelder())
var/obj/item/weldingtool/WT = C
if(WT.remove_fuel(0, user))
if(WT.use(0, user))
to_chat(user, SPAN_NOTICE("You slice apart the track."))
new /obj/item/stack/rods(get_turf(src))
qdel(src)
@@ -1227,8 +1230,7 @@ var/list/total_extraction_beacons = list()
/obj/structure/sculpting_block/attackby(obj/item/C, mob/user)
if(C.iswrench())
visible_message("<b>[user]</b> starts to [anchored ? "un" : ""]anchor \the [src].", SPAN_NOTICE("You start to [anchored ? "un" : ""]anchor \the [src]."))
if(do_after(user, 5 SECONDS, TRUE))
playsound(src.loc, C.usesound, 100, 1)
if(C.use_tool(src, user, 50, volume = 50))
anchored = !anchored
else if(istype(C, /obj/item/autochisel))
+2 -2
View File
@@ -358,7 +358,7 @@ var/list/mineral_can_smooth_with = list(
to_chat(user, SPAN_NOTICE("You start chiselling \the [src] into a sculptable block."))
if(!do_after(user, 80 / W.toolspeed))
if(!W.use_tool(src, user, 80, volume = 50))
return
if(!istype(src, /turf/simulated/mineral))
@@ -706,7 +706,7 @@ var/list/asteroid_floor_smooth = list(
to_chat(user, SPAN_NOTICE("You start digging deeper."))
playsound(get_turf(user), 'sound/effects/stonedoor_openclose.ogg', 50, TRUE)
digging = TRUE
if(!do_after(user, 60 / W.toolspeed))
if(!W.use_tool(src, user, 60, volume = 50))
if(istype(src, /turf/unsimulated/floor/asteroid))
digging = FALSE
return