From a347273e5b07287e4194dfca9a304af9a0b2963b Mon Sep 17 00:00:00 2001 From: Mota Date: Mon, 2 Sep 2024 12:00:38 +0300 Subject: [PATCH 1/6] add centcom roles --- .../ghost/roles/ghost-role-component.ftl | 6 + .../Locale/ru-RU/corvax/job/job-names.ftl | 4 + .../entities/mobs/player/humanoid.ftl | 4 + Resources/Maps/corvax_centcomm.yml | 1058 ++++++++++------- .../Corvax/Entities/Mobs/Player/humanoid.yml | 60 + .../Corvax/Roles/Jobs/Command/centcom.yml | 80 ++ .../Roles/Jobs/Command/centcom_admiral.yml | 15 - .../Corvax/Roles/play_time_trackers.yml | 8 +- 8 files changed, 759 insertions(+), 476 deletions(-) create mode 100644 Resources/Locale/ru-RU/corvax/ghost/roles/ghost-role-component.ftl create mode 100644 Resources/Locale/ru-RU/corvax/prototypes/entities/mobs/player/humanoid.ftl create mode 100644 Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml create mode 100644 Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml delete mode 100644 Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom_admiral.yml diff --git a/Resources/Locale/ru-RU/corvax/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/corvax/ghost/roles/ghost-role-component.ftl new file mode 100644 index 00000000000..1f62c6cf529 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/ghost/roles/ghost-role-component.ftl @@ -0,0 +1,6 @@ +ghost-role-information-centcom-chief-name = Начальник штаба ЦентКом +ghost-role-information-centcom-chief-description = Начальник Штаба Центрального Командования – непосредственный глава Секторального Штаба ЦентКома, возглавляет Станцию ЦК Сектора. + Ему подчиняется весь Экипаж Станции ЦентКом, за исключением представителей Департамента Специальных Операций. +ghost-role-information-centcom-opertor-name = Оператор ЦентКом +ghost-role-information-centcom-opertor-description = Оператор Центрального Командования – связующее звено между Секторальным ЦК и станциями в Секторе. + Задача оператора - осуществлять оперативный контроль и связь со станциями сектора. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/corvax/job/job-names.ftl b/Resources/Locale/ru-RU/corvax/job/job-names.ftl index e766c50d1bf..f63c21ab839 100644 --- a/Resources/Locale/ru-RU/corvax/job/job-names.ftl +++ b/Resources/Locale/ru-RU/corvax/job/job-names.ftl @@ -1,4 +1,8 @@ job-name-iaa = агент внутренних дел job-name-pilot = пилот +job-name-centcom-chief = начальник штаба ЦентКом +job-name-centcom-opertor = оператор ЦентКом JobIAA = агент внутренних дел JobPilot = пилот +JobCentcomChief = начальник штаба ЦентКом +JobCentcomOperator = оператор ЦентКом diff --git a/Resources/Locale/ru-RU/corvax/prototypes/entities/mobs/player/humanoid.ftl b/Resources/Locale/ru-RU/corvax/prototypes/entities/mobs/player/humanoid.ftl new file mode 100644 index 00000000000..34fa4015649 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/prototypes/entities/mobs/player/humanoid.ftl @@ -0,0 +1,4 @@ +ent-RandomHumanoidSpawnerCentcomChief = Начальник штаба ЦентКом + .desc = { "" } +ent-RandomHumanoidSpawnerCentcomOperator = Оператор ЦентКом + .desc = { "" } \ No newline at end of file diff --git a/Resources/Maps/corvax_centcomm.yml b/Resources/Maps/corvax_centcomm.yml index dd5cc38c945..e925d1cc941 100644 --- a/Resources/Maps/corvax_centcomm.yml +++ b/Resources/Maps/corvax_centcomm.yml @@ -18,6 +18,7 @@ tilemap: 37: FloorFreezer 16: FloorGlass 80: FloorGrayConcrete + 67: FloorGrayConcreteMono 53: FloorGrayConcreteSmooth 61: FloorGreenCircuit 65: FloorKitchen @@ -119,7 +120,7 @@ entities: version: 6 1,2: ind: 1,2 - tiles: FAAAAAAAFAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAEQAAAAAAkwAAAAAAQQAAAAAAFQAAAAAAFQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAQQAAAAAAFQAAAAAAFQAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAkwAAAAAAJQAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAkwAAAAAAIgAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAIgAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAFAAAAAAAFAAAAAAAIgAAAAAAkwAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAkwAAAAAAIgAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAFAAAAAAAFAAAAAAAIgAAAAAAkwAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAkwAAAAAAIgAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAEQAAAAAAkwAAAAAAEQAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAIgAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAIgAAAAAAkwAAAAAAAQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAEQAAAAAAEQAAAAAABAAAAAAABAAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAFwAAAAAAkwAAAAAAFwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAkwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAkwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAIgAAAAAALAAAAAAALAAAAAAAIgAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAADgAAAAAAAgAAAAAACgAAAAAACgAAAAAAIgAAAAAALAAAAAAALAAAAAAAIgAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAADgAAAAAAAgAAAAAACgAAAAAACgAAAAAAIgAAAAAALAAAAAAALAAAAAAAIgAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAADgAAAAAAAgAAAAAACgAAAAAACgAAAAAA + tiles: FAAAAAAAFAAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAEQAAAAAAkwAAAAAAQQAAAAAAFQAAAAAAFQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAQQAAAAAAFQAAAAAAFQAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAkwAAAAAAJQAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAkwAAAAAAIgAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAIgAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAFAAAAAAAFAAAAAAAIgAAAAAAkwAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAkwAAAAAAIgAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAFAAAAAAAFAAAAAAAIgAAAAAAkwAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAkwAAAAAAIgAAAAAAFAAAAAAAIgAAAAAAkwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAEQAAAAAAkwAAAAAAEQAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAUAAAAAAAUAAAAAAAkwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAIgAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAkwAAAAAAQwAAAAAAQwAAAAAAEwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAUAAAAAAAUAAAAAAAkwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAEQAAAAAAEQAAAAAABAAAAAAABAAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAFwAAAAAAkwAAAAAAFwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAkwAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAkwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAkwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAkwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAIgAAAAAALAAAAAAALAAAAAAAIgAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAADgAAAAAAAgAAAAAACgAAAAAACgAAAAAAIgAAAAAALAAAAAAALAAAAAAAIgAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAADgAAAAAAAgAAAAAACgAAAAAACgAAAAAAIgAAAAAALAAAAAAALAAAAAAAIgAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAAkwAAAAAAEwAAAAAAGQAAAAAAEwAAAAAADgAAAAAAAgAAAAAACgAAAAAACgAAAAAA version: 6 1,1: ind: 1,1 @@ -268,6 +269,11 @@ entities: decals: 4639: 22,58 4640: 21,54 + - node: + color: '#8C347F96' + id: BoxGreyscale + decals: + 5651: 22,42 - node: color: '#DE3A3AFF' id: BoxGreyscale @@ -291,10 +297,10 @@ entities: 3904: 38,52 4607: 19,57 - node: - color: '#FC66009B' + color: '#FA750096' id: BrickCornerOverlayNE decals: - 4398: 21,42 + 5642: 20,42 - node: color: '#52B4E99E' id: BrickCornerOverlayNW @@ -334,10 +340,10 @@ entities: 3902: 38,50 4604: 19,54 - node: - color: '#FC66009B' + color: '#FA750096' id: BrickCornerOverlaySE decals: - 4404: 21,40 + 5644: 20,40 - node: color: '#0E885BCD' id: BrickCornerOverlaySW @@ -398,10 +404,10 @@ entities: 4605: 19,55 4606: 19,56 - node: - color: '#FC66009B' + color: '#FA750096' id: BrickLineOverlayE decals: - 4405: 21,41 + 5643: 20,41 - node: color: '#0E885BCD' id: BrickLineOverlayN @@ -461,7 +467,6 @@ entities: decals: 4395: 18,42 4396: 19,42 - 4397: 20,42 - node: color: '#0E885BCD' id: BrickLineOverlayS @@ -511,7 +516,6 @@ entities: color: '#FC66009B' id: BrickLineOverlayS decals: - 4406: 20,40 4407: 19,40 4408: 18,40 4409: 17,40 @@ -601,7 +605,6 @@ entities: 2386: 72,36 4625: 30,47 5059: 50,12 - 5086: 23,42 5334: 44,25 - node: color: '#B3B3B3FF' @@ -642,7 +645,6 @@ entities: 410: 72,18 4623: 30,45 5067: 50,18 - 5088: 23,40 5229: 49,39 - node: zIndex: 100 @@ -974,7 +976,6 @@ entities: 5055: 47,11 5056: 48,11 5057: 49,11 - 5093: 24,42 5094: 26,42 5095: 28,42 5096: 29,42 @@ -1100,7 +1101,6 @@ entities: 5082: 47,19 5083: 48,19 5084: 49,19 - 5089: 24,40 5090: 28,40 5091: 29,40 5092: 30,40 @@ -1203,7 +1203,6 @@ entities: 5063: 51,15 5064: 51,16 5065: 51,17 - 5087: 23,41 5197: 50,38 5198: 50,36 5199: 50,37 @@ -1357,12 +1356,12 @@ entities: id: BrickTileSteelEndW decals: 286: 64,21 - 5101: 24,41 5102: 32,41 5124: 45,41 5125: 40,41 5222: 50,41 5249: 54,41 + 5645: 25,41 - node: zIndex: 100 color: '#FFFFFFFF' @@ -1565,7 +1564,6 @@ entities: 294: 67,21 295: 68,21 3677: 34,14 - 5076: 25,41 5077: 26,41 5078: 27,41 5079: 28,41 @@ -1628,7 +1626,6 @@ entities: 290: 67,21 291: 68,21 3675: 34,16 - 5070: 25,41 5071: 26,41 5074: 27,41 5075: 28,41 @@ -2615,6 +2612,35 @@ entities: 827: 54,11 4461: 38,13 4462: 38,17 + - node: + color: '#52B4E9FF' + id: DeliveryGreyscale + decals: + 5654: 13,56 + - node: + color: '#8C347F96' + id: DeliveryGreyscale + decals: + 5650: 23,42 + - node: + color: '#BC863FFF' + id: DeliveryGreyscale + decals: + 5660: 15,57 + 5661: 15,56 + 5662: 15,55 + 5663: 15,54 + - node: + color: '#DE3A3AFF' + id: DeliveryGreyscale + decals: + 5652: 13,54 + 5653: 13,55 + - node: + color: '#FF9821FF' + id: DeliveryGreyscale + decals: + 5655: 13,57 - node: zIndex: 1 color: '#2E6D38FF' @@ -3023,6 +3049,8 @@ entities: 333: 55,8 334: 56,8 335: 57,8 + 5646: 22,41 + 5647: 23,41 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineS @@ -3033,6 +3061,8 @@ entities: 326: 55,8 327: 56,8 328: 57,8 + 5648: 23,41 + 5649: 22,41 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineW @@ -5067,6 +5097,7 @@ entities: decals: 5623: 77.387985,41.57695 - node: + cleanable: True color: '#6E4A1371' id: splatter decals: @@ -5074,6 +5105,7 @@ entities: 1641: 69.07086,47.508766 1642: 68.62808,47.786545 - node: + cleanable: True color: '#CE8A4880' id: splatter decals: @@ -5081,6 +5113,7 @@ entities: 2965: 36.18409,53.73192 2966: 36.84825,53.45848 - node: + cleanable: True color: '#CE8A48BF' id: splatter decals: @@ -5206,7 +5239,8 @@ entities: 2: 1911 4,10: 2: 16371 - 0: 12 + 4: 4 + 0: 8 4,11: 2: 65535 2,6: @@ -5263,8 +5297,9 @@ entities: 5,9: 2: 4095 5,10: - 2: 2489 - 0: 514 + 1: 2049 + 2: 440 + 4: 514 5,7: 2: 63350 6,8: @@ -5335,7 +5370,8 @@ entities: 11,13: 2: 15 11,11: - 2: 65535 + 0: 3 + 2: 65532 12,12: 2: 56796 12,13: @@ -5470,7 +5506,8 @@ entities: 15,8: 2: 65488 15,9: - 2: 3533 + 2: 2509 + 0: 1024 15,10: 2: 819 15,7: @@ -5956,7 +5993,7 @@ entities: - uid: 66 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -7155,6 +7192,14 @@ entities: - type: GridFill addComponents: [] path: /Maps/Shuttles/ert_corvaxcentcomm.yml +- proto: AirlockJanitorLocked + entities: + - uid: 7135 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,41.5 + parent: 2 - proto: AirlockMaintLocked entities: - uid: 193 @@ -8243,11 +8288,6 @@ entities: parent: 2 - proto: AtmosFixFreezerMarker entities: - - uid: 361 - components: - - type: Transform - pos: 30.5,34.5 - parent: 2 - uid: 362 components: - type: Transform @@ -8394,15 +8434,10 @@ entities: canCollide: False - proto: BannerMedical entities: - - uid: 389 + - uid: 7136 components: - type: Transform - pos: 24.5,40.5 - parent: 2 - - uid: 390 - components: - - type: Transform - pos: 28.5,40.5 + pos: 26.5,40.5 parent: 2 - proto: BannerNanotrasen entities: @@ -9043,7 +9078,7 @@ entities: - uid: 516 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: InsideEntityStorage @@ -9775,6 +9810,14 @@ entities: rot: 1.5707963267948966 rad pos: 29.5,28.5 parent: 2 +- proto: BorgCharger + entities: + - uid: 5108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,22.5 + parent: 2 - proto: BoxBeaker entities: - uid: 591 @@ -9934,7 +9977,7 @@ entities: - uid: 67 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -10606,7 +10649,7 @@ entities: - uid: 68 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -10719,7 +10762,7 @@ entities: - uid: 782 components: - type: Transform - parent: 781 + parent: 5558 - type: Physics canCollide: False - type: InsideEntityStorage @@ -10844,7 +10887,7 @@ entities: - uid: 69 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -10926,6 +10969,11 @@ entities: parent: 2 - proto: CableApcExtension entities: + - uid: 389 + components: + - type: Transform + pos: 22.5,41.5 + parent: 2 - uid: 829 components: - type: Transform @@ -14651,6 +14699,16 @@ entities: - type: Transform pos: 33.5,42.5 parent: 2 + - uid: 4811 + components: + - type: Transform + pos: 23.5,41.5 + parent: 2 + - uid: 7129 + components: + - type: Transform + pos: 22.5,40.5 + parent: 2 - proto: CableApcStack entities: - uid: 1574 @@ -19540,11 +19598,6 @@ entities: - type: Transform pos: 19.5,34.5 parent: 2 - - uid: 2510 - components: - - type: Transform - pos: 23.5,41.5 - parent: 2 - uid: 2511 components: - type: Transform @@ -19574,11 +19627,6 @@ entities: - type: Transform pos: 35.5,25.5 parent: 2 - - uid: 2516 - components: - - type: Transform - pos: 23.5,42.5 - parent: 2 - uid: 2517 components: - type: Transform @@ -19596,10 +19644,10 @@ entities: parent: 2 - proto: ClosetL3Janitor entities: - - uid: 65 + - uid: 5559 components: - type: Transform - pos: 21.5,42.5 + pos: 23.5,42.5 parent: 2 - type: EntityStorage air: @@ -19607,8 +19655,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.8856695 - - 7.0937095 + - 1.7459903 + - 6.568249 - 0 - 0 - 0 @@ -19625,21 +19673,21 @@ entities: showEnts: False occludes: True ents: - - 77 - - 70 - - 68 - - 79 - - 69 - - 75 - 66 + - 75 - 76 - - 73 + - 67 - 72 + - 73 - 74 + - 79 - 80 - - 67 - - 71 - 78 + - 69 + - 70 + - 71 + - 68 + - 77 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -19920,7 +19968,7 @@ entities: - uid: 517 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: GroupExamine @@ -19948,7 +19996,7 @@ entities: - uid: 783 components: - type: Transform - parent: 781 + parent: 5558 - type: Physics canCollide: False - type: GroupExamine @@ -19998,7 +20046,7 @@ entities: - uid: 784 components: - type: Transform - parent: 781 + parent: 5558 - type: Physics canCollide: False - type: InsideEntityStorage @@ -20061,7 +20109,7 @@ entities: - uid: 70 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -20070,7 +20118,7 @@ entities: - uid: 518 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: InsideEntityStorage @@ -20143,7 +20191,7 @@ entities: - uid: 519 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: InsideEntityStorage @@ -20233,7 +20281,7 @@ entities: - uid: 71 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -20250,7 +20298,7 @@ entities: - uid: 520 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: InsideEntityStorage @@ -20351,7 +20399,7 @@ entities: - uid: 72 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -20367,14 +20415,14 @@ entities: - uid: 521 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: InsideEntityStorage - uid: 785 components: - type: Transform - parent: 781 + parent: 5558 - type: Physics canCollide: False - type: InsideEntityStorage @@ -20465,7 +20513,7 @@ entities: - uid: 786 components: - type: Transform - parent: 781 + parent: 5558 - type: Physics canCollide: False - type: InsideEntityStorage @@ -20711,13 +20759,6 @@ entities: missingComponents: - Item - Pullable -- proto: ClothingNeckSyndicakePin - entities: - - uid: 2630 - components: - - type: Transform - pos: 31.771967,57.423477 - parent: 2 - proto: ClothingOuterArmorBasic entities: - uid: 2631 @@ -20800,7 +20841,7 @@ entities: - uid: 787 components: - type: Transform - parent: 781 + parent: 5558 - type: GroupExamine group: - hoverMessage: "" @@ -20979,7 +21020,7 @@ entities: - uid: 788 components: - type: Transform - parent: 781 + parent: 5558 - type: Physics canCollide: False - type: InsideEntityStorage @@ -21237,7 +21278,7 @@ entities: - uid: 73 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -21246,7 +21287,7 @@ entities: - uid: 522 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: InsideEntityStorage @@ -21956,7 +21997,7 @@ entities: - uid: 74 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -24541,14 +24582,6 @@ entities: - type: Transform pos: 73.54628,38.388664 parent: 2 -- proto: DrinkNukieCan - entities: - - uid: 3159 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 31.011978,55.362724 - parent: 2 - proto: DrinkRoyRogersGlass entities: - uid: 3160 @@ -25143,12 +25176,14 @@ entities: - uid: 3243 components: - type: Transform - pos: 71.5,28.5 + rot: 1.5707963267948966 rad + pos: 68.5,49.5 parent: 2 - uid: 3244 components: - type: Transform - pos: 68.5,49.5 + rot: 1.5707963267948966 rad + pos: 24.5,45.5 parent: 2 - uid: 3245 components: @@ -25170,25 +25205,27 @@ entities: - type: Transform pos: 49.5,43.5 parent: 2 - - uid: 3249 + - uid: 3250 components: - type: Transform - pos: 24.5,45.5 + pos: 26.5,53.5 parent: 2 - - uid: 3250 + - uid: 3252 components: - type: Transform - pos: 26.5,53.5 + pos: 55.5,32.5 parent: 2 - - uid: 3251 + - uid: 5252 components: - type: Transform + rot: -1.5707963267948966 rad pos: 53.5,22.5 parent: 2 - - uid: 3252 + - uid: 7141 components: - type: Transform - pos: 55.5,32.5 + rot: 1.5707963267948966 rad + pos: 71.5,28.5 parent: 2 - proto: ExtinguisherCabinetOpen entities: @@ -26783,6 +26820,14 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 4809 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,41.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: FloraTree02 entities: - uid: 3406 @@ -37854,12 +37899,6 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,4.5 parent: 2 - - uid: 4720 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,14.5 - parent: 2 - uid: 4721 components: - type: Transform @@ -37996,13 +38035,7 @@ entities: components: - type: Transform rot: 3.141592653589793 rad - pos: 13.5,7.5 - parent: 2 - - uid: 4746 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,4.5 + pos: 53.5,20.5 parent: 2 - uid: 4747 components: @@ -38022,12 +38055,6 @@ entities: rot: 3.141592653589793 rad pos: 15.5,7.5 parent: 2 - - uid: 4750 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,4.5 - parent: 2 - uid: 4751 components: - type: Transform @@ -38040,12 +38067,6 @@ entities: rot: 3.141592653589793 rad pos: 15.5,4.5 parent: 2 - - uid: 4753 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,7.5 - parent: 2 - uid: 4754 components: - type: Transform @@ -38289,12 +38310,6 @@ entities: - type: Transform pos: 56.5,55.5 parent: 2 - - uid: 4796 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,23.5 - parent: 2 - uid: 4797 components: - type: Transform @@ -38318,12 +38333,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,23.5 parent: 2 - - uid: 4801 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,23.5 - parent: 2 - uid: 4802 components: - type: Transform @@ -38336,12 +38345,6 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,17.5 parent: 2 - - uid: 4804 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,4.5 - parent: 2 - uid: 4805 components: - type: Transform @@ -38366,24 +38369,12 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,19.5 parent: 2 - - uid: 4809 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,16.5 - parent: 2 - uid: 4810 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,7.5 parent: 2 - - uid: 4811 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,15.5 - parent: 2 - uid: 4812 components: - type: Transform @@ -38402,12 +38393,6 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,23.5 parent: 2 - - uid: 4815 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,23.5 - parent: 2 - uid: 4816 components: - type: Transform @@ -38432,12 +38417,6 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,7.5 parent: 2 - - uid: 4820 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,7.5 - parent: 2 - uid: 4821 components: - type: Transform @@ -38571,6 +38550,60 @@ entities: - type: Transform pos: 47.5,39.5 parent: 2 + - uid: 4895 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,9.5 + parent: 2 + - uid: 4942 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,20.5 + parent: 2 + - uid: 5048 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,21.5 + parent: 2 + - uid: 5515 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,21.5 + parent: 2 + - uid: 5571 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,46.5 + parent: 2 + - uid: 5602 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,47.5 + parent: 2 + - uid: 5712 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,43.5 + parent: 2 + - uid: 6346 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,39.5 + parent: 2 + - uid: 6354 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,10.5 + parent: 2 - proto: GrilleDiagonal entities: - uid: 4846 @@ -38867,7 +38900,7 @@ entities: - uid: 523 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: InsideEntityStorage @@ -38982,7 +39015,7 @@ entities: - uid: 75 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -39092,7 +39125,7 @@ entities: - uid: 524 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: InsideEntityStorage @@ -39223,11 +39256,11 @@ entities: - 3229 - proto: JanitorialTrolley entities: - - uid: 4895 + - uid: 7130 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,40.5 + rot: 1.5707963267948966 rad + pos: 23.555183,40.586617 parent: 2 - proto: JawsOfLife entities: @@ -39608,12 +39641,10 @@ entities: - 0 - proto: LockerChiefMedicalOfficer entities: - - uid: 515 + - uid: 6865 components: - - type: MetaData - name: шкаф медика ОБР - type: Transform - pos: 18.5,40.5 + pos: 20.5,40.5 parent: 2 - type: EntityStorage air: @@ -39621,8 +39652,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.8856695 - - 7.0937095 + - 1.7459903 + - 6.568249 - 0 - 0 - 0 @@ -39639,16 +39670,16 @@ entities: showEnts: False occludes: True ents: + - 517 + - 520 + - 516 + - 518 - 521 - - 523 - 519 - - 517 - 524 - - 522 - - 518 - - 520 + - 523 - 525 - - 516 + - 522 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -39708,10 +39739,10 @@ entities: prevFixedRotation: True - proto: LockerEngineerFilledHardsuit entities: - - uid: 4918 + - uid: 3249 components: - type: Transform - pos: 64.5,22.5 + pos: 70.5,22.5 parent: 2 - proto: LockerEvidence entities: @@ -39917,8 +39948,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -39935,11 +39966,11 @@ entities: showEnts: False occludes: True ents: - - 16 - - 21 - - 26 - - 15 - 31 + - 15 + - 26 + - 21 + - 16 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -40251,13 +40282,6 @@ entities: - type: Transform pos: 62.5473,33.443535 parent: 2 -- proto: MaterialReclaimer - entities: - - uid: 4942 - components: - - type: Transform - pos: 37.5,56.5 - parent: 2 - proto: Mattress entities: - uid: 4943 @@ -40409,7 +40433,7 @@ entities: - uid: 76 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -41437,7 +41461,7 @@ entities: - uid: 525 components: - type: Transform - parent: 515 + parent: 6865 - type: Physics canCollide: False - type: InsideEntityStorage @@ -41530,13 +41554,6 @@ entities: - type: Transform pos: 59.957397,47.587532 parent: 2 -- proto: PhoneInstrumentSyndicate - entities: - - uid: 5048 - components: - - type: Transform - pos: 31.93931,57.71843 - parent: 2 - proto: PianoInstrument entities: - uid: 5049 @@ -41617,7 +41634,7 @@ entities: - uid: 77 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -41726,6 +41743,23 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: PositronicBrain + entities: + - uid: 5111 + components: + - type: Transform + pos: 63.38392,22.691586 + parent: 2 + - uid: 7134 + components: + - type: Transform + pos: 33.4344,31.779327 + parent: 2 + - uid: 7140 + components: + - type: Transform + pos: 12.628529,30.667295 + parent: 2 - proto: PosterContrabandAtmosiaDeclarationIndependence entities: - uid: 5071 @@ -41979,13 +42013,6 @@ entities: rot: -1.5707963267948966 rad pos: 74.5,39.5 parent: 2 -- proto: PottedPlant1 - entities: - - uid: 5108 - components: - - type: Transform - pos: 70.5,22.5 - parent: 2 - proto: PottedPlant10 entities: - uid: 5109 @@ -42037,11 +42064,6 @@ entities: showEnts: False occludes: True ent: 4709 - - uid: 5111 - components: - - type: Transform - pos: 63.5,22.5 - parent: 2 - proto: PottedPlant22 entities: - uid: 5112 @@ -42098,13 +42120,6 @@ entities: - type: Transform pos: 48.532192,37.13181 parent: 2 -- proto: PottedPlantAlt3 - entities: - - uid: 5119 - components: - - type: Transform - pos: 58.5,22.5 - parent: 2 - proto: PottedPlantAlt4 entities: - uid: 4849 @@ -42257,6 +42272,23 @@ entities: - type: Transform pos: 46.5,18.5 parent: 2 +- proto: PowerCellHigh + entities: + - uid: 5119 + components: + - type: Transform + pos: 63.676193,22.491028 + parent: 2 + - uid: 7138 + components: + - type: Transform + pos: 33.508694,31.458004 + parent: 2 + - uid: 7139 + components: + - type: Transform + pos: 12.380095,30.462816 + parent: 2 - proto: PowerCellRecharger entities: - uid: 5146 @@ -42876,12 +42908,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,50.5 parent: 2 - - uid: 5252 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,46.5 - parent: 2 - uid: 5253 components: - type: Transform @@ -43054,6 +43080,12 @@ entities: rot: 3.141592653589793 rad pos: 26.5,50.5 parent: 2 + - uid: 6396 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,45.5 + parent: 2 - proto: PoweredlightBlue entities: - uid: 5283 @@ -43217,6 +43249,12 @@ entities: parent: 2 - proto: PoweredSmallLight entities: + - uid: 390 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,41.5 + parent: 2 - uid: 5310 components: - type: Transform @@ -43321,6 +43359,12 @@ entities: - type: Emagged - proto: Rack entities: + - uid: 4918 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,22.5 + parent: 2 - uid: 5326 components: - type: Transform @@ -43874,6 +43918,30 @@ entities: - type: Transform pos: 55.5,20.5 parent: 2 +- proto: RandomHumanoidSpawnerCentcomChief + entities: + - uid: 361 + components: + - type: Transform + pos: 66.14474,49.53502 + parent: 2 +- proto: RandomHumanoidSpawnerCentcomOperator + entities: + - uid: 6398 + components: + - type: Transform + pos: 69.51857,25.835213 + parent: 2 + - uid: 6701 + components: + - type: Transform + pos: 65.48517,25.74758 + parent: 2 + - uid: 6702 + components: + - type: Transform + pos: 61.495605,25.769487 + parent: 2 - proto: RandomPosterContraband entities: - uid: 5422 @@ -44391,51 +44459,45 @@ entities: parent: 2 - proto: ReinforcedWindow entities: - - uid: 5513 - components: - - type: Transform - pos: 24.5,59.5 - parent: 2 - - uid: 5514 + - uid: 2510 components: - type: Transform - pos: 27.5,59.5 + rot: 3.141592653589793 rad + pos: 24.5,47.5 parent: 2 - - uid: 5515 + - uid: 4815 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,16.5 + rot: 1.5707963267948966 rad + pos: 26.5,43.5 parent: 2 - - uid: 5516 + - uid: 4820 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,17.5 + rot: 3.141592653589793 rad + pos: 24.5,46.5 parent: 2 - - uid: 5517 + - uid: 5513 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,13.5 + pos: 24.5,59.5 parent: 2 - - uid: 5518 + - uid: 5514 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,14.5 + pos: 27.5,59.5 parent: 2 - - uid: 5519 + - uid: 5516 components: - type: Transform rot: -1.5707963267948966 rad - pos: 32.5,19.5 + pos: 32.5,17.5 parent: 2 - - uid: 5520 + - uid: 5517 components: - type: Transform rot: -1.5707963267948966 rad - pos: 32.5,15.5 + pos: 32.5,13.5 parent: 2 - uid: 5521 components: @@ -44479,24 +44541,12 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,33.5 parent: 2 - - uid: 5529 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,23.5 - parent: 2 - uid: 5530 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,23.5 parent: 2 - - uid: 5531 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,23.5 - parent: 2 - uid: 5532 components: - type: Transform @@ -44607,24 +44657,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,7.5 parent: 2 - - uid: 5551 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,7.5 - parent: 2 - - uid: 5552 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,7.5 - parent: 2 - - uid: 5553 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,4.5 - parent: 2 - uid: 5554 components: - type: Transform @@ -44643,24 +44675,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,4.5 parent: 2 - - uid: 5557 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,4.5 - parent: 2 - - uid: 5558 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,4.5 - parent: 2 - - uid: 5559 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,23.5 - parent: 2 - uid: 5560 components: - type: Transform @@ -44727,12 +44741,6 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,7.5 parent: 2 - - uid: 5571 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,7.5 - parent: 2 - uid: 5572 components: - type: Transform @@ -44792,6 +44800,52 @@ entities: - type: Transform pos: 27.5,58.5 parent: 2 + - uid: 5728 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,21.5 + parent: 2 + - uid: 6165 + components: + - type: Transform + pos: 32.5,20.5 + parent: 2 + - uid: 6332 + components: + - type: Transform + pos: 32.5,10.5 + parent: 2 + - uid: 6333 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,9.5 + parent: 2 + - uid: 6334 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,20.5 + parent: 2 + - uid: 6345 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,21.5 + parent: 2 + - uid: 6395 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,19.5 + parent: 2 + - uid: 6397 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,39.5 + parent: 2 - proto: RemoteSignaller entities: - uid: 5583 @@ -44934,13 +44988,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: RubberStampSyndicate - entities: - - uid: 5602 - components: - - type: Transform - pos: 32.103767,57.466686 - parent: 2 - proto: Saw entities: - uid: 5603 @@ -45841,6 +45888,13 @@ entities: - type: Transform pos: 15.5,34.5 parent: 2 +- proto: SignDisposalSpace + entities: + - uid: 5553 + components: + - type: Transform + pos: 41.5,53.5 + parent: 2 - proto: SignElectricalMed entities: - uid: 5707 @@ -45877,10 +45931,10 @@ entities: parent: 2 - proto: SignJanitor entities: - - uid: 5712 + - uid: 7132 components: - type: Transform - pos: 41.5,53.5 + pos: 24.5,42.5 parent: 2 - proto: SignLawyer entities: @@ -45936,6 +45990,44 @@ entities: - type: Transform pos: 71.5,47.5 parent: 2 +- proto: SignSpace + entities: + - uid: 2630 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,7.5 + parent: 2 + - uid: 3159 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,4.5 + parent: 2 + - uid: 3251 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,23.5 + parent: 2 + - uid: 5518 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,23.5 + parent: 2 + - uid: 5520 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,4.5 + parent: 2 + - uid: 5529 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,7.5 + parent: 2 - proto: SignTelecomms entities: - uid: 5720 @@ -45969,6 +46061,12 @@ entities: parent: 2 - proto: SinkWide entities: + - uid: 781 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,41.5 + parent: 2 - uid: 5724 components: - type: Transform @@ -45991,12 +46089,6 @@ entities: rot: 3.141592653589793 rad pos: 38.5,54.5 parent: 2 - - uid: 5728 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,41.5 - parent: 2 - proto: Sledgehammer entities: - uid: 5729 @@ -46114,7 +46206,7 @@ entities: - uid: 78 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -46245,6 +46337,45 @@ entities: - type: Transform pos: 62.5,31.5 parent: 2 +- proto: SpawnMobHuman + entities: + - uid: 7142 + components: + - type: MetaData + name: борг официант + - type: Transform + pos: 32.5,31.5 + parent: 2 + - type: ConditionalSpawner + prototypes: + - BorgChassisService + - uid: 7143 + components: + - type: MetaData + name: борг медик + - type: Transform + pos: 12.5,29.5 + parent: 2 + - type: ConditionalSpawner + prototypes: + - BorgChassisMedical + - uid: 7144 + components: + - type: MetaData + name: борг инженер + - type: Transform + pos: 64.5,22.5 + parent: 2 + - type: ConditionalSpawner + prototypes: + - BorgChassisEngineer +- proto: SpawnPointPilot + entities: + - uid: 7145 + components: + - type: Transform + pos: 47.5,22.5 + parent: 2 - proto: SpeedLoaderMagnumAP entities: - uid: 2534 @@ -46732,48 +46863,6 @@ entities: - 60 - 63 - 62 - - uid: 781 - components: - - type: MetaData - name: хранилище скафандра уборщика ОБР - - type: Transform - pos: 21.5,40.5 - parent: 2 - - type: AccessReader - access: - - - CentralCommand - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 782 - - 785 - - 789 - - 786 - - 787 - - 783 - - 788 - - 784 - uid: 2550 components: - type: MetaData @@ -46853,6 +46942,25 @@ entities: - 2612 - 2611 - 2613 + - uid: 5558 + components: + - type: Transform + pos: 22.5,42.5 + parent: 2 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 786 + - 789 + - 782 + - 788 + - 785 + - 787 + - 783 + - 784 - proto: SurveillanceCameraCommand entities: - uid: 5794 @@ -48807,7 +48915,7 @@ entities: - uid: 79 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage @@ -49315,15 +49423,6 @@ entities: - type: Transform pos: 38.5,50.5 parent: 2 -- proto: VendingMachineSyndieDrobe - entities: - - uid: 6165 - components: - - type: MetaData - desc: 'Да, да, секретка синдиката на СЦК. Ну а что вы хотели от 2d игры про космонавтиков, в которой существует корпорация, размерами в миллион раз превышающая размер земли? ' - - type: Transform - pos: 30.5,57.5 - parent: 2 - proto: VendingMachineTankDispenserEVA entities: - uid: 6166 @@ -49405,6 +49504,96 @@ entities: parent: 2 - proto: WallReinforced entities: + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,42.5 + parent: 2 + - uid: 515 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,41.5 + parent: 2 + - uid: 2516 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,14.5 + parent: 2 + - uid: 4720 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,4.5 + parent: 2 + - uid: 4746 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,23.5 + parent: 2 + - uid: 4750 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,4.5 + parent: 2 + - uid: 4753 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,16.5 + parent: 2 + - uid: 4796 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,15.5 + parent: 2 + - uid: 4801 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,23.5 + parent: 2 + - uid: 4804 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,7.5 + parent: 2 + - uid: 5519 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,7.5 + parent: 2 + - uid: 5531 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,7.5 + parent: 2 + - uid: 5551 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,23.5 + parent: 2 + - uid: 5552 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,4.5 + parent: 2 + - uid: 5557 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,40.5 + parent: 2 - uid: 6178 components: - type: Transform @@ -50216,21 +50405,6 @@ entities: - type: Transform pos: 22.5,43.5 parent: 2 - - uid: 6332 - components: - - type: Transform - pos: 22.5,42.5 - parent: 2 - - uid: 6333 - components: - - type: Transform - pos: 22.5,41.5 - parent: 2 - - uid: 6334 - components: - - type: Transform - pos: 22.5,40.5 - parent: 2 - uid: 6335 components: - type: Transform @@ -50288,18 +50462,6 @@ entities: rot: 3.141592653589793 rad pos: 24.5,48.5 parent: 2 - - uid: 6345 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 24.5,47.5 - parent: 2 - - uid: 6346 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 24.5,46.5 - parent: 2 - uid: 6347 components: - type: Transform @@ -50340,12 +50502,6 @@ entities: rot: 3.141592653589793 rad pos: 26.5,49.5 parent: 2 - - uid: 6354 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 26.5,43.5 - parent: 2 - uid: 6355 components: - type: Transform @@ -50557,26 +50713,6 @@ entities: - type: Transform pos: 32.5,22.5 parent: 2 - - uid: 6395 - components: - - type: Transform - pos: 32.5,21.5 - parent: 2 - - uid: 6396 - components: - - type: Transform - pos: 32.5,20.5 - parent: 2 - - uid: 6397 - components: - - type: Transform - pos: 32.5,10.5 - parent: 2 - - uid: 6398 - components: - - type: Transform - pos: 32.5,9.5 - parent: 2 - uid: 6399 components: - type: Transform @@ -52248,18 +52384,6 @@ entities: rot: 1.5707963267948966 rad pos: 53.5,22.5 parent: 2 - - uid: 6701 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,21.5 - parent: 2 - - uid: 6702 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,20.5 - parent: 2 - uid: 6703 components: - type: Transform @@ -53201,11 +53325,6 @@ entities: parent: 2 - proto: WallSolid entities: - - uid: 6865 - components: - - type: Transform - pos: 26.5,39.5 - parent: 2 - uid: 6866 components: - type: Transform @@ -53955,6 +54074,18 @@ entities: - type: Transform pos: 19.5,32.5 parent: 2 + - uid: 7131 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,40.5 + parent: 2 + - uid: 7137 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,42.5 + parent: 2 - proto: WallWeaponCapacitorRecharger entities: - uid: 7003 @@ -53976,8 +54107,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -54001,8 +54132,8 @@ entities: immutable: False temperature: 293.14673 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -54099,6 +54230,13 @@ entities: - type: Transform pos: 74.5,40.5 parent: 2 +- proto: WaterTankHighCapacity + entities: + - uid: 7133 + components: + - type: Transform + pos: 22.5,40.5 + parent: 2 - proto: WeaponCapacitorRecharger entities: - uid: 7019 @@ -54242,7 +54380,7 @@ entities: - uid: 789 components: - type: Transform - parent: 781 + parent: 5558 - type: Physics canCollide: False - type: InsideEntityStorage @@ -54281,7 +54419,7 @@ entities: - uid: 80 components: - type: Transform - parent: 65 + parent: 5559 - type: Physics canCollide: False - type: InsideEntityStorage diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml new file mode 100644 index 00000000000..15b3f2e37ff --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml @@ -0,0 +1,60 @@ +### CentComm Chief + +- type: entity + name: Centcom chief + id: RandomHumanoidSpawnerCentcomChief + components: + - type: Sprite + sprite: Markers/jobs.rsi + state: centcom + - type: RandomHumanoidSpawner + settings: CentcomChief + +- type: randomHumanoidSettings + id: CentcomChief + parent: EventHumanoidMindShielded + components: + - type: GhostRole + name: ghost-role-information-centcom-chief-name + description: ghost-role-information-centcom-chief-description + rules: ghost-role-information-nonantagonist-rules + raffle: + settings: default + requirements: + - !type:RoleTimeRequirement + role: JobCentcomOperator + time: 36000 # 10h + - type: Loadout + prototypes: [ CentcomChiefGear ] + roleLoadout: [ RoleSurvivalStandard ] + + +### CentComm Operator + +- type: entity + name: Centcom operator + id: RandomHumanoidSpawnerCentcomOperator + components: + - type: Sprite + sprite: Markers/jobs.rsi + state: centcom + - type: RandomHumanoidSpawner + settings: CentcomOperator + +- type: randomHumanoidSettings + id: CentcomOperator + parent: EventHumanoidMindShielded + components: + - type: GhostRole + name: ghost-role-information-centcom-opertor-name + description: ghost-role-information-centcom-opertor-description + rules: ghost-role-information-nonantagonist-rules + raffle: + settings: default + requirements: + - !type:RoleTimeRequirement # For whitelist + role: JobCentcomOperator + time: 600 # 10m + - type: Loadout + prototypes: [ CentcomOperatorGear ] + roleLoadout: [ RoleSurvivalStandard ] diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml new file mode 100644 index 00000000000..d7f6fe58c5e --- /dev/null +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml @@ -0,0 +1,80 @@ +# Just equipment preset, no custom role + +- type: startingGear + id: CentcomAdmiralGear + equipment: + jumpsuit: ClothingUniformJumpsuitCentcomAdmiral + shoes: ClothingShoesBootsJack + head: ClothingHeadCapCentcomNaval + eyes: ClothingEyesGlassesSunglasses + gloves: ClothingHandsGlovesCentcomNaval + outerClothing: ClothingOuterArmorCentcomCarapace + neck: ClothingNeckCloakCentcomAdmiral + id: CentcomPDA + ears: ClothingHeadsetCentCom + pocket1: RubberStampCentcom + + +# Centcom Chief + +- type: job + id: CentcomChief + name: job-name-centcom-chief + playTimeTracker: JobCentcomChief + setPreference: false + startingGear: CentcomChiefGear + icon: "JobIconNanotrasen" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + +- type: startingGear + id: CentcomChiefGear + equipment: + jumpsuit: ClothingUniformJumpsuitCentcomAdmiral + back: ClothingBackpackSatchelLeather + shoes: ClothingShoesBootsCombatFilled + head: ClothingHeadHatBeretCentcomNaval + eyes: ClothingEyesGlassesSunglasses + gloves: ClothingHandsGlovesCentcomNaval + outerClothing: ClothingOuterArmorCentcomCarapace + neck: ClothingNeckCloakCentcom + id: CentcomPDA + ears: ClothingHeadsetAltCentCom + pocket1: RubberStampCentcom + pocket2: WeaponDisabler + + +### CentComm Operator + +- type: job + id: CentcomOperator + name: job-name-centcom-operator + playTimeTracker: JobCentcomOperator + setPreference: false + startingGear: CentcomOperatorGear + icon: "JobIconNanotrasen" + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + access: + - CentralCommand + +- type: startingGear + id: CentcomOperatorGear + equipment: + jumpsuit: ClothingUniformJumpsuitCentcomOfficial + back: ClothingBackpackSatchelLeather + shoes: ClothingShoesBootsJack + head: ClothingHeadHatBeretCentcomNaval + eyes: ClothingEyesGlassesSunglasses + gloves: ClothingHandsGlovesColorBlack + neck: ClothingNeckNanoTrasenPin + id: CentcomPDA + ears: ClothingHeadsetCentCom + pocket1: RubberStampCentcom + pocket2: BoxFolderCentCom diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom_admiral.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom_admiral.yml deleted file mode 100644 index a652fc346ea..00000000000 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom_admiral.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Just equipment preset, no custom role - -- type: startingGear - id: CentcomAdmiralGear - equipment: - jumpsuit: ClothingUniformJumpsuitCentcomAdmiral - shoes: ClothingShoesBootsJack - head: ClothingHeadCapCentcomNaval - eyes: ClothingEyesGlassesSunglasses - gloves: ClothingHandsGlovesCentcomNaval - outerClothing: ClothingOuterArmorCentcomCarapace - neck: ClothingNeckCloakCentcomAdmiral - id: CentcomPDA - ears: ClothingHeadsetCentCom - pocket1: RubberStampCentcom diff --git a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml index 1fcf1e64f82..0f17a9c0d6c 100644 --- a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml @@ -32,4 +32,10 @@ id: JobEvent9 - type: playTimeTracker - id: JobEvent10 \ No newline at end of file + id: JobEvent10 + +- type: playTimeTracker + id: JobCentcommChief + +- type: playTimeTracker + id: JobCentcommOperator \ No newline at end of file From 6a3a5aa0c7e2a89338ad9f5956e2911adf4fec18 Mon Sep 17 00:00:00 2001 From: Mota Date: Sun, 8 Sep 2024 10:22:33 +0300 Subject: [PATCH 2/6] add jobs --- Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml index 15b3f2e37ff..82837ac4590 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml @@ -20,6 +20,7 @@ rules: ghost-role-information-nonantagonist-rules raffle: settings: default + job: CentcomChief requirements: - !type:RoleTimeRequirement role: JobCentcomOperator @@ -51,6 +52,7 @@ rules: ghost-role-information-nonantagonist-rules raffle: settings: default + job: CentcomOperator requirements: - !type:RoleTimeRequirement # For whitelist role: JobCentcomOperator From 493574ccd00924a6517d0a31251f017b1040a493 Mon Sep 17 00:00:00 2001 From: Mota Date: Wed, 11 Sep 2024 12:42:28 +0300 Subject: [PATCH 3/6] add some stuff --- .../corvax/job/department-description.ftl | 1 + .../Locale/ru-RU/corvax/job/department.ftl | 1 + .../Locale/ru-RU/corvax/job/job-names.ftl | 2 +- .../ru-RU/corvax/job/job-supervisors.ftl | 2 ++ .../Corvax/Entities/Mobs/Player/humanoid.yml | 11 ++++++++--- .../Corvax/Entities/Objects/Devices/pda.yml | 14 ++++++++++++++ .../Objects/Misc/identification_cards.yml | 14 ++++++++++++++ .../Corvax/Roles/Jobs/Command/centcom.yml | 19 +++++++++++++++---- .../Corvax/Roles/Jobs/departaments.yml | 9 +++++++++ 9 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 Resources/Locale/ru-RU/corvax/job/department-description.ftl create mode 100644 Resources/Locale/ru-RU/corvax/job/department.ftl create mode 100644 Resources/Locale/ru-RU/corvax/job/job-supervisors.ftl create mode 100644 Resources/Prototypes/Corvax/Roles/Jobs/departaments.yml diff --git a/Resources/Locale/ru-RU/corvax/job/department-description.ftl b/Resources/Locale/ru-RU/corvax/job/department-description.ftl new file mode 100644 index 00000000000..c3dd3dbca9d --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/job/department-description.ftl @@ -0,0 +1 @@ +department-Centcom-description = Осуществляйте управление всеми станциями в секторе и отвечайте непосредственно перед советом директоров. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/corvax/job/department.ftl b/Resources/Locale/ru-RU/corvax/job/department.ftl new file mode 100644 index 00000000000..90410b54e44 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/job/department.ftl @@ -0,0 +1 @@ +department-Centcom = Центральное командование \ No newline at end of file diff --git a/Resources/Locale/ru-RU/corvax/job/job-names.ftl b/Resources/Locale/ru-RU/corvax/job/job-names.ftl index f63c21ab839..fac0e2b31a7 100644 --- a/Resources/Locale/ru-RU/corvax/job/job-names.ftl +++ b/Resources/Locale/ru-RU/corvax/job/job-names.ftl @@ -1,7 +1,7 @@ job-name-iaa = агент внутренних дел job-name-pilot = пилот job-name-centcom-chief = начальник штаба ЦентКом -job-name-centcom-opertor = оператор ЦентКом +job-name-centcom-operator = оператор ЦентКом JobIAA = агент внутренних дел JobPilot = пилот JobCentcomChief = начальник штаба ЦентКом diff --git a/Resources/Locale/ru-RU/corvax/job/job-supervisors.ftl b/Resources/Locale/ru-RU/corvax/job/job-supervisors.ftl new file mode 100644 index 00000000000..44bbe7ed27b --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/job/job-supervisors.ftl @@ -0,0 +1,2 @@ +job-supervisors-nanotrasen = совету директоров Nanotrasen +job-supervisors-centcom-cheif = начальнику штаба Центрального командования \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml index 82837ac4590..62e8feb627c 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml @@ -13,6 +13,7 @@ - type: randomHumanoidSettings id: CentcomChief parent: EventHumanoidMindShielded + speciesBlacklist: ['Diona', 'Vox'] components: - type: GhostRole name: ghost-role-information-centcom-chief-name @@ -45,6 +46,7 @@ - type: randomHumanoidSettings id: CentcomOperator parent: EventHumanoidMindShielded + speciesBlacklist: ['Diona', 'Vox'] components: - type: GhostRole name: ghost-role-information-centcom-opertor-name @@ -54,9 +56,12 @@ settings: default job: CentcomOperator requirements: - - !type:RoleTimeRequirement # For whitelist - role: JobCentcomOperator - time: 600 # 10m + - !type:RoleTimeRequirement + role: JobCaptain + time: 18000 # 5h + - !type:RoleTimeRequirement + role: JobIAA + time: 18000 # 5h - type: Loadout prototypes: [ CentcomOperatorGear ] roleLoadout: [ RoleSurvivalStandard ] diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml index 74c880d689a..3a8eb0720c8 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/pda.yml @@ -26,3 +26,17 @@ accentVColor: "#DFDFDF" - type: Icon state: pda-seniorofficer + +- type: entity + parent: CentcomPDA + id: CentcomOperatorPDA + components: + - type: Pda + id: CentcomOperatorIDCard + +- type: entity + parent: CentcomPDA + id: CentcomChiefPDA + components: + - type: Pda + id: CentcomChiefIDCard \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml index 5f95ccca973..eeaf36e809c 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml @@ -21,3 +21,17 @@ - state: idpilot - type: PresetIdCard job: Pilot + +- type: entity + parent: CentcomIDCard + id: CentcomOperatorIDCard + components: + - type: PresetIdCard + job: CentcomOperator + +- type: entity + parent: CentcomIDCard + id: CentcomChiefIDCard + components: + - type: PresetIdCard + job: CentcomChief \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml index d7f6fe58c5e..10972cf5368 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml @@ -24,8 +24,12 @@ setPreference: false startingGear: CentcomChiefGear icon: "JobIconNanotrasen" - supervisors: job-supervisors-centcom + supervisors: job-supervisors-nanotrasen canBeAntag: false + requirements: + - !type:RoleTimeRequirement + role: JobCentcomOperator + time: 36000 # 10h accessGroups: - AllAccess access: @@ -42,7 +46,7 @@ gloves: ClothingHandsGlovesCentcomNaval outerClothing: ClothingOuterArmorCentcomCarapace neck: ClothingNeckCloakCentcom - id: CentcomPDA + id: CentcomChiefPDA ears: ClothingHeadsetAltCentCom pocket1: RubberStampCentcom pocket2: WeaponDisabler @@ -57,8 +61,15 @@ setPreference: false startingGear: CentcomOperatorGear icon: "JobIconNanotrasen" - supervisors: job-supervisors-centcom + supervisors: job-supervisors-centcom-cheif canBeAntag: false + requirements: + - !type:RoleTimeRequirement + role: JobCaptain + time: 18000 # 5h + - !type:RoleTimeRequirement + role: JobIAA + time: 18000 # 5h accessGroups: - AllAccess access: @@ -74,7 +85,7 @@ eyes: ClothingEyesGlassesSunglasses gloves: ClothingHandsGlovesColorBlack neck: ClothingNeckNanoTrasenPin - id: CentcomPDA + id: CentcomOperatorPDA ears: ClothingHeadsetCentCom pocket1: RubberStampCentcom pocket2: BoxFolderCentCom diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/departaments.yml b/Resources/Prototypes/Corvax/Roles/Jobs/departaments.yml new file mode 100644 index 00000000000..060331eef57 --- /dev/null +++ b/Resources/Prototypes/Corvax/Roles/Jobs/departaments.yml @@ -0,0 +1,9 @@ +- type: department + id: Centcom + name: department-Centcom + description: department-Centcom-description + color: "#228B22" + editorHidden: true + roles: + - CentcomChief + - CentcomOperator \ No newline at end of file From 6af9544ef0c480ba0b6cb8caaf7b437d366b1848 Mon Sep 17 00:00:00 2001 From: Mota Date: Wed, 11 Sep 2024 13:07:35 +0300 Subject: [PATCH 4/6] add locale --- .../prototypes/corvax/entities/objects/devices/pda.ftl | 4 ++++ .../corvax/entities/objects/misc/identification_cards.ftl | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl index c03990adf60..1ddb1ae21dd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/pda.ftl @@ -2,3 +2,7 @@ ent-IAAPDA = КПК агента внутренних дел .desc = Корпорация и прибыль - лучшие друзья. ent-PilotPDA = КПК пилота .desc = Имеет защиту от космической радиации. +ent-CentcomOperatorPDA = { ent-CentcomPDA } + .desc = { ent-CentcomPDA.desc } +ent-CentcomChiefPDA = { ent-CentcomPDA } + .desc = { ent-CentcomPDA.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl index 1bc170e6b76..bc72641ddd2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/identification_cards.ftl @@ -2,3 +2,7 @@ ent-IAAIDCard = ID карта агента внутренних дел .desc = { ent-IDCardStandard.desc } ent-PilotIDCard = ID карта пилота .desc = { ent-IDCardStandard.desc } +ent-CentcomOperatorIDCard = ID карта оператора ЦентКом + .desc = { ent-IDCardStandard.desc } +ent-CentcomChiefIDCard = ID карта начальника штаба ЦентКом + .desc = { ent-IDCardStandard.desc } \ No newline at end of file From 8ee74b44ddd47d0be348860b0a6b5d6753a8b7c8 Mon Sep 17 00:00:00 2001 From: Mota Date: Wed, 11 Sep 2024 13:42:50 +0300 Subject: [PATCH 5/6] fix typo --- Resources/Prototypes/Corvax/Roles/play_time_trackers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml index 0f17a9c0d6c..5ad06a7a221 100644 --- a/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Corvax/Roles/play_time_trackers.yml @@ -35,7 +35,7 @@ id: JobEvent10 - type: playTimeTracker - id: JobCentcommChief + id: JobCentcomChief - type: playTimeTracker - id: JobCentcommOperator \ No newline at end of file + id: JobCentcomOperator \ No newline at end of file From bc5e4ccde6b62ff9bca6c4b8b17367d4e6149b35 Mon Sep 17 00:00:00 2001 From: Mota Date: Wed, 11 Sep 2024 14:00:44 +0300 Subject: [PATCH 6/6] raise up playtime reqs --- Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml | 4 ++-- Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml index 62e8feb627c..4cc1c33fd42 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Player/humanoid.yml @@ -58,10 +58,10 @@ requirements: - !type:RoleTimeRequirement role: JobCaptain - time: 18000 # 5h + time: 36000 # 10h - !type:RoleTimeRequirement role: JobIAA - time: 18000 # 5h + time: 36000 # 10h - type: Loadout prototypes: [ CentcomOperatorGear ] roleLoadout: [ RoleSurvivalStandard ] diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml index 10972cf5368..583edd2910f 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/centcom.yml @@ -66,10 +66,10 @@ requirements: - !type:RoleTimeRequirement role: JobCaptain - time: 18000 # 5h + time: 36000 # 10h - !type:RoleTimeRequirement role: JobIAA - time: 18000 # 5h + time: 36000 # 10h accessGroups: - AllAccess access: