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