diff --git a/Content.Client/White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs b/Content.Client/White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs index 16d3e75e0e..875ca08cdb 100644 --- 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; diff --git a/Content.Server/Administration/Managers/RoleBanManager.cs b/Content.Server/Administration/Managers/RoleBanManager.cs index 4c3e90b961..3cf2880be5 100644 --- 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(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(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, diff --git a/Content.Server/UtkaIntegration/Commands/UtkaBanCommand.cs b/Content.Server/UtkaIntegration/Commands/UtkaBanCommand.cs index d824016d3d..ae21976d0d 100644 --- 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().TryGetEntitySystem(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); diff --git a/Content.Server/UtkaIntegration/Commands/UtkaJobBanCommand.cs b/Content.Server/UtkaIntegration/Commands/UtkaJobBanCommand.cs index a407e3ab70..dbc25ed752 100644 --- 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; diff --git a/Content.Server/UtkaIntegration/Commands/UtkaRestartRoundCommand.cs b/Content.Server/UtkaIntegration/Commands/UtkaRestartRoundCommand.cs index 54a1a432a2..7a12349787 100644 --- 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; diff --git a/Content.Server/UtkaIntegration/Commands/UtkaUnJobBanCommand.cs b/Content.Server/UtkaIntegration/Commands/UtkaUnJobBanCommand.cs index 1a1db48ab7..2560806e54 100644 --- 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; diff --git a/Content.Server/UtkaIntegration/Commands/UtkaUnbanCommand.cs b/Content.Server/UtkaIntegration/Commands/UtkaUnbanCommand.cs index 94a4efac15..967ed0c599 100644 --- 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; diff --git a/Content.Shared/White/CustomGhostSystem/CustomGhostPrototype.cs b/Content.Shared/White/CustomGhostSystem/CustomGhostPrototype.cs index c21513c12a..6ba559975f 100644 --- 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; diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index 645c7426c2..9618a3f247 100644 --- 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 diff --git a/Resources/Prototypes/White/Mobs/Pets/pets.yml b/Resources/Prototypes/White/Mobs/Pets/pets.yml index 00fe88d1bf..bc443de69d 100644 --- 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 diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json index 69f1ce4e39..87655b6b86 100644 --- 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 ] ] },