diff --git a/.github/workflows/update-wiki.yml b/.github/workflows/update-wiki.yml index 1ce05afe94..068e515241 100644 --- a/.github/workflows/update-wiki.yml +++ b/.github/workflows/update-wiki.yml @@ -1,6 +1,7 @@ name: Update Wiki on: + workflow_dispatch: push: branches: [ master, jsondump ] paths: diff --git a/Content.Client/Access/AccessOverlay.cs b/Content.Client/Access/AccessOverlay.cs index 74273d4102..1ba2dc613f 100644 --- a/Content.Client/Access/AccessOverlay.cs +++ b/Content.Client/Access/AccessOverlay.cs @@ -32,7 +32,7 @@ public sealed class AccessOverlay : Overlay var xformQuery = _entityManager.GetEntityQuery(); foreach (var ent in _lookup.GetEntitiesIntersecting(args.MapId, args.WorldAABB, - LookupFlags.Anchored | LookupFlags.Approximate)) + LookupFlags.Static | LookupFlags.Approximate)) { if (!readerQuery.TryGetComponent(ent, out var reader) || !xformQuery.TryGetComponent(ent, out var xform)) diff --git a/Content.Client/Audio/AmbientSoundSystem.cs b/Content.Client/Audio/AmbientSoundSystem.cs index 3111e3177f..6de63bbf10 100644 --- a/Content.Client/Audio/AmbientSoundSystem.cs +++ b/Content.Client/Audio/AmbientSoundSystem.cs @@ -172,7 +172,7 @@ namespace Content.Client.Audio var ambientQuery = GetEntityQuery(); var xformQuery = GetEntityQuery(); - foreach (var entity in _lookup.GetEntitiesInRange(coordinates, _maxAmbientRange + RangeBuffer, LookupFlags.Anchored | LookupFlags.Approximate)) + foreach (var entity in _lookup.GetEntitiesInRange(coordinates, _maxAmbientRange + RangeBuffer)) { if (!ambientQuery.TryGetComponent(entity, out var ambientComp) || !ambientComp.Enabled || diff --git a/Content.Client/Body/Systems/BodySystem.cs b/Content.Client/Body/Systems/BodySystem.cs index bab785525b..172728a955 100644 --- a/Content.Client/Body/Systems/BodySystem.cs +++ b/Content.Client/Body/Systems/BodySystem.cs @@ -1,7 +1,13 @@ -using Content.Shared.Body.Systems; +using Content.Shared.Body.Components; +using Content.Shared.Body.Prototypes; +using Content.Shared.Body.Systems; namespace Content.Client.Body.Systems; public sealed class BodySystem : SharedBodySystem { + protected override void InitBody(BodyComponent body, BodyPrototype prototype) + { + return; + } } diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs index b46d9786fd..f71f52d809 100644 --- a/Content.Client/Inventory/ClientInventorySystem.cs +++ b/Content.Client/Inventory/ClientInventorySystem.cs @@ -39,6 +39,7 @@ namespace Content.Client.Inventory public override void Initialize() { + UpdatesOutsidePrediction = true; base.Initialize(); SubscribeLocalEvent(OnPlayerAttached); @@ -162,7 +163,7 @@ namespace Content.Client.Inventory public void ReloadInventory(ClientInventoryComponent? component = null) { var player = _playerManager.LocalPlayer?.ControlledEntity; - if (player == null || !Resolve(player.Value, ref component)) + if (player == null || !Resolve(player.Value, ref component, false)) { return; } diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs index 7bbd7fad17..58e2ac2b8d 100644 --- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs @@ -1,16 +1,11 @@ -using System.Collections.Generic; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; -using Content.Shared.Kitchen.Components; +using Content.Shared.Kitchen; using Robust.Client.AutoGenerated; using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Localization; -using Robust.Shared.Maths; using Robust.Shared.Prototypes; namespace Content.Client.Kitchen.UI @@ -68,15 +63,15 @@ namespace Content.Client.Kitchen.UI { switch (message) { - case SharedReagentGrinderComponent.ReagentGrinderWorkStartedMessage workStarted: + case ReagentGrinderWorkStartedMessage workStarted: GrindButton.Disabled = true; - GrindButton.Modulate = workStarted.GrinderProgram == SharedReagentGrinderComponent.GrinderProgram.Grind ? Color.Green : Color.White; + GrindButton.Modulate = workStarted.GrinderProgram == GrinderProgram.Grind ? Color.Green : Color.White; JuiceButton.Disabled = true; - JuiceButton.Modulate = workStarted.GrinderProgram == SharedReagentGrinderComponent.GrinderProgram.Juice ? Color.Green : Color.White; + JuiceButton.Modulate = workStarted.GrinderProgram == GrinderProgram.Juice ? Color.Green : Color.White; BeakerContentBox.EjectButton.Disabled = true; ChamberContentBox.EjectButton.Disabled = true; break; - case SharedReagentGrinderComponent.ReagentGrinderWorkCompleteMessage: + case ReagentGrinderWorkCompleteMessage: GrindButton.Disabled = false; JuiceButton.Disabled = false; GrindButton.Modulate = Color.White; diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs index e4e8c6a073..e05c871146 100644 --- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs @@ -1,11 +1,8 @@ using Content.Shared.Containers.ItemSlots; -using Content.Shared.Kitchen.Components; +using Content.Shared.Kitchen; using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Prototypes; -using static Content.Shared.Chemistry.Components.Solution; namespace Content.Client.Kitchen.UI { @@ -55,10 +52,10 @@ namespace Content.Client.Kitchen.UI _menu?.HandleMessage(message); } - public void StartGrinding(BaseButton.ButtonEventArgs? args = null) => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderGrindStartMessage()); - public void StartJuicing(BaseButton.ButtonEventArgs? args = null) => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderJuiceStartMessage()); - public void EjectAll(BaseButton.ButtonEventArgs? args = null) => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderEjectChamberAllMessage()); - public void EjectBeaker(BaseButton.ButtonEventArgs? args = null) => SendMessage(new ItemSlotButtonPressedEvent(SharedReagentGrinderComponent.BeakerSlotId)); - public void EjectChamberContent(EntityUid uid) => SendMessage(new SharedReagentGrinderComponent.ReagentGrinderEjectChamberContentMessage(uid)); + public void StartGrinding(BaseButton.ButtonEventArgs? args = null) => SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Grind)); + public void StartJuicing(BaseButton.ButtonEventArgs? args = null) => SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Juice)); + public void EjectAll(BaseButton.ButtonEventArgs? args = null) => SendMessage(new ReagentGrinderEjectChamberAllMessage()); + public void EjectBeaker(BaseButton.ButtonEventArgs? args = null) => SendMessage(new ItemSlotButtonPressedEvent(SharedReagentGrinder.BeakerSlotId)); + public void EjectChamberContent(EntityUid uid) => SendMessage(new ReagentGrinderEjectChamberContentMessage(uid)); } } diff --git a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs index e02cc96ccb..04d3e178fc 100644 --- a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs +++ b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs @@ -1,7 +1,5 @@ using Robust.Client.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using static Content.Shared.Kitchen.Components.SharedReagentGrinderComponent; +using Content.Shared.Kitchen; namespace Content.Client.Kitchen.Visualizers { diff --git a/Content.Client/Options/UI/Tabs/NetworkTab.xaml b/Content.Client/Options/UI/Tabs/NetworkTab.xaml index 09ee2584f2..d010f0bd31 100644 --- a/Content.Client/Options/UI/Tabs/NetworkTab.xaml +++ b/Content.Client/Options/UI/Tabs/NetworkTab.xaml @@ -4,6 +4,9 @@ x:Class="Content.Client.Options.UI.Tabs.NetworkTab"> + + + + +