tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remote Explosives (#7682)

Browse Source 
* Remote Explosives

* Apparently we forgot to push the changed files. Dumb.

We Forgor.#

* Made Requested Changes.

* And more changes.

* Added requested changes and tweaked a few other things.

* Fixed RSI issue (hopefully.) Readded Ensurecomp.
This commit is contained in:
Snowni
2022-04-22 02:54:39 -04:00
committed by GitHub
parent 2690c28eea
commit 87c618db4b
19 changed files with 186 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Entry/IgnoredComponents.cs
View File

@@ -108,6 +108,7 @@ namespace Content.Client.Entry
"SolarControlConsole",
"Thruster",
"FlashOnTrigger",
"Signaller",
"TriggerOnCollide",
"DeleteOnTrigger",
"EmptyOnMachineDeconstruct",
@@ -290,7 +291,7 @@ namespace Content.Client.Entry
"IncreaseDamageOnWield",
"TabletopGame",
"LitOnPowered",
"TriggerOnSignalReceived",
"TriggerOnSignal",
"DeviceNetwork",
"WiredNetworkConnection",
"WirelessNetworkConnection",

13
Content.Server/Explosion/Components/TriggerOnSignalComponent.cs Normal file
View File

@@ -0,0 +1,13 @@
using Robust.Shared.GameObjects;
namespace Content.Server.Explosion.Components
{
/// <summary>
/// Sends a trigger when signal is received.
/// </summary>
[RegisterComponent]
public sealed class TriggerOnSignalComponent : Component
{
public const string Port = "Trigger";
}
}

29
Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs Normal file
View File

@@ -0,0 +1,29 @@
using Content.Server.Explosion.Components;
using Content.Server.MachineLinking.Events;
using Content.Server.MachineLinking.Components;
namespace Content.Server.Explosion.EntitySystems
{
public sealed partial class TriggerSystem
{
private void InitializeSignal()
{
SubscribeLocalEvent<TriggerOnSignalComponent,SignalReceivedEvent>(OnSignalReceived);
SubscribeLocalEvent<TriggerOnSignalComponent,ComponentInit>(OnInit);
}
private void OnSignalReceived(EntityUid uid, TriggerOnSignalComponent component, SignalReceivedEvent args)
{
if (args.Port != TriggerOnSignalComponent.Port)
return;
Trigger(uid);
}
private void OnInit(EntityUid uid, TriggerOnSignalComponent component, ComponentInit args)
{
var receiver = EnsureComp<SignalReceiverComponent>(uid);
if (!receiver.Inputs.ContainsKey(TriggerOnSignalComponent.Port))
receiver.AddPort(TriggerOnSignalComponent.Port);
}
}
}

1
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -46,6 +46,7 @@ namespace Content.Server.Explosion.EntitySystems
InitializeProximity();
InitializeOnUse();
InitializeSignal();
SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnTriggerCollide);

13
Content.Server/MachineLinking/Components/SignallerComponent.cs Normal file
View File

@@ -0,0 +1,13 @@
using Robust.Shared.GameObjects;
namespace Content.Server.MachineLinking.Components
{
/// <summary>
/// Sends out a signal to machine linked objects.
/// </summary>
[RegisterComponent]
public sealed class SignallerComponent : Component
{
public const string Port = "Pressed";
}
}

9
Content.Server/MachineLinking/Components/TriggerOnSignalReceivedComponent.cs
View File

@@ -1,9 +0,0 @@
using Robust.Shared.GameObjects;
namespace Content.Server.MachineLinking.Components
{
[RegisterComponent]
public sealed class TriggerOnSignalReceivedComponent : Component
{
}
}

1
Content.Server/MachineLinking/System/SignalButtonSystem.cs
View File

@@ -3,6 +3,7 @@ using Content.Server.MachineLinking.Events;
using Content.Shared.Interaction;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Content.Shared.Interaction.Events;
namespace Content.Server.MachineLinking.System
{

35
Content.Server/MachineLinking/System/SignallerSystem.cs Normal file
View File

@@ -0,0 +1,35 @@
using Content.Server.MachineLinking.Components;
using Content.Server.MachineLinking.Events;
using Content.Shared.Interaction;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Content.Shared.Interaction.Events;
namespace Content.Server.MachineLinking.System
{
[UsedImplicitly]
public sealed class SignallerSystem : EntitySystem
{
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<SignallerComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<SignallerComponent, UseInHandEvent>(OnUseInHand);
}
private void OnInit(EntityUid uid, SignallerComponent component, ComponentInit args)
{
var transmitter = EnsureComp<SignalTransmitterComponent>(uid);
if (!transmitter.Outputs.ContainsKey(SignallerComponent.Port))
transmitter.AddPort(SignallerComponent.Port);
}
private void OnUseInHand(EntityUid uid, SignallerComponent component, UseInHandEvent args)
{
if (args.Handled)
return;
RaiseLocalEvent(uid, new InvokePortEvent(SignallerComponent.Port), false);
args.Handled = true;
}
}
}

25
Content.Server/MachineLinking/System/TriggerOnSignalReceivedSystem.cs
View File

@@ -1,25 +0,0 @@
using Content.Server.Explosion.EntitySystems;
using Content.Server.MachineLinking.Components;
using Content.Server.MachineLinking.Events;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.MachineLinking.System
{
public sealed class TriggerOnSignalReceivedSystem : EntitySystem
{
[Dependency] private readonly TriggerSystem _trigger = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<TriggerOnSignalReceivedComponent, SignalReceivedEvent>(OnSignalReceived);
}
private void OnSignalReceived(EntityUid uid, TriggerOnSignalReceivedComponent component, SignalReceivedEvent args)
{
_trigger.Trigger(uid);
}
}
}

2
Resources/Prototypes/Catalog/Research/technologies.yml
View File

@@ -343,6 +343,8 @@
- SolarControlComputerCircuitboard
- GeneratorPlasmaMachineCircuitboard
- GeneratorUraniumMachineCircuitboard
- Signaller
- SignalTrigger
- type: technology
name: "compact power technology"

12
Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml Normal file
View File

@@ -0,0 +1,12 @@
#Remote Signaller Device
- type: entity
parent: BaseItem
id: RemoteSignaller
name: remote signaller
description: A handheld device used for remotely sending signals to objects.
components:
- type: Sprite
sprite: Objects/Devices/signaller.rsi
state: signaller
- type: Signaller

14
Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
View File

@@ -25,3 +25,17 @@
delayOptions: [3, 5, 10, 15, 30]
initialBeepDelay: 0
beepSound: /Audio/Machines/Nuke/general_beep.ogg
- type: entity
parent: TimerTrigger
id: SignalTrigger
name: signal trigger
description: Adds a machine link that is triggered by signals.
components:
- type: Sprite
sprite: Objects/Devices/signaltrigger.rsi
state: signaltrigger
- type: PayloadTrigger
components:
- type: TriggerOnSignal
- type: SignalReceiver

2
Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
View File

@@ -16,6 +16,8 @@
initialBeepDelay: 0
beepSound: /Audio/Machines/Nuke/general_beep.ogg
startOnStick: true
- type: TriggerOnSignal
- type: SignalReceiver
- type: Sticky
stickDelay: 5
unstickDelay: 5

4
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View File

@@ -193,6 +193,8 @@
- TimerTrigger
- ChemicalPayload
- FlashPayload
- Signaller
- SignalTrigger
- type: ActivatableUI
key: enum.LatheUiKey.Key #Yes only having 1 of them here doesn't break anything
- type: ActivatableUIRequiresPower
@@ -303,6 +305,8 @@
- CableMVStack
- CableHVStack
- TimerTrigger
- Signaller
- SignalTrigger
- type: entity
parent: Autolathe

23
Resources/Prototypes/Recipes/Lathes/devices.yml
View File

@@ -9,6 +9,17 @@
Steel: 300
Plastic: 200
- type: latheRecipe
id: SignalTrigger
icon:
sprite: Objects/Devices/signaltrigger.rsi
state: signaltrigger
result: SignalTrigger
completetime: 2
materials:
Steel: 300
Plastic: 200
- type: latheRecipe
id: ChemicalPayload
icon:
@@ -32,3 +43,15 @@
Plastic: 100
Glass: 50
#one fourth of what making a flash would cost
- type: latheRecipe
id: Signaller
icon:
sprite: Objects/Devices/signaller.rsi
state: signaller
result: RemoteSignaller
completetime: 2
materials:
Steel: 100
Plastic: 200
Glass: 100

17
Resources/Textures/Objects/Devices/signaller.rsi/meta.json Normal file
View File

@@ -0,0 +1,17 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/commit/1dc83191daf55d54f5e1285c2f8b1af8c2c99b75",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "signaller",
"directions": 1
}
]
}

BIN
Resources/Textures/Objects/Devices/signaller.rsi/signaller.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 227 B

17
Resources/Textures/Objects/Devices/signaltrigger.rsi/meta.json Normal file
View File

@@ -0,0 +1,17 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/assemblies/new_assemblies.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "signaltrigger",
"directions": 1
}
]
}

BIN
Resources/Textures/Objects/Devices/signaltrigger.rsi/signaltrigger.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB