From 671b49cba15e01ac4f38b7934fe17e2bbb849765 Mon Sep 17 00:00:00 2001
From: VistaPOWA <hegyi.mokka@gmail.com>
Date: Sat, 11 Jan 2014 17:04:17 +0100
Subject: [PATCH] Fixes the double-energy draw of the esword, makes the
 syndicate icon properly display for the borg.

---
 code/game/gamemodes/antag_spawner.dm            | 3 ++-
 code/game/objects/items/weapons/melee/energy.dm | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm
index 40eef5cb2de..25ca77b124c 100644
--- a/code/game/gamemodes/antag_spawner.dm
+++ b/code/game/gamemodes/antag_spawner.dm
@@ -138,5 +138,6 @@
 	S.start()
 	var/mob/living/silicon/robot/R = new /mob/living/silicon/robot/syndicate(T)
 	R.key = C.key
-	ticker.mode.traitors += R.mind
+	ticker.mode.syndicates += R.mind
+	ticker.mode.update_synd_icons_added(R.mind)
 	R.mind.special_role = "syndicate"
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index 0d2eb5fefd2..3167d70bc40 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -136,10 +136,9 @@
 	if(R.cell)
 		var/obj/item/weapon/cell/C = R.cell
 		if(active && !(C.use(hitcost)))
-			attack_self()
+			attack_self(R)
 			R << "<span class='notice'>It's out of charge!</span>"
 			return
-		C.use(hitcost)
 		..()
 	return