diff --git a/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs b/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs index 2f35cd924f..3765d45fa2 100644 --- a/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs +++ b/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs @@ -27,7 +27,6 @@ namespace Content.Client.AME.UI _window.ToggleInjection.OnPressed += _ => ButtonPressed(UiButton.ToggleInjection); _window.IncreaseFuelButton.OnPressed += _ => ButtonPressed(UiButton.IncreaseFuel); _window.DecreaseFuelButton.OnPressed += _ => ButtonPressed(UiButton.DecreaseFuel); - _window.RefreshPartsButton.OnPressed += _ => ButtonPressed(UiButton.RefreshParts); } /// diff --git a/Content.Client/AME/UI/AMEWindow.cs b/Content.Client/AME/UI/AMEWindow.cs index 94b0e006b5..108806eb55 100644 --- a/Content.Client/AME/UI/AMEWindow.cs +++ b/Content.Client/AME/UI/AMEWindow.cs @@ -16,7 +16,6 @@ namespace Content.Client.AME.UI public Button ToggleInjection { get; set; } public Button IncreaseFuelButton { get; set; } public Button DecreaseFuelButton { get; set; } - public Button RefreshPartsButton { get; set; } public ProgressBar? FuelMeter { get; set; } public Label FuelAmount { get; set; } public Label InjectionAmount { get; set; } @@ -85,7 +84,6 @@ namespace Content.Client.AME.UI { Children = { - (RefreshPartsButton = new Button {Text = Loc.GetString("ame-window-refresh-parts-button"), StyleClasses = {StyleBase.ButtonOpenBoth }, Disabled = true }), new Label { Text = Loc.GetString("ame-window-core-count-label")}, (CoreCount = new Label { Text = "0"}), } @@ -159,8 +157,6 @@ namespace Content.Client.AME.UI InjectionStatus.Text = Loc.GetString("ame-window-engine-injection-status-injecting-label"); } - RefreshPartsButton.Disabled = castState.Injecting; - CoreCount.Text = $"{castState.CoreCount}"; InjectionAmount.Text = $"{castState.InjectionAmount}"; } diff --git a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs index fe18e1fc5f..d714789aa0 100644 --- a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs +++ b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Maths; namespace Content.Client.Atmos.EntitySystems { [UsedImplicitly] - internal sealed class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem, IResettingEntitySystem + internal sealed class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem { [Dependency] private readonly IMapManager _mapManager = default!; @@ -37,6 +37,7 @@ namespace Content.Client.Atmos.EntitySystems { base.Initialize(); + SubscribeNetworkEvent(Reset); SubscribeNetworkEvent(HandleAtmosDebugOverlayMessage); SubscribeNetworkEvent(HandleAtmosDebugOverlayDisableMessage); @@ -66,7 +67,7 @@ namespace Content.Client.Atmos.EntitySystems overlayManager.RemoveOverlay(); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _tileData.Clear(); } diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs index 5f77e97c15..4af4b111e4 100644 --- a/Content.Client/Chat/Managers/ChatManager.cs +++ b/Content.Client/Chat/Managers/ChatManager.cs @@ -585,6 +585,10 @@ namespace Content.Client.Chat.Managers private void EnqueueSpeechBubble(IEntity entity, string contents, SpeechBubble.SpeechType speechType) { + // Don't enqueue speech bubbles for other maps. TODO: Support multiple viewports/maps? + if (entity.Transform.MapID != _eyeManager.CurrentMap) + return; + if (!_queuedSpeechBubbles.TryGetValue(entity.Uid, out var queueData)) { queueData = new SpeechBubbleQueueData(); @@ -600,8 +604,7 @@ namespace Content.Client.Chat.Managers private void CreateSpeechBubble(IEntity entity, SpeechBubbleData speechData) { - var bubble = - SpeechBubble.CreateSpeechBubble(speechData.Type, speechData.Message, entity, _eyeManager, this); + var bubble = SpeechBubble.CreateSpeechBubble(speechData.Type, speechData.Message, entity, _eyeManager, this); if (_activeSpeechBubbles.TryGetValue(entity.Uid, out var existing)) { diff --git a/Content.Client/Chat/UI/ChatBox.cs b/Content.Client/Chat/UI/ChatBox.cs index 08a6ffaf2f..1052f499c2 100644 --- a/Content.Client/Chat/UI/ChatBox.cs +++ b/Content.Client/Chat/UI/ChatBox.cs @@ -185,10 +185,10 @@ namespace Content.Client.Chat.UI { Children = { - new Control{MinSize = (10,0)}, + new Control{MinSize = (4,0)}, (_filterVBox = new VBoxContainer { - SeparationOverride = 10 + SeparationOverride = 4 }) } } @@ -203,7 +203,7 @@ namespace Content.Client.Chat.UI { (_channelSelectorHBox = new HBoxContainer { - SeparationOverride = 4 + SeparationOverride = 1 }) } }; diff --git a/Content.Client/Content.Client.csproj.DotSettings b/Content.Client/Content.Client.csproj.DotSettings new file mode 100644 index 0000000000..a558236f55 --- /dev/null +++ b/Content.Client/Content.Client.csproj.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/Content.Client/Doors/AirlockVisualizer.cs b/Content.Client/Doors/AirlockVisualizer.cs index 4f6832b7b6..8f6c0651b1 100644 --- a/Content.Client/Doors/AirlockVisualizer.cs +++ b/Content.Client/Doors/AirlockVisualizer.cs @@ -1,5 +1,6 @@ using System; using Content.Client.Wires; +using Content.Client.Wires.Visualizers; using Content.Shared.Audio; using Content.Shared.Doors; using JetBrains.Annotations; diff --git a/Content.Client/Entry/IgnoredComponents.cs b/Content.Client/Entry/IgnoredComponents.cs index 9b19afe561..b3a76fb612 100644 --- a/Content.Client/Entry/IgnoredComponents.cs +++ b/Content.Client/Entry/IgnoredComponents.cs @@ -55,7 +55,7 @@ namespace Content.Client.Entry "AccessReader", "IdCardConsole", "Airlock", - "WirePlacer", + "CablePlacer", "Drink", "Food", "FoodContainer", @@ -73,6 +73,7 @@ namespace Content.Client.Entry "StorageFill", "Mop", "Bucket", + "CableVis", "Puddle", "CanSpill", "SpeedLoader", @@ -105,12 +106,11 @@ namespace Content.Client.Entry "PowerSupplier", "PowerConsumer", "Battery", - "BatteryStorage", "BatteryDischarger", "Apc", "PowerProvider", - "PowerReceiver", - "Wire", + "ApcPowerReceiver", + "Cable", "StressTestMovement", "Toys", "SurgeryTool", @@ -273,6 +273,8 @@ namespace Content.Client.Entry "ExplosionLaunched", "BeingCloned", "Advertise", + "PowerNetworkBattery", + "BatteryCharger", }; } } diff --git a/Content.Client/HealthOverlay/HealthOverlaySystem.cs b/Content.Client/HealthOverlay/HealthOverlaySystem.cs index 5dd348934f..2e92fb4245 100644 --- a/Content.Client/HealthOverlay/HealthOverlaySystem.cs +++ b/Content.Client/HealthOverlay/HealthOverlaySystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.IoC; namespace Content.Client.HealthOverlay { [UsedImplicitly] - public class HealthOverlaySystem : EntitySystem, IResettingEntitySystem + public class HealthOverlaySystem : EntitySystem { [Dependency] private readonly IEyeManager _eyeManager = default!; @@ -44,10 +44,11 @@ namespace Content.Client.HealthOverlay { base.Initialize(); + SubscribeNetworkEvent(Reset); SubscribeLocalEvent(HandlePlayerAttached); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { foreach (var gui in _guis.Values) { diff --git a/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs b/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs new file mode 100644 index 0000000000..4c7ed5db08 --- /dev/null +++ b/Content.Client/Light/Visualizers/EmergencyLightVisualizer.cs @@ -0,0 +1,23 @@ +using Content.Shared.Light.Component; +using Robust.Client.GameObjects; +using Robust.Shared.Serialization.Manager.Attributes; + +namespace Content.Client.Light.Visualizers +{ + [DataDefinition] + public sealed class EmergencyLightVisualizer : AppearanceVisualizer + { + public override void OnChangeData(AppearanceComponent component) + { + base.OnChangeData(component); + + if (!component.Owner.TryGetComponent(out SpriteComponent? sprite)) + return; + + if (!component.TryGetData(EmergencyLightVisuals.On, out bool on)) + on = false; + + sprite.LayerSetState(0, on ? "emergency_light_on" : "emergency_light_off"); + } + } +} diff --git a/Content.Client/MobState/MobStateComponent.cs b/Content.Client/MobState/MobStateComponent.cs index caa215c0c1..55d67780ef 100644 --- a/Content.Client/MobState/MobStateComponent.cs +++ b/Content.Client/MobState/MobStateComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.MobState; +using Content.Shared.MobState.Components; using Content.Shared.MobState.State; using Robust.Shared.GameObjects; diff --git a/Content.Client/NodeContainer/NodeGroupSystem.cs b/Content.Client/NodeContainer/NodeGroupSystem.cs new file mode 100644 index 0000000000..4cb7d678c4 --- /dev/null +++ b/Content.Client/NodeContainer/NodeGroupSystem.cs @@ -0,0 +1,99 @@ +using System.Collections.Generic; +using System.Linq; +using Content.Shared.NodeContainer; +using JetBrains.Annotations; +using Robust.Client.Graphics; +using Robust.Client.Input; +using Robust.Client.ResourceManagement; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; + +namespace Content.Client.NodeContainer +{ + [UsedImplicitly] + public sealed class NodeGroupSystem : EntitySystem + { + [Dependency] private readonly IOverlayManager _overlayManager = default!; + [Dependency] private readonly IEntityLookup _entityLookup = default!; + [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private readonly IEyeManager _eyeManager = default!; + [Dependency] private readonly IResourceCache _resourceCache = default!; + + public bool VisEnabled { get; private set; } + + public Dictionary Groups { get; } = new(); + public HashSet Filtered { get; } = new(); + + public Dictionary + Entities { get; private set; } = new(); + + public Dictionary<(int group, int node), NodeVis.NodeDatum> NodeLookup { get; private set; } = new(); + + public override void Initialize() + { + base.Initialize(); + + SubscribeNetworkEvent(DataMsgHandler); + } + + public override void Shutdown() + { + base.Shutdown(); + + _overlayManager.RemoveOverlay(); + } + + private void DataMsgHandler(NodeVis.MsgData ev) + { + if (!VisEnabled) + return; + + foreach (var deletion in ev.GroupDeletions) + { + Groups.Remove(deletion); + } + + foreach (var group in ev.Groups) + { + Groups.Add(group.NetId, group); + } + + Entities = Groups.Values + .SelectMany(g => g.Nodes, (data, nodeData) => (data, nodeData)) + .GroupBy(n => n.nodeData.Entity) + .ToDictionary(g => g.Key, g => g.ToArray()); + + NodeLookup = Groups.Values + .SelectMany(g => g.Nodes, (data, nodeData) => (data, nodeData)) + .ToDictionary(n => (n.data.NetId, n.nodeData.NetId), n => n.nodeData); + } + + public void SetVisEnabled(bool enabled) + { + VisEnabled = enabled; + + RaiseNetworkEvent(new NodeVis.MsgEnable(enabled)); + + if (enabled) + { + var overlay = new NodeVisualizationOverlay( + this, + _entityLookup, + _mapManager, + _inputManager, + _eyeManager, + _resourceCache, + EntityManager); + + _overlayManager.AddOverlay(overlay); + } + else + { + Groups.Clear(); + Entities.Clear(); + } + } + } +} diff --git a/Content.Client/NodeContainer/NodeVisCommand.cs b/Content.Client/NodeContainer/NodeVisCommand.cs new file mode 100644 index 0000000000..c6a95fce5b --- /dev/null +++ b/Content.Client/NodeContainer/NodeVisCommand.cs @@ -0,0 +1,56 @@ +using Content.Client.Administration.Managers; +using Content.Shared.Administration; +using Robust.Shared.Console; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; + +namespace Content.Client.NodeContainer +{ + public sealed class NodeVisCommand : IConsoleCommand + { + public string Command => "nodevis"; + public string Description => "Toggles node group visualization"; + public string Help => ""; + + public void Execute(IConsoleShell shell, string argStr, string[] args) + { + var adminMan = IoCManager.Resolve(); + if (!adminMan.HasFlag(AdminFlags.Debug)) + { + shell.WriteError("You need +DEBUG for this command"); + return; + } + + var sys = EntitySystem.Get(); + sys.SetVisEnabled(!sys.VisEnabled); + } + } + + public sealed class NodeVisFilterCommand : IConsoleCommand + { + public string Command => "nodevisfilter"; + public string Description => "Toggles showing a specific group on nodevis"; + public string Help => "Usage: nodevis [filter]\nOmit filter to list currently masked-off"; + + public void Execute(IConsoleShell shell, string argStr, string[] args) + { + var sys = EntitySystem.Get(); + + if (args.Length == 0) + { + foreach (var filtered in sys.Filtered) + { + shell.WriteLine(filtered); + } + } + else + { + var filter = args[0]; + if (!sys.Filtered.Add(filter)) + { + sys.Filtered.Remove(filter); + } + } + } + } +} diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs new file mode 100644 index 0000000000..989780f3c8 --- /dev/null +++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs @@ -0,0 +1,232 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Content.Client.Resources; +using Robust.Client.Graphics; +using Robust.Client.Input; +using Robust.Client.ResourceManagement; +using Robust.Client.UserInterface.CustomControls; +using Robust.Shared.Enums; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Timing; +using Robust.Shared.Utility; +using static Content.Shared.NodeContainer.NodeVis; + +namespace Content.Client.NodeContainer +{ + public sealed class NodeVisualizationOverlay : Overlay + { + private readonly NodeGroupSystem _system; + private readonly IEntityLookup _lookup; + private readonly IMapManager _mapManager; + private readonly IInputManager _inputManager; + private readonly IEyeManager _eyeManager; + private readonly IEntityManager _entityManager; + + private readonly Dictionary<(int, int), NodeRenderData> _nodeIndex = new(); + private readonly Dictionary>> _gridIndex = new (); + + private readonly Font _font; + + private (int group, int node)? _hovered; + private float _time; + + public override OverlaySpace Space => OverlaySpace.ScreenSpace | OverlaySpace.WorldSpace; + + public NodeVisualizationOverlay( + NodeGroupSystem system, + IEntityLookup lookup, + IMapManager mapManager, + IInputManager inputManager, + IEyeManager eyeManager, + IResourceCache cache, + IEntityManager entityManager) + { + _system = system; + _lookup = lookup; + _mapManager = mapManager; + _inputManager = inputManager; + _eyeManager = eyeManager; + _entityManager = entityManager; + + _font = cache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 12); + } + + protected override void Draw(in OverlayDrawArgs args) + { + if ((args.Space & OverlaySpace.WorldSpace) != 0) + { + DrawWorld(args); + } + else if ((args.Space & OverlaySpace.ScreenSpace) != 0) + { + DrawScreen(args); + } + } + + private void DrawScreen(in OverlayDrawArgs args) + { + if (_hovered == null) + return; + + var (groupId, nodeId) = _hovered.Value; + + var group = _system.Groups[groupId]; + var node = _system.NodeLookup[(groupId, nodeId)]; + + var mousePos = _inputManager.MouseScreenPosition.Position; + + var entity = _entityManager.GetEntity(node.Entity); + + var gridId = entity.Transform.GridID; + var grid = _mapManager.GetGrid(gridId); + var gridTile = grid.TileIndicesFor(entity.Transform.Coordinates); + + var sb = new StringBuilder(); + sb.Append($"entity: {entity}\n"); + sb.Append($"group id: {group.GroupId}\n"); + sb.Append($"node: {node.Name}\n"); + sb.Append($"type: {node.Type}\n"); + sb.Append($"grid pos: {gridTile}\n"); + + args.ScreenHandle.DrawString(_font, mousePos + (20, -20), sb.ToString()); + } + + private void DrawWorld(in OverlayDrawArgs overlayDrawArgs) + { + const float nodeSize = 8f / 32; + const float nodeOffset = 6f / 32; + + var handle = overlayDrawArgs.WorldHandle; + + var map = overlayDrawArgs.Viewport.Eye?.Position.MapId ?? default; + if (map == MapId.Nullspace) + return; + + var mouseScreenPos = _inputManager.MouseScreenPosition; + var mouseWorldPos = _eyeManager.ScreenToMap(mouseScreenPos).Position; + + _hovered = default; + + var cursorBox = Box2.CenteredAround(mouseWorldPos, (nodeSize, nodeSize)); + + // Group visible nodes by grid tiles. + var worldBounds = overlayDrawArgs.WorldBounds; + _lookup.FastEntitiesIntersecting(map, ref worldBounds, entity => + { + if (!_system.Entities.TryGetValue(entity.Uid, out var nodeData)) + return; + + var gridId = entity.Transform.GridID; + var grid = _mapManager.GetGrid(gridId); + var gridDict = _gridIndex.GetOrNew(gridId); + var coords = entity.Transform.Coordinates; + + // TODO: This probably shouldn't be capable of returning NaN... + if (float.IsNaN(coords.Position.X) || float.IsNaN(coords.Position.Y)) + return; + + var tile = gridDict.GetOrNew(grid.TileIndicesFor(coords)); + + foreach (var (group, nodeDatum) in nodeData) + { + if (!_system.Filtered.Contains(group.GroupId)) + { + tile.Add((group, nodeDatum)); + } + } + }); + + foreach (var (gridId, gridDict) in _gridIndex) + { + var grid = _mapManager.GetGrid(gridId); + foreach (var (pos, list) in gridDict) + { + var centerPos = grid.GridTileToWorld(pos).Position; + list.Sort(NodeDisplayComparer.Instance); + + var offset = -(list.Count - 1) * nodeOffset / 2; + + foreach (var (group, node) in list) + { + var nodePos = centerPos + (offset, offset); + if (cursorBox.Contains(nodePos)) + _hovered = (group.NetId, node.NetId); + + _nodeIndex[(group.NetId, node.NetId)] = new NodeRenderData(group, node, nodePos); + offset += nodeOffset; + } + } + } + + foreach (var nodeRenderData in _nodeIndex.Values) + { + var pos = nodeRenderData.WorldPos; + var bounds = Box2.CenteredAround(pos, (nodeSize, nodeSize)); + + var groupData = nodeRenderData.GroupData; + var color = groupData.Color; + + if (!_hovered.HasValue) + color.A = 0.5f; + else if (_hovered.Value.group != groupData.NetId) + color.A = 0.2f; + else + color.A = 0.75f + MathF.Sin(_time * 4) * 0.25f; + + handle.DrawRect(bounds, color); + + foreach (var reachable in nodeRenderData.NodeDatum.Reachable) + { + if (_nodeIndex.TryGetValue((groupData.NetId, reachable), out var reachDat)) + { + handle.DrawLine(pos, reachDat.WorldPos, color); + } + } + } + + _nodeIndex.Clear(); + _gridIndex.Clear(); + } + + protected override void FrameUpdate(FrameEventArgs args) + { + base.FrameUpdate(args); + + _time += args.DeltaSeconds; + } + + private sealed class NodeDisplayComparer : IComparer<(GroupData, NodeDatum)> + { + public static readonly NodeDisplayComparer Instance = new(); + + public int Compare((GroupData, NodeDatum) x, (GroupData, NodeDatum) y) + { + var (groupX, nodeX) = x; + var (groupY, nodeY) = y; + + var cmp = groupX.NetId.CompareTo(groupY.NetId); + if (cmp != 0) + return cmp; + + return nodeX.NetId.CompareTo(nodeY.NetId); + } + } + + private sealed class NodeRenderData + { + public GroupData GroupData; + public NodeDatum NodeDatum; + public Vector2 WorldPos; + + public NodeRenderData(GroupData groupData, NodeDatum nodeDatum, Vector2 worldPos) + { + GroupData = groupData; + NodeDatum = nodeDatum; + WorldPos = worldPos; + } + } + } +} diff --git a/Content.Client/APC/ApcBoundUserInterface.cs b/Content.Client/Power/APC/ApcBoundUserInterface.cs similarity index 99% rename from Content.Client/APC/ApcBoundUserInterface.cs rename to Content.Client/Power/APC/ApcBoundUserInterface.cs index 567bb842b8..0df4379d78 100644 --- a/Content.Client/APC/ApcBoundUserInterface.cs +++ b/Content.Client/Power/APC/ApcBoundUserInterface.cs @@ -9,7 +9,7 @@ using Robust.Client.UserInterface.CustomControls; using Robust.Shared.GameObjects; using Robust.Shared.Maths; -namespace Content.Client.APC +namespace Content.Client.Power.APC { [UsedImplicitly] public class ApcBoundUserInterface : BoundUserInterface diff --git a/Content.Client/APC/ApcVisualizer.cs b/Content.Client/Power/APC/ApcVisualizer.cs similarity index 98% rename from Content.Client/APC/ApcVisualizer.cs rename to Content.Client/Power/APC/ApcVisualizer.cs index a112f55b42..85ed0e5d25 100644 --- a/Content.Client/APC/ApcVisualizer.cs +++ b/Content.Client/Power/APC/ApcVisualizer.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -namespace Content.Client.APC +namespace Content.Client.Power.APC { public class ApcVisualizer : AppearanceVisualizer { diff --git a/Content.Client/SMES/SmesVisualizer.cs b/Content.Client/Power/SMES/SmesVisualizer.cs similarity index 98% rename from Content.Client/SMES/SmesVisualizer.cs rename to Content.Client/Power/SMES/SmesVisualizer.cs index 0937cfb3ad..11fcbd41d5 100644 --- a/Content.Client/SMES/SmesVisualizer.cs +++ b/Content.Client/Power/SMES/SmesVisualizer.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -namespace Content.Client.SMES +namespace Content.Client.Power.SMES { [UsedImplicitly] public class SmesVisualizer : AppearanceVisualizer diff --git a/Content.Client/Power/Visualizers/CableVisualizer.cs b/Content.Client/Power/Visualizers/CableVisualizer.cs new file mode 100644 index 0000000000..b5c09c7ebc --- /dev/null +++ b/Content.Client/Power/Visualizers/CableVisualizer.cs @@ -0,0 +1,26 @@ +using Content.Shared.Wires; +using Robust.Client.GameObjects; +using Robust.Shared.Serialization.Manager.Attributes; + +namespace Content.Client.Power +{ + [DataDefinition] + public sealed class CableVisualizer : AppearanceVisualizer + { + [DataField("base")] + public string? StateBase; + + public override void OnChangeData(AppearanceComponent component) + { + base.OnChangeData(component); + + if (!component.Owner.TryGetComponent(out SpriteComponent? sprite)) + return; + + if (!component.TryGetData(WireVisVisuals.ConnectedMask, out WireVisDirFlags mask)) + mask = WireVisDirFlags.None; + + sprite.LayerSetState(0, $"{StateBase}{(int) mask}"); + } + } +} diff --git a/Content.Client/Power/PowerDeviceVisualizer.cs b/Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs similarity index 100% rename from Content.Client/Power/PowerDeviceVisualizer.cs rename to Content.Client/Power/Visualizers/PowerDeviceVisualizer.cs diff --git a/Content.Client/Stack/StackVisualizer.cs b/Content.Client/Stack/StackVisualizer.cs index 3b0197ef93..7324bd1b8a 100644 --- a/Content.Client/Stack/StackVisualizer.cs +++ b/Content.Client/Stack/StackVisualizer.cs @@ -66,7 +66,7 @@ namespace Content.Client.Stack /// /// /// - /// false: they are opaque and mutually exclusive (e.g. sprites in a wire coil). Default value + /// false: they are opaque and mutually exclusive (e.g. sprites in a cable coil). Default value /// /// /// true: they are transparent and thus layered one over another in ascending order first diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index a40dd6bef3..3bdd6478cf 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System.Linq; using Content.Client.Actions.UI; using Content.Client.Examine; diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index a0fd186a07..36a01098d6 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -28,7 +28,7 @@ using Timer = Robust.Shared.Timing.Timer; namespace Content.Client.Verbs { [UsedImplicitly] - public sealed class VerbSystem : SharedVerbSystem, IResettingEntitySystem + public sealed class VerbSystem : SharedVerbSystem { [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; @@ -47,6 +47,7 @@ namespace Content.Client.Verbs { base.Initialize(); + SubscribeNetworkEvent(Reset); SubscribeNetworkEvent(FillEntityPopup); SubscribeNetworkEvent(HandleContainerVisibilityMessage); @@ -68,7 +69,7 @@ namespace Content.Client.Verbs CommandBinds.Unregister(); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { ToggleContainerVisibility?.Invoke(this, false); } diff --git a/Content.Client/Wires/WiresVisualizer.cs b/Content.Client/Wires/Visualizers/WiresVisualizer.cs similarity index 95% rename from Content.Client/Wires/WiresVisualizer.cs rename to Content.Client/Wires/Visualizers/WiresVisualizer.cs index e20fd1cfa4..2ad300e436 100644 --- a/Content.Client/Wires/WiresVisualizer.cs +++ b/Content.Client/Wires/Visualizers/WiresVisualizer.cs @@ -1,7 +1,7 @@ using Robust.Client.GameObjects; using static Content.Shared.Wires.SharedWiresComponent; -namespace Content.Client.Wires +namespace Content.Client.Wires.Visualizers { public class WiresVisualizer : AppearanceVisualizer { diff --git a/Content.IntegrationTests/ContentIntegrationTest.cs b/Content.IntegrationTests/ContentIntegrationTest.cs index d550bc7cc9..765d3ade75 100644 --- a/Content.IntegrationTests/ContentIntegrationTest.cs +++ b/Content.IntegrationTests/ContentIntegrationTest.cs @@ -7,6 +7,8 @@ using Content.Server.IoC; using Content.Shared.CCVar; using Moq; using NUnit.Framework; +using Robust.Client; +using Robust.Server; using Robust.Server.Maps; using Robust.Shared; using Robust.Shared.ContentPack; @@ -31,6 +33,13 @@ namespace Content.IntegrationTests FailureLogLevel = LogLevel.Warning }; + // Load content resources, but not config and user data. + options.Options = new GameControllerOptions() + { + LoadContentResources = true, + LoadConfigAndUserData = false, + }; + options.ContentStart = true; options.ContentAssemblies = new[] @@ -57,13 +66,6 @@ namespace Content.IntegrationTests }); }; - // Connecting to Discord is a massive waste of time. - // Basically just makes the CI logs a mess. - options.CVarOverrides[CVars.DiscordEnabled.Name] = "false"; - - // Avoid preloading textures in tests. - options.CVarOverrides.TryAdd(CVars.TexturePreloadingEnabled.Name, "false"); - return base.StartClient(options); } @@ -74,6 +76,13 @@ namespace Content.IntegrationTests FailureLogLevel = LogLevel.Warning }; + // Load content resources, but not config and user data. + options.Options = new ServerOptions() + { + LoadConfigAndUserData = false, + LoadContentResources = true, + }; + options.ContentStart = true; options.ContentAssemblies = new[] @@ -105,15 +114,23 @@ namespace Content.IntegrationTests // Disable holidays as some of them might mess with the map at round start. options.CVarOverrides[CCVars.HolidaysEnabled.Name] = "false"; - // Avoid loading a large map by default for integration tests. - options.CVarOverrides[CCVars.GameMap.Name] = "Maps/Test/empty.yml"; + // Avoid loading a large map by default for integration tests if none has been specified. + if(!options.CVarOverrides.ContainsKey(CCVars.GameMap.Name)) + options.CVarOverrides[CCVars.GameMap.Name] = "Maps/Test/empty.yml"; return base.StartServer(options); } protected ServerIntegrationInstance StartServerDummyTicker(ServerIntegrationOptions options = null) { - options ??= new ServerIntegrationOptions(); + options ??= new ServerContentIntegrationOption(); + + // Load content resources, but not config and user data. + options.Options = new ServerOptions() + { + LoadConfigAndUserData = false, + LoadContentResources = true, + }; // Dummy game ticker. options.CVarOverrides[CCVars.GameDummyTicker.Name] = "true"; @@ -229,6 +246,12 @@ namespace Content.IntegrationTests FailureLogLevel = LogLevel.Warning; } + public override GameControllerOptions Options { get; set; } = new() + { + LoadContentResources = true, + LoadConfigAndUserData = false, + }; + public Action ContentBeforeIoC { get; set; } } @@ -239,6 +262,12 @@ namespace Content.IntegrationTests FailureLogLevel = LogLevel.Warning; } + public override ServerOptions Options { get; set; } = new() + { + LoadContentResources = true, + LoadConfigAndUserData = false, + }; + public Action ContentBeforeIoC { get; set; } } } diff --git a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs index ebc11c9c2e..c6cf878851 100644 --- a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs @@ -20,7 +20,13 @@ namespace Content.IntegrationTests.Tests.Commands [TestCase(false)] public async Task RestartRoundAfterStart(bool lobbyEnabled) { - var (_, server) = await StartConnectedServerClientPair(); + var (_, server) = await StartConnectedServerClientPair(serverOptions: new ServerContentIntegrationOption + { + CVarOverrides = + { + [CCVars.GameMap.Name] = "Maps/saltern.yml" + } + }); await server.WaitIdleAsync(); diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs index 6f4b5f5555..a75d936594 100644 --- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs +++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs @@ -85,7 +85,7 @@ namespace Content.IntegrationTests.Tests.Disposal components: - type: DisposalUnit - type: Anchorable - - type: PowerReceiver + - type: ApcPowerReceiver - type: Physics bodyType: Static @@ -155,7 +155,7 @@ namespace Content.IntegrationTests.Tests.Disposal Flush(unit, false, human, wrench); // Remove power need - Assert.True(disposalUnit.TryGetComponent(out PowerReceiverComponent? power)); + Assert.True(disposalUnit.TryGetComponent(out ApcPowerReceiverComponent? power)); power!.NeedsPower = false; Assert.True(unit.Powered); diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs index 16ef7b43c9..570178cf44 100644 --- a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs +++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs @@ -39,7 +39,7 @@ namespace Content.IntegrationTests.Tests.DoAfter var mob = entityManager.SpawnEntity("Dummy", MapCoordinates.Nullspace); var cancelToken = new CancellationTokenSource(); var args = new DoAfterEventArgs(mob, tickTime / 2, cancelToken.Token); - task = EntitySystem.Get().DoAfter(args); + task = EntitySystem.Get().WaitDoAfter(args); }); await server.WaitRunTicks(1); @@ -62,7 +62,7 @@ namespace Content.IntegrationTests.Tests.DoAfter var mob = entityManager.SpawnEntity("Dummy", MapCoordinates.Nullspace); var cancelToken = new CancellationTokenSource(); var args = new DoAfterEventArgs(mob, tickTime * 2, cancelToken.Token); - task = EntitySystem.Get().DoAfter(args); + task = EntitySystem.Get().WaitDoAfter(args); cancelToken.Cancel(); }); diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 63f5f48633..6e5bbb5469 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -2,8 +2,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Content.Server.Battery.Components; +using Content.Server.Power.Components; using Content.Server.PowerCell.Components; +using Content.Shared.CCVar; using Content.Shared.Coordinates; using NUnit.Framework; using Robust.Shared.GameObjects; @@ -21,7 +22,12 @@ namespace Content.IntegrationTests.Tests [Test] public async Task SpawnTest() { - var server = StartServerDummyTicker(); + var options = new ServerContentIntegrationOption() + { + CVarOverrides = {{CCVars.AIMaxUpdates.Name, int.MaxValue.ToString()}} + }; + + var server = StartServerDummyTicker(options); await server.WaitIdleAsync(); var mapManager = server.ResolveDependency(); diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs index 078d69762a..69d8c63581 100644 --- a/Content.IntegrationTests/Tests/GravityGridTest.cs +++ b/Content.IntegrationTests/Tests/GravityGridTest.cs @@ -22,7 +22,7 @@ namespace Content.IntegrationTests.Tests id: GravityGeneratorDummy components: - type: GravityGenerator - - type: PowerReceiver + - type: ApcPowerReceiver "; [Test] public async Task Test() @@ -48,9 +48,9 @@ namespace Content.IntegrationTests.Tests generator = entityMan.SpawnEntity("GravityGeneratorDummy", grid2.ToCoordinates()); Assert.That(generator.HasComponent()); - Assert.That(generator.HasComponent()); + Assert.That(generator.HasComponent()); var generatorComponent = generator.GetComponent(); - var powerComponent = generator.GetComponent(); + var powerComponent = generator.GetComponent(); Assert.That(generatorComponent.Status, Is.EqualTo(GravityGeneratorStatus.Unpowered)); powerComponent.NeedsPower = false; }); diff --git a/Content.IntegrationTests/Tests/Power/PowerTest.cs b/Content.IntegrationTests/Tests/Power/PowerTest.cs new file mode 100644 index 0000000000..b8453821f3 --- /dev/null +++ b/Content.IntegrationTests/Tests/Power/PowerTest.cs @@ -0,0 +1,996 @@ +#nullable enable +using System.Threading.Tasks; +using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; +using Content.Server.Power.Components; +using Content.Server.Power.Nodes; +using Content.Shared.Coordinates; +using NUnit.Framework; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Timing; + +namespace Content.IntegrationTests.Tests.Power +{ + [Parallelizable(ParallelScope.Fixtures)] + [TestFixture] + public class PowerTest : ContentIntegrationTest + { + private const string Prototypes = @" +- type: entity + id: GeneratorDummy + components: + - type: NodeContainer + nodes: + output: + !type:CableDeviceNode + nodeGroupID: HVPower + - type: PowerSupplier + - type: Transform + anchored: true + +- type: entity + id: ConsumerDummy + components: + - type: Transform + anchored: true + - type: NodeContainer + nodes: + input: + !type:CableDeviceNode + nodeGroupID: HVPower + - type: PowerConsumer + +- type: entity + id: ChargingBatteryDummy + components: + - type: Transform + anchored: true + - type: NodeContainer + nodes: + output: + !type:CableDeviceNode + nodeGroupID: HVPower + - type: PowerNetworkBattery + - type: Battery + - type: BatteryCharger + +- type: entity + id: DischargingBatteryDummy + components: + - type: Transform + anchored: true + - type: NodeContainer + nodes: + output: + !type:CableDeviceNode + nodeGroupID: HVPower + - type: PowerNetworkBattery + - type: Battery + - type: BatteryDischarger + +- type: entity + id: FullBatteryDummy + components: + - type: Transform + anchored: true + - type: NodeContainer + nodes: + output: + !type:CableDeviceNode + nodeGroupID: HVPower + input: + !type:CableTerminalPortNode + nodeGroupID: HVPower + - type: PowerNetworkBattery + - type: Battery + - type: BatteryDischarger + node: output + - type: BatteryCharger + node: input + +- type: entity + id: SubstationDummy + components: + - type: NodeContainer + nodes: + input: + !type:CableDeviceNode + nodeGroupID: HVPower + output: + !type:CableDeviceNode + nodeGroupID: MVPower + - type: BatteryCharger + voltage: High + - type: BatteryDischarger + voltage: Medium + - type: PowerNetworkBattery + maxChargeRate: 1000 + maxSupply: 1000 + supplyRampTolerance: 1000 + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: Transform + anchored: true + +- type: entity + id: ApcDummy + components: + - type: Battery + maxCharge: 10000 + startingCharge: 10000 + - type: PowerNetworkBattery + maxChargeRate: 1000 + maxSupply: 1000 + supplyRampTolerance: 1000 + - type: BatteryCharger + voltage: Medium + - type: BatteryDischarger + voltage: Apc + - type: Apc + voltage: Apc + - type: NodeContainer + nodes: + input: + !type:CableDeviceNode + nodeGroupID: MVPower + output: + !type:CableDeviceNode + nodeGroupID: Apc + - type: Transform + anchored: true + - type: UserInterface + interfaces: + - key: enum.ApcUiKey.Key + type: ApcBoundUserInterface + - type: AccessReader + access: [['Engineering']] + +- type: entity + id: ApcPowerReceiverDummy + components: + - type: ApcPowerReceiver + - type: Transform + anchored: true +"; + + private ServerIntegrationInstance _server = default!; + private IMapManager _mapManager = default!; + private IEntityManager _entityManager = default!; + private IGameTiming _gameTiming = default!; + + [OneTimeSetUp] + public async Task Setup() + { + var options = new ServerIntegrationOptions {ExtraPrototypes = Prototypes}; + _server = StartServerDummyTicker(options); + + await _server.WaitIdleAsync(); + _mapManager = _server.ResolveDependency(); + _entityManager = _server.ResolveDependency(); + _gameTiming = _server.ResolveDependency(); + } + + /// + /// Test small power net with a simple surplus of power over the loads. + /// + [Test] + public async Task TestSimpleSurplus() + { + const float loadPower = 200; + PowerSupplierComponent supplier = default!; + PowerConsumerComponent consumer1 = default!; + PowerConsumerComponent consumer2 = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 3; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + var generatorEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates()); + var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1)); + var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2)); + + supplier = generatorEnt.GetComponent(); + consumer1 = consumerEnt1.GetComponent(); + consumer2 = consumerEnt2.GetComponent(); + + // Plenty of surplus and tolerance + supplier.MaxSupply = loadPower * 4; + supplier.SupplyRampTolerance = loadPower * 4; + consumer1.DrawRate = loadPower; + consumer2.DrawRate = loadPower; + }); + + _server.RunTicks(1); //let run a tick for PowerNet to process power + + _server.Assert(() => + { + // Assert both consumers fully powered + Assert.That(consumer1.ReceivedPower, Is.EqualTo(consumer1.DrawRate).Within(0.1)); + Assert.That(consumer2.ReceivedPower, Is.EqualTo(consumer2.DrawRate).Within(0.1)); + + // Assert that load adds up on supply. + Assert.That(supplier.CurrentSupply, Is.EqualTo(loadPower * 2).Within(0.1)); + }); + + await _server.WaitIdleAsync(); + } + + + /// + /// Test small power net with a simple deficit of power over the loads. + /// + [Test] + public async Task TestSimpleDeficit() + { + const float loadPower = 200; + PowerSupplierComponent supplier = default!; + PowerConsumerComponent consumer1 = default!; + PowerConsumerComponent consumer2 = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 3; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + var generatorEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates()); + var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1)); + var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2)); + + supplier = generatorEnt.GetComponent(); + consumer1 = consumerEnt1.GetComponent(); + consumer2 = consumerEnt2.GetComponent(); + + // Too little supply, both consumers should get 33% power. + supplier.MaxSupply = loadPower; + supplier.SupplyRampTolerance = loadPower; + consumer1.DrawRate = loadPower; + consumer2.DrawRate = loadPower * 2; + }); + + _server.RunTicks(1); //let run a tick for PowerNet to process power + + _server.Assert(() => + { + // Assert both consumers get 33% power. + Assert.That(consumer1.ReceivedPower, Is.EqualTo(consumer1.DrawRate / 3).Within(0.1)); + Assert.That(consumer2.ReceivedPower, Is.EqualTo(consumer2.DrawRate / 3).Within(0.1)); + + // Supply should be maxed out + Assert.That(supplier.CurrentSupply, Is.EqualTo(supplier.MaxSupply).Within(0.1)); + }); + + await _server.WaitIdleAsync(); + } + + [Test] + public async Task TestSupplyRamp() + { + PowerSupplierComponent supplier = default!; + PowerConsumerComponent consumer = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 3; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + var generatorEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates()); + var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2)); + + supplier = generatorEnt.GetComponent(); + consumer = consumerEnt.GetComponent(); + + // Supply has enough total power but needs to ramp up to match. + supplier.MaxSupply = 400; + supplier.SupplyRampRate = 400; + supplier.SupplyRampTolerance = 100; + consumer.DrawRate = 400; + }); + + // Exact values can/will be off by a tick, add tolerance for that. + var tickRate = (float) _gameTiming.TickPeriod.TotalSeconds; + var tickDev = 400 * tickRate * 1.1f; + + _server.RunTicks(1); + + _server.Assert(() => + { + // First tick, supply should be delivering 100 W (max tolerance) and start ramping up. + Assert.That(supplier.CurrentSupply, Is.EqualTo(100).Within(0.1)); + Assert.That(consumer.ReceivedPower, Is.EqualTo(100).Within(0.1)); + }); + + _server.RunTicks(14); + + _server.Assert(() => + { + // After 15 ticks (0.25 seconds), supply ramp pos should be at 100 W and supply at 100, approx. + Assert.That(supplier.CurrentSupply, Is.EqualTo(200).Within(tickDev)); + Assert.That(supplier.SupplyRampPosition, Is.EqualTo(100).Within(tickDev)); + Assert.That(consumer.ReceivedPower, Is.EqualTo(200).Within(tickDev)); + }); + + _server.RunTicks(45); + + _server.Assert(() => + { + // After 1 second total, ramp should be at 400 and supply should be at 400, everybody happy. + Assert.That(supplier.CurrentSupply, Is.EqualTo(400).Within(tickDev)); + Assert.That(supplier.SupplyRampPosition, Is.EqualTo(400).Within(tickDev)); + Assert.That(consumer.ReceivedPower, Is.EqualTo(400).Within(tickDev)); + }); + + await _server.WaitIdleAsync(); + } + + [Test] + public async Task TestBatteryRamp() + { + const float startingCharge = 100_000; + + PowerNetworkBatteryComponent netBattery = default!; + BatteryComponent battery = default!; + PowerConsumerComponent consumer = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 3; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + var generatorEnt = _entityManager.SpawnEntity("DischargingBatteryDummy", grid.ToCoordinates()); + var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2)); + + netBattery = generatorEnt.GetComponent(); + battery = generatorEnt.GetComponent(); + consumer = consumerEnt.GetComponent(); + + battery.MaxCharge = startingCharge; + battery.CurrentCharge = startingCharge; + netBattery.MaxSupply = 400; + netBattery.SupplyRampRate = 400; + netBattery.SupplyRampTolerance = 100; + consumer.DrawRate = 400; + }); + + // Exact values can/will be off by a tick, add tolerance for that. + var tickRate = (float) _gameTiming.TickPeriod.TotalSeconds; + var tickDev = 400 * tickRate * 1.1f; + + _server.RunTicks(1); + + _server.Assert(() => + { + // First tick, supply should be delivering 100 W (max tolerance) and start ramping up. + Assert.That(netBattery.CurrentSupply, Is.EqualTo(100).Within(0.1)); + Assert.That(consumer.ReceivedPower, Is.EqualTo(100).Within(0.1)); + }); + + _server.RunTicks(14); + + _server.Assert(() => + { + // After 15 ticks (0.25 seconds), supply ramp pos should be at 100 W and supply at 100, approx. + Assert.That(netBattery.CurrentSupply, Is.EqualTo(200).Within(tickDev)); + Assert.That(netBattery.SupplyRampPosition, Is.EqualTo(100).Within(tickDev)); + Assert.That(consumer.ReceivedPower, Is.EqualTo(200).Within(tickDev)); + + // Trivial integral to calculate expected power spent. + const double spentExpected = (200 + 100) / 2.0 * 0.25; + Assert.That(battery.CurrentCharge, Is.EqualTo(startingCharge - spentExpected).Within(tickDev)); + }); + + _server.RunTicks(45); + + _server.Assert(() => + { + // After 1 second total, ramp should be at 400 and supply should be at 400, everybody happy. + Assert.That(netBattery.CurrentSupply, Is.EqualTo(400).Within(tickDev)); + Assert.That(netBattery.SupplyRampPosition, Is.EqualTo(400).Within(tickDev)); + Assert.That(consumer.ReceivedPower, Is.EqualTo(400).Within(tickDev)); + + // Trivial integral to calculate expected power spent. + const double spentExpected = (400 + 100) / 2.0 * 0.75 + 400 * 0.25; + Assert.That(battery.CurrentCharge, Is.EqualTo(startingCharge - spentExpected).Within(tickDev)); + }); + + await _server.WaitIdleAsync(); + } + + + [Test] + public async Task TestSimpleBatteryChargeDeficit() + { + PowerSupplierComponent supplier = default!; + BatteryComponent battery = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 3; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + var generatorEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates()); + var batteryEnt = _entityManager.SpawnEntity("ChargingBatteryDummy", grid.ToCoordinates(0, 2)); + + supplier = generatorEnt.GetComponent(); + var netBattery = batteryEnt.GetComponent(); + battery = batteryEnt.GetComponent(); + + supplier.MaxSupply = 500; + supplier.SupplyRampTolerance = 500; + battery.MaxCharge = 100000; + netBattery.MaxChargeRate = 1000; + netBattery.Efficiency = 0.5f; + }); + + _server.RunTicks(30); // 60 TPS, 0.5 seconds + + _server.Assert(() => + { + // half a second @ 500 W = 250 + // 50% efficiency, so 125 J stored total. + Assert.That(battery.CurrentCharge, Is.EqualTo(125).Within(0.1)); + Assert.That(supplier.CurrentSupply, Is.EqualTo(500).Within(0.1)); + }); + + await _server.WaitIdleAsync(); + } + + [Test] + public async Task TestFullBattery() + { + PowerConsumerComponent consumer = default!; + PowerSupplierComponent supplier = default!; + PowerNetworkBatteryComponent netBattery = default!; + BatteryComponent battery = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 4; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1)); + terminal.Transform.LocalRotation = Angle.FromDegrees(180); + + var batteryEnt = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2)); + var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0)); + var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3)); + + consumer = consumerEnt.GetComponent(); + supplier = supplyEnt.GetComponent(); + netBattery = batteryEnt.GetComponent(); + battery = batteryEnt.GetComponent(); + + // Consumer needs 1000 W, supplier can only provide 800, battery fills in the remaining 200. + consumer.DrawRate = 1000; + supplier.MaxSupply = 800; + supplier.SupplyRampTolerance = 800; + + netBattery.MaxSupply = 400; + netBattery.SupplyRampTolerance = 400; + netBattery.SupplyRampRate = 100_000; + battery.MaxCharge = 100_000; + battery.CurrentCharge = 100_000; + }); + + // Run some ticks so everything is stable. + _server.RunTicks(60); + + // Exact values can/will be off by a tick, add tolerance for that. + var tickRate = (float) _gameTiming.TickPeriod.TotalSeconds; + var tickDev = 400 * tickRate * 1.1f; + + _server.Assert(() => + { + Assert.That(consumer.ReceivedPower, Is.EqualTo(consumer.DrawRate).Within(0.1)); + Assert.That(supplier.CurrentSupply, Is.EqualTo(supplier.MaxSupply).Within(0.1)); + + // Battery's current supply includes passed-through power from the supply. + // Assert ramp position is correct to make sure it's only supplying 200 W for real. + Assert.That(netBattery.CurrentSupply, Is.EqualTo(1000).Within(0.1)); + Assert.That(netBattery.SupplyRampPosition, Is.EqualTo(200).Within(0.1)); + + const int expectedSpent = 200; + Assert.That(battery.CurrentCharge, Is.EqualTo(battery.MaxCharge - expectedSpent).Within(tickDev)); + }); + + await _server.WaitIdleAsync(); + } + + [Test] + public async Task TestFullBatteryEfficiencyPassThrough() + { + PowerConsumerComponent consumer = default!; + PowerSupplierComponent supplier = default!; + PowerNetworkBatteryComponent netBattery = default!; + BatteryComponent battery = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 4; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1)); + terminal.Transform.LocalRotation = Angle.FromDegrees(180); + + var batteryEnt = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2)); + var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0)); + var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3)); + + consumer = consumerEnt.GetComponent(); + supplier = supplyEnt.GetComponent(); + netBattery = batteryEnt.GetComponent(); + battery = batteryEnt.GetComponent(); + + // Consumer needs 1000 W, supply and battery can only provide 400 each. + // BUT the battery has 50% input efficiency, so 50% of the power of the supply gets lost. + consumer.DrawRate = 1000; + supplier.MaxSupply = 400; + supplier.SupplyRampTolerance = 400; + + netBattery.MaxSupply = 400; + netBattery.SupplyRampTolerance = 400; + netBattery.SupplyRampRate = 100_000; + netBattery.Efficiency = 0.5f; + battery.MaxCharge = 1_000_000; + battery.CurrentCharge = 1_000_000; + }); + + // Run some ticks so everything is stable. + _server.RunTicks(60); + + // Exact values can/will be off by a tick, add tolerance for that. + var tickRate = (float) _gameTiming.TickPeriod.TotalSeconds; + var tickDev = 400 * tickRate * 1.1f; + + _server.Assert(() => + { + Assert.That(consumer.ReceivedPower, Is.EqualTo(600).Within(0.1)); + Assert.That(supplier.CurrentSupply, Is.EqualTo(supplier.MaxSupply).Within(0.1)); + + Assert.That(netBattery.CurrentSupply, Is.EqualTo(600).Within(0.1)); + Assert.That(netBattery.SupplyRampPosition, Is.EqualTo(400).Within(0.1)); + + const int expectedSpent = 400; + Assert.That(battery.CurrentCharge, Is.EqualTo(battery.MaxCharge - expectedSpent).Within(tickDev)); + }); + + await _server.WaitIdleAsync(); + } + + [Test] + public async Task TestFullBatteryEfficiencyDemandPassThrough() + { + PowerConsumerComponent consumer1 = default!; + PowerConsumerComponent consumer2 = default!; + PowerSupplierComponent supplier = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Map layout here is + // C - consumer + // B - battery + // G - generator + // B - battery + // C - consumer + // Connected in the only way that makes sense. + + // Power only works when anchored + for (var i = 0; i < 5; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2)); + var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2)); + terminal.Transform.LocalRotation = Angle.FromDegrees(180); + + var batteryEnt1 = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 1)); + var batteryEnt2 = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 3)); + var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 2)); + var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0)); + var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4)); + + consumer1 = consumerEnt1.GetComponent(); + consumer2 = consumerEnt2.GetComponent(); + supplier = supplyEnt.GetComponent(); + var netBattery1 = batteryEnt1.GetComponent(); + var netBattery2 = batteryEnt2.GetComponent(); + var battery1 = batteryEnt1.GetComponent(); + var battery2 = batteryEnt2.GetComponent(); + + // There are two loads, 500 W and 1000 W respectively. + // The 500 W load is behind a 50% efficient battery, + // so *effectively* it needs 2x as much power from the supply to run. + // Assert that both are getting 50% power. + // Batteries are empty and only a bridge. + + consumer1.DrawRate = 500; + consumer2.DrawRate = 1000; + supplier.MaxSupply = 1000; + supplier.SupplyRampTolerance = 1000; + + battery1.MaxCharge = 1_000_000; + battery2.MaxCharge = 1_000_000; + + netBattery1.MaxChargeRate = 1_000; + netBattery2.MaxChargeRate = 1_000; + + netBattery1.Efficiency = 0.5f; + + netBattery1.MaxSupply = 1_000_000; + netBattery2.MaxSupply = 1_000_000; + + netBattery1.SupplyRampTolerance = 1_000_000; + netBattery2.SupplyRampTolerance = 1_000_000; + }); + + // Run some ticks so everything is stable. + _server.RunTicks(10); + + _server.Assert(() => + { + Assert.That(consumer1.ReceivedPower, Is.EqualTo(250).Within(0.1)); + Assert.That(consumer2.ReceivedPower, Is.EqualTo(500).Within(0.1)); + Assert.That(supplier.CurrentSupply, Is.EqualTo(supplier.MaxSupply).Within(0.1)); + }); + + await _server.WaitIdleAsync(); + } + + /// + /// Test that power is distributed proportionally, even through batteries. + /// + [Test] + public async Task TestBatteriesProportional() + { + PowerConsumerComponent consumer1 = default!; + PowerConsumerComponent consumer2 = default!; + PowerSupplierComponent supplier = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Map layout here is + // C - consumer + // B - battery + // G - generator + // B - battery + // C - consumer + // Connected in the only way that makes sense. + + // Power only works when anchored + for (var i = 0; i < 5; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2)); + var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2)); + terminal.Transform.LocalRotation = Angle.FromDegrees(180); + + var batteryEnt1 = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 1)); + var batteryEnt2 = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 3)); + var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 2)); + var consumerEnt1 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0)); + var consumerEnt2 = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4)); + + consumer1 = consumerEnt1.GetComponent(); + consumer2 = consumerEnt2.GetComponent(); + supplier = supplyEnt.GetComponent(); + var netBattery1 = batteryEnt1.GetComponent(); + var netBattery2 = batteryEnt2.GetComponent(); + var battery1 = batteryEnt1.GetComponent(); + var battery2 = batteryEnt2.GetComponent(); + + consumer1.DrawRate = 500; + consumer2.DrawRate = 1000; + supplier.MaxSupply = 1000; + supplier.SupplyRampTolerance = 1000; + + battery1.MaxCharge = 1_000_000; + battery2.MaxCharge = 1_000_000; + + netBattery1.MaxChargeRate = 20; + netBattery2.MaxChargeRate = 20; + + netBattery1.MaxSupply = 1_000_000; + netBattery2.MaxSupply = 1_000_000; + + netBattery1.SupplyRampTolerance = 1_000_000; + netBattery2.SupplyRampTolerance = 1_000_000; + }); + + // Run some ticks so everything is stable. + _server.RunTicks(60); + + _server.Assert(() => + { + // NOTE: MaxChargeRate on batteries actually skews the demand. + // So that's why the tolerance is so high, the charge rate is so *low*, + // and we run so many ticks to stabilize. + Assert.That(consumer1.ReceivedPower, Is.EqualTo(333.333).Within(10)); + Assert.That(consumer2.ReceivedPower, Is.EqualTo(666.666).Within(10)); + Assert.That(supplier.CurrentSupply, Is.EqualTo(supplier.MaxSupply).Within(0.1)); + }); + + await _server.WaitIdleAsync(); + } + + [Test] + public async Task TestBatteryEngineCut() + { + PowerConsumerComponent consumer = default!; + PowerSupplierComponent supplier = default!; + PowerNetworkBatteryComponent netBattery = default!; + + _server.Post(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 4; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i)); + } + + var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1)); + terminal.Transform.LocalRotation = Angle.FromDegrees(180); + + var batteryEnt = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2)); + var supplyEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0)); + var consumerEnt = _entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3)); + + consumer = consumerEnt.GetComponent(); + supplier = supplyEnt.GetComponent(); + netBattery = batteryEnt.GetComponent(); + var battery = batteryEnt.GetComponent(); + + // Consumer needs 1000 W, supplier can only provide 800, battery fills in the remaining 200. + consumer.DrawRate = 1000; + supplier.MaxSupply = 1000; + supplier.SupplyRampTolerance = 1000; + + netBattery.MaxSupply = 1000; + netBattery.SupplyRampTolerance = 200; + netBattery.SupplyRampRate = 10; + battery.MaxCharge = 100_000; + battery.CurrentCharge = 100_000; + }); + + // Run some ticks so everything is stable. + _server.RunTicks(5); + + _server.Assert(() => + { + // Supply and consumer are fully loaded/supplied. + Assert.That(consumer.ReceivedPower, Is.EqualTo(consumer.DrawRate).Within(0.5)); + Assert.That(supplier.CurrentSupply, Is.EqualTo(supplier.MaxSupply).Within(0.5)); + + // Cut off the supplier + supplier.Enabled = false; + // Remove tolerance on battery too. + netBattery.SupplyRampTolerance = 5; + }); + + _server.RunTicks(3); + + _server.Assert(() => + { + // Assert that network drops to 0 power and starts ramping up + Assert.That(consumer.ReceivedPower, Is.LessThan(50).And.GreaterThan(0)); + Assert.That(netBattery.CurrentReceiving, Is.EqualTo(0)); + Assert.That(netBattery.CurrentSupply, Is.GreaterThan(0)); + }); + + await _server.WaitIdleAsync(); + } + + /// + /// Test that correctly isolates two networks. + /// + [Test] + public async Task TestTerminalNodeGroups() + { + CableNode leftNode = default!; + CableNode rightNode = default!; + Node batteryInput = default!; + Node batteryOutput = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 4; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + } + + var leftEnt = _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 0)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 1)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 2)); + var rightEnt = _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 3)); + + var terminal = _entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1)); + terminal.Transform.LocalRotation = Angle.FromDegrees(180); + + var battery = _entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2)); + var batteryNodeContainer = battery.GetComponent(); + + leftNode = leftEnt.GetComponent().GetNode("power"); + rightNode = rightEnt.GetComponent().GetNode("power"); + + batteryInput = batteryNodeContainer.GetNode("input"); + batteryOutput = batteryNodeContainer.GetNode("output"); + }); + + // Run ticks to allow node groups to update. + _server.RunTicks(1); + + _server.Assert(() => + { + Assert.That(batteryInput.NodeGroup, Is.EqualTo(leftNode.NodeGroup)); + Assert.That(batteryOutput.NodeGroup, Is.EqualTo(rightNode.NodeGroup)); + + Assert.That(leftNode.NodeGroup, Is.Not.EqualTo(rightNode.NodeGroup)); + }); + + await _server.WaitIdleAsync(); + } + + [Test] + public async Task ApcChargingTest() + { + PowerNetworkBatteryComponent substationNetBattery = default!; + BatteryComponent apcBattery = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 3; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + } + + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 0)); + _entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 1)); + _entityManager.SpawnEntity("CableMV", grid.ToCoordinates(0, 1)); + _entityManager.SpawnEntity("CableMV", grid.ToCoordinates(0, 2)); + + var generatorEnt = _entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0)); + var substationEnt = _entityManager.SpawnEntity("SubstationDummy", grid.ToCoordinates(0, 1)); + var apcEnt = _entityManager.SpawnEntity("ApcDummy", grid.ToCoordinates(0, 2)); + + var generatorSupplier = generatorEnt.GetComponent(); + substationNetBattery = substationEnt.GetComponent(); + apcBattery = apcEnt.GetComponent(); + + generatorSupplier.MaxSupply = 1000; + generatorSupplier.SupplyRampTolerance = 1000; + + apcBattery.CurrentCharge = 0; + }); + + _server.RunTicks(5); //let run a few ticks for PowerNets to reevaluate and start charging apc + + _server.Assert(() => + { + Assert.That(substationNetBattery.CurrentSupply, Is.GreaterThan(0)); //substation should be providing power + Assert.That(apcBattery.CurrentCharge, Is.GreaterThan(0)); //apc battery should have gained charge + }); + + await _server.WaitIdleAsync(); + } + + [Test] + public async Task ApcNetTest() + { + PowerNetworkBatteryComponent apcNetBattery = default!; + ApcPowerReceiverComponent receiver = default!; + + _server.Assert(() => + { + var map = _mapManager.CreateMap(); + var grid = _mapManager.CreateGrid(map); + + // Power only works when anchored + for (var i = 0; i < 3; i++) + { + grid.SetTile(new Vector2i(0, i), new Tile(1)); + } + + var apcEnt = _entityManager.SpawnEntity("ApcDummy", grid.ToCoordinates(0, 0)); + var apcExtensionEnt = _entityManager.SpawnEntity("CableApcExtension", grid.ToCoordinates(0, 0)); + var powerReceiverEnt = _entityManager.SpawnEntity("ApcPowerReceiverDummy", grid.ToCoordinates(0, 2)); + + var provider = apcExtensionEnt.GetComponent(); + receiver = powerReceiverEnt.GetComponent(); + var battery = apcEnt.GetComponent(); + apcNetBattery = apcEnt.GetComponent(); + + provider.PowerTransferRange = 5; //arbitrary range to reach receiver + receiver.PowerReceptionRange = 5; //arbitrary range to reach provider + + battery.MaxCharge = 10000; //arbitrary nonzero amount of charge + battery.CurrentCharge = battery.MaxCharge; //fill battery + + receiver.Load = 1; //arbitrary small amount of power + }); + + _server.RunTicks(1); //let run a tick for ApcNet to process power + + _server.Assert(() => + { + Assert.That(receiver.Powered); + Assert.That(apcNetBattery.CurrentSupply, Is.EqualTo(1).Within(0.1)); + }); + + await _server.WaitIdleAsync(); + } + } +} diff --git a/Content.IntegrationTests/Tests/PowerTest.cs b/Content.IntegrationTests/Tests/PowerTest.cs deleted file mode 100644 index 191288b16a..0000000000 --- a/Content.IntegrationTests/Tests/PowerTest.cs +++ /dev/null @@ -1,292 +0,0 @@ -#nullable enable -using System.Threading.Tasks; -using Content.Server.APC.Components; -using Content.Server.Battery.Components; -using Content.Server.GameObjects.Components; -using Content.Server.Power.Components; -using Content.Shared.Coordinates; -using NUnit.Framework; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Map; -using Robust.Shared.Maths; -using Robust.Shared.Physics; - -namespace Content.IntegrationTests.Tests -{ - [TestFixture] - public class PowerTest : ContentIntegrationTest - { - private const string Prototypes = @" -- type: entity - name: GeneratorDummy - id: GeneratorDummy - components: - - type: NodeContainer - nodes: - output: - !type:AdjacentNode - nodeGroupID: HVPower - - type: PowerSupplier - supplyRate: 3000 - - type: Anchorable - - type: Transform - anchored: true - -- type: entity - name: ConsumerDummy - id: ConsumerDummy - components: - - type: Transform - anchored: true - - type: NodeContainer - nodes: - input: - !type:AdjacentNode - nodeGroupID: HVPower - - type: PowerConsumer - drawRate: 50 - -- type: entity - name: SubstationDummy - id: SubstationDummy - components: - - type: Battery - maxCharge: 1000 - startingCharge: 1000 - - type: NodeContainer - nodes: - input: - !type:AdjacentNode - nodeGroupID: HVPower - output: - !type:AdjacentNode - nodeGroupID: MVPower - - type: PowerConsumer - - type: BatteryStorage - activeDrawRate: 1500 - - type: PowerSupplier - voltage: Medium - - type: BatteryDischarger - activeSupplyRate: 1000 - - type: Transform - anchored: true - -- type: entity - name: ApcDummy - id: ApcDummy - components: - - type: Battery - maxCharge: 10000 - startingCharge: 10000 - - type: BatteryStorage - activeDrawRate: 1000 - - type: PowerProvider - voltage: Apc - - type: Apc - voltage: Apc - - type: PowerConsumer - voltage: Medium - - type: NodeContainer - nodes: - input: - !type:AdjacentNode - nodeGroupID: MVPower - output: - !type:AdjacentNode - nodeGroupID: Apc - - type: Transform - anchored: true - - type: UserInterface - interfaces: - - key: enum.ApcUiKey.Key - type: ApcBoundUserInterface - - type: AccessReader - access: [['Engineering']] - -- type: entity - name: ApcExtensionCableDummy - id: ApcExtensionCableDummy - components: - - type: NodeContainer - nodes: - apc: - !type:AdjacentNode - nodeGroupID: Apc - wire: - !type:AdjacentNode - nodeGroupID: WireNet - - type: PowerProvider - voltage: Apc - - type: Wire - wireType: Apc - - type: Transform - anchored: true - -- type: entity - name: PowerReceiverDummy - id: PowerReceiverDummy - components: - - type: PowerReceiver - - type: Transform - anchored: true -"; - [Test] - public async Task PowerNetTest() - { - var options = new ServerIntegrationOptions{ExtraPrototypes = Prototypes}; - var server = StartServerDummyTicker(options); - - PowerSupplierComponent supplier = default!; - PowerConsumerComponent consumer1 = default!; - PowerConsumerComponent consumer2 = default!; - - server.Assert(() => - { - var mapMan = IoCManager.Resolve(); - var entityMan = IoCManager.Resolve(); - mapMan.CreateMap(new MapId(1)); - var grid = mapMan.CreateGrid(new MapId(1)); - - // Power only works when anchored - grid.SetTile(new Vector2i(0, 0), new Tile(1)); - grid.SetTile(new Vector2i(0, 1), new Tile(1)); - grid.SetTile(new Vector2i(0, 2), new Tile(1)); - - var generatorEnt = entityMan.SpawnEntity("GeneratorDummy", grid.ToCoordinates()); - var consumerEnt1 = entityMan.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1)); - var consumerEnt2 = entityMan.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2)); - - if (generatorEnt.TryGetComponent(out PhysicsComponent? physics)) - { - physics.BodyType = BodyType.Static; - } - - supplier = generatorEnt.GetComponent(); - consumer1 = consumerEnt1.GetComponent(); - consumer2 = consumerEnt2.GetComponent(); - - var supplyRate = 1000; //arbitrary amount of power supply - - supplier.SupplyRate = supplyRate; - consumer1.DrawRate = supplyRate / 2; //arbitrary draw less than supply - consumer2.DrawRate = supplyRate * 2; //arbitrary draw greater than supply - - consumer1.Priority = Priority.First; //power goes to this consumer first - consumer2.Priority = Priority.Last; //any excess power should go to low priority consumer - }); - - server.RunTicks(1); //let run a tick for PowerNet to process power - - server.Assert(() => - { - Assert.That(consumer1.DrawRate, Is.EqualTo(consumer1.ReceivedPower)); //first should be fully powered - Assert.That(consumer2.ReceivedPower, Is.EqualTo(supplier.SupplyRate - consumer1.ReceivedPower)); //second should get remaining power - }); - - await server.WaitIdleAsync(); - } - - [Test] - public async Task ApcChargingTest() - { - var options = new ServerIntegrationOptions{ExtraPrototypes = Prototypes}; - var server = StartServerDummyTicker(options); - - BatteryComponent apcBattery = default!; - PowerSupplierComponent substationSupplier = default!; - - server.Assert(() => - { - var mapMan = IoCManager.Resolve(); - var entityMan = IoCManager.Resolve(); - mapMan.CreateMap(new MapId(1)); - var grid = mapMan.CreateGrid(new MapId(1)); - - // Power only works when anchored - grid.SetTile(new Vector2i(0, 0), new Tile(1)); - grid.SetTile(new Vector2i(0, 1), new Tile(1)); - grid.SetTile(new Vector2i(0, 2), new Tile(1)); - - var generatorEnt = entityMan.SpawnEntity("GeneratorDummy", grid.ToCoordinates()); - var substationEnt = entityMan.SpawnEntity("SubstationDummy", grid.ToCoordinates(0, 1)); - var apcEnt = entityMan.SpawnEntity("ApcDummy", grid.ToCoordinates(0, 2)); - - var generatorSupplier = generatorEnt.GetComponent(); - - substationSupplier = substationEnt.GetComponent(); - var substationStorage = substationEnt.GetComponent(); - var substationDischarger = substationEnt.GetComponent(); - - apcBattery = apcEnt.GetComponent(); - var apcStorage = apcEnt.GetComponent(); - - generatorSupplier.SupplyRate = 1000; //arbitrary nonzero amount of power - substationStorage.ActiveDrawRate = 1000; //arbitrary nonzero power draw - substationDischarger.ActiveSupplyRate = 500; //arbitirary nonzero power supply less than substation storage draw - apcStorage.ActiveDrawRate = 500; //arbitrary nonzero power draw - apcBattery.MaxCharge = 100; //abbitrary nonzero amount of charge - apcBattery.CurrentCharge = 0; //no charge - }); - - server.RunTicks(5); //let run a few ticks for PowerNets to reevaluate and start charging apc - - server.Assert(() => - { - Assert.That(substationSupplier.SupplyRate, Is.Not.EqualTo(0)); //substation should be providing power - Assert.That(apcBattery.CurrentCharge, Is.Not.EqualTo(0)); //apc battery should have gained charge - }); - - await server.WaitIdleAsync(); - } - - [Test] - public async Task ApcNetTest() - { - var options = new ServerIntegrationOptions{ExtraPrototypes = Prototypes}; - var server = StartServerDummyTicker(options); - - PowerReceiverComponent receiver = default!; - - server.Assert(() => - { - var mapMan = IoCManager.Resolve(); - var entityMan = IoCManager.Resolve(); - var mapId = new MapId(1); - mapMan.CreateMap(mapId); - var grid = mapMan.CreateGrid(mapId); - - // Power only works when anchored - grid.SetTile(new Vector2i(0, 0), new Tile(1)); - grid.SetTile(new Vector2i(0, 1), new Tile(1)); - grid.SetTile(new Vector2i(0, 2), new Tile(1)); - - var apcEnt = entityMan.SpawnEntity("ApcDummy", grid.ToCoordinates(0, 0)); - var apcExtensionEnt = entityMan.SpawnEntity("ApcExtensionCableDummy", grid.ToCoordinates(0, 1)); - var powerReceiverEnt = entityMan.SpawnEntity("PowerReceiverDummy", grid.ToCoordinates(0, 2)); - - var apc = apcEnt.GetComponent(); - var provider = apcExtensionEnt.GetComponent(); - receiver = powerReceiverEnt.GetComponent(); - var battery = apcEnt.GetComponent(); - - provider.PowerTransferRange = 5; //arbitrary range to reach receiver - receiver.PowerReceptionRange = 5; //arbitrary range to reach provider - - battery.MaxCharge = 10000; //arbitrary nonzero amount of charge - battery.CurrentCharge = battery.MaxCharge; //fill battery - - receiver.Load = 1; //arbitrary small amount of power - }); - - server.RunTicks(1); //let run a tick for ApcNet to process power - - server.Assert(() => - { - Assert.That(receiver.Powered); - }); - - await server.WaitIdleAsync(); - } - } -} diff --git a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs index a7b8740c73..58af6d2bc4 100644 --- a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs +++ b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs @@ -9,15 +9,22 @@ using Robust.Shared.Reflection; namespace Content.IntegrationTests.Tests { [TestFixture] - [TestOf(typeof(IResettingEntitySystem))] + [TestOf(typeof(RoundRestartCleanupEvent))] public class ResettingEntitySystemTests : ContentIntegrationTest { [Reflect(false)] - private class TestResettingEntitySystem : EntitySystem, IResettingEntitySystem + private class TestRoundRestartCleanupEvent : EntitySystem { public bool HasBeenReset { get; set; } - public void Reset() + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(Reset); + } + + public void Reset(RoundRestartCleanupEvent ev) { HasBeenReset = true; } @@ -30,7 +37,7 @@ namespace Content.IntegrationTests.Tests { ContentBeforeIoC = () => { - IoCManager.Resolve().LoadExtraSystemType(); + IoCManager.Resolve().LoadExtraSystemType(); } }); @@ -43,7 +50,7 @@ namespace Content.IntegrationTests.Tests { Assert.That(gameTicker.RunLevel, Is.EqualTo(GameRunLevel.InRound)); - var system = entitySystemManager.GetEntitySystem(); + var system = entitySystemManager.GetEntitySystem(); system.HasBeenReset = false; diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs index 9bf40017c0..e77981375b 100644 --- a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs @@ -122,7 +122,24 @@ namespace Content.IntegrationTests.Tests two = reader.ReadToEnd(); } - Assert.That(one, Is.EqualTo(two)); + Assert.Multiple(() => { + Assert.That(two, Is.EqualTo(one)); + var failed = TestContext.CurrentContext.Result.Assertions.FirstOrDefault(); + if (failed != null) + { + var oneTmp = Path.GetTempFileName(); + var twoTmp = Path.GetTempFileName(); + + File.WriteAllText(oneTmp, one); + File.WriteAllText(twoTmp, two); + + TestContext.AddTestAttachment(oneTmp, "First save file"); + TestContext.AddTestAttachment(twoTmp, "Second save file"); + TestContext.Error.WriteLine("Complete output:"); + TestContext.Error.WriteLine(oneTmp); + TestContext.Error.WriteLine(twoTmp); + } + }); } } } diff --git a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs b/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs index f58c049720..099e5fb6b1 100644 --- a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs +++ b/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Content.Server.StationEvents; +using Content.Shared.GameTicking; using NUnit.Framework; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -33,7 +34,7 @@ namespace Content.IntegrationTests.Tests.StationEvents Assert.That(stationEvent.Occurrences > 0); } - stationEventsSystem.Reset(); + stationEventsSystem.Reset(new RoundRestartCleanupEvent()); foreach (var stationEvent in stationEventsSystem.StationEvents) { diff --git a/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs index 7b39db4ea0..5f66ec5e2e 100644 --- a/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs +++ b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs @@ -21,7 +21,7 @@ namespace Content.Server.AI.Pathfinding.Accessible /// /// Long-term can be used to do hierarchical pathfinding [UsedImplicitly] - public sealed class AiReachableSystem : EntitySystem, IResettingEntitySystem + public sealed class AiReachableSystem : EntitySystem { /* * The purpose of this is to provide a higher-level / hierarchical abstraction of the actual pathfinding graph @@ -81,6 +81,7 @@ namespace Content.Server.AI.Pathfinding.Accessible public override void Initialize() { _pathfindingSystem = Get(); + SubscribeLocalEvent(Reset); SubscribeLocalEvent(RecalculateNodeRegions); #if DEBUG SubscribeNetworkEvent(HandleSubscription); @@ -699,7 +700,7 @@ namespace Content.Server.AI.Pathfinding.Accessible #endif } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _queuedUpdates.Clear(); _regions.Clear(); diff --git a/Content.Server/AI/Pathfinding/PathfindingSystem.cs b/Content.Server/AI/Pathfinding/PathfindingSystem.cs index 91c189a069..98cf1f500c 100644 --- a/Content.Server/AI/Pathfinding/PathfindingSystem.cs +++ b/Content.Server/AI/Pathfinding/PathfindingSystem.cs @@ -27,7 +27,7 @@ namespace Content.Server.AI.Pathfinding /// This system handles pathfinding graph updates as well as dispatches to the pathfinder /// (90% of what it's doing is graph updates so not much point splitting the 2 roles) /// - public class PathfindingSystem : EntitySystem, IResettingEntitySystem + public class PathfindingSystem : EntitySystem { [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!; @@ -201,6 +201,7 @@ namespace Content.Server.AI.Pathfinding public override void Initialize() { + SubscribeLocalEvent(Reset); SubscribeLocalEvent(QueueCollisionChangeMessage); SubscribeLocalEvent(QueueMoveEvent); SubscribeLocalEvent(QueueAccessChangeMessage); @@ -385,7 +386,7 @@ namespace Content.Server.AI.Pathfinding return true; } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _graph.Clear(); _collidableUpdateQueue.Clear(); diff --git a/Content.Server/AME/AMENodeGroup.cs b/Content.Server/AME/AMENodeGroup.cs index 920cff987c..a015d20a72 100644 --- a/Content.Server/AME/AMENodeGroup.cs +++ b/Content.Server/AME/AMENodeGroup.cs @@ -8,6 +8,7 @@ using Content.Server.NodeContainer.NodeGroups; using Content.Server.NodeContainer.Nodes; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Maths; using Robust.Shared.Random; using Robust.Shared.ViewVariables; @@ -36,64 +37,42 @@ namespace Content.Server.AME public int CoreCount => _cores.Count; - protected override void OnAddNode(Node node) + public override void LoadNodes(List groupNodes) { - base.OnAddNode(node); - if (_masterController == null) - { - node.Owner.TryGetComponent(out var controller); - _masterController = controller; - } - } + base.LoadNodes(groupNodes); - protected override void OnRemoveNode(Node node) - { - base.OnRemoveNode(node); - RefreshAMENodes(_masterController); - if (_masterController != null && _masterController?.Owner == node.Owner) { _masterController = null; } - } + var mapManager = IoCManager.Resolve(); + var grid = mapManager.GetGrid(GridId); - public void RefreshAMENodes(AMEControllerComponent? controller) - { - if(_masterController == null && controller != null) - { - _masterController = controller; - } - - foreach (AMEShieldComponent core in _cores) - { - core.UnsetCore(); - } - _cores.Clear(); - - //Check each shield node to see if it meets core criteria - foreach (Node node in Nodes) + foreach (var node in groupNodes) { var nodeOwner = node.Owner; - if (!nodeOwner.TryGetComponent(out var shield)) { continue; } - - var grid = IoCManager.Resolve().GetGrid(nodeOwner.Transform.GridID); - var nodeNeighbors = grid.GetCellsInSquareArea(nodeOwner.Transform.Coordinates, 1) - .Select(sgc => nodeOwner.EntityManager.GetEntity(sgc)) - .Where(entity => entity != nodeOwner) - .Select(entity => entity.TryGetComponent(out var adjshield) ? adjshield : null) - .Where(adjshield => adjshield != null); - - if (nodeNeighbors.Count() >= 8) + if (nodeOwner.TryGetComponent(out AMEControllerComponent? controller)) { - _cores.Add(shield); + _masterController = controller; } - } - foreach (AMEShieldComponent core in _cores) - { - core.SetCore(); + if (nodeOwner.TryGetComponent(out AMEShieldComponent? shield)) + { + var nodeNeighbors = grid.GetCellsInSquareArea(nodeOwner.Transform.Coordinates, 1) + .Select(sgc => nodeOwner.EntityManager.GetEntity(sgc)) + .Where(entity => entity != nodeOwner && entity.HasComponent()); + + if (nodeNeighbors.Count() >= 8) + { + _cores.Add(shield); + shield.SetCore(); + } + else + { + shield.UnsetCore(); + } + } } } public void UpdateCoreVisuals(int injectionAmount, bool injecting) { - var injectionStrength = CoreCount > 0 ? injectionAmount / CoreCount : 0; foreach (AMEShieldComponent core in _cores) @@ -119,7 +98,7 @@ namespace Content.Server.AME // fuel > safeFuelLimit: Slow damage. Can safely run at this level for burst periods if the engine is small and someone is keeping an eye on it. if (_random.Prob(0.5f)) instability = 1; - // overloadVsSizeResult > 5: + // overloadVsSizeResult > 5: if (overloadVsSizeResult > 5) instability = 5; // overloadVsSizeResult > 10: This will explode in at most 5 injections. diff --git a/Content.Server/AME/Components/AMEControllerComponent.cs b/Content.Server/AME/Components/AMEControllerComponent.cs index b6e71fd1c2..54873aa4e8 100644 --- a/Content.Server/AME/Components/AMEControllerComponent.cs +++ b/Content.Server/AME/Components/AMEControllerComponent.cs @@ -33,7 +33,7 @@ namespace Content.Server.AME.Components private AppearanceComponent? _appearance; private PowerSupplierComponent? _powerSupplier; - private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; [ViewVariables] private int _stability = 100; @@ -92,7 +92,7 @@ namespace Content.Server.AME.Components if(fuelJar != null && _powerSupplier != null) { var availableInject = fuelJar.FuelAmount >= InjectionAmount ? InjectionAmount : fuelJar.FuelAmount; - _powerSupplier.SupplyRate = group.InjectFuel(availableInject, out var overloading); + _powerSupplier.MaxSupply = group.InjectFuel(availableInject, out var overloading); fuelJar.FuelAmount -= availableInject; InjectSound(overloading); UpdateUserInterface(); @@ -212,9 +212,6 @@ namespace Content.Server.AME.Components case UiButton.DecreaseFuel: InjectionAmount = InjectionAmount > 0 ? InjectionAmount -= 2 : 0; break; - case UiButton.RefreshParts: - RefreshParts(); - break; } GetAMENodeGroup()?.UpdateCoreVisuals(InjectionAmount, _injecting); @@ -252,7 +249,7 @@ namespace Content.Server.AME.Components _appearance?.SetData(AMEControllerVisuals.DisplayState, "off"); if (_powerSupplier != null) { - _powerSupplier.SupplyRate = 0; + _powerSupplier.MaxSupply = 0; } } _injecting = !_injecting; @@ -277,12 +274,6 @@ namespace Content.Server.AME.Components } - private void RefreshParts() - { - GetAMENodeGroup()?.RefreshAMENodes(this); - UpdateUserInterface(); - } - private AMENodeGroup? GetAMENodeGroup() { Owner.TryGetComponent(out NodeContainerComponent? nodeContainer); diff --git a/Content.Server/APC/ApcNetNodeGroup.cs b/Content.Server/APC/ApcNetNodeGroup.cs deleted file mode 100644 index 8b2bae38b8..0000000000 --- a/Content.Server/APC/ApcNetNodeGroup.cs +++ /dev/null @@ -1,223 +0,0 @@ -#nullable enable -using System.Collections.Generic; -using System.Linq; -using Content.Server.APC.Components; -using Content.Server.Battery.Components; -using Content.Server.NodeContainer.NodeGroups; -using Content.Server.NodeContainer.Nodes; -using Content.Server.Power.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.Map; -using Robust.Shared.Utility; -using Robust.Shared.ViewVariables; - -namespace Content.Server.APC -{ - public interface IApcNet - { - bool Powered { get; } - - void AddApc(ApcComponent apc); - - void RemoveApc(ApcComponent apc); - - void AddPowerProvider(PowerProviderComponent provider); - - void RemovePowerProvider(PowerProviderComponent provider); - - void UpdatePowerProviderReceivers(PowerProviderComponent provider, int oldLoad, int newLoad); - - void Update(float frameTime); - - GridId? GridId { get; } - } - - [NodeGroup(NodeGroupID.Apc)] - public class ApcNetNodeGroup : BaseNetConnectorNodeGroup, IApcNet - { - [ViewVariables] - private readonly Dictionary _apcBatteries = new(); - - [ViewVariables] - private readonly List _providers = new(); - - [ViewVariables] - public bool Powered { get => _powered; private set => SetPowered(value); } - private bool _powered = false; - - //Debug property - [ViewVariables] - private int TotalReceivers => _providers.SelectMany(provider => provider.LinkedReceivers).Count(); - - [ViewVariables] - private int TotalPowerReceiverLoad { get => _totalPowerReceiverLoad; set => SetTotalPowerReceiverLoad(value); } - - GridId? IApcNet.GridId => GridId; - - private int _totalPowerReceiverLoad = 0; - - public static readonly IApcNet NullNet = new NullApcNet(); - - public override void Initialize(Node sourceNode) - { - base.Initialize(sourceNode); - - EntitySystem.Get().AddApcNet(this); - } - - protected override void AfterRemake(IEnumerable newGroups) - { - base.AfterRemake(newGroups); - - foreach (var group in newGroups) - { - if (group is not ApcNetNodeGroup apcNet) - continue; - - apcNet.Powered = Powered; - } - - StopUpdates(); - } - - protected override void OnGivingNodesForCombine(INodeGroup newGroup) - { - base.OnGivingNodesForCombine(newGroup); - - if (newGroup is ApcNetNodeGroup apcNet) - { - apcNet.Powered = Powered; - } - - StopUpdates(); - } - - private void StopUpdates() - { - EntitySystem.Get().RemoveApcNet(this); - } - - #region IApcNet Methods - - protected override void SetNetConnectorNet(BaseApcNetComponent netConnectorComponent) - { - netConnectorComponent.Net = this; - } - - public void AddApc(ApcComponent apc) - { - if (!apc.Owner.TryGetComponent(out BatteryComponent? battery)) - { - return; - } - - _apcBatteries.Add(apc, battery); - } - - public void RemoveApc(ApcComponent apc) - { - _apcBatteries.Remove(apc); - } - - public void AddPowerProvider(PowerProviderComponent provider) - { - _providers.Add(provider); - - foreach (var receiver in provider.LinkedReceivers) - { - TotalPowerReceiverLoad += receiver.Load; - } - } - - public void RemovePowerProvider(PowerProviderComponent provider) - { - _providers.Remove(provider); - - foreach (var receiver in provider.LinkedReceivers) - { - TotalPowerReceiverLoad -= receiver.Load; - } - } - - public void UpdatePowerProviderReceivers(PowerProviderComponent provider, int oldLoad, int newLoad) - { - DebugTools.Assert(_providers.Contains(provider)); - TotalPowerReceiverLoad -= oldLoad; - TotalPowerReceiverLoad += newLoad; - } - - public void Update(float frameTime) - { - var remainingPowerNeeded = TotalPowerReceiverLoad * frameTime; - - foreach (var apcBatteryPair in _apcBatteries) - { - var apc = apcBatteryPair.Key; - - if (!apc.MainBreakerEnabled) - continue; - - var battery = apcBatteryPair.Value; - - if (battery.CurrentCharge < remainingPowerNeeded) - { - remainingPowerNeeded -= battery.CurrentCharge; - battery.CurrentCharge = 0; - } - else - { - battery.UseCharge(remainingPowerNeeded); - remainingPowerNeeded = 0; - } - - if (remainingPowerNeeded == 0) - break; - } - - Powered = remainingPowerNeeded == 0; - } - - private void SetPowered(bool powered) - { - if (powered != Powered) - { - _powered = powered; - PoweredChanged(); - } - } - - private void PoweredChanged() - { - foreach (var provider in _providers) - { - foreach (var receiver in provider.LinkedReceivers) - { - receiver.ApcPowerChanged(); - } - } - } - - private void SetTotalPowerReceiverLoad(int totalPowerReceiverLoad) - { - DebugTools.Assert(totalPowerReceiverLoad >= 0, $"Expected load equal to or greater than 0, was {totalPowerReceiverLoad}"); - _totalPowerReceiverLoad = totalPowerReceiverLoad; - } - - #endregion - - private class NullApcNet : IApcNet - { - /// - /// It is important that this returns false, so s with a have no power. - /// - public bool Powered => false; - public GridId? GridId => default; - public void AddApc(ApcComponent apc) { } - public void AddPowerProvider(PowerProviderComponent provider) { } - public void RemoveApc(ApcComponent apc) { } - public void RemovePowerProvider(PowerProviderComponent provider) { } - public void UpdatePowerProviderReceivers(PowerProviderComponent provider, int oldLoad, int newLoad) { } - public void Update(float frameTime) { } - } - } -} diff --git a/Content.Server/APC/ApcNetSystem.cs b/Content.Server/APC/ApcNetSystem.cs deleted file mode 100644 index ccf5835eac..0000000000 --- a/Content.Server/APC/ApcNetSystem.cs +++ /dev/null @@ -1,45 +0,0 @@ -#nullable enable -using System.Collections.Generic; -using Content.Shared.GameTicking; -using JetBrains.Annotations; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Timing; - -namespace Content.Server.APC -{ - [UsedImplicitly] - internal sealed class ApcNetSystem : EntitySystem, IResettingEntitySystem - { - [Dependency] private readonly IPauseManager _pauseManager = default!; - - private HashSet _apcNets = new(); - - public override void Update(float frameTime) - { - foreach (var apcNet in _apcNets) - { - var gridId = apcNet.GridId; - if (gridId != null && !_pauseManager.IsGridPaused(gridId.Value)) - apcNet.Update(frameTime); - } - } - - public void AddApcNet(ApcNetNodeGroup apcNet) - { - _apcNets.Add(apcNet); - } - - public void RemoveApcNet(ApcNetNodeGroup apcNet) - { - _apcNets.Remove(apcNet); - } - - public void Reset() - { - // NodeGroupSystem does not remake ApcNets affected during restarting until a frame later, - // when their grid is invalid. So, we are clearing them on round restart. - _apcNets.Clear(); - } - } -} diff --git a/Content.Server/APC/Components/BaseApcNetComponent.cs b/Content.Server/APC/Components/BaseApcNetComponent.cs deleted file mode 100644 index 51fa8b3c43..0000000000 --- a/Content.Server/APC/Components/BaseApcNetComponent.cs +++ /dev/null @@ -1,10 +0,0 @@ -#nullable enable -using Content.Server.Power.Components; - -namespace Content.Server.APC.Components -{ - public abstract class BaseApcNetComponent : BaseNetConnectorComponent - { - protected override IApcNet NullNet => ApcNetNodeGroup.NullNet; - } -} diff --git a/Content.Server/Access/Components/IdCardConsoleComponent.cs b/Content.Server/Access/Components/IdCardConsoleComponent.cs index 5debc68a1a..f9de78f2ac 100644 --- a/Content.Server/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Server/Access/Components/IdCardConsoleComponent.cs @@ -34,7 +34,7 @@ namespace Content.Server.Access.Components private ContainerSlot _targetIdContainer = default!; [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(IdCardConsoleUiKey.Key); - [ViewVariables] private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + [ViewVariables] private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; private bool PrivilegedIDEmpty => _privilegedIdContainer.ContainedEntities.Count < 1; private bool TargetIDEmpty => _targetIdContainer.ContainedEntities.Count < 1; diff --git a/Content.Server/Actions/Spells/GiveItemSpell.cs b/Content.Server/Actions/Spells/GiveItemSpell.cs new file mode 100644 index 0000000000..d7cac3a1b2 --- /dev/null +++ b/Content.Server/Actions/Spells/GiveItemSpell.cs @@ -0,0 +1,75 @@ +using Content.Server.Hands.Components; +using Content.Server.Items; +using Content.Server.Notification; +using Content.Shared.ActionBlocker; +using Content.Shared.Actions.Behaviors; +using Content.Shared.Actions.Components; +using Content.Shared.Cooldown; +using Content.Shared.Notification.Managers; +using JetBrains.Annotations; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Log; +using Robust.Shared.Player; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.ViewVariables; + +namespace Content.Server.Actions.Spells +{ + [UsedImplicitly] + [DataDefinition] + public class GiveItemSpell : IInstantAction + { //TODO: Needs to be an EntityPrototype for proper validation + [ViewVariables] [DataField("castMessage")] public string? CastMessage { get; set; } = default!; + [ViewVariables] [DataField("cooldown")] public float CoolDown { get; set; } = 1f; + [ViewVariables] [DataField("spellItem")] public string ItemProto { get; set; } = default!; + + [ViewVariables] [DataField("castSound")] public string? CastSound { get; set; } = default!; + + //Rubber-band snapping items into player's hands, originally was a workaround, later found it works quite well with stuns + //Not sure if needs fixing + + public void DoInstantAction(InstantActionEventArgs args) + { + var caster = args.Performer; + + if (!caster.TryGetComponent(out HandsComponent? handsComponent)) + { + caster.PopupMessage(Loc.GetString("spell-fail-no-hands")); + return; + } + + if (!EntitySystem.Get().CanInteract(caster)) return; + + // TODO: Nix when we get EntityPrototype serializers + if (!IoCManager.Resolve().HasIndex(ItemProto)) + { + Logger.Error($"Invalid prototype {ItemProto} supplied for {nameof(GiveItemSpell)}"); + return; + } + + // TODO: Look this is shitty and ideally a test would do it + var spawnedProto = caster.EntityManager.SpawnEntity(ItemProto, caster.Transform.MapPosition); + + if (!spawnedProto.TryGetComponent(out ItemComponent? itemComponent)) + { + Logger.Error($"Tried to use {nameof(GiveItemSpell)} but prototype has no {nameof(ItemComponent)}?"); + spawnedProto.Delete(); + return; + } + + args.PerformerActions?.Cooldown(args.ActionType, Cooldowns.SecondsFromNow(CoolDown)); + + if (CastMessage != null) + caster.PopupMessageEveryone(CastMessage); + + handsComponent.PutInHandOrDrop(itemComponent); + + if (CastSound != null) + SoundSystem.Play(Filter.Pvs(caster), CastSound, caster); + } + } +} diff --git a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs index 5dce5324bf..6634ae5d9a 100644 --- a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs +++ b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs @@ -27,7 +27,7 @@ namespace Content.Server.Arcade.Components public override string Name => "BlockGameArcade"; public override uint? NetID => ContentNetIDs.BLOCKGAME_ARCADE; - [ComponentDependency] private readonly PowerReceiverComponent? _powerReceiverComponent = default!; + [ComponentDependency] private readonly ApcPowerReceiverComponent? _powerReceiverComponent = default!; private bool Powered => _powerReceiverComponent?.Powered ?? false; private BoundUserInterface? UserInterface => Owner.GetUIOrNull(BlockGameUiKey.Key); diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs index 40f337896a..d2aae64b6a 100644 --- a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs +++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Content.Server.Power.Components; using Content.Server.UserInterface; using Content.Server.VendingMachines; -using Content.Server.Wires.Components; +using Content.Server.WireHacking; using Content.Shared.ActionBlocker; using Content.Shared.Arcade; using Content.Shared.Interaction; @@ -28,7 +28,7 @@ namespace Content.Server.Arcade.Components { [Dependency] private readonly IRobustRandom _random = null!; - [ComponentDependency] private readonly PowerReceiverComponent? _powerReceiverComponent = default!; + [ComponentDependency] private readonly ApcPowerReceiverComponent? _powerReceiverComponent = default!; [ComponentDependency] private readonly WiresComponent? _wiresComponent = default!; private bool Powered => _powerReceiverComponent != null && _powerReceiverComponent.Powered; diff --git a/Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs b/Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs index 195b1c2623..8023127069 100644 --- a/Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs +++ b/Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs @@ -20,7 +20,7 @@ namespace Content.Server.GameObjects.Components protected readonly object UserInterfaceKey; [ViewVariables] protected BoundUserInterface? UserInterface => Owner.GetUIOrNull(UserInterfaceKey); - [ViewVariables] public bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + [ViewVariables] public bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; public BaseComputerUserInterfaceComponent(object key) { diff --git a/Content.Server/Atmos/Components/GasTankComponent.cs b/Content.Server/Atmos/Components/GasTankComponent.cs index add95c5905..d30494b082 100644 --- a/Content.Server/Atmos/Components/GasTankComponent.cs +++ b/Content.Server/Atmos/Components/GasTankComponent.cs @@ -4,9 +4,9 @@ using System; using Content.Server.Atmos.EntitySystems; using Content.Server.Body.Respiratory; using Content.Server.Explosion; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.Interfaces; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Server.UserInterface; using Content.Shared.ActionBlocker; using Content.Shared.Actions; diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs index f7bdf1839b..2094d2a52e 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics.CodeAnalysis; using Content.Server.Atmos.Components; +using Content.Server.NodeContainer.EntitySystems; using Content.Shared.Atmos.EntitySystems; using Content.Shared.Maps; using JetBrains.Annotations; @@ -33,6 +34,8 @@ namespace Content.Server.Atmos.EntitySystems { base.Initialize(); + UpdatesAfter.Add(typeof(NodeGroupSystem)); + InitializeGases(); InitializeCVars(); diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs index fd0101e5c4..4c9d0516b6 100644 --- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs +++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs @@ -25,7 +25,7 @@ using Dependency = Robust.Shared.IoC.DependencyAttribute; namespace Content.Server.Atmos.EntitySystems { [UsedImplicitly] - internal sealed class GasTileOverlaySystem : SharedGasTileOverlaySystem, IResettingEntitySystem + internal sealed class GasTileOverlaySystem : SharedGasTileOverlaySystem { [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; @@ -67,6 +67,8 @@ namespace Content.Server.Atmos.EntitySystems { base.Initialize(); + SubscribeLocalEvent(Reset); + _atmosphereSystem = Get(); _playerManager.PlayerStatusChanged += OnPlayerStatusChanged; _mapManager.OnGridRemoved += OnGridRemoved; @@ -479,7 +481,7 @@ namespace Content.Server.Atmos.EntitySystems } } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _invalidTiles.Clear(); _overlay.Clear(); diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs index 6a239c0700..7a20b63509 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs +++ b/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs @@ -1,5 +1,5 @@ -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs index dc825a48d6..9d27211ad2 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs @@ -1,8 +1,8 @@ using System; using Content.Server.Atmos.Piping.Binary.Components; using Content.Server.Atmos.Piping.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs index 5e616ea68a..dc38b4da76 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs @@ -1,7 +1,7 @@ using Content.Server.Atmos.Piping.Binary.Components; using Content.Server.Atmos.Piping.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using Content.Shared.Atmos.Piping; using JetBrains.Annotations; diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs index a157094c88..48e253167b 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs @@ -1,7 +1,7 @@ using Content.Server.Atmos.Piping.Binary.Components; using Content.Server.Atmos.Piping.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs index b94441e5b4..2f63c28b59 100644 --- a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs +++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs @@ -1,8 +1,8 @@ using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.Piping.Components; using Content.Server.Construction.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using Content.Shared.Notification.Managers; using JetBrains.Annotations; diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs index 2b543a6a82..a2db87f7bc 100644 --- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs +++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs @@ -1,7 +1,7 @@ using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Trinary.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs index f2b829854f..3e886d6773 100644 --- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs +++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs @@ -1,8 +1,8 @@ using System; using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Trinary.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs index 2cfabfeb1f..d12a363475 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs @@ -4,9 +4,9 @@ using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.Piping.Binary.Components; using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Unary.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.Hands.Components; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Server.UserInterface; using Content.Shared.ActionBlocker; using Content.Shared.Atmos; @@ -62,7 +62,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems return; // Create a pipenet if we don't have one already. - portNode.TryAssignGroupIfNeeded(); + portNode.CreateSingleNetImmediate(); Get().Merge(portNode.Air, canister.InitialMixture); portNode.Air.Temperature = canister.InitialMixture.Temperature; portNode.Volume = canister.InitialMixture.Volume; @@ -90,7 +90,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems } ui.SetState(new GasCanisterBoundUserInterfaceState(metadata.EntityName, portNode.Air.Pressure, - portNode.NodeGroup.Nodes.Count > 1, tankLabel, tankPressure, + portNode.NodeGroup!.Nodes.Count > 1, tankLabel, tankPressure, canister.ReleasePressure, canister.ReleaseValve, canister.MinReleasePressure, canister.MaxReleasePressure)); } diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs index 187cee7b93..1d275837ea 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs @@ -1,7 +1,7 @@ using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Unary.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs index c04d3c44ad..e984bd3515 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs @@ -1,8 +1,8 @@ using System; using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Unary.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs index d675ad21c6..4ee5c723fa 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs @@ -2,8 +2,8 @@ using System.Diagnostics.CodeAnalysis; using Content.Server.Atmos.Piping.Binary.Components; using Content.Server.Atmos.Piping.Unary.Components; using Content.Server.Construction.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos.Piping.Unary.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs index 43f001d186..748700d13e 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs @@ -1,8 +1,8 @@ using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Unary.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos.Piping; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs index a310e4a225..16046fd61e 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs @@ -1,8 +1,8 @@ using System; using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Unary.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using Content.Shared.Atmos.Visuals; using JetBrains.Annotations; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs index 17559dbb4b..262924c2b6 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs @@ -2,8 +2,8 @@ using System; using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Unary.Components; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.NodeContainer; +using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using Content.Shared.Atmos.Piping.Unary.Visuals; using JetBrains.Annotations; diff --git a/Content.Server/BarSign/BarSignComponent.cs b/Content.Server/BarSign/BarSignComponent.cs index 1a673d1186..a0b953dc22 100644 --- a/Content.Server/BarSign/BarSignComponent.cs +++ b/Content.Server/BarSign/BarSignComponent.cs @@ -35,7 +35,7 @@ namespace Content.Server.BarSign } } - private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; private void UpdateSignInfo() { diff --git a/Content.Server/Battery/EntitySystems/BatteryDischargerSystem.cs b/Content.Server/Battery/EntitySystems/BatteryDischargerSystem.cs deleted file mode 100644 index 37873eaa61..0000000000 --- a/Content.Server/Battery/EntitySystems/BatteryDischargerSystem.cs +++ /dev/null @@ -1,19 +0,0 @@ -#nullable enable -using Content.Server.Power.Components; -using JetBrains.Annotations; -using Robust.Shared.GameObjects; - -namespace Content.Server.Battery.EntitySystems -{ - [UsedImplicitly] - internal sealed class BatteryDischargerSystem : EntitySystem - { - public override void Update(float frameTime) - { - foreach (var comp in ComponentManager.EntityQuery(false)) - { - comp.Update(frameTime); - } - } - } -} diff --git a/Content.Server/Battery/EntitySystems/BatteryStorageSystem.cs b/Content.Server/Battery/EntitySystems/BatteryStorageSystem.cs deleted file mode 100644 index c32b58e725..0000000000 --- a/Content.Server/Battery/EntitySystems/BatteryStorageSystem.cs +++ /dev/null @@ -1,19 +0,0 @@ -#nullable enable -using Content.Server.Power.Components; -using JetBrains.Annotations; -using Robust.Shared.GameObjects; - -namespace Content.Server.Battery.EntitySystems -{ - [UsedImplicitly] - internal sealed class BatteryStorageSystem : EntitySystem - { - public override void Update(float frameTime) - { - foreach (var comp in ComponentManager.EntityQuery(false)) - { - comp.Update(frameTime); - } - } - } -} diff --git a/Content.Server/Battery/EntitySystems/BatterySystem.cs b/Content.Server/Battery/EntitySystems/BatterySystem.cs deleted file mode 100644 index ace6084dce..0000000000 --- a/Content.Server/Battery/EntitySystems/BatterySystem.cs +++ /dev/null @@ -1,19 +0,0 @@ -#nullable enable -using Content.Server.Battery.Components; -using JetBrains.Annotations; -using Robust.Shared.GameObjects; - -namespace Content.Server.Battery.EntitySystems -{ - [UsedImplicitly] - public class BatterySystem : EntitySystem - { - public override void Update(float frameTime) - { - foreach (var comp in ComponentManager.EntityQuery(true)) - { - comp.OnUpdate(frameTime); - } - } - } -} diff --git a/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs index b6db086dc7..5d932a611f 100644 --- a/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs +++ b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs @@ -68,7 +68,7 @@ namespace Content.Server.Body.Surgery BreakOnTargetMove = true }; - return await doAfterSystem.DoAfter(args) == DoAfterStatus.Finished; + return await doAfterSystem.WaitDoAfter(args) == DoAfterStatus.Finished; } private bool HasIncisionNotClamped() diff --git a/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs b/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs index 36f3eb743c..b628e7f89c 100644 --- a/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs +++ b/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.GameObjects; namespace Content.Server.Body.Surgery.Components { [UsedImplicitly] - public class SurgeryToolSystem : EntitySystem, IResettingEntitySystem + public class SurgeryToolSystem : EntitySystem { private readonly HashSet _openSurgeryUIs = new(); @@ -18,11 +18,12 @@ namespace Content.Server.Body.Surgery.Components { base.Initialize(); + SubscribeLocalEvent(Reset); SubscribeLocalEvent(OnSurgeryWindowOpen); SubscribeLocalEvent(OnSurgeryWindowClose); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _openSurgeryUIs.Clear(); } diff --git a/Content.Server/Botany/Components/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs index 160fdad86a..c195c4f869 100644 --- a/Content.Server/Botany/Components/SeedExtractorComponent.cs +++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs @@ -14,7 +14,7 @@ namespace Content.Server.Botany.Components [RegisterComponent] public class SeedExtractorComponent : Component, IInteractUsing { - [ComponentDependency] private readonly PowerReceiverComponent? _powerReceiver = default!; + [ComponentDependency] private readonly ApcPowerReceiverComponent? _powerReceiver = default!; [Dependency] private readonly IRobustRandom _random = default!; diff --git a/Content.Server/Cargo/CargoConsoleSystem.cs b/Content.Server/Cargo/CargoConsoleSystem.cs index db81e4629b..183bd723a1 100644 --- a/Content.Server/Cargo/CargoConsoleSystem.cs +++ b/Content.Server/Cargo/CargoConsoleSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.GameObjects; namespace Content.Server.Cargo { - public class CargoConsoleSystem : EntitySystem, IResettingEntitySystem + public class CargoConsoleSystem : EntitySystem { /// /// How much time to wait (in seconds) before increasing bank accounts balance. @@ -45,6 +45,8 @@ namespace Content.Server.Cargo public override void Initialize() { + SubscribeLocalEvent(Reset); + CreateBankAccount("Space Station 14", 1000); CreateOrderDatabase(0); } @@ -64,7 +66,7 @@ namespace Content.Server.Cargo } } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _accountsDict.Clear(); _databasesDict.Clear(); diff --git a/Content.Server/Cargo/Components/CargoConsoleComponent.cs b/Content.Server/Cargo/Components/CargoConsoleComponent.cs index 3adcf4f9bb..4a53d52b48 100644 --- a/Content.Server/Cargo/Components/CargoConsoleComponent.cs +++ b/Content.Server/Cargo/Components/CargoConsoleComponent.cs @@ -59,7 +59,7 @@ namespace Content.Server.Cargo.Components [DataField("requestOnly")] private bool _requestOnly = false; - private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; private CargoConsoleSystem _cargoConsoleSystem = default!; [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(CargoConsoleUiKey.Key); @@ -171,7 +171,7 @@ namespace Content.Server.Cargo.Components { foreach (IEntity entity in enumerator) { - if (entity.HasComponent() && entity.TryGetComponent(out var powerReceiver) && powerReceiver.Powered) + if (entity.HasComponent() && entity.TryGetComponent(out var powerReceiver) && powerReceiver.Powered) { cargoTelepad = entity; break; diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs index 1d87a7cf2b..ba31eb3d13 100644 --- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs +++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs @@ -43,14 +43,14 @@ namespace Content.Server.Cargo.Components { if (args.Powered && _currentState == CargoTelepadState.Unpowered) { _currentState = CargoTelepadState.Idle; - if(Owner.TryGetComponent(out var spriteComponent)) + if(Owner.TryGetComponent(out var spriteComponent) && spriteComponent.LayerCount > 0) spriteComponent.LayerSetState(0, "idle"); TeleportLoop(); } else if (!args.Powered) { _currentState = CargoTelepadState.Unpowered; - if (Owner.TryGetComponent(out var spriteComponent)) + if (Owner.TryGetComponent(out var spriteComponent) && spriteComponent.LayerCount > 0) spriteComponent.LayerSetState(0, "offline"); } } @@ -59,14 +59,14 @@ namespace Content.Server.Cargo.Components if (_currentState == CargoTelepadState.Idle && _teleportQueue.Count > 0) { _currentState = CargoTelepadState.Charging; - if (Owner.TryGetComponent(out var spriteComponent)) + if (Owner.TryGetComponent(out var spriteComponent) && spriteComponent.LayerCount > 0) spriteComponent.LayerSetState(0, "idle"); Owner.SpawnTimer((int) (TeleportDelay * 1000), () => { if (!Deleted && !Owner.Deleted && _currentState == CargoTelepadState.Charging && _teleportQueue.Count > 0) { _currentState = CargoTelepadState.Teleporting; - if (Owner.TryGetComponent(out var spriteComponent)) + if (Owner.TryGetComponent(out var spriteComponent) && spriteComponent.LayerCount > 0) spriteComponent.LayerSetState(0, "beam"); Owner.SpawnTimer((int) (TeleportDuration * 1000), () => { @@ -75,7 +75,7 @@ namespace Content.Server.Cargo.Components SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/phasein.ogg", Owner, AudioParams.Default.WithVolume(-8f)); Owner.EntityManager.SpawnEntity(_teleportQueue[0].Product, Owner.Transform.Coordinates); _teleportQueue.RemoveAt(0); - if (Owner.TryGetComponent(out var spriteComponent)) + if (Owner.TryGetComponent(out var spriteComponent) && spriteComponent.LayerCount > 0) spriteComponent.LayerSetState(0, "idle"); _currentState = CargoTelepadState.Idle; TeleportLoop(); diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index b06c5c9479..7ae9b4193f 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -40,7 +40,7 @@ namespace Content.Server.Chemistry.Components [ViewVariables] private bool HasBeaker => _beakerContainer.ContainedEntity != null; [ViewVariables] private bool _bufferModeTransfer = true; - [ViewVariables] private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + [ViewVariables] private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; [ViewVariables] private readonly Solution BufferSolution = new(); diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs index 66c31a9357..938f009b8e 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs @@ -51,7 +51,7 @@ namespace Content.Server.Chemistry.Components [ViewVariables] private ReagentUnit _dispenseAmount = ReagentUnit.New(10); [UsedImplicitly] [ViewVariables] private SolutionContainerComponent? Solution => _beakerContainer.ContainedEntity?.GetComponent(); - [ViewVariables] private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + [ViewVariables] private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ReagentDispenserUiKey.Key); diff --git a/Content.Server/Climbing/ClimbSystem.cs b/Content.Server/Climbing/ClimbSystem.cs index 862795ddec..3a4a0517bb 100644 --- a/Content.Server/Climbing/ClimbSystem.cs +++ b/Content.Server/Climbing/ClimbSystem.cs @@ -8,10 +8,17 @@ using Robust.Shared.GameObjects; namespace Content.Server.Climbing { [UsedImplicitly] - internal sealed class ClimbSystem : EntitySystem, IResettingEntitySystem + internal sealed class ClimbSystem : EntitySystem { private readonly HashSet _activeClimbers = new(); + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(Reset); + } + public void AddActiveClimber(ClimbingComponent climbingComponent) { _activeClimbers.Add(climbingComponent); @@ -30,7 +37,7 @@ namespace Content.Server.Climbing } } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _activeClimbers.Clear(); } diff --git a/Content.Server/Climbing/Components/ClimbableComponent.cs b/Content.Server/Climbing/Components/ClimbableComponent.cs index 5b928cdf54..e8033f269d 100644 --- a/Content.Server/Climbing/Components/ClimbableComponent.cs +++ b/Content.Server/Climbing/Components/ClimbableComponent.cs @@ -157,7 +157,7 @@ namespace Content.Server.Climbing.Components BreakOnStun = true }; - var result = await EntitySystem.Get().DoAfter(doAfterEventArgs); + var result = await EntitySystem.Get().WaitDoAfter(doAfterEventArgs); if (result != DoAfterStatus.Cancelled && entityToMove.TryGetComponent(out PhysicsComponent? body) && body.Fixtures.Count >= 1) { @@ -204,7 +204,7 @@ namespace Content.Server.Climbing.Components BreakOnStun = true }; - var result = await EntitySystem.Get().DoAfter(doAfterEventArgs); + var result = await EntitySystem.Get().WaitDoAfter(doAfterEventArgs); if (result != DoAfterStatus.Cancelled && user.TryGetComponent(out PhysicsComponent? body) && body.Fixtures.Count >= 1) { diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index 774d00f585..4622ae660b 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/Content.Server/Cloning/CloningSystem.cs @@ -16,7 +16,7 @@ using static Content.Shared.Cloning.SharedCloningPodComponent; namespace Content.Server.Cloning { - internal sealed class CloningSystem : EntitySystem, IResettingEntitySystem + internal sealed class CloningSystem : EntitySystem { [Dependency] private readonly IGameTiming _timing = default!; public readonly Dictionary MindToId = new(); @@ -29,6 +29,7 @@ namespace Content.Server.Cloning { base.Initialize(); + SubscribeLocalEvent(Reset); SubscribeLocalEvent(HandleActivate); SubscribeLocalEvent(HandleMindAdded); } @@ -73,7 +74,7 @@ namespace Content.Server.Cloning public override void Update(float frameTime) { - foreach (var (cloning, power) in ComponentManager.EntityQuery(true)) + foreach (var (cloning, power) in ComponentManager.EntityQuery(true)) { if (cloning.UiKnownPowerState != power.Powered) { @@ -142,7 +143,7 @@ namespace Content.Server.Cloning return IdToDNA.ToDictionary(m => m.Key, m => m.Value.Mind.CharacterName); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { MindToId.Clear(); IdToDNA.Clear(); diff --git a/Content.Server/Cloning/Components/CloningPodComponent.cs b/Content.Server/Cloning/Components/CloningPodComponent.cs index 3b7f81e28c..fba96c8860 100644 --- a/Content.Server/Cloning/Components/CloningPodComponent.cs +++ b/Content.Server/Cloning/Components/CloningPodComponent.cs @@ -26,7 +26,7 @@ namespace Content.Server.Cloning.Components [Dependency] private readonly EuiManager _euiManager = null!; [ViewVariables] - public bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + public bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; [ViewVariables] public BoundUserInterface? UserInterface => diff --git a/Content.Server/Communications/CommunicationsConsoleComponent.cs b/Content.Server/Communications/CommunicationsConsoleComponent.cs index 4ed0b34b7b..cf0b768e78 100644 --- a/Content.Server/Communications/CommunicationsConsoleComponent.cs +++ b/Content.Server/Communications/CommunicationsConsoleComponent.cs @@ -25,7 +25,7 @@ namespace Content.Server.Communications { [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IChatManager _chatManager = default!; - private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; private RoundEndSystem RoundEndSystem => EntitySystem.Get(); diff --git a/Content.Server/Computer/ComputerComponent.cs b/Content.Server/Computer/ComputerComponent.cs index 22527a5c7f..9e22500007 100644 --- a/Content.Server/Computer/ComputerComponent.cs +++ b/Content.Server/Computer/ComputerComponent.cs @@ -24,7 +24,7 @@ namespace Content.Server.Computer // Let's ensure the container manager and container are here. Owner.EnsureContainer("board", out var _); - if (Owner.TryGetComponent(out PowerReceiverComponent? powerReceiver) && + if (Owner.TryGetComponent(out ApcPowerReceiverComponent? powerReceiver) && Owner.TryGetComponent(out AppearanceComponent? appearance)) { appearance.SetData(ComputerVisuals.Powered, powerReceiver.Powered); diff --git a/Content.Server/Construction/Components/ConstructionComponent.cs b/Content.Server/Construction/Components/ConstructionComponent.cs index 8b86182e5a..a4de447e4c 100644 --- a/Content.Server/Construction/Components/ConstructionComponent.cs +++ b/Content.Server/Construction/Components/ConstructionComponent.cs @@ -258,7 +258,7 @@ namespace Content.Server.Construction.Components { case ArbitraryInsertConstructionGraphStep arbitraryStep: if (arbitraryStep.EntityValid(eventArgs.Using) - && await doAfterSystem.DoAfter(doAfterArgs) == DoAfterStatus.Finished) + && await doAfterSystem.WaitDoAfter(doAfterArgs) == DoAfterStatus.Finished) { valid = true; } @@ -267,7 +267,7 @@ namespace Content.Server.Construction.Components case MaterialConstructionGraphStep materialStep: if (materialStep.EntityValid(eventArgs.Using, out var stack) - && await doAfterSystem.DoAfter(doAfterArgs) == DoAfterStatus.Finished) + && await doAfterSystem.WaitDoAfter(doAfterArgs) == DoAfterStatus.Finished) { var splitStack = EntitySystem.Get().Split(eventArgs.Using.Uid, stack, materialStep.Amount, eventArgs.User.Transform.Coordinates); diff --git a/Content.Server/Construction/Conditions/AllWiresCut.cs b/Content.Server/Construction/Conditions/AllWiresCut.cs index 0370978f64..0137c057fc 100644 --- a/Content.Server/Construction/Conditions/AllWiresCut.cs +++ b/Content.Server/Construction/Conditions/AllWiresCut.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components; -using Content.Server.Wires.Components; +using Content.Server.WireHacking; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Construction/Conditions/WirePanel.cs b/Content.Server/Construction/Conditions/WirePanel.cs index a966a3c845..c443506a2e 100644 --- a/Content.Server/Construction/Conditions/WirePanel.cs +++ b/Content.Server/Construction/Conditions/WirePanel.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components; -using Content.Server.Wires.Components; +using Content.Server.WireHacking; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Shared.GameObjects; diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs index a102f51697..4b4bcaab3c 100644 --- a/Content.Server/Construction/ConstructionSystem.cs +++ b/Content.Server/Construction/ConstructionSystem.cs @@ -238,7 +238,7 @@ namespace Content.Server.Construction NeedHand = false, }; - if (await doAfterSystem.DoAfter(doAfterArgs) == DoAfterStatus.Cancelled) + if (await doAfterSystem.WaitDoAfter(doAfterArgs) == DoAfterStatus.Cancelled) { FailCleanup(); return null; @@ -457,9 +457,16 @@ namespace Content.Server.Construction return; } + // We do this to be able to move the construction to its proper position in case it's anchored... + // Oh wow transform anchoring is amazing wow I love it!!!! + var wasAnchored = structure.Transform.Anchored; + structure.Transform.Anchored = false; + structure.Transform.Coordinates = ev.Location; structure.Transform.LocalRotation = constructionPrototype.CanRotate ? ev.Angle : Angle.Zero; + structure.Transform.Anchored = wasAnchored; + RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack)); Cleanup(); diff --git a/Content.Server/Conveyor/ConveyorComponent.cs b/Content.Server/Conveyor/ConveyorComponent.cs index 55e8465154..31983f36ef 100644 --- a/Content.Server/Conveyor/ConveyorComponent.cs +++ b/Content.Server/Conveyor/ConveyorComponent.cs @@ -19,7 +19,7 @@ namespace Content.Server.Conveyor { public override string Name => "Conveyor"; - [ViewVariables] private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + [ViewVariables] private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; /// /// The angle to move entities by in relation to the owner's rotation. @@ -105,7 +105,7 @@ namespace Content.Server.Conveyor return false; } - if (Owner.TryGetComponent(out PowerReceiverComponent? receiver) && + if (Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) && !receiver.Powered) { return false; diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs index 7fc5d27503..4293558043 100644 --- a/Content.Server/Cuffs/Components/CuffableComponent.cs +++ b/Content.Server/Cuffs/Components/CuffableComponent.cs @@ -253,7 +253,7 @@ namespace Content.Server.Cuffs.Components var doAfterSystem = EntitySystem.Get(); _uncuffing = true; - var result = await doAfterSystem.DoAfter(doAfterEventArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterEventArgs); _uncuffing = false; diff --git a/Content.Server/Cuffs/Components/HandcuffComponent.cs b/Content.Server/Cuffs/Components/HandcuffComponent.cs index 66fd797321..bac2720916 100644 --- a/Content.Server/Cuffs/Components/HandcuffComponent.cs +++ b/Content.Server/Cuffs/Components/HandcuffComponent.cs @@ -214,7 +214,7 @@ namespace Content.Server.Cuffs.Components _cuffing = true; - var result = await EntitySystem.Get().DoAfter(doAfterEventArgs); + var result = await EntitySystem.Get().WaitDoAfter(doAfterEventArgs); _cuffing = false; diff --git a/Content.Server/Damage/GodmodeSystem.cs b/Content.Server/Damage/GodmodeSystem.cs index b3ddb7dd39..788fe4bca7 100644 --- a/Content.Server/Damage/GodmodeSystem.cs +++ b/Content.Server/Damage/GodmodeSystem.cs @@ -12,11 +12,18 @@ using Robust.Shared.GameObjects; namespace Content.Server.Damage { [UsedImplicitly] - public class GodmodeSystem : EntitySystem, IResettingEntitySystem + public class GodmodeSystem : EntitySystem { private readonly Dictionary _entities = new(); - public void Reset() + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(Reset); + } + + public void Reset(RoundRestartCleanupEvent ev) { _entities.Clear(); } diff --git a/Content.Server/DeviceNetwork/Connections/WiredNetworkConnection.cs b/Content.Server/DeviceNetwork/Connections/WiredNetworkConnection.cs index c49abd3d61..710de4ea34 100644 --- a/Content.Server/DeviceNetwork/Connections/WiredNetworkConnection.cs +++ b/Content.Server/DeviceNetwork/Connections/WiredNetworkConnection.cs @@ -26,7 +26,7 @@ namespace Content.Server.DeviceNetwork.Connections return false; } - if (_owner.TryGetComponent(out var powerReceiver) + if (_owner.TryGetComponent(out var powerReceiver) && TryGetWireNet(powerReceiver, out var ownNet) && metadata.TryParseMetadata(WIRENET, out var senderNet)) { @@ -44,7 +44,7 @@ namespace Content.Server.DeviceNetwork.Connections return new Metadata(); } - if (_owner.TryGetComponent(out var powerReceiver) + if (_owner.TryGetComponent(out var powerReceiver) && TryGetWireNet(powerReceiver, out var net)) { var metadata = new Metadata @@ -63,16 +63,16 @@ namespace Content.Server.DeviceNetwork.Connections return payload; } - private bool TryGetWireNet(PowerReceiverComponent powerReceiver, [NotNullWhen(true)] out INodeGroup? net) + private bool TryGetWireNet(ApcPowerReceiverComponent apcPowerReceiver, [NotNullWhen(true)] out INodeGroup? net) { - if (powerReceiver.Provider is PowerProviderComponent provider && - provider.ProviderOwner.TryGetComponent(out var nodeContainer)) + var provider = apcPowerReceiver.Provider; + if (provider != null && provider.ProviderOwner.TryGetComponent(out var nodeContainer)) { var nodes = nodeContainer.Nodes; foreach (var node in nodes.Values) { - if (node.NodeGroupID == NodeGroupID.WireNet) + if (node.NodeGroupID == NodeGroupID.WireNet && node.NodeGroup != null) { net = node.NodeGroup; return true; diff --git a/Content.Server/Dice/DiceComponent.cs b/Content.Server/Dice/DiceComponent.cs index 94cb65945b..99bdf36eaa 100644 --- a/Content.Server/Dice/DiceComponent.cs +++ b/Content.Server/Dice/DiceComponent.cs @@ -1,6 +1,7 @@ using Content.Shared.Audio; using Content.Shared.Examine; using Content.Shared.Interaction; +using Content.Shared.Sound; using Content.Shared.Throwing; using Robust.Server.GameObjects; using Robust.Shared.Audio; @@ -24,15 +25,16 @@ namespace Content.Server.Dice public override string Name => "Dice"; - [DataField("step")] - private int _step = 1; private int _sides = 20; - private int _currentSide = 20; + [ViewVariables] - [DataField("diceSoundCollection")] - public string _soundCollectionName = "dice"; + [DataField("sound")] + private readonly SoundSpecifier _sound = new SoundCollectionSpecifier("Dice"); + [ViewVariables] - public int Step => _step; + [DataField("step")] + public int Step { get; } = 1; + [ViewVariables] [DataField("sides")] public int Sides @@ -41,29 +43,28 @@ namespace Content.Server.Dice set { _sides = value; - _currentSide = value; + CurrentSide = value; } } [ViewVariables] - public int CurrentSide => _currentSide; + public int CurrentSide { get; private set; } = 20; public void Roll() { - _currentSide = _random.Next(1, (_sides/_step)+1) * _step; - if (!Owner.TryGetComponent(out SpriteComponent? sprite)) return; - sprite.LayerSetState(0, $"d{_sides}{_currentSide}"); + CurrentSide = _random.Next(1, (_sides/Step)+1) * Step; + PlayDiceEffect(); + + if (!Owner.TryGetComponent(out SpriteComponent? sprite)) + return; + + sprite.LayerSetState(0, $"d{_sides}{CurrentSide}"); } public void PlayDiceEffect() { - if (!string.IsNullOrWhiteSpace(_soundCollectionName)) - { - var soundCollection = _prototypeManager.Index(_soundCollectionName); - var file = _random.Pick(soundCollection.PickFiles); - SoundSystem.Play(Filter.Pvs(Owner), file, Owner, AudioParams.Default); - } + SoundSystem.Play(Filter.Pvs(Owner), _sound.GetSound(), Owner, AudioParams.Default); } void IActivate.Activate(ActivateEventArgs eventArgs) @@ -89,7 +90,7 @@ namespace Content.Server.Dice ("sidesAmount", _sides)) + "\n" + Loc.GetString("dice-component-on-examine-message-part-2", - ("currentSide", _currentSide))); + ("currentSide", CurrentSide))); } } } diff --git a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs index af7225fd4a..bc202065f2 100644 --- a/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs +++ b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs @@ -117,7 +117,7 @@ namespace Content.Server.Disposal.Mailing [ViewVariables] public bool Powered => - !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || + !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; [ViewVariables] @@ -217,7 +217,7 @@ namespace Content.Server.Disposal.Mailing NeedHand = false, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result == DoAfterStatus.Cancelled) return false; @@ -372,7 +372,7 @@ namespace Content.Server.Disposal.Mailing private void TogglePower() { - if (!Owner.TryGetComponent(out PowerReceiverComponent? receiver)) + if (!Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver)) { return; } diff --git a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs index 25075c8be7..c040169240 100644 --- a/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs +++ b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs @@ -107,7 +107,7 @@ namespace Content.Server.Disposal.Unit.Components [ViewVariables] public bool Powered => - !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || + !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; [ViewVariables] @@ -196,7 +196,7 @@ namespace Content.Server.Disposal.Unit.Components NeedHand = false, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result == DoAfterStatus.Cancelled) return false; @@ -314,7 +314,7 @@ namespace Content.Server.Disposal.Unit.Components private void TogglePower() { - if (!Owner.TryGetComponent(out PowerReceiverComponent? receiver)) + if (!Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver)) { return; } diff --git a/Content.Server/DoAfter/DoAfter.cs b/Content.Server/DoAfter/DoAfter.cs index 3c41363818..4b929a060b 100644 --- a/Content.Server/DoAfter/DoAfter.cs +++ b/Content.Server/DoAfter/DoAfter.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Content.Server.Hands.Components; using Content.Server.Items; using Content.Server.Stunnable.Components; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Timing; @@ -16,7 +17,7 @@ namespace Content.Server.DoAfter private TaskCompletionSource Tcs { get; } - public DoAfterEventArgs EventArgs; + public readonly DoAfterEventArgs EventArgs; public TimeSpan StartTime { get; } diff --git a/Content.Server/DoAfter/DoAfterEventArgs.cs b/Content.Server/DoAfter/DoAfterEventArgs.cs index b7ec522f5c..c4291fdc9c 100644 --- a/Content.Server/DoAfter/DoAfterEventArgs.cs +++ b/Content.Server/DoAfter/DoAfterEventArgs.cs @@ -81,6 +81,36 @@ namespace Content.Server.DoAfter /// public Func? ExtraCheck { get; set; } + /// + /// Event to be raised directed to the entity when the DoAfter is cancelled. + /// + public EntityEventArgs? UserCancelledEvent { get; set; } + + /// + /// Event to be raised directed to the entity when the DoAfter is finished successfully. + /// + public EntityEventArgs? UserFinishedEvent { get; set; } + + /// + /// Event to be raised directed to the entity when the DoAfter is cancelled. + /// + public EntityEventArgs? TargetCancelledEvent { get; set; } + + /// + /// Event to be raised directed to the entity when the DoAfter is finished successfully. + /// + public EntityEventArgs? TargetFinishedEvent { get; set; } + + /// + /// Event to be broadcast when the DoAfter is cancelled. + /// + public object? BroadcastCancelledEvent { get; set; } + + /// + /// Event to be broadcast when the DoAfter is finished successfully. + /// + public object? BroadcastFinishedEvent { get; set; } + public DoAfterEventArgs( IEntity user, float delay, diff --git a/Content.Server/DoAfter/DoAfterSystem.cs b/Content.Server/DoAfter/DoAfterSystem.cs index 8ee9372983..6934a93c61 100644 --- a/Content.Server/DoAfter/DoAfterSystem.cs +++ b/Content.Server/DoAfter/DoAfterSystem.cs @@ -11,15 +11,16 @@ namespace Content.Server.DoAfter [UsedImplicitly] public sealed class DoAfterSystem : EntitySystem { + // We cache these lists as to not allocate them every update tick... + private readonly List _cancelled = new(); + private readonly List _finished = new(); + public override void Update(float frameTime) { base.Update(frameTime); foreach (var comp in ComponentManager.EntityQuery(true)) { - var cancelled = new List(0); - var finished = new List(0); - foreach (var doAfter in comp.DoAfters.ToArray()) { doAfter.Run(frameTime); @@ -29,27 +30,47 @@ namespace Content.Server.DoAfter case DoAfterStatus.Running: break; case DoAfterStatus.Cancelled: - cancelled.Add(doAfter); + _cancelled.Add(doAfter); break; case DoAfterStatus.Finished: - finished.Add(doAfter); + _finished.Add(doAfter); break; default: throw new ArgumentOutOfRangeException(); } } - foreach (var doAfter in cancelled) + foreach (var doAfter in _cancelled) { comp.Cancelled(doAfter); + + if(!doAfter.EventArgs.User.Deleted && doAfter.EventArgs.UserCancelledEvent != null) + RaiseLocalEvent(doAfter.EventArgs.User.Uid, doAfter.EventArgs.UserCancelledEvent, false); + + if(doAfter.EventArgs.Target is { Deleted: false } && doAfter.EventArgs.TargetCancelledEvent != null) + RaiseLocalEvent(doAfter.EventArgs.Target.Uid, doAfter.EventArgs.TargetCancelledEvent, false); + + if(doAfter.EventArgs.BroadcastCancelledEvent != null) + RaiseLocalEvent(doAfter.EventArgs.BroadcastCancelledEvent); } - foreach (var doAfter in finished) + foreach (var doAfter in _finished) { comp.Finished(doAfter); + + if(!doAfter.EventArgs.User.Deleted && doAfter.EventArgs.UserFinishedEvent != null) + RaiseLocalEvent(doAfter.EventArgs.User.Uid, doAfter.EventArgs.UserFinishedEvent, false); + + if(doAfter.EventArgs.Target is { Deleted: false } && doAfter.EventArgs.TargetFinishedEvent != null) + RaiseLocalEvent(doAfter.EventArgs.Target.Uid, doAfter.EventArgs.TargetFinishedEvent, false); + + if(doAfter.EventArgs.BroadcastFinishedEvent != null) + RaiseLocalEvent(doAfter.EventArgs.BroadcastFinishedEvent); } - finished.Clear(); + // Clean the shared lists at the end, ensuring they'll be clean for the next time we need them. + _cancelled.Clear(); + _finished.Clear(); } } @@ -59,17 +80,33 @@ namespace Content.Server.DoAfter /// /// /// - public async Task DoAfter(DoAfterEventArgs eventArgs) + public async Task WaitDoAfter(DoAfterEventArgs eventArgs) + { + var doAfter = CreateDoAfter(eventArgs); + + await doAfter.AsTask; + + return doAfter.Status; + } + + /// + /// Creates a DoAfter without waiting for it to finish. You can use events with this. + /// These can be potentially cancelled by the user moving or when other things happen. + /// + /// + public void DoAfter(DoAfterEventArgs eventArgs) + { + CreateDoAfter(eventArgs); + } + + private DoAfter CreateDoAfter(DoAfterEventArgs eventArgs) { // Setup var doAfter = new DoAfter(eventArgs); // Caller's gonna be responsible for this I guess var doAfterComponent = eventArgs.User.GetComponent(); doAfterComponent.Add(doAfter); - - await doAfter.AsTask; - - return doAfter.Status; + return doAfter; } } diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs index d810e71c0b..ae59d4a65c 100644 --- a/Content.Server/Doors/Components/AirlockComponent.cs +++ b/Content.Server/Doors/Components/AirlockComponent.cs @@ -3,7 +3,7 @@ using System; using System.Threading; using Content.Server.Power.Components; using Content.Server.VendingMachines; -using Content.Server.Wires.Components; +using Content.Server.WireHacking; using Content.Shared.Doors; using Content.Shared.Interaction; using Content.Shared.Notification; @@ -36,7 +36,7 @@ namespace Content.Server.Doors.Components private readonly SharedAppearanceComponent? _appearanceComponent = null; [ComponentDependency] - private readonly PowerReceiverComponent? _receiverComponent = null; + private readonly ApcPowerReceiverComponent? _receiverComponent = null; [ComponentDependency] private readonly WiresComponent? _wiresComponent = null; diff --git a/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs b/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs index b123077e94..7dedae6d28 100644 --- a/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs +++ b/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs @@ -33,7 +33,7 @@ namespace Content.Server.Engineering.EntitySystems BreakOnUserMove = true, BreakOnStun = true, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result != DoAfterStatus.Finished) return; diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs index 1ccb603416..ef71b16e43 100644 --- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs +++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs @@ -50,7 +50,7 @@ namespace Content.Server.Engineering.EntitySystems BreakOnStun = true, PostCheck = IsTileClear, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result != DoAfterStatus.Finished) return; diff --git a/Content.Server/Fluids/Components/BucketComponent.cs b/Content.Server/Fluids/Components/BucketComponent.cs index a205e507e3..2774549cb8 100644 --- a/Content.Server/Fluids/Components/BucketComponent.cs +++ b/Content.Server/Fluids/Components/BucketComponent.cs @@ -82,7 +82,7 @@ namespace Content.Server.Fluids.Components BreakOnStun = true, BreakOnDamage = true, }; - var result = await EntitySystem.Get().DoAfter(doAfterArgs); + var result = await EntitySystem.Get().WaitDoAfter(doAfterArgs); _currentlyUsing.Remove(eventArgs.Using.Uid); diff --git a/Content.Server/Fluids/Components/MopComponent.cs b/Content.Server/Fluids/Components/MopComponent.cs index 864358d321..fa0c7ec11e 100644 --- a/Content.Server/Fluids/Components/MopComponent.cs +++ b/Content.Server/Fluids/Components/MopComponent.cs @@ -123,7 +123,7 @@ namespace Content.Server.Fluids.Components BreakOnStun = true, BreakOnDamage = true, }; - var result = await EntitySystem.Get().DoAfter(doAfterArgs); + var result = await EntitySystem.Get().WaitDoAfter(doAfterArgs); Mopping = false; diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index 0d6df65844..e47c36c58a 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -11,6 +11,7 @@ using Robust.Server.Player; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; +using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Timing; using Robust.Shared.Utility; @@ -296,13 +297,12 @@ namespace Content.Server.GameTicking _gameRules.Clear(); - foreach (var system in _entitySystemManager.AllSystems) - { - if (system is IResettingEntitySystem resetting) - { - resetting.Reset(); - } - } + // Round restart cleanup event, so entity systems can reset. + var ev = new RoundRestartCleanupEvent(); + RaiseLocalEvent(ev); + + // So clients' entity systems can clean up too... + RaiseNetworkEvent(ev, Filter.Broadcast()); _spawnedPositions.Clear(); _manifest.Clear(); diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs index fb878ae83b..38352f7d86 100644 --- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs +++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs @@ -17,7 +17,7 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Ghost.Roles { [UsedImplicitly] - public class GhostRoleSystem : EntitySystem, IResettingEntitySystem + public class GhostRoleSystem : EntitySystem { [Dependency] private readonly EuiManager _euiManager = default!; @@ -33,6 +33,7 @@ namespace Content.Server.Ghost.Roles { base.Initialize(); + SubscribeLocalEvent(Reset); SubscribeLocalEvent(OnPlayerAttached); } @@ -137,7 +138,7 @@ namespace Content.Server.Ghost.Roles CloseEui(message.Player); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { foreach (var session in _openUis.Keys) { diff --git a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs index 54bd008b42..06e452aea0 100644 --- a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs +++ b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs @@ -12,7 +12,7 @@ using Robust.Shared.Utility; namespace Content.Server.Gravity.EntitySystems { [UsedImplicitly] - public class WeightlessSystem : EntitySystem, IResettingEntitySystem + public class WeightlessSystem : EntitySystem { [Dependency] private readonly IMapManager _mapManager = default!; @@ -22,11 +22,12 @@ namespace Content.Server.Gravity.EntitySystems { base.Initialize(); + SubscribeLocalEvent(Reset); SubscribeLocalEvent(GravityChanged); SubscribeLocalEvent(EntParentChanged); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _alerts.Clear(); } diff --git a/Content.Server/Gravity/GravityGeneratorComponent.cs b/Content.Server/Gravity/GravityGeneratorComponent.cs index 207f032697..b148562c72 100644 --- a/Content.Server/Gravity/GravityGeneratorComponent.cs +++ b/Content.Server/Gravity/GravityGeneratorComponent.cs @@ -26,7 +26,7 @@ namespace Content.Server.Gravity private GravityGeneratorStatus _status; - public bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + public bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; public bool SwitchedOn => _switchedOn; diff --git a/Content.Server/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs index 62749507e2..98fed4906d 100644 --- a/Content.Server/Instruments/InstrumentComponent.cs +++ b/Content.Server/Instruments/InstrumentComponent.cs @@ -292,26 +292,30 @@ namespace Content.Server.Instruments void IActivate.Activate(ActivateEventArgs eventArgs) { - if (Handheld || !eventArgs.User.TryGetComponent(out ActorComponent? actor)) return; + if (Handheld) + return; - if (InstrumentPlayer != null) return; - - InstrumentPlayer = actor.PlayerSession; - OpenUserInterface(actor.PlayerSession); + InteractInstrument(eventArgs.User); } bool IUse.UseEntity(UseEntityEventArgs eventArgs) { - if (!eventArgs.User.TryGetComponent(out ActorComponent? actor)) return false; - - if (InstrumentPlayer == actor.PlayerSession) - { - OpenUserInterface(actor.PlayerSession); - } - + InteractInstrument(eventArgs.User); return false; } + private void InteractInstrument(IEntity user) + { + if (!user.TryGetComponent(out ActorComponent? actor)) return; + + if (InstrumentPlayer != null || !EntitySystem.Get().CanInteract(user)) return; + + InstrumentPlayer = actor.PlayerSession; + OpenUserInterface(InstrumentPlayer); + + return; + } + private void UserInterfaceOnClosed(IPlayerSession player) { if (Handheld || player != InstrumentPlayer) return; diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs index 3a9682d0b3..e6f5d5238a 100644 --- a/Content.Server/IoC/ServerContentIoC.cs +++ b/Content.Server/IoC/ServerContentIoC.cs @@ -50,7 +50,6 @@ namespace Content.Server.IoC IoCManager.Register(); IoCManager.Register(); IoCManager.Register(); - IoCManager.Register(); IoCManager.Register(); IoCManager.Register(); IoCManager.Register(); diff --git a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs index 4403a12c4f..8e5c27d0fd 100644 --- a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs +++ b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs @@ -133,7 +133,7 @@ namespace Content.Server.Kitchen.Components _beingButchered.Add(victimUid); - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); _beingButchered.Remove(victimUid); diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index 26ff81bc50..a6453558c5 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -67,7 +67,7 @@ namespace Content.Server.Kitchen.Components [ViewVariables] private uint _currentCookTimerTime = 1; - private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; private bool _hasContents => Owner.TryGetComponent(out SolutionContainerComponent? solution) && (solution.ReagentList.Count > 0 || _storage.ContainedEntities.Count > 0); private bool _uiDirty = true; private bool _lostPower = false; diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs index 2ea4a7a955..4a9ff99166 100644 --- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs +++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs @@ -53,7 +53,7 @@ namespace Content.Server.Kitchen.Components [ViewVariables] private bool HasBeaker => _beakerContainer.ContainedEntity != null; [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ReagentGrinderUiKey.Key); - private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; /// /// Should the BoundUI be told to update? diff --git a/Content.Server/Lathe/Components/LatheComponent.cs b/Content.Server/Lathe/Components/LatheComponent.cs index 0bd32992d2..f5494064b8 100644 --- a/Content.Server/Lathe/Components/LatheComponent.cs +++ b/Content.Server/Lathe/Components/LatheComponent.cs @@ -42,7 +42,7 @@ namespace Content.Server.Lathe.Components [ViewVariables] private LatheRecipePrototype? _producingRecipe; [ViewVariables] - private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; private static readonly TimeSpan InsertionTime = TimeSpan.FromSeconds(0.9f); diff --git a/Content.Server/Light/Components/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs index 667ba5c925..f775c18e52 100644 --- a/Content.Server/Light/Components/EmergencyLightComponent.cs +++ b/Content.Server/Light/Components/EmergencyLightComponent.cs @@ -1,9 +1,9 @@ #nullable enable using System; using System.Collections.Generic; -using Content.Server.Battery.Components; using Content.Server.Power.Components; using Content.Shared.Examine; +using Content.Shared.Light.Component; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Localization; @@ -60,7 +60,7 @@ namespace Content.Server.Light.Components /// public void UpdateState() { - if (!Owner.TryGetComponent(out PowerReceiverComponent? receiver)) + if (!Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver)) { return; } @@ -80,7 +80,7 @@ namespace Content.Server.Light.Components public void OnUpdate(float frameTime) { - if (Owner.Deleted || !Owner.TryGetComponent(out BatteryComponent? battery)) + if (Owner.Deleted || !Owner.TryGetComponent(out BatteryComponent? battery) || Owner.Paused) { return; } @@ -96,9 +96,9 @@ namespace Content.Server.Light.Components else { battery.CurrentCharge += _chargingWattage * frameTime * _chargingEfficiency; - if (battery.BatteryState == BatteryState.Full) + if (battery.IsFullyCharged) { - if (Owner.TryGetComponent(out PowerReceiverComponent? receiver)) + if (Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver)) { receiver.Load = 1; } @@ -110,28 +110,24 @@ namespace Content.Server.Light.Components private void TurnOff() { - if (Owner.TryGetComponent(out SpriteComponent? sprite)) - { - sprite.LayerSetState(0, "emergency_light_off"); - } - if (Owner.TryGetComponent(out PointLightComponent? light)) { light.Enabled = false; } + + if (Owner.TryGetComponent(out AppearanceComponent? appearance)) + appearance.SetData(EmergencyLightVisuals.On, false); } private void TurnOn() { - if (Owner.TryGetComponent(out SpriteComponent? sprite)) - { - sprite.LayerSetState(0, "emergency_light_on"); - } - if (Owner.TryGetComponent(out PointLightComponent? light)) { light.Enabled = true; } + + if (Owner.TryGetComponent(out AppearanceComponent? appearance)) + appearance.SetData(EmergencyLightVisuals.On, true); } public override void HandleMessage(ComponentMessage message, IComponent? component) diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs index 2bc11a73f4..3e5ecd5b19 100644 --- a/Content.Server/Light/Components/PoweredLightComponent.cs +++ b/Content.Server/Light/Components/PoweredLightComponent.cs @@ -198,7 +198,7 @@ namespace Content.Server.Light.Components /// public void UpdateLight() { - var powerReceiver = Owner.GetComponent(); + var powerReceiver = Owner.GetComponent(); if (LightBulb == null) // No light bulb. { diff --git a/Content.Server/Medical/Components/MedicalScannerComponent.cs b/Content.Server/Medical/Components/MedicalScannerComponent.cs index bc677a2503..0ee7e60964 100644 --- a/Content.Server/Medical/Components/MedicalScannerComponent.cs +++ b/Content.Server/Medical/Components/MedicalScannerComponent.cs @@ -48,7 +48,7 @@ namespace Content.Server.Medical.Components private readonly Vector2 _ejectOffset = new(0f, 0f); [ViewVariables] - private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(MedicalScannerUiKey.Key); diff --git a/Content.Server/MobState/States/MobStateManager.cs b/Content.Server/MobState/States/MobStateManager.cs index 3e607b46e2..ac15fba39a 100644 --- a/Content.Server/MobState/States/MobStateManager.cs +++ b/Content.Server/MobState/States/MobStateManager.cs @@ -1,4 +1,5 @@ using Content.Shared.MobState; +using Content.Shared.MobState.Components; using Content.Shared.MobState.State; using Robust.Shared.GameObjects; diff --git a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs index 519ddee323..ba11446302 100644 --- a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs +++ b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs @@ -4,6 +4,10 @@ using Robust.Shared.GameObjects; namespace Content.Server.NodeContainer.EntitySystems { + /// + /// Manages events. + /// + /// [UsedImplicitly] public class NodeContainerSystem : EntitySystem { @@ -11,16 +15,51 @@ namespace Content.Server.NodeContainer.EntitySystems { base.Initialize(); + SubscribeLocalEvent(OnInitEvent); + SubscribeLocalEvent(OnStartupEvent); + SubscribeLocalEvent(OnShutdownEvent); SubscribeLocalEvent(OnAnchorStateChanged); SubscribeLocalEvent(OnRotateEvent); } - private void OnAnchorStateChanged(EntityUid uid, NodeContainerComponent component, AnchorStateChangedEvent args) + private static void OnInitEvent(EntityUid uid, NodeContainerComponent component, ComponentInit args) { - component.AnchorUpdate(); + foreach (var (key, node) in component.Nodes) + { + node.Name = key; + node.Initialize(component.Owner); + } } - private void OnRotateEvent(EntityUid uid, NodeContainerComponent container, RotateEvent ev) + private static void OnStartupEvent(EntityUid uid, NodeContainerComponent component, ComponentStartup args) + { + foreach (var node in component.Nodes.Values) + { + node.OnContainerStartup(); + } + } + + private static void OnShutdownEvent(EntityUid uid, NodeContainerComponent component, ComponentShutdown args) + { + foreach (var node in component.Nodes.Values) + { + node.OnContainerShutdown(); + } + } + + private static void OnAnchorStateChanged( + EntityUid uid, + NodeContainerComponent component, + AnchorStateChangedEvent args) + { + foreach (var node in component.Nodes.Values) + { + node.AnchorUpdate(); + node.AnchorStateChanged(); + } + } + + private static void OnRotateEvent(EntityUid uid, NodeContainerComponent container, RotateEvent ev) { if (ev.NewRotation == ev.OldRotation) { diff --git a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs index c4a0a5e0a0..36f4d2c459 100644 --- a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs +++ b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs @@ -1,30 +1,387 @@ using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using Content.Server.Administration.Managers; using Content.Server.NodeContainer.NodeGroups; +using Content.Server.NodeContainer.Nodes; +using Content.Shared.Administration; +using Content.Shared.NodeContainer; using JetBrains.Annotations; +using Robust.Server.Player; +using Robust.Shared.Enums; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Maths; +using Robust.Shared.Utility; namespace Content.Server.NodeContainer.EntitySystems { + /// + /// Entity system that manages and updating. + /// + /// [UsedImplicitly] public class NodeGroupSystem : EntitySystem { - private readonly HashSet _dirtyNodeGroups = new(); + [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private readonly INodeGroupFactory _nodeGroupFactory = default!; + [Dependency] private readonly ILogManager _logManager = default!; - public void AddDirtyNodeGroup(INodeGroup nodeGroup) + private readonly List _visDeletes = new(); + private readonly List _visSends = new(); + + private readonly HashSet _visPlayers = new(); + private readonly HashSet _toRemake = new(); + private readonly HashSet _toRemove = new(); + private readonly List _toReflood = new(); + + private ISawmill _sawmill = default!; + + public bool VisEnabled => _visPlayers.Count != 0; + + private int _gen = 1; + private int _groupNetIdCounter = 1; + + public override void Initialize() { - _dirtyNodeGroups.Add(nodeGroup); + base.Initialize(); + + _sawmill = _logManager.GetSawmill("nodegroup"); + + _playerManager.PlayerStatusChanged += OnPlayerStatusChanged; + + SubscribeNetworkEvent(HandleEnableMsg); + } + + public override void Shutdown() + { + base.Shutdown(); + + _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged; + } + + private void HandleEnableMsg(NodeVis.MsgEnable msg, EntitySessionEventArgs args) + { + var session = (IPlayerSession) args.SenderSession; + if (!_adminManager.HasAdminFlag(session, AdminFlags.Debug)) + return; + + if (msg.Enabled) + { + _visPlayers.Add(session); + VisSendFullStateImmediate(session); + } + else + { + _visPlayers.Remove(session); + } + } + + private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e) + { + if (e.NewStatus == SessionStatus.Disconnected) + _visPlayers.Remove(e.Session); + } + + public void QueueRemakeGroup(BaseNodeGroup group) + { + if (group.Remaking) + return; + + _toRemake.Add(group); + group.Remaking = true; + + foreach (var node in group.Nodes) + { + QueueReflood(node); + } + } + + public void QueueReflood(Node node) + { + if (node.FlaggedForFlood) + return; + + _toReflood.Add(node); + node.FlaggedForFlood = true; + } + + public void QueueNodeRemove(Node node) + { + _toRemove.Add(node); + } + + public void CreateSingleNetImmediate(Node node) + { + if (node.NodeGroup != null) + return; + + QueueReflood(node); + + InitGroup(node, new List {node}); } public override void Update(float frameTime) { base.Update(frameTime); - foreach (var group in _dirtyNodeGroups) + DoGroupUpdates(); + VisDoUpdate(); + } + + private void DoGroupUpdates() + { + // "Why is there a separate queue for group remakes and node refloods when they both cause eachother" + // Future planning for the potential ability to do more intelligent group updating. + + if (_toRemake.Count == 0 && _toReflood.Count == 0 && _toRemove.Count == 0) + return; + + var sw = Stopwatch.StartNew(); + + foreach (var toRemove in _toRemove) { - group.RemakeGroup(); + if (toRemove.NodeGroup == null) + continue; + + var group = (BaseNodeGroup) toRemove.NodeGroup; + + group.RemoveNode(toRemove); + toRemove.NodeGroup = null; + + QueueRemakeGroup(group); } - _dirtyNodeGroups.Clear(); + // Break up all remaking groups. + // Don't clear the list yet, we'll come back to these later. + foreach (var toRemake in _toRemake) + { + QueueRemakeGroup(toRemake); + } + + _gen += 1; + + // Go over all nodes to calculate reachable nodes and make an undirected graph out of them. + // Node.GetReachableNodes() may return results asymmetrically, + // i.e. node A may return B, but B may not return A. + // + // Must be for loop to allow concurrent modification from RemakeGroupImmediate. + for (var i = 0; i < _toReflood.Count; i++) + { + var node = _toReflood[i]; + + if (node.Deleting) + continue; + + ClearReachableIfNecessary(node); + + if (node.NodeGroup?.Remaking == false) + { + QueueRemakeGroup((BaseNodeGroup) node.NodeGroup); + } + + foreach (var compatible in GetCompatibleNodes(node)) + { + ClearReachableIfNecessary(compatible); + + if (compatible.NodeGroup?.Remaking == false) + { + // We are expanding into an existing group, + // remake it so that we can treat it uniformly. + var group = (BaseNodeGroup) compatible.NodeGroup; + QueueRemakeGroup(group); + } + + node.ReachableNodes.Add(compatible); + compatible.ReachableNodes.Add(node); + } + } + + var newGroups = new List(); + + // Flood fill over nodes. Every node will only be flood filled once. + foreach (var node in _toReflood) + { + node.FlaggedForFlood = false; + + // Check if already flood filled. + if (node.FloodGen == _gen || node.Deleting) + continue; + + // Flood fill + var groupNodes = FloodFillNode(node); + + var newGroup = InitGroup(node, groupNodes); + newGroups.Add(newGroup); + } + + // Go over dead groups that need to be cleaned up. + // Tell them to push their data to new groups too. + foreach (var oldGroup in _toRemake) + { + // Group by the NEW group. + var newGrouped = oldGroup.Nodes.GroupBy(n => n.NodeGroup); + + oldGroup.Removed = true; + oldGroup.AfterRemake(newGrouped); + if (VisEnabled) + _visDeletes.Add(oldGroup.NetId); + } + + var refloodCount = _toReflood.Count; + + _toReflood.Clear(); + _toRemake.Clear(); + _toRemove.Clear(); + + foreach (var group in newGroups) + { + foreach (var node in group.Nodes) + { + node.OnPostRebuild(); + } + } + + _sawmill.Debug($"Updated node groups in {sw.Elapsed.TotalMilliseconds}ms. {newGroups.Count} new groups, {refloodCount} nodes processed."); + } + + private void ClearReachableIfNecessary(Node node) + { + if (node.UndirectGen != _gen) + { + node.ReachableNodes.Clear(); + node.UndirectGen = _gen; + } + } + + private BaseNodeGroup InitGroup(Node node, List groupNodes) + { + var newGroup = (BaseNodeGroup) _nodeGroupFactory.MakeNodeGroup(node.NodeGroupID); + newGroup.Initialize(node); + newGroup.NetId = _groupNetIdCounter++; + + var netIdCounter = 0; + foreach (var groupNode in groupNodes) + { + groupNode.NodeGroup = newGroup; + groupNode.NetId = ++netIdCounter; + } + + newGroup.LoadNodes(groupNodes); + + if (VisEnabled) + _visSends.Add(newGroup); + + return newGroup; + } + + private List FloodFillNode(Node rootNode) + { + // All nodes we're filling into that currently have NO network. + var allNodes = new List(); + + var stack = new Stack(); + stack.Push(rootNode); + rootNode.FloodGen = _gen; + + while (stack.TryPop(out var node)) + { + allNodes.Add(node); + + foreach (var reachable in node.ReachableNodes) + { + if (reachable.FloodGen == _gen) + continue; + + reachable.FloodGen = _gen; + stack.Push(reachable); + } + } + + return allNodes; + } + + private static IEnumerable GetCompatibleNodes(Node node) + { + foreach (var reachable in node.GetReachableNodes()) + { + DebugTools.Assert(reachable != node, "GetReachableNodes() should not include self."); + + if (reachable.Connectable && reachable.NodeGroupID == node.NodeGroupID) + yield return reachable; + } + } + + private void VisDoUpdate() + { + if (_visSends.Count == 0 && _visDeletes.Count == 0) + return; + + var msg = new NodeVis.MsgData(); + + msg.GroupDeletions.AddRange(_visDeletes); + msg.Groups.AddRange(_visSends.Select(VisMakeGroupState)); + + _visSends.Clear(); + _visDeletes.Clear(); + + foreach (var player in _visPlayers) + { + RaiseNetworkEvent(msg, player.ConnectedClient); + } + } + + private void VisSendFullStateImmediate(IPlayerSession player) + { + var msg = new NodeVis.MsgData(); + + var allNetworks = ComponentManager + .EntityQuery() + .SelectMany(nc => nc.Nodes.Values) + .Select(n => (BaseNodeGroup?) n.NodeGroup) + .Where(n => n != null) + .Distinct(); + + foreach (var network in allNetworks) + { + msg.Groups.Add(VisMakeGroupState(network!)); + } + + RaiseNetworkEvent(msg, player.ConnectedClient); + } + + private static NodeVis.GroupData VisMakeGroupState(BaseNodeGroup group) + { + return new() + { + NetId = group.NetId, + GroupId = group.GroupId.ToString(), + Color = CalcNodeGroupColor(group), + Nodes = group.Nodes.Select(n => new NodeVis.NodeDatum + { + Name = n.Name, + NetId = n.NetId, + Reachable = n.ReachableNodes.Select(r => r.NetId).ToArray(), + Entity = n.Owner.Uid, + Type = n.GetType().Name + }).ToArray() + }; + } + + private static Color CalcNodeGroupColor(BaseNodeGroup group) + { + return group.GroupId switch + { + NodeGroupID.HVPower => Color.Orange, + NodeGroupID.MVPower => Color.Yellow, + NodeGroupID.Apc => Color.LimeGreen, + NodeGroupID.AMEngine => Color.Purple, + NodeGroupID.Pipe => Color.Blue, + NodeGroupID.WireNet => Color.DarkMagenta, + _ => Color.White + }; } } } diff --git a/Content.Server/NodeContainer/NodeContainerComponent.cs b/Content.Server/NodeContainer/NodeContainerComponent.cs index 2c1e4841bf..b0943f7cb6 100644 --- a/Content.Server/NodeContainer/NodeContainerComponent.cs +++ b/Content.Server/NodeContainer/NodeContainerComponent.cs @@ -20,60 +20,18 @@ namespace Content.Server.NodeContainer { public override string Name => "NodeContainer"; - [ViewVariables] - public IReadOnlyDictionary Nodes => _nodes; + [DataField("nodes")] [ViewVariables] public Dictionary Nodes { get; } = new(); - [DataField("nodes")] - private readonly Dictionary _nodes = new(); - - [DataField("examinable")] - private bool _examinable = false; - - protected override void Initialize() - { - base.Initialize(); - foreach (var node in _nodes.Values) - { - node.Initialize(Owner); - } - } - - protected override void Startup() - { - base.Startup(); - foreach (var node in _nodes.Values) - { - node.OnContainerStartup(); - } - } - - protected override void Shutdown() - { - base.Shutdown(); - - foreach (var node in _nodes.Values) - { - node.OnContainerShutdown(); - } - } - - public void AnchorUpdate() - { - foreach (var node in Nodes.Values) - { - node.AnchorUpdate(); - node.AnchorStateChanged(); - } - } + [DataField("examinable")] private bool _examinable = false; public T GetNode(string identifier) where T : Node { - return (T)_nodes[identifier]; + return (T) Nodes[identifier]; } public bool TryGetNode(string identifier, [NotNullWhen(true)] out T? node) where T : Node { - if (_nodes.TryGetValue(identifier, out var n) && n is T t) + if (Nodes.TryGetValue(identifier, out var n) && n is T t) { node = t; return true; diff --git a/Content.Server/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs b/Content.Server/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs deleted file mode 100644 index bee595ac19..0000000000 --- a/Content.Server/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs +++ /dev/null @@ -1,37 +0,0 @@ -#nullable enable -using System.Collections.Generic; -using System.Linq; -using Content.Server.NodeContainer.Nodes; -using Content.Server.Power.Components; - -namespace Content.Server.NodeContainer.NodeGroups -{ - public abstract class BaseNetConnectorNodeGroup : BaseNodeGroup where TNetConnector : BaseNetConnectorComponent - { - private readonly Dictionary> _netConnectorComponents = new(); - - protected override void OnAddNode(Node node) - { - var newNetConnectorComponents = node.Owner - .GetAllComponents() - .Where(powerComp => (NodeGroupID) powerComp.Voltage == node.NodeGroupID) - .ToList(); - _netConnectorComponents[node] = newNetConnectorComponents; - foreach (var netConnectorComponent in newNetConnectorComponents) - { - SetNetConnectorNet(netConnectorComponent); - } - } - - protected abstract void SetNetConnectorNet(TNetConnector netConnectorComponent); - - protected override void OnRemoveNode(Node node) - { - foreach (var netConnectorComponent in _netConnectorComponents[node]) - { - netConnectorComponent.ClearNet(); - } - _netConnectorComponents.Remove(node); - } - } -} diff --git a/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs b/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs new file mode 100644 index 0000000000..81edd4e643 --- /dev/null +++ b/Content.Server/NodeContainer/NodeGroups/BaseNodeGroup.cs @@ -0,0 +1,119 @@ +#nullable enable +using System.Collections.Generic; +using System.Linq; +using Content.Server.NodeContainer.EntitySystems; +using Content.Server.NodeContainer.Nodes; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.ViewVariables; + +namespace Content.Server.NodeContainer.NodeGroups +{ + /// + /// Maintains a collection of s, and performs operations requiring a list of + /// all connected s. + /// + public interface INodeGroup + { + bool Remaking { get; } + + /// + /// The list of nodes currently in this group. + /// + IReadOnlyList Nodes { get; } + + void Create(NodeGroupID groupId); + + void Initialize(Node sourceNode); + + void RemoveNode(Node node); + + void LoadNodes(List groupNodes); + + // In theory, the SS13 curse ensures this method will never be called. + void AfterRemake(IEnumerable> newGroups); + + // TODO: Why is this method needed? + void QueueRemake(); + } + + [NodeGroup(NodeGroupID.Default, NodeGroupID.WireNet)] + public class BaseNodeGroup : INodeGroup + { + public bool Remaking { get; set; } + + IReadOnlyList INodeGroup.Nodes => Nodes; + + /// + /// The list of nodes in this group. + /// + [ViewVariables] public readonly List Nodes = new(); + + [ViewVariables] public int NodeCount => Nodes.Count; + + /// + /// Debug variable to indicate that this NodeGroup should not be being used by anything. + /// + [ViewVariables] + public bool Removed { get; set; } = false; + + [ViewVariables] + protected GridId GridId { get; private set; } + + /// + /// Network ID of this group for client-side debug visualization of nodes. + /// + [ViewVariables] + public int NetId; + + [ViewVariables] + public NodeGroupID GroupId { get; private set; } + + public void Create(NodeGroupID groupId) + { + GroupId = groupId; + } + + public virtual void Initialize(Node sourceNode) + { + // TODO: Can we get rid of this GridId? + GridId = sourceNode.Owner.Transform.GridID; + } + + /// + /// Called when a node has been removed from this group via deletion of the node. + /// + /// + /// Note that this always still results in a complete remake of the group later, + /// but hooking this method is good for book keeping. + /// + /// The node that was deleted. + public virtual void RemoveNode(Node node) + { + } + + /// + /// Called to load this newly created group up with new nodes. + /// + /// The new nodes for this group. + public virtual void LoadNodes( + List groupNodes) + { + Nodes.AddRange(groupNodes); + } + + /// + /// Called after the nodes in this group have been made into one or more new groups. + /// + /// + /// Use this to split in-group data such as pipe gas mixtures into newly split nodes. + /// + /// A list of new groups for this group's former nodes. + public virtual void AfterRemake(IEnumerable> newGroups) { } + + public void QueueRemake() + { + EntitySystem.Get().QueueRemakeGroup(this); + } + } +} diff --git a/Content.Server/NodeContainer/NodeGroups/INodeGroup.cs b/Content.Server/NodeContainer/NodeGroups/INodeGroup.cs deleted file mode 100644 index bc8868bc11..0000000000 --- a/Content.Server/NodeContainer/NodeGroups/INodeGroup.cs +++ /dev/null @@ -1,132 +0,0 @@ -#nullable enable -using System.Collections.Generic; -using Content.Server.NodeContainer.EntitySystems; -using Content.Server.NodeContainer.Nodes; -using Robust.Shared.GameObjects; -using Robust.Shared.Map; -using Robust.Shared.ViewVariables; - -namespace Content.Server.NodeContainer.NodeGroups -{ - /// - /// Maintains a collection of s, and performs operations requiring a list of - /// all connected s. - /// - public interface INodeGroup - { - IReadOnlyList Nodes { get; } - - void Initialize(Node sourceNode); - - void AddNode(Node node); - - void RemoveNode(Node node); - - void CombineGroup(INodeGroup newGroup); - - void RemakeGroup(); - } - - [NodeGroup(NodeGroupID.Default, NodeGroupID.WireNet)] - public class BaseNodeGroup : INodeGroup - { - [ViewVariables] - public IReadOnlyList Nodes => _nodes; - private readonly List _nodes = new(); - - [ViewVariables] - public int NodeCount => Nodes.Count; - - /// - /// Debug variable to indicate that this NodeGroup should not be being used by anything. - /// - [ViewVariables] - public bool Removed { get; private set; } = false; - - public static readonly INodeGroup NullGroup = new NullNodeGroup(); - - protected GridId GridId { get; private set;} - - public virtual void Initialize(Node sourceNode) - { - GridId = sourceNode.Owner.Transform.GridID; - } - - public void AddNode(Node node) - { - _nodes.Add(node); - OnAddNode(node); - } - - public void RemoveNode(Node node) - { - _nodes.Remove(node); - OnRemoveNode(node); - EntitySystem.Get().AddDirtyNodeGroup(this); - } - - public void CombineGroup(INodeGroup newGroup) - { - if (newGroup.Nodes.Count < Nodes.Count) - { - newGroup.CombineGroup(this); - return; - } - - OnGivingNodesForCombine(newGroup); - - foreach (var node in Nodes) - { - node.NodeGroup = newGroup; - } - - Removed = true; - } - - /// - /// Causes all s to remake their groups. Called when a is removed - /// and may have split a group in two, so multiple new groups may need to be formed. - /// - public void RemakeGroup() - { - foreach (var node in Nodes) - { - node.ClearNodeGroup(); - } - - var newGroups = new HashSet(); - - foreach (var node in Nodes) - { - if (node.TryAssignGroupIfNeeded()) - { - node.SpreadGroup(); - newGroups.Add(node.NodeGroup); - } - } - - AfterRemake(newGroups); - - Removed = true; - } - - protected virtual void OnAddNode(Node node) { } - - protected virtual void OnRemoveNode(Node node) { } - - protected virtual void OnGivingNodesForCombine(INodeGroup newGroup) { } - - protected virtual void AfterRemake(IEnumerable newGroups) { } - - protected class NullNodeGroup : INodeGroup - { - public IReadOnlyList Nodes => _nodes; - private readonly List _nodes = new(); - public void Initialize(Node sourceNode) { } - public void AddNode(Node node) { } - public void CombineGroup(INodeGroup newGroup) { } - public void RemoveNode(Node node) { } - public void RemakeGroup() { } - } - } -} diff --git a/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs b/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs index d41b8dc265..27ef01eafc 100644 --- a/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs +++ b/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs @@ -1,5 +1,6 @@ #nullable enable using System; +using JetBrains.Annotations; namespace Content.Server.NodeContainer.NodeGroups { @@ -9,6 +10,7 @@ namespace Content.Server.NodeContainer.NodeGroups /// have the same type of . Used by . /// [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + [MeansImplicitUse] public class NodeGroupAttribute : Attribute { public NodeGroupID[] NodeGroupIDs { get; } diff --git a/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs index 0391439ec3..33b81a55d5 100644 --- a/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs +++ b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs @@ -19,7 +19,7 @@ namespace Content.Server.NodeContainer.NodeGroups /// /// Returns a new instance. /// - INodeGroup MakeNodeGroup(Node sourceNode); + INodeGroup MakeNodeGroup(NodeGroupID id); } public class NodeGroupFactory : INodeGroupFactory @@ -45,15 +45,14 @@ namespace Content.Server.NodeContainer.NodeGroups } } - public INodeGroup MakeNodeGroup(Node sourceNode) + public INodeGroup MakeNodeGroup(NodeGroupID id) { - if (_groupTypes.TryGetValue(sourceNode.NodeGroupID, out var type)) - { - var nodeGroup = _typeFactory.CreateInstance(type); - nodeGroup.Initialize(sourceNode); - return nodeGroup; - } - throw new ArgumentException($"{sourceNode.NodeGroupID} did not have an associated {nameof(INodeGroup)}."); + if (!_groupTypes.TryGetValue(id, out var type)) + throw new ArgumentException($"{id} did not have an associated {nameof(INodeGroup)} implementation."); + + var instance = _typeFactory.CreateInstance(type); + instance.Create(id); + return instance; } } diff --git a/Content.Server/NodeContainer/NodeGroups/IPipeNet.cs b/Content.Server/NodeContainer/NodeGroups/PipeNet.cs similarity index 51% rename from Content.Server/NodeContainer/NodeGroups/IPipeNet.cs rename to Content.Server/NodeContainer/NodeGroups/PipeNet.cs index ed740b39a4..573694cdd6 100644 --- a/Content.Server/NodeContainer/NodeGroups/IPipeNet.cs +++ b/Content.Server/NodeContainer/NodeGroups/PipeNet.cs @@ -1,14 +1,15 @@ #nullable enable using System; using System.Collections.Generic; +using System.Linq; using Content.Server.Atmos; using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; -using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.Interfaces; using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using Robust.Shared.GameObjects; +using Robust.Shared.Maths; using Robust.Shared.ViewVariables; namespace Content.Server.NodeContainer.NodeGroups @@ -24,17 +25,15 @@ namespace Content.Server.NodeContainer.NodeGroups [NodeGroup(NodeGroupID.Pipe)] public class PipeNet : BaseNodeGroup, IPipeNet { - [ViewVariables] - public GasMixture Air { get; set; } = new() {Temperature = Atmospherics.T20C}; + [ViewVariables] public GasMixture Air { get; set; } = new() {Temperature = Atmospherics.T20C}; - public static readonly IPipeNet NullNet = new NullPipeNet(); - - [ViewVariables] - private readonly List _pipes = new(); + [ViewVariables] private readonly List _pipes = new(); [ViewVariables] private AtmosphereSystem? _atmosphereSystem; - [ViewVariables] private IGridAtmosphereComponent? GridAtmos => _atmosphereSystem?.GetGridAtmosphere(GridId); + [ViewVariables] + private IGridAtmosphereComponent? GridAtmos => + _atmosphereSystem?.GetGridAtmosphere(GridId); public override void Initialize(Node sourceNode) { @@ -49,35 +48,30 @@ namespace Content.Server.NodeContainer.NodeGroups _atmosphereSystem?.React(Air, this); } - protected override void OnAddNode(Node node) + public override void LoadNodes(List groupNodes) { - if (node is not PipeNode pipeNode) - return; + base.LoadNodes(groupNodes); - _pipes.Add(pipeNode); - pipeNode.JoinPipeNet(this); - Air.Volume += pipeNode.Volume; + foreach (var node in groupNodes) + { + var pipeNode = (PipeNode) node; + _pipes.Add(pipeNode); + pipeNode.JoinPipeNet(this); + Air.Volume += pipeNode.Volume; + } } - protected override void OnRemoveNode(Node node) + public override void RemoveNode(Node node) { - RemoveFromGridAtmos(); - if (node is not PipeNode pipeNode) - return; + base.RemoveNode(node); - pipeNode.ClearPipeNet(); + var pipeNode = (PipeNode) node; + Air.Volume -= pipeNode.Volume; + // TODO: Bad O(n^2) _pipes.Remove(pipeNode); } - protected override void OnGivingNodesForCombine(INodeGroup newGroup) - { - if (newGroup is not IPipeNet newPipeNet) - return; - - EntitySystem.Get().Merge(newPipeNet.Air, Air); - } - - protected override void AfterRemake(IEnumerable newGroups) + public override void AfterRemake(IEnumerable> newGroups) { RemoveFromGridAtmos(); @@ -86,14 +80,15 @@ namespace Content.Server.NodeContainer.NodeGroups foreach (var newGroup in newGroups) { - if (newGroup is not IPipeNet newPipeNet) + if (newGroup.Key is not IPipeNet newPipeNet) continue; var newAir = newPipeNet.Air; + var newVolume = newGroup.Cast().Sum(n => n.Volume); buffer.Clear(); atmosphereSystem.Merge(buffer, Air); - buffer.Multiply(MathF.Min(newAir.Volume / Air.Volume, 1f)); + buffer.Multiply(MathF.Min(newVolume / Air.Volume, 1f)); atmosphereSystem.Merge(newAir, buffer); } } @@ -102,20 +97,5 @@ namespace Content.Server.NodeContainer.NodeGroups { GridAtmos?.RemovePipeNet(this); } - - private class NullPipeNet : NullNodeGroup, IPipeNet - { - private readonly GasMixture _air; - - GasMixture IGasMixtureHolder.Air { get => _air; set { } } - - public NullPipeNet() - { - _air = new GasMixture(1f) {Temperature = Atmospherics.T20C}; - _air.MarkImmutable(); - } - - public void Update() { } - } } } diff --git a/Content.Server/NodeContainer/NodeGroups/PowerNetNodeGroup.cs b/Content.Server/NodeContainer/NodeGroups/PowerNetNodeGroup.cs deleted file mode 100644 index 331a3de40f..0000000000 --- a/Content.Server/NodeContainer/NodeGroups/PowerNetNodeGroup.cs +++ /dev/null @@ -1,164 +0,0 @@ -#nullable enable -using System; -using System.Collections.Generic; -using System.Diagnostics; -using Content.Server.Power.Components; -using Robust.Shared.IoC; -using Robust.Shared.ViewVariables; - -namespace Content.Server.NodeContainer.NodeGroups -{ - public interface IPowerNet - { - void AddSupplier(PowerSupplierComponent supplier); - - void RemoveSupplier(PowerSupplierComponent supplier); - - void UpdateSupplierSupply(PowerSupplierComponent supplier, int oldSupplyRate, int newSupplyRate); - - void AddConsumer(PowerConsumerComponent consumer); - - void RemoveConsumer(PowerConsumerComponent consumer); - - void UpdateConsumerDraw(PowerConsumerComponent consumer, int oldDrawRate, int newDrawRate); - - void UpdateConsumerPriority(PowerConsumerComponent consumer, Priority oldPriority, Priority newPriority); - - void UpdateConsumerReceivedPower(); - } - - [NodeGroup(NodeGroupID.HVPower, NodeGroupID.MVPower)] - public class PowerNetNodeGroup : BaseNetConnectorNodeGroup, IPowerNet - { - private static readonly Priority[] CachedPriorities = (Priority[]) Enum.GetValues(typeof(Priority)); - - [Dependency] private readonly IPowerNetManager _powerNetManager = default!; - - [ViewVariables] - private readonly List _suppliers = new(); - - [ViewVariables] - private int _totalSupply = 0; - - [ViewVariables] - private readonly Dictionary> _consumersByPriority = new(); - - [ViewVariables] - private readonly Dictionary _drawByPriority = new(); - - public static readonly IPowerNet NullNet = new NullPowerNet(); - - public PowerNetNodeGroup() - { - foreach (Priority priority in Enum.GetValues(typeof(Priority))) - { - _consumersByPriority.Add(priority, new List()); - _drawByPriority.Add(priority, 0); - } - } - - protected override void SetNetConnectorNet(BasePowerNetComponent netConnectorComponent) - { - netConnectorComponent.Net = this; - } - - #region IPowerNet Methods - - public void AddSupplier(PowerSupplierComponent supplier) - { - _suppliers.Add(supplier); - _totalSupply += supplier.SupplyRate; - _powerNetManager.AddDirtyPowerNet(this); - } - - public void RemoveSupplier(PowerSupplierComponent supplier) - { - Debug.Assert(_suppliers.Contains(supplier)); - _suppliers.Remove(supplier); - _totalSupply -= supplier.SupplyRate; - _powerNetManager.AddDirtyPowerNet(this); - } - - public void UpdateSupplierSupply(PowerSupplierComponent supplier, int oldSupplyRate, int newSupplyRate) - { - Debug.Assert(_suppliers.Contains(supplier)); - _totalSupply -= oldSupplyRate; - _totalSupply += newSupplyRate; - _powerNetManager.AddDirtyPowerNet(this); - } - - public void AddConsumer(PowerConsumerComponent consumer) - { - _consumersByPriority[consumer.Priority].Add(consumer); - _drawByPriority[consumer.Priority] += consumer.DrawRate; - _powerNetManager.AddDirtyPowerNet(this); - } - - public void RemoveConsumer(PowerConsumerComponent consumer) - { - Debug.Assert(_consumersByPriority[consumer.Priority].Contains(consumer)); - consumer.ReceivedPower = 0; - _consumersByPriority[consumer.Priority].Remove(consumer); - _drawByPriority[consumer.Priority] -= consumer.DrawRate; - _powerNetManager.AddDirtyPowerNet(this); - } - - public void UpdateConsumerDraw(PowerConsumerComponent consumer, int oldDrawRate, int newDrawRate) - { - Debug.Assert(_consumersByPriority[consumer.Priority].Contains(consumer)); - _drawByPriority[consumer.Priority] -= oldDrawRate; - _drawByPriority[consumer.Priority] += newDrawRate; - _powerNetManager.AddDirtyPowerNet(this); - } - - public void UpdateConsumerPriority(PowerConsumerComponent consumer, Priority oldPriority, Priority newPriority) - { - Debug.Assert(_consumersByPriority[oldPriority].Contains(consumer)); - _consumersByPriority[oldPriority].Remove(consumer); - _drawByPriority[oldPriority] -= consumer.DrawRate; - _consumersByPriority[newPriority].Add(consumer); - _drawByPriority[newPriority] += consumer.DrawRate; - _powerNetManager.AddDirtyPowerNet(this); - } - - public void UpdateConsumerReceivedPower() - { - var remainingSupply = _totalSupply; - foreach (var priority in CachedPriorities) - { - var categoryPowerDemand = _drawByPriority[priority]; - if (remainingSupply >= categoryPowerDemand) //can fully power all in category - { - remainingSupply -= categoryPowerDemand; - foreach (var consumer in _consumersByPriority[priority]) - { - consumer.ReceivedPower = consumer.DrawRate; - } - } - else //cannot fully power all, split power - { - var availiablePowerFraction = (float) remainingSupply / categoryPowerDemand; - remainingSupply = 0; - foreach (var consumer in _consumersByPriority[priority]) - { - consumer.ReceivedPower = (int) (consumer.DrawRate * availiablePowerFraction); //give each consumer a fraction of what they requested (rounded down to nearest int) - } - } - } - } - - #endregion - - private class NullPowerNet : IPowerNet - { - public void AddConsumer(PowerConsumerComponent consumer) { } - public void AddSupplier(PowerSupplierComponent supplier) { } - public void UpdateSupplierSupply(PowerSupplierComponent supplier, int oldSupplyRate, int newSupplyRate) { } - public void RemoveConsumer(PowerConsumerComponent consumer) { } - public void RemoveSupplier(PowerSupplierComponent supplier) { } - public void UpdateConsumerDraw(PowerConsumerComponent consumer, int oldDrawRate, int newDrawRate) { } - public void UpdateConsumerPriority(PowerConsumerComponent consumer, Priority oldPriority, Priority newPriority) { } - public void UpdateConsumerReceivedPower() { } - } - } -} diff --git a/Content.Server/NodeContainer/Nodes/AdjacentNode.cs b/Content.Server/NodeContainer/Nodes/AdjacentNode.cs index 43e9c78c1d..c28589aec9 100644 --- a/Content.Server/NodeContainer/Nodes/AdjacentNode.cs +++ b/Content.Server/NodeContainer/Nodes/AdjacentNode.cs @@ -1,5 +1,6 @@ #nullable enable using System.Collections.Generic; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Serialization.Manager.Attributes; @@ -12,29 +13,19 @@ namespace Content.Server.NodeContainer.Nodes [DataDefinition] public class AdjacentNode : Node { - protected override IEnumerable GetReachableNodes() + public override IEnumerable GetReachableNodes() { if (!Owner.Transform.Anchored) yield break; + var compMgr = IoCManager.Resolve(); var grid = IoCManager.Resolve().GetGrid(Owner.Transform.GridID); - var coords = Owner.Transform.Coordinates; - foreach (var cell in grid.GetCardinalNeighborCells(coords)) + var gridIndex = grid.TileIndicesFor(Owner.Transform.Coordinates); + + foreach (var (_, node) in NodeHelpers.GetCardinalNeighborNodes(compMgr, grid, gridIndex)) { - foreach (var entity in grid.GetLocal(Owner.EntityManager.GetEntity(cell).Transform.Coordinates)) - { - if (!Owner.EntityManager.GetEntity(entity).TryGetComponent(out var container)) - continue; - - foreach (var node in container.Nodes.Values) - { - if (node != null && node != this) - { - yield return node; - } - } - - } + if (node != this) + yield return node; } } } diff --git a/Content.Server/NodeContainer/Nodes/Node.cs b/Content.Server/NodeContainer/Nodes/Node.cs index 614a5bff4c..58519e5e23 100644 --- a/Content.Server/NodeContainer/Nodes/Node.cs +++ b/Content.Server/NodeContainer/Nodes/Node.cs @@ -1,11 +1,8 @@ #nullable enable using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; +using Content.Server.NodeContainer.EntitySystems; using Content.Server.NodeContainer.NodeGroups; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Physics; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -26,20 +23,20 @@ namespace Content.Server.NodeContainer.Nodes [DataField("nodeGroupID")] public NodeGroupID NodeGroupID { get; private set; } = NodeGroupID.Default; - [ViewVariables] - public INodeGroup NodeGroup { get => _nodeGroup; set => SetNodeGroup(value); } - private INodeGroup _nodeGroup = BaseNodeGroup.NullGroup; + /// + /// The node group this node is a part of. + /// + [ViewVariables] public INodeGroup? NodeGroup; - [ViewVariables] - public IEntity Owner { get; private set; } = default!; - - [ViewVariables] - private bool _needsGroup = true; + /// + /// The entity that owns this node via its . + /// + [ViewVariables] public IEntity Owner { get; private set; } = default!; /// /// If this node should be considered for connection by other nodes. /// - public bool Connectable => !_deleting && Anchored; + public bool Connectable => !Deleting && Anchored; protected bool Anchored => !NeedAnchored || Owner.Transform.Anchored; @@ -50,137 +47,104 @@ namespace Content.Server.NodeContainer.Nodes /// /// Prevents a node from being used by other nodes while midway through removal. /// - private bool _deleting; + public bool Deleting; + /// + /// All compatible nodes that are reachable by this node. + /// Effectively, active connections out of this node. + /// + public readonly HashSet ReachableNodes = new(); + + internal int FloodGen; + internal int UndirectGen; + internal bool FlaggedForFlood; + internal int NetId; + + /// + /// Name of this node on the owning . + /// + public string Name = default!; + + /// + /// Invoked when the owning is initialized. + /// + /// The owning entity. public virtual void Initialize(IEntity owner) { Owner = owner; } + /// + /// Invoked when the owning is started. + /// public virtual void OnContainerStartup() { - TryAssignGroupIfNeeded(); - CombineGroupWithReachable(); + EntitySystem.Get().QueueReflood(this); + } + + /// + /// Immediately create a single-node node group for this node if it does not have one yet. + /// + /// + /// This can be useful for nodes like pipes + /// that need immediate access to their node group to set parameters like node volume. + /// The node group created by this function (if necessary) will still update and form new, + /// merged groups later if necessary. + /// Set parameters like pipe net volume should then be transferred/merged there. + /// + public void CreateSingleNetImmediate() + { + EntitySystem.Get().CreateSingleNetImmediate(this); } public void AnchorUpdate() { if (Anchored) { - TryAssignGroupIfNeeded(); - CombineGroupWithReachable(); + EntitySystem.Get().QueueReflood(this); } else { - RemoveSelfFromGroup(); + EntitySystem.Get().QueueNodeRemove(this); } } + /// + /// Called when the anchored state of the owning entity changes. + /// public virtual void AnchorStateChanged() { } + /// + /// Called after the parent node group has been rebuilt. + /// + public virtual void OnPostRebuild() + { + + } + + /// + /// Called when the owning is shut down. + /// public virtual void OnContainerShutdown() { - _deleting = true; - NodeGroup.RemoveNode(this); - } - - public bool TryAssignGroupIfNeeded() - { - if (!_needsGroup || !Connectable) - { - return false; - } - NodeGroup = GetReachableCompatibleGroups().FirstOrDefault() ?? MakeNewGroup(); - return true; - } - - public void SpreadGroup() - { - Debug.Assert(!_needsGroup); - foreach (var node in GetReachableCompatibleNodes()) - { - if (node._needsGroup) - { - node.NodeGroup = NodeGroup; - node.SpreadGroup(); - } - } - } - - public void ClearNodeGroup() - { - _nodeGroup = BaseNodeGroup.NullGroup; - _needsGroup = true; - } - - protected void RefreshNodeGroup() - { - RemoveSelfFromGroup(); - TryAssignGroupIfNeeded(); - CombineGroupWithReachable(); + Deleting = true; + EntitySystem.Get().QueueNodeRemove(this); } /// /// How this node will attempt to find other reachable s to group with. /// Returns a set of s to consider grouping with. Should not return this current . /// - protected abstract IEnumerable GetReachableNodes(); - - private IEnumerable GetReachableCompatibleNodes() - { - foreach (var node in GetReachableNodes()) - { - if (node.NodeGroupID == NodeGroupID && node.Connectable) - { - yield return node; - } - } - } - - private IEnumerable GetReachableCompatibleGroups() - { - foreach (var node in GetReachableCompatibleNodes()) - { - if (!node._needsGroup) - { - var group = node.NodeGroup; - if (group != NodeGroup) - { - yield return group; - } - } - } - } - - private void CombineGroupWithReachable() - { - if (_needsGroup || !Connectable) - return; - - foreach (var group in GetReachableCompatibleGroups()) - { - NodeGroup.CombineGroup(group); - } - } - - private void SetNodeGroup(INodeGroup newGroup) - { - _nodeGroup = newGroup; - NodeGroup.AddNode(this); - _needsGroup = false; - } - - private INodeGroup MakeNewGroup() - { - return IoCManager.Resolve().MakeNodeGroup(this); - } - - private void RemoveSelfFromGroup() - { - NodeGroup.RemoveNode(this); - ClearNodeGroup(); - } + /// + /// + /// The set of nodes returned can be asymmetrical + /// (meaning that it can return other nodes whose does not return this node). + /// If this is used, creation of a new node may not correctly merge networks unless both sides + /// of this asymmetric relation are made to manually update with . + /// + /// + public abstract IEnumerable GetReachableNodes(); } } diff --git a/Content.Server/NodeContainer/Nodes/NodeHelpers.cs b/Content.Server/NodeContainer/Nodes/NodeHelpers.cs new file mode 100644 index 0000000000..115e5a276f --- /dev/null +++ b/Content.Server/NodeContainer/Nodes/NodeHelpers.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Maths; + +namespace Content.Server.NodeContainer.Nodes +{ + /// + /// Helper utilities for implementing . + /// + public static class NodeHelpers + { + public static IEnumerable GetNodesInTile(IComponentManager compMgr, IMapGrid grid, Vector2i coords) + { + foreach (var entityUid in grid.GetAnchoredEntities(coords)) + { + if (!compMgr.TryGetComponent(entityUid, out NodeContainerComponent? container)) + continue; + + foreach (var node in container.Nodes.Values) + { + yield return node; + } + } + } + + public static IEnumerable<(Direction dir, Node node)> GetCardinalNeighborNodes( + IComponentManager compMgr, + IMapGrid grid, + Vector2i coords, + bool includeSameTile = true) + { + foreach (var (dir, entityUid) in GetCardinalNeighborCells(grid, coords, includeSameTile)) + { + if (!compMgr.TryGetComponent(entityUid, out NodeContainerComponent? container)) + continue; + + foreach (var node in container.Nodes.Values) + { + yield return (dir, node); + } + } + } + + [SuppressMessage("ReSharper", "EnforceForeachStatementBraces")] + public static IEnumerable<(Direction dir, EntityUid entity)> GetCardinalNeighborCells( + IMapGrid grid, + Vector2i coords, + bool includeSameTile = true) + { + if (includeSameTile) + { + foreach (var uid in grid.GetAnchoredEntities(coords)) + yield return (Direction.Invalid, uid); + } + + foreach (var uid in grid.GetAnchoredEntities(coords + (0, 1))) + yield return (Direction.North, uid); + + foreach (var uid in grid.GetAnchoredEntities(coords + (0, -1))) + yield return (Direction.South, uid); + + foreach (var uid in grid.GetAnchoredEntities(coords + (1, 0))) + yield return (Direction.East, uid); + + foreach (var uid in grid.GetAnchoredEntities(coords + (-1, 0))) + yield return (Direction.West, uid); + } + + public static Vector2i TileOffsetForDir(Direction dir) + { + return dir switch + { + Direction.Invalid => (0, 0), + Direction.South => (0, -1), + Direction.SouthEast => (1, -1), + Direction.East => (1, 0), + Direction.NorthEast => (1, 1), + Direction.North => (0, 1), + Direction.NorthWest => (-1, 1), + Direction.West => (-1, 0), + Direction.SouthWest => (-1, -1), + _ => throw new ArgumentOutOfRangeException(nameof(dir), dir, null) + }; + } + } +} diff --git a/Content.Server/NodeContainer/Nodes/PipeNode.cs b/Content.Server/NodeContainer/Nodes/PipeNode.cs index 54f0c0fb54..68d093188c 100644 --- a/Content.Server/NodeContainer/Nodes/PipeNode.cs +++ b/Content.Server/NodeContainer/Nodes/PipeNode.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using Content.Server.Atmos; using Content.Server.Atmos.EntitySystems; using Content.Server.Interfaces; -using Content.Server.NodeContainer; +using Content.Server.NodeContainer.EntitySystems; using Content.Server.NodeContainer.NodeGroups; -using Content.Server.NodeContainer.Nodes; using Content.Shared.Atmos; using Robust.Server.GameObjects; using Robust.Shared.Containers; @@ -13,9 +12,10 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -namespace Content.Server.GameObjects.Components.NodeContainer.Nodes +namespace Content.Server.NodeContainer.Nodes { /// /// Connects with other s whose @@ -63,21 +63,23 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes set { _connectionsEnabled = value; - RefreshNodeGroup(); + + if (NodeGroup != null) + EntitySystem.Get().QueueRemakeGroup((BaseNodeGroup) NodeGroup); } } + [DataField("connectionsEnabled")] + private bool _connectionsEnabled = true; + [DataField("rotationsEnabled")] public bool RotationsEnabled { get; set; } = true; /// - /// The this pipe is a part of. Set to when not in an . + /// The this pipe is a part of. /// [ViewVariables] - private IPipeNet _pipeNet = PipeNet.NullNet; - - [DataField("connectionsEnabled")] - private bool _connectionsEnabled = true; + private IPipeNet? PipeNet => (IPipeNet?) NodeGroup; /// /// Whether to ignore the pipenet and return the environment's air. @@ -92,8 +94,12 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes [ViewVariables] public GasMixture Air { - get => !EnvironmentalAir ? _pipeNet.Air : Owner.Transform.Coordinates.GetTileAir() ?? GasMixture.SpaceGas; - set => _pipeNet.Air = value; + get => (!EnvironmentalAir ? PipeNet?.Air : Owner.Transform.Coordinates.GetTileAir()) ?? GasMixture.SpaceGas; + set + { + DebugTools.Assert(PipeNet != null); + PipeNet!.Air = value; + } } public void AssumeAir(GasMixture giver) @@ -105,7 +111,7 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes return; } - EntitySystem.Get().Merge(_pipeNet.Air, giver); + EntitySystem.Get().Merge(PipeNet!.Air, giver); } [ViewVariables] @@ -128,13 +134,6 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes public void JoinPipeNet(IPipeNet pipeNet) { - _pipeNet = pipeNet; - OnConnectedDirectionsNeedsUpdating(); - } - - public void ClearPipeNet() - { - _pipeNet = PipeNet.NullNet; OnConnectedDirectionsNeedsUpdating(); } @@ -146,12 +145,11 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes if (!RotationsEnabled) return; var diff = ev.NewRotation - ev.OldRotation; PipeDirection = PipeDirection.RotatePipeDirection(diff); - RefreshNodeGroup(); OnConnectedDirectionsNeedsUpdating(); UpdateAppearance(); } - protected override IEnumerable GetReachableNodes() + public override IEnumerable GetReachableNodes() { for (var i = 0; i < PipeDirectionHelpers.AllPipeDirections; i++) { diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs index b3ef6644ee..8562cccfbe 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs @@ -6,9 +6,10 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using Content.Server.Notification; using Content.Server.Power.Components; +using Content.Server.Power.EntitySystems; using Content.Server.UserInterface; using Content.Server.VendingMachines; -using Content.Server.Wires.Components; +using Content.Server.WireHacking; using Content.Shared.ActionBlocker; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; @@ -47,7 +48,7 @@ namespace Content.Server.ParticleAccelerator.Components /// /// Power receiver for the control console itself. /// - [ViewVariables] private PowerReceiverComponent _powerReceiverComponent = default!; + [ViewVariables] private ApcPowerReceiverComponent _apcPowerReceiverComponent = default!; [ViewVariables] private ParticleAcceleratorFuelChamberComponent? _partFuelChamber; [ViewVariables] private ParticleAcceleratorEndCapComponent? _partEndCap; @@ -88,7 +89,7 @@ namespace Content.Server.ParticleAccelerator.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("powerDrawBase")] private int _powerDrawBase = 500; [ViewVariables(VVAccess.ReadWrite)] [DataField("powerDrawMult")] private int _powerDrawMult = 1500; - [ViewVariables] private bool ConsolePowered => _powerReceiverComponent?.Powered ?? true; + [ViewVariables] private bool ConsolePowered => _apcPowerReceiverComponent?.Powered ?? true; public ParticleAcceleratorControlBoxComponent() { @@ -107,9 +108,9 @@ namespace Content.Server.ParticleAccelerator.Components UserInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage; } - Owner.EnsureComponent(out _powerReceiverComponent); + Owner.EnsureComponent(out _apcPowerReceiverComponent); - _powerReceiverComponent!.Load = 250; + _apcPowerReceiverComponent!.Load = 250; } public override void HandleMessage(ComponentMessage message, IComponent? component) @@ -189,8 +190,8 @@ namespace Content.Server.ParticleAccelerator.Components public void UpdateUI() { - var draw = 0; - var receive = 0; + var draw = 0f; + var receive = 0f; if (_isEnabled) { @@ -202,8 +203,8 @@ namespace Content.Server.ParticleAccelerator.Components _isAssembled, _isEnabled, _selectedStrength, - draw, - receive, + (int) draw, + (int) receive, _partEmitterLeft != null, _partEmitterCenter != null, _partEmitterRight != null, @@ -577,7 +578,7 @@ namespace Content.Server.ParticleAccelerator.Components if (Owner.TryGetComponent(out AppearanceComponent? appearance)) { appearance.SetData(ParticleAcceleratorVisuals.VisualState, - _powerReceiverComponent!.Powered + _apcPowerReceiverComponent!.Powered ? (ParticleAcceleratorVisualState) _selectedStrength : ParticleAcceleratorVisualState.Unpowered); } @@ -645,7 +646,7 @@ namespace Content.Server.ParticleAccelerator.Components } * _powerDrawMult + _powerDrawBase; } - public void PowerBoxReceivedChanged(object? sender, ReceivedPowerChangedEventArgs eventArgs) + public void PowerBoxReceivedChanged(PowerConsumerReceivedChanged eventArgs) { DebugTools.Assert(_isAssembled); diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs index c3f79a8be7..c37486bc81 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs @@ -17,12 +17,6 @@ namespace Content.Server.ParticleAccelerator.Components base.Initialize(); PowerConsumerComponent = Owner.EnsureComponentWarn(); - PowerConsumerComponent.OnReceivedPowerChanged += PowerReceivedChanged; - } - - private void PowerReceivedChanged(object? sender, ReceivedPowerChangedEventArgs e) - { - Master?.PowerBoxReceivedChanged(sender, e); } } } diff --git a/Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs similarity index 94% rename from Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs rename to Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs index 10f386d959..79be10ebae 100644 --- a/Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs +++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPartSystem.cs @@ -3,7 +3,7 @@ using Content.Server.ParticleAccelerator.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; -namespace Content.Server.ParticleAccelerator +namespace Content.Server.ParticleAccelerator.EntitySystems { [UsedImplicitly] public class ParticleAcceleratorPartSystem : EntitySystem diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPowerBoxSystem.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPowerBoxSystem.cs new file mode 100644 index 0000000000..92bef8bfeb --- /dev/null +++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorPowerBoxSystem.cs @@ -0,0 +1,27 @@ +using Content.Server.ParticleAccelerator.Components; +using Content.Server.Power.EntitySystems; +using JetBrains.Annotations; +using Robust.Shared.GameObjects; + +namespace Content.Server.ParticleAccelerator.EntitySystems +{ + [UsedImplicitly] + public class ParticleAcceleratorPowerBoxSystem : EntitySystem + { + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent( + PowerBoxReceivedChanged); + } + + private static void PowerBoxReceivedChanged( + EntityUid uid, + ParticleAcceleratorPowerBoxComponent component, + PowerConsumerReceivedChanged args) + { + component.Master!.PowerBoxReceivedChanged(args); + } + } +} diff --git a/Content.Server/Plants/PlantSystem.cs b/Content.Server/Plants/PlantSystem.cs index 541a606e51..2dbe10b10e 100644 --- a/Content.Server/Plants/PlantSystem.cs +++ b/Content.Server/Plants/PlantSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Plants { [UsedImplicitly] - public class PlantSystem : EntitySystem, IResettingEntitySystem + public class PlantSystem : EntitySystem { [Dependency] private readonly IComponentManager _componentManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; @@ -26,6 +26,8 @@ namespace Content.Server.Plants { base.Initialize(); + SubscribeLocalEvent(Reset); + PopulateDatabase(); } @@ -73,7 +75,7 @@ namespace Content.Server.Plants } } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { PopulateDatabase(); } diff --git a/Content.Server/Power/Commands/PowerStatCommand.cs b/Content.Server/Power/Commands/PowerStatCommand.cs new file mode 100644 index 0000000000..16be3b82a0 --- /dev/null +++ b/Content.Server/Power/Commands/PowerStatCommand.cs @@ -0,0 +1,26 @@ +using Content.Server.Administration; +using Content.Server.Power.EntitySystems; +using Content.Shared.Administration; +using Robust.Shared.Console; +using Robust.Shared.GameObjects; + +namespace Content.Server.Power.Commands +{ + [AdminCommand(AdminFlags.Debug)] + public sealed class PowerStatCommand : IConsoleCommand + { + public string Command => "powerstat"; + public string Description => "Shows statistics for pow3r"; + public string Help => "Usage: powerstat"; + + public void Execute(IConsoleShell shell, string argStr, string[] args) + { + var stats = EntitySystem.Get().GetStatistics(); + + shell.WriteLine($"networks: {stats.CountNetworks}"); + shell.WriteLine($"loads: {stats.CountLoads}"); + shell.WriteLine($"supplies: {stats.CountSupplies}"); + shell.WriteLine($"batteries: {stats.CountBatteries}"); + } + } +} diff --git a/Content.Server/APC/Components/ApcComponent.cs b/Content.Server/Power/Components/ApcComponent.cs similarity index 84% rename from Content.Server/APC/Components/ApcComponent.cs rename to Content.Server/Power/Components/ApcComponent.cs index 07df66a3fc..5182551775 100644 --- a/Content.Server/APC/Components/ApcComponent.cs +++ b/Content.Server/Power/Components/ApcComponent.cs @@ -1,23 +1,22 @@ #nullable enable using System; using Content.Server.Access.Components; -using Content.Server.Battery.Components; -using Content.Server.Power.Components; +using Content.Server.Power.NodeGroups; using Content.Server.UserInterface; using Content.Shared.APC; using Content.Shared.Interaction; -using Content.Shared.Notification; using Content.Shared.Notification.Managers; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Maths; using Robust.Shared.Player; using Robust.Shared.Timing; using Robust.Shared.ViewVariables; -namespace Content.Server.APC.Components +namespace Content.Server.Power.Components { [RegisterComponent] [ComponentReference(typeof(IActivate))] @@ -57,7 +56,6 @@ namespace Content.Server.APC.Components { base.Initialize(); - Owner.EnsureComponent(); Owner.EnsureComponentWarn(); Owner.EnsureComponentWarn(); @@ -89,6 +87,8 @@ namespace Content.Server.APC.Components if (_accessReader == null || _accessReader.IsAllowed(user)) { MainBreakerEnabled = !MainBreakerEnabled; + Owner.GetComponent().CanDischarge = MainBreakerEnabled; + _uiDirty = true; SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Machines/machine_switch.ogg", Owner, AudioParams.Default.WithVolume(-2f)); } @@ -153,44 +153,31 @@ namespace Content.Server.APC.Components return ApcChargeState.Full; } - if (!Owner.TryGetComponent(out PowerConsumerComponent? consumer)) - { - return ApcChargeState.Full; - } + var netBattery = Owner.GetComponent(); + var delta = netBattery.CurrentSupply - netBattery.CurrentReceiving; - if (consumer.DrawRate == consumer.ReceivedPower) - { - return ApcChargeState.Charging; - } - else - { - return ApcChargeState.Lack; - } + return delta < 0 ? ApcChargeState.Charging : ApcChargeState.Lack; } private ApcExternalPowerState CalcExtPowerState() { - if (!Owner.TryGetComponent(out BatteryStorageComponent? batteryStorage)) + var bat = Battery; + if (bat == null) + return ApcExternalPowerState.None; + + var netBat = Owner.GetComponent(); + if (netBat.CurrentReceiving == 0 && netBat.LoadingNetworkDemand != 0) { return ApcExternalPowerState.None; } - var consumer = batteryStorage.Consumer; - if (consumer == null) - return ApcExternalPowerState.None; - - if (consumer.ReceivedPower == 0 && consumer.DrawRate != 0) - { - return ApcExternalPowerState.None; - } - else if (consumer.ReceivedPower < consumer.DrawRate) + var delta = netBat.CurrentReceiving - netBat.LoadingNetworkDemand; + if (!MathHelper.CloseTo(delta, 0, 0.1f) && delta < 0) { return ApcExternalPowerState.Low; } - else - { - return ApcExternalPowerState.Good; - } + + return ApcExternalPowerState.Good; } void IActivate.Activate(ActivateEventArgs eventArgs) diff --git a/Content.Server/Power/Components/ApcPowerProviderComponent.cs b/Content.Server/Power/Components/ApcPowerProviderComponent.cs new file mode 100644 index 0000000000..c87e4b6c54 --- /dev/null +++ b/Content.Server/Power/Components/ApcPowerProviderComponent.cs @@ -0,0 +1,121 @@ +#nullable enable +using System; +using System.Collections.Generic; +using Content.Server.Power.NodeGroups; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.ViewVariables; + +namespace Content.Server.Power.Components +{ + [RegisterComponent] + public class ApcPowerProviderComponent : BaseApcNetComponent + { + public override string Name => "PowerProvider"; + + public IEntity ProviderOwner => Owner; + + /// + /// The max distance this can transmit power to s from. + /// + [ViewVariables(VVAccess.ReadWrite)] + public int PowerTransferRange { get => _powerTransferRange; set => SetPowerTransferRange(value); } + [DataField("powerTransferRange")] + private int _powerTransferRange = 3; + + [ViewVariables] public List LinkedReceivers { get; } = new(); + + /// + /// If s should consider connecting to this. + /// + [ViewVariables(VVAccess.ReadWrite)] + public bool Connectable { get; private set; } = true; + + public void AddReceiver(ApcPowerReceiverComponent receiver) + { + LinkedReceivers.Add(receiver); + receiver.NetworkLoad.LinkedNetwork = default; + + Net?.QueueNetworkReconnect(); + } + + public void RemoveReceiver(ApcPowerReceiverComponent receiver) + { + LinkedReceivers.Remove(receiver); + receiver.NetworkLoad.LinkedNetwork = default; + + Net?.QueueNetworkReconnect(); + } + + protected override void Startup() + { + base.Startup(); + + foreach (var receiver in FindAvailableReceivers()) + { + receiver.Provider = this; + } + } + + protected override void OnRemove() + { + Connectable = false; + var receivers = LinkedReceivers.ToArray(); + foreach (var receiver in receivers) + { + receiver.Provider = null; + } + foreach (var receiver in receivers) + { + receiver.TryFindAndSetProvider(); + } + base.OnRemove(); + } + + private IEnumerable FindAvailableReceivers() + { + var nearbyEntities = IoCManager.Resolve() + .GetEntitiesInRange(Owner, PowerTransferRange); + + foreach (var entity in nearbyEntities) + { + if (entity.TryGetComponent(out var receiver) && + receiver.Connectable && + receiver.NeedsProvider && + receiver.Owner.Transform.Coordinates.TryDistance(Owner.EntityManager, Owner.Transform.Coordinates, out var distance) && + distance < Math.Min(PowerTransferRange, receiver.PowerReceptionRange)) + { + yield return receiver; + } + } + } + + protected override void AddSelfToNet(IApcNet apcNet) + { + apcNet.AddPowerProvider(this); + } + + protected override void RemoveSelfFromNet(IApcNet apcNet) + { + apcNet.RemovePowerProvider(this); + } + + private void SetPowerTransferRange(int newPowerTransferRange) + { + var receivers = LinkedReceivers.ToArray(); + + foreach (var receiver in receivers) + { + receiver.Provider = null; + } + + _powerTransferRange = newPowerTransferRange; + + foreach (var receiver in receivers) + { + receiver.TryFindAndSetProvider(); + } + } + } +} diff --git a/Content.Server/Power/Components/PowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs similarity index 65% rename from Content.Server/Power/Components/PowerReceiverComponent.cs rename to Content.Server/Power/Components/ApcPowerReceiverComponent.cs index 89d44c13a7..b95db5cc86 100644 --- a/Content.Server/Power/Components/PowerReceiverComponent.cs +++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs @@ -1,12 +1,15 @@ #nullable enable using System; -using Content.Server.APC; +using System.Diagnostics.CodeAnalysis; +using Content.Server.Power.NodeGroups; +using Content.Server.Power.Pow3r; using Content.Shared.Examine; using Content.Shared.Power; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; @@ -15,26 +18,21 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Power.Components { /// - /// Attempts to link with a nearby s so that it can receive power from a . + /// Attempts to link with a nearby s + /// so that it can receive power from a . /// [RegisterComponent] - public class PowerReceiverComponent : Component, IExamine + public class ApcPowerReceiverComponent : Component, IExamine { [ViewVariables] [ComponentDependency] private readonly IPhysBody? _physicsComponent = null; - public override string Name => "PowerReceiver"; + public override string Name => "ApcPowerReceiver"; [ViewVariables] - public bool Powered => (HasApcPower || !NeedsPower) && !PowerDisabled; + public bool Powered => (MathHelper.CloseTo(NetworkLoad.ReceivingPower, Load) || !NeedsPower) && !PowerDisabled; /// - /// If this is being powered by an Apc. - /// - [ViewVariables] - public bool HasApcPower { get; private set; } - - /// - /// The max distance from a that this can receive power from. + /// The max distance from a that this can receive power from. /// [ViewVariables(VVAccess.ReadWrite)] public int PowerReceptionRange { get => _powerReceptionRange; set => SetPowerReceptionRange(value); } @@ -42,32 +40,53 @@ namespace Content.Server.Power.Components private int _powerReceptionRange = 3; [ViewVariables] - public IPowerProvider Provider { get => _provider; set => SetProvider(value); } - private IPowerProvider _provider = PowerProviderComponent.NullProvider; + public ApcPowerProviderComponent? Provider + { + get => _provider; + set + { + // Will get updated before power networks process. + NetworkLoad.LinkedNetwork = default; + _provider?.RemoveReceiver(this); + _provider = value; + value?.AddReceiver(this); + ApcPowerChanged(); + } + } + + private ApcPowerProviderComponent? _provider; /// - /// If this should be considered for connection by s. + /// If this should be considered for connection by s. /// public bool Connectable => Anchored; private bool Anchored => _physicsComponent == null || _physicsComponent.BodyType == BodyType.Static; - [ViewVariables] - public bool NeedsProvider { get; private set; } = true; + [ViewVariables] public bool NeedsProvider => Provider == null; /// /// Amount of charge this needs from an APC per second to function. /// [ViewVariables(VVAccess.ReadWrite)] - public int Load { get => _load; set => SetLoad(value); } [DataField("powerLoad")] - private int _load = 5; + public float Load { get => NetworkLoad.DesiredPower; set => NetworkLoad.DesiredPower = value; } /// /// When false, causes this to appear powered even if not receiving power from an Apc. /// [ViewVariables(VVAccess.ReadWrite)] - public bool NeedsPower { get => _needsPower; set => SetNeedsPower(value); } + public bool NeedsPower + { + get => _needsPower; + set + { + _needsPower = value; + // Reset this so next tick will do a power update. + LastPowerReceived = float.NaN; + } + } + [DataField("needsPower")] private bool _needsPower = true; @@ -75,9 +94,16 @@ namespace Content.Server.Power.Components /// When true, causes this to never appear powered. /// [ViewVariables(VVAccess.ReadWrite)] - public bool PowerDisabled { get => _powerDisabled; set => SetPowerDisabled(value); } [DataField("powerDisabled")] - private bool _powerDisabled; + public bool PowerDisabled { get => !NetworkLoad.Enabled; set => NetworkLoad.Enabled = !value; } + + public float LastPowerReceived = float.NaN; + + [ViewVariables] + public PowerState.Load NetworkLoad { get; } = new PowerState.Load + { + DesiredPower = 5 + }; protected override void Startup() { @@ -94,7 +120,8 @@ namespace Content.Server.Power.Components protected override void OnRemove() { - _provider.RemoveReceiver(this); + _provider?.RemoveReceiver(this); + base.OnRemove(); } @@ -108,20 +135,17 @@ namespace Content.Server.Power.Components public void ApcPowerChanged() { - var oldPowered = Powered; - HasApcPower = Provider.HasApcPower; - if (Powered != oldPowered) - OnNewPowerState(); + OnNewPowerState(); } - private bool TryFindAvailableProvider(out IPowerProvider foundProvider) + private bool TryFindAvailableProvider([NotNullWhen(true)] out ApcPowerProviderComponent? foundProvider) { var nearbyEntities = IoCManager.Resolve() .GetEntitiesInRange(Owner, PowerReceptionRange); foreach (var entity in nearbyEntities) { - if (entity.TryGetComponent(out var provider)) + if (entity.TryGetComponent(out var provider)) { if (provider.Connectable) { @@ -136,60 +160,18 @@ namespace Content.Server.Power.Components } } } - foundProvider = default!; + + foundProvider = default; return false; } - public void ClearProvider() - { - _provider.RemoveReceiver(this); - _provider = PowerProviderComponent.NullProvider; - NeedsProvider = true; - ApcPowerChanged(); - } - - private void SetProvider(IPowerProvider newProvider) - { - _provider.RemoveReceiver(this); - _provider = newProvider; - newProvider.AddReceiver(this); - NeedsProvider = false; - ApcPowerChanged(); - } - private void SetPowerReceptionRange(int newPowerReceptionRange) { - ClearProvider(); + Provider = null; _powerReceptionRange = newPowerReceptionRange; TryFindAndSetProvider(); } - private void SetLoad(int newLoad) - { - Provider.UpdateReceiverLoad(Load, newLoad); - _load = newLoad; - } - - private void SetNeedsPower(bool newNeedsPower) - { - var oldPowered = Powered; - _needsPower = newNeedsPower; - if (oldPowered != Powered) - { - OnNewPowerState(); - } - } - - private void SetPowerDisabled(bool newPowerDisabled) - { - var oldPowered = Powered; - _powerDisabled = newPowerDisabled; - if (oldPowered != Powered) - { - OnNewPowerState(); - } - } - private void OnNewPowerState() { SendMessage(new PowerChangedMessage(Powered)); @@ -211,7 +193,7 @@ namespace Content.Server.Power.Components } else { - ClearProvider(); + Provider = null; } } diff --git a/Content.Server/Power/Components/BaseApcNetComponent.cs b/Content.Server/Power/Components/BaseApcNetComponent.cs new file mode 100644 index 0000000000..e004606107 --- /dev/null +++ b/Content.Server/Power/Components/BaseApcNetComponent.cs @@ -0,0 +1,9 @@ +#nullable enable +using Content.Server.Power.NodeGroups; + +namespace Content.Server.Power.Components +{ + public abstract class BaseApcNetComponent : BaseNetConnectorComponent + { + } +} diff --git a/Content.Server/Power/Components/BaseCharger.cs b/Content.Server/Power/Components/BaseCharger.cs index a438ad97cb..753e5d59e8 100644 --- a/Content.Server/Power/Components/BaseCharger.cs +++ b/Content.Server/Power/Components/BaseCharger.cs @@ -1,7 +1,6 @@ #nullable enable using System; using System.Threading.Tasks; -using Content.Server.Battery.Components; using Content.Server.Hands.Components; using Content.Server.Items; using Content.Server.Weapon.Ranged.Barrels.Components; @@ -45,7 +44,7 @@ namespace Content.Server.Power.Components { base.Initialize(); - Owner.EnsureComponent(); + Owner.EnsureComponent(); _container = ContainerHelpers.EnsureContainer(Owner, $"{Name}-powerCellContainer"); // Default state in the visualizer is OFF, so when this gets powered on during initialization it will generally show empty } @@ -191,7 +190,7 @@ namespace Content.Server.Power.Components private CellChargerStatus GetStatus() { - if (Owner.TryGetComponent(out PowerReceiverComponent? receiver) && + if (Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) && !receiver.Powered) { return CellChargerStatus.Off; @@ -234,7 +233,7 @@ namespace Content.Server.Power.Components // Not called UpdateAppearance just because it messes with the load var status = GetStatus(); if (_status == status || - !Owner.TryGetComponent(out PowerReceiverComponent? receiver)) + !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver)) { return; } @@ -279,7 +278,7 @@ namespace Content.Server.Power.Components private void TransferPower(float frameTime) { - if (Owner.TryGetComponent(out PowerReceiverComponent? receiver) && + if (Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) && !receiver.Powered) { return; diff --git a/Content.Server/Power/Components/BaseNetConnectorComponent.cs b/Content.Server/Power/Components/BaseNetConnectorComponent.cs index 017b80ca65..d24fb16191 100644 --- a/Content.Server/Power/Components/BaseNetConnectorComponent.cs +++ b/Content.Server/Power/Components/BaseNetConnectorComponent.cs @@ -17,23 +17,18 @@ namespace Content.Server.Power.Components private Voltage _voltage = Voltage.High; [ViewVariables] - public TNetType Net { get => _net; set => SetNet(value); } - private TNetType _net = default!; //set in OnAdd() - - protected abstract TNetType NullNet { get; } + public TNetType? Net { get => _net; set => SetNet(value); } + private TNetType? _net; [ViewVariables] - private bool _needsNet = true; + private bool _needsNet => _net != null; - protected override void OnAdd() - { - base.OnAdd(); - _net = NullNet; - } + [DataField("node")] [ViewVariables] public string? NodeId; protected override void Initialize() { base.Initialize(); + if (_needsNet) { TryFindAndSetNet(); @@ -56,9 +51,8 @@ namespace Content.Server.Power.Components public void ClearNet() { - RemoveSelfFromNet(_net); - _net = NullNet; - _needsNet = true; + if (_net != null) + RemoveSelfFromNet(_net); } protected abstract void AddSelfToNet(TNetType net); @@ -70,7 +64,7 @@ namespace Content.Server.Power.Components if (Owner.TryGetComponent(out var container)) { var compatibleNet = container.Nodes.Values - .Where(node => node.NodeGroupID == (NodeGroupID) Voltage) + .Where(node => (NodeId == null || NodeId == node.Name) && node.NodeGroupID == (NodeGroupID) Voltage) .Select(node => node.NodeGroup) .OfType() .FirstOrDefault(); @@ -85,12 +79,15 @@ namespace Content.Server.Power.Components return false; } - private void SetNet(TNetType newNet) + private void SetNet(TNetType? newNet) { - RemoveSelfFromNet(_net); - AddSelfToNet(newNet); + if (_net != null) + RemoveSelfFromNet(_net); + + if (newNet != null) + AddSelfToNet(newNet); + _net = newNet; - _needsNet = false; } private void SetVoltage(Voltage newVoltage) diff --git a/Content.Server/Power/Components/BasePowerNetComponent.cs b/Content.Server/Power/Components/BasePowerNetComponent.cs index 78e00cf9dd..c25715abb4 100644 --- a/Content.Server/Power/Components/BasePowerNetComponent.cs +++ b/Content.Server/Power/Components/BasePowerNetComponent.cs @@ -1,10 +1,10 @@ #nullable enable using Content.Server.NodeContainer.NodeGroups; +using Content.Server.Power.NodeGroups; namespace Content.Server.Power.Components { public abstract class BasePowerNetComponent : BaseNetConnectorComponent { - protected override IPowerNet NullNet => PowerNetNodeGroup.NullNet; } } diff --git a/Content.Server/Power/Components/BatteryChargerComponent.cs b/Content.Server/Power/Components/BatteryChargerComponent.cs new file mode 100644 index 0000000000..f6b472cdb4 --- /dev/null +++ b/Content.Server/Power/Components/BatteryChargerComponent.cs @@ -0,0 +1,24 @@ +using Content.Server.Power.NodeGroups; +using Robust.Shared.GameObjects; + +namespace Content.Server.Power.Components +{ + /// + /// Connects the loading side of a to a non-APC power network. + /// + [RegisterComponent] + public class BatteryChargerComponent : BasePowerNetComponent + { + public override string Name => "BatteryCharger"; + + protected override void AddSelfToNet(IPowerNet net) + { + net.AddCharger(this); + } + + protected override void RemoveSelfFromNet(IPowerNet net) + { + net.RemoveCharger(this); + } + } +} diff --git a/Content.Server/Battery/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs similarity index 73% rename from Content.Server/Battery/Components/BatteryComponent.cs rename to Content.Server/Power/Components/BatteryComponent.cs index bc0ea33f65..480afbde0e 100644 --- a/Content.Server/Battery/Components/BatteryComponent.cs +++ b/Content.Server/Power/Components/BatteryComponent.cs @@ -5,8 +5,11 @@ using Robust.Shared.Maths; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Server.Battery.Components +namespace Content.Server.Power.Components { + /// + /// Battery node on the pow3r network. Needs other components to connect to actual networks. + /// [RegisterComponent] public class BatteryComponent : Component { @@ -15,9 +18,9 @@ namespace Content.Server.Battery.Components /// /// Maximum charge of the battery in joules (ie. watt seconds) /// - [ViewVariables(VVAccess.ReadWrite)] public int MaxCharge { get => _maxCharge; set => SetMaxCharge(value); } + [ViewVariables(VVAccess.ReadWrite)] public float MaxCharge { get => _maxCharge; set => SetMaxCharge(value); } [DataField("maxCharge")] - private int _maxCharge = 1000; + private float _maxCharge; /// /// Current charge of the battery in joules (ie. watt seconds) @@ -25,7 +28,7 @@ namespace Content.Server.Battery.Components [ViewVariables(VVAccess.ReadWrite)] public float CurrentCharge { get => _currentCharge; set => SetCurrentCharge(value); } [DataField("startingCharge")] - private float _currentCharge = 500; + private float _currentCharge; /// /// True if the battery is fully charged. @@ -36,14 +39,6 @@ namespace Content.Server.Battery.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("autoRechargeRate")] public float AutoRechargeRate { get; set; } - [ViewVariables] public BatteryState BatteryState { get; private set; } - - protected override void Initialize() - { - base.Initialize(); - UpdateStorageState(); - } - /// /// If sufficient charge is avaiable on the battery, use it. Otherwise, don't. /// @@ -83,34 +78,16 @@ namespace Content.Server.Battery.Components protected virtual void OnChargeChanged() { } - private void UpdateStorageState() - { - if (IsFullyCharged) - { - BatteryState = BatteryState.Full; - } - else if (CurrentCharge == 0) - { - BatteryState = BatteryState.Empty; - } - else - { - BatteryState = BatteryState.PartlyFull; - } - } - - private void SetMaxCharge(int newMax) + private void SetMaxCharge(float newMax) { _maxCharge = Math.Max(newMax, 0); _currentCharge = Math.Min(_currentCharge, MaxCharge); - UpdateStorageState(); OnChargeChanged(); } private void SetCurrentCharge(float newChargeAmount) { _currentCharge = MathHelper.Clamp(newChargeAmount, 0, MaxCharge); - UpdateStorageState(); OnChargeChanged(); } @@ -121,11 +98,4 @@ namespace Content.Server.Battery.Components CurrentCharge += AutoRechargeRate * frameTime; } } - - public enum BatteryState - { - Full, - PartlyFull, - Empty - } } diff --git a/Content.Server/Power/Components/BatteryDischargerComponent.cs b/Content.Server/Power/Components/BatteryDischargerComponent.cs index 62335e2727..37cb8dbe58 100644 --- a/Content.Server/Power/Components/BatteryDischargerComponent.cs +++ b/Content.Server/Power/Components/BatteryDischargerComponent.cs @@ -1,79 +1,21 @@ -#nullable enable -using Content.Server.Battery.Components; +using Content.Server.Power.NodeGroups; using Robust.Shared.GameObjects; -using Robust.Shared.Serialization.Manager.Attributes; -using Robust.Shared.ViewVariables; namespace Content.Server.Power.Components { - /// - /// Uses charge from a to supply power via a . - /// [RegisterComponent] - public class BatteryDischargerComponent : Component + public class BatteryDischargerComponent : BasePowerNetComponent { public override string Name => "BatteryDischarger"; - [ViewVariables] - [ComponentDependency] private BatteryComponent? _battery = default!; - - [ViewVariables] - [ComponentDependency] private PowerSupplierComponent? _supplier = default!; - - [ViewVariables(VVAccess.ReadWrite)] - public int ActiveSupplyRate { get => _activeSupplyRate; set => SetActiveSupplyRate(value); } - - [DataField("activeSupplyRate")] - private int _activeSupplyRate = 50; - - protected override void Initialize() + protected override void AddSelfToNet(IPowerNet net) { - base.Initialize(); - Owner.EnsureComponentWarn(); - UpdateSupplyRate(); + net.AddDischarger(this); } - public void Update(float frameTime) + protected override void RemoveSelfFromNet(IPowerNet net) { - if (_battery == null) - return; - - //Simplified implementation - if the battery is empty, and charge is being added to the battery - //at a lower rate that this is using it, the charge is used without creating power supply. - _battery.CurrentCharge -= ActiveSupplyRate * frameTime; - UpdateSupplyRate(); - } - - private void UpdateSupplyRate() - { - if (_battery == null) - return; - - if (_battery.BatteryState == BatteryState.Empty) - { - SetSupplierSupplyRate(0); - } - else - { - SetSupplierSupplyRate(ActiveSupplyRate); - } - } - - private void SetSupplierSupplyRate(int newSupplierSupplyRate) - { - if (_supplier == null) - return; - - if (_supplier.SupplyRate != newSupplierSupplyRate) - { - _supplier.SupplyRate = newSupplierSupplyRate; - } - } - - private void SetActiveSupplyRate(int newEnabledSupplyRate) - { - _activeSupplyRate = newEnabledSupplyRate; - UpdateSupplyRate(); + net.RemoveDischarger(this); } } } diff --git a/Content.Server/Power/Components/BatteryStorageComponent.cs b/Content.Server/Power/Components/BatteryStorageComponent.cs deleted file mode 100644 index daa1dba4d6..0000000000 --- a/Content.Server/Power/Components/BatteryStorageComponent.cs +++ /dev/null @@ -1,79 +0,0 @@ -#nullable enable -using Content.Server.Battery.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization.Manager.Attributes; -using Robust.Shared.ViewVariables; - -namespace Content.Server.Power.Components -{ - /// - /// Takes power via a to charge a . - /// - [RegisterComponent] - public class BatteryStorageComponent : Component - { - public override string Name => "BatteryStorage"; - - [ViewVariables(VVAccess.ReadWrite)] - public int ActiveDrawRate { get => _activeDrawRate; set => SetActiveDrawRate(value); } - [DataField("activeDrawRate")] - private int _activeDrawRate = 100; - - [ViewVariables] - [ComponentDependency] private BatteryComponent? _battery = default!; - - [ViewVariables] - public PowerConsumerComponent? Consumer => _consumer; - - [ComponentDependency] private PowerConsumerComponent? _consumer = default!; - - protected override void Initialize() - { - base.Initialize(); - Owner.EnsureComponentWarn(); - UpdateDrawRate(); - } - - public void Update(float frameTime) - { - if (_consumer == null || _battery == null) - return; - - //Simplified implementation - If a frame adds more power to a partially full battery than it can hold, the power is lost. - _battery.CurrentCharge += _consumer.ReceivedPower * frameTime; - UpdateDrawRate(); - } - - private void UpdateDrawRate() - { - if (_battery == null) - return; - - if (_battery.BatteryState == BatteryState.Full) - { - SetConsumerDraw(0); - } - else - { - SetConsumerDraw(ActiveDrawRate); - } - } - - private void SetConsumerDraw(int newConsumerDrawRate) - { - if (_consumer == null) - return; - - if (_consumer.DrawRate != newConsumerDrawRate) - { - _consumer.DrawRate = newConsumerDrawRate; - } - } - - private void SetActiveDrawRate(int newEnabledDrawRate) - { - _activeDrawRate = newEnabledDrawRate; - UpdateDrawRate(); - } - } -} diff --git a/Content.Server/Wires/Components/WireComponent.cs b/Content.Server/Power/Components/CableComponent.cs similarity index 61% rename from Content.Server/Wires/Components/WireComponent.cs rename to Content.Server/Power/Components/CableComponent.cs index 473a6d8375..b95f790953 100644 --- a/Content.Server/Wires/Components/WireComponent.cs +++ b/Content.Server/Power/Components/CableComponent.cs @@ -3,45 +3,44 @@ using System.Threading.Tasks; using Content.Server.Stack; using Content.Server.Tools.Components; using Content.Shared.Interaction; -using Content.Shared.Stacks; using Content.Shared.Tool; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Server.Wires.Components +namespace Content.Server.Power.Components { /// - /// Allows the attached entity to be destroyed by a cutting tool, dropping a piece of wire. + /// Allows the attached entity to be destroyed by a cutting tool, dropping a piece of cable. /// [RegisterComponent] - public class WireComponent : Component, IInteractUsing + public class CableComponent : Component, IInteractUsing { - public override string Name => "Wire"; + public override string Name => "Cable"; [ViewVariables] - [DataField("wireDroppedOnCutPrototype")] - private string? _wireDroppedOnCutPrototype = "HVWireStack1"; + [DataField("cableDroppedOnCutPrototype")] + private string? _cableDroppedOnCutPrototype = "CableHVStack1"; /// - /// Checked by to determine if there is - /// already a wire of a type on a tile. + /// Checked by to determine if there is + /// already a cable of a type on a tile. /// [ViewVariables] - public WireType WireType => _wireType; - [DataField("wireType")] - private WireType _wireType = WireType.HighVoltage; + public CableType CableType => _cableType; + [DataField("cableType")] + private CableType _cableType = CableType.HighVoltage; async Task IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) { - if (_wireDroppedOnCutPrototype == null) + if (_cableDroppedOnCutPrototype == null) return false; if (!eventArgs.Using.TryGetComponent(out var tool)) return false; if (!await tool.UseTool(eventArgs.User, Owner, 0.25f, ToolQuality.Cutting)) return false; Owner.Delete(); - var droppedEnt = Owner.EntityManager.SpawnEntity(_wireDroppedOnCutPrototype, eventArgs.ClickLocation); + var droppedEnt = Owner.EntityManager.SpawnEntity(_cableDroppedOnCutPrototype, eventArgs.ClickLocation); // TODO: Literally just use a prototype that has a single thing in the stack, it's not that complicated... if (droppedEnt.TryGetComponent(out var stack)) @@ -51,7 +50,7 @@ namespace Content.Server.Wires.Components } } - public enum WireType + public enum CableType { HighVoltage, MediumVoltage, diff --git a/Content.Server/Wires/Components/WirePlacerComponent.cs b/Content.Server/Power/Components/CablePlacerComponent.cs similarity index 73% rename from Content.Server/Wires/Components/WirePlacerComponent.cs rename to Content.Server/Power/Components/CablePlacerComponent.cs index 6b83e9de6c..a2eb805730 100644 --- a/Content.Server/Wires/Components/WirePlacerComponent.cs +++ b/Content.Server/Power/Components/CablePlacerComponent.cs @@ -9,28 +9,28 @@ using Robust.Shared.Map; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Server.Wires.Components +namespace Content.Server.Power.Components { [RegisterComponent] - internal class WirePlacerComponent : Component, IAfterInteract + internal class CablePlacerComponent : Component, IAfterInteract { [Dependency] private readonly IMapManager _mapManager = default!; /// - public override string Name => "WirePlacer"; + public override string Name => "CablePlacer"; [ViewVariables] - [DataField("wirePrototypeID")] - private string? _wirePrototypeID = "HVWire"; + [DataField("cablePrototypeID")] + private string? _cablePrototypeID = "CableHV"; [ViewVariables] [DataField("blockingWireType")] - private WireType _blockingWireType = WireType.HighVoltage; + private CableType _blockingCableType = CableType.HighVoltage; /// async Task IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs) { - if (_wirePrototypeID == null) + if (_cablePrototypeID == null) return true; if (!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true)) return true; @@ -41,7 +41,7 @@ namespace Content.Server.Wires.Components return true; foreach (var anchored in grid.GetAnchoredEntities(snapPos)) { - if (Owner.EntityManager.ComponentManager.TryGetComponent(anchored, out var wire) && wire.WireType == _blockingWireType) + if (Owner.EntityManager.ComponentManager.TryGetComponent(anchored, out var wire) && wire.CableType == _blockingCableType) { return true; } @@ -51,7 +51,7 @@ namespace Content.Server.Wires.Components && !EntitySystem.Get().Use(Owner.Uid, stack, 1)) return true; - Owner.EntityManager.SpawnEntity(_wirePrototypeID, grid.GridTileToLocal(snapPos)); + Owner.EntityManager.SpawnEntity(_cablePrototypeID, grid.GridTileToLocal(snapPos)); return true; } } diff --git a/Content.Server/Power/Components/CableVisComponent.cs b/Content.Server/Power/Components/CableVisComponent.cs new file mode 100644 index 0000000000..add61d7de5 --- /dev/null +++ b/Content.Server/Power/Components/CableVisComponent.cs @@ -0,0 +1,16 @@ +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.ViewVariables; + +namespace Content.Server.Power.Components +{ + [RegisterComponent] + public sealed class CableVisComponent : Component + { + public override string Name => "CableVis"; + + [ViewVariables(VVAccess.ReadWrite)] + [DataField("node")] + public string? Node; + } +} diff --git a/Content.Server/Battery/Components/ExaminableBatteryComponent.cs b/Content.Server/Power/Components/ExaminableBatteryComponent.cs similarity index 96% rename from Content.Server/Battery/Components/ExaminableBatteryComponent.cs rename to Content.Server/Power/Components/ExaminableBatteryComponent.cs index 202572e568..e5da57a61c 100644 --- a/Content.Server/Battery/Components/ExaminableBatteryComponent.cs +++ b/Content.Server/Power/Components/ExaminableBatteryComponent.cs @@ -5,7 +5,7 @@ using Robust.Shared.Localization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -namespace Content.Server.Battery.Components +namespace Content.Server.Power.Components { [RegisterComponent] public class ExaminableBatteryComponent : Component, IExamine diff --git a/Content.Server/Power/Components/IPowerNetManager.cs b/Content.Server/Power/Components/IPowerNetManager.cs deleted file mode 100644 index 51487f2297..0000000000 --- a/Content.Server/Power/Components/IPowerNetManager.cs +++ /dev/null @@ -1,39 +0,0 @@ -#nullable enable -using System.Collections.Generic; -using Content.Server.NodeContainer.NodeGroups; - -namespace Content.Server.Power.Components -{ - /// - /// Maintains a set of s that need to be updated with . - /// Defers updating to reduce recalculations when a group is altered multiple times in a frame. - /// - public interface IPowerNetManager - { - /// - /// Queue up an to be updated. - /// - void AddDirtyPowerNet(IPowerNet powerNet); - - void Update(float frameTime); - } - - public class PowerNetManager : IPowerNetManager - { - private readonly HashSet _dirtyPowerNets = new(); - - public void AddDirtyPowerNet(IPowerNet powerNet) - { - _dirtyPowerNets.Add(powerNet); - } - - public void Update(float frameTime) - { - foreach (var powerNet in _dirtyPowerNets) - { - powerNet.UpdateConsumerReceivedPower(); - } - _dirtyPowerNets.Clear(); - } - } -} diff --git a/Content.Server/Power/Components/PowerConsumerComponent.cs b/Content.Server/Power/Components/PowerConsumerComponent.cs index 94c3f2b064..a9c44434bd 100644 --- a/Content.Server/Power/Components/PowerConsumerComponent.cs +++ b/Content.Server/Power/Components/PowerConsumerComponent.cs @@ -1,13 +1,15 @@ #nullable enable -using System; -using System.Diagnostics; -using Content.Server.NodeContainer.NodeGroups; +using Content.Server.Power.NodeGroups; +using Content.Server.Power.Pow3r; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; namespace Content.Server.Power.Components { + /// + /// Draws power directly from an MV or HV wire it is on top of. + /// [RegisterComponent] public class PowerConsumerComponent : BasePowerNetComponent { @@ -16,28 +18,19 @@ namespace Content.Server.Power.Components /// /// How much power this needs to be fully powered. /// - [ViewVariables(VVAccess.ReadWrite)] - public int DrawRate { get => _drawRate; set => SetDrawRate(value); } [DataField("drawRate")] - private int _drawRate; - - /// - /// Determines which s receive power when there is not enough - /// power for each. - /// [ViewVariables(VVAccess.ReadWrite)] - public Priority Priority { get => _priority; set => SetPriority(value); } - [DataField("priority")] - private Priority _priority = Priority.First; + public float DrawRate { get => NetworkLoad.DesiredPower; set => NetworkLoad.DesiredPower = value; } /// /// How much power this is currently receiving from s. /// [ViewVariables] - public int ReceivedPower { get => _receivedPower; set => SetReceivedPower(value); } - private int _receivedPower; + public float ReceivedPower => NetworkLoad.ReceivingPower; - public event EventHandler? OnReceivedPowerChanged; + public float LastReceived = float.NaN; + + public PowerState.Load NetworkLoad { get; } = new(); protected override void AddSelfToNet(IPowerNet powerNet) { @@ -48,44 +41,5 @@ namespace Content.Server.Power.Components { powerNet.RemoveConsumer(this); } - - private void SetDrawRate(int newDrawRate) - { - var oldDrawRate = DrawRate; - _drawRate = newDrawRate; //must be set before updating powernet, as it checks the DrawRate of every consumer - Net.UpdateConsumerDraw(this, oldDrawRate, newDrawRate); - } - - private void SetReceivedPower(int newReceivedPower) - { - Debug.Assert(newReceivedPower >= 0 && newReceivedPower <= DrawRate); - if(_receivedPower == newReceivedPower) return; - _receivedPower = newReceivedPower; - OnReceivedPowerChanged?.Invoke(this, new ReceivedPowerChangedEventArgs(_drawRate, _receivedPower)); - } - - private void SetPriority(Priority newPriority) - { - Net.UpdateConsumerPriority(this, Priority, newPriority); - _priority = newPriority; - } - } - - public enum Priority - { - First, - Last, - } - - public class ReceivedPowerChangedEventArgs : EventArgs - { - public readonly int DrawRate; - public readonly int ReceivedPower; - - public ReceivedPowerChangedEventArgs(int drawRate, int receivedPower) - { - DrawRate = drawRate; - ReceivedPower = receivedPower; - } } } diff --git a/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs b/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs new file mode 100644 index 0000000000..5da505e03d --- /dev/null +++ b/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs @@ -0,0 +1,119 @@ +using Content.Server.Power.Pow3r; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.ViewVariables; + +namespace Content.Server.Power.Components +{ + /// + /// Glue component that manages the pow3r network node for batteries that are connected to the power network. + /// + /// + /// This needs components like to work correctly, + /// and battery storage should be handed off to components like . + /// + [RegisterComponent] + public sealed class PowerNetworkBatteryComponent : Component + { + public override string Name => "PowerNetworkBattery"; + + [DataField("maxChargeRate")] + [ViewVariables(VVAccess.ReadWrite)] + public float MaxChargeRate + { + get => NetworkBattery.MaxChargeRate; + set => NetworkBattery.MaxChargeRate = value; + } + + [DataField("maxSupply")] + [ViewVariables(VVAccess.ReadWrite)] + public float MaxSupply + { + get => NetworkBattery.MaxSupply; + set => NetworkBattery.MaxSupply = value; + } + + [DataField("supplyRampTolerance")] + [ViewVariables(VVAccess.ReadWrite)] + public float SupplyRampTolerance + { + get => NetworkBattery.SupplyRampTolerance; + set => NetworkBattery.SupplyRampTolerance = value; + } + + [DataField("supplyRampRate")] + [ViewVariables(VVAccess.ReadWrite)] + public float SupplyRampRate + { + get => NetworkBattery.SupplyRampRate; + set => NetworkBattery.SupplyRampRate = value; + } + + [DataField("supplyRampPosition")] + [ViewVariables(VVAccess.ReadWrite)] + public float SupplyRampPosition + { + get => NetworkBattery.SupplyRampPosition; + set => NetworkBattery.SupplyRampPosition = value; + } + + [DataField("currentSupply")] + [ViewVariables(VVAccess.ReadWrite)] + public float CurrentSupply + { + get => NetworkBattery.CurrentSupply; + set => NetworkBattery.CurrentSupply = value; + } + + [DataField("currentReceiving")] + [ViewVariables(VVAccess.ReadWrite)] + public float CurrentReceiving + { + get => NetworkBattery.CurrentReceiving; + set => NetworkBattery.CurrentReceiving = value; + } + + [DataField("loadingNetworkDemand")] + [ViewVariables(VVAccess.ReadWrite)] + public float LoadingNetworkDemand + { + get => NetworkBattery.LoadingNetworkDemand; + set => NetworkBattery.LoadingNetworkDemand = value; + } + + [DataField("enabled")] + [ViewVariables(VVAccess.ReadWrite)] + public bool Enabled + { + get => NetworkBattery.Enabled; + set => NetworkBattery.Enabled = value; + } + + [DataField("canCharge")] + [ViewVariables(VVAccess.ReadWrite)] + public bool CanCharge + { + get => NetworkBattery.CanCharge; + set => NetworkBattery.CanCharge = value; + } + + [DataField("canDisharge")] + [ViewVariables(VVAccess.ReadWrite)] + public bool CanDischarge + { + get => NetworkBattery.CanDischarge; + set => NetworkBattery.CanDischarge = value; + } + + [DataField("efficiency")] + [ViewVariables(VVAccess.ReadWrite)] + public float Efficiency + { + get => NetworkBattery.Efficiency; + set => NetworkBattery.Efficiency = value; + } + + [ViewVariables] + public PowerState.Battery NetworkBattery { get; } = new(); + } +} diff --git a/Content.Server/Power/Components/PowerProviderComponent.cs b/Content.Server/Power/Components/PowerProviderComponent.cs deleted file mode 100644 index 1b8a35cbf2..0000000000 --- a/Content.Server/Power/Components/PowerProviderComponent.cs +++ /dev/null @@ -1,174 +0,0 @@ -#nullable enable -using System; -using System.Collections.Generic; -using Content.Server.APC; -using Content.Server.APC.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Serialization.Manager.Attributes; -using Robust.Shared.ViewVariables; - -namespace Content.Server.Power.Components -{ - /// - /// Relays s in an area to a so they can receive power. - /// - public interface IPowerProvider - { - void AddReceiver(PowerReceiverComponent receiver); - - void RemoveReceiver(PowerReceiverComponent receiver); - - void UpdateReceiverLoad(int oldLoad, int newLoad); - - public IEntity? ProviderOwner { get; } - - public bool HasApcPower { get; } - } - - [RegisterComponent] - public class PowerProviderComponent : BaseApcNetComponent, IPowerProvider - { - public override string Name => "PowerProvider"; - - public IEntity ProviderOwner => Owner; - - [ViewVariables] - public bool HasApcPower => Net.Powered; - - /// - /// The max distance this can transmit power to s from. - /// - [ViewVariables(VVAccess.ReadWrite)] - public int PowerTransferRange { get => _powerTransferRange; set => SetPowerTransferRange(value); } - [DataField("powerTransferRange")] - private int _powerTransferRange = 3; - - [ViewVariables] - public IReadOnlyList LinkedReceivers => _linkedReceivers; - private List _linkedReceivers = new(); - - /// - /// If s should consider connecting to this. - /// - [ViewVariables(VVAccess.ReadWrite)] - public bool Connectable { get; private set; } = true; - - public static readonly IPowerProvider NullProvider = new NullPowerProvider(); - - public void AddReceiver(PowerReceiverComponent receiver) - { - var oldLoad = GetTotalLoad(); - _linkedReceivers.Add(receiver); - var newLoad = oldLoad + receiver.Load; - Net.UpdatePowerProviderReceivers(this, oldLoad, newLoad); - } - - public void RemoveReceiver(PowerReceiverComponent receiver) - { - var oldLoad = GetTotalLoad(); - _linkedReceivers.Remove(receiver); - var newLoad = oldLoad - receiver.Load; - Net.UpdatePowerProviderReceivers(this, oldLoad, newLoad); - } - - public void UpdateReceiverLoad(int oldLoad, int newLoad) - { - Net.UpdatePowerProviderReceivers(this, oldLoad, newLoad); - } - - protected override void Startup() - { - base.Startup(); - foreach (var receiver in FindAvailableReceivers()) - { - receiver.Provider = this; - } - } - - protected override void OnRemove() - { - Connectable = false; - var receivers = _linkedReceivers.ToArray(); - foreach (var receiver in receivers) - { - receiver.ClearProvider(); - } - foreach (var receiver in receivers) - { - receiver.TryFindAndSetProvider(); - } - base.OnRemove(); - } - - private List FindAvailableReceivers() - { - var nearbyEntities = IoCManager.Resolve() - .GetEntitiesInRange(Owner, PowerTransferRange); - - var receivers = new List(); - - foreach (var entity in nearbyEntities) - { - if (entity.TryGetComponent(out var receiver) && - receiver.Connectable && - receiver.NeedsProvider && - receiver.Owner.Transform.Coordinates.TryDistance(Owner.EntityManager, Owner.Transform.Coordinates, out var distance) && - distance < Math.Min(PowerTransferRange, receiver.PowerReceptionRange)) - { - receivers.Add(receiver); - } - } - return receivers; - } - - protected override void AddSelfToNet(IApcNet apcNet) - { - apcNet.AddPowerProvider(this); - } - - protected override void RemoveSelfFromNet(IApcNet apcNet) - { - apcNet.RemovePowerProvider(this); - } - - private void SetPowerTransferRange(int newPowerTransferRange) - { - var receivers = _linkedReceivers.ToArray(); - - foreach (var receiver in receivers) - { - receiver.ClearProvider(); - } - _powerTransferRange = newPowerTransferRange; - - foreach (var receiver in receivers) - { - receiver.TryFindAndSetProvider(); - } - } - - private int GetTotalLoad() - { - var load = 0; - foreach (var receiver in _linkedReceivers) - { - load += receiver.Load; - } - return load; - } - - private class NullPowerProvider : IPowerProvider - { - /// - /// It is important that this returns false, so s with a have no power. - /// - public bool HasApcPower => false; - - public void AddReceiver(PowerReceiverComponent receiver) { } - public void RemoveReceiver(PowerReceiverComponent receiver) { } - public void UpdateReceiverLoad(int oldLoad, int newLoad) { } - public IEntity? ProviderOwner => default; - } - } -} diff --git a/Content.Server/Power/Components/PowerSupplierComponent.cs b/Content.Server/Power/Components/PowerSupplierComponent.cs index bbd8b658fd..c145cd6803 100644 --- a/Content.Server/Power/Components/PowerSupplierComponent.cs +++ b/Content.Server/Power/Components/PowerSupplierComponent.cs @@ -1,5 +1,6 @@ #nullable enable -using Content.Server.NodeContainer.NodeGroups; +using Content.Server.Power.NodeGroups; +using Content.Server.Power.Pow3r; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -12,9 +13,45 @@ namespace Content.Server.Power.Components public override string Name => "PowerSupplier"; [ViewVariables(VVAccess.ReadWrite)] - public int SupplyRate { get => _supplyRate; set => SetSupplyRate(value); } [DataField("supplyRate")] - private int _supplyRate; + public float MaxSupply { get => NetworkSupply.MaxSupply; set => NetworkSupply.MaxSupply = value; } + + [ViewVariables(VVAccess.ReadWrite)] + [DataField("supplyRampTolerance")] + public float SupplyRampTolerance + { + get => NetworkSupply.SupplyRampTolerance; + set => NetworkSupply.SupplyRampTolerance = value; + } + + [ViewVariables(VVAccess.ReadWrite)] + [DataField("supplyRampRate")] + public float SupplyRampRate + { + get => NetworkSupply.SupplyRampRate; + set => NetworkSupply.SupplyRampRate = value; + } + + [ViewVariables(VVAccess.ReadWrite)] + [DataField("supplyRampPosition")] + public float SupplyRampPosition + { + get => NetworkSupply.SupplyRampPosition; + set => NetworkSupply.SupplyRampPosition = value; + } + + [ViewVariables(VVAccess.ReadWrite)] + [DataField("enabled")] + public bool Enabled + { + get => NetworkSupply.Enabled; + set => NetworkSupply.Enabled = value; + } + + [ViewVariables] public float CurrentSupply => NetworkSupply.CurrentSupply; + + [ViewVariables] + public PowerState.Supply NetworkSupply { get; } = new(); protected override void AddSelfToNet(IPowerNet powerNet) { @@ -25,11 +62,5 @@ namespace Content.Server.Power.Components { powerNet.RemoveSupplier(this); } - - private void SetSupplyRate(int newSupplyRate) - { - Net.UpdateSupplierSupply(this, SupplyRate, newSupplyRate); - _supplyRate = newSupplyRate; - } } } diff --git a/Content.Server/Battery/DrainAllBatteriesCommand.cs b/Content.Server/Power/DrainAllBatteriesCommand.cs similarity index 78% rename from Content.Server/Battery/DrainAllBatteriesCommand.cs rename to Content.Server/Power/DrainAllBatteriesCommand.cs index 561d171d5b..431e68c4d8 100644 --- a/Content.Server/Battery/DrainAllBatteriesCommand.cs +++ b/Content.Server/Power/DrainAllBatteriesCommand.cs @@ -1,12 +1,12 @@ #nullable enable using Content.Server.Administration; -using Content.Server.Battery.Components; +using Content.Server.Power.Components; using Content.Shared.Administration; using Robust.Shared.Console; using Robust.Shared.GameObjects; using Robust.Shared.IoC; -namespace Content.Server.Battery +namespace Content.Server.Power { [AdminCommand(AdminFlags.Admin)] public class DrainAllBatteriesCommand : IConsoleCommand @@ -23,8 +23,8 @@ namespace Content.Server.Battery return; } - var entityManager = IoCManager.Resolve(); - foreach (var batteryComp in entityManager.ComponentManager.EntityQuery()) + var comp = IoCManager.Resolve(); + foreach (var batteryComp in comp.EntityQuery()) { batteryComp.CurrentCharge = 0; } diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs new file mode 100644 index 0000000000..ce54a7e866 --- /dev/null +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -0,0 +1,42 @@ +#nullable enable +using Content.Server.Power.Components; +using JetBrains.Annotations; +using Robust.Shared.GameObjects; + +namespace Content.Server.Power.EntitySystems +{ + [UsedImplicitly] + public class BatterySystem : EntitySystem + { + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(PreSync); + SubscribeLocalEvent(PostSync); + } + + private void PreSync(EntityUid uid, BatteryComponent component, NetworkBatteryPreSync args) + { + var networkBattery = ComponentManager.GetComponent(uid); + + networkBattery.NetworkBattery.Capacity = component.MaxCharge; + networkBattery.NetworkBattery.CurrentStorage = component.CurrentCharge; + } + + private void PostSync(EntityUid uid, BatteryComponent component, NetworkBatteryPostSync args) + { + var networkBattery = ComponentManager.GetComponent(uid); + + component.CurrentCharge = networkBattery.NetworkBattery.CurrentStorage; + } + + public override void Update(float frameTime) + { + foreach (var comp in ComponentManager.EntityQuery()) + { + comp.OnUpdate(frameTime); + } + } + } +} diff --git a/Content.Server/Power/EntitySystems/CableVisSystem.cs b/Content.Server/Power/EntitySystems/CableVisSystem.cs new file mode 100644 index 0000000000..d0425d63b5 --- /dev/null +++ b/Content.Server/Power/EntitySystems/CableVisSystem.cs @@ -0,0 +1,85 @@ +using System.Collections.Generic; +using Content.Server.NodeContainer; +using Content.Server.NodeContainer.EntitySystems; +using Content.Server.Power.Components; +using Content.Server.Power.Nodes; +using Content.Shared.Wires; +using JetBrains.Annotations; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; + +namespace Content.Server.Power.EntitySystems +{ + [UsedImplicitly] + public sealed class CableVisSystem : EntitySystem + { + [Dependency] private readonly IMapManager _mapManager = default!; + + private readonly HashSet _toUpdate = new(); + + public void QueueUpdate(EntityUid uid) + { + _toUpdate.Add(uid); + } + + public override void Initialize() + { + base.Initialize(); + + UpdatesAfter.Add(typeof(NodeGroupSystem)); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + foreach (var uid in _toUpdate) + { + if (!ComponentManager.TryGetComponent(uid, out NodeContainerComponent? nodeContainer) + || !ComponentManager.TryGetComponent(uid, out CableVisComponent? cableVis) + || !ComponentManager.TryGetComponent(uid, out AppearanceComponent? appearance)) + { + continue; + } + + if (cableVis.Node == null) + continue; + + var mask = WireVisDirFlags.None; + + var transform = ComponentManager.GetComponent(uid); + var grid = _mapManager.GetGrid(transform.GridID); + var tile = grid.TileIndicesFor(transform.Coordinates); + var node = nodeContainer.GetNode(cableVis.Node); + + foreach (var reachable in node.ReachableNodes) + { + if (reachable is not CableNode) + continue; + + var otherTransform = reachable.Owner.Transform; + if (otherTransform.GridID != grid.Index) + continue; + + var otherTile = grid.TileIndicesFor(otherTransform.Coordinates); + var diff = otherTile - tile; + + mask |= diff switch + { + (0, 1) => WireVisDirFlags.North, + (0, -1) => WireVisDirFlags.South, + (1, 0) => WireVisDirFlags.East, + (-1, 0) => WireVisDirFlags.West, + _ => WireVisDirFlags.None + }; + } + + appearance.SetData(WireVisVisuals.ConnectedMask, mask); + } + + _toUpdate.Clear(); + } + } +} diff --git a/Content.Server/APC/PowerApcSystem.cs b/Content.Server/Power/EntitySystems/PowerApcSystem.cs similarity index 59% rename from Content.Server/APC/PowerApcSystem.cs rename to Content.Server/Power/EntitySystems/PowerApcSystem.cs index 1aefa669f4..e44b66f260 100644 --- a/Content.Server/APC/PowerApcSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerApcSystem.cs @@ -1,16 +1,23 @@ #nullable enable -using Content.Server.APC.Components; +using Content.Server.Power.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; -namespace Content.Server.APC +namespace Content.Server.Power.EntitySystems { [UsedImplicitly] internal sealed class PowerApcSystem : EntitySystem { + public override void Initialize() + { + base.Initialize(); + + UpdatesAfter.Add(typeof(PowerNetSystem)); + } + public override void Update(float frameTime) { - foreach (var apc in ComponentManager.EntityQuery(false)) + foreach (var apc in ComponentManager.EntityQuery()) { apc.Update(); } diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs index bcb8ec6926..e2b54ac769 100644 --- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs @@ -1,20 +1,351 @@ #nullable enable +using System.Collections.Generic; +using Content.Server.NodeContainer.EntitySystems; using Content.Server.Power.Components; +using Content.Server.Power.NodeGroups; +using Content.Server.Power.Pow3r; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; +using Robust.Shared.Maths; namespace Content.Server.Power.EntitySystems { + /// + /// Manages power networks, power state, and all power components. + /// [UsedImplicitly] public class PowerNetSystem : EntitySystem { - [Dependency] private readonly IPowerNetManager _powerNetManager = default!; + private readonly PowerState _powerState = new(); + private readonly HashSet _powerNetReconnectQueue = new(); + private readonly HashSet _apcNetReconnectQueue = new(); + + private int _nextId = 1; + private readonly BatteryRampPegSolver _solver = new(); + + public override void Initialize() + { + base.Initialize(); + + UpdatesAfter.Add(typeof(NodeGroupSystem)); + + SubscribeLocalEvent(ApcPowerReceiverInit); + SubscribeLocalEvent(ApcPowerReceiverShutdown); + SubscribeLocalEvent(ApcPowerReceiverPaused); + SubscribeLocalEvent(BatteryInit); + SubscribeLocalEvent(BatteryShutdown); + SubscribeLocalEvent(BatteryPaused); + SubscribeLocalEvent(PowerConsumerInit); + SubscribeLocalEvent(PowerConsumerShutdown); + SubscribeLocalEvent(PowerConsumerPaused); + SubscribeLocalEvent(PowerSupplierInit); + SubscribeLocalEvent(PowerSupplierShutdown); + SubscribeLocalEvent(PowerSupplierPaused); + } + + private void ApcPowerReceiverInit(EntityUid uid, ApcPowerReceiverComponent component, ComponentInit args) + { + AllocLoad(component.NetworkLoad); + } + + private void ApcPowerReceiverShutdown(EntityUid uid, ApcPowerReceiverComponent component, + ComponentShutdown args) + { + _powerState.Loads.Remove(component.NetworkLoad.Id); + } + + private static void ApcPowerReceiverPaused( + EntityUid uid, + ApcPowerReceiverComponent component, + EntityPausedEvent args) + { + component.NetworkLoad.Paused = args.Paused; + } + + private void BatteryInit(EntityUid uid, PowerNetworkBatteryComponent component, ComponentInit args) + { + AllocBattery(component.NetworkBattery); + } + + private void BatteryShutdown(EntityUid uid, PowerNetworkBatteryComponent component, ComponentShutdown args) + { + _powerState.Batteries.Remove(component.NetworkBattery.Id); + } + + private static void BatteryPaused(EntityUid uid, PowerNetworkBatteryComponent component, EntityPausedEvent args) + { + component.NetworkBattery.Paused = args.Paused; + } + + private void PowerConsumerInit(EntityUid uid, PowerConsumerComponent component, ComponentInit args) + { + AllocLoad(component.NetworkLoad); + } + + private void PowerConsumerShutdown(EntityUid uid, PowerConsumerComponent component, ComponentShutdown args) + { + _powerState.Loads.Remove(component.NetworkLoad.Id); + } + + private static void PowerConsumerPaused(EntityUid uid, PowerConsumerComponent component, EntityPausedEvent args) + { + component.NetworkLoad.Paused = args.Paused; + } + + private void PowerSupplierInit(EntityUid uid, PowerSupplierComponent component, ComponentInit args) + { + AllocSupply(component.NetworkSupply); + } + + private void PowerSupplierShutdown(EntityUid uid, PowerSupplierComponent component, ComponentShutdown args) + { + _powerState.Supplies.Remove(component.NetworkSupply.Id); + } + + private static void PowerSupplierPaused(EntityUid uid, PowerSupplierComponent component, EntityPausedEvent args) + { + component.NetworkSupply.Paused = args.Paused; + } + + public void InitPowerNet(PowerNet powerNet) + { + AllocNetwork(powerNet.NetworkNode); + } + + public void DestroyPowerNet(PowerNet powerNet) + { + _powerState.Networks.Remove(powerNet.NetworkNode.Id); + } + + public void QueueReconnectPowerNet(PowerNet powerNet) + { + _powerNetReconnectQueue.Add(powerNet); + } + + public void InitApcNet(ApcNet apcNet) + { + AllocNetwork(apcNet.NetworkNode); + } + + public void DestroyApcNet(ApcNet apcNet) + { + _powerState.Networks.Remove(apcNet.NetworkNode.Id); + } + + public void QueueReconnectApcNet(ApcNet apcNet) + { + _apcNetReconnectQueue.Add(apcNet); + } + + public PowerStatistics GetStatistics() + { + return new() + { + CountBatteries = _powerState.Batteries.Count, + CountLoads = _powerState.Loads.Count, + CountNetworks = _powerState.Networks.Count, + CountSupplies = _powerState.Supplies.Count + }; + } public override void Update(float frameTime) { base.Update(frameTime); - _powerNetManager.Update(frameTime); + + // Reconnect networks. + { + foreach (var apcNet in _apcNetReconnectQueue) + { + if (apcNet.Removed) + continue; + + DoReconnectApcNet(apcNet); + } + + _apcNetReconnectQueue.Clear(); + + foreach (var powerNet in _powerNetReconnectQueue) + { + if (powerNet.Removed) + continue; + + DoReconnectPowerNet(powerNet); + } + + _powerNetReconnectQueue.Clear(); + } + + // Synchronize batteries + foreach (var battery in ComponentManager.EntityQuery()) + { + RaiseLocalEvent(battery.Owner.Uid, new NetworkBatteryPreSync()); + } + + // Run power solver. + _solver.Tick(frameTime, _powerState); + + // Synchronize batteries, the other way around. + foreach (var battery in ComponentManager.EntityQuery()) + { + RaiseLocalEvent(battery.Owner.Uid, new NetworkBatteryPostSync()); + } + + // Send events where necessary. + { + foreach (var apcReceiver in ComponentManager.EntityQuery()) + { + var recv = apcReceiver.NetworkLoad.ReceivingPower; + ref var last = ref apcReceiver.LastPowerReceived; + + if (!MathHelper.CloseTo(recv, last)) + { + last = recv; + apcReceiver.ApcPowerChanged(); + } + } + + foreach (var consumer in ComponentManager.EntityQuery()) + { + var newRecv = consumer.NetworkLoad.ReceivingPower; + ref var lastRecv = ref consumer.LastReceived; + if (!MathHelper.CloseTo(lastRecv, newRecv)) + { + lastRecv = newRecv; + var msg = new PowerConsumerReceivedChanged(newRecv, consumer.DrawRate); + RaiseLocalEvent(consumer.Owner.Uid, msg); + } + } + } + } + + private void AllocLoad(PowerState.Load load) + { + load.Id = AllocId(); + _powerState.Loads.Add(load.Id, load); + } + + private void AllocSupply(PowerState.Supply supply) + { + supply.Id = AllocId(); + _powerState.Supplies.Add(supply.Id, supply); + } + + private void AllocBattery(PowerState.Battery battery) + { + battery.Id = AllocId(); + _powerState.Batteries.Add(battery.Id, battery); + } + + private void AllocNetwork(PowerState.Network network) + { + network.Id = AllocId(); + _powerState.Networks.Add(network.Id, network); + } + + private static void DoReconnectApcNet(ApcNet net) + { + var netNode = net.NetworkNode; + + netNode.Loads.Clear(); + netNode.BatteriesDischarging.Clear(); + netNode.BatteriesCharging.Clear(); + netNode.Supplies.Clear(); + + foreach (var provider in net.Providers) + { + foreach (var receiver in provider.LinkedReceivers) + { + netNode.Loads.Add(receiver.NetworkLoad.Id); + receiver.NetworkLoad.LinkedNetwork = netNode.Id; + } + } + + foreach (var apc in net.Apcs) + { + var netBattery = apc.Owner.GetComponent(); + netNode.BatteriesDischarging.Add(netBattery.NetworkBattery.Id); + netBattery.NetworkBattery.LinkedNetworkDischarging = netNode.Id; + } + } + + private static void DoReconnectPowerNet(PowerNet net) + { + var netNode = net.NetworkNode; + + netNode.Loads.Clear(); + netNode.Supplies.Clear(); + netNode.BatteriesCharging.Clear(); + netNode.BatteriesDischarging.Clear(); + + foreach (var consumer in net.Consumers) + { + netNode.Loads.Add(consumer.NetworkLoad.Id); + consumer.NetworkLoad.LinkedNetwork = netNode.Id; + } + + foreach (var supplier in net.Suppliers) + { + netNode.Supplies.Add(supplier.NetworkSupply.Id); + supplier.NetworkSupply.LinkedNetwork = netNode.Id; + } + + foreach (var charger in net.Chargers) + { + var battery = charger.Owner.GetComponent(); + netNode.BatteriesCharging.Add(battery.NetworkBattery.Id); + battery.NetworkBattery.LinkedNetworkCharging = netNode.Id; + } + + foreach (var discharger in net.Dischargers) + { + var battery = discharger.Owner.GetComponent(); + netNode.BatteriesDischarging.Add(battery.NetworkBattery.Id); + battery.NetworkBattery.LinkedNetworkDischarging = netNode.Id; + } + } + + private PowerState.NodeId AllocId() + { + return new(_nextId++); } } + + /// + /// Raised before power network simulation happens, to synchronize battery state from + /// components like into . + /// + public sealed class NetworkBatteryPreSync : EntityEventArgs + { + } + + /// + /// Raised after power network simulation happens, to synchronize battery charge changes from + /// to components like . + /// + public sealed class NetworkBatteryPostSync : EntityEventArgs + { + } + + /// + /// Raised when the amount of receiving power on a changes. + /// + public sealed class PowerConsumerReceivedChanged : EntityEventArgs + { + public float ReceivedPower { get; } + public float DrawRate { get; } + + public PowerConsumerReceivedChanged(float receivedPower, float drawRate) + { + ReceivedPower = receivedPower; + DrawRate = drawRate; + } + } + + public struct PowerStatistics + { + public int CountNetworks; + public int CountLoads; + public int CountSupplies; + public int CountBatteries; + } } diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs index 54ed7847de..119e66195c 100644 --- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs @@ -9,12 +9,12 @@ namespace Content.Server.Power.EntitySystems { base.Initialize(); - SubscribeLocalEvent(BodyTypeChanged); + SubscribeLocalEvent(BodyTypeChanged); } private static void BodyTypeChanged( EntityUid uid, - PowerReceiverComponent component, + ApcPowerReceiverComponent component, PhysicsBodyTypeChangedEvent args) { component.AnchorUpdate(); diff --git a/Content.Server/Power/NodeGroups/ApcNet.cs b/Content.Server/Power/NodeGroups/ApcNet.cs new file mode 100644 index 0000000000..a2f77eedb0 --- /dev/null +++ b/Content.Server/Power/NodeGroups/ApcNet.cs @@ -0,0 +1,112 @@ +#nullable enable +using System.Collections.Generic; +using System.Linq; +using Content.Server.NodeContainer.NodeGroups; +using Content.Server.NodeContainer.Nodes; +using Content.Server.Power.Components; +using Content.Server.Power.EntitySystems; +using Content.Server.Power.Pow3r; +using JetBrains.Annotations; +using Robust.Shared.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.ViewVariables; + +namespace Content.Server.Power.NodeGroups +{ + public interface IApcNet + { + void AddApc(ApcComponent apc); + + void RemoveApc(ApcComponent apc); + + void AddPowerProvider(ApcPowerProviderComponent provider); + + void RemovePowerProvider(ApcPowerProviderComponent provider); + + void QueueNetworkReconnect(); + + PowerState.Network NetworkNode { get; } + + GridId? GridId { get; } + } + + [NodeGroup(NodeGroupID.Apc)] + [UsedImplicitly] + public class ApcNet : BaseNetConnectorNodeGroup, IApcNet + { + private readonly PowerNetSystem _powerNetSystem = EntitySystem.Get(); + + [ViewVariables] public readonly List Apcs = new(); + + [ViewVariables] public readonly List Providers = new(); + + //Debug property + [ViewVariables] private int TotalReceivers => Providers.Sum(provider => provider.LinkedReceivers.Count); + + [ViewVariables] + private IEnumerable AllReceivers => + Providers.SelectMany(provider => provider.LinkedReceivers); + + GridId? IApcNet.GridId => GridId; + + [ViewVariables] + public PowerState.Network NetworkNode { get; } = new(); + + public override void Initialize(Node sourceNode) + { + base.Initialize(sourceNode); + + _powerNetSystem.InitApcNet(this); + } + + public override void AfterRemake(IEnumerable> newGroups) + { + base.AfterRemake(newGroups); + + _powerNetSystem.DestroyApcNet(this); + } + + public void AddApc(ApcComponent apc) + { + if (apc.Owner.TryGetComponent(out PowerNetworkBatteryComponent? netBattery)) + netBattery.NetworkBattery.LinkedNetworkDischarging = default; + + _powerNetSystem.QueueReconnectApcNet(this); + Apcs.Add(apc); + } + + public void RemoveApc(ApcComponent apc) + { + if (apc.Owner.TryGetComponent(out PowerNetworkBatteryComponent? netBattery)) + netBattery.NetworkBattery.LinkedNetworkDischarging = default; + + _powerNetSystem.QueueReconnectApcNet(this); + Apcs.Remove(apc); + } + + public void AddPowerProvider(ApcPowerProviderComponent provider) + { + Providers.Add(provider); + + _powerNetSystem.QueueReconnectApcNet(this); + } + + public void RemovePowerProvider(ApcPowerProviderComponent provider) + { + Providers.Remove(provider); + + _powerNetSystem.QueueReconnectApcNet(this); + } + + public void QueueNetworkReconnect() + { + _powerNetSystem.QueueReconnectApcNet(this); + } + + protected override void SetNetConnectorNet(BaseApcNetComponent netConnectorComponent) + { + netConnectorComponent.Net = this; + } + } +} diff --git a/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs b/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs new file mode 100644 index 0000000000..17785078ef --- /dev/null +++ b/Content.Server/Power/NodeGroups/BaseNetConnectorNodeGroup.cs @@ -0,0 +1,34 @@ +#nullable enable +using System.Collections.Generic; +using System.Linq; +using Content.Server.NodeContainer.NodeGroups; +using Content.Server.NodeContainer.Nodes; +using Content.Server.Power.Components; + +namespace Content.Server.Power.NodeGroups +{ + public abstract class BaseNetConnectorNodeGroup : BaseNodeGroup + where TNetConnector : BaseNetConnectorComponent + { + public override void LoadNodes(List groupNodes) + { + base.LoadNodes(groupNodes); + + foreach (var node in groupNodes) + { + var newNetConnectorComponents = node.Owner + .GetAllComponents() + .Where(powerComp => (powerComp.NodeId == null || powerComp.NodeId == node.Name) && + (NodeGroupID) powerComp.Voltage == node.NodeGroupID) + .ToList(); + + foreach (var netConnector in newNetConnectorComponents) + { + SetNetConnectorNet(netConnector); + } + } + } + + protected abstract void SetNetConnectorNet(TNetConnector netConnectorComponent); + } +} diff --git a/Content.Server/Power/NodeGroups/PowerNet.cs b/Content.Server/Power/NodeGroups/PowerNet.cs new file mode 100644 index 0000000000..38df0af231 --- /dev/null +++ b/Content.Server/Power/NodeGroups/PowerNet.cs @@ -0,0 +1,132 @@ +#nullable enable +using System.Collections.Generic; +using System.Linq; +using Content.Server.NodeContainer.NodeGroups; +using Content.Server.NodeContainer.Nodes; +using Content.Server.Power.Components; +using Content.Server.Power.EntitySystems; +using Content.Server.Power.Pow3r; +using JetBrains.Annotations; +using Robust.Shared.GameObjects; +using Robust.Shared.Maths; +using Robust.Shared.ViewVariables; + +namespace Content.Server.Power.NodeGroups +{ + public interface IPowerNet + { + void AddSupplier(PowerSupplierComponent supplier); + + void RemoveSupplier(PowerSupplierComponent supplier); + + void AddConsumer(PowerConsumerComponent consumer); + + void RemoveConsumer(PowerConsumerComponent consumer); + + void AddDischarger(BatteryDischargerComponent discharger); + + void RemoveDischarger(BatteryDischargerComponent discharger); + + void AddCharger(BatteryChargerComponent charger); + + void RemoveCharger(BatteryChargerComponent charger); + } + + [NodeGroup(NodeGroupID.HVPower, NodeGroupID.MVPower)] + [UsedImplicitly] + public class PowerNet : BaseNetConnectorNodeGroup, IPowerNet + { + private readonly PowerNetSystem _powerNetSystem = EntitySystem.Get(); + + [ViewVariables] public readonly List Suppliers = new(); + [ViewVariables] public readonly List Consumers = new(); + [ViewVariables] public readonly List Chargers = new(); + [ViewVariables] public readonly List Dischargers = new(); + + [ViewVariables] + public PowerState.Network NetworkNode { get; } = new(); + + public override void Initialize(Node sourceNode) + { + base.Initialize(sourceNode); + + _powerNetSystem.InitPowerNet(this); + } + + public override void AfterRemake(IEnumerable> newGroups) + { + base.AfterRemake(newGroups); + + _powerNetSystem.DestroyPowerNet(this); + } + + protected override void SetNetConnectorNet(BasePowerNetComponent netConnectorComponent) + { + netConnectorComponent.Net = this; + } + + public void AddSupplier(PowerSupplierComponent supplier) + { + supplier.NetworkSupply.LinkedNetwork = default; + Suppliers.Add(supplier); + _powerNetSystem.QueueReconnectPowerNet(this); + } + + public void RemoveSupplier(PowerSupplierComponent supplier) + { + supplier.NetworkSupply.LinkedNetwork = default; + Suppliers.Remove(supplier); + _powerNetSystem.QueueReconnectPowerNet(this); + } + + public void AddConsumer(PowerConsumerComponent consumer) + { + consumer.NetworkLoad.LinkedNetwork = default; + Consumers.Add(consumer); + _powerNetSystem.QueueReconnectPowerNet(this); + } + + public void RemoveConsumer(PowerConsumerComponent consumer) + { + consumer.NetworkLoad.LinkedNetwork = default; + Consumers.Remove(consumer); + _powerNetSystem.QueueReconnectPowerNet(this); + } + + public void AddDischarger(BatteryDischargerComponent discharger) + { + var battery = discharger.Owner.GetComponent(); + battery.NetworkBattery.LinkedNetworkCharging = default; + Dischargers.Add(discharger); + _powerNetSystem.QueueReconnectPowerNet(this); + } + + public void RemoveDischarger(BatteryDischargerComponent discharger) + { + // Can be missing if the entity is being deleted, not a big deal. + if (discharger.Owner.TryGetComponent(out PowerNetworkBatteryComponent? battery)) + battery.NetworkBattery.LinkedNetworkCharging = default; + + Dischargers.Remove(discharger); + _powerNetSystem.QueueReconnectPowerNet(this); + } + + public void AddCharger(BatteryChargerComponent charger) + { + var battery = charger.Owner.GetComponent(); + battery.NetworkBattery.LinkedNetworkCharging = default; + Chargers.Add(charger); + _powerNetSystem.QueueReconnectPowerNet(this); + } + + public void RemoveCharger(BatteryChargerComponent charger) + { + // Can be missing if the entity is being deleted, not a big deal. + if (charger.Owner.TryGetComponent(out PowerNetworkBatteryComponent? battery)) + battery.NetworkBattery.LinkedNetworkCharging = default; + + Chargers.Remove(charger); + _powerNetSystem.QueueReconnectPowerNet(this); + } + } +} diff --git a/Content.Server/Power/Nodes/CableDeviceNode.cs b/Content.Server/Power/Nodes/CableDeviceNode.cs new file mode 100644 index 0000000000..48a7942728 --- /dev/null +++ b/Content.Server/Power/Nodes/CableDeviceNode.cs @@ -0,0 +1,29 @@ +using System.Collections.Generic; +using Content.Server.NodeContainer.Nodes; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Serialization.Manager.Attributes; + +namespace Content.Server.Power.Nodes +{ + /// + /// Type of node that connects to a below it. + /// + [DataDefinition] + public class CableDeviceNode : Node + { + public override IEnumerable GetReachableNodes() + { + var compMgr = IoCManager.Resolve(); + var grid = IoCManager.Resolve().GetGrid(Owner.Transform.GridID); + var gridIndex = grid.TileIndicesFor(Owner.Transform.Coordinates); + + foreach (var node in NodeHelpers.GetNodesInTile(compMgr, grid, gridIndex)) + { + if (node is CableNode) + yield return node; + } + } + } +} diff --git a/Content.Server/Power/Nodes/CableNode.cs b/Content.Server/Power/Nodes/CableNode.cs new file mode 100644 index 0000000000..07d519656d --- /dev/null +++ b/Content.Server/Power/Nodes/CableNode.cs @@ -0,0 +1,79 @@ +using System.Collections.Generic; +using Content.Server.NodeContainer.Nodes; +using Content.Server.Power.EntitySystems; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Serialization.Manager.Attributes; + +namespace Content.Server.Power.Nodes +{ + [DataDefinition] + public class CableNode : Node + { + public override IEnumerable GetReachableNodes() + { + if (!Anchored) + yield break; + + var compMgr = IoCManager.Resolve(); + var grid = IoCManager.Resolve().GetGrid(Owner.Transform.GridID); + var gridIndex = grid.TileIndicesFor(Owner.Transform.Coordinates); + + // While we go over adjacent nodes, we build a list of blocked directions due to + // incoming or outgoing wire terminals. + var terminalDirs = 0; + List<(Direction, Node)> nodeDirs = new(); + + foreach (var (dir, node) in NodeHelpers.GetCardinalNeighborNodes(compMgr, grid, gridIndex)) + { + if (node is CableNode && node != this) + { + nodeDirs.Add((dir, node)); + } + + if (node is CableDeviceNode && dir == Direction.Invalid) + { + // device on same tile + nodeDirs.Add((Direction.Invalid, node)); + } + + if (node is CableTerminalNode) + { + if (dir == Direction.Invalid) + { + // On own tile, block direction it faces + terminalDirs |= 1 << (int) node.Owner.Transform.LocalRotation.GetCardinalDir(); + } + else + { + var terminalDir = node.Owner.Transform.LocalRotation.GetCardinalDir(); + if (terminalDir.GetOpposite() == dir) + { + // Target tile has a terminal towards us, block the direction. + terminalDirs |= 1 << (int) dir; + break; + } + } + } + } + + foreach (var (dir, node) in nodeDirs) + { + // If there is a wire terminal connecting across this direction, skip the node. + if (dir != Direction.Invalid && (terminalDirs & (1 << (int) dir)) != 0) + continue; + + yield return node; + } + } + + public override void OnPostRebuild() + { + base.OnPostRebuild(); + + EntitySystem.Get().QueueUpdate(Owner.Uid); + } + } +} diff --git a/Content.Server/Power/Nodes/CableTerminalNode.cs b/Content.Server/Power/Nodes/CableTerminalNode.cs new file mode 100644 index 0000000000..7bcf0a323c --- /dev/null +++ b/Content.Server/Power/Nodes/CableTerminalNode.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using Content.Server.NodeContainer.Nodes; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Serialization.Manager.Attributes; + +namespace Content.Server.Power.Nodes +{ + [DataDefinition] + public class CableTerminalNode : CableDeviceNode + { + public override IEnumerable GetReachableNodes() + { + var compMgr = IoCManager.Resolve(); + var grid = IoCManager.Resolve().GetGrid(Owner.Transform.GridID); + var gridIndex = grid.TileIndicesFor(Owner.Transform.Coordinates); + + var dir = Owner.Transform.LocalRotation.GetDir(); + var targetIdx = gridIndex + NodeHelpers.TileOffsetForDir(dir); + + foreach (var node in NodeHelpers.GetNodesInTile(compMgr, grid, targetIdx)) + { + if (node is CableTerminalPortNode) + yield return node; + } + + foreach (var node in base.GetReachableNodes()) + { + yield return node; + } + } + } +} diff --git a/Content.Server/Power/Nodes/CableTerminalPortNode.cs b/Content.Server/Power/Nodes/CableTerminalPortNode.cs new file mode 100644 index 0000000000..aa703aefd8 --- /dev/null +++ b/Content.Server/Power/Nodes/CableTerminalPortNode.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using Content.Server.NodeContainer.Nodes; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Serialization.Manager.Attributes; + +namespace Content.Server.Power.Nodes +{ + [DataDefinition] + public class CableTerminalPortNode : Node + { + public override IEnumerable GetReachableNodes() + { + var compMgr = IoCManager.Resolve(); + var grid = IoCManager.Resolve().GetGrid(Owner.Transform.GridID); + var gridIndex = grid.TileIndicesFor(Owner.Transform.Coordinates); + + var nodes = NodeHelpers.GetCardinalNeighborNodes(compMgr, grid, gridIndex, includeSameTile: false); + foreach (var (_, node) in nodes) + { + if (node is CableTerminalNode) + yield return node; + } + } + } +} diff --git a/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs b/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs new file mode 100644 index 0000000000..591e4add55 --- /dev/null +++ b/Content.Server/Power/Pow3r/BatteryRampPegSolver.cs @@ -0,0 +1,305 @@ +using System; +using System.Collections.Generic; +using Robust.Shared.Utility; +using static Content.Server.Power.Pow3r.PowerState; + +namespace Content.Server.Power.Pow3r +{ + public sealed class BatteryRampPegSolver : IPowerSolver + { + private sealed class HeightComparer : IComparer + { + public static HeightComparer Instance { get; } = new(); + + public int Compare(Network? x, Network? y) + { + if (ReferenceEquals(x, y)) return 0; + if (ReferenceEquals(null, y)) return 1; + if (ReferenceEquals(null, x)) return -1; + return x.Height.CompareTo(y.Height); + } + } + + private Network[] _sortBuffer = Array.Empty(); + + public void Tick(float frameTime, PowerState state) + { + // Clear loads and supplies. + foreach (var load in state.Loads.Values) + { + if (load.Paused) + continue; + + load.ReceivingPower = 0; + } + + foreach (var supply in state.Supplies.Values) + { + if (supply.Paused) + continue; + + supply.CurrentSupply = 0; + supply.SupplyRampTarget = 0; + } + + // Run a pass to estimate network tree graph height. + // This is so that we can run networks before their children, + // to avoid draining batteries for a tick if their passing-supply gets cut off. + // It's not a big loss if this doesn't work (it won't, in some scenarios), but it's a nice-to-have. + foreach (var network in state.Networks.Values) + { + network.HeightTouched = false; + network.Height = -1; + } + + foreach (var network in state.Networks.Values) + { + if (network.BatteriesDischarging.Count != 0) + continue; + + EstimateNetworkDepth(state, network); + } + + if (_sortBuffer.Length != state.Networks.Count) + _sortBuffer = new Network[state.Networks.Count]; + + var i = 0; + foreach (var network in state.Networks.Values) + { + _sortBuffer[i++] = network; + } + + Array.Sort(_sortBuffer, HeightComparer.Instance); + + // Go over every network. + foreach (var network in _sortBuffer) + { + // Add up demand in network. + var demand = 0f; + foreach (var loadId in network.Loads) + { + var load = state.Loads[loadId]; + + if (!load.Enabled || load.Paused) + continue; + + DebugTools.Assert(load.DesiredPower >= 0); + demand += load.DesiredPower; + } + + // TODO: Consider having battery charge loads be processed "after" pass-through loads. + // This would mean that charge rate would have no impact on throughput rate like it does currently. + // Would require a second pass over the network, or something. Not sure. + + // Loading batteries. + foreach (var batteryId in network.BatteriesCharging) + { + var battery = state.Batteries[batteryId]; + if (!battery.Enabled || !battery.CanCharge || battery.Paused) + continue; + + var batterySpace = (battery.Capacity - battery.CurrentStorage) * (1 / battery.Efficiency); + batterySpace = Math.Max(0, batterySpace); + var scaledSpace = batterySpace / frameTime; + + var chargeRate = battery.MaxChargeRate + battery.LoadingNetworkDemand / battery.Efficiency; + + var batDemand = Math.Min(chargeRate, scaledSpace); + + DebugTools.Assert(batDemand >= 0); + + battery.DesiredPower = batDemand; + demand += batDemand; + } + + DebugTools.Assert(demand >= 0); + + // Add up supply in network. + var availableSupplySum = 0f; + var maxSupplySum = 0f; + foreach (var supplyId in network.Supplies) + { + var supply = state.Supplies[supplyId]; + if (!supply.Enabled || supply.Paused) + continue; + + var rampMax = supply.SupplyRampPosition + supply.SupplyRampTolerance; + var effectiveSupply = Math.Min(rampMax, supply.MaxSupply); + + DebugTools.Assert(effectiveSupply >= 0); + DebugTools.Assert(supply.MaxSupply >= 0); + + supply.EffectiveMaxSupply = effectiveSupply; + availableSupplySum += effectiveSupply; + maxSupplySum += supply.MaxSupply; + } + + var unmet = Math.Max(0, demand - availableSupplySum); + + DebugTools.Assert(availableSupplySum >= 0); + DebugTools.Assert(maxSupplySum >= 0); + + // Supplying batteries. + // Batteries need to go after local supplies so that local supplies are prioritized. + // Also, it makes demand-pulling of batteries + // Because all batteries will will desire the unmet demand of their loading network, + // there will be a "rush" of input current when a network powers on, + // before power stabilizes in the network. + // This is fine. + foreach (var batteryId in network.BatteriesDischarging) + { + var battery = state.Batteries[batteryId]; + if (!battery.Enabled || !battery.CanDischarge || battery.Paused) + continue; + + var scaledSpace = battery.CurrentStorage / frameTime; + var supplyCap = Math.Min(battery.MaxSupply, + battery.SupplyRampPosition + battery.SupplyRampTolerance); + var supplyAndPassthrough = supplyCap + battery.CurrentReceiving * battery.Efficiency; + var tempSupply = Math.Min(scaledSpace, supplyAndPassthrough); + // Clamp final supply to the unmet demand, so that batteries refrain from taking power away from supplies. + var clampedSupply = Math.Min(unmet, tempSupply); + + DebugTools.Assert(clampedSupply >= 0); + + battery.TempMaxSupply = clampedSupply; + availableSupplySum += clampedSupply; + // TODO: Calculate this properly. + maxSupplySum += clampedSupply; + + battery.LoadingNetworkDemand = unmet; + battery.LoadingDemandMarked = true; + } + + var met = Math.Min(demand, availableSupplySum); + + if (met != 0) + { + // Distribute supply to loads. + foreach (var loadId in network.Loads) + { + var load = state.Loads[loadId]; + if (!load.Enabled || load.DesiredPower == 0 || load.Paused) + continue; + + var ratio = load.DesiredPower / demand; + load.ReceivingPower = ratio * met; + } + + // Loading batteries + foreach (var batteryId in network.BatteriesCharging) + { + var battery = state.Batteries[batteryId]; + + if (!battery.Enabled || battery.DesiredPower == 0 || battery.Paused) + continue; + + var ratio = battery.DesiredPower / demand; + battery.CurrentReceiving = ratio * met; + var receivedPower = frameTime * battery.CurrentReceiving; + receivedPower *= battery.Efficiency; + battery.CurrentStorage = Math.Min( + battery.Capacity, + battery.CurrentStorage + receivedPower); + battery.LoadingMarked = true; + } + + // Load to supplies + foreach (var supplyId in network.Supplies) + { + var supply = state.Supplies[supplyId]; + if (!supply.Enabled || supply.EffectiveMaxSupply == 0 || supply.Paused) + continue; + + var ratio = supply.EffectiveMaxSupply / availableSupplySum; + supply.CurrentSupply = ratio * met; + + if (supply.MaxSupply != 0) + { + var maxSupplyRatio = supply.MaxSupply / maxSupplySum; + + supply.SupplyRampTarget = maxSupplyRatio * demand; + } + else + { + supply.SupplyRampTarget = 0; + } + } + + // Supplying batteries + foreach (var batteryId in network.BatteriesDischarging) + { + var battery = state.Batteries[batteryId]; + if (!battery.Enabled || battery.TempMaxSupply == 0 || battery.Paused) + continue; + + var ratio = battery.TempMaxSupply / availableSupplySum; + battery.CurrentSupply = ratio * met; + + battery.CurrentStorage = Math.Max( + 0, + battery.CurrentStorage - frameTime * battery.CurrentSupply); + + battery.SupplyRampTarget = battery.CurrentSupply - battery.CurrentReceiving * battery.Efficiency; + + /*var maxSupplyRatio = supply.MaxSupply / maxSupplySum; + + supply.SupplyRampTarget = maxSupplyRatio * demand;*/ + battery.SupplyingMarked = true; + } + } + } + + // Clear supplying/loading on any batteries that haven't been marked by usage. + // Because we need this data while processing ramp-pegging, we can't clear it at the start. + foreach (var battery in state.Batteries.Values) + { + if (battery.Paused) + continue; + + if (!battery.SupplyingMarked) + battery.CurrentSupply = 0; + + if (!battery.LoadingMarked) + battery.CurrentReceiving = 0; + + if (!battery.LoadingDemandMarked) + battery.LoadingNetworkDemand = 0; + + battery.SupplyingMarked = false; + battery.LoadingMarked = false; + battery.LoadingDemandMarked = false; + } + + PowerSolverShared.UpdateRampPositions(frameTime, state); + } + + private static void EstimateNetworkDepth(PowerState state, Network network) + { + network.HeightTouched = true; + + if (network.BatteriesCharging.Count == 0) + { + network.Height = 1; + return; + } + + var max = 0; + foreach (var batteryId in network.BatteriesCharging) + { + var battery = state.Batteries[batteryId]; + + if (battery.LinkedNetworkDischarging == default) + continue; + + var subNet = state.Networks[battery.LinkedNetworkDischarging]; + if (!subNet.HeightTouched) + EstimateNetworkDepth(state, subNet); + + max = Math.Max(subNet.Height, max); + } + + network.Height = 1 + max; + } + } +} diff --git a/Content.Server/Power/Pow3r/GraphWalkSolver.cs b/Content.Server/Power/Pow3r/GraphWalkSolver.cs new file mode 100644 index 0000000000..981aad8120 --- /dev/null +++ b/Content.Server/Power/Pow3r/GraphWalkSolver.cs @@ -0,0 +1,181 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using static Content.Server.Power.Pow3r.PowerState; + +namespace Content.Server.Power.Pow3r +{ + /// + /// Partial implementation of full-graph-walking power solving under pow3r. + /// Concept described at https://hackmd.io/@ss14/lowpower + /// + /// + /// Many features like batteries, cycle detection, join handling, etc... are not implemented at all. + /// Seriously, this implementation barely works. Ah well. + /// is better. + /// + public class GraphWalkSolver : IPowerSolver + { + public void Tick(float frameTime, PowerState state) + { + foreach (var load in state.Loads.Values) + { + load.ReceivingPower = 0; + } + + foreach (var supply in state.Supplies.Values) + { + supply.CurrentSupply = 0; + } + + foreach (var network in state.Networks.Values) + { + // Clear some stuff. + network.LocalDemandMet = 0; + + // Add up demands in network. + network.LocalDemandTotal = network.Loads + .Select(l => state.Loads[l]) + .Where(c => c.Enabled) + .Sum(c => c.DesiredPower); + + // Add up supplies in network. + var availableSupplySum = 0f; + var maxSupplySum = 0f; + foreach (var supplyId in network.Supplies) + { + var supply = state.Supplies[supplyId]; + if (!supply.Enabled) + continue; + + var rampMax = supply.SupplyRampPosition + supply.SupplyRampTolerance; + var effectiveSupply = Math.Min(rampMax, supply.MaxSupply); + supply.EffectiveMaxSupply = effectiveSupply; + availableSupplySum += effectiveSupply; + maxSupplySum += supply.MaxSupply; + } + + network.AvailableSupplyTotal = availableSupplySum; + network.TheoreticalSupplyTotal = maxSupplySum; + } + + // Sort networks by tree height so that suppliers that have less possible loads go FIRST. + // Idea being that a backup generator on a small subnet should do more work + // so that a larger generator that covers more networks can put its power elsewhere. + var sortedByHeight = state.Networks.Values.OrderBy(v => TotalSubLoadCount(state, v)).ToArray(); + + // Go over every network with supply to send power. + foreach (var network in sortedByHeight) + { + // Find all loads recursively, and sum them up. + var subNets = new List(); + var totalDemand = 0f; + GetLoadingNetworksRecursively(state, network, subNets, ref totalDemand); + + if (totalDemand == 0) + continue; + + // Calculate power delivered. + var power = Math.Min(totalDemand, network.AvailableSupplyTotal); + + // Distribute load across supplies in network. + foreach (var supplyId in network.Supplies) + { + var supply = state.Supplies[supplyId]; + if (!supply.Enabled) + continue; + + if (supply.EffectiveMaxSupply != 0) + { + var ratio = supply.EffectiveMaxSupply / network.AvailableSupplyTotal; + + supply.CurrentSupply = ratio * power; + } + else + { + supply.CurrentSupply = 0; + } + + if (supply.MaxSupply != 0) + { + var ratio = supply.MaxSupply / network.TheoreticalSupplyTotal; + + supply.SupplyRampTarget = ratio * totalDemand; + } + else + { + supply.SupplyRampTarget = 0; + } + } + + // Distribute supply across subnet loads. + foreach (var subNet in subNets) + { + var rem = subNet.RemainingDemand; + var ratio = rem / totalDemand; + + subNet.LocalDemandMet += ratio * power; + } + } + + // Distribute power across loads in networks. + foreach (var network in state.Networks.Values) + { + if (network.LocalDemandMet == 0) + continue; + + foreach (var loadId in network.Loads) + { + var load = state.Loads[loadId]; + if (!load.Enabled) + continue; + + var ratio = load.DesiredPower / network.LocalDemandTotal; + load.ReceivingPower = ratio * network.LocalDemandMet; + } + } + + PowerSolverShared.UpdateRampPositions(frameTime, state); + } + + private int TotalSubLoadCount(PowerState state, Network network) + { + // TODO: Cycle detection. + var height = network.Loads.Count; + + foreach (var batteryId in network.BatteriesCharging) + { + var battery = state.Batteries[batteryId]; + if (battery.LinkedNetworkDischarging != default) + { + height += TotalSubLoadCount(state, state.Networks[battery.LinkedNetworkDischarging]); + } + } + + return height; + } + + private void GetLoadingNetworksRecursively( + PowerState state, + Network network, + List networks, + ref float totalDemand) + { + networks.Add(network); + totalDemand += network.LocalDemandTotal - network.LocalDemandMet; + + foreach (var batteryId in network.BatteriesCharging) + { + var battery = state.Batteries[batteryId]; + if (battery.LinkedNetworkDischarging != default) + { + GetLoadingNetworksRecursively( + state, + state.Networks[battery.LinkedNetworkDischarging], + networks, + ref totalDemand); + } + } + } + } +} diff --git a/Content.Server/Power/Pow3r/IPowerSolver.cs b/Content.Server/Power/Pow3r/IPowerSolver.cs new file mode 100644 index 0000000000..af1fe2d035 --- /dev/null +++ b/Content.Server/Power/Pow3r/IPowerSolver.cs @@ -0,0 +1,7 @@ +namespace Content.Server.Power.Pow3r +{ + public interface IPowerSolver + { + void Tick(float frameTime, PowerState state); + } +} diff --git a/Content.Server/Power/Pow3r/NoOpSolver.cs b/Content.Server/Power/Pow3r/NoOpSolver.cs new file mode 100644 index 0000000000..fa54a8b80d --- /dev/null +++ b/Content.Server/Power/Pow3r/NoOpSolver.cs @@ -0,0 +1,10 @@ +namespace Content.Server.Power.Pow3r +{ + public sealed class NoOpSolver : IPowerSolver + { + public void Tick(float frameTime, PowerState state) + { + // Literally nothing. + } + } +} diff --git a/Content.Server/Power/Pow3r/PowerSolverShared.cs b/Content.Server/Power/Pow3r/PowerSolverShared.cs new file mode 100644 index 0000000000..f9ef3cead5 --- /dev/null +++ b/Content.Server/Power/Pow3r/PowerSolverShared.cs @@ -0,0 +1,90 @@ +using System; + +namespace Content.Server.Power.Pow3r +{ + public static class PowerSolverShared + { + public static void UpdateRampPositions(float frameTime, PowerState state) + { + // Update supplies to move their ramp position towards target, if necessary. + foreach (var supply in state.Supplies.Values) + { + if (supply.Paused) + continue; + + if (!supply.Enabled) + { + // If disabled, set ramp to 0. + supply.SupplyRampPosition = 0; + continue; + } + + var rampDev = supply.SupplyRampTarget - supply.SupplyRampPosition; + if (Math.Abs(rampDev) > 0.001f) + { + float newPos; + if (rampDev > 0) + { + // Position below target, go up. + newPos = Math.Min( + supply.SupplyRampTarget, + supply.SupplyRampPosition + supply.SupplyRampRate * frameTime); + } + else + { + // Other way around, go down + newPos = Math.Max( + supply.SupplyRampTarget, + supply.SupplyRampPosition - supply.SupplyRampRate * frameTime); + } + + supply.SupplyRampPosition = Math.Clamp(newPos, 0, supply.MaxSupply); + } + else + { + supply.SupplyRampPosition = supply.SupplyRampTarget; + } + } + + // Batteries too. + foreach (var battery in state.Batteries.Values) + { + if (battery.Paused) + continue; + + if (!battery.Enabled) + { + // If disabled, set ramp to 0. + battery.SupplyRampPosition = 0; + continue; + } + + var rampDev = battery.SupplyRampTarget - battery.SupplyRampPosition; + if (Math.Abs(rampDev) > 0.001f) + { + float newPos; + if (rampDev > 0) + { + // Position below target, go up. + newPos = Math.Min( + battery.SupplyRampTarget, + battery.SupplyRampPosition + battery.SupplyRampRate * frameTime); + } + else + { + // Other way around, go down + newPos = Math.Max( + battery.SupplyRampTarget, + battery.SupplyRampPosition - battery.SupplyRampRate * frameTime); + } + + battery.SupplyRampPosition = Math.Clamp(newPos, 0, battery.MaxSupply); + } + else + { + battery.SupplyRampPosition = battery.SupplyRampTarget; + } + } + } + } +} diff --git a/Content.Server/Power/Pow3r/PowerState.cs b/Content.Server/Power/Pow3r/PowerState.cs new file mode 100644 index 0000000000..276fc785a9 --- /dev/null +++ b/Content.Server/Power/Pow3r/PowerState.cs @@ -0,0 +1,207 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Numerics; +using System.Text.Json; +using System.Text.Json.Serialization; +using Robust.Shared.ViewVariables; + +namespace Content.Server.Power.Pow3r +{ + public sealed class PowerState + { + public const int MaxTickData = 180; + + public static readonly JsonSerializerOptions SerializerOptions = new() + { + IncludeFields = true, + Converters = {new NodeIdJsonConverter()} + }; + + public Dictionary Supplies = new(); + public Dictionary Networks = new(); + public Dictionary Loads = new(); + public Dictionary Batteries = new(); + + public readonly struct NodeId : IEquatable + { + public readonly int Id; + + public NodeId(int id) + { + Id = id; + } + + public bool Equals(NodeId other) + { + return Id == other.Id; + } + + public override bool Equals(object? obj) + { + return obj is NodeId other && Equals(other); + } + + public override int GetHashCode() + { + return Id; + } + + public static bool operator ==(NodeId left, NodeId right) + { + return left.Equals(right); + } + + public static bool operator !=(NodeId left, NodeId right) + { + return !left.Equals(right); + } + + public override string ToString() + { + return Id.ToString(); + } + } + + public sealed class NodeIdJsonConverter : JsonConverter + { + public override NodeId Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + return new(reader.GetInt32()); + } + + public override void Write(Utf8JsonWriter writer, NodeId value, JsonSerializerOptions options) + { + writer.WriteNumberValue(value.Id); + } + } + + public sealed class Supply + { + [ViewVariables] public NodeId Id; + + // == Static parameters == + [ViewVariables(VVAccess.ReadWrite)] public bool Enabled = true; + [ViewVariables(VVAccess.ReadWrite)] public bool Paused; + [ViewVariables(VVAccess.ReadWrite)] public float MaxSupply; + + [ViewVariables(VVAccess.ReadWrite)] public float SupplyRampRate; + [ViewVariables(VVAccess.ReadWrite)] public float SupplyRampTolerance; + + // == Runtime parameters == + + // Actual power supplied last network update. + [ViewVariables(VVAccess.ReadWrite)] public float CurrentSupply; + + // The amount of power we WANT to be supplying to match grid load. + [ViewVariables(VVAccess.ReadWrite)] [JsonIgnore] + public float SupplyRampTarget; + + // Position of the supply ramp. + [ViewVariables(VVAccess.ReadWrite)] public float SupplyRampPosition; + + [ViewVariables] [JsonIgnore] public NodeId LinkedNetwork; + + // In-tick max supply thanks to ramp. Used during calculations. + [JsonIgnore] public float EffectiveMaxSupply; + } + + public sealed class Load + { + [ViewVariables] public NodeId Id; + + // == Static parameters == + [ViewVariables(VVAccess.ReadWrite)] public bool Enabled = true; + [ViewVariables(VVAccess.ReadWrite)] public bool Paused; + [ViewVariables(VVAccess.ReadWrite)] public float DesiredPower; + + // == Runtime parameters == + [ViewVariables(VVAccess.ReadWrite)] public float ReceivingPower; + + [ViewVariables] [JsonIgnore] public NodeId LinkedNetwork; + } + + public sealed class Battery + { + [ViewVariables] public NodeId Id; + + // == Static parameters == + [ViewVariables(VVAccess.ReadWrite)] public bool Enabled = true; + [ViewVariables(VVAccess.ReadWrite)] public bool Paused; + [ViewVariables(VVAccess.ReadWrite)] public bool CanDischarge = true; + [ViewVariables(VVAccess.ReadWrite)] public bool CanCharge = true; + [ViewVariables(VVAccess.ReadWrite)] public float Capacity; + [ViewVariables(VVAccess.ReadWrite)] public float MaxChargeRate; + [ViewVariables(VVAccess.ReadWrite)] public float MaxThroughput; // 0 = infinite cuz imgui + [ViewVariables(VVAccess.ReadWrite)] public float MaxSupply; + [ViewVariables(VVAccess.ReadWrite)] public float SupplyRampTolerance; + [ViewVariables(VVAccess.ReadWrite)] public float SupplyRampRate; + [ViewVariables(VVAccess.ReadWrite)] public float Efficiency = 1; + + // == Runtime parameters == + [ViewVariables(VVAccess.ReadWrite)] public float SupplyRampPosition; + [ViewVariables(VVAccess.ReadWrite)] public float CurrentSupply; + [ViewVariables(VVAccess.ReadWrite)] public float CurrentStorage; + [ViewVariables(VVAccess.ReadWrite)] public float CurrentReceiving; + [ViewVariables(VVAccess.ReadWrite)] public float LoadingNetworkDemand; + + [ViewVariables(VVAccess.ReadWrite)] [JsonIgnore] + public bool SupplyingMarked; + + [ViewVariables(VVAccess.ReadWrite)] [JsonIgnore] + public bool LoadingMarked; + + [ViewVariables(VVAccess.ReadWrite)] [JsonIgnore] + public bool LoadingDemandMarked; + + [ViewVariables(VVAccess.ReadWrite)] [JsonIgnore] + public float TempMaxSupply; + + [ViewVariables(VVAccess.ReadWrite)] [JsonIgnore] + public float DesiredPower; + + [ViewVariables(VVAccess.ReadWrite)] [JsonIgnore] + public float SupplyRampTarget; + + [ViewVariables(VVAccess.ReadWrite)] [JsonIgnore] + public NodeId LinkedNetworkCharging; + + [ViewVariables(VVAccess.ReadWrite)] [JsonIgnore] + public NodeId LinkedNetworkDischarging; + } + + // Readonly breaks json serialization. + [SuppressMessage("ReSharper", "FieldCanBeMadeReadOnly.Local")] + public sealed class Network + { + [ViewVariables] public NodeId Id; + + [ViewVariables] public List Supplies = new(); + + [ViewVariables] public List Loads = new(); + + // "Loading" means the network is connected to the INPUT port of the battery. + [ViewVariables] public List BatteriesCharging = new(); + + // "Supplying" means the network is connected to the OUTPUT port of the battery. + [ViewVariables] public List BatteriesDischarging = new(); + + // Calculation parameters used by GraphWalkSolver. + // Unused by BatteryRampPegSolver. + [JsonIgnore] public float LocalDemandTotal; + [JsonIgnore] public float LocalDemandMet; + [JsonIgnore] public float GroupDemandTotal; + [JsonIgnore] public float GroupDemandMet; + + [ViewVariables] [JsonIgnore] public int Height; + [JsonIgnore] public bool HeightTouched; + + // Supply available this tick. + [JsonIgnore] public float AvailableSupplyTotal; + + // Max theoretical supply assuming max ramp. + [JsonIgnore] public float TheoreticalSupplyTotal; + public float RemainingDemand => LocalDemandTotal - LocalDemandMet; + } + } +} diff --git a/Content.Server/SMES/PowerSmesSystem.cs b/Content.Server/Power/SMES/PowerSmesSystem.cs similarity index 91% rename from Content.Server/SMES/PowerSmesSystem.cs rename to Content.Server/Power/SMES/PowerSmesSystem.cs index 1bccbecbcf..bf66d9daa0 100644 --- a/Content.Server/SMES/PowerSmesSystem.cs +++ b/Content.Server/Power/SMES/PowerSmesSystem.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using Robust.Shared.GameObjects; -namespace Content.Server.SMES +namespace Content.Server.Power.SMES { [UsedImplicitly] internal class PowerSmesSystem : EntitySystem diff --git a/Content.Server/SMES/SmesComponent.cs b/Content.Server/Power/SMES/SmesComponent.cs similarity index 81% rename from Content.Server/SMES/SmesComponent.cs rename to Content.Server/Power/SMES/SmesComponent.cs index c511f5bf11..903d616011 100644 --- a/Content.Server/SMES/SmesComponent.cs +++ b/Content.Server/Power/SMES/SmesComponent.cs @@ -1,6 +1,5 @@ #nullable enable using System; -using Content.Server.Battery.Components; using Content.Server.Power.Components; using Content.Shared.Power; using Content.Shared.Rounding; @@ -10,7 +9,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Timing; -namespace Content.Server.SMES +namespace Content.Server.Power.SMES { /// /// Handles the "user-facing" side of the actual SMES object. @@ -80,20 +79,13 @@ namespace Content.Server.SMES private ChargeState GetNewChargeState() { - var supplier = Owner.GetComponent(); - var consumer = Owner.GetComponent(); - if (supplier.SupplyRate > 0 && consumer.DrawRate != consumer.ReceivedPower) + var battery = Owner.GetComponent(); + return (battery.CurrentSupply - battery.CurrentReceiving) switch { - return ChargeState.Discharging; - } - else if (supplier.SupplyRate == 0 && consumer.DrawRate > 0) - { - return ChargeState.Charging; - } - else - { - return ChargeState.Still; - } + > 0 => ChargeState.Discharging, + < 0 => ChargeState.Charging, + _ => ChargeState.Still + }; } } } diff --git a/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs b/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs index 8548ff020b..80cfa844ac 100644 --- a/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs +++ b/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs @@ -1,5 +1,4 @@ #nullable enable -using Content.Server.Battery.Components; using Content.Server.Power.Components; using Content.Shared.Interaction; using Robust.Shared.GameObjects; diff --git a/Content.Server/PowerCell/Components/PowerCellComponent.cs b/Content.Server/PowerCell/Components/PowerCellComponent.cs index 05b951913a..2ba23bf120 100644 --- a/Content.Server/PowerCell/Components/PowerCellComponent.cs +++ b/Content.Server/PowerCell/Components/PowerCellComponent.cs @@ -1,8 +1,8 @@ #nullable enable using System; -using Content.Server.Battery.Components; using Content.Server.Chemistry.Components; using Content.Server.Explosion; +using Content.Server.Power.Components; using Content.Shared.Chemistry; using Content.Shared.Examine; using Content.Shared.PowerCell; diff --git a/Content.Server/RCD/Components/RCDComponent.cs b/Content.Server/RCD/Components/RCDComponent.cs index aa344649b8..1f6f229023 100644 --- a/Content.Server/RCD/Components/RCDComponent.cs +++ b/Content.Server/RCD/Components/RCDComponent.cs @@ -119,7 +119,7 @@ namespace Content.Server.RCD.Components ExtraCheck = () => IsRCDStillValid(eventArgs, mapGrid, tile, snapPos, startingMode) //All of the sanity checks are here }; - var result = await _doAfterSystem.DoAfter(doAfterEventArgs); + var result = await _doAfterSystem.WaitDoAfter(doAfterEventArgs); if (result == DoAfterStatus.Cancelled) { return true; diff --git a/Content.Server/Recycling/Components/RecyclerComponent.cs b/Content.Server/Recycling/Components/RecyclerComponent.cs index 1c1073b0a1..bf0b04b219 100644 --- a/Content.Server/Recycling/Components/RecyclerComponent.cs +++ b/Content.Server/Recycling/Components/RecyclerComponent.cs @@ -47,7 +47,7 @@ namespace Content.Server.Recycling.Components private float _efficiency = 0.25f; private bool Powered => - !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || + !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; private void Bloodstain() @@ -97,7 +97,7 @@ namespace Content.Server.Recycling.Components public bool CanRun() { - if (Owner.TryGetComponent(out PowerReceiverComponent? receiver) && + if (Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) && !receiver.Powered) { return false; diff --git a/Content.Server/Research/Components/ResearchConsoleComponent.cs b/Content.Server/Research/Components/ResearchConsoleComponent.cs index b6cdea4c1a..da1dea4ff9 100644 --- a/Content.Server/Research/Components/ResearchConsoleComponent.cs +++ b/Content.Server/Research/Components/ResearchConsoleComponent.cs @@ -26,7 +26,7 @@ namespace Content.Server.Research.Components private const string SoundCollectionName = "keyboard"; - [ViewVariables] private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + [ViewVariables] private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ResearchConsoleUiKey.Key); diff --git a/Content.Server/Research/Components/ResearchPointSourceComponent.cs b/Content.Server/Research/Components/ResearchPointSourceComponent.cs index 4eaeeff0b8..39d95fe36d 100644 --- a/Content.Server/Research/Components/ResearchPointSourceComponent.cs +++ b/Content.Server/Research/Components/ResearchPointSourceComponent.cs @@ -16,7 +16,7 @@ namespace Content.Server.Research.Components private int _pointsPerSecond; [DataField("active")] private bool _active; - private PowerReceiverComponent? _powerReceiver; + private ApcPowerReceiverComponent? _powerReceiver; [ViewVariables(VVAccess.ReadWrite)] public int PointsPerSecond @@ -35,7 +35,7 @@ namespace Content.Server.Research.Components /// /// Whether this can be used to produce research points. /// - /// If no is found, it's assumed power is not required. + /// If no is found, it's assumed power is not required. [ViewVariables] public bool CanProduce => Active && (_powerReceiver is null || _powerReceiver.Powered); diff --git a/Content.Server/Research/Components/ResearchServerComponent.cs b/Content.Server/Research/Components/ResearchServerComponent.cs index f8e8368afb..fada87fc84 100644 --- a/Content.Server/Research/Components/ResearchServerComponent.cs +++ b/Content.Server/Research/Components/ResearchServerComponent.cs @@ -61,11 +61,11 @@ namespace Content.Server.Research.Components } } - /// If no is found, it's assumed power is not required. + /// If no is found, it's assumed power is not required. [ViewVariables] public bool CanRun => _powerReceiver is null || _powerReceiver.Powered; - private PowerReceiverComponent? _powerReceiver; + private ApcPowerReceiverComponent? _powerReceiver; protected override void Initialize() { diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs index 649c7374b9..2e52ae73f8 100644 --- a/Content.Server/RoundEnd/RoundEndSystem.cs +++ b/Content.Server/RoundEnd/RoundEndSystem.cs @@ -13,7 +13,7 @@ using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.RoundEnd { - public class RoundEndSystem : EntitySystem, IResettingEntitySystem + public class RoundEndSystem : EntitySystem { [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IChatManager _chatManager = default!; @@ -30,6 +30,7 @@ namespace Content.Server.RoundEnd public TimeSpan CallCooldown { get; } = TimeSpan.FromSeconds(30); + // TODO: Make these regular eventbus events... public delegate void RoundEndCountdownStarted(); public event RoundEndCountdownStarted? OnRoundEndCountdownStarted; @@ -42,7 +43,14 @@ namespace Content.Server.RoundEnd public delegate void CallCooldownEnded(); public event CallCooldownEnded? OnCallCooldownEnded; - void IResettingEntitySystem.Reset() + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(Reset); + } + + void Reset(RoundRestartCleanupEvent ev) { IsRoundEndCountdownStarted = false; _roundEndCancellationTokenSource.Cancel(); diff --git a/Content.Server/Singularity/Components/EmitterComponent.cs b/Content.Server/Singularity/Components/EmitterComponent.cs index 6571234b1d..cf87e7955c 100644 --- a/Content.Server/Singularity/Components/EmitterComponent.cs +++ b/Content.Server/Singularity/Components/EmitterComponent.cs @@ -44,7 +44,7 @@ namespace Content.Server.Singularity.Components private PowerConsumerComponent _powerConsumer = default!; // whether the power switch is in "on" - [ViewVariables] private bool _isOn; + [ViewVariables] public bool IsOn { get; private set; } // Whether the power switch is on AND the machine has enough power (so is actively firing) [ViewVariables] private bool _isPowered; [ViewVariables] private bool _isLocked; @@ -64,32 +64,6 @@ namespace Content.Server.Singularity.Components [ViewVariables(VVAccess.ReadWrite)] [DataField("fireBurstDelayMin")] private TimeSpan _fireBurstDelayMin = TimeSpan.FromSeconds(2); [ViewVariables(VVAccess.ReadWrite)] [DataField("fireBurstDelayMax")] private TimeSpan _fireBurstDelayMax = TimeSpan.FromSeconds(10); - protected override void Initialize() - { - base.Initialize(); - - Owner.EnsureComponent(out _powerConsumer); - - _powerConsumer.OnReceivedPowerChanged += OnReceivedPowerChanged; - } - - private void OnReceivedPowerChanged(object? sender, ReceivedPowerChangedEventArgs e) - { - if (!_isOn) - { - return; - } - - if (e.ReceivedPower < e.DrawRate) - { - PowerOff(); - } - else - { - PowerOn(); - } - } - void IActivate.Activate(ActivateEventArgs eventArgs) { if (_isLocked) @@ -100,7 +74,7 @@ namespace Content.Server.Singularity.Components if (Owner.TryGetComponent(out PhysicsComponent? phys) && phys.BodyType == BodyType.Static) { - if (!_isOn) + if (!IsOn) { SwitchOn(); Owner.PopupMessage(eventArgs.User, Loc.GetString("comp-emitter-turned-on", ("target", Owner))); @@ -149,7 +123,7 @@ namespace Content.Server.Singularity.Components public void SwitchOff() { - _isOn = false; + IsOn = false; _powerConsumer.DrawRate = 0; PowerOff(); UpdateAppearance(); @@ -157,14 +131,14 @@ namespace Content.Server.Singularity.Components public void SwitchOn() { - _isOn = true; + IsOn = true; _powerConsumer.DrawRate = _powerUseActive; // Do not directly PowerOn(). // OnReceivedPowerChanged will get fired due to DrawRate change which will turn it on. UpdateAppearance(); } - private void PowerOff() + public void PowerOff() { if (!_isPowered) { @@ -180,7 +154,7 @@ namespace Content.Server.Singularity.Components UpdateAppearance(); } - private void PowerOn() + public void PowerOn() { if (_isPowered) { @@ -202,7 +176,7 @@ namespace Content.Server.Singularity.Components // Any power-off condition should result in the timer for this method being cancelled // and thus not firing DebugTools.Assert(_isPowered); - DebugTools.Assert(_isOn); + DebugTools.Assert(IsOn); DebugTools.Assert(_powerConsumer.DrawRate <= _powerConsumer.ReceivedPower); Fire(); @@ -269,7 +243,7 @@ namespace Content.Server.Singularity.Components { state = EmitterVisualState.On; } - else if (_isOn) + else if (IsOn) { state = EmitterVisualState.Underpowered; } diff --git a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs index 31c4413f58..84a05b155b 100644 --- a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs +++ b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs @@ -1,9 +1,7 @@ #nullable enable using System; -using Content.Server.Battery.Components; using Content.Server.Power.Components; using Content.Shared.Interaction; -using Content.Shared.Notification; using Content.Shared.Notification.Managers; using Content.Shared.Radiation; using Content.Shared.Singularity.Components; @@ -37,7 +35,6 @@ namespace Content.Server.Singularity.Components } [ComponentDependency] private readonly BatteryComponent? _batteryComponent = default!; - [ComponentDependency] private readonly BatteryDischargerComponent? _batteryDischargerComponent = default!; bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs) { @@ -74,12 +71,6 @@ namespace Content.Server.Singularity.Components if (_batteryComponent != null) { _batteryComponent!.CurrentCharge += frameTime * radiation.RadsPerSecond * 3000f; - if (_batteryDischargerComponent != null) - { - // The battery discharger is controlled like this to ensure it won't drain the entire battery in a single tick. - // If that occurs then the battery discharger ends up shutting down. - _batteryDischargerComponent!.ActiveSupplyRate = (int) Math.Max(1, _batteryComponent!.CurrentCharge); - } } } diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs new file mode 100644 index 0000000000..5f3fc0c83d --- /dev/null +++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs @@ -0,0 +1,38 @@ +using Content.Server.Power.EntitySystems; +using Content.Server.Singularity.Components; +using JetBrains.Annotations; +using Robust.Shared.GameObjects; + +namespace Content.Server.Singularity.EntitySystems +{ + [UsedImplicitly] + public class EmitterSystem : EntitySystem + { + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(ReceivedChanged); + } + + private static void ReceivedChanged( + EntityUid uid, + EmitterComponent component, + PowerConsumerReceivedChanged args) + { + if (!component.IsOn) + { + return; + } + + if (args.ReceivedPower < args.DrawRate) + { + component.PowerOff(); + } + else + { + component.PowerOn(); + } + } + } +} diff --git a/Content.Server/Solar/Components/SolarPanelComponent.cs b/Content.Server/Solar/Components/SolarPanelComponent.cs index 1c82915ed0..d4f918beb6 100644 --- a/Content.Server/Solar/Components/SolarPanelComponent.cs +++ b/Content.Server/Solar/Components/SolarPanelComponent.cs @@ -67,7 +67,7 @@ namespace Content.Server.Solar.Components { if (Owner.TryGetComponent(out var supplier)) { - supplier.SupplyRate = (int) (_maxSupply * _coverage); + supplier.MaxSupply = (int) (_maxSupply * _coverage); } } diff --git a/Content.Server/StationEvents/Events/PowerGridCheck.cs b/Content.Server/StationEvents/Events/PowerGridCheck.cs index 0d44829a18..6ff0b78e1a 100644 --- a/Content.Server/StationEvents/Events/PowerGridCheck.cs +++ b/Content.Server/StationEvents/Events/PowerGridCheck.cs @@ -41,7 +41,7 @@ namespace Content.Server.StationEvents.Events { var componentManager = IoCManager.Resolve(); - foreach (var component in componentManager.EntityQuery(true)) + foreach (var component in componentManager.EntityQuery(true)) { component.PowerDisabled = true; _powered.Add(component.Owner); @@ -56,7 +56,7 @@ namespace Content.Server.StationEvents.Events { if (entity.Deleted) continue; - if (entity.TryGetComponent(out PowerReceiverComponent? powerReceiverComponent)) + if (entity.TryGetComponent(out ApcPowerReceiverComponent? powerReceiverComponent)) { powerReceiverComponent.PowerDisabled = false; } diff --git a/Content.Server/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs index ebd118dae9..9dc20f2aaf 100644 --- a/Content.Server/StationEvents/StationEventSystem.cs +++ b/Content.Server/StationEvents/StationEventSystem.cs @@ -25,7 +25,7 @@ namespace Content.Server.StationEvents { [UsedImplicitly] // Somewhat based off of TG's implementation of events - public sealed class StationEventSystem : EntitySystem, IResettingEntitySystem + public sealed class StationEventSystem : EntitySystem { [Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly IServerNetManager _netManager = default!; @@ -185,6 +185,8 @@ namespace Content.Server.StationEvents _netManager.RegisterNetMessage(RxRequest); _netManager.RegisterNetMessage(); + + SubscribeLocalEvent(Reset); } private void RxRequest(MsgRequestStationEvents msg) @@ -359,7 +361,7 @@ namespace Content.Server.StationEvents base.Shutdown(); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { if (CurrentEvent?.Running == true) { diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs index 459f0d14e7..41def850b7 100644 --- a/Content.Server/Storage/Components/ServerStorageComponent.cs +++ b/Content.Server/Storage/Components/ServerStorageComponent.cs @@ -522,7 +522,7 @@ namespace Content.Server.Storage.Components BreakOnUserMove = true, NeedHand = true, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result != DoAfterStatus.Finished) return true; } diff --git a/Content.Server/Strip/StrippableComponent.cs b/Content.Server/Strip/StrippableComponent.cs index 05a4927e41..240d0cd0fd 100644 --- a/Content.Server/Strip/StrippableComponent.cs +++ b/Content.Server/Strip/StrippableComponent.cs @@ -197,7 +197,7 @@ namespace Content.Server.Strip NeedHand = true, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result != DoAfterStatus.Finished) return; userHands.Drop(item!.Owner, false); @@ -264,7 +264,7 @@ namespace Content.Server.Strip NeedHand = true, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result != DoAfterStatus.Finished) return; userHands.Drop(hand); @@ -314,7 +314,7 @@ namespace Content.Server.Strip BreakOnUserMove = true, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result != DoAfterStatus.Finished) return; var item = inventory.GetSlotItem(slot); @@ -370,7 +370,7 @@ namespace Content.Server.Strip BreakOnUserMove = true, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result != DoAfterStatus.Finished) return; var item = hands.GetItem(hand); diff --git a/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs b/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs index a56d7791bd..643d4a98cd 100644 --- a/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs +++ b/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.IoC; namespace Content.Server.Suspicion.EntitySystems { [UsedImplicitly] - public sealed class SuspicionEndTimerSystem : EntitySystem, IResettingEntitySystem + public sealed class SuspicionEndTimerSystem : EntitySystem { [Dependency] private readonly IPlayerManager _playerManager = null!; @@ -33,6 +33,8 @@ namespace Content.Server.Suspicion.EntitySystems { base.Initialize(); + SubscribeLocalEvent(Reset); + _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged; } @@ -69,7 +71,7 @@ namespace Content.Server.Suspicion.EntitySystems EntityManager.EntityNetManager?.SendSystemNetworkMessage(msg, player.ConnectedClient); } - void IResettingEntitySystem.Reset() + private void Reset(RoundRestartCleanupEvent ev) { EndTime = null; } diff --git a/Content.Server/Suspicion/EntitySystems/SuspicionRoleSystem.cs b/Content.Server/Suspicion/EntitySystems/SuspicionRoleSystem.cs index 7cd2e2c292..0c1fff2703 100644 --- a/Content.Server/Suspicion/EntitySystems/SuspicionRoleSystem.cs +++ b/Content.Server/Suspicion/EntitySystems/SuspicionRoleSystem.cs @@ -7,7 +7,7 @@ using Robust.Shared.GameObjects; namespace Content.Server.Suspicion.EntitySystems { [UsedImplicitly] - public class SuspicionRoleSystem : EntitySystem, IResettingEntitySystem + public class SuspicionRoleSystem : EntitySystem { private readonly HashSet _traitors = new(); @@ -19,6 +19,7 @@ namespace Content.Server.Suspicion.EntitySystems { base.Initialize(); + SubscribeLocalEvent(Reset); SubscribeLocalEvent((HandlePlayerAttached)); SubscribeLocalEvent((HandlePlayerDetached)); } @@ -71,7 +72,7 @@ namespace Content.Server.Suspicion.EntitySystems base.Shutdown(); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _traitors.Clear(); } diff --git a/Content.Server/Throwing/ThrowHelper.cs b/Content.Server/Throwing/ThrowHelper.cs index c188b41aba..52145f357b 100644 --- a/Content.Server/Throwing/ThrowHelper.cs +++ b/Content.Server/Throwing/ThrowHelper.cs @@ -54,7 +54,13 @@ namespace Content.Server.Throwing // Give thrower an impulse in the other direction if (user != null && pushbackRatio > 0.0f && user.TryGetComponent(out IPhysBody? body)) { - body.ApplyLinearImpulse(-direction * pushbackRatio); + var msg = new ThrowPushbackAttemptEvent(); + body.Owner.EntityManager.EventBus.RaiseLocalEvent(body.Owner.Uid, msg); + + if (!msg.Cancelled) + { + body.ApplyLinearImpulse(-direction * pushbackRatio); + } } } } diff --git a/Content.Server/Tools/Components/ToolComponent.cs b/Content.Server/Tools/Components/ToolComponent.cs index 63e1345328..8eff4dd539 100644 --- a/Content.Server/Tools/Components/ToolComponent.cs +++ b/Content.Server/Tools/Components/ToolComponent.cs @@ -85,7 +85,7 @@ namespace Content.Server.Tools.Components NeedHand = true, }; - var result = await doAfterSystem.DoAfter(doAfterArgs); + var result = await doAfterSystem.WaitDoAfter(doAfterArgs); if (result == DoAfterStatus.Cancelled) return false; diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs index f0a6ce7000..4b4bd3bca6 100644 --- a/Content.Server/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/VendingMachines/VendingMachineComponent.cs @@ -7,7 +7,7 @@ using Content.Server.Advertise; using Content.Server.Notification; using Content.Server.Power.Components; using Content.Server.UserInterface; -using Content.Server.Wires.Components; +using Content.Server.WireHacking; using Content.Shared.Acts; using Content.Shared.Examine; using Content.Shared.Interaction; @@ -41,7 +41,7 @@ namespace Content.Server.VendingMachines private string? _description; private string _spriteName = ""; - private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered; + private bool Powered => !Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver) || receiver.Powered; private bool _broken; [DataField("soundVend")] @@ -108,7 +108,7 @@ namespace Content.Server.VendingMachines UserInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage; } - if (Owner.TryGetComponent(out PowerReceiverComponent? receiver)) + if (Owner.TryGetComponent(out ApcPowerReceiverComponent? receiver)) { TrySetVisualState(receiver.Powered ? VendingMachineVisualState.Normal : VendingMachineVisualState.Off); } diff --git a/Content.Server/Verbs/VerbSystem.cs b/Content.Server/Verbs/VerbSystem.cs index fa88d65367..5483f0d82a 100644 --- a/Content.Server/Verbs/VerbSystem.cs +++ b/Content.Server/Verbs/VerbSystem.cs @@ -12,7 +12,7 @@ using static Content.Shared.Verbs.VerbSystemMessages; namespace Content.Server.Verbs { - public class VerbSystem : SharedVerbSystem, IResettingEntitySystem + public class VerbSystem : SharedVerbSystem { [Dependency] private readonly IPlayerManager _playerManager = default!; @@ -24,6 +24,7 @@ namespace Content.Server.Verbs IoCManager.InjectDependencies(this); + SubscribeLocalEvent(Reset); SubscribeNetworkEvent(RequestVerbs); SubscribeNetworkEvent(UseVerb); @@ -38,7 +39,7 @@ namespace Content.Server.Verbs } } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _seesThroughContainers.Clear(); } diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs index 95b4aff527..9909470dac 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Content.Server.Battery.Components; using Content.Server.Hands.Components; using Content.Server.Items; +using Content.Server.Power.Components; using Content.Server.Projectiles.Components; using Content.Shared.ActionBlocker; using Content.Shared.Damage; diff --git a/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs b/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs index adcfdf029a..956bfcb5c4 100644 --- a/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs +++ b/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs @@ -1,5 +1,4 @@ #nullable enable -using Content.Server.Battery.Components; using Content.Server.Power.Components; using Content.Server.PowerCell.Components; using Content.Server.Weapon.Ranged.Barrels.Components; diff --git a/Content.Server/Wires/WireHackingSystem.cs b/Content.Server/WireHacking/WireHackingSystem.cs similarity index 81% rename from Content.Server/Wires/WireHackingSystem.cs rename to Content.Server/WireHacking/WireHackingSystem.cs index 7155f331e8..99ed63bfb6 100644 --- a/Content.Server/Wires/WireHackingSystem.cs +++ b/Content.Server/WireHacking/WireHackingSystem.cs @@ -5,13 +5,20 @@ using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; using static Content.Shared.Wires.SharedWiresComponent; -namespace Content.Server.Wires +namespace Content.Server.WireHacking { - public class WireHackingSystem : EntitySystem, IResettingEntitySystem + public class WireHackingSystem : EntitySystem { [ViewVariables] private readonly Dictionary _layouts = new(); + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(Reset); + } + public bool TryGetLayout(string id, [NotNullWhen(true)] out WireLayout? layout) { return _layouts.TryGetValue(id, out layout); @@ -22,7 +29,7 @@ namespace Content.Server.Wires _layouts.Add(id, layout); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _layouts.Clear(); } diff --git a/Content.Server/Wires/Components/WiresComponent.cs b/Content.Server/WireHacking/WiresComponent.cs similarity index 99% rename from Content.Server/Wires/Components/WiresComponent.cs rename to Content.Server/WireHacking/WiresComponent.cs index 60d19b0e1f..e48b1959dc 100644 --- a/Content.Server/Wires/Components/WiresComponent.cs +++ b/Content.Server/WireHacking/WiresComponent.cs @@ -10,7 +10,6 @@ using Content.Server.VendingMachines; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; -using Content.Shared.Notification; using Content.Shared.Notification.Managers; using Content.Shared.Tool; using Content.Shared.Wires; @@ -27,7 +26,7 @@ using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -namespace Content.Server.Wires.Components +namespace Content.Server.WireHacking { [RegisterComponent] public class WiresComponent : SharedWiresComponent, IInteractUsing, IExamine, IMapInit diff --git a/Content.Shared/AME/SharedAMEControllerComponent.cs b/Content.Shared/AME/SharedAMEControllerComponent.cs index aa65f151f6..162cb32a52 100644 --- a/Content.Shared/AME/SharedAMEControllerComponent.cs +++ b/Content.Shared/AME/SharedAMEControllerComponent.cs @@ -55,7 +55,6 @@ namespace Content.Shared.AME ToggleInjection, IncreaseFuel, DecreaseFuel, - RefreshParts } [Serializable, NetSerializable] diff --git a/Content.Shared/Actions/ActionType.cs b/Content.Shared/Actions/ActionType.cs index beb5e6136d..fdca3780ea 100644 --- a/Content.Shared/Actions/ActionType.cs +++ b/Content.Shared/Actions/ActionType.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable namespace Content.Shared.Actions { /// @@ -17,7 +17,8 @@ namespace Content.Shared.Actions DebugTargetPoint, DebugTargetPointRepeat, DebugTargetEntity, - DebugTargetEntityRepeat + DebugTargetEntityRepeat, + SpellPie } /// diff --git a/Content.Shared/Buckle/SharedBuckleSystem.cs b/Content.Shared/Buckle/SharedBuckleSystem.cs index 2072ca2d2d..2363b2b196 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Buckle.Components; using Content.Shared.Standing; +using Content.Shared.Throwing; using Robust.Shared.GameObjects; using Robust.Shared.Physics.Dynamics; @@ -13,6 +14,7 @@ namespace Content.Shared.Buckle SubscribeLocalEvent(PreventCollision); SubscribeLocalEvent(HandleDown); SubscribeLocalEvent(HandleStand); + SubscribeLocalEvent(HandleThrowPushback); } private void HandleStand(EntityUid uid, SharedBuckleComponent component, StandAttemptEvent args) @@ -31,6 +33,12 @@ namespace Content.Shared.Buckle } } + private void HandleThrowPushback(EntityUid uid, SharedBuckleComponent component, ThrowPushbackAttemptEvent args) + { + if (!component.Buckled) return; + args.Cancel(); + } + private void PreventCollision(EntityUid uid, SharedBuckleComponent component, PreventCollideEvent args) { if (args.BodyB.Owner.Uid != component.LastEntityBuckledTo) return; diff --git a/Content.Shared/GameTicking/IResettingEntitySystem.cs b/Content.Shared/GameTicking/IResettingEntitySystem.cs deleted file mode 100644 index f5daa7e1c1..0000000000 --- a/Content.Shared/GameTicking/IResettingEntitySystem.cs +++ /dev/null @@ -1,9 +0,0 @@ -#nullable enable - -namespace Content.Shared.GameTicking -{ - public interface IResettingEntitySystem - { - void Reset(); - } -} diff --git a/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs b/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs new file mode 100644 index 0000000000..0537925b56 --- /dev/null +++ b/Content.Shared/GameTicking/RoundRestartCleanupEvent.cs @@ -0,0 +1,13 @@ +using System; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; + +#nullable enable + +namespace Content.Shared.GameTicking +{ + [Serializable, NetSerializable] + public class RoundRestartCleanupEvent : EntityEventArgs + { + } +} diff --git a/Content.Shared/Light/Component/SharedEmergencyLightComponent.cs b/Content.Shared/Light/Component/SharedEmergencyLightComponent.cs new file mode 100644 index 0000000000..b7f1e9a95a --- /dev/null +++ b/Content.Shared/Light/Component/SharedEmergencyLightComponent.cs @@ -0,0 +1,11 @@ +using System; +using Robust.Shared.Serialization; + +namespace Content.Shared.Light.Component +{ + [Serializable, NetSerializable] + public enum EmergencyLightVisuals + { + On, + } +} diff --git a/Content.Shared/MobState/State/SharedMobStateComponent.cs b/Content.Shared/MobState/Components/SharedMobStateComponent.cs similarity index 99% rename from Content.Shared/MobState/State/SharedMobStateComponent.cs rename to Content.Shared/MobState/Components/SharedMobStateComponent.cs index c9bfe76b69..ffc8112549 100644 --- a/Content.Shared/MobState/State/SharedMobStateComponent.cs +++ b/Content.Shared/MobState/Components/SharedMobStateComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Alert; using Content.Shared.Damage; using Content.Shared.Damage.Components; +using Content.Shared.MobState.State; using Content.Shared.NetIDs; using Robust.Shared.GameObjects; using Robust.Shared.Players; @@ -14,7 +15,7 @@ using Robust.Shared.Serialization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; -namespace Content.Shared.MobState.State +namespace Content.Shared.MobState.Components { /// /// When attached to an , diff --git a/Content.Shared/MobState/EntitySystems/SharedMobStateSystem.cs b/Content.Shared/MobState/EntitySystems/SharedMobStateSystem.cs new file mode 100644 index 0000000000..6db4899389 --- /dev/null +++ b/Content.Shared/MobState/EntitySystems/SharedMobStateSystem.cs @@ -0,0 +1,22 @@ +using Content.Shared.MobState.Components; +using Content.Shared.Pulling.Events; +using Robust.Shared.GameObjects; + +namespace Content.Shared.MobState.EntitySystems +{ + public class SharedMobStateSystem : EntitySystem + { + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnStartPullAttempt); + } + + private void OnStartPullAttempt(EntityUid uid, SharedMobStateComponent component, StartPullAttemptEvent args) + { + if(component.IsIncapacitated()) + args.Cancel(); + } + } +} diff --git a/Content.Shared/NodeContainer/NodeVis.cs b/Content.Shared/NodeContainer/NodeVis.cs new file mode 100644 index 0000000000..d3f9ceb93a --- /dev/null +++ b/Content.Shared/NodeContainer/NodeVis.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using Robust.Shared.GameObjects; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; + +namespace Content.Shared.NodeContainer +{ + public static class NodeVis + { + [Serializable, NetSerializable] + public sealed class MsgEnable : EntityEventArgs + { + public MsgEnable(bool enabled) + { + Enabled = enabled; + } + + public bool Enabled { get; } + } + + [Serializable, NetSerializable] + public sealed class MsgData : EntityEventArgs + { + public List Groups = new(); + public List GroupDeletions = new(); + } + + [Serializable, NetSerializable] + public sealed class GroupData + { + public int NetId; + public string GroupId = ""; + public Color Color; + public NodeDatum[] Nodes = Array.Empty(); + } + + [Serializable, NetSerializable] + public sealed class NodeDatum + { + public EntityUid Entity; + public int NetId; + public int[] Reachable = Array.Empty(); + public string Name = ""; + public string Type = ""; + } + } +} diff --git a/Content.Shared/Pulling/Components/SharedPullableComponent.cs b/Content.Shared/Pulling/Components/SharedPullableComponent.cs index 0ed2464601..d5c7c9e066 100644 --- a/Content.Shared/Pulling/Components/SharedPullableComponent.cs +++ b/Content.Shared/Pulling/Components/SharedPullableComponent.cs @@ -204,6 +204,11 @@ namespace Content.Shared.Pulling.Components return false; } + if (!EntitySystem.Get().CanPull(puller, Owner)) + { + return false; + } + if (_physics == null) { return false; diff --git a/Content.Shared/Pulling/Events/StartPullAttemptEvent.cs b/Content.Shared/Pulling/Events/StartPullAttemptEvent.cs new file mode 100644 index 0000000000..a45e289b7a --- /dev/null +++ b/Content.Shared/Pulling/Events/StartPullAttemptEvent.cs @@ -0,0 +1,19 @@ +using Robust.Shared.GameObjects; + +namespace Content.Shared.Pulling.Events +{ + /// + /// Directed event raised on the puller to see if it can start pulling something. + /// + public class StartPullAttemptEvent : CancellableEntityEventArgs + { + public StartPullAttemptEvent(IEntity puller, IEntity pulled) + { + Puller = puller; + Pulled = pulled; + } + + public IEntity Puller { get; } + public IEntity Pulled { get; } + } +} diff --git a/Content.Shared/Pulling/SharedPullingSystem.cs b/Content.Shared/Pulling/SharedPullingSystem.cs index 40374f3756..9660f7f1bc 100644 --- a/Content.Shared/Pulling/SharedPullingSystem.cs +++ b/Content.Shared/Pulling/SharedPullingSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.GameTicking; using Content.Shared.Input; using Content.Shared.Physics.Pull; using Content.Shared.Pulling.Components; +using Content.Shared.Pulling.Events; using Content.Shared.Rotatable; using JetBrains.Annotations; using Robust.Shared.Containers; @@ -19,7 +20,7 @@ using Robust.Shared.Players; namespace Content.Shared.Pulling { [UsedImplicitly] - public abstract class SharedPullingSystem : EntitySystem, IResettingEntitySystem + public abstract class SharedPullingSystem : EntitySystem { /// /// A mapping of pullers to the entity that they are pulling. @@ -50,6 +51,7 @@ namespace Content.Shared.Pulling { base.Initialize(); + SubscribeLocalEvent(Reset); SubscribeLocalEvent(OnPullStarted); SubscribeLocalEvent(OnPullStopped); SubscribeLocalEvent(PullerMoved); @@ -69,7 +71,7 @@ namespace Content.Shared.Pulling _stoppedMoving.Clear(); } - public void Reset() + public void Reset(RoundRestartCleanupEvent ev) { _pullers.Clear(); _moving.Clear(); @@ -237,5 +239,12 @@ namespace Content.Shared.Pulling pulled.Transform.WorldRotation = newAngle; } } + + public bool CanPull(IEntity puller, IEntity pulled) + { + var startPull = new StartPullAttemptEvent(puller, pulled); + RaiseLocalEvent(puller.Uid, startPull); + return !startPull.Cancelled; + } } } diff --git a/Content.Shared/Sound/SoundSpecifier.cs b/Content.Shared/Sound/SoundSpecifier.cs new file mode 100644 index 0000000000..616ccf9551 --- /dev/null +++ b/Content.Shared/Sound/SoundSpecifier.cs @@ -0,0 +1,67 @@ +using System; +using Content.Shared.Audio; +using Robust.Shared; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Serialization.TypeSerializers.Implementations; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.Utility; + +namespace Content.Shared.Sound +{ + [DataDefinition] + public abstract class SoundSpecifier + { + public abstract string GetSound(); + } + + [DataDefinition] + public sealed class SoundPathSpecifier : SoundSpecifier + { + public const string Node = "path"; + + [DataField(Node, customTypeSerializer:typeof(ResourcePathSerializer), required:true)] + public ResourcePath? Path { get; } + + public SoundPathSpecifier() + { + } + + public SoundPathSpecifier(string path) + { + Path = new ResourcePath(path); + } + + public SoundPathSpecifier(ResourcePath path) + { + Path = path; + } + + public override string GetSound() + { + return Path == null ? string.Empty : Path.ToString(); + } + } + + [DataDefinition] + public sealed class SoundCollectionSpecifier : SoundSpecifier + { + public const string Node = "collection"; + + [DataField(Node, customTypeSerializer:typeof(PrototypeIdSerializer), required:true)] + public string? Collection { get; } + + public SoundCollectionSpecifier() + { + } + + public SoundCollectionSpecifier(string collection) + { + Collection = collection; + } + + public override string GetSound() + { + return Collection == null ? string.Empty : AudioHelpers.GetRandomFileFromSoundCollection(Collection); + } + } +} diff --git a/Content.Shared/Sound/SoundSpecifierTypeSerializer.cs b/Content.Shared/Sound/SoundSpecifierTypeSerializer.cs new file mode 100644 index 0000000000..26596961c5 --- /dev/null +++ b/Content.Shared/Sound/SoundSpecifierTypeSerializer.cs @@ -0,0 +1,48 @@ +using System; +using Robust.Shared.IoC; +using Robust.Shared.Serialization.Manager; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Serialization.Manager.Result; +using Robust.Shared.Serialization.Markdown.Mapping; +using Robust.Shared.Serialization.Markdown.Validation; +using Robust.Shared.Serialization.TypeSerializers.Interfaces; + +namespace Content.Shared.Sound +{ + [TypeSerializer] + public class SoundSpecifierTypeSerializer : ITypeReader + { + private Type GetType(MappingDataNode node) + { + var hasPath = node.Has(SoundPathSpecifier.Node); + var hasCollection = node.Has(SoundCollectionSpecifier.Node); + + if (hasPath || !(hasPath ^ hasCollection)) + return typeof(SoundPathSpecifier); + + if (hasCollection) + return typeof(SoundCollectionSpecifier); + + return typeof(SoundPathSpecifier); + } + + public DeserializationResult Read(ISerializationManager serializationManager, MappingDataNode node, + IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null) + { + var type = GetType(node); + return serializationManager.Read(type, node, context, skipHook); + } + + public ValidationNode Validate(ISerializationManager serializationManager, MappingDataNode node, + IDependencyCollection dependencies, ISerializationContext? context = null) + { + if (node.Has(SoundPathSpecifier.Node) && node.Has(SoundCollectionSpecifier.Node)) + return new ErrorNode(node, "You can only specify either a sound path or a sound collection!"); + + if (!node.Has(SoundPathSpecifier.Node) && !node.Has(SoundCollectionSpecifier.Node)) + return new ErrorNode(node, "You need to specify either a sound path or a sound collection!"); + + return serializationManager.ValidateNode(GetType(node), node, context); + } + } +} diff --git a/Content.Shared/Throwing/ThrowAttemptEvent.cs b/Content.Shared/Throwing/ThrowAttemptEvent.cs index a862a8a82e..ba17ab4789 100644 --- a/Content.Shared/Throwing/ThrowAttemptEvent.cs +++ b/Content.Shared/Throwing/ThrowAttemptEvent.cs @@ -11,4 +11,9 @@ namespace Content.Shared.Throwing public IEntity Entity { get; } } + + /// + /// Raised when we try to pushback an entity from throwing + /// + public sealed class ThrowPushbackAttemptEvent : CancellableEntityEventArgs {} } diff --git a/Content.Shared/Wires/SharedWireVisComponent.cs b/Content.Shared/Wires/SharedWireVisComponent.cs new file mode 100644 index 0000000000..df9f0837c2 --- /dev/null +++ b/Content.Shared/Wires/SharedWireVisComponent.cs @@ -0,0 +1,22 @@ +using System; +using Robust.Shared.Serialization; + +namespace Content.Shared.Wires +{ + [Serializable, NetSerializable] + public enum WireVisVisuals + { + ConnectedMask + } + + [Flags] + [Serializable, NetSerializable] + public enum WireVisDirFlags : byte + { + None = 0, + North = 1, + South = 2, + East = 4, + West = 8 + } +} diff --git a/Pow3r/LinqHelper.cs b/Pow3r/LinqHelper.cs new file mode 100644 index 0000000000..25ae91b090 --- /dev/null +++ b/Pow3r/LinqHelper.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; + +namespace Pow3r +{ + public static class LinqHelper + { + public static void ForEach(this IEnumerable enumerable, Action action) + { + foreach (var item in enumerable) + { + action(item); + } + } + } +} diff --git a/Pow3r/Pow3r.csproj b/Pow3r/Pow3r.csproj new file mode 100644 index 0000000000..d86f41e139 --- /dev/null +++ b/Pow3r/Pow3r.csproj @@ -0,0 +1,21 @@ + + + + Exe + net5.0 + true + + + + + + + + + + + + + + + diff --git a/Pow3r/Program.OpenGL.cs b/Pow3r/Program.OpenGL.cs new file mode 100644 index 0000000000..5ad123feed --- /dev/null +++ b/Pow3r/Program.OpenGL.cs @@ -0,0 +1,127 @@ +using System; +using System.Numerics; +using System.Text; +using System.Linq; +using ImGuiNET; +using OpenTK.Graphics.OpenGL; +using OpenTK.Windowing.GraphicsLibraryFramework; + +namespace Pow3r +{ + internal sealed unsafe partial class Program + { + private int _glFontTexture; + + private void InitOpenGL() + { + if (GL.GetString(StringName.Extensions).Split(' ').Contains("GL_ARB_debug_output")) + GL.Arb.DebugMessageCallback(GLDebugCallbackDelegate, (nint) 0x0105); + + GL.Enable(EnableCap.ScissorTest); + GL.Enable(EnableCap.Blend); + GL.BlendEquation(BlendEquationMode.FuncAdd); + GL.BlendFuncSeparate( + BlendingFactorSrc.SrcAlpha, + BlendingFactorDest.OneMinusSrcAlpha, + BlendingFactorSrc.One, + BlendingFactorDest.OneMinusSrcAlpha); + + var io = ImGui.GetIO(); + + io.Fonts.GetTexDataAsRGBA32(out byte* pixels, out var width, out var height, out _); + + _glFontTexture = GL.GenTexture(); + GL.BindTexture(TextureTarget.Texture2D, _glFontTexture); + GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, width, height, 0, PixelFormat.Bgra, PixelType.UnsignedByte, (nint) pixels); + GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int) TextureMagFilter.Nearest); + GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int) TextureMinFilter.Nearest); + GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int) TextureWrapMode.ClampToEdge); + GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int) TextureWrapMode.ClampToEdge); + + /* + GL.TextureParameter(_fontTexture, TextureParameterName.TextureSwizzleR, 1); + GL.TextureParameter(_fontTexture, TextureParameterName.TextureSwizzleG, 1); + GL.TextureParameter(_fontTexture, TextureParameterName.TextureSwizzleB, 1); + GL.TextureParameter(_fontTexture, TextureParameterName.TextureSwizzleA, (int) All.Red);*/ + + io.Fonts.SetTexID((nint) _glFontTexture); + io.Fonts.ClearTexData(); + } + + private void RenderOpenGL() + { + GLFW.GetFramebufferSize(_window.WindowPtr, out var fbW, out var fbH); + GL.Viewport(0, 0, fbW, fbH); + GL.Disable(EnableCap.ScissorTest); + GL.ClearColor(0, 0, 0, 1); + GL.Clear(ClearBufferMask.ColorBufferBit); + GL.Enable(EnableCap.ScissorTest); + GL.Enable(EnableCap.Texture2D); + + var drawData = ImGui.GetDrawData(); + + var l = drawData.DisplayPos.X; + var r = drawData.DisplayPos.X + drawData.DisplaySize.X; + var t = drawData.DisplayPos.Y; + var b = drawData.DisplayPos.Y + drawData.DisplaySize.Y; + + var matrix = Matrix4x4.CreateOrthographicOffCenter(l, r, b, t, -1, 1); + + GL.MatrixMode(MatrixMode.Projection); + GL.LoadMatrix((float*) &matrix); + + var clipOff = drawData.DisplayPos; + var clipScale = drawData.FramebufferScale; + + GL.EnableClientState(ArrayCap.VertexArray); + GL.EnableClientState(ArrayCap.TextureCoordArray); + GL.EnableClientState(ArrayCap.ColorArray); + + for (var n = 0; n < drawData.CmdListsCount; n++) + { + var drawList = drawData.CmdListsRange[n]; + + for (var cmdI = 0; cmdI < drawList.CmdBuffer.Size; cmdI++) + { + var cmd = drawList.CmdBuffer[cmdI]; + + GL.BindTexture(TextureTarget.Texture2D, (uint) cmd.TextureId); + + Vector4 clipRect = default; + clipRect.X = (cmd.ClipRect.X - clipOff.X) * clipScale.X; + clipRect.Y = (cmd.ClipRect.Y - clipOff.Y) * clipScale.Y; + clipRect.Z = (cmd.ClipRect.Z - clipOff.X) * clipScale.X; + clipRect.W = (cmd.ClipRect.W - clipOff.Y) * clipScale.Y; + + GL.Scissor((int) clipRect.X, (int) (fbH - clipRect.W), (int) (clipRect.Z - clipRect.X), + (int) (clipRect.W - clipRect.Y)); + + IntPtr adjustedVB = drawList.VtxBuffer.Data + (nint) (sizeof(ImDrawVert) * cmd.VtxOffset); + + GL.VertexPointer(2, VertexPointerType.Float, sizeof(ImDrawVert), adjustedVB); + GL.TexCoordPointer(2, TexCoordPointerType.Float, sizeof(ImDrawVert), adjustedVB + 8); + GL.ColorPointer(4, ColorPointerType.UnsignedByte, sizeof(ImDrawVert), adjustedVB + 16); + + GL.DrawElements(PrimitiveType.Triangles, (int) cmd.ElemCount, + DrawElementsType.UnsignedShort, + drawList.IdxBuffer.Data + (nint) (cmd.IdxOffset * 2)); + } + } + + _window.SwapBuffers(); + } + + private static readonly DebugProcArb GLDebugCallbackDelegate = GLDebugCallback; + + private static void GLDebugCallback(DebugSource source, DebugType type, int id, DebugSeverity severity, + int length, IntPtr message, IntPtr userParam) + { + var msg = Encoding.UTF8.GetString((byte*) message, length); + + if (severity == DebugSeverity.DebugSeverityNotification) + return; + + Console.WriteLine($"[{type}][{severity}] {source}: {msg}"); + } + } +} diff --git a/Pow3r/Program.SaveLoad.cs b/Pow3r/Program.SaveLoad.cs new file mode 100644 index 0000000000..2ffdc8eb4e --- /dev/null +++ b/Pow3r/Program.SaveLoad.cs @@ -0,0 +1,71 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text.Json; +using Content.Server.Power.Pow3r; +using static Content.Server.Power.Pow3r.PowerState; + +namespace Pow3r +{ + internal sealed partial class Program + { + private void LoadFromDisk() + { + if (!File.Exists("data.json")) + return; + + var dat = JsonSerializer.Deserialize(File.ReadAllBytes("data.json"), SerializerOptions); + + if (dat == null) + return; + + _paused = dat.Paused; + _nextId = dat.NextId; + _currentSolver = dat.Solver; + + _state = new PowerState + { + Networks = dat.Networks.ToDictionary(n => n.Id, n => n), + Supplies = dat.Supplies.ToDictionary(s => s.Id, s => s), + Loads = dat.Loads.ToDictionary(l => l.Id, l => l), + Batteries = dat.Batteries.ToDictionary(b => b.Id, b => b) + }; + + _displayLoads = dat.Loads.ToDictionary(n => n.Id, _ => new DisplayLoad()); + _displaySupplies = dat.Supplies.ToDictionary(n => n.Id, _ => new DisplaySupply()); + _displayBatteries = dat.Batteries.ToDictionary(n => n.Id, _ => new DisplayBattery()); + _displayNetworks = dat.Networks.ToDictionary(n => n.Id, _ => new DisplayNetwork()); + + RefreshLinks(); + } + + private void SaveToDisk() + { + var data = new DiskDat + { + Paused = _paused, + NextId = _nextId, + Solver = _currentSolver, + + Loads = _state.Loads.Values.ToList(), + Batteries = _state.Batteries.Values.ToList(), + Networks = _state.Networks.Values.ToList(), + Supplies = _state.Supplies.Values.ToList() + }; + + File.WriteAllBytes("data.json", JsonSerializer.SerializeToUtf8Bytes(data, SerializerOptions)); + } + + private sealed class DiskDat + { + public bool Paused; + public int NextId; + public int Solver; + + public List Loads; + public List Networks; + public List Supplies; + public List Batteries; + } + } +} diff --git a/Pow3r/Program.Simulation.cs b/Pow3r/Program.Simulation.cs new file mode 100644 index 0000000000..440e262f83 --- /dev/null +++ b/Pow3r/Program.Simulation.cs @@ -0,0 +1,137 @@ +using System.Collections.Generic; +using System.Diagnostics; +using Content.Server.Power.Pow3r; +using static Content.Server.Power.Pow3r.PowerState; + + +namespace Pow3r +{ + internal sealed partial class Program + { + private const int MaxTickData = 180; + + private int _nextId = 1; + private PowerState _state = new(); + private Network _linking; + private int _tickDataIdx; + private bool _paused; + + private readonly string[] _solverNames = + { + nameof(GraphWalkSolver), + nameof(BatteryRampPegSolver), + nameof(NoOpSolver) + }; + + private readonly IPowerSolver[] _solvers = { + new GraphWalkSolver(), + new BatteryRampPegSolver(), + new NoOpSolver() + }; + + private int _currentSolver; + + private readonly float[] _simTickTimes = new float[MaxTickData]; + private readonly Queue _remQueue = new(); + private readonly Stopwatch _simStopwatch = new Stopwatch(); + + private NodeId AllocId() + { + return new(_nextId++); + } + + private void Tick(float frameTime) + { + if (_paused) + return; + + RunSingleStep(frameTime); + } + + private void RunSingleStep(float frameTime) + { + _simStopwatch.Restart(); + _tickDataIdx = (_tickDataIdx + 1) % MaxTickData; + + _solvers[_currentSolver].Tick(frameTime, _state); + + // Update tick history. + foreach (var load in _state.Loads.Values) + { + var displayLoad = _displayLoads[load.Id]; + displayLoad.ReceivedPowerData[_tickDataIdx] = load.ReceivingPower; + } + + foreach (var supply in _state.Supplies.Values) + { + var displaySupply = _displaySupplies[supply.Id]; + displaySupply.SuppliedPowerData[_tickDataIdx] = supply.CurrentSupply; + } + + foreach (var battery in _state.Batteries.Values) + { + var displayBattery = _displayBatteries[battery.Id]; + displayBattery.StoredPowerData[_tickDataIdx] = battery.CurrentStorage; + displayBattery.ReceivingPowerData[_tickDataIdx] = battery.CurrentReceiving; + displayBattery.SuppliedPowerData[_tickDataIdx] = battery.CurrentSupply; + } + + _simTickTimes[_tickDataIdx] = (float) _simStopwatch.Elapsed.TotalMilliseconds; + } + + private void RunSingleStep() + { + RunSingleStep(1f/_tps); + } + + // Link data is stored authoritatively on networks, + // but for easy access it is replicated into the linked components. + // This is updated here. + private void RefreshLinks() + { + foreach (var battery in _state.Batteries.Values) + { + battery.LinkedNetworkCharging = default; + battery.LinkedNetworkDischarging = default; + } + + foreach (var load in _state.Loads.Values) + { + load.LinkedNetwork = default; + } + + foreach (var supply in _state.Supplies.Values) + { + supply.LinkedNetwork = default; + } + + foreach (var network in _state.Networks.Values) + { + foreach (var loadId in network.Loads) + { + var load = _state.Loads[loadId]; + load.LinkedNetwork = network.Id; + } + + foreach (var supplyId in network.Supplies) + { + var supply = _state.Supplies[supplyId]; + supply.LinkedNetwork = network.Id; + } + + foreach (var batteryId in network.BatteriesCharging) + { + var battery = _state.Batteries[batteryId]; + battery.LinkedNetworkCharging = network.Id; + } + + foreach (var batteryId in network.BatteriesDischarging) + { + var battery = _state.Batteries[batteryId]; + battery.LinkedNetworkDischarging = network.Id; + } + } + } + + } +} diff --git a/Pow3r/Program.UI.cs b/Pow3r/Program.UI.cs new file mode 100644 index 0000000000..96f7b90cf8 --- /dev/null +++ b/Pow3r/Program.UI.cs @@ -0,0 +1,459 @@ +using System; +using System.Collections.Generic; +using ImGuiNET; +using Robust.Shared.Maths; +using static ImGuiNET.ImGui; +using Color = System.Drawing.Color; +using Vector2 = System.Numerics.Vector2; +using RobustVec2 = Robust.Shared.Maths.Vector2; +using static Content.Server.Power.Pow3r.PowerState; + +namespace Pow3r +{ + internal sealed partial class Program + { + private bool _showDemo; + + private Dictionary _displayLoads = new(); + private Dictionary _displayBatteries = new(); + private Dictionary _displayNetworks = new(); + private Dictionary _displaySupplies = new(); + + private void DoUI(float frameTime) + { + if (BeginMainMenuBar()) + { + _showDemo ^= MenuItem("Demo"); + EndMainMenuBar(); + } + + SetNextWindowSize(new Vector2(150, 200)); + + Begin("CreateButtons", + ImGuiWindowFlags.NoTitleBar | + ImGuiWindowFlags.NoCollapse | + ImGuiWindowFlags.NoResize); + + if (Button("Generator")) + { + var id = AllocId(); + _state.Supplies.Add(id, new Supply { Id = id }); + _displaySupplies.Add(id, new DisplaySupply()); + } + + if (Button("Load")) + { + var id = AllocId(); + _state.Loads.Add(id, new Load { Id = id }); + _displayLoads.Add(id, new DisplayLoad()); + } + + if (Button("Network")) + { + var id = AllocId(); + _state.Networks.Add(id, new Network { Id = id }); + _displayNetworks.Add(id, new DisplayNetwork()); + } + + if (Button("Battery")) + { + var id = AllocId(); + _state.Batteries.Add(id, new Battery { Id = id }); + _displayBatteries.Add(id, new DisplayBattery()); + } + + Checkbox("Paused", ref _paused); + SliderInt("TPS", ref _tps, 1, 120); + SetNextItemWidth(-1); + Combo("", ref _currentSolver, _solverNames, _solverNames.Length); + + if (Button("Single step")) + RunSingleStep(); + + End(); + + Begin("Simulating timing"); + + PlotLines("Tick time (ms)", ref _simTickTimes[0], MaxTickData, _tickDataIdx + 1, + $"{_simTickTimes[_tickDataIdx]:N2}", + 0, + 0.1f, new Vector2(250, 150)); + + End(); + + Begin("Frame timings"); + + PlotLines("Frame (ms)", ref _frameTimings[0], _frameTimings.Length, _frameTimeIdx + 1, + $"{_frameTimings[_frameTimeIdx]:N2}", + 0, + 33.333f, new Vector2(250, 150)); + + End(); + + { + Begin("Memory"); + + var heap = GC.GetTotalMemory(false); + Text($"Managed heap: {heap>>20} MiB"); + + End(); + } + + foreach (var network in _state.Networks.Values) + { + var displayNetwork = _displayNetworks[network.Id]; + Begin($"Network {network.Id}##Gen{network.Id}"); + + Text($"Height: {network.Height}"); + + displayNetwork.CurrentWindowPos = CalcWindowCenter(); + + if (Button("Delete")) + { + _remQueue.Enqueue(network); + + if (_linking == network) + { + _linking = null; + } + } + + SameLine(); + + if (_linking != null) + { + if (_linking == network && Button("Cancel")) + { + _linking = null; + } + } + else + { + if (Button("Link...")) + { + _linking = network; + } + } + + End(); + } + + foreach (var load in _state.Loads.Values) + { + var displayLoad = _displayLoads[load.Id]; + + Begin($"Load {load.Id}##Load{load.Id}"); + + Checkbox("Enabled", ref load.Enabled); + SliderFloat("Desired", ref load.DesiredPower, 0, 1000, "%.0f W"); + + displayLoad.CurrentWindowPos = CalcWindowCenter(); + + PlotLines("", ref displayLoad.ReceivedPowerData[0], MaxTickData, _tickDataIdx + 1, + $"Receiving: {load.ReceivingPower:N1} W", + 0, + load.DesiredPower, new Vector2(250, 150)); + + if (Button("Delete")) + { + _remQueue.Enqueue(load); + } + + SameLine(); + if (_linking != null) + { + if (Button("Link")) + { + _linking.Loads.Add(load.Id); + _linking = null; + RefreshLinks(); + } + } + else + { + if (load.LinkedNetwork != default && Button("Unlink")) + { + var net = _state.Networks[load.LinkedNetwork]; + net.Loads.Remove(load.Id); + load.LinkedNetwork = default; + } + } + + End(); + } + + foreach (var supply in _state.Supplies.Values) + { + var displaySupply = _displaySupplies[supply.Id]; + Begin($"Generator {supply.Id}##Gen{supply.Id}"); + + Checkbox("Enabled", ref supply.Enabled); + SliderFloat("Available", ref supply.MaxSupply, 0, 1000, "%.0f W"); + SliderFloat("Ramp", ref supply.SupplyRampRate, 0, 100, "%.0f W/s"); + SliderFloat("Tolerance", ref supply.SupplyRampTolerance, 0, 100, "%.0f W"); + + displaySupply.CurrentWindowPos = CalcWindowCenter(); + + Text($"Ramp Position: {supply.SupplyRampPosition:N1}"); + + PlotLines("", ref displaySupply.SuppliedPowerData[0], MaxTickData, _tickDataIdx + 1, + $"Supply: {supply.CurrentSupply:N1} W", + 0, supply.MaxSupply, new Vector2(250, 150)); + + if (Button("Delete")) + { + _remQueue.Enqueue(supply); + } + + SameLine(); + if (_linking != null) + { + if (Button("Link")) + { + _linking.Supplies.Add(supply.Id); + _linking = null; + RefreshLinks(); + } + } + else + { + if (supply.LinkedNetwork != default && Button("Unlink")) + { + var net = _state.Networks[supply.LinkedNetwork]; + net.Supplies.Remove(supply.Id); + supply.LinkedNetwork = default; + } + } + + End(); + } + + foreach (var battery in _state.Batteries.Values) + { + var displayBattery = _displayBatteries[battery.Id]; + + Begin($"Battery {battery.Id}##Bat{battery.Id}"); + + Checkbox("Enabled", ref battery.Enabled); + SliderFloat("Capacity", ref battery.Capacity, 0, 100000, "%.0f J"); + SliderFloat("Max charge rate", ref battery.MaxChargeRate, 0, 1000, "%.0f W"); + SliderFloat("Max supply", ref battery.MaxSupply, 0, 1000, "%.0f W"); + SliderFloat("Ramp", ref battery.SupplyRampRate, 0, 100, "%.0f W/s"); + SliderFloat("Tolerance", ref battery.SupplyRampTolerance, 0, 100, "%.0f W"); + var percent = 100 * battery.Efficiency; + SliderFloat("Efficiency", ref percent, 0, 100, "%.0f %%"); + battery.Efficiency = percent / 100; + + displayBattery.CurrentWindowPos = CalcWindowCenter(); + + SliderFloat("Ramp position", ref battery.SupplyRampPosition, 0, battery.MaxSupply, "%.0f W"); + + PlotLines("", ref displayBattery.SuppliedPowerData[0], MaxTickData, _tickDataIdx + 1, + $"OUT: {battery.CurrentSupply:N1} W", + 0, battery.MaxSupply + 1000, new Vector2(250, 75)); + + PlotLines("", ref displayBattery.ReceivingPowerData[0], MaxTickData, _tickDataIdx + 1, + $"IN: {battery.CurrentReceiving:N1} W", + 0, battery.MaxChargeRate + 1000, new Vector2(250, 75)); + + PlotLines("", ref displayBattery.StoredPowerData[0], MaxTickData, _tickDataIdx + 1, + $"Charge: {battery.CurrentStorage:N1} J", + 0, battery.Capacity, new Vector2(250, 75)); + + if (Button("Delete")) + { + _remQueue.Enqueue(battery); + } + + SameLine(); + if (_linking != null) + { + if (battery.LinkedNetworkCharging == default && Button("Link as load")) + { + _linking.BatteriesCharging.Add(battery.Id); + _linking = null; + RefreshLinks(); + } + else + { + SameLine(); + if (battery.LinkedNetworkDischarging == default && Button("Link as supply")) + { + _linking.BatteriesDischarging.Add(battery.Id); + _linking = null; + RefreshLinks(); + } + } + } + else + { + if (battery.LinkedNetworkCharging != default && Button("Unlink loading")) + { + var net = _state.Networks[battery.LinkedNetworkCharging]; + net.BatteriesCharging.Remove(battery.Id); + battery.LinkedNetworkCharging = default; + } + else + { + SameLine(); + if (battery.LinkedNetworkDischarging != default && Button("Unlink supplying")) + { + var net = _state.Networks[battery.LinkedNetworkDischarging]; + net.BatteriesDischarging.Remove(battery.Id); + battery.LinkedNetworkDischarging = default; + } + } + } + + if (Button("Empty")) + battery.CurrentStorage = 0; + SameLine(); + if (Button("Fill")) + battery.CurrentStorage = battery.Capacity; + + End(); + } + + var bgDrawList = GetBackgroundDrawList(); + + foreach (var network in _state.Networks.Values) + { + var displayNet = _displayNetworks[network.Id]; + foreach (var supplyId in network.Supplies) + { + var supply = _displaySupplies[supplyId]; + DrawArrowLine(bgDrawList, displayNet.CurrentWindowPos, supply.CurrentWindowPos, Color.LawnGreen); + } + + foreach (var loadId in network.Loads) + { + var load = _displayLoads[loadId]; + DrawArrowLine(bgDrawList, load.CurrentWindowPos, displayNet.CurrentWindowPos, Color.Red); + } + + foreach (var batteryId in network.BatteriesCharging) + { + var battery = _displayBatteries[batteryId]; + DrawArrowLine(bgDrawList, battery.CurrentWindowPos, displayNet.CurrentWindowPos, Color.Purple); + } + + foreach (var batteryId in network.BatteriesDischarging) + { + var battery = _displayBatteries[batteryId]; + DrawArrowLine(bgDrawList, displayNet.CurrentWindowPos, battery.CurrentWindowPos, Color.Cyan); + } + } + + if (_showDemo) + { + ShowDemoWindow(); + } + + var reLink = false; + while (_remQueue.TryDequeue(out var item)) + { + switch (item) + { + case Network n: + _state.Networks.Remove(n.Id); + _displayNetworks.Remove(n.Id); + reLink = true; + break; + + case Supply s: + _state.Supplies.Remove(s.Id); + _state.Networks.Values.ForEach(n => n.Supplies.Remove(s.Id)); + _displaySupplies.Remove(s.Id); + break; + + case Load l: + _state.Loads.Remove(l.Id); + _state.Networks.Values.ForEach(n => n.Loads.Remove(l.Id)); + _displayLoads.Remove(l.Id); + break; + + case Battery b: + _state.Batteries.Remove(b.Id); + _state.Networks.Values.ForEach(n => n.BatteriesCharging.Remove(b.Id)); + _state.Networks.Values.ForEach(n => n.BatteriesDischarging.Remove(b.Id)); + _displayBatteries.Remove(b.Id); + break; + } + } + + if (reLink) + RefreshLinks(); + } + + + private void DrawArrowLine(ImDrawListPtr ptr, Vector2 a, Vector2 b, Color color) + { + // A: to + // B: from + + const float wingLength = 15; + const float thickness = 3; + + var cvtColor = CvtColor(color); + + ptr.AddLine(a, b, cvtColor, thickness); + + var angleA = Angle.FromDegrees(45); + var angleB = Angle.FromDegrees(-45); + + var mid = (a + b) / 2; + var dir = -Vector2.Normalize(a - b); + + var rVec = new RobustVec2(dir.X, dir.Y); + + var wingADir = CvtVec(angleA.RotateVec(rVec)); + var wingBDir = CvtVec(angleB.RotateVec(rVec)); + + var wingA = wingADir * wingLength + mid; + var wingB = wingBDir * wingLength + mid; + + ptr.AddLine(mid, wingA, cvtColor, thickness); + ptr.AddLine(mid, wingB, cvtColor, thickness); + } + + private static uint CvtColor(Color color) + { + return color.R | ((uint) color.G << 8) | ((uint) color.B << 16) | ((uint) color.A << 24); + } + + private static Vector2 CalcWindowCenter() + { + return GetWindowPos() + GetWindowSize() / 2; + } + + private static Vector2 CvtVec(RobustVec2 vec) + { + return new Vector2(vec.X, vec.Y); + } + + private sealed class DisplayNetwork + { + public Vector2 CurrentWindowPos; + } + + private sealed class DisplayBattery + { + public Vector2 CurrentWindowPos; + public readonly float[] ReceivingPowerData = new float[MaxTickData]; + public readonly float[] SuppliedPowerData = new float[MaxTickData]; + public readonly float[] StoredPowerData = new float[MaxTickData]; + } + + private sealed class DisplayLoad + { + public Vector2 CurrentWindowPos; + public readonly float[] ReceivedPowerData = new float[MaxTickData]; + } + + private sealed class DisplaySupply + { + public Vector2 CurrentWindowPos; + public readonly float[] SuppliedPowerData = new float[MaxTickData]; + } + } +} diff --git a/Pow3r/Program.Veldrid.cs b/Pow3r/Program.Veldrid.cs new file mode 100644 index 0000000000..0ebc62b8de --- /dev/null +++ b/Pow3r/Program.Veldrid.cs @@ -0,0 +1,409 @@ +using System; +using System.Numerics; +using System.Runtime.InteropServices; +using System.Text; +using ImGuiNET; +using OpenTK.Windowing.GraphicsLibraryFramework; +using Veldrid; +using Veldrid.OpenGL; +using Veldrid.SPIRV; +using Veldrid.Vk; + +namespace Pow3r +{ + internal sealed unsafe partial class Program + { + private const string VDVertexShader = @" +#version 460 + +layout (location = 0) in vec2 Position; +layout (location = 1) in vec2 UV; +layout (location = 2) in vec4 Color; + +layout (set = 0, binding = 0) uniform ProjMtx { + mat4 _ProjMtx; +}; + +layout (location = 0) out vec2 Frag_UV; +layout (location = 1) out vec4 Frag_Color; + +// Converts a color from sRGB gamma to linear light gamma +vec4 toLinear(vec4 sRGB) +{ + bvec3 cutoff = lessThan(sRGB.rgb, vec3(0.04045)); + vec3 higher = pow((sRGB.rgb + vec3(0.055))/vec3(1.055), vec3(2.4)); + vec3 lower = sRGB.rgb/vec3(12.92); + + return vec4(mix(higher, lower, cutoff), sRGB.a); +} + +void main() +{ + Frag_UV = UV; + Frag_Color = toLinear(Color); + gl_Position = _ProjMtx * vec4(Position.xy,0,1); +}"; + + private const string VDFragmentShader = @" +#version 460 + +layout (location = 0) in vec2 Frag_UV; +layout (location = 1) in vec4 Frag_Color; + +layout (set = 1, binding = 0) uniform texture2D Texture; +layout (set = 1, binding = 1) uniform sampler TextureSampler; + +layout (location = 0) out vec4 Out_Color; + +void main() +{ + Out_Color = Frag_Color * texture(sampler2D(Texture, TextureSampler), Frag_UV.st); +}"; + + private VeldridRenderer _vdRenderer = VeldridRenderer.Vulkan; + + private GraphicsDevice _vdGfxDevice; + private CommandList _vdCommandList; + private Pipeline _vdPipeline; + private Shader[] _vdShaders; + private ResourceSet _vdSetTexture; + private ResourceSet _vdSetProjMatrix; + private Texture _vdTexture; + private Sampler _vdSampler; + private DeviceBuffer _vdProjMatrixUniformBuffer; + private int _vdLastWidth; + private int _vdLastHeight; + private VdFencedDatum[] _fencedData = Array.Empty(); + + private void InitVeldrid() + { + var options = new GraphicsDeviceOptions + { +#if DEBUG + Debug = true, +#endif + HasMainSwapchain = true, + SyncToVerticalBlank = _vsync, + PreferStandardClipSpaceYDirection = true, + SwapchainSrgbFormat = true + }; + + GLFW.GetFramebufferSize(_window.WindowPtr, out var w, out var h); + + var hwnd = GLFW.GetWin32Window(_window.WindowPtr); + var hinstance = GetModuleHandleA(null); + + switch (_vdRenderer) + { + case VeldridRenderer.Vulkan: + _vdGfxDevice = GraphicsDevice.CreateVulkan( + options, + VkSurfaceSource.CreateWin32((nint) hinstance, hwnd), + (uint) w, (uint) h); + break; + case VeldridRenderer.D3D11: + _vdGfxDevice = GraphicsDevice.CreateD3D11(options, hwnd, (uint) w, (uint) h); + break; + case VeldridRenderer.OpenGL: + { + var platInfo = new OpenGLPlatformInfo( + (nint) _window.WindowPtr, + GLFW.GetProcAddress, + ptr => GLFW.MakeContextCurrent((Window*) ptr), + () => (nint) GLFW.GetCurrentContext(), + () => GLFW.MakeContextCurrent(null), + ptr => GLFW.DestroyWindow((Window*) ptr), + () => GLFW.SwapBuffers(_window.WindowPtr), + vsync => GLFW.SwapInterval(vsync ? 1 : 0)); + + _vdGfxDevice = GraphicsDevice.CreateOpenGL(options, platInfo, (uint) w, (uint) h); + break; + } + } + + + var factory = _vdGfxDevice.ResourceFactory; + + _vdCommandList = factory.CreateCommandList(); + _vdCommandList.Name = "Honk"; + + var vtxLayout = new VertexLayoutDescription( + new VertexElementDescription("Position", VertexElementFormat.Float2, + VertexElementSemantic.TextureCoordinate), + new VertexElementDescription("UV", VertexElementFormat.Float2, VertexElementSemantic.TextureCoordinate), + new VertexElementDescription("Color", VertexElementFormat.Byte4_Norm, + VertexElementSemantic.TextureCoordinate)); + + var vtxShaderDesc = new ShaderDescription( + ShaderStages.Vertex, + Encoding.UTF8.GetBytes(VDVertexShader), + "main"); + + var fragShaderDesc = new ShaderDescription( + ShaderStages.Fragment, + Encoding.UTF8.GetBytes(VDFragmentShader), + "main"); + + _vdShaders = factory.CreateFromSpirv(vtxShaderDesc, fragShaderDesc); + + _vdShaders[0].Name = "VertexShader"; + _vdShaders[1].Name = "FragmentShader"; + + var layoutTexture = factory.CreateResourceLayout(new ResourceLayoutDescription( + new ResourceLayoutElementDescription( + "Texture", + ResourceKind.TextureReadOnly, + ShaderStages.Fragment), + new ResourceLayoutElementDescription( + "TextureSampler", + ResourceKind.Sampler, + ShaderStages.Fragment))); + + layoutTexture.Name = "LayoutTexture"; + + var layoutProjMatrix = factory.CreateResourceLayout(new ResourceLayoutDescription( + new ResourceLayoutElementDescription( + "ProjMtx", + ResourceKind.UniformBuffer, + ShaderStages.Vertex))); + + layoutProjMatrix.Name = "LayoutProjMatrix"; + + var pipelineDesc = new GraphicsPipelineDescription( + new BlendStateDescription( + RgbaFloat.White, + new BlendAttachmentDescription( + true, + BlendFactor.SourceAlpha, + BlendFactor.InverseSourceAlpha, + BlendFunction.Add, + BlendFactor.One, + BlendFactor.InverseSourceAlpha, + BlendFunction.Add) + ), + DepthStencilStateDescription.Disabled, + new RasterizerStateDescription( + FaceCullMode.None, + PolygonFillMode.Solid, + FrontFace.Clockwise, + depthClipEnabled: false, + scissorTestEnabled: true), + PrimitiveTopology.TriangleList, + new ShaderSetDescription(new[] {vtxLayout}, _vdShaders), + new[] {layoutProjMatrix, layoutTexture}, + new OutputDescription( + null, + new OutputAttachmentDescription(PixelFormat.B8_G8_R8_A8_UNorm_SRgb)) + ); + + _vdPipeline = factory.CreateGraphicsPipeline(pipelineDesc); + _vdPipeline.Name = "MainPipeline"; + + _vdProjMatrixUniformBuffer = factory.CreateBuffer(new BufferDescription( + (uint) sizeof(Matrix4x4), + BufferUsage.Dynamic | BufferUsage.UniformBuffer)); + _vdProjMatrixUniformBuffer.Name = "_vdProjMatrixUniformBuffer"; + + _vdSetProjMatrix = factory.CreateResourceSet(new ResourceSetDescription( + layoutProjMatrix, + _vdProjMatrixUniformBuffer)); + _vdSetProjMatrix.Name = "_vdSetProjMatrix"; + var io = ImGui.GetIO(); + + io.Fonts.GetTexDataAsRGBA32(out byte* pixels, out var width, out var height, out _); + + _vdTexture = factory.CreateTexture(TextureDescription.Texture2D( + (uint) width, (uint) height, + mipLevels: 1, + arrayLayers: 1, + PixelFormat.R8_G8_B8_A8_UNorm_SRgb, + TextureUsage.Sampled)); + + _vdTexture.Name = "MainTexture"; + + _vdSampler = factory.CreateSampler(SamplerDescription.Linear); + + _vdSampler.Name = "MainSampler"; + + _vdGfxDevice.UpdateTexture( + _vdTexture, + (IntPtr) pixels, + (uint) (width * height * 4), + x: 0, y: 0, z: 0, + (uint) width, (uint) height, depth: 1, + mipLevel: 0, + arrayLayer: 0); + + _vdSetTexture = factory.CreateResourceSet(new ResourceSetDescription( + layoutTexture, + _vdTexture, + _vdSampler)); + + _vdSetTexture.Name = "SetTexture"; + + io.Fonts.SetTexID((nint) 0); + io.Fonts.ClearTexData(); + + _vdGfxDevice.ResizeMainWindow((uint) w, (uint) h); + _vdGfxDevice.SwapBuffers(); + } + + private void RenderVeldrid() + { + GLFW.GetFramebufferSize(_window.WindowPtr, out var fbW, out var fbH); + + if (_vdLastWidth != fbW && _vdLastHeight != fbH) + { + _vdGfxDevice.ResizeMainWindow((uint) fbW, (uint) fbH); + _vdLastWidth = fbW; + _vdLastHeight = fbH; + } + + _vdCommandList.Begin(); + _vdCommandList.SetFramebuffer(_vdGfxDevice.SwapchainFramebuffer); + + _vdCommandList.SetViewport(0, new Viewport(0, 0, fbW, fbH, 0, 1)); + _vdCommandList.ClearColorTarget(0, RgbaFloat.Black); + + var factory = _vdGfxDevice.ResourceFactory; + + var drawData = ImGui.GetDrawData(); + + ref var fencedData = ref GetFreeFencedData(); + ref var vtxBuf = ref fencedData.VertexBuffer; + ref var idxBuf = ref fencedData.IndexBuffer; + + var byteLenVtx = (uint) (sizeof(ImDrawVert) * drawData.TotalVtxCount); + if (fencedData.VertexBuffer == null || vtxBuf.SizeInBytes < byteLenVtx) + { + vtxBuf?.Dispose(); + vtxBuf = factory.CreateBuffer(new BufferDescription( + byteLenVtx, + BufferUsage.VertexBuffer | BufferUsage.Dynamic)); + vtxBuf.Name = "_vdVtxBuffer"; + } + + var byteLenIdx = (uint) (sizeof(ushort) * drawData.TotalIdxCount); + if (idxBuf == null || idxBuf.SizeInBytes < byteLenIdx) + { + idxBuf?.Dispose(); + idxBuf = factory.CreateBuffer(new BufferDescription( + byteLenIdx, + BufferUsage.IndexBuffer | BufferUsage.Dynamic)); + idxBuf.Name = "_vdIdxBuffer"; + } + + var vtxOffset = 0; + var idxOffset = 0; + var mappedVtxBuf = MappedToSpan(_vdGfxDevice.Map(vtxBuf, MapMode.Write)); + var mappedIdxBuf = MappedToSpan(_vdGfxDevice.Map(idxBuf, MapMode.Write)); + + var l = drawData.DisplayPos.X; + var r = drawData.DisplayPos.X + drawData.DisplaySize.X; + var t = drawData.DisplayPos.Y; + var b = drawData.DisplayPos.Y + drawData.DisplaySize.Y; + + var matrix = Matrix4x4.CreateOrthographicOffCenter(l, r, b, t, -1, 1); + + var clipOff = drawData.DisplayPos; + var clipScale = drawData.FramebufferScale; + + _vdCommandList.UpdateBuffer(_vdProjMatrixUniformBuffer, 0, ref matrix); + + _vdCommandList.SetPipeline(_vdPipeline); + _vdCommandList.SetGraphicsResourceSet(0, _vdSetProjMatrix); + _vdCommandList.SetGraphicsResourceSet(1, _vdSetTexture); + _vdCommandList.SetVertexBuffer(0, vtxBuf); + _vdCommandList.SetIndexBuffer(idxBuf, IndexFormat.UInt16); + + for (var n = 0; n < drawData.CmdListsCount; n++) + { + var drawList = drawData.CmdListsRange[n]; + + var drawVtx = new Span((void*) drawList.VtxBuffer.Data, drawList.VtxBuffer.Size); + var drawIdx = new Span((void*) drawList.IdxBuffer.Data, drawList.IdxBuffer.Size); + + drawVtx.CopyTo(mappedVtxBuf[vtxOffset..]); + drawIdx.CopyTo(mappedIdxBuf[idxOffset..]); + + for (var cmdI = 0; cmdI < drawList.CmdBuffer.Size; cmdI++) + { + var cmd = drawList.CmdBuffer[cmdI]; + + Vector4 clipRect = default; + clipRect.X = (cmd.ClipRect.X - clipOff.X) * clipScale.X; + clipRect.Y = (cmd.ClipRect.Y - clipOff.Y) * clipScale.Y; + clipRect.Z = (cmd.ClipRect.Z - clipOff.X) * clipScale.X; + clipRect.W = (cmd.ClipRect.W - clipOff.Y) * clipScale.Y; + + _vdCommandList.SetScissorRect( + 0, + (uint) clipRect.X, + (uint) clipRect.Y, + (uint) (clipRect.Z - clipRect.X), + (uint) (clipRect.W - clipRect.Y)); + + _vdCommandList.DrawIndexed( + cmd.ElemCount, + 1, + (uint) (cmd.IdxOffset + idxOffset), + (int) (cmd.VtxOffset + vtxOffset), + 0); + } + + vtxOffset += drawVtx.Length; + idxOffset += drawIdx.Length; + } + + _vdGfxDevice.Unmap(vtxBuf); + _vdGfxDevice.Unmap(idxBuf); + + _vdCommandList.End(); + + _vdGfxDevice.SubmitCommands(_vdCommandList, fencedData.Fence); + _vdGfxDevice.SwapBuffers(); + } + + private ref VdFencedDatum GetFreeFencedData() + { + for (var i = 0; i < _fencedData.Length; i++) + { + ref var fenced = ref _fencedData[i]; + + if (fenced.Fence.Signaled) + { + fenced.Fence.Reset(); + return ref fenced; + } + } + + Array.Resize(ref _fencedData, _fencedData.Length + 1); + ref var slot = ref _fencedData[^1]; + slot = new VdFencedDatum {Fence = _vdGfxDevice.ResourceFactory.CreateFence(false)}; + return ref slot; + } + + private static Span MappedToSpan(MappedResourceView mapped) where T : struct + { + return MemoryMarshal.CreateSpan(ref mapped[0], mapped.Count); + } + + [DllImport("kernel32.dll")] + private static extern void* GetModuleHandleA(byte* lpModuleName); + + private struct VdFencedDatum + { + public Fence Fence; + + public DeviceBuffer IndexBuffer; + public DeviceBuffer VertexBuffer; + } + + private enum VeldridRenderer + { + Vulkan, + D3D11, + OpenGL + } + } +} diff --git a/Pow3r/Program.cs b/Pow3r/Program.cs new file mode 100644 index 0000000000..349fb6bcd7 --- /dev/null +++ b/Pow3r/Program.cs @@ -0,0 +1,389 @@ +using System; +using System.Diagnostics; +using System.Runtime.InteropServices; +using ImGuiNET; +using OpenTK.Windowing.Common; +using OpenTK.Windowing.Desktop; +using OpenTK.Windowing.GraphicsLibraryFramework; +using ErrorCode = OpenTK.Windowing.GraphicsLibraryFramework.ErrorCode; +using Vector2 = System.Numerics.Vector2; + +// ReSharper disable PossibleNullReferenceException + +namespace Pow3r +{ + internal sealed unsafe partial class Program + { + private Renderer _renderer = Renderer.Veldrid; + + [UnmanagedCallersOnly] + private static byte* GetClipboardTextCallback(void* userData) + { + return GLFW.GetClipboardStringRaw((Window*) userData); + } + + [UnmanagedCallersOnly] + private static void SetClipboardTextCallback(void* userData, byte* text) + { + GLFW.SetClipboardStringRaw((Window*) userData, text); + } + + private static readonly GLFWCallbacks.ErrorCallback ErrorCallback = GlfwErrorCallback; + + private static void GlfwErrorCallback(ErrorCode error, string description) + { + Console.WriteLine($"{error}: {description}"); + } + + private bool[] _mouseJustPressed = new bool[5]; + + private bool _fullscreen; + private int _monitorIdx; + private bool _vsync = true; + private GameWindow _window; + private readonly Stopwatch _stopwatch = new(); + private readonly Cursor*[] _cursors = new Cursor*[9]; + private readonly float[] _frameTimings = new float[180]; + private int _frameTimeIdx = 0; + private int _tps = 60; + + private void Run(string[] args) + { + for (var i = 0; i < args.Length; i++) + { + if (args[i] == "--renderer") + { + _renderer = Enum.Parse(args[++i]); + } + else if (args[i] == "--veldrid") + { + _vdRenderer = Enum.Parse(args[++i]); + } + else if (args[i] == "--fullscreen") + { + _fullscreen = true; + } + else if (args[i] == "--monitor-idx") + { + _monitorIdx = int.Parse(args[++i]); + } + else if (args[i] == "--no-vsync") + { + _vsync = false; + } + else if (args[i] == "--help") + { + Console.WriteLine("--renderer "); + Console.WriteLine("--veldrid "); + Console.WriteLine("--no-vsync"); + Console.WriteLine("--fullscreen"); + Console.WriteLine("--monitor-idx"); + Console.WriteLine("--help"); + return; + } + else + { + Console.WriteLine($"unknown arg \"{args[i]}\""); + return; + } + } + + Console.WriteLine($"Renderer: {_renderer}"); + if (_renderer == Renderer.Veldrid) + Console.WriteLine($"Veldrid API: {_vdRenderer}"); + + Console.WriteLine($"Fullscreen: {_fullscreen}"); + Console.WriteLine($"VSync: {_vsync}"); + + //NativeLibrary.Load("nvapi64.dll"); + GLFW.Init(); + GLFW.SetErrorCallback(ErrorCallback); + + // var sw = Stopwatch.StartNew(); + GLFW.WindowHint(WindowHintBool.SrgbCapable, true); + var windowSettings = new NativeWindowSettings + { + Size = (1280, 720), + WindowState = WindowState.Maximized, + StartVisible = false, + + Title = "Pow3r" + }; + + + var openGLBased = _renderer == Renderer.OpenGL || + (_renderer == Renderer.Veldrid && _vdRenderer == VeldridRenderer.OpenGL); + + if (openGLBased) + { + windowSettings.API = ContextAPI.OpenGL; + if (_renderer == Renderer.Veldrid) + { + windowSettings.Profile = ContextProfile.Core; + windowSettings.APIVersion = new Version(4, 6); + windowSettings.Flags = ContextFlags.ForwardCompatible; + } + else + { + windowSettings.Profile = ContextProfile.Any; + windowSettings.APIVersion = new Version(1, 5); + } +#if DEBUG + windowSettings.Flags |= ContextFlags.Debug; +#endif + } + else + { + windowSettings.API = ContextAPI.NoAPI; + } + + _window = new GameWindow(GameWindowSettings.Default, windowSettings); + + // Console.WriteLine(sw.ElapsedMilliseconds); + + if (_fullscreen) + { + var monitors = GLFW.GetMonitors(); + var monitor = monitors[_monitorIdx]; + var monitorMode = GLFW.GetVideoMode(monitor); + + GLFW.SetWindowMonitor( + _window.WindowPtr, + monitor, + 0, 0, + monitorMode->Width, + monitorMode->Height, + monitorMode->RefreshRate); + } + + if (openGLBased) + { + _window.VSync = _vsync ? VSyncMode.On : VSyncMode.Off; + } + + var context = ImGui.CreateContext(); + ImGui.SetCurrentContext(context); + ImGui.StyleColorsDark(); + + var io = ImGui.GetIO(); + io.Fonts.AddFontDefault(); + + delegate* unmanaged getClipboardCallback = &GetClipboardTextCallback; + io.GetClipboardTextFn = (IntPtr) getClipboardCallback; + delegate* unmanaged setClipboardCallback = &SetClipboardTextCallback; + io.GetClipboardTextFn = (IntPtr) setClipboardCallback; + io.ClipboardUserData = (IntPtr) _window.WindowPtr; + io.BackendFlags |= ImGuiBackendFlags.RendererHasVtxOffset; + io.BackendFlags |= ImGuiBackendFlags.HasSetMousePos; + io.BackendFlags |= ImGuiBackendFlags.HasMouseCursors; + + io.KeyMap[(int) ImGuiKey.Tab] = (int) Keys.Tab; + io.KeyMap[(int) ImGuiKey.LeftArrow] = (int) Keys.Left; + io.KeyMap[(int) ImGuiKey.RightArrow] = (int) Keys.Right; + io.KeyMap[(int) ImGuiKey.UpArrow] = (int) Keys.Up; + io.KeyMap[(int) ImGuiKey.DownArrow] = (int) Keys.Down; + io.KeyMap[(int) ImGuiKey.PageUp] = (int) Keys.PageUp; + io.KeyMap[(int) ImGuiKey.PageDown] = (int) Keys.PageDown; + io.KeyMap[(int) ImGuiKey.Home] = (int) Keys.Home; + io.KeyMap[(int) ImGuiKey.End] = (int) Keys.End; + io.KeyMap[(int) ImGuiKey.Delete] = (int) Keys.Delete; + io.KeyMap[(int) ImGuiKey.Backspace] = (int) Keys.Backspace; + io.KeyMap[(int) ImGuiKey.Enter] = (int) Keys.Enter; + io.KeyMap[(int) ImGuiKey.Escape] = (int) Keys.Escape; + io.KeyMap[(int) ImGuiKey.A] = (int) Keys.A; + io.KeyMap[(int) ImGuiKey.C] = (int) Keys.C; + io.KeyMap[(int) ImGuiKey.V] = (int) Keys.V; + io.KeyMap[(int) ImGuiKey.X] = (int) Keys.X; + io.KeyMap[(int) ImGuiKey.Y] = (int) Keys.Y; + io.KeyMap[(int) ImGuiKey.Z] = (int) Keys.Z; + + _cursors[(int) ImGuiMouseCursor.Arrow] = GLFW.CreateStandardCursor(CursorShape.Arrow); + _cursors[(int) ImGuiMouseCursor.TextInput] = GLFW.CreateStandardCursor(CursorShape.IBeam); + _cursors[(int) ImGuiMouseCursor.ResizeNS] = GLFW.CreateStandardCursor(CursorShape.VResize); + _cursors[(int) ImGuiMouseCursor.ResizeEW] = GLFW.CreateStandardCursor(CursorShape.HResize); + _cursors[(int) ImGuiMouseCursor.Hand] = GLFW.CreateStandardCursor(CursorShape.Hand); + _cursors[(int) ImGuiMouseCursor.ResizeAll] = GLFW.CreateStandardCursor(CursorShape.Arrow); + _cursors[(int) ImGuiMouseCursor.ResizeNESW] = GLFW.CreateStandardCursor(CursorShape.Arrow); + _cursors[(int) ImGuiMouseCursor.ResizeNWSE] = GLFW.CreateStandardCursor(CursorShape.Arrow); + _cursors[(int) ImGuiMouseCursor.NotAllowed] = GLFW.CreateStandardCursor(CursorShape.Arrow); + + InitRenderer(); + + _window.MouseDown += OnMouseDown; + _window.TextInput += WindowOnTextInput; + _window.MouseWheel += WindowOnMouseWheel; + _window.KeyDown += args => KeyCallback(args, true); + _window.KeyUp += args => KeyCallback(args, false); + + _stopwatch.Start(); + + LoadFromDisk(); + + _window.IsVisible = true; + + var lastTick = TimeSpan.Zero; + var lastFrame = TimeSpan.Zero; + var curTime = TimeSpan.Zero; + + while (!GLFW.WindowShouldClose(_window.WindowPtr)) + { + _window.ProcessEvents(); + + var tickSpan = TimeSpan.FromSeconds(1f / _tps); + while (curTime - lastTick > tickSpan) + { + lastTick += tickSpan; + + Tick((float) tickSpan.TotalSeconds); + } + + _frameTimeIdx = (_frameTimeIdx + 1) % _frameTimings.Length; + + var dt = curTime - lastFrame; + lastFrame = curTime; + _frameTimings[_frameTimeIdx] = (float) dt.TotalMilliseconds; + + FrameUpdate((float) dt.TotalSeconds); + Render(); + curTime = _stopwatch.Elapsed; + } + + SaveToDisk(); + } + + private static void KeyCallback(KeyboardKeyEventArgs obj, bool down) + { + var io = ImGui.GetIO(); + if (obj.Key ==Keys.Unknown) + return; + + var keyInt = (int) obj.Key; + io.KeysDown[keyInt] = down; + io.KeyCtrl = io.KeysDown[(int) Keys.LeftControl] || io.KeysDown[(int) Keys.RightControl]; + io.KeyShift = io.KeysDown[(int) Keys.LeftShift] || io.KeysDown[(int) Keys.RightShift]; + io.KeyAlt = io.KeysDown[(int) Keys.LeftAlt] || io.KeysDown[(int) Keys.RightAlt]; + } + + private static void WindowOnMouseWheel(MouseWheelEventArgs obj) + { + var io = ImGui.GetIO(); + io.MouseWheelH += obj.OffsetX; + io.MouseWheel += obj.OffsetY; + } + + private static void WindowOnTextInput(TextInputEventArgs obj) + { + var io = ImGui.GetIO(); + io.AddInputCharacter((uint) obj.Unicode); + } + + private void OnMouseDown(MouseButtonEventArgs obj) + { + var button = (int) obj.Button; + if (obj.IsPressed && button < _mouseJustPressed.Length) + _mouseJustPressed[button] = true; + } + + private void FrameUpdate(float dt) + { + //var sw = Stopwatch.StartNew(); + var io = ImGui.GetIO(); + GLFW.GetFramebufferSize(_window.WindowPtr, out var fbW, out var fbH); + GLFW.GetWindowSize(_window.WindowPtr, out var wW, out var wH); + io.DisplaySize = new Vector2(wW, wH); + io.DisplayFramebufferScale = new Vector2(fbW / (float) wW, fbH / (float) wH); + io.DeltaTime = dt; + + UpdateMouseState(io); + UpdateCursorState(io); + + //Console.WriteLine($"INPUT: {sw.Elapsed.TotalMilliseconds}"); + + ImGui.NewFrame(); + + DoUI(dt); + } + + private void UpdateCursorState(ImGuiIOPtr io) + { + var cursor = ImGui.GetMouseCursor(); + if (cursor == ImGuiMouseCursor.None) + { + GLFW.SetInputMode(_window.WindowPtr, CursorStateAttribute.Cursor, CursorModeValue.CursorHidden); + } + else + { + GLFW.SetCursor(_window.WindowPtr, _cursors[(int) cursor]); + GLFW.SetInputMode(_window.WindowPtr, CursorStateAttribute.Cursor, CursorModeValue.CursorNormal); + } + } + + private void UpdateMouseState(ImGuiIOPtr io) + { + for (var i = 0; i < io.MouseDown.Count; i++) + { + io.MouseDown[i] = _mouseJustPressed[i] || + GLFW.GetMouseButton(_window.WindowPtr, (MouseButton) i) == InputAction.Press; + _mouseJustPressed[i] = false; + } + + var oldMousePos = io.MousePos; + io.MousePos = new Vector2(float.PositiveInfinity, float.PositiveInfinity); + + var focused = _window.IsFocused; + if (focused) + { + if (io.WantSetMousePos) + { + GLFW.SetCursorPos(_window.WindowPtr, oldMousePos.X, oldMousePos.Y); + } + else + { + GLFW.GetCursorPos(_window.WindowPtr, out var x, out var y); + io.MousePos = new Vector2((float) x, (float) y); + } + } + } + + private void InitRenderer() + { + switch (_renderer) + { + case Renderer.OpenGL: + InitOpenGL(); + break; + + case Renderer.Veldrid: + InitVeldrid(); + break; + } + } + + private void Render() + { + ImGui.Render(); + + switch (_renderer) + { + case Renderer.OpenGL: + RenderOpenGL(); + break; + + case Renderer.Veldrid: + RenderVeldrid(); + break; + } + } + + private static void Main(string[] args) + { + new Program().Run(args); + } + + public enum Renderer + { + OpenGL, + Veldrid + } + } +} diff --git a/Resources/Changelog/Parts/instrument_dead.yml b/Resources/Changelog/Parts/instrument_dead.yml new file mode 100644 index 0000000000..a7d3cb0b31 --- /dev/null +++ b/Resources/Changelog/Parts/instrument_dead.yml @@ -0,0 +1,4 @@ +author: Zumorica +changes: + - type: Fix + message: Fix being able to play instruments while incapacitated. diff --git a/Resources/Changelog/Parts/midi.yml b/Resources/Changelog/Parts/midi.yml new file mode 100644 index 0000000000..fa68fa7c34 --- /dev/null +++ b/Resources/Changelog/Parts/midi.yml @@ -0,0 +1,4 @@ +author: Zumorica +changes: + - type: Fix + message: Fix crash when MIDI stops playing. diff --git a/Resources/Changelog/Parts/spray.yml b/Resources/Changelog/Parts/spray.yml new file mode 100644 index 0000000000..444be3dd4b --- /dev/null +++ b/Resources/Changelog/Parts/spray.yml @@ -0,0 +1,4 @@ +author: Zumorica +changes: + - type: Fix # One of the following: Add, Remove, Tweak, Fix + message: Fixes spray puff and fire extinguisher cloud not moving. diff --git a/Resources/Locale/en-US/actions/actions/spells.ftl b/Resources/Locale/en-US/actions/actions/spells.ftl new file mode 100644 index 0000000000..186e6e7fec --- /dev/null +++ b/Resources/Locale/en-US/actions/actions/spells.ftl @@ -0,0 +1 @@ +spell-fail-no-hands = You don't have hands! diff --git a/Resources/Locale/en-US/chat/ui/chat-box.ftl b/Resources/Locale/en-US/chat/ui/chat-box.ftl index 19d8555583..aa9d912893 100644 --- a/Resources/Locale/en-US/chat/ui/chat-box.ftl +++ b/Resources/Locale/en-US/chat/ui/chat-box.ftl @@ -1,4 +1,4 @@ -hud-chatbox-info = Say something! T to talk, Tab to cycle channels. +hud-chatbox-info = T to talk, Tab to cycle channels. hud-chatbox-admin = Admin hud-chatbox-ooc = OOC -hud-chatbox-console = Console \ No newline at end of file +hud-chatbox-console = Console diff --git a/Resources/Maps/Test/singularity.yml b/Resources/Maps/Test/singularity.yml index 337431e707..ceb80b4927 100644 --- a/Resources/Maps/Test/singularity.yml +++ b/Resources/Maps/Test/singularity.yml @@ -576,361 +576,361 @@ entities: pos: -4.5,-0.5 type: Transform - uid: 21 - type: MVWire + type: CableMV components: - parent: 0 pos: -4.5,-0.5 type: Transform - uid: 22 - type: MVWire + type: CableMV components: - parent: 0 pos: -5.5,-0.5 type: Transform - uid: 23 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-0.5 type: Transform - uid: 24 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-1.5 type: Transform - uid: 25 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-2.5 type: Transform - uid: 26 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-3.5 type: Transform - uid: 27 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-4.5 type: Transform - uid: 28 - type: MVWire + type: CableMV components: - parent: 0 pos: -5.5,-4.5 type: Transform - uid: 29 - type: MVWire + type: CableMV components: - parent: 0 pos: -4.5,-4.5 type: Transform - uid: 30 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-5.5 type: Transform - uid: 31 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-6.5 type: Transform - uid: 32 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-7.5 type: Transform - uid: 33 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-8.5 type: Transform - uid: 34 - type: MVWire + type: CableMV components: - parent: 0 pos: -5.5,-8.5 type: Transform - uid: 35 - type: MVWire + type: CableMV components: - parent: 0 pos: -4.5,-8.5 type: Transform - uid: 36 - type: MVWire + type: CableMV components: - parent: 0 pos: -0.5,3.5 type: Transform - uid: 37 - type: MVWire + type: CableMV components: - parent: 0 pos: -0.5,4.5 type: Transform - uid: 38 - type: MVWire + type: CableMV components: - parent: 0 pos: -0.5,5.5 type: Transform - uid: 39 - type: MVWire + type: CableMV components: - parent: 0 pos: 0.5,5.5 type: Transform - uid: 40 - type: MVWire + type: CableMV components: - parent: 0 pos: 1.5,5.5 type: Transform - uid: 41 - type: MVWire + type: CableMV components: - parent: 0 pos: 2.5,5.5 type: Transform - uid: 42 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,5.5 type: Transform - uid: 43 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,4.5 type: Transform - uid: 44 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,3.5 type: Transform - uid: 45 - type: MVWire + type: CableMV components: - parent: 0 pos: 4.5,5.5 type: Transform - uid: 46 - type: MVWire + type: CableMV components: - parent: 0 pos: 5.5,5.5 type: Transform - uid: 47 - type: MVWire + type: CableMV components: - parent: 0 pos: 6.5,5.5 type: Transform - uid: 48 - type: MVWire + type: CableMV components: - parent: 0 pos: 7.5,5.5 type: Transform - uid: 49 - type: MVWire + type: CableMV components: - parent: 0 pos: 7.5,4.5 type: Transform - uid: 50 - type: MVWire + type: CableMV components: - parent: 0 pos: 7.5,3.5 type: Transform - uid: 51 - type: MVWire + type: CableMV components: - parent: 0 pos: 11.5,-0.5 type: Transform - uid: 52 - type: MVWire + type: CableMV components: - parent: 0 pos: 12.5,-0.5 type: Transform - uid: 53 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-0.5 type: Transform - uid: 54 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-1.5 type: Transform - uid: 55 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-2.5 type: Transform - uid: 56 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-3.5 type: Transform - uid: 57 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-4.5 type: Transform - uid: 58 - type: MVWire + type: CableMV components: - parent: 0 pos: 12.5,-4.5 type: Transform - uid: 59 - type: MVWire + type: CableMV components: - parent: 0 pos: 11.5,-4.5 type: Transform - uid: 60 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-5.5 type: Transform - uid: 61 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-6.5 type: Transform - uid: 62 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-7.5 type: Transform - uid: 63 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-8.5 type: Transform - uid: 64 - type: MVWire + type: CableMV components: - parent: 0 pos: 12.5,-8.5 type: Transform - uid: 65 - type: MVWire + type: CableMV components: - parent: 0 pos: 11.5,-8.5 type: Transform - uid: 66 - type: MVWire + type: CableMV components: - parent: 0 pos: 7.5,-12.5 type: Transform - uid: 67 - type: MVWire + type: CableMV components: - parent: 0 pos: 7.5,-13.5 type: Transform - uid: 68 - type: MVWire + type: CableMV components: - parent: 0 pos: 7.5,-14.5 type: Transform - uid: 69 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,-12.5 type: Transform - uid: 70 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,-13.5 type: Transform - uid: 71 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,-14.5 type: Transform - uid: 72 - type: MVWire + type: CableMV components: - parent: 0 pos: -0.5,-12.5 type: Transform - uid: 73 - type: MVWire + type: CableMV components: - parent: 0 pos: -0.5,-13.5 type: Transform - uid: 74 - type: MVWire + type: CableMV components: - parent: 0 pos: -0.5,-14.5 type: Transform - uid: 75 - type: MVWire + type: CableMV components: - parent: 0 pos: 0.5,-14.5 type: Transform - uid: 76 - type: MVWire + type: CableMV components: - parent: 0 pos: 1.5,-14.5 type: Transform - uid: 77 - type: MVWire + type: CableMV components: - parent: 0 pos: 2.5,-14.5 type: Transform - uid: 78 - type: MVWire + type: CableMV components: - parent: 0 pos: 4.5,-14.5 type: Transform - uid: 79 - type: MVWire + type: CableMV components: - parent: 0 pos: 5.5,-14.5 type: Transform - uid: 80 - type: MVWire + type: CableMV components: - parent: 0 pos: 6.5,-14.5 @@ -942,265 +942,265 @@ entities: pos: 3.5,-4.5 type: Transform - uid: 82 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,0.5 type: Transform - uid: 83 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,1.5 type: Transform - uid: 84 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,2.5 type: Transform - uid: 85 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,3.5 type: Transform - uid: 86 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,4.5 type: Transform - uid: 87 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,5.5 type: Transform - uid: 88 - type: MVWire + type: CableMV components: - parent: 0 pos: -5.5,5.5 type: Transform - uid: 89 - type: MVWire + type: CableMV components: - parent: 0 pos: -4.5,5.5 type: Transform - uid: 90 - type: MVWire + type: CableMV components: - parent: 0 pos: -3.5,5.5 type: Transform - uid: 91 - type: MVWire + type: CableMV components: - parent: 0 pos: -2.5,5.5 type: Transform - uid: 92 - type: MVWire + type: CableMV components: - parent: 0 pos: -1.5,5.5 type: Transform - uid: 93 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-9.5 type: Transform - uid: 94 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-10.5 type: Transform - uid: 95 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-11.5 type: Transform - uid: 96 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-12.5 type: Transform - uid: 97 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-13.5 type: Transform - uid: 98 - type: MVWire + type: CableMV components: - parent: 0 pos: -6.5,-14.5 type: Transform - uid: 99 - type: MVWire + type: CableMV components: - parent: 0 pos: -5.5,-14.5 type: Transform - uid: 100 - type: MVWire + type: CableMV components: - parent: 0 pos: -4.5,-14.5 type: Transform - uid: 101 - type: MVWire + type: CableMV components: - parent: 0 pos: -3.5,-14.5 type: Transform - uid: 102 - type: MVWire + type: CableMV components: - parent: 0 pos: -2.5,-14.5 type: Transform - uid: 103 - type: MVWire + type: CableMV components: - parent: 0 pos: -1.5,-14.5 type: Transform - uid: 104 - type: MVWire + type: CableMV components: - parent: 0 pos: 8.5,-14.5 type: Transform - uid: 105 - type: MVWire + type: CableMV components: - parent: 0 pos: 9.5,-14.5 type: Transform - uid: 106 - type: MVWire + type: CableMV components: - parent: 0 pos: 10.5,-14.5 type: Transform - uid: 107 - type: MVWire + type: CableMV components: - parent: 0 pos: 11.5,-14.5 type: Transform - uid: 108 - type: MVWire + type: CableMV components: - parent: 0 pos: 12.5,-14.5 type: Transform - uid: 109 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-14.5 type: Transform - uid: 110 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-13.5 type: Transform - uid: 111 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-12.5 type: Transform - uid: 112 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-11.5 type: Transform - uid: 113 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-10.5 type: Transform - uid: 114 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,-9.5 type: Transform - uid: 115 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,0.5 type: Transform - uid: 116 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,1.5 type: Transform - uid: 117 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,2.5 type: Transform - uid: 118 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,3.5 type: Transform - uid: 119 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,4.5 type: Transform - uid: 120 - type: MVWire + type: CableMV components: - parent: 0 pos: 13.5,5.5 type: Transform - uid: 121 - type: MVWire + type: CableMV components: - parent: 0 pos: 12.5,5.5 type: Transform - uid: 122 - type: MVWire + type: CableMV components: - parent: 0 pos: 11.5,5.5 type: Transform - uid: 123 - type: MVWire + type: CableMV components: - parent: 0 pos: 10.5,5.5 type: Transform - uid: 124 - type: MVWire + type: CableMV components: - parent: 0 pos: 9.5,5.5 type: Transform - uid: 125 - type: MVWire + type: CableMV components: - parent: 0 pos: 8.5,5.5 @@ -1248,7 +1248,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - powerLoad: 250 - type: PowerReceiver + type: ApcPowerReceiver - uid: 132 type: ParticleAcceleratorEndCap components: @@ -1257,105 +1257,105 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 133 - type: HVWire + type: CableHV components: - parent: 0 pos: 2.5,12.5 rot: -1.5707963267948966 rad type: Transform - uid: 134 - type: HVWire + type: CableHV components: - parent: 0 pos: 3.5,12.5 rot: -1.5707963267948966 rad type: Transform - uid: 135 - type: HVWire + type: CableHV components: - parent: 0 pos: 4.5,12.5 rot: -1.5707963267948966 rad type: Transform - uid: 136 - type: HVWire + type: CableHV components: - parent: 0 pos: 3.5,13.5 rot: -1.5707963267948966 rad type: Transform - uid: 137 - type: HVWire + type: CableHV components: - parent: 0 pos: 3.5,14.5 rot: -1.5707963267948966 rad type: Transform - uid: 138 - type: HVWire + type: CableHV components: - parent: 0 pos: 2.5,14.5 rot: -1.5707963267948966 rad type: Transform - uid: 139 - type: HVWire + type: CableHV components: - parent: 0 pos: 3.5,15.5 rot: -1.5707963267948966 rad type: Transform - uid: 140 - type: HVWire + type: CableHV components: - parent: 0 pos: 4.5,14.5 rot: -1.5707963267948966 rad type: Transform - uid: 141 - type: HVWire + type: CableHV components: - parent: 0 pos: 3.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 142 - type: HVWire + type: CableHV components: - parent: 0 pos: 0.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 143 - type: HVWire + type: CableHV components: - parent: 0 pos: 1.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 144 - type: HVWire + type: CableHV components: - parent: 0 pos: 2.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 145 - type: HVWire + type: CableHV components: - parent: 0 pos: 4.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 146 - type: HVWire + type: CableHV components: - parent: 0 pos: 5.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 147 - type: HVWire + type: CableHV components: - parent: 0 pos: 6.5,16.5 @@ -1376,35 +1376,35 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 150 - type: ApcExtensionCable + type: CableApcExtension components: - parent: 0 pos: 3.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 151 - type: ApcExtensionCable + type: CableApcExtension components: - parent: 0 pos: 3.5,17.5 rot: -1.5707963267948966 rad type: Transform - uid: 152 - type: ApcExtensionCable + type: CableApcExtension components: - parent: 0 pos: 2.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 153 - type: ApcExtensionCable + type: CableApcExtension components: - parent: 0 pos: 2.5,15.5 rot: -1.5707963267948966 rad type: Transform - uid: 154 - type: ApcExtensionCable + type: CableApcExtension components: - parent: 0 pos: 2.5,14.5 @@ -1439,70 +1439,70 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 159 - type: HVWire + type: CableHV components: - parent: 0 pos: 0.5,13.5 rot: -1.5707963267948966 rad type: Transform - uid: 160 - type: HVWire + type: CableHV components: - parent: 0 pos: 0.5,12.5 rot: -1.5707963267948966 rad type: Transform - uid: 161 - type: HVWire + type: CableHV components: - parent: 0 pos: 6.5,13.5 rot: -1.5707963267948966 rad type: Transform - uid: 162 - type: HVWire + type: CableHV components: - parent: 0 pos: 6.5,12.5 rot: -1.5707963267948966 rad type: Transform - uid: 163 - type: HVWire + type: CableHV components: - parent: 0 pos: 6.5,11.5 rot: -1.5707963267948966 rad type: Transform - uid: 164 - type: HVWire + type: CableHV components: - parent: 0 pos: 0.5,11.5 rot: -1.5707963267948966 rad type: Transform - uid: 165 - type: HVWire + type: CableHV components: - parent: 0 pos: 0.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 166 - type: HVWire + type: CableHV components: - parent: 0 pos: 1.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 167 - type: HVWire + type: CableHV components: - parent: 0 pos: 6.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 168 - type: HVWire + type: CableHV components: - parent: 0 pos: 5.5,10.5 @@ -1579,77 +1579,77 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 179 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,6.5 rot: -1.5707963267948966 rad type: Transform - uid: 180 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,7.5 rot: -1.5707963267948966 rad type: Transform - uid: 181 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,8.5 rot: -1.5707963267948966 rad type: Transform - uid: 182 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,9.5 rot: -1.5707963267948966 rad type: Transform - uid: 183 - type: MVWire + type: CableMV components: - parent: 0 pos: 3.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 184 - type: MVWire + type: CableMV components: - parent: 0 pos: 2.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 185 - type: MVWire + type: CableMV components: - parent: 0 pos: 4.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 186 - type: MVWire + type: CableMV components: - parent: 0 pos: 5.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 187 - type: MVWire + type: CableMV components: - parent: 0 pos: 6.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 188 - type: MVWire + type: CableMV components: - parent: 0 pos: 1.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 189 - type: MVWire + type: CableMV components: - parent: 0 pos: 0.5,10.5 @@ -1992,7 +1992,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -2004,26 +2004,26 @@ entities: rot: -1.5707963267948966 rad type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 239 - type: ApcExtensionCable + type: CableApcExtension components: - parent: 0 pos: 4.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 240 - type: ApcExtensionCable + type: CableApcExtension components: - parent: 0 pos: 5.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 241 - type: ApcExtensionCable + type: CableApcExtension components: - parent: 0 pos: 1.5,16.5 diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 9cb53589ce..9383b08baf 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -465,6 +465,8 @@ entities: pos: -35.09421,0.5072632 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -586,10 +588,13 @@ entities: - uid: 65 type: BedsheetMedical components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-20.5 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 66 type: Bed components: @@ -802,7 +807,8 @@ entities: - uid: 94 type: DisposalBend components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 3.5,-27.5 parent: 853 type: Transform @@ -1100,6 +1106,8 @@ entities: pos: 36.928772,12.48564 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -1110,6 +1118,8 @@ entities: pos: 4.9229045,12.440822 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -1120,6 +1130,8 @@ entities: pos: -13.082766,-25.616213 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -1155,7 +1167,7 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -1165,6 +1177,8 @@ entities: - pos: -18.508244,-7.132841 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -1203,6 +1217,8 @@ entities: pos: 45.108562,12.421564 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -1248,18 +1264,20 @@ entities: CloningPod-bodyContainer: !type:ContainerSlot {} type: ContainerContainer - uid: 152 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 153 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-29.5 parent: 853 type: Transform @@ -1282,7 +1300,8 @@ entities: - uid: 156 type: ConveyorBelt components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -23.5,-13.5 parent: 853 type: Transform @@ -1316,9 +1335,10 @@ entities: - canCollide: False type: Physics - uid: 161 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 16.5,-1.5 parent: 853 type: Transform @@ -1335,7 +1355,8 @@ entities: - uid: 163 type: DisposalJunctionFlipped components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 34.5,3.5 parent: 853 type: Transform @@ -1346,7 +1367,8 @@ entities: - uid: 164 type: DisposalJunction components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 24.5,3.5 parent: 853 type: Transform @@ -1355,9 +1377,10 @@ entities: ents: [] type: ContainerContainer - uid: 165 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 13.5,1.5 parent: 853 type: Transform @@ -1368,7 +1391,8 @@ entities: - uid: 166 type: DisposalJunctionFlipped components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 12.5,3.5 parent: 853 type: Transform @@ -1379,7 +1403,8 @@ entities: - uid: 167 type: DisposalJunction components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,17.5 parent: 853 type: Transform @@ -1390,7 +1415,8 @@ entities: - uid: 168 type: DisposalJunctionFlipped components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,11.5 parent: 853 type: Transform @@ -1401,7 +1427,8 @@ entities: - uid: 169 type: DisposalJunctionFlipped components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -10.5,-15.5 parent: 853 type: Transform @@ -1412,7 +1439,8 @@ entities: - uid: 170 type: DisposalJunction components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-15.5 parent: 853 type: Transform @@ -1423,7 +1451,8 @@ entities: - uid: 171 type: DisposalYJunction components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,-10.5 parent: 853 type: Transform @@ -1434,7 +1463,8 @@ entities: - uid: 172 type: DisposalJunctionFlipped components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -27.5,-10.5 parent: 853 type: Transform @@ -1445,7 +1475,8 @@ entities: - uid: 173 type: DisposalJunction components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -28.5,3.5 parent: 853 type: Transform @@ -1456,7 +1487,8 @@ entities: - uid: 174 type: DisposalJunction components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -22.5,3.5 parent: 853 type: Transform @@ -1467,7 +1499,8 @@ entities: - uid: 175 type: DisposalJunctionFlipped components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -12.5,3.5 parent: 853 type: Transform @@ -1478,7 +1511,8 @@ entities: - uid: 176 type: DisposalJunctionFlipped components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 0.5,3.5 parent: 853 type: Transform @@ -1489,7 +1523,8 @@ entities: - uid: 177 type: DisposalJunction components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 2.5,3.5 parent: 853 type: Transform @@ -1500,7 +1535,8 @@ entities: - uid: 178 type: DisposalJunctionFlipped components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 3.5,3.5 parent: 853 type: Transform @@ -1511,7 +1547,8 @@ entities: - uid: 179 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-14.5 parent: 853 type: Transform @@ -1522,7 +1559,8 @@ entities: - uid: 180 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-13.5 parent: 853 type: Transform @@ -1533,7 +1571,8 @@ entities: - uid: 181 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-12.5 parent: 853 type: Transform @@ -1544,7 +1583,8 @@ entities: - uid: 182 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-11.5 parent: 853 type: Transform @@ -1555,7 +1595,8 @@ entities: - uid: 183 type: DisposalTrunk components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-22.5 parent: 853 type: Transform @@ -1577,7 +1618,8 @@ entities: - uid: 185 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -16.5,-15.5 parent: 853 type: Transform @@ -1588,7 +1630,8 @@ entities: - uid: 186 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,5.5 parent: 853 type: Transform @@ -1599,7 +1642,8 @@ entities: - uid: 187 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,6.5 parent: 853 type: Transform @@ -1610,7 +1654,8 @@ entities: - uid: 188 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,7.5 parent: 853 type: Transform @@ -1621,7 +1666,8 @@ entities: - uid: 189 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,8.5 parent: 853 type: Transform @@ -1632,7 +1678,8 @@ entities: - uid: 190 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,9.5 parent: 853 type: Transform @@ -1661,7 +1708,8 @@ entities: - uid: 193 type: DisposalBend components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -8.5,-15.5 parent: 853 type: Transform @@ -1672,7 +1720,8 @@ entities: - uid: 194 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-16.5 parent: 853 type: Transform @@ -1683,7 +1732,8 @@ entities: - uid: 195 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: 0.5,17.5 parent: 853 type: Transform @@ -1694,7 +1744,8 @@ entities: - uid: 196 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -0.5,17.5 parent: 853 type: Transform @@ -1705,7 +1756,8 @@ entities: - uid: 197 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -1.5,17.5 parent: 853 type: Transform @@ -1716,7 +1768,8 @@ entities: - uid: 198 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -2.5,17.5 parent: 853 type: Transform @@ -1727,7 +1780,8 @@ entities: - uid: 199 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -3.5,17.5 parent: 853 type: Transform @@ -1738,7 +1792,8 @@ entities: - uid: 200 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -4.5,17.5 parent: 853 type: Transform @@ -1749,7 +1804,8 @@ entities: - uid: 201 type: DisposalTrunk components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -5.5,17.5 parent: 853 type: Transform @@ -1771,7 +1827,8 @@ entities: - uid: 203 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-17.5 parent: 853 type: Transform @@ -1782,7 +1839,8 @@ entities: - uid: 204 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 4.5,11.5 parent: 853 type: Transform @@ -1793,7 +1851,8 @@ entities: - uid: 205 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 5.5,11.5 parent: 853 type: Transform @@ -1804,7 +1863,8 @@ entities: - uid: 206 type: DisposalTrunk components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 6.5,11.5 parent: 853 type: Transform @@ -1825,7 +1885,8 @@ entities: - uid: 208 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-18.5 parent: 853 type: Transform @@ -1836,7 +1897,8 @@ entities: - uid: 209 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,5.5 parent: 853 type: Transform @@ -1847,7 +1909,8 @@ entities: - uid: 210 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,6.5 parent: 853 type: Transform @@ -1858,7 +1921,8 @@ entities: - uid: 211 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,7.5 parent: 853 type: Transform @@ -1869,7 +1933,8 @@ entities: - uid: 212 type: DisposalTrunk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,8.5 parent: 853 type: Transform @@ -1899,7 +1964,8 @@ entities: - uid: 215 type: DisposalTrunk components: - - pos: 14.5,1.5 + - anchored: True + pos: 14.5,1.5 parent: 853 type: Transform - containers: @@ -1919,7 +1985,8 @@ entities: - uid: 217 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-19.5 parent: 853 type: Transform @@ -1930,13 +1997,15 @@ entities: - uid: 218 type: Recycler components: - - pos: -21.5,-13.5 + - anchored: True + pos: -21.5,-13.5 parent: 853 type: Transform - uid: 219 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-20.5 parent: 853 type: Transform @@ -1947,7 +2016,8 @@ entities: - uid: 220 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 34.5,1.5 parent: 853 type: Transform @@ -1958,7 +2028,8 @@ entities: - uid: 221 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 34.5,0.5 parent: 853 type: Transform @@ -1969,7 +2040,8 @@ entities: - uid: 222 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 34.5,-0.5 parent: 853 type: Transform @@ -1980,7 +2052,8 @@ entities: - uid: 223 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 34.5,-1.5 parent: 853 type: Transform @@ -1991,7 +2064,8 @@ entities: - uid: 224 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 34.5,-2.5 parent: 853 type: Transform @@ -2002,7 +2076,8 @@ entities: - uid: 225 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 34.5,-3.5 parent: 853 type: Transform @@ -2013,7 +2088,8 @@ entities: - uid: 226 type: DisposalTrunk components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 34.5,-4.5 parent: 853 type: Transform @@ -2034,7 +2110,8 @@ entities: - uid: 228 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 30.5,3.5 parent: 853 type: Transform @@ -2045,7 +2122,8 @@ entities: - uid: 229 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 36.5,3.5 parent: 853 type: Transform @@ -2056,7 +2134,8 @@ entities: - uid: 230 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 35.5,3.5 parent: 853 type: Transform @@ -2067,7 +2146,8 @@ entities: - uid: 231 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 34.5,2.5 parent: 853 type: Transform @@ -2078,7 +2158,8 @@ entities: - uid: 232 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 33.5,3.5 parent: 853 type: Transform @@ -2089,7 +2170,8 @@ entities: - uid: 233 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 32.5,3.5 parent: 853 type: Transform @@ -2100,7 +2182,8 @@ entities: - uid: 234 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 31.5,3.5 parent: 853 type: Transform @@ -2111,7 +2194,8 @@ entities: - uid: 235 type: DisposalBend components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 37.5,3.5 parent: 853 type: Transform @@ -2122,7 +2206,8 @@ entities: - uid: 236 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,4.5 parent: 853 type: Transform @@ -2133,7 +2218,8 @@ entities: - uid: 237 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,5.5 parent: 853 type: Transform @@ -2144,7 +2230,8 @@ entities: - uid: 238 type: DisposalTrunk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,6.5 parent: 853 type: Transform @@ -2166,7 +2253,8 @@ entities: - uid: 240 type: DisposalBend components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,29.5 parent: 853 type: Transform @@ -2177,7 +2265,8 @@ entities: - uid: 241 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,5.5 parent: 853 type: Transform @@ -2188,7 +2277,8 @@ entities: - uid: 242 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,6.5 parent: 853 type: Transform @@ -2199,7 +2289,8 @@ entities: - uid: 243 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,7.5 parent: 853 type: Transform @@ -2210,7 +2301,8 @@ entities: - uid: 244 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,8.5 parent: 853 type: Transform @@ -2221,7 +2313,8 @@ entities: - uid: 245 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,9.5 parent: 853 type: Transform @@ -2232,7 +2325,8 @@ entities: - uid: 246 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,10.5 parent: 853 type: Transform @@ -2243,7 +2337,8 @@ entities: - uid: 247 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 3.5,11.5 parent: 853 type: Transform @@ -2254,7 +2349,8 @@ entities: - uid: 248 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,12.5 parent: 853 type: Transform @@ -2265,7 +2361,8 @@ entities: - uid: 249 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,13.5 parent: 853 type: Transform @@ -2276,7 +2373,8 @@ entities: - uid: 250 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,14.5 parent: 853 type: Transform @@ -2287,7 +2385,8 @@ entities: - uid: 251 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,15.5 parent: 853 type: Transform @@ -2298,7 +2397,8 @@ entities: - uid: 252 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,16.5 parent: 853 type: Transform @@ -2309,7 +2409,8 @@ entities: - uid: 253 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: 1.5,17.5 parent: 853 type: Transform @@ -2320,7 +2421,8 @@ entities: - uid: 254 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,18.5 parent: 853 type: Transform @@ -2331,7 +2433,8 @@ entities: - uid: 255 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,19.5 parent: 853 type: Transform @@ -2342,7 +2445,8 @@ entities: - uid: 256 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,20.5 parent: 853 type: Transform @@ -2353,7 +2457,8 @@ entities: - uid: 257 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,21.5 parent: 853 type: Transform @@ -2364,7 +2469,8 @@ entities: - uid: 258 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,22.5 parent: 853 type: Transform @@ -2375,7 +2481,8 @@ entities: - uid: 259 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,23.5 parent: 853 type: Transform @@ -2386,7 +2493,8 @@ entities: - uid: 260 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,24.5 parent: 853 type: Transform @@ -2397,7 +2505,8 @@ entities: - uid: 261 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,25.5 parent: 853 type: Transform @@ -2408,7 +2517,8 @@ entities: - uid: 262 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,26.5 parent: 853 type: Transform @@ -2419,7 +2529,8 @@ entities: - uid: 263 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,27.5 parent: 853 type: Transform @@ -2437,7 +2548,8 @@ entities: - uid: 265 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,28.5 parent: 853 type: Transform @@ -2448,7 +2560,8 @@ entities: - uid: 266 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -17.5,-21.5 parent: 853 type: Transform @@ -2459,7 +2572,8 @@ entities: - uid: 267 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: 1.5,29.5 parent: 853 type: Transform @@ -2470,7 +2584,8 @@ entities: - uid: 268 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: 0.5,29.5 parent: 853 type: Transform @@ -2481,7 +2596,8 @@ entities: - uid: 269 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -0.5,29.5 parent: 853 type: Transform @@ -2492,7 +2608,8 @@ entities: - uid: 270 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -1.5,29.5 parent: 853 type: Transform @@ -2503,7 +2620,8 @@ entities: - uid: 271 type: DisposalTrunk components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -2.5,29.5 parent: 853 type: Transform @@ -2524,7 +2642,8 @@ entities: - uid: 273 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -18.5,-10.5 parent: 853 type: Transform @@ -2535,7 +2654,8 @@ entities: - uid: 274 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-8.5 parent: 853 type: Transform @@ -2546,7 +2666,8 @@ entities: - uid: 275 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-7.5 parent: 853 type: Transform @@ -2557,7 +2678,8 @@ entities: - uid: 276 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-6.5 parent: 853 type: Transform @@ -2568,7 +2690,8 @@ entities: - uid: 277 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-5.5 parent: 853 type: Transform @@ -2579,7 +2702,8 @@ entities: - uid: 278 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-4.5 parent: 853 type: Transform @@ -2590,7 +2714,8 @@ entities: - uid: 279 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-3.5 parent: 853 type: Transform @@ -2601,7 +2726,8 @@ entities: - uid: 280 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-2.5 parent: 853 type: Transform @@ -2612,7 +2738,8 @@ entities: - uid: 281 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-1.5 parent: 853 type: Transform @@ -2623,7 +2750,8 @@ entities: - uid: 282 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-0.5 parent: 853 type: Transform @@ -2634,7 +2762,8 @@ entities: - uid: 283 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,0.5 parent: 853 type: Transform @@ -2645,7 +2774,8 @@ entities: - uid: 284 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,1.5 parent: 853 type: Transform @@ -2656,7 +2786,8 @@ entities: - uid: 285 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,2.5 parent: 853 type: Transform @@ -2667,7 +2798,8 @@ entities: - uid: 286 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-10.5 parent: 853 type: Transform @@ -2676,9 +2808,10 @@ entities: ents: [] type: ContainerContainer - uid: 287 - type: HVWire + type: CableHV components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 3.5,-20.5 parent: 853 type: Transform @@ -2689,7 +2822,8 @@ entities: - uid: 288 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 5.5,-11.5 parent: 853 type: Transform @@ -2700,7 +2834,8 @@ entities: - uid: 289 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 6.5,-11.5 parent: 853 type: Transform @@ -2711,7 +2846,8 @@ entities: - uid: 290 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 7.5,-11.5 parent: 853 type: Transform @@ -2722,7 +2858,8 @@ entities: - uid: 291 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 8.5,-11.5 parent: 853 type: Transform @@ -2733,7 +2870,8 @@ entities: - uid: 292 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 4.5,-11.5 parent: 853 type: Transform @@ -2744,7 +2882,8 @@ entities: - uid: 293 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 9.5,-11.5 parent: 853 type: Transform @@ -2755,7 +2894,8 @@ entities: - uid: 294 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 10.5,-11.5 parent: 853 type: Transform @@ -2766,7 +2906,8 @@ entities: - uid: 295 type: DisposalTrunk components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 11.5,-11.5 parent: 853 type: Transform @@ -2787,7 +2928,8 @@ entities: - uid: 297 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -19.5,-10.5 parent: 853 type: Transform @@ -2798,7 +2940,8 @@ entities: - uid: 298 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 12.5,1.5 parent: 853 type: Transform @@ -2809,7 +2952,8 @@ entities: - uid: 299 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 12.5,0.5 parent: 853 type: Transform @@ -2820,7 +2964,8 @@ entities: - uid: 300 type: DisposalPipe components: - - pos: 14.5,0.5 + - anchored: True + pos: 14.5,0.5 parent: 853 type: Transform - containers: @@ -2830,7 +2975,8 @@ entities: - uid: 301 type: DisposalJunctionFlipped components: - - pos: 12.5,-0.5 + - anchored: True + pos: 12.5,-0.5 parent: 853 type: Transform - containers: @@ -2840,7 +2986,8 @@ entities: - uid: 302 type: DisposalBend components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 14.5,-0.5 parent: 853 type: Transform @@ -2865,7 +3012,8 @@ entities: - uid: 305 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 5.5,3.5 parent: 853 type: Transform @@ -2876,7 +3024,8 @@ entities: - uid: 306 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 6.5,3.5 parent: 853 type: Transform @@ -2887,7 +3036,8 @@ entities: - uid: 307 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 7.5,3.5 parent: 853 type: Transform @@ -2898,7 +3048,8 @@ entities: - uid: 308 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 8.5,3.5 parent: 853 type: Transform @@ -2909,7 +3060,8 @@ entities: - uid: 309 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 9.5,3.5 parent: 853 type: Transform @@ -2920,7 +3072,8 @@ entities: - uid: 310 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 10.5,3.5 parent: 853 type: Transform @@ -2931,7 +3084,8 @@ entities: - uid: 311 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 11.5,3.5 parent: 853 type: Transform @@ -2942,7 +3096,8 @@ entities: - uid: 312 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 12.5,2.5 parent: 853 type: Transform @@ -2953,7 +3108,8 @@ entities: - uid: 313 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 13.5,3.5 parent: 853 type: Transform @@ -2964,7 +3120,8 @@ entities: - uid: 314 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 14.5,3.5 parent: 853 type: Transform @@ -2975,7 +3132,8 @@ entities: - uid: 315 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 15.5,3.5 parent: 853 type: Transform @@ -2986,7 +3144,8 @@ entities: - uid: 316 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 16.5,3.5 parent: 853 type: Transform @@ -2997,7 +3156,8 @@ entities: - uid: 317 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 17.5,3.5 parent: 853 type: Transform @@ -3008,7 +3168,8 @@ entities: - uid: 318 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 18.5,3.5 parent: 853 type: Transform @@ -3019,7 +3180,8 @@ entities: - uid: 319 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 19.5,3.5 parent: 853 type: Transform @@ -3030,7 +3192,8 @@ entities: - uid: 320 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 20.5,3.5 parent: 853 type: Transform @@ -3041,7 +3204,8 @@ entities: - uid: 321 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 21.5,3.5 parent: 853 type: Transform @@ -3052,7 +3216,8 @@ entities: - uid: 322 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 22.5,3.5 parent: 853 type: Transform @@ -3063,7 +3228,8 @@ entities: - uid: 323 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 23.5,3.5 parent: 853 type: Transform @@ -3074,7 +3240,8 @@ entities: - uid: 324 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,4.5 parent: 853 type: Transform @@ -3093,7 +3260,8 @@ entities: - uid: 326 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 26.5,3.5 parent: 853 type: Transform @@ -3104,7 +3272,8 @@ entities: - uid: 327 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 27.5,3.5 parent: 853 type: Transform @@ -3115,7 +3284,8 @@ entities: - uid: 328 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 28.5,3.5 parent: 853 type: Transform @@ -3126,7 +3296,8 @@ entities: - uid: 329 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 29.5,3.5 parent: 853 type: Transform @@ -3137,7 +3308,8 @@ entities: - uid: 330 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 4.5,3.5 parent: 853 type: Transform @@ -3148,7 +3320,8 @@ entities: - uid: 331 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 3.5,-9.5 parent: 853 type: Transform @@ -3159,7 +3332,8 @@ entities: - uid: 332 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,4.5 parent: 853 type: Transform @@ -3170,7 +3344,8 @@ entities: - uid: 333 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -20.5,-10.5 parent: 853 type: Transform @@ -3181,7 +3356,8 @@ entities: - uid: 334 type: DisposalTrunk components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 0.5,1.5 parent: 853 type: Transform @@ -3203,7 +3379,8 @@ entities: - uid: 336 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,-9.5 parent: 853 type: Transform @@ -3214,7 +3391,8 @@ entities: - uid: 337 type: DisposalTrunk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,-8.5 parent: 853 type: Transform @@ -3225,7 +3403,8 @@ entities: - uid: 338 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -21.5,-10.5 parent: 853 type: Transform @@ -3236,7 +3415,8 @@ entities: - uid: 339 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -12.5,2.5 parent: 853 type: Transform @@ -3247,7 +3427,8 @@ entities: - uid: 340 type: DisposalTrunk components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -12.5,1.5 parent: 853 type: Transform @@ -3258,7 +3439,8 @@ entities: - uid: 341 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -22.5,-10.5 parent: 853 type: Transform @@ -3269,7 +3451,8 @@ entities: - uid: 342 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,-12.5 parent: 853 type: Transform @@ -3280,7 +3463,8 @@ entities: - uid: 343 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,-11.5 parent: 853 type: Transform @@ -3291,7 +3475,8 @@ entities: - uid: 344 type: DisposalBend components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -32.5,3.5 parent: 853 type: Transform @@ -3302,7 +3487,8 @@ entities: - uid: 345 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,4.5 parent: 853 type: Transform @@ -3313,7 +3499,8 @@ entities: - uid: 346 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,5.5 parent: 853 type: Transform @@ -3324,7 +3511,8 @@ entities: - uid: 347 type: DisposalTrunk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,6.5 parent: 853 type: Transform @@ -3335,7 +3523,8 @@ entities: - uid: 348 type: DisposalBend components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,-10.5 parent: 853 type: Transform @@ -3346,7 +3535,8 @@ entities: - uid: 349 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -7.5,3.5 parent: 853 type: Transform @@ -3357,7 +3547,8 @@ entities: - uid: 350 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -6.5,3.5 parent: 853 type: Transform @@ -3368,7 +3559,8 @@ entities: - uid: 351 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -5.5,3.5 parent: 853 type: Transform @@ -3379,7 +3571,8 @@ entities: - uid: 352 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -4.5,3.5 parent: 853 type: Transform @@ -3390,7 +3583,8 @@ entities: - uid: 353 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -3.5,3.5 parent: 853 type: Transform @@ -3401,7 +3595,8 @@ entities: - uid: 354 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -2.5,3.5 parent: 853 type: Transform @@ -3412,7 +3607,8 @@ entities: - uid: 355 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -1.5,3.5 parent: 853 type: Transform @@ -3423,7 +3619,8 @@ entities: - uid: 356 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -0.5,3.5 parent: 853 type: Transform @@ -3434,7 +3631,8 @@ entities: - uid: 357 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: 0.5,2.5 parent: 853 type: Transform @@ -3445,7 +3643,8 @@ entities: - uid: 358 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 1.5,3.5 parent: 853 type: Transform @@ -3456,7 +3655,8 @@ entities: - uid: 359 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -8.5,3.5 parent: 853 type: Transform @@ -3467,7 +3667,8 @@ entities: - uid: 360 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -9.5,3.5 parent: 853 type: Transform @@ -3478,7 +3679,8 @@ entities: - uid: 361 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -10.5,3.5 parent: 853 type: Transform @@ -3489,7 +3691,8 @@ entities: - uid: 362 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -11.5,3.5 parent: 853 type: Transform @@ -3511,7 +3714,8 @@ entities: - uid: 364 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -13.5,3.5 parent: 853 type: Transform @@ -3522,7 +3726,8 @@ entities: - uid: 365 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -14.5,3.5 parent: 853 type: Transform @@ -3533,7 +3738,8 @@ entities: - uid: 366 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -15.5,3.5 parent: 853 type: Transform @@ -3544,7 +3750,8 @@ entities: - uid: 367 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -16.5,3.5 parent: 853 type: Transform @@ -3555,7 +3762,8 @@ entities: - uid: 368 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -17.5,3.5 parent: 853 type: Transform @@ -3566,7 +3774,8 @@ entities: - uid: 369 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -18.5,3.5 parent: 853 type: Transform @@ -3577,7 +3786,8 @@ entities: - uid: 370 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -19.5,3.5 parent: 853 type: Transform @@ -3588,7 +3798,8 @@ entities: - uid: 371 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -20.5,3.5 parent: 853 type: Transform @@ -3599,7 +3810,8 @@ entities: - uid: 372 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -21.5,3.5 parent: 853 type: Transform @@ -3620,7 +3832,8 @@ entities: - uid: 374 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -23.5,3.5 parent: 853 type: Transform @@ -3631,7 +3844,8 @@ entities: - uid: 375 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -24.5,3.5 parent: 853 type: Transform @@ -3642,7 +3856,8 @@ entities: - uid: 376 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -25.5,3.5 parent: 853 type: Transform @@ -3653,7 +3868,8 @@ entities: - uid: 377 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -26.5,3.5 parent: 853 type: Transform @@ -3664,7 +3880,8 @@ entities: - uid: 378 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -27.5,3.5 parent: 853 type: Transform @@ -3675,7 +3892,8 @@ entities: - uid: 379 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,4.5 parent: 853 type: Transform @@ -3686,7 +3904,8 @@ entities: - uid: 380 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -29.5,3.5 parent: 853 type: Transform @@ -3697,7 +3916,8 @@ entities: - uid: 381 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -30.5,3.5 parent: 853 type: Transform @@ -3708,7 +3928,8 @@ entities: - uid: 382 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -31.5,3.5 parent: 853 type: Transform @@ -3719,7 +3940,8 @@ entities: - uid: 383 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,2.5 parent: 853 type: Transform @@ -3730,7 +3952,8 @@ entities: - uid: 384 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,1.5 parent: 853 type: Transform @@ -3741,7 +3964,8 @@ entities: - uid: 385 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,0.5 parent: 853 type: Transform @@ -3752,7 +3976,8 @@ entities: - uid: 386 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-0.5 parent: 853 type: Transform @@ -3763,7 +3988,8 @@ entities: - uid: 387 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-1.5 parent: 853 type: Transform @@ -3774,7 +4000,8 @@ entities: - uid: 388 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-2.5 parent: 853 type: Transform @@ -3785,7 +4012,8 @@ entities: - uid: 389 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-3.5 parent: 853 type: Transform @@ -3796,7 +4024,8 @@ entities: - uid: 390 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-4.5 parent: 853 type: Transform @@ -3807,7 +4036,8 @@ entities: - uid: 391 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-5.5 parent: 853 type: Transform @@ -3818,7 +4048,8 @@ entities: - uid: 392 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-6.5 parent: 853 type: Transform @@ -3829,7 +4060,8 @@ entities: - uid: 393 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-7.5 parent: 853 type: Transform @@ -3840,7 +4072,8 @@ entities: - uid: 394 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-8.5 parent: 853 type: Transform @@ -3851,7 +4084,8 @@ entities: - uid: 395 type: DisposalPipe components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-9.5 parent: 853 type: Transform @@ -3862,7 +4096,8 @@ entities: - uid: 396 type: DisposalBend components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -32.5,-10.5 parent: 853 type: Transform @@ -3873,7 +4108,8 @@ entities: - uid: 397 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -31.5,-10.5 parent: 853 type: Transform @@ -3884,7 +4120,8 @@ entities: - uid: 398 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -30.5,-10.5 parent: 853 type: Transform @@ -3895,7 +4132,8 @@ entities: - uid: 399 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -29.5,-10.5 parent: 853 type: Transform @@ -3906,7 +4144,8 @@ entities: - uid: 400 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -28.5,-10.5 parent: 853 type: Transform @@ -3927,7 +4166,8 @@ entities: - uid: 402 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -26.5,-10.5 parent: 853 type: Transform @@ -3938,7 +4178,8 @@ entities: - uid: 403 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -25.5,-10.5 parent: 853 type: Transform @@ -3949,7 +4190,8 @@ entities: - uid: 404 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -24.5,-10.5 parent: 853 type: Transform @@ -4366,7 +4608,7 @@ entities: type: RandomSpawner components: - rot: 4.371139006309477E-08 rad - pos: -0.5,-22.5 + pos: -0.5,-23.5 parent: 853 type: Transform - uid: 463 @@ -4386,7 +4628,8 @@ entities: - uid: 465 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,8.5 parent: 853 type: Transform @@ -4422,7 +4665,7 @@ entities: type: RandomSpawner components: - rot: 4.371139006309477E-08 rad - pos: 0.5,-6.5 + pos: 0.5,-7.5 parent: 853 type: Transform - uid: 471 @@ -4650,7 +4893,7 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -4738,6 +4981,8 @@ entities: pos: 9.916167,-29.48114 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -4749,7 +4994,7 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -4760,41 +5005,48 @@ entities: pos: -21.136164,-6.519089 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 517 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-6.5 parent: 853 type: Transform - uid: 518 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-5.5 parent: 853 type: Transform - uid: 519 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-5.5 parent: 853 type: Transform - uid: 520 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-4.5 parent: 853 type: Transform - uid: 521 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-4.5 parent: 853 type: Transform @@ -5065,7 +5317,8 @@ entities: - uid: 556 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,21.5 parent: 853 type: Transform @@ -5082,6 +5335,8 @@ entities: - pos: 13.52327,-13.17637 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -5095,7 +5350,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -5106,6 +5361,8 @@ entities: pos: 11.041167,-29.44989 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -5371,7 +5628,7 @@ entities: parent: 853 type: Transform - uid: 587 - type: AirlockServiceLocked + type: AirlockTheatreLocked components: - name: Theatre type: MetaData @@ -5619,9 +5876,10 @@ entities: ents: [] type: ContainerContainer - uid: 608 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -4.5,4.5 + - anchored: True + pos: -4.5,4.5 parent: 853 type: Transform - visible: False @@ -5746,7 +6004,8 @@ entities: - uid: 619 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,9.5 parent: 853 type: Transform @@ -5971,9 +6230,10 @@ entities: ents: [] type: ContainerContainer - uid: 638 - type: HVWire + type: CableHV components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 3.5,-23.5 parent: 853 type: Transform @@ -6285,6 +6545,8 @@ entities: - pos: -38.50688,10.857263 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -6536,9 +6798,10 @@ entities: ents: [] type: ContainerContainer - uid: 701 - type: HVWire + type: CableHV components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 3.5,-22.5 parent: 853 type: Transform @@ -6554,9 +6817,10 @@ entities: parent: 853 type: Transform - uid: 703 - type: HVWire + type: CableHV components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 3.5,-21.5 parent: 853 type: Transform @@ -6869,7 +7133,8 @@ entities: - uid: 746 type: DisposalPipe components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 13.5,-0.5 parent: 853 type: Transform @@ -6950,9 +7215,10 @@ entities: parent: 853 type: Transform - uid: 757 - type: HVWire + type: CableHV components: - - pos: 14.5,11.5 + - anchored: True + pos: 14.5,11.5 parent: 853 type: Transform - visible: False @@ -6970,7 +7236,8 @@ entities: - uid: 759 type: DisposalPipe components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 12.5,-1.5 parent: 853 type: Transform @@ -7738,91 +8005,104 @@ entities: - uid: 826 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-4.5 parent: 853 type: Transform - uid: 827 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-5.5 parent: 853 type: Transform - uid: 828 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-6.5 parent: 853 type: Transform - uid: 829 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-6.5 parent: 853 type: Transform - uid: 830 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-6.5 parent: 853 type: Transform - uid: 831 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-6.5 parent: 853 type: Transform - uid: 832 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-6.5 parent: 853 type: Transform - uid: 833 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-5.5 parent: 853 type: Transform - uid: 834 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-4.5 parent: 853 type: Transform - uid: 835 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-3.5 parent: 853 type: Transform - uid: 836 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-2.5 parent: 853 type: Transform - uid: 837 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-2.5 parent: 853 type: Transform - uid: 838 type: DisposalTrunk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,11.5 parent: 853 type: Transform @@ -7833,7 +8113,8 @@ entities: - uid: 839 type: DisposalBend components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -29.5,10.5 parent: 853 type: Transform @@ -7844,7 +8125,8 @@ entities: - uid: 840 type: DisposalBend components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,10.5 parent: 853 type: Transform @@ -7855,7 +8137,8 @@ entities: - uid: 841 type: DisposalBend components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -8.5,-14.5 parent: 853 type: Transform @@ -7866,7 +8149,8 @@ entities: - uid: 842 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -7.5,-14.5 parent: 853 type: Transform @@ -7877,7 +8161,8 @@ entities: - uid: 843 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -6.5,-14.5 parent: 853 type: Transform @@ -7888,7 +8173,8 @@ entities: - uid: 844 type: DisposalTrunk components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -5.5,-14.5 parent: 853 type: Transform @@ -7910,7 +8196,8 @@ entities: - uid: 846 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: -9.5,-15.5 parent: 853 type: Transform @@ -7921,7 +8208,8 @@ entities: - uid: 847 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -15.5,-15.5 parent: 853 type: Transform @@ -7932,7 +8220,8 @@ entities: - uid: 848 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -13.5,-15.5 parent: 853 type: Transform @@ -7943,7 +8232,8 @@ entities: - uid: 849 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -14.5,-15.5 parent: 853 type: Transform @@ -7954,7 +8244,8 @@ entities: - uid: 850 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -12.5,-15.5 parent: 853 type: Transform @@ -7965,7 +8256,8 @@ entities: - uid: 851 type: DisposalPipe components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: -11.5,-15.5 parent: 853 type: Transform @@ -7976,7 +8268,8 @@ entities: - uid: 852 type: DisposalPipe components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -10.5,-16.5 parent: 853 type: Transform @@ -12056,21 +12349,24 @@ entities: - uid: 854 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-2.5 parent: 853 type: Transform - uid: 855 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-2.5 parent: 853 type: Transform - uid: 856 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-2.5 parent: 853 type: Transform @@ -12080,6 +12376,8 @@ entities: - pos: 54.543198,-9.213088 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -12089,6 +12387,8 @@ entities: - pos: 44.465073,-9.134963 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -12199,7 +12499,8 @@ entities: - uid: 873 type: Autolathe components: - - pos: 29.5,-2.5 + - anchored: True + pos: 29.5,-2.5 parent: 853 type: Transform - containers: @@ -12219,7 +12520,8 @@ entities: - uid: 875 type: Protolathe components: - - pos: 29.5,-1.5 + - anchored: True + pos: 29.5,-1.5 parent: 853 type: Transform - containers: @@ -12249,9 +12551,10 @@ entities: parent: 853 type: Transform - uid: 879 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,1.5 parent: 853 type: Transform @@ -12325,7 +12628,8 @@ entities: - uid: 889 type: GravityGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-4.5 parent: 853 type: Transform @@ -12346,7 +12650,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -12356,6 +12660,8 @@ entities: - pos: -11.487365,5.8158755 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -12369,14 +12675,15 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 894 type: KitchenMicrowave components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-1.5 parent: 853 type: Transform @@ -12458,14 +12765,16 @@ entities: - uid: 905 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,-14.5 parent: 853 type: Transform - uid: 906 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,-10.5 parent: 853 type: Transform @@ -13083,9 +13392,10 @@ entities: parent: 853 type: Transform - uid: 994 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 1.5,1.5 + - anchored: True + pos: 1.5,1.5 parent: 853 type: Transform - canCollide: False @@ -13093,7 +13403,8 @@ entities: - uid: 995 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-18.5 parent: 853 type: Transform @@ -13107,17 +13418,19 @@ entities: - bodyType: Dynamic type: Physics - uid: 997 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 0.5,2.5 + - anchored: True + pos: 0.5,2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 998 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 1.5,2.5 + - anchored: True + pos: 1.5,2.5 parent: 853 type: Transform - canCollide: False @@ -13130,9 +13443,10 @@ entities: parent: 853 type: Transform - uid: 1000 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 3.5,30.5 + - anchored: True + pos: 3.5,30.5 parent: 853 type: Transform - visible: False @@ -13140,9 +13454,10 @@ entities: - canCollide: False type: Physics - uid: 1001 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 3.5,28.5 + - anchored: True + pos: 3.5,28.5 parent: 853 type: Transform - visible: False @@ -13150,9 +13465,10 @@ entities: - canCollide: False type: Physics - uid: 1002 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 26.5,4.5 + - anchored: True + pos: 26.5,4.5 parent: 853 type: Transform - visible: False @@ -13160,9 +13476,10 @@ entities: - canCollide: False type: Physics - uid: 1003 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 25.5,4.5 + - anchored: True + pos: 25.5,4.5 parent: 853 type: Transform - visible: False @@ -13184,9 +13501,10 @@ entities: parent: 853 type: Transform - uid: 1006 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 27.5,4.5 + - anchored: True + pos: 27.5,4.5 parent: 853 type: Transform - visible: False @@ -13194,9 +13512,10 @@ entities: - canCollide: False type: Physics - uid: 1007 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 27.5,6.5 + - anchored: True + pos: 27.5,6.5 parent: 853 type: Transform - visible: False @@ -13204,9 +13523,10 @@ entities: - canCollide: False type: Physics - uid: 1008 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 27.5,5.5 + - anchored: True + pos: 27.5,5.5 parent: 853 type: Transform - visible: False @@ -13214,9 +13534,10 @@ entities: - canCollide: False type: Physics - uid: 1009 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 3.5,29.5 + - anchored: True + pos: 3.5,29.5 parent: 853 type: Transform - visible: False @@ -13224,9 +13545,10 @@ entities: - canCollide: False type: Physics - uid: 1010 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 16.5,-2.5 + - anchored: True + pos: 16.5,-2.5 parent: 853 type: Transform - visible: False @@ -13241,9 +13563,10 @@ entities: parent: 853 type: Transform - uid: 1012 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 22.5,-18.5 + - anchored: True + pos: 22.5,-18.5 parent: 853 type: Transform - canCollide: False @@ -13251,7 +13574,8 @@ entities: - uid: 1013 type: DisposalPipe components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 12.5,-2.5 parent: 853 type: Transform @@ -13299,9 +13623,10 @@ entities: parent: 853 type: Transform - uid: 1019 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-26.5 parent: 853 type: Transform @@ -13310,21 +13635,24 @@ entities: - uid: 1020 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,14.5 parent: 853 type: Transform - uid: 1021 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,14.5 parent: 853 type: Transform - uid: 1022 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,14.5 parent: 853 type: Transform @@ -13425,6 +13753,8 @@ entities: - pos: -32.48585,5.8534822 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13480,7 +13810,8 @@ entities: - uid: 1043 type: Autolathe components: - - pos: -5.5,-12.5 + - anchored: True + pos: -5.5,-12.5 parent: 853 type: Transform - containers: @@ -13492,7 +13823,8 @@ entities: - uid: 1044 type: Protolathe components: - - pos: -3.5,-12.5 + - anchored: True + pos: -3.5,-12.5 parent: 853 type: Transform - containers: @@ -13594,7 +13926,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13625,6 +13957,8 @@ entities: pos: 2.1104045,7.4564466 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13635,6 +13969,8 @@ entities: pos: -9.922553,13.456606 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13644,6 +13980,8 @@ entities: - pos: -15.539971,-17.154892 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13653,6 +13991,8 @@ entities: - pos: 40.98358,13.845015 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13675,7 +14015,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13686,6 +14026,8 @@ entities: pos: -17.87964,-21.491213 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13699,7 +14041,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13710,6 +14052,8 @@ entities: pos: -20.870539,0.49653578 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13723,7 +14067,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13734,6 +14078,8 @@ entities: pos: -5.89616,-14.473355 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13744,6 +14090,8 @@ entities: pos: 2.0898275,-9.5469675 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13757,7 +14105,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13918,6 +14266,8 @@ entities: pos: 19.913452,-17.520119 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -13974,7 +14324,8 @@ entities: - uid: 1104 type: DisposalTrunk components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 12.5,-3.5 parent: 853 type: Transform @@ -14017,71 +14368,81 @@ entities: - uid: 1109 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-22.5 parent: 853 type: Transform - uid: 1110 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-23.5 parent: 853 type: Transform - uid: 1111 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-24.5 parent: 853 type: Transform - uid: 1112 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-25.5 parent: 853 type: Transform - uid: 1113 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-26.5 parent: 853 type: Transform - uid: 1114 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-26.5 parent: 853 type: Transform - uid: 1115 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-25.5 parent: 853 type: Transform - uid: 1116 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-24.5 parent: 853 type: Transform - uid: 1117 - type: HVWire + type: CableHV components: - - pos: -6.5,-26.5 + - anchored: True + pos: -6.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 1118 - type: HVWire + type: CableHV components: - - pos: -4.5,-26.5 + - anchored: True + pos: -4.5,-26.5 parent: 853 type: Transform - canCollide: False @@ -14089,21 +14450,24 @@ entities: - uid: 1119 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-26.5 parent: 853 type: Transform - uid: 1120 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,-26.5 parent: 853 type: Transform - uid: 1121 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-26.5 parent: 853 type: Transform @@ -14124,7 +14488,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14135,6 +14499,8 @@ entities: pos: 19.923454,-11.570569 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14145,6 +14511,8 @@ entities: pos: 5.9039526,-17.513905 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14155,6 +14523,8 @@ entities: pos: 24.894157,-14.48887 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14247,14 +14617,16 @@ entities: - uid: 1139 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 29.5,-6.5 parent: 853 type: Transform - uid: 1140 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,-6.5 parent: 853 type: Transform @@ -14281,7 +14653,8 @@ entities: - uid: 1143 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,-6.5 parent: 853 type: Transform @@ -14362,7 +14735,8 @@ entities: - uid: 1153 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-6.5 parent: 853 type: Transform @@ -14458,7 +14832,8 @@ entities: - uid: 1163 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-3.5 parent: 853 type: Transform @@ -14649,6 +15024,8 @@ entities: pos: -13.905625,16.18277 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14660,7 +15037,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 1191 @@ -14670,6 +15047,8 @@ entities: pos: -16.087059,-1.5190892 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14714,6 +15093,8 @@ entities: - pos: -18.497206,5.8113365 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14727,7 +15108,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14755,7 +15136,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14769,7 +15150,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14792,6 +15173,8 @@ entities: - pos: -5.502577,17.78978 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14841,7 +15224,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14859,6 +15242,8 @@ entities: pos: -22.116953,2.4939203 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14885,7 +15270,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14899,7 +15284,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14909,6 +15294,8 @@ entities: - pos: -27.497717,11.849479 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14919,6 +15306,8 @@ entities: pos: -34.08711,9.508544 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -14993,6 +15382,8 @@ entities: pos: -29.906116,9.430419 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15006,7 +15397,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15034,7 +15425,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15048,7 +15439,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15062,7 +15453,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15086,6 +15477,8 @@ entities: pos: 17.115456,-20.488289 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15121,13 +15514,12 @@ entities: - uid: 1239 type: SalternApc components: - - pos: -5.5120974,-7.5 + - anchored: True + pos: -5.5,-7.5 parent: 853 type: Transform - startingCharge: 11999.417 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 1240 type: Poweredlight components: @@ -15135,6 +15527,8 @@ entities: pos: -23.089119,8.505429 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15169,14 +15563,16 @@ entities: - uid: 1245 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-23.5 parent: 853 type: Transform - uid: 1246 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -2.5,-15.5 + - anchored: True + pos: -2.5,-15.5 parent: 853 type: Transform - visible: False @@ -15184,9 +15580,10 @@ entities: - canCollide: False type: Physics - uid: 1247 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 6.5,-0.5 + - anchored: True + pos: 6.5,-0.5 parent: 853 type: Transform - visible: False @@ -15201,9 +15598,10 @@ entities: parent: 853 type: Transform - uid: 1249 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 6.5,0.5 + - anchored: True + pos: 6.5,0.5 parent: 853 type: Transform - visible: False @@ -15234,7 +15632,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15248,7 +15646,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15262,7 +15660,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15276,7 +15674,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15290,7 +15688,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15310,7 +15708,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15321,6 +15719,8 @@ entities: pos: -35.07844,-4.406664 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15330,6 +15730,8 @@ entities: - pos: 1.5033649,0.8428016 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15343,7 +15745,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15382,6 +15784,8 @@ entities: pos: 6.1210775,-4.523888 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15395,7 +15799,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15406,6 +15810,8 @@ entities: pos: 4.8710775,2.273314 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15416,6 +15822,8 @@ entities: pos: 4.8977103,23.496256 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15432,6 +15840,8 @@ entities: - pos: -1.4910796,14.8427725 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15441,6 +15851,8 @@ entities: - pos: -8.486245,22.842363 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15454,7 +15866,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15468,7 +15880,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15482,7 +15894,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15496,7 +15908,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15510,7 +15922,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15522,7 +15934,7 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15536,7 +15948,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15547,6 +15959,8 @@ entities: pos: -11.046864,19.455282 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15557,6 +15971,8 @@ entities: pos: 2.1164603,23.496256 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15598,7 +16014,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15623,7 +16039,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15633,6 +16049,8 @@ entities: - pos: 12.520373,24.758696 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15643,6 +16061,8 @@ entities: pos: 0.4871831,3.0057735 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15653,6 +16073,8 @@ entities: pos: 10.845088,9.476223 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15666,7 +16088,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15680,7 +16102,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15694,7 +16116,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15704,6 +16126,8 @@ entities: - pos: 8.501338,21.797794 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15714,6 +16138,8 @@ entities: pos: 6.157588,9.523098 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15727,7 +16153,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15741,7 +16167,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15755,7 +16181,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15779,6 +16205,8 @@ entities: - pos: 25.501043,-1.1861185 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15820,7 +16248,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15834,7 +16262,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15848,7 +16276,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15859,6 +16287,8 @@ entities: pos: 47.090073,-4.4708805 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15868,6 +16298,8 @@ entities: - pos: 12.508076,1.8582891 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15881,7 +16313,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15895,7 +16327,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15909,7 +16341,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15920,6 +16352,8 @@ entities: pos: 18.098747,8.494373 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15933,7 +16367,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15943,6 +16377,8 @@ entities: - pos: 15.493641,1.8426641 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15952,6 +16388,8 @@ entities: - pos: 15.520623,12.86064 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15962,6 +16400,8 @@ entities: pos: 1.1155372,-17.513905 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -15989,7 +16429,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16003,7 +16443,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16013,6 +16453,8 @@ entities: - pos: -1.4899101,-13.17648 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16022,6 +16464,8 @@ entities: - pos: -9.521995,-17.191471 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16039,6 +16483,8 @@ entities: pos: 18.89989,-0.46983594 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16056,6 +16502,8 @@ entities: pos: 2.0898275,-4.523888 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16080,6 +16528,8 @@ entities: pos: 7.1310654,-14.473245 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16093,7 +16543,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16107,7 +16557,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16118,6 +16568,8 @@ entities: pos: 19.90783,-8.476819 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16160,6 +16612,8 @@ entities: pos: 6.1367025,1.6240516 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16170,6 +16624,8 @@ entities: pos: 18.088957,13.54814 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16181,7 +16637,7 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16191,6 +16647,8 @@ entities: - pos: 22.445484,-9.293987 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16208,6 +16666,8 @@ entities: pos: 51.933823,-4.5333805 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16218,6 +16678,8 @@ entities: pos: 12.937156,-3.5445666 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16231,7 +16693,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16250,9 +16712,10 @@ entities: parent: 853 type: Transform - uid: 1351 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,1.5 parent: 853 type: Transform @@ -16275,7 +16738,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16296,7 +16759,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16310,35 +16773,39 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 1357 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-19.5 parent: 853 type: Transform - uid: 1358 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-19.5 parent: 853 type: Transform - uid: 1359 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-10.5 parent: 853 type: Transform - uid: 1360 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-10.5 parent: 853 type: Transform @@ -16359,7 +16826,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16380,7 +16847,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16394,7 +16861,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16404,6 +16871,8 @@ entities: - pos: 35.514977,-6.262737 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16414,6 +16883,8 @@ entities: pos: -30.97177,-5.531664 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16427,7 +16898,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16437,6 +16908,8 @@ entities: - pos: 28.505056,6.8201885 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16446,6 +16919,8 @@ entities: - pos: 30.499353,-6.200237 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16456,6 +16931,8 @@ entities: pos: -25.917414,-0.5190892 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16473,6 +16950,8 @@ entities: pos: 37.0966,2.484137 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16486,7 +16965,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16500,7 +16979,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16514,7 +16993,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16525,6 +17004,8 @@ entities: pos: 24.923923,11.532515 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16549,6 +17030,8 @@ entities: pos: 30.104717,12.563765 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16558,6 +17041,8 @@ entities: - pos: 46.516445,4.843512 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16571,7 +17056,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16585,14 +17070,15 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 1384 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -4.5,5.5 + - anchored: True + pos: -4.5,5.5 parent: 853 type: Transform - visible: False @@ -16616,7 +17102,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16630,7 +17116,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -16640,6 +17126,8 @@ entities: - pos: 13.536872,-7.156335 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -17290,9 +17778,10 @@ entities: parent: 853 type: Transform - uid: 1482 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-25.5 parent: 853 type: Transform @@ -17301,9 +17790,10 @@ entities: - canCollide: False type: Physics - uid: 1483 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-26.5 parent: 853 type: Transform @@ -17702,9 +18192,10 @@ entities: parent: 853 type: Transform - uid: 1539 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-28.5 parent: 853 type: Transform @@ -17760,18 +18251,20 @@ entities: ents: [] type: ContainerContainer - uid: 1546 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-32.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 1547 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 57.5,-33.5 parent: 853 type: Transform @@ -17891,14 +18384,16 @@ entities: - uid: 1564 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-15.5 parent: 853 type: Transform - uid: 1565 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,-14.5 parent: 853 type: Transform @@ -17918,21 +18413,24 @@ entities: - uid: 1567 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,-10.5 parent: 853 type: Transform - uid: 1568 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-9.5 parent: 853 type: Transform - uid: 1569 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-8.5 parent: 853 type: Transform @@ -17953,7 +18451,8 @@ entities: - uid: 1572 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-7.5 parent: 853 type: Transform @@ -17979,105 +18478,120 @@ entities: - uid: 1576 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-6.5 parent: 853 type: Transform - uid: 1577 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-6.5 parent: 853 type: Transform - uid: 1578 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,0.5 parent: 853 type: Transform - uid: 1579 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,1.5 parent: 853 type: Transform - uid: 1580 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,11.5 parent: 853 type: Transform - uid: 1581 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,7.5 parent: 853 type: Transform - uid: 1582 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,12.5 parent: 853 type: Transform - uid: 1583 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,11.5 parent: 853 type: Transform - uid: 1584 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,23.5 parent: 853 type: Transform - uid: 1585 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,22.5 parent: 853 type: Transform - uid: 1586 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,21.5 parent: 853 type: Transform - uid: 1587 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,20.5 parent: 853 type: Transform - uid: 1588 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,14.5 parent: 853 type: Transform - uid: 1589 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,13.5 parent: 853 type: Transform - uid: 1590 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,20.5 parent: 853 type: Transform @@ -18095,14 +18609,16 @@ entities: - uid: 1592 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,8.5 parent: 853 type: Transform - uid: 1593 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,1.5 parent: 853 type: Transform @@ -18310,7 +18826,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -18324,7 +18840,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -19173,9 +19689,10 @@ entities: parent: 853 type: Transform - uid: 1753 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-33.5 parent: 853 type: Transform @@ -19209,9 +19726,10 @@ entities: parent: 853 type: Transform - uid: 1758 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-30.5 parent: 853 type: Transform @@ -19365,18 +19883,20 @@ entities: parent: 853 type: Transform - uid: 1780 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 1781 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-33.5 parent: 853 type: Transform @@ -19397,9 +19917,10 @@ entities: parent: 853 type: Transform - uid: 1784 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-33.5 parent: 853 type: Transform @@ -19678,18 +20199,20 @@ entities: parent: 853 type: Transform - uid: 1825 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 1826 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 55.5,-33.5 parent: 853 type: Transform @@ -19788,7 +20311,7 @@ entities: - color: '#FFFFFFFF' type: PointLight - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -21153,7 +21676,8 @@ entities: - uid: 2033 type: DisposalPipe components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 3.5,-13.5 parent: 853 type: Transform @@ -21164,7 +21688,8 @@ entities: - uid: 2034 type: DisposalPipe components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 3.5,-12.5 parent: 853 type: Transform @@ -21175,7 +21700,8 @@ entities: - uid: 2035 type: DisposalJunction components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 3.5,-11.5 parent: 853 type: Transform @@ -21506,14 +22032,16 @@ entities: - uid: 2084 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-23.5 parent: 853 type: Transform - uid: 2085 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-24.5 parent: 853 type: Transform @@ -21534,9 +22062,10 @@ entities: parent: 853 type: Transform - uid: 2088 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 1.5,6.5 + - anchored: True + pos: 1.5,6.5 parent: 853 type: Transform - canCollide: False @@ -23809,9 +24338,10 @@ entities: parent: 853 type: Transform - uid: 2410 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -1.5,6.5 + - anchored: True + pos: -1.5,6.5 parent: 853 type: Transform - canCollide: False @@ -23855,17 +24385,19 @@ entities: ents: [] type: ContainerContainer - uid: 2415 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -3.5,6.5 + - anchored: True + pos: -3.5,6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2416 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -2.5,6.5 + - anchored: True + pos: -2.5,6.5 parent: 853 type: Transform - canCollide: False @@ -23885,9 +24417,10 @@ entities: parent: 853 type: Transform - uid: 2419 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -4.5,6.5 + - anchored: True + pos: -4.5,6.5 parent: 853 type: Transform - canCollide: False @@ -23914,9 +24447,10 @@ entities: parent: 853 type: Transform - uid: 2423 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -13.5,-9.5 + - anchored: True + pos: -15.5,-9.5 parent: 853 type: Transform - visible: False @@ -23933,7 +24467,8 @@ entities: - uid: 2425 type: DisposalTrunk components: - - rot: 3.141592697301183 rad + - anchored: True + rot: 3.141592697301183 rad pos: -10.5,-17.5 parent: 853 type: Transform @@ -24378,7 +24913,8 @@ entities: - uid: 2486 type: Emitter components: - - pos: 43.5,13.5 + - anchored: True + pos: 43.5,13.5 parent: 853 type: Transform - uid: 2487 @@ -24503,135 +25039,123 @@ entities: - uid: 2504 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,27.5 parent: 853 type: Transform - startingCharge: 11999.634 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2505 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,27.5 parent: 853 type: Transform - startingCharge: 11999.3 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2506 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,22.5 parent: 853 type: Transform - startingCharge: 11999.066 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2507 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,14.5 parent: 853 type: Transform - startingCharge: 11999.733 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2508 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,14.5 parent: 853 type: Transform - startingCharge: 11999.483 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2509 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-1.5 parent: 853 type: Transform - startingCharge: 11991.15 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2510 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,1.5 parent: 853 type: Transform - startingCharge: 11999.15 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2511 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,10.5 parent: 853 type: Transform - startingCharge: 11999.384 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2512 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,13.5 parent: 853 type: Transform - startingCharge: 11999.116 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2513 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-17.5 parent: 853 type: Transform - startingCharge: 11999.2 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2514 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-3.5 parent: 853 type: Transform - startingCharge: 11999.066 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2515 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,2.5 parent: 853 type: Transform - startingCharge: 11999.467 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2516 type: CrateServiceReplacementLights components: @@ -24647,47 +25171,43 @@ entities: - uid: 2517 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,15.5 parent: 853 type: Transform - startingCharge: 11999.483 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2518 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,12.5 parent: 853 type: Transform - startingCharge: 11999.4 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2519 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -39.5,11.5 parent: 853 type: Transform - startingCharge: 11999.4 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2520 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,2.5 parent: 853 type: Transform - startingCharge: 11998.483 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2521 type: ShellShotgunSlug components: @@ -24699,18 +25219,18 @@ entities: - uid: 2522 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-12.5 parent: 853 type: Transform - startingCharge: 11999.75 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2523 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,0.5 parent: 853 type: Transform @@ -24728,49 +25248,48 @@ entities: - uid: 2525 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-18.5 parent: 853 type: Transform - startingCharge: 11999.083 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2526 type: SalternApc components: - - rot: 4.371139006309477E-08 rad - pos: -9.75476,-21.5 + - anchored: True + rot: 4.371139006309477E-08 rad + pos: -9.5,-21.5 parent: 853 type: Transform - startingCharge: 11996.233 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2527 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-16.5 parent: 853 type: Transform - startingCharge: 11999.65 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2528 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2529 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,11.5 parent: 853 type: Transform @@ -24779,9 +25298,10 @@ entities: - canCollide: False type: Physics - uid: 2530 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,10.5 parent: 853 type: Transform @@ -24790,9 +25310,10 @@ entities: - canCollide: False type: Physics - uid: 2531 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,9.5 parent: 853 type: Transform @@ -24801,9 +25322,10 @@ entities: - canCollide: False type: Physics - uid: 2532 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,8.5 parent: 853 type: Transform @@ -24812,9 +25334,10 @@ entities: - canCollide: False type: Physics - uid: 2533 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,9.5 parent: 853 type: Transform @@ -24823,9 +25346,10 @@ entities: - canCollide: False type: Physics - uid: 2534 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,9.5 parent: 853 type: Transform @@ -24834,18 +25358,20 @@ entities: - canCollide: False type: Physics - uid: 2535 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -25.5,9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2536 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,8.5 parent: 853 type: Transform @@ -24854,18 +25380,20 @@ entities: - canCollide: False type: Physics - uid: 2537 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2538 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -24.5,9.5 parent: 853 type: Transform @@ -24874,9 +25402,10 @@ entities: - canCollide: False type: Physics - uid: 2539 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,9.5 parent: 853 type: Transform @@ -24885,9 +25414,10 @@ entities: - canCollide: False type: Physics - uid: 2540 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,9.5 parent: 853 type: Transform @@ -24896,9 +25426,10 @@ entities: - canCollide: False type: Physics - uid: 2541 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,9.5 parent: 853 type: Transform @@ -24907,9 +25438,10 @@ entities: - canCollide: False type: Physics - uid: 2542 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,9.5 parent: 853 type: Transform @@ -24918,9 +25450,10 @@ entities: - canCollide: False type: Physics - uid: 2543 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -19.5,9.5 parent: 853 type: Transform @@ -24929,9 +25462,10 @@ entities: - canCollide: False type: Physics - uid: 2544 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,8.5 parent: 853 type: Transform @@ -24940,9 +25474,10 @@ entities: - canCollide: False type: Physics - uid: 2545 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,7.5 parent: 853 type: Transform @@ -24951,9 +25486,10 @@ entities: - canCollide: False type: Physics - uid: 2546 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,7.5 parent: 853 type: Transform @@ -24962,9 +25498,10 @@ entities: - canCollide: False type: Physics - uid: 2547 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,6.5 parent: 853 type: Transform @@ -24973,9 +25510,10 @@ entities: - canCollide: False type: Physics - uid: 2548 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,13.5 parent: 853 type: Transform @@ -24984,27 +25522,30 @@ entities: - canCollide: False type: Physics - uid: 2549 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2550 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2551 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,9.5 parent: 853 type: Transform @@ -25013,9 +25554,10 @@ entities: - canCollide: False type: Physics - uid: 2552 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,8.5 parent: 853 type: Transform @@ -25024,9 +25566,10 @@ entities: - canCollide: False type: Physics - uid: 2553 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,7.5 parent: 853 type: Transform @@ -25035,18 +25578,18 @@ entities: - uid: 2554 type: SalternApc components: - - rot: 4.371139006309477E-08 rad - pos: -16.302551,15.5 + - anchored: True + rot: 4.371139006309477E-08 rad + pos: -16.5,15.5 parent: 853 type: Transform - startingCharge: 11999.833 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2555 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,15.5 parent: 853 type: Transform @@ -25055,18 +25598,20 @@ entities: - canCollide: False type: Physics - uid: 2556 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,15.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2557 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,16.5 parent: 853 type: Transform @@ -25075,9 +25620,10 @@ entities: - canCollide: False type: Physics - uid: 2558 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,17.5 parent: 853 type: Transform @@ -25086,9 +25632,10 @@ entities: - canCollide: False type: Physics - uid: 2559 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,18.5 parent: 853 type: Transform @@ -25097,9 +25644,10 @@ entities: - canCollide: False type: Physics - uid: 2560 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,19.5 parent: 853 type: Transform @@ -25108,9 +25656,10 @@ entities: - canCollide: False type: Physics - uid: 2561 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,20.5 parent: 853 type: Transform @@ -25119,9 +25668,10 @@ entities: - canCollide: False type: Physics - uid: 2562 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,21.5 parent: 853 type: Transform @@ -25130,9 +25680,10 @@ entities: - canCollide: False type: Physics - uid: 2563 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,22.5 parent: 853 type: Transform @@ -25141,9 +25692,10 @@ entities: - canCollide: False type: Physics - uid: 2564 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,23.5 parent: 853 type: Transform @@ -25152,9 +25704,10 @@ entities: - canCollide: False type: Physics - uid: 2565 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,24.5 parent: 853 type: Transform @@ -25163,9 +25716,10 @@ entities: - canCollide: False type: Physics - uid: 2566 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,24.5 parent: 853 type: Transform @@ -25174,9 +25728,10 @@ entities: - canCollide: False type: Physics - uid: 2567 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,24.5 parent: 853 type: Transform @@ -25185,9 +25740,10 @@ entities: - canCollide: False type: Physics - uid: 2568 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,24.5 parent: 853 type: Transform @@ -25196,9 +25752,10 @@ entities: - canCollide: False type: Physics - uid: 2569 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,24.5 parent: 853 type: Transform @@ -25207,9 +25764,10 @@ entities: - canCollide: False type: Physics - uid: 2570 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,24.5 parent: 853 type: Transform @@ -25218,9 +25776,10 @@ entities: - canCollide: False type: Physics - uid: 2571 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,24.5 parent: 853 type: Transform @@ -25229,9 +25788,10 @@ entities: - canCollide: False type: Physics - uid: 2572 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,24.5 parent: 853 type: Transform @@ -25240,9 +25800,10 @@ entities: - canCollide: False type: Physics - uid: 2573 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,24.5 parent: 853 type: Transform @@ -25251,9 +25812,10 @@ entities: - canCollide: False type: Physics - uid: 2574 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,24.5 parent: 853 type: Transform @@ -25262,27 +25824,30 @@ entities: - canCollide: False type: Physics - uid: 2575 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2576 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2577 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,11.5 parent: 853 type: Transform @@ -25291,9 +25856,10 @@ entities: - canCollide: False type: Physics - uid: 2578 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,11.5 parent: 853 type: Transform @@ -25302,9 +25868,10 @@ entities: - canCollide: False type: Physics - uid: 2579 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,10.5 parent: 853 type: Transform @@ -25313,9 +25880,10 @@ entities: - canCollide: False type: Physics - uid: 2580 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,9.5 parent: 853 type: Transform @@ -25324,9 +25892,10 @@ entities: - canCollide: False type: Physics - uid: 2581 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,7.5 parent: 853 type: Transform @@ -25335,9 +25904,10 @@ entities: - canCollide: False type: Physics - uid: 2582 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,8.5 parent: 853 type: Transform @@ -25346,9 +25916,10 @@ entities: - canCollide: False type: Physics - uid: 2583 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,7.5 parent: 853 type: Transform @@ -25357,9 +25928,10 @@ entities: - canCollide: False type: Physics - uid: 2584 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,10.5 parent: 853 type: Transform @@ -25368,9 +25940,10 @@ entities: - canCollide: False type: Physics - uid: 2585 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,10.5 parent: 853 type: Transform @@ -25379,9 +25952,10 @@ entities: - canCollide: False type: Physics - uid: 2586 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,10.5 parent: 853 type: Transform @@ -25390,9 +25964,10 @@ entities: - canCollide: False type: Physics - uid: 2587 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,10.5 parent: 853 type: Transform @@ -25401,9 +25976,10 @@ entities: - canCollide: False type: Physics - uid: 2588 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,10.5 parent: 853 type: Transform @@ -25412,9 +25988,10 @@ entities: - canCollide: False type: Physics - uid: 2589 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,10.5 parent: 853 type: Transform @@ -25423,9 +26000,10 @@ entities: - canCollide: False type: Physics - uid: 2590 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,10.5 parent: 853 type: Transform @@ -25434,9 +26012,10 @@ entities: - canCollide: False type: Physics - uid: 2591 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,10.5 parent: 853 type: Transform @@ -25445,9 +26024,10 @@ entities: - canCollide: False type: Physics - uid: 2592 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,10.5 parent: 853 type: Transform @@ -25456,9 +26036,10 @@ entities: - canCollide: False type: Physics - uid: 2593 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,10.5 parent: 853 type: Transform @@ -25467,9 +26048,10 @@ entities: - canCollide: False type: Physics - uid: 2594 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,10.5 parent: 853 type: Transform @@ -25478,9 +26060,10 @@ entities: - canCollide: False type: Physics - uid: 2595 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,10.5 parent: 853 type: Transform @@ -25489,9 +26072,10 @@ entities: - canCollide: False type: Physics - uid: 2596 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,10.5 parent: 853 type: Transform @@ -25500,9 +26084,10 @@ entities: - canCollide: False type: Physics - uid: 2597 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,9.5 parent: 853 type: Transform @@ -25511,9 +26096,10 @@ entities: - canCollide: False type: Physics - uid: 2598 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,8.5 parent: 853 type: Transform @@ -25522,9 +26108,10 @@ entities: - canCollide: False type: Physics - uid: 2599 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,7.5 parent: 853 type: Transform @@ -25533,9 +26120,10 @@ entities: - canCollide: False type: Physics - uid: 2600 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,9.5 parent: 853 type: Transform @@ -25544,9 +26132,10 @@ entities: - canCollide: False type: Physics - uid: 2601 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,8.5 parent: 853 type: Transform @@ -25555,9 +26144,10 @@ entities: - canCollide: False type: Physics - uid: 2602 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,7.5 parent: 853 type: Transform @@ -25566,45 +26156,50 @@ entities: - canCollide: False type: Physics - uid: 2603 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2604 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2605 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2606 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,15.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2607 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,16.5 parent: 853 type: Transform @@ -25613,9 +26208,10 @@ entities: - canCollide: False type: Physics - uid: 2608 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,17.5 parent: 853 type: Transform @@ -25624,9 +26220,10 @@ entities: - canCollide: False type: Physics - uid: 2609 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,18.5 parent: 853 type: Transform @@ -25635,9 +26232,10 @@ entities: - canCollide: False type: Physics - uid: 2610 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,18.5 parent: 853 type: Transform @@ -25646,9 +26244,10 @@ entities: - canCollide: False type: Physics - uid: 2611 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,18.5 parent: 853 type: Transform @@ -25657,9 +26256,10 @@ entities: - canCollide: False type: Physics - uid: 2612 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,18.5 parent: 853 type: Transform @@ -25668,18 +26268,20 @@ entities: - canCollide: False type: Physics - uid: 2613 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,15.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2614 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,14.5 parent: 853 type: Transform @@ -25688,9 +26290,10 @@ entities: - canCollide: False type: Physics - uid: 2615 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,14.5 parent: 853 type: Transform @@ -25699,9 +26302,10 @@ entities: - canCollide: False type: Physics - uid: 2616 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,14.5 parent: 853 type: Transform @@ -25710,9 +26314,10 @@ entities: - canCollide: False type: Physics - uid: 2617 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,14.5 parent: 853 type: Transform @@ -25721,9 +26326,10 @@ entities: - canCollide: False type: Physics - uid: 2618 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,14.5 parent: 853 type: Transform @@ -25732,9 +26338,10 @@ entities: - canCollide: False type: Physics - uid: 2619 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,14.5 parent: 853 type: Transform @@ -25743,9 +26350,10 @@ entities: - canCollide: False type: Physics - uid: 2620 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,14.5 parent: 853 type: Transform @@ -25754,18 +26362,20 @@ entities: - canCollide: False type: Physics - uid: 2621 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2622 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,14.5 parent: 853 type: Transform @@ -25774,9 +26384,10 @@ entities: - canCollide: False type: Physics - uid: 2623 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,14.5 parent: 853 type: Transform @@ -25785,9 +26396,10 @@ entities: - canCollide: False type: Physics - uid: 2624 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,15.5 parent: 853 type: Transform @@ -25796,9 +26408,10 @@ entities: - canCollide: False type: Physics - uid: 2625 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,16.5 parent: 853 type: Transform @@ -25807,9 +26420,10 @@ entities: - canCollide: False type: Physics - uid: 2626 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,15.5 parent: 853 type: Transform @@ -25818,9 +26432,10 @@ entities: - canCollide: False type: Physics - uid: 2627 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,16.5 parent: 853 type: Transform @@ -25829,9 +26444,10 @@ entities: - canCollide: False type: Physics - uid: 2628 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,17.5 parent: 853 type: Transform @@ -25840,9 +26456,10 @@ entities: - canCollide: False type: Physics - uid: 2629 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,17.5 parent: 853 type: Transform @@ -25851,9 +26468,10 @@ entities: - canCollide: False type: Physics - uid: 2630 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,17.5 parent: 853 type: Transform @@ -25862,9 +26480,10 @@ entities: - canCollide: False type: Physics - uid: 2631 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,18.5 parent: 853 type: Transform @@ -25873,9 +26492,10 @@ entities: - canCollide: False type: Physics - uid: 2632 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,19.5 parent: 853 type: Transform @@ -25884,9 +26504,10 @@ entities: - canCollide: False type: Physics - uid: 2633 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,20.5 parent: 853 type: Transform @@ -25895,9 +26516,10 @@ entities: - canCollide: False type: Physics - uid: 2634 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,20.5 parent: 853 type: Transform @@ -25906,9 +26528,10 @@ entities: - canCollide: False type: Physics - uid: 2635 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,21.5 parent: 853 type: Transform @@ -25917,9 +26540,10 @@ entities: - canCollide: False type: Physics - uid: 2636 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,21.5 parent: 853 type: Transform @@ -25928,9 +26552,10 @@ entities: - canCollide: False type: Physics - uid: 2637 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,17.5 parent: 853 type: Transform @@ -25939,9 +26564,10 @@ entities: - canCollide: False type: Physics - uid: 2638 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,18.5 parent: 853 type: Transform @@ -25950,9 +26576,10 @@ entities: - canCollide: False type: Physics - uid: 2639 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,19.5 parent: 853 type: Transform @@ -25961,9 +26588,10 @@ entities: - canCollide: False type: Physics - uid: 2640 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,20.5 parent: 853 type: Transform @@ -25972,9 +26600,10 @@ entities: - canCollide: False type: Physics - uid: 2641 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,20.5 parent: 853 type: Transform @@ -25983,9 +26612,10 @@ entities: - canCollide: False type: Physics - uid: 2642 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,20.5 parent: 853 type: Transform @@ -25994,9 +26624,10 @@ entities: - canCollide: False type: Physics - uid: 2643 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,14.5 parent: 853 type: Transform @@ -26005,9 +26636,10 @@ entities: - canCollide: False type: Physics - uid: 2644 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,14.5 parent: 853 type: Transform @@ -26016,9 +26648,10 @@ entities: - canCollide: False type: Physics - uid: 2645 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,14.5 parent: 853 type: Transform @@ -26027,9 +26660,10 @@ entities: - canCollide: False type: Physics - uid: 2646 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,14.5 parent: 853 type: Transform @@ -26038,9 +26672,10 @@ entities: - canCollide: False type: Physics - uid: 2647 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,14.5 parent: 853 type: Transform @@ -26049,18 +26684,20 @@ entities: - canCollide: False type: Physics - uid: 2648 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 1.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2649 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,13.5 parent: 853 type: Transform @@ -26069,9 +26706,10 @@ entities: - canCollide: False type: Physics - uid: 2650 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,12.5 parent: 853 type: Transform @@ -26080,18 +26718,20 @@ entities: - canCollide: False type: Physics - uid: 2651 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -39.5,11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2652 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -39.5,10.5 parent: 853 type: Transform @@ -26100,9 +26740,10 @@ entities: - canCollide: False type: Physics - uid: 2653 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -38.5,10.5 parent: 853 type: Transform @@ -26111,9 +26752,10 @@ entities: - canCollide: False type: Physics - uid: 2654 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -37.5,10.5 parent: 853 type: Transform @@ -26122,9 +26764,10 @@ entities: - canCollide: False type: Physics - uid: 2655 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,10.5 parent: 853 type: Transform @@ -26133,9 +26776,10 @@ entities: - canCollide: False type: Physics - uid: 2656 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,9.5 parent: 853 type: Transform @@ -26144,9 +26788,10 @@ entities: - canCollide: False type: Physics - uid: 2657 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,8.5 parent: 853 type: Transform @@ -26155,9 +26800,10 @@ entities: - canCollide: False type: Physics - uid: 2658 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,7.5 parent: 853 type: Transform @@ -26166,9 +26812,10 @@ entities: - canCollide: False type: Physics - uid: 2659 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,6.5 parent: 853 type: Transform @@ -26177,9 +26824,10 @@ entities: - canCollide: False type: Physics - uid: 2660 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,5.5 parent: 853 type: Transform @@ -26188,9 +26836,10 @@ entities: - canCollide: False type: Physics - uid: 2661 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,4.5 parent: 853 type: Transform @@ -26199,9 +26848,10 @@ entities: - canCollide: False type: Physics - uid: 2662 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,3.5 parent: 853 type: Transform @@ -26210,9 +26860,10 @@ entities: - canCollide: False type: Physics - uid: 2663 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,2.5 parent: 853 type: Transform @@ -26221,9 +26872,10 @@ entities: - canCollide: False type: Physics - uid: 2664 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,1.5 parent: 853 type: Transform @@ -26232,9 +26884,10 @@ entities: - canCollide: False type: Physics - uid: 2665 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,0.5 parent: 853 type: Transform @@ -26243,9 +26896,10 @@ entities: - canCollide: False type: Physics - uid: 2666 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,-0.5 parent: 853 type: Transform @@ -26254,9 +26908,10 @@ entities: - canCollide: False type: Physics - uid: 2667 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,-1.5 parent: 853 type: Transform @@ -26265,9 +26920,10 @@ entities: - canCollide: False type: Physics - uid: 2668 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,-2.5 parent: 853 type: Transform @@ -26276,9 +26932,10 @@ entities: - canCollide: False type: Physics - uid: 2669 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,-3.5 parent: 853 type: Transform @@ -26287,9 +26944,10 @@ entities: - canCollide: False type: Physics - uid: 2670 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,-4.5 parent: 853 type: Transform @@ -26298,9 +26956,10 @@ entities: - canCollide: False type: Physics - uid: 2671 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,-5.5 parent: 853 type: Transform @@ -26309,9 +26968,10 @@ entities: - canCollide: False type: Physics - uid: 2672 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,-6.5 parent: 853 type: Transform @@ -26320,9 +26980,10 @@ entities: - canCollide: False type: Physics - uid: 2673 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -35.5,-6.5 parent: 853 type: Transform @@ -26331,9 +26992,10 @@ entities: - canCollide: False type: Physics - uid: 2674 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -35.5,2.5 parent: 853 type: Transform @@ -26342,9 +27004,10 @@ entities: - canCollide: False type: Physics - uid: 2675 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -35.5,5.5 parent: 853 type: Transform @@ -26353,9 +27016,10 @@ entities: - canCollide: False type: Physics - uid: 2676 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -34.5,5.5 parent: 853 type: Transform @@ -26364,9 +27028,10 @@ entities: - canCollide: False type: Physics - uid: 2677 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,5.5 parent: 853 type: Transform @@ -26375,9 +27040,10 @@ entities: - canCollide: False type: Physics - uid: 2678 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,5.5 parent: 853 type: Transform @@ -26386,9 +27052,10 @@ entities: - canCollide: False type: Physics - uid: 2679 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -35.5,8.5 parent: 853 type: Transform @@ -26397,9 +27064,10 @@ entities: - canCollide: False type: Physics - uid: 2680 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -34.5,8.5 parent: 853 type: Transform @@ -26408,9 +27076,10 @@ entities: - canCollide: False type: Physics - uid: 2681 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -37.5,8.5 parent: 853 type: Transform @@ -26419,9 +27088,10 @@ entities: - canCollide: False type: Physics - uid: 2682 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -38.5,8.5 parent: 853 type: Transform @@ -26430,9 +27100,10 @@ entities: - canCollide: False type: Physics - uid: 2683 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -39.5,8.5 parent: 853 type: Transform @@ -26441,9 +27112,10 @@ entities: - canCollide: False type: Physics - uid: 2684 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -40.5,8.5 parent: 853 type: Transform @@ -26452,9 +27124,10 @@ entities: - canCollide: False type: Physics - uid: 2685 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -37.5,4.5 parent: 853 type: Transform @@ -26463,9 +27136,10 @@ entities: - canCollide: False type: Physics - uid: 2686 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -38.5,4.5 parent: 853 type: Transform @@ -26474,9 +27148,10 @@ entities: - canCollide: False type: Physics - uid: 2687 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -39.5,4.5 parent: 853 type: Transform @@ -26485,9 +27160,10 @@ entities: - canCollide: False type: Physics - uid: 2688 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -40.5,4.5 parent: 853 type: Transform @@ -26496,9 +27172,10 @@ entities: - canCollide: False type: Physics - uid: 2689 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -37.5,-3.5 parent: 853 type: Transform @@ -26507,9 +27184,10 @@ entities: - canCollide: False type: Physics - uid: 2690 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -38.5,-3.5 parent: 853 type: Transform @@ -26518,45 +27196,50 @@ entities: - canCollide: False type: Physics - uid: 2691 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2692 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2693 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2694 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-3.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2695 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-4.5 parent: 853 type: Transform @@ -26565,9 +27248,10 @@ entities: - canCollide: False type: Physics - uid: 2696 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-5.5 parent: 853 type: Transform @@ -26576,18 +27260,20 @@ entities: - canCollide: False type: Physics - uid: 2697 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2698 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-7.5 parent: 853 type: Transform @@ -26596,9 +27282,10 @@ entities: - canCollide: False type: Physics - uid: 2699 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,-7.5 parent: 853 type: Transform @@ -26607,9 +27294,10 @@ entities: - canCollide: False type: Physics - uid: 2700 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,-7.5 parent: 853 type: Transform @@ -26618,9 +27306,10 @@ entities: - canCollide: False type: Physics - uid: 2701 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,-7.5 parent: 853 type: Transform @@ -26629,9 +27318,10 @@ entities: - canCollide: False type: Physics - uid: 2702 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,-7.5 parent: 853 type: Transform @@ -26640,9 +27330,10 @@ entities: - canCollide: False type: Physics - uid: 2703 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -25.5,-7.5 parent: 853 type: Transform @@ -26651,9 +27342,10 @@ entities: - canCollide: False type: Physics - uid: 2704 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -25.5,-8.5 parent: 853 type: Transform @@ -26662,9 +27354,10 @@ entities: - canCollide: False type: Physics - uid: 2705 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -24.5,-7.5 parent: 853 type: Transform @@ -26673,9 +27366,10 @@ entities: - canCollide: False type: Physics - uid: 2706 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,-7.5 parent: 853 type: Transform @@ -26684,9 +27378,10 @@ entities: - canCollide: False type: Physics - uid: 2707 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,-8.5 parent: 853 type: Transform @@ -26695,9 +27390,10 @@ entities: - canCollide: False type: Physics - uid: 2708 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-7.5 parent: 853 type: Transform @@ -26706,9 +27402,10 @@ entities: - canCollide: False type: Physics - uid: 2709 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-2.5 parent: 853 type: Transform @@ -26717,9 +27414,10 @@ entities: - canCollide: False type: Physics - uid: 2710 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-1.5 parent: 853 type: Transform @@ -26728,18 +27426,20 @@ entities: - canCollide: False type: Physics - uid: 2711 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2712 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,0.5 parent: 853 type: Transform @@ -26748,9 +27448,10 @@ entities: - canCollide: False type: Physics - uid: 2713 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,1.5 parent: 853 type: Transform @@ -26759,9 +27460,10 @@ entities: - canCollide: False type: Physics - uid: 2714 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,0.5 parent: 853 type: Transform @@ -26770,9 +27472,10 @@ entities: - canCollide: False type: Physics - uid: 2715 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,0.5 parent: 853 type: Transform @@ -26781,9 +27484,10 @@ entities: - canCollide: False type: Physics - uid: 2716 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,0.5 parent: 853 type: Transform @@ -26792,18 +27496,20 @@ entities: - canCollide: False type: Physics - uid: 2717 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,-0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2718 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,-1.5 parent: 853 type: Transform @@ -26819,9 +27525,10 @@ entities: parent: 853 type: Transform - uid: 2720 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -31.5,-6.5 parent: 853 type: Transform @@ -26830,18 +27537,20 @@ entities: - canCollide: False type: Physics - uid: 2721 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2722 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-5.5 parent: 853 type: Transform @@ -26850,9 +27559,10 @@ entities: - canCollide: False type: Physics - uid: 2723 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-4.5 parent: 853 type: Transform @@ -26861,9 +27571,10 @@ entities: - canCollide: False type: Physics - uid: 2724 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-3.5 parent: 853 type: Transform @@ -26872,9 +27583,10 @@ entities: - canCollide: False type: Physics - uid: 2725 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-2.5 parent: 853 type: Transform @@ -26883,9 +27595,10 @@ entities: - canCollide: False type: Physics - uid: 2726 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-1.5 parent: 853 type: Transform @@ -26894,9 +27607,10 @@ entities: - canCollide: False type: Physics - uid: 2727 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-0.5 parent: 853 type: Transform @@ -26905,36 +27619,40 @@ entities: - canCollide: False type: Physics - uid: 2728 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2729 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2730 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2731 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-13.5 parent: 853 type: Transform @@ -26943,9 +27661,10 @@ entities: - canCollide: False type: Physics - uid: 2732 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-14.5 parent: 853 type: Transform @@ -26954,9 +27673,10 @@ entities: - canCollide: False type: Physics - uid: 2733 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,-14.5 parent: 853 type: Transform @@ -26965,9 +27685,10 @@ entities: - canCollide: False type: Physics - uid: 2734 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-14.5 parent: 853 type: Transform @@ -26976,9 +27697,10 @@ entities: - canCollide: False type: Physics - uid: 2735 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-14.5 parent: 853 type: Transform @@ -26987,9 +27709,10 @@ entities: - canCollide: False type: Physics - uid: 2736 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,-14.5 parent: 853 type: Transform @@ -26998,9 +27721,10 @@ entities: - canCollide: False type: Physics - uid: 2737 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -24.5,-14.5 parent: 853 type: Transform @@ -27009,9 +27733,10 @@ entities: - canCollide: False type: Physics - uid: 2738 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -24.5,-13.5 parent: 853 type: Transform @@ -27020,9 +27745,10 @@ entities: - canCollide: False type: Physics - uid: 2739 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-8.5 parent: 853 type: Transform @@ -27031,9 +27757,10 @@ entities: - canCollide: False type: Physics - uid: 2740 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-9.5 parent: 853 type: Transform @@ -27042,9 +27769,10 @@ entities: - canCollide: False type: Physics - uid: 2741 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-10.5 parent: 853 type: Transform @@ -27053,9 +27781,10 @@ entities: - canCollide: False type: Physics - uid: 2742 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-10.5 parent: 853 type: Transform @@ -27063,21 +27792,11 @@ entities: type: Sprite - canCollide: False type: Physics -- uid: 2743 - type: ApcExtensionCable - components: - - rot: 4.371139006309477E-08 rad - pos: -14.5,-11.5 - parent: 853 - type: Transform - - visible: False - type: Sprite - - canCollide: False - type: Physics - uid: 2744 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,-11.5 parent: 853 type: Transform @@ -27086,9 +27805,10 @@ entities: - canCollide: False type: Physics - uid: 2745 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-11.5 parent: 853 type: Transform @@ -27097,9 +27817,10 @@ entities: - canCollide: False type: Physics - uid: 2746 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-11.5 parent: 853 type: Transform @@ -27108,9 +27829,10 @@ entities: - canCollide: False type: Physics - uid: 2747 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-10.5 parent: 853 type: Transform @@ -27119,9 +27841,10 @@ entities: - canCollide: False type: Physics - uid: 2748 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-9.5 parent: 853 type: Transform @@ -27130,9 +27853,10 @@ entities: - canCollide: False type: Physics - uid: 2749 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,-12.5 parent: 853 type: Transform @@ -27141,9 +27865,10 @@ entities: - canCollide: False type: Physics - uid: 2750 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-8.5 parent: 853 type: Transform @@ -27152,9 +27877,10 @@ entities: - canCollide: False type: Physics - uid: 2751 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-7.5 parent: 853 type: Transform @@ -27163,9 +27889,10 @@ entities: - canCollide: False type: Physics - uid: 2752 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-7.5 parent: 853 type: Transform @@ -27174,9 +27901,10 @@ entities: - canCollide: False type: Physics - uid: 2753 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-7.5 parent: 853 type: Transform @@ -27185,9 +27913,10 @@ entities: - canCollide: False type: Physics - uid: 2754 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,-7.5 parent: 853 type: Transform @@ -27196,9 +27925,10 @@ entities: - canCollide: False type: Physics - uid: 2755 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-7.5 parent: 853 type: Transform @@ -27207,9 +27937,10 @@ entities: - canCollide: False type: Physics - uid: 2756 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -19.5,-7.5 parent: 853 type: Transform @@ -27218,9 +27949,10 @@ entities: - canCollide: False type: Physics - uid: 2757 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-7.5 parent: 853 type: Transform @@ -27229,18 +27961,20 @@ entities: - canCollide: False type: Physics - uid: 2758 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2759 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-5.5 parent: 853 type: Transform @@ -27249,9 +27983,10 @@ entities: - canCollide: False type: Physics - uid: 2760 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-4.5 parent: 853 type: Transform @@ -27260,9 +27995,10 @@ entities: - canCollide: False type: Physics - uid: 2761 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -19.5,-4.5 parent: 853 type: Transform @@ -27271,9 +28007,10 @@ entities: - canCollide: False type: Physics - uid: 2762 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-4.5 parent: 853 type: Transform @@ -27282,9 +28019,10 @@ entities: - canCollide: False type: Physics - uid: 2763 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,-4.5 parent: 853 type: Transform @@ -27293,9 +28031,10 @@ entities: - canCollide: False type: Physics - uid: 2764 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-4.5 parent: 853 type: Transform @@ -27304,9 +28043,10 @@ entities: - canCollide: False type: Physics - uid: 2765 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-3.5 parent: 853 type: Transform @@ -27315,9 +28055,10 @@ entities: - canCollide: False type: Physics - uid: 2766 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-2.5 parent: 853 type: Transform @@ -27326,9 +28067,10 @@ entities: - canCollide: False type: Physics - uid: 2767 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-2.5 parent: 853 type: Transform @@ -27337,9 +28079,10 @@ entities: - canCollide: False type: Physics - uid: 2768 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-1.5 parent: 853 type: Transform @@ -27348,9 +28091,10 @@ entities: - canCollide: False type: Physics - uid: 2769 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-0.5 parent: 853 type: Transform @@ -27359,9 +28103,10 @@ entities: - canCollide: False type: Physics - uid: 2770 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,0.5 parent: 853 type: Transform @@ -27370,18 +28115,20 @@ entities: - canCollide: False type: Physics - uid: 2771 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2772 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -23.5,0.5 + - anchored: True + pos: -23.5,0.5 parent: 853 type: Transform - visible: False @@ -27389,45 +28136,50 @@ entities: - canCollide: False type: Physics - uid: 2773 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2774 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-5.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2775 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2776 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2777 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,1.5 parent: 853 type: Transform @@ -27436,9 +28188,10 @@ entities: - canCollide: False type: Physics - uid: 2778 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,0.5 parent: 853 type: Transform @@ -27447,9 +28200,10 @@ entities: - canCollide: False type: Physics - uid: 2779 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-0.5 parent: 853 type: Transform @@ -27458,9 +28212,10 @@ entities: - canCollide: False type: Physics - uid: 2780 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-1.5 parent: 853 type: Transform @@ -27469,18 +28224,20 @@ entities: - canCollide: False type: Physics - uid: 2781 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2782 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-3.5 parent: 853 type: Transform @@ -27489,9 +28246,10 @@ entities: - canCollide: False type: Physics - uid: 2783 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-4.5 parent: 853 type: Transform @@ -27500,9 +28258,10 @@ entities: - canCollide: False type: Physics - uid: 2784 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-4.5 parent: 853 type: Transform @@ -27511,9 +28270,10 @@ entities: - canCollide: False type: Physics - uid: 2785 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,0.5 parent: 853 type: Transform @@ -27522,9 +28282,10 @@ entities: - canCollide: False type: Physics - uid: 2786 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,0.5 parent: 853 type: Transform @@ -27533,9 +28294,10 @@ entities: - canCollide: False type: Physics - uid: 2787 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,0.5 parent: 853 type: Transform @@ -27544,9 +28306,10 @@ entities: - canCollide: False type: Physics - uid: 2788 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,0.5 parent: 853 type: Transform @@ -27557,18 +28320,18 @@ entities: - uid: 2789 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-9.5 parent: 853 type: Transform - startingCharge: 11999.45 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 2790 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,0.5 parent: 853 type: Transform @@ -27577,9 +28340,10 @@ entities: - canCollide: False type: Physics - uid: 2791 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,0.5 parent: 853 type: Transform @@ -27588,9 +28352,10 @@ entities: - canCollide: False type: Physics - uid: 2792 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,0.5 parent: 853 type: Transform @@ -27599,9 +28364,10 @@ entities: - canCollide: False type: Physics - uid: 2793 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,0.5 parent: 853 type: Transform @@ -27610,9 +28376,10 @@ entities: - canCollide: False type: Physics - uid: 2794 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -19.5,0.5 parent: 853 type: Transform @@ -27621,9 +28388,10 @@ entities: - canCollide: False type: Physics - uid: 2795 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,0.5 parent: 853 type: Transform @@ -27632,9 +28400,10 @@ entities: - canCollide: False type: Physics - uid: 2796 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,1.5 parent: 853 type: Transform @@ -27643,9 +28412,10 @@ entities: - canCollide: False type: Physics - uid: 2797 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-0.5 parent: 853 type: Transform @@ -27654,9 +28424,10 @@ entities: - canCollide: False type: Physics - uid: 2798 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-1.5 parent: 853 type: Transform @@ -27665,9 +28436,10 @@ entities: - canCollide: False type: Physics - uid: 2799 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-1.5 parent: 853 type: Transform @@ -27676,9 +28448,10 @@ entities: - canCollide: False type: Physics - uid: 2800 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-1.5 parent: 853 type: Transform @@ -27687,9 +28460,10 @@ entities: - canCollide: False type: Physics - uid: 2801 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,-1.5 parent: 853 type: Transform @@ -27698,9 +28472,10 @@ entities: - canCollide: False type: Physics - uid: 2802 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-0.5 parent: 853 type: Transform @@ -27709,9 +28484,10 @@ entities: - canCollide: False type: Physics - uid: 2803 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-0.5 parent: 853 type: Transform @@ -27720,9 +28496,10 @@ entities: - canCollide: False type: Physics - uid: 2804 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-1.5 parent: 853 type: Transform @@ -27731,9 +28508,10 @@ entities: - canCollide: False type: Physics - uid: 2805 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-2.5 parent: 853 type: Transform @@ -27742,9 +28520,10 @@ entities: - canCollide: False type: Physics - uid: 2806 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,0.5 parent: 853 type: Transform @@ -27753,9 +28532,10 @@ entities: - canCollide: False type: Physics - uid: 2807 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,0.5 parent: 853 type: Transform @@ -27764,9 +28544,10 @@ entities: - canCollide: False type: Physics - uid: 2808 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,0.5 parent: 853 type: Transform @@ -27775,9 +28556,10 @@ entities: - canCollide: False type: Physics - uid: 2809 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,0.5 parent: 853 type: Transform @@ -27786,9 +28568,10 @@ entities: - canCollide: False type: Physics - uid: 2810 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,0.5 parent: 853 type: Transform @@ -27797,9 +28580,10 @@ entities: - canCollide: False type: Physics - uid: 2811 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,0.5 parent: 853 type: Transform @@ -27808,9 +28592,10 @@ entities: - canCollide: False type: Physics - uid: 2812 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,0.5 parent: 853 type: Transform @@ -27819,9 +28604,10 @@ entities: - canCollide: False type: Physics - uid: 2813 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,0.5 parent: 853 type: Transform @@ -27830,9 +28616,10 @@ entities: - canCollide: False type: Physics - uid: 2814 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,0.5 parent: 853 type: Transform @@ -27841,9 +28628,10 @@ entities: - canCollide: False type: Physics - uid: 2815 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,0.5 parent: 853 type: Transform @@ -27852,9 +28640,10 @@ entities: - canCollide: False type: Physics - uid: 2816 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,0.5 parent: 853 type: Transform @@ -27863,9 +28652,10 @@ entities: - canCollide: False type: Physics - uid: 2817 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,0.5 parent: 853 type: Transform @@ -27874,9 +28664,10 @@ entities: - canCollide: False type: Physics - uid: 2818 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,0.5 parent: 853 type: Transform @@ -27885,9 +28676,10 @@ entities: - canCollide: False type: Physics - uid: 2819 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-0.5 parent: 853 type: Transform @@ -27896,9 +28688,10 @@ entities: - canCollide: False type: Physics - uid: 2820 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-1.5 parent: 853 type: Transform @@ -27907,9 +28700,10 @@ entities: - canCollide: False type: Physics - uid: 2821 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-2.5 parent: 853 type: Transform @@ -27918,9 +28712,10 @@ entities: - canCollide: False type: Physics - uid: 2822 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-3.5 parent: 853 type: Transform @@ -27929,9 +28724,10 @@ entities: - canCollide: False type: Physics - uid: 2823 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-4.5 parent: 853 type: Transform @@ -27940,9 +28736,10 @@ entities: - canCollide: False type: Physics - uid: 2824 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-4.5 parent: 853 type: Transform @@ -27951,18 +28748,20 @@ entities: - canCollide: False type: Physics - uid: 2825 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2826 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-7.5 parent: 853 type: Transform @@ -27971,9 +28770,10 @@ entities: - canCollide: False type: Physics - uid: 2827 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-7.5 parent: 853 type: Transform @@ -27982,9 +28782,10 @@ entities: - canCollide: False type: Physics - uid: 2828 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-7.5 parent: 853 type: Transform @@ -27993,9 +28794,10 @@ entities: - canCollide: False type: Physics - uid: 2829 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-7.5 parent: 853 type: Transform @@ -28004,9 +28806,10 @@ entities: - canCollide: False type: Physics - uid: 2830 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-7.5 parent: 853 type: Transform @@ -28015,9 +28818,10 @@ entities: - canCollide: False type: Physics - uid: 2831 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-7.5 parent: 853 type: Transform @@ -28026,9 +28830,10 @@ entities: - canCollide: False type: Physics - uid: 2832 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-6.5 parent: 853 type: Transform @@ -28037,9 +28842,10 @@ entities: - canCollide: False type: Physics - uid: 2833 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-5.5 parent: 853 type: Transform @@ -28048,9 +28854,10 @@ entities: - canCollide: False type: Physics - uid: 2834 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-4.5 parent: 853 type: Transform @@ -28059,9 +28866,10 @@ entities: - canCollide: False type: Physics - uid: 2835 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-9.5 parent: 853 type: Transform @@ -28070,126 +28878,140 @@ entities: - canCollide: False type: Physics - uid: 2836 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2837 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2838 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2839 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2840 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2841 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2842 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2843 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2844 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2845 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2846 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2847 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2848 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2849 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-19.5 parent: 853 type: Transform @@ -28198,9 +29020,10 @@ entities: - canCollide: False type: Physics - uid: 2850 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-20.5 parent: 853 type: Transform @@ -28209,9 +29032,10 @@ entities: - canCollide: False type: Physics - uid: 2851 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-19.5 parent: 853 type: Transform @@ -28220,9 +29044,10 @@ entities: - canCollide: False type: Physics - uid: 2852 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,-19.5 parent: 853 type: Transform @@ -28231,9 +29056,10 @@ entities: - canCollide: False type: Physics - uid: 2853 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-19.5 parent: 853 type: Transform @@ -28242,9 +29068,10 @@ entities: - canCollide: False type: Physics - uid: 2854 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-19.5 parent: 853 type: Transform @@ -28253,9 +29080,10 @@ entities: - canCollide: False type: Physics - uid: 2855 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-20.5 parent: 853 type: Transform @@ -28264,9 +29092,10 @@ entities: - canCollide: False type: Physics - uid: 2856 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-21.5 parent: 853 type: Transform @@ -28275,9 +29104,10 @@ entities: - canCollide: False type: Physics - uid: 2857 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-23.5 parent: 853 type: Transform @@ -28286,9 +29116,10 @@ entities: - canCollide: False type: Physics - uid: 2858 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-22.5 parent: 853 type: Transform @@ -28297,9 +29128,10 @@ entities: - canCollide: False type: Physics - uid: 2859 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,-23.5 parent: 853 type: Transform @@ -28308,18 +29140,20 @@ entities: - canCollide: False type: Physics - uid: 2860 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2861 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-22.5 parent: 853 type: Transform @@ -28328,9 +29162,10 @@ entities: - canCollide: False type: Physics - uid: 2862 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-23.5 parent: 853 type: Transform @@ -28339,9 +29174,10 @@ entities: - canCollide: False type: Physics - uid: 2863 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,-23.5 parent: 853 type: Transform @@ -28350,9 +29186,10 @@ entities: - canCollide: False type: Physics - uid: 2864 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-23.5 parent: 853 type: Transform @@ -28361,18 +29198,20 @@ entities: - canCollide: False type: Physics - uid: 2865 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2866 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-25.5 parent: 853 type: Transform @@ -28381,9 +29220,10 @@ entities: - canCollide: False type: Physics - uid: 2867 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-20.5 parent: 853 type: Transform @@ -28392,9 +29232,10 @@ entities: - canCollide: False type: Physics - uid: 2868 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,-20.5 parent: 853 type: Transform @@ -28403,9 +29244,10 @@ entities: - canCollide: False type: Physics - uid: 2869 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-20.5 parent: 853 type: Transform @@ -28414,9 +29256,10 @@ entities: - canCollide: False type: Physics - uid: 2870 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-19.5 parent: 853 type: Transform @@ -28425,9 +29268,10 @@ entities: - canCollide: False type: Physics - uid: 2871 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-19.5 parent: 853 type: Transform @@ -28436,9 +29280,10 @@ entities: - canCollide: False type: Physics - uid: 2872 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-18.5 parent: 853 type: Transform @@ -28447,9 +29292,10 @@ entities: - canCollide: False type: Physics - uid: 2873 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-17.5 parent: 853 type: Transform @@ -28458,9 +29304,10 @@ entities: - canCollide: False type: Physics - uid: 2874 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,-17.5 parent: 853 type: Transform @@ -28469,9 +29316,10 @@ entities: - canCollide: False type: Physics - uid: 2875 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-18.5 parent: 853 type: Transform @@ -28480,9 +29328,10 @@ entities: - canCollide: False type: Physics - uid: 2876 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-17.5 parent: 853 type: Transform @@ -28491,9 +29340,10 @@ entities: - canCollide: False type: Physics - uid: 2877 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-17.5 parent: 853 type: Transform @@ -28502,9 +29352,10 @@ entities: - canCollide: False type: Physics - uid: 2878 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-16.5 parent: 853 type: Transform @@ -28513,9 +29364,10 @@ entities: - canCollide: False type: Physics - uid: 2879 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-15.5 parent: 853 type: Transform @@ -28524,9 +29376,10 @@ entities: - canCollide: False type: Physics - uid: 2880 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-14.5 parent: 853 type: Transform @@ -28535,9 +29388,10 @@ entities: - canCollide: False type: Physics - uid: 2881 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-13.5 parent: 853 type: Transform @@ -28546,9 +29400,10 @@ entities: - canCollide: False type: Physics - uid: 2882 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-12.5 parent: 853 type: Transform @@ -28557,9 +29412,10 @@ entities: - canCollide: False type: Physics - uid: 2883 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,-13.5 parent: 853 type: Transform @@ -28568,9 +29424,10 @@ entities: - canCollide: False type: Physics - uid: 2884 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-13.5 parent: 853 type: Transform @@ -28579,9 +29436,10 @@ entities: - canCollide: False type: Physics - uid: 2885 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-17.5 parent: 853 type: Transform @@ -28590,9 +29448,10 @@ entities: - canCollide: False type: Physics - uid: 2886 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-17.5 parent: 853 type: Transform @@ -28601,18 +29460,20 @@ entities: - canCollide: False type: Physics - uid: 2887 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2888 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-14.5 parent: 853 type: Transform @@ -28621,9 +29482,10 @@ entities: - canCollide: False type: Physics - uid: 2889 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-12.5 parent: 853 type: Transform @@ -28632,9 +29494,10 @@ entities: - canCollide: False type: Physics - uid: 2890 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-17.5 parent: 853 type: Transform @@ -28643,9 +29506,10 @@ entities: - canCollide: False type: Physics - uid: 2891 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-12.5 parent: 853 type: Transform @@ -28654,18 +29518,20 @@ entities: - canCollide: False type: Physics - uid: 2892 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2893 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-14.5 parent: 853 type: Transform @@ -28674,18 +29540,20 @@ entities: - canCollide: False type: Physics - uid: 2894 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2895 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-17.5 parent: 853 type: Transform @@ -28694,9 +29562,10 @@ entities: - canCollide: False type: Physics - uid: 2896 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-18.5 parent: 853 type: Transform @@ -28705,9 +29574,10 @@ entities: - canCollide: False type: Physics - uid: 2897 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-19.5 parent: 853 type: Transform @@ -28716,9 +29586,10 @@ entities: - canCollide: False type: Physics - uid: 2898 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-20.5 parent: 853 type: Transform @@ -28727,9 +29598,10 @@ entities: - canCollide: False type: Physics - uid: 2899 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-21.5 parent: 853 type: Transform @@ -28738,9 +29610,10 @@ entities: - canCollide: False type: Physics - uid: 2900 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-22.5 parent: 853 type: Transform @@ -28749,9 +29622,10 @@ entities: - canCollide: False type: Physics - uid: 2901 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-23.5 parent: 853 type: Transform @@ -28760,9 +29634,10 @@ entities: - canCollide: False type: Physics - uid: 2902 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-24.5 parent: 853 type: Transform @@ -28771,9 +29646,10 @@ entities: - canCollide: False type: Physics - uid: 2903 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-25.5 parent: 853 type: Transform @@ -28782,9 +29658,10 @@ entities: - canCollide: False type: Physics - uid: 2904 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-25.5 parent: 853 type: Transform @@ -28793,9 +29670,10 @@ entities: - canCollide: False type: Physics - uid: 2905 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-25.5 parent: 853 type: Transform @@ -28804,9 +29682,10 @@ entities: - canCollide: False type: Physics - uid: 2906 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-22.5 parent: 853 type: Transform @@ -28815,9 +29694,10 @@ entities: - canCollide: False type: Physics - uid: 2907 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-22.5 parent: 853 type: Transform @@ -28826,9 +29706,10 @@ entities: - canCollide: False type: Physics - uid: 2908 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,-22.5 parent: 853 type: Transform @@ -28837,45 +29718,50 @@ entities: - canCollide: False type: Physics - uid: 2909 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2910 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2911 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2912 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2913 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-18.5 parent: 853 type: Transform @@ -28884,18 +29770,20 @@ entities: - canCollide: False type: Physics - uid: 2914 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-19.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2915 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-18.5 parent: 853 type: Transform @@ -28904,9 +29792,10 @@ entities: - canCollide: False type: Physics - uid: 2916 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-18.5 parent: 853 type: Transform @@ -28915,9 +29804,10 @@ entities: - canCollide: False type: Physics - uid: 2917 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,-18.5 parent: 853 type: Transform @@ -28926,9 +29816,10 @@ entities: - canCollide: False type: Physics - uid: 2918 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,-19.5 parent: 853 type: Transform @@ -28937,9 +29828,10 @@ entities: - canCollide: False type: Physics - uid: 2919 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,-19.5 parent: 853 type: Transform @@ -28948,9 +29840,10 @@ entities: - canCollide: False type: Physics - uid: 2920 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,-19.5 parent: 853 type: Transform @@ -28959,9 +29852,10 @@ entities: - canCollide: False type: Physics - uid: 2921 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,-19.5 parent: 853 type: Transform @@ -28970,18 +29864,20 @@ entities: - canCollide: False type: Physics - uid: 2922 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-19.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2923 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-19.5 parent: 853 type: Transform @@ -28990,9 +29886,10 @@ entities: - canCollide: False type: Physics - uid: 2924 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-16.5 parent: 853 type: Transform @@ -29001,9 +29898,10 @@ entities: - canCollide: False type: Physics - uid: 2925 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-15.5 parent: 853 type: Transform @@ -29012,9 +29910,10 @@ entities: - canCollide: False type: Physics - uid: 2926 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-14.5 parent: 853 type: Transform @@ -29023,9 +29922,10 @@ entities: - canCollide: False type: Physics - uid: 2927 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-13.5 parent: 853 type: Transform @@ -29034,18 +29934,20 @@ entities: - canCollide: False type: Physics - uid: 2928 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2929 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 5.5,-13.5 parent: 853 type: Transform @@ -29054,9 +29956,10 @@ entities: - canCollide: False type: Physics - uid: 2930 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-13.5 parent: 853 type: Transform @@ -29065,9 +29968,10 @@ entities: - canCollide: False type: Physics - uid: 2931 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-13.5 parent: 853 type: Transform @@ -29076,9 +29980,10 @@ entities: - canCollide: False type: Physics - uid: 2932 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,-13.5 parent: 853 type: Transform @@ -29087,18 +29992,20 @@ entities: - canCollide: False type: Physics - uid: 2933 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2934 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-4.5 parent: 853 type: Transform @@ -29107,9 +30014,10 @@ entities: - canCollide: False type: Physics - uid: 2935 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-5.5 parent: 853 type: Transform @@ -29118,9 +30026,10 @@ entities: - canCollide: False type: Physics - uid: 2936 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,-4.5 parent: 853 type: Transform @@ -29129,9 +30038,10 @@ entities: - canCollide: False type: Physics - uid: 2937 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,-4.5 parent: 853 type: Transform @@ -29140,27 +30050,30 @@ entities: - canCollide: False type: Physics - uid: 2938 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 25.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2939 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2940 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-1.5 parent: 853 type: Transform @@ -29169,9 +30082,10 @@ entities: - canCollide: False type: Physics - uid: 2941 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-0.5 parent: 853 type: Transform @@ -29180,9 +30094,10 @@ entities: - canCollide: False type: Physics - uid: 2942 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,0.5 parent: 853 type: Transform @@ -29191,9 +30106,10 @@ entities: - canCollide: False type: Physics - uid: 2943 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,1.5 parent: 853 type: Transform @@ -29202,18 +30118,20 @@ entities: - canCollide: False type: Physics - uid: 2944 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2945 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,0.5 parent: 853 type: Transform @@ -29222,9 +30140,10 @@ entities: - canCollide: False type: Physics - uid: 2946 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,-1.5 parent: 853 type: Transform @@ -29233,9 +30152,10 @@ entities: - canCollide: False type: Physics - uid: 2947 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,-1.5 parent: 853 type: Transform @@ -29244,9 +30164,10 @@ entities: - canCollide: False type: Physics - uid: 2948 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 25.5,-1.5 parent: 853 type: Transform @@ -29255,9 +30176,10 @@ entities: - canCollide: False type: Physics - uid: 2949 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-6.5 parent: 853 type: Transform @@ -29266,9 +30188,10 @@ entities: - canCollide: False type: Physics - uid: 2950 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-6.5 parent: 853 type: Transform @@ -29277,9 +30200,10 @@ entities: - canCollide: False type: Physics - uid: 2951 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 20.5,-6.5 parent: 853 type: Transform @@ -29288,9 +30212,10 @@ entities: - canCollide: False type: Physics - uid: 2952 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 19.5,-6.5 parent: 853 type: Transform @@ -29299,9 +30224,10 @@ entities: - canCollide: False type: Physics - uid: 2953 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-6.5 parent: 853 type: Transform @@ -29310,9 +30236,10 @@ entities: - canCollide: False type: Physics - uid: 2954 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-5.5 parent: 853 type: Transform @@ -29321,9 +30248,10 @@ entities: - canCollide: False type: Physics - uid: 2955 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-4.5 parent: 853 type: Transform @@ -29332,9 +30260,10 @@ entities: - canCollide: False type: Physics - uid: 2956 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-7.5 parent: 853 type: Transform @@ -29343,9 +30272,10 @@ entities: - canCollide: False type: Physics - uid: 2957 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-8.5 parent: 853 type: Transform @@ -29354,9 +30284,10 @@ entities: - canCollide: False type: Physics - uid: 2958 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-9.5 parent: 853 type: Transform @@ -29365,9 +30296,10 @@ entities: - canCollide: False type: Physics - uid: 2959 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-10.5 parent: 853 type: Transform @@ -29376,9 +30308,10 @@ entities: - canCollide: False type: Physics - uid: 2960 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-11.5 parent: 853 type: Transform @@ -29387,9 +30320,10 @@ entities: - canCollide: False type: Physics - uid: 2961 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-12.5 parent: 853 type: Transform @@ -29398,9 +30332,10 @@ entities: - canCollide: False type: Physics - uid: 2962 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-13.5 parent: 853 type: Transform @@ -29409,9 +30344,10 @@ entities: - canCollide: False type: Physics - uid: 2963 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-14.5 parent: 853 type: Transform @@ -29420,9 +30356,10 @@ entities: - canCollide: False type: Physics - uid: 2964 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-15.5 parent: 853 type: Transform @@ -29431,9 +30368,10 @@ entities: - canCollide: False type: Physics - uid: 2965 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-16.5 parent: 853 type: Transform @@ -29442,9 +30380,10 @@ entities: - canCollide: False type: Physics - uid: 2966 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-17.5 parent: 853 type: Transform @@ -29453,18 +30392,20 @@ entities: - canCollide: False type: Physics - uid: 2967 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2968 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-19.5 parent: 853 type: Transform @@ -29473,9 +30414,10 @@ entities: - canCollide: False type: Physics - uid: 2969 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-20.5 parent: 853 type: Transform @@ -29484,9 +30426,10 @@ entities: - canCollide: False type: Physics - uid: 2970 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 19.5,-13.5 parent: 853 type: Transform @@ -29495,9 +30438,10 @@ entities: - canCollide: False type: Physics - uid: 2971 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 20.5,-13.5 parent: 853 type: Transform @@ -29506,9 +30450,10 @@ entities: - canCollide: False type: Physics - uid: 2972 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-13.5 parent: 853 type: Transform @@ -29517,9 +30462,10 @@ entities: - canCollide: False type: Physics - uid: 2973 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-13.5 parent: 853 type: Transform @@ -29528,9 +30474,10 @@ entities: - canCollide: False type: Physics - uid: 2974 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-13.5 parent: 853 type: Transform @@ -29539,9 +30486,10 @@ entities: - canCollide: False type: Physics - uid: 2975 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,-13.5 parent: 853 type: Transform @@ -29550,9 +30498,10 @@ entities: - canCollide: False type: Physics - uid: 2976 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,-14.5 parent: 853 type: Transform @@ -29561,9 +30510,10 @@ entities: - canCollide: False type: Physics - uid: 2977 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-12.5 parent: 853 type: Transform @@ -29572,9 +30522,10 @@ entities: - canCollide: False type: Physics - uid: 2978 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-11.5 parent: 853 type: Transform @@ -29583,9 +30534,10 @@ entities: - canCollide: False type: Physics - uid: 2979 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-11.5 parent: 853 type: Transform @@ -29594,9 +30546,10 @@ entities: - canCollide: False type: Physics - uid: 2980 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-11.5 parent: 853 type: Transform @@ -29605,9 +30558,10 @@ entities: - canCollide: False type: Physics - uid: 2981 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,-11.5 parent: 853 type: Transform @@ -29616,9 +30570,10 @@ entities: - canCollide: False type: Physics - uid: 2982 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-7.5 parent: 853 type: Transform @@ -29627,9 +30582,10 @@ entities: - canCollide: False type: Physics - uid: 2983 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-7.5 parent: 853 type: Transform @@ -29638,9 +30594,10 @@ entities: - canCollide: False type: Physics - uid: 2984 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-7.5 parent: 853 type: Transform @@ -29649,9 +30606,10 @@ entities: - canCollide: False type: Physics - uid: 2985 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,-7.5 parent: 853 type: Transform @@ -29660,9 +30618,10 @@ entities: - canCollide: False type: Physics - uid: 2986 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,-7.5 parent: 853 type: Transform @@ -29671,9 +30630,10 @@ entities: - canCollide: False type: Physics - uid: 2987 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,-7.5 parent: 853 type: Transform @@ -29682,9 +30642,10 @@ entities: - canCollide: False type: Physics - uid: 2988 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,-7.5 parent: 853 type: Transform @@ -29693,9 +30654,10 @@ entities: - canCollide: False type: Physics - uid: 2989 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-7.5 parent: 853 type: Transform @@ -29704,9 +30666,10 @@ entities: - canCollide: False type: Physics - uid: 2990 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-7.5 parent: 853 type: Transform @@ -29715,9 +30678,10 @@ entities: - canCollide: False type: Physics - uid: 2991 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,-7.5 parent: 853 type: Transform @@ -29726,9 +30690,10 @@ entities: - canCollide: False type: Physics - uid: 2992 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 17.5,-7.5 parent: 853 type: Transform @@ -29737,9 +30702,10 @@ entities: - canCollide: False type: Physics - uid: 2993 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-7.5 parent: 853 type: Transform @@ -29748,9 +30714,10 @@ entities: - canCollide: False type: Physics - uid: 2994 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 17.5,-17.5 parent: 853 type: Transform @@ -29759,9 +30726,10 @@ entities: - canCollide: False type: Physics - uid: 2995 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,-17.5 parent: 853 type: Transform @@ -29770,9 +30738,10 @@ entities: - canCollide: False type: Physics - uid: 2996 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-17.5 parent: 853 type: Transform @@ -29781,18 +30750,20 @@ entities: - canCollide: False type: Physics - uid: 2997 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 2998 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,1.5 parent: 853 type: Transform @@ -29801,9 +30772,10 @@ entities: - canCollide: False type: Physics - uid: 2999 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 17.5,1.5 parent: 853 type: Transform @@ -29812,9 +30784,10 @@ entities: - canCollide: False type: Physics - uid: 3000 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,1.5 parent: 853 type: Transform @@ -29823,9 +30796,10 @@ entities: - canCollide: False type: Physics - uid: 3001 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,1.5 parent: 853 type: Transform @@ -29834,9 +30808,10 @@ entities: - canCollide: False type: Physics - uid: 3002 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,1.5 parent: 853 type: Transform @@ -29853,9 +30828,10 @@ entities: - canCollide: False type: Physics - uid: 3004 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,1.5 parent: 853 type: Transform @@ -29864,9 +30840,10 @@ entities: - canCollide: False type: Physics - uid: 3005 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,1.5 parent: 853 type: Transform @@ -29875,9 +30852,10 @@ entities: - canCollide: False type: Physics - uid: 3006 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,1.5 parent: 853 type: Transform @@ -29886,9 +30864,10 @@ entities: - canCollide: False type: Physics - uid: 3007 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,1.5 parent: 853 type: Transform @@ -29897,9 +30876,10 @@ entities: - canCollide: False type: Physics - uid: 3008 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,1.5 parent: 853 type: Transform @@ -29908,9 +30888,10 @@ entities: - canCollide: False type: Physics - uid: 3009 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,1.5 parent: 853 type: Transform @@ -29919,9 +30900,10 @@ entities: - canCollide: False type: Physics - uid: 3010 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,1.5 parent: 853 type: Transform @@ -29930,9 +30912,10 @@ entities: - canCollide: False type: Physics - uid: 3011 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,0.5 parent: 853 type: Transform @@ -29941,9 +30924,10 @@ entities: - canCollide: False type: Physics - uid: 3012 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,-0.5 parent: 853 type: Transform @@ -29952,9 +30936,10 @@ entities: - canCollide: False type: Physics - uid: 3013 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 17.5,-0.5 parent: 853 type: Transform @@ -29963,9 +30948,10 @@ entities: - canCollide: False type: Physics - uid: 3014 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-0.5 parent: 853 type: Transform @@ -29974,9 +30960,10 @@ entities: - canCollide: False type: Physics - uid: 3015 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,0.5 parent: 853 type: Transform @@ -29985,9 +30972,10 @@ entities: - canCollide: False type: Physics - uid: 3016 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-0.5 parent: 853 type: Transform @@ -29996,9 +30984,10 @@ entities: - canCollide: False type: Physics - uid: 3017 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-1.5 parent: 853 type: Transform @@ -30007,9 +30996,10 @@ entities: - canCollide: False type: Physics - uid: 3018 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-2.5 parent: 853 type: Transform @@ -30018,9 +31008,10 @@ entities: - canCollide: False type: Physics - uid: 3019 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-3.5 parent: 853 type: Transform @@ -30029,9 +31020,10 @@ entities: - canCollide: False type: Physics - uid: 3020 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-4.5 parent: 853 type: Transform @@ -30040,9 +31032,10 @@ entities: - canCollide: False type: Physics - uid: 3021 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-4.5 parent: 853 type: Transform @@ -30051,9 +31044,10 @@ entities: - canCollide: False type: Physics - uid: 3022 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-4.5 parent: 853 type: Transform @@ -30062,9 +31056,10 @@ entities: - canCollide: False type: Physics - uid: 3023 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,-4.5 parent: 853 type: Transform @@ -30073,9 +31068,10 @@ entities: - canCollide: False type: Physics - uid: 3024 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,-2.5 parent: 853 type: Transform @@ -30084,9 +31080,10 @@ entities: - canCollide: False type: Physics - uid: 3025 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,-2.5 parent: 853 type: Transform @@ -30095,18 +31092,20 @@ entities: - canCollide: False type: Physics - uid: 3026 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3027 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 1.5,-23.5 parent: 853 type: Transform @@ -30115,9 +31114,10 @@ entities: - canCollide: False type: Physics - uid: 3028 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,-23.5 parent: 853 type: Transform @@ -30126,9 +31126,10 @@ entities: - canCollide: False type: Physics - uid: 3029 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,-23.5 parent: 853 type: Transform @@ -30137,9 +31138,10 @@ entities: - canCollide: False type: Physics - uid: 3030 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,-22.5 parent: 853 type: Transform @@ -30148,9 +31150,10 @@ entities: - canCollide: False type: Physics - uid: 3031 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,-21.5 parent: 853 type: Transform @@ -30159,9 +31162,10 @@ entities: - canCollide: False type: Physics - uid: 3032 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,-21.5 parent: 853 type: Transform @@ -30170,9 +31174,10 @@ entities: - canCollide: False type: Physics - uid: 3033 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 4.5,-21.5 parent: 853 type: Transform @@ -30181,27 +31186,30 @@ entities: - canCollide: False type: Physics - uid: 3034 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-3.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3035 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3036 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,0.5 parent: 853 type: Transform @@ -30210,9 +31218,10 @@ entities: - canCollide: False type: Physics - uid: 3037 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,-0.5 parent: 853 type: Transform @@ -30221,9 +31230,10 @@ entities: - canCollide: False type: Physics - uid: 3038 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,-1.5 parent: 853 type: Transform @@ -30232,9 +31242,10 @@ entities: - canCollide: False type: Physics - uid: 3039 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,-3.5 parent: 853 type: Transform @@ -30243,9 +31254,10 @@ entities: - canCollide: False type: Physics - uid: 3040 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,-2.5 parent: 853 type: Transform @@ -30254,9 +31266,10 @@ entities: - canCollide: False type: Physics - uid: 3041 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 30.5,-2.5 parent: 853 type: Transform @@ -30265,9 +31278,10 @@ entities: - canCollide: False type: Physics - uid: 3042 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 29.5,-2.5 parent: 853 type: Transform @@ -30276,9 +31290,10 @@ entities: - canCollide: False type: Physics - uid: 3043 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 32.5,-2.5 parent: 853 type: Transform @@ -30287,9 +31302,10 @@ entities: - canCollide: False type: Physics - uid: 3044 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,-2.5 parent: 853 type: Transform @@ -30298,9 +31314,10 @@ entities: - canCollide: False type: Physics - uid: 3045 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,-2.5 parent: 853 type: Transform @@ -30309,9 +31326,10 @@ entities: - canCollide: False type: Physics - uid: 3046 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,-2.5 parent: 853 type: Transform @@ -30320,18 +31338,20 @@ entities: - canCollide: False type: Physics - uid: 3047 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3048 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,2.5 parent: 853 type: Transform @@ -30340,9 +31360,10 @@ entities: - canCollide: False type: Physics - uid: 3049 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,3.5 parent: 853 type: Transform @@ -30351,9 +31372,10 @@ entities: - canCollide: False type: Physics - uid: 3050 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,4.5 parent: 853 type: Transform @@ -30362,9 +31384,10 @@ entities: - canCollide: False type: Physics - uid: 3051 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 32.5,4.5 parent: 853 type: Transform @@ -30373,9 +31396,10 @@ entities: - canCollide: False type: Physics - uid: 3052 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,4.5 parent: 853 type: Transform @@ -30384,9 +31408,10 @@ entities: - canCollide: False type: Physics - uid: 3053 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,4.5 parent: 853 type: Transform @@ -30395,9 +31420,10 @@ entities: - canCollide: False type: Physics - uid: 3054 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,4.5 parent: 853 type: Transform @@ -30406,9 +31432,10 @@ entities: - canCollide: False type: Physics - uid: 3055 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 36.5,4.5 parent: 853 type: Transform @@ -30417,9 +31444,10 @@ entities: - canCollide: False type: Physics - uid: 3056 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,4.5 parent: 853 type: Transform @@ -30428,9 +31456,10 @@ entities: - canCollide: False type: Physics - uid: 3057 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,4.5 parent: 853 type: Transform @@ -30439,9 +31468,10 @@ entities: - canCollide: False type: Physics - uid: 3058 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,3.5 parent: 853 type: Transform @@ -30450,9 +31480,10 @@ entities: - canCollide: False type: Physics - uid: 3059 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,2.5 parent: 853 type: Transform @@ -30461,9 +31492,10 @@ entities: - canCollide: False type: Physics - uid: 3060 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,1.5 parent: 853 type: Transform @@ -30472,9 +31504,10 @@ entities: - canCollide: False type: Physics - uid: 3061 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,0.5 parent: 853 type: Transform @@ -30483,9 +31516,10 @@ entities: - canCollide: False type: Physics - uid: 3062 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,-0.5 parent: 853 type: Transform @@ -30494,9 +31528,10 @@ entities: - canCollide: False type: Physics - uid: 3063 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,-1.5 parent: 853 type: Transform @@ -30505,18 +31540,20 @@ entities: - canCollide: False type: Physics - uid: 3064 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3065 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,9.5 parent: 853 type: Transform @@ -30525,9 +31562,10 @@ entities: - canCollide: False type: Physics - uid: 3066 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,9.5 parent: 853 type: Transform @@ -30536,9 +31574,10 @@ entities: - canCollide: False type: Physics - uid: 3067 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,9.5 parent: 853 type: Transform @@ -30547,9 +31586,10 @@ entities: - canCollide: False type: Physics - uid: 3068 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 39.5,9.5 parent: 853 type: Transform @@ -30558,9 +31598,10 @@ entities: - canCollide: False type: Physics - uid: 3069 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,9.5 parent: 853 type: Transform @@ -30569,9 +31610,10 @@ entities: - canCollide: False type: Physics - uid: 3070 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,9.5 parent: 853 type: Transform @@ -30580,9 +31622,10 @@ entities: - canCollide: False type: Physics - uid: 3071 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,8.5 parent: 853 type: Transform @@ -30591,9 +31634,10 @@ entities: - canCollide: False type: Physics - uid: 3072 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,7.5 parent: 853 type: Transform @@ -30602,9 +31646,10 @@ entities: - canCollide: False type: Physics - uid: 3073 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,6.5 parent: 853 type: Transform @@ -30613,9 +31658,10 @@ entities: - canCollide: False type: Physics - uid: 3074 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,9.5 parent: 853 type: Transform @@ -30624,9 +31670,10 @@ entities: - canCollide: False type: Physics - uid: 3075 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,8.5 parent: 853 type: Transform @@ -30635,9 +31682,10 @@ entities: - canCollide: False type: Physics - uid: 3076 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,7.5 parent: 853 type: Transform @@ -30646,9 +31694,10 @@ entities: - canCollide: False type: Physics - uid: 3077 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,6.5 parent: 853 type: Transform @@ -30657,9 +31706,10 @@ entities: - canCollide: False type: Physics - uid: 3078 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,5.5 parent: 853 type: Transform @@ -30668,9 +31718,10 @@ entities: - canCollide: False type: Physics - uid: 3079 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,4.5 parent: 853 type: Transform @@ -30679,9 +31730,10 @@ entities: - canCollide: False type: Physics - uid: 3080 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,4.5 parent: 853 type: Transform @@ -30690,9 +31742,10 @@ entities: - canCollide: False type: Physics - uid: 3081 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,4.5 parent: 853 type: Transform @@ -30701,9 +31754,10 @@ entities: - canCollide: False type: Physics - uid: 3082 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,4.5 parent: 853 type: Transform @@ -30712,9 +31766,10 @@ entities: - canCollide: False type: Physics - uid: 3083 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,4.5 parent: 853 type: Transform @@ -30723,9 +31778,10 @@ entities: - canCollide: False type: Physics - uid: 3084 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,4.5 parent: 853 type: Transform @@ -30734,9 +31790,10 @@ entities: - canCollide: False type: Physics - uid: 3085 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,-3.5 parent: 853 type: Transform @@ -30745,9 +31802,10 @@ entities: - canCollide: False type: Physics - uid: 3086 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,-4.5 parent: 853 type: Transform @@ -30756,9 +31814,10 @@ entities: - canCollide: False type: Physics - uid: 3087 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,4.5 parent: 853 type: Transform @@ -30767,9 +31826,10 @@ entities: - canCollide: False type: Physics - uid: 3088 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,3.5 parent: 853 type: Transform @@ -30778,9 +31838,10 @@ entities: - canCollide: False type: Physics - uid: 3089 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,2.5 parent: 853 type: Transform @@ -30789,9 +31850,10 @@ entities: - canCollide: False type: Physics - uid: 3090 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,1.5 parent: 853 type: Transform @@ -30800,9 +31862,10 @@ entities: - canCollide: False type: Physics - uid: 3091 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,0.5 parent: 853 type: Transform @@ -30811,9 +31874,10 @@ entities: - canCollide: False type: Physics - uid: 3092 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,-0.5 parent: 853 type: Transform @@ -30822,9 +31886,10 @@ entities: - canCollide: False type: Physics - uid: 3093 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,-1.5 parent: 853 type: Transform @@ -30833,9 +31898,10 @@ entities: - canCollide: False type: Physics - uid: 3094 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,-2.5 parent: 853 type: Transform @@ -30844,9 +31910,10 @@ entities: - canCollide: False type: Physics - uid: 3095 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,-3.5 parent: 853 type: Transform @@ -30855,9 +31922,10 @@ entities: - canCollide: False type: Physics - uid: 3096 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-3.5 parent: 853 type: Transform @@ -30866,9 +31934,10 @@ entities: - canCollide: False type: Physics - uid: 3097 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,-3.5 parent: 853 type: Transform @@ -30877,9 +31946,10 @@ entities: - canCollide: False type: Physics - uid: 3098 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-3.5 parent: 853 type: Transform @@ -30888,9 +31958,10 @@ entities: - canCollide: False type: Physics - uid: 3099 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 39.5,-3.5 parent: 853 type: Transform @@ -30899,9 +31970,10 @@ entities: - canCollide: False type: Physics - uid: 3100 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,-3.5 parent: 853 type: Transform @@ -30910,9 +31982,10 @@ entities: - canCollide: False type: Physics - uid: 3101 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,-3.5 parent: 853 type: Transform @@ -30921,9 +31994,10 @@ entities: - canCollide: False type: Physics - uid: 3102 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,-4.5 parent: 853 type: Transform @@ -30932,9 +32006,10 @@ entities: - canCollide: False type: Physics - uid: 3103 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,-5.5 parent: 853 type: Transform @@ -30943,9 +32018,10 @@ entities: - canCollide: False type: Physics - uid: 3104 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,-6.5 parent: 853 type: Transform @@ -30954,9 +32030,10 @@ entities: - canCollide: False type: Physics - uid: 3105 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 36.5,-6.5 parent: 853 type: Transform @@ -30965,9 +32042,10 @@ entities: - canCollide: False type: Physics - uid: 3106 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,-6.5 parent: 853 type: Transform @@ -30976,9 +32054,10 @@ entities: - canCollide: False type: Physics - uid: 3107 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,-6.5 parent: 853 type: Transform @@ -30987,18 +32066,20 @@ entities: - canCollide: False type: Physics - uid: 3108 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3109 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 32.5,-6.5 parent: 853 type: Transform @@ -31007,9 +32088,10 @@ entities: - canCollide: False type: Physics - uid: 3110 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,-6.5 parent: 853 type: Transform @@ -31018,9 +32100,10 @@ entities: - canCollide: False type: Physics - uid: 3111 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 30.5,-6.5 parent: 853 type: Transform @@ -31029,36 +32112,40 @@ entities: - canCollide: False type: Physics - uid: 3112 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 29.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3113 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3114 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3115 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-7.5 parent: 853 type: Transform @@ -31067,9 +32154,10 @@ entities: - canCollide: False type: Physics - uid: 3116 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-8.5 parent: 853 type: Transform @@ -31078,9 +32166,10 @@ entities: - canCollide: False type: Physics - uid: 3117 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-9.5 parent: 853 type: Transform @@ -31089,9 +32178,10 @@ entities: - canCollide: False type: Physics - uid: 3118 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-10.5 parent: 853 type: Transform @@ -31100,9 +32190,10 @@ entities: - canCollide: False type: Physics - uid: 3119 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-11.5 parent: 853 type: Transform @@ -31111,9 +32202,10 @@ entities: - canCollide: False type: Physics - uid: 3120 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-12.5 parent: 853 type: Transform @@ -31122,9 +32214,10 @@ entities: - canCollide: False type: Physics - uid: 3121 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-13.5 parent: 853 type: Transform @@ -31133,9 +32226,10 @@ entities: - canCollide: False type: Physics - uid: 3122 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-14.5 parent: 853 type: Transform @@ -31144,9 +32238,10 @@ entities: - canCollide: False type: Physics - uid: 3123 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-15.5 parent: 853 type: Transform @@ -31155,9 +32250,10 @@ entities: - canCollide: False type: Physics - uid: 3124 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-16.5 parent: 853 type: Transform @@ -31166,9 +32262,10 @@ entities: - canCollide: False type: Physics - uid: 3125 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-17.5 parent: 853 type: Transform @@ -31177,9 +32274,10 @@ entities: - canCollide: False type: Physics - uid: 3126 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-18.5 parent: 853 type: Transform @@ -31188,9 +32286,10 @@ entities: - canCollide: False type: Physics - uid: 3127 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-18.5 parent: 853 type: Transform @@ -31199,9 +32298,10 @@ entities: - canCollide: False type: Physics - uid: 3128 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 25.5,-18.5 parent: 853 type: Transform @@ -31210,9 +32310,10 @@ entities: - canCollide: False type: Physics - uid: 3129 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,-18.5 parent: 853 type: Transform @@ -31221,90 +32322,100 @@ entities: - canCollide: False type: Physics - uid: 3130 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3131 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3132 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-3.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3133 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3134 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3135 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3136 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3137 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-3.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3138 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3139 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,10.5 parent: 853 type: Transform @@ -31313,9 +32424,10 @@ entities: - canCollide: False type: Physics - uid: 3140 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,11.5 parent: 853 type: Transform @@ -31324,9 +32436,10 @@ entities: - canCollide: False type: Physics - uid: 3141 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,12.5 parent: 853 type: Transform @@ -31335,9 +32448,10 @@ entities: - canCollide: False type: Physics - uid: 3142 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,13.5 parent: 853 type: Transform @@ -31346,27 +32460,30 @@ entities: - canCollide: False type: Physics - uid: 3143 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3144 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3145 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,12.5 parent: 853 type: Transform @@ -31375,9 +32492,10 @@ entities: - canCollide: False type: Physics - uid: 3146 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,11.5 parent: 853 type: Transform @@ -31386,9 +32504,10 @@ entities: - canCollide: False type: Physics - uid: 3147 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,10.5 parent: 853 type: Transform @@ -31397,9 +32516,10 @@ entities: - canCollide: False type: Physics - uid: 3148 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 29.5,10.5 parent: 853 type: Transform @@ -31408,18 +32528,20 @@ entities: - canCollide: False type: Physics - uid: 3149 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3150 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,9.5 parent: 853 type: Transform @@ -31428,18 +32550,20 @@ entities: - canCollide: False type: Physics - uid: 3151 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3152 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 25.5,9.5 parent: 853 type: Transform @@ -31448,9 +32572,10 @@ entities: - canCollide: False type: Physics - uid: 3153 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,10.5 parent: 853 type: Transform @@ -31459,9 +32584,10 @@ entities: - canCollide: False type: Physics - uid: 3154 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,11.5 parent: 853 type: Transform @@ -31470,18 +32596,20 @@ entities: - canCollide: False type: Physics - uid: 3155 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3156 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,7.5 parent: 853 type: Transform @@ -31490,9 +32618,10 @@ entities: - canCollide: False type: Physics - uid: 3157 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 30.5,10.5 parent: 853 type: Transform @@ -31501,9 +32630,10 @@ entities: - canCollide: False type: Physics - uid: 3158 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,10.5 parent: 853 type: Transform @@ -31512,9 +32642,10 @@ entities: - canCollide: False type: Physics - uid: 3159 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 32.5,10.5 parent: 853 type: Transform @@ -31523,9 +32654,10 @@ entities: - canCollide: False type: Physics - uid: 3160 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,10.5 parent: 853 type: Transform @@ -31534,9 +32666,10 @@ entities: - canCollide: False type: Physics - uid: 3161 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,10.5 parent: 853 type: Transform @@ -31545,9 +32678,10 @@ entities: - canCollide: False type: Physics - uid: 3162 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,10.5 parent: 853 type: Transform @@ -31556,9 +32690,10 @@ entities: - canCollide: False type: Physics - uid: 3163 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 36.5,10.5 parent: 853 type: Transform @@ -31567,9 +32702,10 @@ entities: - canCollide: False type: Physics - uid: 3164 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 30.5,9.5 parent: 853 type: Transform @@ -31578,9 +32714,10 @@ entities: - canCollide: False type: Physics - uid: 3165 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,9.5 parent: 853 type: Transform @@ -31589,9 +32726,10 @@ entities: - canCollide: False type: Physics - uid: 3166 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,9.5 parent: 853 type: Transform @@ -31600,9 +32738,10 @@ entities: - canCollide: False type: Physics - uid: 3167 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,8.5 parent: 853 type: Transform @@ -31611,18 +32750,20 @@ entities: - canCollide: False type: Physics - uid: 3168 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3169 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 36.5,11.5 parent: 853 type: Transform @@ -31631,9 +32772,10 @@ entities: - canCollide: False type: Physics - uid: 3170 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 36.5,12.5 parent: 853 type: Transform @@ -31642,9 +32784,10 @@ entities: - canCollide: False type: Physics - uid: 3171 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 30.5,11.5 parent: 853 type: Transform @@ -31653,9 +32796,10 @@ entities: - canCollide: False type: Physics - uid: 3172 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 30.5,12.5 parent: 853 type: Transform @@ -31664,18 +32808,20 @@ entities: - canCollide: False type: Physics - uid: 3173 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3174 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,13.5 parent: 853 type: Transform @@ -31684,9 +32830,10 @@ entities: - canCollide: False type: Physics - uid: 3175 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,13.5 parent: 853 type: Transform @@ -31695,9 +32842,10 @@ entities: - canCollide: False type: Physics - uid: 3176 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,13.5 parent: 853 type: Transform @@ -31706,9 +32854,10 @@ entities: - canCollide: False type: Physics - uid: 3177 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-27.5 parent: 853 type: Transform @@ -31732,9 +32881,10 @@ entities: ents: [] type: ContainerContainer - uid: 3180 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,13.5 parent: 853 type: Transform @@ -31743,9 +32893,10 @@ entities: - canCollide: False type: Physics - uid: 3181 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 20.5,13.5 parent: 853 type: Transform @@ -31754,27 +32905,30 @@ entities: - canCollide: False type: Physics - uid: 3182 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3183 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3184 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 19.5,13.5 parent: 853 type: Transform @@ -31783,9 +32937,10 @@ entities: - canCollide: False type: Physics - uid: 3185 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,13.5 parent: 853 type: Transform @@ -31794,9 +32949,10 @@ entities: - canCollide: False type: Physics - uid: 3186 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,12.5 parent: 853 type: Transform @@ -31805,9 +32961,10 @@ entities: - canCollide: False type: Physics - uid: 3187 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,11.5 parent: 853 type: Transform @@ -31816,9 +32973,10 @@ entities: - canCollide: False type: Physics - uid: 3188 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,10.5 parent: 853 type: Transform @@ -31827,9 +32985,10 @@ entities: - canCollide: False type: Physics - uid: 3189 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,9.5 parent: 853 type: Transform @@ -31838,9 +32997,10 @@ entities: - canCollide: False type: Physics - uid: 3190 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,8.5 parent: 853 type: Transform @@ -31849,9 +33009,10 @@ entities: - canCollide: False type: Physics - uid: 3191 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,8.5 parent: 853 type: Transform @@ -31860,9 +33021,10 @@ entities: - canCollide: False type: Physics - uid: 3192 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,8.5 parent: 853 type: Transform @@ -31871,9 +33033,10 @@ entities: - canCollide: False type: Physics - uid: 3193 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 20.5,8.5 parent: 853 type: Transform @@ -31882,9 +33045,10 @@ entities: - canCollide: False type: Physics - uid: 3194 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 19.5,8.5 parent: 853 type: Transform @@ -31893,9 +33057,10 @@ entities: - canCollide: False type: Physics - uid: 3195 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,8.5 parent: 853 type: Transform @@ -31904,18 +33069,20 @@ entities: - canCollide: False type: Physics - uid: 3196 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 17.5,8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3197 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,12.5 parent: 853 type: Transform @@ -31924,9 +33091,10 @@ entities: - canCollide: False type: Physics - uid: 3198 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,11.5 parent: 853 type: Transform @@ -31935,18 +33103,20 @@ entities: - canCollide: False type: Physics - uid: 3199 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3200 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,12.5 parent: 853 type: Transform @@ -31955,9 +33125,10 @@ entities: - canCollide: False type: Physics - uid: 3201 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,11.5 parent: 853 type: Transform @@ -31966,9 +33137,10 @@ entities: - canCollide: False type: Physics - uid: 3202 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,10.5 parent: 853 type: Transform @@ -31977,9 +33149,10 @@ entities: - canCollide: False type: Physics - uid: 3203 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,10.5 parent: 853 type: Transform @@ -31988,9 +33161,10 @@ entities: - canCollide: False type: Physics - uid: 3204 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,10.5 parent: 853 type: Transform @@ -31999,9 +33173,10 @@ entities: - canCollide: False type: Physics - uid: 3205 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,10.5 parent: 853 type: Transform @@ -32010,9 +33185,10 @@ entities: - canCollide: False type: Physics - uid: 3206 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,10.5 parent: 853 type: Transform @@ -32021,9 +33197,10 @@ entities: - canCollide: False type: Physics - uid: 3207 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,11.5 parent: 853 type: Transform @@ -32032,9 +33209,10 @@ entities: - canCollide: False type: Physics - uid: 3208 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,9.5 parent: 853 type: Transform @@ -32043,18 +33221,20 @@ entities: - canCollide: False type: Physics - uid: 3209 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3210 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,10.5 parent: 853 type: Transform @@ -32063,9 +33243,10 @@ entities: - canCollide: False type: Physics - uid: 3211 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,10.5 parent: 853 type: Transform @@ -32074,9 +33255,10 @@ entities: - canCollide: False type: Physics - uid: 3212 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,10.5 parent: 853 type: Transform @@ -32085,9 +33267,10 @@ entities: - canCollide: False type: Physics - uid: 3213 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,10.5 parent: 853 type: Transform @@ -32096,9 +33279,10 @@ entities: - canCollide: False type: Physics - uid: 3214 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,10.5 parent: 853 type: Transform @@ -32107,9 +33291,10 @@ entities: - canCollide: False type: Physics - uid: 3215 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,11.5 parent: 853 type: Transform @@ -32118,9 +33303,10 @@ entities: - canCollide: False type: Physics - uid: 3216 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,9.5 parent: 853 type: Transform @@ -32129,9 +33315,10 @@ entities: - canCollide: False type: Physics - uid: 3217 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,8.5 parent: 853 type: Transform @@ -32140,9 +33327,10 @@ entities: - canCollide: False type: Physics - uid: 3218 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,7.5 parent: 853 type: Transform @@ -32151,54 +33339,60 @@ entities: - canCollide: False type: Physics - uid: 3219 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3220 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3221 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3222 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3223 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3224 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,14.5 parent: 853 type: Transform @@ -32207,9 +33401,10 @@ entities: - canCollide: False type: Physics - uid: 3225 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,14.5 parent: 853 type: Transform @@ -32218,9 +33413,10 @@ entities: - canCollide: False type: Physics - uid: 3226 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,14.5 parent: 853 type: Transform @@ -32229,27 +33425,30 @@ entities: - canCollide: False type: Physics - uid: 3227 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3228 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3229 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,14.5 parent: 853 type: Transform @@ -32258,9 +33457,10 @@ entities: - canCollide: False type: Physics - uid: 3230 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,14.5 parent: 853 type: Transform @@ -32269,9 +33469,10 @@ entities: - canCollide: False type: Physics - uid: 3231 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,14.5 parent: 853 type: Transform @@ -32280,9 +33481,10 @@ entities: - canCollide: False type: Physics - uid: 3232 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,15.5 parent: 853 type: Transform @@ -32291,9 +33493,10 @@ entities: - canCollide: False type: Physics - uid: 3233 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,16.5 parent: 853 type: Transform @@ -32302,9 +33505,10 @@ entities: - canCollide: False type: Physics - uid: 3234 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,15.5 parent: 853 type: Transform @@ -32313,18 +33517,20 @@ entities: - canCollide: False type: Physics - uid: 3235 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3236 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,21.5 parent: 853 type: Transform @@ -32333,9 +33539,10 @@ entities: - canCollide: False type: Physics - uid: 3237 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,20.5 parent: 853 type: Transform @@ -32344,9 +33551,10 @@ entities: - canCollide: False type: Physics - uid: 3238 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,19.5 parent: 853 type: Transform @@ -32355,9 +33563,10 @@ entities: - canCollide: False type: Physics - uid: 3239 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,18.5 parent: 853 type: Transform @@ -32366,9 +33575,10 @@ entities: - canCollide: False type: Physics - uid: 3240 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,17.5 parent: 853 type: Transform @@ -32377,9 +33587,10 @@ entities: - canCollide: False type: Physics - uid: 3241 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,16.5 parent: 853 type: Transform @@ -32388,9 +33599,10 @@ entities: - canCollide: False type: Physics - uid: 3242 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,20.5 parent: 853 type: Transform @@ -32399,9 +33611,10 @@ entities: - canCollide: False type: Physics - uid: 3243 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,17.5 parent: 853 type: Transform @@ -32410,9 +33623,10 @@ entities: - canCollide: False type: Physics - uid: 3244 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,17.5 parent: 853 type: Transform @@ -32421,9 +33635,10 @@ entities: - canCollide: False type: Physics - uid: 3245 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,17.5 parent: 853 type: Transform @@ -32432,9 +33647,10 @@ entities: - canCollide: False type: Physics - uid: 3246 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,20.5 parent: 853 type: Transform @@ -32443,9 +33659,10 @@ entities: - canCollide: False type: Physics - uid: 3247 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,17.5 parent: 853 type: Transform @@ -32454,9 +33671,10 @@ entities: - canCollide: False type: Physics - uid: 3248 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 5.5,17.5 parent: 853 type: Transform @@ -32465,9 +33683,10 @@ entities: - canCollide: False type: Physics - uid: 3249 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 5.5,16.5 parent: 853 type: Transform @@ -32476,9 +33695,10 @@ entities: - canCollide: False type: Physics - uid: 3250 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 4.5,17.5 parent: 853 type: Transform @@ -32487,9 +33707,10 @@ entities: - canCollide: False type: Physics - uid: 3251 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,17.5 parent: 853 type: Transform @@ -32498,9 +33719,10 @@ entities: - canCollide: False type: Physics - uid: 3252 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,18.5 parent: 853 type: Transform @@ -32509,9 +33731,10 @@ entities: - canCollide: False type: Physics - uid: 3253 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,19.5 parent: 853 type: Transform @@ -32520,9 +33743,10 @@ entities: - canCollide: False type: Physics - uid: 3254 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,20.5 parent: 853 type: Transform @@ -32531,9 +33755,10 @@ entities: - canCollide: False type: Physics - uid: 3255 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,20.5 parent: 853 type: Transform @@ -32542,9 +33767,10 @@ entities: - canCollide: False type: Physics - uid: 3256 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,21.5 parent: 853 type: Transform @@ -32553,18 +33779,20 @@ entities: - canCollide: False type: Physics - uid: 3257 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3258 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,20.5 parent: 853 type: Transform @@ -32573,9 +33801,10 @@ entities: - canCollide: False type: Physics - uid: 3259 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 1.5,20.5 parent: 853 type: Transform @@ -32584,18 +33813,20 @@ entities: - canCollide: False type: Physics - uid: 3260 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,27.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3261 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,26.5 parent: 853 type: Transform @@ -32604,9 +33835,10 @@ entities: - canCollide: False type: Physics - uid: 3262 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,25.5 parent: 853 type: Transform @@ -32615,9 +33847,10 @@ entities: - canCollide: False type: Physics - uid: 3263 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,24.5 parent: 853 type: Transform @@ -32626,9 +33859,10 @@ entities: - canCollide: False type: Physics - uid: 3264 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,24.5 parent: 853 type: Transform @@ -32637,9 +33871,10 @@ entities: - canCollide: False type: Physics - uid: 3265 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,24.5 parent: 853 type: Transform @@ -32648,9 +33883,10 @@ entities: - canCollide: False type: Physics - uid: 3266 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,24.5 parent: 853 type: Transform @@ -32659,9 +33895,10 @@ entities: - canCollide: False type: Physics - uid: 3267 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,28.5 parent: 853 type: Transform @@ -32670,9 +33907,10 @@ entities: - canCollide: False type: Physics - uid: 3268 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,29.5 parent: 853 type: Transform @@ -32681,9 +33919,10 @@ entities: - canCollide: False type: Physics - uid: 3269 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,30.5 parent: 853 type: Transform @@ -32692,9 +33931,10 @@ entities: - canCollide: False type: Physics - uid: 3270 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,30.5 parent: 853 type: Transform @@ -32703,9 +33943,10 @@ entities: - canCollide: False type: Physics - uid: 3271 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,30.5 parent: 853 type: Transform @@ -32714,9 +33955,10 @@ entities: - canCollide: False type: Physics - uid: 3272 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,30.5 parent: 853 type: Transform @@ -32725,9 +33967,10 @@ entities: - canCollide: False type: Physics - uid: 3273 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,31.5 parent: 853 type: Transform @@ -32736,18 +33979,20 @@ entities: - canCollide: False type: Physics - uid: 3274 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,27.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3275 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,28.5 parent: 853 type: Transform @@ -32756,9 +34001,10 @@ entities: - canCollide: False type: Physics - uid: 3276 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,29.5 parent: 853 type: Transform @@ -32767,9 +34013,10 @@ entities: - canCollide: False type: Physics - uid: 3277 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,30.5 parent: 853 type: Transform @@ -32778,9 +34025,10 @@ entities: - canCollide: False type: Physics - uid: 3278 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,30.5 parent: 853 type: Transform @@ -32789,9 +34037,10 @@ entities: - canCollide: False type: Physics - uid: 3279 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,30.5 parent: 853 type: Transform @@ -32800,9 +34049,10 @@ entities: - canCollide: False type: Physics - uid: 3280 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,30.5 parent: 853 type: Transform @@ -32811,9 +34061,10 @@ entities: - canCollide: False type: Physics - uid: 3281 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 1.5,30.5 parent: 853 type: Transform @@ -32822,9 +34073,10 @@ entities: - canCollide: False type: Physics - uid: 3282 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,30.5 parent: 853 type: Transform @@ -32833,9 +34085,10 @@ entities: - canCollide: False type: Physics - uid: 3283 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,30.5 parent: 853 type: Transform @@ -32844,9 +34097,10 @@ entities: - canCollide: False type: Physics - uid: 3284 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,31.5 parent: 853 type: Transform @@ -32855,9 +34109,10 @@ entities: - canCollide: False type: Physics - uid: 3285 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,31.5 parent: 853 type: Transform @@ -32866,9 +34121,10 @@ entities: - canCollide: False type: Physics - uid: 3286 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,26.5 parent: 853 type: Transform @@ -32877,9 +34133,10 @@ entities: - canCollide: False type: Physics - uid: 3287 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,25.5 parent: 853 type: Transform @@ -32888,9 +34145,10 @@ entities: - canCollide: False type: Physics - uid: 3288 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,25.5 parent: 853 type: Transform @@ -32899,9 +34157,10 @@ entities: - canCollide: False type: Physics - uid: 3289 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,25.5 parent: 853 type: Transform @@ -32910,9 +34169,10 @@ entities: - canCollide: False type: Physics - uid: 3290 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,25.5 parent: 853 type: Transform @@ -32921,9 +34181,10 @@ entities: - canCollide: False type: Physics - uid: 3291 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,24.5 parent: 853 type: Transform @@ -32932,9 +34193,10 @@ entities: - canCollide: False type: Physics - uid: 3292 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,24.5 parent: 853 type: Transform @@ -32943,9 +34205,10 @@ entities: - canCollide: False type: Physics - uid: 3293 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,23.5 parent: 853 type: Transform @@ -32954,9 +34217,10 @@ entities: - canCollide: False type: Physics - uid: 3294 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,23.5 parent: 853 type: Transform @@ -32979,9 +34243,10 @@ entities: parent: 853 type: Transform - uid: 3297 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,6.5 parent: 853 type: Transform @@ -32990,9 +34255,10 @@ entities: - canCollide: False type: Physics - uid: 3298 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,5.5 parent: 853 type: Transform @@ -33001,9 +34267,10 @@ entities: - canCollide: False type: Physics - uid: 3299 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,4.5 parent: 853 type: Transform @@ -33012,9 +34279,10 @@ entities: - canCollide: False type: Physics - uid: 3300 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,3.5 parent: 853 type: Transform @@ -33023,9 +34291,10 @@ entities: - canCollide: False type: Physics - uid: 3301 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,2.5 parent: 853 type: Transform @@ -33034,9 +34303,10 @@ entities: - canCollide: False type: Physics - uid: 3302 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,1.5 parent: 853 type: Transform @@ -33045,45 +34315,50 @@ entities: - canCollide: False type: Physics - uid: 3303 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3304 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3305 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3306 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3307 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-3.5 parent: 853 type: Transform @@ -33092,180 +34367,200 @@ entities: - canCollide: False type: Physics - uid: 3308 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3309 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3310 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3311 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3312 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 39.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3313 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3314 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,-5.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3315 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3316 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3317 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3318 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 36.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3319 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3320 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3321 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3322 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 32.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3323 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3324 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 30.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3325 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 29.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3326 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3327 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,-7.5 parent: 853 type: Transform @@ -33274,450 +34569,500 @@ entities: - canCollide: False type: Physics - uid: 3328 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3329 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3330 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3331 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3332 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3333 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3334 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3335 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3336 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-15.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3337 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3338 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3339 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 25.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3340 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3341 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3342 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3343 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3344 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 25.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3345 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3346 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3347 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3348 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3349 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-19.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3350 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3351 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3352 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3353 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3354 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3355 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3356 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3357 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 20.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3358 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 19.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3359 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3360 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 17.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3361 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3362 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3363 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3364 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3365 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3366 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3367 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3368 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3369 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3370 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3371 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3372 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3373 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3374 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3375 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3376 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3377 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 5.5,-20.5 parent: 853 type: Transform @@ -33726,9 +35071,10 @@ entities: - canCollide: False type: Physics - uid: 3378 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 4.5,-20.5 parent: 853 type: Transform @@ -33744,38 +35090,38 @@ entities: type: Transform - startingCharge: 2366791.8 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 3380 type: SalternApc components: - - pos: 13.5,-23.5 + - anchored: True + pos: 13.5,-23.5 parent: 853 type: Transform - startingCharge: 11999.918 type: Battery - uid: 3381 - type: MVWire + type: CableMV components: - - pos: 14.5,-25.5 + - anchored: True + pos: 14.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3382 - type: MVWire + type: CableMV components: - - pos: 13.5,-25.5 + - anchored: True + pos: 13.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3383 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,-23.5 parent: 853 type: Transform @@ -33784,9 +35130,10 @@ entities: - canCollide: False type: Physics - uid: 3384 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 1.5,-23.5 parent: 853 type: Transform @@ -33795,81 +35142,90 @@ entities: - canCollide: False type: Physics - uid: 3385 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3386 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3387 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3388 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3389 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3390 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3391 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3392 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3393 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -0.5,-15.5 + - anchored: True + pos: -0.5,-15.5 parent: 853 type: Transform - visible: False @@ -33877,18 +35233,20 @@ entities: - canCollide: False type: Physics - uid: 3394 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3395 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -1.5,-15.5 + - anchored: True + pos: -1.5,-15.5 parent: 853 type: Transform - visible: False @@ -33896,99 +35254,110 @@ entities: - canCollide: False type: Physics - uid: 3396 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3397 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3398 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3399 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3400 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3401 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3402 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3403 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3404 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3405 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3406 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-21.5 parent: 853 type: Transform @@ -33997,9 +35366,10 @@ entities: - canCollide: False type: Physics - uid: 3407 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-20.5 parent: 853 type: Transform @@ -34008,9 +35378,10 @@ entities: - canCollide: False type: Physics - uid: 3408 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-19.5 parent: 853 type: Transform @@ -34019,9 +35390,10 @@ entities: - canCollide: False type: Physics - uid: 3409 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-18.5 parent: 853 type: Transform @@ -34030,9 +35402,10 @@ entities: - canCollide: False type: Physics - uid: 3410 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-17.5 parent: 853 type: Transform @@ -34041,18 +35414,20 @@ entities: - canCollide: False type: Physics - uid: 3411 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3412 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-15.5 parent: 853 type: Transform @@ -34061,189 +35436,210 @@ entities: - canCollide: False type: Physics - uid: 3413 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3414 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3415 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3416 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3417 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3418 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3419 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3420 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3421 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3422 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3423 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3424 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3425 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3426 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3427 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3428 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3429 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3430 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3431 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3432 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3433 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-6.5 parent: 853 type: Transform @@ -34252,189 +35648,210 @@ entities: - canCollide: False type: Physics - uid: 3434 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3435 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3436 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3437 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3438 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3439 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3440 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3441 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3442 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3443 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3444 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3445 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -19.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3446 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3447 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3448 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3449 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3450 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -24.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3451 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -25.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3452 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3453 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3454 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,-10.5 parent: 853 type: Transform @@ -34443,189 +35860,210 @@ entities: - canCollide: False type: Physics - uid: 3455 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3456 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3457 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3458 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -31.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3459 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3460 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3461 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3462 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3463 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3464 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3465 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3466 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-5.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3467 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3468 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-3.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3469 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3470 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3471 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,-0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3472 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3473 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3474 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3475 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,2.5 parent: 853 type: Transform @@ -34634,9 +36072,10 @@ entities: - canCollide: False type: Physics - uid: 3476 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,3.5 parent: 853 type: Transform @@ -34645,9 +36084,10 @@ entities: - canCollide: False type: Physics - uid: 3477 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,4.5 parent: 853 type: Transform @@ -34656,9 +36096,10 @@ entities: - canCollide: False type: Physics - uid: 3478 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,5.5 parent: 853 type: Transform @@ -34667,279 +36108,310 @@ entities: - canCollide: False type: Physics - uid: 3479 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3480 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3481 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3482 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3483 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3484 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3485 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3486 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3487 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3488 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3489 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -31.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3490 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3491 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3492 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3493 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3494 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3495 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -25.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3496 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -24.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3497 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3498 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3499 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3500 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3501 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3502 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -19.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3503 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3504 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3505 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3506 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3507 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,15.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3508 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3509 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,16.5 parent: 853 type: Transform @@ -34948,9 +36420,10 @@ entities: - canCollide: False type: Physics - uid: 3510 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,16.5 parent: 853 type: Transform @@ -34959,324 +36432,360 @@ entities: - canCollide: False type: Physics - uid: 3511 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3512 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3513 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3514 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,19.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3515 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3516 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3517 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3518 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3519 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3520 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3521 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3522 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3523 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3524 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3525 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3526 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3527 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3528 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3529 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3530 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3531 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3532 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3533 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3534 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3535 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3536 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3537 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3538 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3539 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3540 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3541 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3542 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3543 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3544 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3545 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3546 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,20.5 parent: 853 type: Transform @@ -35285,9 +36794,10 @@ entities: - canCollide: False type: Physics - uid: 3547 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 1.5,20.5 parent: 853 type: Transform @@ -35296,9 +36806,10 @@ entities: - canCollide: False type: Physics - uid: 3548 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,20.5 parent: 853 type: Transform @@ -35307,9 +36818,10 @@ entities: - canCollide: False type: Physics - uid: 3549 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,20.5 parent: 853 type: Transform @@ -35318,9 +36830,10 @@ entities: - canCollide: False type: Physics - uid: 3550 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 4.5,20.5 parent: 853 type: Transform @@ -35329,9 +36842,10 @@ entities: - canCollide: False type: Physics - uid: 3551 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 5.5,20.5 parent: 853 type: Transform @@ -35340,9 +36854,10 @@ entities: - canCollide: False type: Physics - uid: 3552 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,20.5 parent: 853 type: Transform @@ -35351,9 +36866,10 @@ entities: - canCollide: False type: Physics - uid: 3553 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,20.5 parent: 853 type: Transform @@ -35362,9 +36878,10 @@ entities: - canCollide: False type: Physics - uid: 3554 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,20.5 parent: 853 type: Transform @@ -35373,9 +36890,10 @@ entities: - canCollide: False type: Physics - uid: 3555 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,20.5 parent: 853 type: Transform @@ -35384,9 +36902,10 @@ entities: - canCollide: False type: Physics - uid: 3556 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,20.5 parent: 853 type: Transform @@ -35395,9 +36914,10 @@ entities: - canCollide: False type: Physics - uid: 3557 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,20.5 parent: 853 type: Transform @@ -35406,18 +36926,20 @@ entities: - canCollide: False type: Physics - uid: 3558 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3559 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,21.5 parent: 853 type: Transform @@ -35426,9 +36948,10 @@ entities: - canCollide: False type: Physics - uid: 3560 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,22.5 parent: 853 type: Transform @@ -35437,9 +36960,10 @@ entities: - canCollide: False type: Physics - uid: 3561 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,23.5 parent: 853 type: Transform @@ -35448,126 +36972,140 @@ entities: - canCollide: False type: Physics - uid: 3562 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3563 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3564 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3565 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,19.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3566 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3567 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3568 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3569 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,15.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3570 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3571 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3572 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3573 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3574 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3575 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,11.5 parent: 853 type: Transform @@ -35576,18 +37114,20 @@ entities: - canCollide: False type: Physics - uid: 3576 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3577 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,11.5 parent: 853 type: Transform @@ -35596,9 +37136,10 @@ entities: - canCollide: False type: Physics - uid: 3578 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,11.5 parent: 853 type: Transform @@ -35615,9 +37156,10 @@ entities: - canCollide: False type: Physics - uid: 3580 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,11.5 parent: 853 type: Transform @@ -35626,9 +37168,10 @@ entities: - canCollide: False type: Physics - uid: 3581 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,11.5 parent: 853 type: Transform @@ -35637,9 +37180,10 @@ entities: - canCollide: False type: Physics - uid: 3582 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 17.5,11.5 parent: 853 type: Transform @@ -35648,9 +37192,10 @@ entities: - canCollide: False type: Physics - uid: 3583 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,11.5 parent: 853 type: Transform @@ -35659,9 +37204,10 @@ entities: - canCollide: False type: Physics - uid: 3584 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 19.5,11.5 parent: 853 type: Transform @@ -35670,9 +37216,10 @@ entities: - canCollide: False type: Physics - uid: 3585 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 20.5,11.5 parent: 853 type: Transform @@ -35681,9 +37228,10 @@ entities: - canCollide: False type: Physics - uid: 3586 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,11.5 parent: 853 type: Transform @@ -35692,9 +37240,10 @@ entities: - canCollide: False type: Physics - uid: 3587 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,11.5 parent: 853 type: Transform @@ -35703,9 +37252,10 @@ entities: - canCollide: False type: Physics - uid: 3588 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,11.5 parent: 853 type: Transform @@ -35714,9 +37264,10 @@ entities: - canCollide: False type: Physics - uid: 3589 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,11.5 parent: 853 type: Transform @@ -35725,18 +37276,20 @@ entities: - canCollide: False type: Physics - uid: 3590 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 25.5,11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3591 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,11.5 parent: 853 type: Transform @@ -35745,9 +37298,10 @@ entities: - canCollide: False type: Physics - uid: 3592 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,11.5 parent: 853 type: Transform @@ -35756,9 +37310,10 @@ entities: - canCollide: False type: Physics - uid: 3593 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,12.5 parent: 853 type: Transform @@ -35767,18 +37322,20 @@ entities: - canCollide: False type: Physics - uid: 3594 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3595 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,11.5 parent: 853 type: Transform @@ -35787,18 +37344,20 @@ entities: - canCollide: False type: Physics - uid: 3596 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 29.5,11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3597 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 30.5,11.5 parent: 853 type: Transform @@ -35807,9 +37366,10 @@ entities: - canCollide: False type: Physics - uid: 3598 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,11.5 parent: 853 type: Transform @@ -35818,9 +37378,10 @@ entities: - canCollide: False type: Physics - uid: 3599 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 32.5,11.5 parent: 853 type: Transform @@ -35829,9 +37390,10 @@ entities: - canCollide: False type: Physics - uid: 3600 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,11.5 parent: 853 type: Transform @@ -35840,9 +37402,10 @@ entities: - canCollide: False type: Physics - uid: 3601 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,11.5 parent: 853 type: Transform @@ -35851,9 +37414,10 @@ entities: - canCollide: False type: Physics - uid: 3602 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,10.5 parent: 853 type: Transform @@ -35862,9 +37426,10 @@ entities: - canCollide: False type: Physics - uid: 3603 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,9.5 parent: 853 type: Transform @@ -35873,9 +37438,10 @@ entities: - canCollide: False type: Physics - uid: 3604 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,8.5 parent: 853 type: Transform @@ -35884,18 +37450,20 @@ entities: - canCollide: False type: Physics - uid: 3605 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3606 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,6.5 parent: 853 type: Transform @@ -35904,9 +37472,10 @@ entities: - canCollide: False type: Physics - uid: 3607 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,5.5 parent: 853 type: Transform @@ -35915,9 +37484,10 @@ entities: - canCollide: False type: Physics - uid: 3608 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,5.5 parent: 853 type: Transform @@ -35926,9 +37496,10 @@ entities: - canCollide: False type: Physics - uid: 3609 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 36.5,5.5 parent: 853 type: Transform @@ -35937,9 +37508,10 @@ entities: - canCollide: False type: Physics - uid: 3610 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,5.5 parent: 853 type: Transform @@ -35948,9 +37520,10 @@ entities: - canCollide: False type: Physics - uid: 3611 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,5.5 parent: 853 type: Transform @@ -35959,9 +37532,10 @@ entities: - canCollide: False type: Physics - uid: 3612 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 39.5,5.5 parent: 853 type: Transform @@ -35978,10 +37552,6 @@ entities: type: Transform - startingCharge: 3200172 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 3614 type: SalternSubstation components: @@ -35991,10 +37561,6 @@ entities: type: Transform - startingCharge: 3200172 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 3615 type: SalternSubstation components: @@ -36004,10 +37570,6 @@ entities: type: Transform - startingCharge: 3200172 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 3616 type: SalternSubstation components: @@ -36017,10 +37579,6 @@ entities: type: Transform - startingCharge: 3200172 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 3617 type: BedsheetSpawner components: @@ -36037,14 +37595,11 @@ entities: type: Transform - startingCharge: 3200172 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 3619 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-22.5 parent: 853 type: Transform @@ -36059,10 +37614,6 @@ entities: type: Transform - startingCharge: 3200172 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 3621 type: SalternSubstation components: @@ -36072,10 +37623,6 @@ entities: type: Transform - startingCharge: 3200172 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 3622 type: SalternSubstation components: @@ -36085,59 +37632,61 @@ entities: type: Transform - startingCharge: 3200172 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 3623 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 27.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3624 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3625 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 28.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3626 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3627 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 25.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3628 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,13.5 parent: 853 type: Transform @@ -36146,18 +37695,20 @@ entities: - canCollide: False type: Physics - uid: 3629 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3630 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 24.5,12.5 parent: 853 type: Transform @@ -36166,9 +37717,10 @@ entities: - canCollide: False type: Physics - uid: 3631 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 23.5,12.5 parent: 853 type: Transform @@ -36177,9 +37729,10 @@ entities: - canCollide: False type: Physics - uid: 3632 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,12.5 parent: 853 type: Transform @@ -36188,9 +37741,10 @@ entities: - canCollide: False type: Physics - uid: 3633 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,12.5 parent: 853 type: Transform @@ -36199,9 +37753,10 @@ entities: - canCollide: False type: Physics - uid: 3634 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 20.5,12.5 parent: 853 type: Transform @@ -36210,9 +37765,10 @@ entities: - canCollide: False type: Physics - uid: 3635 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 19.5,12.5 parent: 853 type: Transform @@ -36221,9 +37777,10 @@ entities: - canCollide: False type: Physics - uid: 3636 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,12.5 parent: 853 type: Transform @@ -36232,18 +37789,20 @@ entities: - canCollide: False type: Physics - uid: 3637 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 17.5,12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3638 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,12.5 parent: 853 type: Transform @@ -36252,9 +37811,10 @@ entities: - canCollide: False type: Physics - uid: 3639 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,12.5 parent: 853 type: Transform @@ -36263,9 +37823,10 @@ entities: - canCollide: False type: Physics - uid: 3640 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,12.5 parent: 853 type: Transform @@ -36274,9 +37835,10 @@ entities: - canCollide: False type: Physics - uid: 3641 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,12.5 parent: 853 type: Transform @@ -36285,9 +37847,10 @@ entities: - canCollide: False type: Physics - uid: 3642 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,12.5 parent: 853 type: Transform @@ -36296,27 +37859,30 @@ entities: - canCollide: False type: Physics - uid: 3643 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3644 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3645 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,24.5 parent: 853 type: Transform @@ -36325,18 +37891,20 @@ entities: - canCollide: False type: Physics - uid: 3646 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3647 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,23.5 parent: 853 type: Transform @@ -36345,18 +37913,20 @@ entities: - canCollide: False type: Physics - uid: 3648 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3649 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,24.5 parent: 853 type: Transform @@ -36365,9 +37935,10 @@ entities: - canCollide: False type: Physics - uid: 3650 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,25.5 parent: 853 type: Transform @@ -36376,9 +37947,10 @@ entities: - canCollide: False type: Physics - uid: 3651 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,26.5 parent: 853 type: Transform @@ -36387,9 +37959,10 @@ entities: - canCollide: False type: Physics - uid: 3652 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,26.5 parent: 853 type: Transform @@ -36398,18 +37971,20 @@ entities: - canCollide: False type: Physics - uid: 3653 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,27.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3654 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,25.5 parent: 853 type: Transform @@ -36418,9 +37993,10 @@ entities: - canCollide: False type: Physics - uid: 3655 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,25.5 parent: 853 type: Transform @@ -36429,9 +38005,10 @@ entities: - canCollide: False type: Physics - uid: 3656 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 6.5,25.5 parent: 853 type: Transform @@ -36440,9 +38017,10 @@ entities: - canCollide: False type: Physics - uid: 3657 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 5.5,25.5 parent: 853 type: Transform @@ -36451,9 +38029,10 @@ entities: - canCollide: False type: Physics - uid: 3658 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 4.5,25.5 parent: 853 type: Transform @@ -36462,9 +38041,10 @@ entities: - canCollide: False type: Physics - uid: 3659 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 3.5,25.5 parent: 853 type: Transform @@ -36473,9 +38053,10 @@ entities: - canCollide: False type: Physics - uid: 3660 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 2.5,25.5 parent: 853 type: Transform @@ -36484,9 +38065,10 @@ entities: - canCollide: False type: Physics - uid: 3661 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 1.5,25.5 parent: 853 type: Transform @@ -36495,9 +38077,10 @@ entities: - canCollide: False type: Physics - uid: 3662 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,25.5 parent: 853 type: Transform @@ -36506,9 +38089,10 @@ entities: - canCollide: False type: Physics - uid: 3663 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,26.5 parent: 853 type: Transform @@ -36517,9 +38101,10 @@ entities: - canCollide: False type: Physics - uid: 3664 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,26.5 parent: 853 type: Transform @@ -36528,9 +38113,10 @@ entities: - canCollide: False type: Physics - uid: 3665 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,26.5 parent: 853 type: Transform @@ -36539,9 +38125,10 @@ entities: - canCollide: False type: Physics - uid: 3666 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,26.5 parent: 853 type: Transform @@ -36550,9 +38137,10 @@ entities: - canCollide: False type: Physics - uid: 3667 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,26.5 parent: 853 type: Transform @@ -36561,27 +38149,30 @@ entities: - canCollide: False type: Physics - uid: 3668 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,27.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3669 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3670 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,-0.5 parent: 853 type: Transform @@ -36590,9 +38181,10 @@ entities: - canCollide: False type: Physics - uid: 3671 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,0.5 parent: 853 type: Transform @@ -36601,9 +38193,10 @@ entities: - canCollide: False type: Physics - uid: 3672 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,1.5 parent: 853 type: Transform @@ -36612,9 +38205,10 @@ entities: - canCollide: False type: Physics - uid: 3673 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,1.5 parent: 853 type: Transform @@ -36623,9 +38217,10 @@ entities: - canCollide: False type: Physics - uid: 3674 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,1.5 parent: 853 type: Transform @@ -36634,9 +38229,10 @@ entities: - canCollide: False type: Physics - uid: 3675 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,1.5 parent: 853 type: Transform @@ -36645,9 +38241,10 @@ entities: - canCollide: False type: Physics - uid: 3676 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,1.5 parent: 853 type: Transform @@ -36656,9 +38253,10 @@ entities: - canCollide: False type: Physics - uid: 3677 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,1.5 parent: 853 type: Transform @@ -36667,9 +38265,10 @@ entities: - canCollide: False type: Physics - uid: 3678 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,0.5 parent: 853 type: Transform @@ -36678,9 +38277,10 @@ entities: - canCollide: False type: Physics - uid: 3679 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-0.5 parent: 853 type: Transform @@ -36689,54 +38289,60 @@ entities: - canCollide: False type: Physics - uid: 3680 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3681 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3682 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3683 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3684 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,-0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3685 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-0.5 parent: 853 type: Transform @@ -36745,9 +38351,10 @@ entities: - canCollide: False type: Physics - uid: 3686 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 39.5,-0.5 parent: 853 type: Transform @@ -36756,9 +38363,10 @@ entities: - canCollide: False type: Physics - uid: 3687 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 38.5,-0.5 parent: 853 type: Transform @@ -36767,9 +38375,10 @@ entities: - canCollide: False type: Physics - uid: 3688 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 37.5,-0.5 parent: 853 type: Transform @@ -36778,18 +38387,20 @@ entities: - canCollide: False type: Physics - uid: 3689 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 36.5,-0.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3690 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 35.5,-0.5 parent: 853 type: Transform @@ -36798,9 +38409,10 @@ entities: - canCollide: False type: Physics - uid: 3691 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 34.5,-0.5 parent: 853 type: Transform @@ -36809,9 +38421,10 @@ entities: - canCollide: False type: Physics - uid: 3692 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 33.5,-0.5 parent: 853 type: Transform @@ -36820,9 +38433,10 @@ entities: - canCollide: False type: Physics - uid: 3693 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 32.5,-0.5 parent: 853 type: Transform @@ -36831,9 +38445,10 @@ entities: - canCollide: False type: Physics - uid: 3694 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 32.5,0.5 parent: 853 type: Transform @@ -36842,9 +38457,10 @@ entities: - canCollide: False type: Physics - uid: 3695 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,0.5 parent: 853 type: Transform @@ -36853,18 +38469,20 @@ entities: - canCollide: False type: Physics - uid: 3696 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 31.5,1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3697 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,2.5 parent: 853 type: Transform @@ -36873,9 +38491,10 @@ entities: - canCollide: False type: Physics - uid: 3698 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,3.5 parent: 853 type: Transform @@ -36884,9 +38503,10 @@ entities: - canCollide: False type: Physics - uid: 3699 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,4.5 parent: 853 type: Transform @@ -36895,9 +38515,10 @@ entities: - canCollide: False type: Physics - uid: 3700 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,5.5 parent: 853 type: Transform @@ -36906,9 +38527,10 @@ entities: - canCollide: False type: Physics - uid: 3701 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,6.5 parent: 853 type: Transform @@ -36917,9 +38539,10 @@ entities: - canCollide: False type: Physics - uid: 3702 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,7.5 parent: 853 type: Transform @@ -36928,9 +38551,10 @@ entities: - canCollide: False type: Physics - uid: 3703 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,8.5 parent: 853 type: Transform @@ -36939,9 +38563,10 @@ entities: - canCollide: False type: Physics - uid: 3704 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,9.5 parent: 853 type: Transform @@ -36950,36 +38575,40 @@ entities: - canCollide: False type: Physics - uid: 3705 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3706 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3707 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3708 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-7.5 parent: 853 type: Transform @@ -36988,9 +38617,10 @@ entities: - canCollide: False type: Physics - uid: 3709 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-6.5 parent: 853 type: Transform @@ -36999,9 +38629,10 @@ entities: - canCollide: False type: Physics - uid: 3710 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-5.5 parent: 853 type: Transform @@ -37010,9 +38641,10 @@ entities: - canCollide: False type: Physics - uid: 3711 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-4.5 parent: 853 type: Transform @@ -37021,9 +38653,10 @@ entities: - canCollide: False type: Physics - uid: 3712 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-4.5 parent: 853 type: Transform @@ -37032,27 +38665,30 @@ entities: - canCollide: False type: Physics - uid: 3713 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 22.5,-3.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3714 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 20.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3715 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 19.5,-9.5 parent: 853 type: Transform @@ -37061,18 +38697,20 @@ entities: - canCollide: False type: Physics - uid: 3716 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 21.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3717 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 18.5,-9.5 parent: 853 type: Transform @@ -37081,9 +38719,10 @@ entities: - canCollide: False type: Physics - uid: 3718 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 17.5,-9.5 parent: 853 type: Transform @@ -37092,9 +38731,10 @@ entities: - canCollide: False type: Physics - uid: 3719 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,-9.5 parent: 853 type: Transform @@ -37103,9 +38743,10 @@ entities: - canCollide: False type: Physics - uid: 3720 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-9.5 parent: 853 type: Transform @@ -37114,9 +38755,10 @@ entities: - canCollide: False type: Physics - uid: 3721 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 14.5,-9.5 parent: 853 type: Transform @@ -37125,9 +38767,10 @@ entities: - canCollide: False type: Physics - uid: 3722 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 13.5,-9.5 parent: 853 type: Transform @@ -37136,9 +38779,10 @@ entities: - canCollide: False type: Physics - uid: 3723 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 12.5,-9.5 parent: 853 type: Transform @@ -37147,9 +38791,10 @@ entities: - canCollide: False type: Physics - uid: 3724 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 11.5,-9.5 parent: 853 type: Transform @@ -37158,9 +38803,10 @@ entities: - canCollide: False type: Physics - uid: 3725 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 10.5,-9.5 parent: 853 type: Transform @@ -37169,9 +38815,10 @@ entities: - canCollide: False type: Physics - uid: 3726 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 9.5,-9.5 parent: 853 type: Transform @@ -37180,9 +38827,10 @@ entities: - canCollide: False type: Physics - uid: 3727 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-9.5 parent: 853 type: Transform @@ -37191,9 +38839,10 @@ entities: - canCollide: False type: Physics - uid: 3728 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-10.5 parent: 853 type: Transform @@ -37202,9 +38851,10 @@ entities: - canCollide: False type: Physics - uid: 3729 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-11.5 parent: 853 type: Transform @@ -37213,9 +38863,10 @@ entities: - canCollide: False type: Physics - uid: 3730 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-12.5 parent: 853 type: Transform @@ -37224,9 +38875,10 @@ entities: - canCollide: False type: Physics - uid: 3731 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-13.5 parent: 853 type: Transform @@ -37235,9 +38887,10 @@ entities: - canCollide: False type: Physics - uid: 3732 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-14.5 parent: 853 type: Transform @@ -37246,9 +38899,10 @@ entities: - canCollide: False type: Physics - uid: 3733 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-15.5 parent: 853 type: Transform @@ -37257,9 +38911,10 @@ entities: - canCollide: False type: Physics - uid: 3734 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 8.5,-16.5 parent: 853 type: Transform @@ -37268,9 +38923,10 @@ entities: - canCollide: False type: Physics - uid: 3735 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-16.5 parent: 853 type: Transform @@ -37279,18 +38935,20 @@ entities: - canCollide: False type: Physics - uid: 3736 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 7.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3737 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-8.5 parent: 853 type: Transform @@ -37299,9 +38957,10 @@ entities: - canCollide: False type: Physics - uid: 3738 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-7.5 parent: 853 type: Transform @@ -37310,9 +38969,10 @@ entities: - canCollide: False type: Physics - uid: 3739 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-6.5 parent: 853 type: Transform @@ -37321,9 +38981,10 @@ entities: - canCollide: False type: Physics - uid: 3740 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-5.5 parent: 853 type: Transform @@ -37332,9 +38993,10 @@ entities: - canCollide: False type: Physics - uid: 3741 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-4.5 parent: 853 type: Transform @@ -37343,9 +39005,10 @@ entities: - canCollide: False type: Physics - uid: 3742 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-3.5 parent: 853 type: Transform @@ -37354,9 +39017,10 @@ entities: - canCollide: False type: Physics - uid: 3743 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-2.5 parent: 853 type: Transform @@ -37365,9 +39029,10 @@ entities: - canCollide: False type: Physics - uid: 3744 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-1.5 parent: 853 type: Transform @@ -37376,9 +39041,10 @@ entities: - canCollide: False type: Physics - uid: 3745 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,-0.5 parent: 853 type: Transform @@ -37387,9 +39053,10 @@ entities: - canCollide: False type: Physics - uid: 3746 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,0.5 parent: 853 type: Transform @@ -37398,9 +39065,10 @@ entities: - canCollide: False type: Physics - uid: 3747 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 15.5,1.5 parent: 853 type: Transform @@ -37409,9 +39077,10 @@ entities: - canCollide: False type: Physics - uid: 3748 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,1.5 parent: 853 type: Transform @@ -37420,36 +39089,40 @@ entities: - canCollide: False type: Physics - uid: 3749 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 16.5,2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3750 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3751 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3752 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-20.5 parent: 853 type: Transform @@ -37458,9 +39131,10 @@ entities: - canCollide: False type: Physics - uid: 3753 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,15.5 parent: 853 type: Transform @@ -37469,9 +39143,10 @@ entities: - canCollide: False type: Physics - uid: 3754 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-19.5 parent: 853 type: Transform @@ -37480,18 +39155,20 @@ entities: - canCollide: False type: Physics - uid: 3755 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3756 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-20.5 parent: 853 type: Transform @@ -37500,9 +39177,10 @@ entities: - canCollide: False type: Physics - uid: 3757 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,-20.5 parent: 853 type: Transform @@ -37511,9 +39189,10 @@ entities: - canCollide: False type: Physics - uid: 3758 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-20.5 parent: 853 type: Transform @@ -37522,9 +39201,10 @@ entities: - canCollide: False type: Physics - uid: 3759 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-20.5 parent: 853 type: Transform @@ -37533,9 +39213,10 @@ entities: - canCollide: False type: Physics - uid: 3760 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-20.5 parent: 853 type: Transform @@ -37544,9 +39225,10 @@ entities: - canCollide: False type: Physics - uid: 3761 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-20.5 parent: 853 type: Transform @@ -37555,9 +39237,10 @@ entities: - canCollide: False type: Physics - uid: 3762 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-20.5 parent: 853 type: Transform @@ -37566,9 +39249,10 @@ entities: - canCollide: False type: Physics - uid: 3763 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,-20.5 parent: 853 type: Transform @@ -37577,9 +39261,10 @@ entities: - canCollide: False type: Physics - uid: 3764 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-20.5 parent: 853 type: Transform @@ -37588,18 +39273,20 @@ entities: - canCollide: False type: Physics - uid: 3765 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3766 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,-20.5 parent: 853 type: Transform @@ -37608,9 +39295,10 @@ entities: - canCollide: False type: Physics - uid: 3767 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-20.5 parent: 853 type: Transform @@ -37619,9 +39307,10 @@ entities: - canCollide: False type: Physics - uid: 3768 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-20.5 parent: 853 type: Transform @@ -37630,9 +39319,10 @@ entities: - canCollide: False type: Physics - uid: 3769 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,-20.5 parent: 853 type: Transform @@ -37641,9 +39331,10 @@ entities: - canCollide: False type: Physics - uid: 3770 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,-19.5 parent: 853 type: Transform @@ -37652,9 +39343,10 @@ entities: - canCollide: False type: Physics - uid: 3771 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,-18.5 parent: 853 type: Transform @@ -37663,9 +39355,10 @@ entities: - canCollide: False type: Physics - uid: 3772 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,-17.5 parent: 853 type: Transform @@ -37674,9 +39367,10 @@ entities: - canCollide: False type: Physics - uid: 3773 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-17.5 parent: 853 type: Transform @@ -37685,18 +39379,20 @@ entities: - canCollide: False type: Physics - uid: 3774 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3775 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-6.5 parent: 853 type: Transform @@ -37705,27 +39401,30 @@ entities: - canCollide: False type: Physics - uid: 3776 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3777 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3778 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -0.5,-8.5 parent: 853 type: Transform @@ -37734,9 +39433,10 @@ entities: - canCollide: False type: Physics - uid: 3779 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-8.5 parent: 853 type: Transform @@ -37745,9 +39445,10 @@ entities: - canCollide: False type: Physics - uid: 3780 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -1.5,-9.5 parent: 853 type: Transform @@ -37756,9 +39457,10 @@ entities: - canCollide: False type: Physics - uid: 3781 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,-9.5 parent: 853 type: Transform @@ -37767,9 +39469,10 @@ entities: - canCollide: False type: Physics - uid: 3782 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,-9.5 parent: 853 type: Transform @@ -37778,9 +39481,10 @@ entities: - canCollide: False type: Physics - uid: 3783 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-9.5 parent: 853 type: Transform @@ -37789,9 +39493,10 @@ entities: - canCollide: False type: Physics - uid: 3784 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-9.5 parent: 853 type: Transform @@ -37800,18 +39505,20 @@ entities: - canCollide: False type: Physics - uid: 3785 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3786 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,-9.5 parent: 853 type: Transform @@ -37820,9 +39527,10 @@ entities: - canCollide: False type: Physics - uid: 3787 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,-9.5 parent: 853 type: Transform @@ -37831,9 +39539,10 @@ entities: - canCollide: False type: Physics - uid: 3788 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,-9.5 parent: 853 type: Transform @@ -37842,27 +39551,30 @@ entities: - canCollide: False type: Physics - uid: 3789 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3790 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3791 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-7.5 parent: 853 type: Transform @@ -37871,9 +39583,10 @@ entities: - canCollide: False type: Physics - uid: 3792 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,-6.5 parent: 853 type: Transform @@ -37882,9 +39595,10 @@ entities: - canCollide: False type: Physics - uid: 3793 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,-6.5 parent: 853 type: Transform @@ -37893,9 +39607,10 @@ entities: - canCollide: False type: Physics - uid: 3794 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,-6.5 parent: 853 type: Transform @@ -37904,9 +39619,10 @@ entities: - canCollide: False type: Physics - uid: 3795 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-6.5 parent: 853 type: Transform @@ -37915,18 +39631,20 @@ entities: - canCollide: False type: Physics - uid: 3796 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-5.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3797 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-4.5 parent: 853 type: Transform @@ -37935,9 +39653,10 @@ entities: - canCollide: False type: Physics - uid: 3798 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-3.5 parent: 853 type: Transform @@ -37946,9 +39665,10 @@ entities: - canCollide: False type: Physics - uid: 3799 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-2.5 parent: 853 type: Transform @@ -37957,9 +39677,10 @@ entities: - canCollide: False type: Physics - uid: 3800 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-1.5 parent: 853 type: Transform @@ -37968,9 +39689,10 @@ entities: - canCollide: False type: Physics - uid: 3801 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,-0.5 parent: 853 type: Transform @@ -37979,9 +39701,10 @@ entities: - canCollide: False type: Physics - uid: 3802 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,0.5 parent: 853 type: Transform @@ -37990,9 +39713,10 @@ entities: - canCollide: False type: Physics - uid: 3803 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,1.5 parent: 853 type: Transform @@ -38001,9 +39725,10 @@ entities: - canCollide: False type: Physics - uid: 3804 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,1.5 parent: 853 type: Transform @@ -38012,18 +39737,20 @@ entities: - canCollide: False type: Physics - uid: 3805 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3806 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,-10.5 parent: 853 type: Transform @@ -38032,18 +39759,20 @@ entities: - canCollide: False type: Physics - uid: 3807 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3808 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,-8.5 parent: 853 type: Transform @@ -38052,18 +39781,20 @@ entities: - canCollide: False type: Physics - uid: 3809 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3810 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -19.5,-8.5 parent: 853 type: Transform @@ -38072,9 +39803,10 @@ entities: - canCollide: False type: Physics - uid: 3811 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-8.5 parent: 853 type: Transform @@ -38083,9 +39815,10 @@ entities: - canCollide: False type: Physics - uid: 3812 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,-8.5 parent: 853 type: Transform @@ -38094,9 +39827,10 @@ entities: - canCollide: False type: Physics - uid: 3813 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -17.5,-9.5 parent: 853 type: Transform @@ -38105,18 +39839,20 @@ entities: - canCollide: False type: Physics - uid: 3814 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3815 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,-9.5 parent: 853 type: Transform @@ -38125,9 +39861,10 @@ entities: - canCollide: False type: Physics - uid: 3816 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-9.5 parent: 853 type: Transform @@ -38136,9 +39873,10 @@ entities: - canCollide: False type: Physics - uid: 3817 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-8.5 parent: 853 type: Transform @@ -38147,9 +39885,10 @@ entities: - canCollide: False type: Physics - uid: 3818 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -22.5,-8.5 parent: 853 type: Transform @@ -38158,36 +39897,40 @@ entities: - canCollide: False type: Physics - uid: 3819 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3820 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -21.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3821 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3822 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,-8.5 parent: 853 type: Transform @@ -38196,9 +39939,10 @@ entities: - canCollide: False type: Physics - uid: 3823 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -24.5,-8.5 parent: 853 type: Transform @@ -38207,9 +39951,10 @@ entities: - canCollide: False type: Physics - uid: 3824 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -25.5,-8.5 parent: 853 type: Transform @@ -38218,18 +39963,20 @@ entities: - canCollide: False type: Physics - uid: 3825 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3826 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -27.5,-8.5 parent: 853 type: Transform @@ -38238,9 +39985,10 @@ entities: - canCollide: False type: Physics - uid: 3827 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,-8.5 parent: 853 type: Transform @@ -38249,9 +39997,10 @@ entities: - canCollide: False type: Physics - uid: 3828 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,-8.5 parent: 853 type: Transform @@ -38260,9 +40009,10 @@ entities: - canCollide: False type: Physics - uid: 3829 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,-7.5 parent: 853 type: Transform @@ -38271,18 +40021,20 @@ entities: - canCollide: False type: Physics - uid: 3830 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3831 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,-5.5 parent: 853 type: Transform @@ -38291,9 +40043,10 @@ entities: - canCollide: False type: Physics - uid: 3832 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,-4.5 parent: 853 type: Transform @@ -38302,9 +40055,10 @@ entities: - canCollide: False type: Physics - uid: 3833 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-4.5 parent: 853 type: Transform @@ -38313,54 +40067,60 @@ entities: - canCollide: False type: Physics - uid: 3834 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,-3.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3835 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3836 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3837 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3838 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -33.5,9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3839 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -34.5,9.5 parent: 853 type: Transform @@ -38369,9 +40129,10 @@ entities: - canCollide: False type: Physics - uid: 3840 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -35.5,9.5 parent: 853 type: Transform @@ -38380,9 +40141,10 @@ entities: - canCollide: False type: Physics - uid: 3841 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -36.5,9.5 parent: 853 type: Transform @@ -38391,9 +40153,10 @@ entities: - canCollide: False type: Physics - uid: 3842 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -37.5,9.5 parent: 853 type: Transform @@ -38402,9 +40165,10 @@ entities: - canCollide: False type: Physics - uid: 3843 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -38.5,9.5 parent: 853 type: Transform @@ -38413,9 +40177,10 @@ entities: - canCollide: False type: Physics - uid: 3844 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -38.5,10.5 parent: 853 type: Transform @@ -38424,9 +40189,10 @@ entities: - canCollide: False type: Physics - uid: 3845 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -39.5,10.5 parent: 853 type: Transform @@ -38435,27 +40201,30 @@ entities: - canCollide: False type: Physics - uid: 3846 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -39.5,11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3847 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3848 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -31.5,9.5 parent: 853 type: Transform @@ -38464,9 +40233,10 @@ entities: - canCollide: False type: Physics - uid: 3849 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -31.5,10.5 parent: 853 type: Transform @@ -38475,9 +40245,10 @@ entities: - canCollide: False type: Physics - uid: 3850 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -31.5,11.5 parent: 853 type: Transform @@ -38486,9 +40257,10 @@ entities: - canCollide: False type: Physics - uid: 3851 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -31.5,12.5 parent: 853 type: Transform @@ -38497,9 +40269,10 @@ entities: - canCollide: False type: Physics - uid: 3852 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -31.5,13.5 parent: 853 type: Transform @@ -38508,9 +40281,10 @@ entities: - canCollide: False type: Physics - uid: 3853 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -30.5,13.5 parent: 853 type: Transform @@ -38519,9 +40293,10 @@ entities: - canCollide: False type: Physics - uid: 3854 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -29.5,13.5 parent: 853 type: Transform @@ -38530,9 +40305,10 @@ entities: - canCollide: False type: Physics - uid: 3855 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -28.5,13.5 parent: 853 type: Transform @@ -38541,18 +40317,20 @@ entities: - canCollide: False type: Physics - uid: 3856 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3857 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,16.5 parent: 853 type: Transform @@ -38561,9 +40339,10 @@ entities: - canCollide: False type: Physics - uid: 3858 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,16.5 parent: 853 type: Transform @@ -38572,9 +40351,10 @@ entities: - canCollide: False type: Physics - uid: 3859 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,15.5 parent: 853 type: Transform @@ -38583,9 +40363,10 @@ entities: - canCollide: False type: Physics - uid: 3860 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,14.5 parent: 853 type: Transform @@ -38594,9 +40375,10 @@ entities: - canCollide: False type: Physics - uid: 3861 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -13.5,13.5 parent: 853 type: Transform @@ -38605,9 +40387,10 @@ entities: - canCollide: False type: Physics - uid: 3862 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,13.5 parent: 853 type: Transform @@ -38616,18 +40399,20 @@ entities: - canCollide: False type: Physics - uid: 3863 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3864 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -11.5,13.5 parent: 853 type: Transform @@ -38636,18 +40421,20 @@ entities: - canCollide: False type: Physics - uid: 3865 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -10.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3866 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -9.5,13.5 parent: 853 type: Transform @@ -38656,9 +40443,10 @@ entities: - canCollide: False type: Physics - uid: 3867 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -8.5,13.5 parent: 853 type: Transform @@ -38667,9 +40455,10 @@ entities: - canCollide: False type: Physics - uid: 3868 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -7.5,13.5 parent: 853 type: Transform @@ -38678,9 +40467,10 @@ entities: - canCollide: False type: Physics - uid: 3869 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -6.5,13.5 parent: 853 type: Transform @@ -38689,9 +40479,10 @@ entities: - canCollide: False type: Physics - uid: 3870 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,13.5 parent: 853 type: Transform @@ -38700,9 +40491,10 @@ entities: - canCollide: False type: Physics - uid: 3871 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,13.5 parent: 853 type: Transform @@ -38711,9 +40503,10 @@ entities: - canCollide: False type: Physics - uid: 3872 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,13.5 parent: 853 type: Transform @@ -38722,9 +40515,10 @@ entities: - canCollide: False type: Physics - uid: 3873 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,14.5 parent: 853 type: Transform @@ -38733,27 +40527,30 @@ entities: - canCollide: False type: Physics - uid: 3874 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -3.5,15.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3875 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -15.5,16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3876 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -16.5,16.5 parent: 853 type: Transform @@ -38775,13 +40572,16 @@ entities: pos: -15.015614,20.502157 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 3879 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 22.5,-7.5 + - anchored: True + pos: 22.5,-7.5 parent: 853 type: Transform - visible: False @@ -38826,7 +40626,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3884 @@ -38837,7 +40637,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3885 @@ -38848,7 +40648,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3886 @@ -38859,7 +40659,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3887 @@ -38870,7 +40670,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3888 @@ -38881,7 +40681,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3889 @@ -38892,7 +40692,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3890 @@ -38903,7 +40703,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3891 @@ -38914,7 +40714,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3892 @@ -38925,7 +40725,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3893 @@ -38936,7 +40736,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3894 @@ -38947,7 +40747,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3895 @@ -38958,7 +40758,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3896 @@ -38969,7 +40769,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3897 @@ -38980,7 +40780,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3898 @@ -38991,7 +40791,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3899 @@ -39002,7 +40802,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3900 @@ -39013,7 +40813,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3901 @@ -39024,7 +40824,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3902 @@ -39035,7 +40835,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3903 @@ -39046,7 +40846,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3904 @@ -39065,7 +40865,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3906 @@ -39076,7 +40876,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3907 @@ -39087,7 +40887,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3908 @@ -39098,7 +40898,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3909 @@ -39109,7 +40909,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3910 @@ -39120,13 +40920,14 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3911 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -24.5,10.5 parent: 853 type: Transform @@ -39135,9 +40936,10 @@ entities: - canCollide: False type: Physics - uid: 3912 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -24.5,11.5 parent: 853 type: Transform @@ -39146,9 +40948,10 @@ entities: - canCollide: False type: Physics - uid: 3913 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,7.5 parent: 853 type: Transform @@ -39159,14 +40962,16 @@ entities: - uid: 3914 type: SalternGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,7.5 parent: 853 type: Transform - uid: 3915 type: SalternGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,7.5 parent: 853 type: Transform @@ -39177,6 +40982,8 @@ entities: pos: 6.105843,-25.592358 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -39188,7 +40995,7 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -39214,21 +41021,20 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 3921 type: SalternApc components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -12.5,12.5 parent: 853 type: Transform - startingCharge: 11999.217 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 3922 type: EmergencyLight components: @@ -39237,7 +41043,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3923 @@ -39248,7 +41054,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3924 @@ -39259,7 +41065,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3925 @@ -39270,7 +41076,7 @@ entities: parent: 853 type: Transform - powerLoad: 1 - type: PowerReceiver + type: ApcPowerReceiver - startingCharge: 30000 type: Battery - uid: 3926 @@ -39326,21 +41132,21 @@ entities: parent: 853 type: Transform - uid: 3933 - type: HVWireStack + type: CableHVStack components: - rot: 4.371139006309477E-08 rad pos: 50.5,4.5 parent: 853 type: Transform - uid: 3934 - type: MVWireStack + type: CableMVStack components: - rot: 4.371139006309477E-08 rad pos: 50.288177,4.693361 parent: 853 type: Transform - uid: 3935 - type: ApcExtensionCableStack + type: CableApcStack components: - rot: 4.371139006309477E-08 rad pos: 50.053802,4.474611 @@ -39408,9 +41214,10 @@ entities: - canCollide: False type: Physics - uid: 3944 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 3.5,0.5 + - anchored: True + pos: 3.5,0.5 parent: 853 type: Transform - visible: False @@ -39418,25 +41225,28 @@ entities: - canCollide: False type: Physics - uid: 3945 - type: MVWire + type: CableMV components: - - pos: 13.5,-24.5 + - anchored: True + pos: 13.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3946 - type: MVWire + type: CableMV components: - - pos: 13.5,-23.5 + - anchored: True + pos: 13.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3947 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 8.5,20.5 + - anchored: True + pos: 8.5,20.5 parent: 853 type: Transform - visible: False @@ -39462,9 +41272,10 @@ entities: - airBlocked: False type: Airtight - uid: 3950 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 3.5,1.5 + - anchored: True + pos: 3.5,1.5 parent: 853 type: Transform - visible: False @@ -39526,9 +41337,10 @@ entities: - airBlocked: False type: Airtight - uid: 3957 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 2.5,0.5 + - anchored: True + pos: 2.5,0.5 parent: 853 type: Transform - visible: False @@ -39536,9 +41348,10 @@ entities: - canCollide: False type: Physics - uid: 3958 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 1.5,0.5 + - anchored: True + pos: 1.5,0.5 parent: 853 type: Transform - visible: False @@ -39582,9 +41395,10 @@ entities: - airBlocked: False type: Airtight - uid: 3963 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -31.5,5.5 + - anchored: True + pos: -31.5,5.5 parent: 853 type: Transform - visible: False @@ -39592,9 +41406,10 @@ entities: - canCollide: False type: Physics - uid: 3964 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 7.5,20.5 + - anchored: True + pos: 7.5,20.5 parent: 853 type: Transform - visible: False @@ -39620,9 +41435,10 @@ entities: - airBlocked: False type: Airtight - uid: 3967 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -30.5,5.5 + - anchored: True + pos: -30.5,5.5 parent: 853 type: Transform - visible: False @@ -39630,9 +41446,10 @@ entities: - canCollide: False type: Physics - uid: 3968 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -23.5,5.5 parent: 853 type: Transform @@ -39659,9 +41476,10 @@ entities: - airBlocked: False type: Airtight - uid: 3971 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 12.5,-8.5 + - anchored: True + pos: 12.5,-8.5 parent: 853 type: Transform - visible: False @@ -39671,7 +41489,8 @@ entities: - uid: 3972 type: DisposalPipe components: - - rot: 4.71238902409608 rad + - anchored: True + rot: 4.71238902409608 rad pos: 25.5,3.5 parent: 853 type: Transform @@ -39688,9 +41507,10 @@ entities: - canCollide: False type: Physics - uid: 3974 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 2.5,6.5 + - anchored: True + pos: 2.5,6.5 parent: 853 type: Transform - visible: False @@ -39698,27 +41518,30 @@ entities: - canCollide: False type: Physics - uid: 3975 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,7.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3976 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3977 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -21.5,13.5 + - anchored: True + pos: -21.5,13.5 parent: 853 type: Transform - visible: False @@ -39735,18 +41558,20 @@ entities: - airBlocked: False type: Airtight - uid: 3979 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 3980 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -26.5,5.5 parent: 853 type: Transform @@ -39762,9 +41587,10 @@ entities: parent: 853 type: Transform - uid: 3982 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 3.5,6.5 + - anchored: True + pos: 3.5,6.5 parent: 853 type: Transform - visible: False @@ -39772,9 +41598,10 @@ entities: - canCollide: False type: Physics - uid: 3983 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 4.5,6.5 + - anchored: True + pos: 4.5,6.5 parent: 853 type: Transform - visible: False @@ -39800,9 +41627,10 @@ entities: - airBlocked: False type: Airtight - uid: 3986 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 12.5,-9.5 + - anchored: True + pos: 12.5,-9.5 parent: 853 type: Transform - visible: False @@ -39846,9 +41674,10 @@ entities: - airBlocked: False type: Airtight - uid: 3991 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -32.5,-8.5 + - anchored: True + pos: -32.5,-8.5 parent: 853 type: Transform - visible: False @@ -39973,9 +41802,10 @@ entities: parent: 853 type: Transform - uid: 4005 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -32.5,-7.5 + - anchored: True + pos: -32.5,-7.5 parent: 853 type: Transform - visible: False @@ -40014,6 +41844,8 @@ entities: pos: 2.100807,-25.514233 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -40111,9 +41943,10 @@ entities: - canCollide: False type: Physics - uid: 4021 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 23.5,-18.5 + - anchored: True + pos: 23.5,-18.5 parent: 853 type: Transform - visible: False @@ -40144,6 +41977,8 @@ entities: - pos: 7.512093,-22.139233 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -40209,6 +42044,8 @@ entities: pos: -22.097801,-0.5190892 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -40331,33 +42168,37 @@ entities: parent: 853 type: Transform - uid: 4048 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -18.5,13.5 + - anchored: True + pos: -18.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4049 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -17.5,13.5 + - anchored: True + pos: -17.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4050 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -17.5,14.5 + - anchored: True + pos: -17.5,14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4051 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-26.5 parent: 853 type: Transform @@ -40372,9 +42213,10 @@ entities: - airBlocked: False type: Airtight - uid: 4053 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -5.5,-26.5 parent: 853 type: Transform @@ -40389,9 +42231,10 @@ entities: - airBlocked: False type: Airtight - uid: 4055 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -4.5,-26.5 parent: 853 type: Transform @@ -40454,9 +42297,10 @@ entities: - airBlocked: False type: Airtight - uid: 4063 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -20.5,13.5 + - anchored: True + pos: -20.5,13.5 parent: 853 type: Transform - canCollide: False @@ -40471,9 +42315,10 @@ entities: - airBlocked: False type: Airtight - uid: 4065 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -8.5,-7.5 + - anchored: True + pos: -8.5,-7.5 parent: 853 type: Transform - visible: False @@ -40481,9 +42326,10 @@ entities: - canCollide: False type: Physics - uid: 4066 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -32.5,-6.5 + - anchored: True + pos: -32.5,-6.5 parent: 853 type: Transform - canCollide: False @@ -40505,9 +42351,10 @@ entities: - airBlocked: False type: Airtight - uid: 4069 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -26.5,4.5 + - anchored: True + pos: -26.5,4.5 parent: 853 type: Transform - visible: False @@ -40541,25 +42388,28 @@ entities: - airBlocked: False type: Airtight - uid: 4073 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -19.5,13.5 + - anchored: True + pos: -19.5,13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4074 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 0.5,6.5 + - anchored: True + pos: 0.5,6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4075 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -0.5,6.5 + - anchored: True + pos: -0.5,6.5 parent: 853 type: Transform - canCollide: False @@ -40592,9 +42442,10 @@ entities: parent: 853 type: Transform - uid: 4080 - type: MVWire + type: CableMV components: - - pos: -5.5,-7.5 + - anchored: True + pos: -5.5,-7.5 parent: 853 type: Transform - visible: False @@ -40777,7 +42628,8 @@ entities: - uid: 4105 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -32.5,-7.5 parent: 853 type: Transform @@ -40837,13 +42689,12 @@ entities: - uid: 4111 type: SalternApc components: - - pos: -30.517641,-3.5 + - anchored: True + pos: -30.5,-3.5 parent: 853 type: Transform - startingCharge: 11999.233 type: Battery - - drawRate: 2000 - type: PowerConsumer - uid: 4112 type: Bed components: @@ -40870,7 +42721,7 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -40929,6 +42780,8 @@ entities: pos: 44.01483,12.438765 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -40939,6 +42792,8 @@ entities: pos: 46.108562,6.5075245 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -40949,6 +42804,8 @@ entities: pos: -6.2755547,3.0213985 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -41066,17 +42923,23 @@ entities: - uid: 4141 type: BedsheetOrange components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -2.5,7.5 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 4142 type: BedsheetOrange components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 0.5,7.5 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 4143 type: LockerGeneric components: @@ -41110,6 +42973,8 @@ entities: pos: -3.099586,-5.569584 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -41119,6 +42984,8 @@ entities: - pos: -13.50299,1.8497577 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -41128,6 +42995,8 @@ entities: - pos: -9.505926,1.8653827 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -41138,6 +43007,8 @@ entities: pos: -7.889039,-4.569584 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -41155,55 +43026,64 @@ entities: pos: -2.9115314,24.482988 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 4151 type: hydroponicsTray components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,1.5 parent: 853 type: Transform - uid: 4152 type: hydroponicsTray components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -19.5,1.5 parent: 853 type: Transform - uid: 4153 type: hydroponicsTray components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,1.5 parent: 853 type: Transform - uid: 4154 type: hydroponicsTray components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,0.5 parent: 853 type: Transform - uid: 4155 type: hydroponicsTray components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -20.5,-0.5 parent: 853 type: Transform - uid: 4156 type: hydroponicsTray components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -19.5,-0.5 parent: 853 type: Transform - uid: 4157 type: hydroponicsTray components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -18.5,-0.5 parent: 853 type: Transform @@ -41231,7 +43111,8 @@ entities: - uid: 4161 type: Morgue components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: 12.5,-13.5 parent: 853 type: Transform @@ -41243,7 +43124,8 @@ entities: - uid: 4162 type: Morgue components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: 12.5,-14.5 parent: 853 type: Transform @@ -41255,7 +43137,8 @@ entities: - uid: 4163 type: Morgue components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: 12.5,-15.5 parent: 853 type: Transform @@ -41267,7 +43150,8 @@ entities: - uid: 4164 type: Morgue components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: 12.5,-16.5 parent: 853 type: Transform @@ -41279,7 +43163,8 @@ entities: - uid: 4165 type: Morgue components: - - rot: 1.5707963705062866 rad + - anchored: True + rot: 1.5707963705062866 rad pos: 12.5,-17.5 parent: 853 type: Transform @@ -41395,6 +43280,8 @@ entities: - pos: 38.499187,9.874689 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -41404,6 +43291,8 @@ entities: - pos: 38.503914,-3.2242432 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -41424,7 +43313,8 @@ entities: - uid: 4182 type: KitchenReagentGrinder components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: -14.5,-0.5 parent: 853 type: Transform @@ -41434,18 +43324,20 @@ entities: ents: [] type: ContainerContainer - uid: 4183 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 26.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4184 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 25.5,-10.5 parent: 853 type: Transform @@ -41598,6 +43490,8 @@ entities: pos: 47.090073,-10.509963 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -41739,7 +43633,7 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: WeaponCapacitorCharger-powerCellContainer: !type:ContainerSlot {} type: ContainerContainer @@ -41860,7 +43754,7 @@ entities: parent: 853 type: Transform - powerLoad: 0 - type: PowerReceiver + type: ApcPowerReceiver - containers: WeaponCapacitorCharger-powerCellContainer: !type:ContainerSlot {} type: ContainerContainer @@ -41918,7 +43812,8 @@ entities: - uid: 4247 type: KitchenMicrowave components: - - pos: -7.5,-28.5 + - anchored: True + pos: -7.5,-28.5 parent: 853 type: Transform - containers: @@ -42013,6 +43908,8 @@ entities: pos: 51.918198,-10.509963 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -42243,7 +44140,8 @@ entities: - uid: 4290 type: SingularityGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-24.5 parent: 853 type: Transform @@ -42476,13 +44374,16 @@ entities: pos: 38.030457,12.470015 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 4322 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,8.5 parent: 853 type: Transform @@ -42491,9 +44392,10 @@ entities: - canCollide: False type: Physics - uid: 4323 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,8.5 parent: 853 type: Transform @@ -42502,9 +44404,10 @@ entities: - canCollide: False type: Physics - uid: 4324 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,12.5 parent: 853 type: Transform @@ -42513,9 +44416,10 @@ entities: - canCollide: False type: Physics - uid: 4325 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,9.5 parent: 853 type: Transform @@ -42524,9 +44428,10 @@ entities: - canCollide: False type: Physics - uid: 4326 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,10.5 parent: 853 type: Transform @@ -42535,9 +44440,10 @@ entities: - canCollide: False type: Physics - uid: 4327 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,11.5 parent: 853 type: Transform @@ -42546,9 +44452,10 @@ entities: - canCollide: False type: Physics - uid: 4328 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,12.5 parent: 853 type: Transform @@ -42557,9 +44464,10 @@ entities: - canCollide: False type: Physics - uid: 4329 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,8.5 parent: 853 type: Transform @@ -42568,9 +44476,10 @@ entities: - canCollide: False type: Physics - uid: 4330 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,7.5 parent: 853 type: Transform @@ -42579,9 +44488,10 @@ entities: - canCollide: False type: Physics - uid: 4331 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,12.5 parent: 853 type: Transform @@ -42590,9 +44500,10 @@ entities: - canCollide: False type: Physics - uid: 4332 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,11.5 parent: 853 type: Transform @@ -42601,9 +44512,10 @@ entities: - canCollide: False type: Physics - uid: 4333 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,10.5 parent: 853 type: Transform @@ -42612,9 +44524,10 @@ entities: - canCollide: False type: Physics - uid: 4334 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,9.5 parent: 853 type: Transform @@ -42623,9 +44536,10 @@ entities: - canCollide: False type: Physics - uid: 4335 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,8.5 parent: 853 type: Transform @@ -42634,9 +44548,10 @@ entities: - canCollide: False type: Physics - uid: 4336 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,7.5 parent: 853 type: Transform @@ -42645,9 +44560,10 @@ entities: - canCollide: False type: Physics - uid: 4337 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,9.5 parent: 853 type: Transform @@ -42662,13 +44578,16 @@ entities: pos: 35.905144,-2.4519515 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 4339 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,7.5 parent: 853 type: Transform @@ -42677,9 +44596,10 @@ entities: - canCollide: False type: Physics - uid: 4340 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,7.5 parent: 853 type: Transform @@ -42688,9 +44608,10 @@ entities: - canCollide: False type: Physics - uid: 4341 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,7.5 parent: 853 type: Transform @@ -42699,9 +44620,10 @@ entities: - canCollide: False type: Physics - uid: 4342 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,7.5 parent: 853 type: Transform @@ -42710,9 +44632,10 @@ entities: - canCollide: False type: Physics - uid: 4343 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,7.5 parent: 853 type: Transform @@ -42721,9 +44644,10 @@ entities: - canCollide: False type: Physics - uid: 4344 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,7.5 parent: 853 type: Transform @@ -42732,9 +44656,10 @@ entities: - canCollide: False type: Physics - uid: 4345 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,7.5 parent: 853 type: Transform @@ -42743,9 +44668,10 @@ entities: - canCollide: False type: Physics - uid: 4346 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,8.5 parent: 853 type: Transform @@ -42754,9 +44680,10 @@ entities: - canCollide: False type: Physics - uid: 4347 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,9.5 parent: 853 type: Transform @@ -42765,9 +44692,10 @@ entities: - canCollide: False type: Physics - uid: 4348 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,10.5 parent: 853 type: Transform @@ -42776,9 +44704,10 @@ entities: - canCollide: False type: Physics - uid: 4349 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,11.5 parent: 853 type: Transform @@ -42787,9 +44716,10 @@ entities: - canCollide: False type: Physics - uid: 4350 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,12.5 parent: 853 type: Transform @@ -43158,133 +45088,151 @@ entities: - uid: 4401 type: Emitter components: - - pos: 45.5,-17.5 + - anchored: True + pos: 45.5,-17.5 parent: 853 type: Transform - uid: 4402 type: Emitter components: - - pos: 49.5,-17.5 + - anchored: True + pos: 49.5,-17.5 parent: 853 type: Transform - uid: 4403 type: Emitter components: - - pos: 53.5,-17.5 + - anchored: True + pos: 53.5,-17.5 parent: 853 type: Transform - uid: 4404 type: Emitter components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 56.5,-20.5 parent: 853 type: Transform - uid: 4405 type: Emitter components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 56.5,-24.5 parent: 853 type: Transform - uid: 4406 type: Emitter components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 56.5,-28.5 parent: 853 type: Transform - uid: 4407 type: Emitter components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 53.5,-31.5 parent: 853 type: Transform - uid: 4408 type: Emitter components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 49.5,-31.5 parent: 853 type: Transform - uid: 4409 type: Emitter components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 45.5,-31.5 parent: 853 type: Transform - uid: 4410 type: Emitter components: - - rot: 1.5707963267948966 rad + - anchored: True + rot: 1.5707963267948966 rad pos: 42.5,-28.5 parent: 853 type: Transform - uid: 4411 type: Emitter components: - - rot: 1.5707963267948966 rad + - anchored: True + rot: 1.5707963267948966 rad pos: 42.5,-24.5 parent: 853 type: Transform - uid: 4412 type: Emitter components: - - rot: 1.5707963267948966 rad + - anchored: True + rot: 1.5707963267948966 rad pos: 42.5,-20.5 parent: 853 type: Transform - uid: 4413 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4414 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4415 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4416 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4417 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4418 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-9.5 parent: 853 type: Transform @@ -43293,54 +45241,60 @@ entities: - canCollide: False type: Physics - uid: 4419 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4420 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4421 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-10.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4422 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4423 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4424 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-9.5 parent: 853 type: Transform @@ -43349,27 +45303,30 @@ entities: - canCollide: False type: Physics - uid: 4425 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4426 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-9.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4427 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-9.5 parent: 853 type: Transform @@ -43378,9 +45335,10 @@ entities: - canCollide: False type: Physics - uid: 4428 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-9.5 parent: 853 type: Transform @@ -43389,9 +45347,10 @@ entities: - canCollide: False type: Physics - uid: 4429 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-9.5 parent: 853 type: Transform @@ -43400,18 +45359,20 @@ entities: - canCollide: False type: Physics - uid: 4430 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4431 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-7.5 parent: 853 type: Transform @@ -43420,54 +45381,60 @@ entities: - canCollide: False type: Physics - uid: 4432 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4433 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4434 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4435 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-5.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4436 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4437 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-10.5 parent: 853 type: Transform @@ -43476,9 +45443,10 @@ entities: - canCollide: False type: Physics - uid: 4438 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-11.5 parent: 853 type: Transform @@ -43487,9 +45455,10 @@ entities: - canCollide: False type: Physics - uid: 4439 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-12.5 parent: 853 type: Transform @@ -43498,9 +45467,10 @@ entities: - canCollide: False type: Physics - uid: 4440 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-11.5 parent: 853 type: Transform @@ -43509,9 +45479,10 @@ entities: - canCollide: False type: Physics - uid: 4441 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-11.5 parent: 853 type: Transform @@ -43520,18 +45491,20 @@ entities: - canCollide: False type: Physics - uid: 4442 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4443 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-10.5 parent: 853 type: Transform @@ -43540,9 +45513,10 @@ entities: - canCollide: False type: Physics - uid: 4444 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-12.5 parent: 853 type: Transform @@ -43551,27 +45525,30 @@ entities: - canCollide: False type: Physics - uid: 4445 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4446 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4447 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-11.5 parent: 853 type: Transform @@ -43580,9 +45557,10 @@ entities: - canCollide: False type: Physics - uid: 4448 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-10.5 parent: 853 type: Transform @@ -43591,9 +45569,10 @@ entities: - canCollide: False type: Physics - uid: 4449 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-10.5 parent: 853 type: Transform @@ -43602,9 +45581,10 @@ entities: - canCollide: False type: Physics - uid: 4450 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-10.5 parent: 853 type: Transform @@ -43613,9 +45593,10 @@ entities: - canCollide: False type: Physics - uid: 4451 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-12.5 parent: 853 type: Transform @@ -43624,36 +45605,40 @@ entities: - canCollide: False type: Physics - uid: 4452 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4453 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4454 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4455 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-10.5 parent: 853 type: Transform @@ -43662,9 +45647,10 @@ entities: - canCollide: False type: Physics - uid: 4456 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-12.5 parent: 853 type: Transform @@ -43673,9 +45659,10 @@ entities: - canCollide: False type: Physics - uid: 4457 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-9.5 parent: 853 type: Transform @@ -43684,18 +45671,20 @@ entities: - canCollide: False type: Physics - uid: 4458 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-8.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4459 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-7.5 parent: 853 type: Transform @@ -43704,90 +45693,100 @@ entities: - canCollide: False type: Physics - uid: 4460 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4461 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4462 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-6.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4463 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-5.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4464 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-4.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4465 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-3.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4466 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4467 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-2.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4468 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-1.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4469 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-0.5 parent: 853 type: Transform @@ -43796,9 +45795,10 @@ entities: - canCollide: False type: Physics - uid: 4470 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,0.5 parent: 853 type: Transform @@ -43807,9 +45807,10 @@ entities: - canCollide: False type: Physics - uid: 4471 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,1.5 parent: 853 type: Transform @@ -43818,9 +45819,10 @@ entities: - canCollide: False type: Physics - uid: 4472 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,1.5 parent: 853 type: Transform @@ -43829,9 +45831,10 @@ entities: - canCollide: False type: Physics - uid: 4473 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,1.5 parent: 853 type: Transform @@ -43840,9 +45843,10 @@ entities: - canCollide: False type: Physics - uid: 4474 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,1.5 parent: 853 type: Transform @@ -43851,9 +45855,10 @@ entities: - canCollide: False type: Physics - uid: 4475 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,1.5 parent: 853 type: Transform @@ -43919,10 +45924,6 @@ entities: type: Transform - startingCharge: 3200136 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 4482 type: SalternSubstation components: @@ -43932,10 +45933,6 @@ entities: type: Transform - startingCharge: 3200136 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 4483 type: Poweredlight components: @@ -43943,6 +45940,8 @@ entities: pos: 12.942612,-25.529858 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -43953,6 +45952,8 @@ entities: pos: 4.928932,-28.529858 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -43963,6 +45964,8 @@ entities: pos: -2.0884767,-23.529858 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -43973,13 +45976,16 @@ entities: pos: -13.129641,-21.475588 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 4487 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-10.5 parent: 853 type: Transform @@ -43988,18 +45994,20 @@ entities: - canCollide: False type: Physics - uid: 4488 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4489 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-10.5 parent: 853 type: Transform @@ -44008,639 +46016,710 @@ entities: - canCollide: False type: Physics - uid: 4490 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4491 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4492 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4493 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4494 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4495 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-11.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4496 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-12.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4497 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4498 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4499 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4500 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4501 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-13.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4502 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4503 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-15.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4504 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4505 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4506 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4507 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4508 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4509 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4510 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4511 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4512 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4513 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4514 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4515 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 55.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4516 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4517 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4518 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-19.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4519 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4520 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4521 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4522 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4523 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4524 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4525 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4526 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-27.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4527 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-28.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4528 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-29.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4529 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-30.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4530 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4531 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 55.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4532 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4533 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4534 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4535 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4536 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4537 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4538 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4539 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4540 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4541 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4542 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4543 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4544 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4545 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-30.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4546 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-29.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4547 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-28.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4548 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-27.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4549 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4550 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4551 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4552 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4553 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4554 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4555 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4556 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-19.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4557 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4558 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4559 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4560 - type: MVWire + type: CableMV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-17.5 parent: 853 type: Transform @@ -44649,210 +46728,240 @@ entities: - uid: 4561 type: ContainmentFieldGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-20.5 parent: 853 type: Transform - uid: 4562 type: ContainmentFieldGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-20.5 parent: 853 type: Transform - uid: 4563 type: ContainmentFieldGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-20.5 parent: 853 type: Transform - uid: 4564 type: ContainmentFieldGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-24.5 parent: 853 type: Transform - uid: 4565 type: ContainmentFieldGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-28.5 parent: 853 type: Transform - uid: 4566 type: ContainmentFieldGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-28.5 parent: 853 type: Transform - uid: 4567 type: ContainmentFieldGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-28.5 parent: 853 type: Transform - uid: 4568 type: ContainmentFieldGenerator components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-24.5 parent: 853 type: Transform - uid: 4569 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-9.5 parent: 853 type: Transform - uid: 4570 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-9.5 parent: 853 type: Transform - uid: 4571 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-10.5 parent: 853 type: Transform - uid: 4572 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-11.5 parent: 853 type: Transform - uid: 4573 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-12.5 parent: 853 type: Transform - uid: 4574 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-13.5 parent: 853 type: Transform - uid: 4575 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-13.5 parent: 853 type: Transform - uid: 4576 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-11.5 parent: 853 type: Transform - uid: 4577 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-9.5 parent: 853 type: Transform - uid: 4578 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-9.5 parent: 853 type: Transform - uid: 4579 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-10.5 parent: 853 type: Transform - uid: 4580 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-11.5 parent: 853 type: Transform - uid: 4581 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-11.5 parent: 853 type: Transform - uid: 4582 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-12.5 parent: 853 type: Transform - uid: 4583 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-13.5 parent: 853 type: Transform - uid: 4584 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-13.5 parent: 853 type: Transform - uid: 4585 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-8.5 parent: 853 type: Transform - uid: 4586 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-8.5 parent: 853 type: Transform - uid: 4587 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-8.5 parent: 853 type: Transform - uid: 4588 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-8.5 parent: 853 type: Transform - uid: 4589 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-9.5 parent: 853 type: Transform - uid: 4590 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-11.5 parent: 853 type: Transform @@ -44863,77 +46972,88 @@ entities: - uid: 4591 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-8.5 parent: 853 type: Transform - uid: 4592 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-11.5 parent: 853 type: Transform - uid: 4593 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-12.5 parent: 853 type: Transform - uid: 4594 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-13.5 parent: 853 type: Transform - uid: 4595 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-13.5 parent: 853 type: Transform - uid: 4596 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-13.5 parent: 853 type: Transform - uid: 4597 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-13.5 parent: 853 type: Transform - uid: 4598 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-13.5 parent: 853 type: Transform - uid: 4599 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-12.5 parent: 853 type: Transform - uid: 4600 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-11.5 parent: 853 type: Transform - uid: 4601 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-11.5 parent: 853 type: Transform @@ -44944,650 +47064,728 @@ entities: - uid: 4602 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-9.5 parent: 853 type: Transform - uid: 4603 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-23.5 parent: 853 type: Transform - uid: 4604 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-22.5 parent: 853 type: Transform - uid: 4605 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-21.5 parent: 853 type: Transform - uid: 4606 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-27.5 parent: 853 type: Transform - uid: 4607 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-26.5 parent: 853 type: Transform - uid: 4608 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-25.5 parent: 853 type: Transform - uid: 4609 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-31.5 parent: 853 type: Transform - uid: 4610 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-31.5 parent: 853 type: Transform - uid: 4611 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-31.5 parent: 853 type: Transform - uid: 4612 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-31.5 parent: 853 type: Transform - uid: 4613 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-31.5 parent: 853 type: Transform - uid: 4614 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-31.5 parent: 853 type: Transform - uid: 4615 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-27.5 parent: 853 type: Transform - uid: 4616 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-26.5 parent: 853 type: Transform - uid: 4617 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-25.5 parent: 853 type: Transform - uid: 4618 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-23.5 parent: 853 type: Transform - uid: 4619 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-22.5 parent: 853 type: Transform - uid: 4620 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-21.5 parent: 853 type: Transform - uid: 4621 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-17.5 parent: 853 type: Transform - uid: 4622 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-17.5 parent: 853 type: Transform - uid: 4623 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-17.5 parent: 853 type: Transform - uid: 4624 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-17.5 parent: 853 type: Transform - uid: 4625 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-17.5 parent: 853 type: Transform - uid: 4626 type: RadiationCollector components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-17.5 parent: 853 type: Transform - uid: 4627 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4628 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4629 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4630 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4631 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4632 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4633 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4634 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 53.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4635 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4636 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4637 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4638 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4639 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 54.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4640 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 55.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4641 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4642 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 57.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4643 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4644 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4645 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-19.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4646 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4647 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4648 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4649 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 57.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4650 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4651 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 58.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4652 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4653 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4654 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4655 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4656 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4657 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4658 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-19.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4659 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-18.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4660 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4661 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,-17.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4662 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4663 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4664 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4665 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4666 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4667 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4668 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-27.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4669 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-24.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4670 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4671 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-22.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4672 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-21.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4673 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4674 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4675 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 56.5,-27.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4676 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-16.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4677 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-15.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4678 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-14.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4679 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-13.5 parent: 853 type: Transform @@ -45596,264 +47794,294 @@ entities: - uid: 4680 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-10.5 parent: 853 type: Transform - uid: 4681 type: Catwalk components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-10.5 parent: 853 type: Transform - uid: 4682 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4683 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4684 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4685 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4686 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4687 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4688 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 52.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4689 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-32.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4690 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 49.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4691 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 48.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4692 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 47.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4693 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 46.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4694 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 45.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4695 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 44.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4696 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 43.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4697 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 42.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4698 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 41.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4699 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4700 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-32.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4701 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-31.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4702 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-30.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4703 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-29.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4704 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-28.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4705 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-27.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4706 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-26.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4707 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 40.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4708 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 50.5,-33.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4709 - type: HVWire + type: CableHV components: - - rot: 4.371139006309477E-08 rad + - anchored: True + rot: 4.371139006309477E-08 rad pos: 51.5,-33.5 parent: 853 type: Transform @@ -45912,10 +48140,6 @@ entities: type: Transform - startingCharge: 3969174 type: Battery - - drawRate: 8000 - type: PowerConsumer - - supplyRate: 6000 - type: PowerSupplier - uid: 4717 type: HydroponicsToolSpade components: @@ -46152,9 +48376,10 @@ entities: ents: [] type: ContainerContainer - uid: 4746 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 7.5,-29.5 + - anchored: True + pos: 7.5,-29.5 parent: 853 type: Transform - visible: False @@ -46213,7 +48438,8 @@ entities: - uid: 4754 type: DisposalPipe components: - - pos: 3.5,-21.5 + - anchored: True + pos: 3.5,-21.5 parent: 853 type: Transform - containers: @@ -46300,7 +48526,8 @@ entities: - uid: 4765 type: DisposalPipe components: - - pos: 3.5,-20.5 + - anchored: True + pos: 3.5,-20.5 parent: 853 type: Transform - containers: @@ -46332,9 +48559,10 @@ entities: parent: 853 type: Transform - uid: 4769 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 8.5,-29.5 + - anchored: True + pos: 8.5,-29.5 parent: 853 type: Transform - visible: False @@ -46351,17 +48579,19 @@ entities: - canCollide: False type: Physics - uid: 4771 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 5.5,-25.5 + - anchored: True + pos: 5.5,-25.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4772 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 6.5,-28.5 + - anchored: True + pos: 6.5,-28.5 parent: 853 type: Transform - visible: False @@ -46371,7 +48601,8 @@ entities: - uid: 4773 type: DisposalPipe components: - - pos: 3.5,-24.5 + - anchored: True + pos: 3.5,-24.5 parent: 853 type: Transform - containers: @@ -46381,7 +48612,8 @@ entities: - uid: 4774 type: DisposalPipe components: - - pos: 3.5,-23.5 + - anchored: True + pos: 3.5,-23.5 parent: 853 type: Transform - containers: @@ -46391,7 +48623,8 @@ entities: - uid: 4775 type: DisposalPipe components: - - pos: 3.5,-22.5 + - anchored: True + pos: 3.5,-22.5 parent: 853 type: Transform - containers: @@ -46411,9 +48644,10 @@ entities: parent: 853 type: Transform - uid: 4778 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 6.5,-29.5 + - anchored: True + pos: 6.5,-29.5 parent: 853 type: Transform - visible: False @@ -46421,9 +48655,10 @@ entities: - canCollide: False type: Physics - uid: 4779 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 4.5,-29.5 + - anchored: True + pos: 4.5,-29.5 parent: 853 type: Transform - visible: False @@ -46431,17 +48666,19 @@ entities: - canCollide: False type: Physics - uid: 4780 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 5.5,-29.5 + - anchored: True + pos: 5.5,-29.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4781 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 6.5,-27.5 + - anchored: True + pos: 6.5,-27.5 parent: 853 type: Transform - visible: False @@ -46454,6 +48691,8 @@ entities: - pos: 23.519926,-4.184294 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -46464,22 +48703,26 @@ entities: pos: -30.97177,0.51521087 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 4784 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 13.5,-23.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4785 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-23.5 parent: 853 type: Transform @@ -46488,9 +48731,10 @@ entities: - canCollide: False type: Physics - uid: 4786 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-24.5 parent: 853 type: Transform @@ -46499,9 +48743,10 @@ entities: - canCollide: False type: Physics - uid: 4787 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-24.5 parent: 853 type: Transform @@ -46510,9 +48755,10 @@ entities: - canCollide: False type: Physics - uid: 4788 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-25.5 parent: 853 type: Transform @@ -46521,9 +48767,10 @@ entities: - canCollide: False type: Physics - uid: 4789 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-25.5 parent: 853 type: Transform @@ -46532,9 +48779,10 @@ entities: - canCollide: False type: Physics - uid: 4790 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-26.5 parent: 853 type: Transform @@ -46543,9 +48791,10 @@ entities: - canCollide: False type: Physics - uid: 4791 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-26.5 parent: 853 type: Transform @@ -46554,9 +48803,10 @@ entities: - canCollide: False type: Physics - uid: 4792 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-27.5 parent: 853 type: Transform @@ -46565,9 +48815,10 @@ entities: - canCollide: False type: Physics - uid: 4793 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-27.5 parent: 853 type: Transform @@ -46576,18 +48827,20 @@ entities: - canCollide: False type: Physics - uid: 4794 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-28.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4795 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-29.5 parent: 853 type: Transform @@ -46596,9 +48849,10 @@ entities: - canCollide: False type: Physics - uid: 4796 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 11.5,-29.5 parent: 853 type: Transform @@ -46607,18 +48861,20 @@ entities: - canCollide: False type: Physics - uid: 4797 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 10.5,-29.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4798 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 9.5,-29.5 parent: 853 type: Transform @@ -46627,9 +48883,10 @@ entities: - canCollide: False type: Physics - uid: 4799 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-23.5 parent: 853 type: Transform @@ -46638,9 +48895,10 @@ entities: - canCollide: False type: Physics - uid: 4800 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 11.5,-23.5 parent: 853 type: Transform @@ -46649,9 +48907,10 @@ entities: - canCollide: False type: Physics - uid: 4801 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 10.5,-23.5 parent: 853 type: Transform @@ -46660,9 +48919,10 @@ entities: - canCollide: False type: Physics - uid: 4802 - type: ApcExtensionCable + type: CableApcExtension components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 9.5,-23.5 parent: 853 type: Transform @@ -46750,7 +49010,8 @@ entities: - uid: 4813 type: DisposalTrunk components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 12.5,-27.5 parent: 853 type: Transform @@ -46761,7 +49022,8 @@ entities: - uid: 4814 type: DisposalPipe components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 11.5,-27.5 parent: 853 type: Transform @@ -46772,7 +49034,8 @@ entities: - uid: 4815 type: DisposalPipe components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 10.5,-27.5 parent: 853 type: Transform @@ -46783,7 +49046,8 @@ entities: - uid: 4816 type: DisposalPipe components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 9.5,-27.5 parent: 853 type: Transform @@ -46794,7 +49058,8 @@ entities: - uid: 4817 type: DisposalJunctionFlipped components: - - rot: -1.5707963267948966 rad + - anchored: True + rot: -1.5707963267948966 rad pos: 6.5,-27.5 parent: 853 type: Transform @@ -46805,7 +49070,8 @@ entities: - uid: 4818 type: DisposalPipe components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 6.5,-28.5 parent: 853 type: Transform @@ -46816,7 +49082,8 @@ entities: - uid: 4819 type: DisposalPipe components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 6.5,-29.5 parent: 853 type: Transform @@ -46838,7 +49105,8 @@ entities: - uid: 4821 type: DisposalTrunk components: - - rot: 3.141592653589793 rad + - anchored: True + rot: 3.141592653589793 rad pos: 6.5,-30.5 parent: 853 type: Transform @@ -46849,7 +49117,8 @@ entities: - uid: 4822 type: DisposalPipe components: - - rot: 1.5707963267948966 rad + - anchored: True + rot: 1.5707963267948966 rad pos: 8.5,-27.5 parent: 853 type: Transform @@ -46860,7 +49129,8 @@ entities: - uid: 4823 type: DisposalPipe components: - - rot: 1.5707963267948966 rad + - anchored: True + rot: 1.5707963267948966 rad pos: 7.5,-27.5 parent: 853 type: Transform @@ -46871,7 +49141,8 @@ entities: - uid: 4824 type: DisposalPipe components: - - rot: 1.5707963267948966 rad + - anchored: True + rot: 1.5707963267948966 rad pos: 5.5,-27.5 parent: 853 type: Transform @@ -46882,7 +49153,8 @@ entities: - uid: 4825 type: DisposalPipe components: - - rot: 1.5707963267948966 rad + - anchored: True + rot: 1.5707963267948966 rad pos: 4.5,-27.5 parent: 853 type: Transform @@ -46893,7 +49165,8 @@ entities: - uid: 4826 type: DisposalPipe components: - - pos: 3.5,-16.5 + - anchored: True + pos: 3.5,-16.5 parent: 853 type: Transform - containers: @@ -46903,7 +49176,8 @@ entities: - uid: 4827 type: DisposalPipe components: - - pos: 3.5,-14.5 + - anchored: True + pos: 3.5,-14.5 parent: 853 type: Transform - containers: @@ -46913,7 +49187,8 @@ entities: - uid: 4828 type: DisposalPipe components: - - pos: 3.5,-15.5 + - anchored: True + pos: 3.5,-15.5 parent: 853 type: Transform - containers: @@ -46923,7 +49198,8 @@ entities: - uid: 4829 type: DisposalPipe components: - - pos: 3.5,-18.5 + - anchored: True + pos: 3.5,-18.5 parent: 853 type: Transform - containers: @@ -46933,7 +49209,8 @@ entities: - uid: 4830 type: DisposalPipe components: - - pos: 3.5,-17.5 + - anchored: True + pos: 3.5,-17.5 parent: 853 type: Transform - containers: @@ -46943,7 +49220,8 @@ entities: - uid: 4831 type: DisposalPipe components: - - pos: 3.5,-19.5 + - anchored: True + pos: 3.5,-19.5 parent: 853 type: Transform - containers: @@ -46951,9 +49229,10 @@ entities: ents: [] type: ContainerContainer - uid: 4832 - type: HVWire + type: CableHV components: - - pos: 3.5,-24.5 + - anchored: True + pos: 3.5,-24.5 parent: 853 type: Transform - visible: False @@ -46961,9 +49240,10 @@ entities: - canCollide: False type: Physics - uid: 4833 - type: HVWire + type: CableHV components: - - pos: 3.5,-25.5 + - anchored: True + pos: 3.5,-25.5 parent: 853 type: Transform - visible: False @@ -46971,9 +49251,10 @@ entities: - canCollide: False type: Physics - uid: 4834 - type: HVWire + type: CableHV components: - - pos: 3.5,-26.5 + - anchored: True + pos: 3.5,-26.5 parent: 853 type: Transform - visible: False @@ -46981,9 +49262,10 @@ entities: - canCollide: False type: Physics - uid: 4835 - type: HVWire + type: CableHV components: - - pos: 3.5,-27.5 + - anchored: True + pos: 3.5,-27.5 parent: 853 type: Transform - visible: False @@ -46991,9 +49273,10 @@ entities: - canCollide: False type: Physics - uid: 4836 - type: HVWire + type: CableHV components: - - pos: 3.5,-28.5 + - anchored: True + pos: 3.5,-28.5 parent: 853 type: Transform - visible: False @@ -47003,7 +49286,8 @@ entities: - uid: 4837 type: DisposalPipe components: - - pos: 3.5,-26.5 + - anchored: True + pos: 3.5,-26.5 parent: 853 type: Transform - containers: @@ -47013,7 +49297,8 @@ entities: - uid: 4838 type: DisposalPipe components: - - pos: 3.5,-25.5 + - anchored: True + pos: 3.5,-25.5 parent: 853 type: Transform - containers: @@ -47088,9 +49373,10 @@ entities: parent: 853 type: Transform - uid: 4850 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 6.5,-26.5 + - anchored: True + pos: 6.5,-26.5 parent: 853 type: Transform - visible: False @@ -47098,9 +49384,10 @@ entities: - canCollide: False type: Physics - uid: 4851 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 6.5,-25.5 + - anchored: True + pos: 6.5,-25.5 parent: 853 type: Transform - visible: False @@ -47114,6 +49401,8 @@ entities: pos: -30.956144,-2.5004141 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -47124,6 +49413,8 @@ entities: pos: 16.911247,7.525623 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -47134,13 +49425,16 @@ entities: pos: 1,-24.5 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 4855 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 8.5,-23.5 + - anchored: True + pos: 8.5,-23.5 parent: 853 type: Transform - visible: False @@ -47148,9 +49442,10 @@ entities: - canCollide: False type: Physics - uid: 4856 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 7.5,-23.5 + - anchored: True + pos: 7.5,-23.5 parent: 853 type: Transform - visible: False @@ -47164,9 +49459,10 @@ entities: parent: 853 type: Transform - uid: 4858 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 4.5,-25.5 + - anchored: True + pos: 4.5,-25.5 parent: 853 type: Transform - visible: False @@ -47340,9 +49636,10 @@ entities: ents: [] type: ContainerContainer - uid: 4885 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -15.5,-10.5 + - anchored: True + pos: -15.5,-10.5 parent: 853 type: Transform - visible: False @@ -47356,9 +49653,10 @@ entities: parent: 853 type: Transform - uid: 4887 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: -13.5,-10.5 + - anchored: True + pos: -13.5,-10.5 parent: 853 type: Transform - visible: False @@ -47372,13 +49670,16 @@ entities: pos: -15,-5.3 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 4889 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 11.5,20.5 + - anchored: True + pos: 11.5,20.5 parent: 853 type: Transform - visible: False @@ -47386,17 +49687,19 @@ entities: - canCollide: False type: Physics - uid: 4890 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 12.5,20.5 + - anchored: True + pos: 12.5,20.5 parent: 853 type: Transform - canCollide: False type: Physics - uid: 4891 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 12.5,21.5 + - anchored: True + pos: 12.5,21.5 parent: 853 type: Transform - visible: False @@ -47404,9 +49707,10 @@ entities: - canCollide: False type: Physics - uid: 4892 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 12.5,22.5 + - anchored: True + pos: 12.5,22.5 parent: 853 type: Transform - visible: False @@ -47414,9 +49718,10 @@ entities: - canCollide: False type: Physics - uid: 4893 - type: ApcExtensionCable + type: CableApcExtension components: - - pos: 12.5,23.5 + - anchored: True + pos: 12.5,23.5 parent: 853 type: Transform - visible: False @@ -47462,43 +49767,50 @@ entities: - uid: 4897 type: ParticleAcceleratorEndCapUnfinished components: - - pos: 49.5,-9.5 + - anchored: True + pos: 49.5,-9.5 parent: 853 type: Transform - uid: 4898 type: ParticleAcceleratorFuelChamberUnfinished components: - - pos: 49.5,-10.5 + - anchored: True + pos: 49.5,-10.5 parent: 853 type: Transform - uid: 4899 type: ParticleAcceleratorPowerBoxUnfinished components: - - pos: 49.5,-11.5 + - anchored: True + pos: 49.5,-11.5 parent: 853 type: Transform - uid: 4900 type: ParticleAcceleratorControlBoxUnfinished components: - - pos: 48.5,-10.5 + - anchored: True + pos: 48.5,-10.5 parent: 853 type: Transform - uid: 4901 type: ParticleAcceleratorEmitterCenterUnfinished components: - - pos: 49.5,-12.5 + - anchored: True + pos: 49.5,-12.5 parent: 853 type: Transform - uid: 4902 type: ParticleAcceleratorEmitterLeftUnfinished components: - - pos: 48.5,-12.5 + - anchored: True + pos: 48.5,-12.5 parent: 853 type: Transform - uid: 4903 type: ParticleAcceleratorEmitterRightUnfinished components: - - pos: 50.5,-12.5 + - anchored: True + pos: 50.5,-12.5 parent: 853 type: Transform - uid: 4904 @@ -47554,7 +49866,8 @@ entities: - uid: 4909 type: KitchenReagentGrinder components: - - pos: 18.5,1.5 + - anchored: True + pos: 18.5,1.5 parent: 853 type: Transform - containers: @@ -47575,6 +49888,8 @@ entities: pos: -17.91089,-25.522463 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -47840,6 +50155,8 @@ entities: pos: -25.886164,-4.550339 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -47850,6 +50167,8 @@ entities: pos: 31.116735,0.101480484 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -47860,6 +50179,8 @@ entities: pos: 25.960485,0.023355484 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -47870,6 +50191,8 @@ entities: pos: 29.00736,0.038980484 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -47880,6 +50203,8 @@ entities: pos: 6.4960318,3.0213985 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -47890,6 +50215,8 @@ entities: pos: -2.8850474,30.48638 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer @@ -47900,6 +50227,8 @@ entities: pos: 9.911827,30.439505 parent: 853 type: Transform + - powerLoad: 0 + type: ApcPowerReceiver - containers: light_bulb: !type:ContainerSlot {} type: ContainerContainer diff --git a/Resources/Prototypes/Actions/spells.yml b/Resources/Prototypes/Actions/spells.yml new file mode 100644 index 0000000000..cfcb1709ce --- /dev/null +++ b/Resources/Prototypes/Actions/spells.yml @@ -0,0 +1,13 @@ +- type: action + actionType: SpellPie + icon: Objects/Consumable/Food/Baked/pie.rsi/plain.png + name: "Pie" + filters: + - spells + description: "Give me a pie, I dare you!" + behaviorType: Instant + behavior: !type:GiveItemSpell + spellItem: FoodPieBananaCream + castMessage: I NEED A PIE! + cooldown: 15 + castSound: /Audio/Items/bikehorn.ogg diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml index 88e7b10c28..de38aab797 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml @@ -51,7 +51,7 @@ components: - type: StorageFill contents: - - id: ApcExtensionCableStack + - id: CableApcStack amount: 3 - type: entity @@ -61,7 +61,7 @@ components: - type: StorageFill contents: - - id: MVWireStack + - id: CableMVStack amount: 3 - type: entity @@ -71,7 +71,7 @@ components: - type: StorageFill contents: - - id: HVWireStack + - id: CableHVStack amount: 3 - type: entity @@ -81,9 +81,9 @@ components: - type: StorageFill contents: - - id: HVWireStack + - id: CableHVStack amount: 2 - - id: MVWireStack + - id: CableMVStack amount: 2 - - id: ApcExtensionCableStack + - id: CableApcStack amount: 2 diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 893dc3231b..f67ff53d7c 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -24,7 +24,7 @@ - id: Crowbar - id: WelderExperimental - id: Multitool - - id: ApcExtensionCableStack + - id: CableApcStack - type: entity id: ClothingBeltSecurityFilled diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 018414e302..4d367f3c09 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -30,12 +30,12 @@ - id: Screwdriver - id: Crowbar - id: Wirecutter - - id: ApcExtensionCableStack - - id: MVWireStack + - id: CableApcStack + - id: CableMVStack - id: ClothingHandsGlovesColorYellow prob: 0.05 orGroup: GlovesOrWires - - id: HVWireStack + - id: CableHVStack orGroup: GlovesOrWires - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index b92e47ec69..c44efffef7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -27,11 +27,11 @@ prob: 0.05 - id: ClothingHeadHatHardhatRed prob: 0.4 - - id: ApcExtensionCableStack + - id: CableApcStack prob: 0.3 - - id: ApcExtensionCableStack + - id: CableApcStack prob: 0.3 - - id: ApcExtensionCableStack + - id: CableApcStack prob: 0.3 - type: entity @@ -47,9 +47,9 @@ prob: 0.05 - id: APCElectronics prob: 0.1 - - id: MVWireStack + - id: CableMVStack prob: 0.2 - - id: ApcExtensionCableStack + - id: CableApcStack prob: 0.3 - type: entity @@ -91,7 +91,7 @@ - id: OxygenTankFilled - id: ClothingShoesBootsMag prob: 0.15 - + - type: entity id: LockerRadiationSuitFilled parent: LockerRadiationSuit diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml index 33e4bdfbc2..718af1cd90 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml @@ -7,6 +7,7 @@ - Ice - Tea - Water + - ThirteenLoko - type: reagentDispenserInventory id: BoozeDispenserInventory diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 9645d50403..2978056ac6 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -16,7 +16,7 @@ - type: technology name: "cleaning technology" - id: MopBucket + id: MopBucket description: Start to a shiny clean station icon: sprite: Objects/Specific/Janitorial/janitorial.rsi @@ -44,7 +44,7 @@ unlockedRecipes: - Scythe - Hatchet - - KitchenKnife + - KitchenKnife - type: technology name: "advanced botany" @@ -234,8 +234,8 @@ - BasicResearch unlockedRecipes: - CableStack - - MVWireStack - - HVWireStack + - CableMVStack + - CableHVStack - LightBulb - LightTube - FirelockElectronics @@ -253,4 +253,4 @@ # state: icon # requiredPoints: 999999 # requiredTechnologies: -# - BasicResearch \ No newline at end of file +# - BasicResearch diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index 233b9ccde1..10938a6eaa 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -5,7 +5,7 @@ animationDuration: 1.1 spriteName: youtool startingInventory: - ApcExtensionCableStack1: 10 + CableApcStack1: 10 Crowbar: 5 Welder: 3 Wirecutter: 5 diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml index a917721474..912fcecf58 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml @@ -7,6 +7,14 @@ - type: AccessReader access: [["Service"]] +- type: entity + parent: Airlock + id: AirlockTheatreLocked + suffix: Theatre, Locked + components: + - type: AccessReader + access: [["Theatre"]] + - type: entity parent: AirlockExternal id: AirlockExternalLocked diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml index 77436e43f9..523a1e4c62 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml @@ -46,7 +46,7 @@ close_sound: /Audio/Machines/airlock_close.ogg deny_sound: /Audio/Machines/airlock_deny.ogg - type: WiresVisualizer - - type: PowerReceiver + - type: ApcPowerReceiver - type: Wires BoardName: "Airlock Control" LayoutId: Airlock diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml index 2f04ab3d3c..e6d8dc2e04 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml @@ -9,7 +9,7 @@ fixtures: - shape: !type:PhysShapeAabb - bounds: "-0.5, -0.2, 0.5, 0.2" + bounds: "-0.2, -0.2, 0.2, 0.2" mass: 25 mask: - MobImpassable diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml index ef85ffa558..c34c0821b9 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml @@ -54,12 +54,12 @@ examinable: true nodes: ame: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: AMEngine input: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: HVPower - - type: PowerReceiver + - type: ApcPowerReceiver - type: PowerSupplier supplyRate: 0 diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml index 65e8d061cb..14494511f7 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/control_box.yml @@ -17,7 +17,7 @@ visuals: - type: ParticleAcceleratorPartVisualizer baseState: unlit - - type: PowerReceiver + - type: ApcPowerReceiver - type: ParticleAcceleratorControlBox - type: Construction graph: particleAcceleratorControlBox diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml index 81fd4cd3ba..b9b24c7d43 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/power_box.yml @@ -24,7 +24,7 @@ examinable: true nodes: input: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: HVPower - type: Construction graph: particleAcceleratorPowerBox diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml index 2fae75c43c..b5e8c6ea33 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml @@ -36,7 +36,7 @@ examinable: true nodes: input: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: HVPower - type: RadiationCollector # Note that this doesn't matter too much (see next comment) @@ -47,8 +47,10 @@ - type: BatteryDischarger # This is JUST a default. It has to be dynamically adjusted to ensure that the battery doesn't discharge "too fast" & run out immediately, while still scaling by input power. activeSupplyRate: 100000 - - type: PowerSupplier - supplyRate: 0 - type: Anchorable - type: Rotatable - type: Pullable + - type: PowerNetworkBattery + maxSupply: 1000000000 + supplyRampTolerance: 1000000000 + diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml index 1067d20264..c8ba2e3832 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml @@ -41,7 +41,7 @@ examinable: true nodes: input: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: MVPower - type: Damageable resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml b/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml index 45091750d8..6772432f48 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml @@ -33,12 +33,11 @@ examinable: true nodes: output: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: HVPower - type: PowerSupplier supplyRate: 3000 + supplyRampRate: 500 + supplyRampTolerance: 500 - type: Anchorable - type: Pullable - - type: ClientEntitySpawner - prototypes: - - HVDummyWire diff --git a/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml index 9f852d0c9a..0daea56341 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml @@ -29,9 +29,11 @@ examinable: true nodes: output: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: HVPower - type: PowerSupplier + supplyRampTolerance: 500 + supplyRampRate: 500 - type: SolarPanel supply: 1500 - type: SnapGrid @@ -47,9 +49,6 @@ acts: ["Breakage"] - type: Anchorable - type: Pullable - - type: ClientEntitySpawner - prototypes: - - HVDummyWire - type: Construction graph: solarpanel node: solarpanel diff --git a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml b/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml index 963521c356..24f55dfcfa 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml @@ -25,7 +25,7 @@ - type: NodeContainer nodes: input: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: HVPower - type: PowerConsumer drawRate: 50 @@ -64,10 +64,8 @@ - type: NodeContainer nodes: input: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: HVPower - - type: PowerConsumer - - type: BatteryStorage - type: Anchorable - type: entity @@ -93,9 +91,8 @@ - type: NodeContainer nodes: input: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: HVPower - - type: PowerSupplier - type: BatteryDischarger - type: Anchorable @@ -133,5 +130,5 @@ - type: Sprite sprite: Constructible/Power/power.rsi state: wirelessmachine - - type: PowerReceiver + - type: ApcPowerReceiver - type: Anchorable diff --git a/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml b/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml index 91e1e4f651..d9cdf02d91 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Specific/saltern_power.yml @@ -12,10 +12,6 @@ - type: Battery maxCharge: 10000000 startingCharge: 10000000 - - type: BatteryStorage - activeDrawRate: 0 - - type: BatteryDischarger - activeSupplyRate: 0 - type: entity parent: BaseSubstation @@ -24,10 +20,6 @@ - type: Battery maxCharge: 4000000 startingCharge: 4000000 - - type: BatteryStorage - activeDrawRate: 8000 - - type: BatteryDischarger - activeSupplyRate: 6000 - type: entity parent: BaseApc @@ -36,5 +28,3 @@ - type: Battery maxCharge: 12000 startingCharge: 2000 - - type: BatteryStorage - activeDrawRate: 2000 diff --git a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml index 5f3b4009e5..f0db5e326a 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml @@ -5,7 +5,7 @@ name: arcade parent: ComputerBase components: - - type: PowerReceiver + - type: ApcPowerReceiver - type: Sprite sprite: Constructible/Power/computers.rsi layers: diff --git a/Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml new file mode 100644 index 0000000000..ef3c90a1cb --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Power/cable_terminal.yml @@ -0,0 +1,42 @@ +- type: entity + id: CableTerminal + name: cable terminal + placement: + mode: SnapgridCenter + components: + - type: Sprite + sprite: Constructible/Power/wire_terminal.rsi + state: term + netsync: false + drawdepth: BelowFloor + - type: Clickable + - type: Physics + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.5, -0.5, 0.5, 0.5" + layer: + - Underplating + - type: InteractionOutline + - type: SnapGrid + - type: Damageable + resistances: metallicResistances + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: SubFloorHide + - type: NodeContainer + nodes: + # Just define nodes for both MV and HV. One will end up unused in 99% of cases + # but it means one cable terminal type. + powerHV: + !type:CableTerminalNode + nodeGroupID: HVPower + powerMV: + !type:CableTerminalNode + nodeGroupID: MVPower diff --git a/Resources/Prototypes/Entities/Constructible/Power/wires.yml b/Resources/Prototypes/Entities/Constructible/Power/cables.yml similarity index 60% rename from Resources/Prototypes/Entities/Constructible/Power/wires.yml rename to Resources/Prototypes/Entities/Constructible/Power/cables.yml index 36ba146627..4970d246cb 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/wires.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/cables.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - id: WireBase + id: CableBase placement: mode: SnapgridCenter components: @@ -17,8 +17,6 @@ - type: Sprite netsync: false drawdepth: BelowFloor - - type: IconSmooth - mode: CardinalFlags - type: Damageable resistances: metallicResistances - type: Destructible @@ -30,11 +28,13 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: SubFloorHide + - type: CableVis + node: power - type: entity - parent: WireBase - id: HVWire - name: HV Wire + parent: CableBase + id: CableHV + name: HV power cable description: An orange high voltage power cable. components: - type: Sprite @@ -43,20 +43,17 @@ - type: Icon sprite: Constructible/Power/Wires/hv_cable.rsi state: hvcable_4 - - type: IconSmooth - base: hvcable_ - key: hv_cables - type: NodeContainer nodes: power: - !type:AdjacentNode + !type:CableNode nodeGroupID: HVPower wire: !type:AdjacentNode nodeGroupID: WireNet - - type: Wire - wireDroppedOnCutPrototype: HVWireStack1 - wireType: HighVoltage + - type: Cable + cableDroppedOnCutPrototype: CableHVStack1 + cableType: HighVoltage - type: Destructible thresholds: - trigger: @@ -65,16 +62,20 @@ behaviors: - !type:SpawnEntitiesBehavior spawn: - HVWireStack1: + CableHVStack1: min: 1 max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Appearance + visuals: + - type: CableVisualizer + base: hvcable_ - type: entity - parent: WireBase - id: MVWire - name: MV Wire + parent: CableBase + id: CableMV + name: MV power cable description: A medium voltage power cable. components: - type: Sprite @@ -85,20 +86,17 @@ color: Yellow sprite: Constructible/Power/Wires/mv_cable.rsi state: mvcable_4 - - type: IconSmooth - base: mvcable_ - key: mv_cables - type: NodeContainer nodes: power: - !type:AdjacentNode + !type:CableNode nodeGroupID: MVPower wire: !type:AdjacentNode nodeGroupID: WireNet - - type: Wire - wireDroppedOnCutPrototype: MVWireStack1 - wireType: MediumVoltage + - type: Cable + cableDroppedOnCutPrototype: CableMVStack1 + cableType: MediumVoltage - type: Destructible thresholds: - trigger: @@ -107,16 +105,20 @@ behaviors: - !type:SpawnEntitiesBehavior spawn: - MVWireStack1: + CableMVStack1: min: 1 max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Appearance + visuals: + - type: CableVisualizer + base: mvcable_ - type: entity - parent: WireBase - id: ApcExtensionCable - name: LV Wire + parent: CableBase + id: CableApcExtension + name: LV power cable description: A cable used to connect machines to an APC. #ACPs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future. components: - type: Sprite @@ -127,22 +129,19 @@ color: Green sprite: Constructible/Power/Wires/lv_cable.rsi state: lvcable_4 - - type: IconSmooth - base: lvcable_ - key: lv_cables - type: NodeContainer nodes: power: - !type:AdjacentNode + !type:CableNode nodeGroupID: Apc wire: !type:AdjacentNode nodeGroupID: WireNet - type: PowerProvider voltage: Apc - - type: Wire - wireDroppedOnCutPrototype: ApcExtensionCableStack1 - wireType: Apc + - type: Cable + cableDroppedOnCutPrototype: CableApcStack1 + cableType: Apc - type: Destructible thresholds: - trigger: @@ -151,64 +150,12 @@ behaviors: - !type:SpawnEntitiesBehavior spawn: - ApcExtensionCableStack1: + CableApcStack1: min: 1 max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - -#Dummy wires - -- type: entity - abstract: true - id: BaseDummyWire - placement: - mode: SnapgridCenter - components: - - type: SnapGrid - - type: Sprite - drawdepth: BelowFloor - - type: IconSmooth - mode: CardinalFlags - - type: SubFloorHide - -- type: entity - abstract: true - parent: BaseDummyWire - id: HVDummyWire - name: HV Connector Wire - components: - - type: Sprite - sprite: Constructible/Power/Wires/hv_cable.rsi - state: hvcable_0 - - type: IconSmooth - base: hvcable_ - key: hv_cables - -- type: entity - abstract: true - parent: BaseDummyWire - id: MVDummyWire - name: MV Connector Wire - components: - - type: Sprite - sprite: Constructible/Power/Wires/mv_cable.rsi - state: mvcable_0 - color: Yellow - - type: IconSmooth - base: mvcable_ - key: mv_cables - -- type: entity - abstract: true - parent: BaseDummyWire - id: LVDummyWire - name: LV Connector Wire - components: - - type: Sprite - sprite: Constructible/Power/Wires/lv_cable.rsi - state: lvcable_0 - color: Green - - type: IconSmooth - base: lvcable_ - key: lv_cables + - type: Appearance + visuals: + - type: CableVisualizer + base: lvcable_ diff --git a/Resources/Prototypes/Entities/Constructible/Power/chargers.yml b/Resources/Prototypes/Entities/Constructible/Power/chargers.yml index 17cb057c14..017ebeeac9 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/chargers.yml @@ -11,7 +11,7 @@ state: empty - type: PowerCellCharger transfer_efficiency: 0.85 - - type: PowerReceiver + - type: ApcPowerReceiver - type: Appearance visuals: - type: PowerChargerVisualizer @@ -32,7 +32,7 @@ state: empty - type: WeaponCapacitorCharger transfer_efficiency: 0.85 - - type: PowerReceiver + - type: ApcPowerReceiver - type: Appearance visuals: - type: PowerChargerVisualizer @@ -53,7 +53,7 @@ state: empty - type: WeaponCapacitorCharger transfer_efficiency: 0.95 - - type: PowerReceiver + - type: ApcPowerReceiver - type: Appearance visuals: - type: PowerChargerVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Power/computers.yml b/Resources/Prototypes/Entities/Constructible/Power/computers.yml index d1fb21a4d7..d19ec4cb9e 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/computers.yml @@ -1,8 +1,8 @@ - type: entity id: ComputerFrame - parent: BaseConstructibleDynamic + parent: BaseConstructible name: computer frame - description: A computer under construction. It needs a circuit board. + description: A computer under construction. components: - type: Physics bodyType: Static @@ -20,6 +20,7 @@ - VaultImpassable - type: InteractionOutline - type: Rotatable + - type: Anchorable - type: Construction graph: computer node: frameUnsecured @@ -81,7 +82,7 @@ graph: computer node: computer - type: Computer - - type: PowerReceiver + - type: ApcPowerReceiver - type: Sprite sprite: Constructible/Power/computers.rsi layers: @@ -157,7 +158,7 @@ type: ResearchConsoleBoundUserInterface - key: enum.ResearchClientUiKey.Key type: ResearchClientBoundUserInterface - - type: PowerReceiver + - type: ApcPowerReceiver load: 200 priority: Low - type: Computer diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index 0cb0e591c6..7202bd93f7 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -30,7 +30,7 @@ interfaces: - key: enum.LatheUiKey.Key type: LatheBoundUserInterface - - type: PowerReceiver + - type: ApcPowerReceiver - type: entity parent: BaseLathe @@ -138,8 +138,8 @@ - SheetRGlass - SheetPlastic - CableStack - - MVWireStack - - HVWireStack + - CableMVStack + - CableHVStack - ConveyorAssembly - RCD - RCDAmmo diff --git a/Resources/Prototypes/Entities/Constructible/Power/parts.yml b/Resources/Prototypes/Entities/Constructible/Power/parts.yml index a5300917ae..f80f119e3d 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/parts.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/parts.yml @@ -1,43 +1,3 @@ -- type: entity - abstract: true - id: BaseSmes - parent: BaseMachine - name: SMES - description: A high-capacity superconducting magnetic energy storage (SMES) unit. - placement: - mode: SnapgridCenter - components: - - type: Sprite - netsync: false - sprite: Constructible/Power/smes.rsi - layers: - - state: smes - - state: smes-display - shader: unshaded - - type: Smes - - type: Appearance - visuals: - - type: SmesVisualizer - - type: Battery - maxCharge: 1000 - startingCharge: 1000 - - type: ExaminableBattery - - type: NodeContainer - examinable: true - nodes: - power: - !type:AdjacentNode - nodeGroupID: HVPower - - type: PowerConsumer - - type: BatteryStorage - activeDrawRate: 1500 - - type: PowerSupplier - - type: BatteryDischarger - activeSupplyRate: 1000 - - type: ClientEntitySpawner - prototypes: - - HVDummyWire - - type: entity abstract: true id: BaseSubstation @@ -63,23 +23,20 @@ examinable: true nodes: input: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: HVPower output: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: MVPower - - type: PowerConsumer - - type: BatteryStorage - activeDrawRate: 1500 - - type: PowerSupplier - voltage: Medium + - type: BatteryCharger + voltage: High - type: BatteryDischarger - activeSupplyRate: 1000 - - type: ClientEntitySpawner - prototypes: - - HVDummyWire - - MVDummyWire - + voltage: Medium + - type: PowerNetworkBattery + maxSupply: 150000 + maxChargeRate: 5000 + supplyRampTolerance: 5000 + supplyRampRate: 1000 - type: entity abstract: true id: BaseApc @@ -115,15 +72,13 @@ examinable: true nodes: input: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: MVPower output: - !type:AdjacentNode + !type:CableDeviceNode nodeGroupID: Apc - - type: PowerConsumer + - type: BatteryCharger voltage: Medium - - type: BatteryStorage - activeDrawRate: 1000 - type: PowerProvider voltage: Apc - type: Apc @@ -135,7 +90,9 @@ - type: Construction graph: apc node: apc - - type: ClientEntitySpawner - prototypes: - - MVDummyWire - - LVDummyWire + - type: PowerNetworkBattery + maxSupply: 10000 + maxChargeRate: 5000 + supplyRampTolerance: 1000 + supplyRampRate: 500 + diff --git a/Resources/Prototypes/Entities/Constructible/Power/smes.yml b/Resources/Prototypes/Entities/Constructible/Power/smes.yml new file mode 100644 index 0000000000..cce3cbebf2 --- /dev/null +++ b/Resources/Prototypes/Entities/Constructible/Power/smes.yml @@ -0,0 +1,46 @@ +- type: entity + abstract: true + id: BaseSmes + parent: BaseMachine + name: SMES + description: A high-capacity superconducting magnetic energy storage (SMES) unit. + placement: + mode: SnapgridCenter + components: + - type: Sprite + netsync: false + sprite: Constructible/Power/smes.rsi + layers: + - state: smes + - state: smes-display + shader: unshaded + - type: Smes + - type: Appearance + visuals: + - type: SmesVisualizer + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: ExaminableBattery + - type: NodeContainer + examinable: true + nodes: + input: + !type:CableDeviceNode + nodeGroupID: HVPower + output: + !type:CableTerminalPortNode + nodeGroupID: HVPower + - type: BatteryCharger + voltage: High + node: output + + - type: BatteryDischarger + voltage: High + node: input + + - type: PowerNetworkBattery + maxSupply: 150000 + maxChargeRate: 5000 + supplyRampTolerance: 5000 + supplyRampRate: 1000 diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index eabdb87ed6..5b11907247 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -38,7 +38,7 @@ type: VendingMachineBoundUserInterface - key: enum.WiresUiKey.Key type: WiresBoundUserInterface - - type: PowerReceiver + - type: ApcPowerReceiver - type: Wires BoardName: "Vending Machine" LayoutId: Vending @@ -54,8 +54,6 @@ pack: AmmoVendInventory - type: Advertise pack: AmmoVendAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/ammo.rsi @@ -84,8 +82,6 @@ pack: BoozeOMatInventory - type: Advertise pack: BoozeOMatAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/boozeomat.rsi @@ -116,8 +112,6 @@ pack: BarDrobe - type: Advertise pack: BarDrobeAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Sprite sprite: Constructible/Power/VendingMachines/bardrobe.rsi layers: @@ -174,8 +168,6 @@ pack: CigaretteMachineInventory - type: Advertise pack: CigaretteMachineAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/cigs.rsi @@ -206,8 +198,6 @@ pack: ClothesMateInventory - type: Advertise pack: ClothesMateAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/clothing.rsi @@ -237,8 +227,6 @@ pack: HotDrinksMachineInventory - type: Advertise pack: HotDrinksMachineAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/coffee.rsi @@ -273,8 +261,6 @@ pack: RobustSoftdrinksInventory - type: Advertise pack: RobustSoftdrinksAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/cola.rsi @@ -305,8 +291,6 @@ pack: DinnerwareInventory - type: Advertise pack: DinnerwareAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Sprite sprite: Constructible/Power/VendingMachines/dinnerware.rsi layers: @@ -336,8 +320,6 @@ pack: DiscountDansInventory - type: Advertise pack: DiscountDansAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/discount.rsi @@ -395,8 +377,6 @@ pack: NanoMedPlusInventory - type: Advertise pack: NanoMedAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Sprite sprite: Constructible/Power/VendingMachines/medical.rsi layers: @@ -428,8 +408,6 @@ pack: NutriMaxInventory - type: Advertise pack: NutriMaxAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Sprite sprite: Constructible/Power/VendingMachines/nutri.rsi layers: @@ -460,8 +438,6 @@ pack: SecTechInventory - type: Advertise pack: SecTechAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Sprite sprite: Constructible/Power/VendingMachines/sec.rsi layers: @@ -491,8 +467,6 @@ pack: MegaSeedServitorInventory - type: Advertise pack: MegaSeedAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Sprite sprite: Constructible/Power/VendingMachines/seeds.rsi layers: @@ -522,8 +496,6 @@ pack: SmartFridgeInventory - type: Advertise pack: SmartFridgeAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/smartfridge.rsi @@ -551,8 +523,6 @@ pack: GetmoreChocolateCorpInventory - type: Advertise pack: GetmoreChocolateCorpAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/snack.rsi @@ -582,8 +552,6 @@ pack: BodaInventory - type: Advertise pack: BodaAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/sovietsoda.rsi @@ -613,8 +581,6 @@ pack: AutoDrobeInventory - type: Advertise pack: AutoDrobeAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/theater.rsi @@ -648,8 +614,6 @@ pack: VendomatInventory - type: Advertise pack: VendomatAds - minWait: 480 # 8 minutes - maxWait: 600 # 10 minutes - type: Speech - type: Sprite sprite: Constructible/Power/VendingMachines/vendomat.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml b/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml index 3fe0e117cf..0aa313a130 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml @@ -27,7 +27,7 @@ drawdepth: FloorObjects - type: SignalReceiver maxTransmitters: 1 - - type: PowerReceiver + - type: ApcPowerReceiver - type: Conveyor - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml index 47139c65f2..84ae79f823 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml @@ -12,4 +12,4 @@ state: industrial_dispenser - type: ReagentDispenser pack: ChemDispenserStandardInventory - - type: PowerReceiver + - type: ApcPowerReceiver diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml index dd6a6ac8c1..412c455d39 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml @@ -21,7 +21,7 @@ - Opaque - MobImpassable - SmallImpassable - - type: PowerReceiver + - type: ApcPowerReceiver - type: UserInterface interfaces: - key: enum.ReagentDispenserUiKey.Key diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml b/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml index 8a29b60620..38c3bae6c9 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml @@ -39,7 +39,7 @@ - state: mw_unlit shader: unshaded map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"] - - type: PowerReceiver + - type: ApcPowerReceiver - type: Damageable resistances: metallicResistances - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml b/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml index 9ab61d3506..1261dcbebb 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml @@ -17,7 +17,7 @@ - type: ReagentGrinderVisualizer - type: Clickable - type: InteractionOutline - - type: PowerReceiver + - type: ApcPowerReceiver - type: LoopingSound - type: Physics fixtures: diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml b/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml index 10efe5da0d..68ce5a5646 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml @@ -21,7 +21,7 @@ - MobImpassable - type: ResearchServer - type: TechnologyDatabase - - type: PowerReceiver + - type: ApcPowerReceiver powerLoad: 200 priority: Low - type: Damageable @@ -77,7 +77,7 @@ - type: Appearance visuals: - type: PowerDeviceVisualizer - - type: PowerReceiver + - type: ApcPowerReceiver - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml b/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml index f041f5a07b..aefaaff479 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml @@ -33,5 +33,5 @@ max: 1 - !type:DoActsBehavior acts: ["Destruction"] - - type: PowerReceiver + - type: ApcPowerReceiver - type: CargoTelepad diff --git a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml b/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml index 7b1653ced2..08526a09de 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml @@ -16,7 +16,7 @@ sprite: Constructible/Power/mixer.rsi state: mixer_loaded - type: ChemMaster - - type: PowerReceiver + - type: ApcPowerReceiver - type: InteractionOutline - type: Anchorable - type: Physics diff --git a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml b/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml index 4708e06aee..527bcade39 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml @@ -14,7 +14,7 @@ shader: unshaded map: ["enum.GravityGeneratorVisualLayers.Core"] - type: SnapGrid - - type: PowerReceiver + - type: ApcPowerReceiver powerLoad: 500 - type: Physics fixtures: diff --git a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml b/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml index 419981a1d1..683b59074d 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml @@ -32,4 +32,4 @@ state_clean: grinder-o1 state_bloody: grinder-o1bld - type: Recycler - - type: PowerReceiver + - type: ApcPowerReceiver diff --git a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml index be8f01c2dc..9cf0b64ab5 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml @@ -14,7 +14,7 @@ drawdepth: WallTops sprite: Constructible/Misc/barsign.rsi state: empty - - type: PowerReceiver + - type: ApcPowerReceiver - type: BarSign - type: Destructible thresholds: @@ -37,7 +37,7 @@ drawdepth: WallTops sprite: Constructible/Misc/sylphs.rsi state: sylph - - type: PowerReceiver + - type: ApcPowerReceiver - type: BarSign - type: entity diff --git a/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml b/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml index 69c2c5a1ac..f4e6bb0181 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/emergency_light.yml @@ -11,7 +11,7 @@ offset: "0, 0.8" color: "#FF4020" mask: /Textures/Effects/LightMasks/emergency_mask.png - - type: PowerReceiver + - type: ApcPowerReceiver - type: Battery maxCharge: 30000 startingCharge: 0 @@ -20,6 +20,10 @@ sprite: Constructible/Lighting/emergency_light.rsi layers: - state: emergency_light_off + - type: Appearance + visuals: + - type: EmergencyLightVisualizer + placement: snap: - Wallmount diff --git a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml index c12809b5df..b4d2401e14 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml @@ -4,6 +4,8 @@ name: girder description: A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall. components: + - type: Transform + anchored: true - type: Physics bodyType: Static fixtures: @@ -11,6 +13,7 @@ !type:PhysShapeAabb {} mass: 50 layer: + - Impassable - SmallImpassable mask: - VaultImpassable diff --git a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml index 4a41b66ea6..3a1c355533 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml @@ -63,7 +63,7 @@ enabled: false - type: PoweredLight bulb: Tube - - type: PowerReceiver + - type: ApcPowerReceiver - type: Appearance visuals: - type: PoweredLightVisualizer @@ -135,7 +135,7 @@ layer: [ Passable ] - type: PoweredLight bulb: Bulb - - type: PowerReceiver + - type: ApcPowerReceiver - type: Appearance visuals: - type: PoweredLightVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/base.yml b/Resources/Prototypes/Entities/Constructible/base.yml index 3c8d26064e..2df3e4b3e8 100644 --- a/Resources/Prototypes/Entities/Constructible/base.yml +++ b/Resources/Prototypes/Entities/Constructible/base.yml @@ -46,4 +46,3 @@ mask: - VaultImpassable - type: Anchorable - - type: Pullable diff --git a/Resources/Prototypes/Entities/Constructible/base_machine.yml b/Resources/Prototypes/Entities/Constructible/base_machine.yml index 14928a150b..b19a2a4167 100644 --- a/Resources/Prototypes/Entities/Constructible/base_machine.yml +++ b/Resources/Prototypes/Entities/Constructible/base_machine.yml @@ -29,10 +29,10 @@ acts: ["Destruction"] - !type:PlaySoundBehavior sound: /Audio/Effects/metalbreak.ogg - + - type: entity abstract: true parent: BaseMachine id: BaseMachinePowered components: - - type: PowerReceiver + - type: ApcPowerReceiver diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index 814a195790..c24a919ef9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -21,6 +21,7 @@ # Donkpocket # Warm gives +5 nutriment. +# Warm ones contain a small amount of Omnizine. - type: entity name: donk-pocket @@ -68,6 +69,8 @@ reagents: - ReagentId: Nutriment Quantity: 10 + - ReagentId: Omnizine + Quantity: 4 - type: entity name: spicy-pocket @@ -80,7 +83,7 @@ - type: entity name: warm spicy-pocket - parent: FoodDonkpocketDank + parent: FoodDonkpocketSpicy id: FoodDonkpocketSpicyWarm description: The classic snack food, now maybe a bit too spicy. components: @@ -89,6 +92,8 @@ reagents: - ReagentId: Nutriment Quantity: 10 + - ReagentId: Omnizine + Quantity: 2 - type: Sprite state: spicy @@ -112,6 +117,8 @@ reagents: - ReagentId: Nutriment Quantity: 10 + - ReagentId: Omnizine + Quantity: 2 - type: entity name: pizza-pocket @@ -131,13 +138,15 @@ name: warm pizza-pocket parent: FoodDonkpocketPizza id: FoodDonkpocketPizzaWarm - description: An East Asian take on the classic stationside snack, now steamy and warm. + description: Cheese filling really hits the spot when warm. components: - type: SolutionContainer contents: reagents: - ReagentId: Nutriment Quantity: 15 + - ReagentId: Omnizine + Quantity: 2 - type: entity name: honk-pocket @@ -150,6 +159,7 @@ reagents: - ReagentId: Nutriment Quantity: 5 + - ReagentId: Omnizine - type: Sprite state: banana @@ -164,6 +174,8 @@ reagents: - ReagentId: Nutriment Quantity: 10 + - ReagentId: Omnizine + Quantity: 2 - type: entity name: berry-pocket @@ -190,6 +202,10 @@ reagents: - ReagentId: Nutriment Quantity: 10 + - ReagentId: Omnizine + Quantity: 2 + - ReagentId: Glucose + Quantity: 2 - type: entity name: gondola-pocket @@ -215,3 +231,19 @@ reagents: - ReagentId: Nutriment Quantity: 10 + - ReagentId: Omnizine + Quantity: 2 + +- type: entity + name: dink-pocket + parent: FoodDonkpocketBase + id: FoodDonkpocketDink + description: An off-brand lizard donk-pocket, filled with pickled carrot and wrapped with seaweed. Best eaten cold, or even better, not eaten at all. + components: + - type: SolutionContainer + contents: + reagents: + - ReagentId: Nutriment + Quantity: 2 + - type: Sprite + state: dink diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 08cca5a0a2..b3264ef81e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -357,3 +357,19 @@ contents: - id: FoodDonkpocketHonk amount: 6 + +- type: entity + parent: FoodBoxDonkpocket + id: FoodBoxDonkpocketDink + name: box of dink-pockets + description: Net Zero carbohydrates! No need for heating! + components: + - type: Sprite + state: dink-box + - type: Item + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + color: green + - type: StorageFill + contents: + - id: FoodDonkpocketDink + amount: 6 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml index 825d494e9a..74560880ac 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml @@ -111,6 +111,13 @@ name: thirteen loko can description: The MBO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly. components: + - type: SolutionContainer + maxVol: 20 + caps: None + contents: + reagents: + - ReagentId: ThirteenLoko + Quantity: 20 - type: Sprite sprite: Objects/Consumable/Drinks/thirteen_loko.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml index 90005db59b..93ae58dd7c 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml @@ -4,7 +4,6 @@ id: BaseDice components: - type: Dice - - type: LoopingSound - type: Sprite sprite: Objects/Fun/dice.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml index dcbe3d4fde..a024fba25d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -53,7 +53,7 @@ - state: extinguish map: [ "enum.VaporVisualLayers.Base" ] - type: Physics - bodyType: KinematicController + bodyType: Dynamic fixtures: - shape: !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml index 2226d60bbd..0bae25cef0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml @@ -57,7 +57,6 @@ name: "vapor" abstract: true components: - - type: SnapGrid - type: SolutionContainer maxVol: 50 - type: Vapor @@ -69,7 +68,7 @@ - state: chempuff map: [ "enum.VaporVisualLayers.Base" ] - type: Physics - bodyType: KinematicController + bodyType: Dynamic fixtures: - shape: !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index df9e7ac1d5..6e57604d46 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -16,26 +16,26 @@ netsync: false - type: Item sprite: Objects/Tools/cable-coils.rsi - - type: WirePlacer + - type: CablePlacer - type: Clickable - type: entity - id: HVWireStack + id: CableHVStack parent: CableStack name: HV cable coil suffix: Full components: - type: Stack - stackType: HVCable + stackType: CableHV - type: Sprite state: coilhv-30 - type: Item size: 10 HeldPrefix: coilhv - - type: WirePlacer - wirePrototypeID: HVWire - blockingWireType: HighVoltage + - type: CablePlacer + cablePrototypeID: CableHV + blockingCableType: HighVoltage - type: Appearance visuals: - type: StackVisualizer @@ -45,8 +45,8 @@ - coilhv-30 - type: entity - parent: HVWireStack - id: HVWireStack1 + parent: CableHVStack + id: CableHVStack1 suffix: 1 components: - type: Sprite @@ -54,12 +54,11 @@ - type: Item size: 3 - type: Stack - stackType: HVWireStack1 count: 1 - type: entity parent: CableStack - id: ApcExtensionCableStack + id: CableApcStack name: cable coil description: Low-Voltage stack of wires for connecting APCs to machines and other purposes. suffix: Full @@ -69,9 +68,9 @@ - type: Item size: 10 HeldPrefix: coillv - - type: WirePlacer - wirePrototypeID: ApcExtensionCable - blockingWireType: Apc + - type: CablePlacer + cablePrototypeID: CableApcExtension + blockingCableType: Apc - type: Appearance visuals: - type: StackVisualizer @@ -81,8 +80,8 @@ - coillv-30 - type: entity - parent: ApcExtensionCableStack - id: ApcExtensionCableStack1 + parent: CableApcStack + id: CableApcStack1 suffix: 1 components: - type: Sprite @@ -94,20 +93,20 @@ - type: entity parent: CableStack - id: MVWireStack + id: CableMVStack name: MV cable coil suffix: Full components: - type: Stack - stackType: MVCable + stackType: CableMV - type: Sprite state: coilmv-30 - type: Item size: 10 HeldPrefix: coilmv - - type: WirePlacer - wirePrototypeID: MVWire - blockingWireType: MediumVoltage + - type: CablePlacer + cablePrototypeID: CableMV + blockingCableType: MediumVoltage - type: Appearance visuals: - type: StackVisualizer @@ -117,8 +116,8 @@ - coilmv-30 - type: entity - parent: MVWireStack - id: MVWireStack1 + parent: CableMVStack + id: CableMVStack1 suffix: 1 components: - type: Sprite @@ -126,5 +125,4 @@ - type: Item size: 3 - type: Stack - stackType: MVWireStack1 count: 1 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index d91a96dd18..eb2b34041b 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -14,3 +14,23 @@ amount: 1 - !type:AdjustHealth amount: 0.1 + +- type: reagent + id: ThirteenLoko + name: Thirteen Loko + desc: A highly processed liquid substance barely-passing intergalatic health standarts for a soft drink. + physicalDesc: fizzy + color: "#deb928" + metabolism: + - !type:DefaultDrink + rate: 1 + - !type:HealthChangeMetabolism + healthChange: 2 + damageClass: Toxin + plantMetabolism: + - !type:AdjustNutrition + amount: 0.1 + - !type:AdjustWater + amount: 1 + - !type:AdjustHealth + amount: 0.1 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index a34e89132a..16dba85352 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -356,3 +356,24 @@ desc: Pure THC oil, extracted from the leaves of the cannabis plant. Much stronger than in it's natural form and can be used to numb chronic pain in patients. physicalDesc: skunky color: "#DAA520" + +- type: reagent + id: Omnizine + name: Omnizine + desc: A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that it's origins remain a mystery because knowing the secrets of its production would render most commercial pharmaceuticals obsolete. + physicalDesc: soothing + color: "#fcf7f9" + metabolism: + - !type:HealthChangeMetabolism + healthChange: -2 + damageClass: Burn + - !type:HealthChangeMetabolism + healthChange: -2 + damageClass: Toxin + - !type:HealthChangeMetabolism + healthChange: -2 + damageClass: Airloss + - !type:HealthChangeMetabolism + healthChange: -2 + damageClass: Brute + diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml index cd744c5983..32c5c8c337 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/airlock.yml @@ -58,7 +58,7 @@ - to: assembly completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 amount: 5 steps: - tool: Cutting diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml index 7e185a449d..3de0a915fd 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/computer.yml @@ -100,7 +100,7 @@ - !type:EntityAnchored { } completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 amount: 5 steps: - tool: Cutting diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml index cf2fa03416..000dfdda8c 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml @@ -59,7 +59,7 @@ - to: frame1 completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 amount: 2 conditions: - !type:EntityAnchored diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml index 916d48ad17..53c8cb6478 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/machine.yml @@ -63,7 +63,7 @@ - !type:EntityAnchored {} completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 steps: - tool: Prying doAfter: 2 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/particle_accelerator.yml b/Resources/Prototypes/Recipes/Construction/Graphs/particle_accelerator.yml index 0f1b5f504e..6c9f668220 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/particle_accelerator.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/particle_accelerator.yml @@ -34,7 +34,7 @@ - !type:EntityAnchored {} completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 steps: - tool: Cutting doAfter: 0.5 @@ -86,7 +86,7 @@ - !type:EntityAnchored {} completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 steps: - tool: Cutting doAfter: 0.5 @@ -138,7 +138,7 @@ - !type:EntityAnchored {} completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 steps: - tool: Cutting doAfter: 0.5 @@ -189,7 +189,7 @@ - !type:EntityAnchored {} completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 steps: - tool: Cutting doAfter: 0.5 @@ -240,7 +240,7 @@ - !type:EntityAnchored {} completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 steps: - tool: Cutting doAfter: 0.5 @@ -291,7 +291,7 @@ - !type:EntityAnchored {} completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 steps: - tool: Cutting doAfter: 0.5 @@ -342,7 +342,7 @@ - !type:EntityAnchored {} completed: - !type:SpawnPrototype - prototype: ApcExtensionCableStack1 + prototype: CableApcStack1 steps: - tool: Cutting doAfter: 0.5 diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml index ddfce393ee..37160c400f 100644 --- a/Resources/Prototypes/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/Recipes/Lathes/tools.yml @@ -38,25 +38,25 @@ id: CableStack name: cable coil icon: /Textures/Objects/Tools/cable-coils.rsi/coillv-30.png - result: ApcExtensionCableStack1 + result: CableApcStack1 completetime: 500 materials: Steel: 100 - type: latheRecipe - id: MVWireStack + id: CableMVStack name: MV cable coil icon: /Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png - result: MVWireStack1 + result: CableMVStack1 completetime: 500 materials: Steel: 150 - type: latheRecipe - id: HVWireStack + id: CableHVStack name: HV cable coil icon: /Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png - result: HVWireStack1 + result: CableHVStack1 completetime: 500 materials: Steel: 200 diff --git a/Resources/Prototypes/SoundCollections/dice.yml b/Resources/Prototypes/SoundCollections/dice.yml index 6ae970bc91..2683441098 100644 --- a/Resources/Prototypes/SoundCollections/dice.yml +++ b/Resources/Prototypes/SoundCollections/dice.yml @@ -1,5 +1,5 @@ - type: soundCollection - id: dice + id: Dice files: - /Audio/Items/Dice/dice1.ogg - /Audio/Items/Dice/dice2.ogg diff --git a/Resources/Prototypes/Stacks/power_stacks.yml b/Resources/Prototypes/Stacks/power_stacks.yml index b72177af1a..bc49118433 100644 --- a/Resources/Prototypes/Stacks/power_stacks.yml +++ b/Resources/Prototypes/Stacks/power_stacks.yml @@ -2,24 +2,13 @@ id: Cable name: cable icon: "/Textures/Objects/Tools/cable-coils.rsi/coil-30.png" - spawn: ApcExtensionCableStack1 + spawn: CableApcStack1 - type: stack - id: MVCable + id: CableMV name: mv cable + spawn: CableHVStack1 - type: stack - id: HVCable + id: CableHV name: hv cable - -- type: stack - id: HVWireStack1 - name: hv wire - -- type: stack - id: MVWireStack1 - name: mv wire - -- type: stack - id: ApcExtensionCableStack1 - name: apc extension cable diff --git a/Resources/Textures/Constructible/Power/wire_terminal.rsi/meta.json b/Resources/Textures/Constructible/Power/wire_terminal.rsi/meta.json new file mode 100644 index 0000000000..5344175985 --- /dev/null +++ b/Resources/Textures/Constructible/Power/wire_terminal.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "copyright": "Taken from https://github.com/tgstation/tgstation at 21e50aebdac3e30b3f85b5e44e552e3e37ed00ea", + "license": "CC-BY-SA-3.0", + "states": + [ + { + "name": "term", + "directions": 4, + "delays": + [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Power/wire_terminal.rsi/term.png b/Resources/Textures/Constructible/Power/wire_terminal.rsi/term.png new file mode 100644 index 0000000000..dbae38dbe9 Binary files /dev/null and b/Resources/Textures/Constructible/Power/wire_terminal.rsi/term.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png new file mode 100644 index 0000000000..eba69a81bd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink-box.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink.png b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink.png new file mode 100644 index 0000000000..991604d85b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/dink.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json index 7b6a77fc7a..8b64f3577a 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json @@ -51,6 +51,12 @@ }, { "name": "teriyaki-box" + }, + { + "name": "dink-box" + }, + { + "name": "dink" }, { "name": "inhand-left", diff --git a/RobustToolbox b/RobustToolbox index 0dfd3b7443..c06707d519 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 0dfd3b7443cf11bb763b29059732053917a2cacb +Subproject commit c06707d51911ebb1ed8005277d0f10e58bf49d6d diff --git a/SpaceStation14.sln b/SpaceStation14.sln index 9746998c5a..e9d03b7d4b 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -104,6 +104,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Linguini.Syntax", "RobustTo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralRules.Generator", "RobustToolbox\Linguini\PluralRules.Generator\PluralRules.Generator.csproj", "{9210CCA8-94AA-407F-8F9A-64101D0E552D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pow3r", "Pow3r\Pow3r.csproj", "{1C048C9F-00A9-4796-BE4D-BB36B7769720}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -245,6 +247,10 @@ Global {9210CCA8-94AA-407F-8F9A-64101D0E552D}.Debug|Any CPU.Build.0 = Debug|Any CPU {9210CCA8-94AA-407F-8F9A-64101D0E552D}.Release|Any CPU.ActiveCfg = Release|Any CPU {9210CCA8-94AA-407F-8F9A-64101D0E552D}.Release|Any CPU.Build.0 = Release|Any CPU + {1C048C9F-00A9-4796-BE4D-BB36B7769720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C048C9F-00A9-4796-BE4D-BB36B7769720}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings index 7e9587d93b..4e62aebed4 100644 --- a/SpaceStation14.sln.DotSettings +++ b/SpaceStation14.sln.DotSettings @@ -164,6 +164,9 @@ True Serializable & NetSerializable types True + True + 2.0 + InCSharpTypeAndNamespace True 2.0 InCSharpTypeMember