diff --git a/code/defines/global.dm b/code/defines/global.dm
index 635dea405ce..3709bbbeb2a 100644
--- a/code/defines/global.dm
+++ b/code/defines/global.dm
@@ -104,7 +104,7 @@ var
 	cmoMax = 1
 	mimeMax = 1
 	sorterMax = 2
-	borgMax = 2
+	//borgMax = 1 < Isn't used anymore since borgs can't latejoin now. -- Urist
 
 	list/bombers = list(  )
 	list/admin_log = list (  )
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index b9fdc519ab8..49d33feeb7d 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -704,6 +704,8 @@
 	force = 7.0
 	m_amt = 2000
 	origin_tech = "combat=3;magnets=2"
+	var/shot_delay = 0 //used for borg guns, adds that much in deciseconds delay between shots
+	var/next_attack = 0 //used for the delay
 
 /obj/item/weapon/gun/energy/laser_gun/captain
 	icon_state = "caplaser"
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index f9a13beb67b..a1420ded8dc 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -14,7 +14,7 @@ var/list/occupations = list(
 	"Research Director",
 	"Chaplain",
 	"Roboticist",
-	"Cyborg","Cyborg",//"Cyborg","Cyborg","Cyborg",
+	"Cyborg",//"Cyborg","Cyborg","Cyborg","Cyborg", < Fuck that. Seriously. -- Urist
 	"AI",
 	"Barman",
 	"Chef",
diff --git a/code/game/objects/items/weapons/guns_ammo.dm b/code/game/objects/items/weapons/guns_ammo.dm
index 86e602f0af5..f80c7be7f94 100644
--- a/code/game/objects/items/weapons/guns_ammo.dm
+++ b/code/game/objects/items/weapons/guns_ammo.dm
@@ -446,7 +446,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li
 		return
 
 	var/detective = 0
-	
+
 	if (istype(user, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
 		detective = (istype(H.w_uniform, /obj/item/clothing/under/det) && \
@@ -457,7 +457,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li
 			user << "\red You don't have the dexterity to do this!"
 			return
 		detective = 1
-		
+
 	if(!detective)
 		usr << "\red You just don't feel cool enough to use this gun looking like that."
 		return
@@ -497,7 +497,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li
 
 /obj/item/weapon/gun/detectiverevolver/attack(mob/M as mob, mob/living/user as mob)
 	var/detective = 0
-	
+
 	if (istype(user, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
 		detective = (istype(H.w_uniform, /obj/item/clothing/under/det) && \
@@ -508,7 +508,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li
 			user << "\red You don't have the dexterity to do this!"
 			return
 		detective = 1
-		
+
 	if(!detective)
 		user << "\red You just don't feel cool enough to use this gun looking like that."
 		return
@@ -603,12 +603,17 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/li
 		user << "\red *click* *click*"
 		return
 
+	if(next_attack > world.time)
+		return
+
 	playsound(user, 'Laser.ogg', 50, 1)
 	if(isrobot(user))
 		var/mob/living/silicon/robot/R = user
 		R.cell.charge -= 30
 	else
 		src.charges--
+	if(shot_delay)
+		next_attack = world.time + shot_delay
 	update_icon()
 
 	var/turf/T = user.loc
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index e2083199339..c0e47666d9d 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -137,6 +137,7 @@ obj/item/weapon/robot_module/syndicate
 	src.modules += new /obj/item/weapon/handcuffs(src)
 	src.modules += new /obj/item/weapon/gun/energy/taser_gun(src)
 	src.emag = new /obj/item/weapon/gun/energy/laser_gun(src)
+	src.emag:shot_delay = 7
 
 
 /obj/item/weapon/robot_module/janitor/New()
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index efbd5ac1a48..cf4de0b0002 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -251,8 +251,8 @@ mob/new_player
 					AttemptLateSpawn("Mime", mimeMax)
 				if ("31")
 					AttemptLateSpawn("Mail Sorter", sorterMax)
-				if ("32")
-					AttemptLateSpawn("Cyborg", borgMax)
+				//if ("32") < Nope. Latejoining cyborgs can fuck a lot of shit up since it's sudden and nobody is near the robotics console etc. -- Urist
+					//AttemptLateSpawn("Cyborg", borgMax)
 
 		if(!ready && href_list["preferences"])
 			preferences.process_link(src, href_list)
@@ -430,8 +430,8 @@ mob/new_player
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=29'>Shaft Miner</a><br>"
 		if (IsJobAvailable("Mail Sorter",sorterMax))
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=31'>Mail Sorter</a> (BETA)<br>"
-		if (IsJobAvailable("Cyborg",borgMax))
-			dat += "<a href='byond://?src=\ref[src];SelectedJob=32'>Cyborg</a><br>"
+		//if (IsJobAvailable("Cyborg",borgMax))
+			//dat += "<a href='byond://?src=\ref[src];SelectedJob=32'>Cyborg</a><br>"
 		if (!jobban_isbanned(src,"Assistant"))
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=18'>Assistant</a><br>"