diff --git a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs index b95fdf12b16..cfc5a96e6df 100644 --- a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs +++ b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs @@ -1,8 +1,8 @@ using Content.Client.Stylesheets; +using Content.Goobstation.Maths.FixedPoint; using Content.Shared.Atmos; using Content.Shared.Atmos.Components; using Content.Shared.Atmos.Monitor; -using Content.Shared.FixedPoint; using Content.Shared.Temperature; using Robust.Client.AutoGenerated; using Robust.Client.Graphics; diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs index 0ce0c9c880a..21bb8ffabed 100644 --- a/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs +++ b/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs @@ -1,7 +1,8 @@ using Content.Client.Stylesheets; using Content.Shared.Atmos; using Content.Shared.Atmos.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Temperature; using Robust.Client.AutoGenerated; using Robust.Client.Graphics; diff --git a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs index 212ecc1fdf9..d49538106f7 100644 --- a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs +++ b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs @@ -247,7 +247,7 @@ private void OnVesselChange(NewVesselEnteredMessage ev) if (_musicProto == null) //if we don't find any, we play the default track. { _musicProto = _protMan.Index("default"); - //_lastBiome = _proto.Index("default"); + //_lastBiome = _protMan.Index("default"); } SoundCollectionPrototype soundcol = _protMan.Index(_musicProto.ID); diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs index 98852e82229..e904c41da6a 100644 --- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs +++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs @@ -11,7 +11,8 @@ using Robust.Shared.Utility; using System.Linq; using System.Numerics; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Client.Graphics; using static Robust.Client.UserInterface.Controls.BoxContainer; diff --git a/Content.Client/Chemistry/UI/FillableOneTimeInjectorStatusControl.cs b/Content.Client/Chemistry/UI/FillableOneTimeInjectorStatusControl.cs index 2c9e28138f3..de3e52c1eb1 100644 --- a/Content.Client/Chemistry/UI/FillableOneTimeInjectorStatusControl.cs +++ b/Content.Client/Chemistry/UI/FillableOneTimeInjectorStatusControl.cs @@ -2,7 +2,8 @@ using Content.Client.Stylesheets; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Timing; diff --git a/Content.Client/Chemistry/UI/HyposprayStatusControl.cs b/Content.Client/Chemistry/UI/HyposprayStatusControl.cs index 4a4d90dc4d5..fd905f4eee7 100644 --- a/Content.Client/Chemistry/UI/HyposprayStatusControl.cs +++ b/Content.Client/Chemistry/UI/HyposprayStatusControl.cs @@ -2,7 +2,8 @@ using Content.Client.Stylesheets; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Timing; diff --git a/Content.Client/Chemistry/UI/InjectorStatusControl.cs b/Content.Client/Chemistry/UI/InjectorStatusControl.cs index f9b0d90e205..f1eb761c904 100644 --- a/Content.Client/Chemistry/UI/InjectorStatusControl.cs +++ b/Content.Client/Chemistry/UI/InjectorStatusControl.cs @@ -2,7 +2,8 @@ using Content.Client.Stylesheets; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Timing; diff --git a/Content.Client/Chemistry/UI/SolutionStatusControl.cs b/Content.Client/Chemistry/UI/SolutionStatusControl.cs index 1a33ffb0e14..60849d01fcd 100644 --- a/Content.Client/Chemistry/UI/SolutionStatusControl.cs +++ b/Content.Client/Chemistry/UI/SolutionStatusControl.cs @@ -5,7 +5,8 @@ using Content.Client.Stylesheets; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Client.UserInterface.Controls; namespace Content.Client.Chemistry.UI; diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs index f1cb27a62a4..fc412734c53 100644 --- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.UserInterface; diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index ba4f4aec356..e543de8d11e 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -59,9 +59,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later - - - LobbyCharacterPanel.xaml diff --git a/Content.Client/Damage/DamageVisualsComponent.cs b/Content.Client/Damage/DamageVisualsComponent.cs index 90171e78f95..cabc37f09a4 100644 --- a/Content.Client/Damage/DamageVisualsComponent.cs +++ b/Content.Client/Damage/DamageVisualsComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Client.Damage; diff --git a/Content.Client/Damage/DamageVisualsSystem.cs b/Content.Client/Damage/DamageVisualsSystem.cs index e275f13f935..0cf1e636a96 100644 --- a/Content.Client/Damage/DamageVisualsSystem.cs +++ b/Content.Client/Damage/DamageVisualsSystem.cs @@ -1,7 +1,8 @@ using System.Linq; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Client.GameObjects; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs index a8c1d355105..a0dd1c06e0b 100644 --- a/Content.Client/Fluids/PuddleOverlay.cs +++ b/Content.Client/Fluids/PuddleOverlay.cs @@ -1,5 +1,6 @@ using System.Numerics; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Client.Graphics; using Robust.Client.ResourceManagement; using Robust.Shared.Enums; diff --git a/Content.Client/Guidebook/Controls/GuideFoodComposition.xaml.cs b/Content.Client/Guidebook/Controls/GuideFoodComposition.xaml.cs index b4f25a02e4c..97b9e42e9d2 100644 --- a/Content.Client/Guidebook/Controls/GuideFoodComposition.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideFoodComposition.xaml.cs @@ -1,6 +1,7 @@ using Content.Client.UserInterface.ControlExtensions; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/Guidebook/Controls/GuideFoodEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideFoodEmbed.xaml.cs index 355d3a020f8..9dfd5c89542 100644 --- a/Content.Client/Guidebook/Controls/GuideFoodEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideFoodEmbed.xaml.cs @@ -5,7 +5,8 @@ using Content.Client.Message; using Content.Client.Nutrition.EntitySystems; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Client.AutoGenerated; using Robust.Client.Graphics; diff --git a/Content.Client/Guidebook/Controls/GuideFoodSource.xaml.cs b/Content.Client/Guidebook/Controls/GuideFoodSource.xaml.cs index b0fee709759..b4ebccf7374 100644 --- a/Content.Client/Guidebook/Controls/GuideFoodSource.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideFoodSource.xaml.cs @@ -2,7 +2,8 @@ using Content.Client.Chemistry.EntitySystems; using Content.Client.UserInterface.ControlExtensions; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Nutrition.Components; using JetBrains.Annotations; using Robust.Client.AutoGenerated; diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs index 168f352d1ab..b85e050dc9b 100644 --- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs @@ -5,7 +5,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Localizations; using JetBrains.Annotations; using Robust.Client.AutoGenerated; diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index e2b07a5d778..77e3df55d82 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -5,7 +5,8 @@ using Content.Shared._Shitmed.Targeting; // Shitmed using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Humanoid; using Content.Shared.Humanoid.Prototypes; using Content.Shared.IdentityManagement; diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs index 193635bda7b..db7d9cde38a 100644 --- a/Content.Client/Overlays/EntityHealthBarOverlay.cs +++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs @@ -2,7 +2,8 @@ using Content.Client.StatusIcon; using Content.Client.UserInterface.Systems; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs index 372961ea9a3..73b3cd6f3f6 100644 --- a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs +++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs @@ -1,6 +1,7 @@ using System.Linq; using Content.Client.UserInterface.Controls; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Silicons.Laws; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.XAML; diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs index 58aebaddc67..844b83927e8 100644 --- a/Content.Client/Store/Ui/StoreMenu.xaml.cs +++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs @@ -2,7 +2,8 @@ using System.Text; using Content.Client.Actions; using Content.Client.Message; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Store; using Content.Client.Stylesheets; using Robust.Client.AutoGenerated; diff --git a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs index 79368557562..8cea6c72527 100644 --- a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs +++ b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs @@ -2,7 +2,8 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Store; using Robust.Client.UserInterface.Controls; using Robust.Shared.Prototypes; diff --git a/Content.Client/Tools/UI/WelderStatusControl.cs b/Content.Client/Tools/UI/WelderStatusControl.cs index 3d44d6fa84a..a4b68244a88 100644 --- a/Content.Client/Tools/UI/WelderStatusControl.cs +++ b/Content.Client/Tools/UI/WelderStatusControl.cs @@ -1,7 +1,8 @@ using Content.Client.Items.UI; using Content.Client.Message; using Content.Client.Stylesheets; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Tools.Components; using Content.Shared.Tools.Systems; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs index c10c33a9902..c93a6201475 100644 --- a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs +++ b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; diff --git a/Content.Client/WhiteDream/BloodCult/UI/BloodRitesUi.cs b/Content.Client/WhiteDream/BloodCult/UI/BloodRitesUi.cs index 9a221b025a5..43f50d5e4b6 100644 --- a/Content.Client/WhiteDream/BloodCult/UI/BloodRitesUi.cs +++ b/Content.Client/WhiteDream/BloodCult/UI/BloodRitesUi.cs @@ -1,7 +1,8 @@ using System.Numerics; using Content.Client.Popups; using Content.Client.UserInterface.Controls; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.WhiteDream.BloodCult.UI; using JetBrains.Annotations; using Robust.Client.GameObjects; diff --git a/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs b/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs index 0e3f89c2825..c3bbe357fc4 100644 --- a/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs +++ b/Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs @@ -1,5 +1,6 @@ using System.Reflection; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Markdown.Mapping; using Robust.Shared.Serialization.Markdown.Value; diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs index 89d33186a27..00f139f45d4 100644 --- a/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs +++ b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameObjects; namespace Content.IntegrationTests.Tests.Chemistry; diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs index 6b71dd08be0..79f69b493d9 100644 --- a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs +++ b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs @@ -1,6 +1,7 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs index cfc80073066..89bdc32d08b 100644 --- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs @@ -2,7 +2,8 @@ using Content.Server.Administration.Systems; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Robust.Shared.GameObjects; diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs index 75358cda47e..40757227dad 100644 --- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs +++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs @@ -2,7 +2,8 @@ using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; using Content.Shared.Execution; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Ghost; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs index 6eea519af3b..e7b2fe39ec1 100644 --- a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs +++ b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs @@ -1,7 +1,8 @@ using Content.IntegrationTests.Tests.Interaction; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.IntegrationTests.Tests.Construction.Interaction; diff --git a/Content.IntegrationTests/Tests/Damageable/DamageSpecifierTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageSpecifierTest.cs index bd5cac05dd1..8197cc6bab6 100644 --- a/Content.IntegrationTests/Tests/Damageable/DamageSpecifierTest.cs +++ b/Content.IntegrationTests/Tests/Damageable/DamageSpecifierTest.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.IntegrationTests.Tests.Damageable; diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs index 69069fc82fe..8dddb429cac 100644 --- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs +++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs @@ -1,7 +1,8 @@ using System.Linq; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs index d37de7a5044..7de542322ab 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs @@ -1,7 +1,8 @@ using Content.Server.Destructible.Thresholds.Triggers; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs index 80f750c715c..afdb779693a 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs @@ -5,7 +5,8 @@ using Content.Server.Destructible.Thresholds.Triggers; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.GameObjects; diff --git a/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs b/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs index 87ef41fe96e..4b2ade9ed26 100644 --- a/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/AbsorbentTest.cs @@ -1,7 +1,8 @@ using Content.Server.Fluids.EntitySystems; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids; using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; diff --git a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs index d6f9bf35986..1935fa0dd17 100644 --- a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs @@ -2,7 +2,8 @@ using Content.Server.Fluids.EntitySystems; using Content.Server.Spreader; using Content.Shared.Chemistry.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids.Components; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs index ee2d0cb1f7a..b28699ae078 100644 --- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs @@ -1,7 +1,8 @@ using Content.Server.Fluids.EntitySystems; using Content.Shared.Chemistry.Components; using Content.Shared.Coordinates; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids.Components; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs index 62b0a14f215..8436cf876cc 100644 --- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs @@ -15,7 +15,8 @@ using Content.Server.Station.Components; using Content.Shared.CCVar; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.GameTicking; using Content.Shared.Hands.Components; using Content.Shared.Inventory; diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs index d113b539c4b..8dc0df28747 100644 --- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs +++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs @@ -9,7 +9,8 @@ using Content.Shared.Construction.Components; using Content.Shared.Construction.Prototypes; using Content.Shared.Construction.Steps; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Lathe; using Content.Shared.Materials; using Content.Shared.Research.Prototypes; diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs index d4d551f4e0a..b7ecd7440d3 100644 --- a/Content.IntegrationTests/Tests/Minds/MindTests.cs +++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs @@ -6,7 +6,8 @@ using Content.Server.Roles; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Players; diff --git a/Content.IntegrationTests/Tests/StoreTests.cs b/Content.IntegrationTests/Tests/StoreTests.cs index 8ac8c1f65b7..09953b1cdcb 100644 --- a/Content.IntegrationTests/Tests/StoreTests.cs +++ b/Content.IntegrationTests/Tests/StoreTests.cs @@ -3,7 +3,8 @@ using System.Threading; using Content.Server.Store.Systems; using Content.Server.Traitor.Uplink; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Inventory; using Content.Shared.Mind; using Content.Shared.Store; diff --git a/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs index 83835a01afb..f6cf5679999 100644 --- a/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs +++ b/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs @@ -6,7 +6,8 @@ using Content.Shared.Abilities.Psionics; using Content.Shared.Chemistry.Components; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Popups; using Content.Shared.Psionics.Events; using Content.Shared.Examine; diff --git a/Content.Server/Administration/Commands/AddReagent.cs b/Content.Server/Administration/Commands/AddReagent.cs index 46e8e8c35e2..9779bc5219b 100644 --- a/Content.Server/Administration/Commands/AddReagent.cs +++ b/Content.Server/Administration/Commands/AddReagent.cs @@ -2,7 +2,8 @@ using Content.Shared.Administration; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Console; using Robust.Shared.Prototypes; using System.Linq; diff --git a/Content.Server/Administration/Commands/SetSolutionCapacity.cs b/Content.Server/Administration/Commands/SetSolutionCapacity.cs index 19900d488be..b502e99cf88 100644 --- a/Content.Server/Administration/Commands/SetSolutionCapacity.cs +++ b/Content.Server/Administration/Commands/SetSolutionCapacity.cs @@ -1,7 +1,8 @@ using Content.Server.Chemistry.Containers.EntitySystems; using Content.Shared.Administration; using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Console; using System.Linq; diff --git a/Content.Server/Administration/Logs/Converters/FixedPoint2Converter.cs b/Content.Server/Administration/Logs/Converters/FixedPoint2Converter.cs index 9f6dcfa2e50..e1bf2248926 100644 --- a/Content.Server/Administration/Logs/Converters/FixedPoint2Converter.cs +++ b/Content.Server/Administration/Logs/Converters/FixedPoint2Converter.cs @@ -1,5 +1,6 @@ using System.Text.Json; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Server.Administration.Logs.Converters; diff --git a/Content.Server/Administration/Toolshed/SolutionCommand.cs b/Content.Server/Administration/Toolshed/SolutionCommand.cs index 64b40e31207..03b00254ab6 100644 --- a/Content.Server/Administration/Toolshed/SolutionCommand.cs +++ b/Content.Server/Administration/Toolshed/SolutionCommand.cs @@ -2,7 +2,8 @@ using Content.Shared.Administration; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Toolshed; using Robust.Shared.Toolshed.Syntax; using Robust.Shared.Toolshed.TypeParsers; diff --git a/Content.Server/Animals/Components/UdderComponent.cs b/Content.Server/Animals/Components/UdderComponent.cs index f01c11c5dd7..398880845e8 100644 --- a/Content.Server/Animals/Components/UdderComponent.cs +++ b/Content.Server/Animals/Components/UdderComponent.cs @@ -1,7 +1,8 @@ using Content.Server.Animals.Systems; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; diff --git a/Content.Server/Animals/Components/WoolyComponent.cs b/Content.Server/Animals/Components/WoolyComponent.cs index 77dbd903322..987f1221ec8 100644 --- a/Content.Server/Animals/Components/WoolyComponent.cs +++ b/Content.Server/Animals/Components/WoolyComponent.cs @@ -1,7 +1,8 @@ using Content.Server.Animals.Systems; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; diff --git a/Content.Server/Atmos/Components/BarotraumaComponent.cs b/Content.Server/Atmos/Components/BarotraumaComponent.cs index d261c5ab030..eb52070aacb 100644 --- a/Content.Server/Atmos/Components/BarotraumaComponent.cs +++ b/Content.Server/Atmos/Components/BarotraumaComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Alert; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.Atmos.Components diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs index 04079aea478..73b063893dd 100644 --- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs +++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs @@ -5,7 +5,8 @@ using Content.Shared.Atmos; using Content.Shared.Damage; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Inventory; using Content.Shared.Inventory.Events; using Content.Shared.Mood; diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index 55e5ce84864..608e31a276a 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -22,7 +22,8 @@ using Content.Shared.Timing; using Content.Shared.Toggleable; using Content.Shared.Weapons.Melee.Events; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Server.Audio; using Content.Shared.Mood; using Robust.Shared.Physics.Components; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs index e903ceedafa..0905aa85273 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs @@ -8,7 +8,8 @@ using Content.Server.Power.EntitySystems; using Content.Shared.Atmos; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; namespace Content.Server.Atmos.Piping.Unary.EntitySystems; diff --git a/Content.Server/Atmos/Reactions/WaterVaporReaction.cs b/Content.Server/Atmos/Reactions/WaterVaporReaction.cs index e06c4b75ff9..3231846d220 100644 --- a/Content.Server/Atmos/Reactions/WaterVaporReaction.cs +++ b/Content.Server/Atmos/Reactions/WaterVaporReaction.cs @@ -3,7 +3,8 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Reactions; using Content.Shared.Chemistry.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Maps; using JetBrains.Annotations; diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs index d3a2831f2a3..e09d6bff7e3 100644 --- a/Content.Server/Body/Components/BloodstreamComponent.cs +++ b/Content.Server/Body/Components/BloodstreamComponent.cs @@ -7,7 +7,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs index fddaa4c517c..54bcf2e32aa 100644 --- a/Content.Server/Body/Components/MetabolizerComponent.cs +++ b/Content.Server/Body/Components/MetabolizerComponent.cs @@ -1,7 +1,8 @@ using Content.Server.Body.Systems; using Content.Server.Traits.Assorted; using Content.Shared.Body.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Content.Server.Limbus.Traits; diff --git a/Content.Server/Body/Events/NaturalBloodRegenerationAttemptEvent.cs b/Content.Server/Body/Events/NaturalBloodRegenerationAttemptEvent.cs index 8ad2b88efe8..319b09f2130 100644 --- a/Content.Server/Body/Events/NaturalBloodRegenerationAttemptEvent.cs +++ b/Content.Server/Body/Events/NaturalBloodRegenerationAttemptEvent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Server.Body.Events; diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs index a40bafc8cff..0a578483e97 100644 --- a/Content.Server/Body/Systems/BloodstreamSystem.cs +++ b/Content.Server/Body/Systems/BloodstreamSystem.cs @@ -12,7 +12,8 @@ using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; using Content.Shared.Drunk; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.HealthExaminable; using Content.Shared.Mobs.Systems; using Content.Shared.Nutrition.Components; diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs index a3fc940b30a..3615c83356a 100644 --- a/Content.Server/Body/Systems/MetabolizerSystem.cs +++ b/Content.Server/Body/Systems/MetabolizerSystem.cs @@ -7,7 +7,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Robust.Shared.Collections; diff --git a/Content.Server/Botany/Systems/BotanySystem.Produce.cs b/Content.Server/Botany/Systems/BotanySystem.Produce.cs index e309fb47720..1e23fe0aa97 100644 --- a/Content.Server/Botany/Systems/BotanySystem.Produce.cs +++ b/Content.Server/Botany/Systems/BotanySystem.Produce.cs @@ -1,5 +1,6 @@ using Content.Server.Botany.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Server.Botany.Systems; diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index b4e90491334..a6e88e7ded2 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -12,7 +12,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Coordinates.Helpers; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Hands.Components; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index 01c1f4c3e2d..b2ff37a35b0 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs @@ -49,7 +49,7 @@ private void InitializeShuttle() SubscribeLocalEvent(OnRoundRestart); SubscribeLocalEvent(OnStationInitialize); - Subs.CVar(_cfgManager, CCVars.GridFill, SetGridFill); + Subs.CVar(_cfg, CCVars.GridFill, SetGridFill); } private void SetGridFill(bool obj) @@ -356,7 +356,7 @@ private void OnStationInitialize(StationInitializedEvent args) if (!HasComp(args.Station)) // No cargo, L return; - if (_cfgManager.GetCVar(CCVars.GridFill) && _cfg.GetCVar(CargoCVars.CreateCargoMap)) + if (_cfg.GetCVar(CCVars.GridFill) && _cfg.GetCVar(CargoCVars.CreateCargoMap)) SetupTradePost(); } diff --git a/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs b/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs index 708c1ef0052..77044c085ab 100644 --- a/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs +++ b/Content.Server/Chemistry/Components/BaseSolutionInjectOnEventComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Inventory; namespace Content.Server.Chemistry.Components; diff --git a/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs b/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs index 9b9294b6f93..e33de8462df 100644 --- a/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs @@ -1,6 +1,7 @@ using Content.Server.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; diff --git a/Content.Server/Chemistry/Components/VaporComponent.cs b/Content.Server/Chemistry/Components/VaporComponent.cs index a2f4a01a2a0..a52056a6337 100644 --- a/Content.Server/Chemistry/Components/VaporComponent.cs +++ b/Content.Server/Chemistry/Components/VaporComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Server.Chemistry.Components { diff --git a/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs b/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs index 3d99db1129c..eb61f7f8fb8 100644 --- a/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs +++ b/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs @@ -1,7 +1,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Utility; diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs index 983fd9e0f45..aebcee48d9f 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs @@ -10,7 +10,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Containers.ItemSlots; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Storage; using JetBrains.Annotations; using Robust.Server.Audio; diff --git a/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs index 7c0f29efa6e..22eff393188 100644 --- a/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs @@ -10,7 +10,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Forensics; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs index afd04d2b830..480c2a21b7c 100644 --- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs +++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs @@ -4,7 +4,8 @@ using Content.Shared.Chemistry.Hypospray.Events; using Content.Shared.Chemistry; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Forensics; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs index 39ddca3412b..0c36a394afc 100644 --- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs @@ -10,7 +10,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Forensics; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs index c48bf086d39..3682b1c53ba 100644 --- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs @@ -5,7 +5,8 @@ using Content.Shared.Chemistry.Dispenser; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Containers.ItemSlots; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Nutrition.EntitySystems; using JetBrains.Annotations; using Robust.Server.Audio; diff --git a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs index 57ede394d0f..13e0d654578 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Timing; namespace Content.Server.Chemistry.EntitySystems; diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs index 1415b6cad3c..069fbe4bea0 100644 --- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs @@ -4,7 +4,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Physics; using Content.Shared.Throwing; using JetBrains.Annotations; diff --git a/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs b/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs index a20f54728ee..3bbcda7451f 100644 --- a/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs +++ b/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; using Content.Shared.Decals; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Map; using Robust.Shared.Map.Components; using System.Numerics; diff --git a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs index 3f5ae63c365..25468623747 100644 --- a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids.Components; using Robust.Shared.Map; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs index d3b57e76303..225abbcd9c5 100644 --- a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs @@ -1,6 +1,7 @@ using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Maps; using Content.Shared.Whitelist; using Robust.Shared.Map; diff --git a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs index 312b88bd341..43ef782ff6f 100644 --- a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs @@ -2,7 +2,8 @@ using Content.Shared.Atmos; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Shared.Map; diff --git a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs index a694bf60190..82753a75ab0 100644 --- a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs @@ -1,7 +1,8 @@ using Content.Server.Atmos.EntitySystems; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Shared.Map; diff --git a/Content.Server/Chemistry/TileReactions/PryTileReaction.cs b/Content.Server/Chemistry/TileReactions/PryTileReaction.cs index 39e95df5f7c..f6ba6f98f61 100644 --- a/Content.Server/Chemistry/TileReactions/PryTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/PryTileReaction.cs @@ -1,7 +1,8 @@ using Content.Server.Maps; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Maps; using JetBrains.Annotations; using Robust.Shared.Map; diff --git a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs index 82ede720cd0..38b35852e60 100644 --- a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Shared.Map; diff --git a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs index 8f8b0626a28..afc74529554 100644 --- a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Movement.Components; using Content.Shared.Movement.Systems; using Content.Shared.Slippery; diff --git a/Content.Server/Construction/Conditions/MinSolution.cs b/Content.Server/Construction/Conditions/MinSolution.cs index f98d639b7b7..bf9408373b6 100644 --- a/Content.Server/Construction/Conditions/MinSolution.cs +++ b/Content.Server/Construction/Conditions/MinSolution.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Construction; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.Construction.Conditions; diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj index 2c77bd8a689..00e3fdd944b 100644 --- a/Content.Server/Content.Server.csproj +++ b/Content.Server/Content.Server.csproj @@ -61,10 +61,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later - - - - diff --git a/Content.Server/Damage/Commands/HurtCommand.cs b/Content.Server/Damage/Commands/HurtCommand.cs index af9c1ee8fc3..1d5950993f1 100644 --- a/Content.Server/Damage/Commands/HurtCommand.cs +++ b/Content.Server/Damage/Commands/HurtCommand.cs @@ -4,7 +4,8 @@ using Content.Shared.Administration; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Console; using Robust.Shared.Prototypes; diff --git a/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs b/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs index 81018f539c9..ed1dce3d26f 100644 --- a/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs +++ b/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Server.Damage.Components; diff --git a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs index bc61c5d141a..1cb74276bdb 100644 --- a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs +++ b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs @@ -1,7 +1,8 @@ using Content.Shared.Bed.Sleep; using Content.Shared.Damage; using Content.Shared.Damage.ForceSay; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs; using Content.Shared.Mobs.Systems; using Content.Shared.Stunnable; diff --git a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs b/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs index b068c56a2bd..ef472a8b4ba 100644 --- a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs +++ b/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs @@ -8,7 +8,8 @@ using Content.Shared.CombatMode.Pacification; using Content.Shared.DeltaV.CCVars; using Content.Shared.Explosion.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Flash.Components; using Content.Shared.Store.Components; using Robust.Server.Player; diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs index d37dc2fca37..72f2a220950 100644 --- a/Content.Server/Destructible/DestructibleSystem.cs +++ b/Content.Server/Destructible/DestructibleSystem.cs @@ -12,7 +12,8 @@ using Content.Shared.Damage; using Content.Shared.Database; using Content.Shared.Destructible; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Server.Audio; using Robust.Shared.Containers; diff --git a/Content.Server/EntityEffects/EffectConditions/BloodReagentThreshold.cs b/Content.Server/EntityEffects/EffectConditions/BloodReagentThreshold.cs index 739bad7a5f0..89e0740ea36 100644 --- a/Content.Server/EntityEffects/EffectConditions/BloodReagentThreshold.cs +++ b/Content.Server/EntityEffects/EffectConditions/BloodReagentThreshold.cs @@ -1,7 +1,8 @@ using Content.Server.Body.Components; using Content.Shared.Chemistry.Reagent; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Content.Shared.Chemistry.EntitySystems; diff --git a/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs b/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs index 6cbd7b4ea57..6a399843a0b 100644 --- a/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs +++ b/Content.Server/EntityEffects/EffectConditions/ReagentThreshold.cs @@ -1,6 +1,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.EntityEffects.EffectConditions; diff --git a/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs index 2d039a1ac8f..fa48d0ee464 100644 --- a/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs +++ b/Content.Server/EntityEffects/EffectConditions/TotalDamage.cs @@ -1,6 +1,7 @@ using Content.Shared.EntityEffects; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.EntityEffects.EffectConditions; diff --git a/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs index 84ad4c22403..95fde577f96 100644 --- a/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs +++ b/Content.Server/EntityEffects/EffectConditions/TotalHunger.cs @@ -1,6 +1,7 @@ using Content.Shared.EntityEffects; using Content.Shared.Nutrition.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.EntityEffects.EffectConditions; diff --git a/Content.Server/EntityEffects/Effects/AddReagentToBlood.cs b/Content.Server/EntityEffects/Effects/AddReagentToBlood.cs index e75ad7e66e2..9f80d3bd2d0 100644 --- a/Content.Server/EntityEffects/Effects/AddReagentToBlood.cs +++ b/Content.Server/EntityEffects/Effects/AddReagentToBlood.cs @@ -5,7 +5,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Server.Body.Systems; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Content.Shared.Chemistry.Components; diff --git a/Content.Server/EntityEffects/Effects/AdjustReagent.cs b/Content.Server/EntityEffects/Effects/AdjustReagent.cs index 5437e3e2f86..86a52a8d0de 100644 --- a/Content.Server/EntityEffects/Effects/AdjustReagent.cs +++ b/Content.Server/EntityEffects/Effects/AdjustReagent.cs @@ -1,7 +1,8 @@ using Content.Shared.Body.Prototypes; using Content.Shared.Chemistry.Reagent; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs index 481f1fc27c5..b76d02f2da0 100644 --- a/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs +++ b/Content.Server/EntityEffects/Effects/AreaReactionEffect.cs @@ -3,7 +3,8 @@ using Content.Shared.Coordinates.Helpers; using Content.Shared.Database; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Maps; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/EntityEffects/Effects/HealthChange.cs b/Content.Server/EntityEffects/Effects/HealthChange.cs index 0d2a236bb45..23966bdca1d 100644 --- a/Content.Server/EntityEffects/Effects/HealthChange.cs +++ b/Content.Server/EntityEffects/Effects/HealthChange.cs @@ -1,7 +1,8 @@ using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Localizations; using Content.Shared._Shitmed.Targeting; // Shitmed Change using JetBrains.Annotations; diff --git a/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs index d8aca7d2842..c14a9415062 100644 --- a/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs +++ b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs @@ -1,7 +1,8 @@ using Content.Server.Body.Components; using Content.Server.Body.Systems; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.EntityEffects.Effects; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs index 4b59c8f1c48..e7537a712d6 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs @@ -4,7 +4,8 @@ using Content.Shared.Damage; using Content.Shared.Explosion; using Content.Shared.Explosion.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Map.Components; namespace Content.Server.Explosion.EntitySystems; diff --git a/Content.Server/Extinguisher/FireExtinguisherSystem.cs b/Content.Server/Extinguisher/FireExtinguisherSystem.cs index b33a1af157f..14907993818 100644 --- a/Content.Server/Extinguisher/FireExtinguisherSystem.cs +++ b/Content.Server/Extinguisher/FireExtinguisherSystem.cs @@ -3,7 +3,8 @@ using Content.Server.Popups; using Content.Shared.Chemistry.Components; using Content.Shared.Extinguisher; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Verbs; diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs index e5362eb4e9c..7aab0b96878 100644 --- a/Content.Server/Fluids/Components/SprayComponent.cs +++ b/Content.Server/Fluids/Components/SprayComponent.cs @@ -1,5 +1,6 @@ using Content.Server.Fluids.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.Prototypes; diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs index 99f2ac4a987..4aaf9ec0a1a 100644 --- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs +++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs @@ -2,7 +2,8 @@ using Content.Server.Popups; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids; using Content.Shared.Fluids.Components; using Content.Shared.Interaction; diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs index 2fd8608da94..d8d5b260a8e 100644 --- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs +++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs @@ -6,7 +6,8 @@ using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids; using Content.Shared.Fluids.Components; using Content.Shared.Interaction; diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs index d9605c775c1..d4265034867 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids.Components; namespace Content.Server.Fluids.EntitySystems; diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs index 6842349828d..4c1d5a0f787 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs @@ -7,7 +7,8 @@ using Content.Shared.Clothing; using Content.Shared.CombatMode.Pacification; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids.Components; using Content.Shared.IdentityManagement; using Content.Shared.Nutrition.EntitySystems; diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs index 04bbf55c581..7542c24d5b1 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs @@ -1,6 +1,7 @@ using Content.Shared.Chemistry.Components; using Content.Shared.DragDrop; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids; namespace Content.Server.Fluids.EntitySystems; diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index 545710325a8..15489739d78 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -11,7 +11,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; using Content.Shared.Effects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids; using Content.Shared.Fluids.Components; using Content.Shared.Friction; diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs index 2459a5cc7e5..d4fcc73b305 100644 --- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs +++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs @@ -10,7 +10,8 @@ using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Smoking; using Robust.Server.GameObjects; using Robust.Shared.Map.Components; diff --git a/Content.Server/Fluids/EntitySystems/SpraySystem.cs b/Content.Server/Fluids/EntitySystems/SpraySystem.cs index 17a16ee2b16..3f64c07a000 100644 --- a/Content.Server/Fluids/EntitySystems/SpraySystem.cs +++ b/Content.Server/Fluids/EntitySystems/SpraySystem.cs @@ -5,7 +5,8 @@ using Content.Server.Fluids.Components; using Content.Server.Gravity; using Content.Server.Popups; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Timing; using Content.Shared.Vapor; diff --git a/Content.Server/FootPrint/PuddleFootPrintsSystem.cs b/Content.Server/FootPrint/PuddleFootPrintsSystem.cs index a778bcf2c7d..01bb604e843 100644 --- a/Content.Server/FootPrint/PuddleFootPrintsSystem.cs +++ b/Content.Server/FootPrint/PuddleFootPrintsSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.FootPrint; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids.Components; using Content.Shared.Forensics; using Robust.Shared.Physics.Events; diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs index 119abc9d69d..b3f09d084d0 100644 --- a/Content.Server/GameTicking/GameTicker.GamePreset.cs +++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs @@ -8,7 +8,8 @@ using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Ghost; using Content.Shared.Mind; using Content.Shared.Mobs; diff --git a/Content.Server/GameTicking/Rules/Components/DeathMatchRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/DeathMatchRuleComponent.cs index cb2c4138702..68a8f834953 100644 --- a/Content.Server/GameTicking/Rules/Components/DeathMatchRuleComponent.cs +++ b/Content.Server/GameTicking/Rules/Components/DeathMatchRuleComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Roles; using Content.Shared.Storage; using Robust.Shared.Network; diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs index 696f72a6ed7..af59ddccf23 100644 --- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs +++ b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Dataset; using Content.Shared.NPC.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Random; using Content.Shared.Roles; using Robust.Shared.Audio; diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index 68fc4b80fd3..6cbd5e2e226 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -5,7 +5,8 @@ using Content.Server.PDA.Ringer; using Content.Server.Roles; using Content.Server.Traitor.Uplink; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.GameTicking.Components; using Content.Shared.Mind; using Content.Shared.Mobs.Systems; diff --git a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs index 8fd088408c0..ca264836eac 100644 --- a/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs +++ b/Content.Server/GuideGenerator/ChemistryJsonGenerator.cs @@ -6,7 +6,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Damage; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.GuideGenerator; diff --git a/Content.Server/KillTracking/KillTrackerComponent.cs b/Content.Server/KillTracking/KillTrackerComponent.cs index aad6671df94..5ceefa81d61 100644 --- a/Content.Server/KillTracking/KillTrackerComponent.cs +++ b/Content.Server/KillTracking/KillTrackerComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs; using Robust.Shared.Network; diff --git a/Content.Server/KillTracking/KillTrackingSystem.cs b/Content.Server/KillTracking/KillTrackingSystem.cs index 63627fd1b97..8c3e732ee5b 100644 --- a/Content.Server/KillTracking/KillTrackingSystem.cs +++ b/Content.Server/KillTracking/KillTrackingSystem.cs @@ -1,6 +1,7 @@ using Content.Server.NPC.HTN; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs; using Robust.Shared.Player; diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 9839e5098d6..ac24004dcdd 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -18,7 +18,8 @@ using Content.Shared.Construction.EntitySystems; using Content.Shared.Database; using Content.Shared.Destructible; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Robust.Shared.Random; diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs index 4a118e696fa..a851ce45dc5 100644 --- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -6,7 +6,8 @@ using Content.Server.Stack; using Content.Shared.Chemistry.Components; using Content.Shared.Containers.ItemSlots; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Kitchen; using Content.Shared.Kitchen.Components; @@ -324,7 +325,7 @@ private void DoWork(EntityUid uid, ReagentGrinderComponent reagentGrinder, Grind var active = AddComp(uid); active.EndTime = _timing.CurTime + reagentGrinder.WorkTime * reagentGrinder.WorkTimeMultiplier; active.Program = program; - + // slightly higher pitched var audio = _audioSystem.PlayPvs(sound, uid, AudioParams.Default.WithPitchScale(1 / reagentGrinder.WorkTimeMultiplier)); diff --git a/Content.Server/Lightning/Components/LightningTargetComponent.cs b/Content.Server/Lightning/Components/LightningTargetComponent.cs index 6d806b3fe7e..b5856197eac 100644 --- a/Content.Server/Lightning/Components/LightningTargetComponent.cs +++ b/Content.Server/Lightning/Components/LightningTargetComponent.cs @@ -1,6 +1,7 @@ using Content.Server.Tesla.EntitySystems; using Content.Shared.Explosion; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.Lightning.Components; @@ -19,7 +20,7 @@ public sealed partial class LightningTargetComponent : Component public float HitProbability = 1f; /// - /// Priority level for selecting a lightning target. + /// Priority level for selecting a lightning target. /// [DataField, ViewVariables(VVAccess.ReadWrite)] public int Priority; diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs index a8abc729204..12285efa3ff 100644 --- a/Content.Server/Mech/Systems/MechSystem.cs +++ b/Content.Server/Mech/Systems/MechSystem.cs @@ -6,7 +6,8 @@ using Content.Shared.ActionBlocker; using Content.Shared.Damage; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Mech; using Content.Shared.Mech.Components; diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs index 73cce899903..984bd1595ac 100644 --- a/Content.Server/Medical/HealingSystem.cs +++ b/Content.Server/Medical/HealingSystem.cs @@ -9,7 +9,8 @@ using Content.Shared.Damage; using Content.Shared.Database; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Medical; diff --git a/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs b/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs index b8304c562a4..1581cd8a68b 100644 --- a/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs +++ b/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs @@ -6,7 +6,8 @@ using Content.Shared.Clothing; using Content.Shared.Damage; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Medical; using Content.Shared.Medical.Stethoscope; using Content.Shared.Mobs.Components; diff --git a/Content.Server/Mood/MoodComponent.cs b/Content.Server/Mood/MoodComponent.cs index caa221fe18e..8e73f6ba70e 100644 --- a/Content.Server/Mood/MoodComponent.cs +++ b/Content.Server/Mood/MoodComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Alert; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Generic; diff --git a/Content.Server/Mood/MoodSystem.cs b/Content.Server/Mood/MoodSystem.cs index e959e354671..f8a556014c8 100644 --- a/Content.Server/Mood/MoodSystem.cs +++ b/Content.Server/Mood/MoodSystem.cs @@ -3,7 +3,8 @@ using Content.Shared.Alert; using Content.Shared.Chat; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index 3303372f66b..830085fa8dc 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -1,6 +1,7 @@ using Content.Server.Body.Components; using Content.Shared.Nutrition.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.Prototypes; diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index 3b4afc2d6ad..bb14582bae2 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -18,7 +18,8 @@ using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.IdentityManagement; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index e8fca86e545..3f6019590c3 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -12,7 +12,8 @@ using Content.Shared.Chemistry; using Content.Shared.Database; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.IdentityManagement; diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs index 71360c1cb47..41d565e09dd 100644 --- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs @@ -5,7 +5,8 @@ using Content.Shared.Nutrition.Components; using Content.Shared.Chemistry.Components; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs index 7f8253efedf..db27109e6b9 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs @@ -7,7 +7,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Clothing.Components; using Content.Shared.Clothing.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Inventory; using Content.Shared.Inventory.Events; using Content.Shared.Item; diff --git a/Content.Server/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs b/Content.Server/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs index 3eb8f8bbce9..53dbb9410ac 100644 --- a/Content.Server/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs +++ b/Content.Server/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Construction.Prototypes; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Nutrition; using Content.Shared.Nyanotrasen.Kitchen; using Content.Shared.Nyanotrasen.Kitchen.Components; diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs index ae3e8b10811..ce666237ad3 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs @@ -9,7 +9,8 @@ using Content.Shared.Atmos.Rotting; using Content.Shared.Buckle.Components; using Content.Shared.Chemistry.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs.Components; using Content.Shared.NPC; using Content.Shared.Nutrition.Components; diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs index ceab74801b2..d701d4fcaa4 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Update.cs @@ -5,7 +5,8 @@ using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reagent; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Popups; using Robust.Shared.Player; diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs index ddc534b5505..d7ef133b428 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs @@ -30,7 +30,8 @@ using Content.Shared.DragDrop; using Content.Shared.EntityEffects; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.IdentityManagement; diff --git a/Content.Server/Points/PointSystem.cs b/Content.Server/Points/PointSystem.cs index b5f94d097ed..0ede32723d3 100644 --- a/Content.Server/Points/PointSystem.cs +++ b/Content.Server/Points/PointSystem.cs @@ -1,5 +1,6 @@ using System.Linq; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Points; using JetBrains.Annotations; using Robust.Server.GameStates; diff --git a/Content.Server/Power/Components/RiggableComponent.cs b/Content.Server/Power/Components/RiggableComponent.cs index 797c8c81f4c..24834cf7ab0 100644 --- a/Content.Server/Power/Components/RiggableComponent.cs +++ b/Content.Server/Power/Components/RiggableComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Server.Power.Components; diff --git a/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs b/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs index d36828eb83a..d12ecb61dce 100644 --- a/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs +++ b/Content.Server/Power/Generator/ChemicalFuelGeneratorAdapterComponent.cs @@ -1,7 +1,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs index 721a959820b..0722a16cef3 100644 --- a/Content.Server/Power/Generator/GeneratorSystem.cs +++ b/Content.Server/Power/Generator/GeneratorSystem.cs @@ -6,7 +6,8 @@ using Content.Server.Popups; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Popups; using Content.Shared.Power.Generator; using Robust.Server.GameObjects; diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs index c889d59f155..d3dae847267 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs @@ -18,7 +18,8 @@ using Content.Shared.Physics; using Content.Shared.DoAfter; using Content.Shared.Emag.Systems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Humanoid; using Content.Shared.Maps; using Content.Shared.Mobs; diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs index fa4f6db240c..2e2cf3b2469 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs @@ -8,7 +8,8 @@ using Content.Shared.DoAfter; using Content.Shared.Examine; using Content.Shared.Eye; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Maps; using Content.Shared.Mobs.Systems; diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs index 926ecc2db92..33d9769f093 100644 --- a/Content.Server/StationEvents/Events/IonStormRule.cs +++ b/Content.Server/StationEvents/Events/IonStormRule.cs @@ -5,7 +5,8 @@ using Content.Shared.Administration.Logs; using Content.Shared.Database; using Content.Shared.Dataset; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.GameTicking.Components; using Content.Shared.Random; using Content.Shared.Random.Helpers; diff --git a/Content.Server/Store/Components/CurrencyComponent.cs b/Content.Server/Store/Components/CurrencyComponent.cs index cfe9b76c8bf..a3f3c8c492e 100644 --- a/Content.Server/Store/Components/CurrencyComponent.cs +++ b/Content.Server/Store/Components/CurrencyComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Store; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; diff --git a/Content.Server/Store/Systems/StoreSystem.Command.cs b/Content.Server/Store/Systems/StoreSystem.Command.cs index 5ad361eb427..6b3ab67b8c3 100644 --- a/Content.Server/Store/Systems/StoreSystem.Command.cs +++ b/Content.Server/Store/Systems/StoreSystem.Command.cs @@ -1,6 +1,7 @@ using System.Linq; using Content.Server.Store.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Store.Components; diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs index 827fe5d8d31..d1e8b84bed1 100644 --- a/Content.Server/Store/Systems/StoreSystem.Ui.cs +++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs @@ -6,7 +6,8 @@ using Content.Server.Store.Components; using Content.Shared.Actions; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Hands.EntitySystems; using Content.Shared.Mind; using Content.Shared.Store; diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs index 7bdf550301e..f8a4dcc5dbd 100644 --- a/Content.Server/Store/Systems/StoreSystem.cs +++ b/Content.Server/Store/Systems/StoreSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Store.Components; using Content.Shared.UserInterface; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Implants.Components; using Content.Shared.Interaction; using Content.Shared.Popups; diff --git a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs index 1e3bad4e06e..6c1f69b45a1 100644 --- a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs +++ b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs @@ -1,7 +1,8 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Server.Store.Systems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Store; using Content.Shared.StoreDiscount.Components; using Robust.Shared.Prototypes; diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs index ae2c373b140..8ee5fe831e8 100644 --- a/Content.Server/Temperature/Components/TemperatureComponent.cs +++ b/Content.Server/Temperature/Components/TemperatureComponent.cs @@ -1,7 +1,8 @@ using Content.Shared.Alert; using Content.Shared.Atmos; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.Temperature.Components; diff --git a/Content.Server/Tools/ToolSystem.cs b/Content.Server/Tools/ToolSystem.cs index cc47436e18b..0ada31cda9a 100644 --- a/Content.Server/Tools/ToolSystem.cs +++ b/Content.Server/Tools/ToolSystem.cs @@ -1,7 +1,8 @@ using Content.Server.Atmos.EntitySystems; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Tools.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs b/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs index f5fde87c11f..6ae5b0454ac 100644 --- a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs +++ b/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs @@ -1,7 +1,8 @@ using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.CCVar; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Server.Player; using Robust.Shared.Configuration; using Robust.Shared.Console; diff --git a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs index 759cad5deda..caa73818366 100644 --- a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs +++ b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs @@ -1,7 +1,8 @@ using System.Linq; using Content.Server.Storage.EntitySystems; using Content.Server.Store.Systems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Store; using Content.Shared.Store.Components; using Robust.Shared.Random; diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs index 4cdaaa2a8d6..6f808953f37 100644 --- a/Content.Server/Traitor/Uplink/UplinkSystem.cs +++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs @@ -1,7 +1,8 @@ using System.Linq; using Content.Server.Store.Systems; using Content.Server.StoreDiscount.Systems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Hands.EntitySystems; using Content.Shared.Implants; using Content.Shared.Inventory; diff --git a/Content.Server/Traits/Assorted/KillOnDamageSystem.cs b/Content.Server/Traits/Assorted/KillOnDamageSystem.cs index 6237658fae4..f0d7bb39ffa 100644 --- a/Content.Server/Traits/Assorted/KillOnDamageSystem.cs +++ b/Content.Server/Traits/Assorted/KillOnDamageSystem.cs @@ -2,7 +2,8 @@ using Content.Shared.Mobs.Systems; using Content.Shared.Popups; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.IdentityManagement; using Content.Shared.Mobs.Components; diff --git a/Content.Server/Traits/Assorted/SingerSystem.cs b/Content.Server/Traits/Assorted/SingerSystem.cs index bf435a038c2..50afd7ddb98 100644 --- a/Content.Server/Traits/Assorted/SingerSystem.cs +++ b/Content.Server/Traits/Assorted/SingerSystem.cs @@ -5,7 +5,8 @@ using Content.Shared.Bed.Sleep; using Content.Shared.Damage; using Content.Shared.Damage.ForceSay; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Instruments; using Content.Shared.Inventory; using Content.Shared.Inventory.Events; diff --git a/Content.Server/Traits/BloodDeficiencySystem.cs b/Content.Server/Traits/BloodDeficiencySystem.cs index 8928bc57a1c..ddcd346afd0 100644 --- a/Content.Server/Traits/BloodDeficiencySystem.cs +++ b/Content.Server/Traits/BloodDeficiencySystem.cs @@ -1,7 +1,8 @@ using Content.Server.Body.Components; using Content.Server.Body.Events; using Content.Server.Traits.Assorted; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Server.Traits; diff --git a/Content.Server/Traits/TraitSystem.Functions.cs b/Content.Server/Traits/TraitSystem.Functions.cs index f99dbbeb602..06796a2d797 100644 --- a/Content.Server/Traits/TraitSystem.Functions.cs +++ b/Content.Server/Traits/TraitSystem.Functions.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Traits; using JetBrains.Annotations; using Robust.Shared.Prototypes; diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs index 0dcd92f9417..8bcb8dfc958 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs @@ -1,7 +1,8 @@ using Content.Server.Power.Components; using Content.Shared.Damage; using Content.Shared.Damage.Events; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Projectiles; using Content.Shared.Weapons.Ranged; using Content.Shared.Weapons.Ranged.Components; diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs index e7bd3683d38..4cf20aae8a7 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs @@ -1,7 +1,8 @@ using Content.Shared.Damage; using Content.Shared.Damage.Events; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Projectiles; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.Prototypes; diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs index 7ad4b15ffc7..6e7d8420f74 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs @@ -2,7 +2,8 @@ using Content.Server.Chemistry.Containers.EntitySystems; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Vapor; using Content.Shared.Weapons.Ranged; using Content.Shared.Weapons.Ranged.Components; diff --git a/Content.Server/Whetstone/WhetstoneComponent.cs b/Content.Server/Whetstone/WhetstoneComponent.cs index 59fab2e04bf..1f4a831698a 100644 --- a/Content.Server/Whetstone/WhetstoneComponent.cs +++ b/Content.Server/Whetstone/WhetstoneComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Whitelist; using Robust.Shared.Audio; diff --git a/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesAuraComponent.cs b/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesAuraComponent.cs index 081e0e04c6e..f2d884cd53b 100644 --- a/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesAuraComponent.cs +++ b/Content.Server/WhiteDream/BloodCult/BloodRites/BloodRitesAuraComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Server/WhiteDream/BloodCult/Runes/Offering/CultRuneOfferingComponent.cs b/Content.Server/WhiteDream/BloodCult/Runes/Offering/CultRuneOfferingComponent.cs index 5e594808d98..6a6c9dabcba 100644 --- a/Content.Server/WhiteDream/BloodCult/Runes/Offering/CultRuneOfferingComponent.cs +++ b/Content.Server/WhiteDream/BloodCult/Runes/Offering/CultRuneOfferingComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Server.WhiteDream.BloodCult.Runes.Offering; diff --git a/Content.Server/WhiteDream/BloodCult/Runes/Revive/CultRuneReviveComponent.cs b/Content.Server/WhiteDream/BloodCult/Runes/Revive/CultRuneReviveComponent.cs index ba703e89ea1..0c88612daaf 100644 --- a/Content.Server/WhiteDream/BloodCult/Runes/Revive/CultRuneReviveComponent.cs +++ b/Content.Server/WhiteDream/BloodCult/Runes/Revive/CultRuneReviveComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Server.WhiteDream.BloodCult.Runes.Revive; diff --git a/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs b/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs index 871d10a7c27..d7ccf87023a 100644 --- a/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs +++ b/Content.Server/_DV/Abilities/Chitinid/ChitinidComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; diff --git a/Content.Server/_Goobstation/Blob/Systems/BlobCoreSystem.cs b/Content.Server/_Goobstation/Blob/Systems/BlobCoreSystem.cs index 2a3016a7eee..6eb927e681c 100644 --- a/Content.Server/_Goobstation/Blob/Systems/BlobCoreSystem.cs +++ b/Content.Server/_Goobstation/Blob/Systems/BlobCoreSystem.cs @@ -20,7 +20,8 @@ using Content.Shared.Damage; using Content.Shared.Destructible; using Content.Shared.Explosion.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.GameTicking.Components; using Content.Shared.Objectives.Components; using Content.Shared.Popups; diff --git a/Content.Server/_Goobstation/Blob/Systems/BlobFactorySystem.cs b/Content.Server/_Goobstation/Blob/Systems/BlobFactorySystem.cs index 6efeff65817..c6ba2b8a397 100644 --- a/Content.Server/_Goobstation/Blob/Systems/BlobFactorySystem.cs +++ b/Content.Server/_Goobstation/Blob/Systems/BlobFactorySystem.cs @@ -6,7 +6,8 @@ using Content.Shared.Damage; using Content.Shared.Destructible; using Content.Shared.Explosion.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Weapons.Melee; using Robust.Shared.Prototypes; diff --git a/Content.Server/_Goobstation/Blob/Systems/BlobResourceSystem.cs b/Content.Server/_Goobstation/Blob/Systems/BlobResourceSystem.cs index 871893dda40..ba880deddc8 100644 --- a/Content.Server/_Goobstation/Blob/Systems/BlobResourceSystem.cs +++ b/Content.Server/_Goobstation/Blob/Systems/BlobResourceSystem.cs @@ -1,7 +1,8 @@ using Content.Server._Goobstation.Blob.Components; using Content.Shared._Goobstation.Blob; using Content.Shared._Goobstation.Blob.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Popups; namespace Content.Server._Goobstation.Blob.Systems; diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs index f30d07617c1..a9415376dc4 100644 --- a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs +++ b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs @@ -11,7 +11,8 @@ using Content.Shared.Damage.Components; using Content.Shared.Damage.Prototypes; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.IdentityManagement; using Content.Shared.Mobs; using Content.Shared.Store.Components; diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs index 814fa2fef2d..9a70c639ac5 100644 --- a/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs +++ b/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs @@ -9,7 +9,8 @@ using Content.Shared.Changeling; using Content.Shared.Chemistry.Components; using Content.Shared.Cuffs.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Humanoid; using Content.Shared.IdentityManagement; using Content.Shared.Mobs; diff --git a/Content.Server/_Goobstation/EntityEffects/EffectConditions/TypedDamageThreshold.cs b/Content.Server/_Goobstation/EntityEffects/EffectConditions/TypedDamageThreshold.cs index 2bdcb898c5c..277996d2021 100644 --- a/Content.Server/_Goobstation/EntityEffects/EffectConditions/TypedDamageThreshold.cs +++ b/Content.Server/_Goobstation/EntityEffects/EffectConditions/TypedDamageThreshold.cs @@ -1,7 +1,8 @@ using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Localizations; using Robust.Shared.Prototypes; diff --git a/Content.Server/_Lavaland/Mobs/Hierophant/HierophantSystem.cs b/Content.Server/_Lavaland/Mobs/Hierophant/HierophantSystem.cs index 9288a951fa7..1198a021dda 100644 --- a/Content.Server/_Lavaland/Mobs/Hierophant/HierophantSystem.cs +++ b/Content.Server/_Lavaland/Mobs/Hierophant/HierophantSystem.cs @@ -11,7 +11,8 @@ using Content.Server._Lavaland.Mobs.Hierophant.Components; using Content.Shared._Lavaland.Aggression; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs; using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Components; @@ -158,7 +159,7 @@ private void TickTimer(ref float timer, float frameTime, Action onFired) private void InitBoss(Entity ent, AggressiveComponent aggressors) { - ent.Comp.Aggressive = true; + ent.Comp.Aggressive = true; RaiseLocalEvent(ent, new MegafaunaStartupEvent()); } diff --git a/Content.Server/_Lavaland/Tendril/TendrilSystem.cs b/Content.Server/_Lavaland/Tendril/TendrilSystem.cs index dd426d61f68..09a132c4e13 100644 --- a/Content.Server/_Lavaland/Tendril/TendrilSystem.cs +++ b/Content.Server/_Lavaland/Tendril/TendrilSystem.cs @@ -2,7 +2,8 @@ using Content.Server._Lavaland.Tendril.Components; using Content.Shared.Damage; using Content.Shared.Destructible; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs; using Content.Shared.Popups; using Robust.Server.GameObjects; diff --git a/Content.Server/_NF/Shuttles/Tools/Component/OnToolsUseComponent.cs b/Content.Server/_NF/Shuttles/Tools/Component/OnToolsUseComponent.cs index 670d1b34ee2..7fd25c2cf47 100644 --- a/Content.Server/_NF/Shuttles/Tools/Component/OnToolsUseComponent.cs +++ b/Content.Server/_NF/Shuttles/Tools/Component/OnToolsUseComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Tools.Components; using Robust.Shared.Audio; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Bed/Sleep/SleepingComponent.cs b/Content.Shared/Bed/Sleep/SleepingComponent.cs index e43c71769ab..fdac265813b 100644 --- a/Content.Shared/Bed/Sleep/SleepingComponent.cs +++ b/Content.Shared/Bed/Sleep/SleepingComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.GameStates; diff --git a/Content.Shared/Beeper/Components/BeeperComponent.cs b/Content.Shared/Beeper/Components/BeeperComponent.cs index f6efbb10f3e..6cf5715378e 100644 --- a/Content.Shared/Beeper/Components/BeeperComponent.cs +++ b/Content.Shared/Beeper/Components/BeeperComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Beeper.Systems; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.ProximityDetection.Systems; using Robust.Shared.Audio; using Robust.Shared.GameStates; diff --git a/Content.Shared/Beeper/Systems/BeeperSystem.cs b/Content.Shared/Beeper/Systems/BeeperSystem.cs index a52e19f7552..01a272df22a 100644 --- a/Content.Shared/Beeper/Systems/BeeperSystem.cs +++ b/Content.Shared/Beeper/Systems/BeeperSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Beeper.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Item.ItemToggle; using Content.Shared.Item.ItemToggle.Components; using Robust.Shared.Audio.Systems; diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs index 8a8aa4ac927..184145dfa3c 100644 --- a/Content.Shared/Body/Part/BodyPartComponent.cs +++ b/Content.Shared/Body/Part/BodyPartComponent.cs @@ -7,7 +7,8 @@ // Shitmed Change using Content.Shared.Containers.ItemSlots; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared._Shitmed.Medical.Surgery.Tools; using Content.Shared._Shitmed.Targeting; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs index a899bca3f19..637b4b1cb56 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs @@ -118,7 +118,7 @@ private void OnBodyMapInit(Entity ent, ref MapInitEvent args) // One-time setup // Obviously can't run in Init to avoid double-spawns on save / load. - var prototype = _prototypeManager.Index(ent.Comp.Prototype.Value); + var prototype = Prototypes.Index(ent.Comp.Prototype.Value); MapInitBody(ent, prototype); } @@ -473,7 +473,7 @@ private void OnBeingEquippedAttempt(Entity ent, ref IsEquippingAt && bodyPart is not null) { var bodyPartString = bodyPart.Value.ToString().ToLower(); - var prototype = _prototypeManager.Index(targetBody.Prototype.Value); + var prototype = Prototypes.Index(targetBody.Prototype.Value); var hasPartConnection = prototype.Slots.Values.Any(slot => slot.Connections.Contains(bodyPartString)); diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index 863ba7173ca..86ddfb7feea 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -390,8 +390,8 @@ private void PartRemoveDamage(Entity bodyEnt, Entity("Bloodloss"), partEnt.Comp.VitalDamage); // Shitmed Change - _damageable.TryChangeDamage(bodyEnt, damage, partMultiplier: 0f); // Shitmed Change + var damage = new DamageSpecifier(Prototypes.Index("Bloodloss"), partEnt.Comp.VitalDamage); // Shitmed Change + Damageable.TryChangeDamage(bodyEnt, damage, partMultiplier: 0f); // Shitmed Change } } diff --git a/Content.Shared/Body/Systems/SharedBodySystem.cs b/Content.Shared/Body/Systems/SharedBodySystem.cs index 1442e273028..7fbe3045d9b 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.cs @@ -27,6 +27,8 @@ public abstract partial class SharedBodySystem : EntitySystem /// Container ID prefix for any body organs. /// public const string OrganSlotContainerIdPrefix = "body_organ_slot_"; + [Dependency] protected readonly IPrototypeManager Prototypes = default!; + [Dependency] protected readonly DamageableSystem Damageable = default!; [Dependency] protected readonly MovementSpeedModifierSystem Movement = default!; [Dependency] protected readonly SharedContainerSystem Containers = default!; [Dependency] protected readonly SharedTransformSystem SharedTransform = default!; diff --git a/Content.Shared/Chemistry/Components/FillableOneTimeInjectorComponent.cs b/Content.Shared/Chemistry/Components/FillableOneTimeInjectorComponent.cs index e74563c531f..1570053ee16 100644 --- a/Content.Shared/Chemistry/Components/FillableOneTimeInjectorComponent.cs +++ b/Content.Shared/Chemistry/Components/FillableOneTimeInjectorComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Chemistry.EntitySystems; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Chemistry/Components/HyposprayComponent.cs b/Content.Shared/Chemistry/Components/HyposprayComponent.cs index b467a1cb43b..e730e185281 100644 --- a/Content.Shared/Chemistry/Components/HyposprayComponent.cs +++ b/Content.Shared/Chemistry/Components/HyposprayComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; using Robust.Shared.Serialization; using Robust.Shared.Audio; diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs index c583ee66640..5dadb4fabc0 100644 --- a/Content.Shared/Chemistry/Components/InjectorComponent.cs +++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Chemistry.EntitySystems; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Chemistry/Components/ReagentTankComponent.cs b/Content.Shared/Chemistry/Components/ReagentTankComponent.cs index 3aa1756cf9c..095e1105ed7 100644 --- a/Content.Shared/Chemistry/Components/ReagentTankComponent.cs +++ b/Content.Shared/Chemistry/Components/ReagentTankComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs b/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs index 245b7398a7e..8ceb1976074 100644 --- a/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs +++ b/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; namespace Content.Shared.Chemistry.Components; diff --git a/Content.Shared/Chemistry/Components/RehydratableComponent.cs b/Content.Shared/Chemistry/Components/RehydratableComponent.cs index 00599498e42..c6c28965fbc 100644 --- a/Content.Shared/Chemistry/Components/RehydratableComponent.cs +++ b/Content.Shared/Chemistry/Components/RehydratableComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/Chemistry/Components/SmokeComponent.cs b/Content.Shared/Chemistry/Components/SmokeComponent.cs index db4ad37c7ab..97da110c196 100644 --- a/Content.Shared/Chemistry/Components/SmokeComponent.cs +++ b/Content.Shared/Chemistry/Components/SmokeComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids.Components; using Robust.Shared.GameStates; diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs index f16cf4a80fa..7018641da91 100644 --- a/Content.Shared/Chemistry/Components/Solution.cs +++ b/Content.Shared/Chemistry/Components/Solution.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs index b130304afc8..251bdd1f6cf 100644 --- a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; namespace Content.Shared.Chemistry.Components; diff --git a/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs index 36ca791290a..2a66a2ce8ba 100644 --- a/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Popups; using Robust.Shared.Network; using Robust.Shared.Random; diff --git a/Content.Shared/Chemistry/EntitySystems/SharedFillableOneTimeInjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedFillableOneTimeInjectorSystem.cs index 6e7f2287097..65fd897af6a 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedFillableOneTimeInjectorSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedFillableOneTimeInjectorSystem.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.CombatMode; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction.Events; using Content.Shared.Mobs.Systems; using Content.Shared.Popups; diff --git a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs index 1620344652c..425213fa1cc 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.CombatMode; using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction.Events; using Content.Shared.Mobs.Systems; using Content.Shared.Popups; diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs index ce0cfab0021..6dbc0f9567a 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs @@ -1,7 +1,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reaction; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Utility; using System.Diagnostics.CodeAnalysis; using System.Text; diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Relays.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Relays.cs index e6e96fa80a3..626d9b02c9d 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Relays.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Relays.cs @@ -1,7 +1,8 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.Reaction; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Shared.Chemistry.EntitySystems; diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs index 5e58a0944a4..773e6b63490 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs @@ -3,7 +3,8 @@ using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Shared.Containers; diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs index b12778262c8..33b646df544 100644 --- a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs @@ -2,7 +2,8 @@ using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Verbs; diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs index f9dfa9b2734..268c01e7e8d 100644 --- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs +++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs @@ -3,7 +3,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio.Systems; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Shared/Chemistry/Reaction/ITileReaction.cs b/Content.Shared/Chemistry/Reaction/ITileReaction.cs index 1f6a6bf3073..9d0eb28cccb 100644 --- a/Content.Shared/Chemistry/Reaction/ITileReaction.cs +++ b/Content.Shared/Chemistry/Reaction/ITileReaction.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Map; namespace Content.Shared.Chemistry.Reaction diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs index 351aa50b0f3..6e927ab0edf 100644 --- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs +++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs @@ -1,7 +1,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; using Content.Shared.EntityEffects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; diff --git a/Content.Shared/Chemistry/Reagent/ReagentData.cs b/Content.Shared/Chemistry/Reagent/ReagentData.cs index a4a77f552e3..3241a099c7c 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentData.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentData.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization; namespace Content.Shared.Chemistry.Reagent; diff --git a/Content.Shared/Chemistry/Reagent/ReagentId.cs b/Content.Shared/Chemistry/Reagent/ReagentId.cs index 07a42002197..b58b59b193e 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentId.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentId.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs index 08bee30a0f1..d4fa7444e66 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs @@ -7,7 +7,8 @@ using Content.Shared.Chemistry.Reaction; using Content.Shared.EntityEffects; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Nutrition; using Robust.Shared.Audio; using Robust.Shared.Map; diff --git a/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs b/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs index 9644f919f74..cbe1046aebf 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization; namespace Content.Shared.Chemistry.Reagent; diff --git a/Content.Shared/Chemistry/SharedChemMaster.cs b/Content.Shared/Chemistry/SharedChemMaster.cs index b300039374f..b654ca79b9d 100644 --- a/Content.Shared/Chemistry/SharedChemMaster.cs +++ b/Content.Shared/Chemistry/SharedChemMaster.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization; namespace Content.Shared.Chemistry diff --git a/Content.Shared/Chemistry/SharedTransferAmount.cs b/Content.Shared/Chemistry/SharedTransferAmount.cs index 1d95d2d687d..bc3943fa131 100644 --- a/Content.Shared/Chemistry/SharedTransferAmount.cs +++ b/Content.Shared/Chemistry/SharedTransferAmount.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization; namespace Content.Shared.Chemistry diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs index a927e1a6970..6e89ad22e7f 100644 --- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs +++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs @@ -1,7 +1,8 @@ using System.Diagnostics.CodeAnalysis; using Content.Shared.Actions; using Content.Shared.Alert; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Events; using Content.Shared.Popups; diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index e0486073b9b..8b74ee54aed 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -57,7 +57,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later - diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs index ed01bd26473..4226e0d33cc 100644 --- a/Content.Shared/Damage/Components/DamageableComponent.cs +++ b/Content.Shared/Damage/Components/DamageableComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs; using Content.Shared.StatusIcon; using Robust.Shared.GameStates; diff --git a/Content.Shared/Damage/Components/PassiveDamageComponent.cs b/Content.Shared/Damage/Components/PassiveDamageComponent.cs index 269960adac4..1b91b5a8ff8 100644 --- a/Content.Shared/Damage/Components/PassiveDamageComponent.cs +++ b/Content.Shared/Damage/Components/PassiveDamageComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Mobs; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.GameStates; diff --git a/Content.Shared/Damage/Components/SlowOnDamageComponent.cs b/Content.Shared/Damage/Components/SlowOnDamageComponent.cs index aa0cafa0576..5befad38b22 100644 --- a/Content.Shared/Damage/Components/SlowOnDamageComponent.cs +++ b/Content.Shared/Damage/Components/SlowOnDamageComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; namespace Content.Shared.Damage.Components diff --git a/Content.Shared/Damage/DamageSpecifier.cs b/Content.Shared/Damage/DamageSpecifier.cs index 7f505b807f7..46b414516d7 100644 --- a/Content.Shared/Damage/DamageSpecifier.cs +++ b/Content.Shared/Damage/DamageSpecifier.cs @@ -1,6 +1,7 @@ using System.Text.Json.Serialization; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; diff --git a/Content.Shared/Damage/DamageSpecifierDictionarySerializer.cs b/Content.Shared/Damage/DamageSpecifierDictionarySerializer.cs index 92f56571a62..2a924ad8bf2 100644 --- a/Content.Shared/Damage/DamageSpecifierDictionarySerializer.cs +++ b/Content.Shared/Damage/DamageSpecifierDictionarySerializer.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Serialization.Manager; diff --git a/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs b/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs index 163cc7cbf4c..2f5ed7c34b1 100644 --- a/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs +++ b/Content.Shared/Damage/ForceSay/DamageForceSayComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set; diff --git a/Content.Shared/Damage/Systems/DamageExamineSystem.cs b/Content.Shared/Damage/Systems/DamageExamineSystem.cs index fd1f191334f..0614a4aa10d 100644 --- a/Content.Shared/Damage/Systems/DamageExamineSystem.cs +++ b/Content.Shared/Damage/Systems/DamageExamineSystem.cs @@ -2,7 +2,8 @@ using Content.Shared.Damage.Events; using Content.Shared.Damage.Prototypes; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Verbs; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs index 6754ac8219e..18328734b7c 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.cs @@ -2,7 +2,8 @@ using System.Linq; using System.Runtime.InteropServices.JavaScript; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Inventory; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; diff --git a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs index e750863e243..6ef180c5d6d 100644 --- a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs +++ b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs @@ -1,7 +1,8 @@ using Content.Shared.Damage.Components; using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Timing; namespace Content.Shared.Damage; diff --git a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs index 78650ec5cfb..2899a66c178 100644 --- a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs +++ b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs @@ -1,7 +1,8 @@ using Content.Shared.Clothing; using Content.Shared.Damage.Components; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Inventory; using Content.Shared.Movement.Systems; diff --git a/Content.Shared/DoAfter/DoAfterArgs.cs b/Content.Shared/DoAfter/DoAfterArgs.cs index 97d9e42d74e..1b867e3f345 100644 --- a/Content.Shared/DoAfter/DoAfterArgs.cs +++ b/Content.Shared/DoAfter/DoAfterArgs.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization; namespace Content.Shared.DoAfter; diff --git a/Content.Shared/EntityEffects/EntityEffect.cs b/Content.Shared/EntityEffects/EntityEffect.cs index 21e79f224de..d9fd2882e90 100644 --- a/Content.Shared/EntityEffects/EntityEffect.cs +++ b/Content.Shared/EntityEffects/EntityEffect.cs @@ -3,7 +3,8 @@ using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Localizations; using JetBrains.Annotations; using Robust.Shared.Prototypes; diff --git a/Content.Shared/FixedPoint/FixedPoint2.cs b/Content.Shared/FixedPoint/FixedPoint2.cs deleted file mode 100644 index 33a9d25bc27..00000000000 --- a/Content.Shared/FixedPoint/FixedPoint2.cs +++ /dev/null @@ -1,331 +0,0 @@ -using System.Globalization; -using System.Linq; -using Robust.Shared.Serialization; -using Robust.Shared.Utility; - -namespace Content.Shared.FixedPoint -{ - /// - /// Represents a quantity of something, to a precision of 0.01. - /// To enforce this level of precision, floats are shifted by 2 decimal points, rounded, and converted to an int. - /// - [Serializable, CopyByRef] - public struct FixedPoint2 : ISelfSerialize, IComparable, IEquatable, IFormattable - { - public int Value { get; private set; } - private const int Shift = 2; - private const int ShiftConstant = 100; // Must be equal to pow(10, Shift) - - public static FixedPoint2 MaxValue { get; } = new(int.MaxValue); - public static FixedPoint2 Epsilon { get; } = new(1); - public static FixedPoint2 Zero { get; } = new(0); - - // This value isn't picked by any proper testing, don't @ me. - private const float FloatEpsilon = 0.00001f; - -#if DEBUG - static FixedPoint2() - { - // ReSharper disable once CompareOfFloatsByEqualityOperator - DebugTools.Assert(Math.Pow(10, Shift) == ShiftConstant, "ShiftConstant must be equal to pow(10, Shift)"); - } -#endif - - private readonly double ShiftDown() - { - return Value / (double) ShiftConstant; - } - - private FixedPoint2(int value) - { - Value = value; - } - - public static FixedPoint2 New(int value) - { - return new(value * ShiftConstant); - } - - public static FixedPoint2 FromCents(int value) => new(value); - - public static FixedPoint2 New(float value) - { - return new((int) ApplyFloatEpsilon(value * ShiftConstant)); - } - - private static float ApplyFloatEpsilon(float value) - { - return value + FloatEpsilon * Math.Sign(value); - } - - private static double ApplyFloatEpsilon(double value) - { - return value + FloatEpsilon * Math.Sign(value); - } - - /// - /// Create the closest for a float value, always rounding up. - /// - public static FixedPoint2 NewCeiling(float value) - { - return new((int) MathF.Ceiling(value * ShiftConstant)); - } - - public static FixedPoint2 New(double value) - { - return new((int) ApplyFloatEpsilon(value * ShiftConstant)); - } - - public static FixedPoint2 New(string value) - { - return New(Parse.Float(value)); - } - - public static FixedPoint2 operator +(FixedPoint2 a) => a; - - public static FixedPoint2 operator -(FixedPoint2 a) => new(-a.Value); - - public static FixedPoint2 operator +(FixedPoint2 a, FixedPoint2 b) - => new(a.Value + b.Value); - - public static FixedPoint2 operator -(FixedPoint2 a, FixedPoint2 b) - => new(a.Value - b.Value); - - public static FixedPoint2 operator *(FixedPoint2 a, FixedPoint2 b) - { - return new(b.Value * a.Value / ShiftConstant); - } - - public static FixedPoint2 operator *(FixedPoint2 a, float b) - { - return new((int) ApplyFloatEpsilon(a.Value * b)); - } - - public static FixedPoint2 operator *(FixedPoint2 a, double b) - { - return new((int) ApplyFloatEpsilon(a.Value * b)); - } - - public static FixedPoint2 operator *(FixedPoint2 a, int b) - { - return new(a.Value * b); - } - - public static FixedPoint2 operator /(FixedPoint2 a, FixedPoint2 b) - { - return new((int) (ShiftConstant * (long) a.Value / b.Value)); - } - - public static FixedPoint2 operator /(FixedPoint2 a, float b) - { - return new((int) ApplyFloatEpsilon(a.Value / b)); - } - - public static bool operator <=(FixedPoint2 a, int b) - { - return a <= New(b); - } - - public static bool operator >=(FixedPoint2 a, int b) - { - return a >= New(b); - } - - public static bool operator <(FixedPoint2 a, int b) - { - return a < New(b); - } - - public static bool operator >(FixedPoint2 a, int b) - { - return a > New(b); - } - - public static bool operator ==(FixedPoint2 a, int b) - { - return a == New(b); - } - - public static bool operator !=(FixedPoint2 a, int b) - { - return a != New(b); - } - - public static bool operator ==(FixedPoint2 a, FixedPoint2 b) - { - return a.Equals(b); - } - - public static bool operator !=(FixedPoint2 a, FixedPoint2 b) - { - return !a.Equals(b); - } - - public static bool operator <=(FixedPoint2 a, FixedPoint2 b) - { - return a.Value <= b.Value; - } - - public static bool operator >=(FixedPoint2 a, FixedPoint2 b) - { - return a.Value >= b.Value; - } - - public static bool operator <(FixedPoint2 a, FixedPoint2 b) - { - return a.Value < b.Value; - } - - public static bool operator >(FixedPoint2 a, FixedPoint2 b) - { - return a.Value > b.Value; - } - - public readonly float Float() - { - return (float) ShiftDown(); - } - - public readonly double Double() - { - return ShiftDown(); - } - - public readonly int Int() - { - return Value / ShiftConstant; - } - - // Implicit operators ftw - public static implicit operator FixedPoint2(float n) => FixedPoint2.New(n); - public static implicit operator FixedPoint2(double n) => FixedPoint2.New(n); - public static implicit operator FixedPoint2(int n) => FixedPoint2.New(n); - - public static explicit operator float(FixedPoint2 n) => n.Float(); - public static explicit operator double(FixedPoint2 n) => n.Double(); - public static explicit operator int(FixedPoint2 n) => n.Int(); - - public static FixedPoint2 Min(params FixedPoint2[] fixedPoints) - { - return fixedPoints.Min(); - } - - public static FixedPoint2 Min(FixedPoint2 a, FixedPoint2 b) - { - return a < b ? a : b; - } - - public static FixedPoint2 Max(FixedPoint2 a, FixedPoint2 b) - { - return a > b ? a : b; - } - - public static int Sign(FixedPoint2 value) - { - if (value < Zero) - { - return -1; - } - - if (value > Zero) - { - return 1; - } - - return 0; - } - - public static FixedPoint2 Abs(FixedPoint2 a) - { - return FixedPoint2.New(Math.Abs(a.Value)); - } - - public static FixedPoint2 Dist(FixedPoint2 a, FixedPoint2 b) - { - return FixedPoint2.Abs(a - b); - } - - public static FixedPoint2 Clamp(FixedPoint2 reagent, FixedPoint2 min, FixedPoint2 max) - { - if (min > max) - { - throw new ArgumentException($"{nameof(min)} {min} cannot be larger than {nameof(max)} {max}"); - } - - return reagent < min ? min : reagent > max ? max : reagent; - } - - public override readonly bool Equals(object? obj) - { - return obj is FixedPoint2 unit && - Value == unit.Value; - } - - public override readonly int GetHashCode() - { - // ReSharper disable once NonReadonlyMemberInGetHashCode - return HashCode.Combine(Value); - } - - public void Deserialize(string value) - { - // TODO implement "lossless" serializer. - // I.e., dont use floats. - if (value == "MaxValue") - Value = int.MaxValue; - else - this = New(Parse.Float(value)); - } - - public override readonly string ToString() => $"{ShiftDown().ToString(CultureInfo.InvariantCulture)}"; - - public string ToString(string? format, IFormatProvider? formatProvider) - { - return ToString(); - } - - public readonly string Serialize() - { - // TODO implement "lossless" serializer. - // I.e., dont use floats. - if (Value == int.MaxValue) - return "MaxValue"; - - return ToString(); - } - - public readonly bool Equals(FixedPoint2 other) - { - return Value == other.Value; - } - - public readonly int CompareTo(FixedPoint2 other) - { - if (other.Value > Value) - { - return -1; - } - if (other.Value < Value) - { - return 1; - } - return 0; - } - - } - - public static class FixedPointEnumerableExt - { - public static FixedPoint2 Sum(this IEnumerable source) - { - var acc = FixedPoint2.Zero; - - foreach (var n in source) - { - acc += n; - } - - return acc; - } - } -} diff --git a/Content.Shared/Fluids/AbsorbentComponent.cs b/Content.Shared/Fluids/AbsorbentComponent.cs index 6cda88a72d6..f66546c2ff2 100644 --- a/Content.Shared/Fluids/AbsorbentComponent.cs +++ b/Content.Shared/Fluids/AbsorbentComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Audio; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.GameStates; diff --git a/Content.Shared/Fluids/Components/EvaporationComponent.cs b/Content.Shared/Fluids/Components/EvaporationComponent.cs index f2ed3a6186b..b8776edf19c 100644 --- a/Content.Shared/Fluids/Components/EvaporationComponent.cs +++ b/Content.Shared/Fluids/Components/EvaporationComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs index 5434479fb71..65de909aead 100644 --- a/Content.Shared/Fluids/Components/PuddleComponent.cs +++ b/Content.Shared/Fluids/Components/PuddleComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.GameStates; diff --git a/Content.Shared/Fluids/Components/SpillableComponent.cs b/Content.Shared/Fluids/Components/SpillableComponent.cs index 51bb73a11fe..c780ec52345 100644 --- a/Content.Shared/Fluids/Components/SpillableComponent.cs +++ b/Content.Shared/Fluids/Components/SpillableComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Shared.Fluids.Components; diff --git a/Content.Shared/Fluids/Events.cs b/Content.Shared/Fluids/Events.cs index e281de91377..a70b034d641 100644 --- a/Content.Shared/Fluids/Events.cs +++ b/Content.Shared/Fluids/Events.cs @@ -1,5 +1,6 @@ using Content.Shared.DoAfter; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.Serialization; diff --git a/Content.Shared/Fluids/SharedPuddleDebugOverlaySystem.cs b/Content.Shared/Fluids/SharedPuddleDebugOverlaySystem.cs index 6f6d56cf60a..3dcef02b25f 100644 --- a/Content.Shared/Fluids/SharedPuddleDebugOverlaySystem.cs +++ b/Content.Shared/Fluids/SharedPuddleDebugOverlaySystem.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization; namespace Content.Shared.Fluids; diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs index 2f8fabae5a4..052f909c4ff 100644 --- a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs +++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs @@ -2,7 +2,8 @@ using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids.Components; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Spillable; diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs index f573c042c55..e52b00e5fc0 100644 --- a/Content.Shared/Fluids/SharedPuddleSystem.cs +++ b/Content.Shared/Fluids/SharedPuddleSystem.cs @@ -4,7 +4,8 @@ using Content.Shared.DoAfter; using Content.Shared.DragDrop; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Fluids.Components; using Content.Shared.Movement.Events; using Content.Shared.StepTrigger.Components; diff --git a/Content.Shared/Footprint/FootPrintsComponent.cs b/Content.Shared/Footprint/FootPrintsComponent.cs index a3894e42e1e..2dcbfc84b59 100644 --- a/Content.Shared/Footprint/FootPrintsComponent.cs +++ b/Content.Shared/Footprint/FootPrintsComponent.cs @@ -1,6 +1,7 @@ using System.Numerics; using Content.Shared.Chemistry.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Shared/Footprint/PuddleFootPrintsComponent.cs b/Content.Shared/Footprint/PuddleFootPrintsComponent.cs index 284d79a3a90..d8aac4780fa 100644 --- a/Content.Shared/Footprint/PuddleFootPrintsComponent.cs +++ b/Content.Shared/Footprint/PuddleFootPrintsComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Shared.FootPrint; diff --git a/Content.Shared/Glue/GlueComponent.cs b/Content.Shared/Glue/GlueComponent.cs index 4cbbc497379..c3cdd5dfaa7 100644 --- a/Content.Shared/Glue/GlueComponent.cs +++ b/Content.Shared/Glue/GlueComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/HealthExaminable/HealthExaminableComponent.cs b/Content.Shared/HealthExaminable/HealthExaminableComponent.cs index 88a79782a55..6ef9c04e264 100644 --- a/Content.Shared/HealthExaminable/HealthExaminableComponent.cs +++ b/Content.Shared/HealthExaminable/HealthExaminableComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; namespace Content.Shared.HealthExaminable; diff --git a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs index 091176a3cb1..781e1d318e5 100644 --- a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs +++ b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.Damage; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.IdentityManagement; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; diff --git a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs index 65a7b9ed045..9d6b196d688 100644 --- a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs +++ b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; diff --git a/Content.Shared/Lube/LubeComponent.cs b/Content.Shared/Lube/LubeComponent.cs index 6a99e3cf144..c2591ddebe7 100644 --- a/Content.Shared/Lube/LubeComponent.cs +++ b/Content.Shared/Lube/LubeComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/Materials/PhysicalCompositionComponent.cs b/Content.Shared/Materials/PhysicalCompositionComponent.cs index 4066bb9f7cc..07118fd227b 100644 --- a/Content.Shared/Materials/PhysicalCompositionComponent.cs +++ b/Content.Shared/Materials/PhysicalCompositionComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; namespace Content.Shared.Materials; diff --git a/Content.Shared/Mech/Components/MechComponent.cs b/Content.Shared/Mech/Components/MechComponent.cs index 747f16e5e20..9f18d09cc55 100644 --- a/Content.Shared/Mech/Components/MechComponent.cs +++ b/Content.Shared/Mech/Components/MechComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Whitelist; using Robust.Shared.Containers; using Robust.Shared.GameStates; @@ -148,7 +149,7 @@ public sealed partial class MechComponent : Component [DataField] public EntProtoId MechCycleAction = "ActionMechCycleEquipment"; [DataField] - public EntProtoId ToggleAction = "ActionToggleLight"; //Goobstation Mech Lights toggle action + public EntProtoId ToggleAction = "ActionToggleLight"; //Goobstation Mech Lights toggle action [DataField] public EntProtoId MechUiAction = "ActionMechOpenUI"; [DataField] diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs index 022453d8614..fd4a4b8097e 100644 --- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs +++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs @@ -5,7 +5,8 @@ using Content.Shared.Destructible; using Content.Shared.DoAfter; using Content.Shared.DragDrop; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Interaction.Components; using Content.Shared.Interaction.Events; @@ -57,7 +58,7 @@ public abstract class SharedMechSystem : EntitySystem // Goobstation: Local variable for checking if mech guns can be used out of them. private bool _canUseMechGunOutside; - + /// public override void Initialize() { @@ -616,4 +617,4 @@ public MechOpenRadarEvent(NetEntity pilot) { Pilot = pilot; } -} \ No newline at end of file +} diff --git a/Content.Shared/Mobs/Components/MobThresholdsComponent.cs b/Content.Shared/Mobs/Components/MobThresholdsComponent.cs index fe435db4d80..e7bd35daea1 100644 --- a/Content.Shared/Mobs/Components/MobThresholdsComponent.cs +++ b/Content.Shared/Mobs/Components/MobThresholdsComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Alert; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs.Systems; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs index a5307c4ba57..1423ed9d30c 100644 --- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs +++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs @@ -2,7 +2,8 @@ using System.Linq; using Content.Shared.Alert; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs.Components; using Robust.Shared.GameStates; diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs index ae7389f8768..78a2746d3e6 100644 --- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs +++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs @@ -68,6 +68,7 @@ public sealed class PullingSystem : EntitySystem [Dependency] private readonly SharedGravitySystem _gravity = default!; [Dependency] private readonly MovementSpeedModifierSystem _modifierSystem = default!; [Dependency] private readonly SharedJointSystem _joints = default!; + [Dependency] private readonly INetManager _net = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedInteractionSystem _interaction = default!; @@ -80,7 +81,6 @@ public sealed class PullingSystem : EntitySystem [Dependency] private readonly StaminaSystem _stamina = default!; [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly INetManager _netManager = default!; [Dependency] private readonly SharedVirtualItemSystem _virtualSystem = default!; [Dependency] private readonly GrabThrownSystem _grabThrown = default!; [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; @@ -130,7 +130,7 @@ private void OnAddCuffDoAfterEvent(Entity ent, ref AddCuffDoAft && TryComp(ent.Comp.Pulling, out var comp) && ent.Comp.Pulling != null) { - if(_netManager.IsServer) + if(_net.IsServer) StopPulling(ent.Comp.Pulling.Value, comp); } } @@ -155,7 +155,7 @@ public override void Shutdown() public override void Update(float frameTime) { - if (_netManager.IsClient) // Client cannot predict this + if (_net.IsClient) // Client cannot predict this return; var query = EntityQueryEnumerator(); @@ -526,7 +526,7 @@ private void StopPulling(EntityUid pullableUid, PullableComponent pullableComp) if (TryComp(oldPuller, out var pullerComp)) { var pullerUid = oldPuller.Value; - if (_netManager.IsServer) + if (_net.IsServer) _alertsSystem.ClearAlert(pullerUid, pullerComp.PullingAlert); pullerComp.Pulling = null; // Goobstation - Grab Intent @@ -549,7 +549,7 @@ private void StopPulling(EntityUid pullableUid, PullableComponent pullableComp) } - if (_netManager.IsServer) + if (_net.IsServer) _alertsSystem.ClearAlert(pullableUid, pullableComp.PulledAlert); } @@ -729,7 +729,7 @@ public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid, if (!TryStopPull(pullableUid, pullableComp, pullableComp.Puller)) { // Not succeed to retake grabbed entity - if (_netManager.IsServer) + if (_net.IsServer) { _popup.PopupEntity(Loc.GetString("popup-grab-retake-fail", ("puller", Identity.Entity(pullableComp.Puller.Value, EntityManager)), @@ -746,7 +746,7 @@ public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid, else if (pullableComp.GrabStage != GrabStage.No) { // Successful retake - if (_netManager.IsServer) + if (_net.IsServer) { _popup.PopupEntity(Loc.GetString("popup-grab-retake-success", ("puller", Identity.Entity(pullableComp.Puller.Value, EntityManager)), @@ -843,7 +843,7 @@ public bool TryStopPull(EntityUid pullableUid, PullableComponent? pullable = nul // Goobstation - Grab Intent if (!ignoreGrab) { - if (_netManager.IsServer && user != null && user.Value == pullableUid) + if (_net.IsServer && user != null && user.Value == pullableUid) { var releaseAttempt = AttemptGrabRelease(pullableUid); if (!releaseAttempt) @@ -990,7 +990,7 @@ private bool TrySetGrabStages(Entity puller, Entity puller, Entity puller, Entity(otherUid, out var stepTriggerImmuneComponent) - && component.TriggerGroups != null - && component.TriggerGroups.IsValid(stepTriggerImmuneComponent)) + if (!component.Active || component.CurrentlySteppedOn.Contains(otherUid)) return false; // Can't trigger if we don't ignore weightless entities @@ -142,7 +135,7 @@ private bool CanTrigger(EntityUid uid, EntityUid otherUid, StepTriggerComponent (physics.BodyStatus == BodyStatus.InAir || _gravity.IsWeightless(otherUid, physics))) return false; - var msg = new StepTriggerAttemptEvent { Source = uid, Tripper = otherUid }; + var msg = new StepTriggerAttemptEvent { Source = (uid, component), Tripper = otherUid }; RaiseLocalEvent(uid, ref msg); return msg.Continue && !msg.Cancelled; @@ -239,7 +232,7 @@ public void SetIgnoreWeightless(EntityUid uid, bool ignore, StepTriggerComponent /// Allows for entities to end the steptrigger early via args.Cancelled. /// [ByRefEvent] -public record struct StepTriggerAttemptEvent(EntityUid Source, EntityUid Tripper, bool Continue, bool Cancelled); +public record struct StepTriggerAttemptEvent(Entity Source, EntityUid Tripper, bool Continue, bool Cancelled); /// /// Raised when an entity stands on a steptrigger initially (assuming it has both on and off states). diff --git a/Content.Shared/Store/Components/StoreComponent.cs b/Content.Shared/Store/Components/StoreComponent.cs index e5171dec418..4c421cbbbe6 100644 --- a/Content.Shared/Store/Components/StoreComponent.cs +++ b/Content.Shared/Store/Components/StoreComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Store/CurrencyPrototype.cs b/Content.Shared/Store/CurrencyPrototype.cs index 5dafbfd91fb..2d5fa9bb06f 100644 --- a/Content.Shared/Store/CurrencyPrototype.cs +++ b/Content.Shared/Store/CurrencyPrototype.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs index 05ac5cc4cd5..5d0f64298f9 100644 --- a/Content.Shared/Store/ListingPrototype.cs +++ b/Content.Shared/Store/ListingPrototype.cs @@ -1,5 +1,6 @@ using System.Linq; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Store.Components; using Content.Shared.StoreDiscount.Components; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Store/StorePresetPrototype.cs b/Content.Shared/Store/StorePresetPrototype.cs index 41ee510bd8e..f33992f4d04 100644 --- a/Content.Shared/Store/StorePresetPrototype.cs +++ b/Content.Shared/Store/StorePresetPrototype.cs @@ -2,7 +2,8 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Shared.Store; diff --git a/Content.Shared/Store/StoreUi.cs b/Content.Shared/Store/StoreUi.cs index d8cb9e6ca88..02df1529b53 100644 --- a/Content.Shared/Store/StoreUi.cs +++ b/Content.Shared/Store/StoreUi.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs b/Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs index 3736b4d4234..24c3784f2c5 100644 --- a/Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs +++ b/Content.Shared/StoreDiscount/Components/StoreDiscountComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Store; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Tools/Components/WelderComponent.cs b/Content.Shared/Tools/Components/WelderComponent.cs index 3c78a03fdeb..35f07933dfa 100644 --- a/Content.Shared/Tools/Components/WelderComponent.cs +++ b/Content.Shared/Tools/Components/WelderComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Tools.Systems; using Robust.Shared.Audio; using Robust.Shared.GameStates; diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs index 9e012973c25..3df7c4db218 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs @@ -3,7 +3,8 @@ using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Tools.Components; diff --git a/Content.Shared/Traits/Assorted/Components/CritModifierComponent.cs b/Content.Shared/Traits/Assorted/Components/CritModifierComponent.cs index c29ebad9cb3..f802a5449c6 100644 --- a/Content.Shared/Traits/Assorted/Components/CritModifierComponent.cs +++ b/Content.Shared/Traits/Assorted/Components/CritModifierComponent.cs @@ -1,5 +1,6 @@ using Robust.Shared.GameStates; -//using Content.Shared.FixedPoint; +//using Content.Goobstation.Maths.FixedPoint; + namespace Content.Shared.Traits.Assorted.Components; diff --git a/Content.Shared/Traits/Assorted/Components/SelfAwareComponent.cs b/Content.Shared/Traits/Assorted/Components/SelfAwareComponent.cs index fd721c214e3..cf44e5ef121 100644 --- a/Content.Shared/Traits/Assorted/Components/SelfAwareComponent.cs +++ b/Content.Shared/Traits/Assorted/Components/SelfAwareComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set; diff --git a/Content.Shared/Traits/Assorted/Systems/TraitStatModifierSystem.cs b/Content.Shared/Traits/Assorted/Systems/TraitStatModifierSystem.cs index f269ebe9ba8..9b0515d5d6b 100644 --- a/Content.Shared/Traits/Assorted/Systems/TraitStatModifierSystem.cs +++ b/Content.Shared/Traits/Assorted/Systems/TraitStatModifierSystem.cs @@ -8,7 +8,8 @@ using Content.Shared.Mood; using Robust.Shared.Random; using Robust.Shared.GameObjects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Shared.Traits.Assorted.Systems; diff --git a/Content.Shared/Weapons/Melee/Components/BonusMeleeDamageComponent.cs b/Content.Shared/Weapons/Melee/Components/BonusMeleeDamageComponent.cs index 08af9e42a3d..ff2115dacaf 100644 --- a/Content.Shared/Weapons/Melee/Components/BonusMeleeDamageComponent.cs +++ b/Content.Shared/Weapons/Melee/Components/BonusMeleeDamageComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Weapons.Melee.Events; using Robust.Shared.GameStates; diff --git a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs index 75c85790deb..21936da35b5 100644 --- a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs +++ b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs @@ -1,6 +1,7 @@ using System.Numerics; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; namespace Content.Shared.Weapons.Melee.Events; diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index ad191be8053..f53fa0deec4 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Contests; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index e8c33ded58f..a631eee9999 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -10,7 +10,8 @@ using Content.Shared.Damage.Components; using Content.Shared.Damage.Systems; using Content.Shared.Database; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Hands; using Content.Shared.Hands.Components; using Content.Shared.Interaction; diff --git a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs index d9ad12bbcea..bebb15be487 100644 --- a/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs +++ b/Content.Shared/WhiteDream/BloodCult/BloodCultist/BloodCultistComponent.cs @@ -1,6 +1,7 @@ using System.Threading; using Content.Shared.Antag; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Language; using Content.Shared.Mind; using Content.Shared.StatusIcon; diff --git a/Content.Shared/WhiteDream/BloodCult/UI/BloodRites.cs b/Content.Shared/WhiteDream/BloodCult/UI/BloodRites.cs index 961f2015a4d..d32ad3a0841 100644 --- a/Content.Shared/WhiteDream/BloodCult/UI/BloodRites.cs +++ b/Content.Shared/WhiteDream/BloodCult/UI/BloodRites.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Prototypes; using Robust.Shared.Serialization; diff --git a/Content.Shared/_Crescent/DegradeableArmor/DegradeableArmorSystem.cs b/Content.Shared/_Crescent/DegradeableArmor/DegradeableArmorSystem.cs index 0497e393086..ca0b3fb2ccc 100644 --- a/Content.Shared/_Crescent/DegradeableArmor/DegradeableArmorSystem.cs +++ b/Content.Shared/_Crescent/DegradeableArmor/DegradeableArmorSystem.cs @@ -10,7 +10,8 @@ using Content.Shared.Damage.Systems; using Content.Shared.DoAfter; using Content.Shared.Examine; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Interaction; using Content.Shared.Inventory; using Content.Shared.Popups; diff --git a/Content.Shared/_Crescent/Magic/GreaterSuppressSpellEvent.cs b/Content.Shared/_Crescent/Magic/GreaterSuppressSpellEvent.cs index d20d6ba4f2c..144910cf84f 100644 --- a/Content.Shared/_Crescent/Magic/GreaterSuppressSpellEvent.cs +++ b/Content.Shared/_Crescent/Magic/GreaterSuppressSpellEvent.cs @@ -2,7 +2,8 @@ using Content.Shared.Chat; using Robust.Shared.Audio; using Content.Shared.Magic; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Damage; namespace Content.Shared._Crescent.Magic; diff --git a/Content.Shared/_Crescent/Magic/LesserSuppressSpellEvent.cs b/Content.Shared/_Crescent/Magic/LesserSuppressSpellEvent.cs index 2446a8d0e07..cd7f758c3d6 100644 --- a/Content.Shared/_Crescent/Magic/LesserSuppressSpellEvent.cs +++ b/Content.Shared/_Crescent/Magic/LesserSuppressSpellEvent.cs @@ -2,7 +2,8 @@ using Content.Shared.Chat; using Robust.Shared.Audio; using Content.Shared.Magic; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Shared._Crescent.Magic; public sealed partial class LesserSuppressSpellEvent : WorldTargetActionEvent, ISpeakSpell diff --git a/Content.Shared/_Goobstation/Blob/BlobTypedStorage.cs b/Content.Shared/_Goobstation/Blob/BlobTypedStorage.cs index 6509f107a23..16a78291da0 100644 --- a/Content.Shared/_Goobstation/Blob/BlobTypedStorage.cs +++ b/Content.Shared/_Goobstation/Blob/BlobTypedStorage.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Diagnostics.Contracts; using Content.Shared._Goobstation.Blob.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Robust.Shared.Prototypes; namespace Content.Shared._Goobstation.Blob; diff --git a/Content.Shared/_Goobstation/Blob/Components/BlobCoreComponent.cs b/Content.Shared/_Goobstation/Blob/Components/BlobCoreComponent.cs index 79624062b49..aff2435b5d9 100644 --- a/Content.Shared/_Goobstation/Blob/Components/BlobCoreComponent.cs +++ b/Content.Shared/_Goobstation/Blob/Components/BlobCoreComponent.cs @@ -1,6 +1,7 @@ +using Content.Goobstation.Maths.FixedPoint; using Content.Shared.Damage; using Content.Shared.Explosion; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/_Goobstation/Blob/Components/BlobMobComponent.cs b/Content.Shared/_Goobstation/Blob/Components/BlobMobComponent.cs index ff75ffc146f..22f8115ea2e 100644 --- a/Content.Shared/_Goobstation/Blob/Components/BlobMobComponent.cs +++ b/Content.Shared/_Goobstation/Blob/Components/BlobMobComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Robust.Shared.GameStates; namespace Content.Shared._Goobstation.Blob.Components; diff --git a/Content.Shared/_Goobstation/Blob/Components/BlobObserverComponent.cs b/Content.Shared/_Goobstation/Blob/Components/BlobObserverComponent.cs index 79a66970214..c07c037176b 100644 --- a/Content.Shared/_Goobstation/Blob/Components/BlobObserverComponent.cs +++ b/Content.Shared/_Goobstation/Blob/Components/BlobObserverComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.Actions; using Content.Shared.Antag; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Content.Shared.StatusIcon; using Robust.Shared.GameStates; using Robust.Shared.Map; diff --git a/Content.Shared/_Goobstation/Blob/Components/BlobResourceComponent.cs b/Content.Shared/_Goobstation/Blob/Components/BlobResourceComponent.cs index a17b6520820..13a3461a4fc 100644 --- a/Content.Shared/_Goobstation/Blob/Components/BlobResourceComponent.cs +++ b/Content.Shared/_Goobstation/Blob/Components/BlobResourceComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; namespace Content.Shared._Goobstation.Blob.Components; diff --git a/Content.Shared/_Goobstation/Blob/Components/BlobStorageComponent.cs b/Content.Shared/_Goobstation/Blob/Components/BlobStorageComponent.cs index 40b3203a62d..43fc5fc0f46 100644 --- a/Content.Shared/_Goobstation/Blob/Components/BlobStorageComponent.cs +++ b/Content.Shared/_Goobstation/Blob/Components/BlobStorageComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; namespace Content.Shared._Goobstation.Blob.Components; diff --git a/Content.Shared/_Goobstation/Blob/Components/BlobTileComponent.cs b/Content.Shared/_Goobstation/Blob/Components/BlobTileComponent.cs index b007ab1aee0..5127926d4ed 100644 --- a/Content.Shared/_Goobstation/Blob/Components/BlobTileComponent.cs +++ b/Content.Shared/_Goobstation/Blob/Components/BlobTileComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Robust.Shared.GameStates; namespace Content.Shared._Goobstation.Blob.Components; diff --git a/Content.Shared/_Goobstation/Blob/Components/BlobbernautComponent.cs b/Content.Shared/_Goobstation/Blob/Components/BlobbernautComponent.cs index fa25982ca9d..33e4643dd9b 100644 --- a/Content.Shared/_Goobstation/Blob/Components/BlobbernautComponent.cs +++ b/Content.Shared/_Goobstation/Blob/Components/BlobbernautComponent.cs @@ -1,6 +1,6 @@ using Content.Shared._Goobstation.Blob; using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Robust.Shared.GameStates; namespace Content.Shared._Goobstation.Blob.Components; diff --git a/Content.Shared/_Goobstation/Changeling/ChangelingComponent.cs b/Content.Shared/_Goobstation/Changeling/ChangelingComponent.cs index 5d4b191b724..c4dcf8ccb63 100644 --- a/Content.Shared/_Goobstation/Changeling/ChangelingComponent.cs +++ b/Content.Shared/_Goobstation/Changeling/ChangelingComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Content.Shared.Humanoid; using Content.Shared.Popups; using Content.Shared.StatusIcon; diff --git a/Content.Shared/_Goobstation/Changeling/ReagentStingConfigurationPrototype.cs b/Content.Shared/_Goobstation/Changeling/ReagentStingConfigurationPrototype.cs index 0838b0b2810..c466cd1d51d 100644 --- a/Content.Shared/_Goobstation/Changeling/ReagentStingConfigurationPrototype.cs +++ b/Content.Shared/_Goobstation/Changeling/ReagentStingConfigurationPrototype.cs @@ -1,4 +1,4 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Robust.Shared.Prototypes; namespace Content.Shared.Changeling; diff --git a/Content.Shared/_Goobstation/MartialArts/Components/MartialArtsComponents.cs b/Content.Shared/_Goobstation/MartialArts/Components/MartialArtsComponents.cs index d6bcf529f2c..d5fad17fc94 100644 --- a/Content.Shared/_Goobstation/MartialArts/Components/MartialArtsComponents.cs +++ b/Content.Shared/_Goobstation/MartialArts/Components/MartialArtsComponents.cs @@ -1,4 +1,4 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/_Goobstation/MartialArts/MartialArtPrototype.cs b/Content.Shared/_Goobstation/MartialArts/MartialArtPrototype.cs index 2500452d6ec..8c1ead77d2c 100644 --- a/Content.Shared/_Goobstation/MartialArts/MartialArtPrototype.cs +++ b/Content.Shared/_Goobstation/MartialArts/MartialArtPrototype.cs @@ -1,5 +1,5 @@ using Content.Shared._Goobstation.MartialArts.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Robust.Shared.Prototypes; namespace Content.Shared._Goobstation.MartialArts; diff --git a/Content.Shared/_Goobstation/TableSlam/TableSlamSystem.cs b/Content.Shared/_Goobstation/TableSlam/TableSlamSystem.cs index 89c8a3fce92..a033494ccf7 100644 --- a/Content.Shared/_Goobstation/TableSlam/TableSlamSystem.cs +++ b/Content.Shared/_Goobstation/TableSlam/TableSlamSystem.cs @@ -8,7 +8,6 @@ using Content.Shared.Damage; using Content.Shared.Damage.Events; using Content.Shared.Damage.Systems; -using Content.Shared.FixedPoint; using Content.Shared.Interaction; using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Systems; @@ -24,6 +23,7 @@ using Robust.Shared.Random; using Robust.Shared.Timing; using Content.Shared.Climbing.Systems; +using Content.Goobstation.Maths.FixedPoint; namespace Content.Shared._Goobstation.TableSlam; diff --git a/Content.Shared/_Lavaland/Weather/LavalandWeatherPrototype.cs b/Content.Shared/_Lavaland/Weather/LavalandWeatherPrototype.cs index e24f4ad5d00..efad0e7958f 100644 --- a/Content.Shared/_Lavaland/Weather/LavalandWeatherPrototype.cs +++ b/Content.Shared/_Lavaland/Weather/LavalandWeatherPrototype.cs @@ -1,5 +1,6 @@ using Content.Shared.Damage; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Weather; using Robust.Shared.Prototypes; diff --git a/Content.Shared/_Shitmed/Body/BodyCapacity/OrganCapacity.cs b/Content.Shared/_Shitmed/Body/BodyCapacity/OrganCapacity.cs index 6b0f559b1cd..7c871f95f2f 100644 --- a/Content.Shared/_Shitmed/Body/BodyCapacity/OrganCapacity.cs +++ b/Content.Shared/_Shitmed/Body/BodyCapacity/OrganCapacity.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.Utility; using Robust.Shared.Serialization; diff --git a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.BodyCapacity.cs b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.BodyCapacity.cs index 6e1b4ad54c1..716abe22c95 100644 --- a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.BodyCapacity.cs +++ b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.BodyCapacity.cs @@ -1,7 +1,8 @@ /*using Content.Shared.Damage; using Content.Shared.Body.Organ; using Content.Shared._Shitmed.Body.Organ; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + // Namespace has set accessors, leaving it on the default. namespace Content.Shared.Body.Systems; @@ -87,4 +88,4 @@ public static OrganStatus GetOrganStatus(OrganComponent component, FixedPoint2 i } -*/ \ No newline at end of file +*/ diff --git a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs index d29d2a94bef..2130a1b9933 100644 --- a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs +++ b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs @@ -15,7 +15,6 @@ public partial class SharedBodySystem { [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoid = default!; [Dependency] private readonly MarkingManager _markingManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; private void InitializePartAppearances() { base.Initialize(); @@ -83,8 +82,8 @@ private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent private string? CreateIdFromPart(HumanoidAppearanceComponent bodyAppearance, HumanoidVisualLayers part) { - var speciesProto = _prototypeManager.Index(bodyAppearance.Species); - var baseSprites = _prototypeManager.Index(speciesProto.SpriteSet); + var speciesProto = Prototypes.Index(bodyAppearance.Species); + var baseSprites = Prototypes.Index(speciesProto.SpriteSet); if (!baseSprites.Sprites.ContainsKey(part)) return null; diff --git a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Targeting.cs b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Targeting.cs index aba66e09f81..ebc3cc968f2 100644 --- a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Targeting.cs +++ b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Targeting.cs @@ -3,7 +3,7 @@ using Content.Shared._Shitmed.Body.Events; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; using Content.Shared.IdentityManagement; using Content.Shared._Shitmed.Medical.Surgery.Steps.Parts; using Content.Shared.Mobs.Components; @@ -30,9 +30,7 @@ public partial class SharedBodySystem { [Dependency] private readonly INetManager _net = default!; [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] private readonly StandingStateSystem _standing = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; private readonly string[] _severingDamageTypes = { "Slash", "Piercing", "Blunt" }; private const double IntegrityJobTime = 0.005; @@ -83,7 +81,7 @@ private void ProcessIntegrityTick(Entity entity) && damage <= entity.Comp.IntegrityThresholds[TargetIntegrity.HeavilyWounded] && _queryTargeting.HasComp(body) && !_mobState.IsDead(body)) - _damageable.TryChangeDamage(entity, GetHealingSpecifier(entity), canSever: false, targetPart: GetTargetBodyPart(entity)); + Damageable.TryChangeDamage(entity, GetHealingSpecifier(entity), canSever: false, targetPart: GetTargetBodyPart(entity)); } public override void Update(float frameTime) @@ -178,7 +176,7 @@ private void OnPartDamageModify(Entity partEnt, ref DamageMod && TryComp(partEnt.Comp.Body.Value, out InventoryComponent? inventory)) _inventory.RelayEvent((partEnt.Comp.Body.Value, inventory), ref args); - if (_prototypeManager.TryIndex("PartDamage", out var partModifierSet)) + if (Prototypes.TryIndex("PartDamage", out var partModifierSet)) args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, partModifierSet); args.Damage *= GetPartDamageModifier(partEnt.Comp.PartType); @@ -214,7 +212,7 @@ private bool TryChangePartDamage(EntityUid entity, continue; } - var damageResult = _damageable.TryChangeDamage(part.FirstOrDefault().Id, damage * partMultiplier, ignoreResistances, canSever: canSever); + var damageResult = Damageable.TryChangeDamage(part.FirstOrDefault().Id, damage * partMultiplier, ignoreResistances, canSever: canSever); if (damageResult != null && damageResult.GetTotal() != 0) landed = true; } diff --git a/Content.Shared/_Shitmed/Body/Vascular/VascularComponent.cs b/Content.Shared/_Shitmed/Body/Vascular/VascularComponent.cs index bd77a3d0794..ecf721d5c4e 100644 --- a/Content.Shared/_Shitmed/Body/Vascular/VascularComponent.cs +++ b/Content.Shared/_Shitmed/Body/Vascular/VascularComponent.cs @@ -1,4 +1,5 @@ -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Robust.Shared.GameStates; using Robust.Shared.Serialization; using System.Linq; @@ -89,4 +90,4 @@ public sealed partial class StrainData [DataField] public TimeSpan? Duration; -} \ No newline at end of file +} diff --git a/Content.Shared/_Shitmed/Body/Vascular/VascularSystem.cs b/Content.Shared/_Shitmed/Body/Vascular/VascularSystem.cs index 0cb85f1e3f2..14b8c7dd9e4 100644 --- a/Content.Shared/_Shitmed/Body/Vascular/VascularSystem.cs +++ b/Content.Shared/_Shitmed/Body/Vascular/VascularSystem.cs @@ -1,4 +1,5 @@ -/*using Content.Shared.FixedPoint; +/*using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Body.Systems; using Content.Shared._Shitmed.Body.Organ; using Content.Shared.Medical; @@ -145,4 +146,4 @@ private void OnZapSuccess(EntityUid uid, VascularComponent component, ref Defibr component.TimeOverHigh = TimeSpan.Zero; component.TimeUnderLow = TimeSpan.Zero; } -}*/ \ No newline at end of file +}*/ diff --git a/Content.Shared/_Shitmed/OnHit/SharedOnHitSystem.cs b/Content.Shared/_Shitmed/OnHit/SharedOnHitSystem.cs index b27f3ae6b4f..4f235bca451 100644 --- a/Content.Shared/_Shitmed/OnHit/SharedOnHitSystem.cs +++ b/Content.Shared/_Shitmed/OnHit/SharedOnHitSystem.cs @@ -6,7 +6,8 @@ using Content.Shared.Cuffs.Components; using Content.Shared.DoAfter; using Content.Shared.Effects; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using Content.Shared.Mobs.Systems; using Content.Shared.Stunnable; using Content.Shared.Weapons.Melee.Events; diff --git a/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs b/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs index 8f9de2c2f82..aee78fc0f38 100644 --- a/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs +++ b/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs @@ -1,5 +1,6 @@ using System; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using NUnit.Framework; namespace Content.Tests.Shared.Chemistry diff --git a/Content.Tests/Shared/Chemistry/SolutionTests.cs b/Content.Tests/Shared/Chemistry/SolutionTests.cs index 7f6e335b36a..f896b38bd6c 100644 --- a/Content.Tests/Shared/Chemistry/SolutionTests.cs +++ b/Content.Tests/Shared/Chemistry/SolutionTests.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Components; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + using NUnit.Framework; using Robust.Shared.IoC; using Robust.Shared.Prototypes; diff --git a/Content.Tests/Shared/DamageTest.cs b/Content.Tests/Shared/DamageTest.cs index 88beca8841c..660a4ac6709 100644 --- a/Content.Tests/Shared/DamageTest.cs +++ b/Content.Tests/Shared/DamageTest.cs @@ -5,7 +5,8 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager; using System.Collections.Generic; -using Content.Shared.FixedPoint; +using Content.Goobstation.Maths.FixedPoint; + namespace Content.Tests.Shared {