ouugh

_maps/outpost/indie_space.dmm

@@ -165,6 +165,7 @@
 	pixel_x = -4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "bc" = (
@@ -3792,6 +3793,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "yR" = (
@@ -5316,6 +5318,7 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "Ix" = (
@@ -5662,6 +5665,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "KF" = (
@@ -6369,6 +6373,7 @@
 	dir = 8
 	},
 /obj/item/toy/figure/captain,
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "Po" = (
@@ -6761,6 +6766,11 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood,
 /area/outpost/crew/bar)
+"RC" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/ert_outpost_spawn,
+/turf/open/floor/plating,
+/area/outpost/maintenance/central)
 "RG" = (
 /obj/structure/barricade/wooden/crude,
 /obj/machinery/door/firedoor/closed,
@@ -7202,6 +7212,7 @@
 	layer = 2.9;
 	pixel_y = 4
 	},
+/obj/effect/landmark/ert_outpost_spawn,
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "Uq" = (
@@ -16795,8 +16806,8 @@ Zk
 cq
 KJ
 pA
-Mt
-Mt
+RC
+RC
 tk
 Ap
 cq

code/_globalvars/lists/mapping.dm

@@ -34,7 +34,7 @@ GLOBAL_LIST_EMPTY(blobstart) //blobs, santa, respawning devils
 GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players
 GLOBAL_LIST_EMPTY(deathsquadspawn)
 GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)
-GLOBAL_LIST_EMPTY(emergencyresponseteamsoutpostpawn)
+GLOBAL_LIST_EMPTY(emergencyresponseteam_outpostspawn)
 GLOBAL_LIST_EMPTY(ruin_landmarks)
 GLOBAL_LIST_EMPTY(stationroom_landmarks) //List of all spawns for stationrooms
 

code/datums/ert.dm

@@ -165,32 +165,32 @@
 	roles = list(/datum/antagonist/ert/minutemen/piratehunters)
 	mission = "Eliminate pirate presence within the sector."
 	rename_team = "Minutemen Pirate Hunter Team"
-	polldesc = "Minutemen pirate hunters"
+	polldesc = "a fireteam of Minutemen pirate hunters"
 
-/datum/ert/minutemen/gold_irs
-	teamsize = 3
-	leader_role = /datum/antagonist/ert/minutemen/gold_irs
-	roles = list(/datum/antagonist/ert/minutemen/gold_irs)
-	rename_team = "Minutemen GOLD Collection Squad"
-	polldesc = "Minutemen collection squad"
+/datum/ert/minutemen/inspector
+	teamsize = 1
+	leader_role = /datum/antagonist/ert/official/minutemen
+	roles = list(/datum/antagonist/ert/official/minutemen)
+	rename_team = "Minutemen GOLD Inspector"
+	polldesc = "a Minutemen inspector"
 
 // Syndicate
 
 /datum/ert/syndicate
 	teamsize = 4
 	opendoors = FALSE
-	leader_role = /datum/antagonist/ert/syndicate
+	leader_role = /datum/antagonist/ert/syndicate/leader
 	roles = list(/datum/antagonist/ert/syndicate)
 	mission = "Serve the interests of the Syndicate."
 	rename_team = "Generic Syndicate Team"
 	polldesc = "a Syndicate emergency team"
 
 /datum/ert/syndicate/gorlex
 	leader_role = /datum/antagonist/ert/syndicate/gorlex/leader
-	roles = list(/datum/antagonist/ert/syndicate/gorlex)
-	mission = "Serve the interests of the Gorlex Maruders."
-	rename_team = "Gorlex Maruders Team"
-	polldesc = "a Syndicate Gorlex squad"
+	roles = list(/datum/antagonist/ert/syndicate/gorlex, /datum/antagonist/ert/syndicate/gorlex/pointman, /datum/antagonist/ert/syndicate/gorlex/medic, /datum/antagonist/ert/syndicate/gorlex/sniper)
+	mission = "Serve the interests of the 2nd Battlegroup."
+	rename_team = "2nd Battlegroup Squad"
+	polldesc = "a loyalist Gorlex squad"
 
 /datum/ert/syndicate/cybersun
 	leader_role = /datum/antagonist/ert/syndicate/cybersun/leader
@@ -229,18 +229,21 @@
 /datum/ert/independent
 	teamsize = 3
 	opendoors = FALSE
-	leader_role = /datum/antagonist/ert/indie
-	roles = list(/datum/antagonist/ert/indie)
+	leader_role = /datum/antagonist/ert/independent
+	roles = list(/datum/antagonist/ert/independent)
 	rename_team = "Security Independent Team"
+	polldesc = "an independent security team"
 
 /datum/ert/independent/emt
 	teamsize = 4
-	leader_role = /datum/antagonist/ert/indie/emt
-	roles = list(/datum/antagonist/ert/indie/emt)
+	leader_role = /datum/antagonist/ert/independent/emt
+	roles = list(/datum/antagonist/ert/independent/emt)
 	rename_team = "Medical Independent Team"
+	polldesc = "an independent medical response team"
 
 /datum/ert/independent/firefighter
 	teamsize = 5
-	leader_role = /datum/antagonist/ert/indie/firefighter/leader
-	roles = list(/datum/antagonist/ert/indie/firefighter, /datum/antagonist/ert/indie/firefighter/medic)
+	leader_role = /datum/antagonist/ert/independent/firefighter/leader
+	roles = list(/datum/antagonist/ert/independent/firefighter, /datum/antagonist/ert/independent/firefighter/medic)
 	rename_team = "Independent Firefighter Team"
+	polldesc = "an independent firefighting team"

code/game/objects/effects/landmarks.dm

@@ -347,19 +347,18 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	name = "Emergency response team spawn"
 	icon_state = "ert_spawn"
 
+/obj/effect/landmark/ert_spawn/Initialize(mapload)
+	..()
+	GLOB.emergencyresponseteamspawn += loc
+	return INITIALIZE_HINT_QDEL
+
 /obj/effect/landmark/ert_outpost_spawn
 	name = "Emergency response team outpost spawn"
 	icon_state = "ert_spawn"
 
 /obj/effect/landmark/ert_outpost_spawn/Initialize(mapload)
 	..()
-	GLOB.emergencyresponseteamsoutpostpawn += loc
-	return INITIALIZE_HINT_QDEL
-
-
-/obj/effect/landmark/ert_spawn/Initialize(mapload)
-	..()
-	GLOB.emergencyresponseteamspawn += loc
+	GLOB.emergencyresponseteam_outpostspawn += loc
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/ert_shuttle_spawn

code/game/objects/items/storage/belt.dm

@@ -303,6 +303,11 @@
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_items = 6
 
+/obj/item/storage/belt/security/webbing/bulldog/PopulateContents()
+	. = ..()
+	for(var/i in 1 to 3)
+		new /obj/item/ammo_box/magazine/m12g(src)
+
 /obj/item/storage/belt/mining
 	name = "explorer's webbing"
 	desc = "A versatile chest rig, cherished by miners and hunters alike."
@@ -436,13 +441,13 @@
 
 /obj/item/storage/belt/military/c20r/PopulateContents()
 	. = ..()
-	for(var/i in 1 to 7)
+	for(var/i in 1 to 4)
 		new /obj/item/ammo_box/magazine/smgm45(src)
 
-/obj/item/storage/belt/military/bulldog/PopulateContents()
+/obj/item/storage/belt/military/assault/m90/PopulateContents()
 	. = ..()
-	for(var/i in 1 to 7)
-		new /obj/item/ammo_box/magazine/m12g(src)
+	for(var/i in 1 to 4)
+		new /obj/item/ammo_box/magazine/m556(src)
 
 /obj/item/storage/belt/military/minutemen
 	name = "minutemen tactical webbing"

code/modules/admin/verbs/one_click_antag.dm

@@ -341,20 +341,17 @@
 			to_chat(usr, span_warning("No applicants for ERT. Aborting spawn."))
 			return FALSE
 
-		if(ertemplate.spawn_at_outpost && !ertemplate.use_custom_shuttle)
-			if(!length(GLOB.emergencyresponseteamsoutpostpawn))
-				stack_trace("No ERT outpost spawns! ERT spawning at CentCom.")
-				return
-			spawn_turfs = GLOB.emergencyresponseteamsoutpostpawn
-
-
 		if(ertemplate.use_custom_shuttle && ertemplate.ert_template)
 			to_chat(usr, span_boldnotice("Attempting to spawn ERT custom shuttle, this may take a few seconds..."))
 
 			var/datum/map_template/shuttle/template = new ertemplate.ert_template
 			var/spawn_location
 
 			if(ertemplate.spawn_at_outpost)
+				if(!length(GLOB.emergencyresponseteam_outpostspawn))
+					message_admins("No outpost spawns found!")
+				spawnpoints = GLOB.emergencyresponseteam_outpostspawn
+
 				if(length(SSovermap.outposts) > 1)
 					var/temp_loc = input(usr, "Select outpost to spawn at") as null|anything in SSovermap.outposts
 					if(!temp_loc)
@@ -435,6 +432,8 @@
 			if(length(spawn_turfs))
 				spawnloc = pick(spawn_turfs)
 			else
+				if(!spawnpoints.len)
+					CRASH("ERT has no spawnpoints!")
 				spawnloc = spawnpoints[index+1]
 				//loop through spawnpoints one at a time
 				index = (index + 1) % spawnpoints.len

code/modules/antagonists/ert/ert.dm

@@ -288,7 +288,7 @@
 
 /datum/antagonist/ert/minutemen/greet()
 	to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
-	var/missiondesc = "Shoulder to shoulder with your fellow colonists in the Colonial Minutemen, you have been sent to [station_name()].<BR>"
+	var/missiondesc = "You stand shoulder to shoulder with your fellow colonists in the Colonial Minutemen within [station_name()].<BR>"
 	if(leader) //If Squad Leader
 		missiondesc += "Lead your team to ensure the completion of your objectives."
 	else
@@ -327,11 +327,18 @@
 	outfit = /datum/outfit/centcom/ert/minutemen/riot/leader
 	role = "Sargent"
 
-/datum/antagonist/ert/minutemen/gold_irs
-	name = "GOLD Collector"
-	outfit = /datum/outfit/centcom/ert/minutemen/gold_irs
+/datum/antagonist/ert/official/minutemen
+	name = "GOLD Inspector"
+	outfit = /datum/outfit/centcom/ert/minutemen/inspector
 	role = "Lieutenant"
 
+/datum/antagonist/ert/official/minutemen/greet()
+	to_chat(owner, "<B><font size=3 color=red>You are the GOLD Inspector.</font></B>")
+	if (ert_team)
+		to_chat(owner, "The Galactic Optimum Labor Division is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
+	else
+		to_chat(owner, "The Galactic Optimum Labor Division is sending you to [station_name()] with the task: [mission.explanation_text]")
+
 /datum/antagonist/ert/minutemen/piratehunters
 	name = "Pirate Hunter"
 	outfit = /datum/outfit/centcom/ert/minutemen/piratehunters
@@ -372,12 +379,38 @@
 	role = "Sergeant"
 
 /datum/antagonist/ert/syndicate/gorlex
-	name = "Gorlex Trooper"
+	name = "2nd Battlegroup Trooper"
 	outfit = /datum/outfit/centcom/ert/syndicate/gorlex
 	role = "Trooper"
 
+/datum/antagonist/ert/syndicate/gorlex/greet()
+	to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
+	var/missiondesc = "You're a soldier of the 2nd Battlegroup, sometimes known as Gorlex Loyalists, sent to [station_name()].<BR>"
+	if(leader) //If Squad Leader
+		missiondesc += "Lead your team to ensure the completion of your objectives."
+	else
+		missiondesc += "Follow orders given to you by your Sergeant."
+
+	missiondesc += "<BR><B>Your Mission</B>: [ert_team.mission.explanation_text]"
+	to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/syndicate/gorlex/pointman
+	name = "2nd Battlegroup Shotgunner"
+	outfit = /datum/outfit/centcom/ert/syndicate/gorlex/pointman
+	role = "Pointman"
+
+/datum/antagonist/ert/syndicate/gorlex/medic
+	name = "2nd Battlegroup Medic"
+	outfit = /datum/outfit/centcom/ert/syndicate/gorlex/medic
+	role = "Medic"
+
+/datum/antagonist/ert/syndicate/gorlex/sniper
+	name = "2nd Battlegroup Sniper"
+	outfit = /datum/outfit/centcom/ert/syndicate/gorlex/sniper
+	role = "Marksman"
+
 /datum/antagonist/ert/syndicate/gorlex/leader
-	name = "Gorlex Sergeant"
+	name = "2nd Battlegroup Sergeant"
 	leader = TRUE
 	outfit = /datum/outfit/centcom/ert/syndicate/gorlex/leader
 	role = "Sergeant"
@@ -439,7 +472,7 @@
 
 /datum/antagonist/ert/frontier/greet()
 	to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
-	var/missiondesc = "You are one of the ruthless, sadistic pirates in the Frontiersmen pirate fleet. They have sent you to [station_name()].<BR>"
+	var/missiondesc = "You are one of the ruthless, sadistic pirates in the Frontiersmen pirate fleet, stationed in [station_name()].<BR>"
 	if(leader) //If Squad Leader
 		missiondesc += "Lead your team to complete your objectives."
 	else
@@ -464,15 +497,15 @@
 	role = "Sapper"
 
 // ********************************************************************
-// ** Indie **
+// ** independent **
 // ********************************************************************
 
-/datum/antagonist/ert/indie
+/datum/antagonist/ert/independent
 	name = "Independent Security Officer"
-	outfit = /datum/outfit/centcom/ert/indie
+	outfit = /datum/outfit/centcom/ert/independent
 	role = "Security Officer"
 
-/datum/antagonist/ert/indie/greet()
+/datum/antagonist/ert/independent/greet()
 	to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
 	var/missiondesc = "You are one of the many Independent contractors, workers and students on [station_name()].<BR>"
 	if(leader) //If Squad Leader
@@ -483,27 +516,27 @@
 	missiondesc += "<BR><B>Your Mission</B>: [ert_team.mission.explanation_text]"
 	to_chat(owner,missiondesc)
 
-/datum/antagonist/ert/indie/emt
+/datum/antagonist/ert/independent/emt
 	name = "Independent Medical Technician"
-	outfit = /datum/outfit/centcom/ert/indie/emt
+	outfit = /datum/outfit/centcom/ert/independent/emt
 	role = "Paramedic"
 
-/datum/antagonist/ert/indie/firefighter
+/datum/antagonist/ert/independent/firefighter
 	name = "Independent Firefighter"
-	outfit = /datum/outfit/centcom/ert/indie/firefighter
+	outfit = /datum/outfit/centcom/ert/independent/firefighter
 	role = "Firefighter"
 
-/datum/antagonist/ert/indie/firefighter/medic
+/datum/antagonist/ert/independent/firefighter/medic
 	name = "Independent Firefighter Paramedic"
-	outfit = /datum/outfit/centcom/ert/indie/firefighter/medic
+	outfit = /datum/outfit/centcom/ert/independent/firefighter/medic
 	role = "Paramedic"
 
-/datum/antagonist/ert/indie/firefighter/leader
+/datum/antagonist/ert/independent/firefighter/leader
 	name = "Independent Firefighter Group Captain"
-	outfit = /datum/outfit/centcom/ert/indie/firefighter/leader
+	outfit = /datum/outfit/centcom/ert/independent/firefighter/leader
 	role = "Group Captain"
 
-/datum/antagonist/ert/indie/technician
+/datum/antagonist/ert/independent/technician
 	name = "Independent Technician"
-	outfit = /datum/outfit/centcom/ert/indie/technician
+	outfit = /datum/outfit/centcom/ert/independent/technician
 	role = "Technician"