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 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(); - if (TryComp(args.Examiner, out var actorComponent) && - TryComp(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