Fixes #2628

code/datums/ert.dm

@@ -210,6 +210,17 @@
 	rename_team = "Cybersun Medical Intervention Team"
 	polldesc = "a Cybersun paramedic team"
 
+/datum/ert/syndicate/inspector
+	teamsize = 1
+	leader_role = /datum/antagonist/ert/official/syndicate
+	roles = list(/datum/antagonist/ert/official/syndicate)
+	rename_team = "Syndicate Inspector"
+	polldesc = "a syndicate inspector"
+	spawn_at_outpost = FALSE
+
+/datum/ert/syndicate/inspector/New()
+	mission = "Conduct a routine review on [station_name()]'s vessels."
+
 // Frontiersmen
 /datum/ert/frontier
 	teamsize = 4

code/modules/antagonists/ert/ert.dm

@@ -461,6 +461,18 @@
 	outfit = /datum/outfit/job/syndicate/ert/cybersun/medic/leader
 	role = "Lead Medical Technician"
 
+/datum/antagonist/ert/official/syndicate
+	name = "Syndicate Inspector"
+	outfit = /datum/outfit/job/syndicate/ert/inspector
+	role = "Syndicate Inspector"
+
+/datum/antagonist/ert/official/solgov/greet()
+	to_chat(owner, "<B><font size=3 color=red>You are a Syndicate Inspector.</font></B>")
+	if (ert_team)
+		to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
+	else
+		to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [mission.explanation_text]")
+
 // ********************************************************************
 // ** Frontiersmen **
 // ********************************************************************

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

@@ -1,5 +1,7 @@
 /datum/outfit/job/independent/ert
 	name = "ERT - Independent Security Officer"
+	jobtype = /datum/job/officer
+	job_icon = "securityofficer"
 
 	head = /obj/item/clothing/head/helmet/sec
 	ears = /obj/item/radio/headset/alt
@@ -14,6 +16,8 @@
 
 /datum/outfit/job/independent/ert/emt
 	name = "ERT - Independent Paramedic"
+	jobtype = /datum/job/paramedic
+	job_icon = "paramedic"
 
 	head = /obj/item/clothing/head/soft/paramedic
 	mask = null
@@ -27,6 +31,8 @@
 
 /datum/outfit/job/independent/ert/firefighter
 	name = "ERT - Independent Firefighter (Standard)"
+	jobtype = /datum/job/atmos
+	job_icon = "atmospherictechnician"
 
 	head = /obj/item/clothing/head/hardhat/red
 	uniform = /obj/item/clothing/under/utility
@@ -43,6 +49,8 @@
 
 /datum/outfit/job/independent/ert/firefighter/medic
 	name = "ERT - Independent Firefighter (Medic)"
+	jobtype = /datum/job/paramedic
+	job_icon = "paramedic"
 
 	mask = /obj/item/clothing/mask/breath/medical
 	back = /obj/item/storage/backpack/fireproof
@@ -56,6 +64,8 @@
 
 /datum/outfit/job/independent/ert/firefighter/leader
 	name = "ERT - Independent Firefighter (Group Captain)"
+	jobtype = /datum/job/chief_engineer
+	job_icon = "chiefengineer"
 
 	back = /obj/item/fireaxe
 	suit = /obj/item/clothing/suit/space/hardsuit/engine
@@ -66,6 +76,8 @@
 
 /datum/outfit/job/independent/ert/technician
 	name = "ERT - Independent Technician"
+	jobtype = /datum/job/engineer
+	job_icon = "stationengineer"
 
 	head = /obj/item/clothing/head/hardhat
 	uniform = /obj/item/clothing/under/rank/engineering/engineer

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

@@ -1,5 +1,7 @@
 /datum/outfit/job/inteq/ert
 	name = "ERT - Inteq Rifleman"
+	jobtype = /datum/job/officer
+	job_icon = "securityofficer"
 
 	mask = /obj/item/clothing/mask/gas/sechailer/inteq
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
@@ -28,6 +30,8 @@
 
 /datum/outfit/job/inteq/ert/medic
 	name = "ERT - Inteq Corpsman"
+	jobtype = /datum/job/paramedic
+	job_icon = "paramedic"
 
 	uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
 	belt = /obj/item/storage/belt/medical/webbing/paramedic
@@ -39,6 +43,8 @@
 
 /datum/outfit/job/inteq/ert/leader
 	name = "ERT - Inteq Vanguard"
+	jobtype = /datum/job/hos
+	job_icon = "headofsecurity"
 
 	ears = /obj/item/radio/headset/inteq/alt/captain
 	back = /obj/item/storage/backpack/messenger/inteq

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

@@ -1,5 +1,7 @@
 /datum/outfit/job/minutemen/ert
 	name = "ERT - Minuteman"
+	jobtype = /datum/job/officer
+	job_icon = "securityofficerOld"
 
 	head = /obj/item/clothing/head/helmet/bulletproof/minutemen
 	uniform = /obj/item/clothing/under/rank/security/officer/minutemen
@@ -17,13 +19,15 @@
 
 /datum/outfit/job/minutemen/ert/leader
 	name = "ERT - Minuteman Sergeant"
+	job_icon = "lieutenant"
 
 	ears = /obj/item/radio/headset/minutemen/alt/captain
 	back = /obj/item/storage/backpack/satchel/sec/cmm
 	head = /obj/item/clothing/head/beret/command
 
 /datum/outfit/job/minutemen/ert/bard
 	name = "ERT - Minuteman (BARD)"
+	job_icon = "securityofficerOld"
 
 	suit = /obj/item/clothing/suit/armor/vest/marine/medium
 	suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
@@ -43,6 +47,7 @@
 
 /datum/outfit/job/minutemen/ert/bard/leader
 	name = "ERT - Minuteman Sergeant (BARD)"
+	job_icon = "lieutenant"
 
 	belt = /obj/item/storage/belt/military/assault/minutemen
 	uniform = /obj/item/clothing/under/rank/command/minutemen
@@ -60,6 +65,7 @@
 
 /datum/outfit/job/minutemen/ert/riot
 	name = "ERT - Minuteman (Riot Officer)"
+	job_icon = "securityofficerOld"
 
 	suit = /obj/item/clothing/suit/armor/riot/minutemen
 	head = /obj/item/clothing/head/helmet/riot/minutemen
@@ -74,12 +80,15 @@
 
 /datum/outfit/job/minutemen/ert/riot/leader
 	name = "ERT - Minutemen Sergeant (Riot Officer)"
+	job_icon = "lieutenant"
 
 	ears = /obj/item/radio/headset/minutemen/alt/captain
 	back = /obj/item/shield/riot/flash
 
 /datum/outfit/job/minutemen/ert/inspector
 	name = "ERT - Inspector (Minutemen GOLD)"
+	jobtype = /datum/job/head_of_personnel
+	job_icon = "minutemen"
 
 	head = /obj/item/clothing/head/cowboy/sec/minutemen
 	mask = null
@@ -97,12 +106,14 @@
 
 /datum/outfit/job/minutemen/ert/pirate_hunter
 	name = "ERT - Minuteman (Pirate Hunter)"
+	job_icon = "securityofficerOld"
 
 	head = null
 	suit = /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen
 
 /datum/outfit/job/minutemen/ert/pirate_hunter/leader
 	name = "ERT - Minutemen Sergeant (Pirate Hunter)"
+	job_icon = "lieutenant"
 
 	uniform = /obj/item/clothing/under/rank/command/minutemen
 	ears = /obj/item/radio/headset/minutemen/alt/captain

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

@@ -382,6 +382,7 @@
 /datum/outfit/job/nanotrasen/ert/lp
 	name = "ERT - Loss Prevention Security Specialist"
 	jobtype = /datum/job/officer
+	job_icon = "securityresponseofficer"
 
 	head = null
 	implants = list(/obj/item/implant/mindshield)
@@ -406,6 +407,7 @@
 /datum/outfit/job/nanotrasen/ert/lp/medic
 	name = "ERT - Loss Prevention Medical Specialist"
 	jobtype = /datum/job/doctor
+	job_icon = "medicalresponseofficer"
 
 	head = null
 	uniform = /obj/item/clothing/under/rank/medical/paramedic/lp
@@ -425,6 +427,7 @@
 /datum/outfit/job/nanotrasen/ert/lp/engineer
 	name = "ERT - Loss Prevention Engineering Specialist"
 	jobtype = /datum/job/engineer
+	job_icon = "engineeringresponseofficer"
 
 	head = null
 	uniform = /obj/item/clothing/under/rank/engineering/engineer/nt/lp
@@ -444,6 +447,7 @@
 /datum/outfit/job/nanotrasen/ert/lp/lieutenant
 	name = "ERT - Loss Prevention Lieutenant"
 	jobtype = /datum/job/captain
+	job_icon = "emergencyresponseteamcommander"
 
 	head = null
 	ears = /obj/item/radio/headset/nanotrasen/alt/captain

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

@@ -18,8 +18,9 @@
 
 
 /datum/outfit/job/solgov/ert/inspector
-	name = "ERT - SolGov Inspector"
+	name = "ERT - Inspector (SolGov)"
 	jobtype = /datum/job/head_of_personnel
+	job_icon = "solgovrepresentative"
 
 	uniform = /obj/item/clothing/under/solgov/formal
 	belt = /obj/item/clipboard

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

@@ -1,5 +1,7 @@
 /datum/outfit/job/syndicate/ert
 	name = "ERT - Syndicate Basic"
+	jobtype = /datum/job/officer
+	job_icon = "securityofficer"
 
 	suit = /obj/item/clothing/suit/armor/vest/syndie
 	suit_store = /obj/item/gun/ballistic/automatic/smg/c20r
@@ -18,10 +20,9 @@
 	implants = list(/obj/item/implant/weapons_auth)
 	backpack_contents = list(/obj/item/radio=1)
 
-	jobtype = /datum/job/officer // most of these are Shooty Shooty People anyway
-
 /datum/outfit/job/syndicate/ert/leader
 	name = "ERT - Syndicate Basic Leader"
+	job_icon = "lieutenant"
 
 	head = /obj/item/clothing/head/HoS/beret/syndicate
 	ears = /obj/item/radio/headset/syndicate/captain
@@ -48,6 +49,8 @@
 
 /datum/outfit/job/syndicate/ert/gorlex/medic
 	name = "ERT - Syndicate Gorlex Loyalist Medic"
+	jobtype = /datum/job/paramedic
+	job_icon = "paramedic"
 
 	head = /obj/item/clothing/head/soft/black
 	mask = null
@@ -79,6 +82,7 @@
 
 /datum/outfit/job/syndicate/ert/gorlex/leader
 	name = "ERT - Syndicate Gorlex Loyalist Sergeant"
+	job_icon = "lieutenant"
 
 	uniform = /obj/item/clothing/under/syndicate/gorlex
 	head = /obj/item/clothing/head/HoS/beret/syndicate
@@ -93,6 +97,7 @@
 
 /datum/outfit/job/syndicate/ert/cybersun
 	name = "ERT - Syndicate Cybersun Commando"
+	job_icon = "syndicate"
 
 	head = null
 	uniform = /obj/item/clothing/under/syndicate/combat
@@ -117,6 +122,7 @@
 
 /datum/outfit/job/syndicate/ert/cybersun/medic
 	name = "ERT - Syndicate Cybersun Paramedic"
+	job_icon = "paramedic"
 
 	uniform = /obj/item/clothing/under/syndicate/medic
 	suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed
@@ -138,6 +144,7 @@
 
 /datum/outfit/job/syndicate/ert/cybersun/medic/leader
 	name = "ERT - Syndicate Cybersun Lead Paramedic"
+	job_icon = "chiefmedicalofficer"
 
 	head = /obj/item/clothing/head/beret/cmo
 	glasses = /obj/item/clothing/glasses/hud/security/night
@@ -150,6 +157,8 @@
 
 /datum/outfit/job/syndicate/ert/inspector
 	name = "ERT - Inspector (Syndicate)"
+	jobtype = /datum/job/head_of_personnel
+	job_icon = "syndicate"
 
 	uniform = /obj/item/clothing/under/syndicate/officer
 	head = /obj/item/clothing/head/HoS/beret/syndicate
@@ -160,10 +169,11 @@
 	shoes = /obj/item/clothing/shoes/laceup
 	gloves = /obj/item/clothing/gloves/color/white
 	suit = /obj/item/clothing/suit/armor/hos
+	l_pocket = null
+	r_pocket = null
 	suit_store = null
 
-	job_icon = "syndicate"
-	jobtype = /datum/job/head_of_personnel
+	backpack_contents = list(/obj/item/stamp/syndicate)
 
 /datum/outfit/job/syndicate/ert/inspector/post_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()

code/modules/clothing/outfits/factions/independent.dm

@@ -1,6 +1,6 @@
 /datum/outfit/job/independent
 	name = "Independent - Base Outfit"
-	faction_icon = "bg_independent"
+	faction_icon = "bg_indie"
 
 	uniform = /obj/item/clothing/under/utility
 	box = /obj/item/storage/box/survival

code/modules/clothing/outfits/factions/nanotrasen.dm

@@ -380,6 +380,7 @@
 	job_icon = "medicaldoctor"
 	jobtype = /datum/job/doctor
 
+	belt = /obj/item/pda/medical
 	ears = /obj/item/radio/headset/headset_med
 	uniform = /obj/item/clothing/under/rank/medical/doctor
 	shoes = /obj/item/clothing/shoes/sneakers/white