here we go again (#2456)

code/modules/surgery/tools.dm

@@ -1,4 +1,4 @@
-/obj/item/weapon/retractor
+/obj/item/retractor
 	name = "retractor"
 	desc = "Retracts stuff."
 	icon = 'icons/obj/surgery.dmi'
@@ -9,7 +9,7 @@
 	origin_tech = "materials=1;biotech=1"
 
 
-/obj/item/weapon/retractor/augment
+/obj/item/retractor/augment
 	name = "toolarm retractor"
 	desc = "Micro-mechanical manipulator for retracting stuff."
 	icon = 'icons/obj/surgery.dmi'
@@ -21,7 +21,7 @@
 	toolspeed = 0.5
 
 
-/obj/item/weapon/hemostat
+/obj/item/hemostat
 	name = "hemostat"
 	desc = "You think you have seen this before."
 	icon = 'icons/obj/surgery.dmi'
@@ -33,7 +33,7 @@
 	attack_verb = list("attacked", "pinched")
 
 
-/obj/item/weapon/hemostat/augment
+/obj/item/hemostat/augment
 	name = "toolarm hemostat"
 	desc = "Tiny servos power a pair of pincers to stop bleeding."
 	icon = 'icons/obj/surgery.dmi'
@@ -46,7 +46,7 @@
 	attack_verb = list("attacked", "pinched")
 
 
-/obj/item/weapon/cautery
+/obj/item/cautery
 	name = "cautery"
 	desc = "This stops bleeding."
 	icon = 'icons/obj/surgery.dmi'
@@ -58,7 +58,7 @@
 	attack_verb = list("burnt")
 
 
-/obj/item/weapon/cautery/augment
+/obj/item/cautery/augment
 	name = "toolarm cautery"
 	desc = "A heated element that cauterizes wounds."
 	icon = 'icons/obj/surgery.dmi'
@@ -71,7 +71,7 @@
 	attack_verb = list("burnt")
 
 
-/obj/item/weapon/surgicaldrill
+/obj/item/surgicaldrill
 	name = "surgical drill"
 	desc = "You can drill using this item. You dig?"
 	icon = 'icons/obj/surgery.dmi'
@@ -87,7 +87,7 @@
 	attack_verb = list("drilled")
 
 
-/obj/item/weapon/surgicaldrill/augment
+/obj/item/surgicaldrill/augment
 	name = "toolarm surgical drill"
 	desc = "Effectively a small power drill contained within your arm, edges dulled to prevent tissue damage. May or may not pierce the heavens."
 	icon = 'icons/obj/surgery.dmi'
@@ -102,7 +102,7 @@
 	attack_verb = list("drilled")
 
 
-/obj/item/weapon/scalpel
+/obj/item/scalpel
 	name = "scalpel"
 	desc = "Cut, cut, and once more cut."
 	icon = 'icons/obj/surgery.dmi'
@@ -121,7 +121,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = IS_SHARP_ACCURATE
 
-/obj/item/weapon/scalpel/augment
+/obj/item/scalpel/augment
 	name = "toolarm scalpel"
 	desc = "Ultra-sharp blade attached directly to your bone for extra-accuracy."
 	icon = 'icons/obj/surgery.dmi'
@@ -139,12 +139,12 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = IS_SHARP_ACCURATE
 
-/obj/item/weapon/scalpel/suicide_act(mob/user)
+/obj/item/scalpel/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is slitting [user.p_their()] [pick("wrists", "throat", "stomach")] with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (BRUTELOSS)
 
 
-/obj/item/weapon/circular_saw
+/obj/item/circular_saw
 	name = "circular saw"
 	desc = "For heavy duty cutting."
 	icon = 'icons/obj/surgery.dmi'
@@ -164,7 +164,7 @@
 	attack_verb = list("attacked", "slashed", "sawed", "cut")
 	sharpness = IS_SHARP
 
-/obj/item/weapon/circular_saw/augment
+/obj/item/circular_saw/augment
 	name = "toolarm circular saw"
 	desc = "A small but very fast spinning saw. Edges dulled to prevent accidental cutting inside of the surgeon."
 	icon = 'icons/obj/surgery.dmi'
@@ -183,7 +183,7 @@
 	attack_verb = list("attacked", "slashed", "sawed", "cut")
 	sharpness = IS_SHARP
 
-/obj/item/weapon/surgical_drapes
+/obj/item/surgical_drapes
 	name = "surgical drapes"
 	desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control."
 	icon = 'icons/obj/surgery.dmi'
@@ -192,17 +192,17 @@
 	origin_tech = "biotech=1"
 	attack_verb = list("slapped")
 
-/obj/item/weapon/surgical_drapes/attack(mob/living/M, mob/user)
+/obj/item/surgical_drapes/attack(mob/living/M, mob/user)
 	if(!attempt_initiate_surgery(src, M, user))
 		..()
 
-/obj/item/weapon/organ_storage //allows medical cyborgs to manipulate organs without hands
+/obj/item/organ_storage //allows medical cyborgs to manipulate organs without hands
 	name = "organ storage bag"
 	desc = "A container for holding body parts."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "evidenceobj"
 
-/obj/item/weapon/organ_storage/afterattack(obj/item/I, mob/user, proximity)
+/obj/item/organ_storage/afterattack(obj/item/I, mob/user, proximity)
 	if(!proximity)
 		return
 	if(contents.len)
@@ -228,7 +228,7 @@
 	I.loc = src
 	w_class = I.w_class
 
-/obj/item/weapon/organ_storage/attack_self(mob/user)
+/obj/item/organ_storage/attack_self(mob/user)
 	if(contents.len)
 		var/obj/item/I = contents[1]
 		user.visible_message("[user] dumps [I] from [src].", "<span class='notice'>You dump [I] from [src].</span>")