From 83d23026afecccbc5e434a5e91c102e7cffaa121 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+Evgencheg@users.noreply.github.com> Date: Tue, 3 Sep 2024 21:17:27 +0300 Subject: [PATCH] =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/_LostParadise/Jobs/jobs.ftl | 52 +++-- Resources/Locale/ru-RU/job/job-names.ftl | 192 +++++++++--------- .../_LostParadise/Access/security.yml | 3 - .../Entities/Clothing/Back/backpack.yml | 11 +- .../Entities/Clothing/Back/duffel.yml | 9 - .../Entities/Clothing/Back/satchel.yml | 11 +- .../Entities/Clothing/Ears/headsets.yml | 31 --- .../Entities/Clothing/Uniforms/misc_roles.yml | 22 -- .../Entities/Markers/Spawners/jobs.yml | 60 ------ .../Objects/Devices/encryption_keys.yml | 14 -- .../Entities/Objects/Devices/pda.yml | 46 ----- .../Objects/Misc/identification_cards.yml | 136 ------------- .../Roles/Jobs/Civilian/LPPPrisoner.yml | 18 -- .../Roles/Jobs/Law/magistrate.yml | 47 ----- .../Roles/Jobs/Medical/paramedic.yml | 80 -------- .../Roles/Jobs/Medical/virologist.yml | 30 --- .../Roles/Jobs/Science/roboticist.yml | 29 --- .../Roles/Jobs/Security/lppbrigmedic.yml | 45 ---- .../Roles/Jobs/Security/senior_officer.yml | 39 ---- .../Roles/Jobs/play_time_trackers.yml | 29 +-- .../_LostParadise/StatusEffects/jobs.yml | 7 - 21 files changed, 123 insertions(+), 788 deletions(-) delete mode 100644 Resources/Prototypes/_LostParadise/Access/security.yml delete mode 100644 Resources/Prototypes/_LostParadise/Entities/Objects/Devices/encryption_keys.yml delete mode 100644 Resources/Prototypes/_LostParadise/Roles/Jobs/Civilian/LPPPrisoner.yml delete mode 100644 Resources/Prototypes/_LostParadise/Roles/Jobs/Law/magistrate.yml delete mode 100644 Resources/Prototypes/_LostParadise/Roles/Jobs/Medical/paramedic.yml delete mode 100644 Resources/Prototypes/_LostParadise/Roles/Jobs/Medical/virologist.yml delete mode 100644 Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml delete mode 100644 Resources/Prototypes/_LostParadise/Roles/Jobs/Security/lppbrigmedic.yml delete mode 100644 Resources/Prototypes/_LostParadise/Roles/Jobs/Security/senior_officer.yml diff --git a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl index 553e031ff1..8281f590b8 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl @@ -1,8 +1,9 @@ -job-name-lppparamedic = парамедик +job-name-lppparamedic = Gарамедик job-description-lppparamedic = Следите за жизнями экипажа, ходите по станции с монитором экипажа и слушайте рацию. -job-name-adjutant = адъютант +job-name-adjutant = Адъютант job-description-adjutant = Вы помощник всего коммандования, слушайте рацию и набирайтесь опыта в работе всей структуры. -JobLPPadjutant = адъютант +JobLPPadjutant = Адъютант +JobLPPBlueShieldOfficer = Офицер "Синий щит" ent-LPPAdjutantPDA = КПК Адъютанта .desc = Установлена прошивка для помощников командования. ent-LPPAdjutantIDCard = ID карта Адъютанта @@ -11,41 +12,36 @@ ent-LPPCentralCommandRepresentativePDA = КПК представителя ЦК .desc = Пахнет бюрократией. .suffix = { "" } job-name-centcom-representative = представитель ЦентКом -job-name-blueshieldofficer = офицер "синий щит" -job-description-blueshieldofficer = Ваша задача защитить всех глав на станции. Следите за ними. -job-name-magistrate = Судья -job-description-magistrate = Вы закон! Проводите суды и следите за соблюдением КЗ. -job-supervisors-mag-iaa = Судья и АВД -job-supervisors-mag = Судья -job-supervisors-mag-centcom = центральному коммандованию и Судье +job-name-blueshieldofficer = Офицер "синий щит" +job-description-blueshieldofficer = Ваша задача защитить всех глав на станции. Следите за ними department-Law = Юридический отдел department-CentCom = Центральное Командование -job-name-borg-security = киборг СБ +job-name-borg-security = Киборг СБ job-description-borg-security = Защищайте станцию от нарушителей закона, выглядите устрашающие, и не забывайте беречь свою батарейку! -job-name-drone-security = дрон СБ +job-name-drone-security = Дрон СБ job-description-drone-security = Летайте по станции, вселяйте ужас, находите нарушителей и сообщайте офицерам службы безопасности! -lpp-job-name-virologist = вирусолог +lpp-job-name-virologist = Вирусолог lpp-job-description-virologist = Лечите экипаж от OwOнавируса. Вы же не хотите восстание кошкомальчиков? -lpp-job-name-prisoner = заключённый +lpp-job-name-prisoner = Заключённый lpp-job-description-prisoner = Будьте единственным(или одним из) разумным существом на весь бриг. -job-name-senior-engineer = ведущий инженер +job-name-senior-engineer = Ведущий инженер job-description-senior-engineer = Обучайте новых инженеров основам работы силовых установок, ремонту, атмосферике и энергоснабжению станции. -job-name-senior-researcher = ведущий учёный +job-name-senior-researcher = Ведущий учёный job-description-senior-researcher = Обучайте новых учёных основам печати предметов, исследования артефактов и аномальных объектов. -job-name-senior-physician = ведущий врач +job-name-senior-physician = Ведущий врач job-description-senior-physician = Обучайте новых врачей основам оказания помощи раненым, химии, диагностике больных и утилизации трупов. -job-name-senior-officer = инструктор СБ +job-name-senior-officer = Инструктор СБ job-description-senior-officer = Обучать новых офицеров основам обыска и задержания, срокам заключения и правильному обращению с огнестрельным оружием. -job-name-roboticist = робототехник +job-name-roboticist = Робототехник job-description-roboticist = Создавайте различных мехов, киборгов и роботов для помощи станции. -JobSeniorEngineer = ведущий инженер -JobSeniorOfficer = инструктор СБ -JobSeniorPhysician = ведущий врач -JobSeniorResearcher = ведущий учёный -JobRoboticist = робототехник -JobExpeditor = исследователь -job-name-expeditor = исследователь +JobSeniorEngineer = Ведущий инженер +JobSeniorOfficer = Инструктор СБ +JobSeniorPhysician = Ведущий врач +JobSeniorResearcher = Ведущий учёный +JobRoboticist = Робототехник +JobExpeditor = Исследователь +job-name-expeditor = Исследователь job-description-expeditor = Исследуйте врата и помогайте станции! -LPPJobSecurityEnginer = полевой инженер -job-name-security-enginer = полевой инженер +LPPJobSecurityEnginer = Полевой инженер +job-name-security-enginer = Полевой инженер job-description-security-enginer = Не дайте бригу пропасть во тьме. Ремонтируйте постройки, а также устройте перестройки. Приносите разруху и разрушения во время штурма! diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index c9a095bee3..572d3d2fa9 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -1,100 +1,100 @@ -job-name-warden = смотритель -job-name-security = офицер СБ -job-name-cadet = кадет СБ -job-name-hos = глава службы безопасности -job-name-detective = детектив -job-name-brigmedic = медицинский офицер -job-name-borg = киборг -job-name-scientist = учёный -job-name-research-assistant = научный ассистент +job-name-warden = Смотритель +job-name-security = Офицер СБ +job-name-cadet = Кадет СБ +job-name-hos = Глава Службы Безопасности +job-name-detective = Детектив +job-name-brigmedic = Медицинский Офицер +job-name-borg = Киборг +job-name-scientist = Учёный +job-name-research-assistant = Научный Ассистент job-name-rd = Научный Директор -job-name-psychologist = психолог -job-name-intern = интерн -job-name-doctor = врач -job-name-paramedic = парамедик -job-name-cmo = главный врач -job-name-chemist = химик -job-name-technical-assistant = технический ассистент -job-name-engineer = инженер -job-name-atmostech = атмосферный техник -job-name-hop = глава персонала -job-name-captain = капитан -job-name-serviceworker = сервисный работник -job-name-centcomoff = представитель Центком -job-name-reporter = репортёр -job-name-musician = музыкант -job-name-librarian = библиотекарь -job-name-mime = мим -job-name-ce = старший инженер -job-name-janitor = уборщик +job-name-psychologist = Психолог +job-name-intern = Интерн +job-name-doctor = Врач +job-name-paramedic = Парамедик +job-name-cmo = Главный Врач +job-name-chemist = Химик +job-name-technical-assistant = Технический Ассистент +job-name-engineer = Инженер +job-name-atmostech = Атмосферный Техник +job-name-hop = Глава Персонала +job-name-captain = Капитан +job-name-serviceworker = Сервисный Работник +job-name-centcomoff = Представитель Центком +job-name-reporter = Репортёр +job-name-musician = Музыкант +job-name-librarian = Библиотекарь +job-name-mime = Мим +job-name-ce = Старший Инженер +job-name-janitor = Уборщик job-name-chaplain = Священник -job-name-botanist = ботаник -job-name-bartender = бармен -job-name-passenger = ассистент -job-name-salvagespec = утилизатор -job-name-qm = Офицер логистики -job-name-cargotech = грузчик -job-name-chef = шеф-повар -job-name-clown = клоун -job-name-ertleader = лидер ОБР +job-name-botanist = Ботаник +job-name-bartender = Бармен +job-name-passenger = Ассистент +job-name-salvagespec = Утилизатор +job-name-qm = Офицер Логистики +job-name-cargotech = Грузчик +job-name-chef = Шеф-повар +job-name-clown = Клоун +job-name-ertleader = Лидер ОБР job-name-ertchaplain = Священник ОБР -job-name-ertengineer = инженер ОБР -job-name-ertsecurity = офицер безопасности ОБР -job-name-ertmedic = медик ОБР -job-name-ertjanitor = уборщик ОБР -job-name-boxer = боксёр -job-name-zookeeper = зоотехник -job-name-visitor = посетитель +job-name-ertengineer = Инженер ОБР +job-name-ertsecurity = Офицер Безопасности ОБР +job-name-ertmedic = Медик ОБР +job-name-ertjanitor = Уборщик ОБР +job-name-boxer = Боксёр +job-name-zookeeper = Зоотехник +job-name-visitor = Посетитель # Role timers - Make these alphabetical or I cut you -JobAtmosphericTechnician = атмосферный техник -JobBartender = бармен -JobBorg = киборг -JobBotanist = ботаник -JobCaptain = капитан -JobCargoTechnician = грузчик -JobCentralCommandOfficial = представитель Центком -JobChaplain = священник -JobChef = шеф-повар -JobChemist = химик -JobChiefEngineer = старший инженер -JobChiefMedicalOfficer = главный врач -JobClown = клоун -JobDetective = детектив -JobERTEngineer = инженер ОБР -JobBrigmedic = медицинский офицер -JobERTChaplain = священник ОБР -JobERTJanitor = уборщик ОБР -JobERTLeader = лидер ОБР -JobERTMedical = медик ОБР -JobERTSecurity = офицер безопасности ОБР -JobHeadOfPersonnel = глава персонала -JobHeadOfSecurity = глава службы безопасности -JobJanitor = уборщик -JobLawyer = адвокат -JobLibrarian = библиотекарь -JobMedicalDoctor = врач -JobMedicalIntern = интерн -JobMime = мим -JobMusician = музыкант -JobPassenger = ассистент -JobParamedic = парамедик -JobPsychologist = психолог -JobQuartermaster = Офицер логистики -JobReporter = репортёр -JobResearchDirector = Мистагог -JobResearchAssistant = научный ассистент -JobSalvageSpecialist = утилизатор -JobScientist = учёный -JobSecurityCadet = кадет СБ -JobSecurityOfficer = офицер СБ -JobSeniorEngineer = Senior Engineer -JobSeniorOfficer = Senior Officer -JobSeniorPhysician = Senior Physician -JobSeniorResearcher = Senior Researcher -JobServiceWorker = сервисный работник -JobStationEngineer = инженер -JobTechnicalAssistant = технический ассистент -JobWarden = смотритель -JobVisitor = посетитель -JobBoxer = боксёр -JobZookeeper = зоотехник +JobAtmosphericTechnician = Атмосферный Техник +JobBartender = Бармен +JobBorg = Киборг +JobBotanist = Ботаник +JobCaptain = Капитан +JobCargoTechnician = Грузчик +JobCentralCommandOfficial = Представитель Центком +JobChaplain = Священник +JobChef = Шеф-повар +JobChemist = Химик +JobChiefEngineer = Старший Инженер +JobChiefMedicalOfficer = Главный Врач +JobClown = Клоун +JobDetective = Детектив +JobERTEngineer = Инженер ОБР +JobBrigmedic = Медицинский офицер +JobERTChaplain = Священник ОБР +JobERTJanitor = Уборщик ОБР +JobERTLeader = Лидер ОБР +JobERTMedical = Медик ОБР +JobERTSecurity = Офицер Безопасности ОБР +JobHeadOfPersonnel = Глава Персонала +JobHeadOfSecurity = Глава Службы Безопасности +JobJanitor = Уборщик +JobLawyer = Адвокат +JobLibrarian = Библиотекарь +JobMedicalDoctor = Врач +JobMedicalIntern = Интерн +JobMime = Мим +JobMusician = Музыкант +JobPassenger = Ассистент +JobParamedic = Парамедик +JobPsychologist = Психолог +JobQuartermaster = Офицер Логистики +JobReporter = Репортёр +JobResearchDirector = Научный Директор +JobResearchAssistant = Научный Ассистент +JobSalvageSpecialist = Утилизатор +JobScientist = Учёный +JobSecurityCadet = Кадет СБ +JobSecurityOfficer = Офицер СБ +JobSeniorEngineer = Старший инженер +JobSeniorOfficer = Инструктор СБ +JobSeniorPhysician = Старший психолог +JobSeniorResearcher = Старший ученый +JobServiceWorker = Сервисный работник +JobStationEngineer = Инженер +JobTechnicalAssistant = Технический ассистент +JobWarden = Смотритель +JobVisitor = Посетитель +JobBoxer = Боксёр +JobZookeeper = Зоотехник diff --git a/Resources/Prototypes/_LostParadise/Access/security.yml b/Resources/Prototypes/_LostParadise/Access/security.yml deleted file mode 100644 index abfd61a889..0000000000 --- a/Resources/Prototypes/_LostParadise/Access/security.yml +++ /dev/null @@ -1,3 +0,0 @@ -- type: accessLevel - id: LPPPrisoner - name: Заключенный diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/backpack.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/backpack.yml index 973dc8fd75..850ea5153d 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/backpack.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/backpack.yml @@ -50,15 +50,6 @@ - type: Sprite sprite: _LostParadise/Clothing/Back/Backpacks/black-pg-backpack.rsi -- type: entity - parent: ClothingBackpack - id: LPPClothingBackpackRobotics - name: robotics backpack - description: A red-striped backpack specially designed for holding spare parts and materials. - components: - - type: Sprite - sprite: _LostParadise/Clothing/Back/Backpacks/roboticist.rsi - - type: entity parent: ClothingBackpack id: LPPClothingBackpackSecurityEngineer @@ -93,4 +84,4 @@ description: Вместит всё, что надо. components: - type: Sprite - sprite: _LostParadise/Clothing/Back/Backpacks/upgbacpacks.rsi \ No newline at end of file + sprite: _LostParadise/Clothing/Back/Backpacks/upgbacpacks.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml index 3accb62e51..fcce9dd590 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml @@ -25,15 +25,6 @@ - 0,0,9,5 - type: HeldSpeedModifier -- type: entity - parent: ClothingBackpackDuffel - id: LPPClothingBackpackDuffelRobotics - name: robotics duffel bag - description: A large red-striped duffel bag for holding extra robotics related parts and materials. - components: - - type: Sprite - sprite: _LostParadise/Clothing/Back/Duffels/roboticist.rsi - - type: entity parent: ClothingBackpackDuffel id: LPPClothingBackpackDuffelSecurityEngineer diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml index 3604985bc6..3fbba8762a 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml @@ -7,15 +7,6 @@ - type: Sprite sprite: _LostParadise/Clothing/Back/Satchels/hop.rsi -- type: entity - parent: ClothingBackpackSatchel - id: LPPClothingBackpackSatchelRobotics - name: robotics satchel - description: A red-striped satchel useful for holding spare parts and materials. - components: - - type: Sprite - sprite: _LostParadise/Clothing/Back/Satchels/roboticist.rsi - - type: entity parent: LPPClothingSatchelSmugglerAbstract id: LPPClothingSatchelSmuggler @@ -55,4 +46,4 @@ description: Convenient to throw off rifle magazines. components: - type: Sprite - sprite: _LostParadise/Clothing/Back/Satchels/expeditor.rsi \ No newline at end of file + sprite: _LostParadise/Clothing/Back/Satchels/expeditor.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Ears/headsets.yml index 89cb87df0b..c5a05c35d5 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Ears/headsets.yml @@ -14,34 +14,3 @@ sprite: _LostParadise/Clothing/Ears/security.rsi - type: Clothing sprite: _LostParadise/Clothing/Ears/security.rsi - -- type: entity - parent: ClothingHeadset - id: ClothingHeadsetMagistrate - name: magistrate headset - description: A headset for internal affairs agent to hear the captain's last words. - components: - - type: ContainerFill - containers: - key_slots: - - LPPEncryptionKeyLaw - - EncryptionKeySecurity - - EncryptionKeyCommon - - EncryptionKeyCommand - - type: Sprite - sprite: Clothing/Ears/Headsets/servicesecurity.rsi - -- type: entity - parent: ClothingHeadset - id: ClothingHeadsetLawyer - name: iaa headset - description: A headset for internal affairs agent to hear the captain's last words. - components: - - type: ContainerFill - containers: - key_slots: - - LPPEncryptionKeyLaw - - EncryptionKeySecurity - - EncryptionKeyCommon - - type: Sprite - sprite: Clothing/Ears/Headsets/servicesecurity.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml index a58aa8cad9..b92f4969b1 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml @@ -17,28 +17,6 @@ containers: toggleable-clothing: !type:ContainerSlot {} -- type: entity - parent: ClothingUniformJumpsuitLawyerBlack - id: LPPIAASuite - name: iaa suit - description: IAA suit. - components: - - type: Sprite - sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/iaa-suite.rsi - - type: Clothing - sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/iaa-suite.rsi - -- type: entity - parent: ClothingUniformJumpsuitLawyerBlack - id: LPPMagistrateUniform - name: Magistrate suit - description: Magitstrate suit. - components: - - type: Sprite - sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi - - type: Clothing - sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi - - type: entity parent: ClothingUniformBase id: LPPClothingUniformJumpsuitBlueshield diff --git a/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml index 9b0f1dd610..d080fe8ef0 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/jobs.yml @@ -1,39 +1,3 @@ -- type: entity - id: LPPSpawnPointPrisoner - parent: SpawnPointJobBase - name: prisoner - components: - - type: SpawnPoint - job_id: LPPPrisoner - - type: Sprite - layers: - - state: green - - state: passenger - -- type: entity - id: LPPSpawnPointLawyer - parent: SpawnPointJobBase - name: lawyer - components: - - type: SpawnPoint - job_id: Lawyer - - type: Sprite - layers: - - state: green - - state: lawyer - -- type: entity - id: LPPSpawnPointVirologist - parent: SpawnPointJobBase - name: virologist - components: - - type: SpawnPoint - job_id: LPPVirologist - - type: Sprite - layers: - - state: green - - state: virologist - - type: entity id: LPPAdjutantSpawn parent: SpawnPointJobBase @@ -46,18 +10,6 @@ - state: green - state: hop -#- type: entity -# id: SpawnMagistrate -# parent: SpawnPointJobBase -# name: magistrate spawn -# components: -# - type: SpawnPoint -# job_id: Magistrate -# - type: Sprite -# layers: -# - state: green -# - state: reporter - - type: entity id: SpawnSecPilot parent: SpawnPointJobBase @@ -81,15 +33,3 @@ layers: - state: green - state: expeditor - -- type: entity - id: SpawnRoboticist - parent: SpawnPointJobBase - name: Roboticist - components: - - type: SpawnPoint - job_id: Roboticist - - type: Sprite - layers: - - state: green - - state: roboticist diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/encryption_keys.yml deleted file mode 100644 index 6a8b59f326..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/encryption_keys.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: EncryptionKey - id: LPPEncryptionKeyLaw - name: law encryption key - description: An encryption key used by the most meticulous person. - components: - - type: EncryptionKey - channels: - - Law - defaultChannel: Law - - type: Sprite - layers: - - state: crypt_silver - - state: nano_label \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml index 6ec04d44a3..92f2008802 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml @@ -1,37 +1,3 @@ -- type: entity - parent: BasePDA - id: RoboticsPDA - name: robotics PDA - description: It's covered with scratches all over it. - components: - - type: Pda - id: RoboticsIDCard - state: pda-roboticist - - type: PdaBorderColor - borderColor: "#484848" - accentVColor: "#d33725" - - type: Icon - state: pda-roboticist - -- type: entity - parent: BasePDA - id: LPPVirologistPDA - name: virologist PDA - description: Shiny and sterile. Has a built-in rapid health analyzer. - components: - - type: Pda - id: LPPVirologistIDCard - state: pda-virology - - type: PdaBorderColor - borderColor: "#B1B5BF" - accentVColor: "#4E6B50" - - type: Icon - state: pda-virology - - type: HealthAnalyzer - scanDelay: 1 - scanningEndSound: - path: "/Audio/Items/Medical/healthscanner.ogg" - - type: entity parent: BasePDA id: LPPSecurityEnginerPDA @@ -75,18 +41,6 @@ - type: Icon state: pda-clear -- type: entity - parent: BasePDA - id: MagistratePDA - name: magistrate PDA - description: magistrate PDA - components: - - type: Pda - id: MagistrateIDCard - state: pda-lawyer - - type: Icon - state: pda-lawyer - - type: entity parent: BasePDA id: LPPExpeditorPDA diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml index 88a0abfb2a..d9ac64f5d8 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml @@ -1,110 +1,3 @@ -- type: entity - parent: IDCardStandard - id: LPPIDCardPrisoner - name: ID карточка заключенного - suffix: Prisoner - components: - - type: Sprite - scale: 0.55, 0.55 - state: orange - - type: PresetIdCard - job: LPPPrisoner - -- type: entity - parent: LPPIDCardPrisoner - id: LPPIDCardPrisoner01 - components: - - type: Sprite - state: prisoner_001 - - type: PresetIdCard - job: LPPPrisoner - -- type: entity - parent: LPPIDCardPrisoner - id: LPPIDCardPrisoner02 - components: - - type: Sprite - state: prisoner_002 - - type: PresetIdCard - job: LPPPrisoner - -- type: entity - parent: LPPIDCardPrisoner - id: LPPIDCardPrisoner03 - components: - - type: Sprite - state: prisoner_003 - - type: PresetIdCard - job: LPPPrisoner - -- type: entity - parent: LPPIDCardPrisoner - id: LPPIDCardPrisoner04 - components: - - type: Sprite - state: prisoner_004 - - type: PresetIdCard - job: LPPPrisoner - -- type: entity - parent: LPPIDCardPrisoner - id: LPPIDCardPrisoner05 - components: - - type: Sprite - state: prisoner_005 - - type: PresetIdCard - job: LPPPrisoner - -- type: entity - parent: LPPIDCardPrisoner - id: LPPIDCardPrisoner06 - components: - - type: Sprite - state: prisoner_006 - - type: PresetIdCard - job: LPPPrisoner - -- type: entity - parent: LPPIDCardPrisoner - id: LPPIDCardPrisoner07 - components: - - type: Sprite - state: prisoner_007 - - type: PresetIdCard - job: LPPPrisoner - -- type: entity - parent: IDCardStandard - id: RoboticsIDCard - name: robotics ID card - components: - - type: Sprite - layers: - - state: default - - state: department - color: "#C96DBF" - - state: subdepartment - color: "#C96DBF" - - state: idroboticist - - type: PresetIdCard - job: Roboticist - -- type: entity - parent: IDCardStandard - id: LPPVirologistIDCard - name: virology ID card - components: - - type: Sprite - layers: - - state: default - - state: department - color: "#5B97BC" - - state: subdepartment - color: "#5B97BC" - - state: idvirologist - - type: PresetIdCard - job: LPPVirologist - - type: entity parent: IDCardStandard id: LPPSecurityEnginerIDCard @@ -151,35 +44,6 @@ - type: PresetIdCard job: LPPAdjutant -#- type: entity -# parent: IDCardStandard -# id: LPPBrigmedicIDCard -# name: brigmedic ID card -# components: -# - type: Sprite -# layers: -# - state: default -# - state: department -# color: "#5B97BC" -# - state: subdepartment -# color: "#5B97BC" -# - state: idbrigmedic -# - type: PresetIdCard -# job: LPPBrigmedic - -#- type: entity -# parent: IDCardStandard -# id: MagistrateIDCard -# name: magistrate ID card -# description: magistrate ID card -# components: -# - type: Sprite -# layers: -# - state: default -# - state: idlawyer -# - type: PresetIdCard -# job: Magistrate - - type: entity parent: IDCardStandard id: ExpeditorIDCard diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Civilian/LPPPrisoner.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Civilian/LPPPrisoner.yml deleted file mode 100644 index 380a29fa58..0000000000 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Civilian/LPPPrisoner.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: job - id: LPPPrisoner - name: lpp-job-name-prisoner - description: lpp-job-description-prisoner - playTimeTracker: JobLPPPrisoner - startingGear: LPPPrisonerGear - icon: "JobIconPrisoner" - supervisors: job-supervisors-everyone -# access: # Corvax-MRP -# - Maintenance - -- type: startingGear - id: LPPPrisonerGear - equipment: - jumpsuit: ClothingUniformJumpsuitPrisoner - shoes: ClothingShoesColorBlack - id: LPPIDCardPrisoner - innerClothingSkirt: ClothingUniformJumpskirtPrisoner diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Law/magistrate.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Law/magistrate.yml deleted file mode 100644 index 663751895d..0000000000 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Law/magistrate.yml +++ /dev/null @@ -1,47 +0,0 @@ -#- type: job -# id: Magistrate -# name: job-name-magistrate -# description: job-description-magistrate -# playTimeTracker: JobMagistrate -# requirements: -# - !type:CharacterDepartmentTimeRequirement -# department: Security -# min: 54000 -# - !type:CharacterPlaytimeRequirement -# role: JobHeadOfSecurity -# min: 36000 -# - !type:CharacterPlaytimeRequirement -# role: JobCaptain -# min: 36000 -# startingGear: MagistrateGear -# icon: "JobIconMagistrate" -# requireAdminNotify: true -# joinNotifyCrew: true -# supervisors: job-supervisors-centcom -# canBeAntag: false -# access: -# - Command -# - Brig -# - Maintenance -# - Service -# - Security -# special: -# - !type:AddImplantSpecial -# implants: [ MindShieldImplant ] -# -#- type: startingGear -# id: MagistrateGear -# equipment: -# jumpsuit: LPPMagistrateUniform -# shoes: ClothingShoesBootsLaceup -# outerClothing: ClothingOuterRobesJudge -# eyes: LPPMagistrateEyeshud -# id: MagistratePDA -# gloves: ClothingHandsGlovesColorBlack -# ears: ClothingHeadsetMagistrate -# pocket1: RubberStampMagistrate -# pocket2: LPPJudgesGavel -# storage: -# back: -# - RubberStampLawyer -# - LPPTelebaton diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Medical/paramedic.yml deleted file mode 100644 index a015f3b926..0000000000 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Medical/paramedic.yml +++ /dev/null @@ -1,80 +0,0 @@ -# - type: job -# id: LPPParamedic -# name: job-name-paramedic -# description: job-description-lppparamedic -# playTimeTracker: JobParamedic -# requirements: -# - !type:RoleTimeRequirement -# role: JobChemist -# time: 18000 -# - !type:CharacterDepartmentTimeRequirement -# department: Medical -# time: 54000 -# startingGear: LPPParamedicGear -# icon: "LPPParamedic" -# supervisors: job-supervisors-cmo -# canBeAntag: false -# access: -# - Medical -# - Chemistry -# - Maintenance -# - External - -#- type: startingGear -# id: LPPParamedicGear -# equipment: -# jumpsuit: ClothingUniformJumpsuitParamedic -# back: LPPClothingBackpackParamedicFilled -# shoes: ClothingShoesColorWhite -# id: LPPPramedicPDA -# ears: ClothingHeadsetMedical -# belt: ClothingBeltMedicalFilled -# pocket1: HandheldCrewMonitor -# gloves: ClothingHandsGlovesNitrile -# outerClothing: ClothingOuterCoatParamedicWB -# head: ClothingHeadHatParamedicsoft -# eyes: ClothingEyesHudMedical -# innerclothingskirt: ClothingUniformJumpskirtParamedic -# satchel: LPPClothingBackpackSatchelParamedicFilled -# duffelbag: LPPClothingBackpackDuffelParamedicFilled - -#- type: entity -# parent: BasePDA -# id: LPPPramedicPDA -# name: Paramedic PDA -# description: Shiny and sterile. Has a built-in health analyzer. -# components: -# - type: PDA -# id: LPPParamedicIDCard -# state: pda-medical -# - type: Icon -# state: pda-medical -# - type: HealthAnalyzer -# scanDelay: 1.2 -# scanningEndSound: -# path: "/Audio/Items/Medical/healthscanner.ogg" -# - type: CrewMonitoringConsole - -#- type: entity -# parent: IDCardStandard -# id: LPPParamedicIDCard -# name: paramedic ID card -# components: -# - type: Sprite -# layers: -# - state: default -# - state: idmedicaldoctor -# - type: PresetIdCard -# job: LPPParamedic - -#- type: entity -# id: SpawnLPPParamedic -# parent: SpawnPointJobBase -# name: Pararmedic -# components: -# - type: SpawnPoint -# job_id: LPPParamedic -# - type: Sprite -# layers: -# - state: green -# - state: geneticist diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Medical/virologist.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Medical/virologist.yml deleted file mode 100644 index f86d333d03..0000000000 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Medical/virologist.yml +++ /dev/null @@ -1,30 +0,0 @@ - -# - type: job -# id: LPPVirologist -# name: lpp-job-name-virologist -# description: lpp-job-description-virologist -# playTimeTracker: JobLPPVirologist -# requirements: -# - !type:RoleTimeRequirement -# role: JobChemist -# time: 18000 -# - !type:CharacterDepartmentTimeRequirement -# department: Medical -# time: 36000 -# startingGear: LPPVirologistGear -# icon: "JobIconVirologist" -# supervisors: job-supervisors-cmo -# canBeAntag: true -# access: -# - Medical -# - Chemistry -# - Maintenance -# - External - - -# - type: startingGear -# id: LPPVirologistGear -# equipment: -# id: LPPVirologistPDA -# ears: ClothingHeadsetMedical -# belt: ClothingBeltMedicalFilled diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml deleted file mode 100644 index 3b00142732..0000000000 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: job - id: Roboticist - name: job-name-roboticist - description: job-description-roboticist - playTimeTracker: JobRoboticist - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Epistemics - time: 36000 #10 hrs - startingGear: RoboticistGear - icon: "JobIconRoboticist" - supervisors: job-supervisors-rd - access: - - Research - - Robotics - - Maintenance - -- type: startingGear - id: RoboticistGear - equipment: - shoes: ClothingShoesColorBlack - id: RoboticsPDA - ears: ClothingHeadsetRobotics - eyes: ClothingEyesHudDiagnostic - belt: ClothingBeltUtilityEngineering - socks: LPPClothingUnderSocksNorm - underwear: LPPBoxer - underwear: LPPBriefs - breast: LPPBraAltWhite \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/lppbrigmedic.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/lppbrigmedic.yml deleted file mode 100644 index 536b781550..0000000000 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/lppbrigmedic.yml +++ /dev/null @@ -1,45 +0,0 @@ -#- type: job -# id: LPPBrigmedic -# name: job-name-brigmedic -# description: job-description-brigmedic -# playTimeTracker: JobLPPBrigmedic -# requirements: -# - !type:CharacterDepartmentTimeRequirement -# department: Medical -# time: 18000 -# - !type:CharacterDepartmentTimeRequirement -# department: Security -# time: 18000 -# startingGear: BrigmedicGear -# icon: "JobIconBrigmedic" -# supervisors: job-supervisors-hos -# canBeAntag: false -# access: -# - Medical -# - Security -# - Brig -# - Maintenance -# - External -# special: -# - !type:AddImplantSpecial -# implants: [ MindShieldImplant ] -# -#- type: startingGear -# id: BrigmedicGear -# equipment: -# jumpsuit: ClothingUniformJumpsuitBrigmedic -# outerClothing: ClothingOuterCoatAMG -# back: ClothingBackpackBrigmedic -# shoes: ClothingShoesColorRed -# gloves: ClothingHandsGlovesNitrile -# eyes: LPPBlueHudGlasses -# head: ClothingHeadHatBeretBrigmedic -# id: BrigmedicPDA -# ears: ClothingHeadsetBrigmedic -# mask: ClothingMaskBreathMedicalSecurity -# belt: ClothingBeltMedicalFilled -# pocket1: WeaponPistolMk58 -# pocket2: MagazinePistol -# innerClothingSkirt: ClothingUniformJumpskirtBrigmedic -# satchel: ClothingBackpackSatchelBrigmedicFilled -# duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/senior_officer.yml deleted file mode 100644 index e7321a072f..0000000000 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/senior_officer.yml +++ /dev/null @@ -1,39 +0,0 @@ -# - type: job -# id: SeniorOfficer -# name: job-name-senior-officer -# description: job-description-senior-officer -# playTimeTracker: JobSeniorOfficer -# requirements: -# - !type:RoleTimeRequirement -# role: JobWarden -# time: 36000 # LPP-RoleTime -# - !type:RoleTimeRequirement -# role: JobDetective -# time: 36000 # LPP-RoleTime -# - !type:RoleTimeRequirement -# role: JobSecurityOfficer -# time: 36000 # LPP-RoleTime -# - !type:CharacterDepartmentTimeRequirement -# department: Security -# time: 108000 # 30 hrs -# startingGear: SeniorOfficerGear -# icon: "JobIconSeniorOfficer" -# supervisors: job-supervisors-hos -# canBeAntag: false -# access: -# - Security -# - Brig -# - Maintenance -# - Service -# - External -# special: -# - !type:AddImplantSpecial -# implants: [ MindShieldImplant ] - -# - type: startingGear -# id: SeniorOfficerGear -# equipment: -# eyes: ClothingEyesGlassesSecurity -# id: SeniorOfficerPDA -# ears: ClothingHeadsetSecurity -# pocket1: WeaponPistolMk58 diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/play_time_trackers.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/play_time_trackers.yml index cd702d84ef..cc891d7169 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/play_time_trackers.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/play_time_trackers.yml @@ -1,45 +1,18 @@ -#- type: playTimeTracker -# id: JobMagistrate - - type: playTimeTracker id: JobLPPBlueShieldOfficer -# - type: playTimeTracker -# id: JobLPPParamedic - - type: playTimeTracker id: JobLPPАdjutant - type: playTimeTracker id: LPPCentralCommandRepresentative -#- type: playTimeTracker -# id: JobLPPBrigmedic - -- type: playTimeTracker - id: JobRoboticist - - type: playTimeTracker id: JobCentralCommandRepresentative - type: playTimeTracker id: JobPilot -# - type: playTimeTracker - # id: JobBorgSecurity - -# - type: playTimeTracker - # id: JobDroneSecurity - -- type: playTimeTracker - id: JobLPPVirologist - -- type: playTimeTracker - id: JobLPPPrisoner - -- type: playTimeTracker - id: JobSeniorService - #-------------------# #-----Syndicate-----# #-------------------# @@ -70,6 +43,6 @@ - type: playTimeTracker # Элетрик id: JobStationEngineerSyndicate - - type: playTimeTracker # Заключёный id: JobPrisonerSyndicate + diff --git a/Resources/Prototypes/_LostParadise/StatusEffects/jobs.yml b/Resources/Prototypes/_LostParadise/StatusEffects/jobs.yml index c5c72f1d53..8b6fde1379 100644 --- a/Resources/Prototypes/_LostParadise/StatusEffects/jobs.yml +++ b/Resources/Prototypes/_LostParadise/StatusEffects/jobs.yml @@ -12,13 +12,6 @@ sprite: /Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi state: Blueshield -- type: statusIcon - parent: JobIcon - id: JobIconMagistrate - icon: - sprite: /Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi - state: Magistrate - - type: statusIcon parent: JobIcon id: JobIconSecPilot