-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Merge branch 'Simple-Station:master' into Psionic-Power-Refac…
- Loading branch information
Showing
52 changed files
with
397 additions
and
920 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 0 additions & 19 deletions
19
Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml
This file was deleted.
Oops, something went wrong.
21 changes: 0 additions & 21 deletions
21
Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchEntryControl.xaml.cs
This file was deleted.
Oops, something went wrong.
27 changes: 0 additions & 27 deletions
27
Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUi.cs
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
Content.Client/DeltaV/CartridgeLoader/Cartridges/SecWatchUiFragment.xaml.cs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 0 additions & 23 deletions
23
Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeComponent.cs
This file was deleted.
Oops, something went wrong.
73 changes: 0 additions & 73 deletions
73
Content.Server/DeltaV/CartridgeLoader/Cartridges/SecWatchCartridgeSystem.cs
This file was deleted.
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
namespace Content.Server.DeltaV.CartridgeLoader.Cartridges; | ||
|
||
[RegisterComponent] | ||
public sealed partial class CrimeAssistCartridgeComponent : Component | ||
{ } |
16 changes: 16 additions & 0 deletions
16
Content.Server/DeltaV/CartridgeLoader/CrimeAssistCartridgeSystem.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
using Content.Shared.CartridgeLoader; | ||
using Content.Server.DeltaV.CartridgeLoader; | ||
using Content.Server.CartridgeLoader.Cartridges; | ||
using Content.Server.CartridgeLoader; | ||
|
||
namespace Content.Server.DeltaV.CartridgeLoader.Cartridges; | ||
|
||
public sealed class CrimeAssistCartridgeSystem : EntitySystem | ||
{ | ||
[Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!; | ||
|
||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
} | ||
} |
Oops, something went wrong.