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

Make FireExtinguisher shared (#11666)

Browse Source
This commit is contained in:
Morb
2022-10-04 04:06:19 +03:00
committed by GitHub
parent 3babdff1de
commit 4a736f2c8f
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Extinguisher/FireExtinguisherComponent.cs Normal file
View File

@@ -0,0 +1,9 @@
using Content.Shared.Extinguisher;
using Robust.Shared.GameStates;
namespace Content.Client.Extinguisher;
[NetworkedComponent, RegisterComponent]
public sealed class FireExtinguisherComponent : SharedFireExtinguisherComponent
{
}

15
Content.Server/Extinguisher/FireExtinguisherComponent.cs
View File

@@ -1,17 +1,10 @@
using Robust.Shared.Audio; using Content.Shared.Extinguisher;
using Robust.Shared.GameStates;
namespace Content.Server.Extinguisher; namespace Content.Server.Extinguisher;
[RegisterComponent] [NetworkedComponent, RegisterComponent]
[Access(typeof(FireExtinguisherSystem))] [Access(typeof(FireExtinguisherSystem))]
public sealed class FireExtinguisherComponent : Component public sealed class FireExtinguisherComponent : SharedFireExtinguisherComponent
{ {
[DataField("refillSound")] public SoundSpecifier RefillSound = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
[DataField("hasSafety")] public bool HasSafety = true;
[DataField("safety")] public bool Safety = true;
[DataField("safetySound")]
public SoundSpecifier SafetySound { get; } = new SoundPathSpecifier("/Audio/Machines/button.ogg");
} }

25
Content.Shared/Extinguisher/SharedFireExtinguisherComponent.cs
View File

@@ -1,10 +1,23 @@
using Robust.Shared.Audio;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
namespace Content.Shared.Extinguisher namespace Content.Shared.Extinguisher;
public abstract class SharedFireExtinguisherComponent : Component
{ {
[Serializable, NetSerializable] [DataField("refillSound")] public SoundSpecifier RefillSound = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
public enum FireExtinguisherVisuals : byte
{ [DataField("hasSafety")] public bool HasSafety = true;
Safety
} [DataField("safety")] public bool Safety = true;
[DataField("safetySound")]
public SoundSpecifier SafetySound { get; } = new SoundPathSpecifier("/Audio/Machines/button.ogg");
}
[Serializable, NetSerializable]
public enum FireExtinguisherVisuals : byte
{
Safety
} }