diff --git a/code/datums/ert.dm b/code/datums/ert.dm
index 58954f76cfa8..63006238f228 100644
--- a/code/datums/ert.dm
+++ b/code/datums/ert.dm
@@ -171,7 +171,7 @@
rename_team = "Minutemen Pirate Hunter Team"
polldesc = "Minutemen pirate hunters"
- /datum/ert/minutemen/gold_irs
+/datum/ert/minutemen/gold_irs
teamsize = 3
leader_role = /datum/antagonist/ert/minutemen/gold_irs
roles = list(/datum/antagonist/ert/minutemen/gold_irs)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index eb47fe818c00..c4cdcf90e05f 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -288,7 +288,7 @@
"teamsize" = list("desc" = "Team Size", "type" = "number", "value" = ertemplate.teamsize),
"mission" = list("desc" = "Mission", "type" = "string", "value" = ertemplate.mission),
"polldesc" = list("desc" = "Ghost poll description", "type" = "string", "value" = ertemplate.polldesc),
- "enforce_human" = list("desc" = "Enforce human authority", "type" = "boolean", "value" = "[(ertemplate.enforce_human ? "Yes" : "No")]"),
+ "enforce_human" = list("desc" = "Spawn as humans", "type" = "boolean", "value" = "[(ertemplate.enforce_human ? "Yes" : "No")]"),
"open_armory" = list("desc" = "Open armory doors", "type" = "boolean", "value" = "[(ertemplate.opendoors ? "Yes" : "No")]"),
"leader_experience" = list("desc" = "Pick an experienced leader", "type" = "boolean", "value" = "[(ertemplate.leader_experience ? "Yes" : "No")]"),
"random_names" = list("desc" = "Randomize names", "type" = "boolean", "value" = "[(ertemplate.random_names ? "Yes" : "No")]"),
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index 851fd3f71912..647022679956 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -60,13 +60,13 @@
var/missiondesc = "Your team is being sent to [station_name()]."
if(leader) //If Squad Leader
- missiondesc += " Lead your tean to ensure the completion of your objectives."
+ missiondesc += " Lead your team to ensure the completion of your objectives."
else
missiondesc += " Follow orders given to you by your squad leader."
if(deathsquad)
missiondesc += "Leave no witnesses."
- missiondesc += "
Your Mission : [ert_team.mission.explanation_text]"
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
// Nanotrasen
@@ -94,7 +94,7 @@
return
var/datum/objective/missionobj = new ()
missionobj.owner = owner
- missionobj.explanation_text = "Conduct a routine performance review of [station_name()] and its Captain."
+ missionobj.explanation_text = "Conduct a routine performance review of [station_name()]'s vessels."
missionobj.completed = TRUE
mission = missionobj
objectives |= mission
@@ -233,6 +233,20 @@
random_names = TRUE
role = "Enforcer"
+
+/datum/antagonist/ert/inteq/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "As part of Inteq Risk Management, you have been sent to [station_name()]."
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your squadron to ensure the completion of your contract."
+ else
+ missiondesc += "Follow orders given to you by your Vanguard."
+ if(deathsquad)
+ missiondesc += "Leave no witnesses."
+
+ missiondesc += "
Contract Terms: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
/datum/antagonist/ert/inteq/leader
name = "Inteq Mercenary Leader"
outfit = /datum/outfit/job/captain/inteq
@@ -267,10 +281,23 @@
outfit = /datum/outfit/centcom/ert/minutemen
role = "Minuteman"
+/datum/antagonist/ert/minutemen/greet()
+ to_chat(owner, "You are the [name].")
+ var/missiondesc = "As part of the Colonial Minutemen, you have been sent to [station_name()]."
+ 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 Sergent."
+ if(deathsquad)
+ missiondesc += "Leave no witnesses."
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
/datum/antagonist/ert/minutemen/leader
name = "Minutemen Leader"
outfit = /datum/outfit/centcom/ert/minutemen/leader
- role = "Sergeant"
+ role = "Sargent"
/datum/antagonist/ert/minutemen/bard
name = "BARD Infantry"
@@ -280,7 +307,7 @@
/datum/antagonist/ert/minutemen/bard/leader
name = "BARD Leader"
outfit = /datum/outfit/centcom/ert/minutemen/bard/leader
- role = "Sergeant"
+ role = "Sargent"
/datum/antagonist/ert/minutemen/riot
name = "Riot Officer"
@@ -288,9 +315,9 @@
role = "Minuteman"
/datum/antagonist/ert/minutemen/riot/leader
- name = "Riot Sergeant"
+ name = "Riot Sargent"
outfit = /datum/outfit/centcom/ert/minutemen/riot/leader
- role = "Sergeant"
+ role = "Sargent"
/datum/antagonist/ert/minutemen/gold_irs
name = "GOLD Collector"
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index c4e96371cb40..e664408457b1 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -7,6 +7,21 @@
ears = /obj/item/radio/headset/minutemen/alt
back = /obj/item/storage/backpack/security/cmm
suit = /obj/item/clothing/suit/armor/vest/bulletproof
+ id = /obj/item/card/id
+ r_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/flashlight/seclite
+
+ box = /obj/item/storage/box/survival/security
+
+/datum/outfit/centcom/ert/minutemen/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ if(visualsOnly)
+ return
+
+ var/obj/item/card/id/W = H.wear_id
+ if(W)
+ W.assignment = H.mind.assigned_role
+ W.update_label()
+ ..()
/datum/outfit/centcom/ert/minutemen/leader
name = "ERT - Minutemen Basic Sargent"
@@ -17,15 +32,46 @@
/datum/outfit/centcom/ert/minutemen/bard
name = "ERT - Minutemen BARD"
+ suit = /obj/item/clothing/suit/armor/vest/marine/medium
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
+ head = /obj/item/clothing/head/helmet/riot/minutemen
+ belt = /obj/item/storage/belt/military/minutemen
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ r_pocket = /obj/item/grenade/smokebomb
+ l_pocket = /obj/item/extinguisher/mini
+ r_hand = /obj/item/kitchen/knife/combat
+ l_hand = /obj/item/reagent_containers/hypospray/medipen/stimpack
+
+ backpack_contents = list(
+ /obj/item/ammo_box/c9mm = 2,
+ /obj/item/ammo_box/magazine/smgm9mm = 5,
+ /obj/item/grenade/c4 = 2,
+ /obj/item/flashlight/seclite = 1,
+ /obj/item/flashlight/flare = 2
+ )
+
/datum/outfit/centcom/ert/minutemen/bard/leader
name = "ERT - Minutemen BARD Sargent"
+ uniform = /obj/item/clothing/under/rank/command/minutemen
+ suit = /obj/item/clothing/suit/armor/vest/marine/heavy
+ suit_store = null
+ glasses = /obj/item/clothing/glasses/hud/security/night
+ r_pocket = /obj/item/grenade/c4
+ l_pocket = /obj/item/reagent_containers/hypospray/medipen/stimpack
+
+ backpack_contents = list(
+ /obj/item/flashlight/flare = 3,
+ /obj/item/grenade/c4 = 2,
+ /obj/item/flashlight/seclite = 1
+ )
+
/datum/outfit/centcom/ert/minutemen/riot
name = "ERT - Minutemen Riot Officer"
suit = /obj/item/clothing/suit/armor/riot/minutemen
head = /obj/item/clothing/head/helmet/riot/minutemen
- l_hand = /obj/item/melee/baton
+ l_hand = /obj/item/melee/baton/loaded
back = /obj/item/shield/riot
belt = /obj/item/gun/ballistic/automatic/smg/cm5
r_pocket = /obj/item/ammo_box/magazine/smgm9mm/rubber
@@ -43,10 +89,17 @@
/datum/outfit/centcom/ert/minutemen/piratehunters
name = "ERT - Minutemen Pirate Hunter"
- suit_store = /obj/item/gun/ballistic/automatic/gal
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen
+ belt = /obj/item/storage/belt/military/minutemen/loaded
+ suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
/datum/outfit/centcom/ert/minutemen/piratehunters/leader
name = "ERT - Minutemen Pirate Hunter Leader"
+ uniform = /obj/item/clothing/under/rank/command/minutemen
ears = /obj/item/radio/headset/minutemen/alt/captain
+ belt = /obj/item/storage/belt/military/minutemen/gal
+ suit_store = /obj/item/gun/ballistic/automatic/gal
+ backpack_contents = list(/obj/item/ammo_box/magazine/gal=4)
diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
index c2d8572d732a..e7e9c6a66250 100644
--- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
+++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
@@ -12,10 +12,6 @@
if(visualsOnly)
return
- var/obj/item/radio/R = H.ears
- R.set_frequency(FREQ_CENTCOM)
- R.freqlock = TRUE
-
var/obj/item/card/id/W = H.wear_id
if(W)
W.registered_name = H.real_name
diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/solgov_ert.dm
index 0e1600654f4f..1acbea645500 100644
--- a/code/modules/clothing/outfits/ert/solgov_ert.dm
+++ b/code/modules/clothing/outfits/ert/solgov_ert.dm
@@ -21,9 +21,9 @@
uniform = /obj/item/clothing/under/solgov/formal
belt = /obj/item/clipboard
ears = /obj/item/radio/headset/solgov/captain
- backpack = /obj/item/storage/backpack/satchel/leather
+ back = /obj/item/storage/backpack/satchel/leather
head = /obj/item/clothing/head/solgov
gloves = /obj/item/clothing/gloves/color/white
shoes = /obj/item/clothing/shoes/laceup
mask = null
- eyes = null
+ glasses = null