-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into toiletbranch
- Loading branch information
Showing
361 changed files
with
1,713,564 additions
and
1,712,558 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,15 @@ | ||
name: CRLF Check | ||
|
||
on: | ||
pull_request: | ||
types: [ opened, reopened, synchronize, ready_for_review ] | ||
|
||
jobs: | ||
build: | ||
name: CRLF Check | ||
if: github.event.pull_request.draft == false | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v3.6.0 | ||
- name: Check for CRLF | ||
run: Tools/check_crlf.py |
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,4 +1,4 @@ | ||
name: Close PR's on master | ||
name: Close PRs on master | ||
|
||
on: | ||
pull_request_target: | ||
|
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,13 @@ | ||
name: "Labels: Untriaged" | ||
|
||
on: | ||
issues: | ||
types: [opened] | ||
|
||
jobs: | ||
add_label: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions-ecosystem/action-add-labels@v1 | ||
with: | ||
labels: "Status: Untriaged" |
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
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
38 changes: 38 additions & 0 deletions
38
Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.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,38 @@ | ||
using Content.Server.DeviceNetwork.Components; | ||
using Content.Shared.DeviceNetwork.Components; | ||
using Robust.Server.GameObjects; | ||
|
||
namespace Content.Server.DeviceNetwork.Systems; | ||
|
||
public sealed class DeviceNetworkJammerSystem : EntitySystem | ||
{ | ||
[Dependency] private TransformSystem _transform = default!; | ||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
|
||
SubscribeLocalEvent<TransformComponent, BeforePacketSentEvent>(BeforePacketSent); | ||
} | ||
|
||
private void BeforePacketSent(EntityUid uid, TransformComponent xform, BeforePacketSentEvent ev) | ||
{ | ||
if (ev.Cancelled) | ||
return; | ||
|
||
var query = EntityQueryEnumerator<DeviceNetworkJammerComponent, TransformComponent>(); | ||
|
||
while (query.MoveNext(out _, out var jammerComp, out var jammerXform)) | ||
{ | ||
if (!jammerComp.JammableNetworks.Contains(ev.NetworkId)) | ||
continue; | ||
|
||
if (jammerXform.Coordinates.InRange(EntityManager, _transform, ev.SenderTransform.Coordinates, jammerComp.Range) | ||
|| jammerXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, jammerComp.Range)) | ||
{ | ||
ev.Cancel(); | ||
return; | ||
} | ||
} | ||
} | ||
|
||
} |
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,19 +1,19 @@ | ||
using Robust.Shared.Prototypes; | ||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; | ||
|
||
namespace Content.Server.Holosign | ||
{ | ||
[RegisterComponent] | ||
public sealed partial class HolosignProjectorComponent : Component | ||
{ | ||
[ViewVariables(VVAccess.ReadWrite)] | ||
[DataField("signProto", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))] | ||
public string SignProto = "HolosignWetFloor"; | ||
|
||
/// <summary> | ||
/// How much charge a single use expends. | ||
/// </summary> | ||
[ViewVariables(VVAccess.ReadWrite), DataField("chargeUse")] | ||
public float ChargeUse = 50f; | ||
} | ||
} | ||
using Robust.Shared.Prototypes; | ||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; | ||
|
||
namespace Content.Server.Holosign | ||
{ | ||
[RegisterComponent] | ||
public sealed partial class HolosignProjectorComponent : Component | ||
{ | ||
[ViewVariables(VVAccess.ReadWrite)] | ||
[DataField("signProto", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))] | ||
public string SignProto = "HolosignWetFloor"; | ||
|
||
/// <summary> | ||
/// How much charge a single use expends. | ||
/// </summary> | ||
[ViewVariables(VVAccess.ReadWrite), DataField("chargeUse")] | ||
public float ChargeUse = 50f; | ||
} | ||
} |
Oops, something went wrong.