From b80f2dbecffa6d003da427cf0f41136aac11d9ce Mon Sep 17 00:00:00 2001 From: DarkSide-droids Date: Thu, 7 Nov 2024 17:22:07 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D0=BD=D1=81=D0=BF=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/IdCardConsoleComponent.cs | 2 +- .../en-US/deltav/job/job-description.ftl | 2 +- .../Locale/en-US/deltav/job/job-names.ftl | 2 +- .../deltav/navmap-beacons/station-beacons.ftl | 2 +- .../deltav/prototypes/access/accesses.ftl | 2 +- .../deltav/entities/clothing/neck/misc.ftl | 4 +- .../entities/clothing/uniforms/jumpskirts.ftl | 4 +- .../entities/clothing/uniforms/jumpsuits.ftl | 4 +- .../deltav/entities/markers/spawners/jobs.ftl | 2 +- .../deltav/entities/objects/devices/pda.ftl | 2 +- .../objects/devices/station_beacon.ftl | 4 +- .../structures/doors/airlocks/access.ftl | 12 ++--- .../structures/doors/windoors/windoor.ftl | 4 +- .../devices/electronics/door_access.ftl | 4 +- .../objects/misc/identification_cards.ftl | 2 +- .../ru-RU/deltav/job/job-description.ftl | 2 +- .../Locale/ru-RU/deltav/job/job-names.ftl | 2 +- .../deltav/navmap-beacons/station-beacons.ftl | 2 +- .../deltav/prototypes/access/accesses.ftl | 2 +- .../deltav/entities/clothing/neck/misc.ftl | 4 +- .../entities/clothing/uniforms/jumpskirts.ftl | 4 +- .../entities/clothing/uniforms/jumpsuits.ftl | 4 +- .../deltav/entities/markers/spawners/jobs.ftl | 2 +- .../deltav/entities/objects/devices/pda.ftl | 2 +- .../objects/devices/station_beacon.ftl | 4 +- .../structures/doors/airlocks/access.ftl | 12 ++--- .../structures/doors/windoors/windoor.ftl | 4 +- .../devices/electronics/door_access.ftl | 4 +- .../objects/misc/identification_cards.ftl | 2 +- .../Maps/_LostParadise/Hell/H_LPPAsterisk.yml | 2 +- .../Maps/_LostParadise/Hell/H_LPPKerberos.yml | 4 +- .../Maps/_LostParadise/Hell/H_LPPNormandy.yml | 4 +- .../Maps/_LostParadise/Hell/H_LPPPebble.yml | 2 +- Resources/Maps/_LostParadise/LPPAsterisk.yml | 2 +- Resources/Maps/_LostParadise/LPPKerberos.yml | 4 +- Resources/Maps/_LostParadise/LPPNormandy.yml | 4 +- Resources/Maps/_LostParadise/LPPPebble.yml | 2 +- Resources/Maps/_LostParadise/LPPSubmarine.yml | 2 +- Resources/Maps/glacier.yml | 10 ++-- Resources/Maps/radstation.yml | 2 +- Resources/Prototypes/Access/misc.yml | 2 +- .../Prototypes/DeltaV/Access/justice.yml | 6 +-- Resources/Prototypes/DeltaV/Access/misc.yml | 2 +- .../DeltaV/Catalog/Fills/Boxes/pda.yml | 2 +- .../DeltaV/Entities/Clothing/Neck/misc.yml | 6 +-- .../Entities/Clothing/Uniforms/jumpskirts.yml | 6 +-- .../Entities/Clothing/Uniforms/jumpsuits.yml | 6 +-- .../DeltaV/Entities/Markers/Spawners/jobs.yml | 6 +-- .../DeltaV/Entities/Objects/Devices/pda.yml | 6 +-- .../Objects/Devices/station_beacon.yml | 6 +-- .../Structures/Doors/Airlocks/access.yml | 18 +++---- .../Structures/Doors/Windoors/windoor.yml | 6 +-- .../Roles/Jobs/Justice/chief_justice.yml | 2 +- .../DeltaV/Roles/Jobs/Justice/clerk.yml | 2 +- .../DeltaV/Roles/Jobs/Justice/prosecutor.yml | 38 --------------- .../DeltaV/Roles/Jobs/departments.yml | 2 +- .../Prototypes/DeltaV/StatusEffects/job.yml | 12 ++--- .../Devices/Electronics/door_access.yml | 6 +-- .../Objects/Misc/identification_cards.yml | 6 +-- .../Objects/Tools/access_configurator.yml | 2 +- Resources/Prototypes/Maps/radstation.yml | 2 +- .../Roles/Jobs/Command/head_of_personnel.yml | 2 +- .../Prototypes/Roles/play_time_trackers.yml | 2 +- .../_LostParadise/Maps/Hell/H_asterisk.yml | 2 +- .../_LostParadise/Maps/Hell/H_kerberos.yml | 2 +- .../_LostParadise/Maps/Hell/H_normandy.yml | 2 +- .../_LostParadise/Maps/Hell/H_pebble.yml | 2 +- .../_LostParadise/Maps/asterisk.yml | 2 +- .../_LostParadise/Maps/kerberos.yml | 2 +- .../_LostParadise/Maps/normandy.yml | 2 +- .../Prototypes/_LostParadise/Maps/pebble.yml | 2 +- .../_LostParadise/Maps/submarine.yml | 2 +- .../Roles/Jobs/Justice/inspector.yml | 44 ++++++++++++++++++ .../_LostParadise/StatusEffects/jobs.yml | 7 +++ .../ServerInfo/Guidebook/DeltaV/Justice.xml | 8 ++-- .../Misc/lpp_job_icons.rsi/Inspector.png | Bin 0 -> 88 bytes .../Misc/lpp_job_icons.rsi/meta.json | 5 +- 77 files changed, 193 insertions(+), 177 deletions(-) delete mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml create mode 100644 Resources/Prototypes/_LostParadise/Roles/Jobs/Justice/inspector.yml create mode 100644 Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Inspector.png diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index e61fc0a6b71..c33825e852e 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -91,7 +91,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List @@ -45,7 +45,7 @@ [color=#00FF00]ГРАЖДАНСКИЕ ПРОЦЕССЫ[/color] -Для рассмотрения гражданских дел не требуются адвокаты или прокуроры, но они могут получить помощь как до, так и во время рассмотрения дела. [color=#a4885c] Как ответчик, так и истец должны быть вызваны в суд[/color], если сторона [color=#a4885c] не явилась[/color] либо из-за отказа, либо по небрежности, либо [color=#a4885c]не выполняет решение суда. по решению[/color] гражданского суда этой стороне может быть предъявлено обвинение в неуважении к суду, [color=#FF0000] уголовном преступлении[/color]. +Для рассмотрения гражданских дел не требуются адвокаты или инспекторы, но они могут получить помощь как до, так и во время рассмотрения дела. [color=#a4885c] Как ответчик, так и истец должны быть вызваны в суд[/color], если сторона [color=#a4885c] не явилась[/color] либо из-за отказа, либо по небрежности, либо [color=#a4885c]не выполняет решение суда. по решению[/color] гражданского суда этой стороне может быть предъявлено обвинение в неуважении к суду, [color=#FF0000] уголовном преступлении[/color]. Гражданское дело предполагает [color=#a4885c]взыскание убытков[/color] с ответчика, которые могут быть денежными, товарными или иными. - Выбранный судья начинает судебное разбирательство, как только защита и истец будут готовы. diff --git a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Inspector.png b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/Inspector.png new file mode 100644 index 0000000000000000000000000000000000000000..47ff1b9568cfc4d68b5cfd9c980484a2bbffbccd GIT binary patch literal 88 zcmV-e0H^;_Nk&Fc00012MM6+kP&iCO0000l2fzUkAE2gf1E%vXf3&3`5Flij@}EOU uK*&b;|I+*i!2e1Wj6{;s=RQvd)@5h3*e literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json index 0730c1b46ec..6fe6af3874d 100644 --- a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Draw by JayJacobs + Pe4henika + BL02DL", + "copyright": "Draw by JayJacobs + Pe4henika + BL02DL + timixx7019", "size": { "x": 8, "y": 8 @@ -51,6 +51,9 @@ }, { "name": "Nanotrasen" + }, + { + "name": "Inspector" } ] } From 8dd730a6c586230c857182dd9b3a2124e3686664 Mon Sep 17 00:00:00 2001 From: DarkSide-droids Date: Thu, 7 Nov 2024 17:44:07 +0300 Subject: [PATCH 2/2] Speed fix CanBeAntag ispector --- .../Prototypes/_LostParadise/Roles/Jobs/Justice/inspector.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Justice/inspector.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Justice/inspector.yml index 134b9e0aad4..c0063d52dd8 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Justice/inspector.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Justice/inspector.yml @@ -12,6 +12,7 @@ startingGear: InspectorGear icon: "JobIconInspector" supervisors: job-supervisors-cj + canBeAntag: false access: - Inspector - Justice