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/devices/radio/radio.dm

@@ -296,7 +296,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 
 		// --- Cyborg ---
 		else if (isrobot(M))
-			jobname = "Cyborg"
+			var/mob/living/silicon/robot/B = M
+			jobname = "[B.designation] Cyborg"
 
 		// --- Personal AI (pAI) ---
 		else if (istype(M, /mob/living/silicon/pai))
@@ -698,6 +699,13 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 /obj/item/device/radio/borg
 	var/obj/item/device/encryptionkey/keyslot = null//Borg radios can handle a single encryption key
 
+/obj/item/device/radio/borg/syndicate
+	syndie = 1
+	keyslot = new /obj/item/device/encryptionkey/syndicate
+/obj/item/device/radio/borg/syndicate/New()
+	..()
+	set_frequency(SYND_FREQ)	
+	
 /obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob)
 //	..()
 	user.set_machine(src)

code/game/objects/items/devices/uplinks.dm

@@ -249,6 +249,27 @@ var/list/world_uplinks = list()
 			src.hidden_uplink.trigger(user)
 			return 1
 	return 0
+	
+//Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it)
+/obj/item/device/radio/headset/syndicate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/antag_spawner/borg_tele))
+		var/obj/item/weapon/antag_spawner/borg_tele/S = W
+		if(!S.used)
+			hidden_uplink.uses += S.TC_cost
+			qdel(S)
+			user << "<span class='notice'>Teleporter refunded.</span>"
+		else
+			user << "<span class='notice'>This teleporter is already used.</span>"
+			
+/obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/antag_spawner/borg_tele))
+		var/obj/item/weapon/antag_spawner/borg_tele/S = W
+		if(!S.used)
+			hidden_uplink.uses += S.TC_cost
+			qdel(S)
+			user << "<span class='notice'>Teleporter refunded.</span>"
+		else
+			user << "<span class='notice'>This teleporter is already used.</span>"
 
 // PRESET UPLINKS
 // A collection of preset uplinks.

code/game/objects/items/robot/robot_parts.dm

@@ -211,7 +211,8 @@
 			O.invisibility = 0
 			O.custom_name = created_name
 			O.updatename("Default")
-
+			if(O.connected_ai)
+				O.notify_ai(1)
 			M.brainmob.mind.transfer_to(O)
 
 			if(O.mind && O.mind.special_role)

code/game/objects/items/robot/robot_upgrades.dm

@@ -35,6 +35,7 @@
 	R.camera.network.Remove(list("Engineering","Medical","MINE"))
 	R.updatename("Default")
 	R.status_flags |= CANPUSH
+	R.notify_ai(2)
 	R.updateicon()
 
 	return 1
@@ -51,6 +52,7 @@
 
 /obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
+	R.notify_ai(3, R.name, heldname)
 	R.name = heldname
 	R.custom_name = heldname
 	R.real_name = heldname
@@ -75,6 +77,9 @@
 				R.key = ghost.key
 
 	R.stat = CONSCIOUS
+	dead_mob_list -= R //please never forget this ever kthx
+	living_mob_list += R
+	R.notify_ai(1)
 	return 1
 
 

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."