From 17e38f6dbb66f7096a3f073654cd5098785f95f9 Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Sun, 24 Sep 2023 23:05:49 +0900
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=81=D1=8F=D0=BA=D0=B8=D0=B5=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B8=20=D1=82=D0=B2=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=B8=20(#436)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* No more dancing

* More mines

* Louder minibomb

* Ritual chair no longer deletes people when disassembled (#19145)

* Fix monkeys not getting rotated on crit/death (#19132)

* No gift hardsuits

* Less emp shock time

* Fix identity

---------

Co-authored-by: Artur <thearturzh@gmail.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
---
 .../AspectsSystem/Aspects/BombassAspect.cs    |  2 +-
 .../Other/ExamineSystem/ExamineSystem.cs      | 22 +++++++++++++++----
 .../Entities/Clothing/OuterClothing/armor.yml |  1 +
 .../Objects/Weapons/Throwable/grenades.yml    |  2 +-
 .../Prototypes/White/Aspects/Aspects.yml      |  1 +
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Content.Server/White/AspectsSystem/Aspects/BombassAspect.cs b/Content.Server/White/AspectsSystem/Aspects/BombassAspect.cs
index ceb6eaff60..8372f31b88 100644
--- a/Content.Server/White/AspectsSystem/Aspects/BombassAspect.cs
+++ b/Content.Server/White/AspectsSystem/Aspects/BombassAspect.cs
@@ -18,7 +18,7 @@ public sealed class BombassAspect : AspectSystem<BombassAspectComponent>
 
     private void SpawnMines()
     {
-        var minMines = _random.Next(30, 50);
+        var minMines = _random.Next(40, 60);
 
         for (var i = 0; i < minMines; i++)
         {
diff --git a/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs b/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs
index 8ae2784e94..16b3530b09 100644
--- a/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs
+++ b/Content.Server/White/Other/ExamineSystem/ExamineSystem.cs
@@ -1,7 +1,9 @@
+using Content.Server.Access.Systems;
 using Content.Shared.Access.Components;
 using Content.Shared.Examine;
 using Robust.Shared.Enums;
 using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.White;
@@ -18,6 +20,7 @@ namespace Content.Server.White.Other.ExamineSystem
     {
         [Dependency] private readonly InventorySystem _inventorySystem = default!;
         [Dependency] private readonly EntityManager _entityManager = default!;
+        [Dependency] private readonly IdCardSystem _idCard = default!;
         [Dependency] private readonly IConsoleHost _consoleHost = default!;
         [Dependency] private readonly INetConfigurationManager _netConfigManager = default!;
 
@@ -41,11 +44,22 @@ namespace Content.Server.White.Other.ExamineSystem
         {
             var infoLines = new List<string>();
 
-            if (TryComp<ActorComponent>(args.Examiner, out var actorComponent) &&
-                TryComp<MetaDataComponent>(uid, out var metaDataComponent))
+            var name = Name(uid);
+
+            var ev = new SeeIdentityAttemptEvent();
+            RaiseLocalEvent(uid, ev);
+            if (ev.Cancelled)
             {
-                infoLines.Add($"Это же [bold]{metaDataComponent.EntityName}[/bold]!");
+                if (_idCard.TryFindIdCard(uid, out var id) && !string.IsNullOrWhiteSpace(id.FullName))
+                {
+                    name = id.FullName;
+                }
+                else
+                {
+                    name = "неизвестный";
+                }
             }
+            infoLines.Add($"Это же [bold]{name}[/bold]!");
 
             var idInfoString = GetInfo(uid);
             if (!string.IsNullOrEmpty(idInfoString))
@@ -106,7 +120,7 @@ namespace Content.Server.White.Other.ExamineSystem
 
             var combinedInfo = string.Join("\n", infoLines);
 
-            if (actorComponent != null)
+            if (TryComp(args.Examined, out ActorComponent? actorComponent))
             {
                 SendNoticeMessage(actorComponent, combinedInfo);
             }
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 7f4d07e5a7..76283da5fb 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -138,6 +138,7 @@
         Radiation: 0
         Caustic: 0.75
   - type: GroupExamine
+  - type: GiftIgnore
 
 - type: entity
   parent: ClothingOuterArmorHeavy
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 90cb751e40..856d45b5ff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -118,7 +118,7 @@
     primingSound:
       path: /Audio/Effects/minibombcountdown.ogg
       params:
-        volume: 12
+        volume: 20
 
 - type: entity
   name: supermatter grenade
diff --git a/Resources/Prototypes/White/Aspects/Aspects.yml b/Resources/Prototypes/White/Aspects/Aspects.yml
index 0f01c33154..ed71777668 100644
--- a/Resources/Prototypes/White/Aspects/Aspects.yml
+++ b/Resources/Prototypes/White/Aspects/Aspects.yml
@@ -204,4 +204,5 @@
       weight: 3
       startAudio:
         path: /Audio/White/Aspects/accent.ogg
+      forbidden: true
     - type: DancingAspect