Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Toilet fixes (#9609)

Browse Source
This commit is contained in:
wrexbe
2022-07-11 23:04:33 -07:00
committed by GitHub
parent 21a56f4b80
commit a1c4f10061
7 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/Toilet/ToiletComponent.cs
View File

@@ -1,23 +0,0 @@
using Content.Shared.Sound;
using Content.Shared.Tools;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Server.Toilet
{
[RegisterComponent]
public sealed class ToiletComponent : Component
{
[DataField("pryLidTime")]
public float PryLidTime = 1f;
[DataField("pryingQuality", customTypeSerializer:typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
public string PryingQuality = "Prying";
[DataField("toggleSound")]
public SoundSpecifier ToggleSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg");
public bool LidOpen = false;
public bool IsSeatUp = false;
public bool IsPrying = false;
}
}

8
Content.Server/Toilet/ToiletSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.Buckle.Components;
using Content.Server.Buckle.Systems;
using Content.Server.Popups;
using Content.Server.Storage.Components;
using Content.Server.Storage.EntitySystems;
@@ -31,7 +32,7 @@ namespace Content.Server.Toilet
SubscribeLocalEvent<ToiletComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<ToiletComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<ToiletComponent, InteractUsingEvent>(OnInteractUsing);
SubscribeLocalEvent<ToiletComponent, InteractHandEvent>(OnInteractHand);
SubscribeLocalEvent<ToiletComponent, InteractHandEvent>(OnInteractHand, new []{typeof(StrapSystem)});
SubscribeLocalEvent<ToiletComponent, ExaminedEvent>(OnExamine);
SubscribeLocalEvent<ToiletComponent, SuicideEvent>(OnSuicide);
SubscribeLocalEvent<ToiletPryFinished>(OnToiletPried);
@@ -184,11 +185,8 @@ namespace Content.Server.Toilet
UpdateSprite(uid, component);
}
private void UpdateSprite(EntityUid uid, ToiletComponent? component = null)
private void UpdateSprite(EntityUid uid, ToiletComponent component)
{
if (!Resolve(uid, ref component))
return;
if (!EntityManager.TryGetComponent(uid,out AppearanceComponent? appearance))
return;