diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 0a9a1ace151..f2165e642a3 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -1,3 +1,5 @@ +name: Update sunrise changelog + on: push: branches: [master] @@ -13,22 +15,23 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.x' - + - name: Install Dependencies run: pip install pyyaml - + - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git config --global user.name 'VigersRay' + git config --global user.email 'VigersRay@gmail.com' + git remote set-url origin https://${{ secrets.GH_TOKEN }}@github.com/VigersRay/repository.git git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push \ No newline at end of file + git push HEAD:master diff --git a/Resources/Locale/ru-RU/_sunrise/job/department.ftl b/Resources/Locale/ru-RU/_sunrise/job/department.ftl index 715ec9a6716..81d540b59e3 100644 --- a/Resources/Locale/ru-RU/_sunrise/job/department.ftl +++ b/Resources/Locale/ru-RU/_sunrise/job/department.ftl @@ -1,2 +1,3 @@ department-Law = Юридический отдел department-CentralCommand = Центральное командование +department-Blueshield = Синий Щит diff --git a/Resources/Maps/_Sunrise/Station/box.yml b/Resources/Maps/_Sunrise/Station/box.yml index 81769941415..e0b76d40368 100644 --- a/Resources/Maps/_Sunrise/Station/box.yml +++ b/Resources/Maps/_Sunrise/Station/box.yml @@ -10478,6 +10478,12 @@ entities: - type: Transform pos: -11.5,0.5 parent: 8364 + - uid: 9450 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,-11.5 + parent: 8364 - uid: 15493 components: - type: Transform @@ -11013,7 +11019,7 @@ entities: linkedPorts: 12469: - DoorStatus: Close -- proto: AirlockExternalGlassShuttleArrivals +- proto: AirlockExternalGlassShuttleArrivalsLocked entities: - uid: 606 components: @@ -11426,12 +11432,6 @@ entities: rot: 3.141592653589793 rad pos: -38.5,0.5 parent: 8364 - - uid: 11913 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-11.5 - parent: 8364 - uid: 11980 components: - type: Transform @@ -11838,6 +11838,12 @@ entities: parent: 8364 - proto: AirlockMaintCommandLocked entities: + - uid: 11913 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,-12.5 + parent: 8364 - uid: 14187 components: - type: Transform @@ -12125,12 +12131,6 @@ entities: rot: 1.5707963267948966 rad pos: -62.5,-13.5 parent: 8364 - - uid: 14996 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,-12.5 - parent: 8364 - uid: 15001 components: - type: Transform @@ -15544,6 +15544,11 @@ entities: - type: Transform pos: -19.5,16.5 parent: 8364 + - uid: 20939 + components: + - type: Transform + pos: -23.5,-9.5 + parent: 8364 - uid: 21210 components: - type: Transform @@ -15677,6 +15682,14 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,-27.5 parent: 8364 +- proto: BedsheetNT + entities: + - uid: 20984 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-9.5 + parent: 8364 - proto: BedsheetOrange entities: - uid: 26353 @@ -71295,6 +71308,14 @@ entities: - type: Transform pos: 29.484377,-32.156303 parent: 8364 +- proto: CurtainsBlueOpen + entities: + - uid: 20985 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-9.5 + parent: 8364 - proto: d10Dice entities: - uid: 10852 @@ -80608,6 +80629,11 @@ entities: - type: Transform pos: 20.5,4.5 parent: 8364 + - uid: 21115 + components: + - type: Transform + pos: -22.5,-9.5 + parent: 8364 - proto: DresserCaptainFilled entities: - uid: 5341 @@ -121386,6 +121412,13 @@ entities: - type: Transform pos: 5.5,-49.5 parent: 8364 +- proto: LockerBlueshieldFilledHardsuit + entities: + - uid: 14996 + components: + - type: Transform + pos: -21.5,-9.5 + parent: 8364 - proto: LockerBoozeFilled entities: - uid: 1718 @@ -125299,11 +125332,6 @@ entities: - type: Transform pos: 44.578045,-62.22757 parent: 8364 - - uid: 21798 - components: - - type: Transform - pos: -22.362862,-11.265691 - parent: 8364 - proto: PlushieRGBee entities: - uid: 5880 @@ -125741,6 +125769,12 @@ entities: - type: Transform pos: 13.5,-14.5 parent: 8364 + - uid: 17387 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-13.5 + parent: 8364 - uid: 18617 components: - type: Transform @@ -125908,11 +125942,6 @@ entities: parent: 8364 - proto: PottedPlant0 entities: - - uid: 9450 - components: - - type: Transform - pos: -23.5,-9.5 - parent: 8364 - uid: 26870 components: - type: Transform @@ -128290,6 +128319,11 @@ entities: parent: 8364 - type: ApcPowerReceiver powerLoad: 0 + - uid: 18592 + components: + - type: Transform + pos: -22.5,-9.5 + parent: 8364 - uid: 18619 components: - type: Transform @@ -128606,6 +128640,12 @@ entities: parent: 8364 - type: ApcPowerReceiver powerLoad: 0 + - uid: 20887 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-11.5 + parent: 8364 - uid: 20901 components: - type: Transform diff --git a/Resources/Maps/_Sunrise/Station/cluster.yml b/Resources/Maps/_Sunrise/Station/cluster.yml index 0b02da26b00..696b4430059 100644 --- a/Resources/Maps/_Sunrise/Station/cluster.yml +++ b/Resources/Maps/_Sunrise/Station/cluster.yml @@ -73,7 +73,7 @@ entities: version: 6 0,1: ind: 0,1 - tiles: WQAAAAACWQAAAAADWQAAAAAAYAAAAAAAYAAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAACdgAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAHQAAAAADHQAAAAAAdgAAAAADdgAAAAAAdgAAAAAAWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACeQAAAAAAHQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAACeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAdgAAAAABdgAAAAADdgAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABeQAAAAAAHQAAAAADWQAAAAAAWQAAAAABHQAAAAADdgAAAAABdgAAAAACdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAdgAAAAABdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAWQAAAAABWQAAAAABeQAAAAAAdgAAAAADdgAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAABWQAAAAADeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA + tiles: WQAAAAACWQAAAAADWQAAAAAAYAAAAAAAYAAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAACdgAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAADHQAAAAAAdgAAAAADdgAAAAAAdgAAAAAAWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAAAeQAAAAAAHQAAAAAAWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACeQAAAAAAHQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAACeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAdgAAAAABdgAAAAADdgAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABeQAAAAAAHQAAAAADWQAAAAAAWQAAAAABHQAAAAADdgAAAAABdgAAAAACdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAdgAAAAABdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAWQAAAAABWQAAAAABeQAAAAAAdgAAAAADdgAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAWQAAAAABWQAAAAADeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA version: 6 -2,0: ind: -2,0 @@ -121,7 +121,7 @@ entities: version: 6 1,1: ind: 1,1 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAADWQAAAAADeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAABeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAHQAAAAADeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAYAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAWQAAAAABWQAAAAADYAAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAADYAAAAAAAWQAAAAAAWQAAAAADYAAAAAAAHQAAAAACeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAWQAAAAADWQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAYAAAAAAAWQAAAAADWQAAAAACYAAAAAAAWQAAAAABeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAADWQAAAAADeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAABeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAHQAAAAAAHQAAAAADeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAYAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAWQAAAAABWQAAAAADYAAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAADYAAAAAAAWQAAAAAAWQAAAAADYAAAAAAAHQAAAAACeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAWQAAAAADWQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAYAAAAAAAWQAAAAADWQAAAAACYAAAAAAAWQAAAAABeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 2,0: ind: 2,0 @@ -2689,16 +2689,6 @@ entities: 997: 20,-11 998: 19,-11 1358: 31,-12 - - node: - angle: 4.71238898038469 rad - color: '#FFFFFFFF' - id: Rust - decals: - 1390: 16,22 - 1391: 15,20 - 1392: 12,20 - 1393: 17,20 - 1394: 14,21 - node: color: '#FFFFFFFF' id: StandClear @@ -3247,21 +3237,6 @@ entities: 241: -1,10 242: -1,11 1202: 44,30 - - node: - angle: 4.71238898038469 rad - color: '#69150079' - id: footprint - decals: - 1385: 12.797138,20.095083 - 1386: 13.359638,19.751333 - 1387: 13.890888,20.079458 - 1388: 14.422138,19.766958 - 1389: 12.219013,19.751333 - - node: - color: '#691500FF' - id: splatter - decals: - 1384: 12.062763,20.798208 - type: GridAtmosphere version: 2 data: @@ -4463,6 +4438,7 @@ entities: id: Cluster - type: SpreaderGrid - type: GridPathfinding + - type: NavMap - uid: 12281 components: - type: MetaData @@ -4482,20 +4458,6 @@ entities: - type: Transform pos: 3.5402613,7.6028175 parent: 1 -- proto: ActionToggleLight - entities: - - uid: 9312 - components: - - type: Transform - parent: 12532 - - type: InstantAction - container: 12532 - - uid: 9313 - components: - - type: Transform - parent: 12533 - - type: InstantAction - container: 12533 - proto: AirAlarm entities: - uid: 8049 @@ -5615,6 +5577,12 @@ 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 @@ -5954,7 +5922,7 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,45.5 parent: 1 -- proto: AirlockExternalGlassShuttleArrivals +- proto: AirlockExternalGlassShuttleArrivalsLocked entities: - uid: 1268 components: @@ -6869,14 +6837,6 @@ entities: - type: Transform pos: 33.5,24.5 parent: 1 -- proto: AirlockSecurityLocked - entities: - - uid: 7081 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,21.5 - parent: 1 - proto: AirlockServiceGlassLocked entities: - uid: 3371 @@ -7282,6 +7242,11 @@ entities: rot: -1.5707963267948966 rad pos: -30.5,24.5 parent: 1 + - uid: 10883 + components: + - type: Transform + pos: 14.5,22.5 + parent: 1 - uid: 12568 components: - type: Transform @@ -7728,6 +7693,11 @@ entities: - type: Transform pos: -20.5,-3.5 parent: 1 + - uid: 2347 + components: + - type: Transform + pos: 12.5,21.5 + parent: 1 - uid: 3482 components: - type: Transform @@ -7910,6 +7880,13 @@ entities: - type: Transform pos: -10.5,-28.5 parent: 1 +- proto: BedsheetNT + entities: + - uid: 7081 + components: + - type: Transform + pos: 12.5,21.5 + parent: 1 - proto: BedsheetOrange entities: - uid: 5441 @@ -8543,13 +8520,6 @@ entities: rot: 3.141592653589793 rad pos: 42.358097,33.58536 parent: 1 -- proto: BoxForensicPad - entities: - - uid: 9318 - components: - - type: Transform - pos: 17.503937,22.695023 - parent: 1 - proto: BoxHandcuff entities: - uid: 5308 @@ -15207,6 +15177,46 @@ entities: - type: Transform pos: -31.5,24.5 parent: 1 + - uid: 10884 + components: + - type: Transform + pos: 14.5,22.5 + parent: 1 + - uid: 10885 + components: + - type: Transform + pos: 14.5,21.5 + parent: 1 + - uid: 10886 + components: + - type: Transform + pos: 13.5,21.5 + parent: 1 + - uid: 10887 + components: + - type: Transform + pos: 12.5,21.5 + parent: 1 + - uid: 10888 + components: + - type: Transform + pos: 15.5,21.5 + parent: 1 + - uid: 10889 + components: + - type: Transform + pos: 16.5,21.5 + parent: 1 + - uid: 10890 + components: + - type: Transform + pos: 17.5,21.5 + parent: 1 + - uid: 10900 + components: + - type: Transform + pos: 16.5,22.5 + parent: 1 - uid: 12124 components: - type: Transform @@ -18974,6 +18984,16 @@ entities: - type: Transform pos: -3.5,7.5 parent: 1 + - uid: 2348 + components: + - type: Transform + pos: 19.5,21.5 + parent: 1 + - uid: 2349 + components: + - type: Transform + pos: 21.5,21.5 + parent: 1 - uid: 2849 components: - type: Transform @@ -19339,6 +19359,11 @@ entities: - type: Transform pos: 22.5,19.5 parent: 1 + - uid: 4917 + components: + - type: Transform + pos: 17.5,21.5 + parent: 1 - uid: 5101 components: - type: Transform @@ -22094,6 +22119,11 @@ entities: - type: Transform pos: -28.5,23.5 parent: 1 + - uid: 9312 + components: + - type: Transform + pos: 20.5,21.5 + parent: 1 - uid: 9736 components: - type: Transform @@ -22104,6 +22134,31 @@ entities: - type: Transform pos: -30.5,24.5 parent: 1 + - uid: 10876 + components: + - type: Transform + pos: 18.5,21.5 + parent: 1 + - uid: 10877 + components: + - type: Transform + pos: 16.5,21.5 + parent: 1 + - uid: 10878 + components: + - type: Transform + pos: 15.5,21.5 + parent: 1 + - uid: 10881 + components: + - type: Transform + pos: 14.5,21.5 + parent: 1 + - uid: 10882 + components: + - type: Transform + pos: 14.5,22.5 + parent: 1 - uid: 12123 components: - type: Transform @@ -22534,6 +22589,81 @@ entities: rot: 3.141592653589793 rad pos: -20.5,-3.5 parent: 1 + - uid: 10901 + components: + - type: Transform + pos: 15.5,23.5 + parent: 1 + - uid: 10902 + components: + - type: Transform + pos: 15.5,22.5 + parent: 1 + - uid: 10903 + components: + - type: Transform + pos: 16.5,23.5 + parent: 1 + - uid: 10919 + components: + - type: Transform + pos: 16.5,22.5 + parent: 1 + - uid: 10920 + components: + - type: Transform + pos: 17.5,23.5 + parent: 1 + - uid: 10921 + components: + - type: Transform + pos: 17.5,22.5 + parent: 1 + - uid: 10924 + components: + - type: Transform + pos: 16.5,21.5 + parent: 1 + - uid: 11645 + components: + - type: Transform + pos: 15.5,21.5 + parent: 1 + - uid: 11646 + components: + - type: Transform + pos: 14.5,21.5 + parent: 1 + - uid: 11796 + components: + - type: Transform + pos: 14.5,20.5 + parent: 1 + - uid: 11805 + components: + - 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 + pos: 13.5,20.5 + parent: 1 + - uid: 12057 + components: + - type: Transform + pos: 13.5,21.5 + parent: 1 + - uid: 12112 + components: + - type: Transform + pos: 17.5,21.5 + parent: 1 - proto: CarpetGreen entities: - uid: 3833 @@ -25967,12 +26097,6 @@ entities: rot: -1.5707963267948966 rad pos: -28.5,11.5 parent: 1 - - uid: 11796 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,21.5 - parent: 1 - proto: ChairCursed entities: - uid: 8763 @@ -26464,12 +26588,6 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,-16.5 parent: 1 - - uid: 9315 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,21.5 - parent: 1 - uid: 9385 components: - type: Transform @@ -26482,6 +26600,12 @@ entities: rot: 1.5707963267948966 rad pos: 17.5,25.5 parent: 1 + - uid: 10875 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.505962,22.519814 + parent: 1 - uid: 11749 components: - type: Transform @@ -27484,13 +27608,6 @@ entities: - type: Transform pos: -40.469826,-20.531178 parent: 1 -- proto: ClothingHandsGlovesColorBlack - entities: - - uid: 9319 - components: - - type: Transform - pos: 17.503937,23.273148 - parent: 1 - proto: ClothingHandsGlovesColorPurple entities: - uid: 3056 @@ -27658,13 +27775,6 @@ entities: - type: Transform pos: -22.500423,-8.478397 parent: 1 -- proto: ClothingMaskGasSecurity - entities: - - uid: 9321 - components: - - type: Transform - pos: 17.53083,23.601284 - parent: 1 - proto: ClothingMaskSterile entities: - uid: 5349 @@ -27895,18 +28005,6 @@ entities: - type: Transform pos: -19.507818,-48.36427 parent: 1 -- proto: ClothingShoesBootsJack - entities: - - uid: 9320 - components: - - type: Transform - pos: 15.556145,23.521154 - parent: 1 - - uid: 9497 - components: - - type: Transform - pos: 15.337395,23.69303 - parent: 1 - proto: ClothingShoesBootsMag entities: - uid: 4922 @@ -28106,6 +28204,12 @@ entities: rot: 3.141592653589793 rad pos: -8.5,5.5 parent: 1 + - uid: 2378 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,22.5 + parent: 1 - uid: 4074 components: - type: Transform @@ -28128,6 +28232,12 @@ entities: - type: Transform pos: 28.5,18.5 parent: 1 + - uid: 9314 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,22.5 + parent: 1 - proto: ComputerFrame entities: - uid: 2685 @@ -28323,6 +28433,11 @@ entities: - type: Transform pos: 26.5,14.5 parent: 1 + - uid: 9313 + components: + - type: Transform + pos: 16.5,23.5 + parent: 1 - proto: ComputerTechnologyDiskTerminal entities: - uid: 3822 @@ -28874,6 +28989,13 @@ entities: - type: Transform pos: -41.5,-23.5 parent: 1 +- proto: CurtainsBlueOpen + entities: + - uid: 2350 + components: + - type: Transform + pos: 12.5,21.5 + parent: 1 - proto: d20Dice entities: - uid: 5591 @@ -29187,6 +29309,18 @@ entities: - type: Transform pos: -3.5,-22.5 parent: 1 +- proto: DefaultStationBeaconUnanchored + entities: + - uid: 12380 + components: + - type: Transform + pos: 15.520857,21.423676 + parent: 1 + - type: NavMapBeacon + color: '#00378993' + text: Офис ОСЩ + - type: WarpPoint + location: Офис ОСЩ - proto: DefaultStationBeaconVault entities: - uid: 12642 @@ -32554,6 +32688,13 @@ entities: - type: Transform pos: 5.5,29.5 parent: 1 +- proto: Dresser + entities: + - uid: 2352 + components: + - type: Transform + pos: 12.5,20.5 + parent: 1 - proto: Drill entities: - uid: 9639 @@ -36033,44 +36174,6 @@ entities: - type: Transform pos: -21.477749,-28.757965 parent: 1 - - uid: 12532 - components: - - type: Transform - pos: 16.59333,23.726284 - parent: 1 - - type: HandheldLight - toggleActionEntity: 9312 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 9312 - - type: ActionsContainer - - uid: 12533 - components: - - type: Transform - pos: 16.59333,23.476284 - parent: 1 - - type: HandheldLight - toggleActionEntity: 9313 - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - actions: !type:Container - showEnts: False - occludes: True - ents: - - 9313 - - type: ActionsContainer - proto: Floodlight entities: - uid: 7307 @@ -54173,6 +54276,21 @@ entities: - type: Transform pos: -44.5,0.5 parent: 1 + - uid: 9316 + components: + - type: Transform + pos: 16.5,19.5 + parent: 1 + - uid: 9317 + components: + - type: Transform + pos: 15.5,19.5 + parent: 1 + - uid: 9318 + components: + - type: Transform + pos: 14.5,19.5 + parent: 1 - uid: 10442 components: - type: Transform @@ -55704,14 +55822,6 @@ entities: - type: Transform pos: -27.397102,-5.3872204 parent: 1 -- proto: LightBulbBroken - entities: - - uid: 12623 - components: - - type: Transform - parent: 12622 - - type: Physics - canCollide: False - proto: LightReplacer entities: - uid: 7668 @@ -55731,6 +55841,13 @@ entities: - type: Transform pos: 32.5,-16.5 parent: 1 +- proto: LockerBlueshieldFilledHardsuit + entities: + - uid: 9307 + components: + - type: Transform + pos: 17.5,20.5 + parent: 1 - proto: LockerBooze entities: - uid: 8297 @@ -56438,11 +56555,6 @@ entities: parent: 1 - proto: MaintenanceFluffSpawner entities: - - uid: 5408 - components: - - type: Transform - pos: 13.5,21.5 - parent: 1 - uid: 8830 components: - type: Transform @@ -59059,6 +59171,11 @@ entities: - type: Transform pos: -24.5,24.5 parent: 1 + - uid: 2353 + components: + - type: Transform + pos: 16.5,23.5 + parent: 1 - uid: 3918 components: - type: Transform @@ -60307,6 +60424,12 @@ entities: parent: 1 - type: ApcPowerReceiver powerLoad: 0 + - uid: 9311 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,20.5 + parent: 1 - uid: 11929 components: - type: Transform @@ -60512,20 +60635,6 @@ entities: rot: 1.5707963267948966 rad pos: -42.5,-23.5 parent: 1 - - uid: 12622 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,20.5 - parent: 1 - - type: ContainerContainer - containers: - light_bulb: !type:ContainerSlot - showEnts: False - occludes: True - ent: 12623 - - type: ApcPowerReceiver - powerLoad: 0 - proto: Protolathe entities: - uid: 3806 @@ -60744,11 +60853,6 @@ entities: - type: Transform pos: 20.5,-18.5 parent: 1 - - uid: 9316 - components: - - type: Transform - pos: 15.5,23.5 - parent: 1 - uid: 9323 components: - type: Transform @@ -62289,12 +62393,6 @@ entities: - type: Transform pos: -22.5,-28.5 parent: 1 - - uid: 12617 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,20.5 - parent: 1 - proto: RandomVending entities: - uid: 7525 @@ -64160,6 +64258,18 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,36.5 parent: 1 + - uid: 2345 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,19.5 + parent: 1 + - uid: 2346 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,19.5 + parent: 1 - uid: 2363 components: - type: Transform @@ -64184,6 +64294,12 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,37.5 parent: 1 + - uid: 2380 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,19.5 + parent: 1 - uid: 2398 components: - type: Transform @@ -64618,14 +64734,6 @@ entities: - type: Transform pos: 5.5,-4.5 parent: 1 -- proto: ShardGlass - entities: - - uid: 9317 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.797138,20.579458 - parent: 1 - proto: SheetGlass entities: - uid: 3166 @@ -66176,14 +66284,6 @@ entities: - type: Transform pos: -3.5,17.5 parent: 1 -- proto: SignInterrogation - entities: - - uid: 9307 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,20.5 - parent: 1 - proto: SignJanitor entities: - uid: 7181 @@ -69277,11 +69377,6 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,-4.5 parent: 1 - - uid: 9311 - components: - - type: Transform - pos: 13.5,21.5 - parent: 1 - uid: 9324 components: - type: Transform @@ -69637,6 +69732,11 @@ entities: - type: Transform pos: -1.5,25.5 parent: 1 + - uid: 5408 + components: + - type: Transform + pos: 15.5,23.5 + parent: 1 - uid: 6064 components: - type: Transform @@ -69652,16 +69752,6 @@ entities: - type: Transform pos: 17.5,23.5 parent: 1 - - uid: 12614 - components: - - type: Transform - pos: 16.5,23.5 - parent: 1 - - uid: 12615 - components: - - type: Transform - pos: 17.5,22.5 - parent: 1 - proto: TableWood entities: - uid: 165 @@ -76412,6 +76502,42 @@ entities: rot: -1.5707963267948966 rad pos: -30.5,23.5 parent: 1 + - uid: 9315 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,19.5 + parent: 1 + - uid: 9319 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,23.5 + parent: 1 + - uid: 9320 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,22.5 + parent: 1 + - uid: 9321 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,20.5 + parent: 1 + - uid: 9497 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,19.5 + parent: 1 + - uid: 9661 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,19.5 + parent: 1 - uid: 9663 components: - type: Transform @@ -76422,6 +76548,18 @@ entities: - type: Transform pos: 26.5,28.5 parent: 1 + - uid: 10863 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,19.5 + parent: 1 + - uid: 10864 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,19.5 + parent: 1 - uid: 12292 components: - type: Transform @@ -79162,60 +79300,6 @@ entities: rot: 3.141592653589793 rad pos: 38.5,31.5 parent: 1 - - uid: 2344 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,19.5 - parent: 1 - - uid: 2345 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,19.5 - parent: 1 - - uid: 2346 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,19.5 - parent: 1 - - uid: 2347 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,19.5 - parent: 1 - - uid: 2348 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,19.5 - parent: 1 - - uid: 2349 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,19.5 - parent: 1 - - uid: 2350 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,20.5 - parent: 1 - - uid: 2352 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,22.5 - parent: 1 - - uid: 2353 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,23.5 - parent: 1 - uid: 2354 components: - type: Transform @@ -79276,18 +79360,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,28.5 parent: 1 - - uid: 2378 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,19.5 - parent: 1 - - uid: 2380 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,19.5 - parent: 1 - uid: 2418 components: - type: Transform @@ -80715,12 +80787,6 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,20.5 parent: 1 - - uid: 4917 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,21.5 - parent: 1 - proto: WindowFrostedDirectional entities: - uid: 312 @@ -80905,11 +80971,4 @@ entities: - type: Transform pos: -28.522102,-7.4028454 parent: 1 -- proto: ZiptiesBroken - entities: - - uid: 9314 - components: - - type: Transform - pos: 12.522411,21.40144 - parent: 1 ... diff --git a/Resources/Maps/_Sunrise/Station/delta.yml b/Resources/Maps/_Sunrise/Station/delta.yml index c8c792f6de7..55113df321d 100644 --- a/Resources/Maps/_Sunrise/Station/delta.yml +++ b/Resources/Maps/_Sunrise/Station/delta.yml @@ -15377,7 +15377,8 @@ entities: 18,8: 1: 242 19,4: - 0: 255 + 0: 223 + 7: 32 1: 61440 19,5: 0: 30576 @@ -15996,6 +15997,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: OccluderTree - type: Shuttle @@ -23020,7 +23036,7 @@ entities: linkedPorts: 508: - DoorStatus: DoorBolt -- proto: AirlockExternalGlassShuttleArrivals +- proto: AirlockExternalGlassShuttleArrivalsLocked entities: - uid: 1705 components: @@ -107715,13 +107731,6 @@ entities: - type: Transform pos: 9.5,67.5 parent: 13307 -- proto: CrateTrackingImplants - entities: - - uid: 4517 - components: - - type: Transform - pos: 77.5,17.5 - parent: 13307 - proto: CrateTrashCart entities: - uid: 4241 @@ -120642,7 +120651,7 @@ entities: pos: 62.5,-40.5 parent: 13307 - type: Door - secondsUntilStateChange: -16963.768 + secondsUntilStateChange: -17004.068 state: Opening - uid: 43264 components: @@ -123255,7 +123264,7 @@ entities: pos: -30.5,70.5 parent: 13307 - type: Door - secondsUntilStateChange: -13494.968 + secondsUntilStateChange: -13535.268 state: Closing - uid: 17804 components: @@ -123337,7 +123346,7 @@ entities: pos: -19.5,21.5 parent: 13307 - type: Door - secondsUntilStateChange: -30310.467 + secondsUntilStateChange: -30350.768 state: Closing - uid: 19168 components: @@ -189601,6 +189610,13 @@ entities: showEnts: False occludes: True ent: null +- proto: LockerBlueshieldFilledHardsuit + entities: + - uid: 4517 + components: + - type: Transform + pos: 79.5,12.5 + parent: 13307 - proto: LockerBooze entities: - uid: 25510 @@ -271901,7 +271917,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -2672.6306 + secondsUntilStateChange: -2712.9304 state: Opening - uid: 38432 components: diff --git a/Resources/Maps/_Sunrise/Station/fland.yml b/Resources/Maps/_Sunrise/Station/fland.yml index d89e8b971f9..f01c5909c76 100644 --- a/Resources/Maps/_Sunrise/Station/fland.yml +++ b/Resources/Maps/_Sunrise/Station/fland.yml @@ -18918,7 +18918,7 @@ entities: rot: 3.141592653589793 rad pos: 57.5,69.5 parent: 13329 -- proto: AirlockExternalGlassShuttleArrivals +- proto: AirlockExternalGlassShuttleArrivalsLocked entities: - uid: 2869 components: @@ -93150,29 +93150,6 @@ entities: - 0 - proto: ClosetSteelBase entities: - - uid: 1978 - components: - - type: Transform - pos: -11.5,2.5 - parent: 13329 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1495 - moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 10901 components: - type: Transform @@ -96370,12 +96347,6 @@ entities: parent: 13329 - proto: ComputerMedicalRecords entities: - - uid: 1981 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,0.5 - parent: 13329 - uid: 9648 components: - type: Transform @@ -96628,6 +96599,12 @@ entities: parent: 13329 - proto: ComputerSurveillanceCameraMonitor entities: + - uid: 1981 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,0.5 + parent: 13329 - uid: 2214 components: - type: Transform @@ -99283,6 +99260,13 @@ entities: - type: Transform pos: 29.5,11.5 parent: 13329 +- proto: Defibrillator + entities: + - uid: 34917 + components: + - type: Transform + pos: -8.584216,-1.2567174 + parent: 13329 - proto: DefibrillatorCabinetFilled entities: - uid: 11850 @@ -110376,7 +110360,7 @@ entities: pos: -8.5,2.5 parent: 13329 - type: FaxMachine - name: Command Checkpoint + name: Blueshield office - uid: 4540 components: - type: Transform @@ -161976,6 +161960,13 @@ entities: - type: Transform pos: 74.5,-26.5 parent: 13329 +- proto: LockerBlueshieldFilledHardsuit + entities: + - uid: 1978 + components: + - type: Transform + pos: -11.5,2.5 + parent: 13329 - proto: LockerBoozeFilled entities: - uid: 1190 @@ -164639,6 +164630,11 @@ entities: - type: Transform pos: 27.429628,62.500965 parent: 13329 + - uid: 34916 + components: + - type: Transform + pos: -8.334216,-1.5798585 + parent: 13329 - proto: MedkitFilled entities: - uid: 4719 @@ -167125,6 +167121,11 @@ entities: - type: Transform pos: 14.5,-18.5 parent: 13329 + - uid: 13696 + components: + - type: Transform + pos: -7.5,-2.5 + parent: 13329 - uid: 26098 components: - type: Transform @@ -167135,6 +167136,11 @@ entities: - type: Transform pos: 53.5,-4.5 parent: 13329 + - uid: 29621 + components: + - type: Transform + pos: -12.5,2.5 + parent: 13329 - uid: 30077 components: - type: Transform @@ -176145,11 +176151,6 @@ entities: - type: Transform pos: -10.5,-11.5 parent: 13329 - - uid: 13696 - components: - - type: Transform - pos: -12.5,2.5 - parent: 13329 - uid: 29615 components: - type: Transform @@ -176175,11 +176176,6 @@ entities: - type: Transform pos: 15.5,1.5 parent: 13329 - - uid: 29621 - components: - - type: Transform - pos: -7.5,-2.5 - parent: 13329 - uid: 29622 components: - type: Transform diff --git a/Resources/Maps/_Sunrise/Station/marathon.yml b/Resources/Maps/_Sunrise/Station/marathon.yml index e2d95a29d57..c3dfffa6f25 100644 --- a/Resources/Maps/_Sunrise/Station/marathon.yml +++ b/Resources/Maps/_Sunrise/Station/marathon.yml @@ -104,7 +104,7 @@ entities: version: 6 -3,0: ind: -3,0 - tiles: AAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAACAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAHwAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAHwAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAABHwAAAAADHwAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADHwAAAAAAHwAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAHwAAAAAAXQAAAAABbQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABfgAAAAAAHwAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABbQAAAAAAfgAAAAAA + tiles: AAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAACAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAHwAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAHwAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAABHwAAAAADHwAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADHwAAAAAAHwAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAHwAAAAAAXQAAAAABbQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABfgAAAAAAHwAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABbQAAAAAAfgAAAAAA version: 6 -3,1: ind: -3,1 @@ -849,6 +849,11 @@ entities: 2397: 2,-9 2398: 2,-10 2399: 2,-11 + - node: + color: '#0024C7FF' + id: BrickTileSteelCornerNe + decals: + 3189: -39,11 - node: color: '#9FED5896' id: BrickTileSteelCornerNe @@ -867,6 +872,11 @@ entities: decals: 2449: -62,-24 2643: -25,11 + - node: + color: '#0024C7FF' + id: BrickTileSteelCornerNw + decals: + 3190: -43,11 - node: color: '#9FED5896' id: BrickTileSteelCornerNw @@ -885,6 +895,11 @@ entities: decals: 2450: -63,-24 2642: -27,11 + - node: + color: '#0024C7FF' + id: BrickTileSteelCornerSe + decals: + 3191: -39,9 - node: color: '#9FED5896' id: BrickTileSteelCornerSe @@ -902,6 +917,11 @@ entities: decals: 2451: -62,-25 2644: -25,7 + - node: + color: '#0024C7FF' + id: BrickTileSteelCornerSw + decals: + 3192: -43,9 - node: color: '#9FED5896' id: BrickTileSteelCornerSw @@ -955,6 +975,11 @@ entities: decals: 1712: -56,-55 1713: -56,-52 + - node: + color: '#0024C7FF' + id: BrickTileSteelLineE + decals: + 3200: -39,10 - node: color: '#9FED5896' id: BrickTileSteelLineE @@ -976,6 +1001,13 @@ entities: 2649: -25,8 2650: -25,9 2651: -25,10 + - node: + color: '#0024C7FF' + id: BrickTileSteelLineN + decals: + 3197: -42,11 + 3198: -41,11 + 3199: -40,11 - node: color: '#334E6DC8' id: BrickTileSteelLineN @@ -1001,6 +1033,13 @@ entities: 1668: 26,32 1703: -62,-61 2652: -26,11 + - node: + color: '#0024C7FF' + id: BrickTileSteelLineS + decals: + 3193: -42,9 + 3194: -41,9 + 3195: -40,9 - node: color: '#9FED5896' id: BrickTileSteelLineS @@ -1014,6 +1053,11 @@ entities: 1666: -27,24 1747: 8,-18 2648: -26,7 + - node: + color: '#0024C7FF' + id: BrickTileSteelLineW + decals: + 3196: -43,10 - node: color: '#9FED5896' id: BrickTileSteelLineW @@ -2601,7 +2645,6 @@ entities: 188: -37,41 479: -19,-4 480: 13,19 - 481: -38,10 680: -1,-34 1083: -19,0 2189: -3,-37 @@ -2858,11 +2901,6 @@ entities: color: '#DE3A3A96' id: HalfTileOverlayGreyscale decals: - 40: -39,11 - 41: -40,11 - 42: -41,11 - 43: -42,11 - 44: -43,11 124: -31,54 125: -32,54 126: -33,54 @@ -3095,11 +3133,6 @@ entities: color: '#DE3A3A96' id: HalfTileOverlayGreyscale180 decals: - 45: -39,9 - 46: -40,9 - 47: -41,9 - 48: -42,9 - 49: -43,9 120: -31,46 121: -32,46 122: -34,46 @@ -3216,7 +3249,6 @@ entities: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 decals: - 52: -43,10 129: -36,47 130: -36,48 131: -36,49 @@ -3330,7 +3362,6 @@ entities: color: '#DE3A3A96' id: HalfTileOverlayGreyscale90 decals: - 53: -39,10 136: -30,47 137: -30,48 138: -30,49 @@ -3683,7 +3714,6 @@ entities: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale decals: - 50: -43,9 144: -30,52 286: -50,53 292: -52,50 @@ -3895,7 +3925,6 @@ entities: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale180 decals: - 54: -39,11 146: -36,48 161: -27,52 207: -31,44 @@ -4085,7 +4114,6 @@ entities: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale270 decals: - 51: -43,11 145: -30,48 162: -36,56 163: -36,57 @@ -4337,7 +4365,6 @@ entities: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale90 decals: - 55: -39,9 143: -36,52 160: -27,48 164: -38,49 @@ -9554,6 +9581,12 @@ 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 @@ -10082,7 +10115,7 @@ entities: - type: Transform pos: -63.5,-20.5 parent: 30 -- proto: AirlockExternalGlassShuttleArrivals +- proto: AirlockExternalGlassShuttleArrivalsLocked entities: - uid: 1299 components: @@ -10827,7 +10860,7 @@ entities: pos: -27.5,18.5 parent: 30 - type: Door - secondsUntilStateChange: -46.86354 + secondsUntilStateChange: -466.44614 state: Opening - type: DeviceLinkSource lastSignals: @@ -11524,12 +11557,6 @@ entities: - type: Transform pos: -29.5,55.5 parent: 30 - - uid: 14472 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -37.5,10.5 - parent: 30 - uid: 14473 components: - type: Transform @@ -13849,6 +13876,11 @@ entities: parent: 30 - proto: Bed entities: + - uid: 1088 + components: + - type: Transform + pos: -38.5,11.5 + parent: 30 - uid: 1765 components: - type: Transform @@ -14063,6 +14095,13 @@ entities: - type: Transform pos: -50.5,50.5 parent: 30 +- proto: BedsheetNT + entities: + - uid: 14508 + components: + - type: Transform + pos: -38.5,11.5 + parent: 30 - proto: BedsheetOrange entities: - uid: 1770 @@ -48771,6 +48810,12 @@ entities: rot: -1.5707963267948966 rad pos: -31.5,39.5 parent: 30 + - uid: 1084 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -41.57122,10.526241 + parent: 30 - uid: 1514 components: - type: Transform @@ -53306,6 +53351,12 @@ entities: parent: 30 - proto: ComputerCrewMonitoring entities: + - uid: 1056 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -42.5,9.5 + parent: 30 - uid: 1446 components: - type: Transform @@ -54722,6 +54773,13 @@ entities: - type: Transform pos: -33.36232,-13.359482 parent: 30 +- proto: CurtainsBlueOpen + entities: + - uid: 14509 + components: + - type: Transform + pos: -38.5,11.5 + parent: 30 - proto: d20Dice entities: - uid: 19470 @@ -55124,6 +55182,13 @@ entities: - type: Transform pos: -42.5,47.5 parent: 30 +- proto: Defibrillator + entities: + - uid: 1060 + components: + - type: Transform + pos: -39.48535,11.630478 + parent: 30 - proto: DefibrillatorCabinetFilled entities: - uid: 3167 @@ -55184,6 +55249,11 @@ entities: - type: Physics canCollide: False bodyType: Static + - uid: 1085 + components: + - type: Transform + pos: -40.680595,8.493579 + parent: 30 - uid: 3657 components: - type: Transform @@ -64169,11 +64239,6 @@ entities: - type: Transform pos: -51.51732,-55.39225 parent: 30 - - uid: 22220 - components: - - type: Transform - pos: -39.56788,9.504957 - parent: 30 - uid: 22221 components: - type: Transform @@ -90009,21 +90074,11 @@ entities: - type: Transform pos: -41.5,8.5 parent: 30 - - uid: 1056 - components: - - type: Transform - pos: -37.5,11.5 - parent: 30 - uid: 1062 components: - type: Transform pos: -39.5,8.5 parent: 30 - - uid: 1063 - components: - - type: Transform - pos: -37.5,9.5 - parent: 30 - uid: 1065 components: - type: Transform @@ -98764,6 +98819,13 @@ entities: - 0 - 0 - 0 +- proto: LockerBlueshieldFilledHardsuit + entities: + - uid: 1052 + components: + - type: Transform + pos: -38.5,9.5 + parent: 30 - proto: LockerBoozeFilled entities: - uid: 451 @@ -99818,29 +99880,6 @@ entities: - 0 - proto: LockerSecurityFilled entities: - - uid: 1072 - components: - - type: Transform - pos: -38.5,11.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 2079 components: - type: Transform @@ -100449,6 +100488,13 @@ entities: - type: Transform pos: -51.477226,53.661713 parent: 30 +- proto: MedkitCombatFilled + entities: + - uid: 1069 + components: + - type: Transform + pos: -39.594727,11.489756 + parent: 30 - proto: MedkitFilled entities: - uid: 1560 @@ -101311,21 +101357,6 @@ entities: parent: 30 - proto: Paper entities: - - uid: 1086 - components: - - type: Transform - pos: -39.59503,11.639032 - parent: 30 - - uid: 1087 - components: - - type: Transform - pos: -39.548157,11.592157 - parent: 30 - - uid: 1088 - components: - - type: Transform - pos: -39.485657,11.529657 - parent: 30 - uid: 1528 components: - type: Transform @@ -101637,11 +101668,6 @@ entities: parent: 30 - proto: Pen entities: - - uid: 1089 - components: - - type: Transform - pos: -39.298157,11.732782 - parent: 30 - uid: 1404 components: - type: Transform @@ -102445,6 +102471,16 @@ entities: parent: 30 - proto: PosterLegitNanotrasenLogo entities: + - uid: 723 + components: + - type: Transform + pos: -42.5,12.5 + parent: 30 + - uid: 1059 + components: + - type: Transform + pos: -37.5,9.5 + parent: 30 - uid: 2419 components: - type: Transform @@ -102932,14 +102968,6 @@ entities: - type: ContainerContainer containers: stash: !type:ContainerSlot {} - - uid: 1075 - components: - - type: Transform - pos: -42.5,9.5 - parent: 30 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot {} - uid: 1522 components: - type: Transform @@ -108831,11 +108859,6 @@ entities: - type: Transform pos: -41.5,12.5 parent: 30 - - uid: 1053 - components: - - type: Transform - pos: -37.5,11.5 - parent: 30 - uid: 1054 components: - type: Transform @@ -108846,11 +108869,6 @@ entities: - type: Transform pos: -39.5,12.5 parent: 30 - - uid: 1060 - components: - - type: Transform - pos: -37.5,9.5 - parent: 30 - uid: 1061 components: - type: Transform @@ -113468,11 +113486,6 @@ entities: - Pressed: Toggle 3405: - Pressed: Toggle - - uid: 723 - components: - - type: Transform - pos: -39.5,9.5 - parent: 30 - uid: 3598 components: - type: MetaData @@ -119642,21 +119655,6 @@ entities: - type: Transform pos: 27.5,-7.5 parent: 30 - - uid: 1068 - components: - - type: Transform - pos: -39.5,9.5 - parent: 30 - - uid: 1069 - components: - - type: Transform - pos: -41.5,9.5 - parent: 30 - - uid: 1085 - components: - - type: Transform - pos: -39.5,11.5 - parent: 30 - uid: 1282 components: - type: Transform @@ -121012,6 +121010,18 @@ entities: - type: Transform pos: -40.5,8.5 parent: 30 + - uid: 1072 + components: + - type: Transform + 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 @@ -123860,6 +123870,18 @@ entities: - type: Transform pos: -42.5,12.5 parent: 30 + - uid: 1053 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -37.5,11.5 + parent: 30 + - uid: 1075 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -37.5,9.5 + parent: 30 - uid: 1081 components: - type: Transform @@ -138524,13 +138546,11 @@ entities: parent: 30 - proto: WeaponCapacitorRecharger entities: - - uid: 1084 + - uid: 1087 components: - type: Transform - pos: -41.5,9.5 + pos: -39.5,9.5 parent: 30 - - type: Physics - canCollide: False - uid: 1924 components: - type: Transform @@ -139032,6 +139052,28 @@ entities: - type: Transform pos: -13.5,16.5 parent: 30 + - uid: 1063 + components: + - type: Transform + pos: -40.5,8.5 + parent: 30 + - uid: 1068 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -40.5,12.5 + parent: 30 + - uid: 14472 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -40.5,8.5 + parent: 30 + - uid: 14507 + components: + - type: Transform + pos: -40.5,12.5 + parent: 30 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 5409 @@ -139083,17 +139125,6 @@ entities: parent: 30 - proto: WindoorSecureSecurityLocked entities: - - uid: 1052 - components: - - type: Transform - pos: -40.5,12.5 - parent: 30 - - uid: 1059 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -40.5,8.5 - parent: 30 - uid: 1746 components: - type: Transform diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 2cece1cb2a9..7962cd7fbe9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -273,9 +273,6 @@ - id: ClothingOuterCoatHoSGreatcoat - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat -# - id: ClothingShoeSlippersDuck: Need more space for style -# prob: 0.2 - - id: WeaponEnergyGunMultiphase # Sunrise-AEG - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - id: ClothingEyesGlassesSecurity @@ -315,7 +312,6 @@ - id: BoxEncryptionKeySecurity - id: HoloprojectorSecurity - id: BookSecretDocuments - - id: WeaponEnergyGunMultiphase # Sunrise-AEG - type: entity id: LockerFreezerVaultFilled diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 75ef23e420f..ad5f56a443e 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -207,19 +207,6 @@ stealGroup: BookSecretDocuments owner: job-name-hos -- type: entity # Sunrise-AEG - parent: BaseTraitorStealObjective - id: MultiphaseEnergygunStealObjective - components: - - type: Objective - # hos has a gun ce does not, higher difficulty than most - difficulty: 3 - - type: NotJobRequirement - job: HeadOfSecurity - - type: StealCondition - stealGroup: WeaponEnergyGunMultiphase - owner: job-name-hos - ## ce - type: entity diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml index 355f04e11e8..38c32e942fd 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml @@ -7,3 +7,28 @@ containers: item: - CombatKnife + +- type: entity + id: ClothingBeltBlueShieldWebbingFilled + parent: ClothingBeltBlueShieldWebbing + suffix: Filled + components: + - type: StorageFill + contents: + - id: Handcuffs + - id: Handcuffs + - id: Stunbaton + - id: GrenadeFlashBang + - id: TearGasGrenade + - id: MedkitCombatFilled + + +- type: entity + id: ClothingShoesBootsBlueShieldFilled + parent: ClothingShoesBootsBlueShield + suffix: Filled + components: + - type: ContainerFill + containers: + item: + - CombatKnife diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/blueshield.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/blueshield.yml new file mode 100644 index 00000000000..6a3e01c8019 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/blueshield.yml @@ -0,0 +1,18 @@ +- type: entity + id: LockerBlueshieldFilledHardsuit + suffix: Filled, Hardsuit + parent: LockerBlueshield + components: + - type: StorageFill + contents: + - id: PinpointerNuclear + - id: WeaponDisabler + - id: ClothingHeadsetAltCommand + - id: SpaceCash1000 + - id: CigarGoldCase + prob: 0.25 + - id: TrackingImplanter + amount: 4 + - id: ClothingOuterHardsuitBlueshield + - id: OxygenTankFilled + - id: WeaponEnergyGunMultiphase diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml index 51272af0ad4..ec0f1118dcc 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml @@ -4,12 +4,12 @@ name: army backpack description: A spacious backpack with lots of pockets, worn by military structures. components: - - type: Sprite - sprite: _Sunrise/Back/Backpacks/military.rsi - - type: Storage - grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - type: Sprite + sprite: _Sunrise/Back/Backpacks/military.rsi + - type: Storage + grid: + - 0,0,6,3 # TODO: Change this + maxItemSize: Huge - type: entity parent: ClothingBackpack @@ -17,12 +17,12 @@ name: death squadron backpack description: A spacious backpack using bluespace technology. components: - - type: Sprite - sprite: _Sunrise/Back/Backpacks/deathsquad-backpack.rsi - - type: Storage - grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - type: Sprite + sprite: _Sunrise/Back/Backpacks/deathsquad-backpack.rsi + - type: Storage + grid: + - 0,0,6,3 # TODO: Change this + maxItemSize: Huge - type: entity parent: ClothingBackpack @@ -30,5 +30,14 @@ name: chief engineer backpack description: Technicially progressive backpack. components: - - type: Sprite - sprite: _Sunrise/Back/Backpacks/ce.rsi + - type: Sprite + sprite: _Sunrise/Back/Backpacks/ce.rsi + +- type: entity + parent: ClothingBackpack + id: ClothingBackpackBlueShield + name: рюкзак офицера «синий щит» + description: На стиле. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Back/Backpacks/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml index b47125c9397..4f612730b02 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml @@ -4,12 +4,12 @@ name: army duffel bag description: A large duffel bag for holding any army goods. components: - - type: Sprite - sprite: _Sunrise/Back/Duffels/military.rsi - - type: Storage - grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - type: Sprite + sprite: _Sunrise/Back/Duffels/military.rsi + - type: Storage + grid: + - 0,0,6,3 # TODO: Change this + maxItemSize: Huge - type: entity parent: ClothingBackpackDuffel @@ -17,5 +17,14 @@ name: chief engineer duffel bag description: A large duffel bag for all instruments you need to create singularity. components: - - type: Sprite - sprite: _Sunrise/Back/Duffels/ce.rsi + - type: Sprite + sprite: _Sunrise/Back/Duffels/ce.rsi + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelBlueShield + name: вещмешок офицера «синий щит» + description: На стиле. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Back/Duffels/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml index 5c182dd267f..5c03b86292c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml @@ -4,12 +4,12 @@ name: army satchel description: A tactical satchel for army related needs. components: - - type: Sprite - sprite: _Sunrise/Back/Satchels/military.rsi - - type: Storage - grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - type: Sprite + sprite: _Sunrise/Back/Satchels/military.rsi + - type: Storage + grid: + - 0,0,6,3 # TODO: Change this + maxItemSize: Huge - type: entity parent: ClothingBackpackSatchel @@ -17,5 +17,14 @@ name: chief engineer satchel description: A white satchel for best engineers. components: - - type: Sprite - sprite: _Sunrise/Back/Satchels/ce.rsi + - type: Sprite + sprite: _Sunrise/Back/Satchels/ce.rsi + +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelBlueShield + name: сумка офицера «синий щит» + description: На стиле. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Back/Satchels/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml new file mode 100644 index 00000000000..824362c3153 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltBlueShieldWebbing + name: рпс офицера «синий щит» + description: Голубой?! + components: + - type: Sprite + sprite: _Sunrise/Clothing/Belt/blueshield_webbing.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Belt/blueshield_webbing.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml index f25c2fdd953..bc8f5596c27 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml @@ -19,3 +19,29 @@ sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi - type: Clothing sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesBlueShield + name: очки офицера «синий щит» + description: Инновационные синие линзы скрывают глаза от световых вспышек и имеют встроенный визор. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi + - type: FlashImmunity + - type: ShowJobIcons + - type: ShowMindShieldIcons + - type: ShowCriminalRecordIcons + - type: ShowHealthBars + damageContainers: + - Biological + - type: ShowHealthIcons + damageContainers: + - Biological + - type: Tag + tags: + - HudMedical + - type: EyeProtection + protectionTime: 5 diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml index 22172f8352b..2d6dd61e103 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml @@ -39,3 +39,28 @@ Shock: 0.1 Cold: 0.2 Radiation: 0.2 + +# Blueshield Hardsuit + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitBlueshield + noSpawn: true + name: шлем скафандра офицера «синий щит» + description: Синий. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/hardsuits/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/hardsuits/blueshield.rsi + - type: PointLight + color: "#adeeff" + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml index f971c948c3d..73762eaff00 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml @@ -85,3 +85,14 @@ sprite: _Sunrise/Clothing/Head/Hats/caphat.rsi - type: Clothing sprite: _Sunrise/Clothing/Head/Hats/caphat.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretBlueShield + name: берет офицера «синий щит» + description: Синий. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/Hats/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/Hats/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml index 49bb67a5822..b04c5cdd13f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml @@ -17,3 +17,25 @@ Heat: 0.5 - type: ExplosionResistance damageCoefficient: 0.65 + +- type: entity + parent: ClothingOuterArmorBasic + id: ClothingOuterArmorBlueShield + name: бронежилет офицера «синий щит» + description: Синий и прочный. + components: + - type: Sprite + sprite: _Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.7 + - type: ExplosionResistance + damageCoefficient: 0.80 + - type: Item + size: Normal diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml index 9eba9f5df70..f2a4d2c3ebb 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -30,3 +30,33 @@ damageCoefficient: 0.7 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCBURNLeader + +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitBlueshield + name: скафандр офицера «синий щит» + description: Крепкий и надёжныый, как и его владелец. + components: + - type: Sprite + sprite: _Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.5 + Piercing: 0.5 + Heat: 0.8 + Radiation: 0.25 + Caustic: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitBlueshield diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml index f5c2bb46021..2147f8a7bfb 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml @@ -6,3 +6,14 @@ sprite: _Sunrise/Clothing/Shoes/Boots/jackboots_sec.rsi - type: Clothing sprite: _Sunrise/Clothing/Shoes/Boots/jackboots_sec.rsi + +- type: entity + parent: ClothingShoesMilitaryBase + id: ClothingShoesBootsBlueShield + name: ботинки офицера «синий щит» + description: Синий или голубой, вот в чём вопрос. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Shoes/Boots/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Shoes/Boots/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpskirts.yml index 475d3f9b930..0a99f4990df 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpskirts.yml @@ -64,3 +64,14 @@ sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtBlueShield + name: юбка-комбинезон офицера «синий щит» + description: Детка... + components: + - type: Sprite + sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml index 16c2a22b3e6..7e639f134b9 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml @@ -52,3 +52,14 @@ sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitBlueShield + name: комбинезон офицера «синий щит» + description: На стиле. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml index b3f5db85ab0..b0d44278283 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml @@ -24,6 +24,20 @@ - state: green - state: brigmedic +- type: entity + id: SpawnPointBlueShield + parent: SpawnPointJobBase + name: blueshield + components: + - type: SpawnPoint + job_id: BlueShield + - type: Sprite + sprite: _Sunrise/Markers/jobs.rsi + layers: + - state: green + - state: blueshield + - state: jobicon + - type: entity id: SpawnPointCentCommOperator parent: SpawnPointJobBase diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml new file mode 100644 index 00000000000..4316e9e930b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml @@ -0,0 +1,15 @@ +- type: entity + parent: IDCardStandard + id: BlueShieldIDCard + name: ID карта офицера «синий щит» + description: Карта, необходимая для доступа в различные области станции. + components: + - type: Sprite + sprite: _Sunrise/Objects/Misc/id_cards.rsi + layers: + - state: silver + - state: idblueshield + - type: Item + heldPrefix: silver + - type: PresetIdCard + job: BlueShield diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index 3972e0bfab4..eca09f198e2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -11,7 +11,7 @@ borderColor: "#6f6192" - type: Icon state: pda-lawyer - + - type: entity parent: CaptainPDA id: MagistratPDA @@ -30,3 +30,27 @@ borderColor: "#7C5D00" - type: Icon state: pda-captain + +- type: entity + parent: BasePDA + id: BlueShieldPDA + name: КПК офицера «синий щит» + description: Охуенный стиль. + components: + - type: Pda + id: BlueShieldIDCard + state: pda-blueshield + - type: Icon + state: pda-blueshield + - type: Sprite + sprite: _Sunrise/Objects/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 00000000000..9a61c9f2ed6 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,26 @@ +- type: entity + id: LockerBlueshield + parent: LockerBaseSecure + name: шкаф офицера "Синий Щит" + components: + - type: Appearance + - type: Sprite + sprite: _Sunrise/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: EntityStorageVisuals + stateBaseClosed: bssecure + stateDoorOpen: bssecure_open + stateDoorClosed: bssecure_door + - type: AccessReader + access: [["Command"]] # TODO: properly add blueshield access level diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml new file mode 100644 index 00000000000..435daec0a2f --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml @@ -0,0 +1,44 @@ +- type: loadout + id: BlueShieldBackpack + equipment: BlueShieldBackpack + +- type: startingGear + id: BlueShieldBackpack + equipment: + back: ClothingBackpackBlueShield + +- type: loadout + id: BlueShieldSatchel + equipment: BlueShieldSatchel + +- type: startingGear + id: BlueShieldSatchel + equipment: + back: ClothingBackpackSatchelBlueShield + +- type: loadout + id: BlueShieldDuffel + equipment: BlueShieldDuffel + +- type: startingGear + id: BlueShieldDuffel + equipment: + back: ClothingBackpackDuffelBlueShield + +- type: loadout + id: BlueShieldJumpsuit + equipment: BlueShieldJumpsuit + +- type: startingGear + id: BlueShieldJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitBlueShield + +- type: loadout + id: BlueShieldJumpskirt + equipment: BlueShieldJumpskirt + +- type: startingGear + id: BlueShieldJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtBlueShield diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml index 959b3163aac..c05426d84d5 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml @@ -106,3 +106,18 @@ - PsychologistBackpack - PsychologistSatchel - PsychologistDuffel + +- type: loadoutGroup + id: BlueShieldBackpack + name: Офицер «Синий Щит», рюкзак + loadouts: + - BlueShieldBackpack + - BlueShieldSatchel + - BlueShieldDuffel + +- type: loadoutGroup + id: BlueShieldJumpsuit + name: Офицер «Синий Щит», комбинезон + loadouts: + - BlueShieldJumpsuit + - BlueShieldJumpskirt diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml index 92280108493..a37394ab1be 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml @@ -43,3 +43,13 @@ - Bra - Pants - Socks + +- type: roleLoadout + id: JobBlueShield + groups: + - Bra + - Pants + - Socks + - BlueShieldJumpsuit + - BlueShieldBackpack + - Trinkets diff --git a/Resources/Prototypes/_Sunrise/Maps/box.yml b/Resources/Prototypes/_Sunrise/Maps/box.yml index 88e2b845501..9f571dbf7a0 100644 --- a/Resources/Prototypes/_Sunrise/Maps/box.yml +++ b/Resources/Prototypes/_Sunrise/Maps/box.yml @@ -60,6 +60,7 @@ Musician: [ 1, 1 ] # Sunrise-Roles Brigmedic: [ 1, 1 ] + BlueShield: [ 1, 1 ] # law IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/cluster.yml b/Resources/Prototypes/_Sunrise/Maps/cluster.yml index 6560ee6e883..4ad5bcbbbe6 100644 --- a/Resources/Prototypes/_Sunrise/Maps/cluster.yml +++ b/Resources/Prototypes/_Sunrise/Maps/cluster.yml @@ -59,6 +59,7 @@ Musician: [ 1, 1 ] # Sunrise-Roles Brigmedic: [ 1, 1 ] + BlueShield: [ 1, 1 ] # law IAA: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/delta.yml b/Resources/Prototypes/_Sunrise/Maps/delta.yml index 9469c8a976e..f35cb28f7ab 100644 --- a/Resources/Prototypes/_Sunrise/Maps/delta.yml +++ b/Resources/Prototypes/_Sunrise/Maps/delta.yml @@ -57,3 +57,5 @@ IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] Magistrat: [ 1, 1 ] + # Blueshield + BlueShield: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/fland.yml b/Resources/Prototypes/_Sunrise/Maps/fland.yml index 5d9c87d7028..8fa4573e818 100644 --- a/Resources/Prototypes/_Sunrise/Maps/fland.yml +++ b/Resources/Prototypes/_Sunrise/Maps/fland.yml @@ -61,6 +61,7 @@ Musician: [ 1, 1 ] # Sunrise-Roles Brigmedic: [ 1, 1 ] + BlueShield: [ 1, 1 ] # law IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/marathon.yml b/Resources/Prototypes/_Sunrise/Maps/marathon.yml index c6644416733..f5b988c8e1f 100644 --- a/Resources/Prototypes/_Sunrise/Maps/marathon.yml +++ b/Resources/Prototypes/_Sunrise/Maps/marathon.yml @@ -60,6 +60,7 @@ Musician: [ 1, 1 ] # Sunrise-Roles Brigmedic: [ 1, 1 ] + BlueShield: [ 1, 1 ] # law IAA: [ 1, 1 ] Lawyer: [ 2, 2 ] diff --git a/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml b/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml index 27ee0041da6..01e3265206d 100644 --- a/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml +++ b/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml @@ -11,3 +11,16 @@ sprite: Objects/Tools/emag.rsi state: icon - type: HijackShuttleCondition + +- type: entity # Sunrise-AEG + parent: BaseTraitorStealObjective + id: MultiphaseEnergygunStealObjective + components: + - type: Objective + # hos has a gun ce does not, higher difficulty than most + difficulty: 3 + - type: NotJobRequirement + job: BlueShield + - type: StealCondition + stealGroup: WeaponEnergyGunMultiphase + owner: офицер "Синий Щит" diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield.yml new file mode 100644 index 00000000000..11d3817d08b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield.yml @@ -0,0 +1,57 @@ +- type: job + id: BlueShield + name: офицер «синий щит» + description: Ваша главная задача - защита глав. Помните, вы не офицер службы безопасности. + playTimeTracker: JobBlueShield + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 36000 # 10 hrs + - !type:DepartmentTimeRequirement + department: Command + time: 36000 # 10 hrs + startingGear: BlueShieldGear + icon: JobIconBlueShield + supervisors: job-supervisors-centcom + canBeAntag: false + access: + - Command + - Bar + - Service + - Maintenance + - Janitor + - Theatre + - Kitchen + - Chapel + - Hydroponics + - External + - Chemistry + - Engineering + - Research + - Detective + - Salvage + - Security + - Brig + - Cargo + - Atmospherics + - Cargo + - Medical + special: + - !type:AddImplantSpecial + implants: [MindShieldImplant] + +- type: startingGear + id: BlueShieldGear + equipment: + shoes: ClothingShoesBootsBlueShieldFilled + eyes: ClothingEyesGlassesBlueShield + head: ClothingHeadHatBeretBlueShield + outerClothing: ClothingOuterArmorBlueShield + id: BlueShieldPDA + ears: ClothingHeadsetAltCommand + belt: ClothingBeltBlueShieldWebbingFilled + gloves: ClothingHandsGlovesCombat + storage: + back: + - BoxSurvivalSecurity + - Flash diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml index ad7e3693545..baeea4f96ee 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -4,9 +4,9 @@ color: "#FF5297" weight: 80 roles: - - Magistrat - - IAA - - Lawyer + - Magistrat + - IAA + - Lawyer - type: department id: CentralCommand @@ -14,5 +14,15 @@ color: "#048e0f" # Sunrise-Edit weight: 120 roles: + - CentCommOfficial - CentCommOperator primary: false + +- type: department # Surnise-Blueshield + id: Blueshield + description: department-Blueshield-description + color: "#05255D" + roles: + - BlueShield + primary: false + weight: 50 diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml index 40921a7062a..3eaea1f91a2 100644 --- a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml @@ -12,3 +12,6 @@ - type: playTimeTracker id: JobCentCommOfficial + +- type: playTimeTracker + id: JobBlueShield diff --git a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml index 9367978c0a7..f2d8298653f 100644 --- a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml +++ b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml @@ -11,3 +11,10 @@ icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Magistrat + +- type: statusIcon + parent: JobIcon + id: JobIconBlueShield + icon: + sprite: /Textures/_Sunrise/Interface/Misc/job_icons.rsi + state: BlueShield diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..d0d36901c93 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/icon.png new file mode 100644 index 00000000000..b21a0b974ed Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..d7194024728 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..dd7edc78bc0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/meta.json new file mode 100644 index 00000000000..76b1f59d533 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..db822d622dc Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/icon.png new file mode 100644 index 00000000000..411bd837bb1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..8b12fd699e6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..6fc311d5308 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/meta.json new file mode 100644 index 00000000000..76b1f59d533 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..22cfa08db31 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/icon.png new file mode 100644 index 00000000000..65c278508cf Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..f2ebc07741d Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..7ddb3bd3826 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/meta.json new file mode 100644 index 00000000000..76b1f59d533 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/equipped-BELT.png b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/equipped-BELT.png new file mode 100644 index 00000000000..97d3dc1c37f Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/icon.png new file mode 100644 index 00000000000..0404b78cce9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-left.png new file mode 100644 index 00000000000..30e8644bf07 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-right.png new file mode 100644 index 00000000000..05bbad9fae4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/meta.json new file mode 100644 index 00000000000..ae2756b9c0a --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/equipped-EYES.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/equipped-EYES.png new file mode 100644 index 00000000000..221ed3abbcf Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/icon.png new file mode 100644 index 00000000000..0666f21d2ea Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-left.png new file mode 100644 index 00000000000..c25fd24aae2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-right.png new file mode 100644 index 00000000000..6e096ebd386 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/meta.json new file mode 100644 index 00000000000..d9ed212742f --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..019b5b9c83a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..6c5dbd05bc2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/icon.png new file mode 100644 index 00000000000..4f4e5ba6a87 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/meta.json new file mode 100644 index 00000000000..6b2edfc8140 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png new file mode 100644 index 00000000000..83017f56e16 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png new file mode 100644 index 00000000000..83017f56e16 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..3168b97cf80 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..7da1aa3a5dd Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json new file mode 100644 index 00000000000..7698fb8f7cf --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..eda1490beef Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..eda1490beef Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..9371b44e78a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/icon.png new file mode 100644 index 00000000000..4b69fb568b1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..aea0f39676c Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..cef6f162c71 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/meta.json new file mode 100644 index 00000000000..d07b9b02bb1 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..17df20f60c4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/icon.png new file mode 100644 index 00000000000..f76c3356cc8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..e3ed2137f3d Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..78b4206377b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/meta.json new file mode 100644 index 00000000000..d07b9b02bb1 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET-digi.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET-digi.png new file mode 100644 index 00000000000..46b244c19ef Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET-digi.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET.png new file mode 100644 index 00000000000..50a41ae8caf Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/icon.png new file mode 100644 index 00000000000..c7941655cf5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..03bdacf9fb5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..f00d861ca54 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/meta.json new file mode 100644 index 00000000000..63b949a526b --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "equipped-FEET-digi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..59399389dfe Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..a3d853aa001 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/icon.png new file mode 100644 index 00000000000..6c52f2fd5ff Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..d5ca96c85f6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..0fcbfbaf67a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/meta.json new file mode 100644 index 00000000000..72f5ef9c020 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-digi.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-digi.png new file mode 100644 index 00000000000..68793ee365d Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-digi.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..bb84d9edf2b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..cbc963ca9fe Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png new file mode 100644 index 00000000000..6b5d7ad25d1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..d5ca96c85f6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..0fcbfbaf67a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json new file mode 100644 index 00000000000..f52664de071 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-digi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/BlueShield.png b/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/BlueShield.png new file mode 100644 index 00000000000..96b3fc32738 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/BlueShield.png differ diff --git a/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/meta.json new file mode 100644 index 00000000000..74c6124ddbf --- /dev/null +++ b/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 8, + "y": 8 + }, + "states": [ + { + "name": "BlueShield" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png new file mode 100644 index 00000000000..f76c3356cc8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png differ diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json b/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json index d5cd9d8326b..630cf9625c6 100644 --- a/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Markers/jobs.rsi/meta.json @@ -8,13 +8,16 @@ }, "states": [ { - "name": "jobicon" + "name": "jobicon" }, { - "name": "green" + "name": "green" }, { - "name": "magistrat" - } + "name": "magistrat" + }, + { + "name": "blueshield" + } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idblueshield.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idblueshield.png new file mode 100644 index 00000000000..d95d8d4c6b6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idblueshield.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json new file mode 100644 index 00000000000..140c1e00f1c --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "silver" + }, + { + "name": "silver-inhand-left", + "directions": 4 + }, + { + "name": "silver-inhand-right", + "directions": 4 + }, + { + "name": "idblueshield" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-left.png new file mode 100644 index 00000000000..8197fa122f9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-right.png new file mode 100644 index 00000000000..430322e892c Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver.png new file mode 100644 index 00000000000..b13153a246e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-BELT.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-BELT.png new file mode 100644 index 00000000000..6901e6c33b1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-IDCARD.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-IDCARD.png new file mode 100644 index 00000000000..6901e6c33b1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-IDCARD.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/id_overlay.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/id_overlay.png new file mode 100644 index 00000000000..3f5d310e703 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/id_overlay.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-left.png new file mode 100644 index 00000000000..12b784f81e8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-right.png new file mode 100644 index 00000000000..6919215bcf5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/insert_overlay.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/insert_overlay.png new file mode 100644 index 00000000000..61ba781c1ff Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/insert_overlay.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/light_overlay.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/light_overlay.png new file mode 100644 index 00000000000..286a6c32558 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/light_overlay.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/pda.rsi/meta.json new file mode 100644 index 00000000000..b0fab9ab5b2 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/pda.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "id_overlay" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "insert_overlay" + }, + { + "name": "light_overlay" + }, + { + "name": "equipped-IDCARD" + }, + { + "name": "pda-blueshield" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/pda-blueshield.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/pda-blueshield.png new file mode 100644 index 00000000000..02b5bbe5836 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/pda-blueshield.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bssecure.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bssecure.png new file mode 100644 index 00000000000..f0b4be7ca70 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bssecure.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bssecure_door.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bssecure_door.png new file mode 100644 index 00000000000..93c2ff2a8b9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bssecure_door.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bssecure_open.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bssecure_open.png new file mode 100644 index 00000000000..71dbe8d0236 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/bssecure_open.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic.png new file mode 100644 index 00000000000..cd0c0ff2ea1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic_door.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic_door.png new file mode 100644 index 00000000000..26498527779 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic_door.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic_icon.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic_icon.png new file mode 100644 index 00000000000..2487eae1fdd Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic_icon.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic_open.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic_open.png new file mode 100644 index 00000000000..01ed5bf73b6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/generic_open.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/locked.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/locked.png new file mode 100644 index 00000000000..d90218d19e2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/locked.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/meta.json new file mode 100644 index 00000000000..d516c4b8729 --- /dev/null +++ b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Taken from tgstation", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "bssecure_door" + }, + { + "name": "bssecure" + }, + { + "name": "bssecure_open" + }, + { + "name": "welded" + }, + { + "name": "unlocked" + }, + { + "name": "locked" + }, + { + "name": "sparking" + }, + { + "name": "generic" + }, + { + "name": "generic_door" + }, + { + "name": "generic_open" + }, + { + "name": "generic_icon" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/sparking.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/sparking.png new file mode 100644 index 00000000000..b027535b060 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/sparking.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/unlocked.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/unlocked.png new file mode 100644 index 00000000000..418607bfaf5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/unlocked.png differ diff --git a/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/welded.png b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/welded.png new file mode 100644 index 00000000000..5ba5dcc8962 Binary files /dev/null and b/Resources/Textures/_Sunrise/Structures/Storage/closet.rsi/welded.png differ