diff --git a/Content.Client/Construction/ConstructionPlacementHijack.cs b/Content.Client/Construction/ConstructionPlacementHijack.cs index b2ef9b9027..e078fc390c 100644 --- a/Content.Client/Construction/ConstructionPlacementHijack.cs +++ b/Content.Client/Construction/ConstructionPlacementHijack.cs @@ -27,16 +27,7 @@ namespace Content.Client.Construction { if (Prototype != null) { - // Stupid god damn Y AXIS. var dir = Manager.Direction; - if (dir == Direction.South) - { - dir = Direction.North; - } - else if (dir == Direction.North) - { - dir = Direction.South; - } Owner.SpawnGhost(Prototype, coords, dir); } return true; diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs index 14ff23be8d..b3bf131c3e 100644 --- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs +++ b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs @@ -56,16 +56,14 @@ namespace Content.Client.GameObjects.Components.SmoothWalling var state0 = $"{StateBase}0"; SnapGrid = Owner.GetComponent(); Sprite = Owner.GetComponent(); - // BIG NOTE: Y axis is fucked. Double fucked. Triple super-mega-ultra-turbo-fucked. - // so, the DirectionOffsets here are incorrect (flipped). Sprite.LayerMapSet(CornerLayers.SE, Sprite.AddLayerState(state0)); - Sprite.LayerSetDirOffset(CornerLayers.SE, DirectionOffset.Flip); + Sprite.LayerSetDirOffset(CornerLayers.SE, DirectionOffset.None); Sprite.LayerMapSet(CornerLayers.NE, Sprite.AddLayerState(state0)); - Sprite.LayerSetDirOffset(CornerLayers.NE, DirectionOffset.Clockwise); + Sprite.LayerSetDirOffset(CornerLayers.NE, DirectionOffset.CounterClockwise); Sprite.LayerMapSet(CornerLayers.NW, Sprite.AddLayerState(state0)); - Sprite.LayerSetDirOffset(CornerLayers.NW, DirectionOffset.None); + Sprite.LayerSetDirOffset(CornerLayers.NW, DirectionOffset.Flip); Sprite.LayerMapSet(CornerLayers.SW, Sprite.AddLayerState(state0)); - Sprite.LayerSetDirOffset(CornerLayers.SW, DirectionOffset.CounterClockwise); + Sprite.LayerSetDirOffset(CornerLayers.SW, DirectionOffset.Clockwise); } public override void ExposeData(ObjectSerializer serializer) diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs index a933537a24..011977d279 100644 --- a/Content.Client/UserInterface/HandsGui.cs +++ b/Content.Client/UserInterface/HandsGui.cs @@ -32,8 +32,8 @@ namespace Content.Client.UserInterface private UiHandInfo LeftHand; private UiHandInfo RightHand; - private Box2i handL; - private Box2i handR; + private UIBox2i handL; + private UIBox2i handR; protected override void Initialize() { @@ -53,7 +53,7 @@ namespace Content.Client.UserInterface SetMarginsPreset(LayoutPreset.CenterBottom); SetAnchorPreset(LayoutPreset.CenterBottom); - handL = new Box2i(0, 0, BOX_SIZE, BOX_SIZE); + handL = new UIBox2i(0, 0, BOX_SIZE, BOX_SIZE); handR = handL.Translated(new Vector2i(BOX_SIZE + BOX_SPACING, 0)); SS14.Shared.Log.Logger.Debug($"{handL}, {handR}"); MouseFilter = MouseFilterMode.Stop; @@ -64,7 +64,7 @@ namespace Content.Client.UserInterface return new Vector2(BOX_SIZE * 2 + 1, BOX_SIZE); } - protected override void Draw(DrawingHandle handle) + protected override void Draw(DrawingHandleScreen handle) { if (!TryGetHands(out IHandsComponent hands)) return; @@ -79,7 +79,7 @@ namespace Content.Client.UserInterface { var bounds = LeftHand.HeldSprite.Size; handle.DrawTextureRect(LeftHand.HeldSprite, - Box2i.FromDimensions(handL.Left + (int)(handL.Width / 2f - bounds.X / 2f), + UIBox2i.FromDimensions(handL.Left + (int)(handL.Width / 2f - bounds.X / 2f), handL.Top + (int)(handL.Height / 2f - bounds.Y / 2f), (int)bounds.X, (int)bounds.Y), tile: false); } @@ -88,7 +88,7 @@ namespace Content.Client.UserInterface { var bounds = RightHand.HeldSprite.Size; handle.DrawTextureRect(RightHand.HeldSprite, - Box2i.FromDimensions(handR.Left + (int)(handR.Width / 2f - bounds.Y / 2f), + UIBox2i.FromDimensions(handR.Left + (int)(handR.Width / 2f - bounds.Y / 2f), handR.Top + (int)(handR.Height / 2f - bounds.Y / 2f), (int)bounds.X, (int)bounds.Y), tile: false); } diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index c4dfcd136e..5636dcd2e9 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -10,60 +10,52 @@ grids: worldpos: 0,0 chunks: - ind: "-1,0" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "-1,-1" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAA== - - ind: "0,-1" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAA== + - ind: "-1,1" + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + - ind: "0,1" + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "0,0" - tiles: AQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + - ind: "0,-1" + tiles: AAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== entities: - type: Wire components: - grid: 0 - pos: 4.5,3.5 + pos: 4.5,-3.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: 4.5,0.5 + pos: 4.5,-0.5 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,-6 + pos: -7,6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,4 + pos: -7,-4 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,3 + pos: -7,-3 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,2 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: -7,1 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: -7,0 + pos: -7,-2 rot: -1.570796 type: Transform - type: wall @@ -75,37 +67,37 @@ entities: - type: wall components: - grid: 0 - pos: 6,7 + pos: -7,0 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,8 + pos: -7,1 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,9 + pos: 6,-7 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,-5 + pos: 6,-8 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,-6 + pos: 6,-9 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,-5 + pos: -7,5 rot: -1.570796 type: Transform - type: wall @@ -123,19 +115,19 @@ entities: - type: wall components: - grid: 0 - pos: -7,9 + pos: 6,-6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,-1 + pos: 6,-5 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,0 + pos: -7,-9 rot: -1.570796 type: Transform - type: wall @@ -147,277 +139,247 @@ entities: - type: wall components: - grid: 0 - pos: 6,2 + pos: 6,0 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,3 + pos: 6,-1 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,4 + pos: 6,-2 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 6,-3 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 6,-4 rot: -1.570796 type: Transform - type: DoorContent components: - grid: 0 - pos: -5.5,4.5 + pos: -5.5,-4.5 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,5 + pos: -7,-5 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,6 + pos: -7,-6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -4,6 + pos: -4,-6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -4,5 + pos: -4,-5 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -4,4 + pos: -4,-4 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -3,6 + pos: -3,-6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -2,6 + pos: -2,-6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -1,6 + pos: -1,-6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 0,6 + pos: 0,-6 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: 4.5,-0.5 + pos: 4.5,0.5 rot: -1.570796 type: Transform - type: table components: - grid: 0 - pos: -2.5,4.5 + pos: -2.5,-4.5 rot: -1.570796 type: Transform - type: DoorContent components: - grid: 0 - pos: 4.5,4.5 + pos: 4.5,-4.5 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 1,6 + pos: 1,-6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 2,6 + pos: 2,-6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 3,6 + pos: 3,-6 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 3,5 + pos: 3,-5 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 3,4 + pos: 3,-4 rot: -1.570796 type: Transform - type: table components: - grid: 0 - pos: -0.5,4.5 + pos: -0.5,-4.5 rot: -1.570796 type: Transform - type: table components: - grid: 0 - pos: 1.5,4.5 + pos: 1.5,-4.5 rot: -1.570796 type: Transform - type: LaserItem components: - grid: 0 - pos: -3.015625,3.890625 + pos: -3.015625,-3.890625 rot: -1.570796 type: Transform - type: LaserItem components: - grid: 0 - pos: -2.015625,3.859375 + pos: -2.015625,-3.859375 rot: -1.570796 type: Transform - type: GUNITEM components: - grid: 0 - pos: -2.890625,4.484375 + pos: -2.890625,-4.484375 rot: -1.570796 type: Transform - type: GUNITEM components: - grid: 0 - pos: -1.984375,4.484375 + pos: -1.984375,-4.484375 rot: -1.570796 type: Transform - type: medkit_r components: - grid: 0 - pos: -0.859375,3.921875 + pos: -0.859375,-3.921875 rot: -1.570796 type: Transform - type: medkit_r components: - grid: 0 - pos: -0.921875,4.640625 + pos: -0.921875,-4.640625 rot: -1.570796 type: Transform - type: MopItem components: - grid: 0 - pos: 0.015625,3.921875 + pos: 0.015625,-3.921875 rot: -1.570796 type: Transform - type: FlashlightLantern components: - grid: 0 - pos: 0.046875,4.609375 + pos: 0.046875,-4.609375 rot: -1.570796 type: Transform - type: IDCardStandard components: - grid: 0 - pos: 0.890625,3.921875 + pos: 0.890625,-3.921875 rot: -1.570796 type: Transform - type: RadioHeadsetEars components: - grid: 0 - pos: 0.984375,4.640625 + pos: 0.984375,-4.640625 rot: -1.570796 type: Transform - type: BackpackClothing components: - grid: 0 - pos: 1.890625,3.796875 + pos: 1.890625,-3.796875 rot: -1.570796 type: Transform - type: JanitorUniform components: - grid: 0 - pos: 2.109375,4.546875 + pos: 2.109375,-4.546875 rot: -1.570796 type: Transform - type: ShoesItem components: - grid: 0 - pos: 1.546875,4.484375 + pos: 1.546875,-4.484375 rot: -1.570796 type: Transform - type: table components: - grid: 0 - pos: 1.5,7.5 + pos: 1.5,-7.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: 4.5,5.5 + pos: 4.5,-5.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: 4.5,4.5 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: -7,7 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: -7,8 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 4.5,2.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 4.5,1.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 4.5,7.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 4.5,6.5 - rot: -1.570796 - type: Transform -- type: WirelessMachine - components: - - grid: 0 - pos: 3,3 + pos: 4.5,-4.5 rot: -1.570796 type: Transform - type: wall @@ -432,324 +394,364 @@ entities: pos: -7,-8 rot: -1.570796 type: Transform -- type: wall +- type: Wire components: - grid: 0 - pos: -6,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: -5,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: -4,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: -3,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: -2,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: -1,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: 0,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: 1,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: 2,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: 3,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: 4,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: 5,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: 6,-8 - rot: -1.570796 - type: Transform -- type: wall - components: - - grid: 0 - pos: 6,-7 - rot: -1.570796 - type: Transform -- type: table - components: - - grid: 0 - pos: -2.5,7.5 - rot: -1.570796 - type: Transform -- type: table - components: - - grid: 0 - pos: -0.5,7.5 + pos: 4.5,-2.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: 4.5,8.5 + pos: 4.5,-1.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,-7.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,-6.5 + rot: -1.570796 + type: Transform +- type: WirelessMachine + components: + - grid: 0 + pos: 3,-3 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: -7,7 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: -7,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: -6,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: -5,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: -4,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: -3,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: -2,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: -1,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 0,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 1,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 2,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 3,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 4,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 5,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 6,8 + rot: -1.570796 + type: Transform +- type: wall + components: + - grid: 0 + pos: 6,7 + rot: -1.570796 + type: Transform +- type: table + components: + - grid: 0 + pos: -2.5,-7.5 + rot: -1.570796 + type: Transform +- type: table + components: + - grid: 0 + pos: -0.5,-7.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,-8.5 rot: -1.570796 type: Transform - type: YellowGloves components: - grid: 0 - pos: -3.015625,6.796875 + pos: -3.015625,-6.796875 rot: -1.570796 type: Transform - type: MesonGlasses components: - grid: 0 - pos: -3.046875,7.484375 + pos: -3.046875,-7.484375 rot: -1.570796 type: Transform - type: UtilityBeltClothing components: - grid: 0 - pos: -2.109375,6.765625 + pos: -2.109375,-6.765625 rot: -1.570796 type: Transform - type: GasMaskClothing components: - grid: 0 - pos: -2.234375,7.390625 + pos: -2.234375,-7.390625 rot: -1.570796 type: Transform - type: BlueToolboxItem components: - grid: 0 - pos: -1.109375,6.796875 + pos: -1.109375,-6.796875 rot: -1.570796 type: Transform - type: YellowToolboxItem components: - grid: 0 - pos: -1.078125,7.578125 + pos: -1.078125,-7.578125 rot: -1.570796 type: Transform - type: Wirecutter components: - grid: 0 - pos: -0.234375,6.640625 + pos: -0.234375,-6.640625 rot: -1.570796 type: Transform - type: Welder components: - grid: 0 - pos: -0.234375,7.515625 + pos: -0.234375,-7.515625 rot: -1.570796 type: Transform - type: Screwdriver components: - grid: 0 - pos: 0.703125,6.609375 + pos: 0.703125,-6.609375 rot: -1.570796 type: Transform - type: Crowbar components: - grid: 0 - pos: 0.578125,7.484375 + pos: 0.578125,-7.484375 rot: -1.570796 type: Transform - type: Multitool components: - grid: 0 - pos: 1.515625,6.921875 + pos: 1.515625,-6.921875 rot: -1.570796 type: Transform - type: Wrench components: - grid: 0 - pos: 1.421875,7.484375 + pos: 1.421875,-7.484375 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,10 + pos: -7,-10 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,11 + pos: -7,-11 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,12 + pos: -7,-12 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,13 + pos: -7,-13 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,10 + pos: 6,-10 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,11 + pos: 6,-11 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,12 + pos: 6,-12 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,13 + pos: 6,-13 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -7,14 + pos: -7,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -6,14 + pos: -6,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -5,14 + pos: -5,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -4,14 + pos: -4,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -3,14 + pos: -3,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -2,14 + pos: -2,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: -1,14 + pos: -1,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 0,14 + pos: 0,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 1,14 + pos: 1,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 2,14 + pos: 2,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 3,14 + pos: 3,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 4,14 + pos: 4,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 5,14 + pos: 5,-14 rot: -1.570796 type: Transform - type: wall components: - grid: 0 - pos: 6,14 + pos: 6,-14 rot: -1.570796 type: Transform - type: SMES - name: Smes components: - grid: 0 - pos: -2.5,12.5 + pos: -2.5,-12.5 rot: -1.570796 type: Transform - type: SMES - name: Smes components: - grid: 0 - pos: 1.5,12.5 + pos: 1.5,-12.5 rot: -1.570796 type: Transform - charge: 438.3279 @@ -757,300 +759,91 @@ entities: - type: BlueWire components: - grid: 0 - pos: -2.5,12.5 + pos: -2.5,-12.5 rot: -1.570796 type: Transform - type: BlueWire components: - grid: 0 - pos: -1.5,12.5 + pos: -1.5,-12.5 rot: -1.570796 type: Transform - type: BlueWire components: - grid: 0 - pos: -0.5,12.5 + pos: -0.5,-12.5 rot: -1.570796 type: Transform - type: BlueWire components: - grid: 0 - pos: 0.5,12.5 + pos: 0.5,-12.5 rot: -1.570796 type: Transform - type: BlueWire components: - grid: 0 - pos: 1.5,12.5 + pos: 1.5,-12.5 rot: -1.570796 type: Transform - type: Generator components: - grid: 0 - pos: -0.5,12.5 + pos: -0.5,-12.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: -3.5,12.5 + pos: -3.5,-12.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: -4.5,12.5 + pos: -4.5,-12.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: -5.5,12.5 + pos: -5.5,-12.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: -5.5,11.5 + pos: -5.5,-11.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: -5.5,10.5 + pos: -5.5,-10.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: -5.5,9.5 + pos: -5.5,-9.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: -5.5,8.5 + pos: -5.5,-8.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: -5.5,7.5 + pos: -5.5,-7.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: -5.5,6.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -5.5,5.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -5.5,4.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -5.5,3.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -5.5,2.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -5.5,1.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -5.5,0.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -5.5,-0.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 2.5,12.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 3.5,12.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 4.5,12.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 4.5,11.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 4.5,10.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 4.5,9.5 - rot: -1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: -4,7 - rot: 1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: 3,7 - rot: 1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: 3,13 - rot: -1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: -4,13 - rot: -1.570796 - type: Transform -- type: APC - components: - - grid: 0 - pos: -4,7 - rot: -1.570796 - type: Transform -- type: APC - components: - - grid: 0 - pos: 3,7 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -4.5,7.5 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 3.5,7.5 - rot: -1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: -6,2 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: 5,2 - rot: -1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: 2,4 - rot: -1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: -3,4 - type: Transform -- type: APC - components: - - grid: 0 - pos: -4,3 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -4.5,2.5 - type: Transform -- type: APC - components: - - grid: 0 - pos: 3,3 - type: Transform -- type: Wire - components: - - grid: 0 - pos: 3.5,2.5 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: -10.5,-1.5 - rot: -1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: -10.5,-4.5 - rot: 1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: 9.5,-4.5 - rot: 1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: 9.5,-1.5 - rot: -1.570796 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: -6,-6 - type: Transform -- type: poweredlight - components: - - grid: 0 - pos: 5,-6 - rot: -1.570796 - type: Transform -- type: Wire - components: - - grid: 0 - pos: -5.5,-1.5 + pos: -5.5,-6.5 rot: -1.570796 type: Transform - type: Wire @@ -1080,25 +873,238 @@ entities: - type: Wire components: - grid: 0 - pos: 4.5,-5.5 + pos: -5.5,-1.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: 4.5,-3.5 + pos: -5.5,-0.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: 4.5,-4.5 + pos: -5.5,0.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 2.5,-12.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 3.5,-12.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,-12.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,-11.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,-10.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,-9.5 + rot: -1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: -4,-7 + rot: 1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: 3,-7 + rot: 1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: 3,-13 + rot: -1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: -4,-13 rot: -1.570796 type: Transform - type: APC components: - grid: 0 - pos: -6,-6 + pos: -4,-7 + rot: -1.570796 + type: Transform + - load: 50 + type: PowerProvider +- type: APC + components: + - grid: 0 + pos: 3,-7 + rot: -1.570796 + type: Transform + - load: 50 + type: PowerProvider +- type: Wire + components: + - grid: 0 + pos: -4.5,-7.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 3.5,-7.5 + rot: -1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: -6,-2 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: 5,-2 + rot: -1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: 2,-4 + rot: -1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: -3,-4 + type: Transform +- type: APC + components: + - grid: 0 + pos: -4,-3 + type: Transform +- type: Wire + components: + - grid: 0 + pos: -4.5,-2.5 + type: Transform +- type: APC + components: + - grid: 0 + pos: 3,-3 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 3.5,-2.5 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: -10.5,1.5 + rot: -1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: -10.5,4.5 + rot: 1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: 9.5,4.5 + rot: 1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: 9.5,1.5 + rot: -1.570796 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: -6,6 + type: Transform +- type: poweredlight + components: + - grid: 0 + pos: 5,6 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: -5.5,1.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: -5.5,5.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: -5.5,4.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: -5.5,3.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: -5.5,2.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,5.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,3.5 + rot: -1.570796 + type: Transform +- type: Wire + components: + - grid: 0 + pos: 4.5,4.5 + rot: -1.570796 + type: Transform +- type: APC + components: + - grid: 0 + pos: -6,6 rot: -1.570796 type: Transform - load: 150 @@ -1106,7 +1112,7 @@ entities: - type: APC components: - grid: 0 - pos: 5,-6 + pos: 5,6 rot: -1.570796 type: Transform - load: 150 @@ -1114,25 +1120,25 @@ entities: - type: Wire components: - grid: 0 - pos: 4.5,-1.5 + pos: 4.5,1.5 rot: -1.570796 type: Transform - type: Wire components: - grid: 0 - pos: 4.5,-2.5 + pos: 4.5,2.5 rot: -1.570796 type: Transform - type: WiredMachine components: - grid: 0 - pos: -5.5,12.5 + pos: -5.5,-12.5 rot: -1.570796 type: Transform - type: WiredMachine components: - grid: 0 - pos: 4.5,12.5 + pos: 4.5,-12.5 rot: -1.570796 type: Transform ... diff --git a/Resources/Prototypes/Entities/Door.yml b/Resources/Prototypes/Entities/Door.yml index 1f1b3cf038..3860d157f5 100644 --- a/Resources/Prototypes/Entities/Door.yml +++ b/Resources/Prototypes/Entities/Door.yml @@ -12,7 +12,7 @@ texture: Objects/door_ew.png - type: BoundingBox - aabb: "1,-0.75,2,0.75" + aabb: "-2,-0.75,-1,0.75" sizeX: 1.9 offsetY: 1.5 - type: Collidable diff --git a/Resources/Prototypes/Entities/Mobs.yml b/Resources/Prototypes/Entities/Mobs.yml index 8eab5f9abb..b1ad7010ab 100644 --- a/Resources/Prototypes/Entities/Mobs.yml +++ b/Resources/Prototypes/Entities/Mobs.yml @@ -22,7 +22,7 @@ state: greyshirt - type: BoundingBox - aabb: "0.15,-0.45,1.05,0.45" + aabb: "-1,-0.45,-0.15,0.45" - type: Physics mass: 5 diff --git a/engine b/engine index 523e4d8c49..796626b7d8 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit 523e4d8c4961b7bc145e5198c3ce42f170718754 +Subproject commit 796626b7d8de5e5d2fc63f5253b74241ea30b230