Говнофикс

2024-01-17 12:00:25 +03:00
parent ec520d07a7
commit 10ea70f905
11 changed files with 53 additions and 32 deletions
--- a/Content.Client/White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs
+++ b/Content.Client/White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Ghost;
 using Content.Shared.White.CustomGhostSystem;
 using Robust.Client.GameObjects;
--- a/Content.Server/Administration/Managers/RoleBanManager.cs
+++ b/Content.Server/Administration/Managers/RoleBanManager.cs
@@ -5,10 +5,12 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using Content.Server.Database;
+using Content.Server.GameTicking;
 using Content.Server.UtkaIntegration;
 using Content.Server.White;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Roles;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -27,6 +29,7 @@ public sealed class RoleBanManager
    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
    [Dependency] private readonly IPlayerLocator _playerLocator = default!;
    [Dependency] private readonly UtkaTCPWrapper _utkaSockets = default!; // WD
+    [Dependency] private readonly IEntitySystemManager _systems = default!; // WD

    private const string JobPrefix = "Job:";

@@ -165,6 +168,10 @@ public sealed class RoleBanManager
            return;
        }

+        _systems.TryGetEntitySystem<GameTicker>(out var ticker);
+        int? roundId = ticker == null || ticker.RoundId == 0 ? null : ticker.RoundId;
+        var playtime = (await _db.GetPlayTimes(targetUid)).Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall)?.TimeSpent ?? TimeSpan.Zero;
+
        var player = locatedPlayer.UserId;
        var banDef = new ServerRoleBanDef(
            null,
@@ -173,8 +180,8 @@ public sealed class RoleBanManager
            targetHWid,
            DateTimeOffset.Now,
            expires,
-            null,
-            TimeSpan.Zero, // IDK what it means
+            roundId,
+            playtime,
            reason,
            NoteSeverity.High,
            player,
@@ -245,6 +252,10 @@ public sealed class RoleBanManager
            serverName = "unknown";
        }

+        _systems.TryGetEntitySystem<GameTicker>(out var ticker);
+        int? roundId = ticker == null || ticker.RoundId == 0 ? null : ticker.RoundId;
+        var playtime = (await _db.GetPlayTimes(targetUid)).Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall)?.TimeSpent ?? TimeSpan.Zero;
+
        var player = shell.Player;
        var banDef = new ServerRoleBanDef(
            null,
@@ -253,8 +264,8 @@ public sealed class RoleBanManager
            targetHWid,
            DateTimeOffset.Now,
            expires,
-            null,
-            TimeSpan.Zero, // IDK what it means
+            roundId,
+            playtime,
            reason,
            NoteSeverity.High,
            player?.UserId,
--- a/Content.Server/UtkaIntegration/Commands/UtkaBanCommand.cs
+++ b/Content.Server/UtkaIntegration/Commands/UtkaBanCommand.cs
@@ -2,7 +2,11 @@
 using System.Net.Sockets;
 using Content.Server.Administration;
 using Content.Server.Database;
+using Content.Server.GameTicking;
+using Content.Server.UtkaIntegration.TCP;
 using Content.Shared.CCVar;
+using Content.Shared.Database;
+using Content.Shared.Players.PlayTimeTracking;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;

@@ -82,6 +86,10 @@ public sealed class UtkaBanCommand : IUtkaCommand
            serverName = "unknown";
        }

+        IoCManager.Resolve<IEntitySystemManager>().TryGetEntitySystem<GameTicker>(out var ticker);
+        int? roundId = ticker == null || ticker.RoundId == 0 ? null : ticker.RoundId;
+        var playtime = (await dbMan.GetPlayTimes(targetUid)).Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall)?.TimeSpent ?? TimeSpan.Zero;
+
        var banDef = new ServerBanDef(
            null,
            targetUid,
@@ -89,7 +97,10 @@ public sealed class UtkaBanCommand : IUtkaCommand
            targetHWid,
            DateTimeOffset.Now,
            expires,
+            roundId,
+            playtime,
            reason,
+            NoteSeverity.High,
            player,
            null,
            serverName);
--- a/Content.Server/UtkaIntegration/Commands/UtkaJobBanCommand.cs
+++ b/Content.Server/UtkaIntegration/Commands/UtkaJobBanCommand.cs
@@ -1,4 +1,5 @@
 using Content.Server.Administration.Managers;
+using Content.Server.UtkaIntegration.TCP;

 namespace Content.Server.UtkaIntegration;

--- a/Content.Server/UtkaIntegration/Commands/UtkaRestartRoundCommand.cs
+++ b/Content.Server/UtkaIntegration/Commands/UtkaRestartRoundCommand.cs
@@ -1,4 +1,5 @@
 using Content.Server.GameTicking;
+using Content.Server.UtkaIntegration.TCP;

 namespace Content.Server.UtkaIntegration;

--- a/Content.Server/UtkaIntegration/Commands/UtkaUnJobBanCommand.cs
+++ b/Content.Server/UtkaIntegration/Commands/UtkaUnJobBanCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.Administration;
 using Content.Server.Database;
+using Content.Server.UtkaIntegration.TCP;

 namespace Content.Server.UtkaIntegration;

--- a/Content.Server/UtkaIntegration/Commands/UtkaUnbanCommand.cs
+++ b/Content.Server/UtkaIntegration/Commands/UtkaUnbanCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.Administration;
 using Content.Server.Database;
+using Content.Server.UtkaIntegration.TCP;

 namespace Content.Server.UtkaIntegration;

--- a/Content.Shared/White/CustomGhostSystem/CustomGhostPrototype.cs
+++ b/Content.Shared/White/CustomGhostSystem/CustomGhostPrototype.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
--- a/Resources/Prototypes/White/Fluff/fluff.yml
+++ b/Resources/Prototypes/White/Fluff/fluff.yml
@@ -1,4 +1,4 @@
-# DOOMMAX
+# DOOMMAX
 - type: entity
  parent: ClothingOuterEVASuitBase
  id: ClothingOuterSuitGlamorous
@@ -151,7 +151,6 @@
    - type: Item
      sprite: White/Fluff/Omntns/gavel_hammer.rsi
      size: 5
-    - type: ItemCooldown
    - type: EmitSoundOnUse
      sound:
        path: /Audio/White/Fluff/Omntns/gavel.ogg
--- a/Resources/Prototypes/White/Mobs/Pets/pets.yml
+++ b/Resources/Prototypes/White/Mobs/Pets/pets.yml
@@ -1,11 +1,11 @@
-# Kommandant
+# Kommandant
 - type: entity
  parent: SimpleMobBase
  id: KommandantPetSpider
  name: паук Валера
  description: Любит мух и деньги.
  components:
-  - type: Faction
+  - type: NpcFactionMember
    factions:
      - PetsNT
  - type: Sprite
@@ -57,7 +57,7 @@
  - type: Bloodstream
    bloodMaxVolume: 150
    bloodReagent: SpiderBlood
-  - type: Pacifist
+  - type: Pacified
  - type: Tag
    tags:
      - CannotSuicide
--- a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json
@@ -5,7 +5,7 @@
        "y": 32
    },
    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/blob/bbe32606902c90f5290b57d905a3f31b84dc6d7d/icons/obj/pipes/disposal.dmi and modified by DrSmugleaf",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/blob/bbe32606902c90f5290b57d905a3f31b84dc6d7d/icons/obj/pipes/disposal.dmi and modified by DrSmugleaf. Signal router sprites based on normal router modified by deltanedas (github).",
    "states": [
        {
            "name": "condisposal",
@@ -228,18 +228,15 @@
            "directions": 1,
            "delays": [
                [
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
                    0.5,
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066
+                    0.1,
+                    0.1,
+                    0.1
                ]
            ]
        },
@@ -248,18 +245,15 @@
            "directions": 1,
            "delays": [
                [
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
                    0.5,
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066,
-                    0.066
+                    0.1,
+                    0.1,
+                    0.1
                ]
            ]
        },