Всякие фиксы и твики (#436)

* 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>
This commit is contained in:
Aviu00
2023-09-24 23:05:49 +09:00
committed by Aviu00
parent 43eabbfa86
commit 17e38f6dbb
5 changed files with 22 additions and 6 deletions

View File

@@ -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++)
{

View File

@@ -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);
}

View File

@@ -138,6 +138,7 @@
Radiation: 0
Caustic: 0.75
- type: GroupExamine
- type: GiftIgnore
- type: entity
parent: ClothingOuterArmorHeavy

View File

@@ -118,7 +118,7 @@
primingSound:
path: /Audio/Effects/minibombcountdown.ogg
params:
volume: 12
volume: 20
- type: entity
name: supermatter grenade

View File

@@ -204,4 +204,5 @@
weight: 3
startAudio:
path: /Audio/White/Aspects/accent.ogg
forbidden: true
- type: DancingAspect