More compilation fixes: mostly Shared.GameTicking

new-frontiers-14 · Jun 18, 2024 · 31fb9a9 · 31fb9a9
1 parent 3ab815d
commit 31fb9a9
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 7 deletions.
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -8,6 +8,7 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
 using Content.Shared.Cuffs.Components;
+using Content.Shared.Mobs; // FRONTIER MERGE: ADDED FOR MobStateChangedEvent
 
 namespace Content.Server.Atmos.Rotting;
 

diff --git a/Content.Server/Construction/Components/MachineComponent.cs b/Content.Server/Construction/Components/MachineComponent.cs
@@ -15,3 +15,14 @@ public sealed partial class MachineComponent : Component
     [ViewVariables]
     public Container PartContainer = default!;
 }
+
+// FRONTIER MERGE: BROUGHT THIS BACK
+/// <summary>
+/// The different types of scaling that are available for machine upgrades
+/// </summary>
+public enum MachineUpgradeScalingType : byte
+{
+    Linear,
+    Exponential
+}
+// END FRONTIER MERGE
diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
@@ -20,7 +20,7 @@ public sealed class UserDbDataManager : IPostInjectInit
 {
     [Dependency] private readonly IServerPreferencesManager _prefs = default!;
     [Dependency] private readonly ILogManager _logManager = default!;
-    [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
+    //[Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; // FRONTIER MERGE: COMMENTED OUT
 
     private readonly Dictionary<NetUserId, UserData> _users = new();
     private readonly List<OnLoadPlayer> _onLoadPlayer = [];

diff --git a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.UserInterface;
 using Content.Shared.Instruments;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Bed.Sleep; // FRONTIER MERGE: ADDED FOR SleepStateChangedEvent
 using Content.Shared.Damage;
 using Content.Shared.Damage.ForceSay;
 using Content.Shared.DeltaV.Harpy;

diff --git a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs b/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.Actions;
-using Content.Server.Bed.Sleep;
+//using Content.Server.Bed.Sleep; //FRONTIER MERGE: COMMENTED OUT
 using Content.Server.Carrying;
 using Content.Server.DoAfter;
 using Content.Server.Popups;

diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
@@ -1,9 +1,9 @@
 using Content.Server.Anomaly;
-using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.CCVar;
+using Content.Shared.GameTicking.Components; // FRONTIER MERGE: Server<Shared
 using Content.Shared.Physics;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;

diff --git a/Content.Server/StationEvents/Events/BluespaceCargoRule.cs b/Content.Server/StationEvents/Events/BluespaceCargoRule.cs
@@ -8,7 +8,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Configuration;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.GameTicking.Components;
+using Content.Shared.GameTicking.Components; // FRONTIER MERGE: Server<Shared
 using Content.Shared.CCVar;
 
 namespace Content.Server.StationEvents.Events;

diff --git a/Content.Server/StationEvents/Events/BluespaceErrorRule.cs b/Content.Server/StationEvents/Events/BluespaceErrorRule.cs
@@ -1,7 +1,6 @@
 using System.Numerics;
 using Content.Server.Cargo.Components;
 using Content.Server.Cargo.Systems;
-using Content.Server.GameTicking.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Map;
@@ -12,6 +11,7 @@
 using Content.Server.Shuttles.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Coordinates;
+using Content.Shared.GameTicking.Components; // FRONTIER MERGE: Server<Shared
 using Content.Shared.Humanoid;
 using Content.Shared.Mobs.Components;
 using Robust.Shared.Player;

diff --git a/Content.Server/StationEvents/Events/BluespaceSyndicateCargoRule.cs b/Content.Server/StationEvents/Events/BluespaceSyndicateCargoRule.cs
@@ -8,7 +8,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Configuration;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.GameTicking.Components;
+using Content.Shared.GameTicking.Components; // FRONTIER MERGE: Server<Shared
 using Content.Shared.CCVar;
 
 namespace Content.Server.StationEvents.Events;

diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -12,14 +12,15 @@
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Console;
+using Content.Shared.GameTicking.Components; // FRONTIER MERGE: ADDED FOR GameRuleComponent
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Map.Components;
 using Content.Shared.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Cargo.Components;
-using Content.Server.GameTicking.Components;
+//using Content.Server.GameTicking.Components; // FRONTIER MERGE: COMMENTED OUT
 using Content.Server.Maps;
 using Content.Server.Station.Systems;
 using Content.Shared.CCVar;