Merge pull request #515 from Markolie/master

Adds Syndiborg to Nuke Ops, enables shortcuts for borgs/drones, notifies the AI of borg changes

code/game/objects/items/weapons/implants/implant.dm

@@ -371,7 +371,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 			if(isliving(user))
 				user:brainloss += 20
 			return
-		if(locate(/obj/item/weapon/implant/traitor) in H.contents || locate(/obj/item/weapon/implant/traitor) in H.contents)
+		if(locate(/obj/item/weapon/implant/traitor) in H.contents || locate(/obj/item/weapon/implant/loyalty) in H.contents)
 			H.visible_message("[H] seems to resist the implant!", "You feel a strange sensation in your head that quickly dissipates.")
 			return 0
 		else if(H.mind in ticker.mode.traitors)

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

@@ -49,6 +49,20 @@
 	sharp = 1
 	edge = 1
 
+/obj/item/weapon/melee/energy/sword/cyborg
+	var/hitcost = 500	
+	
+/obj/item/weapon/melee/energy/sword/cyborg/attack(mob/M, var/mob/living/silicon/robot/R)
+	if(R.cell)
+		var/obj/item/weapon/cell/C = R.cell
+		if(active && !(C.use(hitcost)))
+			attack_self()
+			R << "<span class='notice'>It's out of charge!</span>"
+			return
+		C.use(hitcost)
+		..()
+	return
+	
 /obj/item/weapon/melee/energy/sword/pirate
 	name = "energy cutlass"
 	desc = "Arrrr matey."