Skip to content

Commit

Permalink
Merge branch 'master' into RightType
Browse files Browse the repository at this point in the history
  • Loading branch information
Cyberboss authored Oct 21, 2023
2 parents 742509a + f684cf3 commit 94dd021
Show file tree
Hide file tree
Showing 32 changed files with 20 additions and 54 deletions.
2 changes: 0 additions & 2 deletions Content.IntegrationTests/ContentIntegrationTest.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
using System;
using System.Threading.Tasks;
using OpenDreamClient;
using OpenDreamServer;
using OpenDreamShared;
using NUnit.Framework;
using OpenDreamClient.Interface;
using OpenDreamRuntime;
using Robust.Client;
using Robust.Client.WebView;
using Robust.Server;
using Robust.Shared.ContentPack;
using Robust.Shared.IoC;
Expand Down
4 changes: 0 additions & 4 deletions Content.IntegrationTests/GameTests.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
using System.Diagnostics;
using System.Threading.Tasks;
using NUnit.Framework;
using OpenDreamRuntime;
using Robust.Server.Player;
using Robust.Shared.IoC;
using Robust.Shared.Network;

namespace Content.IntegrationTests {
[TestFixture]
Expand Down
1 change: 0 additions & 1 deletion Content.IntegrationTests/SetupCompileDM.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.IO;
using NUnit.Framework;
using NUnit.Framework.Internal;

// This it outside of any namespace so it affects the whole assembly.
[SetUpFixture]
Expand Down
1 change: 0 additions & 1 deletion Content.Tests/DMTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using NUnit.Framework;
using OpenDreamRuntime;
using OpenDreamRuntime.Objects;
using OpenDreamRuntime.Procs;
using OpenDreamRuntime.Rendering;
using OpenDreamShared.Rendering;
using Robust.Shared.Asynchronous;
Expand Down
2 changes: 0 additions & 2 deletions DMCompiler/Compiler/DM/DMAST.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using JetBrains.Annotations;
using System.Linq;
using OpenDreamShared.Compiler;
using OpenDreamShared.Dream;
using OpenDreamShared.Dream.Procs;

namespace DMCompiler.Compiler.DM {
public interface DMASTVisitor : ASTVisitor {
Expand Down
1 change: 0 additions & 1 deletion DMCompiler/Compiler/DM/DMASTHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Collections.Generic;
using System.Reflection;
using OpenDreamShared.Dream;
using OpenDreamShared.Dream.Procs;
using OpenDreamShared.Compiler;

namespace DMCompiler.Compiler.DM {
Expand Down
1 change: 0 additions & 1 deletion DMCompiler/Compiler/DMPreprocessor/DMPreprocessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using DMCompiler.Compiler.DM;
using OpenDreamShared.Compiler;
using Robust.Shared.Utility;
Expand Down
3 changes: 0 additions & 3 deletions DMCompiler/Compiler/DMPreprocessor/DMPreprocessorParser.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
using DMCompiler.Compiler.DM;
using DMCompiler.DM;
using OpenDreamShared.Compiler;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

#nullable enable
namespace DMCompiler.Compiler.DMPreprocessor {
Expand Down
1 change: 0 additions & 1 deletion DMDisassembler/DMProc.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamRuntime.Procs;
using OpenDreamShared.Dream.Procs;
using OpenDreamShared.Json;
using System;
using System.Collections.Generic;
Expand Down
2 changes: 0 additions & 2 deletions OpenDreamClient/Input/ContextMenu/ContextMenuItem.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using JetBrains.Annotations;
using OpenDreamClient.Rendering;
using OpenDreamShared.Dream;
using Robust.Client.AutoGenerated;
using Robust.Client.Graphics;
using Robust.Client.UserInterface;
Expand Down
1 change: 0 additions & 1 deletion OpenDreamClient/Input/ContextMenu/VerbMenuPopup.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using JetBrains.Annotations;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
Expand Down
3 changes: 1 addition & 2 deletions OpenDreamClient/Interface/Controls/ControlButton.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamClient.Input;
using OpenDreamClient.Interface.Descriptors;
using OpenDreamClient.Interface.Descriptors;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;

Expand Down
3 changes: 1 addition & 2 deletions OpenDreamClient/Interface/Controls/ControlInput.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamClient.Input;
using OpenDreamClient.Interface.Descriptors;
using OpenDreamClient.Interface.Descriptors;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;

Expand Down
3 changes: 1 addition & 2 deletions OpenDreamClient/Interface/Controls/ControlWindow.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamClient.Input;
using OpenDreamClient.Interface.Descriptors;
using OpenDreamClient.Interface.Descriptors;
using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
Expand Down
3 changes: 1 addition & 2 deletions OpenDreamClient/Interface/DebugWindows/MacrosWindow.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamClient.Input;
using OpenDreamClient.Interface.Prompts;
using OpenDreamClient.Interface.Prompts;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Console;

Expand Down
2 changes: 0 additions & 2 deletions OpenDreamClient/Interface/DreamInterfaceManager.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
using System.IO;
using System.Text;
using OpenDreamShared.Compiler;
using OpenDreamShared.Dream.Procs;
using OpenDreamShared.Network.Messages;
using OpenDreamClient.Input;
using OpenDreamClient.Interface.Controls;
using OpenDreamClient.Interface.Descriptors;
using OpenDreamClient.Interface.DMF;
Expand Down
3 changes: 1 addition & 2 deletions OpenDreamClient/Interface/InterfaceMacro.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamClient.Input;
using OpenDreamClient.Interface.Descriptors;
using OpenDreamClient.Interface.Descriptors;
using Robust.Client.Input;
using Robust.Client.UserInterface;
using Robust.Shared.Input;
Expand Down
3 changes: 1 addition & 2 deletions OpenDreamClient/Interface/InterfaceMenu.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamClient.Input;
using OpenDreamClient.Interface.Descriptors;
using OpenDreamClient.Interface.Descriptors;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Serialization.Manager;

Expand Down
2 changes: 0 additions & 2 deletions OpenDreamClient/Rendering/ClientImagesSystem.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using OpenDreamShared.Dream;
using OpenDreamShared.Rendering;
using Vector3 = Robust.Shared.Maths.Vector3;

Expand Down
2 changes: 2 additions & 0 deletions OpenDreamPackageTool/ServerPackaging.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public static class ServerPackaging {
"OpenDreamShared",
"OpenDreamRuntime",
"Byond.TopicSender",
"Microsoft.Extensions.Logging.Abstractions", // dep of Byond.TopicSender
"DMCompiler"
};

Expand All @@ -43,6 +44,7 @@ public static class ServerPackaging {
"OpenDreamShared",
"OpenDreamRuntime",
"Byond.TopicSender",
"Microsoft.Extensions.Logging.Abstractions", // dep of Byond.TopicSender
"DMCompiler"
};

Expand Down
3 changes: 1 addition & 2 deletions OpenDreamRuntime/Input/DreamCommandSystem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamShared.Input;
using OpenDreamShared.Network.Messages;
using OpenDreamShared.Network.Messages;
using Robust.Server.Player;
using Robust.Shared.Network;

Expand Down
2 changes: 2 additions & 0 deletions OpenDreamRuntime/LocalHostConGroup.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#if DEBUG
using Robust.Server.Console;
using Robust.Server.Player;
using System.Net;
using Robust.Shared.Network;
using Robust.Shared.Players;
using Robust.Shared.Toolshed;
using Robust.Shared.Toolshed.Errors;
#endif

namespace OpenDreamRuntime {
#if DEBUG
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using System.Text.Json.Serialization;

namespace OpenDreamRuntime.Procs.DebugAdapter.Protocol;

public enum ExceptionBreakMode {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Linq;
using System.Text.Json.Serialization;

namespace OpenDreamRuntime.Procs.DebugAdapter.Protocol;
Expand Down
1 change: 0 additions & 1 deletion OpenDreamRuntime/Procs/DreamEnumerators.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamRuntime.Objects;
using OpenDreamShared.Dream.Procs;

namespace OpenDreamRuntime.Procs {
public interface IDreamValueEnumerator {
Expand Down
3 changes: 1 addition & 2 deletions OpenDreamRuntime/Procs/Native/DreamProcNativeHelpers.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Runtime.CompilerServices;
using OpenDreamRuntime.Objects;
using OpenDreamRuntime.Objects;
using OpenDreamShared.Dream;
using System.Text.RegularExpressions;
using OpenDreamRuntime.Objects.Types;
Expand Down
3 changes: 0 additions & 3 deletions OpenDreamRuntime/Rendering/ServerClientImagesSystem.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using OpenDreamRuntime.Objects.Types;
using OpenDreamShared.Rendering;
using OpenDreamShared.Dream;
using Robust.Server.GameStates;
using Robust.Server.Player;
using OpenDreamRuntime.Objects;
using Vector3 = Robust.Shared.Maths.Vector3;

Expand Down
1 change: 0 additions & 1 deletion OpenDreamShared/Dream/Procs/ProcAttributes.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.ComponentModel;

namespace OpenDreamShared.Dream.Procs;

Expand Down
3 changes: 1 addition & 2 deletions OpenDreamShared/Network/Messages/MsgLoadInterface.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using Lidgren.Network;
using Lidgren.Network;
using Robust.Shared.Network;
using Robust.Shared.Serialization;

Expand Down
3 changes: 1 addition & 2 deletions OpenDreamShared/Rendering/SharedClientImagesSystem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using OpenDreamShared.Dream;
using Robust.Shared.Analyzers;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
Expand Down
3 changes: 0 additions & 3 deletions OpenDreamShared/SharedOpenDreamIoC.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
using System;
using Robust.Shared.ContentPack;

namespace OpenDreamShared {
public static class SharedOpenDreamIoC {
public static void Register() {
Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "7.0.0",
"rollForward": "latestFeature"
}
}

0 comments on commit 94dd021

Please sign in to comment.