From b93f0e7155e3f746dc6c47a5d1fed082234de145 Mon Sep 17 00:00:00 2001
From: Schrodinger71 <sanya.podshibyakin@mail.ru>
Date: Fri, 8 Mar 2024 01:17:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D1=81=D0=BE=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=B5=D0=B9=D1=88=D0=B5=D0=BD=20=D0=BE=D1=80?=
 =?UTF-8?q?=D1=83=D0=B6=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Content.Shared/Weapons/Ranged/Components/GunComponent.cs   | 1 -
 .../Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs | 7 ++++++-
 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs   | 1 +
 .../ADT/Entities/Mobs/SecurityCyborg/equipment.yml         | 1 +
 .../Entities/Objects/Weapons/Guns/Rifles/rifles.yml        | 1 -
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index 01741edc755..0055e3588f6 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -239,7 +239,6 @@ public sealed partial class GunComponent : Component
     /// </summary>
     //[DataField("gunOwner"), ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? GunOwner = null;
-
 }
 
 [Flags]
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
index 65d96857e80..4b078e6be7f 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
@@ -56,7 +56,6 @@ private void OnAltVerb(EntityUid uid, GunComponent component, GetVerbsEvent<Alte
         };
 
         args.Verbs.Add(verb);
-
     }
 
     private SelectiveFire GetNextMode(GunComponent component)
@@ -99,6 +98,12 @@ private void SelectFire(EntityUid uid, GunComponent component, SelectiveFire fir
         Dirty(uid, component);
     }
 
+    /// <summary>
+    /// ADT, modern. This method makes weapon personal, making everyone except user not able to shoot with it.
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="component"></param>
+    /// <param name="user"></param>
     private void MakeWeaponPersonal(EntityUid uid, GunComponent component, EntityUid? user = null)
     {
         if(component.GunOwner != null)
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 461432383c4..40229915f2e 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Gravity;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
 using Content.Shared.Tag;
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml
index 92de8a5d1e9..4423d57ed55 100644
--- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml
+++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml
@@ -46,6 +46,7 @@
     fireRate: 1.7
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+    personable: true
   - type: ProjectileBatteryAmmoProvider
     proto: BulletDisabler
     fireCost: 60
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index e1626368474..5bc8125ebaa 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -159,7 +159,6 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
-    personable: true
   - type: ItemSlots
     slots:
       gun_magazine: