Merge branch 'master' into NeuroFix

modular_citadel/code/modules/awaymissions/citadel_ghostrole_spawners.dm

@@ -49,7 +49,7 @@
 
 /datum/outfit/lavaknight/captain
 	name ="Cydonian Knight Captain"
-	l_pocket = /obj/item/twohanded/hypereutactic
+	l_pocket = /obj/item/twohanded/dualsaber/hypereutactic
 
 /datum/outfit/lavaknight/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(visualsOnly)

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -220,7 +220,7 @@
 /datum/gear/torisword
 	name = "Rainbow Zweihander"
 	category = SLOT_IN_BACKPACK
-	path = /obj/item/twohanded/hypereutactic/toy/rainbow
+	path = /obj/item/twohanded/dualsaber/hypereutactic/toy/rainbow
 	ckeywhitelist = list("annoymous35")
 
 /datum/gear/darksabre