From 0fcefc84f5d305d6b3a63c8a2c4185bb1ed9b804 Mon Sep 17 00:00:00 2001 From: Aviu00 Date: Thu, 25 Jan 2024 14:55:49 +0300 Subject: [PATCH] Small fixes --- Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs | 2 +- Content.Shared/Bed/Sleep/SharedSleepingSystem.cs | 7 +++++++ Resources/Prototypes/White/Mobs/Player/human.yml | 3 +++ Resources/Prototypes/White/tags.yml | 3 --- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs b/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs index 5d08a37952..bfcedcf42d 100644 --- a/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs +++ b/Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs @@ -17,7 +17,7 @@ public sealed partial class FrezonCoolantReaction : IGasReactionEffect var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium); if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f) return ReactionResult.NoReaction; - + var temperature = mixture.Temperature; var energyModifier = 1f; diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs index 2ac1c372ca..a851dfc006 100644 --- a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.Actions; using Content.Shared.Bed.Sleep; using Content.Shared.Damage.ForceSay; +using Content.Shared.Emoting; using Content.Shared.Eye.Blinding.Systems; using Content.Shared.Speech; using Robust.Shared.Network; @@ -26,6 +27,12 @@ namespace Content.Server.Bed.Sleep SubscribeLocalEvent(OnSpeakAttempt); SubscribeLocalEvent(OnSeeAttempt); SubscribeLocalEvent(OnSleepUnpaused); + SubscribeLocalEvent(OnTryEmote); // WD + } + + private void OnTryEmote(EntityUid uid, SleepingComponent component, EmoteAttemptEvent args) // WD + { + args.Cancel(); } private void OnSleepUnpaused(EntityUid uid, SleepingComponent component, ref EntityUnpausedEvent args) diff --git a/Resources/Prototypes/White/Mobs/Player/human.yml b/Resources/Prototypes/White/Mobs/Player/human.yml index 3d370d692c..37e8470f55 100644 --- a/Resources/Prototypes/White/Mobs/Player/human.yml +++ b/Resources/Prototypes/White/Mobs/Player/human.yml @@ -15,3 +15,6 @@ - type: Tag tags: - CannotSuicide + - CanPilot + - FootstepSound + - DoorBumpOpener diff --git a/Resources/Prototypes/White/tags.yml b/Resources/Prototypes/White/tags.yml index 9f9dc74ea5..158a4d5753 100644 --- a/Resources/Prototypes/White/tags.yml +++ b/Resources/Prototypes/White/tags.yml @@ -25,9 +25,6 @@ - type: Tag id: Crystal -- type: Tag - id: ZombifyableByMelee - - type: Tag id: SpaceCash