From 53f011401e0be53c2927cc15b80da69576a7eacb Mon Sep 17 00:00:00 2001 From: BL02DL <164734444+BL02DL@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:57:15 +0700 Subject: [PATCH 1/6] H_Maps (#308) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * H_Maps * интеграционные тесты --- .../Tests/PostMapInitTest.cs | 4 + .../_LostParadise/Maps/Hell/H_asterisk.yml | 77 +++++++++++++++++++ .../_LostParadise/Maps/Hell/H_kerberos.yml | 77 +++++++++++++++++++ .../_LostParadise/Maps/Hell/H_normandy.yml | 76 ++++++++++++++++++ .../_LostParadise/Maps/Hell/H_pebble.yml | 70 +++++++++++++++++ .../Maps/Pools/LostParadiseMapPool.yml | 9 +-- 6 files changed, 308 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_LostParadise/Maps/Hell/H_asterisk.yml create mode 100644 Resources/Prototypes/_LostParadise/Maps/Hell/H_kerberos.yml create mode 100644 Resources/Prototypes/_LostParadise/Maps/Hell/H_normandy.yml create mode 100644 Resources/Prototypes/_LostParadise/Maps/Hell/H_pebble.yml diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 0f6b162109..4275c68a36 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -67,6 +67,10 @@ public sealed class PostMapInitTest "LPPNormandy", //LPP "LPPPebble", //LPP "LPPSubmarine", //LPP + "H_LPPKerberos", //LPP + "H_LPPAsterisk", //LPP + "H_LPPNormandy", //LPP + "H_LPPPebble", //LPP "Gax", "Rad" }; diff --git a/Resources/Prototypes/_LostParadise/Maps/Hell/H_asterisk.yml b/Resources/Prototypes/_LostParadise/Maps/Hell/H_asterisk.yml new file mode 100644 index 0000000000..8d0de3d64f --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Maps/Hell/H_asterisk.yml @@ -0,0 +1,77 @@ +- type: gameMap + id: H_LPPAsterisk + mapName: 'Астериск' + mapPath: /Maps/_LostParadise/Hell/H_LPPAsterisk.yml + minPlayers: 20 + maxPlayers: 70 + stations: + H_LPPAsterisk: + stationProto: StandardNanotrasenStation + components: + - type: StationRandomTransform + enableStationRotation: false + maxStationOffset: null + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Kaeri.yml + - type: StationNameSetup + mapNameTemplate: '{0} Станция Астериск {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'DV' + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 2 ] + Botanist: [ 2, 3 ] + Chef: [ 1, 2 ] + Clown: [ 1, 1 ] + Lawyer: [ 2, 2 ] + Reporter: [ 1, 1 ] + Musician: [ 1, 1 ] + Janitor: [ 1, 2 ] + Mime: [ 1, 1 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 1, 1 ] #back by popular demand + StationEngineer: [ 3, 3 ] + TechnicalAssistant: [ 2, 4 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 1, 2 ] + Paramedic: [ 1, 2 ] + MedicalDoctor: [ 2, 3 ] + MedicalIntern: [ 2, 3 ] + #science + ResearchDirector: [ 1, 1 ] + Chaplain: [ 1, 1 ] + ForensicMantis: [ 1, 1 ] + Scientist: [ 2, 3 ] + ResearchAssistant: [ 2, 3 ] + Borg: [ 1, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + Detective: [ 1, 1 ] + Brigmedic: [ 1, 1 ] + SecurityOfficer: [ 2, 3 ] + SecurityCadet: [ 1, 3 ] + Prisoner: [ 1, 2 ] # :^) + #supply + Quartermaster: [ 1, 1 ] + MailCarrier: [ 1, 2 ] + SalvageSpecialist: [ 2, 3 ] + CargoTechnician: [ 2, 4 ] + #civilian + Passenger: [ -1, -1 ] + #justice + Prosecutor: [ 1, 1 ] + Clerk: [ 1, 1 ] + ChiefJustice: [ 1, 1 ] + #LOST PARADISE + LPPBlueShieldOfficer: [ 1, 1 ] + LPPAdjutant: [ 1, 1 ] + LPPSecurityEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_LostParadise/Maps/Hell/H_kerberos.yml b/Resources/Prototypes/_LostParadise/Maps/Hell/H_kerberos.yml new file mode 100644 index 0000000000..c9795afbac --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Maps/Hell/H_kerberos.yml @@ -0,0 +1,77 @@ +- type: gameMap + id: H_LPPKerberos + mapName: 'NS Керберос' + mapPath: /Maps/_LostParadise/Hell/H_LPPKerberos.yml + minPlayers: 30 + stations: + H_LPPKerberos: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} NS Керберос {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/_LostParadise/Shuttles/LPPKerberos_evac.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + # Service + Bartender: [ 2, 2 ] + Botanist: [ 3, 4] + Chef: [ 2, 3 ] + Janitor: [ 2, 4 ] + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + ServiceWorker: [ 4, 6 ] + # Engineering + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 4, 5 ] + AtmosphericTechnician: [ 3, 4 ] + TechnicalAssistant: [ 2, 4 ] + # Medical + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 4, 6 ] + Chemist: [ 2, 2 ] + MedicalIntern: [ 2, 4 ] + Paramedic: [ 1, 1 ] + MedicalBorg: [ 2, 3 ] + # RND + ResearchDirector: [ 1, 1 ] + Scientist: [ 4, 6 ] + ResearchAssistant: [ 2, 4 ] + Borg: [ 3, 6 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 2 ] + ForensicMantis: [ 1, 2 ] + # Security + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 2, 4 ] + Warden: [ 1, 1 ] + Lawyer: [ 2, 2 ] + SecurityCadet: [ 1, 2 ] + Detective: [ 1, 1 ] + Prisoner: [ 3, 4 ] + Brigmedic: [ 1, 1 ] + PrisonGuard: [ 1, 1 ] + # Logistics + CargoTechnician: [ 3, 4 ] + Quartermaster: [ 1, 1 ] + MailCarrier: [ 1, 2 ] + SalvageSpecialist: [ 3, 3 ] + # Civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 3 ] + Reporter: [ 1, 2 ] + # Justice + Prosecutor: [ 1, 1 ] + Clerk: [ 2, 2 ] + ChiefJustice: [ 1, 1 ] + #LOST PARADISE + LPPBlueShieldOfficer: [ 1, 1 ] + LPPAdjutant: [ 1, 1 ] + LPPSecurityEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_LostParadise/Maps/Hell/H_normandy.yml b/Resources/Prototypes/_LostParadise/Maps/Hell/H_normandy.yml new file mode 100644 index 0000000000..eb26672feb --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Maps/Hell/H_normandy.yml @@ -0,0 +1,76 @@ +- type: gameMap + id: H_LPPNormandy + mapName: 'N7 Нормандия' + mapPath: /Maps/_LostParadise/Hell/H_LPPNormandy.yml + minPlayers: 20 + stations: + H_LPPNormandy: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} N7 Нормандия {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_UCLB.yml + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + # Service + Bartender: [ 2, 2 ] + Botanist: [ 2, 3] + Chef: [ 1, 2 ] + Janitor: [ 2, 2 ] + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + ServiceWorker: [ 3, 4 ] + # Engineering + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 4, 5 ] + AtmosphericTechnician: [ 2, 2 ] + TechnicalAssistant: [ 2, 4 ] + # Medical + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 3, 5 ] + Chemist: [ 2, 2 ] + MedicalIntern: [ 2, 4 ] + Paramedic: [ 1, 1 ] + # RND + ResearchDirector: [ 1, 1 ] + Scientist: [ 3, 4 ] + ResearchAssistant: [ 2, 4 ] + Borg: [ 1, 2 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ForensicMantis: [ 1, 2 ] + # Security + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 3, 4 ] + Warden: [ 1, 1 ] + Lawyer: [ 2, 3 ] + SecurityCadet: [ 2, 2 ] + Detective: [ 1, 1 ] + Prisoner: [ 2, 3 ] + Brigmedic: [ 1, 1 ] + PrisonGuard: [ 1, 1 ] + # Logistics + CargoTechnician: [ 3, 4 ] + Quartermaster: [ 1, 1 ] + MailCarrier: [ 1, 2 ] + SalvageSpecialist: [ 4, 4 ] + # Civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 3 ] + Reporter: [ 1, 2 ] + # Justice + Prosecutor: [ 1, 1 ] + Clerk: [ 1, 1 ] + ChiefJustice: [ 1, 1 ] + #LOST PARADISE + LPPBlueShieldOfficer: [ 1, 1 ] + LPPAdjutant: [ 1, 1 ] + LPPSecurityEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_LostParadise/Maps/Hell/H_pebble.yml b/Resources/Prototypes/_LostParadise/Maps/Hell/H_pebble.yml new file mode 100644 index 0000000000..cc65e04cda --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Maps/Hell/H_pebble.yml @@ -0,0 +1,70 @@ +- type: gameMap + id: H_LPPPebble + mapName: 'Пеббл' + mapPath: /Maps/_LostParadise/Hell/H_LPPPebble.yml + minPlayers: 0 + maxPlayers: 30 + stations: + H_LPPPebbleStation: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Станция Пеббл {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'DV' + - type: StationJobs + overflowJobs: + - Passenger + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 2 ] + Botanist: [ 2, 2 ] + Boxer: [ 2, 2 ] + Chef: [ 2 , 2 ] + Clown: [ 1, 1 ] + Lawyer: [ 1, 1 ] + Musician: [ 1, 1 ] + Janitor: [ 1, 2 ] + Mime: [ 1, 1 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 1, 1] + StationEngineer: [ 2, 3 ] + TechnicalAssistant: [ 2, 2 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 1, 1 ] + MedicalDoctor: [ 2, 3 ] + MedicalIntern: [ 2, 2 ] + Paramedic: [ 1, 1 ] + Psychologist: [ 1, 1 ] + #science + ResearchDirector: [ 1, 1 ] + Chaplain: [ 1, 1 ] + ForensicMantis: [ 1, 1 ] + Scientist: [ 2, 3 ] + ResearchAssistant: [ 2, 2 ] + Borg: [ 1, 1 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + Detective: [ 1, 1 ] + SecurityOfficer: [ 2, 2 ] + SecurityCadet: [ 1, 1 ] + #supply + Quartermaster: [ 1, 1 ] + MailCarrier: [ 1, 2 ] + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 3 ] + #civilian + Passenger: [ -1, -1 ] + #justice + Prosecutor: [ 1, 1 ] + Clerk: [ 1, 1 ] + #LOST PARADISE + LPPBlueShieldOfficer: [ 1, 1 ] + LPPAdjutant: [ 1, 1 ] + LPPSecurityEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml b/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml index f0391f8f58..1ccab09d9d 100644 --- a/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml +++ b/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml @@ -1,8 +1,7 @@ - type: gameMapPool id: LostParadiseMapPool maps: - - LPPAsterisk - - LPPSubmarine - - LPPPebble - - LPPNormandy - - LPPKerberos + - H_LPPAsterisk + - H_LPPPebble + - H_LPPNormandy + - H_LPPKerberos From 5e9314172cda19963811a23a8317843745bdafc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLost-Paradise-Bot=E2=80=9D?= <172407741+Lost-Paradise-Bot@users.noreply.github.com> Date: Mon, 28 Oct 2024 14:58:20 +0000 Subject: [PATCH 2/6] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 19dc8ae96f..b33eff9dfd 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2411,3 +2411,14 @@ id: 133 time: '2024-10-28T10:52:49.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/306 +- author: BL02DL + changes: + - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\ + \u0435!" + type: Remove + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u0442\u0440\ + \u0430\u0448\u0438\u043B\u043A\u0438!" + type: Add + id: 134 + time: '2024-10-28T14:57:15.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/308 From 54a328de8a194f270567fd704c35e5d4420a97cc Mon Sep 17 00:00:00 2001 From: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Date: Mon, 28 Oct 2024 18:02:21 +0300 Subject: [PATCH 3/6] Update CODEOWNERS --- .github/CODEOWNERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3cd143ba82..dcd6eaa169 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1 @@ -**/_LostParadise/** @Flybik @Evgencheg -* @BL02DL +* @BL02DL @Flybik @Evgencheg From f873d5d3cf007ebcacea6ad40bea67d47c550d92 Mon Sep 17 00:00:00 2001 From: DarkSide Date: Fri, 1 Nov 2024 02:53:32 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=9C=D0=B0=D0=BB=D0=B5=D0=BD=D1=8C=D0=BA?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20(#309)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Маленькие изменения * Восстоновление пропажи голобарьера --------- Co-authored-by: DarkSide-droids --- Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml | 6 +++--- .../Entities/Structures/Holographic/projections.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index f06539aa17..343a03383f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -33,13 +33,13 @@ #1 Ointment = -50 damage of those types #1 Cable ~= -50 (-49.8) damage of those types - type: Healing - delay: 0.6 + delay: 0.7 damageContainers: - Silicon damage: types: # these are all split across multiple types - Heat: -1.66 - Shock: -1.66 + Heat: -3.50 + Shock: -3.50 - type: entity id: CableHVStack diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml index f9bf81695e..adcabbe4bb 100644 --- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml +++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml @@ -69,7 +69,7 @@ layer: - TableLayer - type: TimedDespawn - lifetime: 180 + lifetime: 600 # 10 Минут - type: PointLight enabled: true radius: 3 From e881af1fb6aeb378e64a2506c313540531f31185 Mon Sep 17 00:00:00 2001 From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com> Date: Fri, 1 Nov 2024 02:54:31 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=91=D0=B0=D1=84=D1=84=20=D0=98=D0=BD?= =?UTF-8?q?=D0=B6=D0=B5=D0=B9=20=D0=B8=20=D0=BD=D0=B5=20=D1=82=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20(#310)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Газоанлазиатор инженерам, суперматерия в инженерный чат, программы СБ * Баффы * ПИ * Фикс мезонок * Фиксы * Фикс * Фигня * Фикс тупости моей * И ещё фиксы * Трусы и ручки * Фикс лодаута СИ * У СИ нет рюкзака... * Фикс теста, мб --- .../Systems/SupermatterSystem.Processing.cs | 21 ++++++++ .../entities/objects/devices/pda.ftl | 6 +-- .../entities/objects/misc/papers/pen.ftl | 2 +- .../entities/clothing/ears/headsets.ftl | 8 ++-- .../generation/supermatter/supermatter.ftl | 2 +- .../Catalog/Fills/Lockers/engineer.yml | 2 + .../Catalog/Fills/Lockers/heads.yml | 17 +++++++ .../Catalog/Fills/Lockers/security.yml | 2 + .../Catalog/Fills/Lockers/suit_storage.yml | 1 + .../Entities/Clothing/Ears/headsets.yml | 8 +--- .../Clothing/Head/hardsuit-helmets.yml | 7 ++- .../Entities/Objects/Devices/pda.yml | 41 ++++++++++++++-- .../Loadouts/Jobs/Heads/chiefEngineer.yml | 48 +++++++++++++++++++ .../Prototypes/Loadouts/Jobs/engineering.yml | 7 ++- .../Engineering/atmospheric_technician.yml | 1 + .../Jobs/Engineering/senior_engineer.yml | 1 + .../Roles/Jobs/Medical/senior_physician.yml | 1 + .../Roles/Jobs/Science/senior_researcher.yml | 1 + Resources/Prototypes/Traits/physical.yml | 4 +- .../CharacterItemGroups/bsGroups.yml | 15 ++++++ .../Entities/Clothing/Eyes/Hud/hud.yml | 1 + .../Entities/Objects/Devices/pda.yml | 16 ++++++- .../Loadouts/Jobs/blueshield.yml | 32 +++++++++++++ 23 files changed, 219 insertions(+), 25 deletions(-) create mode 100644 Resources/Prototypes/_LostParadise/CharacterItemGroups/bsGroups.yml diff --git a/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs b/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs index 81995ed1be..3d6fd80cf6 100644 --- a/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs +++ b/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs @@ -6,11 +6,16 @@ using System.Linq; using Content.Shared.Audio; using Content.Shared.CCVar; +using Content.Shared.Radio; +using Content.Server.Radio.EntitySystems; +using Robust.Shared.Prototypes; namespace Content.Server.Supermatter.Systems; public sealed partial class SupermatterSystem { + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly RadioSystem _radioSystem = default!; /// /// Handle power and radiation output depending on atmospheric things. /// @@ -293,6 +298,17 @@ private void AnnounceCoreDamage(EntityUid uid, SupermatterComponent sm) SendSupermatterAnnouncement(uid, message, global); } + private void Report(EntityUid source, string channelName, string messageKey, params (string, object)[] args) + { + var message = args.Length == 0 ? Loc.GetString(messageKey) : Loc.GetString(messageKey, args); + + if (string.IsNullOrWhiteSpace(message)) + return; + + var radioChannel = _prototypeManager.Index(channelName); + _radioSystem.SendRadioMessage(source, message, radioChannel, source); + } + /// If true, sends a station announcement /// Localisation string for a custom announcer name public void SendSupermatterAnnouncement(EntityUid uid, string message, bool global = false, string? customSender = null) @@ -305,6 +321,11 @@ public void SendSupermatterAnnouncement(EntityUid uid, string message, bool glob } _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Speak, hideChat: false, checkRadioPrefix: true); + + if (!string.IsNullOrWhiteSpace(message)) + { + Report(uid, "Engineering", message); + } } /// diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl index a5fd83cb39..e6ad1597d1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl @@ -2,9 +2,9 @@ ent-LPPSecurityEngineerPDA = КПК полевого инженера .desc = Красный, чтобы скрыть пятна крови пассажиров. ent-LPPBlueShieldOfficerPDA = КПК офицера "Синий Щит" .desc = Пахнет защитой. -ent-LPPAdjutantPDA = КПК Адъютанта +ent-LPPAdjutantPDA = КПК адъютанта .desc = Пора почувствовать себя крутым. -ent-LPPExpeditorPDA = КПК Исследователя +ent-LPPExpeditorPDA = КПК исследователя .desc = Потёртый, поцарапанный, но все еще работает. -ent-LPPSecPilotPDA = КПК Пилота СБ +ent-LPPSecPilotPDA = КПК пилота СБ .desc = Выглядит новеньким и пахнет космосом. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/papers/pen.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/papers/pen.ftl index cef767073b..a58378ec72 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/papers/pen.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/papers/pen.ftl @@ -2,7 +2,7 @@ ent-LPPHosPen = Ручка Главы Службы Безопасности .desc = { ent-Pen.desc } ent-LPPCEPen = Ручка Старшего Инженера .desc = { ent-Pen.desc } -ent-LPPQMPen = Ручка Квартир Мейстера +ent-LPPQMPen = Ручка Квартирмейстера .desc = { ent-Pen.desc } ent-LPPCMOPen = Ручка Главного Врача .desc = { ent-Pen.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/ears/headsets.ftl index 252d42dec7..572c4e6302 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/ears/headsets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/ears/headsets.ftl @@ -2,10 +2,10 @@ ent-ClothingHeadsetHoP = Гарнитура главы персонала .desc = Гарнитура используемая Главой Персонала. ent-ClothingHeadsetAltService = Полноразмерная гарнитура главы персонала .desc = { ent-ClothingHeadsetAlt.desc } -ent-ClothingHeadsetAltSyndicateListening = Кроваво-красная полнаразмерная гарнитура перехвата - .desc = Улудшенное, модульное устройство перехвата, которое помещаеться на голову. -ent-ClothingHeadsetJustice = Гарнитура Юридического отдела - .desc = Гарнитура, используемая Юридическим отделом. +ent-ClothingHeadsetAltSyndicateListening = Кроваво-красная полноразмерная гарнитура перехвата + .desc = Улучшенное, модульное устройство перехвата, которое помещается на голову. +ent-ClothingHeadsetJustice = Гарнитура юридического отдела + .desc = Гарнитура, используемая юридическим отделом. ent-ClothingHeadsetAltJustice = Гарнитура главного судьи .desc = Гарнитура, используемая главным судьей. ent-ClothingHeadsetPrison = Тюремная гарнитура diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/supermatter/supermatter.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/supermatter/supermatter.ftl index d3d971cf4d..396d16dd2a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/supermatter/supermatter.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/supermatter/supermatter.ftl @@ -1,2 +1,2 @@ -ent-Supermatter = Кристал суперматерии +ent-Supermatter = Кристалл суперматерии .desc = Странно прозрачный и переливающийся кристалл. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index 860d2c6598..a82ff257dc 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -88,7 +88,9 @@ - id: MedkitOxygenFilled - id: HolofanProjector - id: DoorRemoteFirefight + - id: ClothingShoesBootsMag - id: RCD + - id: RCDAmmo - id: LPPRCDFAPDevice - id: LPPRCDFAPAmmo - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes! diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 6fb85280e7..1af851df17 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -23,6 +23,7 @@ - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 - id: WeaponEnergyGunMini #LPP + - id: LPPQMPanties #LPP - type: entity id: LockerCaptainFilledHardsuit @@ -56,6 +57,7 @@ - id: MedalCase - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: LPPCapPanties #LPP - type: entity id: LockerCaptainFilled @@ -89,6 +91,7 @@ - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: LPPCapPanties #LPP - type: entity id: LockerCaptainFilledNoLaser @@ -121,6 +124,7 @@ - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: LPPCapPanties #LPP - type: entity id: LockerHeadOfPersonnelFilled @@ -156,6 +160,7 @@ - id: LPPBoxFolderSecretBlue prob: 0.6 # - > + - id: LPPHOPPanties #LPP - type: entity id: LockerChiefEngineerFilledHardsuit @@ -181,9 +186,12 @@ - id: BoxPDAEngineering # Delta-V - id: RCD - id: RCDAmmo + - id: LPPRCDFAPDevice + - id: LPPRCDFAPAmmo - id: CEIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: LPPCEPanties #LPP - type: entity id: LockerChiefEngineerFilled @@ -206,8 +214,11 @@ - id: CEIDCard # Delta-V - id: RCD - id: RCDAmmo + - id: LPPRCDFAPDevice + - id: LPPRCDFAPAmmo - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: LPPCEPanties #LPP - type: entity id: LockerChiefMedicalOfficerFilledHardsuit @@ -236,6 +247,7 @@ - id: CMOIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: LPPCMOPanties #LPP - type: entity id: LockerChiefMedicalOfficerFilled @@ -260,6 +272,7 @@ - id: CMOIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: LPPCMOPanties #LPP - type: entity id: LockerResearchDirectorFilledHardsuit @@ -283,6 +296,7 @@ - id: EncryptionKeyBinary - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: LPPRDPanties #LPP - type: entity id: LockerResearchDirectorFilled @@ -305,6 +319,7 @@ - id: EncryptionKeyBinary - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: LPPRDPanties #LPP - type: entity id: LockerHeadOfSecurityFilledHardsuit @@ -338,6 +353,7 @@ prob: 0.3 #LPP - id: LPPBoxArmband + - id: LPPHOSPanties - type: entity id: LockerHeadOfSecurityFilled @@ -369,6 +385,7 @@ prob: 0.3 #LPP - id: LPPBoxArmband + - id: LPPHOSPanties - type: entity id: LockerFreezerVaultFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 3f71c11641..adc0ec6dd3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -170,6 +170,7 @@ prob: 0.7 ## - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why ## prob: 0.15 + - id: LPPCombatHypospray - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 @@ -203,6 +204,7 @@ prob: 0.3 - id: MedkitBurnFilled prob: 0.7 + - id: LPPCombatHypospray - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index c22577f748..c6a2277573 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -125,6 +125,7 @@ - type: StorageFill contents: - id: OxygenTankFilled + - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitAtmos - id: ClothingMaskBreath - type: AccessReader diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml index b32cab7b21..9c0176e917 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml @@ -7,9 +7,7 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyService - - EncryptionKeyCommand - - EncryptionKeyCommon + - EncryptionKeyStationMaster - type: entity parent: ClothingHeadsetAlt @@ -19,9 +17,7 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyService - - EncryptionKeyCommand - - EncryptionKeyCommon + - EncryptionKeyStationMaster - type: Sprite sprite: DeltaV/Clothing/Ears/Headsets/service.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index a03c432d91..cf9bb59718 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -40,6 +40,7 @@ lowPressureMultiplier: 1000 - type: TemperatureProtection coefficient: 0.005 + - type: EyeProtection #Engineering Hardsuit - type: entity @@ -58,6 +59,7 @@ - type: PressureProtection highPressureMultiplier: 0.1 lowPressureMultiplier: 1000 + - type: EyeProtection #Spationaut Hardsuit - type: entity @@ -249,6 +251,7 @@ - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 + - type: EyeProtection #Chief Medical Officer's Hardsuit - type: entity @@ -590,7 +593,9 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - + - type: FlashImmunity + - type: EyeProtection + #ERT Medical Hardsuit - type: entity parent: ClothingHeadHelmetHardsuitSyndieElite diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 484052e404..aa9d5c9153 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -99,6 +99,8 @@ type: InstrumentBoundUserInterface - key: enum.HealthAnalyzerUiKey.Key type: HealthAnalyzerBoundUserInterface + - key: enum.GasAnalyzerUiKey.Key + type: GasAnalyzerBoundUserInterface - type: Tag tags: - DoorBumpOpener @@ -115,6 +117,13 @@ scanningEndSound: path: "/Audio/Items/Medical/healthscanner.ogg" +- type: entity + parent: BasePDA + id: BaseEngineerPDA + abstract: true + components: + - type: GasAnalyzer + - type: entity parent: BasePDA id: PassengerPDA @@ -128,7 +137,7 @@ borderColor: "#717059" - type: entity - parent: BasePDA + parent: BaseEngineerPDA id: TechnicalAssistantPDA name: technical assistant PDA description: Why isn't it yellow? @@ -353,6 +362,12 @@ - type: Pda id: QuartermasterIDCard state: pda-qm + penSlot: + startingItem: LPPQMPen + priority: -1 + whitelist: + tags: + - Write - type: PdaBorderColor borderColor: "#e39751" accentVColor: "#a23e3e" @@ -517,7 +532,7 @@ state: pda-hop - type: entity - parent: BasePDA + parent: BaseEngineerPDA id: CEPDA name: chief engineer PDA description: Looks like it's barely been used. @@ -525,6 +540,12 @@ - type: Pda id: CEIDCard state: pda-ce + penSlot: + startingItem: LPPCEPen + priority: -1 + whitelist: + tags: + - Write - type: PdaBorderColor borderColor: "#949137" accentHColor: "#447987" @@ -532,7 +553,7 @@ state: pda-ce - type: entity - parent: BasePDA + parent: BaseEngineerPDA id: EngineerPDA name: engineer PDA description: Rugged and well-worn. @@ -643,6 +664,12 @@ - type: Pda id: RDIDCard state: pda-rd + penSlot: + startingItem: LPPRDPen + priority: -1 + whitelist: + tags: + - Write - type: PdaBorderColor borderColor: "#d7d7d0" accentHColor: "#447987" @@ -701,6 +728,12 @@ - type: Pda id: HoSIDCard state: pda-hos + penSlot: + startingItem: LPPHosPen + priority: -1 + whitelist: + tags: + - Write - type: PdaBorderColor borderColor: "#A32D26" accentHColor: "#447987" @@ -830,7 +863,7 @@ program: 2 - type: entity - parent: BasePDA + parent: BaseEngineerPDA id: AtmosPDA name: atmos PDA description: Still smells like plasma. diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml index bfddc6e383..e13b0ba881 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml @@ -44,3 +44,51 @@ - ChiefEngineer items: - ClothingShoesBootsWinterChiefEngineer + +- type: loadout + id: LoadoutCommandCEUniformJumpskirt + category: JobsCommand + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingUniformJumpskirtChiefEngineer + +- type: loadout + id: LoadoutCommandCEUniformJumpskirtTurtle + category: JobsCommand + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingUniformJumpskirtChiefEngineerTurtle + +- type: loadout + id: LoadoutCommandCEUniformJumpsuit + category: JobsCommand + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingUniformJumpsuitChiefEngineer + +- type: loadout + id: LoadoutCommandCEUniformJumpsuitTurtle + category: JobsCommand + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - ChiefEngineer + items: + - ClothingUniformJumpsuitChiefEngineerTurtle diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml index beef8a9bb5..6fe1f0e2e5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/engineering.yml +++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml @@ -84,6 +84,7 @@ jobs: - StationEngineer - AtmosphericTechnician + - ChiefEngineer items: - ClothingHeadHatHardhatBlue @@ -99,6 +100,7 @@ jobs: - StationEngineer - AtmosphericTechnician + - ChiefEngineer items: - ClothingHeadHatHardhatOrange @@ -114,6 +116,7 @@ jobs: - StationEngineer - AtmosphericTechnician + - ChiefEngineer items: - ClothingHeadHatHardhatYellow @@ -127,8 +130,7 @@ group: LoadoutHeadEngineering - !type:CharacterJobRequirement jobs: - - StationEngineer - - AtmosphericTechnician + - ChiefEngineer items: - ClothingHeadHatHardhatWhite @@ -144,5 +146,6 @@ jobs: - StationEngineer - AtmosphericTechnician + - ChiefEngineer items: - ClothingHeadHatHardhatRed diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index b9acd247aa..8a7aeabda5 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -11,6 +11,7 @@ startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce + canBeAntag: false access: - Maintenance - Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index 6856f12a71..3669bddb7c 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -17,6 +17,7 @@ startingGear: SeniorEngineerGear icon: "JobIconSeniorEngineer" supervisors: job-supervisors-ce + canBeAntag: false access: - Maintenance - Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index 3482afab31..8ab9e32d75 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -17,6 +17,7 @@ startingGear: SeniorPhysicianGear icon: "JobIconSeniorPhysician" supervisors: job-supervisors-cmo + canBeAntag: false access: - Medical - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index 279f525b0d..f29eb10c82 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -11,6 +11,7 @@ startingGear: SeniorResearcherGear icon: "JobIconSeniorResearcher" supervisors: job-supervisors-rd + canBeAntag: false access: - Research # - Robotics diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index 7bfb620fa8..ce2e88bc6b 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -414,7 +414,7 @@ - type: trait id: BionicArm category: Physical - points: -9 + points: -4 requirements: - !type:CharacterJobRequirement inverted: true @@ -423,7 +423,7 @@ components: - type: Prying speedModifier: 1 - pryPowered: true + pryPowered: false force: true - type: trait diff --git a/Resources/Prototypes/_LostParadise/CharacterItemGroups/bsGroups.yml b/Resources/Prototypes/_LostParadise/CharacterItemGroups/bsGroups.yml new file mode 100644 index 0000000000..872ca6c748 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/CharacterItemGroups/bsGroups.yml @@ -0,0 +1,15 @@ +- type: characterItemGroup + id: LoadoutWeaponBS + items: + - type: loadout + id: LoadoutCommandBSWeaponPistolN1984 + - type: loadout + id: LoadoutCommandBSWeaponPistolUniversal + +- type: characterItemGroup + id: LoadoutMagazineBS + items: + - type: loadout + id: LoadoutCommandBSMagazineUniversalMagnum + - type: loadout + id: LoadoutCommandBSMagazineMagnum diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml index e6b4a40139..754fd19556 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Hud/hud.yml @@ -75,6 +75,7 @@ - type: Clothing sprite: _LostParadise/Clothing/Eyes/HUD/SecEngHUD.rsi - type: EyeProtection + - type: FlashImmunity - type: Tag tags: - HudSecurity diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml index d2518925b7..b2f01e85bd 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/pda.yml @@ -1,5 +1,5 @@ - type: entity - parent: BasePDA + parent: BaseEngineerPDA id: LPPSecurityEngineerPDA name: security PDA description: Red to hide the stains of passenger blood. @@ -11,6 +11,13 @@ borderColor: "#9b2b2a" - type: Icon state: pda-security + - type: CartridgeLoader + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge + - SecWatchCartridge - type: entity parent: BasePDA @@ -70,3 +77,10 @@ accentVColor: "#DFDFDF" - type: Icon state: pda-seniorofficer + - type: CartridgeLoader + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge + - SecWatchCartridge \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml index daba38900c..81d7417211 100644 --- a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml +++ b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml @@ -10,11 +10,37 @@ items: - ClothingBeltKatanaSheathFilledHoS +- type: loadout + id: LoadoutCommandBSMedkitCombat + category: JobsCommand + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - LPPBlueShieldOfficer + items: + - MedkitCombatFilled + +- type: loadout + id: LoadoutCommandBSCombatHypospray + category: JobsCommand + cost: 4 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - LPPBlueShieldOfficer + items: + - LPPCombatHypospray + - type: loadout id: LoadoutCommandBSWeaponPistolN1984 category: JobsCommand cost: 2 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutWeaponBS - !type:CharacterJobRequirement jobs: - LPPBlueShieldOfficer @@ -26,6 +52,8 @@ category: JobsCommand cost: 2 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutWeaponBS - !type:CharacterJobRequirement jobs: - LPPBlueShieldOfficer @@ -37,6 +65,8 @@ category: JobsCommand cost: 1 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMagazineBS - !type:CharacterJobRequirement jobs: - LPPBlueShieldOfficer @@ -48,6 +78,8 @@ category: JobsCommand cost: 1 requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMagazineBS - !type:CharacterJobRequirement jobs: - LPPBlueShieldOfficer From 039478286ffa5158bb556b9b83a2ca3a35192c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLost-Paradise-Bot=E2=80=9D?= <172407741+Lost-Paradise-Bot@users.noreply.github.com> Date: Thu, 31 Oct 2024 23:55:37 +0000 Subject: [PATCH 6/6] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 104 +++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index b33eff9dfd..43c80a1196 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2422,3 +2422,107 @@ id: 134 time: '2024-10-28T14:57:15.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/308 +- author: MrDarkSide + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0437\u0430\u0434\u0435\ + \u0440\u0436\u043A\u0430 \u043F\u0435\u0440\u0435\u0434 \u0438\u0441\u0447\u0435\ + \u0437\u043D\u043E\u0432\u0435\u043D\u0438\u0435\u043C \u0443 \u0433\u043E\u043B\ + \u043E\u0431\u0430\u0440\u044C\u0435\u0440\u0430 \u0421\u0411 \u0441 180 \u0441\ + \u0435\u043A. \u0434\u043E 600 \u0441\u0435\u043A." + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043E \u043A\u043E\u043B\ + -\u0432\u043E \u0443\u0440\u043E\u043D\u0430 \u043A\u043E\u0442\u043E\u0440\u044B\ + \u0435 \u043B\u0435\u0447\u0430\u0442 \u043F\u0440\u043E\u0432\u043E\u0434\u0430\ + \ \u0434\u043B\u044F \u041A\u041F\u0411. \u0421 -1.66 \u0434\u043E -3.50." + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0437\u0430\u0434\u0435\ + \u0440\u0436\u043A\u0430 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\ + \u0430\u043D\u0438\u044F \u043F\u0440\u043E\u0432\u043E\u0434\u043E\u0432 \u043D\ + \u0430 \u041A\u041F\u0411 \u0441 0.6 \u0434\u043E 0.7" + type: Tweak + id: 135 + time: '2024-10-31T23:53:33.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/309 +- author: Farrellka + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0433\u0430\u0437\u043E\ + \u0430\u043D\u0430\u043B\u0438\u0437\u0430\u0442\u043E\u0440 \u0432 \u041A\u041F\ + \u041A \u0432\u0441\u0435\u043C \u0438\u043D\u0436\u0435\u043D\u0435\u0440\u0430\ + \u043C!" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\ + \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0421\u0443\u043F\u0435\u0440\ + \u043C\u0430\u0442\u0435\u0440\u0438\u0438 \u0433\u043E\u0432\u043E\u0440\u0438\ + \u0442\u044C \u0432 \u0440\u0430\u0446\u0438\u044E \u0418\u043D\u0436\u0435\u043D\ + \u0435\u0440\u0430\u043C \u043E \u0435\u0451 \u043D\u0435\u0441\u0442\u0430\u0431\ + \u0438\u043B\u044C\u043D\u043E\u0441\u0442\u0438!" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043C\u0430\u0433\ + \u043D\u0438\u0442\u0431\u0443\u0442\u0441\u044B \u0432 \u0448\u043A\u0430\u0444\ + \u044B \u0430\u0442\u043C\u043E\u0441\u0430\u043C." + type: Add + - message: "\u0412 \u043B\u043E\u0434\u0430\u0443\u0442 \u0421\u0418 \u0434\u043E\ + \u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0435\u0433\u043E \u043E\u0434\u0435\ + \u0436\u0434\u0430, \u0430 \u0442\u0430\u043A \u0436\u0435 \u043A\u0430\u0441\ + \u043A\u0438." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u043E\u0435\u0432\ + \u043E\u0439 \u0433\u0438\u043F\u043E \u0432 \u0448\u043A\u0430\u0444 \u041F\ + \u043E\u043B\u0435\u0432\u043E\u0433\u043E \u0412\u0440\u0430\u0447\u0430!" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u043E\u0435\u0432\ + \u043E\u0439 \u0433\u0438\u043F\u043E \u0437\u0430 4 \u043E\u0447\u043A\u0430\ + , \u0430 \u0442\u0430\u043A \u0436\u0435 \u0431\u043E\u0435\u0432\u0430\u044F\ + \ \u0430\u043F\u0442\u0435\u0447\u043A\u0430 \u0437\u0430 2 \u043E\u0447\u043A\ + \u0430 \u0432 \u043B\u043E\u0434\u0430\u0443\u0442 \u041E\u0444\u0438\u0446\u0435\ + \u0440\u0430 \"\u0421\u0438\u043D\u0438\u0439 \u0429\u0438\u0442\"!" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0442\u0440\u0443\ + \u0441\u0438\u043A\u0438 \u0433\u043B\u0430\u0432\u0430\u043C \u043E\u0442\u0434\ + \u0435\u043B\u043E\u0432 \u0432 \u0438\u0445 \u0448\u043A\u0430\u0444\u0447\u0438\ + \u043A\u0438, \u0430 \u0442\u0430\u043A \u0436\u0435 \u0440\u0443\u0447\u043A\ + \u0438 \u0432 \u0438\u0445 \u041A\u041F\u041A!" + type: Add + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043A\u0430\u0444\ + \u0430\u043D\u0434\u0440\u044B \u0438\u043D\u0436\u0435\u043D\u0435\u0440\u043E\ + \u0432. \u0422\u0435\u043F\u0435\u0440\u044C \u0438\u0445 \u0448\u043B\u0435\ + \u043C\u0430 \u0437\u0430\u0449\u0438\u0449\u0430\u044E\u0442 \u043E\u0442 \u0441\ + \u0432\u0430\u0440\u043A\u0438." + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u043F\u0435\u0440\u043A\ + \ \"\u0411\u0438\u043E\u043D\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u0440\ + \u0443\u043A\u0430\". \u0422\u0435\u043F\u0435\u0440\u044C \u043E\u043D\u0430\ + \ \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u043A\u0430\u043A \u043B\ + \u043E\u043C, \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u044F \u0442\u043E\u043B\ + \u044C\u043A\u043E \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D\u043D\u044B\ + \u0435 \u0448\u043B\u044E\u0437\u044B. \u0422\u0430\u043A \u0436\u0435 \u0441\ + \u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C \u0443\u043C\u0435\u043D\u044C\ + \u0448\u0435\u043D\u0430 \u0441 9 \u0434\u043E 4." + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0433\u0430\u0440\u043D\ + \u0438\u0442\u0443\u0440\u044B \u0413\u043B\u0430\u0432\u044B \u041F\u0435\u0440\ + \u0441\u043E\u043D\u0430\u043B\u0430. \u0422\u0435\u043F\u0435\u0440\u044C \u043E\ + \u043D\u0438 \u0438\u043C\u0435\u044E\u0442 \u0432\u0441\u0435 \u043A\u043B\u044E\ + \u0447\u0438 \u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u0438\u044F, \u043A\ + \u0430\u043A \u044D\u0442\u043E \u0431\u044B\u043B\u043E \u0440\u0430\u043D\u044C\ + \u0448\u0435." + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u041A\u041F\ + \u041A \u041F\u043E\u043B\u0435\u0432\u043E\u0433\u043E \u0418\u043D\u0436\u0435\ + \u043D\u0435\u0440\u0430 \u0438 \u041F\u0438\u043B\u043E\u0442\u0430 \u0421\u0411\ + ! \u0422\u0435\u043F\u0435\u0440\u044C \u043E\u043D\u0438 \u0438\u043C\u0435\ + \u044E\u0442 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B \u0421\u043B\ + \u0443\u0436\u0431\u044B \u0411\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\ + \u0441\u0442\u0438." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u043B\u043E\u0434\ + \u0430\u0443\u0442 \u041E\u0444\u0438\u0446\u0435\u0440\u0430 \"\u0421\u0438\ + \u043D\u0438\u0439 \u0429\u0438\u0442\". \u0422\u0435\u043F\u0435\u0440\u044C\ + \ \u043C\u043E\u0436\u043D\u043E \u0432\u044B\u0431\u0440\u0430\u0442\u044C\ + \ \u043B\u0438\u0448\u044C \u043E\u0434\u0438\u043D \u043F\u0438\u0441\u0442\ + \u043E\u043B\u0435\u0442 .45 \u0438 \u043E\u0431\u043E\u0439\u043C\u0443 \u043A\ + \ \u043D\u0435\u043C\u0443." + type: Fix + id: 136 + time: '2024-10-31T23:54:32.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/310