From d495f5367e54539e147bdadbeb927f11585d2b7e Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 17 Sep 2024 04:52:33 -0300
Subject: [PATCH 01/14] ert
---
blanks.dmi | Bin 0 -> 321 bytes
code/datums/ert.dm | 290 -----------
code/datums/ert/_ert.dm | 39 ++
code/datums/ert/ert_clip.dm | 59 +++
code/datums/ert/ert_frontiersmen.dm | 36 ++
code/datums/ert/ert_gezena.dm | 21 +
code/datums/ert/ert_indies.dm | 50 ++
code/datums/ert/ert_inteq.dm | 32 ++
code/datums/ert/ert_nanotrasen.dm | 26 +
code/datums/ert/ert_roumain.dm | 24 +
code/datums/ert/ert_solgov.dm | 19 +
code/datums/ert/ert_syndicate.dm | 73 +++
code/game/objects/items/grenades/smokebomb.dm | 9 +-
code/game/objects/items/storage/belt.dm | 61 ++-
code/modules/admin/verbs/one_click_antag.dm | 11 +-
code/modules/antagonists/ert/ert.dm | 6 +-
code/modules/antagonists/ert/frontiersmen.dm | 38 +-
code/modules/antagonists/ert/gezena.dm | 29 ++
code/modules/antagonists/ert/indie.dm | 20 +-
code/modules/antagonists/ert/inteq.dm | 38 +-
code/modules/antagonists/ert/minutemen.dm | 95 ++--
code/modules/antagonists/ert/nanotrasen.dm | 191 ++-----
code/modules/antagonists/ert/roumain.dm | 50 ++
code/modules/antagonists/ert/solgov.dm | 11 +-
code/modules/antagonists/ert/syndicate.dm | 110 ++--
code/modules/client/preferences.dm | 2 +-
code/modules/clothing/factions/clip.dm | 13 +-
.../modules/clothing/factions/frontiersmen.dm | 50 +-
code/modules/clothing/factions/gezena.dm | 25 +
code/modules/clothing/factions/hardliners.dm | 6 +
code/modules/clothing/factions/ngr.dm | 11 +
code/modules/clothing/head/helmet.dm | 2 +-
.../clothing/outfits/ert/frontiersmen_ert.dm | 112 ++--
.../clothing/outfits/ert/gezena_ert.dm | 87 ++++
.../modules/clothing/outfits/ert/indie_ert.dm | 101 +++-
.../modules/clothing/outfits/ert/inteq_ert.dm | 114 +++-
.../clothing/outfits/ert/minutemen_ert.dm | 149 ++++--
.../clothing/outfits/ert/nanotrasen_ert.dm | 485 ++----------------
.../clothing/outfits/ert/roumain_ert.dm | 131 +++++
.../clothing/outfits/ert/solgov_ert.dm | 14 +-
.../clothing/outfits/ert/syndicate_ert.dm | 296 ++++++++---
.../clothing/outfits/factions/minutemen.dm | 26 +-
code/modules/clothing/outfits/standard.dm | 84 ---
.../mob/living/simple_animal/corpse.dm | 6 +-
.../boxes_magazines/external/shotgun.dm | 6 +
.../clip_lanchester/ballistics.dm | 25 +-
.../manufacturer/scarborough/ballistics.dm | 16 +-
shiptest.dme | 25 +-
48 files changed, 1831 insertions(+), 1293 deletions(-)
create mode 100644 blanks.dmi
delete mode 100644 code/datums/ert.dm
create mode 100644 code/datums/ert/_ert.dm
create mode 100644 code/datums/ert/ert_clip.dm
create mode 100644 code/datums/ert/ert_frontiersmen.dm
create mode 100644 code/datums/ert/ert_gezena.dm
create mode 100644 code/datums/ert/ert_indies.dm
create mode 100644 code/datums/ert/ert_inteq.dm
create mode 100644 code/datums/ert/ert_nanotrasen.dm
create mode 100644 code/datums/ert/ert_roumain.dm
create mode 100644 code/datums/ert/ert_solgov.dm
create mode 100644 code/datums/ert/ert_syndicate.dm
create mode 100644 code/modules/antagonists/ert/gezena.dm
create mode 100644 code/modules/antagonists/ert/roumain.dm
create mode 100644 code/modules/clothing/outfits/ert/gezena_ert.dm
create mode 100644 code/modules/clothing/outfits/ert/roumain_ert.dm
diff --git a/blanks.dmi b/blanks.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..ad75ecb403aac52f84aa68f77a5325bf09705b87
GIT binary patch
literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQtAOdA+84w9FP){vM{sNkMZ$r
zu1r`mcm4YHCr+H0IC0{cg+-svEb5B(4N_AKQ4)~_YGEu1@(X5gcy=QV$SJN0i70VN
zElw`VEGWs$&tqVym=hdUP*nQ;OK`!*uTQkRb+yi&IUl?s)Zn7=gGV~&eKb!p6!rA(
zurLlXzHIEJFz3;vBa=cDf;BbO4fU<}?NBgX@6y?Ath#xHghtkhqcg*%%$UuUxOmmk
zrCyN-ubyXp!@^+oTixky{+<}1^`4$Cjv*Gk$q5pyS6G|6R@4Zmo3J{aTJh&Xf(dJ1
zhE>c(Uyt<%&L6+v*v6^%<0p^aF(9!y?eTNtH}{(7``>6WPXF-Po$)9G!$vj{LBliC
RD}aVFc)I$ztaD0e0s!9=e>wmF
literal 0
HcmV?d00001
diff --git a/code/datums/ert.dm b/code/datums/ert.dm
deleted file mode 100644
index 0c5227e41074..000000000000
--- a/code/datums/ert.dm
+++ /dev/null
@@ -1,290 +0,0 @@
-/datum/ert
- var/mobtype = /mob/living/carbon/human
- var/team = /datum/team/ert
- var/opendoors = FALSE
- var/leader_role = /datum/antagonist/ert/commander
- var/enforce_human = FALSE
- var/roles = list(/datum/antagonist/ert/security, /datum/antagonist/ert/medic, /datum/antagonist/ert/engineer) //List of possible roles to be assigned to ERT members.
- var/rename_team
- var/code
- var/mission = "Assist your employers in achieving their goals. Protect corporate assets."
- var/teamsize = 5
- var/polldesc
- /// If TRUE, gives the team members "[role] [random last name]" style names
- var/random_names = FALSE
- /// If TRUE, special slots (that are not the leader) will use a predefined limit
- var/limit_slots = FALSE
- /// If TRUE, the admin who created the response team will be spawned in the briefing room (or in the shuttle) in their preferred briefing outfit (assuming they're a ghost)
- var/spawn_admin = FALSE
- /// If TRUE, we try and pick one of the most experienced players who volunteered to fill the leader slot
- var/leader_experience = TRUE
- /// A custom map template to spawn the ERT at. If use_custom_shuttle is FALSE, the ERT will spawn on foot. By default, a Kunai-Class.
- var/datum/map_template/ert_template = /datum/map_template/shuttle/subshuttles/kunai
- /// If we should actually _use_ the ert_template custom shuttle
- var/use_custom_shuttle = TRUE
- /// If TRUE, the ERT will spawn at the outpost. If use_custom_shuttle is also TRUE, the shuttle will be docked at the outpost
- var/spawn_at_outpost = TRUE
-
-// Nanotrasen
-
-/datum/ert/New()
- if (!polldesc)
- polldesc = "a Code [code] Nanotrasen Emergency Response Team"
-
-/datum/ert/blue
- opendoors = FALSE
- code = "Blue"
-
-/datum/ert/amber
- code = "Amber"
-
-/datum/ert/red
- leader_role = /datum/antagonist/ert/commander/red
- roles = list(/datum/antagonist/ert/security/red, /datum/antagonist/ert/medic/red, /datum/antagonist/ert/engineer/red)
- code = "Red"
-
-/datum/ert/deathsquad
- roles = list(/datum/antagonist/ert/deathsquad)
- leader_role = /datum/antagonist/ert/deathsquad/leader
- rename_team = "Deathsquad"
- code = "Delta"
- mission = "Leave no witnesses."
- polldesc = "an elite Nanotrasen Strike Team"
-
-/datum/ert/marine
- leader_role = /datum/antagonist/ert/marine
- roles = list(/datum/antagonist/ert/marine/security, /datum/antagonist/ert/marine/engineer = 1, /datum/antagonist/ert/marine/medic = 1)
- rename_team = "Marine Squad"
- polldesc = "an 'elite' Nanotrasen Strike Team"
- opendoors = FALSE
-
-/datum/ert/centcom_official
- code = "Green"
- teamsize = 1
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/official
- roles = list(/datum/antagonist/ert/official)
- rename_team = "CentCom Officials"
- polldesc = "a CentCom Official"
- random_names = FALSE
- leader_experience = FALSE
- spawn_at_outpost = FALSE
- ert_template = /datum/map_template/shuttle/subshuttles/ancon
-
-/datum/ert/centcom_official/New()
- mission = "Conduct a routine review of [station_name()]'s vessels."
-
-/datum/ert/janitor
- roles = list(/datum/antagonist/ert/janitor, /datum/antagonist/ert/janitor/heavy)
- leader_role = /datum/antagonist/ert/janitor/heavy
- teamsize = 4
- opendoors = FALSE
- rename_team = "Janitor"
- mission = "Clean up EVERYTHING."
- polldesc = "a Nanotrasen Janitorial Response Team"
-
-/datum/ert/intern
- roles = list(/datum/antagonist/ert/intern)
- leader_role = /datum/antagonist/ert/intern/leader
- teamsize = 7
- opendoors = FALSE
- spawn_at_outpost = FALSE
- rename_team = "Horde of Interns"
- mission = "Assist in conflict resolution."
- polldesc = "an unpaid internship opportunity with Nanotrasen"
- ert_template = /datum/map_template/shuttle/subshuttles/ancon
-
-/datum/ert/intern/unarmed
- roles = list(/datum/antagonist/ert/intern/unarmed)
- leader_role = /datum/antagonist/ert/intern/leader/unarmed
- rename_team = "Unarmed Horde of Interns"
-
-/datum/ert/loss_prevention
- code = "Light Blue"
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/lp/lieutenant
- roles = list(/datum/antagonist/ert/lp, /datum/antagonist/ert/lp/medic = 1, /datum/antagonist/ert/lp/engineer = 1)
- rename_team = "Loss Prevention Team"
- polldesc = "a Nanotrasen loss prevention team"
-
-// Inteq
-
-/datum/ert/inteq
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/inteq/leader
- roles = list(/datum/antagonist/ert/inteq)
- mission = "Carry out your contract."
- rename_team = "Generic Inteq Team"
- polldesc = "an Inteq emergency team"
- ert_template = /datum/map_template/shuttle/subshuttles/anvil
-
-// SolGov
-
-/datum/ert/solgov
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/solgov
- roles = list(/datum/antagonist/ert/solgov)
- mission = "Intervene in Solarian interests."
- rename_team = "SolGov Sonnensoldner Team"
- polldesc = "a SolGov mercenary team"
-
-/datum/ert/solgov/inspector
- teamsize = 1
- leader_role = /datum/antagonist/ert/official/solgov
- roles = list(/datum/antagonist/ert/official/solgov)
- rename_team = "SolGov Inspector"
- polldesc = "a solarian inspector"
- spawn_at_outpost = FALSE
-
-/datum/ert/solgov/inspector/New()
- mission = "Conduct a routine review on [station_name()]'s vessels."
-
-// CLIP
-
-/datum/ert/minutemen
- teamsize = 5
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/minutemen/leader
- /// TODO: figure out a way to fill in at least one rifleman first
- roles = list(/datum/antagonist/ert/minutemen, /datum/antagonist/ert/minutemen/corpsman = 1, /datum/antagonist/ert/minutemen/engi = 1, /datum/antagonist/ert/minutemen/gunner = 1)
- mission = "Keep the peace in sector affairs"
- rename_team = "CLIP Minutemen Squadron"
- polldesc = "a CLIP Minutemen squadron"
- ert_template = /datum/map_template/shuttle/subshuttles/crux
-
-//quick infantry - for use when you need to throw minutemen somewhere fast but dont want ANY preperation at all
-/datum/ert/minutemen/quick
- teamsize = 4
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/minutemen/leader
- roles = list(/datum/antagonist/ert/minutemen)
- mission = "Resolve the conflict at hand"
- polldesc = "a CLIP Minutemen emergency team"
- random_names = TRUE
-
-
-/datum/ert/minutemen/bard
- leader_role = /datum/antagonist/ert/minutemen/bard/leader
- roles = list(/datum/antagonist/ert/minutemen/bard, /datum/antagonist/ert/minutemen/bard/medic = 1, /datum/antagonist/ert/minutemen/bard/flamer = 1)
- rename_team = "CLIP Minutemen BARD Squadron"
- polldesc = "a CLIP Minutemen biohazard removal team"
-
-/datum/ert/minutemen/riot
- teamsize = 6
- leader_role = /datum/antagonist/ert/minutemen/riot/leader
- roles = list(/datum/antagonist/ert/minutemen/riot)
- rename_team = "CLIP Minutemen Riot Control Squadron"
- polldesc = "a CLIP Minutemen riot control team"
-
-/datum/ert/minutemen/eva
- leader_role = /datum/antagonist/ert/minutemen/eva/leader
- roles = list(/datum/antagonist/ert/minutemen/eva)
-
-/datum/ert/minutemen/inspector
- teamsize = 1
- leader_role = /datum/antagonist/ert/official/minutemen
- roles = list(/datum/antagonist/ert/official/minutemen)
- rename_team = "CLIP Minutemen GOLD Inspector"
- polldesc = "a CLIP Minutemen inspector"
-
-// Syndicate
-
-/datum/ert/syndicate
- teamsize = 4
- opendoors = FALSE
- 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"
- spawn_at_outpost = FALSE
-
-/datum/ert/syndicate/gorlex
- leader_role = /datum/antagonist/ert/syndicate/gorlex/leader
- roles = list(/datum/antagonist/ert/syndicate/gorlex, /datum/antagonist/ert/syndicate/gorlex/pointman = 1, /datum/antagonist/ert/syndicate/gorlex/medic = 1, /datum/antagonist/ert/syndicate/gorlex/sniper = 1)
- 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
- roles = list(/datum/antagonist/ert/syndicate/cybersun)
- mission = "Serve the interests of CyberSun."
- rename_team = "Cybersun Commando Team"
- polldesc = "a Cybersun Commando team"
-
-/datum/ert/syndicate/cybersun/medic
- leader_role = /datum/antagonist/ert/syndicate/cybersun/medic/leader
- roles = list(/datum/antagonist/ert/syndicate/cybersun/medic)
- mission = "Assist CyberSun clients."
- rename_team = "Cybersun Medical Intervention Team"
- polldesc = "a Cybersun paramedic team"
- ert_template = /datum/map_template/shuttle/subshuttles/runner
-
-/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
- opendoors = FALSE
- leader_role = /datum/antagonist/ert/frontier/leader
- roles = list(/datum/antagonist/ert/frontier)
- rename_team = "Generic Frontiersmen Team"
- mission = "Pillage in the name of the Frontiersmen."
- polldesc = "an armed group of pirates"
- random_names = TRUE
- leader_experience = FALSE
- spawn_at_outpost = FALSE
- ert_template = /datum/map_template/shuttle/subshuttles/sugarcube
-
-/datum/ert/frontier/random
- teamsize = 8
- leader_role = /datum/antagonist/ert/frontier/random
- roles = list(/datum/antagonist/ert/frontier/random)
- rename_team = "Randomly Equipped Frontiersmen Team"
-
-/datum/ert/frontier/assault
- leader_role = /datum/antagonist/ert/frontier/leader
- roles = list(/datum/antagonist/ert/frontier/better, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer)
- rename_team = "Assault Frontiersmen Team"
- polldesc = "a well armed squad of pirates"
-
-/datum/ert/frontier/unarmed //use for finer control of pirate's armaments
- leader_role = /datum/antagonist/ert/frontier/leader/unnarmed
- roles = list(/datum/antagonist/ert/frontier/unnarmed)
- rename_team = "Unnarmed Frontiersmen Team"
- polldesc = "a custom squad of pirates"
-
-/datum/ert/independent
- teamsize = 3
- opendoors = FALSE
- 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/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/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"
diff --git a/code/datums/ert/_ert.dm b/code/datums/ert/_ert.dm
new file mode 100644
index 000000000000..f0b7f5095746
--- /dev/null
+++ b/code/datums/ert/_ert.dm
@@ -0,0 +1,39 @@
+/datum/ert
+ var/mobtype = /mob/living/carbon/human
+ var/team = /datum/team/ert
+ // opens a special subtype of blastdoor. also a legacy setting that will probably not work with multiple outposts
+ var/opendoors = FALSE
+ var/leader_role = /datum/antagonist/ert/independent
+ // makes members spawn as humans. mostly a legacy setting but maybe you'll find it useful
+ var/enforce_human = FALSE
+ // list of possible roles to be assigned to ERT members. if it has a value (e.g. datum/antagonist/myspecialguy = 1), the role will be limited
+ var/roles = list(/datum/antagonist/ert/independent)
+ // this will appear in the end of round report and the antagonist team list
+ var/rename_team = "Emergency Response Team"
+ // this will be shown to the ERT members to be put in their memory
+ var/mission = "Make effective use of your tools."
+ // determines the size of the team. make sure there's enough size for all the special roles you may add
+ var/teamsize = 5
+ // this will be shown to ghosts as "Would you be interested in [polldesc]?"
+ var/polldesc = "an emergency response team"
+ /// If TRUE, gives the team members "[role] [random last name]" style names
+ var/random_names = FALSE
+ /// If TRUE, special slots (that are not the leader) will use a predefined limit
+ var/limit_slots = TRUE
+ /// If TRUE, the admin who created the response team will be spawned in the briefing room (or in the shuttle) in their preferred briefing outfit (assuming they're a ghost)
+ var/spawn_admin = FALSE
+ /// If TRUE, we try and pick one of the most experienced players who volunteered to fill the leader slot
+ var/leader_experience = TRUE
+ /// A custom map template to spawn the ERT at. If use_custom_shuttle is FALSE, the ERT will spawn on foot. By default, a Kunai-Class.
+ var/datum/map_template/ert_template = /datum/map_template/shuttle/subshuttles/kunai
+ /// If we should actually _use_ the ert_template custom shuttle
+ var/use_custom_shuttle = TRUE
+ /// If TRUE, the ERT will spawn at the outpost. If use_custom_shuttle is also TRUE, the shuttle will be docked at the outpost
+ var/spawn_at_outpost = TRUE
+ /// should we give the ERT access to the outpost
+ var/outpost_access = FALSE
+
+/datum/ert/New()
+ . = ..()
+ if(!polldesc)
+ polldesc = "uhm uhh uhmmmm"
diff --git a/code/datums/ert/ert_clip.dm b/code/datums/ert/ert_clip.dm
new file mode 100644
index 000000000000..79c4c7493ede
--- /dev/null
+++ b/code/datums/ert/ert_clip.dm
@@ -0,0 +1,59 @@
+/datum/ert/minutemen
+ teamsize = 5
+ leader_role = /datum/antagonist/ert/minutemen/leader
+ /// TODO: figure out a way to fill in at least one rifleman first
+ roles = list(/datum/antagonist/ert/minutemen, /datum/antagonist/ert/minutemen/corpsman = 1, /datum/antagonist/ert/minutemen/engi = 1, /datum/antagonist/ert/minutemen/gunner = 1)
+ mission = "Keep the peace in sector affairs."
+ rename_team = "CLIP Minutemen Infantry"
+ polldesc = "a CLIP Minutemen squadron"
+ ert_template = /datum/map_template/shuttle/subshuttles/crux
+
+/datum/ert/minutemen/eva
+ leader_role = /datum/antagonist/ert/minutemen/leader/eva
+ roles = list(/datum/antagonist/ert/minutemen/eva)
+
+/datum/ert/minutemen/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/minutemen/inspector
+ roles = list(/datum/antagonist/ert/minutemen/inspector)
+ rename_team = "CLIP Minutemen GOLD Inspector"
+ polldesc = "a CLIP Minutemen inspector"
+
+/datum/ert/minutemen/inspector/guarded
+ teamsize = 3
+ roles = list(/datum/antagonist/ert/minutemen/military_police)
+
+/datum/ert/minutemen/bard
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/minutemen/bard
+ roles = list(/datum/antagonist/ert/minutemen/bard)
+ rename_team = "BARD Biohazard Squadron"
+ polldesc = "a CLIP BARD biohazard team"
+
+/datum/ert/minutemen/bard/emergency
+ leader_role = /datum/antagonist/ert/minutemen/bard/emergency/leader
+ roles = list(/datum/antagonist/ert/minutemen/bard/emergency, /datum/antagonist/ert/minutemen/bard/medic = 1, /datum/antagonist/ert/minutemen/bard/flamer = 1)
+ rename_team = "BARD Emergency Squadron"
+ polldesc = "an emergency CLIP BARD team"
+
+/datum/ert/minutemen/military_police
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/minutemen/military_police/leader
+ roles = list(/datum/antagonist/ert/minutemen/military_police)
+ rename_team = "C-MM Military Police"
+ polldesc = "a C-MM military police team"
+
+/datum/ert/minutemen/military_police/riot
+ leader_role = /datum/antagonist/ert/minutemen/military_police/leader/riot
+ roles = list(/datum/antagonist/ert/minutemen/military_police/riot)
+ rename_team = "C-MM Riot Control Team"
+ polldesc = "a C-MM riot control team"
+
+/datum/ert/minutemen/journalist
+ teamsize = 3
+ leader_role = /datum/antagonist/ert/minutemen/correspondant
+ roles = list(/datum/antagonist/ert/minutemen/correspondant)
+ mission = "Inform the public of the frontier's news."
+ rename_team = "C-MM Correspondants"
+ polldesc = "a C-MM media team"
+ ert_template = /datum/map_template/shuttle/subshuttles/kunai
diff --git a/code/datums/ert/ert_frontiersmen.dm b/code/datums/ert/ert_frontiersmen.dm
new file mode 100644
index 000000000000..58934fa30a1d
--- /dev/null
+++ b/code/datums/ert/ert_frontiersmen.dm
@@ -0,0 +1,36 @@
+/datum/ert/frontier
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/frontier/leader
+ roles = list(/datum/antagonist/ert/frontier)
+ rename_team = "Generic Frontiersmen Team"
+ mission = "Pillage in the name of the Frontiersmen."
+ polldesc = "a group of frontiersmen"
+ random_names = TRUE
+ leader_experience = FALSE
+ spawn_at_outpost = FALSE
+ ert_template = /datum/map_template/shuttle/subshuttles/brawler
+
+/datum/ert/frontier/unarmed // use for finer control of pirate's armaments
+ leader_role = /datum/antagonist/ert/frontier/leader/unarmed
+ roles = list(/datum/antagonist/ert/frontier/unarmed)
+ rename_team = "Unarmed Frontiersmen Team"
+
+/datum/ert/frontier/random
+ teamsize = 8 // the second takes the rifle and shoots
+ leader_role = /datum/antagonist/ert/frontier/random
+ roles = list(/datum/antagonist/ert/frontier/random)
+ rename_team = "Randomly Equipped Frontiersmen Team"
+
+/datum/ert/frontier/raiders
+ leader_role = /datum/antagonist/ert/frontier/leader
+ roles = list(/datum/antagonist/ert/frontier/skm, /datum/antagonist/ert/frontier/medic = 1, /datum/antagonist/ert/frontier/engineer = 1)
+ rename_team = "Assault Frontiersmen Team"
+ polldesc = "a well armed squad of pirates"
+
+/datum/ert/frontier/shock
+ teamsize = 6
+ leader_role = /datum/antagonist/ert/frontier/leader/heavy
+ roles = list(/datum/antagonist/ert/frontier/skm, /datum/antagonist/ert/frontier/sentry = 1, /datum/antagonist/ert/frontier/flamer = 1, /datum/antagonist/ert/frontier/medic/heavy = 1, /datum/antagonist/ert/frontier/engineer = 1)
+ rename_team = "Frontiersmen Shock Troops"
+ polldesc = "a frontiersmen shock troop squadron"
diff --git a/code/datums/ert/ert_gezena.dm b/code/datums/ert/ert_gezena.dm
new file mode 100644
index 000000000000..4e0057a567cd
--- /dev/null
+++ b/code/datums/ert/ert_gezena.dm
@@ -0,0 +1,21 @@
+/datum/ert/gezena
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/gezena/leader
+ roles = list(/datum/antagonist/ert/gezena, /datum/antagonist/ert/gezena/gunner, /datum/antagonist/ert/gezena/medic, /datum/antagonist/ert/gezena/engineer)
+ rename_team = "Gezenan Heavy Response Team"
+ polldesc = "a PGF response team"
+ ert_template = /datum/map_template/shuttle/subshuttles/nail
+
+/datum/ert/gezena/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/gezena/inspector
+ roles = list(/datum/antagonist/ert/gezena/inspector)
+ rename_team = "Gezenan Federation Observer"
+ polldesc = "a PGF inspector"
+
+/datum/ert/gezena/inspector/guarded
+ teamsize = 3
+ roles = list(/datum/antagonist/ert/gezena)
+
+/datum/ert/gezena/inspector/New()
+ mission = "Conduct a routine review on [station_name()]'s Federation vessels."
diff --git a/code/datums/ert/ert_indies.dm b/code/datums/ert/ert_indies.dm
new file mode 100644
index 000000000000..a4fc323b9b83
--- /dev/null
+++ b/code/datums/ert/ert_indies.dm
@@ -0,0 +1,50 @@
+/datum/ert/independent
+ teamsize = 4
+ opendoors = FALSE
+ 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 = 3
+ 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/emt/eva
+ leader_role = /datum/antagonist/ert/independent/emt/eva
+ roles = list(/datum/antagonist/ert/independent/emt/eva)
+
+/datum/ert/independent/firefighter
+ teamsize = 5
+ 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"
+
+/datum/ert/independent/engineer
+ leader_role = /datum/antagonist/ert/independent/technician
+ roles = list(/datum/antagonist/ert/independent/technician)
+ rename_team = "Engineering Independent Team"
+ polldesc = "an independent engineering team"
+
+/datum/ert/independent/janitor
+ leader_role = /datum/antagonist/ert/independent/janitor
+ roles = list(/datum/antagonist/ert/independent/janitor)
+ rename_team = "Independent Janitorial Team"
+ polldesc = "an independent clean-up team"
+
+/datum/ert/independent/pizza
+ leader_role = /datum/antagonist/ert/independent/pizza
+ roles = list(/datum/antagonist/ert/independent/pizza)
+ rename_team = "Independent Pizza Delivery Team"
+ polldesc = "a pizza delivery job"
+
+/datum/ert/independent/deathsquad
+ teamsize = 2
+ leader_role = /datum/antagonist/ert/independent/deathsquad
+ roles = list(/datum/antagonist/ert/independent/deathsquad)
+ rename_team = "Death Commando Team"
+ polldesc = "a death squadron team"
diff --git a/code/datums/ert/ert_inteq.dm b/code/datums/ert/ert_inteq.dm
new file mode 100644
index 000000000000..a1152688ef28
--- /dev/null
+++ b/code/datums/ert/ert_inteq.dm
@@ -0,0 +1,32 @@
+/datum/ert/inteq
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/inteq/leader
+ roles = list(/datum/antagonist/ert/inteq, /datum/antagonist/ert/inteq/medic, /datum/antagonist/ert/inteq/engineer)
+ mission = "Carry out your contract."
+ rename_team = "Inteq Assault Team"
+ polldesc = "an Inteq assault team"
+ ert_template = /datum/map_template/shuttle/subshuttles/anvil
+
+/datum/ert/inteq/eva
+ leader_role = /datum/antagonist/ert/inteq/leader/eva
+ roles = list(/datum/antagonist/ert/inteq/eva, /datum/antagonist/ert/inteq/medic/eva, /datum/antagonist/ert/inteq/engineer/eva)
+
+/datum/ert/inteq/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/inteq/inspector
+ roles = list(/datum/antagonist/ert/inteq/inspector)
+ mission = "Assure Inteq's quality on the frontier."
+ rename_team = "Inteq Investigator Team"
+ polldesc = "an Inteq investigator"
+
+/datum/ert/inteq/inspector/guarded
+ teamsize = 3
+ leader_role = /datum/antagonist/ert/inteq/inspector
+ roles = list(/datum/antagonist/ert/inteq/honor_guard)
+
+/datum/ert/inteq/honor_guard
+ teamsize = 3
+ leader_role = /datum/antagonist/ert/inteq/honor_guard
+ roles = list(/datum/antagonist/ert/inteq/honor_guard)
+ rename_team = "Inteq Honor Guard"
+ polldesc = "an Inteq honor guardsman team"
diff --git a/code/datums/ert/ert_nanotrasen.dm b/code/datums/ert/ert_nanotrasen.dm
new file mode 100644
index 000000000000..79b2adf4bc8d
--- /dev/null
+++ b/code/datums/ert/ert_nanotrasen.dm
@@ -0,0 +1,26 @@
+/datum/ert/nanotrasen
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/nanotrasen/leader
+ roles = list(/datum/antagonist/ert/nanotrasen)
+ mission = "Work for the corporate values of Nanotrasen."
+ rename_team = "Vigilitas Security Team"
+ polldesc = "a Vigilitas security team"
+
+// /datum/ert/nanotrasen/emergency
+// leader_role = /datum/antagonist/ert/nanotrasen/leader/emergency
+// roles = list(/datum/antagonist/ert/nanotrasen/emergency, /datum/antagonist/ert/nanotrasen/emergency/engineer=1, /datum/antagonist/ert/nanotrasen/emergency/medic=1)
+// rename_team = "Vigilitas Distress Response Team"
+// polldesc = "a Vigilitas emergency team"
+
+/datum/ert/nanotrasen/delivery
+ leader_role = /datum/antagonist/ert/nanotrasen/delivery
+ roles = list(/datum/antagonist/ert/nanotrasen/delivery)
+ rename_team = "N+S Delivery Team"
+ polldesc = "a N+S delivery job"
+
+/datum/ert/nanotrasen/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/nanotrasen/inspector
+ roles = list(/datum/antagonist/ert/nanotrasen/inspector)
+ rename_team = "Nanotrasen Central Command Liaison"
+ polldesc = "a NT CentCom inspector"
diff --git a/code/datums/ert/ert_roumain.dm b/code/datums/ert/ert_roumain.dm
new file mode 100644
index 000000000000..5c33bdd39cb6
--- /dev/null
+++ b/code/datums/ert/ert_roumain.dm
@@ -0,0 +1,24 @@
+/datum/ert/srm
+ teamsize = 5
+ leader_role = /datum/antagonist/ert/roumain/leader
+ roles = list(/datum/antagonist/ert/roumain/medic = 1, /datum/antagonist/ert/roumain/engineer = 1, /datum/antagonist/ert/roumain)
+ mission = "Serve the Church of Saint Roumain."
+ rename_team = "Roumain Hunting Party"
+ polldesc = "a Roumain hunting party"
+
+/datum/ert/srm/battle
+ teamsize = 7
+ leader_role = /datum/antagonist/ert/roumain/leader/twobore // if you haven't heard of the srm you sure fucking will now
+ roles = list(
+ /datum/antagonist/ert/roumain/leader/colligne = 1,
+ /datum/antagonist/ert/roumain/medic = 1,
+ /datum/antagonist/ert/roumain/engineer = 1,
+ /datum/antagonist/ert/roumain/firestorm = 1,
+ /datum/antagonist/ert/roumain/scout = 1,
+ /datum/antagonist/ert/roumain/vickland
+ )
+ mission = "Defend the Church of Saint Roumain presence in this sector."
+ rename_team = "Roumain Militia Defense Team"
+ polldesc = "a Roumain militia defense team"
+
+// ashhands one day maybes
diff --git a/code/datums/ert/ert_solgov.dm b/code/datums/ert/ert_solgov.dm
new file mode 100644
index 000000000000..4d0cf8b83011
--- /dev/null
+++ b/code/datums/ert/ert_solgov.dm
@@ -0,0 +1,19 @@
+/datum/ert/solgov
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/solgov
+ roles = list(/datum/antagonist/ert/solgov)
+ mission = "Intervene in Solarian interests."
+ rename_team = "SolGov Sonnensoldner Team"
+ polldesc = "a SolGov mercenary team"
+
+/datum/ert/solgov/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/solgov/inspector
+ roles = list(/datum/antagonist/ert/solgov/inspector)
+ rename_team = "SolGov Inspector"
+ polldesc = "a solarian inspector"
+ spawn_at_outpost = FALSE
+
+/datum/ert/solgov/inspector/New()
+ mission = "Conduct a routine review on [station_name()]'s vessels."
diff --git a/code/datums/ert/ert_syndicate.dm b/code/datums/ert/ert_syndicate.dm
new file mode 100644
index 000000000000..77558a5bc57e
--- /dev/null
+++ b/code/datums/ert/ert_syndicate.dm
@@ -0,0 +1,73 @@
+// stand-ins
+
+/datum/ert/syndicate
+ teamsize = 4
+ 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"
+ spawn_at_outpost = FALSE
+
+/datum/ert/syndicate/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/syndicate/inspector
+ roles = list(/datum/antagonist/ert/syndicate/inspector)
+ rename_team = "Syndicate Inspector"
+ polldesc = "a syndicate ACLF inspector"
+
+/datum/ert/syndicate/inspector/New()
+ mission = "Conduct a routine review on [station_name()]'s Coalition vessels."
+
+// new gorlex republic
+
+/datum/ert/syndicate/ngr
+ teamsize = 5
+ leader_role = /datum/antagonist/ert/syndicate/ngr/leader
+ roles = list(/datum/antagonist/ert/syndicate/ngr, /datum/antagonist/ert/syndicate/ngr/grenadier = 1, /datum/antagonist/ert/syndicate/ngr/medic = 1, /datum/antagonist/ert/syndicate/ngr/sniper = 1)
+ mission = "Uphold the sovereignty of the New Gorlex Republic."
+ rename_team = "Gorlex Republic Detachment"
+ polldesc = "a Gorlex Republic battle squad"
+
+/datum/ert/syndicate/ngr/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/syndicate/ngr/inspector
+ roles = list(/datum/antagonist/ert/syndicate/ngr/inspector)
+ rename_team = "Gorlex Republic Official"
+ polldesc = "a Gorlex Republic inspector"
+
+/datum/ert/syndicate/ngr/inspector/guarded
+ teamsize = 3
+ leader_role = /datum/antagonist/ert/syndicate/ngr/inspector
+ roles = list(/datum/antagonist/ert/syndicate/ngr)
+
+// cybersun
+
+/datum/ert/syndicate/cybersun
+ leader_role = /datum/antagonist/ert/syndicate/cybersun/leader
+ roles = list(/datum/antagonist/ert/syndicate/cybersun)
+ mission = "Serve the interests of CyberSun."
+ rename_team = "Cybersun Commando Team"
+ polldesc = "a Cybersun Commando team"
+
+/datum/ert/syndicate/cybersun/medic
+ leader_role = /datum/antagonist/ert/syndicate/cybersun/medic/leader
+ roles = list(/datum/antagonist/ert/syndicate/cybersun/medic)
+ mission = "Assist CyberSun clients."
+ rename_team = "Cybersun Medical Intervention Team"
+ polldesc = "a Cybersun paramedic team"
+ ert_template = /datum/map_template/shuttle/subshuttles/runner
+
+/datum/ert/syndicate/hardliners
+ leader_role = /datum/antagonist/ert/syndicate/hardliner/leader
+ roles = list(/datum/antagonist/ert/syndicate/hardliner, /datum/antagonist/ert/syndicate/hardliner/medic = 1, /datum/antagonist/ert/syndicate/hardliner/engineer = 1)
+ mission = "Serve the interests of CyberSun."
+ rename_team = "Hardliner Element"
+ polldesc = "a Hardliner attack team"
+
+/datum/ert/syndicate/ramzi
+ leader_role = /datum/antagonist/ert/syndicate/ramzi/leader
+ roles = list(/datum/antagonist/ert/syndicate/ramzi, /datum/antagonist/ert/syndicate/ramzi/medic = 1, /datum/antagonist/ert/syndicate/ramzi/demolitionist = 1)
+ mission = "Make Ramzi proud."
+ rename_team = "Ramzi Cell"
+ polldesc = "a Ramzi pirate team"
diff --git a/code/game/objects/items/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm
index dfea3fb87829..c29a00a83901 100644
--- a/code/game/objects/items/grenades/smokebomb.dm
+++ b/code/game/objects/items/grenades/smokebomb.dm
@@ -1,17 +1,10 @@
/obj/item/grenade/smokebomb
name = "smoke grenade"
- desc = "Real bruh moment if you ever see this. Probably tell a c*der or something."
+ desc = "A smoke grenade pattern, used to screen unit movements, and signal landing zones, widely used by military forces on the frontier and beyond."
icon = 'icons/obj/grenade.dmi'
icon_state = "smokewhite"
item_state = "smoke"
slot_flags = ITEM_SLOT_BELT
- ///It's extremely important to keep this list up to date. It helps to generate the insightful description of the smokebomb. EDIT: honestly fuck you nemvar. go directly to jail and do not collect 200 dollars
- var/static/list/bruh_moment = list("Dank", "Hip", "Lit", "Based", "Robust", "Bruh")
-
-///Here we generate the extremely insightful description.
-/obj/item/grenade/smokebomb/Initialize()
- . = ..()
- desc = "The word '[pick(bruh_moment)]' is scribbled on it in crayon."
///Here we generate some smoke and also damage blobs??? for some reason. Honestly not sure why we do that.
/obj/item/grenade/smokebomb/prime()
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index fb56a7a15886..0370def35243 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -259,6 +259,15 @@
new /obj/item/hypospray/mkii(src)
update_appearance()
+/obj/item/storage/belt/medical/webbing/combat/PopulateContents()
+ . = ..()
+ new /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor(src)
+ new /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/stack/medical/gauze/twelve(src)
+ new /obj/item/stack/medical/splint(src)
+
/obj/item/storage/belt/security
name = "security belt"
desc = "Can hold security gear like handcuffs and flashes."
@@ -322,10 +331,12 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
-/obj/item/storage/belt/security/webbing/bulldog/PopulateContents()
+/obj/item/storage/belt/security/webbing/bulldog_mixed/PopulateContents()
. = ..()
- for(var/i in 1 to 3)
- new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/bioterror(src) // you only get ONE this one is nasty
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/slug(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum/slug(src)
+ new /obj/item/ammo_box/magazine/m12g_bulldog/drum(src)
/obj/item/storage/belt/mining
name = "explorer's webbing"
@@ -479,16 +490,30 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
-/obj/item/storage/belt/military/c20r/PopulateContents()
+/obj/item/storage/belt/military/cobra/PopulateContents()
. = ..()
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/m45_cobra(src)
-/obj/item/storage/belt/military/assault/m90/PopulateContents()
+/obj/item/storage/belt/military/hydra/PopulateContents()
. = ..()
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/m556_42_hydra(src)
+/obj/item/storage/belt/military/boomslang/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/boomslang(src)
+
+/obj/item/storage/belt/military/mako/PopulateContents()
+ . = ..()
+ new /obj/item/ammo_casing/caseless/rocket/a70mm/hedp(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm/hedp(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+ new /obj/item/ammo_casing/caseless/rocket/a70mm(src)
+
/obj/item/storage/belt/military/snack
name = "tactical snack rig"
@@ -572,6 +597,22 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 6
+/obj/item/storage/belt/military/assault/hydra/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m556_42_hydra(src)
+
+/obj/item/storage/belt/military/assault/sniper/PopulateContents()
+ . = ..()
+ new /obj/item/ammo_box/magazine/sniper_rounds(src)
+ new /obj/item/ammo_box/magazine/sniper_rounds(src)
+ new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
+
+/obj/item/storage/belt/military/assault/commander/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/co9mm(src)
+
/obj/item/storage/belt/grenade
name = "grenadier belt"
desc = "A belt for holding grenades."
@@ -936,8 +977,18 @@
for(var/i in 1 to 4)
new /obj/item/ammo_box/magazine/skm_762_40(src)
+/obj/item/storage/belt/security/webbing/inteq/skm_carabine/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/smgm10mm(src)
+
/obj/item/storage/belt/security/webbing/inteq/alt
name = "inteq drop pouch harness"
desc = "A harness with a bunch of pouches attached to them emblazoned in the colors of the IRMG, can hold security gear."
icon_state = "inteq_droppouch"
item_state = "inteq_droppouch"
+
+/obj/item/storage/belt/security/webbing/inteq/alt/bulldog/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m12g_bulldog(src)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index abdecf91de60..13ebb394c66b 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -204,7 +204,7 @@
// DEATH SQUADS
/datum/admins/proc/makeDeathsquad()
- return makeEmergencyresponseteam(/datum/ert/deathsquad)
+ return makeEmergencyresponseteam(/datum/ert/independent/deathsquad)
// CENTCOM RESPONSE TEAM
@@ -226,6 +226,7 @@
.["mainsettings"]["spawn_admin"]["value"] = newtemplate.spawn_admin ? "Yes" : "No"
.["mainsettings"]["use_custom_shuttle"]["value"] = newtemplate.use_custom_shuttle ? "Yes" : "No"
.["mainsettings"]["spawn_at_outpost"]["value"] = newtemplate.spawn_at_outpost ? "Yes" : "No"
+ .["mainsettings"]["outpost_access"]["value"] = newtemplate.spawn_at_outpost ? "Yes" : "No"
/datum/admins/proc/equipAntagOnDummy(mob/living/carbon/human/dummy/mannequin, datum/antagonist/antag)
@@ -280,7 +281,7 @@
if (ertemplate)
ertemplate = new ertemplate
else
- ertemplate = new /datum/ert/centcom_official
+ ertemplate = new /datum/ert/independent
var/list/settings = list(
"preview_callback" = CALLBACK(src, PROC_REF(makeERTPreviewIcon)),
@@ -297,6 +298,7 @@
"spawn_admin" = list("desc" = "Spawn yourself as briefing officer", "type" = "boolean", "value" = "[(ertemplate.spawn_admin ? "Yes" : "No")]"),
"use_custom_shuttle" = list("desc" = "Use the ERT's custom shuttle (if it has one)", "type" = "boolean", "value" = "[(ertemplate.use_custom_shuttle ? "Yes" : "No")]"),
"spawn_at_outpost" = list("desc" = "Spawn the ERT/Dock the ERT at the Outpost", "type" = "boolean", "value" = "[(ertemplate.spawn_at_outpost ? "Yes" : "No")]"),
+ "outpost_access" = list("desc" = "Give ERT members outpost access", "type" = "boolean", "value" = "[(ertemplate.outpost_access ? "Yes" : "No")]")
)
)
@@ -494,13 +496,16 @@
if(teamSpawned)
// guestbook
for(var/datum/mind/member in ert_team.members)
- var/member_mob = member.current
+ var/mob/living/carbon/human/member_mob = member.current
for(var/datum/mind/other_member in ert_team.members)
// skip yourself
if(other_member.name == member.name)
continue
var/mob/living/carbon/human/other_member_mob = other_member.current
member.guestbook.add_guest(member_mob, other_member_mob, other_member_mob.real_name, other_member_mob.real_name, TRUE)
+ if(ertemplate.outpost_access && istype(member_mob.wear_id, /obj/item/card/id))
+ var/obj/item/card/id/id = member_mob.wear_id
+ id.access += list(ACCESS_CENT_GENERAL)
message_admins("[ertemplate.rename_team] has spawned with the mission: [ertemplate.mission]")
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index 25b0b4e1f8cc..9b06d144bafd 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -7,7 +7,7 @@
name = "Emergency Response Officer"
var/datum/team/ert/ert_team
var/leader = FALSE
- var/datum/outfit/outfit = /datum/outfit/centcom/ert/security
+ var/datum/outfit/outfit = /datum/outfit/job/independent/ert
var/role = "Security Officer"
var/list/name_source
var/random_names = TRUE
@@ -60,9 +60,9 @@
var/missiondesc = "Your team is being sent to [station_name()].
"
if(leader) //If Squad Leader
- missiondesc += " Lead your team 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."
+ missiondesc += "Follow orders given to you by your squad leader."
if(deathsquad)
missiondesc += "Leave no witnesses."
diff --git a/code/modules/antagonists/ert/frontiersmen.dm b/code/modules/antagonists/ert/frontiersmen.dm
index d6a1a5182cf0..da1cb0c6812c 100644
--- a/code/modules/antagonists/ert/frontiersmen.dm
+++ b/code/modules/antagonists/ert/frontiersmen.dm
@@ -18,31 +18,53 @@
missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
+/datum/antagonist/ert/frontier/skm
+ outfit = /datum/outfit/job/frontiersmen/ert/skm
+
+/datum/antagonist/ert/frontier/unarmed
+ outfit = /datum/outfit/job/frontiersmen/ert/unarmed
+
/datum/antagonist/ert/frontier/random
outfit = /datum/outfit/job/frontiersmen/ert/random
+// officers
+
/datum/antagonist/ert/frontier/leader
name = "Frontiersmen Officer"
outfit = /datum/outfit/job/frontiersmen/ert/leader
role = "Officer"
-/datum/antagonist/ert/frontier/leader/unnarmed
- outfit = /datum/outfit/job/frontiersmen/ert/leader/unnarmed
+/datum/antagonist/ert/frontier/leader/heavy
+ outfit = /datum/outfit/job/frontiersmen/ert/leader/heavy
+
+/datum/antagonist/ert/frontier/leader/unarmed
+ outfit = /datum/outfit/job/frontiersmen/ert/leader/unarmed
+
+// doctors
/datum/antagonist/ert/frontier/medic
name = "Frontiersmen Medic"
outfit = /datum/outfit/job/frontiersmen/ert/medic
role = "Stretcher-Bearer"
+/datum/antagonist/ert/frontier/medic/heavy
+ outfit = /datum/outfit/job/frontiersmen/ert/medic/heavy
+
+// engineers
+
/datum/antagonist/ert/frontier/engineer
name = "Frontiersmen Engineer"
outfit = /datum/outfit/job/frontiersmen/ert/engineer
role = "Sapper"
-/datum/antagonist/ert/frontier/better
- name = "Frontiersmen Grunt"
- outfit = /datum/outfit/job/frontiersmen/ert/grunt/skm
+// heavy weapons guy
+
+/datum/antagonist/ert/frontier/flamer
+ name = "Frontiersmen Flametrooper"
+ outfit = /datum/outfit/job/frontiersmen/ert/flamer
+ role = "Flametrooper"
-/datum/antagonist/ert/frontier/unnarmed
- name = "Frontiersmen Grunt"
- outfit = /datum/outfit/job/frontiersmen/ert/grunt
+/datum/antagonist/ert/frontier/sentry
+ name = "Frontiersmen Sentry"
+ outfit = /datum/outfit/job/frontiersmen/ert/sentry
+ role = "Sentinel"
diff --git a/code/modules/antagonists/ert/gezena.dm b/code/modules/antagonists/ert/gezena.dm
new file mode 100644
index 000000000000..73ac1eb9ddba
--- /dev/null
+++ b/code/modules/antagonists/ert/gezena.dm
@@ -0,0 +1,29 @@
+/datum/antagonist/ert/gezena
+ name = "PGF Marine"
+ outfit = /datum/outfit/job/gezena/ert
+ role = "Rifleman"
+
+/datum/antagonist/ert/gezena/leader
+ name = "PGF Sergeant"
+ outfit = /datum/outfit/job/gezena/ert/leader
+ role = "Gunnery Sergeant"
+
+/datum/antagonist/ert/gezena/engineer
+ name = "PGF Combat Engineer"
+ outfit = /datum/outfit/job/gezena/ert/engineer
+ role = "Engineer"
+
+/datum/antagonist/ert/gezena/gunner
+ name = "PGF Gunner"
+ outfit = /datum/outfit/job/gezena/ert/gunner
+ role = "Machinegunner"
+
+/datum/antagonist/ert/gezena/medic
+ name = "PGF Corpsman"
+ outfit = /datum/outfit/job/gezena/ert/medic
+ role = "Corpsman"
+
+/datum/antagonist/ert/gezena/inspector
+ name = "PGF Naval Observer"
+ outfit = /datum/outfit/job/gezena/ert/inspector
+ role = "Observer"
diff --git a/code/modules/antagonists/ert/indie.dm b/code/modules/antagonists/ert/indie.dm
index 265af27bd2d4..d56a6ea84e78 100644
--- a/code/modules/antagonists/ert/indie.dm
+++ b/code/modules/antagonists/ert/indie.dm
@@ -8,7 +8,7 @@
role = "Security Officer"
/datum/antagonist/ert/independent/greet()
- to_chat(owner, "You are the [name].")
+ to_chat(owner, "You are \a [name].")
var/missiondesc = "You are one of the many Independent contractors, workers and students on [station_name()].
"
if(leader) //If Squad Leader
missiondesc += "Lead your team to complete your objectives."
@@ -23,6 +23,9 @@
outfit = /datum/outfit/job/independent/ert/emt
role = "Paramedic"
+/datum/antagonist/ert/independent/emt/eva
+ outfit = /datum/outfit/job/independent/ert/emt/eva
+
/datum/antagonist/ert/independent/firefighter
name = "Independent Firefighter"
outfit = /datum/outfit/job/independent/ert/firefighter
@@ -42,3 +45,18 @@
name = "Independent Technician"
outfit = /datum/outfit/job/independent/ert/technician
role = "Technician"
+
+/datum/antagonist/ert/independent/deathsquad
+ name = "Deathsquad Commando"
+ outfit = /datum/outfit/job/independent/ert/deathsquad
+ role = "Commando"
+
+/datum/antagonist/ert/independent/pizza
+ name = "Pizza Delivery Worker"
+ outfit = /datum/outfit/job/independent/ert/pizza
+ role = "Delivery Worker"
+
+/datum/antagonist/ert/independent/janitor
+ name = "Independent Sanitation Technician"
+ outfit = /datum/outfit/job/independent/ert/janitor
+ role = "Sanitation Technician"
diff --git a/code/modules/antagonists/ert/inteq.dm b/code/modules/antagonists/ert/inteq.dm
index f4636487da5f..6666c626c8c0 100644
--- a/code/modules/antagonists/ert/inteq.dm
+++ b/code/modules/antagonists/ert/inteq.dm
@@ -1,10 +1,9 @@
/datum/antagonist/ert/inteq
name = "Inteq Mercenary"
- outfit = /datum/outfit/job/inteq/security
+ outfit = /datum/outfit/job/inteq/ert
random_names = TRUE
role = "Enforcer"
-
/datum/antagonist/ert/inteq/greet()
to_chat(owner, "You are the [name].")
var/missiondesc = "You're one of the many mercenaries under the Inteq Risk Management Group sent to [station_name()].
"
@@ -18,7 +17,40 @@
missiondesc += "
Contract Terms: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
+/datum/antagonist/ert/inteq/eva
+ outfit = /datum/outfit/job/inteq/ert/eva
+
/datum/antagonist/ert/inteq/leader
name = "Inteq Mercenary Leader"
- outfit = /datum/outfit/job/inteq/captain/empty
+ outfit = /datum/outfit/job/inteq/ert/leader
role = "Vanguard"
+
+/datum/antagonist/ert/inteq/leader/eva
+ outfit = /datum/outfit/job/inteq/ert/leader/eva
+
+/datum/antagonist/ert/inteq/medic
+ name = "Inteq Corpsman"
+ outfit = /datum/outfit/job/inteq/ert/medic
+ role = "Corpsman"
+
+/datum/antagonist/ert/inteq/medic/eva
+ outfit = /datum/outfit/job/inteq/ert/medic/eva
+
+/datum/antagonist/ert/inteq/engineer
+ name = "Inteq Artificer"
+ outfit = /datum/outfit/job/inteq/ert/engineer
+ role = "Artificer"
+
+/datum/antagonist/ert/inteq/engineer/eva
+ outfit = /datum/outfit/job/inteq/ert/engineer/eva
+
+/datum/antagonist/ert/inteq/honor_guard
+ name = "Inteq Honor Guard"
+ outfit = /datum/outfit/job/inteq/ert/honor_guard
+ role = "Guardsman"
+
+/datum/antagonist/ert/inteq/inspector
+ name = "Mothership Investigator"
+ outfit = /datum/outfit/job/inteq/ert/inspector
+ random_names = FALSE
+ role = "Investigator"
diff --git a/code/modules/antagonists/ert/minutemen.dm b/code/modules/antagonists/ert/minutemen.dm
index 069ab6625c32..5e772227fd65 100644
--- a/code/modules/antagonists/ert/minutemen.dm
+++ b/code/modules/antagonists/ert/minutemen.dm
@@ -3,17 +3,20 @@
// ********************************************************************
/datum/antagonist/ert/minutemen
- name = "CLIP Minutemen"
+ name = "C-MM Minuteman"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/armed
role = "Minuteman"
+/datum/antagonist/ert/minutemen/eva
+ outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
+
/datum/antagonist/ert/minutemen/greet()
to_chat(owner, "You are \the [role].")
- var/missiondesc = "You serve in the armed forced of the Confederated League of Independent Planets (CLIP), an independent government. You are being deployed to the sector of [station_name()].
"
+ var/missiondesc = "You serve in the Colonial Minutemen, the armed forces of the Confederated League of Independent Planets. You are being deployed to the sector of [station_name()].
"
if(leader) //If Squad Leader
missiondesc += "Lead your squad to complete all objectives."
else
- missiondesc += "Follow orders given to you by your Leader, the Sergent."
+ missiondesc += "Follow orders given to you by your squadron leader."
if(deathsquad)
missiondesc += "You have been given the order to fire at will."
@@ -21,70 +24,82 @@
to_chat(owner,missiondesc)
/datum/antagonist/ert/minutemen/leader
- name = "CLIP Minutemen Field Sergeant"
+ name = "C-MM Sergeant"
leader = TRUE
outfit = /datum/outfit/job/clip/minutemen/grunt/lead
role = "Sergeant"
+/datum/antagonist/ert/minutemen/leader/eva
+ outfit = /datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit
+
/datum/antagonist/ert/minutemen/corpsman
+ name = "C-MM Field Corpsman"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/med/armed
- role = "Field Corpsman"
+ role = "Corpsman"
/datum/antagonist/ert/minutemen/engi
+ name = "C-MM Field Engineer"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/engi/armed
- role = "Field Engineer"
+ role = "Engineer"
/datum/antagonist/ert/minutemen/gunner
+ name = "C-MM Machinegunner"
outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/gunner_armed
role = "Field Gunner"
/datum/antagonist/ert/minutemen/bard
- name = "BARD Infantry"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard
- role = "Minuteman"
+ name = "BARD Field Agent"
+ outfit = /datum/outfit/job/clip/minutemen/bard
+ role = "Agent"
+
+/datum/antagonist/ert/minutemen/bard/emergency
+ name = "BARD Xenofauna Specialist"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency
+ role = "Specialist"
/datum/antagonist/ert/minutemen/bard/flamer
- name = "BARD Flamethrower Infantry"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer
+ name = "BARD Fire Control Specialist"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency/flamer
+ role = "Fire Specialist"
/datum/antagonist/ert/minutemen/bard/medic
- name = "BARD Corpsman"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic
- role = "Corpsman"
+ name = "BARD Medical Aid Specialist"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency/medic
+ role = "Medical Specialist"
-/datum/antagonist/ert/minutemen/bard/leader
- name = "BARD Sergeant"
+/datum/antagonist/ert/minutemen/bard/emergency/leader
+ name = "BARD Master Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader
- role = "Sergeant"
+ outfit = /datum/outfit/job/clip/minutemen/bard/emergency/leader
+ role = "Master Sergeant"
-/datum/antagonist/ert/minutemen/riot
- name = "Riot Officer"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot
- role = "Minuteman"
+/datum/antagonist/ert/minutemen/military_police
+ name = "C-MM Military Police"
+ outfit = /datum/outfit/job/clip/minutemen/military_police
+ role = "Officer"
-/datum/antagonist/ert/minutemen/riot/leader
- name = "Riot Sergeant"
+/datum/antagonist/ert/minutemen/military_police/riot
+ outfit = /datum/outfit/job/clip/minutemen/military_police/riot
+
+/datum/antagonist/ert/minutemen/military_police/leader
+ name = "C-MM Chief Military Police"
leader = TRUE
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader
- role = "Sergeant"
+ outfit = /datum/outfit/job/clip/minutemen/military_police/leader
+ role = "Chief Officer"
+
+/datum/antagonist/ert/minutemen/military_police/leader/riot
+ outfit = /datum/outfit/job/clip/minutemen/military_police/leader/riot
-/datum/antagonist/ert/official/minutemen
+/datum/antagonist/ert/minutemen/inspector
name = "GOLD Inspector"
- outfit = /datum/outfit/job/clip/investigator
+ outfit = /datum/outfit/job/clip/investigator/cm5
role = "Lieutenant"
-/datum/antagonist/ert/official/minutemen/greet()
- to_chat(owner, "You are the GOLD Inspector.")
+/datum/antagonist/ert/minutemen/inspector/greet()
+ to_chat(owner, "You are a Labor Division Inspector.")
to_chat(owner, "You are part of The Galactic Optimum Labor Division, a division of the CLIP Government. Your task: [ert_team.mission.explanation_text]")
-/datum/antagonist/ert/minutemen/eva
- name = "CLIP Minutemen"
- outfit = /datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
- role = "Minuteman"
-
-/datum/antagonist/ert/minutemen/eva/leader
- name = "CLIP Minutemen Field Sergeant"
- leader = TRUE
- outfit = /datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit
- role = "Sergeant"
+/datum/antagonist/ert/minutemen/correspondant
+ name = "C-MM War Correspondant"
+ outfit = /datum/outfit/job/clip/correspondant
+ role = "Correspondant"
diff --git a/code/modules/antagonists/ert/nanotrasen.dm b/code/modules/antagonists/ert/nanotrasen.dm
index 11537e4bcea9..9ea1aa422162 100644
--- a/code/modules/antagonists/ert/nanotrasen.dm
+++ b/code/modules/antagonists/ert/nanotrasen.dm
@@ -1,152 +1,39 @@
-// Official
-/datum/antagonist/ert/official
- name = "CentCom Official"
- show_name_in_check_antagonists = TRUE
- var/datum/objective/mission
- role = "Inspector"
- random_names = FALSE
- outfit = /datum/outfit/centcom/centcom_official
-
-/datum/antagonist/ert/official/greet()
- to_chat(owner, "You are a CentCom Official.")
- if (ert_team)
- to_chat(owner, "Central Command is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "Central Command is sending you to [station_name()] with the task: [mission.explanation_text]")
-
-/datum/antagonist/ert/official/forge_objectives()
- if (ert_team)
- return ..()
- if(mission)
- return
- var/datum/objective/missionobj = new ()
- missionobj.owner = owner
- missionobj.explanation_text = "Conduct a routine performance review of [station_name()]'s vessels."
- missionobj.completed = TRUE
- mission = missionobj
- objectives |= mission
-
-// Standard ERT
-
-/datum/antagonist/ert/security // kinda handled by the base template but here for completion
-
-/datum/antagonist/ert/security/red
- outfit = /datum/outfit/centcom/ert/security/alert
-
-/datum/antagonist/ert/engineer
- role = "Engineer"
- outfit = /datum/outfit/centcom/ert/engineer
-
-/datum/antagonist/ert/engineer/red
- outfit = /datum/outfit/centcom/ert/engineer/alert
-
-/datum/antagonist/ert/medic
- role = "Medical Officer"
- outfit = /datum/outfit/centcom/ert/medic
-
-/datum/antagonist/ert/medic/red
- outfit = /datum/outfit/centcom/ert/medic/alert
-
-/datum/antagonist/ert/commander
- role = "Commander"
- outfit = /datum/outfit/centcom/ert/commander
-
-/datum/antagonist/ert/commander/red
- outfit = /datum/outfit/centcom/ert/commander/alert
-
-// Deathsquad
-
-/datum/antagonist/ert/deathsquad
- name = "Deathsquad Trooper"
- outfit = /datum/outfit/centcom/death_commando
- role = "Trooper"
- deathsquad = TRUE
-
-/datum/antagonist/ert/deathsquad/leader
- name = "Deathsquad Officer"
- outfit = /datum/outfit/centcom/death_commando
- role = "Officer"
-
-/datum/antagonist/ert/deathsquad/New()
- . = ..()
- name_source = GLOB.commando_names
-
-/datum/antagonist/ert/deathsquad/apply_innate_effects(mob/living/mob_override)
- ADD_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
-
-/datum/antagonist/ert/deathsquad/remove_innate_effects(mob/living/mob_override)
- REMOVE_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT)
-
-// Janitor
-
-/datum/antagonist/ert/janitor
- role = "Janitor"
- outfit = /datum/outfit/centcom/ert/janitor
-
-/datum/antagonist/ert/janitor/heavy
- role = "Heavy Duty Janitor"
- outfit = /datum/outfit/centcom/ert/janitor/heavy
-
-// Intern
-
-/datum/antagonist/ert/intern
- name = "CentCom Intern"
- outfit = /datum/outfit/centcom/centcom_intern
- random_names = FALSE
- role = "Intern"
-
-/datum/antagonist/ert/intern/leader
- name = "CentCom Head Intern"
- outfit = /datum/outfit/centcom/centcom_intern/leader
- role = "Head Intern"
-
-/datum/antagonist/ert/intern/unarmed
- outfit = /datum/outfit/centcom/centcom_intern/unarmed
-
-/datum/antagonist/ert/intern/leader/unarmed
- outfit = /datum/outfit/centcom/centcom_intern/leader/unarmed
-
-// Marine
-
-/datum/antagonist/ert/marine
- name = "Marine Commander"
- outfit = /datum/outfit/centcom/ert/marine
- role = "Commander"
-
-/datum/antagonist/ert/marine/security
- name = "Marine Heavy"
- outfit = /datum/outfit/centcom/ert/marine/security
- role = "Trooper"
-
-/datum/antagonist/ert/marine/engineer
- name = "Marine Engineer"
- outfit = /datum/outfit/centcom/ert/marine/engineer
- role = "Engineer"
-
-/datum/antagonist/ert/marine/medic
- name = "Marine Medic"
- outfit = /datum/outfit/centcom/ert/marine/medic
- role = "Medical Officer"
-
-// Loss Prevention
-
-/datum/antagonist/ert/lp
- name = "Loss Prevention Security Specialist"
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp
- role = "Security Specialist"
-
-/datum/antagonist/ert/lp/medic
- name = "Loss Prevention Medical Specialist"
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp/medic
- role = "Medical Specialist"
-
-/datum/antagonist/ert/lp/engineer
- name = "Loss Prevention Engineering Specialist"
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp/engineer
- role = "Engineering Specialist"
-
-/datum/antagonist/ert/lp/lieutenant
- name = "Loss Prevention Lieutenant"
- leader = TRUE
- outfit = /datum/outfit/job/nanotrasen/security/ert/lp/lieutenant
- role = "Lieutenant"
+/datum/antagonist/ert/nanotrasen
+ name = "Vigilitas Security Officer"
+ outfit = /datum/outfit/job/nanotrasen/ert
+ role = "Security Officer"
+
+/datum/antagonist/ert/nanotrasen/delivery
+ name = "N+S Cargo Technician"
+ outfit = /datum/outfit/job/nanotrasen/cargo_tech
+ role = "Cargo Technician"
+
+/datum/antagonist/ert/nanotrasen/inspector
+ name = "Nanotrasen Central Command Liaison"
+ outfit = /datum/outfit/job/nanotrasen/ert/inspector
+ role = "Liaison"
+
+// /datum/antagonist/ert/nanotrasen/emergency
+// name = "Vigilitas Response Officer"
+// outfit = /datum/outfit/job/nanotrasen/ert/emergency
+// role = "Response Officer"
+
+/datum/antagonist/ert/nanotrasen/leader
+ name = "Vigilitas Security Corporal"
+ outfit = /datum/outfit/job/nanotrasen/ert/leader
+ role = "Corporal"
+
+// /datum/antagonist/ert/nanotrasen/leader/emergency
+// name = "Vigilitas Response Lieutenant"
+// outfit = /datum/outfit/job/nanotrasen/ert/leader/emergency
+// role = "Lieutenant"
+
+// /datum/antagonist/ert/nanotrasen/medic/emergency
+// name = "Vigilitas Medical Response Officer"
+// outfit = /datum/outfit/job/nanotrasen/ert/medic/emergency
+// role = "Medic"
+
+// /datum/antagonist/ert/nanotrasen/emergency/engineer
+// name = "Vigilitas Engineering Response Officer"
+// outfit = /datum/outfit/job/nanotrasen/ert/emergency/engineer
+// role = "Engineer"
diff --git a/code/modules/antagonists/ert/roumain.dm b/code/modules/antagonists/ert/roumain.dm
new file mode 100644
index 000000000000..d27c8f39e5c4
--- /dev/null
+++ b/code/modules/antagonists/ert/roumain.dm
@@ -0,0 +1,50 @@
+/datum/antagonist/ert/roumain
+ name = "Saint-Roumain Hunter"
+ outfit = /datum/outfit/job/roumain/ert
+ role = "Hunter"
+
+/datum/antagonist/ert/roumain/greet()
+ to_chat(owner, "You are the [role].")
+ var/missiondesc = "You are one of the devoted members of the Saint-Roumain Militia. You are being directed to the sector of [station_name()].
"
+ if(leader) //If Squad Leader
+ missiondesc += "Lead your squad to complete all objectives."
+ else
+ missiondesc += "Follow orders given to you by your Leader, the Montage."
+ if(deathsquad)
+ missiondesc += "You have been given the order to fire at will."
+
+ missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
+ to_chat(owner,missiondesc)
+
+/datum/antagonist/ert/roumain/vickland
+ outfit = /datum/outfit/job/roumain/ert/vickland
+
+/datum/antagonist/ert/roumain/firestorm
+ outfit = /datum/outfit/job/roumain/ert/firestorm
+
+/datum/antagonist/ert/roumain/scout
+ outfit = /datum/outfit/job/roumain/ert/scout
+
+/datum/antagonist/ert/roumain/leader
+ name = "Saint-Roumain Hunter Montagne"
+ leader = TRUE
+ outfit = /datum/outfit/job/roumain/ert/leader
+ role = "Hunter Montagne"
+
+/datum/antagonist/ert/roumain/leader/colligne
+ name = "Saint-Roumain Hunter Colligne"
+ outfit = /datum/outfit/job/roumain/ert/leader/colligne
+ role = "Hunter clligne"
+
+/datum/antagonist/ert/roumain/leader/twobore
+ outfit = /datum/outfit/job/roumain/ert/leader/twobore
+
+/datum/antagonist/ert/roumain/medic
+ name = "Saint-Roumain Hunter Doctor"
+ outfit = /datum/outfit/job/roumain/ert/medic
+ role = "Doctor"
+
+/datum/antagonist/ert/roumain/engineer
+ name = "Saint-Roumain Machinist"
+ outfit = /datum/outfit/job/roumain/ert/engineer
+ role = "Hunter"
diff --git a/code/modules/antagonists/ert/solgov.dm b/code/modules/antagonists/ert/solgov.dm
index 6868fe9eb9bf..c01f88a00962 100644
--- a/code/modules/antagonists/ert/solgov.dm
+++ b/code/modules/antagonists/ert/solgov.dm
@@ -7,14 +7,11 @@
random_names = FALSE
role = "Sonnensöldner"
-/datum/antagonist/ert/official/solgov
+/datum/antagonist/ert/solgov/inspector
name = "SolGov Inspector"
outfit = /datum/outfit/job/solgov/ert/inspector
role = "Solarian Inspector"
-/datum/antagonist/ert/official/solgov/greet()
- to_chat(owner, "You are a Solarian Inspector.")
- if (ert_team)
- to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
- else
- to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [mission.explanation_text]")
+/datum/antagonist/ert/solgov/inspector/greet()
+ to_chat(owner, "You are the Solarian Inspector.")
+ to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
diff --git a/code/modules/antagonists/ert/syndicate.dm b/code/modules/antagonists/ert/syndicate.dm
index ab8fa4abc5f7..7f2de02571b7 100644
--- a/code/modules/antagonists/ert/syndicate.dm
+++ b/code/modules/antagonists/ert/syndicate.dm
@@ -22,14 +22,23 @@
outfit = /datum/outfit/job/syndicate/ert/leader
role = "Sergeant"
-/datum/antagonist/ert/syndicate/gorlex
- name = "2nd Battlegroup Trooper"
- outfit = /datum/outfit/job/syndicate/ert/gorlex
- role = "Trooper"
+/datum/antagonist/ert/syndicate/inspector
+ name = "ACLF Inspector"
+ outfit = /datum/outfit/job/syndicate/ert/inspector
+ role = "Inspector"
+
+/datum/antagonist/ert/official/syndicate/greet()
+ to_chat(owner, "You are a mid-rank official from the Liberation Front.")
+ to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
-/datum/antagonist/ert/syndicate/gorlex/greet()
+/datum/antagonist/ert/syndicate/ngr
+ name = "Gorlex Republic Serviceman"
+ outfit = /datum/outfit/job/syndicate/ert/ngr
+ role = "Serviceman"
+
+/datum/antagonist/ert/syndicate/ngr/greet()
to_chat(owner, "You are the [name].")
- var/missiondesc = "You're a soldier of the New Gorlex Republic sent to [station_name()].
"
+ var/missiondesc = "You're an enlistee of the New Gorlex Republic sent to [station_name()].
"
if(leader) //If Squad Leader
missiondesc += "Lead your team to ensure the completion of your objectives."
else
@@ -38,26 +47,31 @@
missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
-/datum/antagonist/ert/syndicate/gorlex/pointman
- name = "Gorlex Republic Shotgunner"
- outfit = /datum/outfit/job/syndicate/ert/gorlex/pointman
- role = "Pointman"
+/datum/antagonist/ert/syndicate/ngr/grenadier
+ name = "Gorlex Republic Grenadier"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/grenadier
+ role = "Grenadier"
-/datum/antagonist/ert/syndicate/gorlex/medic
- name = "Gorlex Republic Medic"
- outfit = /datum/outfit/job/syndicate/ert/gorlex/medic
+/datum/antagonist/ert/syndicate/ngr/medic
+ name = "Gorlex Republic Field Medic"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/medic
role = "Medic"
-/datum/antagonist/ert/syndicate/gorlex/sniper
- name = "Gorlex Republic Sniper"
- outfit = /datum/outfit/job/syndicate/ert/gorlex/sniper
+/datum/antagonist/ert/syndicate/ngr/sniper
+ name = "Gorlex Republic Marksman"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/sniper
role = "Marksman"
-/datum/antagonist/ert/syndicate/gorlex/leader
+/datum/antagonist/ert/syndicate/ngr/leader
name = "Gorlex Republic Sergeant"
leader = TRUE
- outfit = /datum/outfit/job/syndicate/ert/gorlex/leader
- role = "Sergeant"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/leader
+ role = "Officer"
+
+/datum/antagonist/ert/syndicate/ngr/inspector
+ name = "Gorlex Republic Official"
+ outfit = /datum/outfit/job/syndicate/ert/ngr/inspector
+ role = "Official"
// cybersun
@@ -73,7 +87,7 @@
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)
+ if(prob(50) && !leader && random_names)
missiondesc += "
In addition to your contract with Cybersun, you are also a Gorlex Hardliner. You do not like Cybersun, but you work with them regardless."
missiondesc += "
Your Mission: [ert_team.mission.explanation_text]"
@@ -107,16 +121,50 @@
outfit = /datum/outfit/job/syndicate/ert/cybersun/medic/leader
role = "Lead Medical Technician"
-// inspector
+/datum/antagonist/ert/syndicate/cybersun/inspector
+ name = "Cybersun Representative"
+ outfit = /datum/outfit/job/syndicate/ert/cybersun/inspector
+ role = "Representative"
-/datum/antagonist/ert/official/syndicate
- name = "Syndicate Inspector"
- outfit = /datum/outfit/job/syndicate/ert/inspector
- role = "Syndicate Inspector"
+/datum/antagonist/ert/syndicate/hardliner
+ name = "Hardliner Mercenary"
+ outfit = /datum/outfit/job/syndicate/ert/hardliner
+ role = "Mercenary"
-/datum/antagonist/ert/official/syndicate/greet()
- to_chat(owner, "You are a Syndicate Inspector.")
- 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]")
+/datum/antagonist/ert/syndicate/hardliner/medic
+ name = "Hardliner Medic"
+ outfit = /datum/outfit/job/syndicate/ert/hardliner/medic
+ role = "Medic"
+
+/datum/antagonist/ert/syndicate/hardliner/engineer
+ name = "Hardliner Mechanic"
+ outfit = /datum/outfit/job/syndicate/ert/hardliner/engineer
+ role = "Mechanic"
+
+/datum/antagonist/ert/syndicate/hardliner/leader
+ name = "Hardliner Sergeant"
+ leader = TRUE
+ outfit = /datum/outfit/job/syndicate/ert/hardliner/leader
+ role = "Sergeant"
+
+// ramzi
+
+/datum/antagonist/ert/syndicate/ramzi
+ name = "Ramzi Clique Cell Member"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi
+ role = "Cell Member"
+
+/datum/antagonist/ert/syndicate/ramzi/medic
+ name = "Ramzi Clique Medic"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi/medic
+ role = "Cell Medic"
+
+/datum/antagonist/ert/syndicate/ramzi/demolitionist
+ name = "Ramzi Clique Demolitonist"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi/demolitionist
+ role = "Cell Demolitonist"
+
+/datum/antagonist/ert/syndicate/ramzi/leader
+ name = "Ramzi Clique Cell Leader"
+ outfit = /datum/outfit/job/syndicate/ert/ramzi/leader
+ role = "Cell Leader"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index ec5b7d188db0..040ca96db8f1 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/ooccolor = "#c43b23"
var/asaycolor = "#ff4500" //This won't change the color for current admins, only incoming ones.
/// If we spawn an ERT as an admin and choose to spawn as the briefing officer, we'll be given this outfit
- var/brief_outfit = /datum/outfit/centcom/commander
+ var/brief_outfit = /datum/outfit/job/nanotrasen/captain
var/enable_tips = TRUE
var/tip_delay = 500 //tip delay in milliseconds
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
index 7ac3668aaf77..42957a0f5b71 100644
--- a/code/modules/clothing/factions/clip.dm
+++ b/code/modules/clothing/factions/clip.dm
@@ -240,7 +240,7 @@
//hats
/obj/item/clothing/head/clip
name = "\improper CLIP Minutemen service cap"
- desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. While usually given to recruits and volunteers, it's sometimes used by occasionally by some Minutemen."
+ desc = "A standard issue soft cap dating back to the original Zohil colonial peroid. While usually given to recruits and new volunteers, it's used occasionally by some Minutemen."
icon = 'icons/obj/clothing/faction/clip/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/clip/head.dmi'
vox_override_icon = 'icons/mob/clothing/faction/clip/vox.dmi'
@@ -435,16 +435,21 @@
new /obj/item/ammo_box/magazine/cm15_12g(src)
new /obj/item/grenade/frag(src)
+/obj/item/storage/belt/military/clip/cm15_inc/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/ammo_box/magazine/cm15_12g/incendiary(src)
+ new /obj/item/grenade/frag(src)
+
/obj/item/storage/belt/military/clip/e50/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/belt/military/clip/e50/PopulateContents()
- for(var/i in 1 to 5)
+ for(var/i in 1 to 3)
new /obj/item/stock_parts/cell/gun/large(src)
new /obj/item/grenade/frag(src)
- new /obj/item/screwdriver/nuke(src)
+ new /obj/item/screwdriver(src)
/obj/item/storage/belt/military/clip/engi/PopulateContents()
new /obj/item/screwdriver/power(src)
@@ -458,7 +463,7 @@
/obj/item/storage/belt/military/clip/flamer/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/glass/beaker/large/fuel(src)
- new /obj/item/ammo_box/magazine/co9mm(src)
+ new /obj/item/ammo_box/magazine/cm23(src)
/obj/item/storage/belt/medical/webbing/clip
name = "medical webbing"
diff --git a/code/modules/clothing/factions/frontiersmen.dm b/code/modules/clothing/factions/frontiersmen.dm
index 77af8138fb40..ba6206c69fa4 100644
--- a/code/modules/clothing/factions/frontiersmen.dm
+++ b/code/modules/clothing/factions/frontiersmen.dm
@@ -230,24 +230,11 @@
unique_reskin = null
-/obj/item/storage/belt/medical/webbing/frontiersmen
- name = "leather medical bandolier"
- desc = "A rudimentary leather bandolier, utilized by both independents and frontiersmen alike. This one is painted white, usually to be worn by a medic."
- icon_state = "frontiermedicalwebbing"
- item_state = "frontiermedicalwebbing"
- icon = 'icons/obj/clothing/faction/frontiersmen/belt.dmi'
- mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/belt.dmi'
-
-/obj/item/storage/belt/medical/webbing/frontiersmen/surgery/PopulateContents()
- new /obj/item/scalpel(src)
- new /obj/item/circular_saw(src)
- new /obj/item/surgicaldrill(src)
- new /obj/item/retractor(src)
- new /obj/item/cautery(src)
- new /obj/item/hemostat(src)
- new /obj/item/hypospray/mkii(src)
- update_appearance()
-
+/obj/item/storage/belt/security/military/frontiersmen/illestren/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/illestren_a850r(src)
+ new /obj/item/grenade/frag(src)
/obj/item/storage/belt/security/military/frontiersmen/skm_ammo/PopulateContents()
for(var/i in 1 to 4)
@@ -268,3 +255,30 @@
for(var/i in 1 to 4)
new /obj/item/reagent_containers/glass/beaker/large/napalm(src)
new /obj/item/grenade/frag(src)
+
+
+/obj/item/storage/belt/medical/webbing/frontiersmen
+ name = "leather medical bandolier"
+ desc = "A rudimentary leather bandolier, utilized by both independents and frontiersmen alike. This one is painted white, usually to be worn by a medic."
+ icon_state = "frontiermedicalwebbing"
+ item_state = "frontiermedicalwebbing"
+ icon = 'icons/obj/clothing/faction/frontiersmen/belt.dmi'
+ mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/belt.dmi'
+
+/obj/item/storage/belt/medical/webbing/frontiersmen/surgery/PopulateContents()
+ new /obj/item/scalpel(src)
+ new /obj/item/circular_saw(src)
+ new /obj/item/surgicaldrill(src)
+ new /obj/item/retractor(src)
+ new /obj/item/cautery(src)
+ new /obj/item/hemostat(src)
+ new /obj/item/hypospray/mkii(src)
+ update_appearance()
+
+/obj/item/storage/belt/medical/webbing/frontiersmen/combat/PopulateContents()
+ new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
+ new /obj/item/reagent_containers/hypospray/medipen/stimulants(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/stack/medical/gauze/twelve(src)
+ new /obj/item/stack/medical/splint(src)
diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm
index 3eea9ebec461..9a4307f1bd76 100644
--- a/code/modules/clothing/factions/gezena.dm
+++ b/code/modules/clothing/factions/gezena.dm
@@ -242,6 +242,20 @@
item_state = "bluecloth"
unique_reskin = null
+/obj/item/storage/belt/military/gezena/bg16/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/stock_parts/cell/gun/pgf(src)
+ new /obj/item/screwdriver(src)
+
+/obj/item/storage/belt/military/gezena/engineer/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 2)
+ new /obj/item/stock_parts/cell/gun/pgf(src)
+ new /obj/item/screwdriver(src)
+ new /obj/item/grenade/c4
+ new /obj/item/grenade/c4
+
/obj/item/storage/belt/medical/gezena
name = "\improper PGF Medical Iho-Usks"
desc = "The “iho-usks”, translating to “gear-holder”, is a lightweight harness covered in pouches, supplied to the ground troops of the PGF. This variant is designed for carrying medical supplies."
@@ -252,6 +266,17 @@
icon_state = "medpouches"
item_state = "whitecloth"
+/obj/item/storage/belt/medical/gezena/paramedic/PopulateContents()
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/styptic(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/silver_sulf(src)
+ new /obj/item/reagent_containers/medigel/synthflesh(src)
+ new /obj/item/stack/medical/gauze/twelve(src)
+ new /obj/item/stack/medical/splint(src)
+ . = ..()
+
+
//Cloaks
/obj/item/clothing/neck/cloak/gezena
diff --git a/code/modules/clothing/factions/hardliners.dm b/code/modules/clothing/factions/hardliners.dm
index a02275d13e05..fab1c2a87dd7 100644
--- a/code/modules/clothing/factions/hardliners.dm
+++ b/code/modules/clothing/factions/hardliners.dm
@@ -179,3 +179,9 @@
item_state = "hl_webbing"
icon = 'icons/obj/clothing/faction/hardliners/belt.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/belt.dmi'
+
+/obj/item/storage/belt/security/webbing/hardliners/sidewinder/PopulateContents()
+ . = ..()
+ new /obj/item/ammo_box/magazine/m57_39_sidewinder(src)
+ new /obj/item/ammo_box/magazine/m57_39_sidewinder(src)
+ new /obj/item/ammo_box/magazine/m57_39_sidewinder(src)
diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm
index 7098dd6f1de9..5ceb8a83e685 100644
--- a/code/modules/clothing/factions/ngr.dm
+++ b/code/modules/clothing/factions/ngr.dm
@@ -244,3 +244,14 @@
item_state = "ngr_webbing"
icon = 'icons/obj/clothing/faction/ngr/belt.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/belt.dmi'
+
+/obj/item/storage/belt/security/webbing/ngr/cobra/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 4)
+ new /obj/item/ammo_box/magazine/m45_cobra(src)
+
+/obj/item/storage/belt/security/webbing/ngr/hydra_grenadier/PopulateContents()
+ for(var/i in 1 to 3)
+ new /obj/item/ammo_box/magazine/m556_42_hydra(src)
+ new /obj/item/ammo_casing/a40mm(src)
+ new /obj/item/ammo_casing/a40mm(src)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 435ad484a4ae..6bb7dca6d31e 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -548,7 +548,7 @@
icon_state = "solgov_envirohelm"
item_state = "solgov_envirohelm"
-/obj/item/clothing/head/helmet/operator
+/obj/item/clothing/head/helmet/syndie
name = "\improper operator helmet"
desc = "A robust combat helmet commonly employed by Syndicate forces, regardless of alignment."
icon_state = "operator"
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index d68c49e61778..e6627f28134f 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -1,21 +1,23 @@
/datum/outfit/job/frontiersmen/ert //most basic of grunts
name = "ERT - Frontiersman Basic"
- head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
- suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ head = /obj/item/clothing/head/beret/sec/frontier
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
suit_store = /obj/item/gun/ballistic/rifle/illestren
+ belt = /obj/item/storage/belt/security/military/frontiersmen/illestren
uniform = /obj/item/clothing/under/frontiersmen
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset/pirate/alt
back = /obj/item/storage/backpack
- l_pocket = /obj/item/flashlight/seclite
- r_pocket = /obj/item/tank/internals/emergency_oxygen/double
+ id = null // lol
+ wallet = null
box = /obj/item/storage/box/survival/frontier
- id = null // lol
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/double
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/illestren_a850r=5, /obj/item/grenade/frag=1)
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen)
/datum/outfit/job/frontiersmen/ert/random
name = "ERT - Frontiersman Randomized"
@@ -25,10 +27,19 @@
suit = null
suit_store = null
back = null
+ belt = null
+ gloves = null
+
l_pocket = null
r_pocket = /obj/item/radio
+
backpack_contents = list()
+ backpack = null
+ courierbag = null
+ satchel = null
+ duffelbag = null
+
/datum/outfit/job/frontiersmen/ert/random/pre_equip(mob/living/carbon/human/H, visualsOnly, client/preference_source)
. = ..()
if(visualsOnly)
@@ -46,11 +57,11 @@
/obj/item/clothing/suit/armor/vest/bulletproof/frontier = 5,
/obj/item/clothing/suit/armor/vest/scrap_armor = 1))
- if(prob(30))
+ if(prob(50))
mask = pickweight(list(
- /obj/item/clothing/mask/gas/frontiersmen = 5,
- /obj/item/clothing/mask/gas/sechailer/balaclava = 5,
- /obj/item/clothing/mask/breath = 5,
+ /obj/item/clothing/mask/gas/frontiersmen = 12,
+ /obj/item/clothing/mask/gas/sechailer/balaclava = 10,
+ /obj/item/clothing/mask/breath = 7,
/obj/item/clothing/mask/whistle = 3))
if(prob(90))
@@ -59,9 +70,8 @@
/obj/item/storage/backpack/satchel = 20,
/obj/item/storage/backpack/messenger = 20,
/obj/item/melee/baton/cattleprod/loaded = 5,
- /obj/item/food/baguette = 2, // yes you can put this on your back
- /obj/item/deployable_turret_folded = 1,
- /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended = 1,
+ /obj/item/deployable_turret_folded = 4,
+ /obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended = 3,
))
if(prob(90))
@@ -73,17 +83,17 @@
var/extra_class = pick(list("Doctor", "Breacher", "Ammo Carrier"))
switch(extra_class)
if("Doctor")
- backpack_contents += list(/obj/item/storage/firstaid/regular = 1)
+ backpack_contents += list(/obj/item/storage/firstaid/medical = 1)
gloves = /obj/item/clothing/gloves/color/latex
suit = /obj/item/clothing/suit/frontiersmen
head = /obj/item/clothing/head/frontier
if(prob(50))
- belt = /obj/item/storage/belt/medical/surgery
+ belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat
if(prob(30))
glasses = /obj/item/clothing/glasses/hud/health
if("Breacher")
- backpack_contents += list(/obj/item/grenade/c4 = 2)
- if(prob(10))
+ backpack_contents += list(/obj/item/grenade/c4 = 2, /obj/item/grenade/smokebomb = 3)
+ if(prob(60))
belt = /obj/item/storage/belt/grenade/full
if("Ammo Carrier")
var/loops = rand(1,3)
@@ -95,7 +105,10 @@
/obj/item/ammo_box/c45,
/obj/item/ammo_box/a4570,
/obj/item/stock_parts/cell/gun/mini))
- backpack_contents += ammotype
+ if(istype(back, /obj/item/storage/backpack))
+ backpack_contents += ammotype
+ else
+ H.put_in_hands(ammotype, FALSE)
var/weapon = pick(list("Bolt-Action", "Pistol", "Melee"))
switch(weapon)
@@ -113,7 +126,7 @@
/obj/item/gun/ballistic/revolver/shadow,
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn,
/obj/item/gun/energy/e_gun/mini))
- if(prob(30))
+ if(prob(80))
l_hand = pick(list(
/obj/item/gun/ballistic/automatic/pistol/disposable,
/obj/item/gun/ballistic/automatic/pistol/candor,
@@ -130,7 +143,7 @@
/obj/item/melee/flyswatter = 1,
))
-/datum/outfit/job/frontiersmen/ert/grunt //better armed, use for quick creating pirate ships
+/datum/outfit/job/frontiersmen/ert/unarmed //better armed, use for quick creating pirate ships
name = "ERT - Frontiersman Grunt (Unarmed)"
suit_store = null
@@ -138,25 +151,25 @@
backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen)
-/datum/outfit/job/frontiersmen/ert/grunt/skm
+/datum/outfit/job/frontiersmen/ert/skm
name = "ERT - Frontiersman Grunt (SKM-24 AR)"
suit_store = /obj/item/gun/ballistic/automatic/assault/skm
belt = /obj/item/storage/belt/security/military/frontiersmen/skm_ammo
-/datum/outfit/job/frontiersmen/ert/grunt/mauler_mp
+/datum/outfit/job/frontiersmen/ert/mauler_mp
name = "ERT - Frontiersman Grunt (Mauler MP)"
suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
belt = /obj/item/storage/belt/security/military/frontiersmen/mauler_mp_ammo
-/datum/outfit/job/frontiersmen/ert/grunt/spitter_mp
+/datum/outfit/job/frontiersmen/ert/spitter_mp
name = "ERT - Frontiersman Grunt (Spitter MP)"
suit_store = /obj/item/gun/ballistic/automatic/pistol/spitter
belt = /obj/item/storage/belt/security/military/frontiersmen/spitter_ammo
-/datum/outfit/job/frontiersmen/ert/grunt/pounder_smg
+/datum/outfit/job/frontiersmen/ert/pounder_smg
name = "ERT - Frontiersman Grunt (Pounder SMG)"
suit_store = /obj/item/gun/ballistic/automatic/smg/pounder
@@ -171,12 +184,26 @@
ears = /obj/item/radio/headset/pirate/alt/captain
back = /obj/item/storage/backpack/satchel/leather
suit = /obj/item/clothing/suit/armor/frontier
- suit_store = /obj/item/gun/ballistic/automatic/pistol/deagle
+ suit_store = null
+ belt = /obj/item/gun/ballistic/automatic/pistol/deagle
backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/m50=2, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
-/datum/outfit/job/frontiersmen/ert/leader/unnarmed
- name = "ERT - Frontiersman Officer (Unnarmed)"
+/datum/outfit/job/frontiersmen/ert/leader/heavy
+ name = "ERT - Frontiersman Officer (Shock Troop)"
+
+ suit = /obj/item/clothing/suit/armor/vest/marine/frontier
+ head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
+ mask = /obj/item/clothing/mask/gas/sechailer
+ belt = /obj/item/gun/ballistic/automatic/pistol/deagle/gold // daring today aren't we
+
+ backpack = /obj/item/minigunpack
+ satchel = /obj/item/minigunpack
+ courierbag = /obj/item/minigunpack
+ duffelbag = /obj/item/minigunpack
+
+/datum/outfit/job/frontiersmen/ert/leader/unarmed
+ name = "ERT - Frontiersman Officer (Unarmed)"
suit_store = null
@@ -190,10 +217,22 @@
mask = /obj/item/clothing/mask/surgical
gloves = /obj/item/clothing/gloves/color/latex/nitrile
belt = /obj/item/storage/belt/medical/webbing/frontiersmen/surgery
- suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
+ suit = /obj/item/clothing/suit/frontiersmen
+ suit_store = null
- backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack=3, /obj/item/ammo_box/magazine/m9mm_mauler=2)
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/regular, /obj/item/ammo_box/magazine/m9mm_mauler = 2, /obj/item/gun/ballistic/automatic/pistol/mauler)
+/datum/outfit/job/frontiersmen/ert/medic/heavy
+ name = "ERT - Frontiersman Medic (Shock Troop)"
+
+ head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier
+ mask = /obj/item/clothing/mask/gas/syndicate/ngr
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler
+ belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat
+ glasses = /obj/item/clothing/glasses/hud/health
+
+ backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 3, /obj/item/ammo_box/magazine/m9mm_mauler=2)
/datum/outfit/job/frontiersmen/ert/engineer
name = "ERT - Frontiersman Engineer"
@@ -215,7 +254,7 @@
suit_store = /obj/item/tank/internals/oxygen/red
uniform = /obj/item/clothing/under/frontiersmen/fireproof
gloves = /obj/item/clothing/gloves/combat
- back = /obj/item/storage/backpack
+ back = /obj/item/storage/backpack/fireproof
belt = /obj/item/storage/belt/security/military/frontiersmen/flamer
l_hand = /obj/item/flamethrower/full/tank
@@ -223,7 +262,7 @@
backpack_contents = list(/obj/item/gun/ballistic/shotgun/doublebarrel/presawn=1,/obj/item/ammo_box/a12g=1,/obj/item/extinguisher=2,/obj/item/radio=1)
-/datum/outfit/job/frontiersmen/ert/sentry_lmg
+/datum/outfit/job/frontiersmen/ert/sentry
name = "ERT - Frontiersman Sentry (SKM-24v LMG)"
head = /obj/item/clothing/head/helmet/marine/frontier
@@ -236,17 +275,10 @@
backpack_contents = list(/obj/item/ammo_box/magazine/skm_762_40/drum=2,/obj/item/ammo_box/a357=2,/obj/item/grenade/frag=1,/obj/item/radio=1)
-/datum/outfit/job/frontiersmen/ert/sentry_shredder
+/datum/outfit/job/frontiersmen/ert/sentry/shredder
name = "ERT - Frontiersman Sentry (Shredder LMG)"
- head = /obj/item/clothing/head/helmet/marine/frontier
- mask = /obj/item/clothing/mask/gas/sechailer/balaclava
- suit = /obj/item/clothing/suit/armor/vest/marine/frontier
- gloves = /obj/item/clothing/gloves/combat
-
- belt = /obj/item/gun/ballistic/revolver/mateba
-
-
+ suit_store = null
l_hand = /obj/item/gun/ballistic/automatic/hmg/shredder // this doesnt even fit on the suit storage slot
backpack_contents = list(/obj/item/ammo_box/magazine/m12_shredder=2,/obj/item/ammo_box/a357=2,/obj/item/grenade/frag=1,/obj/item/radio=1)
diff --git a/code/modules/clothing/outfits/ert/gezena_ert.dm b/code/modules/clothing/outfits/ert/gezena_ert.dm
new file mode 100644
index 000000000000..626df8a99d32
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/gezena_ert.dm
@@ -0,0 +1,87 @@
+/datum/outfit/job/gezena/ert
+ name = "ERT - PGF Marine Rifleman"
+ id_assignment = "Marine Rifleman"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
+
+ uniform = /obj/item/clothing/under/gezena/marine
+ suit = /obj/item/clothing/suit/armor/gezena/marine
+ head = /obj/item/clothing/head/helmet/gezena
+ belt = /obj/item/storage/belt/military/gezena/bg16
+ gloves = /obj/item/clothing/gloves/gezena/marine
+ shoes = /obj/item/clothing/shoes/combat/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena
+ suit_store = /obj/item/gun/energy/kalix/pgf
+
+ l_pocket = /obj/item/kitchen/knife/combat
+ r_pocket = /obj/item/flashlight/seclite
+
+ backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/grenade/frag=2)
+
+
+/datum/outfit/job/gezena/ert/gunner
+ name = "ERT - PGF Marine Gunner"
+
+ suit_store = /obj/item/gun/energy/kalix/pgf/heavy // yea there's not much else to put in. sorry
+
+/datum/outfit/job/gezena/ert/engineer
+ name = "ERT - PGF Marine Combat Engineer"
+ id_assignment = "Marine Combat Engineer"
+
+ belt = /obj/item/storage/belt/military/gezena/engineer
+
+/datum/outfit/job/gezena/ert/medic
+ name = "ERT - PGF Marine Medic"
+ id_assignment = "Marine Medic"
+ jobtype = /datum/job/paramedic
+ job_icon = "paramedic"
+
+ belt = /obj/item/storage/belt/medical/gezena/paramedic
+ gloves = /obj/item/clothing/gloves/gezena/marine
+ neck = /obj/item/clothing/neck/cloak/gezena/med
+
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ courierbag = /obj/item/storage/backpack/messenger/para
+ box = /obj/item/storage/box/survival/medical
+
+ backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/screwdriver)
+
+
+/datum/outfit/job/gezena/ert/leader
+ name = "ERT - PGF Marine Sergeant"
+ id_assignment = "Marine Sergeant"
+ jobtype = /datum/job/hos
+ job_icon = "headofsecurity"
+
+ suit = /obj/item/clothing/suit/armor/gezena/marinecoat
+ head = /obj/item/clothing/head/helmet/gezena
+ gloves = /obj/item/clothing/gloves/gezena/marine
+ shoes = /obj/item/clothing/shoes/combat/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena/lead
+ suit_store = /obj/item/gun/energy/kalix/pgf/heavy
+
+ backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/grenade/smokebomb = 3, /obj/item/binoculars)
+
+
+/datum/outfit/job/gezena/ert/inspector
+ name = "ERT - PGF Naval Observer"
+ id_assignment = "Naval Observer"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "headofpersonnel"
+
+ head = /obj/item/clothing/head/gezena
+ neck = /obj/item/clothing/neck/cloak/gezena/command
+ uniform = /obj/item/clothing/under/gezena
+ suit = /obj/item/clothing/suit/armor/gezena
+ suit_store = null
+ belt = null
+ gloves = /obj/item/clothing/gloves/gezena
+
+ backpack = /obj/item/storage/backpack/satchel
+ satchel = /obj/item/storage/backpack/satchel
+ duffelbag = /obj/item/storage/backpack/satchel
+ courierbag = /obj/item/storage/backpack/satchel
+
+ backpack_contents = list(/obj/item/folder, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
diff --git a/code/modules/clothing/outfits/ert/indie_ert.dm b/code/modules/clothing/outfits/ert/indie_ert.dm
index e45f0895d0f4..197a5dd6d911 100644
--- a/code/modules/clothing/outfits/ert/indie_ert.dm
+++ b/code/modules/clothing/outfits/ert/indie_ert.dm
@@ -3,25 +3,18 @@
jobtype = /datum/job/officer
job_icon = "securityofficer"
+ wallet = null
+
head = /obj/item/clothing/head/helmet/sec
ears = /obj/item/radio/headset/alt
- mask = null
uniform = /obj/item/clothing/under/rank/security/officer
- shoes = /obj/item/clothing/shoes/combat/swat
+ shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/black
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
-/datum/outfit/job/independent/ert/post_equip(mob/living/carbon/human/H, visualsOnly, client/preference_source)
- . = ..()
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access += list(ACCESS_CENT_GENERAL)
-
/datum/outfit/job/independent/ert/emt
name = "ERT - Independent Paramedic"
jobtype = /datum/job/paramedic
@@ -37,6 +30,15 @@
back = /obj/item/storage/backpack/medic
belt = /obj/item/storage/belt/medical/webbing/paramedic
+ backpack_contents = list(/obj/item/storage/firstaid/medical)
+
+/datum/outfit/job/independent/ert/emt/eva
+ name = "ERT - Independent Paramedic (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/medical
+ suit_store = /obj/item/tank/internals/oxygen
+
/datum/outfit/job/independent/ert/firefighter
name = "ERT - Independent Firefighter (Standard)"
jobtype = /datum/job/atmos
@@ -44,14 +46,20 @@
head = /obj/item/clothing/head/hardhat/red
uniform = /obj/item/clothing/under/utility
- suit = /obj/item/clothing/suit/fire/firefighter
+ suit = /obj/item/clothing/suit/fire/atmos
suit_store = /obj/item/extinguisher
glasses = /obj/item/clothing/glasses/heat
- mask = /obj/item/clothing/mask/breath
+ belt = null
+ mask = /obj/item/clothing/mask/gas/atmos
shoes = /obj/item/clothing/shoes/workboots
gloves = /obj/item/clothing/gloves/color/black
back = /obj/item/tank/internals/oxygen/red
+ backpack = /obj/item/storage/backpack/fireproof
+ courierbag = /obj/item/storage/backpack/fireproof
+ duffelbag = /obj/item/storage/backpack/fireproof
+ satchel = /obj/item/storage/backpack/fireproof
+
l_pocket = /obj/item/crowbar/red
r_pocket = /obj/item/radio
@@ -61,14 +69,13 @@
job_icon = "paramedic"
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
suit_store = /obj/item/tank/internals/emergency_oxygen
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)
+ backpack_contents = list(/obj/item/storage/firstaid/fire=1, /obj/item/storage/firstaid/o2=1)
/datum/outfit/job/independent/ert/firefighter/leader
name = "ERT - Independent Firefighter (Group Captain)"
@@ -82,6 +89,13 @@
belt = /obj/item/storage/belt/utility/atmostech
gloves = /obj/item/clothing/gloves/color/yellow
+ backpack_contents = null
+
+ backpack = null
+ courierbag = null
+ duffelbag = null
+ satchel = null
+
/datum/outfit/job/independent/ert/technician
name = "ERT - Independent Technician"
jobtype = /datum/job/engineer
@@ -90,6 +104,7 @@
head = /obj/item/clothing/head/hardhat
uniform = /obj/item/clothing/under/rank/engineering/engineer
belt = /obj/item/storage/belt/utility/full/engi
+ gloves = /obj/item/clothing/gloves/color/yellow
suit = /obj/item/clothing/suit/toggle/hazard
shoes = /obj/item/clothing/shoes/workboots
back = /obj/item/storage/backpack/industrial
@@ -97,3 +112,61 @@
r_pocket = /obj/item/analyzer
box = /obj/item/storage/box/survival/engineer
+
+/datum/outfit/job/independent/ert/pizza
+ name = "ERT - Independent Pizza Delivery Worker"
+
+ uniform = /obj/item/clothing/under/suit/burgundy
+ neck = /obj/item/clothing/neck/tie/red
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ head = /obj/item/clothing/head/soft/mime
+ suit = null
+ ears = null
+ belt = null
+ gloves = null
+
+
+/datum/outfit/job/independent/ert/janitor
+ name = "ERT - Independent Sanitation Technician"
+ jobtype = /datum/job/janitor
+ job_icon = "janitor"
+
+ uniform = /obj/item/clothing/under/rank/civilian/janitor
+ head = /obj/item/clothing/head/soft/purple
+ ears = /obj/item/radio/headset
+ mask = null
+ shoes = /obj/item/clothing/shoes/combat/swat
+ gloves = /obj/item/clothing/gloves/color/purple
+ suit = null
+ belt = /obj/item/storage/belt/janitor/full
+
+/datum/outfit/job/independent/ert/deathsquad
+ name = "ERT - Death Commando"
+ job_icon = "deathsquad"
+ faction_icon = null
+ id_assignment = "Commando" // i mean. if you have enough time to look at a dsquaddie's id card. why not
+
+ head = null
+ uniform = /obj/item/clothing/under/rank/security/officer/military
+ id = /obj/item/card/id/ert/deathsquad
+ suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
+ shoes = /obj/item/clothing/shoes/combat/swat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+ mask = /obj/item/clothing/mask/gas/sechailer/swat
+ glasses = /obj/item/clothing/glasses/hud/toggle/thermal
+ back = /obj/item/storage/backpack/security
+ suit_store = /obj/item/tank/internals/emergency_oxygen/double
+ belt = /obj/item/gun/ballistic/revolver/mateba
+ ears = /obj/item/radio/headset/alt
+ r_hand = /obj/item/gun/energy/pulse
+
+ l_pocket = /obj/item/melee/transforming/energy/sword/saber
+ r_pocket = /obj/item/shield/energy
+
+
+ backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
+ /obj/item/ammo_box/a357=1,\
+ /obj/item/storage/firstaid/regular=1,\
+ /obj/item/storage/box/flashbangs=1,\
+ /obj/item/flashlight=1,\
+ /obj/item/grenade/c4/x4=1)
diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
index b3fc0c61970c..297e6580d319 100644
--- a/code/modules/clothing/outfits/ert/inteq_ert.dm
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -4,31 +4,64 @@
jobtype = /datum/job/officer
job_icon = "securityofficer"
+ wallet = null
+
+ head = /obj/item/clothing/head/helmet/inteq
mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
- suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ suit = /obj/item/clothing/suit/armor/vest
suit_store = /obj/item/gun/ballistic/automatic/assault/skm/inteq
gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/inteq/alt
id = /obj/item/card/id
belt = /obj/item/storage/belt/security/webbing/inteq/skm
- back = /obj/item/storage/backpack/fireproof
l_pocket = /obj/item/kitchen/knife/combat
r_pocket = /obj/item/flashlight/seclite
- backpack_contents = list(/obj/item/radio=1)
+/datum/outfit/job/inteq/ert/eva
+ name = "ERT - Inteq Rifleman (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/shotgun
name = "ERT - Inteq Shotgunner"
- id_assignment = "Enforcer"
- suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
- belt = /obj/item/storage/belt/security/webbing/inteq/alt
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq
+ belt = /obj/item/storage/belt/security/webbing/inteq/alt/bulldog
+
+/datum/outfit/job/inteq/ert/shotgun/eva
+ name = "ERT - Inteq Shotgunner (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
+
+
+/datum/outfit/job/inteq/ert/engineer
+ name = "ERT - Inteq Artificer"
+ id_assignment = "Artificer"
+ jobtype = /datum/job/engineer
+ job_icon = "stationengineer"
+
+ head = /obj/item/clothing/head/soft/inteq
+ uniform = /obj/item/clothing/under/syndicate/inteq/artificer
+ belt = /obj/item/storage/belt/utility/full/engi
+ gloves = /obj/item/clothing/gloves/color/yellow
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/co9mm=2)
- backpack_contents = list(/obj/item/storage/box/lethalshot=2, /obj/item/radio=1)
+/datum/outfit/job/inteq/ert/engineer/eva
+ name = "ERT - Inteq Artificer (EVA)"
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/medic
name = "ERT - Inteq Corpsman"
@@ -36,13 +69,20 @@
jobtype = /datum/job/paramedic
job_icon = "paramedic"
+ head = /obj/item/clothing/head/soft/inteq/corpsman
uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
belt = /obj/item/storage/belt/medical/webbing/paramedic
- suit_store = null
+ suit = /obj/item/clothing/suit/armor/inteq/corpsman
+ suit_store = /obj/item/healthanalyzer
- l_pocket = /obj/item/healthanalyzer
+ backpack_contents = list(/obj/item/storage/firstaid/medical=1)
- backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)
+/datum/outfit/job/inteq/ert/medic/eva
+ name = "ERT - Inteq Corpsman (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/leader
name = "ERT - Inteq Vanguard"
@@ -50,7 +90,59 @@
jobtype = /datum/job/hos
job_icon = "headofsecurity"
+ head = /obj/item/clothing/head/helmet/inteq
ears = /obj/item/radio/headset/inteq/alt/captain
back = /obj/item/storage/backpack/messenger/inteq
+ belt = /obj/item/storage/belt/security/webbing/inteq/skm_carabine
+ suit = /obj/item/clothing/suit/armor/hos/inteq
+ suit_store = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq
+ id = /obj/item/card/id/gold
+
+ backpack_contents = list(/obj/item/megaphone/sec)
+
+/datum/outfit/job/inteq/ert/leader/eva
+ name = "ERT - Inteq Vanguard (EVA)"
+
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
+
+/datum/outfit/job/inteq/ert/honor_guard
+ name = "ERT - Inteq Honor Guard"
+ id_assignment = "Guardsman"
+ jobtype = /datum/job/officer
+ job_icon = "inteq"
+
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ suit = /obj/item/clothing/suit/armor/vest/marine
+ belt = /obj/item/storage/belt/military/assault/commander
+ gloves = /obj/item/clothing/gloves/color/white
+ shoes = /obj/item/clothing/shoes/combat
+ head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
+ ears = /obj/item/radio/headset/inteq/captain
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
+ l_pocket = /obj/item/gun/energy/taser
+ r_pocket = /obj/item/restraints/handcuffs
suit_store = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
- id = /obj/item/card/id/silver
+
+/datum/outfit/job/inteq/ert/inspector
+ name = "ERT - Inteq Mothership Investigator"
+ id_assignment = "Investigator"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "inteq"
+
+ uniform = /obj/item/clothing/under/syndicate/inteq
+ suit = null
+ belt = /obj/item/clipboard
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/laceup
+ head = /obj/item/clothing/head/beret/sec/inteq
+ mask = null
+ ears = /obj/item/radio/headset/inteq/captain
+ glasses = null
+
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/stamp/inteq, /obj/item/folder, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index 482777814c64..971d68a94192 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -1,26 +1,60 @@
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard
- name = "ERT - CLIP Minuteman BARD Specialist"
- id_assignment = "Biohazard Assessment Specialist"
+/datum/outfit/job/clip/minutemen/bard
+ name = "ERT - C-MM BARD Field Agent"
+ id_assignment = "Biohazard Assessment Field Agent"
+ job_icon = "virologist" // can someone resprite the biosuits already
+
+ wallet = null
+
+ uniform = /obj/item/clothing/under/clip/formal/with_shirt
+ head = /obj/item/clothing/head/clip
+ mask = /obj/item/clothing/mask/surgical
+ gloves = /obj/item/clothing/gloves/color/latex
+
+ backpack = /obj/item/storage/backpack/satchel/sec/clip
+ satchel = /obj/item/storage/backpack/satchel/sec/clip
+ courierbag = /obj/item/storage/backpack/satchel/sec/clip
+ duffelbag = /obj/item/storage/backpack/satchel/sec/clip
+
+ l_pocket = /obj/item/taperecorder
+ r_pocket = /obj/item/flashlight
+
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip,
+ /obj/item/evidencebag = 2,
+ /obj/item/camera,
+ /obj/item/storage/firstaid/toxin,
+ )
+
+/datum/outfit/job/clip/minutemen/bard/emergency
+ name = "ERT - C-MM BARD Xenofauna Specialist"
+ id_assignment = "Biohazard Assessment Xenofauna Specialist"
job_icon = "clip_cmm2"
+ uniform = /obj/item/clothing/under/clip/minutemen
suit = /obj/item/clothing/suit/armor/vest/marine/heavy
- suit_store = /obj/item/gun/ballistic/shotgun/cm15
+ suit_store = /obj/item/gun/ballistic/shotgun/cm15/incendiary
mask = /obj/item/clothing/mask/gas/clip
head = /obj/item/clothing/head/helmet/riot/clip
- belt = /obj/item/storage/belt/military/clip/cm15
+ belt = /obj/item/storage/belt/military/clip/cm15_inc
glasses = /obj/item/clothing/glasses/hud/health/night
r_pocket = /obj/item/kitchen/knife/combat
l_pocket = /obj/item/extinguisher/mini
+ shoes = /obj/item/clothing/shoes/combat
+
+ backpack = /obj/item/storage/backpack/ert
+ satchel = /obj/item/storage/backpack/ert
+ courierbag = /obj/item/storage/backpack/ert
+ duffelbag = /obj/item/storage/backpack/ert
backpack_contents = list(
/obj/item/flashlight/seclite = 1,
/obj/item/storage/box/flares = 1
)
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard/medic
- name = "ERT - CLIP Minuteman BARD Medical Specialist"
- id_assignment = "Corpsman"
+/datum/outfit/job/clip/minutemen/bard/emergency/medic
+ name = "ERT - C-MM BARD Medical Specialist"
+ id_assignment = "Biohazard Assessment Medical Aid Specialist"
+ uniform = /obj/item/clothing/under/clip/medic
suit = /obj/item/clothing/suit/armor/vest/marine
suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
belt = /obj/item/storage/belt/medical/webbing/clip/prefilled
@@ -31,11 +65,17 @@
/obj/item/flashlight/seclite = 1,
/obj/item/defibrillator/compact/loaded = 1,
/obj/item/storage/firstaid/advanced = 1,
- /obj/item/ammo_box/magazine/smgm9mm = 2
+ /obj/item/ammo_box/magazine/cm5_9mm = 2
)
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard/flamer
- name = "ERT - CLIP Minuteman BARD Flamethrower Specialist"
+ backpack = /obj/item/storage/backpack/ert/medical
+ satchel = /obj/item/storage/backpack/ert/medical
+ courierbag = /obj/item/storage/backpack/ert/medical
+ duffelbag = /obj/item/storage/backpack/ert/medical
+
+/datum/outfit/job/clip/minutemen/bard/emergency/flamer
+ name = "ERT - C-MM BARD Flamethrower Specialist"
+ id_assignment = "Biohazard Assessment Fire Control Specialist"
suit = /obj/item/clothing/suit/armor/vest/marine/medium
suit_store = /obj/item/flamethrower/full/tank
@@ -46,17 +86,15 @@
backpack_contents = list(
/obj/item/flashlight/seclite = 1,
/obj/item/extinguisher = 1,
- /obj/item/gun/ballistic/automatic/pistol/commander = 1 // replace commander with the cm23 when it is implemented
+ /obj/item/gun/ballistic/automatic/pistol/cm23 = 1
)
-
-/datum/outfit/job/clip/minutemen/grunt/dressed/bard/leader
- name = "ERT - CLIP Minuteman BARD Specialist Sergeant"
- id_assignment = "Biohazard Assessment Sergeant"
- job_icon = "clip_cmm3"
+/datum/outfit/job/clip/minutemen/bard/emergency/leader
+ name = "ERT - C-MM BARD Master Sergeant"
+ id_assignment = "Master Sergeant"
+ job_icon = "clip_cmm4"
belt = /obj/item/storage/belt/military/clip/e50
- uniform = /obj/item/clothing/under/clip/officer
suit = /obj/item/clothing/suit/armor/vest/marine
suit_store = /obj/item/gun/energy/laser/e50/clip
r_pocket = /obj/item/grenade/c4
@@ -65,36 +103,79 @@
backpack_contents = list(
/obj/item/storage/box/flares = 1,
/obj/item/grenade/c4 = 2,
+ /obj/item/grenade/smokebomb = 2,
/obj/item/flashlight/seclite = 1
)
-/datum/outfit/job/clip/minutemen/grunt/dressed/riot
- name = "ERT - CLIP Minuteman Riot Officer"
- job_icon = "securityofficerOld"
+/datum/outfit/job/clip/minutemen/military_police
+ name = "ERT - C-MM Military Police"
+ id_assignment = "Military Police"
+ job_icon = "clip_cmm3"
+
+ ears = /obj/item/radio/headset/clip/alt
+ suit = /obj/item/clothing/suit/armor/vest/bulletproof
+ head = /obj/item/clothing/head/clip/slouch
+ glasses = /obj/item/clothing/glasses/sunglasses
+ belt = /obj/item/storage/belt/security/full
+ shoes = /obj/item/clothing/shoes/jackboots
+ gloves = /obj/item/clothing/gloves/color/white
+
+ l_pocket = /obj/item/flashlight/seclite
+ r_pocket = /obj/item/kitchen/knife/combat
+
+/datum/outfit/job/clip/minutemen/military_police/riot
+ name = "ERT - C-MM Military Police (Riot Control)"
suit = /obj/item/clothing/suit/armor/riot/clip
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ glasses = /obj/item/clothing/glasses/sunglasses/big
+ gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/helmet/riot/clip
l_hand = /obj/item/melee/baton/loaded
- back = /obj/item/shield/riot
- belt = /obj/item/gun/ballistic/automatic/smg/cm5/no_mag
- r_pocket = /obj/item/ammo_box/magazine/smgm9mm/rubber
- l_pocket = /obj/item/ammo_box/magazine/smgm9mm/rubber
+ belt = /obj/item/gun/ballistic/automatic/smg/cm5/rubber
+
+ r_pocket = /obj/item/ammo_box/magazine/cm5_9mm/rubber
+ l_pocket = /obj/item/reagent_containers/spray/pepper
backpack_contents = null
box = null
- backpack = null
- duffelbag = null
- courierbag = null
- satchel = null
+ backpack = /obj/item/shield/riot
+ duffelbag = /obj/item/shield/riot
+ courierbag = /obj/item/shield/riot
+ satchel = /obj/item/shield/riot
-/datum/outfit/job/clip/minutemen/grunt/dressed/riot/leader
- name = "ERT - CLIP Minutemen Riot Officer Sergeant"
- id_assignment = "Security Sergeant"
- job_icon = "lieutenant"
+/datum/outfit/job/clip/minutemen/military_police/leader
+ name = "ERT - C-MM Chief Military Police"
+ id_assignment = "Chief Military Police"
+ job_icon = "clip_cmm4"
+ head = /obj/item/clothing/head/clip/slouch/officer
+ uniform = /obj/item/clothing/under/clip/officer
ears = /obj/item/radio/headset/clip/alt/captain
- back = /obj/item/shield/riot/flash
+
+/datum/outfit/job/clip/minutemen/military_police/leader/riot
+ name = "ERT - C-MM Chief Military Police (Riot Control)"
+
+ suit = /obj/item/clothing/suit/armor/riot/clip
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ glasses = /obj/item/clothing/glasses/sunglasses/big
+ gloves = /obj/item/clothing/gloves/tackler/combat
+ head = /obj/item/clothing/head/helmet/riot/clip
+ suit_store = /obj/item/melee/baton/loaded
+ l_hand = /obj/item/megaphone/command
+ belt = /obj/item/gun/ballistic/automatic/smg/cm5/rubber
+
+ r_pocket = /obj/item/assembly/flash/handheld
+ l_pocket = /obj/item/ammo_box/magazine/cm5_9mm/rubber
+
+ backpack_contents = null
+ box = null
+
+ backpack = /obj/item/shield/riot/flash
+ duffelbag = /obj/item/shield/riot/flash
+ courierbag = /obj/item/shield/riot/flash
+ satchel = /obj/item/shield/riot/flash
/datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
name = "CLIP Minutemen - Minuteman (Spotter Hardsuit)"
diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
index a66ee78c7239..043bacea1d18 100644
--- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
+++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
@@ -1,464 +1,67 @@
-// this is where the base ERT outfit goes
-/datum/outfit/centcom/ert
- name = "ERT Common"
-
- mask = /obj/item/clothing/mask/gas/sechailer
- uniform = /obj/item/clothing/under/rank/centcom/official
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/combat
- ears = /obj/item/radio/headset/headset_cent/alt
-
-/datum/outfit/centcom/ert/post_equip(mob/living/carbon/human/human, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/id = human.wear_id
- if(id)
- id.registered_name = human.real_name
- id.update_label()
- ..()
-
-/datum/outfit/centcom/ert/commander
- name = "ERT Commander"
-
- id = /obj/item/card/id/ert
- suit = /obj/item/clothing/suit/space/hardsuit/ert
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- back = /obj/item/storage/backpack/ert
- belt = /obj/item/storage/belt/security/full
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1)
- l_pocket = /obj/item/kitchen/knife/switchblade
-
-/datum/outfit/centcom/ert/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/heads/captain
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/commander/alert
- name = "ERT Commander - High Alert"
-
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- glasses = /obj/item/clothing/glasses/thermal/eyepatch
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/pulse/pistol=1)
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
-
-/datum/outfit/centcom/ert/security
- name = "ERT Security"
-
- id = /obj/item/card/id/ert/security
- suit = /obj/item/clothing/suit/space/hardsuit/ert/sec
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- back = /obj/item/storage/backpack/ert/security
- belt = /obj/item/storage/belt/security/full
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/handcuffs=1,
- /obj/item/melee/baton/loaded=1)
-
-/datum/outfit/centcom/ert/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/security/alert
- name = "ERT Security - High Alert"
-
- suit_store = /obj/item/gun/energy/pulse/carbine
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/handcuffs=1,\
- /obj/item/melee/baton/loaded=1)
-
-/datum/outfit/centcom/ert/medic
- name = "ERT Medic"
-
- id = /obj/item/card/id/ert/medical
- suit = /obj/item/clothing/suit/space/hardsuit/ert/med
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/hud/health
- back = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical
- r_hand = /obj/item/storage/firstaid/regular
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/reagent_containers/hypospray/combat=1,\
- /obj/item/gun/medbeam=1)
-
-/datum/outfit/centcom/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
-
-/datum/outfit/centcom/ert/medic/alert
- name = "ERT Medic - High Alert"
-
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/pulse/pistol=1,\
- /obj/item/reagent_containers/hypospray/combat/nanites=1,\
- /obj/item/gun/medbeam=1)
-
-/datum/outfit/centcom/ert/engineer
- name = "ERT Engineer"
-
- id = /obj/item/card/id/ert/engineer
- suit = /obj/item/clothing/suit/space/hardsuit/ert/engi
- suit_store = /obj/item/gun/energy/e_gun/hades
- glasses = /obj/item/clothing/glasses/meson/engine
- back = /obj/item/storage/backpack/ert/engineer
- belt = /obj/item/storage/belt/utility/full
- l_pocket = /obj/item/rcd_ammo/large
- r_hand = /obj/item/storage/firstaid/regular
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/construction/rcd/loaded=1)
-
-
-/datum/outfit/centcom/ert/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
+/datum/outfit/job/nanotrasen/ert
+ name = "ERT - Vigilitas Security Officer"
+ jobtype = /datum/job/officer
+ job_icon = "securityofficer"
- if(visualsOnly)
- return
+ wallet = null
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/nanotrasen/security
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/nanotrasen/cap/security
+ suit = /obj/item/clothing/suit/armor/nanotrasen
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/commander
+ dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+ shoes = /obj/item/clothing/shoes/jackboots
-/datum/outfit/centcom/ert/engineer/alert
- name = "ERT Engineer - High Alert"
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+ box = /obj/item/storage/box/survival/security
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/gun/energy/pulse/pistol=1,\
- /obj/item/construction/rcd/combat=1)
+ backpack_contents = list(/obj/item/ammo_box/magazine/co9mm = 3)
-// official
+ implants = list(/obj/item/implant/weapons_auth)
-/datum/outfit/centcom/centcom_official
- name = "CentCom Official"
+/datum/outfit/job/nanotrasen/ert/inspector
+ name = "ERT - Nanotrasen CentCom Inspector"
uniform = /obj/item/clothing/under/rank/centcom/official
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/sunglasses
- belt = /obj/item/gun/energy/e_gun
- l_pocket = /obj/item/pen
- back = /obj/item/storage/backpack/satchel
- r_pocket = /obj/item/pda/heads
- l_hand = /obj/item/clipboard
+ belt = /obj/item/clipboard
id = /obj/item/card/id/centcom
- backpack_contents = list(/obj/item/stamp/centcom=1)
-/datum/outfit/centcom/centcom_official/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/pda/heads/pda = H.r_store
- pda.owner = H.real_name
- pda.ownjob = "CentCom Official"
- pda.update_label()
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_centcom_access("CentCom Official")
- W.access += ACCESS_WEAPONS
- W.assignment = "CentCom Official"
- W.registered_name = H.real_name
- W.update_label()
- ..()
-
-/datum/outfit/centcom/ert/janitor
- name = "ERT Janitor"
-
- id = /obj/item/card/id/ert/janitor
- suit = /obj/item/clothing/suit/space/hardsuit/ert/jani
- glasses = /obj/item/clothing/glasses/night
- back = /obj/item/storage/backpack/ert/janitor
- belt = /obj/item/storage/belt/janitor/full
- r_pocket = /obj/item/grenade/chem_grenade/cleaner
- l_pocket = /obj/item/grenade/chem_grenade/cleaner
- l_hand = /obj/item/storage/bag/trash/bluespace
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/lights/mixed=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/mop/advanced=1,\
- /obj/item/reagent_containers/glass/bucket=1,\
- /obj/item/grenade/clusterbuster/cleaner=1)
-
-/datum/outfit/centcom/ert/janitor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/R = H.ears
- R.keyslot = new /obj/item/encryptionkey/headset_com
- R.recalculateChannels()
+ l_pocket = /obj/item/pen
+ r_pocket = /obj/item/pda/heads
-/datum/outfit/centcom/ert/janitor/heavy
- name = "ERT Janitor - Heavy Duty"
+ backpack_contents = list(/obj/item/stamp/centcom, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- r_hand = /obj/item/reagent_containers/spray/chemsprayer/janitor
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/storage/box/lights/mixed=1,\
- /obj/item/melee/baton/loaded=1,\
- /obj/item/grenade/clusterbuster/cleaner=3)
+// /datum/outfit/job/nanotrasen/ert/emergency
+// name = "ERT - Vigilitas Emergency Response Officer"
-/datum/outfit/centcom/centcom_intern
- name = "CentCom Intern"
+/datum/outfit/job/nanotrasen/ert/leader
+ name = "ERT - Vigilitas Security Corporal"
+ jobtype = /datum/job/hos
+ job_icon = "lieutenant"
- uniform = /obj/item/clothing/under/rank/centcom/intern
- shoes = /obj/item/clothing/shoes/sneakers/black
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/nanotrasen/security
gloves = /obj/item/clothing/gloves/color/black
- ears = /obj/item/radio/headset/headset_cent
- glasses = /obj/item/clothing/glasses/sunglasses
- belt = /obj/item/melee/classic_baton
- r_hand = /obj/item/gun/ballistic/rifle/illestren
- back = /obj/item/storage/backpack/satchel
- l_pocket = /obj/item/ammo_box/magazine/illestren_a850r
- r_pocket = /obj/item/ammo_box/magazine/illestren_a850r
- id = /obj/item/card/id/centcom
- backpack_contents = list(/obj/item/storage/box/survival = 1)
-/datum/outfit/centcom/centcom_intern/unarmed
- name = "CentCom Intern (Unarmed)"
- belt = null
- l_hand = null
- l_pocket = null
- r_pocket = null
-
-/datum/outfit/centcom/centcom_intern/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_centcom_access(name)
- W.access += ACCESS_WEAPONS
- W.assignment = name
- W.registered_name = H.real_name
- W.update_label()
-
-/datum/outfit/centcom/centcom_intern/leader
- name = "CentCom Head Intern"
- belt = /obj/item/melee/baton/loaded
- suit = /obj/item/clothing/suit/armor/vest
- suit_store = /obj/item/gun/ballistic/rifle/illestren
- r_hand = /obj/item/megaphone
- head = /obj/item/clothing/head/intern
-
-/datum/outfit/centcom/centcom_intern/leader/unarmed // i'll be nice and let the leader keep their baton and vest
- name = "CentCom Head Intern (Unarmed)"
- suit_store = null
- l_pocket = null
- r_pocket = null
-
-// Marine
-
-/datum/outfit/centcom/ert/marine
- name = "Marine Commander"
-
- id = /obj/item/card/id/ert
- suit = /obj/item/clothing/suit/armor/vest/marine
- back = /obj/item/storage/backpack/ert
- backpack_contents = list(
- /obj/item/storage/box/survival/engineer = 1,
- /obj/item/gun_voucher/nanotrasen = 1
-)
- belt = /obj/item/storage/belt/military/assault
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
- l_pocket = /obj/item/kitchen/knife/combat
- r_pocket = /obj/item/tank/internals/emergency_oxygen/double
- uniform = /obj/item/clothing/under/rank/security/officer/military
- accessory = /obj/item/clothing/accessory/holster/marine
- mask = /obj/item/clothing/mask/gas/sechailer
- head = /obj/item/clothing/head/helmet/marine
-
-/datum/outfit/centcom/ert/marine/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/heads/captain
- headset.recalculateChannels()
-
-/datum/outfit/centcom/ert/marine/security
- name = "Marine Heavy"
-
- id = /obj/item/card/id/ert/security
- suit = /obj/item/clothing/suit/armor/vest/marine/heavy
- back = /obj/item/storage/backpack/ert/security
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- head = /obj/item/clothing/head/helmet/marine/security
-
-/datum/outfit/centcom/ert/marine/security/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/headset_com
- headset.recalculateChannels()
-
-/datum/outfit/centcom/ert/marine/medic
- name = "Marine Medic"
-
- id = /obj/item/card/id/ert/medical
- suit = /obj/item/clothing/suit/armor/vest/marine
- accessory = /obj/item/clothing/accessory/holster/marine
- back = /obj/item/storage/backpack/ert/medical
- l_pocket = /obj/item/healthanalyzer
- head = /obj/item/clothing/head/helmet/marine/medic
- backpack_contents = list(
- /obj/item/storage/box/survival/engineer = 1,
- /obj/item/gun_voucher/nanotrasen = 1,
- /obj/item/reagent_containers/hypospray/combat = 1,
- /obj/item/storage/firstaid/regular = 1,
- /obj/item/storage/firstaid/advanced = 1
-)
- belt = /obj/item/storage/belt/medical/paramedic
- glasses = /obj/item/clothing/glasses/hud/health/sunglasses
-
-/datum/outfit/centcom/ert/marine/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/headset_com
- headset.recalculateChannels()
-
-/datum/outfit/centcom/ert/marine/engineer
- name = "Marine Engineer"
-
- id = /obj/item/card/id/ert/engineer
- suit = /obj/item/clothing/suit/armor/vest/marine/medium
- head = /obj/item/clothing/head/helmet/marine/engineer
- back = /obj/item/storage/backpack/ert/engineer
- backpack_contents = list(
- /obj/item/storage/box/survival/engineer = 1,
- /obj/item/gun_voucher/nanotrasen = 1,
- /obj/item/rcd_ammo/large = 2,
- )
- r_hand = /obj/item/deployable_turret_folded
- uniform = /obj/item/clothing/under/rank/security/officer/military/eng
- belt = /obj/item/storage/belt/utility/full/ert
- glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
-
-/datum/outfit/centcom/ert/marine/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
-
- if(visualsOnly)
- return
-
- var/obj/item/radio/headset = H.ears
- headset.keyslot = new /obj/item/encryptionkey/headset_com
- headset.recalculateChannels()
-
-// Loss Prevention
-/datum/outfit/job/nanotrasen/security/ert/lp
- name = "ERT - Loss Prevention Security Specialist"
- jobtype = /datum/job/officer
- job_icon = "securityresponseofficer"
-
- head = null
- implants = list(/obj/item/implant/mindshield)
- ears = /obj/item/radio/headset/nanotrasen/alt
- id = /obj/item/card/id/lpsec
- suit_store = /obj/item/gun/energy/laser/scatter/shotty
- belt = /obj/item/storage/belt/security/full
- glasses = /obj/item/clothing/glasses/sunglasses
- gloves = /obj/item/clothing/gloves/tackler/combat
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/sec
- uniform = /obj/item/clothing/under/rank/security/head_of_security/nt/lp
- shoes = /obj/item/clothing/shoes/jackboots
- back = /obj/item/storage/backpack/ert/security
-
- box = /obj/item/storage/box/survival/security
+ head = /obj/item/clothing/head/nanotrasen/beret/security
+ suit = /obj/item/clothing/suit/armor/nanotrasen/slim
l_pocket = /obj/item/restraints/handcuffs
- r_pocket = /obj/item/kitchen/knife/combat
-
- backpack_contents = list(/obj/item/radio=1, /obj/item/stock_parts/cell/gun/upgraded=2, /obj/item/screwdriver=1)
+ r_pocket = /obj/item/assembly/flash/handheld
+ backpack_contents = null
+// /datum/outfit/job/nanotrasen/ert/leader/emergency
+// name = "ERT - Vigilitas Emergency Response Lieutenant"
-/datum/outfit/job/nanotrasen/security/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
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/med
- id = /obj/item/card/id/lpmed
- gloves = /obj/item/clothing/gloves/color/latex/nitrile
- back = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical/surgery
-
- box = /obj/item/storage/box/survival/medical
- l_pocket = /obj/item/healthanalyzer
- r_pocket = /obj/item/reagent_containers/hypospray/medipen/atropine
-
- backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/radio=1)
-
-
-/datum/outfit/job/nanotrasen/security/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
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp/engi
- id = /obj/item/card/id/lpengie
- belt = /obj/item/storage/belt/utility/full
- gloves = /obj/item/clothing/gloves/color/yellow
- glasses = /obj/item/clothing/glasses/welding
- back = /obj/item/storage/backpack/ert/engineer
-
- box = /obj/item/storage/box/survival/engineer
- l_pocket = /obj/item/extinguisher/mini
- r_pocket = /obj/item/wrench/combat
-
- backpack_contents = list(/obj/item/stack/sheet/metal/fifty=1, /obj/item/stack/sheet/glass/fifty=1, /obj/item/radio=1)
-
-/datum/outfit/job/nanotrasen/security/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
- id = /obj/item/card/id/lplieu
- belt = /obj/item/storage/belt/military/army
- gloves = /obj/item/clothing/gloves/color/black
- uniform = /obj/item/clothing/under/rank/security/warden/lp
- suit = /obj/item/clothing/suit/space/hardsuit/ert/lp
- shoes = /obj/item/clothing/shoes/combat
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- back = /obj/item/storage/backpack/ert
+// /datum/outfit/job/nanotrasen/ert/emergency/medic
+// name = "ERT - Vigilitas Emergency Response Medic"
- l_pocket = /obj/item/megaphone/command
- r_pocket = /obj/item/binoculars
+// /datum/outfit/job/nanotrasen/ert/emergency/engineer
+// name = "ERT - Vigilitas Emergency Response Engineer"
diff --git a/code/modules/clothing/outfits/ert/roumain_ert.dm b/code/modules/clothing/outfits/ert/roumain_ert.dm
new file mode 100644
index 000000000000..21966642377f
--- /dev/null
+++ b/code/modules/clothing/outfits/ert/roumain_ert.dm
@@ -0,0 +1,131 @@
+/datum/outfit/job/roumain/ert
+ name = "ERT - Saint-Roumain Hunter" // flaming arrow and shadow
+ id_assignment = "Hunter"
+ jobtype = /datum/job/officer
+ job_icon = "hsrm_hunter"
+
+ wallet = null
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/armor/roumain
+ head = /obj/item/clothing/head/cowboy/sec/roumain
+ belt = /obj/item/gun/ballistic/revolver/shadow
+ suit_store = /obj/item/gun/ballistic/shotgun/flamingarrow/factory
+
+ l_pocket = /obj/item/ammo_box/c38_box
+ r_pocket = /obj/item/flashlight/lantern
+
+ duffelbag = /obj/item/storage/backpack/satchel/leather
+ courierbag = /obj/item/storage/backpack/satchel/leather
+ backpack = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ box = null
+
+ backpack_contents = list(/obj/item/ammo_box/a44roum_speedloader = 3)
+
+/datum/outfit/job/roumain/ert/firestorm
+ name = "ERT - Saint-Roumain Hunter (Firestorm)" // firestorm and shadow
+
+ belt = /obj/item/gun/ballistic/revolver/shadow
+ suit_store = /obj/item/gun/ballistic/automatic/smg/firestorm/pan
+
+ l_pocket = /obj/item/ammo_box/a44roum
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/pan = 3, /obj/item/ammo_box/a44roum_speedloader = 3)
+
+/datum/outfit/job/roumain/ert/vickland
+ name = "ERT - Saint-Roumain Hunter (Vickland)" // vickland and candor
+
+ belt = /obj/item/gun/ballistic/automatic/pistol/candor/factory
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/vickland
+
+ l_pocket = /obj/item/ammo_box/a308
+
+ backpack_contents = list(/obj/item/ammo_box/vickland_a308 = 6, /obj/item/ammo_box/magazine/m45 = 3)
+
+/datum/outfit/job/roumain/ert/scout
+ name = "ERT - Saint-Roumain Hunter (Scout)" // scout and detective special
+
+ belt = /obj/item/gun/ballistic/revolver/detective
+ suit_store = /obj/item/gun/ballistic/rifle/scout
+
+ backpack_contents = list(/obj/item/ammo_box/a300 = 5)
+
+/datum/outfit/job/roumain/ert/medic
+ name = "ERT - Saint-Roumain Hunter Doctor"
+ id_assignment = "Hunter Doctor"
+ job_icon = "srm_doctor"
+ jobtype = /datum/job/doctor
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/toggle/labcoat/roumain_med
+ head = /obj/item/clothing/head/cowboy/sec/roumain/med
+ mask = /obj/item/clothing/mask/gas/plaguedoctor
+ gloves = null
+
+/datum/outfit/job/roumain/ert/engineer
+ name = "ERT - Saint-Roumain Machinist"
+ id_assignment = "Machinist"
+ job_icon = "srm_machinist"
+ jobtype = /datum/job/engineer
+
+ uniform = /obj/item/clothing/under/suit/roumain
+ alt_uniform = null
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ belt = /obj/item/storage/belt/utility/full/engi
+ suit = /obj/item/clothing/suit/hazardvest/roumain
+ head = /obj/item/clothing/head/cowboy/sec/roumain/machinist
+ glasses = /obj/item/clothing/glasses/welding
+ accessory = /obj/item/clothing/accessory/waistcoat/roumain
+ gloves = /obj/item/clothing/gloves/color/yellow
+
+
+/datum/outfit/job/roumain/ert/leader
+ name = "ERT - Saint-Roumain Hunter Montagne" // flaming bolt and montagne
+ id_assignment = "Hunter Montagne"
+ job_icon = "srm_montagne"
+ jobtype = /datum/job/captain
+
+ ears = /obj/item/radio/headset/headset_com/alt
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/cowboy
+ suit = /obj/item/clothing/suit/armor/roumain/montagne
+ suit_store = /obj/item/gun/ballistic/shotgun/flamingarrow/bolt
+ belt = /obj/item/gun/ballistic/revolver/montagne
+ head = /obj/item/clothing/head/cowboy/sec/roumain/montagne
+ id = /obj/item/card/id/gold
+
+ duffelbag = /obj/item/storage/backpack/cultpack
+ courierbag = /obj/item/storage/backpack/cultpack
+ backpack = /obj/item/storage/backpack/cultpack
+ satchel = /obj/item/storage/backpack/cultpack
+
+/datum/outfit/job/roumain/ert/leader/twobore
+ name = "ERT - Saint-Roumain Hunter Montagne (Huntsman)" // huntsman (twobore) and montagne
+
+ suit_store = /obj/item/gun/ballistic/shotgun/doublebarrel/twobore
+
+ l_pocket = /obj/item/ammo_box/a44roum
+
+ backpack_contents = list(/obj/item/ammo_casing/shotgun/buckshot/twobore = 8)
+
+/datum/outfit/job/roumain/ert/leader/colligne
+ name = "ERT - Saint-Roumain Hunter Colligne" // double barrel and ashhand
+ id_assignment = "Hunter Colligne"
+ job_icon = "srm_colligne"
+ jobtype = /datum/job/head_of_personnel
+
+ ears = /obj/item/radio/headset/headset_com
+ uniform = /obj/item/clothing/under/suit/roumain
+ shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/armor/roumain/colligne
+ suit_store = /obj/item/gun/ballistic/shotgun/doublebarrel/roumain
+ head = /obj/item/clothing/head/cowboy/sec/roumain/colligne
+ belt = /obj/item/gun/ballistic/revolver/ashhand
+ id = /obj/item/card/id/silver
+
+ l_pocket = /obj/item/ammo_box/a4570
+
+ backpack_contents = list(/obj/item/ammo_box/a12g)
diff --git a/code/modules/clothing/outfits/ert/solgov_ert.dm b/code/modules/clothing/outfits/ert/solgov_ert.dm
index d6830b751498..5fbc808397b1 100644
--- a/code/modules/clothing/outfits/ert/solgov_ert.dm
+++ b/code/modules/clothing/outfits/ert/solgov_ert.dm
@@ -4,6 +4,8 @@
jobtype = /datum/job/officer
job_icon = "sonnensoldner"
+ wallet = null
+
id = /obj/item/card/id/solgov
uniform = /obj/item/clothing/under/solgov
suit = /obj/item/clothing/suit/armor/vest/solgov
@@ -11,20 +13,20 @@
ears = /obj/item/radio/headset/solgov/alt
gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/solgov/sonnensoldner
- shoes = /obj/item/clothing/shoes/workboots
- back = /obj/item/storage/backpack
+ shoes = /obj/item/clothing/shoes/combat
box = /obj/item/storage/box/survival
l_hand = /obj/item/energyhalberd
/datum/outfit/job/solgov/ert/inspector
- name = "ERT - Inspector (SolGov)"
+ name = "ERT - SolGov Inspector"
id_assignment = "Inspector"
jobtype = /datum/job/head_of_personnel
job_icon = "solgovrepresentative"
uniform = /obj/item/clothing/under/solgov/formal
+ neck = /obj/item/clothing/neck/cloak/solgov
belt = /obj/item/clipboard
ears = /obj/item/radio/headset/solgov/captain
back = /obj/item/storage/backpack/satchel/leather
@@ -35,7 +37,9 @@
suit_store = null
mask = null
glasses = null
-
l_hand = null
- backpack_contents = list(/obj/item/stamp/solgov=1)
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/folder/solgov, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
diff --git a/code/modules/clothing/outfits/ert/syndicate_ert.dm b/code/modules/clothing/outfits/ert/syndicate_ert.dm
index f2dadc4e0d95..197d5066ec17 100644
--- a/code/modules/clothing/outfits/ert/syndicate_ert.dm
+++ b/code/modules/clothing/outfits/ert/syndicate_ert.dm
@@ -1,114 +1,186 @@
+// unaligned. they're basically stand-ins
+
/datum/outfit/job/syndicate/ert
name = "ERT - Syndicate Basic"
jobtype = /datum/job/officer
job_icon = "securityofficer"
+ wallet = null
+
+ uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/vest/syndie
- suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/assault/hydra
shoes = /obj/item/clothing/shoes/combat
- ears = /obj/item/radio/headset/syndicate/alt
+ ears = /obj/item/radio/headset/headset_sec/alt
gloves = /obj/item/clothing/gloves/color/black
id = /obj/item/card/id/syndicate_command/crew_id
mask = /obj/item/clothing/mask/gas/sechailer/balaclava
- head = /obj/item/clothing/head/helmet/operator
- back = /obj/item/storage/backpack/security
- belt = /obj/item/storage/belt/military/c20r
+ head = /obj/item/clothing/head/helmet/syndie
+ belt = /obj/item/storage/belt/military/hydra
+ glasses = /obj/item/clothing/glasses/hud/security
r_pocket = /obj/item/kitchen/knife/combat
l_pocket = /obj/item/grenade/frag
implants = list(/obj/item/implant/weapons_auth)
- backpack_contents = list(/obj/item/radio=1)
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/ringneck=1, /obj/item/ammo_box/magazine/m10mm_ringneck=2)
/datum/outfit/job/syndicate/ert/leader
name = "ERT - Syndicate Basic Leader"
job_icon = "lieutenant"
head = /obj/item/clothing/head/HoS/beret/syndicate
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ ears = /obj/item/radio/headset/syndicate/alt/leader
+
+// inspector
+
+/datum/outfit/job/syndicate/ert/inspector
+ name = "ERT - ACLF Inspector"
+ id_assignment = "Inspector"
+ jobtype = /datum/job/head_of_personnel
+ job_icon = "syndicate"
+
+ uniform = /obj/item/clothing/under/syndicate
+ head = /obj/item/clothing/head/HoS/beret/syndicate
+ mask = null
+ belt = /obj/item/clipboard
+ back = /obj/item/storage/backpack/satchel/leather
ears = /obj/item/radio/headset/syndicate/captain
+ shoes = /obj/item/clothing/shoes/laceup
+ gloves = /obj/item/clothing/gloves/color/white
+ suit = /obj/item/clothing/suit/armor/hos
+ suit_store = null
- backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/ringneck=1, /obj/item/ammo_box/magazine/m10mm_ringneck=2, /obj/item/radio=1)
+ backpack = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/satchel/sec
+ satchel = /obj/item/storage/backpack/satchel/sec
+ courierbag = /obj/item/storage/backpack/satchel/sec
-// gorlex loyalist/2nd battlegroup
+ l_pocket = /obj/item/pen/fourcolor
+ r_pocket = /obj/item/taperecorder
-/datum/outfit/job/syndicate/ert/gorlex
- name = "ERT - New Gorlex Republic Trooper"
+ backpack_contents = list(/obj/item/stamp/syndicate, /obj/item/paper_bin, /obj/item/folder/syndicate, /obj/item/tape)
- head = /obj/item/clothing/head/helmet/swat
- uniform = /obj/item/clothing/under/syndicate/combat
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- belt = /obj/item/storage/belt/military/assault/m90
- back = /obj/item/storage/backpack/security
- suit_store = /obj/item/gun/ballistic/automatic/assault/hydra
+// new gorlex republic
+
+/datum/outfit/job/syndicate/ert/ngr
+ name = "ERT - New Gorlex Republic Serviceman"
+ id_assignment = "Serviceman"
+
+ head = /obj/item/clothing/head/helmet/ngr
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava/ngr
+ ears = /obj/item/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/syndicate/ngr
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/ngr
+ suit = /obj/item/clothing/suit/armor/ngr
+ belt = /obj/item/storage/belt/security/webbing/ngr/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+
+/datum/outfit/job/syndicate/ert/ngr/grenadier
+ name = "ERT - New Gorlex Republic Grenadier"
-/datum/outfit/job/syndicate/ert/gorlex/pointman
- name = "ERT - New Gorlex Republic Pointman"
+ belt = /obj/item/storage/belt/security/webbing/ngr/hydra_grenadier
+ suit_store = /obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl
- suit_store = /obj/item/gun/ballistic/shotgun/automatic/bulldog
- belt = /obj/item/storage/belt/security/webbing/bulldog
+ backpack_contents = list(/obj/item/grenade/c4 = 3)
-/datum/outfit/job/syndicate/ert/gorlex/medic
- name = "ERT - New Gorlex Republic Medic"
+/datum/outfit/job/syndicate/ert/ngr/medic
+ name = "ERT - New Gorlex Republic Field Medic"
jobtype = /datum/job/paramedic
job_icon = "paramedic"
+ id_assignment = "Field Medic"
- head = /obj/item/clothing/head/soft/black
- mask = null
- suit = /obj/item/clothing/suit/armor/vest/alt
+ head = /obj/item/clothing/head/ngr/surgical
+ mask = /obj/item/clothing/mask/gas/syndicate/ngr
belt = /obj/item/storage/belt/medical/webbing/paramedic
- glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+ glasses = /obj/item/clothing/glasses/hud/health
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
- suit_store = /obj/item/gun/ballistic/automatic/pistol/ringneck
+ suit_store = /obj/item/gun/ballistic/automatic/pistol/asp
l_pocket = /obj/item/radio
- backpack_contents = list(/obj/item/ammo_box/magazine/m10mm_ringneck=2, /obj/item/storage/firstaid/medical=1, /obj/item/defibrillator/compact/combat/loaded=1)
+ backpack_contents = list(/obj/item/ammo_box/magazine/m57_39_asp = 2, /obj/item/storage/firstaid/medical=1, /obj/item/defibrillator/compact/combat/loaded=1)
-/datum/outfit/job/syndicate/ert/gorlex/sniper
- name = "ERT - New Gorlex Republic Sniper"
+/datum/outfit/job/syndicate/ert/ngr/sniper
+ name = "ERT - New Gorlex Republic Marksman"
head = /obj/item/clothing/head/beret/black
- back = /obj/item/storage/backpack/messenger/sec
- glasses = /obj/item/clothing/glasses/night
+ neck = /obj/item/clothing/neck/shemagh/ngr
gloves = /obj/item/clothing/gloves/fingerless
- suit = /obj/item/clothing/suit/armor/vest
- belt = /obj/item/storage/belt/security
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ belt = /obj/item/storage/belt/military/assault/sniper
suit_store = /obj/item/gun/ballistic/automatic/marksman/taipan
r_pocket = /obj/item/kitchen/knife/combat/survival
l_pocket = /obj/item/binoculars
- backpack_contents = list(/obj/item/ammo_box/magazine/sniper_rounds=2, /obj/item/radio=1)
+ backpack = /obj/item/storage/backpack/messenger/sec
+ duffelbag = /obj/item/storage/backpack/messenger/sec
+ satchel = /obj/item/storage/backpack/messenger/sec
+ courierbag = /obj/item/storage/backpack/messenger/sec
+
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/asp, /obj/item/ammo_box/magazine/m57_39_asp = 2)
-/datum/outfit/job/syndicate/ert/gorlex/leader
+/datum/outfit/job/syndicate/ert/ngr/leader
name = "ERT - New Gorlex Republic Sergeant"
job_icon = "lieutenant"
- uniform = /obj/item/clothing/under/syndicate/gorlex
- head = /obj/item/clothing/head/HoS/beret/syndicate
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ neck = /obj/item/clothing/mask/whistle/trench // funny
+ head = /obj/item/clothing/head/ngr/peaked
back = /obj/item/storage/backpack/satchel/sec
- mask = /obj/item/clothing/mask/gas/sechailer
- glasses = /obj/item/clothing/glasses/hud/security/night
gloves = /obj/item/clothing/gloves/tackler/combat
+ belt = /obj/item/storage/belt/security/webbing/ngr/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
l_pocket = /obj/item/megaphone/sec
-// commandos
+ backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/asp, /obj/item/ammo_box/magazine/m57_39_asp = 2, /obj/item/grenade/smokebomb)
+
+/datum/outfit/job/syndicate/ert/ngr/inspector
+ name = "ERT - New Gorlex Republic Official"
+ id_assignment = "Official"
+ job_icon = "syndicate"
+
+ head = /obj/item/clothing/head/ngr
+ ears = /obj/item/radio/headset/syndicate/captain
+ gloves = /obj/item/clothing/gloves/color/white
+ mask = null
+ uniform = /obj/item/clothing/under/syndicate/ngr/officer
+ glasses = null
+ suit = /obj/item/clothing/suit/armor/ngr/lieutenant
+ belt = /obj/item/clipboard
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit_store = null
+
+ backpack = /obj/item/storage/backpack/satchel/leather
+ duffelbag = /obj/item/storage/backpack/satchel/leather
+ satchel = /obj/item/storage/backpack/satchel/leather
+ courierbag = /obj/item/storage/backpack/satchel/leather
+
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
+
+ backpack_contents = list(/obj/item/folder/red, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
+
+// cybersun
/datum/outfit/job/syndicate/ert/cybersun
name = "ERT - Syndicate Cybersun Commando"
job_icon = "syndicate"
head = null
- uniform = /obj/item/clothing/under/syndicate/combat
- belt = /obj/item/storage/belt/military/c20r
+ mask = /obj/item/clothing/mask/breath
+ uniform = /obj/item/clothing/under/syndicate/cybersun
+ belt = /obj/item/storage/belt/military/boomslang
suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun
- suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+ suit_store = /obj/item/gun/ballistic/automatic/marksman/boomslang
ears = /obj/item/radio/headset/syndicate/alt
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/hardliners
implants = list(/obj/item/implant/adrenalin)
- backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm, /obj/item/radio=1)
+ backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm, /obj/item/grenade/smokebomb)
/datum/outfit/job/syndicate/ert/cybersun/leader
name = "ERT - Syndicate Cybersun Commando Leader"
@@ -116,15 +188,36 @@
ears = /obj/item/radio/headset/syndicate/alt/captain
glasses = /obj/item/clothing/glasses/hud/security/night
- backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1, /obj/item/radio=1)
+ backpack_contents = list(/obj/item/autosurgeon/syndicate/laser_arm=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1, /obj/item/grenade/smokebomb)
+
+/datum/outfit/job/syndicate/ert/cybersun/inspector
+ name = "ERT - Syndicate Cybersun Representative"
+
+ uniform = /obj/item/clothing/under/syndicate/cybersun/officer
+ head = /obj/item/clothing/head/HoS/cybersun
+ shoes = /obj/item/clothing/shoes/laceup
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ suit = null
+ suit_store = null
+ belt = /obj/item/clipboard
+ glasses = null
+ mask = null
+ ears = /obj/item/radio/headset/syndicate
+
+ r_pocket = /obj/item/pen/fourcolor
+ l_pocket = /obj/item/taperecorder
-// paramedics
+ backpack_contents = list(/obj/item/stamp/cybersun, /obj/item/folder/red, /obj/item/paper_bin/bundlenatural, /obj/item/hand_labeler)
+
+// cybersun paramedics
/datum/outfit/job/syndicate/ert/cybersun/medic
name = "ERT - Syndicate Cybersun Paramedic"
job_icon = "paramedic"
+ jobtype = /datum/job/paramedic
uniform = /obj/item/clothing/under/syndicate/medic
+ accessory = /obj/item/clothing/accessory/holster/marine
suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed
suit_store = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath/medical
@@ -133,15 +226,12 @@
head = /obj/item/clothing/head/soft/cybersun/medical
belt = /obj/item/storage/belt/medical/webbing/paramedic
back = /obj/item/storage/backpack/ert/medical
+
l_pocket = /obj/item/kitchen/knife/combat/survival
r_pocket = /obj/item/pinpointer/crew
- accessory = /obj/item/clothing/accessory/holster/marine
backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/radio=1)
- jobtype = /datum/job/paramedic
- job_icon = "paramedic"
-
/datum/outfit/job/syndicate/ert/cybersun/medic/leader
name = "ERT - Syndicate Cybersun Lead Paramedic"
id_assignment = "Lead Paramedic"
@@ -154,25 +244,89 @@
backpack_contents = list(/obj/item/storage/firstaid/tactical=1, /obj/item/holosign_creator/medical=1, /obj/item/autosurgeon/cmo=1, /obj/item/radio=1, /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked=1)
-// inspector
-/datum/outfit/job/syndicate/ert/inspector
- name = "ERT - Inspector (Syndicate)"
- id_assignment = "Inspector"
- jobtype = /datum/job/head_of_personnel
- job_icon = "syndicate"
+// hardliners
- uniform = /obj/item/clothing/under/syndicate/ngr/officer
- head = /obj/item/clothing/head/HoS/beret/syndicate
- mask = null
- belt = /obj/item/clipboard
- back = /obj/item/storage/backpack/satchel/leather
- ears = /obj/item/radio/headset/syndicate/captain
- 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
+/datum/outfit/job/syndicate/ert/hardliner
+ name = "ERT - Syndicate Hardliner Mercenary"
+
+ uniform = /obj/item/clothing/under/syndicate/hardliners
+ suit = /obj/item/clothing/suit/armor/hardliners
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses/hardliners
+ suit_store = /obj/item/gun/ballistic/automatic/smg/sidewinder
+ belt = /obj/item/storage/belt/security/webbing/hardliners/sidewinder
+ gloves = /obj/item/clothing/gloves/color/black
+ mask = /obj/item/clothing/mask/gas/sechailer/balaclava
+ head = /obj/item/clothing/head/helmet/hardliners
+
+/datum/outfit/job/syndicate/ert/hardliner/engineer
+ name = "ERT - Syndicate Hardliner Mechanic"
+
+ head = /obj/item/clothing/head/hardhat/hardliners
+ belt = /obj/item/storage/belt/utility/full
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m45_cobra = 2)
+
+/datum/outfit/job/syndicate/ert/hardliner/medic
+ name = "ERT - Syndicate Hardliner Medic"
+
+ head = /obj/item/clothing/head/hardliners
+ belt = /obj/item/storage/belt/medical/webbing/paramedic
+
+/datum/outfit/job/syndicate/ert/hardliner/leader
+ name = "ERT - Syndicate Hardliner Sergeant"
+
+ uniform = /obj/item/clothing/under/syndicate/hardliners/officer
+ suit = /obj/item/clothing/suit/armor/hardliners/sergeant
+ head = /obj/item/clothing/head/hardliners/peaked
+
+// ramzi clique
+
+/datum/outfit/job/syndicate/ert/ramzi
+ name = "ERT - Ramzi Clique Cell Rifleman"
+
+ head = null
+ mask = /obj/item/clothing/mask/gas/syndicate
+ uniform = /obj/item/clothing/under/syndicate
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
+ suit_store = /obj/item/gun/ballistic/automatic/smg/cobra
+ belt = /obj/item/storage/belt/military/cobra
+ glasses = /obj/item/clothing/glasses/thermal
+ gloves = /obj/item/clothing/gloves/combat
+ id = null // no identification for you
+
+ l_pocket = /obj/item/tank/internals/emergency_oxygen/double
+
+ implants = list(/obj/item/implant/explosive)
+ backpack_contents = list(/obj/item/grenade/frag = 3, /obj/item/grenade/smokebomb = 3)
+
+/datum/outfit/job/syndicate/ert/ramzi/demolitionist
+ name = "ERT - Ramzi Clique Cell Demolitionist"
+
+ belt = /obj/item/storage/belt/military/mako
+ suit_store = /obj/item/gun/ballistic/rocketlauncher/mako
+ glasses = /obj/item/clothing/glasses/meson/night
+
+ r_pocket = /obj/item/gun/ballistic/automatic/pistol/himehabu
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m22lr_himehabu = 2, /obj/item/grenade/c4/x4 = 3, /obj/item/grenade/syndieminibomb = 3, /obj/item/ammo_casing/caseless/rocket/a70mm = 4)
+
+/datum/outfit/job/syndicate/ert/ramzi/medic
+ name = "ERT - Ramzi Clique Cell Medic"
+
+ belt = /obj/item/storage/belt/medical/webbing/combat
+ glasses = /obj/item/clothing/glasses/hud/health/night
+
+ backpack_contents = list(/obj/item/ammo_box/magazine/m45_cobra = 3, /obj/item/defibrillator/compact/combat/loaded, /obj/item/reagent_containers/hypospray/combat)
+
+/datum/outfit/job/syndicate/ert/ramzi/leader
+ name = "ERT - Ramzi Clique Cell Leader"
+
+ uniform = /obj/item/clothing/under/syndicate/gorlex
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated // funny
+
+ belt = /obj/item/storage/belt/security/webbing/bulldog_mixed
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/bulldog/drum
- backpack_contents = list(/obj/item/stamp/syndicate)
+ backpack_contents = list(/obj/item/grenade/smokebomb = 4, /obj/item/grenade/stingbang = 2, /obj/item/grenade/empgrenade = 2)
diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm
index 2301855c6809..5acce1f37a3a 100644
--- a/code/modules/clothing/outfits/factions/minutemen.dm
+++ b/code/modules/clothing/outfits/factions/minutemen.dm
@@ -3,7 +3,6 @@
/datum/outfit/job/clip
name = "CLIP - Base Outfit"
- jobtype = /datum/job/assistant
uniform = /obj/item/clothing/under/clip
alt_uniform = null
@@ -223,6 +222,8 @@
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/color/black
+ l_hand = /obj/item/storage/briefcase
+
backpack = /obj/item/storage/backpack/satchel/leather
satchel = /obj/item/storage/backpack/satchel/leather
@@ -233,6 +234,16 @@
/obj/item/detective_scanner=1,\
/obj/item/melee/classic_baton=1)
+/datum/outfit/job/clip/investigator/cm5
+ name = "CLIP GOLD - Investigator (CM-5c)"
+
+ backpack_contents = list(/obj/item/storage/box/evidence=1,\
+ /obj/item/detective_scanner=1,\
+ /obj/item/melee/classic_baton=1,\
+ /obj/item/ammo_box/magazine/cm5_9mm = 2, \
+ /obj/item/gun/ballistic/automatic/smg/cm5/compact
+ )
+
/datum/outfit/job/clip/bureaucrat
name = "CLIP GOLD - Bureaucrat"
job_icon = "scribe"
@@ -552,6 +563,11 @@
backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/storage/ration/chicken_wings_hot_sauce=1)
+/datum/outfit/job/clip/minutemen/grunt/dressed/hardsuit
+ name = "CLIP Minutemen - Minuteman (Spotter Hardsuit)"
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/clip_spotter
+
/datum/outfit/job/clip/minutemen/grunt/dressed/armed
name = "CLIP Minutemen - Minuteman (Armed - CM-82)"
@@ -647,8 +663,12 @@
suit_store = /obj/item/gun/ballistic/automatic/assault/cm82
belt = /obj/item/storage/belt/military/clip/cm82
- //replace commander with the cm23 when its impemented, see the cm-f4 above
- backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1, /obj/item/gun/ballistic/automatic/pistol/commander=1)
+ backpack_contents = list(/obj/item/clothing/mask/gas/clip=1, /obj/item/reagent_containers/food/snacks/rationpack=1, /obj/item/gun/ballistic/automatic/pistol/cm23=1)
+
+/datum/outfit/job/clip/minutemen/grunt/lead/armed/hardsuit
+ name = "CLIP Minutemen - Field Sergeant (Spotter Hardsuit)"
+ head = null
+ suit = /obj/item/clothing/suit/space/hardsuit/clip_spotter
/datum/outfit/job/clip/minutemen/grunt/commander
name = "CLIP Minutemen - Field Commander"
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 100cc7ff0f52..cba615e1d20a 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -1,13 +1,3 @@
-/datum/outfit/centcom
- name = "CentCom Base"
-
-/datum/outfit/centcom/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)//hmm lets have centcom officials become revs
- L.implant(H, null, 1)
-
/datum/outfit/laser_tag
name = "Laser Tag Red"
@@ -67,35 +57,6 @@
W.registered_name = H.real_name
W.update_label()
-/datum/outfit/centcom/commander
- name = "CentCom Commander"
-
- uniform = /obj/item/clothing/under/rank/centcom/commander
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- ears = /obj/item/radio/headset/headset_cent/commander
- glasses = /obj/item/clothing/glasses/eyepatch
- mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
- head = /obj/item/clothing/head/centcom_cap
- belt = /obj/item/gun/ballistic/revolver/mateba
- r_pocket = /obj/item/lighter
- l_pocket = /obj/item/ammo_box/a357
- back = /obj/item/storage/backpack/satchel/leather
- id = /obj/item/card/id/centcom
-
-/datum/outfit/centcom/commander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- if(visualsOnly)
- return
-
- var/obj/item/card/id/W = H.wear_id
- W.access = get_all_accesses()
- W.access += get_centcom_access("CentCom Commander")
- W.assignment = "CentCom Commander"
- W.registered_name = H.real_name
- W.update_label()
- ..()
-
/datum/outfit/ghost_cultist
name = "Cultist Ghost"
@@ -154,51 +115,6 @@
mask = /obj/item/clothing/mask/breath
gloves = /obj/item/clothing/gloves/color/plasmaman
-
-/datum/outfit/centcom/death_commando
- name = "Death Commando"
-
- uniform = /obj/item/clothing/under/rank/centcom/commander
- suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
- shoes = /obj/item/clothing/shoes/combat/swat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
- mask = /obj/item/clothing/mask/gas/sechailer/swat
- glasses = /obj/item/clothing/glasses/hud/toggle/thermal
- back = /obj/item/storage/backpack/security
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
- r_pocket = /obj/item/shield/energy
- suit_store = /obj/item/tank/internals/emergency_oxygen/double
- belt = /obj/item/gun/ballistic/revolver/mateba
- r_hand = /obj/item/gun/energy/pulse
- id = /obj/item/card/id/ert/deathsquad
- ears = /obj/item/radio/headset/headset_cent/alt
-
- backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\
- /obj/item/ammo_box/a357=1,\
- /obj/item/storage/firstaid/regular=1,\
- /obj/item/storage/box/flashbangs=1,\
- /obj/item/flashlight=1,\
- /obj/item/grenade/c4/x4=1)
-
-/datum/outfit/centcom/death_commando/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- 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
- W.access = get_all_accesses()//They get full station access.
- W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access.
- W.assignment = "Death Commando"
- W.registered_name = H.real_name
- W.update_label()
- ..()
-
-/datum/outfit/centcom/death_commando/officer
- name = "Death Commando Officer"
- head = /obj/item/clothing/head/helmet/space/beret
-
/datum/outfit/chrono_agent
name = "Timeline Eradication Agent"
uniform = /obj/item/clothing/under/color/white
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 1b8004cbd5b5..ff15a0e635d5 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -55,15 +55,15 @@
/datum/outfit/syndicateramzicorpse
name = "Ramzi Clique Commando Corpse"
- uniform = /obj/item/clothing/under/syndicate/gorlex
+ uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+ gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/tank/jetpack/oxygen
r_pocket = /obj/item/tank/internals/emergency_oxygen
- id = /obj/item/card/id/syndicate
+ id = /obj/item/card/id/syndicate_command/crew_id
/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper
diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
index 9803b0feb084..c5c0fd9b7c1f 100644
--- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
@@ -7,3 +7,9 @@
caliber = "12ga"
max_ammo = 8
multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/cm15_12g/incendiary
+ name = "CM-15 magazine (12g incendiary)"
+ desc = "An almost straight, 8-round magazine designed for the CM-15 shotgun. This one was loaded with incendiary slugs. Be careful!"
+ ammo_type = /obj/item/ammo_casing/shotgun/incendiary
+ caliber = "12ga incendiary"
diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
index f32a2f11a508..80d1bc39bde7 100644
--- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -121,9 +121,17 @@
EMPTY_GUN_HELPER(automatic/smg/cm5)
+/obj/item/gun/ballistic/automatic/smg/cm5/rubber
+ spawnwithmagazine = FALSE
+
+/obj/item/gun/ballistic/automatic/smg/cm5/rubber/Initialize()
+ . = ..()
+ magazine = new /obj/item/ammo_box/magazine/cm5_9mm/rubber(src)
+ chamber_round()
+
/obj/item/ammo_box/magazine/cm5_9mm
name = "CM-5 magazine (9mm)"
- desc = "A 30-round magazine for 9mm submachine guns. These rounds do okay damage, but struggle against armor."
+ desc = "A 30-round magazine for the CM-5 submachine gun. These rounds do okay damage, but struggle against armor."
icon_state = "cm5_mag-1"
base_icon_state = "cm5_mag"
ammo_type = /obj/item/ammo_casing/c9mm
@@ -131,6 +139,11 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
max_ammo = 30
multiple_sprites = AMMO_BOX_FULL_EMPTY
+/obj/item/ammo_box/magazine/cm5_9mm/rubber
+ desc = "A 30-round magazine for the CM-5 submachine gun. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
+ caliber = "9mm rubber"
+ ammo_type = /obj/item/ammo_casing/c9mm/rubber
+
/obj/item/gun/ballistic/automatic/smg/cm5/compact
name = "\improper CM-5c"
desc = "A modification of the CM-5 featuring a dramatically shortened barrel and removed stock. Designed for CLIP-GOLD covert enforcement agents to maximize portability without sacrificing firepower, though accuracy at range is abysmal at best. Chambered in 9mm."
@@ -193,7 +206,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
/obj/item/gun/ballistic/automatic/smg/cm5/compact/AltClick(mob/user)
if(!current_case)
return ..()
- current_case.forceMove(get_turf(src))
+ user.put_in_hands(current_case)
icon = src::icon
base_icon_state = src::icon_state
item_state = src::item_state
@@ -476,3 +489,11 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
wield_slowdown = 0.6
wield_delay = 0.65 SECONDS
+
+/obj/item/gun/ballistic/shotgun/cm15/incendiary
+ spawnwithmagazine = FALSE
+
+/obj/item/gun/ballistic/shotgun/cm15/incendiary/Initialize()
+ . = ..()
+ magazine = new /obj/item/ammo_box/magazine/cm15_12g/incendiary(src)
+ chamber_round()
diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
index 18239e94dd7e..c69072f660ca 100644
--- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
@@ -582,7 +582,7 @@ EMPTY_GUN_HELPER(automatic/marksman/boomslang/indie)
/obj/item/ammo_box/magazine/boomslang
name = "\improper Boomslang Magazine (6.5x57mm CLIP)"
- desc = "A large 10-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and bypass half of their protective equipment, though it isn't a high enough caliber to pierce armored vehicles."
+ desc = "A large 10-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and can pierce protective equipment, excluding armored vehicles."
base_icon_state = "boomslang"
icon_state = "boomslang-10"
ammo_type = /obj/item/ammo_casing/a65clip
@@ -592,7 +592,7 @@ EMPTY_GUN_HELPER(automatic/marksman/boomslang/indie)
/obj/item/ammo_box/magazine/boomslang/short
name = "\improper Boomslang Magazine (6.5x57mm CLIP)"
- desc = "A 5-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and bypass half of their protective equipment, though it isn't a high enough caliber to pierce armored vehicles."
+ desc = "A 5-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and can pierce protective equipment, excluding armored vehicles."
base_icon_state = "boomslang_short"
icon_state = "boomslang_short-5"
ammo_type = /obj/item/ammo_casing/a65clip
@@ -986,6 +986,14 @@ EMPTY_GUN_HELPER(automatic/assault/hydra/dmr)
)
)
+/obj/item/gun/ballistic/shotgun/automatic/bulldog/drum
+ spawnwithmagazine = FALSE
+
+/obj/item/gun/ballistic/shotgun/automatic/bulldog/drum/Initialize()
+ . = ..()
+ magazine = new /obj/item/ammo_box/magazine/m12g_bulldog/drum
+ chamber_round()
+
EMPTY_GUN_HELPER(shotgun/automatic/bulldog)
/obj/item/ammo_box/magazine/m12g_bulldog
@@ -1070,7 +1078,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog)
/obj/item/ammo_casing/caseless/rocket/a70mm
name = "\improper M-KO-9HE"
- desc = "An 70mm High Explosive rocket. Fire at mech and pray."
+ desc = "A 70mm High Explosive rocket. Fire at mech and pray."
icon_state = "srm-8"
caliber = "70mm"
projectile_type = /obj/projectile/bullet/a84mm_he
@@ -1078,7 +1086,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog)
/obj/item/ammo_casing/caseless/rocket/a70mm/hedp
name = "\improper M-KO-9HEDP"
- desc = "An 84mm High Explosive Dual Purpose rocket. Pointy end toward armor."
+ desc = "A 70mm High Explosive Dual Purpose rocket. Pointy end toward armor."
caliber = "70mm"
icon_state = "84mm-hedp"
projectile_type = /obj/projectile/bullet/a84mm
diff --git a/shiptest.dme b/shiptest.dme
index 3e1776300873..6020c3e37eb2 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -161,10 +161,10 @@
#include "code\__DEFINES\wires.dm"
#include "code\__DEFINES\dcs\flags.dm"
#include "code\__DEFINES\dcs\helpers.dm"
+#include "code\__DEFINES\dcs\signals\signals.dm"
#include "code\__DEFINES\dcs\signals\signals_mod.dm"
#include "code\__DEFINES\dcs\signals\signals_storage.dm"
#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_carbon.dm"
-#include "code\__DEFINES\dcs\signals\signals.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_object.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_clothing.dm"
#include "code\__DEFINES\dcs\signals\signals_obj\signals_item\signals_food.dm"
@@ -429,7 +429,6 @@
#include "code\datums\dog_fashion.dm"
#include "code\datums\ductnet.dm"
#include "code\datums\emotes.dm"
-#include "code\datums\ert.dm"
#include "code\datums\forced_movement.dm"
#include "code\datums\guestbook.dm"
#include "code\datums\holocall.dm"
@@ -688,6 +687,16 @@
#include "code\datums\elements\food\dunkable.dm"
#include "code\datums\elements\food\food_trash.dm"
#include "code\datums\elements\food\processable.dm"
+#include "code\datums\ert\_ert.dm"
+#include "code\datums\ert\ert_clip.dm"
+#include "code\datums\ert\ert_frontiersmen.dm"
+#include "code\datums\ert\ert_gezena.dm"
+#include "code\datums\ert\ert_indies.dm"
+#include "code\datums\ert\ert_inteq.dm"
+#include "code\datums\ert\ert_nanotrasen.dm"
+#include "code\datums\ert\ert_roumain.dm"
+#include "code\datums\ert\ert_solgov.dm"
+#include "code\datums\ert\ert_syndicate.dm"
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"
#include "code\datums\helper_datums\icon_snapshot.dm"
@@ -1715,10 +1724,12 @@
#include "code\modules\antagonists\disease\disease_mob.dm"
#include "code\modules\antagonists\ert\ert.dm"
#include "code\modules\antagonists\ert\frontiersmen.dm"
+#include "code\modules\antagonists\ert\gezena.dm"
#include "code\modules\antagonists\ert\indie.dm"
#include "code\modules\antagonists\ert\inteq.dm"
#include "code\modules\antagonists\ert\minutemen.dm"
#include "code\modules\antagonists\ert\nanotrasen.dm"
+#include "code\modules\antagonists\ert\roumain.dm"
#include "code\modules\antagonists\ert\solgov.dm"
#include "code\modules\antagonists\ert\syndicate.dm"
#include "code\modules\antagonists\gang\outfits.dm"
@@ -2018,10 +2029,12 @@
#include "code\modules\clothing\outfits\standard.dm"
#include "code\modules\clothing\outfits\vv_outfit.dm"
#include "code\modules\clothing\outfits\ert\frontiersmen_ert.dm"
+#include "code\modules\clothing\outfits\ert\gezena_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"
+#include "code\modules\clothing\outfits\ert\roumain_ert.dm"
#include "code\modules\clothing\outfits\ert\solgov_ert.dm"
#include "code\modules\clothing\outfits\ert\syndicate_ert.dm"
#include "code\modules\clothing\outfits\factions\frontiersmen.dm"
@@ -2811,6 +2824,10 @@
#include "code\modules\mob\living\simple_animal\slime\slime.dm"
#include "code\modules\mob\living\simple_animal\slime\slime_say.dm"
#include "code\modules\mob\living\simple_animal\slime\subtypes.dm"
+#include "code\modules\mob_spawner\burrow.dm"
+#include "code\modules\mob_spawner\hivebot.dm"
+#include "code\modules\mob_spawner\spawner.dm"
+#include "code\modules\mob_spawner\spawner_componet.dm"
#include "code\modules\mod\mod_actions.dm"
#include "code\modules\mod\mod_activation.dm"
#include "code\modules\mod\mod_ai.dm"
@@ -2835,10 +2852,6 @@
#include "code\modules\mod\modules\modules_storage.dm"
#include "code\modules\mod\modules\modules_supply.dm"
#include "code\modules\mod\modules\modules_visor.dm"
-#include "code\modules\mob_spawner\burrow.dm"
-#include "code\modules\mob_spawner\hivebot.dm"
-#include "code\modules\mob_spawner\spawner.dm"
-#include "code\modules\mob_spawner\spawner_componet.dm"
#include "code\modules\modular_computers\laptop_vendor.dm"
#include "code\modules\modular_computers\computers\_modular_computer_shared.dm"
#include "code\modules\modular_computers\computers\item\computer.dm"
From 0ea9cc96d8f5fc895c1ff0546ba8524ca8f6f8af Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 17 Sep 2024 05:34:41 -0300
Subject: [PATCH 02/14] oops
---
blanks.dmi | Bin 321 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 blanks.dmi
diff --git a/blanks.dmi b/blanks.dmi
deleted file mode 100644
index ad75ecb403aac52f84aa68f77a5325bf09705b87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQtAOdA+84w9FP){vM{sNkMZ$r
zu1r`mcm4YHCr+H0IC0{cg+-svEb5B(4N_AKQ4)~_YGEu1@(X5gcy=QV$SJN0i70VN
zElw`VEGWs$&tqVym=hdUP*nQ;OK`!*uTQkRb+yi&IUl?s)Zn7=gGV~&eKb!p6!rA(
zurLlXzHIEJFz3;vBa=cDf;BbO4fU<}?NBgX@6y?Ath#xHghtkhqcg*%%$UuUxOmmk
zrCyN-ubyXp!@^+oTixky{+<}1^`4$Cjv*Gk$q5pyS6G|6R@4Zmo3J{aTJh&Xf(dJ1
zhE>c(Uyt<%&L6+v*v6^%<0p^aF(9!y?eTNtH}{(7``>6WPXF-Po$)9G!$vj{LBliC
RD}aVFc)I$ztaD0e0s!9=e>wmF
From 4918ffc3bcb7ff2445d42f3338f40d04d34f67c1 Mon Sep 17 00:00:00 2001
From: meem <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 17 Sep 2024 18:38:56 -0300
Subject: [PATCH 03/14] Update
code/modules/clothing/outfits/ert/frontiersmen_ert.dm
Co-authored-by: rye-rice <58402542+rye-rice@users.noreply.github.com>
Signed-off-by: meem <75212565+meemofcourse@users.noreply.github.com>
---
code/modules/clothing/outfits/ert/frontiersmen_ert.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index e6627f28134f..95ba66538462 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -62,7 +62,7 @@
/obj/item/clothing/mask/gas/frontiersmen = 12,
/obj/item/clothing/mask/gas/sechailer/balaclava = 10,
/obj/item/clothing/mask/breath = 7,
- /obj/item/clothing/mask/whistle = 3))
+ /obj/item/clothing/mask/whistle/trench = 3))
if(prob(90))
back = pickweight(list(
From 114bb98e44816a9eb378e831c9500494baca7423 Mon Sep 17 00:00:00 2001
From: meem <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 24 Sep 2024 01:33:55 -0300
Subject: [PATCH 04/14] Update code/modules/admin/verbs/one_click_antag.dm
Signed-off-by: meem <75212565+meemofcourse@users.noreply.github.com>
---
code/modules/admin/verbs/one_click_antag.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 13ebb394c66b..430646a3402a 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -226,7 +226,7 @@
.["mainsettings"]["spawn_admin"]["value"] = newtemplate.spawn_admin ? "Yes" : "No"
.["mainsettings"]["use_custom_shuttle"]["value"] = newtemplate.use_custom_shuttle ? "Yes" : "No"
.["mainsettings"]["spawn_at_outpost"]["value"] = newtemplate.spawn_at_outpost ? "Yes" : "No"
- .["mainsettings"]["outpost_access"]["value"] = newtemplate.spawn_at_outpost ? "Yes" : "No"
+ .["mainsettings"]["outpost_access"]["value"] = newtemplate.outpost_access ? "Yes" : "No"
/datum/admins/proc/equipAntagOnDummy(mob/living/carbon/human/dummy/mannequin, datum/antagonist/antag)
From f863fdb109b9d2d7987fa0ccecaeabf560364040 Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 24 Sep 2024 01:42:41 -0300
Subject: [PATCH 05/14] yeag
---
code/modules/clothing/outfits/ert/gezena_ert.dm | 2 +-
code/modules/clothing/outfits/ert/minutemen_ert.dm | 2 +-
tools/UpdatePaths/{Scripts => }/2932_melee.txt | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename tools/UpdatePaths/{Scripts => }/2932_melee.txt (100%)
diff --git a/code/modules/clothing/outfits/ert/gezena_ert.dm b/code/modules/clothing/outfits/ert/gezena_ert.dm
index 626df8a99d32..436b7379599e 100644
--- a/code/modules/clothing/outfits/ert/gezena_ert.dm
+++ b/code/modules/clothing/outfits/ert/gezena_ert.dm
@@ -13,7 +13,7 @@
neck = /obj/item/clothing/neck/cloak/gezena
suit_store = /obj/item/gun/energy/kalix/pgf
- l_pocket = /obj/item/kitchen/knife/combat
+ l_pocket = /obj/item/melee/knife/combat
r_pocket = /obj/item/flashlight/seclite
backpack_contents = list(/obj/item/gun/energy/kalix/pistol, /obj/item/stock_parts/cell/gun/kalix = 2, /obj/item/grenade/frag=2)
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index 9a613c308883..964c699eeeb4 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -121,7 +121,7 @@
gloves = /obj/item/clothing/gloves/color/white
l_pocket = /obj/item/flashlight/seclite
- r_pocket = /obj/item/kitchen/knife/combat
+ r_pocket = /obj/item/melee/knife/combat
/datum/outfit/job/clip/minutemen/military_police/riot
name = "ERT - C-MM Military Police (Riot Control)"
diff --git a/tools/UpdatePaths/Scripts/2932_melee.txt b/tools/UpdatePaths/2932_melee.txt
similarity index 100%
rename from tools/UpdatePaths/Scripts/2932_melee.txt
rename to tools/UpdatePaths/2932_melee.txt
From 0ed397e3f18b5ab68d624a77646f85e1d9563751 Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 24 Sep 2024 01:47:01 -0300
Subject: [PATCH 06/14] Update syndicate_twinkleshine.dmm
---
_maps/shuttles/syndicate/syndicate_twinkleshine.dmm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index ca7bd7705efd..8ea8e404ca1f 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -1830,7 +1830,7 @@
name = "operative's locker"
},
/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/head/helmet/operator,
+/obj/item/clothing/head/helmet/syndie,
/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
@@ -2095,7 +2095,7 @@
/area/ship/crew/canteen)
"lZ" = (
/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/head/helmet/operator,
+/obj/item/clothing/head/helmet/syndie,
/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
@@ -3310,7 +3310,7 @@
name = "operative's locker"
},
/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/head/helmet/operator,
+/obj/item/clothing/head/helmet/syndie,
/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
From dd47c168359eb0fdd71dce6d1d1b66a14c1e3502 Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 24 Sep 2024 01:53:42 -0300
Subject: [PATCH 07/14] killing myself
---
_maps/shuttles/syndicate/syndicate_twinkleshine.dmm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
index 8ea8e404ca1f..afbe3983bce5 100644
--- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
+++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -7123,7 +7123,7 @@
name = "operative's locker"
},
/obj/item/clothing/suit/armor/vest/syndie,
-/obj/item/clothing/head/helmet/operator,
+/obj/item/clothing/head/helmet/syndie,
/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
From 77743e0a86d1b3bbab53940f3ea5636ab0b16207 Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 24 Sep 2024 02:03:00 -0300
Subject: [PATCH 08/14] checks
---
code/modules/clothing/outfits/ert/frontiersmen_ert.dm | 3 +++
code/modules/clothing/outfits/ert/indie_ert.dm | 10 +++++-----
code/modules/clothing/outfits/ert/inteq_ert.dm | 6 +++++-
code/modules/clothing/outfits/ert/roumain_ert.dm | 2 ++
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index 9c38431f52dd..c26aebf02f28 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -35,6 +35,7 @@
backpack_contents = list()
+ box = null
backpack = null
courierbag = null
satchel = null
@@ -202,6 +203,8 @@
courierbag = /obj/item/minigunpack
duffelbag = /obj/item/minigunpack
+ backpack_contents = null
+
/datum/outfit/job/frontiersmen/ert/leader/unarmed
name = "ERT - Frontiersman Officer (Unarmed)"
diff --git a/code/modules/clothing/outfits/ert/indie_ert.dm b/code/modules/clothing/outfits/ert/indie_ert.dm
index ed79b06ec53a..15ac8f718802 100644
--- a/code/modules/clothing/outfits/ert/indie_ert.dm
+++ b/code/modules/clothing/outfits/ert/indie_ert.dm
@@ -82,7 +82,6 @@
jobtype = /datum/job/chief_engineer
job_icon = "chiefengineer"
- back = /obj/item/melee/axe/fire
suit = /obj/item/clothing/suit/space/hardsuit/engine
suit_store = /obj/item/tank/internals/oxygen/red
head = null
@@ -90,11 +89,12 @@
gloves = /obj/item/clothing/gloves/color/yellow
backpack_contents = null
+ box = null
- backpack = null
- courierbag = null
- duffelbag = null
- satchel = null
+ backpack = /obj/item/melee/axe/fire
+ courierbag = /obj/item/melee/axe/fire
+ duffelbag = /obj/item/melee/axe/fire
+ satchel = /obj/item/melee/axe/fire
/datum/outfit/job/independent/ert/technician
name = "ERT - Independent Technician"
diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
index 1e188c6428ea..715a0352e3b1 100644
--- a/code/modules/clothing/outfits/ert/inteq_ert.dm
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -82,6 +82,7 @@
head = null
suit = /obj/item/clothing/suit/space/hardsuit/syndi/inteq
+ suit_store = null
r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
/datum/outfit/job/inteq/ert/leader
@@ -122,10 +123,12 @@
mask = /obj/item/clothing/mask/gas/sechailer/balaclava/inteq
ears = /obj/item/radio/headset/inteq/captain
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
- l_pocket = /obj/item/gun/energy/taser
r_pocket = /obj/item/restraints/handcuffs
suit_store = /obj/item/gun/ballistic/automatic/pistol/commander/inteq
+ backpack_contents = list(/obj/item/gun/energy/taser)
+
+
/datum/outfit/job/inteq/ert/inspector
name = "ERT - Inteq Mothership Investigator"
id_assignment = "Investigator"
@@ -134,6 +137,7 @@
uniform = /obj/item/clothing/under/syndicate/inteq
suit = null
+ suit_store = null
belt = /obj/item/clipboard
gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/laceup
diff --git a/code/modules/clothing/outfits/ert/roumain_ert.dm b/code/modules/clothing/outfits/ert/roumain_ert.dm
index 21966642377f..b9dea3e3ea7e 100644
--- a/code/modules/clothing/outfits/ert/roumain_ert.dm
+++ b/code/modules/clothing/outfits/ert/roumain_ert.dm
@@ -61,6 +61,7 @@
uniform = /obj/item/clothing/under/suit/roumain
shoes = /obj/item/clothing/shoes/workboots/mining
suit = /obj/item/clothing/suit/toggle/labcoat/roumain_med
+ suit_store = null
head = /obj/item/clothing/head/cowboy/sec/roumain/med
mask = /obj/item/clothing/mask/gas/plaguedoctor
gloves = null
@@ -76,6 +77,7 @@
shoes = /obj/item/clothing/shoes/workboots/mining
belt = /obj/item/storage/belt/utility/full/engi
suit = /obj/item/clothing/suit/hazardvest/roumain
+ suit_store = null
head = /obj/item/clothing/head/cowboy/sec/roumain/machinist
glasses = /obj/item/clothing/glasses/welding
accessory = /obj/item/clothing/accessory/waistcoat/roumain
From 869a218d582869adac8d5c546f9aeb57bc636a2f Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 24 Sep 2024 02:08:42 -0300
Subject: [PATCH 09/14] competency
---
code/modules/clothing/outfits/ert/frontiersmen_ert.dm | 1 +
tools/UpdatePaths/{ => Scripts}/2932_melee.txt | 0
2 files changed, 1 insertion(+)
rename tools/UpdatePaths/{ => Scripts}/2932_melee.txt (100%)
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index c26aebf02f28..3a459c87a0c8 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -204,6 +204,7 @@
duffelbag = /obj/item/minigunpack
backpack_contents = null
+ box = null
/datum/outfit/job/frontiersmen/ert/leader/unarmed
name = "ERT - Frontiersman Officer (Unarmed)"
diff --git a/tools/UpdatePaths/2932_melee.txt b/tools/UpdatePaths/Scripts/2932_melee.txt
similarity index 100%
rename from tools/UpdatePaths/2932_melee.txt
rename to tools/UpdatePaths/Scripts/2932_melee.txt
From 0620f3a4b54332b807b731a688c3dc790883c91d Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:23:48 -0300
Subject: [PATCH 10/14] outpost access, headset message
minor outfit fix too
---
code/datums/ert/_ert.dm | 2 +-
code/modules/admin/verbs/one_click_antag.dm | 3 ++-
code/modules/admin/verbs/randomverbs.dm | 4 ++--
code/modules/clothing/outfits/ert/minutemen_ert.dm | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/code/datums/ert/_ert.dm b/code/datums/ert/_ert.dm
index f0b7f5095746..3618d99dee24 100644
--- a/code/datums/ert/_ert.dm
+++ b/code/datums/ert/_ert.dm
@@ -14,7 +14,7 @@
var/mission = "Make effective use of your tools."
// determines the size of the team. make sure there's enough size for all the special roles you may add
var/teamsize = 5
- // this will be shown to ghosts as "Would you be interested in [polldesc]?"
+ // this will be shown to ghosts as "Would you like to be considered for [polldesc]?"
var/polldesc = "an emergency response team"
/// If TRUE, gives the team members "[role] [random last name]" style names
var/random_names = FALSE
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 430646a3402a..170ade6117c1 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -320,7 +320,7 @@
ertemplate.teamsize = prefs["teamsize"]["value"]
ertemplate.mission = prefs["mission"]["value"]
ertemplate.polldesc = prefs["polldesc"]["value"]
- ertemplate.enforce_human = prefs["enforce_human"]["value"] == "Yes" // these next 8 are effectively toggles
+ ertemplate.enforce_human = prefs["enforce_human"]["value"] == "Yes" // these next 9 are effectively toggles
ertemplate.opendoors = prefs["open_armory"]["value"] == "Yes"
ertemplate.leader_experience = prefs["leader_experience"]["value"] == "Yes"
ertemplate.random_names = prefs["random_names"]["value"] == "Yes"
@@ -328,6 +328,7 @@
ertemplate.spawn_admin = prefs["spawn_admin"]["value"] == "Yes"
ertemplate.use_custom_shuttle = prefs["use_custom_shuttle"]["value"] == "Yes"
ertemplate.spawn_at_outpost = prefs["spawn_at_outpost"]["value"] == "Yes"
+ ertemplate.outpost_access = prefs["outpost_access"]["value"] == "Yes"
var/list/spawnpoints = GLOB.emergencyresponseteamspawn
var/index = 0
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 853d33e1b61b..333b8b828022 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -70,9 +70,9 @@
return
switch(sender)
if (RADIO_CHANNEL_SYNDICATE)
- sender = input("From what branch?", "Syndicate") as null|anything in list("Syndicate High Command", "The Anti-Corporation Liberation Front", "The Gorlex Marauders", "Donk! Corporation", "Cybersun Virtual Solutions", "The Galactic Engineer's Concordat", "The Naturalienwissenschaftlicher Studentenverbindungs-Verband")
+ sender = input("From what faction?", "Syndicate") as null|anything in list("Liberation Front Leadership", "Gorlex Republic Military Command", "Cybersun Industries", "the Student-Union of Naturalistic Sciences")
if (RADIO_CHANNEL_MINUTEMEN)
- sender = input("From what division?", "Minutemen") as null|anything in list("CLIP Minutemen Headquarters", "The Galactic Optium Labor Divison", "The Biohazard Assesment and Removal Division")
+ sender = input("From what division?", "Minutemen") as null|anything in list("the Colonial League Minutemen", "the Galactic Optium Labor Divison", "the Biohazard Assesment and Removal Division")
if (RADIO_CHANNEL_INTEQ)
sender = "Inteq Risk Management"
if ("Outpost")
diff --git a/code/modules/clothing/outfits/ert/minutemen_ert.dm b/code/modules/clothing/outfits/ert/minutemen_ert.dm
index 964c699eeeb4..891ea1efe313 100644
--- a/code/modules/clothing/outfits/ert/minutemen_ert.dm
+++ b/code/modules/clothing/outfits/ert/minutemen_ert.dm
@@ -1,6 +1,7 @@
/datum/outfit/job/clip/minutemen/bard
name = "ERT - C-MM BARD Field Agent"
id_assignment = "Biohazard Assessment Field Agent"
+ jobtype = /datum/job/virologist
job_icon = "virologist" // can someone resprite the biosuits already
wallet = null
From 1c8a7565de75b261d7103e5f8ce29a2644b7e2bd Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Sun, 6 Oct 2024 17:57:18 -0300
Subject: [PATCH 11/14] oops
---
code/modules/clothing/outfits/ert/roumain_ert.dm | 2 +-
code/modules/clothing/outfits/factions/roumain.dm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/clothing/outfits/ert/roumain_ert.dm b/code/modules/clothing/outfits/ert/roumain_ert.dm
index b9dea3e3ea7e..29191ac8c93a 100644
--- a/code/modules/clothing/outfits/ert/roumain_ert.dm
+++ b/code/modules/clothing/outfits/ert/roumain_ert.dm
@@ -2,7 +2,7 @@
name = "ERT - Saint-Roumain Hunter" // flaming arrow and shadow
id_assignment = "Hunter"
jobtype = /datum/job/officer
- job_icon = "hsrm_hunter"
+ job_icon = "srm_hunter"
wallet = null
diff --git a/code/modules/clothing/outfits/factions/roumain.dm b/code/modules/clothing/outfits/factions/roumain.dm
index fe31fddd9041..e7cc57a33a96 100644
--- a/code/modules/clothing/outfits/factions/roumain.dm
+++ b/code/modules/clothing/outfits/factions/roumain.dm
@@ -84,7 +84,7 @@
name = "Saint-Roumain Militia - Hunter"
id_assignment = "Hunter"
jobtype = /datum/job/officer
- job_icon = "hsrm_hunter"
+ job_icon = "srm_hunter"
uniform = /obj/item/clothing/under/suit/roumain
alt_uniform = null
From 87462c7419f0158357407d659b94cb65902fbe05 Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:41:57 -0300
Subject: [PATCH 12/14] wrapup
---
code/modules/clothing/outfits/ert/nanotrasen_ert.dm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
index 043bacea1d18..0e6d3070a482 100644
--- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
+++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
@@ -1,5 +1,5 @@
/datum/outfit/job/nanotrasen/ert
- name = "ERT - Vigilitas Security Officer"
+ name = "ERT - Nanotrasen Vigilitas Security Officer"
jobtype = /datum/job/officer
job_icon = "securityofficer"
@@ -26,10 +26,15 @@
/datum/outfit/job/nanotrasen/ert/inspector
name = "ERT - Nanotrasen CentCom Inspector"
+ id_assignment = "Inspector"
+ job_icon = "centcom"
+ head = null
uniform = /obj/item/clothing/under/rank/centcom/official
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
+ suit = null
+ suit_store = null
ears = /obj/item/radio/headset/headset_cent
glasses = /obj/item/clothing/glasses/sunglasses
belt = /obj/item/clipboard
@@ -44,7 +49,7 @@
// name = "ERT - Vigilitas Emergency Response Officer"
/datum/outfit/job/nanotrasen/ert/leader
- name = "ERT - Vigilitas Security Corporal"
+ name = "ERT - Nanotrasen Vigilitas Security Corporal"
jobtype = /datum/job/hos
job_icon = "lieutenant"
From ad708aa625a7f975472bd89a41f691190a00f69e Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 22 Oct 2024 15:14:16 -0300
Subject: [PATCH 13/14] checks
---
code/modules/clothing/outfits/ert/roumain_ert.dm | 12 ++++++------
code/modules/clothing/outfits/standard.dm | 7 -------
.../manufacturer/clip_lanchester/ballistics.dm | 14 ++------------
.../guns/manufacturer/scarborough/ballistics.dm | 7 +------
4 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/code/modules/clothing/outfits/ert/roumain_ert.dm b/code/modules/clothing/outfits/ert/roumain_ert.dm
index 29191ac8c93a..557d02fec863 100644
--- a/code/modules/clothing/outfits/ert/roumain_ert.dm
+++ b/code/modules/clothing/outfits/ert/roumain_ert.dm
@@ -13,7 +13,7 @@
belt = /obj/item/gun/ballistic/revolver/shadow
suit_store = /obj/item/gun/ballistic/shotgun/flamingarrow/factory
- l_pocket = /obj/item/ammo_box/c38_box
+ l_pocket = /obj/item/storage/box/ammo/c38
r_pocket = /obj/item/flashlight/lantern
duffelbag = /obj/item/storage/backpack/satchel/leather
@@ -30,7 +30,7 @@
belt = /obj/item/gun/ballistic/revolver/shadow
suit_store = /obj/item/gun/ballistic/automatic/smg/firestorm/pan
- l_pocket = /obj/item/ammo_box/a44roum
+ l_pocket = /obj/item/storage/box/ammo/a44roum
backpack_contents = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/pan = 3, /obj/item/ammo_box/a44roum_speedloader = 3)
@@ -40,7 +40,7 @@
belt = /obj/item/gun/ballistic/automatic/pistol/candor/factory
suit_store = /obj/item/gun/ballistic/automatic/marksman/vickland
- l_pocket = /obj/item/ammo_box/a308
+ l_pocket = /obj/item/storage/box/ammo/a308
backpack_contents = list(/obj/item/ammo_box/vickland_a308 = 6, /obj/item/ammo_box/magazine/m45 = 3)
@@ -109,7 +109,7 @@
suit_store = /obj/item/gun/ballistic/shotgun/doublebarrel/twobore
- l_pocket = /obj/item/ammo_box/a44roum
+ l_pocket = /obj/item/storage/box/ammo/a44roum
backpack_contents = list(/obj/item/ammo_casing/shotgun/buckshot/twobore = 8)
@@ -128,6 +128,6 @@
belt = /obj/item/gun/ballistic/revolver/ashhand
id = /obj/item/card/id/silver
- l_pocket = /obj/item/ammo_box/a4570
+ l_pocket = /obj/item/storage/box/ammo/a4570
- backpack_contents = list(/obj/item/ammo_box/a12g)
+ backpack_contents = list(/obj/item/storage/box/ammo/a12g_buckshot)
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 1e0012836546..18e220c3f664 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -57,13 +57,6 @@
W.registered_name = H.real_name
W.update_label()
-/datum/outfit/ghost_cultist
- name = "Cultist Ghost"
-
- uniform = /obj/item/clothing/under/color/black/ghost
- suit = /obj/item/clothing/suit/hooded/cultrobes/alt/ghost
- shoes = /obj/item/clothing/shoes/cult/alt/ghost
-
/datum/outfit/wizard
name = "Blue Wizard"
diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
index 716cc70b70c1..a645d7e99fd2 100644
--- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -137,12 +137,7 @@
NO_MAG_GUN_HELPER(automatic/smg/cm5)
/obj/item/gun/ballistic/automatic/smg/cm5/rubber
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/automatic/smg/cm5/rubber/Initialize()
- . = ..()
- magazine = new /obj/item/ammo_box/magazine/cm5_9mm/rubber(src)
- chamber_round()
+ default_ammo_type = /obj/item/ammo_box/magazine/cm5_9mm/rubber
/obj/item/ammo_box/magazine/cm5_9mm
name = "CM-5 magazine (9mm)"
@@ -520,9 +515,4 @@ NO_MAG_GUN_HELPER(automatic/smg/cm5)
/obj/item/gun/ballistic/shotgun/cm15/incendiary
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/shotgun/cm15/incendiary/Initialize()
- . = ..()
- magazine = new /obj/item/ammo_box/magazine/cm15_12g/incendiary(src)
- chamber_round()
+ default_ammo_type = /obj/item/ammo_box/magazine/cm15_12g/incendiary
diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
index 57bbebd227de..6d1dff192407 100644
--- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
@@ -1013,12 +1013,7 @@ NO_MAG_GUN_HELPER(automatic/assault/hydra/dmr)
)
/obj/item/gun/ballistic/shotgun/automatic/bulldog/drum
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/shotgun/automatic/bulldog/drum/Initialize()
- . = ..()
- magazine = new /obj/item/ammo_box/magazine/m12g_bulldog/drum
- chamber_round()
+ default_ammo_type = /obj/item/ammo_box/magazine/m12g_bulldog/drum
NO_MAG_GUN_HELPER(shotgun/automatic/bulldog)
From e7ec8c025d18389b77c731a53469d1d149fda191 Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Tue, 22 Oct 2024 15:24:03 -0300
Subject: [PATCH 14/14] sanity checks
---
.../clothing/outfits/ert/roumain_ert.dm | 18 ++++++++----------
.../manufacturer/clip_lanchester/ballistics.dm | 2 ++
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/code/modules/clothing/outfits/ert/roumain_ert.dm b/code/modules/clothing/outfits/ert/roumain_ert.dm
index 557d02fec863..efe7828173be 100644
--- a/code/modules/clothing/outfits/ert/roumain_ert.dm
+++ b/code/modules/clothing/outfits/ert/roumain_ert.dm
@@ -13,7 +13,7 @@
belt = /obj/item/gun/ballistic/revolver/shadow
suit_store = /obj/item/gun/ballistic/shotgun/flamingarrow/factory
- l_pocket = /obj/item/storage/box/ammo/c38
+ l_pocket = /obj/item/ammo_box/a44roum_speedloader
r_pocket = /obj/item/flashlight/lantern
duffelbag = /obj/item/storage/backpack/satchel/leather
@@ -22,7 +22,7 @@
satchel = /obj/item/storage/backpack/satchel/leather
box = null
- backpack_contents = list(/obj/item/ammo_box/a44roum_speedloader = 3)
+ backpack_contents = list(/obj/item/ammo_box/a44roum_speedloader = 2, /obj/item/storage/box/ammo/c38)
/datum/outfit/job/roumain/ert/firestorm
name = "ERT - Saint-Roumain Hunter (Firestorm)" // firestorm and shadow
@@ -30,9 +30,9 @@
belt = /obj/item/gun/ballistic/revolver/shadow
suit_store = /obj/item/gun/ballistic/automatic/smg/firestorm/pan
- l_pocket = /obj/item/storage/box/ammo/a44roum
+ l_pocket = /obj/item/ammo_box/a44roum_speedloader
- backpack_contents = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/pan = 3, /obj/item/ammo_box/a44roum_speedloader = 3)
+ backpack_contents = list(/obj/item/ammo_box/magazine/c45_firestorm_mag/pan = 3, /obj/item/ammo_box/a44roum_speedloader = 2, /obj/item/storage/box/ammo/a44roum)
/datum/outfit/job/roumain/ert/vickland
name = "ERT - Saint-Roumain Hunter (Vickland)" // vickland and candor
@@ -40,9 +40,9 @@
belt = /obj/item/gun/ballistic/automatic/pistol/candor/factory
suit_store = /obj/item/gun/ballistic/automatic/marksman/vickland
- l_pocket = /obj/item/storage/box/ammo/a308
+ l_pocket = /obj/item/ammo_box/magazine/m45
- backpack_contents = list(/obj/item/ammo_box/vickland_a308 = 6, /obj/item/ammo_box/magazine/m45 = 3)
+ backpack_contents = list(/obj/item/ammo_box/vickland_a308 = 6, /obj/item/storage/box/ammo/a308, /obj/item/ammo_box/magazine/m45 = 2)
/datum/outfit/job/roumain/ert/scout
name = "ERT - Saint-Roumain Hunter (Scout)" // scout and detective special
@@ -109,7 +109,7 @@
suit_store = /obj/item/gun/ballistic/shotgun/doublebarrel/twobore
- l_pocket = /obj/item/storage/box/ammo/a44roum
+ l_pocket = /obj/item/ammo_box/a357
backpack_contents = list(/obj/item/ammo_casing/shotgun/buckshot/twobore = 8)
@@ -128,6 +128,4 @@
belt = /obj/item/gun/ballistic/revolver/ashhand
id = /obj/item/card/id/silver
- l_pocket = /obj/item/storage/box/ammo/a4570
-
- backpack_contents = list(/obj/item/storage/box/ammo/a12g_buckshot)
+ backpack_contents = list(/obj/item/storage/box/ammo/a12g_buckshot, /obj/item/storage/box/ammo/a4570)
diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
index a645d7e99fd2..ee5d32f0ba46 100644
--- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -104,6 +104,7 @@
default_ammo_type = /obj/item/ammo_box/magazine/cm5_9mm
allowed_ammo_types = list(
/obj/item/ammo_box/magazine/cm5_9mm,
+ /obj/item/ammo_box/magazine/cm5_9mm/rubber,
)
bolt_type = BOLT_TYPE_CLIP
weapon_weight = WEAPON_LIGHT
@@ -486,6 +487,7 @@ NO_MAG_GUN_HELPER(automatic/smg/cm5)
default_ammo_type = /obj/item/ammo_box/magazine/cm15_12g
allowed_ammo_types = list(
/obj/item/ammo_box/magazine/cm15_12g,
+ /obj/item/ammo_box/magazine/cm15_12g/incendiary
)
empty_indicator = FALSE