Small fixes
This commit is contained in:
@@ -17,7 +17,7 @@ public sealed partial class FrezonCoolantReaction : IGasReactionEffect
|
|||||||
var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium);
|
var initialHyperNoblium = mixture.GetMoles(Gas.HyperNoblium);
|
||||||
if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f)
|
if (initialHyperNoblium >= 5.0f && mixture.Temperature > 20f)
|
||||||
return ReactionResult.NoReaction;
|
return ReactionResult.NoReaction;
|
||||||
|
|
||||||
var temperature = mixture.Temperature;
|
var temperature = mixture.Temperature;
|
||||||
|
|
||||||
var energyModifier = 1f;
|
var energyModifier = 1f;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using Content.Shared.Actions;
|
using Content.Shared.Actions;
|
||||||
using Content.Shared.Bed.Sleep;
|
using Content.Shared.Bed.Sleep;
|
||||||
using Content.Shared.Damage.ForceSay;
|
using Content.Shared.Damage.ForceSay;
|
||||||
|
using Content.Shared.Emoting;
|
||||||
using Content.Shared.Eye.Blinding.Systems;
|
using Content.Shared.Eye.Blinding.Systems;
|
||||||
using Content.Shared.Speech;
|
using Content.Shared.Speech;
|
||||||
using Robust.Shared.Network;
|
using Robust.Shared.Network;
|
||||||
@@ -26,6 +27,12 @@ namespace Content.Server.Bed.Sleep
|
|||||||
SubscribeLocalEvent<SleepingComponent, SpeakAttemptEvent>(OnSpeakAttempt);
|
SubscribeLocalEvent<SleepingComponent, SpeakAttemptEvent>(OnSpeakAttempt);
|
||||||
SubscribeLocalEvent<SleepingComponent, CanSeeAttemptEvent>(OnSeeAttempt);
|
SubscribeLocalEvent<SleepingComponent, CanSeeAttemptEvent>(OnSeeAttempt);
|
||||||
SubscribeLocalEvent<SleepingComponent, EntityUnpausedEvent>(OnSleepUnpaused);
|
SubscribeLocalEvent<SleepingComponent, EntityUnpausedEvent>(OnSleepUnpaused);
|
||||||
|
SubscribeLocalEvent<SleepingComponent, EmoteAttemptEvent>(OnTryEmote); // WD
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTryEmote(EntityUid uid, SleepingComponent component, EmoteAttemptEvent args) // WD
|
||||||
|
{
|
||||||
|
args.Cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnSleepUnpaused(EntityUid uid, SleepingComponent component, ref EntityUnpausedEvent args)
|
private void OnSleepUnpaused(EntityUid uid, SleepingComponent component, ref EntityUnpausedEvent args)
|
||||||
|
|||||||
@@ -15,3 +15,6 @@
|
|||||||
- type: Tag
|
- type: Tag
|
||||||
tags:
|
tags:
|
||||||
- CannotSuicide
|
- CannotSuicide
|
||||||
|
- CanPilot
|
||||||
|
- FootstepSound
|
||||||
|
- DoorBumpOpener
|
||||||
|
|||||||
@@ -25,9 +25,6 @@
|
|||||||
- type: Tag
|
- type: Tag
|
||||||
id: Crystal
|
id: Crystal
|
||||||
|
|
||||||
- type: Tag
|
|
||||||
id: ZombifyableByMelee
|
|
||||||
|
|
||||||
- type: Tag
|
- type: Tag
|
||||||
id: SpaceCash
|
id: SpaceCash
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user