diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm
index 1e7b7375fef..835898e450d 100644
--- a/code/game/gamemodes/antag_spawner.dm
+++ b/code/game/gamemodes/antag_spawner.dm
@@ -130,9 +130,9 @@
 
 /obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user)
 	if(used)
-		user << "<span class='warning'>The teleporter's power has been expended.</span>".
+		user << "<span class='warning'>[src] is out of power!</span>"
 		return
-	if(!user.mind in ticker.mode.syndicates)
+	if(!(user.mind in ticker.mode.syndicates))
 		user << "<span class='danger'>AUTHENTICATION FAILURE. ACCESS DENIED.</span>"
 		return 0
 	borg_to_spawn = input("What type?", "Cyborg Type", type) as null|anything in possible_types
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index e3ce3bf5ea1..8e8f6c54f16 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -253,6 +253,9 @@
 	var/mob/living/carbon/nearest_op = null
 
 /obj/item/weapon/pinpointer/operative/attack_self()
+	if(!usr.mind || !(usr.mind in ticker.mode.syndicates))
+		usr << "<span class='danger'>AUTHENTICATION FAILURE. ACCESS DENIED.</span>"
+		return 0
 	if(!active)
 		active = 1
 		workop()
@@ -263,20 +266,27 @@
 		usr << "<span class='notice'>You deactivate the pinpointer.</span>"
 
 /obj/item/weapon/pinpointer/operative/proc/scan_for_ops()
-	if(!nearest_op)
+	if(active)
+		nearest_op = null //Resets nearest_op every time it scans
+		var/closest_distance = 1000
 		for(var/mob/living/carbon/M in mob_list)
-			if(M.mind in ticker.mode.syndicates)
-				nearest_op = M
+			if(M.mind && (M.mind in ticker.mode.syndicates))
+				if(get_dist(M, get_turf(src)) < closest_distance) //Actually points toward the nearest op, instead of a random one like it used to
+					nearest_op = M
 
 /obj/item/weapon/pinpointer/operative/proc/workop()
-	scan_for_ops()
-	point_at(nearest_op, 0)
-	spawn(5)
-		.()
+	if(active)
+		scan_for_ops()
+		point_at(nearest_op, 0)
+		spawn(5)
+			.()
+	else
+		return 0
 
 /obj/item/weapon/pinpointer/operative/examine(mob/user)
 	..()
-	if(nearest_op != null)
-		user << "Nearest operative: <b>[nearest_op]</b>."
-	if(nearest_op == null && active)
-		user << "No operatives detected within scanning range."
+	if(active)
+		if(nearest_op)
+			user << "Nearest operative detected is <i>[nearest_op.real_name].</i>"
+		else
+			user << "No operatives detected within scanning range."
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 924ae2cb4db..52821301840 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1123,6 +1123,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"
@@ -1137,9 +1140,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)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 597a3514ba9..221f2848415 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -270,7 +270,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)
diff --git a/config/admins.txt b/config/admins.txt
index b4a042557de..797a49de2bd 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -94,4 +94,5 @@ bear1ake = Game Master
 CoreOverload = Game Master
 Jalleo = Game Master
 Anonus Tanir = Game Master
-FoxPMcCloud = Game Master
\ No newline at end of file
+FoxPMcCloud = Game Master
+Xhuis = Game Master
\ No newline at end of file
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 8f4682ee343..1d8833ff21c 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ