here we go again (#2456)

code/modules/reagents/reagent_dispenser.dm

@@ -17,8 +17,8 @@
 		if(tank_volume && (damage_flag == "bullet" || damage_flag == "laser"))
 			boom()
 
-/obj/structure/reagent_dispensers/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/reagent_containers))
+/obj/structure/reagent_dispensers/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/reagent_containers))
 		return 0 //so we can refill them via their afterattack.
 	else
 		return ..()
@@ -95,11 +95,11 @@
 			boom()
 
 /obj/structure/reagent_dispensers/fueltank/attackby(obj/item/I, mob/living/user, params)
-	if(istype(I, /obj/item/weapon/weldingtool))
+	if(istype(I, /obj/item/weldingtool))
 		if(!reagents.has_reagent("welding_fuel"))
 			to_chat(user, "<span class='warning'>[src] is out of fuel!</span>")
 			return
-		var/obj/item/weapon/weldingtool/W = I
+		var/obj/item/weldingtool/W = I
 		if(!W.welding)
 			if(W.reagents.has_reagent("welding_fuel", W.max_fuel))
 				to_chat(user, "<span class='warning'>Your [W.name] is already full!</span>")
@@ -153,7 +153,7 @@
 		to_chat(user, "<span class='warning'>There aren't any cups left!</span>")
 		return
 	user.visible_message("<span class='notice'>[user] takes a cup from [src].</span>", "<span class='notice'>You take a paper cup from [src].</span>")
-	var/obj/item/weapon/reagent_containers/food/drinks/sillycup/S = new(get_turf(src))
+	var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src))
 	user.put_in_hands(S)
 	paper_cups--