From 425f91b201449c8c4492b522103c09aa1a4ea74f Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 1 Dec 2024 18:49:29 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9C=D1=8F=D1=81=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=BA=D1=80=D1=8E=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/structures/meat_spike.ftl | 2 + .../Entities/Structures/meat_spike.yml | 2 +- .../Recipes/Construction/furniture.yml | 2 +- .../Graphs/furniture/meatspike.yml | 34 +++++++++++ .../_White/Entities/Structures/meat_spike.yml | 57 ++++++++++++++++++ .../White/Structures/meat_spike.rsi/meta.json | 20 ++++++ .../White/Structures/meat_spike.rsi/spike.png | Bin 0 -> 1636 bytes 7 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_White/Construction/Graphs/furniture/meatspike.yml create mode 100644 Resources/Prototypes/_White/Entities/Structures/meat_spike.yml create mode 100644 Resources/Textures/White/Structures/meat_spike.rsi/meta.json create mode 100644 Resources/Textures/White/Structures/meat_spike.rsi/spike.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/meat_spike.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/meat_spike.ftl index b268aaa587..6224668ea6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/meat_spike.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/meat_spike.ftl @@ -1,2 +1,4 @@ ent-KitchenSpike = мясной крюк .desc = Крюк для снятия мяса с животных. +ent-KitchenSpikeFrame = каркас мясного крюка + .desc = Незаконченный мясной крюк, требуется ещё немного терпения. diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml index 16aa0f4210..b319e13af7 100644 --- a/Resources/Prototypes/Entities/Structures/meat_spike.yml +++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml @@ -52,7 +52,7 @@ Empty: { state: spike } Bloody: { state: spikebloody } - type: Construction - graph: MeatSpike + graph: MeatSpikeWD # WD Edit node: MeatSpike - type: GuideHelp guides: diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index df21266e11..acea2d8b05 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -1017,7 +1017,7 @@ id: KitchenSpike name: meat spike description: A spike found in kitchens butchering animals. - graph: MeatSpike + graph: MeatSpikeWD # WD Edit startNode: start targetNode: MeatSpike category: construction-category-furniture diff --git a/Resources/Prototypes/_White/Construction/Graphs/furniture/meatspike.yml b/Resources/Prototypes/_White/Construction/Graphs/furniture/meatspike.yml new file mode 100644 index 0000000000..d050946f52 --- /dev/null +++ b/Resources/Prototypes/_White/Construction/Graphs/furniture/meatspike.yml @@ -0,0 +1,34 @@ +- type: constructionGraph + id: MeatSpikeWD + start: start + graph: + - node: start + actions: + - !type:DeleteEntity {} + edges: + - to: middle + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Steel + amount: 15 + doAfter: 5 + - node: middle + entity: KitchenSpikeFrame + edges: + - to: MeatSpike + steps: + - tool: Welding + doAfter: 3 + - node: MeatSpike + entity: KitchenSpike + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 15 + steps: + - tool: Screwing + doAfter: 5 diff --git a/Resources/Prototypes/_White/Entities/Structures/meat_spike.yml b/Resources/Prototypes/_White/Entities/Structures/meat_spike.yml new file mode 100644 index 0000000000..fd29b18d43 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Structures/meat_spike.yml @@ -0,0 +1,57 @@ +- type: entity + id: KitchenSpikeFrame + parent: BaseStructure + name: meat spike frame + description: Unfinished meat hook, needs a little more patience. + components: + - type: InteractionOutline + - type: Sprite + sprite: White/Structures/meat_spike.rsi + state: spike + layers: + - state: spike + map: ["base"] + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + params: + volume: -4 + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 1 + - type: Transform + noRot: true + - type: Anchorable + - type: Pullable + - type: Appearance + - type: GenericVisualizer + visuals: + enum.KitchenSpikeVisuals.Status: + base: + Empty: { state: spike } + Bloody: { state: spikebloody } + - type: Construction + graph: MeatSpikeWD + node: middle + - type: GuideHelp + guides: + - Chef diff --git a/Resources/Textures/White/Structures/meat_spike.rsi/meta.json b/Resources/Textures/White/Structures/meat_spike.rsi/meta.json new file mode 100644 index 0000000000..90b32a6907 --- /dev/null +++ b/Resources/Textures/White/Structures/meat_spike.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/kitchen.dmi", + "states": [ + { + "name": "spike", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Structures/meat_spike.rsi/spike.png b/Resources/Textures/White/Structures/meat_spike.rsi/spike.png new file mode 100644 index 0000000000000000000000000000000000000000..4a7bc6d997a0eca4120ab5ab7180a0d0363f5a19 GIT binary patch literal 1636 zcmbVNX>1f#9G`BsD=w7a86tcbrY1sk&fV?qympK0PVH{v)*c&Kj1gvM-tG?FIh>hx z54=*qKmrjXL4r+*#AriOgAigO#3P1)5~)p;;{%q&NF;&Q4<(8u#y5Kf6eTjroA=(l z-~0XV|7`2)?QZct;>9qmB_0z7(2P4{fd{>0-m#?^=AKoO zDLa*T21vR}iL#!CR8ch$8pAqP7Y$Jwf;OIpSw#yIb4NcXa77LiYXS)-VMJk0iIq(_ zSnf?qXlet_efCFp;xu1JHD# zP@oDvN;k7K%kwD)s6x%Q5SDFVjht@lR!;vH>c;Uc0+4SL ziH3~Z>Y}O*5tiLGg3PEnnq`Zc1mi-O zKsHl~B7+d;gObDr$+mPxBpJrKew ziTS(caSF~!2@q2(6s%IMA_n10wN+lhD_HwZTR{^$Ccl{AGvVq(z`21uWFCY{`6?vV?9j0 zec*tw{KSuEJEpdrT82Go-1oi$_?sWk>>5}nU5!5 zmdf)N{TrJz_ZY8kE?nPrjl_x&sI)K1Lwo-A}OJh*NDhvkj4rL%MAygOHQ_4MS9&R%Zao!A=d z={dP;zto?4#nXNG+6HuT@sH5DAD$oV-)(&Mf@l27`CpfP>U!?Ykx2WTx8L~>#JhTh JkDgjT`WGuoBw7Ff literal 0 HcmV?d00001 From da2f5e488a8047b3c41e4097acfc51f98d678710 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 1 Dec 2024 19:21:43 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=91=D0=B0=D1=84=D1=84=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=B9=D1=80=D0=BE=D1=81=D1=82=D0=B0=D0=B1=D0=B8=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implants/NeuroControl/NeuroStabilizationSystem.cs | 2 +- .../Item/DelayedKnockdown/DelayedKnockdownOnHitSystem.cs | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Content.Shared/_White/Implants/NeuroControl/NeuroStabilizationSystem.cs b/Content.Shared/_White/Implants/NeuroControl/NeuroStabilizationSystem.cs index 411a82ab3f..51f3e23318 100644 --- a/Content.Shared/_White/Implants/NeuroControl/NeuroStabilizationSystem.cs +++ b/Content.Shared/_White/Implants/NeuroControl/NeuroStabilizationSystem.cs @@ -18,7 +18,7 @@ public sealed class NeuroStabilizationSystem : EntitySystem private void BeforeStaminaDamage(Entity ent, ref BeforeStaminaDamageEvent args) { args.Cancelled = true; - Electrocute(ent, (int) MathF.Round(args.Value * 2f / 3f)); + Electrocute(ent, (int) MathF.Round(args.Value * 2f / 4f)); } public void Electrocute(EntityUid uid, int damage, StatusEffectsComponent? status = null) diff --git a/Content.Shared/_White/Item/DelayedKnockdown/DelayedKnockdownOnHitSystem.cs b/Content.Shared/_White/Item/DelayedKnockdown/DelayedKnockdownOnHitSystem.cs index aeab3a49f4..bf6f1cdbb7 100644 --- a/Content.Shared/_White/Item/DelayedKnockdown/DelayedKnockdownOnHitSystem.cs +++ b/Content.Shared/_White/Item/DelayedKnockdown/DelayedKnockdownOnHitSystem.cs @@ -4,6 +4,8 @@ using Content.Shared.Speech.EntitySystems; using Content.Shared.Standing; using Content.Shared.StatusEffect; using Content.Shared.Stunnable; +using Content.Shared._White.Implants.NeuroControl; +using Content.Shared.Electrocution; using Robust.Shared.Timing; namespace Content.Shared._White.Item.DelayedKnockdown; @@ -14,6 +16,7 @@ public sealed class DelayedKnockdownOnHitSystem : EntitySystem [Dependency] private readonly SharedJitteringSystem _jitter = default!; [Dependency] private readonly SharedStutteringSystem _stutter = default!; [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!; public override void Initialize() { @@ -36,6 +39,12 @@ public sealed class DelayedKnockdownOnHitSystem : EntitySystem if (!TryComp(uid, out StandingStateComponent? standingState) || !standingState.CanLieDown) continue; + if (HasComp(uid)) + { + _electrocution.TryDoElectrocution(uid, null, 5, TimeSpan.FromSeconds(1), false, 0.5f, null, true); + continue; + } + if (jitterTime > TimeSpan.Zero) _jitter.DoJitter(uid, jitterTime, true, status: statusEffects); if (stutterTime > TimeSpan.Zero) From ef28e7398a74f0ae13f679cd07895e4286050ba0 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 1 Dec 2024 20:39:26 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=91=D0=B0=D1=84=D1=84=20=D1=81=D0=B2?= =?UTF-8?q?=D0=BE=D0=B1=D0=BE=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ensnaring/EnsnareableSystem.Ensnaring.cs | 5 +++- .../Implants/SubdermalImplantSystem.cs | 27 ++++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs index 105a8f9720..4ba60e9c3d 100644 --- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs +++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs @@ -11,6 +11,7 @@ using Content.Shared.Ensnaring.Components; using Content.Shared.IdentityManagement; using Content.Shared.StepTrigger.Systems; using Content.Shared.Throwing; +using Content.Shared.Popups; namespace Content.Server.Ensnaring; @@ -151,9 +152,11 @@ public sealed partial class EnsnareableSystem Dirty(component.Ensnared.Value, ensnareable); component.Ensnared = null; + _popup.PopupEntity(Loc.GetString("ensnare-component-try-free-complete", ("ensnare", ensnare)), target, target, PopupType.Medium); // WD + UpdateAlert(target, ensnareable); var ev = new EnsnareRemoveEvent(component.WalkSpeed, component.SprintSpeed); - RaiseLocalEvent(ensnare, ev); + RaiseLocalEvent(target, ev); // WD fix from ensnare to target } /// diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index c25cf86c34..f50ec8f826 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -23,6 +23,9 @@ using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Systems; using Robust.Shared.Collections; using Robust.Shared.Map.Components; +using Content.Server.Ensnaring; +using Content.Shared.Ensnaring.Components; +using System.Linq; namespace Content.Server.Implants; @@ -41,6 +44,7 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly IdentitySystem _identity = default!; // WD + [Dependency] private readonly EnsnareableSystem _ensnareable = default!; // WD private EntityQuery _physicsQuery; private HashSet> _targetGrids = []; @@ -84,11 +88,26 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem private void OnFreedomImplant(EntityUid uid, SubdermalImplantComponent component, UseFreedomImplantEvent args) { - if (!TryComp(component.ImplantedEntity, out var cuffs) || cuffs.Container.ContainedEntities.Count < 1) - return; + // WD EDIT START + var ensnareCheck = TryComp(component.ImplantedEntity, out var ensnareable) && ensnareable.Container.ContainedEntities.Count > 0; + if (ensnareCheck && ensnareable != null) + { + var ensnaringUid = ensnareable.Container.ContainedEntities.First(); + if (TryComp(ensnaringUid, out var ensnaringComp)) + _ensnareable.ForceFree(ensnaringUid, ensnaringComp); + } - _cuffable.Uncuff(component.ImplantedEntity.Value, cuffs.LastAddedCuffs, cuffs.LastAddedCuffs); - args.Handled = true; + var cuffCheck = TryComp(component.ImplantedEntity, out var cuffs) && cuffs.Container.ContainedEntities.Count > 0; + if (cuffCheck && cuffs != null && component.ImplantedEntity != null) + { + _cuffable.Uncuff(component.ImplantedEntity.Value, cuffs.LastAddedCuffs, cuffs.LastAddedCuffs); + } + + if (ensnareCheck || cuffCheck) + { + args.Handled = true; + } + // WD EDIT END } private void OnActivateImplantEvent(EntityUid uid, SubdermalImplantComponent component, ActivateImplantEvent args) From 1cfb561f6236b73fc42e9c83a46b37141f16cb9e Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sun, 1 Dec 2024 23:17:46 +0300 Subject: [PATCH 4/5] damn --- .../ru-RU/locales-new/autotranslate-19.ftl | 2 +- .../Objects/Misc/identification_cards.yml | 16 ++++++++++++---- .../Roles/Jobs/Security/senior_officer.yml | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-19.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-19.ftl index 3f1a6d711f..59f242f1fe 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-19.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-19.ftl @@ -3,7 +3,7 @@ ent-SeniorResearcherPDA = ПДА ведущего исследователя ent-SeniorPhysicianPDA = ПДА медицинского офицера .desc = Слабо пахнет железом и химикатами. Имеет встроенный анализатор здоровья. ent-SeniorOfficerPDA = ПДА ветерана СБ - .desc = Избитые, потрепанные и сломанные, но едва пригодные для использования. + .desc = Избитый, потрепанный и сломанный, но едва пригодный для использования. ent-SeniorSalvagePDA = ПДА охотника карго .desc = Потрепанный и воняющий кровью с потом, но пригодный для использования. ent-PinpointerUniversal = универсальный пинпоинтер diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index deddc0f44b..1b767f5765 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -904,7 +904,7 @@ - type: Unremoveable - type: entity - parent: EngineeringIDCard + parent: IDCardStandard id: SeniorEngineerIDCard name: senior engineer ID card components: @@ -912,9 +912,11 @@ layers: - state: default - state: idseniorengineer + - type: PresetIdCard + job: SeniorEngineer - type: entity - parent: ResearchIDCard + parent: IDCardStandard id: SeniorResearcherIDCard name: senior researcher ID card components: @@ -922,9 +924,11 @@ layers: - state: default - state: idseniorresearcher + - type: PresetIdCard + job: SeniorResearcher - type: entity - parent: MedicalIDCard + parent: IDCardStandard id: SeniorPhysicianIDCard name: senior physician ID card components: @@ -932,9 +936,11 @@ layers: - state: default - state: idseniorphysician + - type: PresetIdCard + job: SeniorPhysician - type: entity - parent: SecurityIDCard + parent: IDCardStandard id: SeniorOfficerIDCard name: senior officer ID card components: @@ -942,3 +948,5 @@ layers: - state: default - state: idseniorofficer + - type: PresetIdCard + job: SeniorOfficer diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index 1751206c53..9e46e53dad 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -30,7 +30,7 @@ - Maintenance - Service - External - - Medical + - Cryogenics special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] From affb6a57c1123bfede1acd46dd7503a2cafb0de4 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 1 Dec 2024 21:09:43 +0000 Subject: [PATCH 5/5] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 73 ++++++++++++-------------- 1 file changed, 34 insertions(+), 39 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 4b27ecceba..8dd9890b95 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,43 +1,4 @@ Entries: -- author: HitPanda - changes: - - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0430\u043F\u043B\u0438\u043D\ - \u043A\u0430." - type: Add - - message: "\u0414\u0440\u0443\u0433\u043E\u0435 \u043E\u0433\u0440\u043E\u043C\u043D\ - \u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043F\ - \u0435\u0440\u0435\u0432\u043E\u0434\u0430 \u0441 \u0438\u0437\u043C\u0435\u043D\ - \u0435\u043D\u0438\u044F\u043C\u0438 \u0432 1500+ \u0444\u0430\u0439\u043B\u043E\ - \u0432." - type: Add - - message: "\u0424\u0438\u043A\u0441 \u0441\u043B\u043E\u043C\u0430\u043D\u043D\u044B\ - \u0445 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u043E\u0432 (\u0432\u0440\u043E\ - \u0434\u0435 \u0431\u044B)." - type: Fix - id: 115 - time: '2023-04-04T13:12:36.0000000+00:00' -- author: HitPanda - changes: - - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u043A\u043D\u0438\u0433" - type: Add - - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0434\u0438\u0441\u043A\u043E\ - \u0440\u0434-\u0441\u0442\u0430\u0442\u0443\u0441\u0430" - type: Add - - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0430\u0434\u043C\u0438\u043D\ - -\u043F\u0430\u043D\u0435\u043B\u0438" - type: Add - - message: "\u0414\u0440\u0443\u0433\u0438\u0435 \u043F\u0435\u0440\u0435\u0432\u043E\ - \u0434\u044B" - type: Add - id: 116 - time: '2023-04-05T12:32:32.0000000+00:00' -- author: HitPanda - changes: - - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0438\u043A\u043E\u043D\u043E\ - \u043A \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430!" - type: Add - id: 117 - time: '2023-04-05T18:01:47.0000000+00:00' - author: Valtos changes: - message: "\u041D\u043E\u0432\u044B\u0439 \u0441\u0442\u0438\u043B\u044C \u0438\ @@ -8911,3 +8872,37 @@ id: 614 time: '2024-11-30T21:01:53.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/795 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u043C\u043F\u043B\u0430\u043D\u0442 \u043D\u0435\u0439\u0440\u043E\ + \u0441\u0442\u0430\u0431\u0438\u043B\u0438\u0437\u0430\u0446\u0438\u0438 \u0442\ + \u0435\u043F\u0435\u0440\u044C \u043F\u043E\u043C\u043E\u0433\u0430\u0435\u0442\ + \ \u043E\u0442 \u0441\u0442\u0430\u043D\u0431\u0430\u0442\u043E\u043D\u0430\ + \ \u0438 \u043D\u0430\u043D\u043E\u0441\u0438\u0442 \u043C\u0435\u043D\u044C\ + \u0448\u0435 \u0443\u0440\u043E\u043D\u0430 \u0448\u043E\u043A\u043E\u043C." + type: Tweak + - message: "\u0418\u043C\u043F\u043B\u0430\u043D\u0442 \u0441\u0432\u043E\u0431\u043E\ + \u0434\u044B \u0442\u0435\u043F\u0435\u0440\u044C \u043E\u0441\u0432\u043E\u0431\ + \u043E\u0436\u0434\u0430\u0435\u0442 \u043E\u0442 \u0431\u043E\u043B\u044B." + type: Tweak + id: 615 + time: '2024-12-01T21:07:54.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/798 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u043A\u0440\u0430\u0444\u0442\ + \ \u043C\u044F\u0441\u043D\u043E\u0433\u043E \u043A\u0440\u044E\u043A\u0430." + type: Tweak + id: 616 + time: '2024-12-01T21:08:19.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/797 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u044B\ + \u0434\u0430\u0447\u0430 \u0438\u043A\u043E\u043D\u043A\u0438 \u0438 \u043D\u0430\ + \u0437\u0432\u0430\u043D\u0438\u044F \u0432\u0435\u0442\u0435\u0440\u0430\u043D\ + \u0441\u043A\u0438\u043C \u0440\u043E\u043B\u044F\u043C." + type: Fix + id: 617 + time: '2024-12-01T21:08:39.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/799