diff --git a/Resources/Prototypes/AlertLevels/alert_levels.yml b/Resources/Prototypes/AlertLevels/alert_levels.yml index 6a2cf224c4..ba0b96ae81 100644 --- a/Resources/Prototypes/AlertLevels/alert_levels.yml +++ b/Resources/Prototypes/AlertLevels/alert_levels.yml @@ -32,7 +32,6 @@ - type: alertLevel id: Violet announcement: alert-level-violet-announcement - selectable: false # SOP-Playtest sound: /Audio/Misc/notice1.ogg color: Violet emergencyLightColor: Violet @@ -42,7 +41,6 @@ - type: alertLevel id: Yellow announcement: alert-level-yellow-announcement - selectable: false # SOP-Playtest sound: /Audio/Misc/notice1.ogg color: Yellow emergencyLightColor: Goldenrod diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 9e8e8953fa..e6c48a608c 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -4,10 +4,8 @@ description: job-description-chaplain playTimeTracker: JobChaplain startingGear: ChaplainGear - # SOP-Playtest-Start - # subnames: - # - Male: религиовед - # SOP-Playtest-End + subnames: + - Male: религиовед icon: "JobIconChaplain" supervisors: job-supervisors-hop access: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index ddda049e81..11029cdf88 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -7,7 +7,7 @@ - Male: комик - Male: актёр Female: актриса - # - Male: театральный режиссёр # SOP-Playtest + - Male: театральный режиссёр requirements: - !type:OverallPlaytimeRequirement time: 3600 #1 hrs # Corvax-RoleTime diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index c5d69fe7ac..1e11e3b0eb 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -6,10 +6,8 @@ requirements: - !type:AgeRequirement age: 4 # WL-Changes-AgeRequirement - # SOP-Playtest-Start - # subnames: - # - Male: социологист - # SOP-Playtest-End + subnames: + - Male: социологист startingGear: LibrarianGear icon: "JobIconLibrarian" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 9f65611a09..eb5c87977e 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -9,9 +9,8 @@ - Male: пианист - Male: гитарист - Male: певец - # SOP-Playtest-Start - # - Male: поэт - # - Male: артист + - Male: поэт + - Male: артист icon: "JobIconMusician" supervisors: job-supervisors-hop # Corvax-JobSupervisors access: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 9224110f2e..7df94c8aa3 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -14,11 +14,6 @@ - Male: стюард - Male: сервисный ассистент - Male: крупье - # SOP-Playtest-Start - - Male: артист - Female: артистка - - Male: театральный режиссёр - # SOP-Playtest-End icon: "JobIconServiceWorker" supervisors: job-supervisors-service access: diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index e6202a516b..f04294e4ca 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -4,7 +4,7 @@ description: job-description-cadet playTimeTracker: JobSecurityCadet subnames: - - Male: стажёр СБ # SOP-Playtest - стажер безопасности > стажёр СБ + - Male: стажёр безопасности requirements: - !type:OverallPlaytimeRequirement time: 10h # Corvax-RoleTime diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index 1bc3add230..db479ead2b 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -11,7 +11,6 @@ - Male: корреспондент - Male: телеведущий - Male: радиоведущий - - Male: социолог # SOP-Playtest startingGear: ReporterGear icon: "JobIconReporter" supervisors: job-supervisors-hop