From da0b502addb8204a5d469cc820cb5b012f56b880 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Sat, 6 Jan 2024 00:35:16 -0700
Subject: [PATCH] marathon update (#23603)

* marathon update

* autism
---
 Resources/Maps/marathon.yml | 129 +++++-------------------------------
 1 file changed, 17 insertions(+), 112 deletions(-)

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index c7e6486c53..6fb94d24b6 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -7,6 +7,7 @@ tilemap:
   7: FloorAsteroidSand
   9: FloorAsteroidSandRed
   11: FloorAsteroidTile
+  12: FloorAstroGrass
   14: FloorBar
   16: FloorBlue
   17: FloorBlueCircuit
@@ -98,7 +99,7 @@ entities:
           version: 6
         -1,1:
           ind: -1,1
-          tiles: LAAAAAAAeQAAAAAAWQAAAAADeQAAAAAAHQAAAAAAdgAAAAACdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAAWQAAAAADWQAAAAABeQAAAAAAHQAAAAACdgAAAAABdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAdgAAAAABdgAAAAADdgAAAAABdgAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAAAHQAAAAABeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACWQAAAAACWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACWQAAAAADWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACWQAAAAADWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAMQAAAAAAMAAAAAACMgAAAAADMQAAAAAAMQAAAAAAMgAAAAACMAAAAAACeQAAAAAAeQAAAAAAHQAAAAAAWQAAAAABWQAAAAABWQAAAAABeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAADWQAAAAADWQAAAAABWQAAAAACWQAAAAABWQAAAAABSwAAAAAAWQAAAAACSwAAAAACSwAAAAAASwAAAAAASwAAAAADSwAAAAAAWQAAAAABSwAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAABWQAAAAACWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAWQAAAAADWQAAAAADWQAAAAADHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACeQAAAAAAeQAAAAAASwAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAJgAAAAAAHQAAAAABeQAAAAAASwAAAAADSwAAAAACHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAACHQAAAAABHQAAAAABHQAAAAACHQAAAAADeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAHQAAAAACdgAAAAAC
+          tiles: LAAAAAAAeQAAAAAAWQAAAAADeQAAAAAAHQAAAAAAdgAAAAACdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAAWQAAAAADWQAAAAABeQAAAAAAHQAAAAACdgAAAAABdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAHQAAAAAAdgAAAAABdgAAAAADdgAAAAABdgAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAAAHQAAAAABeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACWQAAAAACWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACWQAAAAADWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACWQAAAAADWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAWQAAAAABWQAAAAABWQAAAAABeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAADWQAAAAADWQAAAAABWQAAAAACWQAAAAABWQAAAAABSwAAAAAAWQAAAAACSwAAAAACSwAAAAAASwAAAAAASwAAAAADSwAAAAAAWQAAAAABSwAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAABWQAAAAACWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAWQAAAAADWQAAAAADWQAAAAADHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACeQAAAAAAeQAAAAAASwAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAJgAAAAAAHQAAAAABeQAAAAAASwAAAAADSwAAAAACHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAACHQAAAAABHQAAAAABHQAAAAACHQAAAAADeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAHQAAAAACdgAAAAAC
           version: 6
         -2,1:
           ind: -2,1
@@ -166,7 +167,7 @@ entities:
           version: 6
         -1,2:
           ind: -1,2
-          tiles: HQAAAAACHQAAAAABHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAADHQAAAAAAHQAAAAAAIgAAAAACHQAAAAADdgAAAAACHQAAAAABHQAAAAADeQAAAAAAPgAAAAAAdgAAAAACdgAAAAAAdgAAAAACdgAAAAACdgAAAAADPgAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAHQAAAAACdgAAAAABHQAAAAABHQAAAAACeQAAAAAAPgAAAAAAdgAAAAABLQAAAAADLQAAAAADLQAAAAABdgAAAAADPgAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAACeQAAAAAAPgAAAAAAdgAAAAACdgAAAAADdgAAAAAAdgAAAAABdgAAAAADPgAAAAAAeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAdgAAAAACdgAAAAACHQAAAAABHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAACaAAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAACeQAAAAAAaAAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAAAHQAAAAADHQAAAAAAHQAAAAADHQAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAADHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABIgAAAAACHQAAAAADHQAAAAACHQAAAAADHQAAAAAAHQAAAAACHQAAAAABHQAAAAABIgAAAAABHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAADHQAAAAACLwAAAAAALwAAAAAALwAAAAAAHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAACIgAAAAAAHQAAAAAAHQAAAAAAHQAAAAABHQAAAAACHQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAACHQAAAAABHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAABHQAAAAADHQAAAAAAHQAAAAADeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAA
+          tiles: HQAAAAACHQAAAAABHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAADHQAAAAAAHQAAAAAAIgAAAAACHQAAAAADdgAAAAACHQAAAAABHQAAAAADeQAAAAAAPgAAAAAAdgAAAAACdgAAAAAAdgAAAAACdgAAAAACdgAAAAADPgAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAHQAAAAACdgAAAAABHQAAAAABHQAAAAACeQAAAAAAPgAAAAAAdgAAAAABLQAAAAADLQAAAAADLQAAAAABdgAAAAADPgAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAACeQAAAAAAPgAAAAAAdgAAAAACdgAAAAADdgAAAAAAdgAAAAABdgAAAAADPgAAAAAAeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAdgAAAAACdgAAAAACHQAAAAABHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAACaAAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAACeQAAAAAAaAAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAAAHQAAAAADHQAAAAAAHQAAAAADHQAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAADHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABIgAAAAACHQAAAAADHQAAAAACHQAAAAADHQAAAAAAHQAAAAACHQAAAAABHQAAAAABIgAAAAABHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAADHQAAAAACDAAAAAAADAAAAAAADAAAAAAAHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAACIgAAAAAAHQAAAAAAHQAAAAAAHQAAAAABHQAAAAACHQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAACHQAAAAABHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAABHQAAAAADHQAAAAAAHQAAAAADeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAA
           version: 6
         0,2:
           ind: 0,2
@@ -9284,6 +9285,13 @@ entities:
     - type: Transform
       pos: -22.5,24.5
       parent: 30
+  - uid: 842
+    components:
+    - type: MetaData
+      flags: PvsPriority
+    - type: Transform
+      pos: -78.5,-60.5
+      parent: 30
   - uid: 2319
     components:
     - type: MetaData
@@ -10056,6 +10064,13 @@ entities:
       parent: 30
 - proto: AirlockExternal
   entities:
+  - uid: 841
+    components:
+    - type: MetaData
+      flags: PvsPriority
+    - type: Transform
+      pos: -82.5,-60.5
+      parent: 30
   - uid: 17373
     components:
     - type: MetaData
@@ -10357,11 +10372,6 @@ entities:
       linkedPorts:
         21047:
         - DoorStatus: DoorBolt
-  - uid: 18172
-    components:
-    - type: Transform
-      pos: -82.5,-60.5
-      parent: 30
   - uid: 21047
     components:
     - type: Transform
@@ -10546,13 +10556,6 @@ entities:
       linkedPorts:
         16278:
         - DoorStatus: DoorBolt
-  - uid: 18174
-    components:
-    - type: MetaData
-      flags: PvsPriority
-    - type: Transform
-      pos: -78.5,-60.5
-      parent: 30
 - proto: AirlockExternalShuttleLocked
   entities:
   - uid: 6606
@@ -12540,23 +12543,6 @@ entities:
     - type: Transform
       pos: -11.5,-27.5
       parent: 30
-- proto: AmePart
-  entities:
-  - uid: 841
-    components:
-    - type: Transform
-      pos: -17.338675,-32.512775
-      parent: 30
-  - uid: 842
-    components:
-    - type: Transform
-      pos: -17.44805,-32.356525
-      parent: 30
-  - uid: 865
-    components:
-    - type: Transform
-      pos: -17.6043,-32.2784
-      parent: 30
 - proto: AmplifierSubspaceStockPart
   entities:
   - uid: 801
@@ -56160,11 +56146,6 @@ entities:
       parent: 30
 - proto: DecoratedFirTree
   entities:
-  - uid: 18844
-    components:
-    - type: Transform
-      pos: -59.5,-45.5
-      parent: 30
   - uid: 19846
     components:
     - type: Transform
@@ -148917,27 +148898,6 @@ entities:
       parent: 30
 - proto: WarpPoint
   entities:
-  - uid: 16129
-    components:
-    - type: Transform
-      pos: -53.5,18.5
-      parent: 30
-    - type: WarpPoint
-      location: Arrivals
-  - uid: 16130
-    components:
-    - type: Transform
-      pos: -20.5,10.5
-      parent: 30
-    - type: WarpPoint
-      location: Hydroponics
-  - uid: 16131
-    components:
-    - type: Transform
-      pos: -2.5,10.5
-      parent: 30
-    - type: WarpPoint
-      location: Bar
   - uid: 16132
     components:
     - type: MetaData
@@ -148947,61 +148907,6 @@ entities:
       parent: 30
     - type: WarpPoint
       location: Medbay
-  - uid: 16133
-    components:
-    - type: MetaData
-      desc: Supply
-    - type: Transform
-      pos: 21.5,-4.5
-      parent: 30
-    - type: WarpPoint
-      location: Supply
-  - uid: 16134
-    components:
-    - type: Transform
-      pos: 22.5,15.5
-      parent: 30
-    - type: WarpPoint
-      location: Science
-  - uid: 16135
-    components:
-    - type: MetaData
-      desc: Dorms
-    - type: Transform
-      pos: 22.5,38.5
-      parent: 30
-    - type: WarpPoint
-      location: Dorms
-  - uid: 16136
-    components:
-    - type: MetaData
-      desc: Bridge
-    - type: Transform
-      pos: -9.5,40.5
-      parent: 30
-    - type: WarpPoint
-      location: Bridge
-  - uid: 16137
-    components:
-    - type: Transform
-      pos: -39.5,48.5
-      parent: 30
-    - type: WarpPoint
-      location: Security
-  - uid: 16138
-    components:
-    - type: Transform
-      pos: -7.5,-39.5
-      parent: 30
-    - type: WarpPoint
-      location: Engineering
-  - uid: 16139
-    components:
-    - type: Transform
-      pos: 16.5,-28.5
-      parent: 30
-    - type: WarpPoint
-      location: Atmosia
 - proto: WaterCooler
   entities:
   - uid: 1932
-- 
2.51.2