Call Centcom! ERTs got fixed!

code/modules/admin/topic.dm

@@ -7,6 +7,9 @@
 		return
 
 	if(href_list["makeAntag"])
+		if (!ticker.mode)
+			usr << "<span class='danger'>Not until the round starts!</span>"
+			return
 		switch(href_list["makeAntag"])
 			if("1")
 				message_admins("[key_name_admin(usr)] created traitors.")

code/modules/admin/verbs/debug.dm

@@ -1136,12 +1136,13 @@ var/global/list/g_fancy_list_of_types = null
 	M.equip_to_slot_or_del(new /obj/item/weapon/tank/internals/emergency_oxygen(M), slot_s_store)
 	M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt)
 
-	M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse(M), slot_r_hand)
+	M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse/loyalpin(M), slot_r_hand)
 
 
 	var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(M)//Here you go Deuryn
 	L.imp_in = M
 	L.implanted = 1
+	M.sec_hud_set_implants()
 
 	var/obj/item/weapon/card/id/W = new(M)
 	W.icon_state = "centcom"

code/modules/admin/verbs/one_click_antag.dm

@@ -353,8 +353,10 @@ client/proc/one_click_antag()
 		//Pick the lucky players
 		var/numagents = min(5,candidates.len) //How many commandos to spawn
 		var/list/spawnpoints = deathsquadspawn
-		while(numagents && spawnpoints.len && candidates.len)
-			var/spawnloc = spawnpoints[1]
+		while(numagents && candidates.len)
+			if (numagents > spawnpoints.len)
+				continue // This guy's unlucky, not enough spawn points, we skip him.
+			var/spawnloc = spawnpoints[numagents]
 			var/mob/dead/observer/chosen_candidate = pick(candidates)
 			candidates -= chosen_candidate
 			if(!chosen_candidate.key)
@@ -396,10 +398,12 @@ client/proc/one_click_antag()
 			if(numagents == 1)
 				message_admins("The deathsquad has spawned with the mission: [mission].")
 			log_game("[key_name(Commando)] has been selected as a Death Commando")
-			spawnpoints -= spawnloc
 			numagents--
 
-		return 1
+		if (numagents == candidates.len)
+			return 0 // No one got spawned!
+		else
+			return 1
 
 	return
 
@@ -464,8 +468,10 @@ client/proc/one_click_antag()
 		//Pick the (un)lucky players
 		var/numagents = min(7,candidates.len) //How many officers to spawn
 		var/list/spawnpoints = emergencyresponseteamspawn
-		while(numagents && spawnpoints.len && candidates.len)
-			var/spawnloc = spawnpoints[1]
+		while(numagents && candidates.len)
+			if (candidates.len > spawnpoints.len)
+				continue // This guy's unlucky, not enough spawn points, we skip him.
+			var/spawnloc = spawnpoints[numagents]
 			var/mob/dead/observer/chosen_candidate = pick(candidates)
 			candidates -= chosen_candidate
 			if(!chosen_candidate.key)
@@ -480,13 +486,22 @@ client/proc/one_click_antag()
 				if(1)
 					ERTOperative.real_name = "Commander [pick(lastname)]"
 					equip_emergencyresponsesquad(ERTOperative, "commander")
-				if(2 || 5)
+				if(2)
 					ERTOperative.real_name = "Security Officer [pick(lastname)]"
 					equip_emergencyresponsesquad(ERTOperative, "sec")
-				if(3 || 6)
+				if(3)
 					ERTOperative.real_name = "Medical Officer [pick(lastname)]"
 					equip_emergencyresponsesquad(ERTOperative, "med")
-				if(4 || 7)
+				if(4)
+					ERTOperative.real_name = "Engineer [pick(lastname)]"
+					equip_emergencyresponsesquad(ERTOperative, "eng")
+				if(5)
+					ERTOperative.real_name = "Security Officer [pick(lastname)]"
+					equip_emergencyresponsesquad(ERTOperative, "sec")
+				if(6)
+					ERTOperative.real_name = "Medical Officer [pick(lastname)]"
+					equip_emergencyresponsesquad(ERTOperative, "med")
+				if(7)
 					ERTOperative.real_name = "Engineer [pick(lastname)]"
 					equip_emergencyresponsesquad(ERTOperative, "eng")
 			ERTOperative.key = chosen_candidate.key
@@ -515,10 +530,12 @@ client/proc/one_click_antag()
 			if(numagents == 1)
 				message_admins("The emergency response team has spawned with the mission: [mission].")
 			log_game("[key_name(ERTOperative)] has been selected as an Emergency Response Officer")
-			spawnpoints -= spawnloc
 			numagents--
 
-		return 1
+		if (numagents == candidates.len)
+			return 0 // No one got spawned!
+		else
+			return 1
 
 	return