diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index d41985decae8c1..0140adf8a2d711 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -22,12 +22,6 @@ job-name-captain = Captain job-name-serviceworker = Service Worker job-name-centcomoff = CentComm Official job-name-cburn = Centcomm Quarantine Officer -job-name-ert-leader = ERT Company Commander -job-name-ert-chaplain = ERT Soul Officer -job-name-ert-engineer = ERT Field Engineer -job-name-ert-janitor = ERT Custodian -job-name-ert-security = ERT Field Officer -job-name-ert-medic = ERT Medical Doctor job-name-deathsquad = Centcomm Agent job-name-reporter = Reporter job-name-musician = Musician diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index e60025ed204e65..9933845166df9c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -519,7 +519,7 @@ - state: gold - state: ert_medic - type: PresetIdCard - job: ERTMedic + job: ERTMedical - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml similarity index 100% rename from Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml rename to Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml diff --git a/Resources/Prototypes/Roles/Jobs/ERT/chaplain.yml b/Resources/Prototypes/Roles/Jobs/ERT/chaplain.yml deleted file mode 100644 index 5507149fb45baf..00000000000000 --- a/Resources/Prototypes/Roles/Jobs/ERT/chaplain.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: job - parent: CentralCommandOfficial - id: ERTChaplain - name: job-name-ert-chaplain - playTimeTracker: JobERTChaplain diff --git a/Resources/Prototypes/Roles/Jobs/ERT/engineer.yml b/Resources/Prototypes/Roles/Jobs/ERT/engineer.yml deleted file mode 100644 index 41ab8a9f8f5b2d..00000000000000 --- a/Resources/Prototypes/Roles/Jobs/ERT/engineer.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: job - parent: CentralCommandOfficial - id: ERTEngineer - name: job-name-ert-engineer - playTimeTracker: JobERTEngineer diff --git a/Resources/Prototypes/Roles/Jobs/ERT/janitor.yml b/Resources/Prototypes/Roles/Jobs/ERT/janitor.yml deleted file mode 100644 index 62e0e51cd520aa..00000000000000 --- a/Resources/Prototypes/Roles/Jobs/ERT/janitor.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: job - parent: CentralCommandOfficial - id: ERTJanitor - name: job-name-ert-janitor - playTimeTracker: JobERTJanitor diff --git a/Resources/Prototypes/Roles/Jobs/ERT/leader.yml b/Resources/Prototypes/Roles/Jobs/ERT/leader.yml deleted file mode 100644 index 3cef58e97b522e..00000000000000 --- a/Resources/Prototypes/Roles/Jobs/ERT/leader.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: job - parent: CentralCommandOfficial - id: ERTLeader - name: job-name-ert-leader - playTimeTracker: JobERTLeader diff --git a/Resources/Prototypes/Roles/Jobs/ERT/medic.yml b/Resources/Prototypes/Roles/Jobs/ERT/medic.yml deleted file mode 100644 index 425a4f7a9aec77..00000000000000 --- a/Resources/Prototypes/Roles/Jobs/ERT/medic.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: job - parent: CentralCommandOfficial - id: ERTMedic - name: job-name-ert-medic - playTimeTracker: JobERTMedic diff --git a/Resources/Prototypes/Roles/Jobs/ERT/security.yml b/Resources/Prototypes/Roles/Jobs/ERT/security.yml deleted file mode 100644 index 9c2ede945f7070..00000000000000 --- a/Resources/Prototypes/Roles/Jobs/ERT/security.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: job - parent: CentralCommandOfficial - id: ERTSecurity - name: job-name-ert-security - playTimeTracker: JobERTSecurity diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 4389efc0ff8a98..a3c626f389ba07 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -43,7 +43,7 @@ - ERTLeader - ERTChaplain - ERTJanitor - - ERTMedic + - ERTMedical - ERTSecurity - ERTEngineer - Deathsquad @@ -68,7 +68,7 @@ - ERTLeader - ERTChaplain - ERTJanitor - - ERTMedic + - ERTMedical - ERTSecurity - ERTEngineer - Deathsquad