From 0cf7f2e8826f784b9f8bc76affc66822c13e344e Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 3 Mar 2020 21:07:24 -0700
Subject: [PATCH] Update energy.dm

---
 code/game/objects/items/melee/energy.dm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 94898a3a25..86cbc83891 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -104,14 +104,14 @@
 	armour_penetration = 35
 	block_chance = 50
 
-/obj/item/melee/transforming/energy/sword/Initialize(mapload)
-	. = ..()
-	AddElement(/datum/element/sword_point)
-
 /obj/item/melee/transforming/energy/sword/transform_weapon(mob/living/user, supress_message_text)
 	. = ..()
-	if(. && active && item_color)
-		icon_state = "sword[item_color]"
+	if(active)
+		if(. && item_color)
+			icon_state = "sword[item_color]"
+		AddElement(/datum/element/sword_point)
+	else
+		RemoveElement(/datum/element/sword_point)
 
 /obj/item/melee/transforming/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(active)