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

Unrevert #10934

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-25 13:06:00 +13:00
committed by GitHub
parent 4b5df9b0f7
commit 92e92dceb0
12 changed files with 74 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Temperature/Systems/TemperatureSystem.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Alert;
using Content.Shared.Damage;
using Content.Shared.Database;
using Content.Shared.Inventory;
using Content.Shared.Temperature;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -39,7 +40,7 @@ namespace Content.Server.Temperature.Systems
SubscribeLocalEvent<TemperatureComponent, OnTemperatureChangeEvent>(EnqueueDamage);
SubscribeLocalEvent<TemperatureComponent, AtmosExposedUpdateEvent>(OnAtmosExposedUpdate);
SubscribeLocalEvent<AlertsComponent, OnTemperatureChangeEvent>(ServerAlert);
SubscribeLocalEvent<TemperatureProtectionComponent, ModifyChangedTemperatureEvent>(OnTemperatureChangeAttempt);
SubscribeLocalEvent<TemperatureProtectionComponent, InventoryRelayedEvent<ModifyChangedTemperatureEvent>>(OnTemperatureChangeAttempt);
}
public override void Update(float frameTime)
@@ -204,9 +205,9 @@ namespace Content.Server.Temperature.Systems
}
}
private void OnTemperatureChangeAttempt(EntityUid uid, TemperatureProtectionComponent component, ModifyChangedTemperatureEvent args)
private void OnTemperatureChangeAttempt(EntityUid uid, TemperatureProtectionComponent component, InventoryRelayedEvent<ModifyChangedTemperatureEvent> args)
{
args.TemperatureDelta *= component.Coefficient;
args.Args.TemperatureDelta *= component.Coefficient;
}
}
@@ -223,16 +224,4 @@ namespace Content.Server.Temperature.Systems
TemperatureDelta = delta;
}
}
public sealed class ModifyChangedTemperatureEvent : EntityEventArgs, IInventoryRelayEvent
{
public SlotFlags TargetSlots { get; } = ~SlotFlags.POCKET;
public float TemperatureDelta;
public ModifyChangedTemperatureEvent(float temperature)
{
TemperatureDelta = temperature;
}
}
}