diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl index 05d4517250d..fdadb30045d 100644 --- a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl +++ b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl @@ -1,2 +1,5 @@ -job-name-magistrat = Магистрат +job-name-magistrat = магистрат job-name-centcomop = оператор Центком + +JobCentCommOfficial = представитель Центком +JobMagistrat = магистрат diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index 61527c31c1f..6d7b51b8fd6 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -53,7 +53,6 @@ JobBorg = киборг JobBotanist = ботаник JobCaptain = капитан JobCargoTechnician = грузчик -JobCentralCommandOfficial = представитель Центком JobChaplain = священник JobChef = шеф-повар JobChemist = химик diff --git a/Resources/Maps/_Sunrise/Station/centcomm.yml b/Resources/Maps/_Sunrise/Station/centcomm.yml index 714e504ae4f..5e809f2b622 100644 --- a/Resources/Maps/_Sunrise/Station/centcomm.yml +++ b/Resources/Maps/_Sunrise/Station/centcomm.yml @@ -33088,14 +33088,14 @@ entities: - type: Transform pos: 7.5,-21.5 parent: 1668 -- proto: SpawnPointCentralCommandOfficial +- proto: SpawnPointCentCommOfficial entities: - uid: 6518 components: - type: Transform pos: 0.5,-1.5 parent: 1668 -- proto: SpawnPointCentralCommandOperator +- proto: SpawnPointCentCommOperator entities: - uid: 6517 components: diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 320be4f0a65..bcc9537741f 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -47,15 +47,6 @@ primary: false weight: 100 -- type: department - id: CentralCommand - description: department-CentralCommand-description - color: "#048e0f" # Sunrise-Edit - roles: - - CentralCommandOfficial - - CentralCommandOperator - primary: false - - type: department id: Engineering description: department-Engineering-description diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 402d49e90d2..8420da50320 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -22,9 +22,6 @@ - type: playTimeTracker id: JobCargoTechnician -- type: playTimeTracker - id: JobCentralCommandOfficial - - type: playTimeTracker id: JobChaplain diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml index ea69d1659dc..b3f5db85ab0 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml @@ -25,12 +25,12 @@ - state: brigmedic - type: entity - id: SpawnPointCentralCommandOperator + id: SpawnPointCentCommOperator parent: SpawnPointJobBase name: Central Command Operator components: - type: SpawnPoint - job_id: CentralCommandOperator + job_id: CentCommOperator - type: Sprite sprite: Markers/jobs.rsi layers: @@ -38,12 +38,12 @@ - state: centcom - type: entity - id: SpawnPointCentralCommandOfficial + id: SpawnPointCentCommOfficial parent: SpawnPointJobBase name: Central Command Official components: - type: SpawnPoint - job_id: CentralCommandOfficial + job_id: CentCommOfficial - type: Sprite sprite: Markers/jobs.rsi layers: diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml index e8af8af9669..92280108493 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml @@ -27,3 +27,19 @@ - Bra - Pants - Socks + +- type: roleLoadout + id: JobCentCommOfficial + groups: + - Trinkets + - Bra + - Pants + - Socks + +- type: roleLoadout + id: JobCentCommOperator + groups: + - Trinkets + - Bra + - Pants + - Socks diff --git a/Resources/Prototypes/_Sunrise/Maps/centcomm.yml b/Resources/Prototypes/_Sunrise/Maps/centcomm.yml index da0245fa2cb..77cbd20121a 100644 --- a/Resources/Prototypes/_Sunrise/Maps/centcomm.yml +++ b/Resources/Prototypes/_Sunrise/Maps/centcomm.yml @@ -14,5 +14,5 @@ prefixCreator: 'TG' - type: StationJobs availableJobs: - CentralCommandOperator: [ 1, 1 ] - CentralCommandOfficial: [ 1, 1 ] + CentCommOperator: [ 1, 1 ] + CentCommOfficial: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml index ffe85187767..c0dc073059a 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml @@ -1,14 +1,14 @@ - type: job - id: CentralCommandOfficial + id: CentCommOfficial name: job-name-centcomoff description: job-description-centcomoff - playTimeTracker: JobCentralCommandOfficial + playTimeTracker: JobCentCommOfficial requirements: - !type:DepartmentTimeRequirement department: Command time: 180000 #50 hrs setPreference: true - startingGear: CentcomOfficialGear + startingGear: CentCommOfficialGear icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom radioBold: true @@ -22,7 +22,7 @@ - Vox - type: startingGear - id: CentcomOfficialGear + id: CentCommOfficialGear equipment: jumpsuit: ClothingUniformJumpsuitCentcomOfficial shoes: ClothingShoesBootsCombatFilled diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml index fd57f5fcd9b..c0e54f89087 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml @@ -1,14 +1,14 @@ - type: job - id: CentralCommandOperator + id: CentCommOperator name: job-name-centcomop description: job-description-centcomop - playTimeTracker: JobCentralCommandOperator + playTimeTracker: JobCentCommOperator requirements: - !type:DepartmentTimeRequirement department: Command time: 180000 #50 hrs setPreference: true - startingGear: CentcomOperatorGear + startingGear: CentCommOperatorGear icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom radioBold: true @@ -22,7 +22,7 @@ - Vox - type: startingGear - id: CentcomOperatorGear + id: CentCommOperatorGear equipment: jumpsuit: ClothingUniformJumpsuitCentcomAdmiral shoes: ClothingShoesBootsJack diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml index 91ffa27bd95..0933e3bd062 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -2,8 +2,18 @@ id: Law description: department-Law-description color: "#FF5297" - weight: -10 + weight: 80 roles: - Magistrat - IAA - Lawyer + +- type: department + id: CentralCommand + description: department-CentralCommand-description + color: "#048e0f" # Sunrise-Edit + weight: 120 + roles: + - CentCommOfficial + - CentCommOperator + primary: false diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml index fb520008d80..40921a7062a 100644 --- a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml @@ -8,4 +8,7 @@ id: JobBrigmedic - type: playTimeTracker - id: JobCentralCommandOperator + id: JobCentCommOperator + +- type: playTimeTracker + id: JobCentCommOfficial