Merge remote-tracking branch 'citadel/master' into combat_rework

code/game/objects/items/melee/energy.dm

@@ -292,6 +292,10 @@
 	light_color = "#37FFF7"
 	actions_types = list()
 
+/obj/item/melee/transforming/energy/sword/cx/Initialize()
+	icon_state_on = icon_state
+	return ..()
+
 /obj/item/melee/transforming/energy/sword/cx/ComponentInitialize()
 	. = ..()
 	AddElement(/datum/element/update_icon_updates_onmob)
@@ -309,6 +313,7 @@
 	if(!supress_message_text)
 		to_chat(user, "<span class='notice'>[src] [active ? "is now active":"can now be concealed"].</span>")
 
+
 /obj/item/melee/transforming/energy/sword/cx/update_overlays()
 	. = ..()
 	var/mutable_appearance/blade_overlay = mutable_appearance(icon, "cxsword_blade")