Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Говнофикс

Browse Source
This commit is contained in:
Aviu00
2024-01-17 12:00:25 +03:00
parent ec520d07a7
commit 10ea70f905
11 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs
View File

@@ -1,3 +1,4 @@
using System.Numerics;
using Content.Shared.Ghost; using Content.Shared.Ghost;
using Content.Shared.White.CustomGhostSystem; using Content.Shared.White.CustomGhostSystem;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;

19
Content.Server/Administration/Managers/RoleBanManager.cs
View File

@@ -5,10 +5,12 @@ using System.Net.Sockets;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.Database; using Content.Server.Database;
using Content.Server.GameTicking;
using Content.Server.UtkaIntegration; using Content.Server.UtkaIntegration;
using Content.Server.White; using Content.Server.White;
using Content.Shared.CCVar; using Content.Shared.CCVar;
using Content.Shared.Database; using Content.Shared.Database;
using Content.Shared.Players.PlayTimeTracking;
using Content.Shared.Roles; using Content.Shared.Roles;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
@@ -27,6 +29,7 @@ public sealed class RoleBanManager
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPlayerLocator _playerLocator = default!; [Dependency] private readonly IPlayerLocator _playerLocator = default!;
[Dependency] private readonly UtkaTCPWrapper _utkaSockets = default!; // WD [Dependency] private readonly UtkaTCPWrapper _utkaSockets = default!; // WD
[Dependency] private readonly IEntitySystemManager _systems = default!; // WD
private const string JobPrefix = "Job:"; private const string JobPrefix = "Job:";
@@ -165,6 +168,10 @@ public sealed class RoleBanManager
return; 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 player = locatedPlayer.UserId;
var banDef = new ServerRoleBanDef( var banDef = new ServerRoleBanDef(
null, null,
@@ -173,8 +180,8 @@ public sealed class RoleBanManager
targetHWid, targetHWid,
DateTimeOffset.Now, DateTimeOffset.Now,
expires, expires,
null, roundId,
TimeSpan.Zero, // IDK what it means playtime,
reason, reason,
NoteSeverity.High, NoteSeverity.High,
player, player,
@@ -245,6 +252,10 @@ public sealed class RoleBanManager
serverName = "unknown"; 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 player = shell.Player;
var banDef = new ServerRoleBanDef( var banDef = new ServerRoleBanDef(
null, null,
@@ -253,8 +264,8 @@ public sealed class RoleBanManager
targetHWid, targetHWid,
DateTimeOffset.Now, DateTimeOffset.Now,
expires, expires,
null, roundId,
TimeSpan.Zero, // IDK what it means playtime,
reason, reason,
NoteSeverity.High, NoteSeverity.High,
player?.UserId, player?.UserId,

11
Content.Server/UtkaIntegration/Commands/UtkaBanCommand.cs
View File

@@ -2,7 +2,11 @@
using System.Net.Sockets; using System.Net.Sockets;
using Content.Server.Administration; using Content.Server.Administration;
using Content.Server.Database; using Content.Server.Database;
using Content.Server.GameTicking;
using Content.Server.UtkaIntegration.TCP;
using Content.Shared.CCVar; using Content.Shared.CCVar;
using Content.Shared.Database;
using Content.Shared.Players.PlayTimeTracking;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
@@ -82,6 +86,10 @@ public sealed class UtkaBanCommand : IUtkaCommand
serverName = "unknown"; 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( var banDef = new ServerBanDef(
null, null,
targetUid, targetUid,
@@ -89,7 +97,10 @@ public sealed class UtkaBanCommand : IUtkaCommand
targetHWid, targetHWid,
DateTimeOffset.Now, DateTimeOffset.Now,
expires, expires,
roundId,
playtime,
reason, reason,
NoteSeverity.High,
player, player,
null, null,
serverName); serverName);

1
Content.Server/UtkaIntegration/Commands/UtkaJobBanCommand.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.Administration.Managers; using Content.Server.Administration.Managers;
using Content.Server.UtkaIntegration.TCP;
namespace Content.Server.UtkaIntegration; namespace Content.Server.UtkaIntegration;

1
Content.Server/UtkaIntegration/Commands/UtkaRestartRoundCommand.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.GameTicking; using Content.Server.GameTicking;
using Content.Server.UtkaIntegration.TCP;
namespace Content.Server.UtkaIntegration; namespace Content.Server.UtkaIntegration;

1
Content.Server/UtkaIntegration/Commands/UtkaUnJobBanCommand.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Administration; using Content.Server.Administration;
using Content.Server.Database; using Content.Server.Database;
using Content.Server.UtkaIntegration.TCP;
namespace Content.Server.UtkaIntegration; namespace Content.Server.UtkaIntegration;

1
Content.Server/UtkaIntegration/Commands/UtkaUnbanCommand.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Administration; using Content.Server.Administration;
using Content.Server.Database; using Content.Server.Database;
using Content.Server.UtkaIntegration.TCP;
namespace Content.Server.UtkaIntegration; namespace Content.Server.UtkaIntegration;

1
Content.Shared/White/CustomGhostSystem/CustomGhostPrototype.cs
View File

@@ -1,3 +1,4 @@
using System.Numerics;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Utility; using Robust.Shared.Utility;

3
Resources/Prototypes/White/Fluff/fluff.yml
View File

@@ -1,4 +1,4 @@
# DOOMMAX # DOOMMAX
- type: entity - type: entity
parent: ClothingOuterEVASuitBase parent: ClothingOuterEVASuitBase
id: ClothingOuterSuitGlamorous id: ClothingOuterSuitGlamorous
@@ -151,7 +151,6 @@
- type: Item - type: Item
sprite: White/Fluff/Omntns/gavel_hammer.rsi sprite: White/Fluff/Omntns/gavel_hammer.rsi
size: 5 size: 5
- type: ItemCooldown
- type: EmitSoundOnUse - type: EmitSoundOnUse
sound: sound:
path: /Audio/White/Fluff/Omntns/gavel.ogg path: /Audio/White/Fluff/Omntns/gavel.ogg

6
Resources/Prototypes/White/Mobs/Pets/pets.yml
View File

@@ -1,11 +1,11 @@
# Kommandant # Kommandant
- type: entity - type: entity
parent: SimpleMobBase parent: SimpleMobBase
id: KommandantPetSpider id: KommandantPetSpider
name: паук Валера name: паук Валера
description: Любит мух и деньги. description: Любит мух и деньги.
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- PetsNT - PetsNT
- type: Sprite - type: Sprite
@@ -57,7 +57,7 @@
- type: Bloodstream - type: Bloodstream
bloodMaxVolume: 150 bloodMaxVolume: 150
bloodReagent: SpiderBlood bloodReagent: SpiderBlood
- type: Pacifist - type: Pacified
- type: Tag - type: Tag
tags: tags:
- CannotSuicide - CannotSuicide

40
Resources/Textures/Structures/Piping/disposal.rsi/meta.json
View File

@@ -5,7 +5,7 @@
"y": 32 "y": 32
}, },
"license": "CC-BY-SA-3.0", "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": [ "states": [
{ {
"name": "condisposal", "name": "condisposal",
@@ -228,18 +228,15 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.066, 0.1,
0.066, 0.1,
0.066, 0.1,
0.066, 0.1,
0.066, 0.1,
0.066,
0.5, 0.5,
0.066, 0.1,
0.066, 0.1,
0.066, 0.1
0.066,
0.066
] ]
] ]
}, },
@@ -248,18 +245,15 @@
"directions": 1, "directions": 1,
"delays": [ "delays": [
[ [
0.066, 0.1,
0.066, 0.1,
0.066, 0.1,
0.066, 0.1,
0.066, 0.1,
0.066,
0.5, 0.5,
0.066, 0.1,
0.066, 0.1,
0.066, 0.1
0.066,
0.066
] ]
] ]
}, },