From a82913f6567049c9fb7d3dc050c309f80c5b6f21 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:46:51 +1000
Subject: [PATCH 1/6] =?UTF-8?q?[Tweak]=20Secret=20/=20=D0=A1=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=80=D0=B5=D1=82=20(#87)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

tweak: secret
---
 Resources/Prototypes/secret_weights.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml
index 4ad31cd194..9ba6465b09 100644
--- a/Resources/Prototypes/secret_weights.yml
+++ b/Resources/Prototypes/secret_weights.yml
@@ -1,9 +1,12 @@
 - type: weightedRandom
   id: Secret
   weights:
-    Survival: 0.44
-    Nukeops: 0.14
-    Zombie: 0.03
-    Traitor: 0.39
+    Survival: 0.05
+    Nukeops: 0.20
+    Zombie: 0.10
+    Revolutionary: 0.15
+    Traitor: 0.45
+    Extended: 0.04
+    AllAtOnce: 0.01
     #Pirates: 0.15 #ahoy me bucko
 

From 921d81416beb036d81bfd4fd93d722c2500b0902 Mon Sep 17 00:00:00 2001
From: WWDP Changelogs <riddleridou@users.noreply.github.com>
Date: Wed, 16 Oct 2024 01:47:17 +0000
Subject: [PATCH 2/6] Automatic Changelog Update (#87)

---
 Resources/Changelog/Changelog.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c311f3b3ab..2370c386b7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6539,3 +6539,10 @@ Entries:
   id: 6365
   time: '2024-10-11T05:03:33.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/80
+- author: Spatison
+  changes:
+    - type: Tweak
+      message: Changed the chances of secret modes / Изменены шансы режимов в секрете
+  id: 6366
+  time: '2024-10-16T01:46:51.0000000+00:00'
+  url: https://github.com/WWhiteDreamProject/wwdpublic/pull/87

From d61d9cd041840a6fa8160f35c323e5a403bc49ae Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:57:55 +1000
Subject: [PATCH 3/6] =?UTF-8?q?[Port]=20Blood=20Dagger=20/=20=D0=9A=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=B2=D1=8B=D0=B9=20=D0=9A=D0=B8=D0=BD=D0=B6?=
 =?UTF-8?q?=D0=B0=D0=BB=20(#86)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

add: blood dagger
---
 .../Body/Systems/BloodstreamSystem.cs         |  17 +++-
 .../Melee/BloodAbsorb/BloodAbsorbComponent.cs |  17 ++++
 .../Melee/BloodAbsorb/BloodAbsorbSystem.cs    |  71 +++++++++++++++
 .../_White/Melee/Crit/CritSystem.cs           |  17 +++-
 .../Other/BloodLust/BloodLustComponent.cs     |  14 +++
 .../_White/Other/BloodLust/BloodLustSystem.cs |  42 +++++++++
 .../en-US/_white/store/uplink-catalog.ftl     |   7 +-
 .../objects/weapons/melee/daggers.ftl         |   7 +-
 .../ru-RU/_white/store/uplink-catalog.ftl     |   7 +-
 .../Locale/ru-RU/store/uplink-catalog.ftl     |  20 +----
 .../_White/Catalog/uplink_catalog.yml         |  24 ++++-
 .../Objects/Weapons/Melee/daggers.yml         |  37 +++++++-
 .../icon.png                                  | Bin
 .../inhand-left.png                           | Bin
 .../inhand-right.png                          | Bin
 .../meta.json                                 |   0
 .../Melee/Daggers/blood_dagger.rsi/icon.png   | Bin 0 -> 916 bytes
 .../Daggers/blood_dagger.rsi/inhand-left.png  | Bin 0 -> 982 bytes
 .../Daggers/blood_dagger.rsi/inhand-right.png | Bin 0 -> 958 bytes
 .../Melee/Daggers/blood_dagger.rsi/meta.json  |  84 ++++++++++++++++++
 20 files changed, 330 insertions(+), 34 deletions(-)
 create mode 100644 Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbComponent.cs
 create mode 100644 Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs
 create mode 100644 Content.Server/_White/Other/BloodLust/BloodLustComponent.cs
 create mode 100644 Content.Server/_White/Other/BloodLust/BloodLustSystem.cs
 rename Resources/Textures/_White/Objects/Weapons/Melee/Daggers/{betrayal_knife.rsi => betrayal_dagger.rsi}/icon.png (100%)
 rename Resources/Textures/_White/Objects/Weapons/Melee/Daggers/{betrayal_knife.rsi => betrayal_dagger.rsi}/inhand-left.png (100%)
 rename Resources/Textures/_White/Objects/Weapons/Melee/Daggers/{betrayal_knife.rsi => betrayal_dagger.rsi}/inhand-right.png (100%)
 rename Resources/Textures/_White/Objects/Weapons/Melee/Daggers/{betrayal_knife.rsi => betrayal_dagger.rsi}/meta.json (100%)
 create mode 100644 Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/icon.png
 create mode 100644 Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/meta.json

diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
index b37ac5efeb..338f888b35 100644
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server._White.Other.BloodLust;
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Chemistry.ReactionEffects;
@@ -14,6 +15,7 @@
 using Content.Shared.Drunk;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Systems;
+using Content.Shared.Movement.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Speech.EntitySystems;
@@ -39,6 +41,7 @@ public sealed class BloodstreamSystem : EntitySystem
     [Dependency] private readonly SharedStutteringSystem _stutteringSystem = default!;
     [Dependency] private readonly AlertsSystem _alertsSystem = default!;
     [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; // WD
 
     public override void Initialize()
     {
@@ -352,7 +355,7 @@ public void SetBloodLossThreshold(EntityUid uid, float threshold, BloodstreamCom
     /// <summary>
     ///     Attempts to modify the blood level of this entity directly.
     /// </summary>
-    public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null)
+    public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null, bool createPuddle = true) // WD EDIT
     {
         if (!Resolve(uid, ref component, logMissing: false)
             || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution))
@@ -373,7 +376,7 @@ public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamCo
 
         tempSolution.AddSolution(newSol, _prototypeManager);
 
-        if (tempSolution.Volume > component.BleedPuddleThreshold)
+        if (tempSolution.Volume > component.BleedPuddleThreshold && createPuddle) // WD EDIT
         {
             // Pass some of the chemstream into the spilled blood.
             if (_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution))
@@ -406,6 +409,16 @@ public bool TryModifyBleedAmount(EntityUid uid, float amount, BloodstreamCompone
         component.BleedAmount += amount;
         component.BleedAmount = Math.Clamp(component.BleedAmount, 0, component.MaxBleedAmount);
 
+        // WD EDIT START
+        if (HasComp<BloodLustComponent>(uid))
+        {
+            if (component.BleedAmount == 0f)
+                RemComp<BloodLustComponent>(uid);
+
+            _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
+        }
+        // WD EDIT END
+
         if (component.BleedAmount == 0)
             _alertsSystem.ClearAlert(uid, AlertType.Bleed);
         else
diff --git a/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbComponent.cs b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbComponent.cs
new file mode 100644
index 0000000000..96c71e336d
--- /dev/null
+++ b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbComponent.cs
@@ -0,0 +1,17 @@
+namespace Content.Server._White.Melee.BloodAbsorb;
+
+[RegisterComponent]
+public sealed partial class BloodAbsorbComponent : Component
+{
+    [DataField]
+    public bool BloodLust;
+
+    [DataField]
+    public int MinAbsorb = 1;
+
+    [DataField]
+    public int MaxAbsorb = 20;
+
+    [DataField]
+    public float AbsorbModifierOnHeavy = 0.7f;
+}
diff --git a/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs
new file mode 100644
index 0000000000..de274bfa84
--- /dev/null
+++ b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs
@@ -0,0 +1,71 @@
+using Content.Server._White.Melee.Crit;
+using Content.Server._White.Other.BloodLust;
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Server._White.Melee.BloodAbsorb;
+
+public sealed class BloodAbsorbSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<BloodAbsorbComponent, CritHitEvent>(OnCritHit);
+        SubscribeLocalEvent<BloodAbsorbComponent, MeleeHitEvent>(OnMeleeHit);
+    }
+
+    private void OnCritHit(EntityUid uid, BloodAbsorbComponent component, CritHitEvent args)
+    {
+        if(args.Targets.Count == 0
+           || args.Targets[0] == args.User)
+            return;
+
+        var absorbed = _random.Next(component.MinAbsorb, component.MaxAbsorb);
+
+        if (args.Targets.Count != 1) // Heavy attack
+            absorbed = (int) MathF.Round(absorbed * 0.7f);
+
+        foreach (var target in args.Targets)
+        {
+            if (!TryComp(target, out BloodstreamComponent? bloodstream))
+                continue;
+
+            var blood = bloodstream.BloodSolution;
+
+            if (blood == null)
+                continue;
+
+            var bloodLevel = blood.Value.Comp.Solution.Volume.Int();
+
+            if (!_bloodstream.TryModifyBloodLevel(target, -absorbed, bloodstream, false))
+                continue;
+
+            absorbed = Math.Min(absorbed, bloodLevel);
+            _bloodstream.TryModifyBloodLevel(args.User, absorbed);
+            _damageable.TryChangeDamage(args.User, new DamageSpecifier(_prototype.Index<DamageGroupPrototype>("Brute"), -absorbed));
+            _damageable.TryChangeDamage(args.User, new DamageSpecifier(_prototype.Index<DamageGroupPrototype>("Burn"), -absorbed));
+            _damageable.TryChangeDamage(args.User, new DamageSpecifier(_prototype.Index<DamageGroupPrototype>("Airloss"), -absorbed));
+        }
+    }
+
+    private void OnMeleeHit(EntityUid uid, BloodAbsorbComponent component, MeleeHitEvent args)
+    {
+        if (args.HitEntities.Count == 0
+            || args.HitEntities[0] != args.User
+            || !component.BloodLust
+            || !TryComp(args.User, out BloodstreamComponent? bloodstream))
+            return;
+
+        EnsureComp<BloodLustComponent>(args.User);
+        _bloodstream.TryModifyBleedAmount(args.User, bloodstream.MaxBleedAmount, bloodstream);
+    }
+}
diff --git a/Content.Server/_White/Melee/Crit/CritSystem.cs b/Content.Server/_White/Melee/Crit/CritSystem.cs
index 3ed0440d0f..816c625afc 100644
--- a/Content.Server/_White/Melee/Crit/CritSystem.cs
+++ b/Content.Server/_White/Melee/Crit/CritSystem.cs
@@ -20,7 +20,7 @@ public override void Initialize()
         SubscribeLocalEvent<CritComponent, MeleeHitEvent>(HandleHit, before: new [] {typeof(MeleeBlockSystem)});
     }
 
-    private void HandleHit(EntityUid uid, CritComponent component, MeleeHitEvent args)
+    private void HandleHit(EntityUid uid, CritComponent component, ref MeleeHitEvent args)
     {
         if (args.HitEntities.Count == 0 || !IsCriticalHit(component))
             return;
@@ -32,6 +32,8 @@ private void HandleHit(EntityUid uid, CritComponent component, MeleeHitEvent arg
 
         var message = Loc.GetString("melee-crit-damage", ("damage", damage));
         _popup.PopupEntity(message, args.User, args.User, PopupType.MediumCaution);
+
+        RaiseLocalEvent(uid, new CritHitEvent(args.User, args.HitEntities));
     }
 
     private bool IsCriticalHit(CritComponent component)
@@ -48,3 +50,16 @@ private bool IsCriticalHit(CritComponent component)
         return isCritical;
     }
 }
+
+public sealed class CritHitEvent(EntityUid user, IReadOnlyList<EntityUid> target)
+{
+    /// <summary>
+    ///     Entity who attacked with a critical attack
+    /// </summary>
+    public EntityUid User = user;
+
+    /// <summary>
+    ///     Entities who was attacked with a critical attack
+    /// </summary>
+    public IReadOnlyList<EntityUid> Targets = target;
+}
diff --git a/Content.Server/_White/Other/BloodLust/BloodLustComponent.cs b/Content.Server/_White/Other/BloodLust/BloodLustComponent.cs
new file mode 100644
index 0000000000..daf54999c2
--- /dev/null
+++ b/Content.Server/_White/Other/BloodLust/BloodLustComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server._White.Other.BloodLust;
+
+[RegisterComponent]
+public sealed partial class BloodLustComponent : Component
+{
+    [DataField]
+    public float SprintModifier = 1.3f;
+
+    [DataField]
+    public float WalkModifier = 1.3f;
+
+    [DataField]
+    public float AttackRateModifier = 1.5f;
+}
diff --git a/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs b/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs
new file mode 100644
index 0000000000..68dc2e4dab
--- /dev/null
+++ b/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs
@@ -0,0 +1,42 @@
+using Content.Server.Body.Components;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Weapons.Melee.Events;
+
+namespace Content.Server._White.Other.BloodLust;
+
+public sealed class BloodLustSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<BloodLustComponent, GetMeleeAttackRateEvent>(OnGetMeleeAttackRate);
+        SubscribeLocalEvent<BloodLustComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
+    }
+
+    private void OnGetMeleeAttackRate(EntityUid uid, BloodLustComponent component, GetMeleeAttackRateEvent args)
+    {
+        if (!TryComp(args.User, out BloodLustComponent? bloodLust))
+            return;
+
+        args.Multipliers *= GetBloodLustMultiplier(bloodLust.AttackRateModifier, GetBloodLustModifier(args.User));
+    }
+
+    private void OnRefreshMovementSpeedModifiers(EntityUid uid, BloodLustComponent component, RefreshMovementSpeedModifiersEvent args)
+    {
+        var modifier = GetBloodLustModifier(uid);
+        args.ModifySpeed(GetBloodLustMultiplier(component.WalkModifier, modifier),
+            GetBloodLustMultiplier(component.SprintModifier, modifier));
+    }
+
+    private float GetBloodLustModifier(EntityUid uid)
+    {
+        if (!TryComp(uid, out BloodstreamComponent? bloodstream) || bloodstream.MaxBleedAmount == 0f)
+            return 1f;
+
+        return Math.Clamp(bloodstream.BleedAmount / bloodstream.MaxBleedAmount, 0f, 1f);
+    }
+
+    private float GetBloodLustMultiplier(float multiplier, float modifier)
+    {
+        return float.Lerp(1f, multiplier, modifier);
+    }
+}
diff --git a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl
index 38e64879eb..4cf8b0cb10 100644
--- a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl
@@ -1,8 +1,8 @@
 uplink-emp-flashlight-name = Emp Flashlight
 uplink-emp-flashlight-desc = A rechargeable device disguised as a flashlight designed to disrupt electronic systems. Useful for disrupting communications, security's energy weapons, and APCs when you're in a tight spot.
 
-uplink-betrayal-knife-name = Betrayal dagger
-uplink-betrayal-knife-desc = The betrayal dagger allows the user to teleport a short distance, and also causes significant damage when stabbed in the back.
+uplink-betrayal-dagger-name = Betrayal dagger
+uplink-betrayal-dagger-desc = The betrayal dagger allows the user to teleport a short distance, and also causes significant damage when stabbed in the back.
 
 uplink-betrayal-knife-name = Experimental syndicate teleporter
 uplink-betrayal-knife-desc = Syndicate teleporter, when used, moves 3-8 meters forward. In case of teleportation into a wall, uses emergency teleportation. Has 4 charge.
@@ -18,3 +18,6 @@ uplink-implanter-desc = An advanced implant that allows you to quickly insert an
 
 uplink-smoke-implant-name = Smoke implant
 uplink-smoke-implant-desc = Releases a cloud of smoke when activated.
+
+uplink-blood-dagger-name = Blood dagger
+uplink-blood-dagger-desc = A dagger of pain and blood. It has deadly accuracy, allowing you to deal critical damage and extract blood from opponents, treating the owner in proportion to the sucked blood. When absorbing the owner's blood, it briefly enhances his valuable profuse bleeding.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/weapons/melee/daggers.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/weapons/melee/daggers.ftl
index 00ceb91748..0a23c4c341 100644
--- a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/weapons/melee/daggers.ftl
+++ b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/weapons/melee/daggers.ftl
@@ -1,2 +1,5 @@
-ent-BetrayalKnife = предательский кинжал
-    .desc = Береги спину.
\ No newline at end of file
+ent-BetrayalDagger = предательский кинжал
+    .desc = Береги спину.
+
+ent-BloodDagger = кровавый кинжал
+    .desc = Кинжал из боли и крови. С него что-то капает...
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl
index 0149d91986..4f310690d1 100644
--- a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl
@@ -1,8 +1,8 @@
 uplink-emp-flashlight-name = Электромагнитный фонарик
 uplink-emp-flashlight-desc = Замаскированное под фонарик устройство. При ударе выпускает ЭМИ, поражающий электрические устройства.
 
-uplink-betrayal-knife-name = Предательский кинжал
-uplink-betrayal-knife-desc = Предательский кинжал позволяет пользователю телепортироваться на короткое расстояние, а также наносит значительные повреждения при ударе в спину.
+uplink-betrayal-dagger-name = Предательский кинжал
+uplink-betrayal-dagger-desc = Предательский кинжал позволяет пользователю телепортироваться на короткое расстояние, а также наносит значительные повреждения при ударе в спину.
 
 uplink-experimental-syndicate-teleporter-name = Экспериментальный телепортер синдиката
 uplink-experimental-syndicate-teleporter-desc = Телепортер синдиката, при использовании перемещает на 3-8 метров вперед. В случае телепортации в стену, использует экстренную телепортацию. Имеет 4 заряда и автоматически заряжается.
@@ -18,3 +18,6 @@ uplink-implanter-desc = Продвинутый имплантер, позвол
 
 uplink-smoke-implant-name = Имплант дыма
 uplink-smoke-implant-desc = Выпускает облако дыма при активации.
+
+uplink-blood-dagger-name = Кровавый кинжал
+uplink-blood-dagger-desc = Кинжал из боли и крови. Обладает смертоносной точностью, позволяя наносить критический урон и извлекать кровь из противников, леча владельца пропорционально высосанной крови. При поглощении крови владельца кратковременно усиливает его ценной обильного кровотечения.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl
index 3b73e5e10f..3017fe6914 100644
--- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl
@@ -440,22 +440,4 @@ uplink-hypodart-name = Гиподротик
 uplink-hypodart-desc = Неприметный на первый взгляд дротик с увеличенным резервуаром для химических веществ. Он вмещает в себя до 7 ед. реагентов и мгновенно впрыскивает их при попадании в цель. Изначально пуст.
 
 uplink-helmet-name = Шлем спецназа
-uplink-helmet-desc = Чрезвычайно прочный шлем, обычно используемый военизированными формированиями. Он украшен гнусным рисунком в красную и черную полоску.
-
-uplink-ebow-name = Маленький энергетический арбалет
-uplink-ebow-desc = Довольно тихое оружие, которое автоматически перезаряжается и оглушает. Хорошо сочетается с другими видами оружия.
-
-uplink-blood-dagger-name = Кинжал жажды
-uplink-blood-dagger-desc = Критическая жажда: Кинжал Жажды обладает смертоносной точностью. Его владелец имеет 50% шанс нанести критический урон, поражая врага в его самые уязвимые места. При ударе по себе кинжал наделит пользователя временным усилением скорости атаки и передвижения ценой обильного кровотечения. Кровавый абсорб: При каждом успешном критическом ударе, кинжал извлекает кровь из цели, восстанавливая здоровье владельцу пропорционально количеству высосанной крови.
-
-uplink-night-vision-name = ПНВ [Хамелеон]
-uplink-night-vision-desc = Теперь ты видишь во тьме!
-
-uplink-thermal-vision-name = Оптический термальный сканер [Хамелеон]
-uplink-thermal-vision-desc = Позволяет вам видеть существ через стены.
-
-uplink-betrayal-knife-name = Предательский нож
-uplink-betrayal-knife-desc = Предательский нож позволяет пользователю телепортироваться на короткое расстояние, а также наносит значительные повреждения, пробивая броню противника, при ударе в спину.
-
-uplink-implanter-name = Имплантер
-uplink-implanter-desc = Продвинутый имплантер, позволяющий быстро вкалывать и вытаскивать импланты.
+uplink-helmet-desc = Чрезвычайно прочный шлем, обычно используемый военизированными формированиями. Он украшен гнусным рисунком в красную и черную полоску.
\ No newline at end of file
diff --git a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml
index fd6b69be96..6e2de54e17 100644
--- a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml
@@ -19,10 +19,10 @@
     - UplinkUtility
 
 - type: listing
-  id: UplinkBetrayalKnife
-  name: uplink-betrayal-knife-name
-  description: uplink-betrayal-knife-desc
-  productEntity: BetrayalKnife
+  id: UplinkBetrayalDagger
+  name: uplink-betrayal-dagger-name
+  description: uplink-betrayal-dagger-desc
+  productEntity: BetrayalDagger
   cost:
     Telecrystal: 10
   categories:
@@ -81,3 +81,19 @@
     Telecrystal: 2
   categories:
   - UplinkImplants
+
+- type: listing
+  id: UplinkBloodDagger
+  name: uplink-blood-dagger-name
+  description: uplink-blood-dagger-desc
+  productEntity: BloodDagger
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkWeapons
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
+  saleLimit: 1
diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/daggers.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/daggers.yml
index 86f111e2b5..ad34371b0a 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/daggers.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/daggers.yml
@@ -2,10 +2,10 @@
   name: betrayal dagger
   description: Watch your back.
   parent: BaseKnife
-  id: BetrayalKnife
+  id: BetrayalDagger
   components:
     - type: Sprite
-      sprite: _White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi
+      sprite: _White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi
       state: icon
     - type: Item
       size: Small
@@ -31,3 +31,36 @@
     - type: BackStab
     - type: Blink
       blinkRate: 0.33
+
+- type: entity
+  name: blood dagger
+  description: A dagger of pain and blood. Something is dripping from it...
+  parent: BaseKnife
+  id: BloodDagger
+  components:
+    - type: Sprite
+      sprite: _White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi
+      state: icon
+    - type: MeleeWeapon
+      wideAnimationRotation: 135
+      swingLeft: true
+      attackRate: 1.3
+      damage:
+        types:
+          Slash: 10.5
+      soundHit:
+        path: /Audio/Weapons/bladeslice.ogg
+    - type: Item
+      size: Normal
+    - type: Clothing
+      sprite: _White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi
+      slots:
+        - back
+    - type: DisarmMalus
+    - type: Crit
+      critChance: 0.5
+      critMultiplier: 2
+    - type: BloodAbsorb
+      bloodLust: true
+    - type: MeleeBlock
+      delay: 12.1
diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/icon.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/icon.png
similarity index 100%
rename from Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/icon.png
rename to Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/icon.png
diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/inhand-left.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/inhand-left.png
rename to Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/inhand-left.png
diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/inhand-right.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/inhand-right.png
rename to Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/inhand-right.png
diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/meta.json b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_knife.rsi/meta.json
rename to Resources/Textures/_White/Objects/Weapons/Melee/Daggers/betrayal_dagger.rsi/meta.json
diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/icon.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4612949044e0f0e169e3962b1785bd16b3b2862f
GIT binary patch
literal 916
zcmV;F18e+=P)<h;3K|Lk000e1NJLTq002M$003YJ1^@s6t;KZc00009a7bBm000ie
z000ie0hKEb8vp<UMoC0LRCt{2T)S!<F%-SA1B)S**%W5mK>omx-v6;(0&e^*X##dP
z|KUE6KQN>nQg}%f2wT|eIRkgOmPhlHbaz(wfbr}M-gA6(H4@T6?<sSb0hBq+0LmO@
zK-0~~^?LWQDBh70Qu2E%;Civx{n&2ROi0D=HQ;8sB-(7$Oi0Dw`VPp!gjNH7mL=V+
zR%#}s;O`s-j@^V_!{9NS&}zV!iWKB5;u04LM~4*rjRu?*#kceI`u6Yr{hMc(+ii3c
zFbBX~AO(M;0UwC&9*J&!f5akit<fby@^`)iWEs8@0Yo+;How;ZUpH_CLCCMgqMo@;
z5u(NKH9&R)_hsZ00mPWX#^mqp0_Rs(<hFuO1Q4nkxB+7Gw;F&l{9lzJu3bVF!Pim<
zMErhwnruW0{#FCf3jd0NxG%bdEQ0R?-#43@{Ll0A{@&Pbk%GUo3qS-F#T~|Fe0GI=
zF3VS646;wBr}ecf0>8%?!7s!Z{JmF%cyc29B!oN=?W71MU?JQZ__;Va8C(r@6%c)m
z#Xo3Cj8|!7H2@E*)y{1RDTMDq1h>u*)KwUXf7F_wYz-FDB!Y#o2#|*uB17_zUKEwB
z!9uEGt8pza#w;-u|KwF+&BfCY{I)DknZpdA%wYyl<}d>&bC>~?IV>OGdtmv1rR4+2
z@&RRO`G8|L!SVrZ53|h&q}-p^<{vc^w0r<rKH!y*82JESH?Vv_F8P2|{FV=B6L1Lm
z0N$Ec%Lf24_vf|wdj%x0KhNcuIv=ptP*q|K{$3RzO~7Z_8bIuPfHWaAfA5(fn}BOs
z4J;%@KA@=@r}7V)3QH5T@&Rr&N+Xix130n*Xf2-ZHB_U-l<ygAfc)pR5K_Y|_XW5c
zhA?852FQ2ORLs%<AXGP)tpTB622kcO11NKt0Zlh8A3&B5Aj=03Sw7&HcZC_24>$x7
zn*5dzXu4_nfDTwbfHKGjq}rd?=I_-7EFX|-K7h***BbeN6#ShPAhSZL^8tW-7i4>W
zfUE?y^8+;V0f74X0bB{#k<rKp00(h?fScA}Az7UtAk!LC_vgn#{rmvln`0xipniV9
qA>;+7!1e_wbBr<oL*d*@pYa0iB7*TJFLL7m0000<MNUMnLSTY<VVUp%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-left.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..e990972857fe0cccfa180c726ac52143c2f5992b
GIT binary patch
literal 982
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9F5M?jcysy3fA0|Rr1
zr;B4q#hkZueY<Wuh_KyvNHE*k$TvZnrDk@d>I7!VIaBi{8^2(vWzOGIbcd}`_rHhO
ztM9jdtui}&z@hg^(P^R2%l1opI5RvFXs}>W;A8B-$=tzq!Sw7$cQ1J{mVeRvqZ!uT
zyvTI0{{DL*hwM3jqW&Ib{_*)|<(9(-&3uyuPs{&%{%;Xu%Fpu;n&1ER_1dre_u}#Y
zC*pM)yenCp|CevxKd~-<*{^Qa4Yo3N+m^4t`|_7?;QyuekM71#{(tjlyiG$)+_dla
ztM~ud`tx)5`<=h;e767n^C<I<DeevbZ`q5<`!jJr{(JLrD2Ia#lR!Je5ygh7o6UcJ
zeN)WAxJKq3(*sTXenItYIAh6~^QV92hc#S#^CMNPOz6Y!U+?3Xq8_^je2izEFn#_W
zp1<BN(~g~C{`2qOY|#b(Ro{H^jyT|X;&9LGWj9@aF7Cg7`~L^M2R7ky1wx<Z8<wZ-
z)~N6A`k%*8+ZzAVs>EW3d8Mew@=%AX?<@bwuVXlTTkw4LqskeIOIJ6t<^Q+a|GVkW
z%!e`cn*X1$J4Qcy7yI{c=e(f0c`SAdzU}<CRDq!o>P@ZGoOSh@91DW>*tG}|iZ4_@
z>H+=uH~h7}oI`fb-MG#BGZ@wue#-tXe%JO+({{h(_V4tC4os<i?OpV;|HjVU%O1;r
z7Qbm*b86q$r4qmPrvJ&Z{%6?rM$Rtv{;!~zU&{CXn*Llq=YP_CMy34ftPjt{?TZdo
zWYySkL}>;;R&H?GbNatH!r5V`uKd?`V9;*e%`k%nPYOeIF^j@EZ=j=Zu0Qwx6W0Z)
z=-um2+P@aMAf<mO>W@CFz{dTy|2F-b9?tOo@7wk#3y=F=ezWM$#pC<8)PIX@xc={(
z^QZaN;D|UM^=C8FhdcNG$w4Dw|C68d_cHP1yW6bqe7>-K$~rdrJ%4}ydB^=Jz3ub=
z;=kRt99<D?Q~w@5Ie#ZG63#t|efIx2!Z-J(to-~xS>V9zO;_3jAc>Em@E>!H%D(+h
Tq0XMbjLP8Y>gTe~DWM4fS{lBY

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-right.png b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..e93b1a9810786eee6770cb189d922c5808c96a05
GIT binary patch
literal 958
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9F5M?jcysy3fA0|Rq`
zr;B4q#hkZu9P<`C2)Jf1nYd}DbV0+;gC0A3!;L5Lr<{x|oIR(J`3vu!#G@CcO%TeF
zI^DLe?f*Ts*&gz<+)JgFzFOXB!lA&&)X~iFNTI<37xSDs<E&M$>e@dXew}pU{QUZ0
z#;ncn5}s}2c=G)0{@tusjyVUM{IBMqW51E7wk_fK_U-SkY>O0c{PX9hxoE-;j@SB!
zWW*M7J-lBXI(P4<z3=VI|2@%MP|xvfBgg(Tc2b)+hyQEv`WMT{#?4<SpA~)DcMa3R
z^-QaNT3)Z;#MINTZ2A321Z&lAdz;VtAKw<A>UZHReq#Se@x)>tt>^LaO*}tqIOin%
zVfe-c_eX$+_~!kV|M(mmoKAjq*MN%?_9`$eCWkh({rmsu(`L?q*`?1oet!SFnIk~D
zJ3i~*E2bm!w%vFju{+lGl>E<^e?nP19@fvvuR9@c9{udx_kI6Y{<+HXL+af@3;Xi*
z@tNQ4k7h9)$-5T(fAh=l^8CN|KdavJSM}-gYxRYU$7<i~l&{PD`SIcNHFn=W1@GU#
zgF*cnhsacWb@_Ov@MT{tnc=Z<;M~mF#tjVC?ZFHxjtqqY4l*nP?2JbUG9zOe+T{ND
zKGoN9$la2duUl`(n3eo-`;7e^4DMAQ%xC}K#NeLBP_pzqgU827U}p3T#tDy98D}tF
z$V*~#=vvNVVZ@veY|Id3qk5oI?$4r6@e}*?8@U61@id4aoX0m~Hsb^)#xjQG3>8wu
zISuUgIi8GCzuu^Rnk>4&>@{CnUbn-)Uq3fTJLKB5*gp5?5;*Oz<2+yS&X+|`8~)h*
zJjrDc)ACh3k*`}|w%q;Iuii|3U;E$kle`sc%<uEEVv7HE7bll}J0*Xk_}?0a=GOKd
z{9D&PRSRpp5YBk@&(`bz7jiwQl-Xrw+w$OAtu#0#rJQ{zT*GmTA$!|=<paz)JO9`7
u!Cjxgyywz?dv>NA20z9PQeeM+mOs6F-~RSUyUoB1$>8bg=d#Wzp$P!#)Qvy@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/meta.json b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/meta.json
new file mode 100644
index 0000000000..e5caaafc3d
--- /dev/null
+++ b/Resources/Textures/_White/Objects/Weapons/Melee/Daggers/blood_dagger.rsi/meta.json
@@ -0,0 +1,84 @@
+{
+  "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.5
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.8,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.8,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.8,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.8,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.8,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.8,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.8,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.8,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file

From 8b3b0ec85d720dda93d9edf265943ff225c866e0 Mon Sep 17 00:00:00 2001
From: WWDP Changelogs <riddleridou@users.noreply.github.com>
Date: Wed, 16 Oct 2024 01:58:25 +0000
Subject: [PATCH 4/6] Automatic Changelog Update (#86)

---
 Resources/Changelog/Changelog.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 2370c386b7..b3adcad342 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6546,3 +6546,10 @@ Entries:
   id: 6366
   time: '2024-10-16T01:46:51.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/87
+- author: Spatison
+  changes:
+    - type: Add
+      message: Added blood dagger/ Добавлен кровавый кинжал
+  id: 6367
+  time: '2024-10-16T01:57:56.0000000+00:00'
+  url: https://github.com/WWhiteDreamProject/wwdpublic/pull/86

From a6e57158c91ebf5479bbc2c9da9217ad70f15a75 Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:13:34 +1000
Subject: [PATCH 5/6] =?UTF-8?q?[Port]=20MindSlave=20Implant=20/=20=D0=98?=
 =?UTF-8?q?=D0=BC=D0=BF=D0=BB=D0=B0=D0=BD=D1=82=20=D0=9F=D0=BE=D0=B4=D1=87?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20(#85)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add: mindslave implant

* fix

* fix

---------

Co-authored-by: Remuchi <72476615+Remuchi@users.noreply.github.com>
---
 .../MindSlave/MindSlaveIconsSystem.cs         |  60 +++++++
 Content.Server/Implants/ImplanterSystem.cs    |  12 +-
 .../_White/Implants/ImplantsSystem.cs         | 152 ++++++++++++++++--
 .../Implants/SharedImplanterSystem.cs         |  42 +++--
 .../Implants/MindSlave/MindSlaveComponent.cs  |  21 +++
 .../en-US/_white/mindslave/mindslave.ftl      |  11 ++
 .../en-US/_white/store/uplink-catalog.ftl     |   5 +-
 .../ru-RU/_white/implants/mindslave.ftl       |  16 --
 .../ru-RU/_white/mindslave/mindslave.ftl      |  11 ++
 .../entities/objects/misc/implanters.ftl      |   5 +
 .../objects/misc/subdermal_implants.ftl       |   3 +
 .../ru-RU/_white/store/uplink-catalog.ftl     |   5 +-
 .../_White/Catalog/uplink_catalog.yml         |  11 ++
 .../Entities/Objects/Misc/implanters.yml      |   8 +
 .../Objects/Misc/subdermal_implants.yml       |  12 ++
 .../_White/StatusIcon/mindslave.yml           |  17 ++
 Resources/Prototypes/_White/tags.yml          |   5 +-
 .../Textures/Effects/ssd.rsi/default0.png     | Bin 200 -> 524 bytes
 Resources/Textures/Effects/ssd.rsi/meta.json  |   6 +-
 .../_White/Overlays/mindslave.rsi/master.png  | Bin 0 -> 682 bytes
 .../_White/Overlays/mindslave.rsi/meta.json   |  17 ++
 .../_White/Overlays/mindslave.rsi/slave.png   | Bin 0 -> 646 bytes
 22 files changed, 365 insertions(+), 54 deletions(-)
 create mode 100644 Content.Client/_White/Overlays/MindSlave/MindSlaveIconsSystem.cs
 create mode 100644 Content.Shared/_White/Implants/MindSlave/MindSlaveComponent.cs
 create mode 100644 Resources/Locale/en-US/_white/mindslave/mindslave.ftl
 delete mode 100644 Resources/Locale/ru-RU/_white/implants/mindslave.ftl
 create mode 100644 Resources/Locale/ru-RU/_white/mindslave/mindslave.ftl
 create mode 100644 Resources/Prototypes/_White/StatusIcon/mindslave.yml
 create mode 100644 Resources/Textures/_White/Overlays/mindslave.rsi/master.png
 create mode 100644 Resources/Textures/_White/Overlays/mindslave.rsi/meta.json
 create mode 100644 Resources/Textures/_White/Overlays/mindslave.rsi/slave.png

diff --git a/Content.Client/_White/Overlays/MindSlave/MindSlaveIconsSystem.cs b/Content.Client/_White/Overlays/MindSlave/MindSlaveIconsSystem.cs
new file mode 100644
index 0000000000..ff481bd617
--- /dev/null
+++ b/Content.Client/_White/Overlays/MindSlave/MindSlaveIconsSystem.cs
@@ -0,0 +1,60 @@
+using Content.Client.Overlays;
+using Content.Shared._White.Implants.MindSlave;
+using Content.Shared.StatusIcon;
+using Content.Shared.StatusIcon.Components;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._White.Overlays.MindSlave;
+
+public sealed class MindSlaveIconsSystem : EquipmentHudSystem<MindSlaveComponent>
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MindSlaveComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent);
+    }
+
+    private void OnGetStatusIconsEvent(
+        EntityUid uid,
+        MindSlaveComponent mindSlaveComponent,
+        ref GetStatusIconsEvent args)
+    {
+        if (!IsActive
+            || args.InContainer
+            || !TryComp(_player.LocalEntity, out MindSlaveComponent? ownerMindSlave))
+            return;
+
+        var mindSlaveIcon = MindSlaveIcon(uid, ownerMindSlave);
+        args.StatusIcons.AddRange(mindSlaveIcon);
+    }
+
+    private IEnumerable<StatusIconPrototype> MindSlaveIcon(EntityUid uid, MindSlaveComponent mindSlave)
+    {
+        var result = new List<StatusIconPrototype>();
+        string iconType;
+        var netUid = GetNetEntity(uid);
+
+        if (mindSlave.Master == netUid)
+        {
+            iconType = mindSlave.MasterStatusIcon;
+        }
+        else if (mindSlave.Slaves.Contains(netUid))
+        {
+            iconType = mindSlave.SlaveStatusIcon;
+        }
+        else
+        {
+            return result;
+        }
+
+        if (_prototype.TryIndex<StatusIconPrototype>(iconType, out var mindslaveIcon))
+            result.Add(mindslaveIcon);
+
+        return result;
+    }
+}
diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs
index 3cfa3a9f5f..754c9a7374 100644
--- a/Content.Server/Implants/ImplanterSystem.cs
+++ b/Content.Server/Implants/ImplanterSystem.cs
@@ -43,16 +43,20 @@ private void OnImplanterAfterInteract(EntityUid uid, ImplanterComponent componen
         }
         else
         {
-            if (!CanImplant(args.User, target, uid, component, out var implant, out _))
+            if (!CanImplant(args.User, target, uid, component, out var implant, out _, out var popup)) // WD EDIT
             {
                 // no popup if implant doesn't exist
                 if (implant == null)
                     return;
 
                 // show popup to the user saying implant failed
-                var name = Identity.Name(target, EntityManager, args.User);
-                var msg = Loc.GetString("implanter-component-implant-failed", ("implant", implant), ("target", name));
-                _popup.PopupEntity(msg, target, args.User);
+                if (popup) // WD EDIT
+                {
+                    var name = Identity.Name(target, EntityManager, args.User);
+                    var msg = Loc.GetString("implanter-component-implant-failed", ("implant", implant),
+                        ("target", name));
+                    _popup.PopupEntity(msg, target, args.User);
+                }
                 // prevent further interaction since popup was shown
                 args.Handled = true;
                 return;
diff --git a/Content.Server/_White/Implants/ImplantsSystem.cs b/Content.Server/_White/Implants/ImplantsSystem.cs
index 81123097c4..ed0ffc10c5 100644
--- a/Content.Server/_White/Implants/ImplantsSystem.cs
+++ b/Content.Server/_White/Implants/ImplantsSystem.cs
@@ -1,8 +1,12 @@
 using Content.Server.Administration.Logs;
+using Content.Server.Chat.Managers;
 using Content.Server.Mind;
 using Content.Server.Popups;
 using Content.Server.Roles;
+using Content.Server.Roles.Jobs;
+using Content.Shared._White.Implants.MindSlave;
 using Content.Shared._White.Implants.NeuroStabilization;
+using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Implants;
 using Content.Shared.Implants.Components;
@@ -14,11 +18,13 @@ namespace Content.Server._White.Implants;
 
 public sealed class ImplantsSystem : EntitySystem
 {
-    [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
-    [Dependency] private readonly RoleSystem _roleSystem = default!;
-    [Dependency] private readonly MindSystem _mindSystem = default!;
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
+    [Dependency] private readonly RoleSystem _role = default!;
+    [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly TagSystem _tag = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly IChatManager _chat = default!;
+    [Dependency] private readonly JobSystem _job = default!;
 
     [ValidatePrototypeId<TagPrototype>]
     private const string MindShieldTag = "MindShield";
@@ -26,21 +32,28 @@ public sealed class ImplantsSystem : EntitySystem
     [ValidatePrototypeId<TagPrototype>]
     private const string NeuroStabilizationTag = "NeuroStabilization";
 
+    [ValidatePrototypeId<TagPrototype>]
+    private const string MindSlaveTag = "MindSlave";
+
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<SubdermalImplantComponent, SubdermalImplantInserted>(OnImplantInserted);
         SubscribeLocalEvent<SubdermalImplantComponent, SubdermalImplantRemoved>(OnImplantRemoved);
+        SubscribeLocalEvent<SubdermalImplantComponent, AttemptSubdermalImplantInserted>(AttemptImplantInserted);
     }
 
     private void OnImplantInserted(EntityUid uid, SubdermalImplantComponent component, SubdermalImplantInserted args)
     {
         if (_tag.HasTag(uid, MindShieldTag)
-            && RevolutionCheck(uid, args.Target))
+            && MindShieldCheck(uid, args.Target))
             EnsureComp<MindShieldComponent>(args.Target);
 
         if (_tag.HasTag(uid, NeuroStabilizationTag))
             EnsureComp<NeuroStabilizationComponent>(args.Target);
+
+        if (_tag.HasTag(uid, MindSlaveTag))
+            MindSlaveInserted(args.User, args.Target);
     }
 
     private void OnImplantRemoved(EntityUid uid, SubdermalImplantComponent component, SubdermalImplantRemoved args)
@@ -50,27 +63,144 @@ private void OnImplantRemoved(EntityUid uid, SubdermalImplantComponent component
 
         if (_tag.HasTag(uid, NeuroStabilizationTag))
             RemComp<NeuroStabilizationComponent>(args.Target);
+
+        if (_tag.HasTag(uid, MindSlaveTag))
+            MindSlaveRemoved(args.User, args.Target);
     }
 
+    private void AttemptImplantInserted(EntityUid uid, SubdermalImplantComponent component, ref AttemptSubdermalImplantInserted args)
+    {
+        if (_tag.HasTag(uid, MindSlaveTag)
+            && !MindSlaveCheck(args.User, args.Target))
+        {
+            args.Popup = false;
+            args.Cancel();
+        }
+    }
+
+    #region MindShield
+
     /// <summary>
     /// Checks if the implanted person was a Rev or Head Rev and remove role or destroy mindshield respectively.
     /// </summary>
-    private bool RevolutionCheck(EntityUid uid, EntityUid target)
+    private bool MindShieldCheck(EntityUid uid, EntityUid target)
     {
-        if (HasComp<HeadRevolutionaryComponent>(target))
+        if (HasComp<HeadRevolutionaryComponent>(target)
+            || (TryComp<MindSlaveComponent>(target, out var mindSlave)
+                && mindSlave.Master.HasValue))
         {
-            _popupSystem.PopupEntity(Loc.GetString("head-rev-break-mindshield"), target);
+            _popup.PopupEntity(Loc.GetString("head-rev-break-mindshield"), target);
             QueueDel(uid);
             return false;
         }
 
-        if (_mindSystem.TryGetMind(target, out var mindId, out _)
-            && _roleSystem.MindTryRemoveRole<RevolutionaryRoleComponent>(mindId))
+        if (_mind.TryGetMind(target, out var mindId, out _)
+            && _role.MindTryRemoveRole<RevolutionaryRoleComponent>(mindId))
         {
-            _adminLogManager.Add(LogType.Mind, LogImpact.Medium,
+            _adminLog.Add(LogType.Mind, LogImpact.Medium,
             $"{ToPrettyString(target)} was deconverted due to being implanted with a Mindshield.");
         }
 
         return true;
     }
+
+    #endregion
+
+    #region MindSlave
+
+    private void MindSlaveInserted(EntityUid user, EntityUid target)
+    {
+        var slaveComponent = EnsureComp<MindSlaveComponent>(target);
+        slaveComponent.Master = GetNetEntity(user);
+
+        var masterComponent = EnsureComp<MindSlaveComponent>(user);
+        masterComponent.Slaves.Add(GetNetEntity(target));
+
+        Dirty(user, masterComponent);
+        Dirty(target, slaveComponent);
+
+        if (!_mind.TryGetMind(target, out var targetMindId, out var targetMind)
+            || targetMind.Session is null)
+            return;
+
+        var jobName = _job.MindTryGetJobName(user);
+
+        // send message to chat
+        var message = Loc.GetString("mindslave-chat-message", ("player", user), ("role", jobName));
+        var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message));
+        _chat.ChatMessageToOne(ChatChannel.Server, message, wrappedMessage, default, false,
+            targetMind.Session.Channel, Color.FromHex("#5e9cff"));
+
+        // add briefing in character menu
+        if (TryComp<RoleBriefingComponent>(targetMindId, out var roleBriefing))
+        {
+            roleBriefing.Briefing += Loc.GetString("mindslave-briefing", ("player", user), ("role", jobName));
+            Dirty(targetMindId, roleBriefing);
+        }
+        else
+        {
+            _role.MindAddRole(targetMindId, new RoleBriefingComponent
+            {
+                Briefing = Loc.GetString("mindslave-briefing", ("player", user), ("role", jobName))
+            }, targetMind);
+        }
+
+        _adminLog.Add(LogType.Mind, LogImpact.High,
+            $"{ToPrettyString(user)} MindSlaved {ToPrettyString(target)}");
+    }
+
+    private void MindSlaveRemoved(EntityUid user, EntityUid target)
+    {
+        if (!TryComp(target, out MindSlaveComponent? mindslave)
+            || !mindslave.Master.HasValue)
+            return;
+
+        var master = GetEntity(mindslave.Master.Value);
+        if (_mind.TryGetMind(target, out var mindId, out _))
+        {
+            _role.MindTryRemoveRole<RoleBriefingComponent>(mindId);
+            _popup.PopupEntity(Loc.GetString("mindslave-freed", ("player", master)), target, target);
+        }
+
+        if (TryComp(master, out MindSlaveComponent? masterMindslave))
+        {
+            masterMindslave.Slaves.Remove(GetNetEntity(target));
+            if (masterMindslave.Slaves.Count == 0)
+                RemComp<MindSlaveComponent>(master);
+        }
+
+        RemComp<MindSlaveComponent>(target);
+
+        _adminLog.Add(LogType.Mind, LogImpact.High,
+            $"{ToPrettyString(user)} UnMindSlaved {ToPrettyString(target)}");
+    }
+
+    /// <summary>
+    /// Checks if the target can be an MindSlaved
+    /// </summary>
+    private bool MindSlaveCheck(EntityUid user, EntityUid target)
+    {
+        string message;
+        if (target == user)
+        {
+            message = Loc.GetString("mindslave-target-self");
+        }
+        else if (HasComp<MindShieldComponent>(target)
+                 || HasComp<RevolutionaryComponent>(target)
+                 || !_mind.TryGetMind(target, out _, out _)
+                 || (TryComp<MindSlaveComponent>(target, out var mindSlave)
+                     && mindSlave.Master.HasValue))
+        {
+            message = Loc.GetString("mindslave-cant-insert");
+        }
+        else
+        {
+            return true;
+        }
+
+        _popup.PopupEntity(message, target, user);
+        return false;
+    }
+
+    #endregion
 }
diff --git a/Content.Shared/Implants/SharedImplanterSystem.cs b/Content.Shared/Implants/SharedImplanterSystem.cs
index dce599ef15..545aa17314 100644
--- a/Content.Shared/Implants/SharedImplanterSystem.cs
+++ b/Content.Shared/Implants/SharedImplanterSystem.cs
@@ -56,7 +56,7 @@ private void OnExamine(EntityUid uid, ImplanterComponent component, ExaminedEven
     //Set to draw mode if not implant only
     public void Implant(EntityUid user, EntityUid target, EntityUid implanter, ImplanterComponent component)
     {
-        if (!CanImplant(user, target, implanter, component, out var implant, out var implantComp))
+        if (!CanImplant(user, target, implanter, component, out var implant, out var implantComp, out _))
             return;
 
         //If the target doesn't have the implanted component, add it.
@@ -88,9 +88,11 @@ public bool CanImplant(
         EntityUid implanter,
         ImplanterComponent component,
         [NotNullWhen(true)] out EntityUid? implant,
-        [NotNullWhen(true)] out SubdermalImplantComponent? implantComp)
+        [NotNullWhen(true)] out SubdermalImplantComponent? implantComp,
+        out bool popup) // WD EDIT
     {
         implant = component.ImplanterSlot.ContainerSlot?.ContainedEntities.FirstOrNull();
+        popup = true; // WD EDIF
         if (!TryComp(implant, out implantComp))
             return false;
 
@@ -100,8 +102,12 @@ public bool CanImplant(
             return false;
         }
 
-        var ev = new AddImplantAttemptEvent(user, target, implant.Value, implanter);
-        RaiseLocalEvent(target, ev);
+        // WD EDIT START
+        var ev = new AttemptSubdermalImplantInserted(user, target);
+        RaiseLocalEvent(implant.Value, ev);
+
+        popup = ev.Popup;
+        // WD EDIT END
         return !ev.Cancelled;
     }
 
@@ -214,23 +220,25 @@ public sealed partial class DrawEvent : SimpleDoAfterEvent
 {
 }
 
-public sealed class AddImplantAttemptEvent : CancellableEntityEventArgs
+// WD EDIT START
+public sealed class AttemptSubdermalImplantInserted(EntityUid user, EntityUid target, bool popup = true) : CancellableEntityEventArgs
 {
-    public readonly EntityUid User;
-    public readonly EntityUid Target;
-    public readonly EntityUid Implant;
-    public readonly EntityUid Implanter;
+    /// <summary>
+    ///     Entity who implants
+    /// </summary>
+    public EntityUid User = user;
 
-    public AddImplantAttemptEvent(EntityUid user, EntityUid target, EntityUid implant, EntityUid implanter)
-    {
-        User = user;
-        Target = target;
-        Implant = implant;
-        Implanter = implanter;
-    }
+    /// <summary>
+    ///     Entity being implanted
+    /// </summary>
+    public EntityUid Target = target;
+
+    /// <summary>
+    ///     Popup if implanted failed
+    /// </summary>
+    public bool Popup = popup;
 }
 
-// WD EDIT START
 public sealed class SubdermalImplantInserted(EntityUid user, EntityUid target)
 {
     /// <summary>
diff --git a/Content.Shared/_White/Implants/MindSlave/MindSlaveComponent.cs b/Content.Shared/_White/Implants/MindSlave/MindSlaveComponent.cs
new file mode 100644
index 0000000000..d2c75ecc42
--- /dev/null
+++ b/Content.Shared/_White/Implants/MindSlave/MindSlaveComponent.cs
@@ -0,0 +1,21 @@
+using Content.Shared.StatusIcon;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared._White.Implants.MindSlave;
+
+[RegisterComponent, AutoGenerateComponentState, NetworkedComponent]
+public sealed partial class MindSlaveComponent : Component
+{
+    [ViewVariables(VVAccess.ReadOnly), AutoNetworkedField]
+    public List<NetEntity> Slaves = [];
+
+    [ViewVariables(VVAccess.ReadOnly), AutoNetworkedField]
+    public NetEntity? Master;
+
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<StatusIconPrototype>))]
+    public string SlaveStatusIcon = "SlaveMindSlaveIcon";
+
+    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<StatusIconPrototype>))]
+    public string MasterStatusIcon = "MasterMindSlaveIcon";
+}
diff --git a/Resources/Locale/en-US/_white/mindslave/mindslave.ftl b/Resources/Locale/en-US/_white/mindslave/mindslave.ftl
new file mode 100644
index 0000000000..56ef3a3d8e
--- /dev/null
+++ b/Resources/Locale/en-US/_white/mindslave/mindslave.ftl
@@ -0,0 +1,11 @@
+mindslave-briefing = Serve and protect {$player}, {$role}. Follow
+    { GENDER($player) ->
+        [male] his every order. He is
+        [female] her every order. She is
+       *[other] their every order. they are
+    } absolute power to you.
+mindslave-chat-message = Fragments of your memories fly in front of your eyes in an instant, after which a white veil covers your consciousness. In a flash of bright red light, you remember your purpose - to serve {$player}, {$role}.
+mindslave-freed = You no longer serve {$player}!
+
+mindslave-target-self = You can't make yourself your own slave.
+mindslave-cant-insert = The mind of this creature is already fixated on something
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl
index 4cf8b0cb10..c03e0d33fb 100644
--- a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl
@@ -19,5 +19,8 @@ uplink-implanter-desc = An advanced implant that allows you to quickly insert an
 uplink-smoke-implant-name = Smoke implant
 uplink-smoke-implant-desc = Releases a cloud of smoke when activated.
 
+uplink-mind-slave = Mindslave implant
+uplink-mind-slave-desc = Capture the mind of a living being and order him to throw explosive pies at the captain.
+
 uplink-blood-dagger-name = Blood dagger
-uplink-blood-dagger-desc = A dagger of pain and blood. It has deadly accuracy, allowing you to deal critical damage and extract blood from opponents, treating the owner in proportion to the sucked blood. When absorbing the owner's blood, it briefly enhances his valuable profuse bleeding.
\ No newline at end of file
+uplink-blood-dagger-desc = A dagger of pain and blood. It has deadly accuracy, allowing you to deal critical damage and extract blood from opponents, treating the owner in proportion to the sucked blood. When absorbing the owner's blood, it briefly enhances his valuable profuse bleeding.
diff --git a/Resources/Locale/ru-RU/_white/implants/mindslave.ftl b/Resources/Locale/ru-RU/_white/implants/mindslave.ftl
deleted file mode 100644
index 8d98357654..0000000000
--- a/Resources/Locale/ru-RU/_white/implants/mindslave.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-mindslave-briefing = Служите и защищайте {$player}, {$role}. Выполняйте каждый их приказ. Они для вас - абсолютная власть.
-mindslave-chat-message = Перед вашим глазами в мгновение пролетают осколки ваших воспоминаний, после чего сознание застилает белая пелена. Во вспышке ярко-красного света вы вспоминаете свое предназначение - служить {$player}, {$role}.
-mindslave-freed = Вы больше не служите {$player}!
-
-mindslave-target-self = Вы не можете сделать себя своим же рабом
-mindslave-cant-insert = Разум данного существа уже на чем-то зациклен
-
-uplink-mind-slave = Имплант подчинения
-uplink-mind-slave-desc = Захватите разум живого существа и прикажите ему закидать капитана взрывными пирогами.
-
-ent-MindSlaveImplanter = { ent-BaseImplanter }
-    .desc = { "" }
-    .suffix = майдслейв
-
-ent-MindslaveImplant = Имплант подчинения
-    .desc = Сделайте из кого-то свою личную куклу.
diff --git a/Resources/Locale/ru-RU/_white/mindslave/mindslave.ftl b/Resources/Locale/ru-RU/_white/mindslave/mindslave.ftl
new file mode 100644
index 0000000000..8b9c38c107
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/mindslave/mindslave.ftl
@@ -0,0 +1,11 @@
+mindslave-briefing = Служите и защищайте {$player}, {$role}. Выполняйте каждый 
+    { GENDER($player) ->
+        [male] его приказ. Он
+        [female] её приказ. Она
+       *[other] их приказ. Они
+    } для вас - абсолютная власть.
+mindslave-chat-message = Перед вашим глазами в мгновение пролетают осколки ваших воспоминаний, после чего сознание застилает белая пелена. Во вспышке ярко-красного света вы вспоминаете свое предназначение - служить {$player}, {$role}.
+mindslave-freed = Вы больше не служите {$player}!
+
+mindslave-target-self = Вы не можете сделать себя своим же рабом
+mindslave-cant-insert = Разум данного существа уже на чем-то зациклен
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl
index 788abf0a8a..dabe2096c6 100644
--- a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl
+++ b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl
@@ -7,3 +7,8 @@ ent-ImplanterSyndi = { ent-BaseImplanter }
 
 ent-SmokeImplanter = { ent-BaseImplanter }
     .desc = { ent-BaseImplanter.desc }
+    .suffix = дым
+
+ent-MindSlaveImplanter = { ent-BaseImplanter }
+    .desc = { ent-BaseImplanter.desc }
+    .suffix = подчинение
diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl
index 02d7d7bdf4..816c25dafd 100644
--- a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl
+++ b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl
@@ -3,3 +3,6 @@ ent-NeuroStabilizationImplant = имплант нейро стабализаци
 
 ent-SmokeImplant = имплант дыма
     .desc = Этот имплант выпускает облако дыма при активации.
+
+ent-MindSlaveImplant = имплант подчинения
+    .desc = Сделайте из кого-то свою личную куклу.
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl
index 4f310690d1..d0708e7444 100644
--- a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl
@@ -19,5 +19,8 @@ uplink-implanter-desc = Продвинутый имплантер, позвол
 uplink-smoke-implant-name = Имплант дыма
 uplink-smoke-implant-desc = Выпускает облако дыма при активации.
 
+uplink-mind-slave = Имплант подчинения
+uplink-mind-slave-desc = Захватите разум живого существа и прикажите ему закидать капитана взрывными пирогами.
+
 uplink-blood-dagger-name = Кровавый кинжал
-uplink-blood-dagger-desc = Кинжал из боли и крови. Обладает смертоносной точностью, позволяя наносить критический урон и извлекать кровь из противников, леча владельца пропорционально высосанной крови. При поглощении крови владельца кратковременно усиливает его ценной обильного кровотечения.
\ No newline at end of file
+uplink-blood-dagger-desc = Кинжал из боли и крови. Обладает смертоносной точностью, позволяя наносить критический урон и извлекать кровь из противников, леча владельца пропорционально высосанной крови. При поглощении крови владельца кратковременно усиливает его ценной обильного кровотечения.
diff --git a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml
index 6e2de54e17..f57bfbb65d 100644
--- a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml
@@ -82,6 +82,17 @@
   categories:
   - UplinkImplants
 
+- type: listing
+  id: UplinkMindSlaveImplanter
+  name: uplink-mind-slave
+  description: uplink-mind-slave-desc
+  icon: { sprite: /Textures/_White/Overlays/mindslave.rsi, state: master }
+  productEntity: MindSlaveImplanter
+  cost:
+    Telecrystal: 6
+  categories:
+  - UplinkImplants
+
 - type: listing
   id: UplinkBloodDagger
   name: uplink-blood-dagger-name
diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml
index 43d1bbd593..a66b420ac9 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml
@@ -26,3 +26,11 @@
   components:
   - type: Implanter
     implant: SmokeImplant
+
+- type: entity
+  parent: BaseImplantOnlyImplanterSyndi
+  id: MindSlaveImplanter
+  suffix: mindslave
+  components:
+  - type: Implanter
+    implant: MindSlaveImplant
diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml
index 1a727e98ad..f3ecd5229b 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml
@@ -25,3 +25,15 @@
       duration: 15
     - type: SoundOnTrigger
       sound: /Audio/Effects/smoke.ogg
+
+- type: entity
+  parent: BaseSubdermalImplant
+  id: MindSlaveImplant
+  name: mindslave implant
+  description: Make someone a proper doll for your use.
+  noSpawn: true
+  components:
+  - type: SubdermalImplant
+  - type: Tag
+    tags:
+    - MindSlave
\ No newline at end of file
diff --git a/Resources/Prototypes/_White/StatusIcon/mindslave.yml b/Resources/Prototypes/_White/StatusIcon/mindslave.yml
new file mode 100644
index 0000000000..aee851fc18
--- /dev/null
+++ b/Resources/Prototypes/_White/StatusIcon/mindslave.yml
@@ -0,0 +1,17 @@
+- type: statusIcon
+  id: MasterMindSlaveIcon
+  priority: 3
+  locationPreference: Left
+  isShaded: true
+  icon:
+    sprite: /Textures/_White/Overlays/mindslave.rsi
+    state: master
+
+- type: statusIcon
+  id: SlaveMindSlaveIcon
+  priority: 3
+  locationPreference: Left
+  isShaded: true
+  icon:
+    sprite: /Textures/_White/Overlays/mindslave.rsi
+    state: slave
diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml
index fe2392f438..ca84c8038b 100644
--- a/Resources/Prototypes/_White/tags.yml
+++ b/Resources/Prototypes/_White/tags.yml
@@ -2,4 +2,7 @@
   id: EnergySword
 
 - type: Tag
-  id: NeuroStabilization
\ No newline at end of file
+  id: NeuroStabilization
+
+- type: Tag
+  id: MindSlave
\ No newline at end of file
diff --git a/Resources/Textures/Effects/ssd.rsi/default0.png b/Resources/Textures/Effects/ssd.rsi/default0.png
index bfd8c84da99a874861d8ef47b8c7f4891adf1901..962a7298cf390486a7cce55807e8f7f37876500c 100644
GIT binary patch
literal 524
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq000O8000OG1^@s6#1FoU0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ?()$2ZM+>1gS3CMMWG-6^me@v=v%)FuC+YXws0h
zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi<J1kq|hS9gX4a@yZ5+z2MF~N)2xmNpy?Ge
z8H-Ap?1~h4MHfU2U>qYdvy6CZAq~&*bq^n3@4`IG``n+SSIt=r@JYlGW|$S?b>f-L
ziotoGSY$<6B|ayfFzJHCk6c$=e&bwlSm2qWnNH3Ti^Ni)jg>ZLMN=c5CJw2ZPWeK{
zWtH<5XRTCa&3p0}26Osyit99o5yK+lNI-&uDmG9;1z}osQY<8CKkDHha{LK$DdgG!
zBgZ_-&>%a0@IUz7t(Bjebd!Qnp!3DHKSqJTF3_mi_V=-EH%<WmGjOH1{N*|@`$>AO
zrG<`wzHQ**x}_<5z~v4w_+-eY>_~o^LOu_?pV2pEf&N>dXVvYkxsTHaAWdB@-2exN
zz*vE@*F4_c-QL^3XPW)}0QMVl+o@b*<NyEwLP<nHR2Y?Qj=2p0Fbo2Z$U|lS%3C>A
z>^!DBKmq|yP!a%h<49Aq65s$tU$QTJ<}4w~JlQVuEQ>bs_seLnM@=j)VGN}B{OCvk
O0000<MNUMnLSTX;SLkj4

literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C|Kp`
z;uumf=j|0kt_BAI<^vpdul~i~UGFDw<;~8F$H&xGvUKx!mmEEx=-_|PT$MrM%N~bG
z92Q>sCu*ji*FV&-O}tMesBGd6M!n}jZ6ZublGDZCDc)yD?mBLf-*DNVMd9WF+a~{y
ooB{uYtC&5K8W`Cm5}<^1V+en<hhWEjpeq<WUHx3vIVCg!0H6gy%>V!Z

diff --git a/Resources/Textures/Effects/ssd.rsi/meta.json b/Resources/Textures/Effects/ssd.rsi/meta.json
index 6c5e7b24e3..6e9db0d8de 100644
--- a/Resources/Textures/Effects/ssd.rsi/meta.json
+++ b/Resources/Textures/Effects/ssd.rsi/meta.json
@@ -1,10 +1,10 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Take from https://github.com/Skyrat-SS13/Skyrat-tg/blob/92377cd6203bc4d93a6e289d7b857e19bb6cf338/modular_skyrat/modules/indicators/icons/ssd_indicator.dmi",
+  "copyright": "Take from https://github.com/Skyrat-SS13/Skyrat-tg/blob/92377cd6203bc4d93a6e289d7b857e19bb6cf338/modular_skyrat/modules/indicators/icons/ssd_indicator.dmi and changed by Macoron",
   "size": {
-    "x": 32,
-    "y": 32
+    "x": 8,
+    "y": 8
   },
   "states": [
     {
diff --git a/Resources/Textures/_White/Overlays/mindslave.rsi/master.png b/Resources/Textures/_White/Overlays/mindslave.rsi/master.png
new file mode 100644
index 0000000000000000000000000000000000000000..36e71896de27b46465a9b54da22ea754364bced1
GIT binary patch
literal 682
zcmV;b0#*HqP)<h;3K|Lk000e1NJLTq000O8000OG1^@s6#1FoU0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTcuK494sQ@kfFM0K~%(1s#pXIrLEAagUO{|(4-+r
zad8w}3l4rPRvlcNb#-tR1i=pwX9p)m7b)?7NufoI2gm(*ckglc4)8WAOfkA907W(R
zR6HhRbE|^?6#?{O0AmP=%+M0)#SC1>*F8LZy^HcJ_j7-akeoLd;1P)Dn5LV=8^kl4
zrp9@nILu0-Ongo}uG0mHAGt0${KmOxvzKRv^-OA>I7}=QJ6P&qR?-#XY2t{isFd%`
zIxKVE;;d9^taVTR!eCxqNpqd%FydH30!avvP(v9Nn26G<l42l5`!N^)knK;BOCnbp
zj2sK7LV;-e!T;cQw?<)V(n$)&fbJK|`WONHyFjyUS>MN&)jR=w&%l-1_E#Ig>?i5<
zwiY=8`nG|K>$WEC0hc?#;FBimqAmGodJ6^M{fxdT2lU?pfi<VM);>-jfDCoDd;=UD
z0;5IBUUzwSPiJrco@w>>1B>HwvCd{h3IG5A24YJ`L;(K){{a7>y{D4^000SaNLh0L
z01FcU01FcV0GgZ_00007bV*G`2j~h57A-KfDj9A7005>*L_t&-(|wOC4#GeH1*bq#
zS=X>)9Y5K1tXx%5OVbln_5e5(H)stPfCG>;7!pL0Jp=;H$5bt%A>kKBj(C~pXcbxh
z&;f{jgY*PNo>Al((i6nK0iY|zXmRT`%$G9)9nzNrhGUoY?!dLVgI1BPtI~c_SEbb|
zvK@dxhX5odB{3<l&e1Be(i3d<tGBqsq?|72Hgf7tz80R&fwtq<#bdp79wh`l7jT!%
QR{#J207*qoM6N<$f}!&s)Bpeg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_White/Overlays/mindslave.rsi/meta.json b/Resources/Textures/_White/Overlays/mindslave.rsi/meta.json
new file mode 100644
index 0000000000..fc1da4fe1a
--- /dev/null
+++ b/Resources/Textures/_White/Overlays/mindslave.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "@JustNemo",
+    "size": {
+        "x": 8,
+        "y": 8
+    },
+    "states": [
+        {
+            "name": "slave"
+        },
+        {
+            "name": "master"
+        }
+    ]
+}
diff --git a/Resources/Textures/_White/Overlays/mindslave.rsi/slave.png b/Resources/Textures/_White/Overlays/mindslave.rsi/slave.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bd07e8102b84fa5c673ef51764130c505de7e9b
GIT binary patch
literal 646
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9Sn@U~J8Fb`J1#c2+1T%1_J8No8Qr
zm{>c}*5j~)%+dJhr9sg$I!ccwEZmjh7;+?VRRjz7(zO>>HJ@A>e_@HDXJMg83^!k$
zPMB=WoYK+)QI>=J0_p7PuHu>>>pd5`_OKuSTT%YL@H^iJGc6y(U1|)jre8yB)KZF9
zH~kl7{F20w%+Yz~g3!yOJTb?w+uGFZ?f#_my|}(_!W?sn2Z9~XXDpk2MEZ#F>}AI)
z=UbfdTI5sXXS41yYp489J<C7Gc4lmzp5FG=Cu^RCkB*3S#H)m`OQMf5A9bu*G3EVP
zE1lwdkJf}_tts{YcPJq)*0Xr-GlNGFPE4L069SwiMQ3zeS~V$2!S%PH`2PuS{U>=V
zg-iCxaIbJ`%=mrq|AX@FZi!i!Jh_fFyc0kDOM>ywZimfzk@t^JyK2K&bN;~8Ti?Q^
z54=%-`E{F^CDX5Mjoq)esl8>KZhhdvWVKg|bbn@4akD=7+p|xT{mXr(M$_fnui5#@
zH}I5htznjtVOs2ZDz3b;+&?}4|Gdnv-<i7~7i~P3<^qZ-wj^(N7l!{JxM1({$v_d#
z0*}aI1_o|n5N2eUHAey{$X?><>&pIui(5=znR$_w5m2bf)5S4F;&Sp9lP~|yH?VIo
z0D_h-OCyVGuNQc{$=`Em!>_A#9ZbioWZVAsh6jiM#SPY+yLbM;kpl+~BqY2%2c!-p
z=$||X!VNmdSS~Y8c1Sli1R68Pd(NQ*6MJ^O3={kIhcS;tT9{HiQ(Sp~pa(?k*i-fA
cPna9SvnMk5!h=c@fUaTiboFyt=akR{0H;k682|tP

literal 0
HcmV?d00001


From 8141e99150a907a179bc8d8e077e1512c3fa6fda Mon Sep 17 00:00:00 2001
From: WWDP Changelogs <riddleridou@users.noreply.github.com>
Date: Wed, 16 Oct 2024 02:13:59 +0000
Subject: [PATCH 6/6] Automatic Changelog Update (#85)

---
 Resources/Changelog/Changelog.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b3adcad342..75f0e8a2b0 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -6553,3 +6553,10 @@ Entries:
   id: 6367
   time: '2024-10-16T01:57:56.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/86
+- author: Spatison
+  changes:
+    - type: Add
+      message: Added maindslave implanter/ Добавлен имплант подчинения
+  id: 6368
+  time: '2024-10-16T02:13:34.0000000+00:00'
+  url: https://github.com/WWhiteDreamProject/wwdpublic/pull/85