Merge pull request #12057 from Xhuis/it_worked_in_testing_3

Fixes and tweaks to Syndicate medical cyborgs

code/modules/mob/living/silicon/robot/robot.dm

@@ -1128,6 +1128,9 @@
 	radio = new /obj/item/device/radio/borg/syndicate(src)
 	module = new /obj/item/weapon/robot_module/syndicate(src)
 	laws = new /datum/ai_laws/syndicate_override()
+	spawn(5)
+		if(playstyle_string)
+			src << playstyle_string
 
 /mob/living/silicon/robot/syndicate/medical
 	icon_state = "syndi-medi"
@@ -1142,9 +1145,6 @@
 /mob/living/silicon/robot/syndicate/medical/New(loc)
 	..()
 	module = new /obj/item/weapon/robot_module/syndicate_medical(src)
-	spawn(5)
-		if(playstyle_string)
-			src << playstyle_string
 
 /mob/living/silicon/robot/proc/notify_ai(notifytype, oldname, newname)
 	if(!connected_ai)

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -324,7 +324,6 @@
 	modules += new /obj/item/weapon/reagent_containers/borghypo/syndicate(src)
 	modules += new /obj/item/weapon/twohanded/shockpaddles/syndicate(src)
 	modules += new /obj/item/device/healthanalyzer(src)
-	modules += new /obj/item/weapon/reagent_containers/syringe(src)
 	modules += new /obj/item/weapon/surgical_drapes(src)
 	modules += new /obj/item/weapon/retractor(src)
 	modules += new /obj/item/weapon/hemostat(src)
@@ -332,6 +331,7 @@
 	modules += new /obj/item/weapon/scalpel(src)
 	modules += new /obj/item/weapon/melee/energy/sword/cyborg/saw(src) //Energy saw -- primary weapon
 	modules += new /obj/item/roller/robo(src)
+	modules += new /obj/item/weapon/card/emag(src)
 	modules += new /obj/item/weapon/tank/jetpack/carbondioxide(src)
 	modules += new /obj/item/weapon/crowbar(src)
 	modules += new /obj/item/weapon/pinpointer/operative(src)

code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm

@@ -914,16 +914,16 @@ datum/reagent/medicine/tricordrazine/overdose_process(mob/living/M)
 datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs
 	name = "Restorative Nanites"
 	id = "syndicate_nanites"
-	description = "Miniature medical robots that swiftly restore bodily damage."
+	description = "Miniature medical robots that swiftly restore bodily damage. May begin to attack their host's cells in high amounts."
 	reagent_state = SOLID
 	color = "#555555"
 
 datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
-	M.adjustBruteLoss(-2*REM)
-	M.adjustFireLoss(-2*REM)
-	M.adjustOxyLoss(-2*REM)
-	M.adjustToxLoss(-2*REM)
-	M.adjustBrainLoss(-5*REM)
-	M.adjustCloneLoss(-1*REM)
+	M.adjustBruteLoss(-5*REM) //A ton of healing - this is a 50 telecrystal investment.
+	M.adjustFireLoss(-5*REM)
+	M.adjustOxyLoss(-15*REM)
+	M.adjustToxLoss(-5*REM)
+	M.adjustBrainLoss(-15*REM)
+	M.adjustCloneLoss(-3*REM)
 	..()
 	return

code/modules/reagents/reagent_containers/borghydro.dm

@@ -55,7 +55,7 @@ Borg Hypospray
 	//update_icon()
 	return 1
 
-// Purely for testing purposes I swear~
+// Purely for testing purposes I swear~ //don't lie to me
 /*
 /obj/item/weapon/reagent_containers/borghypo/verb/add_cyanide()
 	set src in world
@@ -128,7 +128,7 @@ Borg Hypospray
 
 /obj/item/weapon/reagent_containers/borghypo/syndicate
 	name = "syndicate cyborg hypospray"
-	desc = "A modified hypospray that generates reagents more quickly and consumes less power."
+	desc = "An experimental piece of Syndicate technology used to produce powerful restorative nanites used to very quickly restore injuries of all types. Also metabolizes potassium iodide, for radiation poisoning, and morphine, for offense."
 	icon_state = "borghypo_s"
 	charge_cost = 20
 	recharge_time = 2
@@ -149,7 +149,7 @@ Borg Shaker
 	reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale")
 
 /obj/item/weapon/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user)
-	return //Can't inject stuff with a shaker, can we?
+	return //Can't inject stuff with a shaker, can we? //not with that attitude
 
 /obj/item/weapon/reagent_containers/borghypo/borgshaker/regenerate_reagents()
 	if(isrobot(src.loc))