Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Resources/Locale/en-US/_ES/jobs/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ ESjob-description-coroner = Perform autopsies to find information about dead bod
ESjob-description-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes.
ESjob-description-engineer = Keep the station's main engine & solars active, optimize the power network, and make emergency repairs using your hardsuit in spaced areas.
ESjob-description-hop = Handle access reassignment fairly using your ID console, manage the Service department, and keep Ian safe.
ESjob-description-hos = Manage your security force and keep them efficient, quell dissent, and keep the other heads of staff safe.
ESjob-description-janitor = Keep the station clean of any trash or slipping hazards, and help deal with rat infestations.
ESjob-description-physician = Diagnose and heal crewmembers through medicinal chemicals, advanced medicine, and defibrillators.
ESjob-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news.
ESjob-description-scientist = Research alien artifacts, unlock new technologies, build newer and better machines around the station, and make everything run more efficiently.
ESjob-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray.
ESjob-description-warden = Patrol the Security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up.
4 changes: 0 additions & 4 deletions Resources/Locale/en-US/_ES/jobs/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ ESjob-name-coroner = Coroner
ESjob-name-detective = Detective
ESjob-name-janitor = Janitor
ESjob-name-hop = Head of Personnel
ESjob-name-hos = Head of Security
ESjob-name-physician = Physician
ESjob-name-reporter = Reporter
ESjob-name-scientist = Scientist
ESjob-name-security = Security Officer
ESjob-name-engineer = Station Engineer
ESjob-name-warden = Warden

# Role timers - Make these alphabetical or I cut you
ESJobAssistant = Assistant
Expand All @@ -33,10 +31,8 @@ ESJobCoroner = Coroner
ESJobDetective = Detective
ESJobJanitor = Janitor
ESJobHeadOfPersonnel = Head of Personnel
ESJobHeadOfSecurity = Head of Security
ESJobPhysician = Physician
ESJobReporter = Reporter
ESJobScientist = Scientist
ESJobSecurityOfficer = Security Officer
ESJobStationEngineer = Station Engineer
ESJobWarden = Warden
26 changes: 0 additions & 26 deletions Resources/Prototypes/_ES/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,6 @@
- state: green
- state: hop

- type: entity
id: ESSpawnPointHeadOfSecurity
parent: SpawnPointJobBase
name: headofsecurity
suffix: ES
components:
- type: SpawnPoint
job_id: ESHeadOfSecurity
- type: Sprite
layers:
- state: green
- state: hos

# Engineering

- type: entity
Expand Down Expand Up @@ -250,19 +237,6 @@

# Security

- type: entity
id: ESSpawnPointWarden
parent: SpawnPointJobBase
name: warden
suffix: ES
components:
- type: SpawnPoint
job_id: ESWarden
- type: Sprite
layers:
- state: green
- state: warden

- type: entity
id: ESSpawnPointSecurityOfficer
parent: SpawnPointJobBase
Expand Down
7 changes: 0 additions & 7 deletions Resources/Prototypes/_ES/Masks/base_masks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,13 @@
prohibitedJobs:
- ESCaptain
- ESHeadOfPersonnel
- ESHeadOfSecurity

- type: esMask
id: ESBaseCommandSecRestricted
abstract: true
prohibitedJobs:
# Command
- ESCaptain
- ESHeadOfPersonnel
- ESHeadOfSecurity
# Security
- ESWarden
- ESSecurityOfficer
- ESDetective
Comment on lines -13 to -20

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change makes this prototype identical to the one above it. this should still have the sec roles in here, but it just shouldnt be used for the base traitor mask


- type: esMask
parent: ESBaseCommandSecRestricted
Expand Down
49 changes: 0 additions & 49 deletions Resources/Prototypes/_ES/Roles/Jobs/Command/head_of_security.yml

This file was deleted.

41 changes: 0 additions & 41 deletions Resources/Prototypes/_ES/Roles/Jobs/Security/warden.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Resources/Prototypes/_ES/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
roles:
- ESCaptain
- ESHeadOfPersonnel
- ESHeadOfSecurity
primary: false
weight: 100

Expand Down Expand Up @@ -70,10 +69,8 @@
color: "#DE3A3A"
weight: 20
roles:
- ESHeadOfSecurity
- ESSecurityOfficer
- ESDetective
- ESWarden

- type: department
id: ESScience
Expand Down
8 changes: 1 addition & 7 deletions Resources/Prototypes/_ES/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
- type: playTimeTracker
id: ESJobHeadOfPersonnel

- type: playTimeTracker
id: ESJobHeadOfSecurity

- type: playTimeTracker
id: ESJobJanitor

Expand All @@ -54,7 +51,4 @@
id: ESJobSecurityOfficer

- type: playTimeTracker
id: ESJobStationEngineer

- type: playTimeTracker
id: ESJobWarden
id: ESJobStationEngineer
4 changes: 2 additions & 2 deletions Resources/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,13 @@ SpawnPointBotanist: ESSpawnPointBotanist
SpawnPointJanitor: ESSpawnPointJanitor
SpawnPointCaptain: ESSpawnPointCaptain
SpawnPointHeadOfPersonnel: ESSpawnPointHeadOfPersonnel
SpawnPointHeadOfSecurity: ESSpawnPointHeadOfSecurity
SpawnPointHeadOfSecurity: ESSpawnPointSecurityOfficer
SpawnPointStationEngineer: ESSpawnPointStationEngineer
SpawnPointAtmos: ESSpawnPointAtmos
SpawnPointMedicalDoctor: ESSpawnPointMedicalDoctor
SpawnPointChemist: ESSpawnPointChemist
SpawnPointScientist: ESSpawnPointScientist
SpawnPointWarden: ESSpawnPointWarden
SpawnPointWarden: ESSpawnPointSecurityOfficer
SpawnPointSecurityOfficer: ESSpawnPointSecurityOfficer
SpawnPointDetective: ESSpawnPointDetective

Expand Down
Loading