Merge branch 'master' into MagicWands
This commit is contained in:
15
Content.Shared/_CP14/Roof/CP14RoofComponent.cs
Normal file
15
Content.Shared/_CP14/Roof/CP14RoofComponent.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
using Content.Shared.Actions;
|
||||
|
||||
namespace Content.Shared._CP14.Roof;
|
||||
|
||||
/// <summary>
|
||||
/// Marks an entity as a roof, allowing you to hide all roofs or show them back depending on different situations
|
||||
/// </summary>
|
||||
[RegisterComponent]
|
||||
public sealed partial class CP14RoofComponent : Component
|
||||
{
|
||||
}
|
||||
|
||||
public sealed partial class CP14ToggleRoofVisibilityAction : InstantActionEvent
|
||||
{
|
||||
}
|
||||
@@ -40,6 +40,9 @@ public sealed class CP14WallmountSystem : EntitySystem
|
||||
{
|
||||
base.Update(frameTime);
|
||||
|
||||
if (_net.IsClient)
|
||||
return;
|
||||
|
||||
var query = EntityQueryEnumerator<CP14WallmountComponent>();
|
||||
while (query.MoveNext(out var uid, out var wallmount))
|
||||
{
|
||||
@@ -51,8 +54,7 @@ public sealed class CP14WallmountSystem : EntitySystem
|
||||
|
||||
if (wallmount.AttachAttempts <= 0)
|
||||
{
|
||||
if (_net.IsServer)
|
||||
QueueDel(uid);
|
||||
QueueDel(uid);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
17
Content.Shared/_CP14/ZLevel/ZLevelActions.cs
Normal file
17
Content.Shared/_CP14/ZLevel/ZLevelActions.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
using Content.Shared.Actions;
|
||||
|
||||
namespace Content.Shared._CP14.ZLevel;
|
||||
|
||||
/// <summary>
|
||||
/// Should be relayed upon using the action.
|
||||
/// </summary>
|
||||
public sealed partial class CP14ZLevelActionUp : InstantActionEvent
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Should be relayed upon using the action.
|
||||
/// </summary>
|
||||
public sealed partial class CP14ZLevelActionDown : InstantActionEvent
|
||||
{
|
||||
}
|
||||
Reference in New Issue
Block a user