code folder. 221 files changed wew

code/game/objects/structures/transit_tubes/transit_tube.dm

@@ -42,8 +42,7 @@
 				to_chat(user, "<span class='warning'>Remove the pod first!</span>")
 				return
 			user.visible_message("[user] starts to deattach \the [src].", "<span class='notice'>You start to deattach the [name]...</span>")
-			playsound(src.loc, W.usesound, 50, 1)
-			if(do_after(user, 35*W.toolspeed, target = src))
+			if(W.use_tool(src, user, 40, volume=50))
 				to_chat(user, "<span class='notice'>You deattach the [name].</span>")
 				var/obj/structure/c_transit_tube/R = new tube_construction(loc)
 				R.setDir(dir)

code/game/objects/structures/transit_tubes/transit_tube_construction.dm

@@ -28,22 +28,17 @@
 			build_type = flipped_build_type
 		else
 			build_type = initial(build_type)
-		icon_state = "[base_icon][flipped]"	
+		icon_state = "[base_icon][flipped]"
 
-/obj/structure/c_transit_tube/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/wrench))
-		to_chat(user, "<span class='notice'>You start attaching the [name]...</span>")
-		add_fingerprint(user)
-		playsound(src.loc, I.usesound, 50, 1)
-		if(do_after(user, 40*I.toolspeed, target = src))
-			if(QDELETED(src))
-				return
-			to_chat(user, "<span class='notice'>You attach the [name].</span>")
-			var/obj/structure/transit_tube/R = new build_type(loc, dir)
-			transfer_fingerprints_to(R)
-			qdel(src)
-	else
-		return ..()
+/obj/structure/c_transit_tube/wrench_act(mob/living/user, obj/item/I)
+	to_chat(user, "<span class='notice'>You start attaching the [name]...</span>")
+	add_fingerprint(user)
+	if(I.use_tool(src, user, 40, volume=50))
+		to_chat(user, "<span class='notice'>You attach the [name].</span>")
+		var/obj/structure/transit_tube/R = new build_type(loc, dir)
+		transfer_fingerprints_to(R)
+		qdel(src)
+	return TRUE
 
 // transit tube station
 /obj/structure/c_transit_tube/station

code/game/objects/structures/transit_tubes/transit_tube_pod.dm

@@ -30,7 +30,7 @@
 /obj/structure/transit_tube_pod/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/crowbar))
 		if(!moving)
-			playsound(src.loc, I.usesound, 50, 1)
+			I.play_tool_sound(src)
 			if(contents.len)
 				user.visible_message("[user] empties \the [src].", "<span class='notice'>You empty \the [src].</span>")
 				empty_pod()