diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index ce3e4e10adb..51c001a38c8 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -38,6 +38,7 @@ using Content.Shared.Zombies; using Robust.Shared.Audio.Systems; using Robust.Shared.Serialization.Manager; +using Robust.Shared.Utility; namespace Content.Server.Zombies; @@ -118,7 +119,11 @@ private void DynamicAddComponents(EntityUid target, ZombieComponent zombieCompon RemComp(target, componentType); var newComponent = _serializationManager.CreateCopy(oldComponent, notNullableOverride: true); - AddComp(target, (Component)newComponent!); + + if (newComponent != null) + { + AddComp(target, (Component)newComponent); + } } } @@ -238,6 +243,13 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null) // Messing with the eye layer made it vanish upon cloning, and also it didn't even appear right huApComp.EyeColor = zombieComponent.EyeColor; + var eyeLayer = huApComp.BaseLayers.FirstOrNull(d => d.Value.ID.Equals("MobHumanoidEyes")); + if (eyeLayer.HasValue) + { + // TODO: Extract Eye information and add new layer to Sprite Component. Take RSI path of Eye Layer and + // mark as unshaded. + } + // this might not resync on clone? _humanoidAppearance.SetBaseLayerId(target, HumanoidVisualLayers.Tail, @@ -495,7 +507,6 @@ private bool UnZombifyEntity(EntityUid source, EntityUid target, ZombieComponent // Dynamically add components. DynamicAddComponents(target, zombieComponent); - // Load old hand status. Copying the component is not enough. if (zombieComponent.BeforeHands.Count > 0) { diff --git a/Content.Server/_Null/Systems/WarperSystem.cs b/Content.Server/_Null/Systems/WarperSystem.cs index 9241013b818..3648e33a190 100644 --- a/Content.Server/_Null/Systems/WarperSystem.cs +++ b/Content.Server/_Null/Systems/WarperSystem.cs @@ -13,10 +13,10 @@ using Content.Shared.Popups; using Content.Shared.Tag; using Robust.Server.Audio; +using Robust.Server.GameObjects; using Robust.Shared.Console; using Robust.Shared.Map; using Robust.Shared.Physics.Components; -using Robust.Shared.Physics.Systems; #pragma warning disable CS0618 // Type or member is obsolete @@ -33,7 +33,7 @@ namespace Content.Server._Null.Systems; public sealed class WarperSystem : EntitySystem { [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly PhysicsSystem _physics = default!; [Dependency] private readonly MobStateSystem _mobState = default!; [Dependency] private readonly TagSystem _tags = default!; [Dependency] private readonly AudioSystem _audio = default!; diff --git a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml index 99e2d8e7212..86eb357a821 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml @@ -1,6 +1,17 @@ meta: - format: 6 - postmapinit: false + format: 7 + category: Grid + engineVersion: 260.2.0 + forkId: "" + forkVersion: "" + time: 11/30/2025 02:25:15 + entityCount: 730 +maps: [] +grids: +- 1 +orphans: +- 1 +nullspace: [] tilemap: 0: Space 30: FloorDark @@ -30,28 +41,28 @@ entities: chunks: 0,0: ind: 0,0 - tiles: HgAAAAABfQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABawAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACawAAAAAAHgAAAAADHgAAAAADHgAAAAACIwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADawAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADfQAAAAAAIwAAAAADIwAAAAABIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAATQAAAAAATQAAAAABfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAATQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 + tiles: HgAAAAABAH0AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAQBrAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAIAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAuAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAH0AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAjAAAAAAIAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAgBrAAAAAAAAHgAAAAADAB4AAAAAAwAeAAAAAAIAIwAAAAADAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADAGsAAAAAAAB9AAAAAAAAfQAAAAAAACMAAAAAAAB9AAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAwB9AAAAAAAAIwAAAAADACMAAAAAAQAjAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAE0AAAAAAAB9AAAAAAAAfQAAAAAAAC4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAAE0AAAAAAABNAAAAAAAAfQAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGsAAAAAAABrAAAAAAAATQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAGsAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAC4AAAAAAwB9AAAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + version: 7 0,-1: ind: 0,-1 - tiles: fQAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAACIwAAAAAAIwAAAAACIwAAAAACfQAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADHgAAAAAAHgAAAAADIwAAAAACawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAACHgAAAAACIwAAAAADawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfQAAAAAAIwAAAAACIwAAAAABIwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAfQAAAAAAIwAAAAACIwAAAAADIwAAAAABfQAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABfQAAAAAAIwAAAAACIwAAAAAAIwAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAawAAAAAAfQAAAAAAfQAAAAAAIwAAAAABawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAfQAAAAAAawAAAAAAfQAAAAAAfQAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADfQAAAAAAawAAAAAAfQAAAAAAawAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 + tiles: fQAAAAAAAH0AAAAAAAB8AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAgAjAAAAAAAAIwAAAAACACMAAAAAAgB9AAAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAEAHgAAAAADAB4AAAAAAAAeAAAAAAMAIwAAAAACAGsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADAB4AAAAAAAAeAAAAAAIAHgAAAAACACMAAAAAAwBrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAQB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrAAAAAAAAfQAAAAAAACMAAAAAAgAjAAAAAAEAIwAAAAADAH0AAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAH0AAAAAAAAjAAAAAAIAIwAAAAADACMAAAAAAQB9AAAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAQB9AAAAAAAAIwAAAAACACMAAAAAAAAjAAAAAAAAawAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrAAAAAAAAfQAAAAAAAGsAAAAAAABrAAAAAAAAawAAAAAAAGsAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAGsAAAAAAAB9AAAAAAAAfQAAAAAAACMAAAAAAQBrAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAB9AAAAAAAAawAAAAAAAH0AAAAAAAB9AAAAAAAAawAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAMAfQAAAAAAAGsAAAAAAAB9AAAAAAAAawAAAAAAAGsAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + version: 7 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAIwAAAAADIwAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAIwAAAAADHgAAAAADHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAIwAAAAAAHgAAAAABHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAIwAAAAADIwAAAAABHgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAADIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAIwAAAAACIwAAAAABawAAAAAAJwAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAADIwAAAAADfQAAAAAAJwAAAAACIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAIwAAAAABIwAAAAADawAAAAAAJwAAAAADHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAA - version: 6 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB8AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAAH0AAAAAAAAjAAAAAAMAIwAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGsAAAAAAAAjAAAAAAMAHgAAAAADAB4AAAAAAQAeAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrAAAAAAAAIwAAAAAAAB4AAAAAAQAeAAAAAAIAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAACMAAAAAAAAjAAAAAAAAIwAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAABrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4AAAAAAAB9AAAAAAAAIwAAAAADACMAAAAAAQAeAAAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAHgAAAAACAB4AAAAAAQAeAAAAAAMAHgAAAAADACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAGsAAAAAAABrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGsAAAAAAAAjAAAAAAIAIwAAAAABAGsAAAAAAAAnAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAIwAAAAADACMAAAAAAwB9AAAAAAAAJwAAAAACACAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAACMAAAAAAQAjAAAAAAMAawAAAAAAACcAAAAAAwAeAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAawAAAAAAAA== + version: 7 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJwAAAAABJwAAAAADJwAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJwAAAAADJwAAAAAAJwAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAJwAAAAAAJwAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUQAAAAAAawAAAAAAXgAAAAADXgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUQAAAAAAfQAAAAAAXgAAAAACXgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAewAAAAABewAAAAADfQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAewAAAAACewAAAAAAawAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAATQAAAAAATQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAATQAAAAABawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAJwAAAAABACcAAAAAAwAnAAAAAAMAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAACcAAAAAAwAnAAAAAAAAJwAAAAACAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACAH0AAAAAAAB9AAAAAAAAJwAAAAAAACcAAAAAAAAeAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAABRAAAAAAAAawAAAAAAAF4AAAAAAwBeAAAAAAIAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAUQAAAAAAAH0AAAAAAABeAAAAAAIAXgAAAAACAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAABAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAABrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAB9AAAAAAAAewAAAAABAHsAAAAAAwB9AAAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAHsAAAAAAgB7AAAAAAAAawAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAABrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAH0AAAAAAABNAAAAAAAATQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAATQAAAAABAGsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAGsAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4AAAAAAAB9AAAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + version: 7 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAAAAAAAAAfAAAAAAA - version: 6 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4AAAAAAAAAAAAAAAAAfAAAAAAAAA== + version: 7 0,-2: ind: 0,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAAAAAAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + version: 7 - type: Broadphase - type: Physics bodyStatus: InAir @@ -616,15 +627,18 @@ entities: -1,0: 0: 65279 0,1: - 0: 56607 + 0: 40223 -1,1: 0: 64398 0,2: - 0: 18288 + 0: 18292 -1,2: 0: 19656 1: 16 0,3: + 1: 1 + 2: 10 + -1,3: 2: 10 1,0: 0: 12305 @@ -632,6 +646,7 @@ entities: 1,1: 0: 4355 2: 64 + 1: 1024 1,2: 1: 16 2: 2 @@ -661,11 +676,13 @@ entities: 2: 2 1,-2: 0: 13073 + 1: 4 2: 64 1,-1: 0: 819 2: 16384 -2,-2: + 1: 4 2: 64 0: 2048 -2,-1: @@ -682,10 +699,9 @@ entities: -2,1: 2: 64 0: 8 + 1: 1024 -2,2: 2: 8 - -1,3: - 2: 10 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -2135,6 +2151,18 @@ entities: - type: Transform pos: 3.5,-8.5 parent: 1 +- proto: ComputerGunneryConsole + entities: + - uid: 238 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,8.5 + parent: 1 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - proto: ComputerTabletopPowerMonitoring entities: - uid: 646 @@ -2142,6 +2170,10 @@ entities: - type: Transform pos: 4.5,-1.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - proto: ComputerTabletopRadar entities: - uid: 421 @@ -2149,6 +2181,10 @@ entities: - type: Transform pos: 2.5,11.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - proto: ComputerTabletopSalvageExpedition entities: - uid: 129 @@ -2157,6 +2193,12 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,10.5 parent: 1 + - type: ExpeditionRewardReciever + spotLocation: -0.98437524,10.015625 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - proto: ComputerTabletopShuttle entities: - uid: 196 @@ -2164,6 +2206,24 @@ entities: - type: Transform pos: -1.5,11.5 parent: 1 + - type: ShuttleConsoleLock + locked: False + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 + - type: DeviceLinkSource + linkedPorts: {} + lastSignals: {} + ports: + - device-button-1 + - device-button-2 + - device-button-3 + - device-button-4 + - device-button-5 + - device-button-6 + - device-button-7 + - device-button-8 - proto: ComputerTabletopStationRecords entities: - uid: 415 @@ -2172,6 +2232,10 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,6.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - proto: ComputerTabletopSurveillanceCameraMonitor entities: - uid: 132 @@ -2180,6 +2244,10 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,10.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - proto: ComputerWallmountWithdrawBankATM entities: - uid: 650 @@ -2188,6 +2256,10 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-2.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - proto: DefaultStationBeaconAME entities: - uid: 738 @@ -3705,17 +3777,30 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,12.5 parent: 1 -- proto: GunSafeShuttleCaptain +- proto: GunneryServer entities: - - uid: 238 + - uid: 702 components: - type: Transform - pos: 2.5,7.5 + pos: 0.5,-14.5 parent: 1 - - uid: 461 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 +- proto: GunSafe + entities: + - uid: 234 components: - type: Transform - pos: 3.5,7.5 + pos: 4.5,7.5 + parent: 1 +- proto: GunSafeShuttleCaptain + entities: + - uid: 104 + components: + - type: Transform + pos: 4.5,6.5 parent: 1 - proto: Gyroscope entities: @@ -3761,6 +3846,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,3.5 parent: 1 +- proto: IceCreamCoffee + entities: + - uid: 704 + components: + - type: Transform + pos: -1.5286605,1.8275988 + parent: 1 - proto: LockerCaptainFilled entities: - uid: 441 @@ -3963,13 +4055,16 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,3.5 parent: 1 -- proto: Rack +- proto: PoweredStrobeRed entities: - - uid: 212 + - uid: 703 components: - type: Transform - pos: 4.5,6.5 + rot: 3.141592653589793 rad + pos: 2.5,8.5 parent: 1 +- proto: Rack + entities: - uid: 476 components: - type: Transform @@ -4053,13 +4148,6 @@ entities: - type: Transform pos: -1.5,-8.5 parent: 1 -- proto: ShipyardBrigandInfo - entities: - - uid: 226 - components: - - type: Transform - pos: 4.292027,-1.6069934 - parent: 1 - proto: ShuttersNormalOpen entities: - uid: 140 @@ -4148,23 +4236,32 @@ entities: - type: DeviceLinkSource linkedPorts: 454: - - Pressed: Toggle + - - Pressed + - Toggle 472: - - Pressed: Toggle + - - Pressed + - Toggle 399: - - Pressed: Toggle + - - Pressed + - Toggle 398: - - Pressed: Toggle + - - Pressed + - Toggle 397: - - Pressed: Toggle + - - Pressed + - Toggle 140: - - Pressed: Toggle + - - Pressed + - Toggle 396: - - Pressed: Toggle + - - Pressed + - Toggle 575: - - Pressed: Toggle + - - Pressed + - Toggle 173: - - Pressed: Toggle + - - Pressed + - Toggle - uid: 630 components: - type: Transform @@ -4173,9 +4270,11 @@ entities: - type: DeviceLinkSource linkedPorts: 157: - - Pressed: Toggle + - - Pressed + - Toggle 158: - - Pressed: Toggle + - - Pressed + - Toggle - uid: 651 components: - type: Transform @@ -4184,11 +4283,14 @@ entities: - type: DeviceLinkSource linkedPorts: 155: - - Pressed: Toggle + - - Pressed + - Toggle 154: - - Pressed: Toggle + - - Pressed + - Toggle 153: - - Pressed: Toggle + - - Pressed + - Toggle - uid: 686 components: - type: Transform @@ -4198,9 +4300,11 @@ entities: - type: DeviceLinkSource linkedPorts: 701: - - Pressed: Toggle + - - Pressed + - Toggle 698: - - Pressed: Toggle + - - Pressed + - Toggle - uid: 688 components: - type: Transform @@ -4210,9 +4314,11 @@ entities: - type: DeviceLinkSource linkedPorts: 653: - - Pressed: Toggle + - - Pressed + - Toggle 654: - - Pressed: Toggle + - - Pressed + - Toggle - proto: SignDirectionalBridge entities: - uid: 659 @@ -4308,10 +4414,10 @@ entities: parent: 1 - proto: SpawnDungeonLootSuitStorageUnitsMercenary entities: - - uid: 234 + - uid: 212 components: - type: Transform - pos: 4.5,7.5 + pos: 3.5,7.5 parent: 1 - proto: SpawnDungeonVendomatsClothes entities: @@ -4364,6 +4470,10 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-5.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - proto: SubstationBasic entities: - uid: 191 @@ -4398,86 +4508,118 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-6.5 parent: 1 + - type: Physics + canCollide: False - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True id: aft starboard side + - type: Fixtures + fixtures: {} - uid: 384 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-6.5 parent: 1 + - type: Physics + canCollide: False - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True id: aft port side + - type: Fixtures + fixtures: {} - uid: 385 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,2.5 parent: 1 + - type: Physics + canCollide: False - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True id: midship port side + - type: Fixtures + fixtures: {} - uid: 402 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,2.5 parent: 1 + - type: Physics + canCollide: False - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True id: midship starboard side + - type: Fixtures + fixtures: {} - uid: 423 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,12.5 parent: 1 + - type: Physics + canCollide: False - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True id: forward starboard side + - type: Fixtures + fixtures: {} - uid: 424 components: - type: Transform pos: -2.5,12.5 parent: 1 + - type: Physics + canCollide: False - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True id: forward port side + - type: Fixtures + fixtures: {} - uid: 427 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-16.5 parent: 1 + - type: Physics + canCollide: False - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True id: aft + - type: Fixtures + fixtures: {} - uid: 473 components: - type: Transform pos: 0.5,-11.5 parent: 1 + - type: Physics + canCollide: False - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True id: cargo bay + - type: Fixtures + fixtures: {} - proto: SurveillanceCameraRouterGeneral entities: - uid: 620 @@ -4672,12 +4814,20 @@ entities: - type: Transform pos: 1.5,-8.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - uid: 621 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,2.5 parent: 1 + - type: ApcPowerReceiver + powerLoad: 5 + - type: Battery + startingCharge: 0 - proto: WallReinforced entities: - uid: 3 @@ -4931,11 +5081,6 @@ entities: - type: Transform pos: 1.5,8.5 parent: 1 - - uid: 104 - components: - - type: Transform - pos: 2.5,8.5 - parent: 1 - uid: 105 components: - type: Transform @@ -5013,6 +5158,11 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-7.5 parent: 1 + - uid: 226 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 - uid: 237 components: - type: Transform @@ -5397,4 +5547,36 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 +- proto: WeaponTurretL85Autocannon + entities: + - uid: 461 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-7.5 + parent: 1 + - uid: 668 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,6.5 + parent: 1 + - uid: 683 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-7.5 + parent: 1 + - uid: 684 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,6.5 + parent: 1 + - uid: 694 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,12.5 + parent: 1 ... diff --git a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml b/Resources/Maps/_NF/Shuttles/Unused_Expedition/ambition.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Expedition/ambition.yml rename to Resources/Maps/_NF/Shuttles/Unused_Expedition/ambition.yml diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Unused_Expedition/anchor.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Expedition/anchor.yml rename to Resources/Maps/_NF/Shuttles/Unused_Expedition/anchor.yml diff --git a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml b/Resources/Maps/_NF/Shuttles/Unused_Expedition/charon.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Expedition/charon.yml rename to Resources/Maps/_NF/Shuttles/Unused_Expedition/charon.yml diff --git a/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml b/Resources/Maps/_NF/Shuttles/Unused_Expedition/decadedove.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml rename to Resources/Maps/_NF/Shuttles/Unused_Expedition/decadedove.yml diff --git a/Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml b/Resources/Maps/_NF/Shuttles/Unused_Expedition/dragonfly.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml rename to Resources/Maps/_NF/Shuttles/Unused_Expedition/dragonfly.yml diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml b/Resources/Maps/_NF/Shuttles/Unused_Expedition/gasbender.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml rename to Resources/Maps/_NF/Shuttles/Unused_Expedition/gasbender.yml diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml b/Resources/Maps/_NF/Shuttles/Unused_Expedition/gourd.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Expedition/gourd.yml rename to Resources/Maps/_NF/Shuttles/Unused_Expedition/gourd.yml diff --git a/Resources/Maps/_NF/Shuttles/Expedition/pathfinder.yml b/Resources/Maps/_NF/Shuttles/Unused_Expedition/pathfinder.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Expedition/pathfinder.yml rename to Resources/Maps/_NF/Shuttles/Unused_Expedition/pathfinder.yml diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Unused_Expedition/sprinter.yml similarity index 100% rename from Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml rename to Resources/Maps/_NF/Shuttles/Unused_Expedition/sprinter.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index d42066348c8..a4597fc478e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -248,6 +248,8 @@ parent: BaseItem id: WeaponGrapplingGun components: + - type: Item + storedRotation: -90 - type: AmmoCounter - type: GrapplingGun - type: Gun diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 8777fad7bb7..789ad80cde3 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -985,7 +985,7 @@ parent: BaseSign id: SignZomlab name: zombie lab sign - description: The final remains of a shut-down Nanotrasen research project that aimed to harness the powers of Romerol. I wonder how that went... + description: The indicator that nearby lies a research project aiming to harness the powers of Romerol. I wonder how that will go... components: - type: Sprite state: zomlab diff --git a/Resources/Prototypes/Entities/Structures/Windows/window_rustic.yml b/Resources/Prototypes/Entities/Structures/Windows/window_rustic.yml new file mode 100644 index 00000000000..b0c2d938c84 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Windows/window_rustic.yml @@ -0,0 +1,17 @@ +- type: entity + parent: Window + id: RusticWindow + name: rustic window + components: + - type: Sprite + drawdepth: WallTops + sprite: _Null/Structures/Windows/wood_window.rsi + - type: Icon + sprite: _Null/Structures/Windows/wood_window.rsi + - type: IconSmooth + base: window + - type: Construction + graph: Window + node: woodWindow + - type: StaticPrice + price: 35 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 2479636e57c..c67eb98aaf3 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -816,6 +816,11 @@ physicalDesc: reagent-physical-desc-soothing flavor: medicine color: "#fcf7f9" + plantMetabolism: + - !type:PlantAdjustNutrition + amount: -1 + - !type:PlantAdjustHealth + amount: 1 metabolisms: Medicine: effects: diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 0ab200de4fb..af5703d94c8 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -108,6 +108,10 @@ color: "#8a9a5b" recognizable: true physicalDesc: reagent-physical-desc-fuzzy + plantMetabolism: + - !type:PlantAffectGrowth + probability: 0.75 + amount: 1 metabolisms: Poison: effects: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml index 37682eb0913..1d8f8fd994f 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml @@ -22,6 +22,12 @@ amount: 2 doAfter: 2 + - to: woodWindow + steps: + - material: WoodPlank + amount: 2 + doAfter: 2 + - to: reinforcedPlasmaWindow steps: - material: ReinforcedPlasmaGlass @@ -98,6 +104,25 @@ - tool: Anchoring doAfter: 2 + - node: woodWindow + entity: RusticWindow + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Screwing + doAfter: 1 + - tool: Prying + doAfter: 2 + - tool: Screwing + doAfter: 1 + - tool: Anchoring + doAfter: 2 + - node: tintedWindow entity: TintedWindow edges: diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 93c4a52bd8e..6aa6caea499 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -467,6 +467,25 @@ placementMode: SnapgridCenter canRotate: false +- type: construction # Null Sector + name: rustic window + id: RusticWindow + graph: Window + startNode: start + targetNode: woodWindow + category: construction-category-structures + description: For a hint of that old-style rustic view. + canBuildInImpassable: true + conditions: + - !type:EmptyOrWindowValidInTile + - !type:NoWindowsInTile + icon: + sprite: _Null/Structures/Windows/wood_window.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + - type: construction name: clockwork window id: ClockworkWindow diff --git a/Resources/Prototypes/_NF/Shuttles/device_linking_ports.yml b/Resources/Prototypes/_Mono/device_linking_ports.yml similarity index 100% rename from Resources/Prototypes/_NF/Shuttles/device_linking_ports.yml rename to Resources/Prototypes/_Mono/device_linking_ports.yml diff --git a/Resources/Prototypes/_NF/Entities/Structures/resident_evil.yml b/Resources/Prototypes/_NF/Entities/Structures/resident_evil.yml index 914dcc3934f..a451f32478c 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/resident_evil.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/resident_evil.yml @@ -21,23 +21,21 @@ # base: plastitanium - type: entity # Null Sector - parent: BaseWall + parent: PlastitaniumWindowIndestructible id: WindowResidentEvilIndestructible name: spooky manor window - description: Skub knows this wall is too hard to destroy. # Frontier + description: It's held together by industrial-strength superglue, and prayers from supervillains. suffix: indestructible components: - - type: Tag - tags: - - Wall # Fix this - type: Sprite - sprite: Structures/Walls/wood.rsi - color: "#cdf3cd" + drawdepth: WallTops + sprite: _Null/Structures/Windows/wood_window.rsi - type: Icon - sprite: Structures/Walls/wood.rsi + sprite: _Null/Structures/Windows/wood_window.rsi + state: full - type: IconSmooth - key: woods - base: wood - # - type: IconSmooth - # key: walls - # base: plastitanium \ No newline at end of file + key: walls # Frontier: windows - - + Due to the rarity of these, they are unable to be looted, and must be scavenged if you wish to outfit your ship with them. They can be fabricated if you have the suitable T3 arsenal research for it though. diff --git a/Resources/Textures/Structures/Walls/wood.rsi/full.png b/Resources/Textures/Structures/Walls/wood.rsi/full.png index c1d1c6ea03f..73eaf7e25b1 100644 Binary files a/Resources/Textures/Structures/Walls/wood.rsi/full.png and b/Resources/Textures/Structures/Walls/wood.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/wood.rsi/wood0.png b/Resources/Textures/Structures/Walls/wood.rsi/wood0.png index 3909f61bd61..2ecd63a42c3 100644 Binary files a/Resources/Textures/Structures/Walls/wood.rsi/wood0.png and b/Resources/Textures/Structures/Walls/wood.rsi/wood0.png differ diff --git a/Resources/Textures/Structures/Walls/wood.rsi/wood1.png b/Resources/Textures/Structures/Walls/wood.rsi/wood1.png index e83f04687de..3cf5871f494 100644 Binary files a/Resources/Textures/Structures/Walls/wood.rsi/wood1.png and b/Resources/Textures/Structures/Walls/wood.rsi/wood1.png differ diff --git a/Resources/Textures/Structures/Walls/wood.rsi/wood2.png b/Resources/Textures/Structures/Walls/wood.rsi/wood2.png index 3909f61bd61..2ecd63a42c3 100644 Binary files a/Resources/Textures/Structures/Walls/wood.rsi/wood2.png and b/Resources/Textures/Structures/Walls/wood.rsi/wood2.png differ diff --git a/Resources/Textures/Structures/Walls/wood.rsi/wood3.png b/Resources/Textures/Structures/Walls/wood.rsi/wood3.png index e83f04687de..3cf5871f494 100644 Binary files a/Resources/Textures/Structures/Walls/wood.rsi/wood3.png and b/Resources/Textures/Structures/Walls/wood.rsi/wood3.png differ diff --git a/Resources/Textures/Structures/Walls/wood.rsi/wood4.png b/Resources/Textures/Structures/Walls/wood.rsi/wood4.png index 66c0976064c..be28fcd7e35 100644 Binary files a/Resources/Textures/Structures/Walls/wood.rsi/wood4.png and b/Resources/Textures/Structures/Walls/wood.rsi/wood4.png differ diff --git a/Resources/Textures/Structures/Walls/wood.rsi/wood5.png b/Resources/Textures/Structures/Walls/wood.rsi/wood5.png index 2bf0e04de38..a31ffcce477 100644 Binary files a/Resources/Textures/Structures/Walls/wood.rsi/wood5.png and b/Resources/Textures/Structures/Walls/wood.rsi/wood5.png differ diff --git a/Resources/Textures/Structures/Walls/wood.rsi/wood6.png b/Resources/Textures/Structures/Walls/wood.rsi/wood6.png index 66c0976064c..bd3b5edcd03 100644 Binary files a/Resources/Textures/Structures/Walls/wood.rsi/wood6.png and b/Resources/Textures/Structures/Walls/wood.rsi/wood6.png differ diff --git a/Resources/Textures/Structures/Walls/wood.rsi/wood7.png b/Resources/Textures/Structures/Walls/wood.rsi/wood7.png index 2bf0e04de38..bc295d8f05e 100644 Binary files a/Resources/Textures/Structures/Walls/wood.rsi/wood7.png and b/Resources/Textures/Structures/Walls/wood.rsi/wood7.png differ diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/full.png b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/full.png new file mode 100644 index 00000000000..b4253f98cf5 Binary files /dev/null and b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/full.png differ diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/meta.json b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/meta.json new file mode 100644 index 00000000000..9f6536937a3 --- /dev/null +++ b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "window0", + "directions": 4 + }, + { + "name": "window1", + "directions": 4 + }, + { + "name": "window2", + "directions": 4 + }, + { + "name": "window3", + "directions": 4 + }, + { + "name": "window4", + "directions": 4 + }, + { + "name": "window5", + "directions": 4 + }, + { + "name": "window6", + "directions": 4 + }, + { + "name": "window7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window0.png b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window0.png new file mode 100644 index 00000000000..e6fd28d2150 Binary files /dev/null and b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window0.png differ diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window1.png b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window1.png new file mode 100644 index 00000000000..4d75a80f931 Binary files /dev/null and b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window1.png differ diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window2.png b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window2.png new file mode 100644 index 00000000000..e6fd28d2150 Binary files /dev/null and b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window2.png differ diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window3.png b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window3.png new file mode 100644 index 00000000000..4d75a80f931 Binary files /dev/null and b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window3.png differ diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window4.png b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window4.png new file mode 100644 index 00000000000..36d467a9ed0 Binary files /dev/null and b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window4.png differ diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window5.png b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window5.png new file mode 100644 index 00000000000..ecfeff79263 Binary files /dev/null and b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window5.png differ diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window6.png b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window6.png new file mode 100644 index 00000000000..36d467a9ed0 Binary files /dev/null and b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window6.png differ diff --git a/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window7.png b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window7.png new file mode 100644 index 00000000000..bc295d8f05e Binary files /dev/null and b/Resources/Textures/_Null/Structures/Windows/wood_window.rsi/window7.png differ diff --git a/Resources/Textures/_Null/Structures/warper.rsi/meta.json b/Resources/Textures/_Null/Structures/warper.rsi/meta.json index 66fefecfc0f..9b2a89e03c4 100644 --- a/Resources/Textures/_Null/Structures/warper.rsi/meta.json +++ b/Resources/Textures/_Null/Structures/warper.rsi/meta.json @@ -1,13 +1,13 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Copyright 2023 Jonas Ljunsgtröm", + "copyright": "Made for Null Sector, Copyright 2025 by Sketch.", "size": { "x": 32, - "y": 64 + "y": 32 }, "states": [ - { + { "name": "warningtape_down", "delays": [ [ @@ -20,13 +20,22 @@ ] }, { - "name": "stair_down" + "name": "warningtape_up", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] }, { - "name": "stair_up" + "name": "stair_down" }, { - "name": "warningtape_up" + "name": "stair_up" } ] } diff --git a/Resources/Textures/_Null/Structures/warper.rsi/stair_down.png b/Resources/Textures/_Null/Structures/warper.rsi/stair_down.png index d85b34ae25a..607c9f44800 100644 Binary files a/Resources/Textures/_Null/Structures/warper.rsi/stair_down.png and b/Resources/Textures/_Null/Structures/warper.rsi/stair_down.png differ diff --git a/Resources/Textures/_Null/Structures/warper.rsi/stair_up.png b/Resources/Textures/_Null/Structures/warper.rsi/stair_up.png index 1507e0f0554..a4393762534 100644 Binary files a/Resources/Textures/_Null/Structures/warper.rsi/stair_up.png and b/Resources/Textures/_Null/Structures/warper.rsi/stair_up.png differ diff --git a/Resources/Textures/_Null/Structures/warper.rsi/warningtape_down.png b/Resources/Textures/_Null/Structures/warper.rsi/warningtape_down.png index 4cdbd7229e1..8eac1f02ed9 100644 Binary files a/Resources/Textures/_Null/Structures/warper.rsi/warningtape_down.png and b/Resources/Textures/_Null/Structures/warper.rsi/warningtape_down.png differ diff --git a/Resources/Textures/_Null/Structures/warper.rsi/warningtape_up.png b/Resources/Textures/_Null/Structures/warper.rsi/warningtape_up.png index fedbfddd27b..a37126ec475 100644 Binary files a/Resources/Textures/_Null/Structures/warper.rsi/warningtape_up.png and b/Resources/Textures/_Null/Structures/warper.rsi/warningtape_up.png differ