here we go again (#2456)

code/modules/power/antimatter/containment_jar.dm

@@ -1,4 +1,4 @@
-/obj/item/weapon/am_containment
+/obj/item/am_containment
 	name = "antimatter containment jar"
 	desc = "Holds antimatter."
 	icon = 'icons/obj/machines/antimatter.dmi'
@@ -15,7 +15,7 @@
 	var/stability = 100//TODO: add all the stability things to this so its not very safe if you keep hitting in on things
 
 
-/obj/item/weapon/am_containment/ex_act(severity, target)
+/obj/item/am_containment/ex_act(severity, target)
 	switch(severity)
 		if(1)
 			explosion(get_turf(src), 1, 2, 3, 5)//Should likely be larger but this works fine for now I guess
@@ -33,7 +33,7 @@
 	//check_stability()
 	return
 
-/obj/item/weapon/am_containment/proc/usefuel(wanted)
+/obj/item/am_containment/proc/usefuel(wanted)
 	if(fuel < wanted)
 		wanted = fuel
 	fuel -= wanted

code/modules/power/antimatter/control.dm

@@ -11,7 +11,7 @@
 
 	var/list/obj/machinery/am_shielding/linked_shielding
 	var/list/obj/machinery/am_shielding/linked_cores
-	var/obj/item/weapon/am_containment/fueljar
+	var/obj/item/am_containment/fueljar
 	var/update_shield_icons = 0
 	var/stability = 100
 	var/exploding = 0
@@ -157,7 +157,7 @@
 
 
 /obj/machinery/power/am_control_unit/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/wrench))
+	if(istype(W, /obj/item/wrench))
 		if(!anchored)
 			playsound(src.loc, W.usesound, 75, 1)
 			user.visible_message("[user.name] secures the [src.name] to the floor.", \
@@ -175,7 +175,7 @@
 		else
 			to_chat(user, "<span class='warning'>Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!</span>")
 
-	else if(istype(W, /obj/item/weapon/am_containment))
+	else if(istype(W, /obj/item/am_containment))
 		if(fueljar)
 			to_chat(user, "<span class='warning'>There is already a [fueljar] inside!</span>")
 			return