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 01/24] 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 02/24] 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 03/24] 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 04/24] =?UTF-8?q?=D0=9C=D0=B0=D0=BB=D0=B5=D0=BD=D1=8C?= =?UTF-8?q?=D0=BA=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=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 05/24] =?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 06/24] 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 From bb53a70d3f980f71c8c5c2930457ed0d87d9da7b Mon Sep 17 00:00:00 2001 From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com> Date: Fri, 1 Nov 2024 19:46:53 +0300 Subject: [PATCH 07/24] Roadmap (#307) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Окно, но не прототип * Рабочий прототип роадмапа * Контрол * Потом доделаю * Пустой Roadmap * Готова --------- Co-authored-by: BL02DL <164734444+BL02DL@users.noreply.github.com> --- Content.Client/Info/LinkBanner.cs | 12 ++- Content.Client/Options/UI/EscapeMenu.xaml | 1 + .../Systems/EscapeMenu/EscapeUIController.cs | 9 +- .../_LostParadise/Roadmap/RoadmapControl.cs | 96 +++++++++++++++++++ .../_LostParadise/Roadmap/RoadmapUI.cs | 81 ++++++++++++++++ .../_LostParadise/Roadmap/RoadmapSystem.cs | 34 +++++++ .../_LostParadise/Roadmap/RoadmapComponent.cs | 18 ++++ .../_LostParadise/Roadmap/RoadmapPrototype.cs | 26 +++++ .../Roadmap/RoadmapUpdateEvent.cs | 16 ++++ .../ru-RU/_LostParadise/roadmap/roadmap.ftl | 7 ++ .../_LostParadise/Roadmap/roadmap.yml | 27 ++++++ 11 files changed, 325 insertions(+), 2 deletions(-) create mode 100644 Content.Client/_LostParadise/Roadmap/RoadmapControl.cs create mode 100644 Content.Client/_LostParadise/Roadmap/RoadmapUI.cs create mode 100644 Content.Server/_LostParadise/Roadmap/RoadmapSystem.cs create mode 100644 Content.Shared/_LostParadise/Roadmap/RoadmapComponent.cs create mode 100644 Content.Shared/_LostParadise/Roadmap/RoadmapPrototype.cs create mode 100644 Content.Shared/_LostParadise/Roadmap/RoadmapUpdateEvent.cs create mode 100644 Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl create mode 100644 Resources/Prototypes/_LostParadise/Roadmap/roadmap.yml diff --git a/Content.Client/Info/LinkBanner.cs b/Content.Client/Info/LinkBanner.cs index a30aa41376..f9c4a1ba76 100644 --- a/Content.Client/Info/LinkBanner.cs +++ b/Content.Client/Info/LinkBanner.cs @@ -1,4 +1,6 @@ -using Content.Client.Changelog; +using Content.Client._LostParadise.Roadmap; +using Content.Client.Changelog; +using Content.Client.Stylesheets; using Content.Client.UserInterface.Systems.EscapeMenu; using Content.Client.UserInterface.Systems.Guidebook; using Content.Shared.CCVar; @@ -47,6 +49,14 @@ public LinkBanner() changelogButton.OnPressed += args => UserInterfaceManager.GetUIController().ToggleWindow(); buttons.AddChild(changelogButton); + var roadmapButton = new Button + { + Text = Loc.GetString("server-info-roadmap-button"), + StyleClasses = { StyleBase.ButtonCaution }, + }; + roadmapButton.OnPressed += _ => UserInterfaceManager.GetUIController().ToggleRoadmap(); + buttons.AddChild(roadmapButton); + void AddInfoButton(string loc, CVarDef cVar) { var button = new Button { Text = Loc.GetString(loc) }; diff --git a/Content.Client/Options/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml index c84954be64..5226be5f58 100644 --- a/Content.Client/Options/UI/EscapeMenu.xaml +++ b/Content.Client/Options/UI/EscapeMenu.xaml @@ -6,6 +6,7 @@ Resizable="False"> + [Flags, Serializable] - public enum ChatChannel : ushort + public enum ChatChannel : uint { None = 0, @@ -60,40 +60,45 @@ public enum ChatChannel : ushort /// Emotes = 1 << 9, + /// + /// HiddenEmotes + /// + HiddenEmotes = 1 << 10, + /// /// Deadchat /// - Dead = 1 << 10, + Dead = 1 << 11, /// /// Misc admin messages /// - Admin = 1 << 11, + Admin = 1 << 12, /// /// Admin alerts, messages likely of elevated importance to admins /// - AdminAlert = 1 << 12, + AdminAlert = 1 << 13, /// /// Admin chat /// - AdminChat = 1 << 13, + AdminChat = 1 << 14, /// /// Unspecified. /// - Unspecified = 1 << 14, + Unspecified = 1 << 15, /// /// Nyano - Summary:: Telepathic channel for all psionic entities. /// - Telepathic = 1 << 15, + Telepathic = 1 << 16, /// /// Channels considered to be IC. /// - IC = Local | Whisper | Radio | Dead | Emotes | Damage | Visual | Telepathic | Notifications, //Nyano - Summary: Adds telepathic as an 'IC' labelled chat.. + IC = Local | Whisper | Radio | Dead | Emotes | HiddenEmotes | Damage | Visual | Telepathic | Notifications, //Nyano - Summary: Adds telepathic as an 'IC' labelled chat.. AdminRelated = Admin | AdminAlert | AdminChat, } diff --git a/Content.Shared/Chat/ChatSelectChannel.cs b/Content.Shared/Chat/ChatSelectChannel.cs index 5104bbc306..972d588598 100644 --- a/Content.Shared/Chat/ChatSelectChannel.cs +++ b/Content.Shared/Chat/ChatSelectChannel.cs @@ -7,7 +7,7 @@ /// Maps to , giving better names. /// [Flags] - public enum ChatSelectChannel : ushort + public enum ChatSelectChannel : uint { None = 0, @@ -41,6 +41,11 @@ public enum ChatSelectChannel : ushort /// Emotes = ChatChannel.Emotes, + /// + /// HiddenEmotes + /// + HiddenEmotes = ChatChannel.HiddenEmotes, + /// /// Deadchat /// diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs index 3ea02a30f7..bb61f920ec 100644 --- a/Content.Shared/Chat/SharedChatSystem.cs +++ b/Content.Shared/Chat/SharedChatSystem.cs @@ -20,6 +20,7 @@ public abstract class SharedChatSystem : EntitySystem public const char OOCPrefix = '['; public const char EmotesPrefix = '%'; // Corvax-Localization public const char EmotesAltPrefix = '*'; + public const char HiddenEmotesPrefix = '+'; public const char AdminPrefix = ']'; public const char WhisperPrefix = ','; public const char TelepathicPrefix = '='; //Nyano - Summary: Adds the telepathic channel's prefix. @@ -265,6 +266,7 @@ public enum InGameICChatType : byte { Speak, Emote, + HiddenEmote, Whisper, Telepathic } diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 79bc474189..416fa900ab 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -14,6 +14,7 @@ public static class ContentKeyFunctions public static readonly BoundKeyFunction FocusChat = "FocusChatInputWindow"; public static readonly BoundKeyFunction FocusLocalChat = "FocusLocalChatWindow"; public static readonly BoundKeyFunction FocusEmote = "FocusEmote"; + public static readonly BoundKeyFunction FocusHiddenEmote = "FocusHiddenEmote"; public static readonly BoundKeyFunction FocusWhisperChat = "FocusWhisperChatWindow"; public static readonly BoundKeyFunction FocusRadio = "FocusRadioWindow"; public static readonly BoundKeyFunction FocusLOOC = "FocusLOOCWindow"; diff --git a/Resources/Locale/en-US/chat/ui/chat-box.ftl b/Resources/Locale/en-US/chat/ui/chat-box.ftl index 720f0d15ab..c2feb3e3a8 100644 --- a/Resources/Locale/en-US/chat/ui/chat-box.ftl +++ b/Resources/Locale/en-US/chat/ui/chat-box.ftl @@ -8,6 +8,7 @@ hud-chatbox-select-channel-Admin = Admin hud-chatbox-select-channel-Console = Console hud-chatbox-select-channel-Dead = Dead hud-chatbox-select-channel-Emotes = Emotes +hud-chatbox-select-channel-HiddenEmotes = Tet-a-tet hud-chatbox-select-channel-Local = Local hud-chatbox-select-channel-Whisper = Whisper hud-chatbox-select-channel-LOOC = LOOC @@ -21,6 +22,7 @@ hud-chatbox-channel-AdminAlert = Admin Alert hud-chatbox-channel-AdminChat = Admin Chat hud-chatbox-channel-Dead = Dead hud-chatbox-channel-Emotes = Emotes +hud-chatbox-channel-HiddenEmotes = Tet-a-tet hud-chatbox-channel-Local = Local hud-chatbox-channel-Whisper = Whisper hud-chatbox-channel-LOOC = LOOC diff --git a/Resources/Locale/ru-RU/chat/ui/chat-box.ftl b/Resources/Locale/ru-RU/chat/ui/chat-box.ftl index dda8ff1aec..98028ab871 100644 --- a/Resources/Locale/ru-RU/chat/ui/chat-box.ftl +++ b/Resources/Locale/ru-RU/chat/ui/chat-box.ftl @@ -7,6 +7,7 @@ hud-chatbox-select-channel-Admin = Админ hud-chatbox-select-channel-Console = Консоль hud-chatbox-select-channel-Dead = Мёртвые hud-chatbox-select-channel-Emotes = Эмоции +hud-chatbox-select-channel-HiddenEmotes = Тет-а-тет hud-chatbox-select-channel-Local = Рядом hud-chatbox-select-channel-Whisper = Шёпот hud-chatbox-select-channel-LOOC = LOOC @@ -19,6 +20,7 @@ hud-chatbox-channel-AdminAlert = Админ Уведомления hud-chatbox-channel-AdminChat = Админ Чат hud-chatbox-channel-Dead = Мёртвые hud-chatbox-channel-Emotes = Эмоции +hud-chatbox-channel-HiddenEmotes = Тет-а-тет hud-chatbox-channel-Local = Рядом hud-chatbox-channel-Whisper = Шёпот hud-chatbox-channel-LOOC = LOOC From f5115e425779c8ea954f113b9eaa0740fa24f857 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: Fri, 1 Nov 2024 16:48:14 +0000 Subject: [PATCH 09/24] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 43c80a1196..52a8516f74 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2526,3 +2526,25 @@ id: 136 time: '2024-10-31T23:54:32.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/310 +- author: Farrellka + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0447\u0430\u0442\ + \ Tet-a-tet! \u042D\u0442\u043E\u0442 \u0447\u0430\u0442 \u0440\u0430\u0431\u043E\ + \u0442\u0430\u0435\u0442 \u043A\u0430\u043A \u0447\u0430\u0442 \u044D\u043C\u043E\ + \u0446\u0438\u0439, \u043D\u043E \u0435\u0433\u043E \u0441\u043B\u044B\u0448\ + \u043D\u043E \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u0440\u0430\u0434\u0438\ + \u0443\u0441\u0435 \u0434\u0432\u0443\u0445 \u0442\u0430\u0439\u043B\u043E\u0432\ + ." + type: Add + id: 137 + time: '2024-11-01T16:47:09.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/313 +- author: Farrellka + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u043B\u0430\u043D\ + \ \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u043A\u0438 Lost-Paradise\ + \ \u0432 \u043C\u0435\u043D\u044E \u0438\u0433\u0440\u044B!" + type: Add + id: 138 + time: '2024-11-01T16:46:53.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/307 From 96fd52538c2454330a98ea6a20135e1047dd8506 Mon Sep 17 00:00:00 2001 From: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Date: Fri, 1 Nov 2024 19:52:29 +0300 Subject: [PATCH 10/24] Update launcher-connecting.ftl --- Resources/Locale/ru-RU/launcher/launcher-connecting.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/launcher/launcher-connecting.ftl b/Resources/Locale/ru-RU/launcher/launcher-connecting.ftl index 66505c2afd..babd9fcd17 100644 --- a/Resources/Locale/ru-RU/launcher/launcher-connecting.ftl +++ b/Resources/Locale/ru-RU/launcher/launcher-connecting.ftl @@ -10,7 +10,7 @@ connecting-in-progress = Подключение к серверу... connecting-disconnected = Отключён от сервера: connecting-tip = Играй РП! connecting-window-tip = Совет { $numberTip } -connecting-version = версия 2.0 +connecting-version = Версия 2.0.6 connecting-fail-reason = Не удалось подключиться к серверу: { $reason } From 1c3a00f70a5016e01e37853934fa9f895ba908e9 Mon Sep 17 00:00:00 2001 From: DarkSide Date: Fri, 1 Nov 2024 19:57:25 +0300 Subject: [PATCH 11/24] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D1=88=D0=BE=D0=B9=20=D1=80=D0=B5=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D1=81=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0=20Secret=20(#315)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Ребаланс секрета * Update secret_weights.yml --------- Co-authored-by: DarkSide-droids Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com> --- Resources/Prototypes/secret_weights.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml index d0f437cfed..a54cbbda68 100644 --- a/Resources/Prototypes/secret_weights.yml +++ b/Resources/Prototypes/secret_weights.yml @@ -1,8 +1,8 @@ - type: weightedRandom id: Secret weights: - Survival: 0.44 - Nukeops: 0.14 - Zombie: 0.03 - Traitor: 0.39 - #Pirates: 0.15 #ahoy me bucko + Survival: 0.15 + Nukeops: 0.20 + Revolutionary: 0.15 + Zombie: 0.20 + Traitor: 0.30 From 439919e6125d31e49faedf488d5cc5e87c76c220 Mon Sep 17 00:00:00 2001 From: DarkSide Date: Fri, 1 Nov 2024 19:58:12 +0300 Subject: [PATCH 12/24] =?UTF-8?q?=D0=92=D0=BE=D0=B4=D0=BE=D0=BB=D0=B0?= =?UTF-8?q?=D0=B7=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=9E=D1=84=D0=B8?= =?UTF-8?q?=D1=86=D0=B5=D1=80=20=D0=A1=D0=B8=D0=BD=D0=B8=D0=B9=20=D0=A9?= =?UTF-8?q?=D0=B8=D1=82=20(#312)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: DarkSide-droids --- .../entities/clothing/uniforms/misc_roles.ftl | 2 ++ .../Loadouts/Jobs/Heads/headOfPersonnel.yml | 1 + .../Entities/Clothing/Uniforms/misc_roles.yml | 11 +++++++ .../Loadouts/Jobs/blueshield.yml | 13 ++++++++- .../equipped-INNERCLOTHING.png | Bin 0 -> 1682 bytes .../blueshield_turtleneck.rsi/icon.png | Bin 0 -> 513 bytes .../blueshield_turtleneck.rsi/inhand-left.png | Bin 0 -> 783 bytes .../inhand-right.png | Bin 0 -> 848 bytes .../blueshield_turtleneck.rsi/meta.json | 27 ++++++++++++++++++ 9 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/misc_roles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/misc_roles.ftl index 6d350a7491..a466900658 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/misc_roles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/misc_roles.ftl @@ -3,3 +3,5 @@ ent-LPPArbiterclothing = Костюм Арбитра .suffix = Личные вещи ent-LPPClothingUniformJumpsuitBlueshield = Костюм офицера "Синий Щит" .desc = Это костюм человека высокого ранга. +ent-LPPClothingUniformSkirtleneckBlueshield = Водолазка офицера "Синий Щит" + .desc = Это костюм человека высокого ранга. \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml index 7bb265dd7b..723e0c1b39 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml @@ -31,6 +31,7 @@ - !type:CharacterJobRequirement jobs: - HeadOfPersonnel + - LPPBlueShieldOfficer items: - ClothingUniformJumpsuitBoatswain diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml index 0e751585d5..4ab71a0905 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml @@ -27,3 +27,14 @@ sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi - type: Clothing sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: LPPClothingUniformSkirtleneckBlueshield + name: blueshield's skirtleneck + description: This is the costume of a man of high rank. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi diff --git a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml index 81d7417211..fe91b16c6d 100644 --- a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml +++ b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml @@ -84,4 +84,15 @@ jobs: - LPPBlueShieldOfficer items: - - MagazineMagnum \ No newline at end of file + - MagazineMagnum + +- type: loadout + id: LoadoutCommandBSSkirtleneck + category: JobsCommand + cost: 0 + requirements: + - !type:CharacterJobRequirement + jobs: + - LPPBlueShieldOfficer + items: + - LPPClothingUniformSkirtleneckBlueshield \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..6c3e4aeb62e04ea8c6e15ec62a44030ab90b6b26 GIT binary patch literal 1682 zcmV;D25tF?P)`hA%d&W*(ZFyxB;9V8`@Rp)^X~7w2XwpL zwdid)9Nx?SSfEEXbyyXkAohJ9tyT++F{rAF+uK_-8jX#H>;jAY=jZ3h^Bj^SVK5jx z$iFiI+U+*)^?Gn86WGlr+{px(x7)T2*L7jrHm7vOn{A3V3E8~7(gk);&ma$ydU4C2<>*8o2FS_pPik7QVLDe%5pRsRpNhi5iFEf z6a}v90zl~j#a|&t(cbIz&~CSP@|IQbFOClYnx-w4Rr$Bt1(GB|k|gkbf2rPXHc>x0 zDX&-CcZDp=kmvd4@i~X@`(TVAilVK@-Y7uf`dOB3eRD;>Mx*g$FKD;h+%OD8QG_4} zW|f>{JRUFg^E|KoKTT6)S%!AIy%qnXYXD;mj4?QlLpBXquh#(pj^hwnmUs4%A&MeI zQMAVIc^)jw!gxG}EPuKUQT~k{Pz=1y)0d=ALlylO4Xc93_*ZYf3jf9)Rrhqy^T?uG zR>dLscNPlgdA_TmHiFF;xHL`6x-?D8dQk`qP;7xkDM`{S4mbcz)5M!MZvX(6WdQ(m zT?YWPS}iQb3fn>`6gGQ5@ua4psjCRn9ENTn2m|P{gh|MtWC^BM@Ano8%VwMBbsewH zU#+!$7<_;fhe)T6P$(?q0fw$4k10rf7JTrS0su%|LmpEY^QW;dD2fUIph=FwwS)gI z|Ha_i0ZsCyb`b~(a5tIYy#E>izHGje|9XoS=Hs@y`F)$s6m8OG` z0Bk%U41nHz$&0xo=Ll3%?8%H(#8}a?U{r0i_g|mzM{5d+PW5T+_6Y z8vrP!NRmW2K|*K>G@DJXC<;u|gk@Rfw|QBXVVWlT{r=t;h`S&x5Y(mG~a!IY(e$Smh{eD3YW^AtZop+vs#UWp>8u8T=uR z$X7Wm%R;BqDYM1K<1r=zM|71QS)qDSGWN97nO)eh>W$k%NB~)uF`Z6vc6N4eX&6Q& zBSc^r#u~Tlx@9T48wm9t`ZZ+scR2az0H^_eh=yUor79q6xXo$+{uVMo6n^6zwH$CM zz&XJ`A6x)+3_p0VJKw__eH0o`I26`8KX9cc!?0%2m|>sd=H?buwh&+Zc92lG^Ybs9 zO#{4m(L&(f0RWP~Ll9@6*BAQ>g#mzGUywMsgC7Ji?9&+u3laVG>%mS@uK)O*D9J2u z(6CS82LXIb}SO5S307*qoM6N<$f+v~q`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8905221e8fb53164208defbb79cafb47d9a679c3 GIT binary patch literal 513 zcmV+c0{;DpP)fKx~nGKE5=-~VIm2gt(~LS7R{ z0*x>=Mt7Zk$e-QxVS6nNrH})nqn9(sd%Opg_nxmr@TI$71Y87M1biC-N~x10NfK|Z z^-3wMwLVD_|F%X7B}u{q;b=7S0M0pv!y#2wp|xhUS}_<50GQ2Y3P75$VhhqV^;wpo zqli4u!F#mU0OWa&)|xEKNYk`awqHp%KfED8v0jrHbFyaNrG1?TL_UZFSZgWElAfY5@bX=s`T=iJHt#2CUTI`h9OPw8WU^EUoHK(&ujTgd=;=RE3SVx)OF2vIT7(fM+^FKOj~bI;SB)3 z-s}X1H?;MJejIn9>n`ABz2^Sm5rE1S%zyq+mD{D?{lgNJ zX9cjGKP%nawfoi>w#!MUkr8`!E_{zaqKklwfOFyx)H9QZ5NY*~7Rxws;piHn+Ic^mk`BpFXsLg<+wkL6iTOMkDpwOFv?Z!) zBW|Zg3V5-vTl`s7g;!Vo`Mi64p3m7_TK>@jWTVtt0%Z=Nz?O)iM8Fi<7pGn)iE37=ont>r={dES0WS&VX zj?+>*9!q$wtbYFb)!gP={SJv{r;SRiWHpv9*xDAvHP??la@yV9>-z3lZrH?@vG!t) z*~Dd<9UM*^0)m%JTsPlrxpu4To+ZaCE_TNT1&$_l{kUfg1y?f?<~~31dC#6_zuV2P zN4;L0|Ilvl`TTg+(7&>)&U>*72(COSqSzYo|4gH)Kv2g7rxhnfKL6ZP^#9!@Yxb}Z z>E2_a3`Yv33-28JRv7x?d+zOP+8up=y)Buv`xzLv$lL3;PD=M*sCN0&Ecy6*p?P;> ztCqizS#>^&pKb(SvCy8ZDS z+lGAUSdPF<>w6~|{+UeJ7`2u`#(wgH6ovzLeGWb2IhbIupl*M^mN948w&VI|_enA_ zOidS>!^5z_eDZ@Q$_d442Tw9ER2y@id&ir1PC#e>(x>0ozIJD5IQsi~Y;w=P<=@%5 zC7UdEGBO-F>1#PTp~rF+>zr5??yjAUK6hp7Sq0h>XXN*-d~@(7LziOLm&@)9+tmdKI;Vst0Q03&M*si- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f1e448fda2105bf03e29157c3ce6506dc8911449 GIT binary patch literal 848 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|PUY zr;B4q#hkaZ59Z%85NWS3Q&aGs+p<#o*1GO(&R0TLd{_Lq{JquNO}EY7-tv-NwAIPu zvgkd&Tq7?bscVa-Z~3R9V!&4WFOmJqcdZVN^O7fZ5AGf6^2?4QuDhcTGT*!w zz9zh_ML@vmM05XqF@_0oKA)fO`lrp{@a1#2{rvM^^~65db11Uh)k`TbQPNb^(fs)Q zmlT7*|6jM}pG^}_4c%}mzUkK!kx42!`SJ`2)xRgGTy!A1FQuiWs6}u$MDo_Q_P$XAcW*>{`|t zn#CS))#Tx>yw|^2!&ZtOc=hP8!5MKY8NQR7)`YbOM9JwZXV2Qvy2jh_hg=eoQ<;|$Rd_*m)o_ovA%p~Eh-HWTM ztM`3=_rs=o&%Ks{Z*Mm*Y5On#uDNS*q0H+wnTytNI&RsrCg!)&jM`oQXQ}9Y{{5U` z$&_nFJ7eA*C|oYmcR=k;Gyl(&_iv@wm?^5H-;dtOyp8LD<|px<8B^A`F`WMl%pwe) Lu6{1-oD!M Date: Fri, 1 Nov 2024 16:59:17 +0000 Subject: [PATCH 13/24] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 54 ++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 52a8516f74..40eda996b4 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2548,3 +2548,57 @@ id: 138 time: '2024-11-01T16:46:53.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/307 +- author: MrDarkSide + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0434\ + \u043E\u043B\u0430\u0437\u043A\u0430 \u041E\u0444\u0438\u0446\u0435\u0440 \u0421\ + \u0438\u043D\u0438\u0439 \u0429\u0438\u0442" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0434\ + \u043E\u043B\u0430\u0437\u043A\u0430 \u041E\u0444\u0438\u0446\u0435\u0440 \u0421\ + \u0438\u043D\u0438\u0439 \u0429\u0438\u0442 \u0432 \u043B\u043E\u0434\u0430\u0443\ + \u0442\u0435 \u0441\u043D\u0430\u0440\u044F\u0436\u0435\u043D\u0438\u044F \u043A\ + \u043E\u043C\u0430\u043D\u0434\u043E\u0432\u0430\u043D\u0438\u044F" + type: Add + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0432\u044B\u0434\u0430\ + \u0447\u0430 \u0432\u043E\u0434\u043E\u043B\u0437\u0430\u043A\u0438 \u0431\u043E\ + \u0446\u043C\u0430\u043D\u0430, \u0442\u0435\u043F\u0435\u0440\u044C \u043E\u043D\ + \u0430 \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u0438 \u041E\u0444\u0438\ + \u0446\u0435\u0440 \u0421\u0438\u043D\u0438\u0439 \u0429\u0438\u0442" + type: Tweak + id: 139 + time: '2024-11-01T16:58:12.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/312 +- author: MrDarkSide + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0440\u0435\u0436\u0438\ + \u043C \u0420\u0435\u0432\u043E\u043B\u044E\u0446\u0438\u0438 \u0432 \u043F\u0443\ + \u043B\u043B \u0440\u0435\u0436\u0438\u043C\u043E\u0432 \u0421\u0435\u043A\u0440\ + \u0435\u0442\u0430. \u0428\u0430\u043D\u0441 \u0432\u044B\u043F\u0430\u0434\u0435\ + \u043D\u0438\u0435 \u0440\u0430\u0432\u0435\u043D 0.15" + type: Add + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0448\u0430\u043D\u0441\ + \ \u0432\u044B\u043F\u0430\u0434\u0430 \u0440\u0435\u0436\u0438\u043C\u0430\ + \ \u042F\u0434\u0435\u0440\u043D\u044B\u0435 \u041E\u043F\u0435\u0440\u0430\u0442\ + \u0438\u0432\u043D\u0438\u043A\u0438 \u0432 \u0421\u0435\u043A\u0440\u0435\u0442\ + \u0435 (0.14 - 0.20)" + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0448\u0430\u043D\u0441\ + \ \u0432\u044B\u043F\u0430\u0434\u0430 \u0440\u0435\u0436\u0438\u043C\u0430\ + \ \u0417\u043E\u043C\u0431\u0438 \u0430\u043F\u043E\u043A\u0430\u043B\u0438\u043F\ + \u0441\u0438\u0441 \u0432 \u0421\u0435\u043A\u0440\u0435\u0442\u0435 (0.03 -\ + \ 0.20)" + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0448\u0430\u043D\u0441\ + \ \u0432\u044B\u043F\u0430\u0434\u0430 \u0440\u0435\u0436\u0438\u043C\u0430\ + \ \u0412\u044B\u0436\u0438\u0432\u0430\u043D\u0438\u0435 \u0432 \u0421\u0435\ + \u043A\u0440\u0435\u0442\u0435 (0.44 - 0.15)" + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0448\u0430\u043D\u0441\ + \ \u0432\u044B\u043F\u0430\u0434\u0430 \u0440\u0435\u0436\u0438\u043C\u0430\ + \ \u041F\u0440\u0435\u0434\u0430\u0442\u0435\u043B\u0438 \u0432 \u0421\u0435\ + \u043A\u0440\u0435\u0442\u0435 (0.39 - 0.30)" + type: Tweak + id: 140 + time: '2024-11-01T16:57:25.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/315 From 50a782e4887fb578b0ffe58f6a9f1ea8fa76daa3 Mon Sep 17 00:00:00 2001 From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:25:44 +0300 Subject: [PATCH 14/24] =?UTF-8?q?=D1=85=D0=BE=D1=82=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=20(#316)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl b/Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl index 8f321ca0fb..e29da05a42 100644 --- a/Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl @@ -1,4 +1,5 @@ ui-roadmap = План разработки +server-info-roadmap-button = План разработки Lost Paradise roadmap-plan-LLP = План разработки Lost Paradise roadmap-goal-completed = Завершено roadmap-goal-progress = В процессе From 567868bbf60d00e7e55426679241854e3e7069c6 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: Sat, 2 Nov 2024 13:26:51 +0000 Subject: [PATCH 15/24] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 40eda996b4..3c27751ea6 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2602,3 +2602,12 @@ id: 140 time: '2024-11-01T16:57:25.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/315 +- author: Farrellka + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043D\u0430\ + \u0437\u0432\u0430\u043D\u0438\u0435 \u0440\u043E\u0430\u0434\u043C\u0430\u043F\ + \u0430!" + type: Fix + id: 141 + time: '2024-11-02T13:25:44.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/316 From 9ef8dfd684d62af0e5c50049e9ea1ad4831b9c37 Mon Sep 17 00:00:00 2001 From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:05:50 +0300 Subject: [PATCH 16/24] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=D0=BE=D0=B2=20(#318)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Фиксы багов * Фикс фиксов * Фикс тестов --- Resources/Locale/ru-RU/traits/traits.ftl | 2 +- .../Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml | 1 + Resources/Prototypes/Entities/Structures/Windows/shuttle.yml | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/traits/traits.ftl b/Resources/Locale/ru-RU/traits/traits.ftl index 4efc692b31..e3815ced87 100644 --- a/Resources/Locale/ru-RU/traits/traits.ftl +++ b/Resources/Locale/ru-RU/traits/traits.ftl @@ -61,7 +61,7 @@ trait-description-ForeignerLight = Чтобы помочь вам преодолеть это препятствие, у вас есть переводчик, который поможет вам говорить на основном языке этой станции. trait-name-Foreigner = Унесённый ядерным взрывом trait-description-Foreigner = - По той или иной причине вы не говорите на основном языке станции. + По той или иной причине вы не говорите на любом языке станции. Вместо этого вам выдан переводчик, которым можете пользоваться только вы. trait-name-Saturnine = Мрачный trait-description-Saturnine = Вы от природы суровы и угрюмый человек. Ваше настроение постоянно ухудшается. diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml index 2267ad85dd..24e0449e1e 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml @@ -72,6 +72,7 @@ id: SyndicateListenerGear equipment: jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateBlack + back: ClothingBackpackSyndicate head: ClothingHeadPyjamaSyndicateBlack ears: ClothingHeadsetAltSyndicateListening gloves: ClothingHandsGlovesCombat diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml index b1850d6e8f..877699f032 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml @@ -39,6 +39,9 @@ - type: IconSmooth base: swindow - type: Appearance + - type: Construction + graph: Window + node: shuttleWindow - type: DamageVisuals thresholds: [4, 8, 12] damageDivisor: 28 @@ -46,7 +49,7 @@ damageOverlay: sprite: Structures/Windows/cracks.rsi - type: StaticPrice - price: 75 + price: 100 - type: entity parent: ShuttleWindow From b0205b3f36c72376086cf7dd95a3cb4d4774178c 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: Sat, 2 Nov 2024 21:06:54 +0000 Subject: [PATCH 17/24] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 3c27751ea6..1a858d5b08 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2611,3 +2611,27 @@ id: 141 time: '2024-11-02T13:25:44.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/316 +- author: Farrellka + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u044E\u043A\ + \u0437\u0430\u043A\u0438 \u0441\u0438\u043D\u0434\u0438\u043A\u0430\u0442\u0430\ + \ \u0434\u043B\u044F \u0430\u0433\u0435\u043D\u0442\u043E\u0432 \u043F\u0440\ + \u043E\u0441\u043B\u0443\u0448\u043A\u0438!" + type: Add + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043E \u043E\u043F\u0438\u0441\ + \u0430\u043D\u0438\u0435 \u0442\u0440\u0435\u0439\u0442\u0430 \u0443\u043D\u0435\ + \u0441\u0451\u043D\u043D\u043E\u0433\u043E \u044F\u0434\u0435\u0440\u043D\u044B\ + \u043C \u0432\u0437\u0440\u044B\u0432\u043E\u043C!" + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0434\u0435\u043C\ + \u043E\u043D\u0442\u0430\u0436 \u043E\u043A\u043D\u0430 \u0448\u0430\u0442\u0442\ + \u043B\u0430! \u0414\u0435\u043C\u043E\u043D\u0442\u0430\u0436 \u0443\u0441\u043B\ + \u043E\u0436\u043D\u0451\u043D, \u0430 \u043F\u043E\u0441\u043B\u0435 \u0434\ + \u0435\u043C\u043E\u043D\u0442\u0430\u0436\u0430 \u0432\u044B\u043F\u0430\u0434\ + \u0430\u044E\u0442 \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\ + \u0443\u044E\u0449\u0438\u0435 \u0441\u0442\u0440\u043E\u0439\u043C\u0430\u0442\ + \u0435\u0440\u0438\u0430\u043B\u044B." + type: Fix + id: 142 + time: '2024-11-02T21:05:50.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/318 From 2ff2b0d33dbe466daf33e5be562427bb76b2ef02 Mon Sep 17 00:00:00 2001 From: PowerKAT1 <53919050+PowerKAT1@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:44:05 +0300 Subject: [PATCH 18/24] =?UTF-8?q?M41-A=20=D0=A4=D0=B8=D0=BA=D1=81=20(#317)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * m41-A Фикс Патронов * m41-A Фикс Патронов * m41-A Фикс Патронов * m41-A Фикс Патронов --- .../guns/ammunition/magazines/M41-A_mag.ftl | 20 +- .../objects/weapons/guns/rifles/M41-A.ftl | 4 +- .../Guns/Ammunition/Magazines/M41-A_mag.yml | 180 +++++++++--------- .../Objects/Weapons/Guns/Rifles/M41-A.yml | 92 ++++----- 4 files changed, 148 insertions(+), 148 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazines/M41-A_mag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazines/M41-A_mag.ftl index 49a5d32b0f..1a5e35fc24 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazines/M41-A_mag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazines/M41-A_mag.ftl @@ -1,10 +1,10 @@ -ent-LPPBaseMagazineRifleM41A = Магазин для M41-A (.20 винтовочные) - .desc = { ent-BaseItem.desc } -ent-LPPBaseMagazineRifleM41AFull = Магазин для M41-A (.20 винтовочные Боевые) - .desc = { ent-LPPBaseMagazineRifleM41A.desc } -ent-LPPBaseMagazineRifleM41APractice = Магазин для M41-A (.20 винтовочные Учебные) - .desc = { ent-LPPBaseMagazineRifleM41A.desc } -ent-LPPBaseMagazineRifleM41ARubber = Магазин для M41-A (.20 винтовочные Резиновые) - .desc = { ent-LPPBaseMagazineRifleM41A.desc } -ent-LPPBaseMagazineRifleM41AUranium = Магазин для M41-A (.20 винтовочные Урановые) - .desc = { ent-LPPBaseMagazineRifleM41A.desc } +ent-LPPBaseMagazineRifleM41A = Магазин для M41-A (.30 винтовочные) + .desc = { ent-BaseItem.desc } +ent-LPPBaseMagazineRifleM41AFull = Магазин для M41-A (.30 винтовочные Боевые) + .desc = { ent-LPPBaseMagazineRifleM41A.desc } +ent-LPPBaseMagazineRifleM41APractice = Магазин для M41-A (.30 винтовочные Учебные) + .desc = { ent-LPPBaseMagazineRifleM41A.desc } +ent-LPPBaseMagazineRifleM41ARubber = Магазин для M41-A (.30 винтовочные Резиновые) + .desc = { ent-LPPBaseMagazineRifleM41A.desc } +ent-LPPBaseMagazineRifleM41AUranium = Магазин для M41-A (.30 винтовочные Урановые) + .desc = { ent-LPPBaseMagazineRifleM41A.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/M41-A.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/M41-A.ftl index 99ef022398..31cd5bbc40 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/M41-A.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/rifles/M41-A.ftl @@ -1,2 +1,2 @@ -ent-LPPWeaponRifleM41 = М41-А - .desc = Старая винтовка, использовавшаяся во времена колониальной экспансии. Использует винтовочные патроны 20-го калибра. +ent-LPPWeaponRifleM41 = М41-А + .desc = Старая винтовка, использовавшаяся во времена колониальной экспансии. Использует винтовочные патроны 30-го калибра. diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/M41-A_mag.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/M41-A_mag.yml index e322a59355..9ef76425b9 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/M41-A_mag.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/M41-A_mag.yml @@ -1,90 +1,90 @@ -- type: entity - id: LPPBaseMagazineRifleM41A - name: "magazine M41-A (.20 rifle)" - parent: BaseItem - abstract: true - components: - - type: Tag - tags: - - MagazineRifleM41A - - type: Item - size: Small - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - CartridgeRifle - capacity: 99 - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: _LostParadise/Objects/Weapons/Guns/Ammunition/Magazine/M41-A_mag.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: false - - type: Appearance - -# Magazines -- type: entity - id: LPPBaseMagazineRifleM41AFull - name: "magazine M41-A (.20 rifle)" - parent: LPPBaseMagazineRifleM41A - components: - - type: BallisticAmmoProvider - proto: CartridgeRifle - - type: Sprite - layers: - - state: red - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: LPPBaseMagazineRifleM41APractice - name: "magazine M41-A (.20 rifle practice)" - parent: LPPBaseMagazineRifleM41A - components: - - type: BallisticAmmoProvider - proto: CartridgeRiflePractice - - type: Sprite - layers: - - state: practice - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: LPPBaseMagazineRifleM41ARubber - name: "magazine M41-A (.20 rifle rubber)" - parent: LPPBaseMagazineRifleM41A - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleRubber - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - -- type: entity - id: LPPBaseMagazineRifleM41AUranium - name: "magazine (.20 rifle uranium)" - parent: LPPBaseMagazineRifleM41A - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleUranium - - type: Sprite - layers: - - state: uranium - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: LPPBaseMagazineRifleM41A + name: "magazine M41-A (.30 rifle)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazineRifleM41A + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeRifle + capacity: 99 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Ammunition/Magazine/M41-A_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + +# Magazines +- type: entity + id: LPPBaseMagazineRifleM41AFull + name: "magazine M41-A (.30 rifle)" + parent: LPPBaseMagazineRifleM41A + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: LPPBaseMagazineRifleM41APractice + name: "magazine M41-A (.30 rifle practice)" + parent: LPPBaseMagazineRifleM41A + components: + - type: BallisticAmmoProvider + proto: CartridgeRiflePractice + - type: Sprite + layers: + - state: practice + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: LPPBaseMagazineRifleM41ARubber + name: "magazine M41-A (.30 rifle rubber)" + parent: LPPBaseMagazineRifleM41A + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + + +- type: entity + id: LPPBaseMagazineRifleM41AUranium + name: "magazine (.30 rifle uranium)" + parent: LPPBaseMagazineRifleM41A + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/M41-A.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/M41-A.yml index 9e22855f38..5ae493fc9f 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/M41-A.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/M41-A.yml @@ -1,47 +1,47 @@ -- type: entity - name: M41-A - parent: BaseWeaponRifle - id: LPPWeaponRifleM41 - description: An old rifle used during the colonial expansion. Uses .20 rifle ammo. - components: - - type: Sprite - sprite: _LostParadise/Objects/Weapons/Guns/Rifles/M41-A.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Gun - fireRate: 7 - soundGunshot: - path: /Audio/_LostParadise/Weapons/Guns/Gunshots/M41-A.ogg - - type: ChamberMagazineAmmoProvider - soundRack: - path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: LPPBaseMagazineRifleM41AFull - insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineRifleM41A - gun_chamber: - name: Chamber - startingItem: CartridgeLightRifle - priority: 1 - whitelist: - tags: - - CartridgeLightRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true +- type: entity + name: M41-A + parent: BaseWeaponRifle + id: LPPWeaponRifleM41 + description: An old rifle used during the colonial expansion. Uses .30 rifle ammo. + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Rifles/M41-A.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + fireRate: 7 + soundGunshot: + path: /Audio/_LostParadise/Weapons/Guns/Gunshots/M41-A.ogg + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: LPPBaseMagazineRifleM41AFull + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifleM41A + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true - type: Appearance \ No newline at end of file From eaf311461dcdeee56d1e1b6d7ee7d440e5e14f52 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: Sat, 2 Nov 2024 21:45:11 +0000 Subject: [PATCH 19/24] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 1a858d5b08..4dce67721b 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2635,3 +2635,13 @@ id: 142 time: '2024-11-02T21:05:50.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/318 +- author: PowerKAT1 + changes: + - message: "\u041E\u0442\u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\ + \u0430\u043D \u043F\u0435\u0440\u0435\u0432\u043E\u0434 \u043E\u043F\u0438\u0441\ + \u0430\u043D\u0438\u044F \u043E\u0431\u043E\u0438\u043C \u0438 \u0441\u0430\u043C\ + \u043E\u0433\u043E M41-A" + type: Fix + id: 143 + time: '2024-11-02T21:44:06.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/317 From 9311ff712f88153e21786723d8a2f9b9a6af915d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2024 16:08:02 +0300 Subject: [PATCH 20/24] Update Credits (#319) Co-authored-by: Lost-Paradise-Bot <172407741+Lost-Paradise-Bot@users.noreply.github.com> --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 7b0e97dea4..eaa2b6068a 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, angelofallars, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, beck-thompson, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlueHNT, Boaz1111, BobdaBiscuit, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, CilliePaint, clorl, Clyybber, CodedCrow, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, d4kii, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, dootythefrooty, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, Evgencheg, exincore, exp111, Fahasor, FairlySadPanda, Fansana, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, geraeumig, Git-Nivrak, github-actions[bot], gituhabu, gluesniffler, Golinth, GoodWheatley, gradientvera, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, Ichaie, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, Lgibb18, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Mnemotechnician, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, nyeogmi, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, paolordls, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, ShatteredSwords, SignalWalker, SimpleStation14, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, stellar-novas, StrawberryMoses, superjj18, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, Tmanzxd, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UltimateJester, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zerorulez, zionnBE, ZNixian, ZoldorfTheWizard, Zymem +0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, angelofallars, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, beck-thompson, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlueHNT, Boaz1111, BobdaBiscuit, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, CilliePaint, clorl, Clyybber, CodedCrow, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, d4kii, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, dootythefrooty, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, Evgencheg, exincore, exp111, Fahasor, FairlySadPanda, Fansana, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, geraeumig, Git-Nivrak, github-actions[bot], gituhabu, gluesniffler, Golinth, GoodWheatley, gradientvera, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, Ichaie, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, Lgibb18, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Mnemotechnician, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, nyeogmi, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, paolordls, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuroSlavKing, qrtDaniil, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, ShatteredSwords, SignalWalker, SimpleStation14, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, stellar-novas, StrawberryMoses, superjj18, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, Tmanzxd, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UltimateJester, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zerorulez, zionnBE, ZNixian, ZoldorfTheWizard, Zymem From 8f7e3892cfb8367d62f5e019d3d3a3a56f207378 Mon Sep 17 00:00:00 2001 From: Miklosh <158335048+MegaDaimond@users.noreply.github.com> Date: Sun, 3 Nov 2024 20:09:41 +0700 Subject: [PATCH 21/24] Syndies & Salvagers update (#314) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Syndies & Salvager update * Update LPPsmg.yml * ы --------- Co-authored-by: BL02DL <164734444+BL02DL@users.noreply.github.com> --- .../catalog/fills/backpacks/duffelbags.ftl | 4 + .../catalog/fills/backpacks/neck.ftl | 3 + .../catalog/fills/crates/Hardsuits.ftl | 4 + .../entities/clothing/back/duffel.ftl | 2 + .../clothing/eyes/glasses/glasses.ftl | 2 + .../clothing/head/hardsuit-helmet.ftl | 8 + .../entities/clothing/mask/mask.ftl | 3 + .../clothing/outerclothing/hardsuits.ftl | 8 + .../entities/clothing/uniforms/jumpsuits.ftl | 2 + .../objects/consumable/food/halloween.ftl | 8 - .../objects/decoration/flora/halloween.ftl | 8 +- .../entities/objects/decoration/halloween.ftl | 12 ++ .../ammunition/magazine/rifle/LPPMags.ftl | 2 +- .../catalog/fills/backpacks/duffelbags.ftl | 4 + .../catalog/fills/backpacks/neck.ftl | 3 + .../catalog/fills/crates/Hardsuits.ftl | 4 + .../entities/clothing/back/duffel.ftl | 2 + .../clothing/eyes/glasses/glasses.ftl | 2 + .../clothing/head/hardsuit-helmet.ftl | 8 + .../entities/clothing/mask/mask.ftl | 3 + .../clothing/outerclothing/hardsuits.ftl | 8 + .../entities/clothing/uniforms/jumpsuits.ftl | 2 + .../objects/consumable/food/halloween.ftl | 2 +- .../entities/objects/decoration/halloween.ftl | 4 + .../ammunition/magazine/rifle/LPPMags.ftl | 2 +- .../Prototypes/Catalog/Cargo/cargo_cargo.yml | 2 +- .../Catalog/Cargo/cargo_hardsuits.yml | 24 +-- .../Prototypes/Catalog/uplink_catalog.yml | 18 +-- .../Entities/Clothing/Belt/belts.yml | 18 ++- .../Clothing/OuterClothing/hardsuits.yml | 16 +- .../Guns/Ammunition/Magazines/pistol.yml | 2 +- .../Objects/Weapons/Melee/baseball_bat.yml | 10 +- Resources/Prototypes/Roles/Antags/nukeops.yml | 21 +-- .../Catalog/Cargo/cargo_crate.yml | 18 ++- .../Catalog/Fills/Backpacks/duffelbags.yml | 26 ++++ .../Catalog/Fills/Backpacks/neck.yml | 10 ++ .../Catalog/Fills/Crates/Hardsuits.yml | 19 +++ .../_LostParadise/Catalog/uplink.yml | 11 ++ .../Entities/Clothing/Back/duffel.yml | 12 ++ .../Clothing/Eyes/Glasses/glasses.yml | 30 ++++ .../Clothing/Head/hardsuit-helmet-eva.yml | 3 + .../Clothing/Head/hardsuit-helmet.yml | 127 ++++++++++++++++ .../Entities/Clothing/Mask/mask.yml | 25 +++ .../OuterClothing/acienthardsuitsyndie.yml | 6 +- .../Clothing/OuterClothing/hardsuits.yml | 143 ++++++++++++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++ .../Objects/Weapons/Guns/SMGs/LPPsmg.yml | 5 +- .../Entities/Objects/Weapons/Melee/syndie.yml | 10 +- .../Misc/syndieholster.rsi/equipped-NECK.png} | Bin .../Misc}/syndieholster.rsi/icon.png | Bin .../Misc}/syndieholster.rsi/inhand-left.png | Bin .../Misc}/syndieholster.rsi/inhand-right.png | Bin .../Misc}/syndieholster.rsi/meta.json | 2 +- .../integduffel.rsi/equipped-BACKPACK.png | Bin 0 -> 871 bytes .../Back/Duffels/integduffel.rsi/icon.png | Bin 0 -> 471 bytes .../Duffels/integduffel.rsi/inhand-left.png | Bin 0 -> 511 bytes .../Duffels/integduffel.rsi/inhand-right.png | Bin 0 -> 550 bytes .../Back/Duffels/integduffel.rsi/meta.json | 26 ++++ .../inteqglasses.rsi/equipped-EYES.png | Bin 0 -> 348 bytes .../Eyes/Glasses/inteqglasses.rsi/icon.png | Bin 0 -> 448 bytes .../Eyes/Glasses/inteqglasses.rsi/meta.json | 18 +++ .../hardsuitinteqhelm.rsi/equipped-HELMET.png | Bin 0 -> 856 bytes .../hardsuitinteqhelm.rsi/icon-open.png | Bin 0 -> 520 bytes .../Hardsuits/hardsuitinteqhelm.rsi/icon.png | Bin 0 -> 495 bytes .../hardsuitinteqhelm.rsi/inhand-left.png | Bin 0 -> 387 bytes .../hardsuitinteqhelm.rsi/inhand-right.png | Bin 0 -> 380 bytes .../Hardsuits/hardsuitinteqhelm.rsi/meta.json | 41 +++++ .../open-equipped-HELMET.png | Bin 0 -> 922 bytes .../open-inhand-left.png | Bin 0 -> 387 bytes .../open-inhand-right.png | Bin 0 -> 380 bytes .../miningjugghelm.rsi/icon-flash.png | Bin 0 -> 457 bytes .../Hardsuits/miningjugghelm.rsi/icon.png | Bin 0 -> 391 bytes .../Hardsuits/miningjugghelm.rsi/meta.json | 57 +++++++ .../off-equipped-HELMET-reptilian.png | Bin 0 -> 1067 bytes .../off-equipped-HELMET-shark.png | Bin 0 -> 1071 bytes .../off-equipped-HELMET-tajaran.png | Bin 0 -> 1132 bytes .../off-equipped-HELMET-vulpkanin.png | Bin 0 -> 1101 bytes .../off-equipped-HELMET.png | Bin 0 -> 1064 bytes .../on-equipped-HELMET-reptilian.png | Bin 0 -> 1079 bytes .../on-equipped-HELMET-shark.png | Bin 0 -> 1083 bytes .../on-equipped-HELMET-tajaran.png | Bin 0 -> 1134 bytes .../on-equipped-HELMET-vulpkanin.png | Bin 0 -> 1109 bytes .../miningjugghelm.rsi/on-equipped-HELMET.png | Bin 0 -> 1077 bytes .../Hardsuits/salvplushelm.rsi/icon-flash.png | Bin 0 -> 456 bytes .../Head/Hardsuits/salvplushelm.rsi/icon.png | Bin 0 -> 398 bytes .../Head/Hardsuits/salvplushelm.rsi/meta.json | 57 +++++++ .../off-equipped-HELMET-reptilian.png | Bin 0 -> 1087 bytes .../off-equipped-HELMET-shark.png | Bin 0 -> 1105 bytes .../off-equipped-HELMET-tajaran.png | Bin 0 -> 1128 bytes .../off-equipped-HELMET-vulpkanin.png | Bin 0 -> 1181 bytes .../salvplushelm.rsi/off-equipped-HELMET.png | Bin 0 -> 1070 bytes .../on-equipped-HELMET-reptilian.png | Bin 0 -> 1092 bytes .../on-equipped-HELMET-shark.png | Bin 0 -> 1110 bytes .../on-equipped-HELMET-tajaran.png | Bin 0 -> 1127 bytes .../on-equipped-HELMET-vulpkanin.png | Bin 0 -> 1180 bytes .../salvplushelm.rsi/on-equipped-HELMET.png | Bin 0 -> 1078 bytes .../upgrmininghelm.rsi/icon-flash.png | Bin 0 -> 391 bytes .../Hardsuits/upgrmininghelm.rsi/icon.png | Bin 0 -> 391 bytes .../Hardsuits/upgrmininghelm.rsi/meta.json | 57 +++++++ .../off-equipped-HELMET-reptilian.png | Bin 0 -> 1061 bytes .../off-equipped-HELMET-shark.png | Bin 0 -> 1079 bytes .../off-equipped-HELMET-tajaran.png | Bin 0 -> 1079 bytes .../off-equipped-HELMET-vulpkanin.png | Bin 0 -> 1138 bytes .../off-equipped-HELMET.png | Bin 0 -> 1060 bytes .../on-equipped-HELMET-reptilian.png | Bin 0 -> 1074 bytes .../on-equipped-HELMET-shark.png | Bin 0 -> 1081 bytes .../on-equipped-HELMET-tajaran.png | Bin 0 -> 1089 bytes .../on-equipped-HELMET-vulpkanin.png | Bin 0 -> 1138 bytes .../upgrmininghelm.rsi/on-equipped-HELMET.png | Bin 0 -> 1071 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 2032 bytes .../Hardsuits/hardsuitinteq.rsi/icon.png | Bin 0 -> 732 bytes .../hardsuitinteq.rsi/inhand-left.png | Bin 0 -> 1485 bytes .../hardsuitinteq.rsi/inhand-right.png | Bin 0 -> 1485 bytes .../Hardsuits/hardsuitinteq.rsi/meta.json | 26 ++++ .../equipped-OUTERCLOTHING-reptilian.png | Bin 0 -> 3334 bytes .../equipped-OUTERCLOTHING-shark.png | Bin 0 -> 3517 bytes .../equipped-OUTERCLOTHING-tajaran.png | Bin 0 -> 3253 bytes .../equipped-OUTERCLOTHING-vulpkanin.png | Bin 0 -> 3456 bytes .../miningjugg.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2973 bytes .../Hardsuits/miningjugg.rsi/icon.png | Bin 0 -> 1055 bytes .../Hardsuits/miningjugg.rsi/inhand-left.png | Bin 0 -> 756 bytes .../Hardsuits/miningjugg.rsi/inhand-right.png | Bin 0 -> 715 bytes .../Hardsuits/miningjugg.rsi/meta.json | 42 +++++ .../equipped-OUTERCLOTHING-reptilian.png | Bin 0 -> 3094 bytes .../equipped-OUTERCLOTHING-shark.png | Bin 0 -> 3244 bytes .../equipped-OUTERCLOTHING-tajaran.png | Bin 0 -> 2915 bytes .../equipped-OUTERCLOTHING-vulpkanin.png | Bin 0 -> 3177 bytes .../salvplus.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2738 bytes .../Hardsuits/salvplus.rsi/icon.png | Bin 0 -> 968 bytes .../Hardsuits/salvplus.rsi/inhand-left.png | Bin 0 -> 756 bytes .../Hardsuits/salvplus.rsi/inhand-right.png | Bin 0 -> 715 bytes .../Hardsuits/salvplus.rsi/meta.json | 42 +++++ .../equipped-OUTERCLOTHING-reptilian.png | Bin 0 -> 3212 bytes .../equipped-OUTERCLOTHING-shark.png | Bin 0 -> 3358 bytes .../equipped-OUTERCLOTHING-tajaran.png | Bin 0 -> 3080 bytes .../equipped-OUTERCLOTHING-vulpkanin.png | Bin 0 -> 3258 bytes .../upgrmining.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2804 bytes .../Hardsuits/upgrmining.rsi/icon.png | Bin 0 -> 1017 bytes .../Hardsuits/upgrmining.rsi/inhand-left.png | Bin 0 -> 756 bytes .../Hardsuits/upgrmining.rsi/inhand-right.png | Bin 0 -> 715 bytes .../Hardsuits/upgrmining.rsi/meta.json | 42 +++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1292 bytes .../flipped-equipped-INNERCLOTHING.png | Bin 0 -> 856 bytes .../Jumpsuit/inteqjumpsuit.rsi/icon.png | Bin 0 -> 516 bytes .../inteqjumpsuit.rsi/icon_flipped.png | Bin 0 -> 516 bytes .../Jumpsuit/inteqjumpsuit.rsi/meta.json | 25 +++ 146 files changed, 1031 insertions(+), 81 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl create mode 100644 Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/neck.yml create mode 100644 Resources/Prototypes/_LostParadise/Catalog/Fills/Crates/Hardsuits.yml rename Resources/Textures/Clothing/{Belt/syndieholster.rsi/equipped-BELT.png => Neck/Misc/syndieholster.rsi/equipped-NECK.png} (100%) rename Resources/Textures/Clothing/{Belt => Neck/Misc}/syndieholster.rsi/icon.png (100%) rename Resources/Textures/Clothing/{Belt => Neck/Misc}/syndieholster.rsi/inhand-left.png (100%) rename Resources/Textures/Clothing/{Belt => Neck/Misc}/syndieholster.rsi/inhand-right.png (100%) rename Resources/Textures/Clothing/{Belt => Neck/Misc}/syndieholster.rsi/meta.json (93%) create mode 100644 Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Eyes/Glasses/inteqglasses.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Eyes/Glasses/inteqglasses.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Eyes/Glasses/inteqglasses.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/icon-open.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/open-equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/open-inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/open-inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/icon-flash.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET-reptilian.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET-shark.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET-reptilian.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET-shark.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/icon-flash.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-reptilian.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-shark.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/on-equipped-HELMET-reptilian.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/on-equipped-HELMET-shark.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/on-equipped-HELMET-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/on-equipped-HELMET-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/icon-flash.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-reptilian.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-shark.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/on-equipped-HELMET-reptilian.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/on-equipped-HELMET-shark.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/on-equipped-HELMET-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/on-equipped-HELMET-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/equipped-OUTERCLOTHING-reptilian.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/equipped-OUTERCLOTHING-shark.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/equipped-OUTERCLOTHING-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/equipped-OUTERCLOTHING-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING-reptilian.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING-shark.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING-reptilian.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING-shark.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING-tajaran.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING-vulpkanin.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi/flipped-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi/icon_flipped.png create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi/meta.json diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl index 152aff5faf..4e3985e8c3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl @@ -16,3 +16,7 @@ ent-LPPBackpackDuffelIncendiaryGrenadeDelta = Duffel bag with incendiary grenade .desc = Contains five incendiary grenades ent-LPPClothingBackpackDuffelAcientSyndicateHardsuitBundle = Ancient syndicate hardsuit bundle .desc = Contains ancient syndicate hardsuit bundle +ent-LPPClothingBackpackDuffelContractorSyndicateHardsuitBundle = Contractor syndicate hardsuit bundle + .desc = Contains contractor syndicate hardsuit bundle +ent-LPPClothingBackpackDuffelSyndicateOperative = contractor duffelbag + .desc = { ent-LPPClothingBackpackDuffelContractor.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl new file mode 100644 index 0000000000..2f2d660221 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl @@ -0,0 +1,3 @@ +ent-ClothingBeltSyndieHolsterBundle = { ent-ClothingBeltSyndieHolster } + .suffix = LoneOps + .desc = { ent-ClothingBeltSyndieHolster.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl new file mode 100644 index 0000000000..b0b7a92f5e --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl @@ -0,0 +1,4 @@ +ent-LPPCrateLogisticsRodosHardsuit = Rodos hardsuit crate + .desc = Contains a single HpI-20a+ "Rodos" hardsuit. +ent-LPPCrateLogisticsKerateiaHardsuit = Kerateia hardsuit crate + .desc = Contains a single HpI-20a+ "Kerateia" hardsuit. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl index 9bdb470234..4203e399c0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl @@ -12,3 +12,5 @@ ent-LPPClothingBackpackDuffelDelta = delta duffel bag .desc = { ent-ClothingBackpackDuffel.desc } ent-LPPClothingBackpackDuffelCommandDelta = command delta duffel bag .desc = { ent-ClothingBackpackDuffel.desc } +ent-LPPClothingBackpackDuffelContractor = contractor duffel bag + .desc = { ent-ClothingBackpackDuffel.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl index f63305a9d6..b2384c4d52 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl @@ -12,3 +12,5 @@ ent-LPPClothingEyesGlassesNVG = PG nightvision goggles .desc = Useful for special operations. ent-LPPClothingEyesGlassesAviatorNPZ = NPZ aviators .desc = Only for the most coolest guys in this sector. +ent-LPPClothingEyesGlassesContractor = Contractor glasses + .desc = Glasses, that provides protection from flashes and secure wearers eyes from wielding. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl index 954b79c9b8..58ad92f98d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl @@ -26,3 +26,11 @@ ent-LPPClothingHeadHelmetHardsuitIICCommand = IIC exosuit helmet .desc = { ent-ClothingHeadHardsuitWithLightBase.desc } ent-LPPClothingHeadHelmetHardsuitIICEngineer = Engineer IIC exosuit helmet .desc = { ent-ClothingHeadHardsuitWithLightBase.desc } +ent-LPPClothingHeadHelmetHardsuitInteq = INT-05Q helmet + .desc = Stury helmet that offers flash protection for your eyes. It has two modes, just for style. +ent-LPPClothingHeadHelmetHardsuitUpgradedMining = HpI-20b helmet + .desc = Good helmet for every needs. +ent-LPPClothingHeadHelmetHardsuitMiningPlus = HpI-20a+ helmet + .desc = Good helmet for every needs. +ent-LPPClothingHeadHelmetHardsuitMiningJuggernaut = HpIP-22 helmet + .desc = Good helmet for every needs. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl index 7cc5ec952c..27bdbe3f77 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl @@ -54,3 +54,6 @@ ent-LPPBlueShieldClothingMaskGas = Gas mask of officer "Blue Shield" .desc = Elite gas mask of officer "Blue Shield". ent-LPPClothingMaskPGWrittenOff = Decommissioned balaclava PG .desc = A decommissioned balaclava that was used by PG soldiers. +ent-LPPClothingMaskNeckGaiterLoneOps = neck gaiter + .desc = Stylish neck gaiter for your neck, can protect from the cosmic wind and even some projectiles. + .suffix = LoneOps diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl index df7a0186fb..543a539f5f 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl @@ -32,3 +32,11 @@ ent-LPPClothingOuterHardsuitRND = Hardsuit RHS-14s - "Lambda" .desc = The protective suit, developed by braines from the RND, is easy to produce, and also provides, in general, good protection from various external factors, which can be found when working in RND. ent-LPPClothingOuterHardsuitScienceNPZ = Hardsuit NPZ-34r - "Gelehrt" .desc = A research spacesuit designed for the work of NPZ scientists, as well as technicians in outer space and harsh planetary conditions. +ent-LPPClothingOuterHardsuitInteq = Hardsuit INT-05Q - "Lochern" + .desc = A sturdy spacesuit for close quarters combat, it's generally pretty versatile. Painted in a glossy brown color. +ent-LPPClothingOuterHardsuitUpgradedMining = Hardsuit HpI-20b "Kerateia" + .desc = Hephaestus Industries porotype spacesuit designed for salvagers usage in low-pressure environments. Marked to indicate that this model has protection against most types of exposure. Looks not so heavy. +ent-LPPClothingOuterHardsuitMiningPlus = Hardsuit HpI-20a+ "Rodos" + .desc = Hephaestus Industries upgraded hardsuit, providing more protection from blunt and slash damages, sacrificing protection from piercing damage. Marked to indicate that this model has protection against most types of exposure. Looks pretty light. +ent-LPPClothingOuterHardsuitMiningJuggernaut = Hardsuit HpIP-22 "Argos" + .desc = Hephaestus Industries juggernaut hardsuit, providing lots of protection from different types of damages. It's desined to work in most harsh enviroments. Looks so heavy... diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl index f8c6d53fb5..d82d8f1900 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl @@ -140,3 +140,5 @@ ent-LPPClothingUniformRedTracksuit = red tracksuit .desc = red tracksuit for sports in any situation. ent-LPPClothingUniformGreenTracksuit = green tracksuit .desc = greeb tracksuit for sports in any situation. +ent-LPPClothingUniformJumpsuitInteq = contractor jumpsuit + .desc = Elite clothing for elite mercs. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl index 6510b2570b..6cf69c7947 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl @@ -1,10 +1,2 @@ ent-LPPCandy = candy .desc = This is my kingdom come, this is my kingdom come... -ent-LPPCandy2 = { ent-LPPCandy } - .desc = { ent-LPPCandy.desc } -ent-LPPCandy3 = { ent-LPPCandy } - .desc = { ent-LPPCandy.desc } -ent-LPPCandy4 = { ent-LPPCandy } - .desc = { ent-LPPCandy.desc } -ent-LPPLolipop = lolipop - .desc = This is my kingdom come, this is my kingdom come... diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl index 62b5651b2f..41786cb01b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl @@ -1,8 +1,8 @@ -ent-HalloweenTree01 = dead tree +ent-LPPHalloweenTree01 = dead tree .desc = Dead tree with leaves on it, looks creepy. -ent-HalloweenTree02 = dead tree +ent-LPPHalloweenTree02 = dead tree .desc = Dead tree with leaves on it, looks creepy. -ent-HalloweenTree03 = dead tree +ent-LPPHalloweenTree03 = dead tree .desc = Dead tree with leaves on it, looks creepy. -ent-HalloweenTree04 = dead tree +ent-LPPHalloweenTree04 = dead tree .desc = Dead tree with leaves on it, looks creepy. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl index 89abc5fc56..3cda702fd0 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl @@ -1,2 +1,14 @@ ent-LPPPSpiderDeco = spiders .desc = Fake spiders that look like they're ready to bite you. +ent-LPPPumpkinDeco = pumpkin + .desc = Small decorative pumpkin with brush marks on it +ent-LPPPumpkinBigDeco = pumpkin + .desc = Decorative pumpkins with brush marks on it +ent-LPPPottedPlantHalloween1 = { ent-PottedPlantBase } + .desc = Withered houseplant, looks dead. +ent-LPPPottedPlantHalloween2 = { ent-LPPPottedPlantHalloween1 } + .desc = { ent-LPPPottedPlantHalloween1.desc } +ent-LPPPottedPlantHalloween3 = { ent-LPPPottedPlantHalloween1 } + .desc = { ent-LPPPottedPlantHalloween1.desc } +ent-LPPPottedPlantHalloween4 = { ent-LPPPottedPlantHalloween1 } + .desc = { ent-LPPPottedPlantHalloween1.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl index 85c3766d51..ebafe811e6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl @@ -6,7 +6,7 @@ ent-LPPMagazineRifleM4A1Rubber = Magazine (calibre 5,56x45 rubber) .desc = { ent-LPPBaseMagazineRifle.desc } ent-LPPMagazineRifleM4A1Practice = Magazine (calibre 5,56x45 practice) .desc = { ent-LPPBaseMagazineRifle.desc } -ent-LPPagazineRifleM4A1Uranium = Magazine (calibre 5,56x45 uranium) +ent-LPPMagazineRifleM4A1Uranium = Magazine (calibre 5,56x45 uranium) .desc = { ent-LPPBaseMagazineRifle.desc } ent-LPPMagazineRifleMars = Magazine from rifle "Mars" .desc = { ent-BaseItem.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl index bbd61aa975..6b001c0675 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/duffelbags.ftl @@ -16,3 +16,7 @@ ent-LPPBackpackDuffelIncendiaryGrenadeDelta = Вещвещмешок с зажи .desc = Содержит 5 зажигательных гранат ent-LPPClothingBackpackDuffelAcientSyndicateHardsuitBundle = Набор древнего скафандра .desc = Содержит набор с древним скафандром. +ent-LPPClothingBackpackDuffelContractorSyndicateHardsuitBundle = Набор скафандра контрактника + .desc = Содержит набор скафандра контрактника +ent-LPPClothingBackpackDuffelSyndicateOperative = Вещмешок контрактника + .desc = { ent-LPPClothingBackpackDuffelContractor.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl new file mode 100644 index 0000000000..73990931b9 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/backpacks/neck.ftl @@ -0,0 +1,3 @@ +ent-ClothingBeltSyndieHolsterBundle = { ent-ClothingBeltSyndieHolster } + .suffix = Лонопс + .desc = { ent-ClothingBeltSyndieHolster.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl new file mode 100644 index 0000000000..b994345a93 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/Hardsuits.ftl @@ -0,0 +1,4 @@ +ent-LPPCrateLogisticsRodosHardsuit = Ящик со скафандром HpI-20a+ "Rodos" + .desc = Содержит один скафандр HpI-20a+ "Rodos". +ent-LPPCrateLogisticsKerateiaHardsuit = Ящик со скафандром HpI-20a+ "Kerateia" + .desc = Содержит один скафандр HpI-20a+ "Kerateia". diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl index b6c103277c..de800d57e0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/back/duffel.ftl @@ -12,3 +12,5 @@ ent-LPPClothingBackpackDuffelDelta = Спортивная сумка "Дельт .desc = { ent-ClothingBackpackDuffel.desc } ent-LPPClothingBackpackDuffelCommandDelta = Спортивная сумка командира "Дельта" .desc = { ent-ClothingBackpackDuffel.desc } +ent-LPPClothingBackpackDuffelContractor = Вещмешок контрактника + .desc = { ent-ClothingBackpackDuffel.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl index c8f99aa514..de60073d3a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/eyes/glasses/glasses.ftl @@ -12,3 +12,5 @@ ent-LPPClothingEyesGlassesNVG = ПНВ ПГ .desc = Помогают лучше видеть в ночи. Полезно для Специальных операций. ent-LPPClothingEyesGlassesAviatorNPZ = НПЗ Авиаторы .desc = Только для самых крутых парней в этом секторе. +ent-LPPClothingEyesGlassesContractor = Очки контрактника + .desc = Очки, обеспечивающие защиту от вспышек и предохраняющие глаза пользователя от сварки. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl index 33b2a67925..da39369cad 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/head/hardsuit-helmet.ftl @@ -26,3 +26,11 @@ ent-LPPClothingHeadHelmetHardsuitIICCommand = Шлем экзоскелета И .desc = { ent-ClothingHeadHardsuitWithLightBase.desc } ent-LPPClothingHeadHelmetHardsuitIICEngineer = Шлем экзоскелета инженера ИРЦ .desc = { ent-ClothingHeadHardsuitWithLightBase.desc } +ent-LPPClothingHeadHelmetHardsuitInteq = Шлем INT-05Q + .desc = Шлем Stury, который обеспечивает защиту глаз от вспышек. У него есть два режима, просто для стиля. +ent-LPPClothingHeadHelmetHardsuitUpgradedMining = Шлем HpI-20b + .desc = Хороший шлем для любых нужд. +ent-LPPClothingHeadHelmetHardsuitMiningPlus = Шлем HpI-20a+ + .desc = Хороший шлем для любых нужд. +ent-LPPClothingHeadHelmetHardsuitMiningJuggernaut = Шлем HpIP-22 + .desc = Хороший шлем для любых нужд. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl index 6a0bd71a61..5c90aab925 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/mask/mask.ftl @@ -55,3 +55,6 @@ ent-LPPBlueShieldClothingMaskGas = Противогаз офицера "сини .desc = Элитный противогаз офицера "синий щит". ent-LPPClothingMaskPGWrittenOff = Списанная балаклава ПГ .desc = Списанная балаклава которая использовалась солдатами ПГ. +ent-LPPClothingMaskNeckGaiterLoneOps = шейный гетр + .desc = Стильный гетр для шеи, способный защитить от космического ветра и даже некоторых снарядов. + .suffix = Лонопс diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl index 3d2a38b817..bfb2638458 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/outerclothing/hardsuits.ftl @@ -34,3 +34,11 @@ ent-LPPClothingOuterHardsuitRND = Скафандр RHS-14s - "Lambda" .desc = Защитный скафандр, разработанный головастиками из отдела НИО, лёгкий для производства, а так же предоставляющий, в целом, хорошую защиту от разных внешних факторов, что можно встретить при работе в НИО. ent-LPPClothingOuterHardsuitScienceNPZ = Скафандр NPZ-34r - "Gelehrt" .desc = Научно исследовательский скафандр, разработанный для работы учёных НПЗ, а так же техников в открытом космосе и тяжёлых условиях планет. +ent-LPPClothingOuterHardsuitInteq = Боевой скафандр INT-05Q - "Lochern" + .desc = Прочный скафандр для ближнего боя, в целом довольно универсальный. Окрашен в глянцевый коричневый цвет. +ent-LPPClothingOuterHardsuitUpgradedMining = скафандр HpI-20b "Kerateia" + .desc = Портотип космического скафандра Hephaestus Industries, предназначенный для использования спасателями в условиях низкого давления. Маркировка указывает на то, что эта модель защищает от большинства видов воздействия. Выглядит не очень тяжелым. +ent-LPPClothingOuterHardsuitMiningPlus = Скафандр HpI-20a+ "Rodos" + .desc = Модернизированный скафандр от Hephaestus Industries, обеспечивающий повышенную защиту от тупых и режущих повреждений, но не дающий защиты от колющих повреждений. Маркировка указывает на то, что эта модель защищает от большинства видов воздействия. Выглядит довольно легким. +ent-LPPClothingOuterHardsuitMiningJuggernaut = Скафандр HpIP-22 "Argos" + .desc = Защитный костюм джаггернаута от Hephaestus Industries, обеспечивающий надежную защиту от различных видов повреждений. Он предназначен для работы в самых суровых условиях. Выглядит таким тяжелым... \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl index e8cffd7046..9c694697a2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/jumpsuits.ftl @@ -140,3 +140,5 @@ ent-LPPClothingUniformRedTracksuit = Красный спортивный кос .desc = Погодите, на нём три полоски? ent-LPPClothingUniformGreenTracksuit = Зелёный спортивный костюм .desc = Погодите, на нём три полоски? +ent-LPPClothingUniformJumpsuitInteq = Комбинезон контрактника + .desc = Элитная одежда для элитных наёмников. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl index de2b0e836e..e1021b4e7a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl @@ -1,2 +1,2 @@ ent-LPPCandy = конфета - .desc = Обычная конфета состоящия из сахара и других вещей \ No newline at end of file + .desc = Обычная конфета состоящия из сахара и других вещей diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl index b7d9cb9b1c..6306079d75 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl @@ -1,5 +1,9 @@ ent-LPPPSpiderDeco = паучки .desc = Муляжи паучков которые выглядят так, будто готовы вас покусать. +ent-LPPPumpkinDeco = pumpkin + .desc = Small decorative pumpkin with brush marks on it +ent-LPPPumpkinBigDeco = pumpkin + .desc = Decorative pumpkins with brush marks on it ent-LPPPPumpkinDeco = тыква .desc = Маленькая декоративная тыква. ent-LPPPPumpkinBigDeco = тыква diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl index fcca9dab4a..1f69d0fd88 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/ammunition/magazine/rifle/LPPMags.ftl @@ -6,7 +6,7 @@ ent-LPPMagazineRifleM4A1Rubber = Магазин (калибр 5,56х45 рези .desc = { ent-LPPBaseMagazineRifle.desc } ent-LPPMagazineRifleM4A1Practice = Магазин (калибр 5,56х45 учебный) .desc = { ent-LPPBaseMagazineRifle.desc } -ent-LPPagazineRifleM4A1Uranium = Магазин (калибр 5,56х45 урановый) +ent-LPPMagazineRifleM4A1Uranium = Магазин (калибр 5,56x45 урановый) .desc = { ent-LPPBaseMagazineRifle.desc } ent-LPPMagazineRifleMars = Обойма винтовки "Марс" .desc = { ent-BaseItem.desc } diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml index 8673789106..044b149efd 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml @@ -14,6 +14,6 @@ sprite: Clothing/Head/Hardsuits/luxury.rsi state: icon product: CrateCargoLuxuryHardsuit - cost: 6500 + cost: 9000 category: cargoproduct-category-name-cargo group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml b/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml index a2f8b035b0..5fe9eae1f7 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml @@ -5,7 +5,7 @@ sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi state: icon product: CrateEngineeringFotiaHardsuit - cost: 2250 + cost: 4500 category: cargoproduct-category-name-hardsuits group: market @@ -15,7 +15,7 @@ sprite: Clothing/OuterClothing/Hardsuits/engineering.rsi state: icon product: CrateEngineeringLampsiHardsuit - cost: 2250 + cost: 3500 category: cargoproduct-category-name-hardsuits group: market @@ -26,7 +26,7 @@ sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi state: icon product: CrateLogisticsKritiHardsuit - cost: 1250 + cost: 3000 category: cargoproduct-category-name-hardsuits group: market @@ -36,7 +36,7 @@ sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi state: icon product: CrateLogisticsLavrionHardsuit - cost: 3500 + cost: 9000 category: cargoproduct-category-name-hardsuits group: market @@ -47,16 +47,6 @@ sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi state: icon product: CrateSecurityShanlinTacsuit - cost: 17500 - category: cargoproduct-category-name-hardsuits - group: market - -- type: cargoProduct - id: SecurityGuanYuTacsuit - icon: - sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi - state: icon - product: CrateSecurityGuanYuTacsuit cost: 30000 category: cargoproduct-category-name-hardsuits group: market @@ -67,7 +57,7 @@ sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi state: icon product: CrateSecurityBaghaturTacsuit - cost: 5000 + cost: 7500 category: cargoproduct-category-name-hardsuits group: market @@ -77,7 +67,7 @@ sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi state: icon product: CrateSecuritySuldeTacsuit - cost: 7500 + cost: 9500 category: cargoproduct-category-name-hardsuits group: market @@ -87,6 +77,6 @@ sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi state: icon product: CrateSecurityTsagaanTacsuit - cost: 5500 + cost: 8000 category: cargoproduct-category-name-hardsuits group: market diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index e6306fd8ea..af7356d2dd 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1620,15 +1620,15 @@ categories: - UplinkPointless -# - type: listing # DeltaV - Move cat ears out of syndicate uplink into the AutoDrobe -# id: UplinkCatEars -# name: uplink-cat-ears-name -# description: uplink-cat-ears-desc -# productEntity: ClothingHeadHatCatEars -# cost: -# Telecrystal: 4 # Nyanotrasen - Make Cat Ears 4TC instead of 26TC -# categories: -# - UplinkPointless +- type: listing # DeltaV - Move cat ears out of syndicate uplink into the AutoDrobe + id: UplinkCatEars + name: uplink-cat-ears-name + description: uplink-cat-ears-desc + productEntity: ClothingHeadHatCatEars + cost: + Telecrystal: 4 # Nyanotrasen - Make Cat Ears 4TC instead of 26TC + categories: + - UplinkPointless - type: listing id: UplinkOutlawHat diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index a96ca01ef2..93af8f9cd7 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -591,26 +591,36 @@ - 0,0,3,1 - type: entity - parent: ClothingBeltStorageBase + parent: ClothingNeckBase id: ClothingBeltSyndieHolster name: syndicate shoulder holster description: A deep shoulder holster capable of holding many types of ballistics. components: - type: Sprite - sprite: Clothing/Belt/syndieholster.rsi + sprite: Clothing/Neck/Misc/syndieholster.rsi - type: Clothing - sprite: Clothing/Belt/syndieholster.rsi + sprite: Clothing/Neck/Misc/syndieholster.rsi + equipSound: + path: /Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg - type: Item size: Ginormous - type: Storage maxItemSize: Huge grid: - - 0,0,3,3 + - 0,0,3,4 whitelist: components: - Gun - BallisticAmmoProvider - CartridgeAmmo + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] - type: entity parent: ClothingBeltStorageBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 154f8b1b29..45b4c623fb 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -146,9 +146,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.5 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.55 Radiation: 0.3 Caustic: 0.7 - type: ClothingSpeedModifier @@ -306,8 +306,8 @@ Piercing: 0.6 Caustic: 0.7 - type: ClothingSpeedModifier - walkModifier: 0.7 - sprintModifier: 0.7 + walkModifier: 0.8 + sprintModifier: 0.8 - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitWarden @@ -507,9 +507,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.7 + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 Radiation: 0.5 Caustic: 0.8 - type: ClothingSpeedModifier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 679acd299c..29c365a866 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -45,7 +45,7 @@ whitelist: tags: - CartridgePistol - capacity: 16 + capacity: 20 - type: Item size: Small - type: ContainerContainer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 350ea94bd9..4bd60f7ca9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -9,17 +9,17 @@ state: icon - type: MeleeWeapon wideAnimationRotation: -135 - range: 1.6 + range: 1.5 damage: types: Blunt: 7.5 Structural: 5 bluntStaminaDamageFactor: 2.0 - heavyRateModifier: 0.5 - heavyDamageBaseModifier: 1.75 - heavyStaminaCost: 10 + heavyRateModifier: 0.25 + heavyDamageBaseModifier: 1.1 + heavyStaminaCost: 25 maxTargets: 2 - angle: 120 + angle: 100 soundHit: collection: MetalThud - type: Wieldable diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index b02ebe6753..3bdb6c0a0a 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -45,18 +45,21 @@ - type: startingGear id: SyndicateLoneOperativeGearFull equipment: - jumpsuit: ClothingUniformJumpsuitOperative - back: ClothingBackpackDuffelSyndicateOperative - mask: ClothingMaskGasSyndicate - eyes: ClothingEyesHudSyndicate + jumpsuit: LPPClothingUniformJumpsuitInteq + back: LPPClothingBackpackDuffelSyndicateOperative + mask: LPPClothingMaskNeckGaiterLoneOps + eyes: LPPClothingEyesGlassesContractor ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitSyndie + outerClothing: LPPClothingOuterHardsuitInteq + neck: ClothingBeltSyndieHolsterBundle shoes: ClothingShoesBootsCombatFilled id: SyndiPDA + underwear: LPPThongYellow + socks: LPPClothingUnderSocksThighYellow pocket1: DoubleEmergencyOxygenTankFilled - pocket2: BaseUplinkRadio40TC - belt: ClothingBeltMilitaryWebbing + pocket2: BaseUplinkRadio25TC + belt: LPPClothingBeltMaximumWebbing innerClothingSkirt: ClothingUniformJumpskirtOperative - satchel: ClothingBackpackDuffelSyndicateOperative - duffelbag: ClothingBackpackDuffelSyndicateOperative + satchel: LPPClothingBackpackDuffelSyndicateOperative + duffelbag: LPPClothingBackpackDuffelSyndicateOperative diff --git a/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml b/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml index 568feec26d..d4b9e9041b 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_crate.yml @@ -29,11 +29,21 @@ group: market - type: cargoProduct - id: LPPCrateCrateCivilianDefensehasLanded + id: LPPCrateCrateRodoshasLanded icon: - sprite: _LostParadise/Objects/Weapons/Guns/Snipers/marsrifle.rsi + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi state: icon - product: LPPCratecivdef + product: LPPCrateLogisticsRodosHardsuit cost: 10000 - category: cargoproduct-category-name-security + category: cargoproduct-category-name-hardsuits + group: market + +- type: cargoProduct + id: LPPCrateCrateKerateiahasLanded + icon: + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi + state: icon + product: LPPCrateLogisticsKerateiaHardsuit + cost: 12000 + category: cargoproduct-category-name-hardsuits group: market \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/duffelbags.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/duffelbags.yml index 1e700e6fa5..b5acea3b8c 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/duffelbags.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/duffelbags.yml @@ -91,3 +91,29 @@ - id: ClothingHandsGlovesCombat - id: DoubleEmergencyOxygenTankFilled - id: DoubleEmergencyNitrogenTankFilled + +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: LPPClothingBackpackDuffelContractorSyndicateHardsuitBundle + name: Contractor syndicate hardsuit bundle + description: Contains contractor syndicate hardsuit bundle + components: + - type: StorageFill + contents: + - id: LPPClothingOuterHardsuitInteq + - id: ClothingMaskGasSyndicate + - id: ClothingHandsGlovesCombat + - id: DoubleEmergencyOxygenTankFilled + - id: DoubleEmergencyNitrogenTankFilled + +- type: entity + parent: LPPClothingBackpackDuffelContractor + id: LPPClothingBackpackDuffelSyndicateOperative + name: contractor duffelbag + components: + - type: StorageFill + contents: + - id: BoxSurvivalSyndicate + - id: LPPWeaponRevolverOC-38 + - id: PinpointerSyndicateNuclear + - id: DeathAcidifierImplanter diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/neck.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/neck.yml new file mode 100644 index 0000000000..8e8a5948c6 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Backpacks/neck.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingBeltSyndieHolster + id: ClothingBeltSyndieHolsterBundle + suffix: LoneOps + components: + - type: StorageFill + contents: + - id: LPPWeaponSubMachineGunIL20 + - id: MagazinePistolHighCapacity + amount: 2 diff --git a/Resources/Prototypes/_LostParadise/Catalog/Fills/Crates/Hardsuits.yml b/Resources/Prototypes/_LostParadise/Catalog/Fills/Crates/Hardsuits.yml new file mode 100644 index 0000000000..ce3c6e65e7 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Catalog/Fills/Crates/Hardsuits.yml @@ -0,0 +1,19 @@ +- type: entity + id: LPPCrateLogisticsRodosHardsuit + parent: CrateGenericSteel + name: Rodos hardsuit crate + description: Contains a single HpI-20a+ "Rodos" hardsuit. + components: + - type: StorageFill + contents: + - id: LPPClothingOuterHardsuitMiningPlus + +- type: entity + id: LPPCrateLogisticsKerateiaHardsuit + parent: CrateGenericSteel + name: Kerateia hardsuit crate + description: Contains a single HpI-20a+ "Kerateia" hardsuit. + components: + - type: StorageFill + contents: + - id: LPPClothingOuterHardsuitUpgradedMining \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Catalog/uplink.yml b/Resources/Prototypes/_LostParadise/Catalog/uplink.yml index a0deda2680..d89c4ca8af 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/uplink.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/uplink.yml @@ -52,3 +52,14 @@ Telecrystal: 12 categories: - UplinkArmor + +- type: listing + id: LPPUplinkBimagpistolboxSyndie + name: uplink-catalog-pistol-bigmagazinebox-name + description: uplink-catalog-armor-syndiehard-desc + icon: { sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi, state: red } + productEntity: BoxMagazinePistolHighCapacity + cost: + Telecrystal: 4 + categories: + - UplinkAmmo \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml index cf97d072be..e4e8674757 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml @@ -66,3 +66,15 @@ - type: Storage grid: - 0,0,10,3 + +- type: entity + parent: ClothingBackpackDuffel + id: LPPClothingBackpackDuffelContractor + name: contractor duffel bag + description: + components: + - type: Sprite + sprite: _LostParadise/Clothing/Back/Duffels/integduffel.rsi + - type: Storage + grid: + - 0,0,10,3 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Glasses/glasses.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Glasses/glasses.yml index 307ed87226..a3964315ac 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Glasses/glasses.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Eyes/Glasses/glasses.yml @@ -91,3 +91,33 @@ - type: FlashImmunity - type: EyeProtection protectionTime: 5 + +- type: entity + parent: ClothingEyesBase + id: LPPClothingEyesGlassesContractor + name: Contractor glasses + description: Glasses, that provides protection from flashes and secure wearers eyes from wielding. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Eyes/Glasses/inteqglasses.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Eyes/Glasses/inteqglasses.rsi + - type: FlashImmunity + - type: EyeProtection + - type: ShowHealthBars + damageContainers: + - Inorganic + - Silicon + - Biological + - type: ShowHealthIcons + damageContainers: + - Biological + - type: ShowSyndicateIcons + - type: ShowSecurityIcons + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml index 2769379ff3..881b6c1f86 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml @@ -26,6 +26,9 @@ Heat: 0.8 - type: TemperatureProtection coefficient: 0.005 + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity parent: ClothingHeadHardsuitWithLightBase diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet.yml index d092625b67..49146dc8e3 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet.yml @@ -408,3 +408,130 @@ Shock: 0.1 Cold: 0.2 Radiation: 0.2 + +- type: entity + parent: ClothingHeadHardsuitBase + id: LPPClothingHeadHelmetHardsuitInteq + noSpawn: true + name: INT-05Q helmet + description: Stury helmet that offers flash protection for your eyes. It has two modes, just for style. + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi + layers: + - state: icon + map: [ "unfoldedLayer" ] + visible: true + - state: icon-open + visible: false + map: ["foldedLayer"] + - type: Clothing + sprite: _LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi + equippedPrefix: open + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 10000 + - type: Item + heldPrefix: open + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.85 + Heat: 0.85 + - type: TemperatureProtection + coefficient: 0.005 + - type: Foldable + folded: true + canFoldInsideContainer: true + unfoldVerbText: fold-zip-verb + foldVerbText: fold-unzip-verb + - type: FoldableClothing + foldedEquippedPrefix: open + foldedHeldPrefix: open + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingHeadHelmetHardsuitUpgradedMining + noSpawn: true + name: HpI-20b helmet + description: Good helmet for every needs. + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi + - type: PointLight + color: "#dff250" + radius: 7 + energy: 3 + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Radiation: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingHeadHelmetHardsuitMiningPlus + noSpawn: true + name: HpI-20a+ helmet + description: Good helmet for every needs. + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi + - type: PointLight + color: "#dff250" + radius: 7 + energy: 3 + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.95 + Radiation: 0.8 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingHeadHelmetHardsuitMiningJuggernaut + noSpawn: true + name: HpIP-22 helmet + description: Good helmet for every needs. + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi + - type: PointLight + color: "#dff250" + radius: 8 + energy: 3 + - type: PressureProtection + highPressureMultiplier: 0.01 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.9 + Radiation: 0.9 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml index ccfb4b0938..7d4e1b3e66 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml @@ -418,3 +418,28 @@ sprite: _LostParadise/Clothing/Mask/pg-balaclava.rsi - type: Clothing sprite: _LostParadise/Clothing/Mask/pg-balaclava.rsi + +- type: entity + parent: ClothingMaskGas + id: LPPClothingMaskNeckGaiterLoneOps + name: neck gaiter + suffix: LoneOps + description: Stylish neck gaiter for your neck, can protect from the cosmic wind and even some projectiles. + components: + - type: Sprite + sprite: Clothing/Mask/neckgaiter.rsi + - type: Clothing + sprite: Clothing/Mask/neckgaiter.rsi + - type: IdentityBlocker + coverage: MOUTH + - type: Tag + tags: + - WhitelistChameleon + - IPCMaskWearable + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml index 08b3365151..b3c1b66514 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/acienthardsuitsyndie.yml @@ -19,10 +19,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.45 - Slash: 0.40 + Blunt: 0.6 + Slash: 0.6 Piercing: 0.35 - Heat: 0.25 + Heat: 0.35 Radiation: 0.05 Caustic: 0.3 - type: ExplosionResistance diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml index 50e155f513..b0e3814a57 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -563,3 +563,146 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetScienceNPZ + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitInteq + name: Hardsuit INT-05Q - "Lochern" + description: A sturdy spacesuit for close quarters combat, it's generally pretty versatile. Painted in a glossy brown color. + components: + - type: Item + size: Huge + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi + - type: PressureProtection + highPressureMultiplier: 0.1 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.40 + Piercing: 0.40 + Caustic: 0.2 + Heat: 0.4 + Radiation: 0.1 + Shock: 0.5 + Cold: 0.5 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: ClothingSpeedModifier + walkModifier: 1.1 + sprintModifier: 0.9 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetHardsuitInteq + - type: BiocodedClothing + - type: StaminaDamageResistance + coefficient: 0.5 + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitUpgradedMining + name: Hardsuit HpI-20b "Kerateia" + description: Hephaestus Industries porotype spacesuit designed for salvagers usage in low-pressure environments. Marked to indicate that this model has protection against most types of exposure. Looks not so heavy. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi + - type: PressureProtection + highPressureMultiplier: 0.1 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.5 + Caustic: 0.45 + Heat: 0.75 + Radiation: 0.3 + Cold: 0.8 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.7 + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetHardsuitUpgradedMining + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitMiningPlus + name: Hardsuit HpI-20a+ "Rodos" + description: Hephaestus Industries upgraded hardsuit, providing more protection from blunt and slash damages, sacrificing protection from piercing damage. Marked to indicate that this model has protection against most types of exposure. Looks pretty light. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi + - type: PressureProtection + highPressureMultiplier: 0.1 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.55 + Slash: 0.55 + Piercing: 0.55 + Caustic: 0.1 + Heat: 0.7 + Radiation: 0.4 + Cold: 0.8 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.7 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetHardsuitMiningPlus + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitMiningJuggernaut + name: Hardsuit HpIP-22 "Argos" + description: Hephaestus Industries juggernaut hardsuit, providing lots of protection from different types of damages. It's desined to work in most harsh enviroments. Looks so heavy... + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.25 + Slash: 0.25 + Piercing: 0.35 + Caustic: 0.05 + Heat: 0.7 + Radiation: 0.05 + Cold: 0.1 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.7 + - type: ClothingSpeedModifier + walkModifier: 0.6 + sprintModifier: 0.6 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetHardsuitMiningJuggernaut + diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuits.yml index 1b769c685e..c9a11caa11 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuits.yml @@ -815,3 +815,14 @@ # sprite: _LostParadise/PERSONAL/Skilets/skilets_uniforms.rsi # - type: Clothing # sprite: _LostParadise/PERSONAL/Skilets/skilets_uniforms.rsi + +- type: entity + parent: ClothingUniformBaseUnsensoredFlippable + id: LPPClothingUniformJumpsuitInteq + name: contractor jumpsuit + description: Elite clothing for elite mercs. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/SMGs/LPPsmg.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/SMGs/LPPsmg.yml index bc4ab596c5..587abcf1dc 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/SMGs/LPPsmg.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/SMGs/LPPsmg.yml @@ -79,10 +79,13 @@ whitelist: tags: - MagazinePistolHighCapacity + - MagazinePistol gun_chamber: name: Chamber startingItem: CartridgePistol priority: 1 whitelist: tags: - - CartridgePistol \ No newline at end of file + - CartridgePistol + - type: Telescope + divisor: 0.2 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/syndie.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/syndie.yml index 26aa0fde3d..7009e0ad18 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/syndie.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/syndie.yml @@ -31,20 +31,24 @@ capacity: 1 count: 1 - type: MeleeWeapon - attackRate: 1.2 + attackRate: 1.25 + heavyRateModifier: 0.75 wideAnimationRotation: -135 damage: types: Blunt: 4.5 Slash: 4.5 - Radiation: 2.5 + Radiation: 1.5 + heavyDamageBaseModifier: 0.9 + heavyStaminaCost: 40 + maxTargets: 2 - type: Wieldable - type: IncreaseDamageOnWield damage: types: Blunt: 7.5 Slash: 7.5 - Radiation: 2.5 + Radiation: 1.5 Structural: 75 - type: GunRequiresWield - type: Item diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png rename to Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png b/Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png rename to Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/icon.png diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-left.png rename to Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-right.png rename to Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/meta.json similarity index 93% rename from Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json rename to Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/meta.json index af733b1b9d..e1ee70642e 100644 --- a/Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Misc/syndieholster.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-BELT", + "name": "equipped-NECK", "directions": 4 }, { diff --git a/Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/equipped-BACKPACK.png b/Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..dd638d2df6881e4a8a325bb574ae89a916c1084b GIT binary patch literal 871 zcmV-t1DO1YP)Px&AxT6*RCt{2non!uKp4iKm_>}%KO_`#*h>%McPQ*}zsAB|mn}$71wo|HJxZZ| z0>8?Fu;)FA2QNMJ642B-ZWhfR+{vaPO=hBTlzo4YgN2!S`{bGNb>0^s2!bF8f*^=g zTCJ8p7&;gX9o3;=Fmzy=rq7?j&&^=yXo7u4gPf7P5=*K6syGCLr;*S>zTvQ8z< z2iwG>y959{Jw4%~Tmq{#;CY_(T+(NNY8RNM=|8$lyswopU9M2C*8u>AJHvcF$L;+@ z*#1BU0RZ(Puv!BX6afImViAi?8p2PXx=d@NjpTn+W`S zU)OakDpj1Hp99$L{poUrk2gQ0+|1ca9&pteWm-Hdx~>D*x*<#Q6J}=zMERSDw-~ z#AUL3|1EH8kN~O!Pz?#7Isny>0ICB}4GEw+0M!UxiG{DA3WWkJYnxFW`ZhR?-gV30 zY&OAXk?XQl2Sn@ez5ZC^|9GBtfGqU-V=dYStIkMs9OvkquwJi&-hnh1yeR-5$cvG?R$%sph~PX{9($4qLR%oI@Yw5*59$KZ z^+b!Mu>y44O+R{qX05)eAR22@RY~{|@m z+iv=cN;T*pNh4N(sAUXymU;;CfDTEtGlg^Z^8BiUEN)A4-gE#Tz-o=4D}$e^vH=|u z9^;}?1*#x~|qFTqPx$kx4{BR9J=Wl|hPwFcgM=OKYK^DP|UhaWfZ~8x(p7@6a=OhvFG}hS_z~Zd}Yp zAqKQK9h}8XL~QbOEW>Q_fh3scdtXe9fW>05SpFGj%0rB?#xy2`n3VHZ#Z3a#mM{!U8* zn3)C`W37l{sOS`o0)3IcVo<<@>$+I4*T(jG9sXJXVh`vjiURznU)MG2x^DaZ_Iy6$ zc@sP?pppV;H=vTC*p4U;7?vPOlJ;{^=YW(F0FV|X^2HKTO7iN)rfG`VOuyQrmOu#6 zJKgB@RkK&INs>5G6lsrW?dfzp9svOR{l3Yv42Q$vp&v{XMGfa1r_<>!4=K=

hx7 z&X{wKIF6m&Zg&?qD4--%zbiw*IdA)M96JD@6BxAzRD!#jiZA8Z(b3vu)&Kwi N002ovPDHLkV1kd%&4T~{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d88f371ebb72d9a06fe8b19a1e924b6818020184 GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zcY3-whE&XX zduwCfAp;TC3$s_PTEM*0MxozyaeE!x{EPf=Z^a<>?}u+`p+K) z{Tu3za_2EHyepe>=ysX;KOU6_d%AyUru9sm`03mOCW+)pTg4bYY`K?YHsYma7aU34^M@f*giKTEd6uV2!A zPVn=E2TV0}`?BwbDz9&Tah{VfoeOwQcN$)iCL4~ zmj3xS_HtZd`jXl5Ldjj9X)VLO-&aaM*{xc2sKUlh?)}Z~32W^inDf4LT~N!sW^06w z*nuzeL^p}9&Tj}~2ov|1Ewh(n%h#8C{l6|RvZ(C4dbP0l+XkKhK=OZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Back/Duffels/integduffel.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..183806a41c221a2d98d7790ba9b9ffa1b4dad4be GIT binary patch literal 550 zcmV+>0@?kEP)Px$;7LS5RCt{2+P`YTP!tC6&my87yyXsZDII!+E*ZLX?&@RonfeTU45vOr2N%IO zUK~Q>5-F5)FiHIrlN*fY2EHE%l5kJHoP;QP03sqHA|fIpA|lEorHq@-V5>^jPFaB< z2s(!agCNLV=YpzPyLpRWm4qG*@$t39%fo#f4etN|Pxwi;Bep5t1f>)J`>a_5q?EBz zDqA>RZMMbM-+KkK?OU;nO{kLfrmR?c^^dkk(ODs{sVM8o1{hb|C}?g8^oYdE?RSYy*4(ZXEp+wDr*^Zuo|TA*h=_=Y zh=_=&UD`A=aEkTM#%-P%C{h|aZ)QN>_HjHjumo_~MxhM-&#Ud(Q>g)Mof#-n`3^9~V6j-h7=t-_@K-y*u!F#{kNzJ*?r?;5Jy4wORGckX!y1}J?5b=Y z|LV!6fXmyezI>l6dg#_gw};91{3kzBSD$^`DCTRJ7TZj%=cYSfoIX1}D)sr?eSaKJ z=1LYtxBZX=x)=)huAaLalkI+R#+%D=;hUL0#yH(JJNfp*jlx%rJA`xYJ!4f_o6hzs z*67!vvp2I}+*~wK#dgN!-kPB3FDF?$n4fIpd9`=F_VeKNf3}^fyzBR-YHxpI&)z?) mFY^j?IGtF=%vNXXOG&t;ucLK6V^8=2Ms literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Eyes/Glasses/inteqglasses.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Eyes/Glasses/inteqglasses.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fb245a57df47a11211c8ac700798807ce1bc209e GIT binary patch literal 448 zcmV;x0YCnUP)Px$dPzhP}5H)lZg(HPG2!X$U1%ifa5qK%+RGMm5ZWwE}LfnP%0O-l>%%JTH^iG)WtY; zWJ=$@c5MJa-Sz+geQyMkOi3Yf**w$t2n@qSr`<%i*OHu}0WQ8i0)Mzn?x${hfe>5{ z0F>IWtQW}{4^# qJ$JrfYiIg&>B?e-LZMLn8NLDE!@=;U_oH(F00006nP)Px&5=lfsRCt{2+A(j_Koke?f6^wsT)|0Bs-3nO2slbWRhP^ekdP{-u6zM@=8B;M z69Y3JfDJKpLQD*q%g_Oe2!tU*X_3y3ORpB8GDEOQ8d~K{t+vwpNm=e3zn9BBC(=ED zOz-Erhr$2MU&i<;or^g)0;RlEMTh_Z1ZR-S2LN=WOoj8hNnB)n?FF#dECgpL8$25C zdJ0nc*z<6N_-WlF`pBSZm&V4Lb_soCbZ-@l;0#T>goy0kL(`OCT?!5vq+={U>nF8lVz*r7>46s@f(fCeJqK^!G|44fWXk9FX734Aa=W4%x z%uwGrgp_-UEkL8Z6qF5)R__26K7+Es(e)HM>KM(^b#y(2?d~_N__I0}`~DHYau6rR zH`nG--|&X>2?`&0#X=D-0M`eQHBig~UC)c=b!a^U7|Wqvt-;M2Q81}|JbF8WdbI|| za@q;#=t!Azvj!a3fwf>pFUNJ@W{p_or~QVo4vU3iH0HQYtopkQVkI0dLg=b~ctQvv zgb+dqA%qY@2qEMQC(qyapWjThA7C0MbI|P(h}9p^C@%#7q9f|ArvO0vTrRG&;_LPZ zXfMERaSdgIqhcE9?0XZ}Y`t$Mx(Mrc?1^tU%%$roe2_o14r#Re1Hv=GR=YQLMt@d< z=Ow)N%NKV6Ad1~;_r`M55o-rX<)e=bMvuxz`vqF<-no}Uqr4Q1#@Kk^;{FqVA{X5q zpmjVRZvUoT!q(2$s7FU|7JUmz3S(@p%|{#H}SlH694rFj~y5(pnUqqUzd zm}6T{DjywntaIC`bkuPaXYw)7s0DyY6hQ06m0EYbuNw(&kN(d_u!n&|OLl+&N5JCtc igb+dqA%qY@uAJXsDR+4i$ig-N0000Px$!bwCyR9J=WltE7uK@`V-B}kTSvcQ;F((D0{gC`F3Ks1qfF&vHG!L#ur^fP$! zTX^Q|hY$j?mj>7+3}phtL`}v+J8RW$XX`cwll`A|=4I#qoA>5Ds8#EKR`y}TR*6?u z7)BEfd~txe+2Q3G;efN|`YJ&&^ zQgbs~fKJ@Dqo(8J;{AmPm?6Ns7u()?CYhqAG;tKtA6De?#uNMHR(j{=qdfnp}(uUe@l0-Ns=jCrldB! zTzlj-hY}@lueu1LyVs<ysuj$$wJHGeGE6GlsJw4rT?p%&YVTh^%+1{}lG>D-h7)@f2E9DG9`~}1 zxuX^QOr|TB)P_XLi5^}6fM+|qg@fqe=r9Lx#)C;XfR!?>Hi!Vyi>xqa%pF0n$TcuG zVq8|GG5{b%%dRZ1jE$Y0pArO%`Pz5uzXEU&MX_m2Yt^cCuk-`g4ZXeoDgW320000< KMNUMnLSTX_2=C|s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..27fb23c76fb29d1689aa8065c494f4405e3b5b69 GIT binary patch literal 495 zcmVPx$sYygZR9J=WRl7<9K@>d(k;w|1WP~Jy6ee1vvM_}xC|Zcv2>yv5U}51GSXo%w zS&JW#!rn?zNV6oH2$Q(tWH7>7gq>`{J|=FI2z$DnJ2U6pd*B;$HOe1?>1}ZQ=>46fZHq{7bo+As+MEnr-LYQ$H>*})OA2L21rT zp)X77B@h5Ej+bzCZ%blly(PZDxfRF}IIh00m>$UA06QTz~l6V7k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwYHDhl7#U?|W_r52+u7K-xwuG6OSAhn*tqsKUynnOZL15a+|c$lb`bX557B#|WtJRG@t=5s9R^!06Schp$Be&78MyT$yw zU-y;hz3B5_vU%&;O$;oT_*d->VR{+bZpH0ju&-yMkb~HQ1tJ1-HZv?*DWaR&wOjO5 zn8O0I@_9?oC^nw^EVEno6px6FBCDoB&;%xB*8dtiO4{3-vda?=&K29m+!w@Ou)z9) z#=m2-FE|ZO*&b+|$FTSgbJ(k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwniv^rYHDU?W_r52+u7K-xwuG6OSAh3{fI;Z~xpP2q&H|6fVg?4jLmXUdWg)%DaGD+_Kv*W71_wv%SK#ot!=gW*lHSqt7~dvJ>lmt{06oRv>FVdQ I&MBb@00yUnwEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/meta.json new file mode 100644 index 0000000000..b951a0818f --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by unknown author", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "open-equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/open-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/open-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..465082bf3f0dc8928a7b11e4b59bd1c5301618a0 GIT binary patch literal 922 zcmV;L17-Y)P)Px&R7pfZRCt{2n!jrsXBfvn{vmNb+h^-F)+y$OD2cEQ#!GO62TvYKhhjp9jv3mm zQ1T~a2pKX40)e)3#|)h^6c;j-wqz-RI=HPCQClk9oi6G5i0fVk@g6!Q5WN@6PT~20 z5PI);pXYt<`yip`3&QYp9$ZS_<@);=f6U}&+ji18j>hUrrOLMO9Gg}YH@gdB)a$-{Sey8zsB(= zO_S(Sq7}uoqBvW-_2D!(9!92H6++n-TUTniwR+Xz@$ZMUlNZMO8C6S5PbZ?$GK8KK zjk6dM+jdgRnqrP))@v$T|Mk$PONk^oGFHI2$<19#*}FcpA1Ar>QL?IL*s9HDDukZ= zyOh|f&9bUyjQ2EZfh0KsYl^)))69Rc4M6zw_x$wB1UDW=z3U@H7rioHAq2t%C_7Zj z(2Am*5{Jb|0hTqzN@JPLyJY|#-TwiAo4XUNG?uZfDdPl8=u#pqI|N~XyI9R$K^PF0 zok9vU?pNK1mHA4x7KA~e{wsn~Zki-Vxnk?jzTY;EUnpT+g#HB1;_!ng<)%drEeL`j z2!bF8f*=TjAP9mW2tzP9fB){Y#z_4D!!VeGsYk$gJg(<&gX3v{C#}EEm7gGfoO@~+244z}Nvwksm__0tqt4v*~^g?3|AQ$go|0!Kc)a?m8$L8_j zbE7eN;UtxEQ|%FO7pv^;KLdL1jX(a}8_Bo8b%707*qoM6N<$f_opeaR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/open-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/hardsuitinteqhelm.rsi/open-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..27ce818b8e55d4006e3ebceec9c45b7418a04956 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwYHDhl7#U?|W_r52+u7K-xwuG6OSAhn*tqsKUynnOZL15a+|c$lb`bX557B#|WtJRG@t=5s9R^!06Schp$Be&78MyT$yw zU-y;hz3B5_vU%&;O$;oT_*d->VR{+bZpH0ju&-yMkb~HQ1tJ1-HZv?*DWaR&wOjO5 zn8O0I@_9?oC^nw^EVEno6px6FBCDoB&;%xB*8dtiO4{3-vda?=&K29m+!w@Ou)z9) z#=m2-FE|ZO*&b+|$FTSgbJ(k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwniv^rYHDU?W_r52+u7K-xwuG6OSAh3{fI;Z~xpP2q&H|6fVg?4jLmXUdWg)%DaGD+_Kv*W71_wv%SK#ot!=gW*lHSqt7~dvJ>lmt{06oRv>FVdQ I&MBb@00yUnwEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/icon-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..0bc67d92d49642d88741db0420779380320d8ae5 GIT binary patch literal 457 zcmV;)0XF`LP)Px$gGod|R9J=Wlub(lK^%vlwl~(+@T8y+y&Np)g*r%dGbjk8E^bm?Jlb9S6n&3C zJyZliL0u)JC^{&VMA3plqDvHNIvrv`B0@`uV4lm&F!TS-!!R=-kw_%}jV1rAu=-Km zE0+ATBC31EcQxP9_0z(r?iGQ#0bbAT1g7l(Vk?pDXf;P^WpUN?#bYr+dM6|Rj7O8) zy@By)0+8MbiK^*~S505M?E+S)y*!B9Hq3g&hU+qg_bH6)GR1nthTAsG#qp5dxV|j{ zjbS4bMU0mmrAiNdu`uPx27R$GrAiOROOBC=;+J*560j&0>bjym;hDTeQ&p5PC!?Dh z%9s;PRq;&TQmo`D73zAknJo$2-PEX8I>=wA9#3-H!_3q;XBSrl*B$_PEx)la-F_Ybk! zz1@1knr~+FmIXf3_$eKnq<)npkw_#G$)E8K7|e|6n+%0e00000NkvXXu0mjf%WTYK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b9153c91fdeb785e916fff19873ddca695bf3641 GIT binary patch literal 391 zcmV;20eJq2P)Px$K}keGR9J=W)W1uDK^VaC?;EuQBH|zvMl|>?@=DSmZH|&If>R)FA}$U787*%4 z7c|slfslji3qjG*kQfq(?;yMo8MOpYLmIY-Co~B6neGSo+;evi2Zmu7t0t39$+TT7 z*pf-7q*kzH-kN#Vmt9yZ*pfZm;qyK~c0T|hrx#sIH_qBJo1Zvm0^p6_=np)+(c7Q# ze@(#lOXQ+u03yo8_De*R3qUSf)=onE31Yz{SAz!KaERC4CL2e`oZmJXzJ&Pl8^nT1 z-H?l$6q{tyDXA9oQt6GQE+UoQSgOUmObS%1D7BxUUOfOHnTSIho}S;KJ?YQPFG{;= z9mkRF@FoCz(JhjRICl?^^amaQL;nM%)WUJKZ$K$!wK}c^Kc~LDzWF_UtK(Wao5K<} lFl+WxnkHo!hG7^h=Nn(9Z_vQ^A_D*b002ovPDHLkV1j0Qr%M0; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/meta.json new file mode 100644 index 0000000000..acd4faea88 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original from uknown author, repsrited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000000000000000000000000000000000..38e1ff58a03f5fa9f07f209dea6037f15f32a5ff GIT binary patch literal 1067 zcmV+`1l0S9P)Px&7u#VcrnBp zD8$5z2Ty_aFG!(1geX|F3A6`8C^2GDhzBXG71Fpw>88O5!;WR+vSnBFP}A4LI@`4k z$iIlO6A3J z#k)Rujh&ypbiLyRP?shXRpr?Fzx5Bfy*fhMBTPNz`fl z-guMh&eMFibd%(|#%_9)rrK~>PPpOH_WNktTNpkso_ctceT==iMFyK-x}OcT<`iMj~_hEDaxcHTViq55Jw0YfKIH^GI47Aln#hkJtRXxkVX7J9vh#nlb& zEZ<{sbpyTLgNDV?wlUZGuBO0OgYN=+b8ilQd9Vd@f6qmyy;3+2yRxaF*LzsA?0x?i zS2tYSbd@WztZbHg?4*$i*M(X&t-Z1S=#^f^=Y`S59l@h3ZV5^1FzJ) zfbOfwJCWa|Rh14xujyA^kyrQW8oqpu0N}b4N)AB4&5C;3YRrTEtS~|!1Y5MHH^%o#fHvwp9F6@>ZfHlh|VCY=F zdIL;o35~Oo^aF7JZU;@ZVQ&A{K=nX7>yr~MTqs??ao{w!ml_DyHZWz47K$QX_9sbf zS1~gmW3aEguvuFQCHK-`U$=4$e{^gYppXOXRF)r;e*TPn184HrU-5bmbOfBw6F&4O3)+vej{*2$HQ%3m9aWOPD<_=<=-}jo=GQgsRF-S8DjIv{-~?QGysxq6H(~C8kQequu?hf&8>acx=Dm(ITPx&=}AOERCt{2n!!sPR~*MbruC4rt6j7kob42|wAqq|wOv}>ws;sJ(nWKz@nVQI zP>9Bh2Ty_aFG!(1geX|F3A6`8C^2GDhzBXG71Fpw>84>L3_F&M%a&F2P}A4LI@`4k z$;{SGFTc-acHf)%eSh!w-uun)-UGooF(az%-^1M@6*Ho0xI3ht_DrRCl76XwPI<9h z@y-ukW9Mfto$q)7)TPN}RXMi)Z~a4V9~cUcC;%&yCuLe#nf$);N>i#6X*%)5ayPgN zKq%YCDg8VEM-p*D**=aW;sBh|&sRJML*Wr+>)V01uYbHfTb4~%Q{Y%_geh~BWSx)S z8*ftGafa`fZjxT}v6~&`SZ$;%C){vp`+a=dTj+i-o_ctce~h)UMGlKlwvQR&uIxD; z0mI!Pbzz~IWZeWoU8DM98*dJHsJ_@nP}fM-O>kkMnMx(a;qH(++B$|06RqCE;_5ng zmhZ8+x{g-w!H3Dw)-l)muBO0OgYN=+b8ilQd9Vd@f6qm`zEaqYUD@!V)q6;p*1rFX ztLv_9y2_m4a99QEUIHMfYebq(aA)}*DboTVo!uspNL1`?Fccn9_6R(@vx4sTVrDkk zIs6tWvoHm|O!Qa&Z4@)2>gz8)SEbjAi&luTqgC4Infds0`vwpMK@bE%5ClOG1VIo4 zK@f!UalD)zGoq?=`MbvmD6QU8thY9{_;x=1T$ab5rTtG|pN8x60X;@Q0kj-%;FX#e z(EK$8Cknf?s?tH|F#@VH`szMi-CsB(0J!c1#{mfHS~2pv-^;^=PkC5U-`p{dKl>Rm zW5RLt-4ZjR%Af56#`%8y<9&54tz(#(O?r%g^68pmo32Jc4xQWv>?RB61d{nB075nI zF*RKX0@LRR_G;?#)f)#Igu&h}ReiUe=8kcGnm+e${RK$YO#nW8F6=rEK+3cT>Kd1? z-T(ud!{e-^0|4B=+s?7t2)BQ0pt`?}waEz=E;!e3>_5Zpr3NCk4NRG%#X}J<2ht?B ztC*ROGuYcz+^lti<6auRigbxGhqV}WwV*q|wE%fJJM>*1W<)obeZR~u|^tul#ljmBzipK6aI9aH_^2Wgg zVc^%j#?Qgpx)n8kXZ-a^W>%F_E!+vD~jiR-s!36^Bua-DIaSE_Nkv%PpgL$>Gz pK@bE%5ClOG1VIo4K@fyz^A~UGpVx*CTZ8}r002ovPDHLkV1nzT4+j7M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000000000000000000000000000000000..2b10715ff61703e7325a9c2c1108156a6a8a6379 GIT binary patch literal 1132 zcmV-y1e5!TP)Px(CP_p=RCt{2+TlwZXB@!suibpnk?0Py6fe7?VQWTLbPJni9lkhAWx@1~Ti&G9 zSvsiJH!I{-Vfza@*j|)QaOhg-UO39A6Gw&mLI!byYl6zMNhTaQN1Bk4h`yNJvlp7I z(J}5)({=EC-o$&({C>at-8~n$dqA=-s0Tze>=OXduutsWeiAkOTmGOPuwBEmcE1oh zc@#i|P9A0JM<=1zo#kynT%AbP*^OycH0%?a+etL++m~N+J6X=!k9o-M7rq&L7XUL; zAZ3`CnL@>Qt^GRpLHTcg`-y)Xx5HKge7OP6XcqxEl8E8U4R9n81K^Byk?rK=s*12` zJ9)XBzts5B=O3@#ttzIiDR8XO&!jOzvPt3hmOIq5#j|_`M8iIDX|980(>PvDrT$7cuM9b;ztW9Y zQ%N?Bb7`)lW;erV*e6=MMo}(`%F~72o>T;l9(AqU>JHM?d@Y(Pi!0z0e zfuB}4VCL_+SlVAJrGs70DyS|8DZ{MTo?ltF9n;nwyREHFc$%IAz^keF+fT3U5~it+erzN&bZ8{pN{iq7v{575y&hCBBWL4DkE_w5Sm0pZRK z0Au^|w|0%9x*SAwk5Dw#a!gxSKpu^J7PgZ+>jaX81ps^vZ!$Tx(*&l@m%o3)8?8zorJ-!gcXdkf9@8=ILlM#_sKp7*3lZq_k98)LY?ul%ys3d?6{ zxW7-70>5*78-N!YovMN&)pMcsRmnx?)|AzT@Ez2llGSs%uIosu{v79GjJNNzkIMw82Y6sn1Qv4)0_(k zRCfdM)jUR~h?(7}_+L9W;;M=a>H*=^RPx4rc`T0xzH$%T4WM9@ z_bFN@DZ{KPr|nf@u=6@RWtb>hC#OOe$fM!aRJ@wXVtlEZkd`dQm&$qaXq*aNc&vl3 yiCQj}_&+bikR(ZxBuSDaNs=TPx(2T4RhRCt{2nomd^R~*Mb(RxVPT{EZ?ob42{h+ER2>C)=9#lw1#E-@EdFNXLB z0x|KDgQq~-L#}CQ51|z-8UxLtMM|us^bikH&;-)BWQ8qZJq$aRbr)e3B{b&su+C&{ zq?xC?z4U!9v-{rc@B5qYd+)a}?|}rPyy4wmVUf&%p$8c44U6s%-emiCKi%*60feCkSS#!>+8Y+v ze@GpX&cuVhsrzXNRPU?b5U6(VlhK!&0RTTud<=k{Es(Zs>}FmqE&aaDI@p=0yOGCl(0j2RWWt0N|{7(KV-1tju3<^&R7#>tCmTJy1+31Db0i z%vfV2a~ikxJ3Jje$8G%%$(+WFHAZu7ynR}tDS^QgH+ulm*?B06OiFV$2b}mM!k>4K*1Ro4daefc?6*9P3R==4_#=V6mM4Wr&i+Oqe2UtC_5 zjww~GTUuH~uV0m%o!jL5xy*m^di+(||IGE@@O(a?R2-oFWFrlMY79M4Orp3; zD=KY5Uo0rPqi^id-90oR0O>*SY(U5~T<1;Q&&vD-R!aKY&P<@^KP4WU^z6PY@mN&o z`9WafrLFk(j&ZE)27R%h&`iT~OsN^Lj>&oso~4TC1X6_u0E7eYF*92xA1OfQtQ5Vg% z5$^rjNX>93a1N%XCDM2`&!aba8ijig8i~|4GGmRoha!#zGo-eTaCdHjk^UZcv(^iq zM`@(LM>v5$I{6I1tpRqnz;Br#&!act{EOdwEjG;>Vwh zBYr+AF!TURPu8)r8`!zcJ-?ADga=B_Now6%blcW3f#SnEiI%GvIy=#&u{A8WUo+be zZ1$nH$4f^hR8o1%T>u?M`g`0Nn6~V)&NPKWp-?Ck3WY+UP$(1%g+ifF{2%xmiYK=c Tj6J}F00000NkvXXu0mjft#S?< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..b8a7b362be8094aa189457af45911e45bcd9e65f GIT binary patch literal 1064 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 B6!riB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000000000000000000000000000000000..d75dffc24ac18196de2aef7f427665b801417767 GIT binary patch literal 1134 zcmV-!1d;oRP)Px(C`m*?RCt{2+CgYrbsWI)Z>t3>No#1#=!Ugmz%JzlScd zX+_@4nmOVBxuox(=J)%(-+TWA-v1Ahc>&EYA|bB;h=jai=kepH;otHHG{5B`Yr%Q zDn~*$FjBd)@oM|+#`~qeeI0H8IBtcd26!`l997Q%urC(Ho9Sa;EDFF;^$eTwa}^a~ z)@J-%DSxr?#n(Syy;f07OH-h=(Z{4dLcGbrA1xEq^&ID$`3aJ14mL9*v^M%GD#D7P z^*3;=7f@YxY)-hFyN{7Bkj228>0_FxrFf?2Yb4|qgCEs1Fz^f>RpG(;%e;KR#;w%? zwI81(p&JYj-{azi4XW`yP@MmBD|b+wHjH!uhuTF}pDP`A9c)HVgVzF#fHlV46dP@Farx>0sKw{pjFOiNd)y}ezyo1O*0qbm41+E`dz zBB2`qBs1&8VzH|I3VhK1g@`we;ZYUpHUUj|BuSDaNs=T_hTDk+WsASWy8QvrvNh{4M>*xjx^Fud$g)eWbK0;yHJc_<9Y)!}l2a#8X@8<3U z@Z-wX_4KF;X74~th3@>RQJgkZmz|CS4vbWeE72NSLNjm#F1@t3O*s2&UN8e|<3~8* z7bva<7FV}aNc$zFK9#z4kDl9B6RT9#ag~g>(o-8VdgQp+q z07*qoM6N<$g3Lf5 A761SM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000000000000000000000000000000000..287a578de843948c65be9306acee55348de96b4c GIT binary patch literal 1109 zcmV-b1giUqP)Px(4@pEpRCt{2nqNp;R~*Mb)%nn2VlV0~-s}z<#Ecru7MNxmKEwxEsC{ws#Zs$K zT0391k*C7;vRC&9%Kpe4+7{M_jWTqyv4{3S2HJwF!3ZfMK3sA;VuBDwS5|xWklx#L zl{H6`z3hBmZgS4a@Atdk^Si&m{T+}XJ`fP`fq;;ms}$AnUn8?PnbQcj9&sJUq7m1r zGhS^>-Lt2EQ}>X}Y0~zdD|cahARv-CFmx~Rfq>|H{Y7?u^U(K-2S6CQm-WIf@qvIC z|1Nb%I+8N{o4SW)Z|$D`o4vK}IvM{`836FZ)LQ`9*#c?H#?BVp@ldP$4#;wAZp8f@ z4h8odmqAK^Kz^8$=6L{)CKd?fhdG*90N|u~-W8`>tj(Ww{X4=t*S}u=WnVU>1ZZmr zGiyzd%xPTHXShFlifj4|$(+WlH9=cLcwa%tFuwg7c5aLH!Y%;og$pXoJM;SBrTiv zlJCyE3{us)qoYIk8lMNiZyKa6+r0v0^4la5iHiRNIK12Om2fif@JE=T9RaYn!3WY+UP$(1%g+ifFC=?2X z;=q*sIy)APh|<^JgHfL-?ZVi(Exx^(`A=StKg;(&WBoUzds%}~p8)7O-a@mt7DM+I zgD7@sMYTm3jQT`hh)ZOW&^TZUl=0=|OKM$$KX+T5fm`2$GIE~Qw`)S^JZ<@}IDUul< z0C(^7($)~>#vd)zjrIVi;L3H0FrLlB$Yt(F;KuD1!VN9VS`+S}h$FrXsqI62@#&w8 zf8uwWwdGLuE{zTK3&-%A#~%Q=HNegm_%-9>VdOHLe*Bv+J)VkW!G+Du$IaKPP_uA` zH+&h_w{uwH=hfnV`b~p!Gf*l(rvN%Q^&r%$VP^|mee~$R-Pg;~@(O9oK5*kS7L5qM zX%G$t`Tob^j-QSQ4BgA}?;BXzP3+v(6Tguug!>B432MVybjLO@f#S_OfmW&*I-TfJ z+ZvWTubEx@7W+W$@zR~~msH+L7eI%xp?)_5)0SP)Oj9Tn3WY+UP$(1%g+ifFC=?3C b|AD^&Kis?hWRA`w00000NkvXXu0mjf%0eKc literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/miningjugghelm.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..53f92b7d2b4f639f7616cfbc71df009a62eff064 GIT binary patch literal 1077 zcmV-51j_q~P)Px&?@2^KRCt{2+EHj5bsWI)Z>t3>P3zH`(TgV~%tpGBYQQ!sKAd1NG<&J*OUJqn zWUK8H!dw=My#6)b)SIuXTFDcyL+(nCU!8!^BMIcO7?IWt>n~=R=P> z;V1!t>@Wwl69DXs#|UJH*%yxia8NtpdJ@Ki)53~xCEnWp`N~pNbvo(-?M)#Tj2RNm z3V*cCQ`dKxZ&&9@Z7S?!XJ~HKPq<2EV3q|KwR--rvB@jUu%lA0=s+OikV8^r>y!7!M`}0z&h8SXsY~ z+R}iTDWYgSS zzrBX$^Rg6#zOHMN|1&FkUT)%Uqo zQQqA*i#L0ch(2dK`%Xplu<&MwfmyzveQ#G;&s$$&qzeq{KA~u;?K&OZ0XZ~s8Q4jb z)(Ir?s{jNVUt?jhlmr%!;U7}P>94=r($1@^3&q6f5*QHiRL*#L2*#8 z?F1wZ6ThZ1@nMqD(K)(K9hU?{@3}l*a%wo#)4tkNe@Xa0JeH zJg#(s4+;grIjD^tPx$f=NU{R9J=WltC!NQ5?rV_)AS_bJ5mzKz2|RYsp0vC3bMw0fmE_B022ju%nX$ zJMG|rnu~*jgQ94+B^(r@I9OZSICwH?`+E*r?Zp58FSqx(yx05n{r3I!e(!-op-?DH zFx=lGOZ#xpE7#|JG92{E-!y-rSrLVUUOC$90id(h4j@-|Z!4^LRhktnb;Kkoz#Rf0Cv-AdK~CrZ1l%D@Aq)p72!DJ$lE4{S;Of~|pC@9UF0)%B;7 zM!Zc8;q7%D@PR|WVI;Xpi^s+NV;V>M4ew=jGZ>!Sg7C)=4)qCJjmF-ti?5z77zB=> zGC9pyFirlm$na2=;qFZZfS-RLP>d3LoyFB?quK4`A(bKhl4q`AgMDq0gOj8wPfKri ysUs%a8oJom76}xi+`V3~b~$IsOQBFG6pC*SDT_B8ja+vC0000Px$NJ&INR9J=W(lJYdK^({NZ{j3`h(zFn4i-Jz6NH1bIXDPCOW;}!fr=mwzKa^l zK^$6|8y$NCf)Me5gGLfP_&}OO&jY$>*P`K6+yia*S?;*w|GVRV2a2L7iiBJyEmred zUKiKpl&Ix(@mtMbf_{o>d0iYGCIHyqjR1(tyWWPMtblAm)o2O;XXLUzuGatc0{Y|( zGhP5->@ILdE@O8AfEh3Nx`gx-^xO{JX$1HHHnB$@-S-H|c}F%%&hi6_TqZ3_4NsJw zJW=wNW5W~c`!cyw9Vnk1Gq4>}vkSJ{TkIq>o?nN&&BnZ}?aPq*xrSi~EgB*jkMWhh zg)DFnf%Yi_+hI7FVp*0{rc?*CXb5v&r}=n}W@kyZV?PHM!#A{|6)c%RBs;KDHJV~C sd_XH$!JOCWe?D+!6@6tXilQjWH(gVKsiVR(Z2$lO07*qoM6N<$f=`sD&Hw-a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/meta.json new file mode 100644 index 0000000000..acd4faea88 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original from uknown author, repsrited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000000000000000000000000000000000..d6691fdd080adb507651aa3d7ebf233d510090d0 GIT binary patch literal 1087 zcmV-F1i<@=P)Px&`AI}URCt{2nqNp;cNE7zYxSXm(TjgpA}NxJc@WYOTuBE$WS|gYUPkk}IT$FD zb$Rf4k7ZCtRjA8gYaM&+9tKW?N#|>@aOJ%FhFP_vZ`W&~Vud%fUoq|JR8yHT$N9A;VEn@m*eDd~ zKe)l$=?*Sl=;HD3oBVmO&2Pu<*Na@$nzC%kn!r#`E9UwxV4S$GgVs(3gF)5R)`Z{Z zwQm#C*fG+To+yc|i~aK@bE%5ClOG1VIo4L3sT*{ww>qP|4KCf0>#|`Lf-=T4Bh`4W*e8mK;hD>F~$d(Mt zGjM&CM_(?pcY9T<2q)~_K8k&PmF~n6*^IW88vc%0q@;A`E$|3U1hIRML((7eelsO3JbHm7Jc;BxE^D+|`UN7?e_ zm=7Lub$E!yrR9G-0|0!cUChf^2#;7_j{FE$hlem9JOr%K?`;W@ub4*%q4T(|<#B+& z-m$vhxHiPE%wn4-HVQ?@r?69^k+8C3Z1Kf*=TjAP9mW2!bF8f*|~_c?P|`#QCp-Nn!v1002ovPDHLk FV1kOG87=?- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000000000000000000000000000000000..cd75ec6165c8140d73f31e6fcd324d94adc9216e GIT binary patch literal 1105 zcmV-X1g`suP)Px(3rR#lRCt{2no&qwR~W~CYxSW*qL-*EkrYYA`yiwvxRMTpIZzNyA4>DuIT%xB z*X6c^V+AUw1@|FAme!9icUrWVZ(%p9g-2)+Ef& z^{|jm(bpXj3yY~!zYpx)pU-_k&3S9gSluDe>;WKKH0}NWz)ayR7B%tZ(g+PN%E(Hi(B3BIBDS81Qp$-z3m%9l`x`9jxW@=v#xx>^?|V zK#Q-A=)ok3mG^1M^$<+?%L^Z_|B89vEz)vplA^sn%=qGQ3(Noz?V6Ongk9}cJd_aa z^-*`%z|cV z25v9&_|rvpXO>Sj38OJx?9Lq8zP(IqEQwjr7*7wE7i{YTYFB#cXxw&e+m%AZW-XWJ z>(4*oho66;-!sd_d<#!f>(=Den~cqUBy0Xy-oAPhewqcaGzp${rl9QmxY(Q`m4M6r zcUih;ojtZJU5@ea5!VNLSx7GaqZt66e$XQw%t=hmd{66_N$ba<9^v{xFUG@1fK~eK z^k;1J!z2EISJ$GS z?phM}`-O;y62gsG(J6i15fKk1#QlCDrn{D2i9l1KP$(1%g+ifFC=?2XLZMJ7{@45s XnqA9l6{KD#00000NkvXXu0mjfwj2}# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000000000000000000000000000000000..c2d6e0275dcdbb6b0c0f60f78ea73196d602f260 GIT binary patch literal 1128 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000000000000000000000000000000000..7f83873062079ec7738f43e755e149b0641400d7 GIT binary patch literal 1092 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/salvplushelm.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000000000000000000000000000000000..33dfe0a0c7e88427a7e803204dfee4ff1ec0e7e2 GIT binary patch literal 1180 zcmV;N1Y`S&P)Px(R!KxbRCt{2n$JrkXBfvnu6kI(=%BHS5|M0hph7IcT6e*N1*M{ag>KHZu;9`_ zY9W{Y1505Ae}KV4QA@EGFAE}Dl&!G6h%1B2PT5G-mIgyNPEaH2q1x$ToHQ18Y#4?J7k}>=W=+=W=R^ecZ0n3w1ihu>dxYrauHAmCj!HwYL|W)rF6R zw*M1C0;rh*f}TMDcC%-s(ph%1X8;5}g9R7il%IaMm&^ZG;x#h`#T341;@M~D#|p3q zSl6I#D0okw6;wbW`KjPsc5YDa|PITk=S6vk&`L?RV5g_bz#h8H)0 zU!iFU=I6Q@pFJiLQ3RLdjMMmM1U-YyC%>fZhPBPU5dv%-Xx9EXz$Qp#Uh@yx=c5$4zzE8pj_B5LW#)1e!t&rsHwo~spt2O zub~@Qf@>=uv7Jn@lR0K{b5kg$2t)o!GhQ=;*Hh2+6Fv7BJh|S&b~1&U8DMntzEFOl z4rr*UAb2{?T?UfU-cF9H4!$&)+9u8Re;gu%N7_1AlNxB{0J`SYz_G* z&E~2A^JS6T%|}#ui9{liNF)-8L?V$$Boc{4B9Xi)L_?}M7H%u57eIuua9hFN1jnDU zd%HT!$IB}v`HAeY6hJb4$naeJU->j{kIM6N+YHaeOYB;m#1ayqrFIW{MxRf8oeO}C z#2%kctQA#+v2dH&>a#{+_GsS5HfiXFf>Qy6r^9Yn>7`@v_P%M{u2P~Q)ht#gL_@0S zc9oJ!XJ1=GGA$NU*dn7F5UdKIy50q>f#lYKmUC_7x8_x2$F>Hd)~GDMj&D|Gum`11 z5i&@4J@u%W0RV=NZ!vs)i>(8VGIa#qP;!M8!zN?L)DrvXhC-P-!q$P7s{2zPEwy`&V;AHQvDr?hc)EB8SfsCVhMTDdUasr_FkxJsQ9?Hq!jEPE zEKfq^4imuB#XD>#7cZ^NDMA9Y_f509U|oA;EMJbc@tnK;Jv?4o{?ju6Ff}V&%-^xl zF<|{U_aofx??Kym4p^<2H8ZF^GZo%VmfZyJ+)GuG};d^4(=85fO%JE~! zDZO1CrX71HbIkjEav?wP-;L;FovY@PKGPiXPnx}59YuRX?Ct6>hy0V~lRndob*}zz u-b5u5i9{liNF)-8L?V$$Boc|_jo}ZR>GLH$GKj?h0000Px&@JU2LRCt{2n%_&CR~W}XYxSan(cq7jNQ$JvTnOn1uA~Dm94JT(l+oO74hEKm zxm@@+ltP7Sz$}A7-G*0%F%S`yPUuyz@?xa{6ReB{!=@2UO7&uPXBV$;s-4~5^U|~o zp3hCfIlRyFoaa2}yzo9>5bQJ97gpB)u~VvM)PKm|jHlg2o9jGdv4CU$=X4)P1k(zjxLx7ouQgt4UgyWDf2{-r zc87_2M*!HVyr8&UVW;u}fT(w*=1E8d)5`MyD!Ge&OK(6wL?13BD0~#r8KOe-md;vW4uEKHQu`8iv|EW_ zT6Hyrn5`SFUOu{+7X(2N1VIo4K@bE%5ClOGgtw3FPuYWgFI!$#Pu^-v0Ti~M@wQsz zW3hmG)i+S}e=^qpLc2LS8ShbTuJfnHJnb&7_}zHh8`alSD>Y5RWV}ZmYZ9uh`8HQ` zbxzm6Rt0pon*F%txzGPGe>HLsFdLS&ssu|I0lYQ_V`HCe$xTfvAX{>iEkU#?M8NeS zU^XQ4WdmblpOC-#)UkNeShmfEsM#tz8OM*AX{<)6U9G+2R{rqc(~BJZ)+c8n>7N9xhyGv#@YxYyW^t+luxd*{^=*m(j$D#m#6##@2*9k>Rnb3B1$EKY2`$$XqUmhuu25e>On-Q wRPXXT5oij6AP9mW2!bF8f*=TjApEcS8?6wvy%A7XU;qFB07*qoM6N<$f;L(O?f?J) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/icon-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..c9970df3e250757e22088ba08336c041e2e6290b GIT binary patch literal 391 zcmV;20eJq2P)Px$K}keGR9J;$U>F6XU=)mkQ9vRH2nhI3P4iet)$scDYdG88SQPGec^W^UPw1cT++Z{xA9^jbX{nR+1b-vI9&%$1?b;q%)kB+RDJE6$2M{d^4B9 z^jQmo2)pe6370a6b_B@|c=Piy!}Nbv3<-A049arS2noAnhUv?!7&v}9kz^i84zSQw z{-4^unPI^K0fsWo9EM;6gxp$g1_pEP)eP6!R?yA?-@gB3U|`^8`26)ZL)Y~w49Z^- zAz=RKDZ_%VzoBY~2PCIlc?qHan(A^4k9yCehQI{|2DxHGhU+&UF+6Bl{UNI?Alm^jN5I(R l7DS_96pVsVFbW17007dlWL$bd_$dGY002ovPDHLkV1lGSr;7jp literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fbbf2e3f5fc6e37db6451375d1903d83f0b6957b GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TXz`+kn_xccGO*KCX1cOyjJ&6t}WZ+z(}BM%T5zPkE9{_~ln zj`Cn9v48r%RC^Ooo(-EMcDbQX7TbG zzGV(;Gde5NmcZO{Cn}GPt@zzlp6fTmE}Ub$zwdua0ucQ8^VQt>`d3Y!Q}Kd|3IASb z9&TE{|6x`KtIG12O3sD90D!xa|Nd8{5t#=eF18@`g4wAN$HOA3W?X?~%H6 z=6^T;HRFzW@z!qbJymBnygD5`Nhdu)L764tz}<*1`z_=T{nfYstGHT6;Wndz`+*xz j#9SajWx&NI!@!XKDW#`#_Vq)+kY(_6^>bP0l+XkK75S+B literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/meta.json new file mode 100644 index 0000000000..acd4faea88 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original from uknown author, repsrited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000000000000000000000000000000000..56121eca67e4d78251dc9afdf2770b2518f851f7 GIT binary patch literal 1061 zcmV+=1ls$FP)Px&-$_J4RCt{2nr}#5WgN#pPMhWI4t2-t^|CwBF?AR%?dFng;t21ca%S`*GJPSf zV7>_UP)gcPyvA9G%ILNW}i_t269mUwj|Q z(oMWl7R#Sr-%`;M0HD3{B^Aj(PG@s@dRQ6eK0X+JJ>xOFsOk{Co4xa%%p0 z?e(+-@J>I?qnn>)u=FgBt?hQaDS85L@Gu*4H>$TUK9?~Oj_w>#l@2eRJIX07cG&UG z=5m}Dy*w3vi}O67wdNX~$x&;ZWAhEv?CPSzDwU0ocTZy;)oYbDp^$mkx1nmtY+Y5{RO z9*9~C?pv$Brq=VisiaUIKs!~L`FBC${%tY3QSIZ{fnKeqsgU0@wtrW z7X(2N1VIo4K@bE%5ClOGg#Ro5q+WrQ)UvFD1Yez@%saP`|LX`&$IY{q^uvlw($VCy zHyn!3+41G{DQNcx`05PhbmUo)K-A)TJV7vQ;;S>1 zt_WHJq&8n#oX^~Xzz zmm6q103h`q_^^KxfW>+SGVOp=KLWs$jYR~*ru{|Galnd->}YbSt(%<~RV|B-uc`y? z-)1`?6pj$N+y}sqKZREG)md?Y>8=2@pF!PR>3QJx^eFx%>CKD(<{W|`2!bF8f*=Tj fAP9mW{CD{SqqCAooYPx&@kvBMRCt{2no&$!RTzLj1Xl;mog3UY-HDfqxjR@dIL*mB!hAsioS z??BP?6dD&jU((#3|D62)fBy5Ia~{qQiri^$Zx{cz5C23y{*}lKHciw1-_oGl#=ic+ zERr?6Ue>a|(!X4h3IM>-+Bbyh9HhIsdZk$C*2{bve7E3%IJbXPe35$gFZK_WUg5&> zYts6p0^nQd3l$Da4bE?`Q?4oALymVTV?<15Ay+BB+bg$;x>_%xfg7tcU;?~-PY?)(kcqx5+bg$;raA{6my>YRvgO(K zNFXh3U+NINdHYV$uBu|uH*yLipxg3Cqb8qQw+cG>to=xpF2LgBZ+^CIb@|;Ql2|IZ zeT71yP$(1%g+ifFC=?2XLZMJ7{;%9mwF2w$C9j8smIhr|5ADSH>okUT?`>t}V?`n9 z^1JN`M-of6JfAuR>H2_{23;6h3D$4m-&2LR!m+Yj6gmi9ez$1d>$TgVSejoFNy1T! zmIhtO20`k1JUe-h%L#xsHHa~J9gj=HwrEqdDOZF|P#b+oBL9@fh6 zxSSYT$*RhcT#(KH0B`sLzJ+lN^&I7@jZeuAA__7E;PB&|2E08Gcnxti*ybhCrz_7|C-9c7^D zEdUO8z$`%L@qASOE#G$>17KhRsDsAut`P`A>1GF4Q~kgRD3{lpR{&z^IpS8zZZ9Mk z=^HtP;nInWm>4ddp@Ea4x9{x@$%3JQlft-omPpj(j4P7?UnLiTOwB;tN)aobliSaK zAmw0oe`U{sizD*@WNQY1RdoaJloV}90Nz{@_P)M6k@;rp5db=x$_Ym;`$mvC2-oFc zm)|XR?=S$+cV*6iNYu2y8=3)s(rr!+1MuTdk#$|a>vnKuRzT)nE=1j6_6Ew5&uSMO x*(>ONwV_Zb6bgkxp-?Ck3WY+UP$>Sp{0=r%ir16vFXaFL002ovPDHLkV1hAR2=D*^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000000000000000000000000000000000..2a42b3583d053f88ecd867a3a50555c7f4591f1e GIT binary patch literal 1079 zcmV-71jze|P)Px&@kvBMRCt{2nqO#Jbri=xwQEp8nZW@~LNqorf4eV8?NOb}=K z5QakgRuCWNhPnqQ6kn7{VITuh99Hab;>)DqU|OtFWJy~CTVm_-r^VbRsj*?#hb*^o zW;4IES44jw_&wZn?){x}@BQB2@4`7CDIT}mt$X_HdLiH4?Ay(~;=A2$;T$X?Cr6`E zp6zh~=wU5m*j2^CKv&j&{;OZgM3X2MPoG`i+pOX#5Pxs8%EfC@;W_UUz2MU1LBd*w zzBZ>Z!diw)lLv)^mxAJ-AgpB=KGbN8u$DpbPn0yDkODf^Uf`+b7nyNE3XBG#9=PX(QU5_^D_5Ep9uHVngEu$RS zx9R(&3OcJU;M?($Z~`LOtu-vfXA8dLh4?IXYYl*Yrl}TAhn(bU@f`9TfTQ_ zN;(Z+XK;!4lN-i4W|3M?6Dto9jHLn1um@x5ton9{&ndKG@2aoWTXwq$j(`7W1^fW6 zvB&Vu2N8MtqU@@#)q7hiaM-F@jwB3w?s(dl7LG5p2;R84TDHeou8&QhLiJe&6nh^Nk7Me$GYpi*_$9RChs1pv5~KcHi6miJOa#1~Vv zBwQRF97MHQ8TB3m(BC~jxvfeV@eJvs-eUxUO9UcMa$#x;-+UcAt1CGWKfxnA+gP?d zEj+JKlDY4{cI6b8Q>UqXpo0DV&#-d+TfTW^+Nc=6VJS1^Gk7(l>yWKRcfQ%n<*$Fl zZml7;p5{R130CV~6J7^OQa~&nBA!SY$7{(Aauwqymy?F^le%~8^=*9!=f+R!-B&&( z5L}`m66K5J29WI;h$m9S%0uD}Pn4hl*jxxdoL&Lo&YppPLIJsc1c2vy>sXE?j2%Hl z0b5Em*S2QeGx!&uDGGReAA#T!;YgIIe+qzWKZUon{cbtQd{qD??ZqOo^5cNm+cuq2 x|Hl4pF(eX+L?V$$Boc{4B9TZW63Ks;KL9?xn2S-$_f!A?002ovPDHLkV1g*s1Hk|Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000000000000000000000000000000000..f7bb33098c10b85af8f3da4050ea57c71872d0af GIT binary patch literal 1138 zcmV-&1daQNP)Px(EJ;K`RCt{2nqN#?RUF4ZNH+wUi*w#yTS6s3U@YhmL>4gA8Uw^_OuLw9)bg-Q zAMnL2@oCFqBIS*o8R~JcYf#GoBVztKu4phcQmTH=v=nQh5l_K4;PlT;%q2gb?)!% z+2)`03(H!C{pF?mU`L~>hi|W@r!9^*5Myw3W|_GCt^&h;@~l5?zasi8byn&h{@R53 z+N6-aNpvBf_dkl?+(&nNg<*T|)NiQa=XuQarKme$u6*+rgVAj_>F+EW0A3RIClr9D zh3D8&^#UWd0hGLnZ3&jD@6cfHsT(~zuxIZA3WMe`Kdai@uc3Sn$ zt#)JV4aB$-iYzOYi6C?YlDluSn1MvSUK<<6W>K(N6dc?4(BpRH>~83ByL89)J%*k( zHjFaf#~n&BHj5ceF(G;v2<=uf09)h7nGB9{I@(Jx9Hq9#&XZkTXcm=9d!lMw>u_Z? z6FfuxI>34F48A!($4;EUGvTGgT*MJiu<*NwBC+K&M6v|}T)b7A9+kh3GO(y`lV)i+mZ zsGGXbQo2UY{CG~pZCaGSd4QG&>WvKWSHr{Ac7FNQ$7>%=WgP4^?^0@302#fDMYK|N zKy0^j&aL=7{x^MsOC%DBL?V$$Boc{4B9TZWlK&om0;Png62T)ji~s-t07*qoM6N<$ Ef^-BfIsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..90be08e3c2f37080bcf212ca1edfafc07a5deb82 GIT binary patch literal 1060 zcmV+<1l#+GP)Px&-bqA3RCt{2nq6pHWf;eQwRP1toY{6KX%fszJJxkfn5(g~Yzx`NQgC)%#S5{f z7iB86H&PJ6xuH&QLeUG|q%e@-P#h{2hIlh6IG8PVQpEJb!j{swe6*PKB=y+R*Nd97 z%vH(TE^g@igFw&o9^U_Rp8nr+E}jPz`P0_cChl|&|HNAIE0MW59*$Wx+dHhdKXC?cNPK&dunmnH7nkE zpccodmuFJ%aEV8y_Pj^t=7c%T>E&j2?CYY=ZPcQOz=soJvZfmV6Ji~|SMeCkIky$WF6i*XQm_W*k zhZE+C`!>k$DRo{qS67OLdJo~gD>pmf2k`VhOlUleO!Z~iTwN)A4W+p3HX<>@if69} zL#DL8)JyQ%^|_*L?qbn9cpOJax8gOiIG-9b1%3Fee$=fCFgW|oFP2u&?-bG0Qo;2V z3WY+UP$(1%g+ifFC=?2XLZSG-ayQKitS6T>H4*}ix-jnBitV=v9NLZEN^Y~FkOcis z>w%-GB`dy`IR)wYfIy=z99jv+@8I9%#ZqtP8~7rui>EIr5QWwfz=9?;5h z*=;zqlA9(+@yz?V`kZC75nW4e(@KkFn4!cfIR|kN2|Lo_t)d}6fcG1(- z!BlvLsn}zj9~dAsUd2XR8T*q**}8ETk&;8w`${F5bwK6paV};~PV6B-=5r^SG($J0`k%U%#zIIMa7bG++9HsqhRnu{d9)7lDPx&>`6pHRCt{2nqN%YRTRfR3^E*G=U}CSW*vcLz=Cmtm5FYo#sGUz{^4#>|AcMA^)e8A4n%F3iZX7|k-}VObmzm&Mo>85iQ{u1o6E=;MF#zc=qJCl_DP z-cL&a=j^jQvGqAdOV482-eKBZp%Xa$y==_gtd3lHK4T&r-E~P-TAXw~Qch{H#k6-e zm1Dc&-X zH!{lMi5BfWSDXPm@2yb#-aNy=z&*TJ-OZCbZqE(nLw)`!JZnGF4nT(z>juWdW6S== zJ?Z`EGZQdn(M5}xN92)zl>wE+^(%87b`M} z+f`y7cqX!7+EeLM(C!atuCpqeB?seIaMjvzY|KrbR**R%5(jVD=`d}+P>h?AIs5^G z<~pm=6+ugY#NkVe3z+;7ELV?XvpC6qtO2a)rNzoT3fLd$LodNT^#^v6XAfn zU3GVLFzK5HU^4I!r-p~|c#BwHkjJCpgKS%0i$7zCD z3w@2Rnib=(f&Rw!v}Hj5;OVTw_lFb@$HzmLq5k4mc)XCeE|>GsUf>`U>F=GA0HN3v zVI#UUiuVj8SBxthcFOt=sji;a(jvl%zC)_v!Y5`1lm&u(Ha8E%dj`Trlu-7RUc1W@ zS^*|Hvl92fha*1&uw2i;>p59zy#roeQ0C2_+>Ze8bYl_zfMLD}I(NXTf^@q|)b_15 ztW~Yc&Zjj49@t@Kz)T=W@aixC-~TYPs#j;#0VZb!#NXvi^$jLop@bi}Gd+rbNpkbz szuAW%2!bF8f*=TjAP9mW2>)Gv2Odd^ozNjCNdN!<07*qoM6N<$f&+;NcK`qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000000000000000000000000000000000..74502908968d8972e3c8a7727233e28eb5c5c7d1 GIT binary patch literal 1081 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 Ef^M%S?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/on-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hardsuits/upgrmininghelm.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..f254a3c6b23b1ac7c6732cbf706fe4614ce08bef GIT binary patch literal 1071 zcmV+~1kn45P)Px&=}AOERCt{2no&%fRTO|fgbWAGzYX@cYa2TP%NWZ{aEMHFYwE)waWcZ^{Mn-SOa7$y+?#XGJw5l{hjT!YJI&3_;$HjkZ>+_?0-43}c-;KmP@|j1F8>hE zlQq0vR+Jy{)F)mpDspw43dP4~bKwFIyIb(+97MO0AZ*C(Ci!HB;Vp zxE#l5EzhUk=PHj$>3l$DaUv7p%tAf;4h5+2xXo|hp#WzV>PciGQpRODInhWcHN5Iv zC^gKJ?azFKa3!G}P$AcyKqiKgMxrcWNukixpPl z_c_fCPp9Th`C9rEr27LJYINby3NZcz-+niq?S;#yh1Egu`<$ZjfX5t%6B&L_%@U0n zG}P!qHV9JX@$BYZb{hcNSRanjYq;zhF1v>JNIM<=7R!!ChrdO5kF=Zi9HZCJ#`@T* z72~qoaA*Z9I!AIrIs*Va(R0+!jPOyqh2%teaYHkq!`~u0 z1FcMkr;6#*M0Xb!4MQ}F62tO8#oT7@_N@4fJ7!j(nv3j z7JCM=72^tzo3fr0BGC2Lh6dqm&k0d~^$RA$QPx+s!2paRCt{2Tg_`DM;8A{wnM4Nw51{=^*B0AXKn0+j4(UkK)_*_A*UStALN#> zr)B?=WmyP>>}~&p9C8Rl$iUnNCIki69>zQEgLa~BLv^cTN=5w9duUa;T9&2mwt6NI z{lM7$RlirS-m8!Io`D4xSYUw#7Wmzw^11~m0>)bL*2bp3K6w5NoO^}(QqB8;!&uB% zD;^ifVJyDxn|Z^bOE`G`3_#L(hb|RvYdP-+o;<_$z4vkO9J<3>8=Ls?rymOokrfVO zF{1=+i(;SqnzL;;f%aO=g@ns_E=$P#^8NN&+_osXeU56qiPr6=e&!wfxCni8Y=&MW z@U-`G?ylu97I$ohZl7bXa~A;c)ssVfzOxPh__})p^*oOfGP%J0_FBBVZUX=qB?!U* z-m$NLf-nH11OTwRZsUG?ZLaR%Fc$B1?!swWng;-m{{EK!n^6L%X<@H(7kS)qrUKN+ z1Ax=Cz=g!t#wLO=&_7!no8UsiX<7h)wngWr1l4%}aQ#T%cl`+Uod;L$0m!9Dw zhey8dJfkF&6;4%vGHC!Hqy|r(O>NARXCS0D@%tiZTNG`Jf>EN|Zqyt4d13(x8uf;j zQLPlpb*Evb3$!hoxB>Snlv?pBPVsa9WvZi64$&gZkN`OMDyxjeS;(`X7YT47Aw*OG z5CZps(`Pa9Hy?{Wp4ri1~^ZRL=Xau zE`d?tsfggov&3AFeB1;N$G&foWekk#Z@+kS<+&>oOZ4Q4cE@R$x?cY6Pk)SEKf=Q! zAB5Dfic>I3bi;(yAmtE1q8u(H23UcVLwtO<38!h{ACG=0yeCjT9KK;82m{S^$6mul zc&VIfy@{XuFSSgKdIR-elZkTHo@AyAI86&5V>BA11_-ImU&^8Wds63b3T47>KR~12 zz(sh90ag%%0UGtojaU!{dVs3+27)la`}QpWz|$EVQzt>SuBus9${{>?28S-`&PzFj zLzm#mGd)7;eRGX2ie4np7>UUB8%*WwwpKHJ3Lc)`05F)C0uwo!F zIkje&fpLC0;s+4(Q8$Y4XI6mPiz^Ip4k02CQUjw)TJvp-!sXfb;;)-Om!GP2*|Y#k zt++*&^)a=KSU{Qlxn8E!ih)bNMcTQ7a%{DjmB@n=?m83;8GLgUxt0n>S*EdEU9!dNR-haYoKu6$4lVZKu|Og)X? z_u)qTN@Pm)8)Cc?) zz*sB(@Pm(X%awb(I==N(C$d*@8Z`MQaTnpwRUkpB6|0c<s=q{yvp|hmc^Dp!$ZDI)-xYWfmY0lDX!Rr~YfCWl(Z;Y=-*I zp8>qc)MhRV0IE7VtF+&-C_DP#`ljuHBB!wE4N>ywo`W7!_uZ(&3Y80`n>$S7t~x%qT&}X1Y8T zNX+k5xP+9$lpC6|m@;NX?s9nmsmf8ajHc|9Adqx$5_i$GeC~32ASsuHL0D#8z$9=X zuaxBuu!7Z5{a_vx8ZonOU*YTj9KO>3J~7L1)c_PJ%PHgn1FWP*JZnYPJYjOGqOBq* zG-~5Hd7%7A&^X2;QveFBK!xT2)p3=NKY0GEw6*^_5K_}6`#1S_okA|41TbNaNZAPx%mPtfGR9J=WmO)D!K@`V-Q3I33#$=!|NDf`tkXWb)LT@>G?ziZN>bLOhHz){_ zLVFSP5Nr}*ca3FtAW64}WM+3Y;%u~sQva~H2T?G7U~E9|R~WJj&Nq*Zn34}CUj z4R+r)Qc^c#eurZYnv%gJ;%snj<$J5h<~^^;<#+->5C*yVAPm@9+C8rckl2v03V}X3 zfZM17&~0}J!oYmpb|*LAsyZCC_MXfMYXtyK`d0wlQfA|3Y&L~O2yQ8xH3v;;<IUuS1$PU-b)_KOJ zrc2?nwLqyDfHE^~qsaPptyDlK(yGEDg`ms~Au7~sb@K^Pq0G!$C5=aOpjCD7BlSQH z9b=_pehy=VsANu`&f8+80$;vfaC$Xnq-GD)&?nRtP^sA1+4*M?`25l1_+47%bPa&? zgmZOgHdiWUuI_U4ws~^!?IeBbm63Duc;FRzFH(tnF1}&nBReRU?WfC4@8&lOL&N_D{)Ys O0000VLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA3M-+$vCO&MVe&?5h&*F!AN!DCYGE#t0wmYdeD{h)w##_934vs z;BYt`4u`|xa5x+ehr{7;IIS=@yFdvE&}d`@ilSKC-0T94Mpl|$Uw@6FD3GLy1}#aN zpys$84LiK&XqGLqy7r{$Iie^Y+a@QjVs-6_wQpjMvqE4YA`wEvp)ttCGV)~uiTu7$ zKfamz8?vU^zL!J@h37*6fGlSO09aZK({yIHc7p!zTlG%<>h+F0jV`-Jokch_1^|%! z{gC|qkc}#xAL@hT@3)SB{flN>FEm7;Tq4kQ6<p_p`Pi5_dAV3dJY8_Csp~3Yk7C$P?BLhjQ*0-85PKAZuB$9ewqUXXG~?*l zz6Y-@hvdsf!|`UM3L0*IzKpHZItG1La9H{igFX>ksde1Gbqmjb++blg07ff7)-*vj zs)!dV*gFEe0|a|VK)g_aY*Zb^zp1yK*ukC9Lx`du03eEf+zCCzc4Eh|-dQkN0TLl} zW_%1eO~okj9y>Nlyh!3Tb(#bReZ$yFts^*a!x}eNghYrVy|ZBA0Mgrys!^MKPJ0uh zqr{7`&{eIZ_`Ag8Gq z=>~3$_G6?Q$Z0C#g^Kl9w9Dp;v@qlKp{uOn=KOW+B`)FS{B?AdHOzQ@*nE*@76Qx) zq3PfhvZV_0Wy7imvZV^9gHtW(CDj9{lp>qUK-X1da~Y_VBB>tOuJYQ--0T89S&Eva za4QBcErx0RzNxpg7(P|6l~S15QfhWXJ5`wz{kQ40QVF)@zref9g?9jx#~=&bN^Hy= zaNZbqiwhqD7v2GF%K_(&@&7Bt+Exd+0j~pWz#ZVW0dB(`;I;v7!yVwZ0dC{^pP^O? z9F{eQ>keoImQ~?}4*~7~w+(PY{R_`%WToLnY&5b0LIQMdc7ZlmtI<(8;AHI2%`Ti< zv!fhfW`9u>ArV5a^&H}}nHlRd*{2_WRQoL7bBLEVKc96}2mo(Zf!UJ~4viuF$s{Et zK<6iij`bwiq2nB2Qs0wcPTIstPeMn9Ks~H_5}3UaqLku`r7!^Cho3iXUndCmO;8jC z%l9IfoV<#s-+co@0u%to2l}jYvZV?DK+|5?5@xmn9)B5yf6&KD?o>9Otzr3Igjr7l zvmEg4_p7X=nzHe1t)VBu-0FK0?9j0}Ad%k}WD=m`1HedkEfLDaGIE-VY^l=z5CDKz z#eZ1JHDx+Dh2Q`B1GM*j0JY>N8&ymPr!ai^+VIBnpI$c8VCI1OWacEXwThxBxPSKn nlF8p1Zg&6f18QgT9030T)x#dKO6v1600000NkvXXu0mjfY0;ba literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4bf2a8173c912dbc9d0e91faaa3400c696d57feb GIT binary patch literal 1485 zcmV;;1v2`HP)VLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA3`EW@4=8=Eh|q^^ z!7kD#X}1)lFU61=WN9_YbVAnJ;M`^s2@8wdK7>h)Gtopd&7`>>n1`In%$)PhIcM%< z4#44XI2;a#!{Kl^91e%W;j|Qjk#S5lG&%?=lS4XJKqS2<9JjB<{(wZOps9ae5l;Sk7ZuY@2!s7K0DvSV1OWK( zgAj`+wu@g-|As`VF5b42hS2C>@r1oLxO;7o3P)_RzYFeOTWSC2KT(LHXqd{4Vzi$? zzC@s^3hpk1na4GRWGaDp0E z@a-@*BU|`6^$44hErf4}p{h#7V{{on3(w0w+wr0#NIF;0?Y9cCeTu2+8LY=v(Bpg) zhuIzUI7O_-RxlL|;>qJx!{c-UNR$dH`j}M6!_(abM>oN<=Rh)>2LMn?g`2nTAs*j0 zH=-JmC>1s%TWogvQzTOf>}Gc$ioNi-#_`SLZw>1oFc82^2=jRck)jG*#8I}-MI4CY z1&hbGh1IW@O$z0FxCvoB&eyRXTfuPm^^#r72sa_DswPM}+i_GV2A`t;){cufa8yu0 zI@@8j;DKTjj3u^Vw>uy^Gk8^e1+tuhde8+`-NtA?sjdk|(tE0F_-9!O^MxH^2r+$b(cR5^gc7?P<3R8>JTm4Lz+qRK(VTehwQN+*l{qEl>ccAi=3 z-hUGB&FH9rgd-)MOOD)xY8 zpdS6mP=IUji*JK;2e#RxE*PO1b4TfD6!Q2O3Sw3t;M_ZKE4wHBGRoR)S_c zFtvOMw7dWfFM&qCUTgUb-~u$-0ZSvxa%o$*a~~69esw%pRa+fi^b~8XZLF znwJsM$0oh~Wpe|~NYzd7_}qXNw1(B^22P{ug;2B34V=Z90=)BH5MJ*H9)0!2nR5fC zdusxxI;}OqnNRLO+4+_EJj1%V0qt`%xm$4v!OB!6004aa{y4jA>%_~Q#&ZM5C(4?M zs(U~ry(dVdk9oR*f%ak}lrlM_sDflR4@&=Py5NBtm%^vb4a`h^)Mb{FW>R$q$g+&N n+4+id1FKKI%h%U6&VRx`9a#68e)Tl*00000NkvXXu0mjfSZJM5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/meta.json new file mode 100644 index 0000000000..d01100b7aa --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/hardsuitinteq.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by unknown author", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000000000000000000000000000000000..cd061dd3f8e922a9e237e9d4a77f67fa61b53a08 GIT binary patch literal 3334 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 Nn3jQNmAZZS{{U0IW9I+> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000000000000000000000000000000000..36fa7047fbc4b58b577329f7dc128e20fec07ec6 GIT binary patch literal 3517 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 Z^e+S%xLR4E1@-^{002ovPDHLkV1kBo|JDEi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fbc53c9c2c15ead2faa4a8fa16ff2a4c9bab0ec2 GIT binary patch literal 756 zcmVMl_zG8Q-2;{=ry+Z7Kh?=;5H9fVmKdXO>ZMVKgp;KpP_@UVkpAltDX zhPQ3Kco-_;P{MAt)pj_rRD=#{I*?A5gPP}|Bz8l$Buxr|?{{gF^#3LA^}VL>0uVw7 zA%qY@2qA$evc zQ~y0@eg16EReZVg5F3|z(IK^(pE)S+M8M5ru}Ii_U#jYeMZzdm^?x2eET7Ki0KokA zt>m3>wFA=GoY~+|Fo1M6hfuI~ic(cK8)YRA04tfl$E@U?aJ2E^-JU|{bz777Lq z9lrbX^{nKbaJ?W;ziMPHV0z_JWahuw5#2AUM`LUNI@=+BaImk zuCm6H5ir!fgLr2J01)r2V5ob?c7A?)1OPCE9e=irLiX903b;c zLcsuT-MEe`$1Xc66TQ?l&Upi9(-UApZdSXg#DcGyFg zTn}BAib#SX=rAZ~5MA2reh(mo5JCtc zgb+dqA%u|sU1=-D8Dl(`l{jOJm$p)T-kHXsHQ6D#6@9q_C zTLfeNr7Jh__0A)Fype?8yP(hM&+j%~#3Nz-eWTSyJQ7Bu)wR5DN5*_gr3wK0)9=5p zF%>|mRP_Z1J#HwKDuSNglt!zof2ds<^8>(s`Sjkf{H6lz?iF3yf&p{If*!Z6w?8nL z-)LBV%LV1K5--<}^y_HIXZyt)<+2hN)EeG@TSOwzger(b^IMiH9tmSzT7fLfu61d} z_TT+}@kkh|AVQX9mnw)O^PjOAR4P?yJK$;Y4Wc36Y?981QmH~b+yGF7c(?%tn?vVX z?to0JjYOac07wLy$i&(+2|6p8SQ|ShYXE?qleLlg2MWL#-AEfjJ2dgdf6FvB z)l~n`*ai50{1efTuh(yTXW3YCl(7r2e^7D(r=4SC6V-_(dW5T~Bo1D`bzINT%Gf&q z0PZc_2H^as4-7dU@HZG^T-yOoIy=yBq8$MA4o$44lGDsG7ZVrYZ29UmbIi@e1$gy) x8|RuY9Cvo0-^2v~dVTkNp@Vcf?bts;e*o!?>DwJm>1qG~002ovPDHLkV1kBjM_d2^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/meta.json new file mode 100644 index 0000000000..4831677228 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miningjugg.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original from uknown author, repsrited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000000000000000000000000000000000..4678e25861a94fa578c72426390f7bef2fc2bc5f GIT binary patch literal 3094 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 N002ovPDHLkV1j3ZqDlY& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000000000000000000000000000000000..459dbdd4efcc3fbee6fb3c41b4072841d36b5be5 GIT binary patch literal 3177 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 L!q%K<>KXGtP5mM` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d4d286468e31a8d650651900c83a0aecb2065b16 GIT binary patch literal 2738 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/meta.json new file mode 100644 index 0000000000..4831677228 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/salvplus.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original from uknown author, repsrited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000000000000000000000000000000000..0e60bf0c08be51a49e3bfcedf7014c26f56d645f GIT binary patch literal 3212 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000000000000000000000000000000000..87a70b8393f53c50947d580bb2791f6bf1f12b09 GIT binary patch literal 3080 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..836615bf3e86944a51d51d88828e10fdbe5fb250 GIT binary patch literal 2804 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 E2cIc#*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dab65284fc42490bc30631d895306461191bc7e8 GIT binary patch literal 1017 zcmVPx&vq?ljR9J=Wm2XH}XB5VN*_04tqsww{tQG|oT}QF%a2unb8=Jb}r+ygJK^+~! zMvDwK!TmwlpeS^OO%Mm6TPK@?4ulq&T`hpLNm+Z2*yAL6k zSQC@Eeb@&dxV&)B;hg6^=Q-zvee7c&d%%VB-TH3!x2rzi)t(5`UXnXS0Z9&UX=nha zEz7V;N|aYy-@+*hTtAo1r=B;{#(!il$;*n10BCD0MN*>1*Vb4HKv{7SFLwT!Q6;j{ zIV8e8zd-HLBLGZ{xF{5JX=^N{P_*Hf6+HJg@ZWIZ6yHaZ0|d3Lv@tVoK~?!7J;!3^ zLEty)51T0zb2--1fg}eEAEziVHPVM)R+;!o

u;fRLEcRyvGj0hz5{j-5Dc;zVz z$67j!RwQC+WsRwkKEA&d;f0(JsmQCv8*-=AL)sQR-1m?g#xHMeyLlocIe=eQ38@+t z2WzRc)d8`|NJb(pfyBO#j*YXtzG0Gz1U>Qp!~T*IWqEzWG@W-@2k?g61hv(q@zYL0 z|KPC6J-@){*f^8ZHvwpB4&b{piF#KEu zx|&L6<{FUX081-t+s>J}2I^`mGrmkp4U`nvb%5^9GkkaD3ZvJ@44Zdxm7G6*Wl{CQ z(rp|1!%PP%$iQ0Jg(OsJ;J4-0q{u(Ps9W#$pP;ABqSwDcjp=0 z^9y?a;BZ$#MNI_en^iC5@O3JK6ZXt z!R^}w!0p?_FDu44j*g9IL|{h+;>q%Ia|o$n`c5ClFDtABHNDF^Hp_^suIJ00000NkvXXu0mjf&ZOh2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fbc53c9c2c15ead2faa4a8fa16ff2a4c9bab0ec2 GIT binary patch literal 756 zcmVMl_zG8Q-2;{=ry+Z7Kh?=;5H9fVmKdXO>ZMVKgp;KpP_@UVkpAltDX zhPQ3Kco-_;P{MAt)pj_rRD=#{I*?A5gPP}|Bz8l$Buxr|?{{gF^#3LA^}VL>0uVw7 zA%qY@2qA$evc zQ~y0@eg16EReZVg5F3|z(IK^(pE)S+M8M5ru}Ii_U#jYeMZzdm^?x2eET7Ki0KokA zt>m3>wFA=GoY~+|Fo1M6hfuI~ic(cK8)YRA04tfl$E@U?aJ2E^-JU|{bz777Lq z9lrbX^{nKbaJ?W;ziMPHV0z_JWahuw5#2AUM`LUNI@=+BaImk zuCm6H5ir!fgLr2J01)r2V5ob?c7A?)1OPCE9e=irLiX903b;c zLcsuT-MEe`$1Xc66TQ?l&Upi9(-UApZdSXg#DcGyFg zTn}BAib#SX=rAZ~5MA2reh(mo5JCtc zgb+dqA%u|sU1=-D8Dl(`l{jOJm$p)T-kHXsHQ6D#6@9q_C zTLfeNr7Jh__0A)Fype?8yP(hM&+j%~#3Nz-eWTSyJQ7Bu)wR5DN5*_gr3wK0)9=5p zF%>|mRP_Z1J#HwKDuSNglt!zof2ds<^8>(s`Sjkf{H6lz?iF3yf&p{If*!Z6w?8nL z-)LBV%LV1K5--<}^y_HIXZyt)<+2hN)EeG@TSOwzger(b^IMiH9tmSzT7fLfu61d} z_TT+}@kkh|AVQX9mnw)O^PjOAR4P?yJK$;Y4Wc36Y?981QmH~b+yGF7c(?%tn?vVX z?to0JjYOac07wLy$i&(+2|6p8SQ|ShYXE?qleLlg2MWL#-AEfjJ2dgdf6FvB z)l~n`*ai50{1efTuh(yTXW3YCl(7r2e^7D(r=4SC6V-_(dW5T~Bo1D`bzINT%Gf&q z0PZc_2H^as4-7dU@HZG^T-yOoIy=yBq8$MA4o$44lGDsG7ZVrYZ29UmbIi@e1$gy) x8|RuY9Cvo0-^2v~dVTkNp@Vcf?bts;e*o!?>DwJm>1qG~002ovPDHLkV1kBjM_d2^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/meta.json new file mode 100644 index 0000000000..4831677228 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/upgrmining.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original from uknown author, repsrited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/inteqjumpsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e5ae8fb1b424383804d2ac6d4c39463cd3b672fd GIT binary patch literal 1292 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 Date: Sun, 3 Nov 2024 13:10:47 +0000 Subject: [PATCH 22/24] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 123 +++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 4dce67721b..3a9d9c787f 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2645,3 +2645,126 @@ id: 143 time: '2024-11-02T21:44:06.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/317 +- author: MegaDaimond + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u044D\u043A\u0438\ + \u043F\u0438\u0440\u043E\u0432\u043A\u0430 \u043A\u043E\u043D\u0442\u0440\u0430\ + \u043A\u0442\u043D\u0438\u043A\u0430 (\u0421\u043A\u0430\u0444\u0430\u043D\u0434\ + \u0440, \u0448\u0435\u0439\u043D\u044B\u0439 \u0433\u0435\u0442\u0440, \u043E\ + \u0447\u043A\u0438, \u043A\u043E\u043C\u0431\u0438\u043D\u0435\u0437\u043E\u043D\ + , \u0432\u0435\u0449\u043C\u0435\u0448\u043E\u043A)" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B 3 \u043D\u043E\ + \u0432\u044B\u0445 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u0430 \u0434\ + \u043B\u044F \u0443\u0442\u0438\u043B\u0438\u0437\u0430\u0442\u043E\u0440\u043E\ + \u0432 (Kerateia, Rodos, Argos)" + type: Add + - message: "\u041A\u043E\u0440\u043E\u0431\u043A\u0430 .35 \u0441 \u0443\u0432\u0435\ + \u043B\u0438\u0447\u0435\u043D\u043D\u044B\u043C \u043E\u0431\u044A\u0451\u043C\ + \u043E\u043C \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432 \u043A\u0430\ + \u0442\u0430\u043B\u043E\u0433 \u0430\u043F\u043B\u0438\u043D\u043A\u0430 \u0437\ + \u0430 4 \u0422\u041A" + type: Add + - message: "\u041A\u043E\u0448\u0430\u0447\u044C\u0438 \u0443\u0448\u043A\u0438\ + \ \u0432\u0435\u0440\u043D\u0443\u043B\u0438\u0441\u044C \u0432 \u043A\u0430\ + \u0442\u0430\u043B\u043E\u0433 \u0430\u043F\u043B\u0438\u043D\u043A\u0430 \u0437\ + \u0430 4 \u0422\u041A." + type: Add + - message: "\u0421\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u044B Kerateia \u0438\ + \ Rodos \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B \u0434\u043B\u044F\ + \ \u043F\u043E\u043A\u0443\u043F\u043A\u0438 \u0432 \u041A\u0430\u0440\u0433\ + \u043E" + type: Add + - message: "\u0423\u0431\u0440\u0430\u043D \u0441\u043A\u0430\u0444\u0430\u043D\u0434\ + \u0440 NTSA-126 (\u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440 \u0434\u0436\ + \u0430\u0433\u0433\u0435\u0440\u043D\u0430\u0443\u0442\u0430 \u043A\u0438\u0431\ + \u0435\u0440\u0441\u0430\u043D, \u043D\u043E \u043E\u0442 \u041D\u0422) \u0438\ + \u0437 \u043F\u043E\u043A\u0443\u043F\u043A\u0438 \u0432 \u041A\u0430\u0440\u0433\ + \u043E" + type: Remove + - message: "\u0426\u0435\u043D\u0430 \u043D\u0430 \u0431\u043E\u043B\u044C\u0448\ + \u0438\u043D\u0441\u0442\u0432\u043E \u043D\u0430\u0431\u043E\u0440\u043E\u0432\ + \ \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u043E\u0432 \u0432 \u041A\ + \u0430\u0440\u0433\u043E \u0431\u044B\u043B\u0430 \u0443\u0432\u0435\u043B\u0438\ + \u0447\u0435\u043D\u0430 (\u0412\u044B\u0434\u0435\u043B\u044F\u044E, \u0447\ + \u0442\u043E \u0446\u0435\u043D\u0430 \u043D\u0430 \u0441\u043A\u0430\u0444\u0430\ + \u043D\u0434\u0440 NTSA-122 (\u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\ + \u043D\u044B\u0439 \u0441\u043A\u0430\u0444 \u042F\u041E \u043E\u0442 \u041D\ + \u0422) \u0442\u0435\u043F\u0435\u0440\u044C 30\u043A, \u0430 \u043D\u0435 17.5\u043A\ + )" + type: Tweak + - message: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0435 \u043F\ + \u0438\u0441\u0442\u043E\u043B\u0435\u0442\u043D\u044B\u0435 \u043C\u0430\u0433\ + \u0430\u0437\u0438\u043D\u044B .35 \u043F\u043E\u043B\u0443\u0447\u0438\u043B\ + \u0438 \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u0438\u0435 \u043E\u0431\ + \u044A\u0451\u043C\u0430 (16>20 \u043F\u0430\u0442\u0440\u043E\u043D\u043E\u0432\ + )" + type: Tweak + - message: "\u041E\u0434\u0438\u043D\u043E\u043A\u0438\u0439 \u044F\u0434\u0435\u0440\ + \u043D\u044B\u0439 \u043E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u0438\ + \u043A \u043F\u043E\u043B\u0443\u0447\u0438\u043B \u043F\u0435\u0440\u0435\u0440\ + \u0430\u0431\u043E\u0442\u043A\u0443 (\u041D\u043E\u0432\u043E\u0435 \u0441\u043D\ + \u0430\u0440\u044F\u0436\u0435\u043D\u0438\u0435, \u0443\u043C\u0435\u043D\u044C\ + \u0448\u0435\u043D\u0438\u0435 \u043A\u043E\u043B-\u0432\u0430 \u0422\u041A\ + \ \u0441 40>25)" + type: Tweak + - message: "\u0411\u0438\u0442\u0430 \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u0430\ + \ \u043D\u0435\u0440\u0444 (\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\ + \u043E \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u0438\u0435 \u0443\u0440\ + \u043E\u043D\u0430 \u043E\u0442 \u0441\u0438\u043B\u044C\u043D\u043E\u0439 \u0430\ + \u0442\u0430\u043A\u0438, \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u0430\ + \ \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u044C \u0430\u0442\u0430\u043A\u0438\ + , \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u043E \u043A\u043E\u043B\ + -\u0432\u043E \u0441\u0442\u0430\u043C\u0438\u043D\u044B \u0434\u043B\u044F\ + \ \u0441\u0438\u043B\u043E\u0432\u043E\u0433\u043E \u0443\u0434\u0430\u0440\u0430\ + , \u0441\u043B\u0435\u0433\u043A\u0430 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\ + \u043D \u0440\u0430\u0434\u0438\u0443\u0441 \u0448\u0438\u0440\u043E\u043A\u043E\ + \u0433\u043E \u0443\u0434\u0430\u0440\u0430 \u0438 \u0435\u0433\u043E \u0434\ + \u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F, )" + type: Tweak + - message: "\u041A\u0440\u043E\u0432\u0430\u0432\u043E-\u043A\u0440\u0430\u0441\u043D\ + \u0430\u044F \u0433\u043B\u0435\u0444\u0430 \u043F\u043E\u043B\u0443\u0447\u0438\ + \u043B\u0430 \u043D\u0435\u0440\u0444 (\u0421\u0438\u043B\u043E\u0432\u043E\u0439\ + \ \u0443\u0434\u0430\u0440 \u0442\u0435\u043F\u0435\u0440\u044C \u0443\u043C\ + \u0435\u043D\u044C\u0448\u0430\u0435\u0442 \u0443\u0440\u043E\u043D \u043D\u0430\ + \ 10%, \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u043E \u043A\u043E\u043B\ + -\u0432\u043E \u0441\u0442\u0430\u043C\u0438\u043D\u044B \u0434\u043B\u044F\ + \ \u0441\u0438\u043B\u043E\u0432\u043E\u0433\u043E \u0443\u0434\u0430\u0440\u0430\ + , \u0441\u0438\u043B\u043E\u0432\u043E\u0439 \u0443\u0434\u0430\u0440 \u043C\ + \u043E\u0436\u0435\u0442 \u0437\u0430\u0434\u0435\u0442\u044C \u043E\u0434\u043D\ + \u043E\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E \u043B\u0438\u0448\u044C\ + \ \u0434\u0432\u0435 \u0446\u0435\u043B\u0438, \u0441\u043B\u0435\u0433\u043A\ + \u0430 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D \u0443\u0440\u043E\u043D\ + \ \u0440\u0430\u0434\u0438\u0430\u0446\u0438\u0435\u0439 \u0437\u0430 \u0443\ + \u0434\u0430\u0440)" + type: Tweak + - message: "\u0420\u0435\u0431\u0430\u043B\u0430\u043D\u0441 \u0445\u0430\u0440\ + -\u043A \u0448\u0430\u0445\u0442\u0451\u0440\u0441\u043A\u043E\u0433\u043E \u0438\ + \ \u044D\u043B\u0438\u0442\u043D\u043E\u0433\u043E \u0448\u0430\u0445\u0442\u0451\ + \u0440\u0441\u043A\u043E\u0433\u043E (\u0424\u0438\u0437 \u043F\u043E\u043A\u0430\ + \u0437\u0430\u0442\u0435\u043B\u0438 \u0448\u0430\u0445\u0442\u0451\u0440\u0441\ + \u043A\u043E\u0433\u043E \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u044B\ + \ \u043D\u0430 5%, \u0430 \u044D\u043B\u0438\u0442\u043D\u043E\u0433\u043E \u043D\ + \u0430 10%)" + type: Tweak + - message: "\u0414\u0440\u0435\u0432\u043D\u0438\u0439 \u0441\u043A\u0430\u0444\u0430\ + \u043D\u0434\u0440 \u0441\u0438\u043D\u0434\u0438\u043A\u0430\u0442\u0430 \u043F\ + \u043E\u043B\u0443\u0447\u0430\u0435\u0442 \u043D\u0435\u0440\u0444 (\u041F\u043E\ + \u043D\u0438\u0436\u0435\u043D\u0438\u0435 \u043D\u0435\u043A\u043E\u0442\u043E\ + \u0440\u044B\u0445 \u0432\u0438\u0434\u043E\u0432 \u0440\u0435\u0437\u0438\u0441\ + \u0442\u043E\u0432 \u043D\u0430 15-20%, \u0430 \u043E\u0436\u043E\u0433\u043E\ + \u0432 \u043D\u0430 10%, \u0442\u0430\u043A \u0436\u0435 \u043D\u0430\u0434\u0435\ + \u0442\u044B\u0439 \u0448\u043B\u0435\u043C \u043F\u043E\u043D\u0438\u0436\u0430\ + \u0435\u0442 \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u044C \u043D\u0430 5%)" + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043E\ + \u0431\u0443\u0440\u0430 \u0441\u0438\u043D\u0434\u0438\u043A\u0430\u0442\u0430\ + , \u0442\u0435\u043F\u0435\u0440\u044C \u043E\u043D\u0430 \u043C\u043E\u0436\ + \u0435\u0442 \u0431\u044B\u0442\u044C \u043D\u0430\u0434\u0435\u0442\u0430 \u043D\ + \u0430 \u0441\u043B\u043E\u0442 \u0430\u043A\u0441\u0435\u0441\u0441\u0443\u0430\ + \u0440\u043E\u0432, \u043A\u0430\u043A \u0438 \u043E\u0431\u044B\u0447\u043D\ + \u0430\u044F \u043A\u043E\u0431\u0443\u0440\u0430" + type: Fix + id: 144 + time: '2024-11-03T13:09:41.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/314 From b894c3c45e29579771a88aeb11cf88ea250f1851 Mon Sep 17 00:00:00 2001 From: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:21:29 +0300 Subject: [PATCH 23/24] Update LostParadiseMapPool.yml (#320) --- .../_LostParadise/Maps/Pools/LostParadiseMapPool.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml b/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml index 1ccab09d9d..f0391f8f58 100644 --- a/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml +++ b/Resources/Prototypes/_LostParadise/Maps/Pools/LostParadiseMapPool.yml @@ -1,7 +1,8 @@ - type: gameMapPool id: LostParadiseMapPool maps: - - H_LPPAsterisk - - H_LPPPebble - - H_LPPNormandy - - H_LPPKerberos + - LPPAsterisk + - LPPSubmarine + - LPPPebble + - LPPNormandy + - LPPKerberos From 3248709a36b9425578882b83d303dde5cd8ea008 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, 4 Nov 2024 19:22:35 +0000 Subject: [PATCH 24/24] Automatic changelog update --- Resources/Changelog/ChangelogLPP.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 3a9d9c787f..77666914b3 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2768,3 +2768,11 @@ id: 144 time: '2024-11-03T13:09:41.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/314 +- author: Evgencheg + changes: + - message: "\u0423\u0431\u0440\u0430\u043D\u044B \u0430\u0434\u0441\u043A\u0438\u0435\ + \ \u043A\u0430\u0440\u0442\u044B!" + type: Remove + id: 145 + time: '2024-11-04T19:21:30.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/320