-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Fansana:master' into Xenospawners
- Loading branch information
Showing
410 changed files
with
342,693 additions
and
1,686 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
using Content.Shared.InteractionVerbs; | ||
|
||
namespace Content.Client.InteractionVerbs; | ||
|
||
// Just here because the shared system is abstract. | ||
public sealed class InteractionVerbsSystem : SharedInteractionVerbsSystem | ||
{ | ||
} |
37 changes: 37 additions & 0 deletions
37
Content.IntegrationTests/Tests/InteractionVerbs/InteractionPrototypesTest.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,37 @@ | ||
using System.Linq; | ||
using Content.Client.Guidebook; | ||
using Content.Server.Verbs; | ||
using Content.Shared.InteractionVerbs; | ||
using Content.Shared.Verbs; | ||
using Robust.Shared.GameObjects; | ||
using Robust.Shared.Prototypes; | ||
|
||
namespace Content.IntegrationTests.Tests.InteractionVerbs; | ||
|
||
[TestFixture] | ||
[FixtureLifeCycle(LifeCycle.SingleInstance)] | ||
[TestOf(typeof(InteractionVerbPrototype))] | ||
public sealed class InteractionPrototypesTest | ||
{ | ||
public const string TestMobProto = "MobHuman"; | ||
|
||
[Test] | ||
public async Task ValidatePrototypeContents() | ||
{ | ||
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); | ||
var server = pair.Server; | ||
await server.WaitIdleAsync(); | ||
|
||
var entMan = server.ResolveDependency<IEntityManager>(); | ||
var protoMan = server.ResolveDependency<IPrototypeManager>(); | ||
|
||
// TODO probably should test if an entity receives an abstract verb, but Iunno how | ||
foreach (var proto in protoMan.EnumeratePrototypes<InteractionVerbPrototype>()) | ||
{ | ||
Assert.That(proto.Abstract || proto.Action is not null, $"Non-abstract prototype {proto.ID} lacks an action!"); | ||
} | ||
|
||
|
||
await pair.CleanReturnAsync(); | ||
} | ||
} |
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
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
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
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 |
---|---|---|
@@ -1,11 +1,8 @@ | ||
namespace Content.Server.Chat | ||
{ | ||
/// <summary> | ||
/// Repeats whatever is happening in telepathic chat. | ||
/// </summary> | ||
[RegisterComponent] | ||
public sealed partial class TelepathicRepeaterComponent : Component | ||
{ | ||
namespace Content.Server.Chat; | ||
|
||
/// <summary> | ||
/// Repeats whatever is happening in telepathic chat. | ||
/// </summary> | ||
[RegisterComponent] | ||
public sealed partial class TelepathicRepeaterComponent : Component { } | ||
|
||
} | ||
} |
23 changes: 23 additions & 0 deletions
23
Content.Server/DeltaV/Station/Components/StationSurfaceComponent.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,23 @@ | ||
using Content.Server.Station.Systems; | ||
using Robust.Shared.Utility; | ||
|
||
namespace Content.Server.Station.Components; | ||
|
||
/// <summary> | ||
/// Loads a surface map on mapinit. | ||
/// </summary> | ||
[RegisterComponent, Access(typeof(StationSurfaceSystem))] | ||
public sealed partial class StationSurfaceComponent : Component | ||
{ | ||
/// <summary> | ||
/// Path to the map to load. | ||
/// </summary> | ||
[DataField(required: true)] | ||
public ResPath? MapPath; | ||
|
||
/// <summary> | ||
/// The map that was loaded. | ||
/// </summary> | ||
[DataField] | ||
public EntityUid? Map; | ||
} |
Oops, something went wrong.