From 126314376fb10ba959408089217871f7696c1d93 Mon Sep 17 00:00:00 2001 From: JDtrimble Date: Mon, 17 Jun 2024 11:54:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B0=D0=BB=20=D1=88=D0=BA=D0=B0=D1=84?= =?UTF-8?q?=D1=83=20=D0=91=D0=A9=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=20?= =?UTF-8?q?=D0=91=D0=A9.=20=D0=A0=D0=B5=D0=BC=D0=B0=D0=BF=D0=BF=20=D0=B2?= =?UTF-8?q?=D1=81=D0=B5=D1=85=20=D0=BA=D0=B0=D0=B1=D0=B8=D0=BD=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=9E=D0=A1=D0=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../station-beacons/station-beacon.ftl | 3 + Resources/Maps/_Sunrise/Station/box.yml | 14 ++ Resources/Maps/_Sunrise/Station/cluster.yml | 58 +++-- Resources/Maps/_Sunrise/Station/delta.yml | 200 ++++++++++++++++-- Resources/Maps/_Sunrise/Station/fland.yml | 49 +++-- Resources/Maps/_Sunrise/Station/marathon.yml | 52 +++-- .../Objects/Devices/station_beacon.yml | 8 + .../Storage/Closets/Lockers/lockers.yml | 2 +- .../_Sunrise/Loadouts/loadout_groups.yml | 9 +- Resources/Prototypes/game_presets.yml | 16 +- 10 files changed, 334 insertions(+), 77 deletions(-) create mode 100644 Resources/Locale/ru-RU/_sunrise/station-beacons/station-beacon.ftl create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Devices/station_beacon.yml diff --git a/Resources/Locale/ru-RU/_sunrise/station-beacons/station-beacon.ftl b/Resources/Locale/ru-RU/_sunrise/station-beacons/station-beacon.ftl new file mode 100644 index 00000000000..8ed24face39 --- /dev/null +++ b/Resources/Locale/ru-RU/_sunrise/station-beacons/station-beacon.ftl @@ -0,0 +1,3 @@ +ent-DefaultStationBeaconBlueShield = { ent-DefaultStationBeacon } + .desc = { ent-DefaultStationBeacon.desc } + .suffix = Офицер "Синий Щит" diff --git a/Resources/Maps/_Sunrise/Station/box.yml b/Resources/Maps/_Sunrise/Station/box.yml index 8106ebb07f3..6d3d5e7c605 100644 --- a/Resources/Maps/_Sunrise/Station/box.yml +++ b/Resources/Maps/_Sunrise/Station/box.yml @@ -71540,6 +71540,13 @@ entities: - type: Transform pos: 23.5,-6.5 parent: 8364 +- proto: DefaultStationBeaconBlueShield + entities: + - uid: 21348 + components: + - type: Transform + pos: -22.5,-11.5 + parent: 8364 - proto: DefaultStationBeaconBotany entities: - uid: 27544 @@ -120161,6 +120168,13 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,44.5 parent: 8364 +- proto: GunSafeBlueShield + entities: + - uid: 21347 + components: + - type: Transform + pos: -23.5,-13.5 + parent: 8364 - proto: GunSafeDisabler entities: - uid: 6253 diff --git a/Resources/Maps/_Sunrise/Station/cluster.yml b/Resources/Maps/_Sunrise/Station/cluster.yml index a9aadc23d39..53d82912bec 100644 --- a/Resources/Maps/_Sunrise/Station/cluster.yml +++ b/Resources/Maps/_Sunrise/Station/cluster.yml @@ -5421,6 +5421,14 @@ entities: rot: 1.5707963267948966 rad pos: 33.5,-10.5 parent: 1 +- proto: AirlockBlueShieldLocked + entities: + - uid: 2344 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,21.5 + parent: 1 - proto: AirlockBrigGlassLocked entities: - uid: 2351 @@ -5577,12 +5585,6 @@ entities: parent: 1 - proto: AirlockCommandLocked entities: - - uid: 2344 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,21.5 - parent: 1 - uid: 3309 components: - type: Transform @@ -22644,11 +22646,6 @@ entities: - type: Transform pos: 15.5,20.5 parent: 1 - - uid: 11806 - components: - - type: Transform - pos: 16.5,20.5 - parent: 1 - uid: 11833 components: - type: Transform @@ -22664,6 +22661,16 @@ entities: - type: Transform pos: 17.5,21.5 parent: 1 + - uid: 12498 + components: + - type: Transform + pos: 17.5,20.5 + parent: 1 + - uid: 12532 + components: + - type: Transform + pos: 16.5,20.5 + parent: 1 - proto: CarpetGreen entities: - uid: 3833 @@ -29066,6 +29073,13 @@ entities: - type: Transform pos: 1.5,6.5 parent: 1 +- proto: DefaultStationBeaconBlueShield + entities: + - uid: 12380 + components: + - type: Transform + pos: 15.5,21.5 + parent: 1 - proto: DefaultStationBeaconBotany entities: - uid: 9428 @@ -55054,6 +55068,13 @@ entities: rot: 3.141592653589793 rad pos: -26.5,-30.5 parent: 1 +- proto: GunSafeBlueShield + entities: + - uid: 11806 + components: + - type: Transform + pos: 16.5,20.5 + parent: 1 - proto: Handcuffs entities: - uid: 5063 @@ -61333,11 +61354,6 @@ entities: - type: Transform pos: 7.5,27.5 parent: 1 - - uid: 11997 - components: - - type: Transform - pos: 14.5,19.5 - parent: 1 - uid: 12106 components: - type: Transform @@ -61497,6 +61513,11 @@ entities: - type: Transform pos: -29.5,-5.5 parent: 1 + - uid: 11997 + components: + - type: Transform + pos: 13.5,19.5 + parent: 1 - uid: 11998 components: - type: Transform @@ -61527,6 +61548,11 @@ entities: - type: Transform pos: -38.5,20.5 parent: 1 + - uid: 12533 + components: + - type: Transform + pos: 17.5,19.5 + parent: 1 - proto: RandomSoap entities: - uid: 12499 diff --git a/Resources/Maps/_Sunrise/Station/delta.yml b/Resources/Maps/_Sunrise/Station/delta.yml index 50fecaba998..b24573f0fe4 100644 --- a/Resources/Maps/_Sunrise/Station/delta.yml +++ b/Resources/Maps/_Sunrise/Station/delta.yml @@ -136,7 +136,7 @@ entities: version: 6 1,1: ind: 1,1 - tiles: YAAAAAADUQAAAAAAYAAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAAAUQAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAUQAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAABUQAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAABUQAAAAAAYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAADYAAAAAACYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAUQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAABbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAABgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAADgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAADgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAUQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAUQAAAAAAYAAAAAACgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAYAAAAAACUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAYAAAAAACUQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAUQAAAAAAYAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: YAAAAAADUQAAAAAAYAAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAAAUQAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAUQAAAAAAYAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAABUQAAAAAAYAAAAAADgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAABUQAAAAAAYAAAAAACgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAYAAAAAADYAAAAAACYAAAAAACgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAUQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAABbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAABgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAADgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAADgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAUQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAUQAAAAAAYAAAAAACgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAYAAAAAACUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAYAAAAAACUQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAUQAAAAAAYAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 1,0: ind: 1,0 @@ -1364,6 +1364,11 @@ entities: id: BrickCornerOverlaySW decals: 6502: -64,-38 + - node: + color: '#0000BDFF' + id: BrickLineOverlayE + decals: + 8005: 24,21 - node: color: '#EFB34196' id: BrickLineOverlayE @@ -1466,11 +1471,21 @@ entities: 7459: 22,-4 7460: 22,0 7465: 53,28 + - node: + color: '#0000BDFF' + id: BrickTileSteelCornerNe + decals: + 8009: 24,22 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe decals: 7524: 39,-9 + - node: + color: '#0000BDFF' + id: BrickTileSteelCornerNw + decals: + 8008: 20,22 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNw @@ -1482,6 +1497,11 @@ entities: id: BrickTileSteelCornerNw decals: 5296: 28,1 + - node: + color: '#0000BDFF' + id: BrickTileSteelCornerSe + decals: + 8006: 24,18 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSe @@ -1493,6 +1513,11 @@ entities: id: BrickTileSteelCornerSe decals: 5300: 30,1 + - node: + color: '#0000BDFF' + id: BrickTileSteelCornerSw + decals: + 8007: 20,18 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw @@ -1526,6 +1551,13 @@ entities: decals: 7298: -29,37 7403: -28,38 + - node: + color: '#0000BDFF' + id: BrickTileSteelLineE + decals: + 8010: 24,21 + 8011: 24,20 + 8012: 24,19 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE @@ -1549,6 +1581,13 @@ entities: 5287: 28,0 5299: 30,2 5308: 28,-2 + - node: + color: '#0000BDFF' + id: BrickTileSteelLineN + decals: + 8019: 21,22 + 8020: 22,22 + 8021: 23,22 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN @@ -1573,6 +1612,13 @@ entities: 5278: 26,-2 5297: 29,1 5306: 27,-2 + - node: + color: '#0000BDFF' + id: BrickTileSteelLineS + decals: + 8013: 21,18 + 8014: 22,18 + 8015: 23,18 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS @@ -1598,6 +1644,13 @@ entities: 5280: 26,-2 5301: 29,1 5307: 27,-2 + - node: + color: '#0000BDFF' + id: BrickTileSteelLineW + decals: + 8016: 20,19 + 8017: 20,20 + 8018: 20,21 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW @@ -22049,6 +22102,9 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,20.5 parent: 13307 + - type: DeviceLinkSink + links: + - 37748 - proto: AirlockBlueShieldLocked entities: - uid: 5804 @@ -22057,6 +22113,9 @@ entities: rot: 3.141592653589793 rad pos: 22.5,17.5 parent: 13307 + - type: DeviceLinkSink + links: + - 37748 - proto: AirlockBrigGlassLocked entities: - uid: 877 @@ -28830,6 +28889,16 @@ entities: - type: Transform pos: 4.5,-71.5 parent: 13307 + - uid: 37761 + components: + - type: Transform + pos: 20.5,18.5 + parent: 13307 + - uid: 37762 + components: + - type: Transform + pos: 24.5,18.5 + parent: 13307 - uid: 43243 components: - type: Transform @@ -32913,6 +32982,14 @@ entities: rot: -1.5707963267948966 rad pos: 68.5,-45.5 parent: 13307 +- proto: ButtonFrameGrey + entities: + - uid: 37747 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,22.5 + parent: 13307 - proto: CableApcExtension entities: - uid: 45 @@ -105200,6 +105277,11 @@ entities: rot: -1.5707963267948966 rad pos: -17.5,-24.5 parent: 13307 + - uid: 37749 + components: + - type: Transform + pos: 20.5,22.5 + parent: 13307 - proto: ComputerFrame entities: - uid: 4960 @@ -105614,6 +105696,11 @@ entities: rot: -1.5707963267948966 rad pos: -17.5,-26.5 parent: 13307 + - uid: 37751 + components: + - type: Transform + pos: 21.5,22.5 + parent: 13307 - proto: ComputerSurveillanceWirelessCameraMonitor entities: - uid: 25052 @@ -108351,6 +108438,13 @@ entities: text: Бар - type: WarpPoint location: Сервис - Бар +- proto: DefaultStationBeaconBlueShield + entities: + - uid: 30719 + components: + - type: Transform + pos: 22.5,20.5 + parent: 13307 - proto: DefaultStationBeaconBotany entities: - uid: 24780 @@ -108375,15 +108469,6 @@ entities: location: Мостик - proto: DefaultStationBeaconBrig entities: - - uid: 30719 - components: - - type: Transform - pos: 22.5,20.5 - parent: 13307 - - type: NavMapBeacon - text: Кабинет офицера "Синий Щит" - - type: WarpPoint - location: Кабинет офицера "Синий Щит" - uid: 32209 components: - type: Transform @@ -120690,7 +120775,7 @@ entities: pos: 62.5,-40.5 parent: 13307 - type: Door - secondsUntilStateChange: -20556.611 + secondsUntilStateChange: -21171.295 state: Opening - uid: 43264 components: @@ -123303,7 +123388,7 @@ entities: pos: -30.5,70.5 parent: 13307 - type: Door - secondsUntilStateChange: -17087.81 + secondsUntilStateChange: -17702.494 state: Closing - uid: 17804 components: @@ -123385,7 +123470,7 @@ entities: pos: -19.5,21.5 parent: 13307 - type: Door - secondsUntilStateChange: -33903.31 + secondsUntilStateChange: -34517.992 state: Closing - uid: 19168 components: @@ -209312,6 +209397,16 @@ entities: rot: 3.141592653589793 rad pos: -74.5,-1.5 parent: 13307 + - uid: 37763 + components: + - type: Transform + pos: 25.5,22.5 + parent: 13307 + - uid: 37764 + components: + - type: Transform + pos: 25.5,18.5 + parent: 13307 - uid: 38280 components: - type: Transform @@ -219919,6 +220014,51 @@ entities: - type: DeviceLinkSink links: - 15231 + - uid: 37742 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,20.5 + parent: 13307 + - type: DeviceLinkSink + links: + - 37748 + - uid: 37743 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,21.5 + parent: 13307 + - type: DeviceLinkSink + links: + - 37748 + - uid: 37744 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,19.5 + parent: 13307 + - type: DeviceLinkSink + links: + - 37748 + - uid: 37745 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,21.5 + parent: 13307 + - type: DeviceLinkSink + links: + - 37748 + - uid: 37746 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,19.5 + parent: 13307 + - type: DeviceLinkSink + links: + - 37748 - uid: 38665 components: - type: Transform @@ -221235,6 +221375,26 @@ entities: - Pressed: Toggle 10836: - Pressed: Toggle + - uid: 37748 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,22.5 + parent: 13307 + - type: DeviceLinkSource + linkedPorts: + 18748: [] + 37745: + - Pressed: Toggle + 37746: + - Pressed: Toggle + 5804: [] + 37743: + - Pressed: Toggle + 37742: + - Pressed: Toggle + 37744: + - Pressed: Toggle - uid: 38018 components: - type: Transform @@ -234227,6 +234387,16 @@ entities: rot: 3.141592653589793 rad pos: -113.5,21.5 parent: 13307 + - uid: 37753 + components: + - type: Transform + pos: 24.5,22.5 + parent: 13307 + - uid: 37754 + components: + - type: Transform + pos: 23.5,22.5 + parent: 13307 - uid: 37864 components: - type: Transform @@ -269837,6 +270007,8 @@ entities: entities: - uid: 20444 components: + - type: MetaData + name: Кабинет ОСЩ - type: Transform pos: 22.5,20.5 parent: 13307 @@ -271804,7 +271976,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -6265.4736 + secondsUntilStateChange: -6880.1567 state: Opening - uid: 38432 components: diff --git a/Resources/Maps/_Sunrise/Station/fland.yml b/Resources/Maps/_Sunrise/Station/fland.yml index 36615c42d5d..c85afc7b285 100644 --- a/Resources/Maps/_Sunrise/Station/fland.yml +++ b/Resources/Maps/_Sunrise/Station/fland.yml @@ -17749,6 +17749,13 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,29.5 parent: 13329 +- proto: AirlockBlueShieldGlassLocked + entities: + - uid: 1979 + components: + - type: Transform + pos: -10.5,3.5 + parent: 13329 - proto: AirlockBrigGlassLocked entities: - uid: 2238 @@ -18063,11 +18070,6 @@ entities: parent: 13329 - proto: AirlockCommandGlassLocked entities: - - uid: 3893 - components: - - type: Transform - pos: -10.5,3.5 - parent: 13329 - uid: 3897 components: - type: Transform @@ -98585,6 +98587,13 @@ entities: - type: Transform pos: -16.5,24.5 parent: 13329 +- proto: DefaultStationBeaconBlueShield + entities: + - uid: 3893 + components: + - type: Transform + pos: -10.5,0.5 + parent: 13329 - proto: DefaultStationBeaconBotany entities: - uid: 26316 @@ -98678,13 +98687,6 @@ entities: parent: 13329 - type: NavMapBeacon text: Conference - - uid: 26701 - components: - - type: Transform - pos: -10.5,0.5 - parent: 13329 - - type: NavMapBeacon - text: Checkpoint - uid: 29163 components: - type: Transform @@ -160688,6 +160690,13 @@ entities: - type: Transform pos: 42.5,61.5 parent: 13329 +- proto: GunSafeBlueShield + entities: + - uid: 34920 + components: + - type: Transform + pos: -11.5,1.5 + parent: 13329 - proto: GunSafeDisabler entities: - uid: 27875 @@ -167396,11 +167405,6 @@ entities: parent: 13329 - proto: PottedPlant12 entities: - - uid: 1979 - components: - - type: Transform - pos: -11.487109,1.2179638 - parent: 13329 - uid: 9443 components: - type: Transform @@ -167421,6 +167425,11 @@ entities: - type: Transform pos: 116.5,-26.5 parent: 13329 + - uid: 34948 + components: + - type: Transform + pos: -9.5,2.5 + parent: 13329 - proto: PottedPlant13 entities: - uid: 4542 @@ -221871,6 +221880,12 @@ entities: - type: Transform pos: -10.5,-2.5 parent: 13329 + - uid: 26701 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-2.5 + parent: 13329 - uid: 30210 components: - type: Transform diff --git a/Resources/Maps/_Sunrise/Station/marathon.yml b/Resources/Maps/_Sunrise/Station/marathon.yml index cba6a94ccf4..9dd74faf909 100644 --- a/Resources/Maps/_Sunrise/Station/marathon.yml +++ b/Resources/Maps/_Sunrise/Station/marathon.yml @@ -9298,6 +9298,14 @@ entities: - type: Transform pos: -10.5,15.5 parent: 30 +- proto: AirlockBlueShieldLocked + entities: + - uid: 1052 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -37.5,10.5 + parent: 30 - proto: AirlockBrigGlassLocked entities: - uid: 556 @@ -9581,12 +9589,6 @@ entities: parent: 30 - proto: AirlockCommandLocked entities: - - uid: 1089 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -37.5,10.5 - parent: 30 - uid: 1794 components: - type: Transform @@ -10860,7 +10862,7 @@ entities: pos: -27.5,18.5 parent: 30 - type: Door - secondsUntilStateChange: -535.0326 + secondsUntilStateChange: -626.3288 state: Opening - type: DeviceLinkSource lastSignals: @@ -54878,6 +54880,14 @@ entities: - type: Transform pos: -2.5,9.5 parent: 30 +- proto: DefaultStationBeaconBlueShield + entities: + - uid: 1086 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -40.5,10.5 + parent: 30 - proto: DefaultStationBeaconBotany entities: - uid: 20535 @@ -96263,6 +96273,13 @@ entities: - type: Transform pos: -10.5,-19.5 parent: 30 +- proto: GunSafeBlueShield + entities: + - uid: 1089 + components: + - type: Transform + pos: -38.5,9.5 + parent: 30 - proto: GunSafeDisabler entities: - uid: 726 @@ -98826,10 +98843,10 @@ entities: - 0 - proto: LockerBlueshieldFilledHardsuit entities: - - uid: 1052 + - uid: 1087 components: - type: Transform - pos: -38.5,9.5 + pos: -39.5,9.5 parent: 30 - proto: LockerBoozeFilled entities: @@ -121023,12 +121040,6 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,11.5 parent: 30 - - uid: 1086 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,9.5 - parent: 30 - uid: 1741 components: - type: Transform @@ -137933,6 +137944,12 @@ entities: parent: 30 - type: Physics canCollide: False + - uid: 14844 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -41.5,12.5 + parent: 30 - proto: WardrobeBlackFilled entities: - uid: 9942 @@ -138553,11 +138570,6 @@ entities: parent: 30 - proto: WeaponCapacitorRecharger entities: - - uid: 1087 - components: - - type: Transform - pos: -39.5,9.5 - parent: 30 - uid: 1924 components: - type: Transform diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/station_beacon.yml new file mode 100644 index 00000000000..dcf4ae077a3 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/station_beacon.yml @@ -0,0 +1,8 @@ +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconBlueShield + suffix: Blue Shield + components: + - type: NavMapBeacon + defaultText: station-beacon-blueshield + color: "#FFFF00" diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 9a61c9f2ed6..072603089d4 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -23,4 +23,4 @@ stateDoorOpen: bssecure_open stateDoorClosed: bssecure_door - type: AccessReader - access: [["Command"]] # TODO: properly add blueshield access level + access: [["BlueShield"]] diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml index b24b5c8acb4..93297137db4 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml @@ -135,6 +135,13 @@ - SecurityWeaponMeleeNeedle - SecurityHoloprojector +- type: loadoutGroup + id: SecurityBodycam + name: loadout-group-bodycam + minlimit: 0 + loadouts: + - SecurityBodycam + - type: loadoutGroup id: CorporateLaw name: loadout-group-corporate-law @@ -156,4 +163,4 @@ name: loadout-group-centcomm-operator-head-hat loadouts: - HeadHatBeretCentcomNaval - - HeadHatCentcomcap \ No newline at end of file + - HeadHatCentcomcap diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index c2ecd0d0d93..d60285250fe 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -8,7 +8,7 @@ rules: - RampingStationEventScheduler - GameRuleMeteorScheduler - - BasicRoundstartVariation +# - BasicRoundstartVariation - type: gamePreset id: AllAtOnce @@ -20,7 +20,7 @@ - Traitor - Revolutionary - Zombie - - RampingStationEventScheduler +# - RampingStationEventScheduler - GameRuleMeteorScheduler - type: gamePreset @@ -34,7 +34,7 @@ rules: - BasicStationEventScheduler - GameRuleMeteorScheduler - - BasicRoundstartVariation +# - BasicRoundstartVariation - type: gamePreset id: Greenshift @@ -45,7 +45,7 @@ showInVote: false #4boring4vote description: greenshift-description rules: - - BasicRoundstartVariation +# - BasicRoundstartVariation - GameRuleMeteorScheduler - GreenshiftAnnouncement # Sunrise-Edit @@ -102,7 +102,7 @@ - SubGamemodesRule - BasicStationEventScheduler - GameRuleMeteorScheduler - - BasicRoundstartVariation +# - BasicRoundstartVariation - type: gamePreset id: Deathmatch @@ -129,7 +129,7 @@ - SubGamemodesRule - BasicStationEventScheduler - GameRuleMeteorScheduler - - BasicRoundstartVariation +# - BasicRoundstartVariation - type: gamePreset id: Revolutionary @@ -145,7 +145,7 @@ - SubGamemodesRule - BasicStationEventScheduler - GameRuleMeteorScheduler - - BasicRoundstartVariation +# - BasicRoundstartVariation - type: gamePreset id: Zombie @@ -162,4 +162,4 @@ - Zombie - BasicStationEventScheduler - GameRuleMeteorScheduler - - BasicRoundstartVariation +# - BasicRoundstartVariation