here we go again (#2456)

code/modules/projectiles/pins.dm

@@ -13,18 +13,18 @@
 	var/selfdestruct = 0 // Explode when user check is failed.
 	var/force_replace = 0 // Can forcefully replace other pins.
 	var/pin_removeable = 0 // Can be replaced by any pin.
-	var/obj/item/weapon/gun/gun
+	var/obj/item/gun/gun
 
 
 /obj/item/device/firing_pin/New(newloc)
 	..()
-	if(istype(newloc, /obj/item/weapon/gun))
+	if(istype(newloc, /obj/item/gun))
 		gun = newloc
 
 /obj/item/device/firing_pin/afterattack(atom/target, mob/user, proximity_flag)
 	if(proximity_flag)
-		if(istype(target, /obj/item/weapon/gun))
-			var/obj/item/weapon/gun/G = target
+		if(istype(target, /obj/item/gun))
+			var/obj/item/gun/G = target
 			if(G.pin && (force_replace || G.pin.pin_removeable))
 				G.pin.loc = get_turf(G)
 				G.pin.gun_remove(user)
@@ -44,7 +44,7 @@
 	emagged = TRUE
 	to_chat(user, "<span class='notice'>You override the authentication mechanism.</span>")
 
-/obj/item/device/firing_pin/proc/gun_insert(mob/living/user, obj/item/weapon/gun/G)
+/obj/item/device/firing_pin/proc/gun_insert(mob/living/user, obj/item/gun/G)
 	gun = G
 	forceMove(gun)
 	gun.pin = src
@@ -93,11 +93,11 @@
 	name = "implant-keyed firing pin"
 	desc = "This is a security firing pin which only authorizes users who are implanted with a certain device."
 	fail_message = "<span class='warning'>IMPLANT CHECK FAILED.</span>"
-	var/obj/item/weapon/implant/req_implant = null
+	var/obj/item/implant/req_implant = null
 
 /obj/item/device/firing_pin/implant/pin_auth(mob/living/user)
 	if(istype(user))
-		for(var/obj/item/weapon/implant/I in user.implants)
+		for(var/obj/item/implant/I in user.implants)
 			if(req_implant && I.type == req_implant)
 				return 1
 	return 0
@@ -106,12 +106,12 @@
 	name = "mindshield firing pin"
 	desc = "This Security firing pin authorizes the weapon for only mindshield-implanted users."
 	icon_state = "firing_pin_loyalty"
-	req_implant = /obj/item/weapon/implant/mindshield
+	req_implant = /obj/item/implant/mindshield
 
 /obj/item/device/firing_pin/implant/pindicate
 	name = "syndicate firing pin"
 	icon_state = "firing_pin_pindi"
-	req_implant = /obj/item/weapon/implant/weapons_auth
+	req_implant = /obj/item/implant/weapons_auth
 
 
 
@@ -136,7 +136,7 @@
 		return 0
 	return 1
 
-/obj/item/device/firing_pin/clown/ultra/gun_insert(mob/living/user, obj/item/weapon/gun/G)
+/obj/item/device/firing_pin/clown/ultra/gun_insert(mob/living/user, obj/item/gun/G)
 	..()
 	G.clumsy_check = 0