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

Remove string appearance keys (#10114)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-08 13:44:16 +12:00
committed by GitHub
parent 1783dd82e7
commit 193b9f467d
14 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
View File

@@ -139,7 +139,7 @@ namespace Content.Server.Atmos.Monitor.Systems
coords = coords.Offset(rotPos);
transform.Coordinates = coords;
appearance.SetData("offset", - new Vector2i(0, -1));
appearance.SetData(AtmosMonitorVisuals.Offset, - new Vector2i(0, -1));
transform.Anchored = true;
}
@@ -192,7 +192,7 @@ namespace Content.Server.Atmos.Monitor.Systems
if (component.DisplayMaxAlarmInNet)
{
if (EntityManager.TryGetComponent(component.Owner, out AppearanceComponent? appearanceComponent))
appearanceComponent.SetData("alarmType", component.HighestAlarmInNetwork);
appearanceComponent.SetData(AtmosMonitorVisuals.AlarmType, component.HighestAlarmInNetwork);
if (component.HighestAlarmInNetwork == AtmosMonitorAlarmType.Danger) PlayAlertSound(uid, component);
}
@@ -227,10 +227,7 @@ namespace Content.Server.Atmos.Monitor.Systems
}
if (EntityManager.TryGetComponent(component.Owner, out AppearanceComponent? appearanceComponent))
{
appearanceComponent.SetData("powered", args.Powered);
appearanceComponent.SetData("alarmType", component.LastAlarmState);
}
appearanceComponent.SetData(AtmosMonitorVisuals.AlarmType, component.LastAlarmState);
}
private void OnFireEvent(EntityUid uid, AtmosMonitorComponent component, ref TileFireEvent args)
@@ -341,7 +338,7 @@ namespace Content.Server.Atmos.Monitor.Systems
if (!Resolve(uid, ref monitor)) return;
monitor.LastAlarmState = state;
if (EntityManager.TryGetComponent(monitor.Owner, out AppearanceComponent? appearanceComponent))
appearanceComponent.SetData("alarmType", monitor.LastAlarmState);
appearanceComponent.SetData(AtmosMonitorVisuals.AlarmType, monitor.LastAlarmState);
BroadcastAlertPacket(monitor, alarms);

4
Content.Server/Buckle/Components/StrapComponent.cs
View File

@@ -115,7 +115,7 @@ namespace Content.Server.Buckle.Components
// Update the visuals of the strap object
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<AppearanceComponent>(Owner, out var appearance))
{
appearance.SetData("StrapState", true);
appearance.SetData(StrapVisuals.State, true);
}
Dirty();
@@ -133,7 +133,7 @@ namespace Content.Server.Buckle.Components
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<AppearanceComponent>(Owner, out var appearance))
{
appearance.SetData("StrapState", false);
appearance.SetData(StrapVisuals.State, false);
}
_occupiedSize -= buckle.Size;

6
Content.Server/Construction/Completions/VisualizerDataInt.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Construction;
using Content.Shared.Construction;
using JetBrains.Annotations;
using Robust.Shared.Reflection;
using Robust.Shared.Serialization;
@@ -22,10 +22,6 @@ namespace Content.Server.Construction.Completions
{
appearance.SetData(@enum, Data);
}
else
{
appearance.SetData(Key, Data);
}
}
}
}