diff --git a/Content.Client/Administration/UI/CustomControls/AdminLogImpactButton.cs b/Content.Client/Administration/UI/CustomControls/AdminLogImpactButton.cs index be4b198347..5cf2e94f9c 100644 --- a/Content.Client/Administration/UI/CustomControls/AdminLogImpactButton.cs +++ b/Content.Client/Administration/UI/CustomControls/AdminLogImpactButton.cs @@ -1,4 +1,5 @@ using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Robust.Client.UserInterface.Controls; namespace Content.Client.Administration.UI.CustomControls; diff --git a/Content.Client/Administration/UI/CustomControls/AdminLogTypeButton.cs b/Content.Client/Administration/UI/CustomControls/AdminLogTypeButton.cs index 0f28a61fd4..6ee1ae95d8 100644 --- a/Content.Client/Administration/UI/CustomControls/AdminLogTypeButton.cs +++ b/Content.Client/Administration/UI/CustomControls/AdminLogTypeButton.cs @@ -1,4 +1,5 @@ using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Robust.Client.UserInterface.Controls; namespace Content.Client.Administration.UI.CustomControls; diff --git a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs index ac1679ac71..1c8a5cca04 100644 --- a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs +++ b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Content.Client.Administration.UI.CustomControls; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs index 121eb5740b..ea260e2b0f 100644 --- a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs +++ b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs @@ -7,6 +7,7 @@ using Content.Server.Database; using Content.Server.GameTicking; using Content.Shared.Administration.Logs; using Content.Shared.CCVar; +using Content.Shared.Database; using NUnit.Framework; using Robust.Server.Player; using Robust.Shared.GameObjects; diff --git a/Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs index fc87cae587..277cf91e9b 100644 --- a/Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs +++ b/Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs @@ -4,6 +4,7 @@ using Content.Server.Administration.Logs; using Content.Server.GameTicking; using Content.Shared.Administration.Logs; using Content.Shared.CCVar; +using Content.Shared.Database; using NUnit.Framework; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs index 8a1fff83f0..6ba0e6ad55 100644 --- a/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs +++ b/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs @@ -6,6 +6,7 @@ using Content.Server.Administration.Logs; using Content.Server.GameTicking; using Content.Shared.Administration.Logs; using Content.Shared.CCVar; +using Content.Shared.Database; using NUnit.Framework; using Robust.Server.Player; using Robust.Shared.GameObjects; diff --git a/Content.Server.Database/Content.Server.Database.csproj b/Content.Server.Database/Content.Server.Database.csproj index e0a676a3e4..a6d8df9e99 100644 --- a/Content.Server.Database/Content.Server.Database.csproj +++ b/Content.Server.Database/Content.Server.Database.csproj @@ -22,7 +22,7 @@ - + diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs index ad1a7143c2..5495825fbb 100644 --- a/Content.Server.Database/Model.cs +++ b/Content.Server.Database/Model.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Net; using System.Text.Json; -using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Microsoft.EntityFrameworkCore; namespace Content.Server.Database diff --git a/Content.Server/Actions/Actions/DisarmAction.cs b/Content.Server/Actions/Actions/DisarmAction.cs index dbbfd9822a..bc0caf804f 100644 --- a/Content.Server/Actions/Actions/DisarmAction.cs +++ b/Content.Server/Actions/Actions/DisarmAction.cs @@ -25,6 +25,7 @@ using System.Linq; using Content.Server.Administration.Logs; using Content.Server.Popups; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.Popups; namespace Content.Server.Actions.Actions diff --git a/Content.Server/Administration/AdminVerbSystem.cs b/Content.Server/Administration/AdminVerbSystem.cs index b923787471..1d3d16569c 100644 --- a/Content.Server/Administration/AdminVerbSystem.cs +++ b/Content.Server/Administration/AdminVerbSystem.cs @@ -17,6 +17,7 @@ using Content.Server.Players; using Content.Shared.Administration; using Content.Shared.Administration.Logs; using Content.Shared.Body.Components; +using Content.Shared.Database; using Content.Shared.GameTicking; using Content.Shared.Interaction.Helpers; using Content.Shared.Popups; diff --git a/Content.Server/Administration/Commands/AdminLogBulk.cs b/Content.Server/Administration/Commands/AdminLogBulk.cs index 3306f15f1d..ec833df9a2 100644 --- a/Content.Server/Administration/Commands/AdminLogBulk.cs +++ b/Content.Server/Administration/Commands/AdminLogBulk.cs @@ -2,6 +2,7 @@ using Content.Server.Administration.Logs; using Content.Shared.Administration; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Robust.Shared.Console; using Robust.Shared.GameObjects; using Robust.Shared.Timing; diff --git a/Content.Server/Administration/Logs/AdminLogSystem.cs b/Content.Server/Administration/Logs/AdminLogSystem.cs index d8c26825bc..2fed0d4b18 100644 --- a/Content.Server/Administration/Logs/AdminLogSystem.cs +++ b/Content.Server/Administration/Logs/AdminLogSystem.cs @@ -8,6 +8,7 @@ using Content.Server.GameTicking; using Content.Server.GameTicking.Events; using Content.Shared.Administration.Logs; using Content.Shared.CCVar; +using Content.Shared.Database; using Prometheus; using Robust.Shared; using Robust.Shared.Configuration; diff --git a/Content.Server/Administration/Logs/LogFilter.cs b/Content.Server/Administration/Logs/LogFilter.cs index 6793377364..20ac639adf 100644 --- a/Content.Server/Administration/Logs/LogFilter.cs +++ b/Content.Server/Administration/Logs/LogFilter.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading; using Content.Shared.Administration.Logs; +using Content.Shared.Database; namespace Content.Server.Administration.Logs; diff --git a/Content.Server/Administration/Logs/LogRecord.cs b/Content.Server/Administration/Logs/LogRecord.cs index 75d1da9514..6f32939350 100644 --- a/Content.Server/Administration/Logs/LogRecord.cs +++ b/Content.Server/Administration/Logs/LogRecord.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Content.Server.Database; using Content.Shared.Administration.Logs; +using Content.Shared.Database; namespace Content.Server.Administration.Logs; diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs index 0b3d85a40a..9f3e8c70e3 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs @@ -4,6 +4,7 @@ using Content.Server.Atmos.Components; using Content.Server.Doors.Components; using Content.Shared.Administration.Logs; using Content.Shared.Atmos; +using Content.Shared.Database; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs index 6feb108c76..89ca5022df 100644 --- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs +++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.Administration.Logs; using Content.Shared.Alert; using Content.Shared.Atmos; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.FixedPoint; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index 461e4d1257..f66142f789 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -10,6 +10,7 @@ using Content.Shared.Administration.Logs; using Content.Shared.Alert; using Content.Shared.Atmos; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Temperature; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs index 99e035f0c3..862fa61e96 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs @@ -14,6 +14,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; using Content.Shared.Atmos; using Content.Shared.Atmos.Piping.Binary.Components; +using Content.Shared.Database; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using JetBrains.Annotations; diff --git a/Content.Server/Body/Components/RespiratorComponent.cs b/Content.Server/Body/Components/RespiratorComponent.cs index 2f5e5e1ef6..effc3325e7 100644 --- a/Content.Server/Body/Components/RespiratorComponent.cs +++ b/Content.Server/Body/Components/RespiratorComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Alert; using Content.Shared.Atmos; using Content.Shared.Body.Components; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.MobState.Components; using Content.Shared.Popups; using Robust.Shared.GameObjects; diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs index 7cd182d34c..a619b45f86 100644 --- a/Content.Server/Body/Systems/MetabolizerSystem.cs +++ b/Content.Server/Body/Systems/MetabolizerSystem.cs @@ -5,6 +5,7 @@ using Content.Server.Chemistry.EntitySystems; using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Content.Shared.FixedPoint; using Content.Shared.MobState.Components; using JetBrains.Annotations; diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs index b502c7ca2a..d4c32071be 100644 --- a/Content.Server/Chat/Commands/SuicideCommand.cs +++ b/Content.Server/Chat/Commands/SuicideCommand.cs @@ -11,6 +11,7 @@ using Content.Server.Popups; using Content.Shared.Administration.Logs; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; +using Content.Shared.Database; using Content.Shared.Popups; using Robust.Server.Player; using Robust.Shared.Console; diff --git a/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs index 3a30a15d9c..cd5247f3ac 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs @@ -2,6 +2,7 @@ using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Content.Shared.FixedPoint; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs index d3a6eb9df5..9418f02d7e 100644 --- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs @@ -7,6 +7,7 @@ using Content.Shared.Audio; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Shared.Audio; diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs index 6b4931be1b..074f5b57b8 100644 --- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs +++ b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs @@ -3,6 +3,7 @@ using Content.Server.Chemistry.Components.SolutionManager; using Content.Server.Explosion.EntitySystems; using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; diff --git a/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs b/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs index beb569016e..b5282c4fcb 100644 --- a/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs +++ b/Content.Server/Chemistry/ReagentEffects/FlammableReaction.cs @@ -4,6 +4,7 @@ using Content.Server.Atmos.EntitySystems; using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Content.Shared.FixedPoint; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs index 90ee7f161a..1541b11886 100644 --- a/Content.Server/Crayon/CrayonComponent.cs +++ b/Content.Server/Crayon/CrayonComponent.cs @@ -5,6 +5,7 @@ using Content.Server.UserInterface; using Content.Shared.Administration.Logs; using Content.Shared.Audio; using Content.Shared.Crayon; +using Content.Shared.Database; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Popups; diff --git a/Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs b/Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs index f0db7dc5f0..5bbbd64422 100644 --- a/Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnHighSpeedImpactSystem.cs @@ -6,6 +6,7 @@ using Content.Server.Stunnable.Components; using Content.Shared.Administration.Logs; using Content.Shared.Audio; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.Stunnable; using JetBrains.Annotations; using Robust.Shared.Audio; diff --git a/Content.Server/Damage/Systems/DamageOnLandSystem.cs b/Content.Server/Damage/Systems/DamageOnLandSystem.cs index 48dbe4f997..17e3192d6f 100644 --- a/Content.Server/Damage/Systems/DamageOnLandSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnLandSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Administration.Logs; using Content.Server.Damage.Components; using Content.Shared.Administration.Logs; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.Throwing; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -25,7 +26,7 @@ namespace Content.Server.Damage.Systems if (dmg == null) return; - _logSystem.Add(LogType.Landed, $"{component.Owner} received {dmg.Total} damage from landing"); + _logSystem.Add(LogType.Landed, $"{component.Owner} received {dmg.Total} damage from landing"); } } } diff --git a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs index 9b75e34e44..c15d66126b 100644 --- a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Damage.Components; using Content.Server.Tools.Components; using Content.Shared.Administration.Logs; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.Interaction; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs index 98ea41dd0b..8f7d1f4aca 100644 --- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs +++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Administration.Logs; using Content.Server.Damage.Components; using Content.Shared.Administration.Logs; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.Throwing; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index 1a09b24523..8abce7202a 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -13,6 +13,7 @@ using Content.Shared.Administration.Logs; using Content.Shared.Alert; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; +using Content.Shared.Database; using Content.Shared.Electrocution; using Content.Shared.Interaction; using Content.Shared.Jittering; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index ff721d0c72..4192f10c48 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -6,6 +6,7 @@ using Content.Server.Camera; using Content.Server.Explosion.Components; using Content.Shared.Acts; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.Interaction.Helpers; using Content.Shared.Maps; using Content.Shared.Physics; diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index 00749f5200..e432b10adb 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -8,6 +8,7 @@ using Content.Server.Fluids.Components; using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Content.Shared.Directions; using Content.Shared.Examine; using Content.Shared.FixedPoint; diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 00bde9cc6b..f2e4ac19e3 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -17,6 +17,7 @@ using Content.Server.Speech.Components; using Content.Server.Station; using Content.Shared.Administration.Logs; using Content.Shared.CharacterAppearance.Systems; +using Content.Shared.Database; using Content.Shared.GameTicking; using Content.Shared.Ghost; using Content.Shared.Inventory; diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs index 4927934494..781484aca0 100644 --- a/Content.Server/Interaction/InteractionSystem.cs +++ b/Content.Server/Interaction/InteractionSystem.cs @@ -9,6 +9,7 @@ using Content.Server.Items; using Content.Server.Pulling; using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.DragDrop; using Content.Shared.Input; using Content.Shared.Interaction; diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index 3dfaa51d7b..d2f48b7d21 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -24,6 +24,7 @@ using Robust.Shared.Maths; using Content.Shared.Audio; using Content.Server.Administration.Logs; using Content.Shared.Administration.Logs; +using Content.Shared.Database; namespace Content.Server.Light.EntitySystems { diff --git a/Content.Server/Medical/Components/HealingComponent.cs b/Content.Server/Medical/Components/HealingComponent.cs index c95db5e3ef..e3bab68ca9 100644 --- a/Content.Server/Medical/Components/HealingComponent.cs +++ b/Content.Server/Medical/Components/HealingComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; +using Content.Shared.Database; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Stacks; diff --git a/Content.Server/Morgue/MorgueSystem.cs b/Content.Server/Morgue/MorgueSystem.cs index 1907bfc885..611a4d0e07 100644 --- a/Content.Server/Morgue/MorgueSystem.cs +++ b/Content.Server/Morgue/MorgueSystem.cs @@ -1,5 +1,6 @@ using Content.Server.Morgue.Components; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Nutrition/Components/HungerComponent.cs b/Content.Server/Nutrition/Components/HungerComponent.cs index bae37a5c0a..94d77abe41 100644 --- a/Content.Server/Nutrition/Components/HungerComponent.cs +++ b/Content.Server/Nutrition/Components/HungerComponent.cs @@ -5,6 +5,7 @@ using Content.Server.Alert; using Content.Shared.Administration.Logs; using Content.Shared.Alert; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.MobState.Components; using Content.Shared.Movement.Components; using Content.Shared.Movement.EntitySystems; diff --git a/Content.Server/Nutrition/Components/ThirstComponent.cs b/Content.Server/Nutrition/Components/ThirstComponent.cs index 66e7e80789..1c5a150dc0 100644 --- a/Content.Server/Nutrition/Components/ThirstComponent.cs +++ b/Content.Server/Nutrition/Components/ThirstComponent.cs @@ -5,6 +5,7 @@ using Content.Server.Alert; using Content.Shared.Administration.Logs; using Content.Shared.Alert; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.MobState.Components; using Content.Shared.Movement.Components; using Content.Shared.Movement.EntitySystems; diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs index fa5d2a4d88..77a3d8a1ea 100644 --- a/Content.Server/Projectiles/ProjectileSystem.cs +++ b/Content.Server/Projectiles/ProjectileSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Projectiles.Components; using Content.Shared.Administration.Logs; using Content.Shared.Body.Components; using Content.Shared.Damage; +using Content.Shared.Database; using JetBrains.Annotations; using Robust.Shared.Audio; using Robust.Shared.GameObjects; diff --git a/Content.Server/Repairable/RepairableSystem.cs b/Content.Server/Repairable/RepairableSystem.cs index a5471ea677..b8296d9bca 100644 --- a/Content.Server/Repairable/RepairableSystem.cs +++ b/Content.Server/Repairable/RepairableSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Tools; using Content.Server.Tools.Components; using Content.Shared.Administration.Logs; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Tools.Components; diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs index b33872e2c0..2dc92158d2 100644 --- a/Content.Server/RoundEnd/RoundEndSystem.cs +++ b/Content.Server/RoundEnd/RoundEndSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Administration.Logs; using Content.Server.Chat.Managers; using Content.Server.GameTicking; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.GameTicking; using Robust.Server.Player; using Robust.Shared.Audio; diff --git a/Content.Server/StationEvents/Events/StationEvent.cs b/Content.Server/StationEvents/Events/StationEvent.cs index c454cc0d5c..770f36e774 100644 --- a/Content.Server/StationEvents/Events/StationEvent.cs +++ b/Content.Server/StationEvents/Events/StationEvent.cs @@ -1,6 +1,7 @@ using Content.Server.Administration.Logs; using Content.Server.Chat.Managers; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs index 80622c7078..e91988567d 100644 --- a/Content.Server/StationEvents/StationEventSystem.cs +++ b/Content.Server/StationEvents/StationEventSystem.cs @@ -8,6 +8,7 @@ using Content.Server.StationEvents.Events; using Content.Shared; using Content.Shared.Administration.Logs; using Content.Shared.CCVar; +using Content.Shared.Database; using Content.Shared.GameTicking; using Content.Shared.StationEvents; using JetBrains.Annotations; diff --git a/Content.Server/Stunnable/StunSystem.cs b/Content.Server/Stunnable/StunSystem.cs index f03084fc1a..cfc214f0e2 100644 --- a/Content.Server/Stunnable/StunSystem.cs +++ b/Content.Server/Stunnable/StunSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Administration.Logs; using Content.Server.Popups; using Content.Shared.Administration.Logs; using Content.Shared.Audio; +using Content.Shared.Database; using Content.Shared.Popups; using Content.Shared.StatusEffect; using Content.Shared.Stunnable; diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs index 0b27610d93..5e65955fe5 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs @@ -9,6 +9,7 @@ using Content.Server.Temperature.Components; using Content.Shared.Administration.Logs; using Content.Shared.Alert; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.FixedPoint; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs index 1c742b3ab6..17c6a0c100 100644 --- a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs +++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs @@ -9,6 +9,7 @@ using Content.Server.Cooldown; using Content.Server.Weapon.Melee.Components; using Content.Shared.Administration.Logs; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.Hands; using Content.Shared.Interaction; using Content.Shared.Physics; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs index a4a2e573e8..32009cb377 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs @@ -9,6 +9,7 @@ using Content.Server.Weapon.Ranged.Ammunition.Components; using Content.Shared.Administration.Logs; using Content.Shared.Audio; using Content.Shared.Damage; +using Content.Shared.Database; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Sound; diff --git a/Content.Shared.Database/Content.Shared.Database.csproj b/Content.Shared.Database/Content.Shared.Database.csproj new file mode 100644 index 0000000000..eb2460e910 --- /dev/null +++ b/Content.Shared.Database/Content.Shared.Database.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/Content.Shared/Administration/Logs/LogImpact.cs b/Content.Shared.Database/LogImpact.cs similarity index 55% rename from Content.Shared/Administration/Logs/LogImpact.cs rename to Content.Shared.Database/LogImpact.cs index 9213225469..eafcf4dc27 100644 --- a/Content.Shared/Administration/Logs/LogImpact.cs +++ b/Content.Shared.Database/LogImpact.cs @@ -1,10 +1,7 @@ -using System; -using Robust.Shared.Serialization; - -namespace Content.Shared.Administration.Logs; +namespace Content.Shared.Database; // DO NOT CHANGE THE NUMERIC VALUES OF THESE -[Serializable, NetSerializable] +[Serializable] public enum LogImpact : sbyte { Low = -1, diff --git a/Content.Shared/Administration/Logs/LogType.cs b/Content.Shared.Database/LogType.cs similarity index 96% rename from Content.Shared/Administration/Logs/LogType.cs rename to Content.Shared.Database/LogType.cs index b128de944d..a6359999c5 100644 --- a/Content.Shared/Administration/Logs/LogType.cs +++ b/Content.Shared.Database/LogType.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Administration.Logs; +namespace Content.Shared.Database; // DO NOT CHANGE THE NUMERIC VALUES OF THESE public enum LogType diff --git a/Content.Shared/Administration/AdminLogsEuiState.cs b/Content.Shared/Administration/AdminLogsEuiState.cs index 15810871db..3eb48524be 100644 --- a/Content.Shared/Administration/AdminLogsEuiState.cs +++ b/Content.Shared/Administration/AdminLogsEuiState.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.Eui; using Robust.Shared.Serialization; diff --git a/Content.Shared/Administration/Logs/SharedAdminLog.cs b/Content.Shared/Administration/Logs/SharedAdminLog.cs index f918f20a24..bf44ba95d0 100644 --- a/Content.Shared/Administration/Logs/SharedAdminLog.cs +++ b/Content.Shared/Administration/Logs/SharedAdminLog.cs @@ -1,4 +1,5 @@ using System; +using Content.Shared.Database; using Robust.Shared.Serialization; namespace Content.Shared.Administration.Logs; diff --git a/Content.Shared/Administration/Logs/SharedAdminLogSystem.cs b/Content.Shared/Administration/Logs/SharedAdminLogSystem.cs index dd7a8f24af..00b17c41f4 100644 --- a/Content.Shared/Administration/Logs/SharedAdminLogSystem.cs +++ b/Content.Shared/Administration/Logs/SharedAdminLogSystem.cs @@ -1,4 +1,5 @@ using System.Globalization; +using Content.Shared.Database; using Robust.Shared.GameObjects; namespace Content.Shared.Administration.Logs; diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs index f117884b0c..5534a7351e 100644 --- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs +++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Content.Shared.FixedPoint; using Content.Shared.Sound; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs index 5ebebe6ac3..1a0b0fc2e1 100644 --- a/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs +++ b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Content.Shared.FixedPoint; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Shared/Chemistry/ReactiveSystem.cs b/Content.Shared/Chemistry/ReactiveSystem.cs index ff9264c271..837d5f4d51 100644 --- a/Content.Shared/Chemistry/ReactiveSystem.cs +++ b/Content.Shared/Chemistry/ReactiveSystem.cs @@ -2,6 +2,7 @@ using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Content.Shared.FixedPoint; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs index 10886c3f27..1c526e053e 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentEffect.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentEffect.cs @@ -2,6 +2,7 @@ using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Database; using Content.Shared.FixedPoint; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs index 5ab4a69433..733ce02709 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs @@ -5,6 +5,7 @@ using Content.Shared.Body.Prototypes; using Content.Shared.Botany; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reaction; +using Content.Shared.Database; using Content.Shared.FixedPoint; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index 13210533c3..c6cf58a98f 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -16,6 +16,7 @@ + false diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs index 17ad591255..82c87b802a 100644 --- a/Content.Shared/Damage/Components/DamageableComponent.cs +++ b/Content.Shared/Damage/Components/DamageableComponent.cs @@ -14,6 +14,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; using Robust.Shared.ViewVariables; using Content.Shared.Administration.Logs; +using Content.Shared.Database; namespace Content.Shared.Damage { diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs index ff9c05c425..9b21ad702f 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.cs @@ -1,6 +1,7 @@ using System.Linq; using Content.Shared.Administration.Logs; using Content.Shared.Damage.Prototypes; +using Content.Shared.Database; using Content.Shared.FixedPoint; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; diff --git a/Content.Shared/Hands/Components/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs index 3b39b7b280..a45e358006 100644 --- a/Content.Shared/Hands/Components/SharedHandsComponent.cs +++ b/Content.Shared/Hands/Components/SharedHandsComponent.cs @@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.Interaction; using Content.Shared.Item; using Robust.Shared.Containers; diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index c5e3bf3cba..ed4f8cfb51 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.Hands; using Content.Shared.Hands.Components; using Content.Shared.Inventory; diff --git a/Content.Shared/Slippery/SharedSlipperySystem.cs b/Content.Shared/Slippery/SharedSlipperySystem.cs index 08a95403b3..0f953f75ae 100644 --- a/Content.Shared/Slippery/SharedSlipperySystem.cs +++ b/Content.Shared/Slippery/SharedSlipperySystem.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.StatusEffect; using Content.Shared.Stunnable; using JetBrains.Annotations; diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs index 3da0b52c10..ec8685b1a1 100644 --- a/Content.Shared/Throwing/ThrownItemSystem.cs +++ b/Content.Shared/Throwing/ThrownItemSystem.cs @@ -1,4 +1,6 @@ using Content.Shared.Administration.Logs; +using Content.Shared.CCVar; +using Content.Shared.Database; using Content.Shared.Hands.Components; using Content.Shared.Physics; using Content.Shared.Physics.Pull; diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs index 3340b97874..8861c1a74e 100644 --- a/Content.Shared/Verbs/SharedVerbSystem.cs +++ b/Content.Shared/Verbs/SharedVerbSystem.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using Content.Shared.Hands.Components; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Shared/Verbs/Verb.cs b/Content.Shared/Verbs/Verb.cs index 79377a71c9..58c1b95227 100644 --- a/Content.Shared/Verbs/Verb.cs +++ b/Content.Shared/Verbs/Verb.cs @@ -3,6 +3,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.Utility; using System; +using Content.Shared.Database; namespace Content.Shared.Verbs { diff --git a/Content.Tests/Shared/Administration/Logs/LogTypeTests.cs b/Content.Tests/Shared/Administration/Logs/LogTypeTests.cs index 5e2a5f5da7..ec5864ab62 100644 --- a/Content.Tests/Shared/Administration/Logs/LogTypeTests.cs +++ b/Content.Tests/Shared/Administration/Logs/LogTypeTests.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using Content.Shared.Administration.Logs; +using Content.Shared.Database; using NUnit.Framework; namespace Content.Tests.Shared.Administration.Logs; diff --git a/SpaceStation14.sln b/SpaceStation14.sln index 297aca7720..4cf3657690 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -108,6 +108,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralRules.Generator", "Ro EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pow3r", "Pow3r\Pow3r.csproj", "{1C048C9F-00A9-4796-BE4D-BB36B7769720}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Shared.Database", "Content.Shared.Database\Content.Shared.Database.csproj", "{8842381D-3426-4BA8-93DA-599AB14D88E9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -253,6 +255,10 @@ Global {1C048C9F-00A9-4796-BE4D-BB36B7769720}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.ActiveCfg = Release|Any CPU {1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.Build.0 = Release|Any CPU + {8842381D-3426-4BA8-93DA-599AB14D88E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8842381D-3426-4BA8-93DA-599AB14D88E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8842381D-3426-4BA8-93DA-599AB14D88E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8842381D-3426-4BA8-93DA-599AB14D88E9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE