paramedic on marathon (#22151)

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index b75464fcaf1ee444b107984911eb2e8ad8277e5b..82cc780bb34b81e2a74f837f25c687c311d4e86d 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -54,6 +54,7 @@ tilemap:
   108: FloorWhiteHerringbone\r
   109: FloorWhiteMini\r
   110: FloorWhiteMono\r
+  111: FloorWhiteOffset\r
   114: FloorWhitePlastic\r
   115: FloorWood\r
   117: Lattice\r
@@ -203,7 +204,7 @@ entities:
           version: 6\r
         -2,-2:\r
           ind: -2,-2\r
-          tiles: dgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAcwAAAAABcwAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAcwAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAADGwAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAcwAAAAACdgAAAAAAcwAAAAACcwAAAAABcwAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAADGwAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAABGwAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAACGwAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAACaQAAAAABdgAAAAAAaQAAAAADaQAAAAAAaQAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAaQAAAAADdgAAAAAAaQAAAAABaQAAAAACaQAAAAACaQAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAABaQAAAAACaQAAAAACdgAAAAAAaQAAAAAAaQAAAAACdgAAAAAAaQAAAAADaQAAAAAAaQAAAAAAaQAAAAABdgAAAAAAcwAAAAACcwAAAAABcwAAAAABcgAAAAACaQAAAAADcgAAAAABaQAAAAACdgAAAAAAaQAAAAACdgAAAAAAdgAAAAAAaQAAAAACaQAAAAACaQAAAAABaQAAAAADdgAAAAAAcwAAAAACcwAAAAAAcwAAAAABdgAAAAAAaQAAAAABaQAAAAAAaQAAAAAAdgAAAAAAaQAAAAADaQAAAAADaQAAAAACaQAAAAADaQAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAcgAAAAACaQAAAAACKgAAAAAAaQAAAAACaQAAAAABaQAAAAADaQAAAAADaQAAAAACdgAAAAAAaQAAAAABaQAAAAACaQAAAAADaQAAAAABaQAAAAAAdgAAAAAAaQAAAAABaQAAAAACaQAAAAACdgAAAAAAKgAAAAAAdgAAAAAAaQAAAAADaQAAAAACaQAAAAAAdgAAAAAAaQAAAAADaQAAAAADaQAAAAACaQAAAAACaQAAAAADaQAAAAACaQAAAAABcgAAAAAAaQAAAAADdgAAAAAATgAAAAAAdgAAAAAAdgAAAAAAaQAAAAACdgAAAAAAdgAAAAAAaQAAAAACaQAAAAADaQAAAAAAaQAAAAACaQAAAAAAaQAAAAAAaQAAAAACcgAAAAAAaQAAAAACdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAaQAAAAACaQAAAAABdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAACaQAAAAACaQAAAAACdgAAAAAAaQAAAAACaQAAAAAAaQAAAAADdgAAAAAA\r
+          tiles: dgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAcwAAAAABcwAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAcwAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAADGwAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAcwAAAAACdgAAAAAAcwAAAAACcwAAAAABcwAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAADGwAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAABGwAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAACGwAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAAAAAAAAAAAAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAACaQAAAAABdgAAAAAAaQAAAAADaQAAAAAAaQAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAaQAAAAADdgAAAAAAaQAAAAABaQAAAAACaQAAAAACaQAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAABaQAAAAACaQAAAAACdgAAAAAAaQAAAAAAaQAAAAACdgAAAAAAaQAAAAADaQAAAAAAaQAAAAAAaQAAAAABdgAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbgAAAAAAaQAAAAADcgAAAAABaQAAAAACdgAAAAAAaQAAAAACdgAAAAAAdgAAAAAAaQAAAAACaQAAAAACaQAAAAABaQAAAAADdgAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAdgAAAAAAaQAAAAABaQAAAAAAaQAAAAAAdgAAAAAAaQAAAAADaQAAAAADaQAAAAACaQAAAAADaQAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAcgAAAAACaQAAAAACKgAAAAAAaQAAAAACaQAAAAABaQAAAAADaQAAAAADaQAAAAACdgAAAAAAaQAAAAABaQAAAAACaQAAAAADaQAAAAABaQAAAAAAdgAAAAAAaQAAAAABaQAAAAACaQAAAAACdgAAAAAAKgAAAAAAdgAAAAAAaQAAAAADaQAAAAACaQAAAAAAdgAAAAAAaQAAAAADaQAAAAADaQAAAAACaQAAAAACaQAAAAADaQAAAAACaQAAAAABcgAAAAAAaQAAAAADdgAAAAAATgAAAAAAdgAAAAAAdgAAAAAAaQAAAAACdgAAAAAAdgAAAAAAaQAAAAACaQAAAAADaQAAAAAAaQAAAAACaQAAAAAAaQAAAAAAaQAAAAACcgAAAAAAaQAAAAACdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAaQAAAAACaQAAAAABdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAACaQAAAAACaQAAAAACdgAAAAAAaQAAAAACaQAAAAAAaQAAAAADdgAAAAAA\r
           version: 6\r
         -3,-2:\r
           ind: -3,-2\r
@@ -3416,6 +3417,16 @@ entities:
           decals:\r
             3057: -56,-5\r
             3058: -56,7\r
+        - node:\r
+            color: '#52B4E996'\r
+            id: OffsetCheckerBOverlay\r
+          decals:\r
+            3140: -22,-23\r
+            3141: -22,-22\r
+            3142: -23,-22\r
+            3143: -23,-23\r
+            3144: -24,-23\r
+            3145: -24,-22\r
         - node:\r
             color: '#334E6DC8'\r
             id: QuarterTileOverlayGreyscale\r
@@ -5000,26 +5011,6 @@ entities:
             1960: -11,34\r
             1961: -10,34\r
             1962: -9,34\r
-        - node:\r
-            color: '#FFFFFFFF'\r
-            id: WoodTrimThinCornerNe\r
-          decals:\r
-            2971: -22,-22\r
-        - node:\r
-            color: '#FFFFFFFF'\r
-            id: WoodTrimThinCornerNw\r
-          decals:\r
-            2972: -24,-22\r
-        - node:\r
-            color: '#FFFFFFFF'\r
-            id: WoodTrimThinCornerSe\r
-          decals:\r
-            2973: -22,-23\r
-        - node:\r
-            color: '#FFFFFFFF'\r
-            id: WoodTrimThinCornerSw\r
-          decals:\r
-            2974: -24,-23\r
         - node:\r
             color: '#334E6DC8'\r
             id: WoodTrimThinEndE\r
@@ -5131,7 +5122,6 @@ entities:
             1930: 26,13\r
             1931: 27,13\r
             1932: 28,13\r
-            2975: -23,-22\r
             3012: -38,-7\r
             3013: -39,-7\r
             3014: -40,-7\r
@@ -5198,7 +5188,6 @@ entities:
             1938: 26,16\r
             2661: -42,32\r
             2662: -45,32\r
-            2976: -23,-23\r
         - node:\r
             cleanable: True\r
             color: '#FFFFFFFF'\r
@@ -13643,11 +13632,6 @@ entities:
       type: Transform\r
 - proto: BedsheetMedical\r
   entities:\r
-  - uid: 989\r
-    components:\r
-    - pos: -21.5,-21.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 6954\r
     components:\r
     - pos: -21.5,-14.5\r
@@ -13658,11 +13642,6 @@ entities:
     - pos: -23.5,-14.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 7420\r
-    components:\r
-    - pos: -23.5,-21.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 8274\r
     components:\r
     - pos: -30.5,-22.5\r
@@ -48523,12 +48502,6 @@ entities:
       pos: -8.5,-17.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 7664\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: -22.5,-22.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 11445\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -48981,14 +48954,14 @@ entities:
       type: Transform\r
 - proto: CheapRollerBed\r
   entities:\r
-  - uid: 6853\r
+  - uid: 989\r
     components:\r
-    - pos: -10.487353,-4.3521314\r
+    - pos: -9.5,-4.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 6854\r
+  - uid: 6853\r
     components:\r
-    - pos: -9.534228,-4.3365064\r
+    - pos: -10.5,-4.5\r
       parent: 30\r
       type: Transform\r
   - uid: 6996\r
@@ -61008,6 +60981,13 @@ entities:
     - pos: -15.524454,-12.386732\r
       parent: 30\r
       type: Transform\r
+- proto: EmergencyRollerBedSpawnFolded\r
+  entities:\r
+  - uid: 496\r
+    components:\r
+    - pos: -23.5,-22.5\r
+      parent: 30\r
+      type: Transform\r
 - proto: Emitter\r
   entities:\r
   - uid: 9409\r
@@ -84699,12 +84679,6 @@ entities:
       type: Transform\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
-  - uid: 7488\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: -22.5,-22.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 7498\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -96096,11 +96070,6 @@ entities:
     - pos: 7.5,-17.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 9666\r
-    components:\r
-    - pos: -20.5,-22.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 13087\r
     components:\r
     - pos: -43.5,64.5\r
@@ -99372,6 +99341,13 @@ entities:
     - pos: -9.5,-17.5\r
       parent: 30\r
       type: Transform\r
+- proto: LockerParamedicFilled\r
+  entities:\r
+  - uid: 6854\r
+    components:\r
+    - pos: -23.5,-21.5\r
+      parent: 30\r
+      type: Transform\r
 - proto: LockerQuarterMasterFilled\r
   entities:\r
   - uid: 16236\r
@@ -100199,16 +100175,6 @@ entities:
       type: Transform\r
 - proto: MedicalBed\r
   entities:\r
-  - uid: 495\r
-    components:\r
-    - pos: -23.5,-21.5\r
-      parent: 30\r
-      type: Transform\r
-  - uid: 496\r
-    components:\r
-    - pos: -21.5,-21.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 6687\r
     components:\r
     - pos: -23.5,-14.5\r
@@ -100340,6 +100306,11 @@ entities:
     - pos: -51.008476,53.677338\r
       parent: 30\r
       type: Transform\r
+  - uid: 9628\r
+    components:\r
+    - pos: -22.612028,-21.409428\r
+      parent: 30\r
+      type: Transform\r
 - proto: MedkitRadiationFilled\r
   entities:\r
   - uid: 6993\r
@@ -104229,12 +104200,22 @@ entities:
       pos: -35.5,-12.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 7420\r
+    components:\r
+    - pos: -14.5,-18.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 7430\r
     components:\r
     - rot: -1.5707963267948966 rad\r
       pos: -27.5,-2.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 7665\r
+    components:\r
+    - pos: -22.5,-21.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 8227\r
     components:\r
     - pos: -22.5,-16.5\r
@@ -106137,12 +106118,6 @@ entities:
       pos: -72.5,-64.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 7665\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: -23.5,-22.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 7912\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -110934,6 +110909,11 @@ entities:
     - pos: -4.5,-42.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 9666\r
+    components:\r
+    - pos: -20.5,-21.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 9723\r
     components:\r
     - pos: -63.5,14.5\r
@@ -117316,6 +117296,13 @@ entities:
     - pos: -2.5,2.5\r
       parent: 30\r
       type: Transform\r
+- proto: SpawnPointParamedic\r
+  entities:\r
+  - uid: 957\r
+    components:\r
+    - pos: -22.5,-22.5\r
+      parent: 30\r
+      type: Transform\r
 - proto: SpawnPointPsychologist\r
   entities:\r
   - uid: 9695\r
@@ -117523,6 +117510,13 @@ entities:
     - pos: -43.5,47.5\r
       parent: 30\r
       type: Transform\r
+- proto: SpawnVehicleATV\r
+  entities:\r
+  - uid: 7664\r
+    components:\r
+    - pos: -21.5,-21.5\r
+      parent: 30\r
+      type: Transform\r
 - proto: SpawnVehicleJanicart\r
   entities:\r
   - uid: 20464\r
@@ -120081,6 +120075,11 @@ entities:
     - pos: -32.5,-11.5\r
       parent: 30\r
       type: Transform\r
+  - uid: 7488\r
+    components:\r
+    - pos: -22.5,-21.5\r
+      parent: 30\r
+      type: Transform\r
   - uid: 9168\r
     components:\r
     - pos: 0.5,-28.5\r
@@ -120858,11 +120857,6 @@ entities:
     - pos: -10.5,-21.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 9628\r
-    components:\r
-    - pos: -22.5,-21.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 9713\r
     components:\r
     - pos: -8.5,-21.5\r
@@ -122363,11 +122357,6 @@ entities:
     - pos: -33.5,21.5\r
       parent: 30\r
       type: Transform\r
-  - uid: 957\r
-    components:\r
-    - pos: -20.5,-21.5\r
-      parent: 30\r
-      type: Transform\r
   - uid: 5735\r
     components:\r
     - pos: -20.5,-14.5\r
@@ -123069,6 +123058,13 @@ entities:
     - pos: -26.5,-21.5\r
       parent: 30\r
       type: Transform\r
+- proto: VehicleKeyATV\r
+  entities:\r
+  - uid: 495\r
+    components:\r
+    - pos: -22.295399,-21.381802\r
+      parent: 30\r
+      type: Transform\r
 - proto: VehicleKeyJanicart\r
   entities:\r
   - uid: 20440\r

diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml
index 7ce93794602ebff7740e769024fd80a1cebd3e9a..2b56a5340b96cbaa398079a88d12b5ee57e7a26b 100644 (file)
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -42,6 +42,7 @@
             MedicalDoctor: [ 3, 3 ]\r
             MedicalIntern: [ 3, 3 ]\r
             Psychologist: [ 1, 1 ]\r
+            Paramedic: [ 1, 1 ]\r
             #science\r
             ResearchDirector: [ 1, 1 ]\r
             SeniorResearcher: [ 1, 1 ]        \r