Merge branch 'master' into findnreplace

code/modules/surgery/organs/autoimplanter.dm

@@ -4,6 +4,7 @@
 	icon_state = "autoimplanter"
 	item_state = "walkietalkie"//left as this so as to intentionally not have inhands
 	w_class = 2
+	usesound = 'sound/weapons/circsawhit.ogg'
 	var/obj/item/organ/internal/cyberimp/storedorgan
 
 /obj/item/device/autoimplanter/attack_self(mob/user)//when the object it used...
@@ -12,7 +13,7 @@
 		return
 	storedorgan.insert(user)//insert stored organ into the user
 	user.visible_message("<span class='notice'>[user] presses a button on [src], and you hear a short mechanical noise.</span>", "<span class='notice'>You feel a sharp sting as [src] plunges into your body.</span>")
-	playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, 1)
+	playsound(get_turf(user), usesound, 50, 1)
 	storedorgan = null
 
 /obj/item/device/autoimplanter/attackby(obj/item/I, mob/user, params)
@@ -32,4 +33,4 @@
 			storedorgan.forceMove(get_turf(user))
 			storedorgan = null
 			to_chat(user, "<span class='notice'>You remove the [storedorgan] from [src].</span>")
-			playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1)
+			playsound(get_turf(user), I.usesound, 50, 1)

code/modules/surgery/surgery.dm

@@ -109,13 +109,8 @@
 	if(implement_type)	//this means it isn't a require nd or any item step.
 		prob_chance = min(allowed_tools[implement_type], 100)
 	prob_chance *= get_location_modifier(target)
-
-	if(prob_chance > 100)//if we are using a super tool
-		time = time/prob_chance //PLACEHOLDER VALUES
 	
-	if(do_after(user, time, target = target))
-
-
+	if(do_after(user, time * tool.toolspeed, target = target))
 		if(prob(prob_chance) || isrobot(user))
 			if(end_step(user, target, target_zone, tool, surgery))
 				advance = 1

code/modules/surgery/tools.dm

@@ -89,6 +89,7 @@
 	item_state = "scalpel"
 	damtype = "fire"
 	hitsound = 'sound/weapons/sear.ogg'
+	toolspeed = 0.8
 
 /obj/item/weapon/scalpel/laser2
 	name = "laser scalpel"
@@ -97,6 +98,7 @@
 	item_state = "scalpel"
 	damtype = "fire"
 	hitsound = 'sound/weapons/sear.ogg'
+	toolspeed = 0.6
 
 /obj/item/weapon/scalpel/laser3
 	name = "laser scalpel"
@@ -105,6 +107,7 @@
 	item_state = "scalpel"
 	damtype = "fire"
 	hitsound = 'sound/weapons/sear.ogg'
+	toolspeed = 0.4
 
 /obj/item/weapon/scalpel/manager //super tool! Retractor/hemostat
 	name = "incision management system"
@@ -113,6 +116,7 @@
 	item_state = "scalpel"
 	damtype = "fire"
 	hitsound = 'sound/weapons/sear.ogg'
+	toolspeed = 0.2
 
 /obj/item/weapon/circular_saw
 	name = "circular saw"