code folder. 221 files changed wew

code/modules/power/terminal.dm

@@ -48,26 +48,31 @@
 		. = 1
 
 
-/obj/machinery/power/terminal/proc/dismantle(mob/living/user, obj/item/W)
+/obj/machinery/power/terminal/proc/dismantle(mob/living/user, obj/item/I)
 	if(isturf(loc))
 		var/turf/T = loc
 		if(T.intact)
 			to_chat(user, "<span class='warning'>You must first expose the power terminal!</span>")
 			return
 
-		if(!master || master.can_terminal_dismantle())
-			user.visible_message("[user.name] dismantles the power terminal from [master].", \
-								"<span class='notice'>You begin to cut the cables...</span>")
+	if(master && !master.can_terminal_dismantle())
+		return
 
-			playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
-			if(do_after(user, 50*W.toolspeed, target = src))
-				if(!master || master.can_terminal_dismantle())
-					if(prob(50) && electrocute_mob(user, powernet, src, 1, TRUE))
-						do_sparks(5, TRUE, master)
-						return
-					new /obj/item/stack/cable_coil(loc, 10)
-					to_chat(user, "<span class='notice'>You cut the cables and dismantle the power terminal.</span>")
-					qdel(src)
+	user.visible_message("[user.name] dismantles the power terminal from [master].",
+		"<span class='notice'>You begin to cut the cables...</span>")
+
+	playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+	if(I.use_tool(src, user, 50))
+		if(master && !master.can_terminal_dismantle())
+			return
+
+		if(prob(50) && electrocute_mob(user, powernet, src, 1, TRUE))
+			do_sparks(5, TRUE, master)
+			return
+
+		new /obj/item/stack/cable_coil(drop_location(), 10)
+		to_chat(user, "<span class='notice'>You cut the cables and dismantle the power terminal.</span>")
+		qdel(src)
 
 
 /obj/machinery/power/terminal/attackby(obj/item/W, mob/living/user, params)