diff --git a/Content.Server/Corvax/Ghost/GhostGoLobbySystem.cs b/Content.Server/Corvax/Ghost/GhostGoLobbySystem.cs index 74aae13661..21ae0997af 100644 --- a/Content.Server/Corvax/Ghost/GhostGoLobbySystem.cs +++ b/Content.Server/Corvax/Ghost/GhostGoLobbySystem.cs @@ -1,5 +1,4 @@ using Content.Server._Corvax.Events; -using Content.Server.GameTicking; using Content.Server.Mind; using Content.Server.Players.PlayTimeTracking; using Content.Shared.Corvax.CCCVars; @@ -48,7 +47,7 @@ public sealed partial class GhostGoLobbySystem : EntitySystem { SubscribeNetworkEvent(OnGhostGoLobby); SubscribeLocalEvent(OnRunLevelChanged); - SubscribeLocalEvent(OnGhostAttached); + //SubscribeLocalEvent(OnGhostAttached); перенесено в class NewPlayerSystem - OnPlayerAttachedEvent изза дубликата Subs.CVar(_cfg, CCCVars.GhostGoLobbyEnabled, value => _enabled = value, true); Subs.CVar(_cfg, CCCVars.GhostGoLobbyTimeHours, value => _requiredPlaytime = TimeSpan.FromHours(value), true); @@ -77,7 +76,7 @@ public sealed partial class GhostGoLobbySystem : EntitySystem _usedCharacters.Clear(); } - private void OnGhostAttached(EntityUid uid, GhostComponent component, PlayerAttachedEvent args) + public void OnGhostAttached(EntityUid uid, PlayerAttachedEvent args) { if (HasComp(uid)) return; diff --git a/Content.Server/NewPlayer/NewPlayerSystem.cs b/Content.Server/NewPlayer/NewPlayerSystem.cs index 1e449acb8a..fbf11354c4 100644 --- a/Content.Server/NewPlayer/NewPlayerSystem.cs +++ b/Content.Server/NewPlayer/NewPlayerSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Database; +using Content.Server.Database; using Content.Server.Players.PlayTimeTracking; using Content.Server.Players.Whitelist; using Content.Shared.CCVar; @@ -8,6 +8,7 @@ using Content.Shared.Ghost.Components; using Robust.Shared.Configuration; using Robust.Shared.GameStates; using Robust.Shared.Player; +using Content.Server.Corvax.Ghost; namespace Content.Server.NewPlayer; @@ -19,6 +20,7 @@ public sealed partial class NewPlayerSystem : EntitySystem [Dependency] private IConfigurationManager _config = default!; [Dependency] private PlayTimeTrackingManager _playtimeManager = default!; [Dependency] private WhitelistManager _whitelistManager = default!; + [Dependency] private GhostGoLobbySystem _ghostGoLobby = default!;//corvax [Dependency] private EntityQuery _showPlayerIconQuery = default!; @@ -76,6 +78,8 @@ public sealed partial class NewPlayerSystem : EntitySystem [SubscribeLocalEvent] private void OnPlayerAttachedEvent(Entity ent, ref PlayerAttachedEvent ev) { + _ghostGoLobby.OnGhostAttached(ent, ev);// corvax - перенёс сюда ивент из GhostGoLobbySystem по причине дублирования подписки + if (_whitelistManager.IsConnectedWhitelisted(ev.Player)) EnsureComp(ev.Entity); } diff --git a/Content.Shared/Corvax/Events/EventIconComponents.cs b/Content.Shared/Corvax/Events/EventIconComponents.cs index 4d2117c3ad..4645a80844 100644 --- a/Content.Shared/Corvax/Events/EventIconComponents.cs +++ b/Content.Shared/Corvax/Events/EventIconComponents.cs @@ -11,7 +11,7 @@ namespace Content.Shared.Corvax.Events.Components public sealed partial class EventIconComponent : Component { [DataField("eventStatusIcon")] - public ProtoId StatusIcon { get; set; } = "EventFaction"; + public ProtoId StatusIcon { get; set; } = "EventFaction"; } /// diff --git a/Content.Shared/Corvax/SecApartment/Components/SquadMemberComponent.cs b/Content.Shared/Corvax/SecApartment/Components/SquadMemberComponent.cs index 7a3319cdaf..8bc260bbc5 100644 --- a/Content.Shared/Corvax/SecApartment/Components/SquadMemberComponent.cs +++ b/Content.Shared/Corvax/SecApartment/Components/SquadMemberComponent.cs @@ -11,5 +11,5 @@ public sealed partial class SquadMemberComponent : Component /// The icon that should be displayed based on the squad icon of the entity. /// [DataField, AutoNetworkedField] - public ProtoId StatusIcon = "SecuritySquadIconAlpha"; + public ProtoId StatusIcon = "SecuritySquadIconAlpha"; } diff --git a/Resources/Prototypes/Corvax/StatusIcon/faction.yml b/Resources/Prototypes/Corvax/StatusIcon/faction.yml index a826369e88..160b80af88 100644 --- a/Resources/Prototypes/Corvax/StatusIcon/faction.yml +++ b/Resources/Prototypes/Corvax/StatusIcon/faction.yml @@ -1,5 +1,5 @@ # Administration -- type: factionIcon +- type: statusIcon id: EventFaction priority: 11 showTo: diff --git a/Resources/Prototypes/Corvax/StatusIcon/security.yml b/Resources/Prototypes/Corvax/StatusIcon/security.yml index 8be39b118a..1b69bf27a4 100644 --- a/Resources/Prototypes/Corvax/StatusIcon/security.yml +++ b/Resources/Prototypes/Corvax/StatusIcon/security.yml @@ -1,172 +1,172 @@ -- type: securityIcon +- type: statusIcon id: SecuritySquadIcon abstract: true priority: 4 locationPreference: Left isShaded: true -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconAlpha icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: alpha -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconBeta icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: beta -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconGamma icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: gamma -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconDelta icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: delta -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconEpsilon icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: epsilon -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconZeta icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: zeta -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconHeta icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: heta -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconTheta icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: theta -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconIota icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: iota -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconKappa icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: kappa -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconLambda icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: lambda -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconMu icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: mu -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconNu icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: nu -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconXi icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: xi -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconOmicron icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: omicron -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconPi icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: pi -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconRo icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: ro -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconSigma icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: sigma -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconTau icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: tau -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconUpsilon icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: upsilon -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconFi icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: fi -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconHi icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: hi -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconPsi icon: sprite: /Textures/Corvax/Interface/Misc/security_icons.rsi state: psi -- type: securityIcon +- type: statusIcon parent: SecuritySquadIcon id: SecuritySquadIconOmega icon: diff --git a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 2b090cdfd9..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-reptilian.png and /dev/null differ