indies

code/datums/ert.dm

@@ -224,3 +224,23 @@
 	roles = list(/datum/antagonist/ert/frontier, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer)
 	rename_team = "Assault Frontiersmen Team"
 	polldesc = "a well armed squad of pirates"
+	ert_template = /datum/map_template/shuttle/subshuttles/frontiersmen_gut
+
+/datum/ert/independent
+	teamsize = 3
+	opendoors = FALSE
+	leader_role = /datum/antagonist/ert/indie
+	roles = list(/datum/antagonist/ert/indie)
+	rename_team = "Security Independent Team"
+
+/datum/ert/independent/emt
+	teamsize = 4
+	leader_role = /datum/antagonist/ert/indie/emt
+	roles = list(/datum/antagonist/ert/indie/emt)
+	rename_team = "Medical Independent 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)
+	rename_team = "Independent Firefighter Team"

code/modules/admin/verbs/one_click_antag.dm

@@ -345,7 +345,7 @@
 			if(!length(GLOB.emergencyresponseteamsoutpostpawn))
 				stack_trace("No ERT outpost spawns! ERT spawning at CentCom.")
 				return
-			spawn_turfs = list(GLOB.emergencyresponseteamsoutpostpawn)
+			spawn_turfs = GLOB.emergencyresponseteamsoutpostpawn
 
 
 		if(ertemplate.use_custom_shuttle && ertemplate.ert_template)

code/modules/antagonists/ert/ert.dm

@@ -69,7 +69,9 @@
 	missiondesc += "<BR><B>Your Mission</B>: [ert_team.mission.explanation_text]"
 	to_chat(owner,missiondesc)
 
-// Nanotrasen
+// ********************************************************************
+// ** Nanotrasen **
+// ********************************************************************
 
 // Official
 /datum/antagonist/ert/official
@@ -237,7 +239,7 @@
 
 /datum/antagonist/ert/inteq/greet()
 	to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
-	var/missiondesc = "As part of Inteq Risk Management, you have been sent to [station_name()].<BR>"
+	var/missiondesc = "You're one of the many mercenaries under the Inteq Risk Management Group sent to [station_name()].<BR>"
 	if(leader) //If Squad Leader
 		missiondesc += "Lead your squadron to ensure the completion of your contract."
 	else
@@ -286,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 = "As part of the Colonial Minutemen, you have been sent to [station_name()].<BR>"
+	var/missiondesc = "Shoulder to shoulder with your fellow colonists in the Colonial Minutemen, you have been sent to [station_name()].<BR>"
 	if(leader) //If Squad Leader
 		missiondesc += "Lead your team to ensure the completion of your objectives."
 	else
@@ -352,7 +354,7 @@
 
 /datum/antagonist/ert/syndicate/greet()
 	to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
-	var/missiondesc = "As part of the Syndicate Coalition, you have been sent to [station_name()].<BR>"
+	var/missiondesc = "You are but another member of the Syndicate sent to [station_name()].<BR>"
 	if(leader) //If Squad Leader
 		missiondesc += "Lead your team to ensure the completion of your objectives."
 	else
@@ -387,13 +389,13 @@
 
 /datum/antagonist/ert/syndicate/cybersun/greet()
 	to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
-	var/missiondesc = "As part of Cybersun enterprises, you have been sent to [station_name()].<BR>"
+	var/missiondesc = "You are one of the commandos enlisted in Cybersun Industries, deployed 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."
 	if(prob(50) && !leader)
-		missiondesc += "In addition to your contract with Cybersun, you are also a <B>Gorlex Hardliner</B>. You do not <I>like</I> Cybersun, but you work with them regardless."
+		missiondesc += "<BR>In addition to your contract with Cybersun, you are also a <B>Gorlex Hardliner</B>. You do not <I>like</I> Cybersun, but you work with them regardless."
 
 	missiondesc += "<BR><B>Your Mission</B>: [ert_team.mission.explanation_text]"
 	to_chat(owner,missiondesc)
@@ -411,7 +413,7 @@
 
 /datum/antagonist/ert/syndicate/cybersun/medic/greet()
 	to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
-	var/missiondesc = "As part of Cybersun's Medical Intervention program, you have been sent to [station_name()] to aid Cybersun clients in distress.<BR>"
+	var/missiondesc = "You are one of the many trained paramedics of Cybersun's Medical Intervention program, sent with your team to [station_name()] to aid Cybersun clients in distress.<BR>"
 	if(leader) //If Squad Leader
 		missiondesc += "Lead your team to ensure the safety of Cybersun's clientele.<BR>"
 	else
@@ -437,7 +439,7 @@
 
 /datum/antagonist/ert/frontier/greet()
 	to_chat(owner, "<B><font size=3 color=red>You are the [name].</font></B>")
-	var/missiondesc = "You have been sent on a mission by the Frontiersmen pirate fleet to [station_name()].<BR>"
+	var/missiondesc = "You are one of the ruthless, sadistic pirates in the Frontiersmen pirate fleet. They have sent you to [station_name()].<BR>"
 	if(leader) //If Squad Leader
 		missiondesc += "Lead your team to complete your objectives."
 	else
@@ -460,3 +462,48 @@
 	name = "Frontiersmen Engineer"
 	outfit = /datum/outfit/centcom/ert/frontiersmen/engineer
 	role = "Sapper"
+
+// ********************************************************************
+// ** Indie **
+// ********************************************************************
+
+/datum/antagonist/ert/indie
+	name = "Independent Security Officer"
+	outfit = /datum/outfit/centcom/ert/indie
+	role = "Security Officer"
+
+/datum/antagonist/ert/indie/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
+		missiondesc += "Lead your team to complete your objectives."
+	else
+		missiondesc += "Follow orders given to you by your leader."
+
+	missiondesc += "<BR><B>Your Mission</B>: [ert_team.mission.explanation_text]"
+	to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/indie/emt
+	name = "Independent Medical Technician"
+	outfit = /datum/outfit/centcom/ert/indie/emt
+	role = "Paramedic"
+
+/datum/antagonist/ert/indie/firefighter
+	name = "Independent Firefighter"
+	outfit = /datum/outfit/centcom/ert/indie/firefighter
+	role = "Firefighter"
+
+/datum/antagonist/ert/indie/firefighter/medic
+	name = "Independent Firefighter Paramedic"
+	outfit = /datum/outfit/centcom/ert/indie/firefighter/medic
+	role = "Paramedic"
+
+/datum/antagonist/ert/indie/firefighter/leader
+	name = "Independent Firefighter Group Captain"
+	outfit = /datum/outfit/centcom/ert/indie/firefighter/leader
+	role = "Group Captain"
+
+/datum/antagonist/ert/indie/technician
+	name = "Independent Technician"
+	outfit = /datum/outfit/centcom/ert/indie/technician
+	role = "Technician"

code/modules/clothing/outfits/ert/indie_ert.dm

@@ -0,0 +1,87 @@
+/datum/outfit/centcom/ert/independent
+	name = "ERT - Independent Security Officer"
+
+	head = /obj/item/clothing/head/helmet/sec
+	mask = null
+	uniform = /obj/item/clothing/under/rank/security/officer
+	shoes = /obj/item/clothing/shoes/combat/swat
+	gloves = /obj/item/clothing/gloves/color/black
+	ears = /obj/item/radio/headset/alt
+	suit = /obj/item/clothing/suit/armor/vest
+	back = /obj/item/storage/backpack/security
+	belt = /obj/item/storage/belt/security/full
+	id = /obj/item/card/id
+
+	id_role = "Security Officer"
+
+/datum/outfit/centcom/ert/indie/emt
+	name = "ERT - Independent Paramedic"
+
+	head = /obj/item/clothing/head/soft/paramedic
+	mask = null
+	uniform = /obj/item/clothing/under/rank/medical/paramedic
+	shoes = /obj/item/clothing/shoes/sneakers/white
+	gloves = /obj/item/clothing/gloves/color/latex
+	ears = /obj/item/radio/headset
+	suit = /obj/item/clothing/suit/toggle/labcoat/paramedic
+	back = /obj/item/storage/backpack/medic
+	belt = /obj/item/storage/belt/medical/webbing/paramedic
+
+	id_role = "Emergency Medical Technician"
+
+/datum/outfit/centcom/ert/indie/firefighter
+	name = "ERT - Independent Firefighter (Standard)"
+
+	head = /obj/item/clothing/head/hardhat/red
+	uniform = /obj/item/clothing/under/utility
+	suit = /obj/item/clothing/suit/fire/firefighter
+	suit_store = /obj/item/extinguisher
+	glasses = /obj/item/clothing/glasses/heat
+	mask = /obj/item/clothing/mask/breath
+	shoes = /obj/item/clothing/shoes/workboots
+	gloves = /obj/item/clothing/gloves/color/black
+	back = /obj/item/tank/internals/oxygen/red
+
+	l_pocket = /obj/item/crowbar/red
+	r_pocket = /obj/item/radio
+
+	id_role = "Firefighter"
+
+/datum/outfit/centcom/ert/indie/firefighter/medic
+	name = "ERT - Independent Firefighter (Medic)"
+
+	mask = /obj/item/clothing/mask/breath/medical
+	back = /obj/item/storage/backpack/fireproof
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
+	glasses = /obj/item/clothing/glasses/hud/health
+
+	l_pocket = /obj/item/extinguisher/mini
+
+	backpack_contents = list(/obj/item/storage/firstaid/fire=1, /obj/item/storage/firstaid/o2=1, /obj/item/radio=1)
+
+	id_role = "Emergency Medical Technician"
+
+/datum/outfit/centcom/ert/indie/firefighter/leader
+	name = "ERT - Independent Firefighter (Group Captain)"
+
+	back = /obj/item/fireaxe
+	suit = /obj/item/clothing/suit/space/hardsuit/engine
+	head = null
+	back = /obj/item/storage/backpack/fireproof
+	belt = /obj/item/storage/belt/utility/atmostech
+	gloves = /obj/item/clothing/gloves/color/yellow
+
+	id_role = "Group Captain"
+
+/datum/outfit/centcom/ert/indie/technician
+	name = "ERT - Independent Technician"
+
+	head = /obj/item/clothing/head/hardhat
+	belt = /obj/item/storage/belt/utility/full/engi
+	suit = /obj/item/clothing/suit/toggle/hazard
+	shoes = /obj/item/clothing/shoes/workboots
+	back = /obj/item/storage/backpack/industrial
+	l_pocket = /obj/item/radio
+	r_pocket = /obj/item/analyzer
+
+	box = /obj/item/storage/box/survival/engineer

shiptest.dme

@@ -1953,6 +1953,7 @@
 #include "code\modules\clothing\outfits\vr.dm"
 #include "code\modules\clothing\outfits\vv_outfit.dm"
 #include "code\modules\clothing\outfits\ert\frontiersmen_ert.dm"
+#include "code\modules\clothing\outfits\ert\indie_ert.dm"
 #include "code\modules\clothing\outfits\ert\inteq_ert.dm"
 #include "code\modules\clothing\outfits\ert\minutemen_ert.dm"
 #include "code\modules\clothing\outfits\ert\nanotrasen_ert.dm"