here we go again (#2456)

code/modules/ruins/lavaland_ruin_code.dm

@@ -18,13 +18,13 @@
 
 //Free Golems
 
-/obj/item/weapon/disk/design_disk/golem_shell
+/obj/item/disk/design_disk/golem_shell
 	name = "Golem Creation Disk"
 	desc = "A gift from the Liberator."
 	icon_state = "datadisk1"
 	max_blueprints = 1
 
-/obj/item/weapon/disk/design_disk/golem_shell/Initialize()
+/obj/item/disk/design_disk/golem_shell/Initialize()
 	. = ..()
 	var/datum/design/golem_shell/G = new
 	blueprints[1] = G
@@ -140,16 +140,16 @@
 
 /datum/outfit/lavaland_syndicate
 	name = "Lavaland Syndicate Agent"
-	r_hand = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle
+	r_hand = /obj/item/gun/ballistic/automatic/sniper_rifle
 	uniform = /obj/item/clothing/under/syndicate
 	suit = /obj/item/clothing/suit/toggle/labcoat
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
 	ears = /obj/item/device/radio/headset/syndicate/alt
-	back = /obj/item/weapon/storage/backpack
-	r_pocket = /obj/item/weapon/gun/ballistic/automatic/pistol
-	id = /obj/item/weapon/card/id
-	implants = list(/obj/item/weapon/implant/weapons_auth)
+	back = /obj/item/storage/backpack
+	r_pocket = /obj/item/gun/ballistic/automatic/pistol
+	id = /obj/item/card/id
+	implants = list(/obj/item/implant/weapons_auth)
 
 /datum/outfit/lavaland_syndicate/post_equip(mob/living/carbon/human/H)
 	H.faction |= "syndicate"
@@ -161,7 +161,7 @@
 
 /datum/outfit/lavaland_syndicate/comms
 	name = "Lavaland Syndicate Comms Agent"
-	r_hand = /obj/item/weapon/melee/transforming/energy/sword/saber
+	r_hand = /obj/item/melee/transforming/energy/sword/saber
 	mask = /obj/item/clothing/mask/chameleon
 	suit = /obj/item/clothing/suit/armor/vest
-	l_pocket = /obj/item/weapon/card/id/syndicate/anyone
+	l_pocket = /obj/item/card/id/syndicate/anyone