From c6371c05cc84b3b160a0dcb512bc49ccb6c0f171 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Wed, 8 Jan 2025 21:19:15 -0600 Subject: [PATCH 01/45] Map Edits: Arena/Hive (#2653) * Map Edits: Arena/Hive * More updates + Tortuga * Ad-ass-proto --------- Co-authored-by: Velcroboy --- Resources/Maps/arena.yml | 345 +++-- Resources/Maps/hive.yml | 1697 ++++++++++++++++++-- Resources/Maps/tortuga.yml | 2052 +++++++++++++++---------- Resources/Prototypes/Maps/hive.yml | 1 + Resources/Prototypes/Maps/tortuga.yml | 1 + 5 files changed, 3001 insertions(+), 1095 deletions(-) diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml index 090cb7fcf2a..e95fffa1cd4 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/arena.yml @@ -607,9 +607,6 @@ entities: 1: 27,-2 2: 32,-4 3: 33,-4 - 6: -18,-51 - 7: -17,-51 - 8: -16,-51 9: 22,-60 10: 22,-61 12: 49,-32 @@ -669,6 +666,9 @@ entities: 4904: 61,25 5231: 43,7 5232: 43,6 + 5874: -14,-52 + 5875: -14,-55 + 5876: -17,-56 - node: color: '#FFFFFFFF' id: Box @@ -9848,9 +9848,11 @@ entities: 2,-8: 0: 3276 2,-9: - 0: 52416 + 0: 52288 + 4: 128 3,-9: - 0: 65520 + 0: 65488 + 5: 32 -8,-11: 0: 45296 -9,-11: @@ -10002,15 +10004,15 @@ entities: 9,9: 1: 4080 9,10: - 4: 273 - 5: 1092 + 6: 273 + 7: 1092 9,11: 1: 240 10,9: 1: 4080 10,10: - 6: 273 - 7: 1092 + 8: 273 + 9: 1092 10,11: 1: 752 0: 28672 @@ -10019,13 +10021,13 @@ entities: 11,9: 1: 4080 11,10: - 7: 1365 + 9: 1365 11,11: 1: 35056 12,9: 1: 4080 12,10: - 7: 273 + 9: 273 0: 34816 12,11: 1: 5936 @@ -11590,6 +11592,36 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -17125,6 +17157,14 @@ entities: rot: 3.141592653589793 rad pos: 11.5,-64.5 parent: 6747 + - uid: 825 + components: + - type: MetaData + name: APC (arena bleachers) + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,-26.5 + parent: 6747 - uid: 6275 components: - type: MetaData @@ -17161,14 +17201,6 @@ entities: - type: Transform pos: -17.5,-7.5 parent: 6747 - - uid: 16255 - components: - - type: MetaData - name: APC (arena bleachers) - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,-26.5 - parent: 6747 - uid: 16476 components: - type: MetaData @@ -18529,6 +18561,18 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-19.5 parent: 6747 + - uid: 3922 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,36.5 + parent: 6747 + - uid: 3925 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,36.5 + parent: 6747 - uid: 5675 components: - type: Transform @@ -18589,16 +18633,6 @@ entities: parent: 6747 - proto: AtmosDeviceFanTiny entities: - - uid: 825 - components: - - type: Transform - pos: 18.5,36.5 - parent: 6747 - - uid: 6406 - components: - - type: Transform - pos: 22.5,36.5 - parent: 6747 - uid: 23657 components: - type: Transform @@ -58388,6 +58422,11 @@ entities: rot: -1.5707963267948966 rad pos: -67.49232,-72.32874 parent: 6747 + - uid: 29448 + components: + - type: Transform + pos: -16.651665,-50.44433 + parent: 6747 - proto: ChairPilotSeat entities: - uid: 3951 @@ -60305,6 +60344,13 @@ entities: - type: Transform pos: 30.735046,7.834367 parent: 6747 +- proto: ClothingHeadHatFlowerWreath + entities: + - uid: 29718 + components: + - type: Transform + pos: -16.285336,-51.59434 + parent: 6747 - proto: ClothingHeadHatHardhatWhite entities: - uid: 4362 @@ -60958,11 +61004,6 @@ entities: - type: Transform pos: 5.519886,-6.465665 parent: 6747 - - uid: 29448 - components: - - type: Transform - pos: -17.455547,-50.42443 - parent: 6747 - uid: 29449 components: - type: Transform @@ -60978,6 +61019,11 @@ entities: - type: Transform pos: 5.519886,-4.4642754 parent: 6747 + - uid: 29637 + components: + - type: Transform + pos: -16.513405,-55.518414 + parent: 6747 - proto: ClothingShoesSlippers entities: - uid: 8350 @@ -62907,11 +62953,37 @@ entities: - 0 - proto: CrateFreezer entities: - - uid: 29444 + - uid: 29727 components: - type: Transform - pos: 11.5,-34.5 + pos: 13.5,-34.5 parent: 6747 + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + radius: 0.01 + vertices: + - -0.4,-0.4 + - 0.4,-0.4 + - 0.4,0.29 + - -0.4,0.29 + mask: + - Impassable + - HighImpassable + - LowImpassable + layer: + - BulletImpassable + - Opaque + density: 50 + hard: True + restitution: 0 + friction: 0.4 + - type: EntityStorage + open: True + removedMasks: 20 + - type: PlaceableSurface + isPlaceable: True - proto: CrateFunBoardGames entities: - uid: 12164 @@ -64319,15 +64391,15 @@ entities: - type: Transform pos: -32.5,-9.5 parent: 6747 - - uid: 3922 + - uid: 29560 components: - type: Transform - pos: -15.5,-50.5 + pos: -13.5,-51.5 parent: 6747 - - uid: 3925 + - uid: 29562 components: - type: Transform - pos: -16.5,-50.5 + pos: -13.5,-54.5 parent: 6747 - proto: DeskBell entities: @@ -75282,6 +75354,11 @@ entities: - type: Transform pos: 12.5,-66.5 parent: 6747 + - uid: 29720 + components: + - type: Transform + pos: 32.5,13.5 + parent: 6747 - proto: DonkpocketBoxSpawner entities: - uid: 2490 @@ -77049,14 +77126,6 @@ entities: - type: Transform pos: -1.5,-70.5 parent: 6747 -- proto: ExtendedEmergencyOxygenTankFilled - entities: - - uid: 4114 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.366966,-55.397507 - parent: 6747 - proto: ExtinguisherCabinetFilled entities: - uid: 2691 @@ -80896,6 +80965,13 @@ entities: parent: 6747 - type: Fixtures fixtures: {} + - uid: 29722 + components: + - type: Transform + pos: 13.5,-32.5 + parent: 6747 + - type: Fixtures + fixtures: {} - proto: FloorTileItemBrassFilled entities: - uid: 18131 @@ -126343,28 +126419,6 @@ entities: parent: 6747 - proto: Holopad entities: - - uid: 29560 - components: - - type: MetaData - name: holopad (General - Barber Shop) - - type: Transform - pos: 60.5,-32.5 - parent: 6747 - - type: Label - currentLabel: General - Barber Shop - - type: NameModifier - baseName: holopad - - uid: 29562 - components: - - type: MetaData - name: holopad (Security - Arena) - - type: Transform - pos: -31.5,-24.5 - parent: 6747 - - type: Label - currentLabel: Security - Arena - - type: NameModifier - baseName: holopad - uid: 29563 components: - type: MetaData @@ -126387,13 +126441,6 @@ entities: currentLabel: Command - Camera Routers - type: NameModifier baseName: holopad - - uid: 29637 - components: - - type: Transform - pos: 61.5,-24.5 - parent: 6747 - - type: Label - currentLabel: Nitrogen Lounge - proto: HolopadAiBackupPower entities: - uid: 29485 @@ -126674,6 +126721,13 @@ entities: - type: Transform pos: -13.5,-33.5 parent: 6747 +- proto: HolopadGeneralVoxNitrogenLounge + entities: + - uid: 16255 + components: + - type: Transform + pos: 61.5,-24.5 + parent: 6747 - proto: HolopadJusticeCJ entities: - uid: 29509 @@ -126737,6 +126791,20 @@ entities: - type: Transform pos: 13.5,-37.5 parent: 6747 +- proto: HolopadMedicalOutpost + entities: + - uid: 29723 + components: + - type: Transform + pos: 49.5,-42.5 + parent: 6747 +- proto: HolopadMedicalParamed + entities: + - uid: 29725 + components: + - type: Transform + pos: -21.5,-9.5 + parent: 6747 - proto: HolopadMedicalSurgery entities: - uid: 29546 @@ -126795,6 +126863,13 @@ entities: - type: Transform pos: 0.5,-68.5 parent: 6747 +- proto: HolopadSecurityArena + entities: + - uid: 6406 + components: + - type: Transform + pos: -31.5,-24.5 + parent: 6747 - proto: HolopadSecurityArmory entities: - uid: 29493 @@ -126844,6 +126919,13 @@ entities: - type: Transform pos: 3.5,-2.5 parent: 6747 +- proto: HolopadSecurityGladiatorLounge + entities: + - uid: 29716 + components: + - type: Transform + pos: -35.5,-37.5 + parent: 6747 - proto: HolopadSecurityInterrogation entities: - uid: 29524 @@ -126851,6 +126933,13 @@ entities: - type: Transform pos: -7.5,-5.5 parent: 6747 +- proto: HolopadSecurityLawyer + entities: + - uid: 29724 + components: + - type: Transform + pos: -10.5,-62.5 + parent: 6747 - proto: HolopadSecurityPerma entities: - uid: 29541 @@ -126872,6 +126961,13 @@ entities: - type: Transform pos: -20.5,-29.5 parent: 6747 +- proto: HolopadServiceBarberShop + entities: + - uid: 4114 + components: + - type: Transform + pos: 60.5,-32.5 + parent: 6747 - proto: HolopadServiceBotany entities: - uid: 29498 @@ -126921,6 +127017,13 @@ entities: - type: Transform pos: 39.5,-51.5 parent: 6747 +- proto: HolopadServiceToolroom + entities: + - uid: 29726 + components: + - type: Transform + pos: 18.5,-2.5 + parent: 6747 - proto: HoloprojectorSecurity entities: - uid: 25517 @@ -128965,6 +129068,13 @@ entities: - type: Transform pos: -31.5,10.5 parent: 6747 +- proto: LunchboxCommandFilledRandom + entities: + - uid: 4113 + components: + - type: Transform + pos: -16.766249,-51.351208 + parent: 6747 - proto: Machete entities: - uid: 4834 @@ -129782,6 +129892,13 @@ entities: - type: Transform pos: 50.5,-41.5 parent: 6747 +- proto: MedicalBiofabricator + entities: + - uid: 29444 + components: + - type: Transform + pos: 11.5,-34.5 + parent: 6747 - proto: MedicalScanner entities: - uid: 20883 @@ -132343,12 +132460,6 @@ entities: - type: Transform pos: -36.408516,0.5454552 parent: 6747 - - uid: 4113 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.564882,-55.449627 - parent: 6747 - uid: 5309 components: - type: Transform @@ -132515,6 +132626,13 @@ entities: - type: Transform pos: -2.4960773,-75.40111 parent: 6747 +- proto: OrganAnimalRuminantStomach + entities: + - uid: 29728 + components: + - type: Transform + pos: 13.688596,-34.6097 + parent: 6747 - proto: OrganHumanHeart entities: - uid: 22426 @@ -132530,6 +132648,13 @@ entities: - type: Transform pos: 55.45177,-34.498474 parent: 6747 +- proto: OrganMouseStomach + entities: + - uid: 29729 + components: + - type: Transform + pos: -62.398544,-84.017204 + parent: 6747 - proto: OxygenCanister entities: - uid: 113 @@ -137015,6 +137140,11 @@ entities: rot: -1.5707963267948966 rad pos: -69.5,-57.5 parent: 6747 + - uid: 29717 + components: + - type: Transform + pos: -17.5,-51.5 + parent: 6747 - proto: PaperBin5 entities: - uid: 12909 @@ -138853,16 +138983,6 @@ entities: - type: Transform pos: -11.5,-51.5 parent: 6747 - - uid: 3927 - components: - - type: Transform - pos: -13.5,-51.5 - parent: 6747 - - uid: 3928 - components: - - type: Transform - pos: -13.5,-54.5 - parent: 6747 - uid: 3929 components: - type: Transform @@ -144732,11 +144852,6 @@ entities: - type: Transform pos: -17.5,-55.5 parent: 6747 - - uid: 3939 - components: - - type: Transform - pos: -16.5,-55.5 - parent: 6747 - uid: 4115 components: - type: Transform @@ -147180,6 +147295,11 @@ entities: - type: Transform pos: -43.5,2.5 parent: 6747 + - uid: 29719 + components: + - type: Transform + pos: -17.5,-49.5 + parent: 6747 - proto: RandomPosterAny entities: - uid: 1770 @@ -156516,6 +156636,13 @@ entities: - type: Transform pos: 23.5,-38.5 parent: 6747 +- proto: SecureCabinetCommand + entities: + - uid: 3927 + components: + - type: Transform + pos: -17.5,-50.5 + parent: 6747 - proto: SecureCabinetDetective entities: - uid: 22922 @@ -161135,6 +161262,13 @@ entities: - type: Transform pos: 51.5,-6.5 parent: 6747 +- proto: SpawnMobCatClippy + entities: + - uid: 29721 + components: + - type: Transform + pos: 32.5,13.5 + parent: 6747 - proto: SpawnMobCatGeneric entities: - uid: 7225 @@ -161317,6 +161451,11 @@ entities: - type: Transform pos: -26.5,-50.5 parent: 6747 + - uid: 29715 + components: + - type: Transform + pos: -16.5,-50.5 + parent: 6747 - proto: SpawnPointAtmos entities: - uid: 17076 @@ -165919,6 +166058,16 @@ entities: - type: Transform pos: 20.5,-5.5 parent: 6747 + - uid: 3928 + components: + - type: Transform + pos: -17.5,-51.5 + parent: 6747 + - uid: 3939 + components: + - type: Transform + pos: -16.5,-51.5 + parent: 6747 - uid: 4900 components: - type: Transform diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index 76cf066c4e4..04f073662b4 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -15615,11 +15615,6 @@ entities: - type: Transform pos: 29.5,-17.5 parent: 1 - - uid: 21205 - components: - - type: Transform - pos: 24.5,-14.5 - parent: 1 - proto: AirlockFreezerLocked entities: - uid: 1434 @@ -16453,6 +16448,13 @@ entities: - type: Transform pos: 96.5,13.5 parent: 1 +- proto: AirlockMaintKitchenHydroLocked + entities: + - uid: 536 + components: + - type: Transform + pos: 24.5,-14.5 + parent: 1 - proto: AirlockMaintLawyerLocked entities: - uid: 526 @@ -21268,6 +21270,11 @@ entities: rot: 1.5707963267948966 rad pos: 4.5908017,19.505356 parent: 1 + - uid: 30044 + components: + - type: Transform + pos: 9.429625,21.602547 + parent: 1 - proto: BooksBag entities: - uid: 1059 @@ -39734,6 +39741,21 @@ entities: - type: Transform pos: -2.5,13.5 parent: 1 + - uid: 29782 + components: + - type: Transform + pos: 28.5,3.5 + parent: 1 + - uid: 29783 + components: + - type: Transform + pos: 27.5,3.5 + parent: 1 + - uid: 29784 + components: + - type: Transform + pos: 26.5,3.5 + parent: 1 - proto: CableApcStack entities: - uid: 4721 @@ -58494,6 +58516,1216 @@ entities: - type: Transform pos: 133.5,6.5 parent: 1 + - uid: 29800 + components: + - type: Transform + pos: -25.5,-26.5 + parent: 1 + - uid: 29801 + components: + - type: Transform + pos: -25.5,-25.5 + parent: 1 + - uid: 29802 + components: + - type: Transform + pos: -25.5,-24.5 + parent: 1 + - uid: 29803 + components: + - type: Transform + pos: -25.5,-23.5 + parent: 1 + - uid: 29804 + components: + - type: Transform + pos: -25.5,-22.5 + parent: 1 + - uid: 29805 + components: + - type: Transform + pos: -27.5,-22.5 + parent: 1 + - uid: 29806 + components: + - type: Transform + pos: -26.5,-22.5 + parent: 1 + - uid: 29807 + components: + - type: Transform + pos: -24.5,-25.5 + parent: 1 + - uid: 29808 + components: + - type: Transform + pos: -23.5,-25.5 + parent: 1 + - uid: 29809 + components: + - type: Transform + pos: -22.5,-25.5 + parent: 1 + - uid: 29810 + components: + - type: Transform + pos: -21.5,-25.5 + parent: 1 + - uid: 29811 + components: + - type: Transform + pos: -20.5,-25.5 + parent: 1 + - uid: 29812 + components: + - type: Transform + pos: -19.5,-25.5 + parent: 1 + - uid: 29813 + components: + - type: Transform + pos: -18.5,-25.5 + parent: 1 + - uid: 29814 + components: + - type: Transform + pos: -17.5,-25.5 + parent: 1 + - uid: 29815 + components: + - type: Transform + pos: -17.5,-26.5 + parent: 1 + - uid: 29816 + components: + - type: Transform + pos: -16.5,-26.5 + parent: 1 + - uid: 29817 + components: + - type: Transform + pos: -16.5,-27.5 + parent: 1 + - uid: 29818 + components: + - type: Transform + pos: -16.5,-28.5 + parent: 1 + - uid: 29819 + components: + - type: Transform + pos: -15.5,-28.5 + parent: 1 + - uid: 29820 + components: + - type: Transform + pos: -14.5,-28.5 + parent: 1 + - uid: 29821 + components: + - type: Transform + pos: -13.5,-28.5 + parent: 1 + - uid: 29822 + components: + - type: Transform + pos: -11.5,-28.5 + parent: 1 + - uid: 29823 + components: + - type: Transform + pos: -12.5,-28.5 + parent: 1 + - uid: 29824 + components: + - type: Transform + pos: -11.5,-27.5 + parent: 1 + - uid: 29825 + components: + - type: Transform + pos: -11.5,-26.5 + parent: 1 + - uid: 29826 + components: + - type: Transform + pos: -10.5,-26.5 + parent: 1 + - uid: 29827 + components: + - type: Transform + pos: -9.5,-26.5 + parent: 1 + - uid: 29828 + components: + - type: Transform + pos: -8.5,-26.5 + parent: 1 + - uid: 29829 + components: + - type: Transform + pos: -7.5,-26.5 + parent: 1 + - uid: 29830 + components: + - type: Transform + pos: -6.5,-26.5 + parent: 1 + - uid: 29831 + components: + - type: Transform + pos: -6.5,-25.5 + parent: 1 + - uid: 29832 + components: + - type: Transform + pos: -6.5,-24.5 + parent: 1 + - uid: 29833 + components: + - type: Transform + pos: -6.5,-23.5 + parent: 1 + - uid: 29834 + components: + - type: Transform + pos: -5.5,-23.5 + parent: 1 + - uid: 29835 + components: + - type: Transform + pos: -4.5,-23.5 + parent: 1 + - uid: 29836 + components: + - type: Transform + pos: -3.5,-23.5 + parent: 1 + - uid: 29837 + components: + - type: Transform + pos: -2.5,-23.5 + parent: 1 + - uid: 29838 + components: + - type: Transform + pos: -0.5,-23.5 + parent: 1 + - uid: 29839 + components: + - type: Transform + pos: 0.5,-23.5 + parent: 1 + - uid: 29840 + components: + - type: Transform + pos: 1.5,-23.5 + parent: 1 + - uid: 29841 + components: + - type: Transform + pos: -1.5,-23.5 + parent: 1 + - uid: 29842 + components: + - type: Transform + pos: -25.5,-21.5 + parent: 1 + - uid: 29843 + components: + - type: Transform + pos: -25.5,-20.5 + parent: 1 + - uid: 29844 + components: + - type: Transform + pos: -25.5,-19.5 + parent: 1 + - uid: 29845 + components: + - type: Transform + pos: -44.5,-8.5 + parent: 1 + - uid: 29846 + components: + - type: Transform + pos: -43.5,-8.5 + parent: 1 + - uid: 29847 + components: + - type: Transform + pos: -42.5,-8.5 + parent: 1 + - uid: 29848 + components: + - type: Transform + pos: -40.5,-8.5 + parent: 1 + - uid: 29849 + components: + - type: Transform + pos: -39.5,-8.5 + parent: 1 + - uid: 29850 + components: + - type: Transform + pos: -41.5,-8.5 + parent: 1 + - uid: 29851 + components: + - type: Transform + pos: -38.5,-8.5 + parent: 1 + - uid: 29852 + components: + - type: Transform + pos: -36.5,-8.5 + parent: 1 + - uid: 29853 + components: + - type: Transform + pos: -37.5,-8.5 + parent: 1 + - uid: 29854 + components: + - type: Transform + pos: -35.5,-8.5 + parent: 1 + - uid: 29855 + components: + - type: Transform + pos: -34.5,-8.5 + parent: 1 + - uid: 29856 + components: + - type: Transform + pos: -33.5,-8.5 + parent: 1 + - uid: 29857 + components: + - type: Transform + pos: -32.5,-8.5 + parent: 1 + - uid: 29858 + components: + - type: Transform + pos: -29.5,-4.5 + parent: 1 + - uid: 29859 + components: + - type: Transform + pos: -29.5,-5.5 + parent: 1 + - uid: 29860 + components: + - type: Transform + pos: -29.5,-6.5 + parent: 1 + - uid: 29861 + components: + - type: Transform + pos: -29.5,-7.5 + parent: 1 + - uid: 29862 + components: + - type: Transform + pos: -30.5,-6.5 + parent: 1 + - uid: 29863 + components: + - type: Transform + pos: -31.5,-6.5 + parent: 1 + - uid: 29864 + components: + - type: Transform + pos: -32.5,-6.5 + parent: 1 + - uid: 29865 + components: + - type: Transform + pos: -32.5,-7.5 + parent: 1 + - uid: 29866 + components: + - type: Transform + pos: -29.5,12.5 + parent: 1 + - uid: 29867 + components: + - type: Transform + pos: -31.5,12.5 + parent: 1 + - uid: 29868 + components: + - type: Transform + pos: -32.5,12.5 + parent: 1 + - uid: 29869 + components: + - type: Transform + pos: -33.5,12.5 + parent: 1 + - uid: 29870 + components: + - type: Transform + pos: -34.5,12.5 + parent: 1 + - uid: 29871 + components: + - type: Transform + pos: -35.5,12.5 + parent: 1 + - uid: 29872 + components: + - type: Transform + pos: -30.5,12.5 + parent: 1 + - uid: 29873 + components: + - type: Transform + pos: -35.5,13.5 + parent: 1 + - uid: 29874 + components: + - type: Transform + pos: -35.5,14.5 + parent: 1 + - uid: 29875 + components: + - type: Transform + pos: -35.5,15.5 + parent: 1 + - uid: 29876 + components: + - type: Transform + pos: -35.5,16.5 + parent: 1 + - uid: 29877 + components: + - type: Transform + pos: -35.5,17.5 + parent: 1 + - uid: 29878 + components: + - type: Transform + pos: -35.5,18.5 + parent: 1 + - uid: 29879 + components: + - type: Transform + pos: -35.5,19.5 + parent: 1 + - uid: 29880 + components: + - type: Transform + pos: -33.5,19.5 + parent: 1 + - uid: 29881 + components: + - type: Transform + pos: -34.5,19.5 + parent: 1 + - uid: 29882 + components: + - type: Transform + pos: -44.5,16.5 + parent: 1 + - uid: 29883 + components: + - type: Transform + pos: -43.5,16.5 + parent: 1 + - uid: 29884 + components: + - type: Transform + pos: -42.5,16.5 + parent: 1 + - uid: 29885 + components: + - type: Transform + pos: -41.5,16.5 + parent: 1 + - uid: 29886 + components: + - type: Transform + pos: -40.5,16.5 + parent: 1 + - uid: 29887 + components: + - type: Transform + pos: -39.5,16.5 + parent: 1 + - uid: 29888 + components: + - type: Transform + pos: -38.5,16.5 + parent: 1 + - uid: 29889 + components: + - type: Transform + pos: -37.5,16.5 + parent: 1 + - uid: 29890 + components: + - type: Transform + pos: -36.5,16.5 + parent: 1 + - uid: 29891 + components: + - type: Transform + pos: -40.5,19.5 + parent: 1 + - uid: 29892 + components: + - type: Transform + pos: -40.5,18.5 + parent: 1 + - uid: 29893 + components: + - type: Transform + pos: -40.5,17.5 + parent: 1 + - uid: 29894 + components: + - type: Transform + pos: 1.5,30.5 + parent: 1 + - uid: 29895 + components: + - type: Transform + pos: 0.5,30.5 + parent: 1 + - uid: 29896 + components: + - type: Transform + pos: 0.5,31.5 + parent: 1 + - uid: 29897 + components: + - type: Transform + pos: 0.5,32.5 + parent: 1 + - uid: 29898 + components: + - type: Transform + pos: 0.5,33.5 + parent: 1 + - uid: 29899 + components: + - type: Transform + pos: -0.5,33.5 + parent: 1 + - uid: 29900 + components: + - type: Transform + pos: -1.5,33.5 + parent: 1 + - uid: 29901 + components: + - type: Transform + pos: -2.5,33.5 + parent: 1 + - uid: 29902 + components: + - type: Transform + pos: -3.5,33.5 + parent: 1 + - uid: 29903 + components: + - type: Transform + pos: -4.5,33.5 + parent: 1 + - uid: 29904 + components: + - type: Transform + pos: -5.5,33.5 + parent: 1 + - uid: 29905 + components: + - type: Transform + pos: -6.5,33.5 + parent: 1 + - uid: 29906 + components: + - type: Transform + pos: -7.5,33.5 + parent: 1 + - uid: 29907 + components: + - type: Transform + pos: -8.5,33.5 + parent: 1 + - uid: 29908 + components: + - type: Transform + pos: -9.5,33.5 + parent: 1 + - uid: 29909 + components: + - type: Transform + pos: -10.5,33.5 + parent: 1 + - uid: 29910 + components: + - type: Transform + pos: -12.5,33.5 + parent: 1 + - uid: 29911 + components: + - type: Transform + pos: -13.5,33.5 + parent: 1 + - uid: 29912 + components: + - type: Transform + pos: -11.5,33.5 + parent: 1 + - uid: 29913 + components: + - type: Transform + pos: -14.5,33.5 + parent: 1 + - uid: 29914 + components: + - type: Transform + pos: -16.5,33.5 + parent: 1 + - uid: 29915 + components: + - type: Transform + pos: -17.5,33.5 + parent: 1 + - uid: 29916 + components: + - type: Transform + pos: -18.5,33.5 + parent: 1 + - uid: 29917 + components: + - type: Transform + pos: -19.5,33.5 + parent: 1 + - uid: 29918 + components: + - type: Transform + pos: -15.5,33.5 + parent: 1 + - uid: 29919 + components: + - type: Transform + pos: -17.5,34.5 + parent: 1 + - uid: 29920 + components: + - type: Transform + pos: -16.5,34.5 + parent: 1 + - uid: 29921 + components: + - type: Transform + pos: -15.5,34.5 + parent: 1 + - uid: 29922 + components: + - type: Transform + pos: -19.5,35.5 + parent: 1 + - uid: 29923 + components: + - type: Transform + pos: -19.5,34.5 + parent: 1 + - uid: 29924 + components: + - type: Transform + pos: -26.5,28.5 + parent: 1 + - uid: 29925 + components: + - type: Transform + pos: -25.5,28.5 + parent: 1 + - uid: 29926 + components: + - type: Transform + pos: -24.5,28.5 + parent: 1 + - uid: 29927 + components: + - type: Transform + pos: -23.5,28.5 + parent: 1 + - uid: 29928 + components: + - type: Transform + pos: -22.5,28.5 + parent: 1 + - uid: 29929 + components: + - type: Transform + pos: -21.5,26.5 + parent: 1 + - uid: 29930 + components: + - type: Transform + pos: -21.5,27.5 + parent: 1 + - uid: 29931 + components: + - type: Transform + pos: -21.5,28.5 + parent: 1 + - uid: 29932 + components: + - type: Transform + pos: -21.5,29.5 + parent: 1 + - uid: 29933 + components: + - type: Transform + pos: -21.5,30.5 + parent: 1 + - uid: 29934 + components: + - type: Transform + pos: -21.5,31.5 + parent: 1 + - uid: 29935 + components: + - type: Transform + pos: -21.5,32.5 + parent: 1 + - uid: 29936 + components: + - type: Transform + pos: -21.5,33.5 + parent: 1 + - uid: 29937 + components: + - type: Transform + pos: -20.5,33.5 + parent: 1 + - uid: 29938 + components: + - type: Transform + pos: -24.5,32.5 + parent: 1 + - uid: 29939 + components: + - type: Transform + pos: -23.5,32.5 + parent: 1 + - uid: 29940 + components: + - type: Transform + pos: -22.5,32.5 + parent: 1 + - uid: 29941 + components: + - type: Transform + pos: -20.5,32.5 + parent: 1 + - uid: 29942 + components: + - type: Transform + pos: 47.5,30.5 + parent: 1 + - uid: 29943 + components: + - type: Transform + pos: 46.5,30.5 + parent: 1 + - uid: 29944 + components: + - type: Transform + pos: 45.5,30.5 + parent: 1 + - uid: 29945 + components: + - type: Transform + pos: 44.5,30.5 + parent: 1 + - uid: 29946 + components: + - type: Transform + pos: 43.5,30.5 + parent: 1 + - uid: 29947 + components: + - type: Transform + pos: 42.5,30.5 + parent: 1 + - uid: 29948 + components: + - type: Transform + pos: 41.5,30.5 + parent: 1 + - uid: 29949 + components: + - type: Transform + pos: 35.5,30.5 + parent: 1 + - uid: 29950 + components: + - type: Transform + pos: 34.5,30.5 + parent: 1 + - uid: 29951 + components: + - type: Transform + pos: 34.5,31.5 + parent: 1 + - uid: 29952 + components: + - type: Transform + pos: 34.5,32.5 + parent: 1 + - uid: 29953 + components: + - type: Transform + pos: 33.5,32.5 + parent: 1 + - uid: 29954 + components: + - type: Transform + pos: 32.5,32.5 + parent: 1 + - uid: 29955 + components: + - type: Transform + pos: 31.5,32.5 + parent: 1 + - uid: 29956 + components: + - type: Transform + pos: 30.5,32.5 + parent: 1 + - uid: 29957 + components: + - type: Transform + pos: 29.5,32.5 + parent: 1 + - uid: 29958 + components: + - type: Transform + pos: 28.5,32.5 + parent: 1 + - uid: 29959 + components: + - type: Transform + pos: 27.5,32.5 + parent: 1 + - uid: 29960 + components: + - type: Transform + pos: 26.5,32.5 + parent: 1 + - uid: 29961 + components: + - type: Transform + pos: 24.5,32.5 + parent: 1 + - uid: 29962 + components: + - type: Transform + pos: 23.5,32.5 + parent: 1 + - uid: 29963 + components: + - type: Transform + pos: 25.5,32.5 + parent: 1 + - uid: 29964 + components: + - type: Transform + pos: 23.5,31.5 + parent: 1 + - uid: 29965 + components: + - type: Transform + pos: 23.5,30.5 + parent: 1 + - uid: 29966 + components: + - type: Transform + pos: 22.5,30.5 + parent: 1 + - uid: 29967 + components: + - type: Transform + pos: 47.5,29.5 + parent: 1 + - uid: 29968 + components: + - type: Transform + pos: 47.5,28.5 + parent: 1 + - uid: 29969 + components: + - type: Transform + pos: 47.5,27.5 + parent: 1 + - uid: 29970 + components: + - type: Transform + pos: 47.5,26.5 + parent: 1 + - uid: 29971 + components: + - type: Transform + pos: 52.5,11.5 + parent: 1 + - uid: 29972 + components: + - type: Transform + pos: 52.5,13.5 + parent: 1 + - uid: 29973 + components: + - type: Transform + pos: 52.5,14.5 + parent: 1 + - uid: 29974 + components: + - type: Transform + pos: 52.5,15.5 + parent: 1 + - uid: 29975 + components: + - type: Transform + pos: 52.5,16.5 + parent: 1 + - uid: 29976 + components: + - type: Transform + pos: 52.5,17.5 + parent: 1 + - uid: 29977 + components: + - type: Transform + pos: 52.5,18.5 + parent: 1 + - uid: 29978 + components: + - type: Transform + pos: 52.5,19.5 + parent: 1 + - uid: 29979 + components: + - type: Transform + pos: 52.5,20.5 + parent: 1 + - uid: 29980 + components: + - type: Transform + pos: 52.5,12.5 + parent: 1 + - uid: 29981 + components: + - type: Transform + pos: 52.5,21.5 + parent: 1 + - uid: 29982 + components: + - type: Transform + pos: 52.5,22.5 + parent: 1 + - uid: 29983 + components: + - type: Transform + pos: 51.5,22.5 + parent: 1 + - uid: 29984 + components: + - type: Transform + pos: 49.5,22.5 + parent: 1 + - uid: 29985 + components: + - type: Transform + pos: 50.5,22.5 + parent: 1 + - uid: 29986 + components: + - type: Transform + pos: 49.5,23.5 + parent: 1 + - uid: 29987 + components: + - type: Transform + pos: 48.5,23.5 + parent: 1 + - uid: 29988 + components: + - type: Transform + pos: 47.5,25.5 + parent: 1 + - uid: 29989 + components: + - type: Transform + pos: 47.5,24.5 + parent: 1 + - uid: 29990 + components: + - type: Transform + pos: 48.5,24.5 + parent: 1 + - uid: 29991 + components: + - type: Transform + pos: 52.5,-3.5 + parent: 1 + - uid: 29992 + components: + - type: Transform + pos: 52.5,-4.5 + parent: 1 + - uid: 29993 + components: + - type: Transform + pos: 52.5,-5.5 + parent: 1 + - uid: 29994 + components: + - type: Transform + pos: 53.5,-5.5 + parent: 1 + - uid: 29995 + components: + - type: Transform + pos: 53.5,-6.5 + parent: 1 + - uid: 29996 + components: + - type: Transform + pos: 53.5,-7.5 + parent: 1 + - uid: 29997 + components: + - type: Transform + pos: 53.5,-8.5 + parent: 1 + - uid: 29998 + components: + - type: Transform + pos: 53.5,-9.5 + parent: 1 + - uid: 29999 + components: + - type: Transform + pos: 53.5,-10.5 + parent: 1 + - uid: 30000 + components: + - type: Transform + pos: 53.5,-11.5 + parent: 1 + - uid: 30001 + components: + - type: Transform + pos: 53.5,-12.5 + parent: 1 + - uid: 30002 + components: + - type: Transform + pos: 53.5,-13.5 + parent: 1 + - uid: 30003 + components: + - type: Transform + pos: 52.5,-13.5 + parent: 1 + - uid: 30004 + components: + - type: Transform + pos: 51.5,-13.5 + parent: 1 + - uid: 30005 + components: + - type: Transform + pos: 50.5,-13.5 + parent: 1 + - uid: 30006 + components: + - type: Transform + pos: 46.5,-22.5 + parent: 1 + - uid: 30007 + components: + - type: Transform + pos: 45.5,-22.5 + parent: 1 + - uid: 30008 + components: + - type: Transform + pos: 44.5,-22.5 + parent: 1 + - uid: 30009 + components: + - type: Transform + pos: 43.5,-22.5 + parent: 1 + - uid: 30010 + components: + - type: Transform + pos: 42.5,-22.5 + parent: 1 + - uid: 30011 + components: + - type: Transform + pos: 42.5,-23.5 + parent: 1 + - uid: 30012 + components: + - type: Transform + pos: 43.5,-23.5 + parent: 1 + - uid: 30013 + components: + - type: Transform + pos: 46.5,-21.5 + parent: 1 + - uid: 30014 + components: + - type: Transform + pos: 46.5,-20.5 + parent: 1 + - uid: 30015 + components: + - type: Transform + pos: 46.5,-19.5 + parent: 1 + - uid: 30016 + components: + - type: Transform + pos: 47.5,-19.5 + parent: 1 + - uid: 30017 + components: + - type: Transform + pos: 49.5,-19.5 + parent: 1 + - uid: 30018 + components: + - type: Transform + pos: 48.5,-19.5 + parent: 1 + - uid: 30019 + components: + - type: Transform + pos: 49.5,-18.5 + parent: 1 + - uid: 30020 + components: + - type: Transform + pos: 49.5,-17.5 + parent: 1 + - uid: 30021 + components: + - type: Transform + pos: 49.5,-16.5 + parent: 1 + - uid: 30022 + components: + - type: Transform + pos: 49.5,-15.5 + parent: 1 + - uid: 30023 + components: + - type: Transform + pos: 50.5,-15.5 + parent: 1 + - uid: 30024 + components: + - type: Transform + pos: 50.5,-14.5 + parent: 1 + - uid: 30025 + components: + - type: Transform + pos: 22.5,-23.5 + parent: 1 + - uid: 30026 + components: + - type: Transform + pos: 22.5,-24.5 + parent: 1 + - uid: 30027 + components: + - type: Transform + pos: 23.5,-24.5 + parent: 1 + - uid: 30028 + components: + - type: Transform + pos: 24.5,-24.5 + parent: 1 + - uid: 30029 + components: + - type: Transform + pos: 25.5,-24.5 + parent: 1 + - uid: 30030 + components: + - type: Transform + pos: 26.5,-24.5 + parent: 1 + - uid: 30031 + components: + - type: Transform + pos: 27.5,-24.5 + parent: 1 + - uid: 30032 + components: + - type: Transform + pos: 28.5,-24.5 + parent: 1 + - uid: 30033 + components: + - type: Transform + pos: 29.5,-24.5 + parent: 1 + - uid: 30034 + components: + - type: Transform + pos: 30.5,-24.5 + parent: 1 + - uid: 30035 + components: + - type: Transform + pos: 32.5,-24.5 + parent: 1 + - uid: 30036 + components: + - type: Transform + pos: 33.5,-24.5 + parent: 1 + - uid: 30037 + components: + - type: Transform + pos: 34.5,-24.5 + parent: 1 + - uid: 30038 + components: + - type: Transform + pos: 31.5,-24.5 + parent: 1 + - uid: 30039 + components: + - type: Transform + pos: 34.5,-23.5 + parent: 1 + - uid: 30040 + components: + - type: Transform + pos: 35.5,-23.5 + parent: 1 + - uid: 30041 + components: + - type: Transform + pos: 36.5,-23.5 + parent: 1 - proto: Cautery entities: - uid: 13277 @@ -62555,6 +63787,13 @@ entities: - type: Transform pos: 48.5,-8.5 parent: 1 +- proto: ClothingBackpackDuffelSurgeryFilled + entities: + - uid: 30042 + components: + - type: Transform + pos: 80.47211,-20.812212 + parent: 1 - proto: ClothingBeltBandolier entities: - uid: 3253 @@ -64148,6 +65387,12 @@ entities: - type: Transform pos: 5.5,-3.5 parent: 1 + - uid: 2001 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,48.5 + parent: 1 - uid: 4751 components: - type: Transform @@ -64160,12 +65405,6 @@ entities: rot: -1.5707963267948966 rad pos: -55.5,-20.5 parent: 1 - - uid: 11672 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,48.5 - parent: 1 - uid: 13348 components: - type: Transform @@ -64376,10 +65615,9 @@ entities: parent: 1 - proto: ComputerSurveillanceCameraMonitor entities: - - uid: 3675 + - uid: 2850 components: - type: Transform - rot: 1.5707963267948966 rad pos: 59.5,22.5 parent: 1 - uid: 5495 @@ -65393,13 +66631,6 @@ entities: - type: Transform pos: 76.5,-12.5 parent: 1 -- proto: CrateMedicalSurgery - entities: - - uid: 14708 - components: - - type: Transform - pos: 75.5,-22.5 - parent: 1 - proto: CrateNitrogenInternals entities: - uid: 20996 @@ -65708,16 +66939,15 @@ entities: - type: Transform pos: -18.497072,7.5828466 parent: 1 - - uid: 7296 + - uid: 22742 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 17.395557,39.488533 + pos: -12.739433,36.82119 parent: 1 - - uid: 22742 + - uid: 29796 components: - type: Transform - pos: -12.739433,36.82119 + pos: 18.555685,39.664207 parent: 1 - proto: CrowbarRed entities: @@ -78686,14 +79916,6 @@ entities: - type: Transform pos: -13.006062,36.40738 parent: 1 -- proto: EncryptionKeyRobo - entities: - - uid: 6537 - components: - - type: Transform - parent: 6536 - - type: Physics - canCollide: False - proto: ExosuitFabricator entities: - uid: 7339 @@ -79088,21 +80310,6 @@ entities: parent: 1 - proto: filingCabinetDrawerRandom entities: - - uid: 536 - components: - - type: Transform - pos: -11.5,48.5 - parent: 1 - - uid: 2001 - components: - - type: Transform - pos: 4.5,0.5 - parent: 1 - - uid: 2850 - components: - - type: Transform - pos: 41.5,-14.5 - parent: 1 - uid: 3111 components: - type: Transform @@ -79118,36 +80325,16 @@ entities: - type: Transform pos: 72.5,-4.5 parent: 1 - - uid: 5809 - components: - - type: Transform - pos: -46.5,-35.5 - parent: 1 - uid: 6668 components: - type: Transform pos: -57.5,-24.5 parent: 1 - - uid: 7323 - components: - - type: Transform - pos: -5.5,41.5 - parent: 1 - - uid: 9883 - components: - - type: Transform - pos: 101.311455,9.789877 - parent: 1 - uid: 9892 components: - type: Transform pos: 101.842705,9.800301 parent: 1 - - uid: 14709 - components: - - type: Transform - pos: 78.5,-8.5 - parent: 1 - uid: 15788 components: - type: Transform @@ -79163,11 +80350,6 @@ entities: - type: Transform pos: -61.5,10.5 parent: 1 - - uid: 23919 - components: - - type: Transform - pos: 74.5,18.5 - parent: 1 - uid: 28513 components: - type: Transform @@ -79190,31 +80372,11 @@ entities: - type: Transform pos: 73.5,-6.5 parent: 1 - - uid: 6598 - components: - - type: Transform - pos: -53.5,0.5 - parent: 1 - uid: 6994 components: - type: Transform pos: 47.5,8.5 parent: 1 - - uid: 6995 - components: - - type: Transform - pos: 47.5,7.5 - parent: 1 - - uid: 23923 - components: - - type: Transform - pos: 74.5,12.5 - parent: 1 - - uid: 28084 - components: - - type: Transform - pos: 103.17996,15.455734 - parent: 1 - proto: filingCabinetTallRandom entities: - uid: 1203 @@ -79222,20 +80384,10 @@ entities: - type: Transform pos: 27.659313,-22.492584 parent: 1 - - uid: 4403 - components: - - type: Transform - pos: 42.5,12.5 - parent: 1 - - uid: 5735 - components: - - type: Transform - pos: 73.5,-5.5 - parent: 1 - - uid: 28086 + - uid: 13763 components: - type: Transform - pos: 103.690384,15.466158 + pos: 103.73396,15.437514 parent: 1 - proto: FireAlarm entities: @@ -133289,20 +134441,6 @@ entities: parent: 1 - type: Label currentLabel: General - Pet Store - - uid: 29520 - components: - - type: Transform - pos: 22.5,4.5 - parent: 1 - - type: Label - currentLabel: General - Park - - uid: 29709 - components: - - type: Transform - pos: 6.5,14.5 - parent: 1 - - type: Label - currentLabel: General - Barber Shop - proto: HolopadAiBackupPower entities: - uid: 29455 @@ -133485,6 +134623,13 @@ entities: - type: Transform pos: -41.5,4.5 parent: 1 +- proto: HolopadEngineeringParticleAccelerator + entities: + - uid: 29797 + components: + - type: Transform + pos: -74.5,2.5 + parent: 1 - proto: HolopadEpistemicsMantis entities: - uid: 29500 @@ -133541,6 +134686,13 @@ entities: - type: Transform pos: 17.5,-16.5 parent: 1 +- proto: HolopadGeneralPark + entities: + - uid: 21205 + components: + - type: Transform + pos: 23.5,3.5 + parent: 1 - proto: HolopadGeneralTheater entities: - uid: 29514 @@ -133618,6 +134770,13 @@ entities: - type: Transform pos: 62.5,-22.5 parent: 1 +- proto: HolopadMedicalOutpost + entities: + - uid: 3675 + components: + - type: Transform + pos: -22.5,8.5 + parent: 1 - proto: HolopadMedicalSurgery entities: - uid: 29513 @@ -133716,6 +134875,13 @@ entities: - type: Transform pos: 76.5,26.5 parent: 1 +- proto: HolopadSecurityPermaWorkshop + entities: + - uid: 29798 + components: + - type: Transform + pos: 74.5,35.5 + parent: 1 - proto: HolopadSecurityWarden entities: - uid: 29518 @@ -133730,6 +134896,13 @@ entities: - type: Transform pos: 37.5,18.5 parent: 1 +- proto: HolopadServiceBarberShop + entities: + - uid: 23525 + components: + - type: Transform + pos: 6.5,14.5 + parent: 1 - proto: HolopadServiceBotany entities: - uid: 1045 @@ -133786,6 +134959,13 @@ entities: - type: Transform pos: 40.5,-10.5 parent: 1 +- proto: HolopadServiceToolroom + entities: + - uid: 29799 + components: + - type: Transform + pos: 3.5,-14.5 + parent: 1 - proto: HoloprojectorSecurity entities: - uid: 7401 @@ -137373,6 +138553,13 @@ entities: - type: Transform pos: 58.5,-10.5 parent: 1 +- proto: MedicalBiofabricator + entities: + - uid: 14708 + components: + - type: Transform + pos: 75.5,-22.5 + parent: 1 - proto: MedicalScanner entities: - uid: 16839 @@ -141191,15 +142378,15 @@ entities: - type: Transform pos: 85.5,-17.5 parent: 1 - - uid: 20537 + - uid: 20676 components: - type: Transform - pos: 128.5,-3.5 + pos: 104.5,13.5 parent: 1 - - uid: 20676 + - uid: 29788 components: - type: Transform - pos: 104.5,13.5 + pos: 126.49917,-3.7744036 parent: 1 - proto: PottedPlantRandom entities: @@ -146035,11 +147222,6 @@ entities: - type: Transform pos: 18.5,39.5 parent: 1 - - uid: 7289 - components: - - type: Transform - pos: 17.5,39.5 - parent: 1 - uid: 7444 components: - type: Transform @@ -146895,6 +148077,14 @@ entities: - type: Transform pos: 161.5,-3.5 parent: 1 + - uid: 30043 + components: + - type: MetaData + desc: A shelf for returning books. + name: book return shelf + - type: Transform + pos: 9.5,21.5 + parent: 1 - proto: RadiationCollector entities: - uid: 19234 @@ -147897,6 +149087,11 @@ entities: rot: 1.5707963267948966 rad pos: 99.4666,14.725122 parent: 1 + - uid: 30045 + components: + - type: Transform + pos: 9.596292,21.592123 + parent: 1 - proto: RandomBox entities: - uid: 2128 @@ -155252,6 +156447,171 @@ entities: - type: Transform pos: 84.52116,17.583738 parent: 1 +- proto: SecureCabinet + entities: + - uid: 29793 + components: + - type: Transform + pos: 59.5,40.5 + parent: 1 +- proto: SecureCabinetAttorney + entities: + - uid: 9883 + components: + - type: Transform + pos: 47.5,7.5 + parent: 1 + - uid: 13772 + components: + - type: Transform + pos: 42.5,12.5 + parent: 1 +- proto: SecureCabinetCaptain + entities: + - uid: 23526 + components: + - type: Transform + pos: 128.72833,-3.3365998 + parent: 1 +- proto: SecureCabinetCE + entities: + - uid: 7323 + components: + - type: Transform + pos: -53.5,0.5 + parent: 1 +- proto: SecureCabinetCJ + entities: + - uid: 29795 + components: + - type: Transform + pos: 107.245705,10.443604 + parent: 1 +- proto: SecureCabinetClerk + entities: + - uid: 6995 + components: + - type: Transform + pos: 101.29022,9.778407 + parent: 1 +- proto: SecureCabinetCMO + entities: + - uid: 7289 + components: + - type: Transform + pos: 78.45868,-8.418583 + parent: 1 +- proto: SecureCabinetCommand + entities: + - uid: 4403 + components: + - type: Transform + pos: 123.5,5.5 + parent: 1 + - uid: 29786 + components: + - type: Transform + pos: 118.5,-7.5 + parent: 1 +- proto: SecureCabinetDetective + entities: + - uid: 29792 + components: + - type: Transform + pos: 60.842125,22.607807 + parent: 1 +- proto: SecureCabinetEpistemics + entities: + - uid: 5735 + components: + - type: Transform + pos: -11.5,48.5 + parent: 1 + - uid: 6598 + components: + - type: Transform + pos: -5.5,41.5 + parent: 1 +- proto: SecureCabinetHoP + entities: + - uid: 5809 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 +- proto: SecureCabinetLogistics + entities: + - uid: 6537 + components: + - type: Transform + pos: -46.5,-35.5 + parent: 1 + - uid: 29789 + components: + - type: Transform + pos: -6.5,-9.5 + parent: 1 +- proto: SecureCabinetMantis + entities: + - uid: 23919 + components: + - type: Transform + pos: 17.5,39.5 + parent: 1 +- proto: SecureCabinetMedical + entities: + - uid: 23923 + components: + - type: Transform + pos: 65.5,-4.5 + parent: 1 +- proto: SecureCabinetMG + entities: + - uid: 29794 + components: + - type: Transform + pos: 8.5,48.5 + parent: 1 +- proto: SecureCabinetProsecutor + entities: + - uid: 20537 + components: + - type: Transform + pos: 103.24051,15.436655 + parent: 1 +- proto: SecureCabinetPsychologist + entities: + - uid: 14709 + components: + - type: Transform + pos: 73.5,-5.5 + parent: 1 +- proto: SecureCabinetReporter + entities: + - uid: 6536 + components: + - type: Transform + pos: 41.5,-14.5 + parent: 1 +- proto: SecureCabinetSecurity + entities: + - uid: 7296 + components: + - type: Transform + pos: 74.5,18.5 + parent: 1 + - uid: 11672 + components: + - type: Transform + pos: 74.5,12.5 + parent: 1 +- proto: SecureCabinetService + entities: + - uid: 29791 + components: + - type: Transform + pos: 1.5,-12.5 + parent: 1 - proto: SecurityTechFab entities: - uid: 4904 @@ -159968,6 +161328,13 @@ entities: - type: Transform pos: -38.5,14.5 parent: 1 +- proto: SpawnMobCatClippy + entities: + - uid: 29709 + components: + - type: Transform + pos: -17.5,-1.5 + parent: 1 - proto: SpawnMobCatGeneric entities: - uid: 4320 @@ -160095,10 +161462,10 @@ entities: parent: 1 - proto: SpawnMobMedibot entities: - - uid: 25764 + - uid: 29790 components: - type: Transform - pos: 65.5,-4.5 + pos: 66.5,-4.5 parent: 1 - proto: SpawnMobMonkeyPunpun entities: @@ -160166,6 +161533,13 @@ entities: - type: Transform pos: 73.5,-11.5 parent: 1 +- proto: SpawnPointAdminAssistant + entities: + - uid: 29785 + components: + - type: Transform + pos: 122.5,9.5 + parent: 1 - proto: SpawnPointAtmos entities: - uid: 6404 @@ -167661,26 +169035,11 @@ entities: parent: 1 - proto: TelecomServerFilled entities: - - uid: 6536 + - uid: 29787 components: - type: Transform - pos: 123.5,5.5 + pos: 142.5,-2.5 parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6537 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - proto: ThermomachineHeaterMachineCircuitBoard entities: - uid: 6499 @@ -168513,13 +169872,13 @@ entities: - type: Transform pos: 38.5,24.5 parent: 1 +- proto: VendingMachineBoozeUnlocked + entities: - uid: 15896 components: - type: Transform pos: -27.5,43.5 parent: 1 -- proto: VendingMachineBoozeUnlocked - entities: - uid: 24313 components: - type: Transform @@ -190932,7 +192291,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -166932.84 + secondsUntilStateChange: -173305.89 state: Opening - uid: 5096 components: @@ -190954,7 +192313,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -166932.84 + secondsUntilStateChange: -173305.89 state: Opening - uid: 5498 components: @@ -190970,7 +192329,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -166656.47 + secondsUntilStateChange: -173029.52 state: Opening - uid: 8696 components: @@ -191003,7 +192362,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -166654.58 + secondsUntilStateChange: -173027.62 state: Opening - uid: 18835 components: @@ -191015,7 +192374,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -166651.58 + secondsUntilStateChange: -173024.62 state: Opening - uid: 23917 components: @@ -192754,18 +194113,6 @@ entities: rot: 3.141592653589793 rad pos: 70.5,-16.5 parent: 1 - - uid: 13763 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 83.5,33.5 - parent: 1 - - uid: 13772 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 83.5,31.5 - parent: 1 - uid: 16660 components: - type: Transform @@ -192795,14 +194142,28 @@ entities: parent: 1 - proto: WindowTintedReinforcedDirectional entities: - - uid: 23525 + - uid: 25764 components: - type: Transform + rot: -1.5707963267948966 rad + pos: 83.5,33.5 + parent: 1 + - uid: 28084 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 83.5,31.5 + parent: 1 + - uid: 28086 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: 65.5,22.5 parent: 1 - - uid: 23526 + - uid: 29520 components: - type: Transform + rot: -1.5707963267948966 rad pos: 65.5,19.5 parent: 1 - proto: Wirecutter diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index 92524551fa9..75517d70710 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -84,7 +84,7 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAACQQAAAAAAQQAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAACXAAAAAADXAAAAAAAQQAAAAAAQQAAAAAAXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAABfAAAAAAAXAAAAAABXAAAAAABQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAABXAAAAAAAXAAAAAABTgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAABXAAAAAACXAAAAAABXAAAAAABXAAAAAABXAAAAAACXAAAAAABXAAAAAABXAAAAAABXAAAAAACewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAAAXAAAAAADTgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAADXAAAAAACXAAAAAABfAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAADfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAACXAAAAAAAXAAAAAADXAAAAAABXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAABfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAbAAAAAAATgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAADXAAAAAABXAAAAAACXAAAAAAAXAAAAAADfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAADXAAAAAAAXAAAAAADXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAADfAAAAAAAHgAAAAABHgAAAAABHgAAAAADfAAAAAAAHgAAAAACHgAAAAACXAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAABfAAAAAAAHgAAAAABHgAAAAADXAAAAAADfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAACfAAAAAAAHgAAAAAAHgAAAAACHgAAAAACfAAAAAAAHgAAAAADHgAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAACQQAAAAAAQQAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAACXAAAAAADXAAAAAAAQQAAAAAAQQAAAAAAXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAABfAAAAAAAXAAAAAABXAAAAAABQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAABXAAAAAAAXAAAAAABTgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAABXAAAAAACXAAAAAABXAAAAAABXAAAAAABXAAAAAACXAAAAAABXAAAAAABXAAAAAABXAAAAAACewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAAAXAAAAAADTgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAXAAAAAADXAAAAAACTgAAAAAAfAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAADfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAACXAAAAAAAXAAAAAADXAAAAAABXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAABfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAbAAAAAAATgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAADXAAAAAABXAAAAAACXAAAAAAAXAAAAAADfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAADXAAAAAAAXAAAAAADXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAADfAAAAAAAHgAAAAABHgAAAAABHgAAAAADfAAAAAAAHgAAAAACHgAAAAACXAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAABfAAAAAAAHgAAAAABHgAAAAADXAAAAAADfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAACfAAAAAAAHgAAAAAAHgAAAAACHgAAAAACfAAAAAAAHgAAAAADHgAAAAAD version: 6 -1,0: ind: -1,0 @@ -120,7 +120,7 @@ entities: version: 6 1,1: ind: 1,1 - tiles: FgAAAAAAawAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAACXAAAAAACfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAFgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAACXAAAAAADXAAAAAACfAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACfAAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAACXAAAAAABfAAAAAAAXAAAAAACXAAAAAAAXAAAAAADXAAAAAACXAAAAAACfAAAAAAAXAAAAAADXAAAAAACXAAAAAABTgAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAACXAAAAAACfAAAAAAATgAAAAAAXAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAAAXAAAAAACTgAAAAAAXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAACXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAABXAAAAAADXAAAAAABXAAAAAADXAAAAAABXAAAAAABXAAAAAACXAAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAACXAAAAAADXAAAAAADXAAAAAADXAAAAAABXAAAAAABTgAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAADXAAAAAACXAAAAAABXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAABXAAAAAAAXAAAAAABXAAAAAACXAAAAAAAXAAAAAABXAAAAAADXAAAAAADfAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAXAAAAAACXAAAAAADXAAAAAADHgAAAAADTgAAAAAATgAAAAAAHgAAAAABHgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAAAXAAAAAABXAAAAAABHgAAAAABHgAAAAACHgAAAAACHgAAAAABHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAADXAAAAAAAHgAAAAADHgAAAAACHgAAAAACHgAAAAADHgAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAACfAAAAAAAawAAAAAAbAAAAAAAfAAAAAAAXAAAAAABXAAAAAABXAAAAAAALgAAAAABLgAAAAACLgAAAAADLgAAAAACLgAAAAADLgAAAAACLgAAAAACHgAAAAACHgAAAAAAfAAAAAAAawAAAAAAbAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAHgAAAAAAfAAAAAAALgAAAAABHgAAAAABHgAAAAADfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAADgAAAAADDgAAAAADDgAAAAABDgAAAAACDgAAAAADfAAAAAAALgAAAAAAHgAAAAADHgAAAAADfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABDgAAAAAAfAAAAAAALgAAAAADHgAAAAAAHgAAAAABfAAAAAAAawAAAAAAbAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAA + tiles: FgAAAAAAawAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAACXAAAAAACfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAFgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAACXAAAAAADXAAAAAACfAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACfAAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAACXAAAAAABfAAAAAAAXAAAAAACXAAAAAAAXAAAAAADXAAAAAACXAAAAAACfAAAAAAAXAAAAAADXAAAAAACXAAAAAABTgAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAACXAAAAAACfAAAAAAATgAAAAAAXAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAAAXAAAAAACTgAAAAAAXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAACXAAAAAADXAAAAAADXAAAAAADXAAAAAADTgAAAAAAXAAAAAADXAAAAAABXAAAAAADXAAAAAABXAAAAAABXAAAAAACXAAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAACXAAAAAADXAAAAAADXAAAAAADXAAAAAABXAAAAAABTgAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAADXAAAAAACXAAAAAABXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABTgAAAAAAXAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAABXAAAAAAAXAAAAAABXAAAAAACXAAAAAAAXAAAAAABXAAAAAADXAAAAAADfAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAXAAAAAACXAAAAAADXAAAAAADHgAAAAADTgAAAAAATgAAAAAAHgAAAAABHgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAAAXAAAAAABXAAAAAABHgAAAAABHgAAAAACHgAAAAACHgAAAAABHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAADXAAAAAAAHgAAAAADHgAAAAACHgAAAAACHgAAAAADHgAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAACfAAAAAAAawAAAAAAbAAAAAAAfAAAAAAAXAAAAAABXAAAAAABXAAAAAAALgAAAAABLgAAAAACLgAAAAADLgAAAAACLgAAAAADLgAAAAACLgAAAAACHgAAAAACHgAAAAAAfAAAAAAAawAAAAAAbAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAHgAAAAAAfAAAAAAALgAAAAABHgAAAAABHgAAAAADfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAADgAAAAADDgAAAAADDgAAAAABDgAAAAACDgAAAAADfAAAAAAALgAAAAAAHgAAAAADHgAAAAADfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABDgAAAAAAfAAAAAAALgAAAAADHgAAAAAAHgAAAAABfAAAAAAAawAAAAAAbAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAA version: 6 -1,-2: ind: -1,-2 @@ -136,11 +136,11 @@ entities: version: 6 -3,-1: ind: -3,-1 - tiles: fAAAAAAAeQAAAAACeQAAAAADeQAAAAADeQAAAAACeQAAAAADeQAAAAACfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAeQAAAAACeQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAACfAAAAAAAeQAAAAABfAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAABeQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAeQAAAAACeQAAAAABeQAAAAACeQAAAAAAeQAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAAAeQAAAAABeQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACeQAAAAACeQAAAAAAeQAAAAADeQAAAAACeQAAAAAAeQAAAAABeQAAAAACeQAAAAAAeQAAAAADeQAAAAADeQAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAeQAAAAAAfAAAAAAAeQAAAAABeQAAAAADeQAAAAAAeQAAAAABeQAAAAACeQAAAAAAeQAAAAAAeQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAACeQAAAAADfAAAAAAAeQAAAAAAeQAAAAAAeQAAAAABeQAAAAACeQAAAAABeQAAAAABeQAAAAABeQAAAAADfAAAAAAAMwAAAAABMwAAAAADMwAAAAADfAAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAeQAAAAAAeQAAAAACeQAAAAACeQAAAAACeQAAAAADeQAAAAAAeQAAAAACeQAAAAAATgAAAAAAMwAAAAADMwAAAAABMwAAAAABfAAAAAAAeQAAAAABeQAAAAACfAAAAAAAeQAAAAACeQAAAAACeQAAAAAAeQAAAAADeQAAAAAAeQAAAAABeQAAAAACeQAAAAADeQAAAAADMwAAAAACMwAAAAADMQAAAAAAfAAAAAAAeQAAAAAAeQAAAAABeQAAAAABeQAAAAABeQAAAAADeQAAAAABeQAAAAABeQAAAAACeQAAAAADeQAAAAABeQAAAAAATgAAAAAAMwAAAAABMQAAAAACMQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAAXAAAAAACTgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMQAAAAABGAAAAAABXAAAAAACXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAADXAAAAAADXAAAAAACXAAAAAABXAAAAAAAXAAAAAABXAAAAAAAfAAAAAAAMwAAAAAAMQAAAAACMQAAAAAAXAAAAAACXAAAAAACXAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAADXAAAAAADTgAAAAAAMwAAAAACMwAAAAADMQAAAAADXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADXAAAAAACXAAAAAABMwAAAAADMwAAAAABMwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAADTgAAAAAAMwAAAAADMwAAAAAAMwAAAAAAHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAACHgAAAAADHgAAAAADfAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA + tiles: fAAAAAAAeQAAAAACeQAAAAADeQAAAAADeQAAAAACeQAAAAADeQAAAAACfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAeQAAAAACeQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAACfAAAAAAAeQAAAAABfAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAABeQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAeQAAAAACeQAAAAABeQAAAAACeQAAAAAAeQAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAAAeQAAAAABeQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACeQAAAAACeQAAAAAAeQAAAAADeQAAAAACeQAAAAAAeQAAAAABeQAAAAACeQAAAAAAeQAAAAADeQAAAAADeQAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAeQAAAAAAfAAAAAAAeQAAAAABeQAAAAADeQAAAAAAeQAAAAABeQAAAAACeQAAAAAAeQAAAAAAeQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAACeQAAAAADfAAAAAAAeQAAAAAAeQAAAAAAeQAAAAABeQAAAAACeQAAAAABeQAAAAABeQAAAAABeQAAAAADfAAAAAAAMwAAAAABMwAAAAADMwAAAAADfAAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAeQAAAAAAeQAAAAACeQAAAAACeQAAAAACeQAAAAADeQAAAAAAeQAAAAACeQAAAAAATgAAAAAAMwAAAAADMwAAAAABMwAAAAABfAAAAAAAeQAAAAABeQAAAAACfAAAAAAAeQAAAAACeQAAAAACeQAAAAAAeQAAAAADeQAAAAAAeQAAAAABeQAAAAACeQAAAAADeQAAAAADMwAAAAACMwAAAAADMQAAAAAAfAAAAAAAeQAAAAAAeQAAAAABeQAAAAABeQAAAAABeQAAAAADeQAAAAABeQAAAAABeQAAAAACeQAAAAADeQAAAAABeQAAAAAATgAAAAAAMwAAAAABMQAAAAACMQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAAXAAAAAACTgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMQAAAAABGAAAAAABTgAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAADXAAAAAADXAAAAAACXAAAAAABXAAAAAAAXAAAAAABXAAAAAAAfAAAAAAAMwAAAAAAMQAAAAACMQAAAAAAXAAAAAACXAAAAAACXAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAADXAAAAAADTgAAAAAAMwAAAAACMwAAAAADMQAAAAADTgAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADXAAAAAACXAAAAAABMwAAAAADMwAAAAABMwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAADTgAAAAAAMwAAAAADMwAAAAAAMwAAAAAAHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAACHgAAAAADHgAAAAADfAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA version: 6 -3,0: ind: -3,0 - tiles: HgAAAAAAHgAAAAADHgAAAAABTgAAAAAAHgAAAAABHgAAAAABHgAAAAABfAAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAACXAAAAAADXAAAAAADXAAAAAADXAAAAAABHgAAAAABHgAAAAADHgAAAAABfAAAAAAAHgAAAAADHgAAAAADHgAAAAAAfAAAAAAAXAAAAAADXAAAAAADXAAAAAADXAAAAAAAXAAAAAADLgAAAAABXAAAAAADLgAAAAAAHgAAAAAAHgAAAAADHgAAAAABfAAAAAAATgAAAAAAHgAAAAACTgAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAACLgAAAAADXAAAAAADHgAAAAADHgAAAAAAHgAAAAABfAAAAAAAXAAAAAABXAAAAAACXAAAAAABXAAAAAADXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAABXAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACLgAAAAABXAAAAAABXAAAAAABXAAAAAADLgAAAAACXAAAAAAAXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbwAAAAACbwAAAAACbwAAAAADfAAAAAAAXAAAAAABXAAAAAACXAAAAAACLgAAAAACXAAAAAABXAAAAAADXAAAAAABXAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAHgAAAAABbwAAAAAAbwAAAAACbwAAAAADfAAAAAAAXAAAAAACLgAAAAACXAAAAAAAXAAAAAACXAAAAAAALgAAAAABXAAAAAADXAAAAAAAfAAAAAAAHgAAAAADHgAAAAACHgAAAAAAbwAAAAAAbwAAAAAAbwAAAAADfAAAAAAAXAAAAAADXAAAAAADXAAAAAADLgAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAABfAAAAAAAHgAAAAADHgAAAAABHgAAAAADbwAAAAADbwAAAAAAbwAAAAADfAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAABXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbwAAAAADbwAAAAAAbwAAAAABfAAAAAAATgAAAAAAbwAAAAACbwAAAAADTgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAABbwAAAAABbwAAAAABbwAAAAACbwAAAAACbwAAAAADbwAAAAAAbwAAAAACbwAAAAACfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAACHgAAAAADHgAAAAAAHgAAAAACbwAAAAABbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAADbwAAAAADbwAAAAADbwAAAAABfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAADHgAAAAABHgAAAAABHgAAAAADbwAAAAABbwAAAAACbwAAAAACbwAAAAADbwAAAAADbwAAAAAAbwAAAAAAbwAAAAABfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAABHgAAAAABHgAAAAADHgAAAAAATgAAAAAATgAAAAAAfAAAAAAAbwAAAAADbwAAAAADbwAAAAACbwAAAAABbwAAAAACfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAACHgAAAAADHgAAAAAAHgAAAAADbwAAAAADbwAAAAADTgAAAAAAbwAAAAADbwAAAAAAbwAAAAACbwAAAAACbwAAAAABfAAAAAAAawAAAAAAawAAAAAAXAAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAACbwAAAAABbwAAAAAAbwAAAAACbwAAAAAAbwAAAAACbwAAAAAAbwAAAAADbwAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAC + tiles: HgAAAAAAHgAAAAADHgAAAAABTgAAAAAAHgAAAAABHgAAAAABHgAAAAABfAAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAACTgAAAAAAXAAAAAADXAAAAAADXAAAAAABHgAAAAABHgAAAAADHgAAAAABfAAAAAAAHgAAAAADHgAAAAADHgAAAAAAfAAAAAAAXAAAAAADXAAAAAADXAAAAAADXAAAAAAAXAAAAAADLgAAAAABXAAAAAADLgAAAAAAHgAAAAAAHgAAAAADHgAAAAABfAAAAAAATgAAAAAAHgAAAAACTgAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAACLgAAAAADXAAAAAADHgAAAAADHgAAAAAAHgAAAAABfAAAAAAAXAAAAAABXAAAAAACXAAAAAABXAAAAAADXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABTgAAAAAAXAAAAAABXAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACLgAAAAABXAAAAAABXAAAAAABXAAAAAADLgAAAAACXAAAAAAAXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbwAAAAACbwAAAAACbwAAAAADfAAAAAAAXAAAAAABXAAAAAACXAAAAAACLgAAAAACXAAAAAABXAAAAAADXAAAAAABXAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAHgAAAAABbwAAAAAAbwAAAAACbwAAAAADfAAAAAAAXAAAAAACLgAAAAACXAAAAAAAXAAAAAACXAAAAAAALgAAAAABXAAAAAADXAAAAAAAfAAAAAAAHgAAAAADHgAAAAACHgAAAAAAbwAAAAAAbwAAAAAAbwAAAAADfAAAAAAAXAAAAAADXAAAAAADXAAAAAADLgAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAABfAAAAAAAHgAAAAADHgAAAAABHgAAAAADbwAAAAADbwAAAAAAbwAAAAADfAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAABXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbwAAAAADbwAAAAAAbwAAAAABfAAAAAAATgAAAAAAbwAAAAACbwAAAAADTgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAABbwAAAAABbwAAAAABbwAAAAACbwAAAAACbwAAAAADbwAAAAAAbwAAAAACbwAAAAACfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAACHgAAAAADHgAAAAAAHgAAAAACbwAAAAABbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAADbwAAAAADbwAAAAADbwAAAAABfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAADHgAAAAABHgAAAAABHgAAAAADbwAAAAABbwAAAAACbwAAAAACbwAAAAADbwAAAAADbwAAAAAAbwAAAAAAbwAAAAABfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAABHgAAAAABHgAAAAADHgAAAAAATgAAAAAATgAAAAAAfAAAAAAAbwAAAAADbwAAAAADbwAAAAACbwAAAAABbwAAAAACfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAACHgAAAAADHgAAAAAAHgAAAAADbwAAAAADbwAAAAADTgAAAAAAbwAAAAADbwAAAAAAbwAAAAACbwAAAAACbwAAAAABfAAAAAAAawAAAAAAawAAAAAAXAAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAACbwAAAAABbwAAAAAAbwAAAAACbwAAAAAAbwAAAAACbwAAAAAAbwAAAAADbwAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAC version: 6 -4,-1: ind: -4,-1 @@ -152,7 +152,7 @@ entities: version: 6 -5,-1: ind: -5,-1 - tiles: HgAAAAADHgAAAAAAHgAAAAADHgAAAAADfAAAAAAAXAAAAAABLgAAAAADXAAAAAAAXAAAAAAAHgAAAAAAHgAAAAACHgAAAAAAfAAAAAAAOQAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAADHgAAAAADfAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAABfAAAAAAATgAAAAAAHgAAAAADfAAAAAAAOQAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAAAHgAAAAAAHgAAAAABfAAAAAAAXAAAAAACXAAAAAABLgAAAAAAXAAAAAABfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAADfAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAABHgAAAAABHgAAAAABHgAAAAACHgAAAAAATgAAAAAAXAAAAAABLgAAAAABXAAAAAADXAAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAACHgAAAAACHgAAAAACHgAAAAADHgAAAAADHgAAAAADHgAAAAABHgAAAAADXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAACTgAAAAAAHgAAAAADHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACTgAAAAAAXAAAAAAAXAAAAAADLgAAAAACXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAACfAAAAAAAXAAAAAABXAAAAAAAXAAAAAADXAAAAAACTgAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAADfAAAAAAAXAAAAAADLgAAAAADXAAAAAACXAAAAAADTgAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAACHgAAAAACHgAAAAABHgAAAAAAHgAAAAADHgAAAAABfAAAAAAAXAAAAAACXAAAAAACXAAAAAADXAAAAAADTgAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAACHgAAAAABHgAAAAACHgAAAAACfAAAAAAAXAAAAAABXAAAAAADLgAAAAAAXAAAAAAATgAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAADfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAHgAAAAAATgAAAAAAEQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADfAAAAAAAXAAAAAADXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAABXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAATgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAACTgAAAAAAXAAAAAADXAAAAAACXAAAAAABXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAABTgAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAADTgAAAAAAXAAAAAACXAAAAAACXAAAAAACXAAAAAAAXAAAAAADXAAAAAABXAAAAAADXAAAAAADXAAAAAAAXAAAAAACTgAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAABfAAAAAAAXAAAAAACXAAAAAACXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA + tiles: HgAAAAADHgAAAAAAHgAAAAADHgAAAAADfAAAAAAAXAAAAAABLgAAAAADXAAAAAAAXAAAAAAAHgAAAAAAHgAAAAACHgAAAAAAfAAAAAAAOQAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAADHgAAAAADfAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAABfAAAAAAATgAAAAAAHgAAAAADfAAAAAAAOQAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAAAHgAAAAAAHgAAAAABfAAAAAAAXAAAAAACXAAAAAABLgAAAAAAXAAAAAABfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAADfAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAABHgAAAAABHgAAAAABHgAAAAACHgAAAAAATgAAAAAAXAAAAAABLgAAAAABXAAAAAADXAAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAACHgAAAAACHgAAAAACHgAAAAADHgAAAAADHgAAAAADHgAAAAABHgAAAAADXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAACTgAAAAAAHgAAAAADHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACTgAAAAAAXAAAAAAAXAAAAAADLgAAAAACXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAACfAAAAAAAXAAAAAABXAAAAAAAXAAAAAADXAAAAAACTgAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAADfAAAAAAAXAAAAAADLgAAAAADXAAAAAACXAAAAAADTgAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAACHgAAAAACHgAAAAABHgAAAAAAHgAAAAADHgAAAAABfAAAAAAAXAAAAAACXAAAAAACXAAAAAADXAAAAAADTgAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAACHgAAAAABHgAAAAACHgAAAAACfAAAAAAAXAAAAAABXAAAAAADLgAAAAAAXAAAAAAATgAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAfAAAAAAAfAAAAAAATgAAAAAAXAAAAAACTgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAHgAAAAAATgAAAAAAEQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADfAAAAAAAXAAAAAADXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAABXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAATgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAACTgAAAAAAXAAAAAADXAAAAAACXAAAAAABXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAABTgAAAAAAHgAAAAACHgAAAAABHgAAAAABHgAAAAADTgAAAAAAXAAAAAACXAAAAAACXAAAAAACXAAAAAAAXAAAAAADXAAAAAABXAAAAAADXAAAAAADXAAAAAAAXAAAAAACTgAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAABfAAAAAAAXAAAAAACXAAAAAACXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA version: 6 -4,-2: ind: -4,-2 @@ -196,7 +196,7 @@ entities: version: 6 -3,2: ind: -3,2 - tiles: TQAAAAABTQAAAAADTQAAAAADTQAAAAADTQAAAAABTQAAAAACTgAAAAAAfAAAAAAAHgAAAAADHgAAAAACHgAAAAACTgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAABTQAAAAACTQAAAAABTQAAAAABTQAAAAADTQAAAAAATQAAAAABTgAAAAAAfAAAAAAAHgAAAAABHgAAAAABHgAAAAABTgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAABHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADTQAAAAACTQAAAAACTgAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAAAHgAAAAADHgAAAAACHgAAAAAAHgAAAAABTQAAAAADTQAAAAAATgAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAADTgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAABfAAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAAXAAAAAABAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAAXAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAAXAAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACTgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAADXAAAAAAAXAAAAAACXAAAAAABXAAAAAAAXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAABLgAAAAABXAAAAAACLgAAAAACXAAAAAABLgAAAAAAXAAAAAACLgAAAAABXAAAAAABXAAAAAAATgAAAAAAXAAAAAAAXAAAAAADXAAAAAACTgAAAAAATgAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAACXAAAAAAAXAAAAAABTgAAAAAAfAAAAAAAXAAAAAAAXAAAAAACLgAAAAABXAAAAAAALgAAAAABXAAAAAACLgAAAAACXAAAAAABLgAAAAADXAAAAAAAfAAAAAAAXAAAAAAB + tiles: TQAAAAABTQAAAAADTQAAAAADTQAAAAADTQAAAAABTQAAAAACTgAAAAAAfAAAAAAAHgAAAAADHgAAAAACHgAAAAACTgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAABTQAAAAACTQAAAAABTQAAAAABTQAAAAADTQAAAAAATQAAAAABTgAAAAAAfAAAAAAAHgAAAAABHgAAAAABHgAAAAABTgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAABHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADTQAAAAACTQAAAAACTgAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAAAHgAAAAADHgAAAAACHgAAAAAAHgAAAAABTQAAAAADTQAAAAAATgAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAADTgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAABfAAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAXAAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAAXAAAAAABAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAAXAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAAXAAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACTgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAADXAAAAAAAXAAAAAACXAAAAAABXAAAAAAAXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAABLgAAAAABXAAAAAACLgAAAAACXAAAAAABLgAAAAAAXAAAAAACLgAAAAABXAAAAAABXAAAAAAATgAAAAAAXAAAAAAAXAAAAAADXAAAAAACTgAAAAAATgAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAACXAAAAAAAXAAAAAABTgAAAAAAfAAAAAAAXAAAAAAAXAAAAAACLgAAAAABXAAAAAAALgAAAAABXAAAAAACLgAAAAACXAAAAAABLgAAAAADXAAAAAAAfAAAAAAAXAAAAAAB version: 6 -4,3: ind: -4,3 @@ -224,7 +224,7 @@ entities: version: 6 -2,2: ind: -2,2 - tiles: XAAAAAAAXAAAAAACfAAAAAAAeQAAAAACeQAAAAADeQAAAAAAeQAAAAADeQAAAAACeQAAAAACeQAAAAACeQAAAAABfAAAAAAAKQAAAAADKQAAAAADKQAAAAAAKQAAAAADXAAAAAABXAAAAAADfAAAAAAAeQAAAAACeQAAAAABeQAAAAAAeQAAAAABeQAAAAADeQAAAAADeQAAAAADeQAAAAABfAAAAAAAKQAAAAADKQAAAAADKQAAAAAAKQAAAAADXAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAAAeQAAAAACeQAAAAAAeQAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAABXAAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAeQAAAAADeQAAAAACeQAAAAADeQAAAAABfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAABXAAAAAABTgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAeQAAAAADeQAAAAAAeQAAAAAAeQAAAAADfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAAAXAAAAAADPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAeQAAAAACeQAAAAABeQAAAAADeQAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAADXAAAAAABfAAAAAAAPgAAAAAAPgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAABfAAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAACXAAAAAACXAAAAAACXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAAAXAAAAAACXAAAAAACXAAAAAAAXAAAAAABOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAACXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAACXAAAAAABXAAAAAAAfAAAAAAATgAAAAAABAAAAAADTgAAAAAAfAAAAAAATgAAAAAABAAAAAAATgAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAABXAAAAAADfAAAAAAAfAAAAAAABAAAAAACBAAAAAABBAAAAAABfAAAAAAABAAAAAACBAAAAAAABAAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAAAXAAAAAACfAAAAAAABAAAAAABBAAAAAACBAAAAAADBAAAAAABfAAAAAAABAAAAAAABAAAAAABBAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAADXAAAAAADTgAAAAAABAAAAAADBAAAAAACBAAAAAADBAAAAAADfAAAAAAABAAAAAAABAAAAAABBAAAAAAAfAAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAADXAAAAAAABAAAAAABBAAAAAACBAAAAAAABAAAAAADBAAAAAACfAAAAAAABAAAAAADBAAAAAABBAAAAAABBAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAACXAAAAAADTgAAAAAABAAAAAABBAAAAAADBAAAAAACBAAAAAADfAAAAAAABAAAAAABBAAAAAACBAAAAAACBAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAA + tiles: XAAAAAAAXAAAAAACfAAAAAAAeQAAAAACeQAAAAADeQAAAAAAeQAAAAADeQAAAAACeQAAAAACeQAAAAACeQAAAAABfAAAAAAAKQAAAAADKQAAAAADKQAAAAAAKQAAAAADXAAAAAABXAAAAAADfAAAAAAAeQAAAAACeQAAAAABeQAAAAAAeQAAAAABeQAAAAADeQAAAAADeQAAAAADeQAAAAABfAAAAAAAKQAAAAADKQAAAAADKQAAAAAAKQAAAAADXAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAAAeQAAAAACeQAAAAAAeQAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAABXAAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAeQAAAAADeQAAAAACeQAAAAADeQAAAAABfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAABXAAAAAABTgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAeQAAAAADeQAAAAAAeQAAAAAAeQAAAAADfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAAAXAAAAAADPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAeQAAAAACeQAAAAABeQAAAAADeQAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAADTgAAAAAAfAAAAAAAPgAAAAAAPgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAABfAAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAACXAAAAAACXAAAAAACXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAAAXAAAAAACXAAAAAACXAAAAAAAXAAAAAABOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAACXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAACXAAAAAABXAAAAAAAfAAAAAAATgAAAAAABAAAAAADTgAAAAAAfAAAAAAATgAAAAAABAAAAAAATgAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAABXAAAAAADfAAAAAAAfAAAAAAABAAAAAACBAAAAAABBAAAAAABfAAAAAAABAAAAAACBAAAAAAABAAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAAAXAAAAAACfAAAAAAABAAAAAABBAAAAAACBAAAAAADBAAAAAABfAAAAAAABAAAAAAABAAAAAABBAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAADXAAAAAADTgAAAAAABAAAAAADBAAAAAACBAAAAAADBAAAAAADfAAAAAAABAAAAAAABAAAAAABBAAAAAAAfAAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAADXAAAAAAABAAAAAABBAAAAAACBAAAAAAABAAAAAADBAAAAAACfAAAAAAABAAAAAADBAAAAAABBAAAAAABBAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAXAAAAAACXAAAAAADTgAAAAAABAAAAAABBAAAAAADBAAAAAACBAAAAAADfAAAAAAABAAAAAABBAAAAAACBAAAAAACBAAAAAACfAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAA version: 6 -2,3: ind: -2,3 @@ -232,7 +232,7 @@ entities: version: 6 -1,3: ind: -1,3 - tiles: TgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAADXAAAAAACXAAAAAABXAAAAAADXAAAAAABXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAABXAAAAAACXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAACXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACXAAAAAACXAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADXAAAAAACfAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAACfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAANwAAAAAATgAAAAAAfAAAAAAAAQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAAQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAAEgAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAfAAAAAAAEgAAAAAATgAAAAAATgAAAAAATgAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAfAAAAAAANwAAAAAATgAAAAAATgAAAAAATgAAAAAAEgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAEgAAAAAATgAAAAAATgAAAAAATgAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAATgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAA + tiles: TgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAACTgAAAAAAXAAAAAADXAAAAAACXAAAAAABXAAAAAADXAAAAAABXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAABXAAAAAACXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAACXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACTgAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADXAAAAAACfAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAACfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAANwAAAAAATgAAAAAAfAAAAAAAAQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAAQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAAEgAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAfAAAAAAAEgAAAAAATgAAAAAATgAAAAAATgAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAfAAAAAAANwAAAAAATgAAAAAATgAAAAAATgAAAAAAEgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAEgAAAAAATgAAAAAATgAAAAAATgAAAAAANwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAATgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAA version: 6 -2,5: ind: -2,5 @@ -256,7 +256,7 @@ entities: version: 6 0,3: ind: 0,3 - tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADXAAAAAADXAAAAAACXAAAAAACXAAAAAABXAAAAAADXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAADXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAABXAAAAAAAXAAAAAACXAAAAAABXAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABXAAAAAAAXAAAAAACXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAfAAAAAAATgAAAAAAXAAAAAADTgAAAAAAXAAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAAAXAAAAAADfAAAAAAATgAAAAAAXAAAAAACTgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfAAAAAAAXAAAAAADXAAAAAADfAAAAAAAXAAAAAACXAAAAAABXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAfAAAAAAAXAAAAAABXAAAAAAATgAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAABXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAKgAAAAAAKgAAAAAAAwAAAAAAAQAAAAAAfAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAADNwAAAAAAfAAAAAAAKgAAAAAAKgAAAAAAAwAAAAAAAQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAACXAAAAAAAXAAAAAAAXAAAAAADXAAAAAACNwAAAAAAfAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAfAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAADXAAAAAADXAAAAAACXAAAAAAANwAAAAAAfAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAACXAAAAAADXAAAAAABXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAADXAAAAAABXAAAAAABXAAAAAABXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAAAXAAAAAABXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAABXAAAAAABXAAAAAACXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA + tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADXAAAAAADXAAAAAACXAAAAAACXAAAAAABXAAAAAADXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADXAAAAAADXAAAAAAATgAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAABXAAAAAAAXAAAAAACXAAAAAABXAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABXAAAAAAAXAAAAAACXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAADXAAAAAADTgAAAAAAXAAAAAADXAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAfAAAAAAATgAAAAAAXAAAAAADTgAAAAAAXAAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAAAXAAAAAADfAAAAAAATgAAAAAAXAAAAAACTgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfAAAAAAAXAAAAAADXAAAAAADfAAAAAAAXAAAAAACXAAAAAABXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAfAAAAAAAXAAAAAABXAAAAAAATgAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAABXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAKgAAAAAAKgAAAAAAAwAAAAAAAQAAAAAAfAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAADNwAAAAAAfAAAAAAAKgAAAAAAKgAAAAAAAwAAAAAAAQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAACXAAAAAAAXAAAAAAAXAAAAAADXAAAAAACNwAAAAAAfAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAfAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAADXAAAAAADXAAAAAACXAAAAAAANwAAAAAAfAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAACXAAAAAADXAAAAAABXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAADXAAAAAABXAAAAAABXAAAAAABXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAAAXAAAAAABXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAABXAAAAAABXAAAAAACXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA version: 6 1,2: ind: 1,2 @@ -264,11 +264,11 @@ entities: version: 6 -2,0: ind: -2,0 - tiles: XAAAAAADXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAACXAAAAAADXAAAAAACXAAAAAABXAAAAAAAXAAAAAABXAAAAAACXAAAAAACXAAAAAADXAAAAAABXAAAAAADXAAAAAADLgAAAAACXAAAAAABLgAAAAADXAAAAAABLgAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAACXAAAAAACXAAAAAABXAAAAAACLgAAAAADXAAAAAABLgAAAAABXAAAAAABLgAAAAADXAAAAAACLgAAAAACXAAAAAADXAAAAAACXAAAAAADXAAAAAADXAAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAABXAAAAAACXAAAAAABXAAAAAADXAAAAAABXAAAAAADXAAAAAABXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAADXAAAAAADXAAAAAACXAAAAAABXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAABfAAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAfAAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAHgAAAAAAHgAAAAACfAAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAATgAAAAAAXAAAAAAAXAAAAAACXAAAAAACfAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAfAAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAAATgAAAAAAXAAAAAADXAAAAAACXAAAAAAAfAAAAAAAXAAAAAABXAAAAAADXAAAAAADfAAAAAAAHgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAABHgAAAAACfAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAfAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAAATgAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAAAXAAAAAABXAAAAAABXAAAAAABfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAQgAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAAAHgAAAAABHgAAAAADHgAAAAAATgAAAAAAXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAADHgAAAAABHgAAAAADHgAAAAADTgAAAAAAXAAAAAACXAAAAAABXAAAAAAATgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHgAAAAAAHgAAAAACHgAAAAAATgAAAAAAHgAAAAADHgAAAAACHgAAAAACHgAAAAADXAAAAAADXAAAAAAAXAAAAAACXAAAAAACWQAAAAAAWQAAAAAAWQAAAAAAXAAAAAAAHgAAAAAAHgAAAAACfAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAADfAAAAAAAXAAAAAAAXAAAAAACXAAAAAADTgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHgAAAAACHgAAAAABfAAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAACTgAAAAAAXAAAAAABXAAAAAABXAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHgAAAAABHgAAAAABfAAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAADTgAAAAAAXAAAAAABXAAAAAABXAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFQAAAAAA + tiles: XAAAAAADXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAACXAAAAAADXAAAAAACXAAAAAABXAAAAAAAXAAAAAABXAAAAAACXAAAAAACTgAAAAAAXAAAAAABXAAAAAADXAAAAAADLgAAAAACXAAAAAABLgAAAAADXAAAAAABLgAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAACXAAAAAACXAAAAAABXAAAAAACLgAAAAADXAAAAAABLgAAAAABXAAAAAABLgAAAAADXAAAAAACLgAAAAACXAAAAAADXAAAAAACXAAAAAADXAAAAAADXAAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAABXAAAAAACXAAAAAABXAAAAAADXAAAAAABXAAAAAADXAAAAAABXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAADXAAAAAADTgAAAAAAXAAAAAABXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAABfAAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAfAAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAHgAAAAAAHgAAAAACfAAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAATgAAAAAAXAAAAAAAXAAAAAACXAAAAAACfAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAfAAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAAATgAAAAAAXAAAAAADXAAAAAACXAAAAAAAfAAAAAAAXAAAAAABXAAAAAADXAAAAAADfAAAAAAAHgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAABHgAAAAACfAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAfAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAAATgAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAAAXAAAAAABXAAAAAABXAAAAAABfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAQgAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAAAHgAAAAABHgAAAAADHgAAAAAATgAAAAAAXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAADHgAAAAABHgAAAAADHgAAAAADTgAAAAAAXAAAAAACXAAAAAABXAAAAAAATgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHgAAAAAAHgAAAAACHgAAAAAATgAAAAAAHgAAAAADHgAAAAACHgAAAAACHgAAAAADXAAAAAADXAAAAAAAXAAAAAACXAAAAAACWQAAAAAAWQAAAAAAWQAAAAAAXAAAAAAAHgAAAAAAHgAAAAACfAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAADfAAAAAAAXAAAAAAAXAAAAAACXAAAAAADTgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHgAAAAACHgAAAAABfAAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAACTgAAAAAAXAAAAAABXAAAAAABXAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHgAAAAABHgAAAAABfAAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAADTgAAAAAAXAAAAAABXAAAAAABXAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFQAAAAAA version: 6 -2,1: ind: -2,1 - tiles: HgAAAAADHgAAAAACfAAAAAAAHgAAAAAAHgAAAAABHgAAAAADHgAAAAABfAAAAAAAXAAAAAACXAAAAAACXAAAAAADfAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACXAAAAAABfAAAAAAAXAAAAAADXAAAAAACXAAAAAACfAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAABXAAAAAABXAAAAAABXAAAAAAAXAAAAAACXAAAAAACXAAAAAADXAAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAADfAAAAAAAXAAAAAAAXAAAAAACXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAACXAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAADXAAAAAACXAAAAAABXAAAAAACfAAAAAAAXAAAAAACXAAAAAABXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAACXAAAAAABXAAAAAABXAAAAAACXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAABXAAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAABXAAAAAAAXAAAAAACXAAAAAACXAAAAAABXAAAAAADXAAAAAABXAAAAAAAXAAAAAABXAAAAAAAXAAAAAADXAAAAAABfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAAAXAAAAAADXAAAAAACTgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAXAAAAAAAXAAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAACTgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAXAAAAAABXAAAAAACfAAAAAAAfAAAAAAATgAAAAAAXAAAAAABTgAAAAAAXAAAAAACXAAAAAADfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAABXAAAAAADXAAAAAABeQAAAAACeQAAAAAAeQAAAAACeQAAAAACeQAAAAADeQAAAAADeQAAAAABeQAAAAADfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAACXAAAAAAAfAAAAAAAeQAAAAADeQAAAAAAeQAAAAABeQAAAAACeQAAAAACeQAAAAABeQAAAAABeQAAAAACfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAeQAAAAABeQAAAAAAeQAAAAADeQAAAAAAeQAAAAACeQAAAAABeQAAAAABeQAAAAABfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAABXAAAAAACTgAAAAAAeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADeQAAAAACeQAAAAACeQAAAAADeQAAAAAAfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAACXAAAAAAAXAAAAAADeQAAAAADeQAAAAACeQAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAAAeQAAAAACfAAAAAAATgAAAAAAXAAAAAACTgAAAAAATgAAAAAAXAAAAAADXAAAAAAATgAAAAAAeQAAAAABeQAAAAACeQAAAAADeQAAAAABeQAAAAABeQAAAAAAeQAAAAAAeQAAAAABfAAAAAAAKQAAAAAAKQAAAAADKQAAAAAAKQAAAAAD + tiles: HgAAAAADHgAAAAACfAAAAAAAHgAAAAAAHgAAAAABHgAAAAADHgAAAAABfAAAAAAAXAAAAAACXAAAAAACXAAAAAADfAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACXAAAAAABfAAAAAAAXAAAAAADXAAAAAACXAAAAAACfAAAAAAAXAAAAAADXAAAAAACTgAAAAAAXAAAAAABXAAAAAABXAAAAAABXAAAAAAAXAAAAAACXAAAAAACXAAAAAADXAAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAADfAAAAAAAXAAAAAAAXAAAAAACXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAACXAAAAAAAXAAAAAADXAAAAAACXAAAAAAAXAAAAAADXAAAAAACXAAAAAABXAAAAAACfAAAAAAAXAAAAAACXAAAAAABXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAADXAAAAAACXAAAAAABXAAAAAABXAAAAAACXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAABTgAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAABXAAAAAAAXAAAAAACXAAAAAACXAAAAAABTgAAAAAAXAAAAAABXAAAAAAAXAAAAAABXAAAAAAAXAAAAAADXAAAAAABfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAAAXAAAAAADXAAAAAACTgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAXAAAAAAAXAAAAAAATgAAAAAAXAAAAAADXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACXAAAAAACTgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAXAAAAAABXAAAAAACfAAAAAAAfAAAAAAATgAAAAAAXAAAAAABTgAAAAAAXAAAAAACXAAAAAADfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAABXAAAAAADXAAAAAABeQAAAAACeQAAAAAAeQAAAAACeQAAAAACeQAAAAADeQAAAAADeQAAAAABeQAAAAADfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAACXAAAAAAAfAAAAAAAeQAAAAADeQAAAAAAeQAAAAABeQAAAAACeQAAAAACeQAAAAABeQAAAAABeQAAAAACfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAeQAAAAABeQAAAAAAeQAAAAADeQAAAAAAeQAAAAACeQAAAAABeQAAAAABeQAAAAABfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAABXAAAAAACTgAAAAAAeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADeQAAAAACeQAAAAACeQAAAAADeQAAAAAAfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAACXAAAAAAAXAAAAAADeQAAAAADeQAAAAACeQAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAAAeQAAAAACfAAAAAAATgAAAAAAXAAAAAACTgAAAAAATgAAAAAAXAAAAAADXAAAAAAATgAAAAAAeQAAAAABeQAAAAACeQAAAAADeQAAAAABeQAAAAABeQAAAAAAeQAAAAAAeQAAAAABfAAAAAAAKQAAAAAAKQAAAAADKQAAAAAAKQAAAAAD version: 6 0,2: ind: 0,2 @@ -276,7 +276,7 @@ entities: version: 6 0,1: ind: 0,1 - tiles: HgAAAAACHgAAAAACHgAAAAABMwAAAAADMwAAAAACXAAAAAABXAAAAAADXAAAAAACHgAAAAADHgAAAAABHgAAAAAAHgAAAAABHgAAAAADFgAAAAAAFgAAAAAAFgAAAAAAHgAAAAAAHgAAAAACfAAAAAAAMwAAAAACMwAAAAACXAAAAAACXAAAAAAAXAAAAAADTgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAHgAAAAADHgAAAAAAfAAAAAAAMwAAAAADMwAAAAAAXAAAAAAAXAAAAAABXAAAAAAATgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAADfAAAAAAAMwAAAAAAfAAAAAAAXAAAAAADXAAAAAADXAAAAAADfAAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfAAAAAAAXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAADXAAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAABXAAAAAAAXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAABXAAAAAADXAAAAAABXAAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAADXAAAAAACXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAADXAAAAAAAXAAAAAADXAAAAAACXAAAAAAAfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAXAAAAAABXAAAAAACXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADXAAAAAABXAAAAAACTgAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADfAAAAAAAHgAAAAABHgAAAAADHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADPQAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAXAAAAAACTgAAAAAAHgAAAAACHgAAAAABHgAAAAACfAAAAAAAHgAAAAABHgAAAAABHgAAAAADPQAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAABXAAAAAAATgAAAAAAHgAAAAABHgAAAAAAHgAAAAADfAAAAAAAHgAAAAAAHgAAAAACHgAAAAABPQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAADfAAAAAAAHgAAAAADHgAAAAABHgAAAAABfAAAAAAAHgAAAAAALgAAAAADLgAAAAACPQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXAAAAAACXAAAAAAAXAAAAAADfAAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAAAHgAAAAACLgAAAAAAHgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXAAAAAAAXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADLgAAAAABDgAAAAABfAAAAAAAQQAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAABXAAAAAACXAAAAAAAfAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAHgAAAAABLgAAAAACDgAAAAAB + tiles: HgAAAAACHgAAAAACHgAAAAABMwAAAAADMwAAAAACXAAAAAABXAAAAAADXAAAAAACHgAAAAADHgAAAAABHgAAAAAAHgAAAAABHgAAAAADFgAAAAAAFgAAAAAAFgAAAAAAHgAAAAAAHgAAAAACfAAAAAAAMwAAAAACMwAAAAACXAAAAAACXAAAAAAAXAAAAAADTgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAHgAAAAADHgAAAAAAfAAAAAAAMwAAAAADMwAAAAAAXAAAAAAAXAAAAAABXAAAAAAATgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAADfAAAAAAAMwAAAAAAfAAAAAAATgAAAAAAXAAAAAADTgAAAAAAfAAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfAAAAAAAXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAATgAAAAAAXAAAAAABXAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAADXAAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAABXAAAAAAAXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAABXAAAAAADXAAAAAABXAAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAADTgAAAAAAXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAADXAAAAAAAXAAAAAADXAAAAAACXAAAAAAAfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAATgAAAAAAXAAAAAACTgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADXAAAAAABXAAAAAACTgAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAXAAAAAADfAAAAAAAHgAAAAABHgAAAAADHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADPQAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAXAAAAAACTgAAAAAAHgAAAAACHgAAAAABHgAAAAACfAAAAAAAHgAAAAABHgAAAAABHgAAAAADPQAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAABXAAAAAAATgAAAAAAHgAAAAABHgAAAAAAHgAAAAADfAAAAAAAHgAAAAAAHgAAAAACHgAAAAABPQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAADfAAAAAAAHgAAAAADHgAAAAABHgAAAAABfAAAAAAAHgAAAAAALgAAAAADLgAAAAACPQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXAAAAAACXAAAAAAAXAAAAAADfAAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAAAHgAAAAACLgAAAAAAHgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXAAAAAAAXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADLgAAAAABDgAAAAABfAAAAAAAQQAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAXAAAAAABXAAAAAACXAAAAAAAfAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAHgAAAAABLgAAAAACDgAAAAAB version: 6 2,1: ind: 2,1 @@ -332,7 +332,7 @@ entities: version: 6 0,0: ind: 0,0 - tiles: XAAAAAADXAAAAAACXAAAAAACXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAABXAAAAAABfAAAAAAAHgAAAAAAHgAAAAADHgAAAAACfAAAAAAAHgAAAAACHgAAAAABXAAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAAAXAAAAAABXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAfAAAAAAAHgAAAAADfAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAABXAAAAAADXAAAAAADXAAAAAACfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAABXAAAAAABXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAAAXAAAAAACTgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAMwAAAAAAMwAAAAADMwAAAAABMwAAAAADfAAAAAAAXAAAAAABXAAAAAADXAAAAAABTgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAMwAAAAADMwAAAAACMwAAAAAAMwAAAAACMwAAAAAAXAAAAAABXAAAAAAAXAAAAAADPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAAAMwAAAAAAMwAAAAABMwAAAAACXAAAAAAAXAAAAAAAXAAAAAADTgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAawAAAAAAMwAAAAADMwAAAAABMwAAAAADMwAAAAAAMwAAAAACXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACMwAAAAACMwAAAAACMwAAAAADMwAAAAADMwAAAAABXAAAAAACXAAAAAADXAAAAAABTgAAAAAAbwAAAAABbwAAAAADbwAAAAABbwAAAAABbwAAAAAAbwAAAAADbwAAAAADMwAAAAADMwAAAAADMwAAAAABMwAAAAABMwAAAAAAXAAAAAABXAAAAAABXAAAAAACbwAAAAACcAAAAAADcAAAAAACcAAAAAADcAAAAAAAcAAAAAACcAAAAAAAcAAAAAACMwAAAAABMwAAAAABMwAAAAABMwAAAAADMwAAAAACXAAAAAAAXAAAAAABXAAAAAADTgAAAAAAbwAAAAAAbwAAAAADbwAAAAACbwAAAAAAbwAAAAAAbwAAAAADcAAAAAAAMwAAAAABMwAAAAACMwAAAAADMwAAAAADMwAAAAACXAAAAAAAXAAAAAACXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbwAAAAADcAAAAAACMwAAAAAAMwAAAAAAMwAAAAACMwAAAAACMwAAAAABXAAAAAACXAAAAAADXAAAAAAAfAAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfAAAAAAAbwAAAAAAbwAAAAAAMwAAAAAAMwAAAAACMwAAAAADMwAAAAACMwAAAAAAXAAAAAADXAAAAAADXAAAAAADTgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAAAfAAAAAAAMwAAAAABMwAAAAABXAAAAAABXAAAAAACXAAAAAABTgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAMwAAAAACHgAAAAAAfAAAAAAAMwAAAAABMwAAAAACXAAAAAAAXAAAAAADXAAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAADHgAAAAABFgAAAAAAFgAAAAAAFgAAAAAA + tiles: XAAAAAADXAAAAAACXAAAAAACXAAAAAADTgAAAAAAXAAAAAABXAAAAAABXAAAAAABXAAAAAABfAAAAAAAHgAAAAAAHgAAAAADHgAAAAACfAAAAAAAHgAAAAACHgAAAAABXAAAAAAAXAAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAAAXAAAAAABXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAfAAAAAAAHgAAAAADfAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAABXAAAAAADXAAAAAADXAAAAAACfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAXAAAAAABXAAAAAABXAAAAAAAXAAAAAACTgAAAAAAXAAAAAACXAAAAAAAXAAAAAACTgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAMwAAAAAAMwAAAAADMwAAAAABMwAAAAADfAAAAAAAXAAAAAABXAAAAAADXAAAAAABTgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAMwAAAAADMwAAAAACMwAAAAAAMwAAAAACMwAAAAAAXAAAAAABXAAAAAAAXAAAAAADPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAAAMwAAAAAAMwAAAAABMwAAAAACXAAAAAAAXAAAAAAAXAAAAAADTgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAawAAAAAAMwAAAAADMwAAAAABMwAAAAADMwAAAAAAMwAAAAACXAAAAAAAXAAAAAABXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACMwAAAAACMwAAAAACMwAAAAADMwAAAAADMwAAAAABXAAAAAACXAAAAAADXAAAAAABTgAAAAAAbwAAAAABbwAAAAADbwAAAAABbwAAAAABbwAAAAAAbwAAAAADbwAAAAADMwAAAAADMwAAAAADMwAAAAABMwAAAAABMwAAAAAAXAAAAAABXAAAAAABXAAAAAACbwAAAAACcAAAAAADcAAAAAACcAAAAAADcAAAAAAAcAAAAAACcAAAAAAAcAAAAAACMwAAAAABMwAAAAABMwAAAAABMwAAAAADMwAAAAACXAAAAAAAXAAAAAABXAAAAAADTgAAAAAAbwAAAAAAbwAAAAADbwAAAAACbwAAAAAAbwAAAAAAbwAAAAADcAAAAAAAMwAAAAABMwAAAAACMwAAAAADMwAAAAADMwAAAAACXAAAAAAAXAAAAAACXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbwAAAAADcAAAAAACMwAAAAAAMwAAAAAAMwAAAAACMwAAAAACMwAAAAABXAAAAAACXAAAAAADXAAAAAAAfAAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfAAAAAAAbwAAAAAAbwAAAAAAMwAAAAAAMwAAAAACMwAAAAADMwAAAAACMwAAAAAAXAAAAAADXAAAAAADXAAAAAADTgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAAAfAAAAAAAMwAAAAABMwAAAAABXAAAAAABXAAAAAACXAAAAAABTgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAMwAAAAACHgAAAAAAfAAAAAAAMwAAAAABMwAAAAACXAAAAAAAXAAAAAADXAAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAADHgAAAAABFgAAAAAAFgAAAAAAFgAAAAAA version: 6 -2,-3: ind: -2,-3 @@ -536,7 +536,7 @@ entities: version: 6 -4,-5: ind: -4,-5 - tiles: AAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAAATQAAAAABTQAAAAADTQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAABHgAAAAADHgAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAACHgAAAAAATQAAAAABNwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAABTQAAAAABTQAAAAABNwAAAAAAfAAAAAAANwAAAAAANwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAHgAAAAAATQAAAAAANwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAADHgAAAAAAHgAAAAABNwAAAAAATgAAAAAAEgAAAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAAAHgAAAAAAHgAAAAACTQAAAAABTQAAAAAATQAAAAADfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAABHgAAAAACHgAAAAACTQAAAAACTQAAAAACfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAACHgAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAADHgAAAAADHgAAAAACHgAAAAAB + tiles: AAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAAATQAAAAABTQAAAAADTQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAABHgAAAAADHgAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAACHgAAAAAATQAAAAABNwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAABTQAAAAABTQAAAAABNwAAAAAAfAAAAAAANwAAAAAANwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAHgAAAAAATQAAAAAANwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAADHgAAAAAAHgAAAAABNwAAAAAATgAAAAAAEgAAAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAAAHgAAAAAAHgAAAAACTQAAAAABTQAAAAAATQAAAAADfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAABHgAAAAACHgAAAAACTQAAAAACTQAAAAACfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAACHgAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAADHgAAAAADHgAAAAACHgAAAAAB version: 6 -4,-6: ind: -4,-6 @@ -787,6 +787,12 @@ entities: 7109: -36,-81 7111: -40,-81 7112: -40,-77 + - node: + color: '#DE3A3A96' + id: BotGreyscale + decals: + 7354: -15,66 + 7355: -15,67 - node: color: '#FFFFFFFF' id: BotGreyscale @@ -1172,7 +1178,6 @@ entities: 4714: 7,16 4715: 7,17 4716: 7,18 - 4717: 7,19 4718: 7,20 4753: 18,20 4777: 28,12 @@ -1185,7 +1190,6 @@ entities: 4784: 28,19 4785: 28,20 4786: 28,21 - 4812: 7,24 4813: 7,25 4814: 7,26 4815: 7,27 @@ -1212,7 +1216,6 @@ entities: 5027: -31,24 5028: -31,36 5029: -31,37 - 5030: -31,38 5086: -22,20 5087: -22,19 5088: -22,18 @@ -1268,7 +1271,6 @@ entities: 5251: -72,-8 5252: -72,-7 5253: -72,-6 - 5254: -72,-5 5291: -37,-4 5292: -37,-3 5293: -37,-2 @@ -1297,7 +1299,6 @@ entities: 6023: 14,-13 6811: 14,-12 6812: 14,-10 - 6820: 9,-9 6931: -31,49 6932: -31,48 6933: -31,47 @@ -1381,12 +1382,9 @@ entities: 4582: -16,3 4583: -17,3 4584: -18,3 - 4585: -19,3 4586: -20,3 4587: -21,3 4644: -13,-2 - 4649: 4,3 - 4674: -36,3 4675: -35,3 4676: -34,3 4677: -33,3 @@ -1399,7 +1397,6 @@ entities: 4684: -26,3 4685: -25,3 4790: 26,23 - 4791: 25,23 4794: 23,24 4795: 22,24 4796: 21,24 @@ -1442,7 +1439,6 @@ entities: 4919: -1,51 4920: -12,51 4921: -13,51 - 4922: -14,51 4923: -15,51 4924: -17,52 4925: -18,52 @@ -1468,8 +1464,6 @@ entities: 5020: -27,21 5021: -28,21 5022: -29,21 - 5023: -30,21 - 5042: -21,23 5043: -20,23 5044: -19,23 5045: -18,23 @@ -1489,7 +1483,6 @@ entities: 5059: 1,23 5060: 2,23 5061: 3,23 - 5062: 4,23 5133: -12,36 5134: -13,36 5135: -14,36 @@ -1505,7 +1498,6 @@ entities: 5175: -45,-3 5176: -46,-3 5177: -47,-3 - 5178: -48,-3 5179: -49,-3 5180: -50,-3 5181: -52,-2 @@ -1529,7 +1521,6 @@ entities: 5199: -70,-2 5200: -71,-2 5201: -73,5 - 5518: 6,51 5524: -10,52 5525: -9,52 5937: -7,51 @@ -1589,7 +1580,6 @@ entities: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 4650: 4,0 4651: 3,0 4652: -8,0 4653: -9,0 @@ -1607,8 +1597,6 @@ entities: 4670: -33,0 4671: -34,0 4672: -35,0 - 4673: -36,0 - 4738: 4,20 4740: 8,21 4741: 9,21 4742: 10,21 @@ -1624,7 +1612,6 @@ entities: 4758: 22,21 4759: 23,21 4760: 24,21 - 4761: 25,21 4774: 26,11 4775: 27,11 4823: 8,34 @@ -1645,7 +1632,6 @@ entities: 4943: -17,49 4944: -16,49 4945: -15,49 - 4946: -14,49 4947: -13,49 4948: -12,49 4949: -11,49 @@ -1665,7 +1651,6 @@ entities: 4963: 3,49 4964: 4,49 4965: 5,49 - 4966: 6,49 4967: 7,49 4968: 8,49 4969: 9,49 @@ -1674,7 +1659,6 @@ entities: 5006: -33,18 5007: -32,18 5008: -31,18 - 5009: -30,18 5010: -29,18 5011: -28,18 5012: -27,18 @@ -1704,7 +1688,6 @@ entities: 5081: -18,21 5082: -19,21 5083: -20,21 - 5084: -21,21 5105: -12,21 5126: -12,31 5161: -43,3 @@ -1734,7 +1717,6 @@ entities: 5276: -51,-5 5277: -50,-5 5278: -49,-5 - 5279: -48,-5 5280: -47,-5 5281: -46,-5 5282: -45,-5 @@ -1751,7 +1733,6 @@ entities: 5475: -22,0 5476: -21,0 5477: -20,0 - 5478: -19,0 5498: -1,-2 5499: -2,-2 5500: -7,0 @@ -1873,7 +1854,6 @@ entities: 4732: 5,16 4733: 5,17 4734: 5,18 - 4735: 5,19 4747: 14,20 4763: 26,20 4764: 26,19 @@ -1902,7 +1882,6 @@ entities: 4850: 5,27 4851: 5,26 4852: 5,25 - 4853: 5,24 4897: 21,47 4898: 21,46 4899: 21,45 @@ -1919,7 +1898,6 @@ entities: 4982: -33,41 4983: -33,40 4984: -33,39 - 4985: -33,38 4986: -33,37 4987: -33,31 4988: -33,30 @@ -1959,7 +1937,6 @@ entities: 5211: -74,-2 5212: -74,-3 5213: -74,-4 - 5214: -74,-5 5215: -75,-7 5216: -75,-8 5217: -75,-9 @@ -1995,7 +1972,6 @@ entities: 6291: -74,2 6292: -74,1 6293: -74,0 - 6793: 6,-9 6794: 6,-10 6795: 6,-11 6796: 6,-12 @@ -2825,6 +2801,12 @@ entities: id: DeliveryGreyscale decals: 6416: 36,-4 + - node: + color: '#DE3A3A96' + id: DeliveryGreyscale + decals: + 7358: -49,-79 + 7359: -49,-79 - node: color: '#FF9999FF' id: DeliveryGreyscale @@ -2944,8 +2926,6 @@ entities: 3388: -13.345347,1.8762295 3389: -9.05368,3.035382 3390: -5.3280025,0.8672097 - 3391: 3.9595351,3.4078434 - 3392: 4.386618,3.0534308 3393: 8.475068,-0.8927023 3394: 9.329235,-7.501841 3395: 13.172985,-10.171054 @@ -3292,10 +3272,7 @@ entities: 3743: 25.44327,34.81941 3744: 26.09952,34.79856 3745: 26.713217,34.953156 - 3746: 25.119516,22.793173 - 3747: 25.807016,23.095467 3748: 26.661182,22.62639 - 3749: 24.535053,20.744965 3750: 21.347553,20.901323 3751: 20.118387,21.026411 3752: 18.38922,21.328705 @@ -3431,7 +3408,6 @@ entities: 3882: -28.94425,19.321878 3883: -22.327682,23.658224 3884: -22.098515,23.35593 - 3885: -21.181849,22.709648 3886: -22.786015,22.39693 3887: -19.5617,21.124546 3888: -18.176285,23.386534 @@ -3551,7 +3527,6 @@ entities: 4002: 2.502865,51.20442 4003: 2.8986983,51.152298 4004: 4.877865,49.39066 - 4005: 6.0302835,49.651257 4006: 7.717784,53.633186 4007: 7.749034,53.987602 4008: 7.634451,54.821514 @@ -4421,7 +4396,6 @@ entities: 1269: -7.7745647,-6.448164 1270: -7.7745647,-6.448164 1274: -12.514148,3.4118273 - 1275: -19.034983,3.453523 1276: -18.316233,3.463947 1277: -18.764149,-0.18441999 1278: -5.4368734,1.8169699 @@ -4656,11 +4630,8 @@ entities: 1639: 28.58572,20.423735 1652: 28.012802,17.619705 1653: 27.794052,17.140205 - 1654: 24.671003,20.596066 1655: 24.077253,20.377163 1656: 24.816837,20.387587 - 1657: 25.27517,23.056107 - 1658: 25.202253,23.504335 1659: 30.199944,20.658607 1660: 30.199944,20.658607 1661: 30.231194,20.429281 @@ -5603,8 +5574,6 @@ entities: 2744: -0.4449033,21.269335 2745: 4.959138,22.780802 2746: 4.5424714,21.727987 - 2747: 3.7299714,20.852379 - 2748: 6.6377254,24.062943 2749: 5.6108203,20.060162 2750: 7.4842143,16.547249 2751: 7.619632,15.91139 @@ -5619,7 +5588,6 @@ entities: 2760: 6.1717143,-1.2616551 2761: 6.1717143,-4.521998 2762: 6.1717143,-5.8270054 - 2763: 6.192548,-8.715143 2764: 6.2133813,-11.58789 2765: 7.0154643,-9.970169 2766: 7.0154643,-7.2633624 @@ -5705,11 +5673,6 @@ entities: 2948: -36.808376,4.690786 2949: -36.76671,4.3780694 2950: -36.76671,4.0966234 - 2951: -36.527126,3.6275477 - 2952: -35.47504,2.9256542 - 2953: -35.558376,3.2383716 - 2954: -36.183376,3.2383716 - 2955: -36.51671,2.9986217 2956: -35.995876,-0.5778641 2957: -40.47504,-0.9843964 2958: -40.45421,-1.4638963 @@ -5726,7 +5689,6 @@ entities: 3145: -71.56062,-3.2653399 3146: -71.74853,-4.026285 3147: -71.34228,-3.8282309 - 3148: -72.08186,-4.4640894 3149: -72.1027,-1.6430955 3150: -73.05061,-0.67367285 3151: -73.6027,5.4136753 @@ -5739,9 +5701,6 @@ entities: 3158: -71.44645,0.19129807 3159: -74.61311,-0.4341361 3160: -74.61311,-0.4341361 - 3161: -74.52978,-5.515501 - 3162: -74.52978,-5.369566 - 3163: -74.55061,-4.9734583 3164: -70.44645,-4.5981975 3165: -69.64436,-4.566926 3166: -69.55061,-4.566926 @@ -5754,9 +5713,7 @@ entities: 3173: -70.144135,-1.4013824 3174: -71.51818,-1.4013824 3175: -53.646587,-2.078937 - 3176: -48.544907,-3.0692077 3177: -49.72908,-2.8815773 - 3178: -47.624916,-3.5904033 3179: -49.664513,-5.5635138 3180: -51.737427,-5.4175787 3181: -51.990097,-6.5061088 @@ -7079,11 +7036,6 @@ entities: 966: 16,57 967: 17,57 968: 19,57 - - node: - color: '#8932B881' - id: HalfTileOverlayGreyscale - decals: - 5517: 6,51 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale @@ -7422,7 +7374,6 @@ entities: color: '#D381C996' id: HalfTileOverlayGreyscale180 decals: - 984: -48,-5 985: -49,-5 986: -51,-5 992: -38,-5 @@ -7536,7 +7487,6 @@ entities: 5468: -22,0 5469: -21,0 5470: -20,0 - 5471: -19,0 5530: 31,17 - node: color: '#F9801D7F' @@ -7592,7 +7542,6 @@ entities: decals: 1112: -40,33 1113: -40,35 - 1115: -33,38 1116: -33,37 1117: -33,31 1118: -33,30 @@ -7702,7 +7651,6 @@ entities: color: '#A4610696' id: HalfTileOverlayGreyscale270 decals: - 6653: 6,-9 6654: 6,-10 6655: 6,-11 6656: 6,-12 @@ -8026,7 +7974,6 @@ entities: color: '#A4610696' id: HalfTileOverlayGreyscale90 decals: - 6737: 9,-9 6738: 14,-10 6739: 14,-12 6741: 9,-23 @@ -8049,7 +7996,6 @@ entities: 1005: -49,-9 1006: -49,-10 1007: -49,-11 - 1024: -72,-5 1025: -72,-6 1026: -72,-7 1027: -72,-8 @@ -11345,8 +11291,8 @@ entities: 0: 65535 7,16: 0: 255 - 5: 32768 - 7: 8192 + 4: 32768 + 5: 8192 8,12: 0: 30583 8,13: @@ -11814,8 +11760,8 @@ entities: 0: 4359 8,16: 0: 255 - 4: 8192 - 6: 32768 + 6: 8192 + 7: 32768 9,12: 0: 14327 9,13: @@ -11828,7 +11774,7 @@ entities: 0: 30583 9,16: 0: 255 - 6: 40960 + 7: 40960 10,12: 0: 2032 10,13: @@ -11841,7 +11787,7 @@ entities: 0: 65535 10,16: 0: 255 - 6: 40960 + 7: 40960 11,12: 0: 30583 11,13: @@ -12383,11 +12329,11 @@ entities: 23,13: 0: 4369 8,17: - 4: 34 - 6: 136 + 6: 34 + 7: 136 7,17: - 5: 136 - 7: 34 + 4: 136 + 5: 34 8,18: 2: 65311 7,18: @@ -12401,7 +12347,7 @@ entities: 9,19: 2: 29936 9,17: - 6: 170 + 7: 170 9,20: 2: 62579 10,18: @@ -12409,7 +12355,7 @@ entities: 10,19: 2: 17532 10,17: - 6: 170 + 7: 170 10,20: 2: 29764 11,18: @@ -13322,10 +13268,10 @@ entities: - volume: 2500 temperature: 293.15 moles: + - 6666.982 - 0 - 0 - 0 - - 6666.982 - 0 - 0 - 0 @@ -13337,8 +13283,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 + - 6666.982 - 0 - 0 - 0 @@ -13355,7 +13301,7 @@ entities: - 0 - 0 - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -13368,7 +13314,7 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 + - 0 - 0 - 0 - 0 @@ -13882,9 +13828,7 @@ entities: - 25783 - 25814 - 25785 - - 1082 - 10816 - - 10848 - 28410 - 25516 - 25779 @@ -13909,18 +13853,14 @@ entities: - 33609 - 33610 - 24250 - - 7730 - 33605 - 33606 - - 33607 - 25839 - 2498 - 2499 - 25836 - - 10827 - 10836 - 10837 - - 10838 - 28396 - 27155 - 27154 @@ -13967,10 +13907,8 @@ entities: - type: DeviceList devices: - 24153 - - 7730 - 33605 - 33606 - - 33607 - 25530 - 3266 - 3255 @@ -13985,14 +13923,10 @@ entities: - 24259 - 24258 - 25877 - - 10874 - 10875 - - 10876 - 25674 - - 10920 - 10919 - 10918 - - 10917 - 22663 - 22662 - 22802 @@ -14232,13 +14166,9 @@ entities: parent: 33 - type: DeviceList devices: - - 10917 - 10918 - 10919 - - 10920 - - 10874 - 10875 - - 10876 - 24250 - 24260 - 24258 @@ -14436,9 +14366,7 @@ entities: - 10946 - 25677 - 25678 - - 10960 - 10959 - - 10958 - 28450 - 10947 - 22882 @@ -14581,9 +14509,7 @@ entities: - 10956 - 25677 - 25678 - - 10961 - 10962 - - 10963 - 25582 - 10957 - 21135 @@ -14819,9 +14745,7 @@ entities: - 22631 - 25750 - 25749 - - 10911 - 10898 - - 10903 - 25689 - 25690 - 10913 @@ -14835,10 +14759,8 @@ entities: - 28434 - 10355 - 24160 - - 10920 - 10919 - 10918 - - 10917 - 24250 - uid: 25679 components: @@ -14853,9 +14775,7 @@ entities: - 28497 - 28498 - 25576 - - 10963 - 10962 - - 10961 - 25560 - 10951 - 10950 @@ -14863,9 +14783,7 @@ entities: - 10949 - 10948 - 25530 - - 10958 - 10959 - - 10960 - 23026 - 23027 - 23160 @@ -15164,15 +15082,11 @@ entities: - 28424 - 27238 - 25689 - - 10894 - 10893 - - 10892 - 27237 - 25767 - 25824 - - 10887 - 10886 - - 10863 - 27136 - 22520 - 27233 @@ -15275,26 +15189,18 @@ entities: - 10852 - 10850 - 25816 - - 10866 - 10862 - - 10864 - 25824 - - 9197 - 10423 - 10759 - - 10847 - 25877 - - 10840 - 10841 - - 10842 - 28399 - 25517 - 28401 - 25815 - 25783 - - 1082 - 10816 - - 10848 - 25784 - uid: 25820 components: @@ -15336,9 +15242,7 @@ entities: - type: DeviceList devices: - 25785 - - 10864 - 10862 - - 10866 - 25816 - 27048 - 27047 @@ -15352,9 +15256,7 @@ entities: - 10890 - 10889 - 25765 - - 10887 - 10886 - - 10863 - 22285 - 22286 - 22283 @@ -15387,15 +15289,11 @@ entities: - type: DeviceList devices: - 24153 - - 10838 - 10837 - 10836 - - 10827 - 25855 - - 10835 - 10834 - 10833 - - 10832 - 28401 - 25524 - 25834 @@ -15407,9 +15305,7 @@ entities: - 10829 - 10843 - 25785 - - 10842 - 10841 - - 10840 - 25840 - 25839 - 2503 @@ -15468,10 +15364,8 @@ entities: - type: DeviceList devices: - 25836 - - 10835 - 10834 - 10833 - - 10832 - 25856 - 10826 - 10830 @@ -15492,10 +15386,8 @@ entities: - type: DeviceList devices: - 25785 - - 9197 - 10423 - 10759 - - 10847 - 27237 - 25894 - 25840 @@ -15516,9 +15408,7 @@ entities: - 25878 - 24263 - 24250 - - 10874 - 10875 - - 10876 - 23226 - 23227 - uid: 25897 @@ -16029,9 +15919,7 @@ entities: - 31330 - 14741 - 25674 - - 10903 - 10898 - - 10911 - 3284 - 25698 - 10910 @@ -16042,9 +15930,7 @@ entities: - 10895 - 10896 - 25765 - - 10894 - 10893 - - 10892 - 31284 - 22573 - 31278 @@ -16238,11 +16124,6 @@ entities: - type: Transform pos: -9.5,69.5 parent: 33 - - uid: 5805 - components: - - type: Transform - pos: -9.5,67.5 - parent: 33 - uid: 5806 components: - type: Transform @@ -16270,11 +16151,6 @@ entities: - type: Transform pos: -12.5,64.5 parent: 33 - - uid: 5829 - components: - - type: Transform - pos: -15.5,68.5 - parent: 33 - proto: AirlockAssembly entities: - uid: 22118 @@ -17763,6 +17639,121 @@ entities: - type: Transform pos: -36.5,-64.5 parent: 33 + - uid: 33960 + components: + - type: Transform + pos: 7.5,-8.5 + parent: 33 + - uid: 33961 + components: + - type: Transform + pos: 8.5,-8.5 + parent: 33 + - uid: 33962 + components: + - type: Transform + pos: 4.5,1.5 + parent: 33 + - uid: 33963 + components: + - type: Transform + pos: 4.5,2.5 + parent: 33 + - uid: 33964 + components: + - type: Transform + pos: 6.5,19.5 + parent: 33 + - uid: 33965 + components: + - type: Transform + pos: 6.5,24.5 + parent: 33 + - uid: 33966 + components: + - type: Transform + pos: 25.5,22.5 + parent: 33 + - uid: 33967 + components: + - type: Transform + pos: -20.5,22.5 + parent: 33 + - uid: 33969 + components: + - type: Transform + pos: 13.5,48.5 + parent: 33 + - uid: 33970 + components: + - type: Transform + pos: 13.5,49.5 + parent: 33 + - uid: 33971 + components: + - type: Transform + pos: 6.5,50.5 + parent: 33 + - uid: 33972 + components: + - type: Transform + pos: -13.5,50.5 + parent: 33 + - uid: 33973 + components: + - type: Transform + pos: -31.5,38.5 + parent: 33 + - uid: 33974 + components: + - type: Transform + pos: -29.5,19.5 + parent: 33 + - uid: 33975 + components: + - type: Transform + pos: -29.5,20.5 + parent: 33 + - uid: 33976 + components: + - type: Transform + pos: -18.5,1.5 + parent: 33 + - uid: 33977 + components: + - type: Transform + pos: -18.5,2.5 + parent: 33 + - uid: 33978 + components: + - type: Transform + pos: -35.5,1.5 + parent: 33 + - uid: 33979 + components: + - type: Transform + pos: -35.5,2.5 + parent: 33 + - uid: 33980 + components: + - type: Transform + pos: -72.5,-4.5 + parent: 33 + - uid: 33981 + components: + - type: Transform + pos: 4.5,21.5 + parent: 33 + - uid: 33982 + components: + - type: Transform + pos: 4.5,22.5 + parent: 33 + - uid: 33983 + components: + - type: Transform + pos: -47.5,-3.5 + parent: 33 - proto: AirlockHeadOfPersonnelLocked entities: - uid: 2466 @@ -18450,15 +18441,13 @@ entities: - type: Transform pos: -29.5,46.5 parent: 33 -- proto: AirlockPsychologistGlassLocked +- proto: AirlockPsychologistLocked entities: - - uid: 3927 + - uid: 1082 components: - type: Transform pos: -44.5,-0.5 parent: 33 -- proto: AirlockPsychologistLocked - entities: - uid: 4713 components: - type: Transform @@ -18799,6 +18788,16 @@ entities: parent: 33 - proto: AirlockSecurityLocked entities: + - uid: 528 + components: + - type: Transform + pos: -9.5,67.5 + parent: 33 + - uid: 901 + components: + - type: Transform + pos: -15.5,68.5 + parent: 33 - uid: 3675 components: - type: Transform @@ -23165,6 +23164,16 @@ entities: - type: Transform pos: -52.5,-51.5 parent: 33 + - uid: 23630 + components: + - type: Transform + pos: -44.5,-65.5 + parent: 33 + - uid: 23631 + components: + - type: Transform + pos: -43.5,-76.5 + parent: 33 - uid: 25359 components: - type: Transform @@ -23230,6 +23239,36 @@ entities: parent: 33 - type: DeviceLinkSink invokeCounter: 1 + - uid: 33947 + components: + - type: Transform + pos: -53.5,-66.5 + parent: 33 + - uid: 33950 + components: + - type: Transform + pos: -54.5,-73.5 + parent: 33 + - uid: 33953 + components: + - type: Transform + pos: -49.5,-61.5 + parent: 33 + - uid: 33954 + components: + - type: Transform + pos: -31.5,-70.5 + parent: 33 + - uid: 33955 + components: + - type: Transform + pos: -31.5,-74.5 + parent: 33 + - uid: 33958 + components: + - type: Transform + pos: -48.5,-78.5 + parent: 33 - proto: BlastDoorOpen entities: - uid: 925 @@ -24780,6 +24819,14 @@ entities: - type: Transform pos: -95.480774,26.597704 parent: 33 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 33952 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -49.5,-71.5 + parent: 33 - proto: ButtonFrameExit entities: - uid: 30898 @@ -44023,6 +44070,16 @@ entities: - type: Transform pos: -45.5,85.5 parent: 33 + - uid: 33937 + components: + - type: Transform + pos: -30.5,0.5 + parent: 33 + - uid: 33938 + components: + - type: Transform + pos: -30.5,-0.5 + parent: 33 - proto: CableApcStack entities: - uid: 8123 @@ -61920,6 +61977,36 @@ entities: - type: Transform pos: -14.5,-13.5 parent: 33 + - uid: 33927 + components: + - type: Transform + pos: -61.5,29.5 + parent: 33 + - uid: 33928 + components: + - type: Transform + pos: -61.5,30.5 + parent: 33 + - uid: 33929 + components: + - type: Transform + pos: -62.5,29.5 + parent: 33 + - uid: 33930 + components: + - type: Transform + pos: -62.5,30.5 + parent: 33 + - uid: 33931 + components: + - type: Transform + pos: -60.5,29.5 + parent: 33 + - uid: 33933 + components: + - type: Transform + pos: -60.5,30.5 + parent: 33 - proto: Catwalk entities: - uid: 544 @@ -66820,6 +66907,12 @@ entities: rot: -1.5707963267948966 rad pos: -54.591286,-70.34826 parent: 33 + - uid: 33906 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.555286,26.791918 + parent: 33 - proto: ChairPilotSeat entities: - uid: 37 @@ -70193,6 +70286,16 @@ entities: - type: Transform pos: 5.470151,-21.506319 parent: 33 + - uid: 33911 + components: + - type: Transform + pos: -14.508715,66.50992 + parent: 33 + - uid: 33912 + components: + - type: Transform + pos: -14.498298,67.40637 + parent: 33 - proto: ClothingShoesSlippers entities: - uid: 24480 @@ -72771,31 +72874,13 @@ entities: - 0 - 0 - 0 -- proto: CrateMedical +- proto: CrateMedicalSurgery entities: - - uid: 4406 + - uid: 33925 components: - type: Transform - pos: -84.5,1.5 + pos: -84.5,-3.5 parent: 33 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 9.117112 - - 34.29771 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: CrateNPCCow entities: - uid: 12893 @@ -73296,6 +73381,13 @@ entities: - type: Transform pos: 12.5,1.5 parent: 33 +- proto: CurtainsBlueOpen + entities: + - uid: 33943 + components: + - type: Transform + pos: -44.5,0.5 + parent: 33 - proto: CurtainsPinkOpen entities: - uid: 14673 @@ -75404,6 +75496,12 @@ entities: - type: Transform pos: -16.5,-0.5 parent: 33 + - uid: 3749 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,3.5 + parent: 33 - uid: 4417 components: - type: Transform @@ -82165,6 +82263,24 @@ entities: - type: Transform pos: -48.5,-41.5 parent: 33 + - uid: 34004 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,3.5 + parent: 33 + - uid: 34005 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,3.5 + parent: 33 + - uid: 34006 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -36.5,3.5 + parent: 33 - proto: DisposalPipeBroken entities: - uid: 30830 @@ -82183,6 +82299,12 @@ entities: parent: 33 - proto: DisposalTagger entities: + - uid: 2245 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,3.5 + parent: 33 - uid: 8156 components: - type: Transform @@ -82388,12 +82510,6 @@ entities: rot: 1.5707963267948966 rad pos: -47.5,12.5 parent: 33 - - uid: 12229 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -36.5,3.5 - parent: 33 - uid: 12255 components: - type: Transform @@ -82444,6 +82560,12 @@ entities: parent: 33 - proto: DisposalTrunk entities: + - uid: 1749 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,3.5 + parent: 33 - uid: 2312 components: - type: Transform @@ -82705,12 +82827,6 @@ entities: rot: -1.5707963267948966 rad pos: -49.5,14.5 parent: 33 - - uid: 12228 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,3.5 - parent: 33 - uid: 12254 components: - type: Transform @@ -83121,11 +83237,6 @@ entities: - type: Transform pos: 6.5,36.5 parent: 33 - - uid: 10998 - components: - - type: Transform - pos: -35.5,3.5 - parent: 33 - uid: 11006 components: - type: Transform @@ -83191,6 +83302,11 @@ entities: - type: Transform pos: -74.5,-5.5 parent: 33 + - uid: 12919 + components: + - type: Transform + pos: -31.5,3.5 + parent: 33 - uid: 17408 components: - type: Transform @@ -84726,6 +84842,11 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight + - uid: 3752 + components: + - type: Transform + pos: -47.5,-59.5 + parent: 33 - uid: 4121 components: - type: Transform @@ -85647,11 +85768,6 @@ entities: - type: Transform pos: -49.5,-38.5 parent: 33 - - uid: 33464 - components: - - type: Transform - pos: -49.5,-59.5 - parent: 33 - uid: 33465 components: - type: Transform @@ -86237,11 +86353,6 @@ entities: parent: 33 - proto: filingCabinet entities: - - uid: 901 - components: - - type: Transform - pos: -33.5,67.5 - parent: 33 - uid: 902 components: - type: Transform @@ -86279,21 +86390,11 @@ entities: - type: Transform pos: -86.5,26.5 parent: 33 - - uid: 5778 - components: - - type: Transform - pos: -88.5,9.5 - parent: 33 - uid: 6624 components: - type: Transform pos: 9.5,19.5 parent: 33 - - uid: 6625 - components: - - type: Transform - pos: 10.5,19.5 - parent: 33 - uid: 6626 components: - type: Transform @@ -86304,26 +86405,11 @@ entities: - type: Transform pos: 9.5,12.5 parent: 33 - - uid: 6628 - components: - - type: Transform - pos: 10.5,12.5 - parent: 33 - uid: 6629 components: - type: Transform pos: 11.5,12.5 parent: 33 - - uid: 8915 - components: - - type: Transform - pos: -47.5,-0.5 - parent: 33 - - uid: 9745 - components: - - type: Transform - pos: -19.5,74.5 - parent: 33 - uid: 10472 components: - type: Transform @@ -86331,21 +86417,11 @@ entities: parent: 33 - proto: filingCabinetDrawerRandom entities: - - uid: 528 - components: - - type: Transform - pos: 11.5,-2.5 - parent: 33 - uid: 6325 components: - type: Transform pos: 13.5,6.5 parent: 33 - - uid: 12919 - components: - - type: Transform - pos: 16.5,-1.5 - parent: 33 - uid: 14689 components: - type: Transform @@ -86371,11 +86447,6 @@ entities: - type: Transform pos: -30.5,89.5 parent: 33 - - uid: 28869 - components: - - type: Transform - pos: -29.5,89.5 - parent: 33 - uid: 32207 components: - type: Transform @@ -86383,11 +86454,6 @@ entities: parent: 33 - proto: filingCabinetRandom entities: - - uid: 1233 - components: - - type: Transform - pos: -21.70356,48.55719 - parent: 33 - uid: 3493 components: - type: Transform @@ -86408,11 +86474,6 @@ entities: - type: Transform pos: 15.5,-2.5 parent: 33 - - uid: 22516 - components: - - type: Transform - pos: -26.294168,48.54775 - parent: 33 - uid: 28870 components: - type: Transform @@ -86423,18 +86484,8 @@ entities: - type: Transform pos: -55.5,-68.5 parent: 33 - - uid: 33528 - components: - - type: Transform - pos: -70.5,27.5 - parent: 33 - proto: filingCabinetTall entities: - - uid: 8508 - components: - - type: Transform - pos: -35.5,15.5 - parent: 33 - uid: 8913 components: - type: Transform @@ -86457,21 +86508,11 @@ entities: - type: Transform pos: -72.5,-36.5 parent: 33 - - uid: 6675 - components: - - type: Transform - pos: -24.5,36.5 - parent: 33 - uid: 10696 components: - type: Transform pos: 12.5,-2.5 parent: 33 - - uid: 14893 - components: - - type: Transform - pos: -21.17231,48.54677 - parent: 33 - uid: 22513 components: - type: Transform @@ -86543,18 +86584,14 @@ entities: - 33609 - 33610 - 24250 - - 7730 - 33605 - 33606 - - 33607 - 25839 - 2498 - 2499 - 25836 - - 10827 - 10836 - 10837 - - 10838 - 28396 - 27155 - 27154 @@ -86694,10 +86731,8 @@ entities: - type: DeviceList devices: - 24153 - - 7730 - 33605 - 33606 - - 33607 - 25530 - 3266 - 3255 @@ -86712,14 +86747,10 @@ entities: - 24259 - 24258 - 25877 - - 10874 - 10875 - - 10876 - 25674 - - 10920 - 10919 - 10918 - - 10917 - uid: 1045 components: - type: Transform @@ -86840,13 +86871,9 @@ entities: parent: 33 - type: DeviceList devices: - - 10917 - 10918 - 10919 - - 10920 - - 10874 - 10875 - - 10876 - 24250 - 24260 - 24258 @@ -86911,9 +86938,7 @@ entities: - 25783 - 25814 - 25785 - - 1082 - 10816 - - 10848 - 28410 - 25516 - 25779 @@ -86979,9 +87004,7 @@ entities: - 10946 - 25677 - 25678 - - 10960 - 10959 - - 10958 - 28450 - 10947 - uid: 25537 @@ -87080,9 +87103,7 @@ entities: - 10956 - 25677 - 25678 - - 10961 - 10962 - - 10963 - 25582 - 10957 - 21135 @@ -87283,9 +87304,7 @@ entities: - 1257 - 25750 - 25749 - - 10911 - 10898 - - 10903 - 25689 - 25690 - 10913 @@ -87299,10 +87318,8 @@ entities: - 28434 - 10355 - 24160 - - 10920 - 10919 - 10918 - - 10917 - 24250 - uid: 25680 components: @@ -87317,9 +87334,7 @@ entities: - 28497 - 28498 - 25576 - - 10963 - 10962 - - 10961 - 25560 - 10951 - 10950 @@ -87327,9 +87342,7 @@ entities: - 10949 - 10948 - 25530 - - 10958 - 10959 - - 10960 - uid: 25685 components: - type: Transform @@ -87522,15 +87535,11 @@ entities: - 28424 - 27238 - 25689 - - 10894 - 10893 - - 10892 - 27237 - 25767 - 25824 - - 10887 - 10886 - - 10863 - uid: 25790 components: - type: Transform @@ -87586,26 +87595,18 @@ entities: - 10852 - 10850 - 25816 - - 10866 - 10862 - - 10864 - 25824 - - 9197 - 10423 - 10759 - - 10847 - 25877 - - 10840 - 10841 - - 10842 - 28399 - 25517 - 28401 - 25815 - 25783 - - 1082 - 10816 - - 10848 - 25784 - uid: 25821 components: @@ -87635,9 +87636,7 @@ entities: - type: DeviceList devices: - 25785 - - 10864 - 10862 - - 10866 - 25816 - 27048 - 27047 @@ -87651,9 +87650,7 @@ entities: - 10890 - 10889 - 25765 - - 10887 - 10886 - - 10863 - uid: 25829 components: - type: Transform @@ -87676,15 +87673,11 @@ entities: - type: DeviceList devices: - 24153 - - 10838 - 10837 - 10836 - - 10827 - 25855 - - 10835 - 10834 - 10833 - - 10832 - 28401 - 25524 - 25834 @@ -87696,9 +87689,7 @@ entities: - 10829 - 10843 - 25785 - - 10842 - 10841 - - 10840 - 25840 - 25839 - 2503 @@ -87741,10 +87732,8 @@ entities: - type: DeviceList devices: - 25836 - - 10835 - 10834 - 10833 - - 10832 - 25856 - 10826 - 10830 @@ -87763,10 +87752,8 @@ entities: - type: DeviceList devices: - 25785 - - 9197 - 10423 - 10759 - - 10847 - 27237 - 25894 - 25840 @@ -87787,9 +87774,7 @@ entities: - 25878 - 24263 - 24250 - - 10874 - 10875 - - 10876 - uid: 25885 components: - type: Transform @@ -88273,9 +88258,7 @@ entities: - 31330 - 14741 - 25674 - - 10903 - 10898 - - 10911 - 3284 - 25698 - 10910 @@ -88286,9 +88269,7 @@ entities: - 10895 - 10896 - 25765 - - 10894 - 10893 - - 10892 - uid: 33195 components: - type: Transform @@ -89132,15 +89113,6 @@ entities: - type: Transform pos: 25.5,-5.5 parent: 33 - - uid: 1082 - components: - - type: Transform - pos: 25.5,23.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25811 - - 25810 - uid: 1751 components: - type: Transform @@ -89242,31 +89214,11 @@ entities: - type: Transform pos: 47.5,26.5 parent: 33 - - uid: 7730 - components: - - type: Transform - pos: -18.5,0.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 271 - - 7732 - - 755 - - 7770 - uid: 8178 components: - type: Transform pos: 9.5,-19.5 parent: 33 - - uid: 9197 - components: - - type: Transform - pos: 4.5,23.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25811 - - 25810 - uid: 10355 components: - type: Transform @@ -89342,15 +89294,6 @@ entities: - type: Transform pos: 15.5,-10.5 parent: 33 - - uid: 10827 - components: - - type: Transform - pos: 4.5,0.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 271 - - 7732 - uid: 10829 components: - type: Transform @@ -89366,11 +89309,6 @@ entities: - type: Transform pos: -13.5,24.5 parent: 33 - - uid: 10832 - components: - - type: Transform - pos: 9.5,-8.5 - parent: 33 - uid: 10833 components: - type: Transform @@ -89381,11 +89319,6 @@ entities: - type: Transform pos: 7.5,-8.5 parent: 33 - - uid: 10835 - components: - - type: Transform - pos: 6.5,-8.5 - parent: 33 - uid: 10836 components: - type: Transform @@ -89404,24 +89337,6 @@ entities: deviceLists: - 271 - 7732 - - uid: 10838 - components: - - type: Transform - pos: 4.5,3.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 271 - - 7732 - - uid: 10840 - components: - - type: Transform - pos: 5.5,19.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25811 - - 25810 - uid: 10841 components: - type: Transform @@ -89431,15 +89346,6 @@ entities: deviceLists: - 25811 - 25810 - - uid: 10842 - components: - - type: Transform - pos: 7.5,19.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25811 - - 25810 - uid: 10843 components: - type: Transform @@ -89450,24 +89356,6 @@ entities: - type: Transform pos: 8.5,5.5 parent: 33 - - uid: 10847 - components: - - type: Transform - pos: 4.5,20.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25811 - - 25810 - - uid: 10848 - components: - - type: Transform - pos: 25.5,21.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25811 - - 25810 - uid: 10850 components: - type: Transform @@ -89543,20 +89431,6 @@ entities: deviceLists: - 25811 - 25810 - - uid: 10863 - components: - - type: Transform - pos: 6.5,49.5 - parent: 33 - - uid: 10864 - components: - - type: Transform - pos: 5.5,24.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25811 - - 25810 - uid: 10865 components: - type: Transform @@ -89566,15 +89440,6 @@ entities: deviceLists: - 7691 - 18285 - - uid: 10866 - components: - - type: Transform - pos: 7.5,24.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25811 - - 25810 - uid: 10868 components: - type: Transform @@ -89590,15 +89455,6 @@ entities: - type: Transform pos: -11.5,24.5 parent: 33 - - uid: 10874 - components: - - type: Transform - pos: -20.5,23.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 755 - - 7770 - uid: 10875 components: - type: Transform @@ -89608,15 +89464,6 @@ entities: deviceLists: - 755 - 7770 - - uid: 10876 - components: - - type: Transform - pos: -20.5,21.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 755 - - 7770 - uid: 10885 components: - type: Transform @@ -89631,11 +89478,6 @@ entities: - type: Transform pos: 6.5,50.5 parent: 33 - - uid: 10887 - components: - - type: Transform - pos: 6.5,51.5 - parent: 33 - uid: 10888 components: - type: Transform @@ -89656,15 +89498,6 @@ entities: - type: Transform pos: -27.5,74.5 parent: 33 - - uid: 10892 - components: - - type: Transform - pos: -13.5,49.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 31329 - - 31328 - uid: 10893 components: - type: Transform @@ -89674,15 +89507,6 @@ entities: deviceLists: - 31329 - 31328 - - uid: 10894 - components: - - type: Transform - pos: -13.5,51.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 31329 - - 31328 - uid: 10895 components: - type: Transform @@ -89737,17 +89561,6 @@ entities: - type: Transform pos: -41.5,49.5 parent: 33 - - uid: 10903 - components: - - type: Transform - pos: -30.5,38.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 31329 - - 31328 - - 25672 - - 25673 - uid: 10905 components: - type: Transform @@ -89790,17 +89603,6 @@ entities: deviceLists: - 31329 - 31328 - - uid: 10911 - components: - - type: Transform - pos: -32.5,38.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 31329 - - 31328 - - 25672 - - 25673 - uid: 10912 components: - type: Transform @@ -89833,17 +89635,6 @@ entities: deviceLists: - 25672 - 25673 - - uid: 10917 - components: - - type: Transform - pos: -29.5,18.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25672 - - 25673 - - 755 - - 7770 - uid: 10918 components: - type: Transform @@ -89866,17 +89657,6 @@ entities: - 25673 - 755 - 7770 - - uid: 10920 - components: - - type: Transform - pos: -29.5,21.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 25672 - - 25673 - - 755 - - 7770 - uid: 10931 components: - type: Transform @@ -89998,36 +89778,16 @@ entities: - type: Transform pos: -75.5,-10.5 parent: 33 - - uid: 10958 - components: - - type: Transform - pos: -47.5,-4.5 - parent: 33 - uid: 10959 components: - type: Transform pos: -47.5,-3.5 parent: 33 - - uid: 10960 - components: - - type: Transform - pos: -47.5,-2.5 - parent: 33 - - uid: 10961 - components: - - type: Transform - pos: -71.5,-4.5 - parent: 33 - uid: 10962 components: - type: Transform pos: -72.5,-4.5 parent: 33 - - uid: 10963 - components: - - type: Transform - pos: -73.5,-4.5 - parent: 33 - uid: 11410 components: - type: Transform @@ -90883,17 +90643,6 @@ entities: - 7732 - 755 - 7770 - - uid: 33607 - components: - - type: Transform - pos: -18.5,3.5 - parent: 33 - - type: DeviceNetwork - deviceLists: - - 271 - - 7732 - - 755 - - 7770 - uid: 33609 components: - type: Transform @@ -90977,11 +90726,6 @@ entities: - type: Transform pos: 29.481274,24.662397 parent: 33 - - uid: 9210 - components: - - type: Transform - pos: -48.398994,26.67613 - parent: 33 - uid: 26162 components: - type: Transform @@ -90992,6 +90736,11 @@ entities: - type: Transform pos: -38.584003,10.716403 parent: 33 + - uid: 33909 + components: + - type: Transform + pos: -48.607372,27.782188 + parent: 33 - proto: FlashlightSeclite entities: - uid: 8613 @@ -91193,13 +90942,6 @@ entities: parent: 33 - type: Fixtures fixtures: {} - - uid: 4225 - components: - - type: Transform - pos: -82.5,-1.5 - parent: 33 - - type: Fixtures - fixtures: {} - uid: 6779 components: - type: Transform @@ -91319,6 +91061,13 @@ entities: parent: 33 - type: Fixtures fixtures: {} + - uid: 33924 + components: + - type: Transform + pos: -81.5,-1.5 + parent: 33 + - type: Fixtures + fixtures: {} - proto: FloorTileItemBar entities: - uid: 17343 @@ -138859,6 +138608,16 @@ entities: - type: Transform pos: -45.5,63.5 parent: 33 + - uid: 6625 + components: + - type: Transform + pos: 4.5,0.5 + parent: 33 + - uid: 6640 + components: + - type: Transform + pos: 9.5,-8.5 + parent: 33 - uid: 6647 components: - type: Transform @@ -138874,6 +138633,11 @@ entities: - type: Transform pos: -31.5,101.5 parent: 33 + - uid: 6675 + components: + - type: Transform + pos: -18.5,0.5 + parent: 33 - uid: 6708 components: - type: Transform @@ -138884,6 +138648,11 @@ entities: - type: Transform pos: -10.5,-32.5 parent: 33 + - uid: 6759 + components: + - type: Transform + pos: -18.5,3.5 + parent: 33 - uid: 6776 components: - type: Transform @@ -139679,6 +139448,16 @@ entities: - type: Transform pos: 53.5,67.5 parent: 33 + - uid: 9197 + components: + - type: Transform + pos: 6.5,-8.5 + parent: 33 + - uid: 9201 + components: + - type: Transform + pos: 4.5,3.5 + parent: 33 - uid: 9427 components: - type: Transform @@ -140164,11 +139943,41 @@ entities: - type: Transform pos: -46.5,28.5 parent: 33 + - uid: 10838 + components: + - type: Transform + pos: 4.5,23.5 + parent: 33 + - uid: 10840 + components: + - type: Transform + pos: 5.5,24.5 + parent: 33 + - uid: 10842 + components: + - type: Transform + pos: 7.5,24.5 + parent: 33 + - uid: 10847 + components: + - type: Transform + pos: 5.5,19.5 + parent: 33 + - uid: 10848 + components: + - type: Transform + pos: 7.5,19.5 + parent: 33 - uid: 10880 components: - type: Transform pos: -13.5,-24.5 parent: 33 + - uid: 10887 + components: + - type: Transform + pos: 25.5,23.5 + parent: 33 - uid: 11005 components: - type: Transform @@ -140529,6 +140338,11 @@ entities: - type: Transform pos: -60.5,1.5 parent: 33 + - uid: 12228 + components: + - type: Transform + pos: 25.5,21.5 + parent: 33 - uid: 12245 components: - type: Transform @@ -140564,6 +140378,11 @@ entities: - type: Transform pos: -0.5,-43.5 parent: 33 + - uid: 12521 + components: + - type: Transform + pos: 4.5,20.5 + parent: 33 - uid: 12605 components: - type: Transform @@ -144031,6 +143850,86 @@ entities: - type: Transform pos: -45.5,92.5 parent: 33901 + - uid: 33968 + components: + - type: Transform + pos: -20.5,21.5 + parent: 33 + - uid: 33984 + components: + - type: Transform + pos: 6.5,49.5 + parent: 33 + - uid: 33985 + components: + - type: Transform + pos: 6.5,51.5 + parent: 33 + - uid: 33988 + components: + - type: Transform + pos: -13.5,49.5 + parent: 33 + - uid: 33989 + components: + - type: Transform + pos: -13.5,51.5 + parent: 33 + - uid: 33992 + components: + - type: Transform + pos: -32.5,38.5 + parent: 33 + - uid: 33993 + components: + - type: Transform + pos: -30.5,38.5 + parent: 33 + - uid: 33996 + components: + - type: Transform + pos: -29.5,18.5 + parent: 33 + - uid: 33997 + components: + - type: Transform + pos: -29.5,21.5 + parent: 33 + - uid: 34000 + components: + - type: Transform + pos: -20.5,23.5 + parent: 33 + - uid: 34007 + components: + - type: Transform + pos: -35.5,0.5 + parent: 33 + - uid: 34008 + components: + - type: Transform + pos: -35.5,3.5 + parent: 33 + - uid: 34011 + components: + - type: Transform + pos: -47.5,-4.5 + parent: 33 + - uid: 34013 + components: + - type: Transform + pos: -47.5,-2.5 + parent: 33 + - uid: 34016 + components: + - type: Transform + pos: -73.5,-4.5 + parent: 33 + - uid: 34017 + components: + - type: Transform + pos: -71.5,-4.5 + parent: 33 - proto: GrilleBroken entities: - uid: 5569 @@ -144944,13 +144843,6 @@ entities: parent: 33 - type: Label currentLabel: Shooting Range - - uid: 33636 - components: - - type: Transform - pos: -3.5,13.5 - parent: 33 - - type: Label - currentLabel: Central Park - proto: HolopadAiBackupPower entities: - uid: 33632 @@ -145077,6 +144969,13 @@ entities: - type: Transform pos: -88.5,7.5 parent: 33 +- proto: HolopadCommandEvac + entities: + - uid: 33940 + components: + - type: Transform + pos: -53.5,45.5 + parent: 33 - proto: HolopadCommandHop entities: - uid: 33546 @@ -145168,7 +145067,7 @@ entities: parent: 33 - proto: HolopadEpistemicsOracle entities: - - uid: 33638 + - uid: 10917 components: - type: Transform pos: -30.5,-3.5 @@ -145215,13 +145114,29 @@ entities: - type: Transform pos: -40.5,51.5 parent: 33 -- proto: HolopadGeneralLounge +- proto: HolopadGeneralPark entities: - - uid: 2245 + - uid: 10911 components: - type: Transform - pos: -9.5,-4.5 + pos: -3.5,13.5 + parent: 33 +- proto: HolopadGeneralShipyardDock + entities: + - uid: 33945 + components: + - type: Transform + pos: -3.5,-43.5 + parent: 33 + - type: Label + currentLabel: General - Shipyard Dock 2 + - uid: 33946 + components: + - type: Transform + pos: -26.5,-43.5 parent: 33 + - type: Label + currentLabel: General - Shipyard Dock 1 - proto: HolopadGeneralTheater entities: - uid: 33571 @@ -145236,6 +145151,13 @@ entities: - type: Transform pos: 21.5,15.5 parent: 33 +- proto: HolopadGeneralVoxNitrogenLounge + entities: + - uid: 10920 + components: + - type: Transform + pos: -9.5,-4.5 + parent: 33 - proto: HolopadJusticeCJ entities: - uid: 33633 @@ -145285,19 +145207,26 @@ entities: - type: Transform pos: -52.5,13.5 parent: 33 - - uid: 33583 +- proto: HolopadMedicalMorgue + entities: + - uid: 33557 + components: + - type: Transform + pos: -73.5,12.5 + parent: 33 +- proto: HolopadMedicalOutpost + entities: + - uid: 10958 components: - type: Transform pos: 14.5,9.5 parent: 33 - - type: Label - currentLabel: Medical - Outpost -- proto: HolopadMedicalMorgue +- proto: HolopadMedicalPsychologist entities: - - uid: 33557 + - uid: 33942 components: - type: Transform - pos: -73.5,12.5 + pos: -42.5,0.5 parent: 33 - proto: HolopadMedicalSurgery entities: @@ -145355,12 +145284,19 @@ entities: - type: Transform pos: -10.5,68.5 parent: 33 +- proto: HolopadSecurityBreakroom + entities: + - uid: 33939 + components: + - type: Transform + pos: -17.5,77.5 + parent: 33 - proto: HolopadSecurityBrig entities: - - uid: 33523 + - uid: 10960 components: - type: Transform - pos: -21.5,82.5 + pos: -24.5,82.5 parent: 33 - proto: HolopadSecurityCorpsman entities: @@ -145411,13 +145347,20 @@ entities: - type: Transform pos: -49.5,74.5 parent: 33 - - uid: 33581 +- proto: HolopadSecurityPermaBotany + entities: + - uid: 33941 + components: + - type: Transform + pos: -42.5,82.5 + parent: 33 +- proto: HolopadSecurityPermaMineshaft + entities: + - uid: 10961 components: - type: Transform pos: -36.5,100.5 parent: 33 - - type: Label - currentLabel: Security - Perma Mine - proto: HolopadSecurityWarden entities: - uid: 33574 @@ -145488,6 +145431,13 @@ entities: - type: Transform pos: 14.5,15.5 parent: 33 +- proto: HolopadServiceToolroom + entities: + - uid: 33944 + components: + - type: Transform + pos: -18.5,27.5 + parent: 33 - proto: Holoprojector entities: - uid: 8241 @@ -145620,11 +145570,6 @@ entities: - type: Transform pos: 26.5,-24.5 parent: 33 - - uid: 4639 - components: - - type: Transform - pos: -57.5,-27.5 - parent: 33 - uid: 4650 components: - type: Transform @@ -145680,6 +145625,12 @@ entities: - type: Transform pos: -12.5,18.5 parent: 33 + - uid: 10963 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -57.5,-27.5 + parent: 33 - uid: 12417 components: - type: Transform @@ -146170,6 +146121,14 @@ entities: rot: 3.141592653589793 rad pos: -55.59366,-70.361244 parent: 33 +- proto: IntercomMedical + entities: + - uid: 33919 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -85.5,-4.5 + parent: 33 - proto: JanitorialTrolley entities: - uid: 8222 @@ -146867,6 +146826,11 @@ entities: rot: -1.5707963267948966 rad pos: -28.420528,90.94582 parent: 33 + - uid: 33923 + components: + - type: Transform + pos: -80.52885,-1.0972736 + parent: 33 - proto: LampBanana entities: - uid: 9393 @@ -147209,7 +147173,7 @@ entities: - type: Transform pos: -27.5,-5.5 parent: 33 - - uid: 4483 + - uid: 10998 components: - type: Transform pos: -30.5,-8.5 @@ -147252,6 +147216,42 @@ entities: rot: 3.141592653589793 rad pos: -37.468155,-70.37036 parent: 33 +- proto: LockableButtonCommand + entities: + - uid: 33951 + components: + - type: MetaData + desc: It's a button for activating the turret defenses. + name: turret defense button + - type: Transform + rot: 3.141592653589793 rad + pos: -49.5,-71.5 + parent: 33 + - type: DeviceLinkSource + linkedPorts: + 33947: + - Pressed: Toggle + 23630: + - Pressed: Toggle + 23631: + - Pressed: Toggle + 33950: + - Pressed: Toggle + 33953: + - Pressed: Toggle + 33954: + - Pressed: Toggle + 33955: + - Pressed: Toggle + 33958: + - Pressed: Toggle +- proto: LockerAdministrativeAssistantFilled + entities: + - uid: 33907 + components: + - type: Transform + pos: -45.5,27.5 + parent: 33 - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 8303 @@ -149190,6 +149190,13 @@ entities: - type: Transform pos: -46.5,19.5 parent: 33 +- proto: MedicalBiofabricator + entities: + - uid: 10903 + components: + - type: Transform + pos: -84.5,1.5 + parent: 33 - proto: MedicalScanner entities: - uid: 1711 @@ -150703,6 +150710,11 @@ entities: - type: Transform pos: -82.5,-0.5 parent: 33 + - uid: 33921 + components: + - type: Transform + pos: -80.5,-2.5 + parent: 33 - proto: Oracle entities: - uid: 1911 @@ -159530,6 +159542,11 @@ entities: parent: 33 - proto: PaperBin20 entities: + - uid: 10894 + components: + - type: Transform + pos: -48.5,26.5 + parent: 33 - uid: 22546 components: - type: Transform @@ -160488,10 +160505,10 @@ entities: parent: 33 - proto: PlaqueAtmos entities: - - uid: 7177 + - uid: 501 components: - type: Transform - pos: 28.5,66.5 + pos: 44.5,66.5 parent: 33 - proto: PlasmaCanister entities: @@ -160689,6 +160706,14 @@ entities: actions: !type:Container ents: - 31442 +- proto: PlasmaWindoorSecureArmoryLocked + entities: + - uid: 12421 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,67.5 + parent: 33 - proto: PlasmaWindoorSecureCommandLocked entities: - uid: 29758 @@ -161683,6 +161708,13 @@ entities: - type: Transform pos: -12.5,-16.5 parent: 33 +- proto: PosterLegitWork + entities: + - uid: 22516 + components: + - type: Transform + pos: -48.5,28.5 + parent: 33 - proto: PosterLegitWorkForAFuture entities: - uid: 11322 @@ -163167,6 +163199,12 @@ entities: parent: 33 - type: ApcPowerReceiver powerLoad: 0 + - uid: 10835 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,21.5 + parent: 33 - uid: 11364 components: - type: Transform @@ -163202,6 +163240,12 @@ entities: rot: 3.141592653589793 rad pos: -49.5,14.5 parent: 33 + - uid: 12229 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,21.5 + parent: 33 - uid: 12400 components: - type: Transform @@ -163256,13 +163300,6 @@ entities: parent: 33 - type: ApcPowerReceiver powerLoad: 0 - - uid: 12421 - components: - - type: Transform - pos: -3.5,23.5 - parent: 33 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 12422 components: - type: Transform @@ -163693,14 +163730,6 @@ entities: parent: 33 - type: ApcPowerReceiver powerLoad: 0 - - uid: 12521 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,20.5 - parent: 33 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 12522 components: - type: Transform @@ -164673,6 +164702,11 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,46.5 parent: 33 + - uid: 14893 + components: + - type: Transform + pos: -49.5,-59.5 + parent: 33 - uid: 15095 components: - type: Transform @@ -168860,11 +168894,6 @@ entities: - type: Transform pos: -33.5,-23.5 parent: 33 - - uid: 14695 - components: - - type: Transform - pos: -45.5,27.5 - parent: 33 - uid: 15170 components: - type: Transform @@ -169012,6 +169041,11 @@ entities: - type: Transform pos: -25.5,117.5 parent: 33 + - uid: 33910 + components: + - type: Transform + pos: -48.5,27.5 + parent: 33 - proto: RandomMeat entities: - uid: 8301 @@ -171991,6 +172025,11 @@ entities: - type: Transform pos: -28.5,41.5 parent: 33 + - uid: 9210 + components: + - type: Transform + pos: 3.5,20.5 + parent: 33 - uid: 9342 components: - type: Transform @@ -172076,11 +172115,6 @@ entities: - type: Transform pos: 23.5,18.5 parent: 33 - - uid: 24515 - components: - - type: Transform - pos: 4.5,20.5 - parent: 33 - uid: 24516 components: - type: Transform @@ -177730,6 +177764,11 @@ entities: parent: 33 - proto: Screen entities: + - uid: 12716 + components: + - type: Transform + pos: -44.5,9.5 + parent: 33 - uid: 22493 components: - type: Transform @@ -177775,16 +177814,6 @@ entities: - type: Transform pos: -81.5,-37.5 parent: 33 - - uid: 30723 - components: - - type: Transform - pos: -35.5,4.5 - parent: 33 - - uid: 30724 - components: - - type: Transform - pos: -20.5,24.5 - parent: 33 - uid: 30725 components: - type: Transform @@ -177845,6 +177874,16 @@ entities: - type: Transform pos: 12.5,30.5 parent: 33 + - uid: 34003 + components: + - type: Transform + pos: -16.5,20.5 + parent: 33 + - uid: 34012 + components: + - type: Transform + pos: -31.5,4.5 + parent: 33 - proto: Screwdriver entities: - uid: 1441 @@ -177954,6 +177993,142 @@ entities: rot: -1.5707963267948966 rad pos: -28.413374,66.53389 parent: 33 +- proto: SecureCabinetAttorney + entities: + - uid: 1233 + components: + - type: Transform + pos: 14.5,-2.5 + parent: 33 + - uid: 4639 + components: + - type: Transform + pos: 11.5,-2.5 + parent: 33 +- proto: SecureCabinetCJ + entities: + - uid: 6393 + components: + - type: Transform + pos: -21.5,48.5 + parent: 33 +- proto: SecureCabinetClerk + entities: + - uid: 6380 + components: + - type: Transform + pos: -24.5,36.5 + parent: 33 +- proto: SecureCabinetCMO + entities: + - uid: 3754 + components: + - type: Transform + pos: -88.5,9.5 + parent: 33 +- proto: SecureCabinetCommand + entities: + - uid: 5805 + components: + - type: Transform + pos: -70.5,27.5 + parent: 33 +- proto: SecureCabinetDetective + entities: + - uid: 5672 + components: + - type: Transform + pos: -29.5,89.5 + parent: 33 +- proto: SecureCabinetEngineering + entities: + - uid: 5682 + components: + - type: Transform + pos: 30.234442,19.676123 + parent: 33 +- proto: SecureCabinetEpistemics + entities: + - uid: 33934 + components: + - type: Transform + pos: -57.5,-7.5 + parent: 33 +- proto: SecureCabinetHoP + entities: + - uid: 5829 + components: + - type: Transform + pos: -35.5,15.5 + parent: 33 +- proto: SecureCabinetHoS + entities: + - uid: 4483 + components: + - type: Transform + pos: -19.5,74.5 + parent: 33 +- proto: SecureCabinetLO + entities: + - uid: 33926 + components: + - type: Transform + pos: 34.5,3.5 + parent: 33 +- proto: SecureCabinetMantis + entities: + - uid: 33936 + components: + - type: Transform + pos: -48.5,-18.5 + parent: 33 +- proto: SecureCabinetMG + entities: + - uid: 33935 + components: + - type: Transform + pos: -59.427727,-24.477924 + parent: 33 +- proto: SecureCabinetProsecutor + entities: + - uid: 5778 + components: + - type: Transform + pos: -26.225328,48.562668 + parent: 33 +- proto: SecureCabinetPsychologist + entities: + - uid: 4406 + components: + - type: Transform + pos: -47.5,-0.5 + parent: 33 +- proto: SecureCabinetReporter + entities: + - uid: 3927 + components: + - type: Transform + pos: 10.5,19.5 + parent: 33 + - uid: 4225 + components: + - type: Transform + pos: 10.5,12.5 + parent: 33 +- proto: SecureCabinetSecurity + entities: + - uid: 5671 + components: + - type: Transform + pos: -19.5,70.5 + parent: 33 +- proto: SecureCabinetWarden + entities: + - uid: 3753 + components: + - type: Transform + pos: -33.5,67.5 + parent: 33 - proto: SecurityTechFab entities: - uid: 5837 @@ -179875,6 +180050,14 @@ entities: rot: 3.141592653589793 rad pos: 32.432083,87.5816 parent: 33 +- proto: ShotGunCabinetFilledOpen + entities: + - uid: 33932 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -49.5,43.5 + parent: 33 - proto: Shovel entities: - uid: 8107 @@ -183040,6 +183223,11 @@ entities: - type: Transform pos: -47.5,-78.5 parent: 33 + - uid: 33959 + components: + - type: Transform + pos: -47.5,-80.5 + parent: 33 - proto: SignSecurity entities: - uid: 9300 @@ -185334,6 +185522,13 @@ entities: - type: Transform pos: -54.5,7.5 parent: 33 +- proto: SpawnPointAdminAssistant + entities: + - uid: 33908 + components: + - type: Transform + pos: -47.5,26.5 + parent: 33 - proto: SpawnPointAtmos entities: - uid: 29733 @@ -186534,6 +186729,11 @@ entities: - type: Transform pos: -2.5,-9.5 parent: 33 + - uid: 33920 + components: + - type: Transform + pos: -80.5,-0.5 + parent: 33 - proto: StationAiUploadComputer entities: - uid: 32320 @@ -187453,6 +187653,36 @@ entities: - type: Transform pos: -26.5,63.5 parent: 33 + - uid: 33913 + components: + - type: Transform + pos: -5.5,71.5 + parent: 33 + - uid: 33914 + components: + - type: Transform + pos: -3.5,71.5 + parent: 33 + - uid: 33915 + components: + - type: Transform + pos: -8.5,72.5 + parent: 33 + - uid: 33916 + components: + - type: Transform + pos: -8.5,71.5 + parent: 33 + - uid: 33917 + components: + - type: Transform + pos: -5.5,72.5 + parent: 33 + - uid: 33918 + components: + - type: Transform + pos: -3.5,72.5 + parent: 33 - proto: SuperweaponSafeSpawner entities: - uid: 26015 @@ -187619,17 +187849,6 @@ entities: - SurveillanceCameraCommand nameSet: True id: AI Sat Dock Interior - - uid: 33433 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -48.5,-78.5 - parent: 33 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraCommand - nameSet: True - id: AI Sat Solars 1 - uid: 33434 components: - type: Transform @@ -187693,17 +187912,6 @@ entities: - SurveillanceCameraCommand nameSet: True id: AI Sat Front Desk - - uid: 33440 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -49.5,-59.5 - parent: 33 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraCommand - nameSet: True - id: AI Sat Entrance Airlock - uid: 33441 components: - type: Transform @@ -187779,6 +187987,28 @@ entities: - SurveillanceCameraCommand nameSet: True id: Captain's Kitchen + - uid: 33956 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -51.5,-59.5 + parent: 33 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Sat Entrance Airlock + - uid: 33957 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -48.5,-80.5 + parent: 33 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Sat Solars 1 - proto: SurveillanceCameraEngineering entities: - uid: 23774 @@ -191916,11 +192146,6 @@ entities: - type: Transform pos: 43.5,19.5 parent: 33 - - uid: 9201 - components: - - type: Transform - pos: -45.5,27.5 - parent: 33 - uid: 9205 components: - type: Transform @@ -192492,6 +192717,11 @@ entities: - type: Transform pos: -47.5,-29.5 parent: 33 + - uid: 33922 + components: + - type: Transform + pos: -80.5,-1.5 + parent: 33 - proto: TableStone entities: - uid: 2495 @@ -214471,60 +214701,65 @@ entities: parent: 33 - proto: WarningAir entities: - - uid: 8762 + - uid: 8764 components: - type: Transform - pos: 44.5,66.5 + pos: 42.5,66.5 parent: 33 - proto: WarningCO2 entities: - - uid: 501 + - uid: 8373 components: - type: Transform - pos: 40.5,66.5 + pos: 38.5,66.5 parent: 33 - proto: WarningN2 entities: - - uid: 502 + - uid: 8761 components: - type: Transform - pos: 30.5,66.5 + pos: 28.5,66.5 parent: 33 - uid: 30438 components: - type: Transform pos: -10.5,-0.5 parent: 33 -- proto: WarningO2 +- proto: WarningN2O entities: - - uid: 8373 + - uid: 8688 components: - type: Transform - pos: 32.5,66.5 + pos: 40.5,66.5 parent: 33 -- proto: WarningPlasma +- proto: WarningO2 entities: - - uid: 490 + - uid: 502 components: - type: Transform - pos: 34.5,66.5 + pos: 30.5,66.5 parent: 33 -- proto: WarningWaste +- proto: WarningPlasma entities: - - uid: 8688 + - uid: 8762 components: - type: Transform - pos: 42.5,66.5 + pos: 32.5,66.5 parent: 33 - - uid: 8761 +- proto: WarningWaste + entities: + - uid: 490 components: + - type: MetaData + desc: WARNING! Water vapor flow tube. Ensure the flow is disengaged before working. + name: water vapor waste sign - type: Transform pos: 36.5,66.5 parent: 33 - - uid: 8764 + - uid: 7177 components: - type: Transform - pos: 38.5,66.5 + pos: 34.5,66.5 parent: 33 - proto: WarpPoint entities: @@ -215172,36 +215407,43 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: WeaponTurretSyndicateBroken +- proto: WeaponTurretAllHostile entities: - - uid: 31792 + - uid: 14695 components: - type: Transform - rot: 3.141592653589793 rad - pos: -49.5,-61.5 + pos: -48.5,-78.5 parent: 33 - - uid: 31793 + - uid: 23628 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -54.5,-73.5 + parent: 33 + - uid: 24515 components: - type: Transform rot: -1.5707963267948966 rad pos: -44.5,-65.5 parent: 33 - - uid: 31794 + - uid: 33948 components: - type: Transform - rot: 3.141592653589793 rad - pos: -43.5,-76.5 + pos: -53.5,-66.5 parent: 33 - - uid: 31795 + - uid: 33949 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -54.5,-73.5 + rot: 3.141592653589793 rad + pos: -43.5,-76.5 parent: 33 - - uid: 31796 +- proto: WeaponTurretSyndicateBroken + entities: + - uid: 31792 components: - type: Transform - pos: -53.5,-66.5 + rot: 3.141592653589793 rad + pos: -49.5,-61.5 parent: 33 - uid: 32477 components: @@ -216530,6 +216772,16 @@ entities: - type: Transform pos: 8.5,3.5 parent: 33 + - uid: 6628 + components: + - type: Transform + pos: 7.5,24.5 + parent: 33 + - uid: 6646 + components: + - type: Transform + pos: -18.5,0.5 + parent: 33 - uid: 6684 components: - type: Transform @@ -216680,6 +216932,11 @@ entities: - type: Transform pos: -13.5,-16.5 parent: 33 + - uid: 7730 + components: + - type: Transform + pos: -18.5,3.5 + parent: 33 - uid: 8069 components: - type: Transform @@ -216740,6 +216997,11 @@ entities: - type: Transform pos: -16.5,30.5 parent: 33 + - uid: 8508 + components: + - type: Transform + pos: 4.5,3.5 + parent: 33 - uid: 8517 components: - type: Transform @@ -216770,6 +217032,11 @@ entities: - type: Transform pos: -8.5,-0.5 parent: 33 + - uid: 8915 + components: + - type: Transform + pos: 4.5,0.5 + parent: 33 - uid: 9074 components: - type: Transform @@ -216810,16 +217077,61 @@ entities: - type: Transform pos: 12.5,38.5 parent: 33 + - uid: 9745 + components: + - type: Transform + pos: 9.5,-8.5 + parent: 33 + - uid: 10827 + components: + - type: Transform + pos: 6.5,-8.5 + parent: 33 + - uid: 10832 + components: + - type: Transform + pos: 5.5,19.5 + parent: 33 - uid: 10845 components: - type: Transform pos: -64.5,13.5 parent: 33 + - uid: 10863 + components: + - type: Transform + pos: 4.5,23.5 + parent: 33 + - uid: 10864 + components: + - type: Transform + pos: 4.5,20.5 + parent: 33 + - uid: 10866 + components: + - type: Transform + pos: 25.5,21.5 + parent: 33 + - uid: 10874 + components: + - type: Transform + pos: 25.5,23.5 + parent: 33 + - uid: 10876 + components: + - type: Transform + pos: 5.5,24.5 + parent: 33 - uid: 10879 components: - type: Transform pos: -20.5,-22.5 parent: 33 + - uid: 10892 + components: + - type: Transform + pos: 7.5,19.5 + parent: 33 - uid: 11027 components: - type: Transform @@ -217030,6 +217342,86 @@ entities: - type: Transform pos: -35.5,-64.5 parent: 33 + - uid: 33986 + components: + - type: Transform + pos: 6.5,51.5 + parent: 33 + - uid: 33987 + components: + - type: Transform + pos: 6.5,49.5 + parent: 33 + - uid: 33990 + components: + - type: Transform + pos: -13.5,49.5 + parent: 33 + - uid: 33991 + components: + - type: Transform + pos: -13.5,51.5 + parent: 33 + - uid: 33994 + components: + - type: Transform + pos: -32.5,38.5 + parent: 33 + - uid: 33995 + components: + - type: Transform + pos: -30.5,38.5 + parent: 33 + - uid: 33998 + components: + - type: Transform + pos: -29.5,21.5 + parent: 33 + - uid: 33999 + components: + - type: Transform + pos: -29.5,18.5 + parent: 33 + - uid: 34001 + components: + - type: Transform + pos: -20.5,23.5 + parent: 33 + - uid: 34002 + components: + - type: Transform + pos: -20.5,21.5 + parent: 33 + - uid: 34009 + components: + - type: Transform + pos: -35.5,0.5 + parent: 33 + - uid: 34010 + components: + - type: Transform + pos: -35.5,3.5 + parent: 33 + - uid: 34014 + components: + - type: Transform + pos: -47.5,-2.5 + parent: 33 + - uid: 34015 + components: + - type: Transform + pos: -47.5,-4.5 + parent: 33 + - uid: 34018 + components: + - type: Transform + pos: -73.5,-4.5 + parent: 33 + - uid: 34019 + components: + - type: Transform + pos: -71.5,-4.5 + parent: 33 - proto: WindowDirectional entities: - uid: 491 @@ -218605,12 +218997,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,44.5 parent: 33 - - uid: 1749 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -79.5,16.5 - parent: 33 - uid: 2433 components: - type: Transform @@ -218649,255 +219035,263 @@ entities: - type: Transform pos: -2.5,17.5 parent: 33 - - uid: 3749 + - uid: 4020 components: - type: Transform rot: 1.5707963267948966 rad - pos: -49.5,71.5 + pos: 0.5,42.5 parent: 33 - - uid: 3752 + - uid: 5163 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,70.5 + rot: 3.141592653589793 rad + pos: -45.5,-8.5 parent: 33 - - uid: 3753 + - uid: 5164 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,69.5 + rot: 3.141592653589793 rad + pos: -46.5,-8.5 parent: 33 - - uid: 3754 + - uid: 9777 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,76.5 + pos: 49.5,17.5 parent: 33 - - uid: 4020 + - uid: 9887 components: - type: Transform rot: 1.5707963267948966 rad - pos: 0.5,42.5 + pos: 49.5,17.5 parent: 33 - - uid: 5163 + - uid: 12999 components: - type: Transform - rot: 3.141592653589793 rad - pos: -45.5,-8.5 + rot: -1.5707963267948966 rad + pos: 30.5,-20.5 parent: 33 - - uid: 5164 + - uid: 13000 components: - type: Transform - rot: 3.141592653589793 rad - pos: -46.5,-8.5 + rot: -1.5707963267948966 rad + pos: 30.5,-21.5 parent: 33 - - uid: 5671 + - uid: 13107 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,77.5 + pos: 30.5,-21.5 parent: 33 - - uid: 5672 + - uid: 18495 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,78.5 + rot: 3.141592653589793 rad + pos: -49.5,16.5 parent: 33 - - uid: 5682 + - uid: 18524 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,78.5 + rot: 3.141592653589793 rad + pos: -50.5,16.5 parent: 33 - - uid: 6380 + - uid: 20883 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,77.5 + rot: 3.141592653589793 rad + pos: -53.5,16.5 parent: 33 - - uid: 6393 + - uid: 23632 components: - type: Transform rot: -1.5707963267948966 rad - pos: -44.5,76.5 + pos: 7.5,85.5 parent: 33 - - uid: 6640 + - uid: 30463 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,71.5 + rot: 3.141592653589793 rad + pos: -46.5,16.5 parent: 33 - - uid: 6646 + - uid: 31411 components: - type: Transform rot: -1.5707963267948966 rad - pos: -44.5,70.5 + pos: -20.5,48.5 parent: 33 - - uid: 6759 + - uid: 31413 components: - type: Transform rot: -1.5707963267948966 rad - pos: -44.5,69.5 + pos: -20.5,46.5 parent: 33 - - uid: 9777 + - uid: 33573 components: - type: Transform - pos: 49.5,17.5 + pos: 37.5,25.5 parent: 33 - - uid: 9887 + - uid: 33575 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 49.5,17.5 + pos: 38.5,25.5 parent: 33 - - uid: 12716 + - uid: 33576 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -79.5,15.5 + pos: 39.5,25.5 parent: 33 - - uid: 12999 + - uid: 33577 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,-20.5 + pos: 40.5,25.5 parent: 33 - - uid: 13000 + - uid: 33578 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,-21.5 + pos: 41.5,25.5 parent: 33 - - uid: 13107 +- proto: WindowTintedReinforcedDirectional + entities: + - uid: 28869 components: - type: Transform - pos: 30.5,-21.5 + rot: 1.5707963267948966 rad + pos: -79.5,15.5 parent: 33 - - uid: 18495 + - uid: 30446 components: - type: Transform - rot: 3.141592653589793 rad - pos: -49.5,16.5 + rot: 1.5707963267948966 rad + pos: -49.5,69.5 parent: 33 - - uid: 18524 + - uid: 30723 components: - type: Transform - rot: 3.141592653589793 rad - pos: -50.5,16.5 + rot: 1.5707963267948966 rad + pos: -49.5,70.5 parent: 33 - - uid: 20883 + - uid: 30724 components: - type: Transform - rot: 3.141592653589793 rad - pos: -53.5,16.5 + rot: 1.5707963267948966 rad + pos: -49.5,71.5 parent: 33 - - uid: 23628 + - uid: 31793 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -40.5,57.5 + rot: 1.5707963267948966 rad + pos: -49.5,78.5 parent: 33 - - uid: 23630 + - uid: 31794 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,57.5 + rot: 1.5707963267948966 rad + pos: -49.5,77.5 parent: 33 - - uid: 23631 + - uid: 31795 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -49.5,76.5 + parent: 33 + - uid: 31796 components: - type: Transform rot: -1.5707963267948966 rad - pos: -42.5,57.5 + pos: -44.5,76.5 parent: 33 - - uid: 23632 + - uid: 32321 components: - type: Transform rot: -1.5707963267948966 rad - pos: 7.5,85.5 + pos: -44.5,77.5 parent: 33 - - uid: 30446 + - uid: 32322 components: - type: Transform rot: -1.5707963267948966 rad - pos: -41.5,57.5 + pos: -44.5,78.5 parent: 33 - - uid: 30463 + - uid: 32323 components: - type: Transform - rot: 3.141592653589793 rad - pos: -46.5,16.5 + rot: -1.5707963267948966 rad + pos: -44.5,69.5 parent: 33 - - uid: 31411 + - uid: 32324 components: - type: Transform rot: -1.5707963267948966 rad - pos: -20.5,48.5 + pos: -44.5,70.5 parent: 33 - - uid: 31413 + - uid: 32325 components: - type: Transform rot: -1.5707963267948966 rad - pos: -20.5,46.5 + pos: -44.5,71.5 parent: 33 - - uid: 32321 + - uid: 32328 components: - type: Transform - pos: -45.5,-65.5 + rot: 1.5707963267948966 rad + pos: -79.5,16.5 parent: 33 - - uid: 32322 + - uid: 32329 components: - type: Transform - pos: -46.5,-65.5 + rot: -1.5707963267948966 rad + pos: -41.5,57.5 parent: 33 - - uid: 32323 + - uid: 33433 components: - type: Transform - pos: -47.5,-65.5 + rot: -1.5707963267948966 rad + pos: -42.5,57.5 parent: 33 - - uid: 32324 + - uid: 33440 components: - type: Transform - pos: -50.5,-65.5 + rot: -1.5707963267948966 rad + pos: -39.5,57.5 parent: 33 - - uid: 32325 + - uid: 33464 components: - type: Transform - pos: -44.5,-65.5 + rot: -1.5707963267948966 rad + pos: -40.5,57.5 parent: 33 - - uid: 32328 + - uid: 33523 components: - type: Transform - pos: -52.5,-65.5 + pos: -50.5,-65.5 parent: 33 - - uid: 32329 + - uid: 33528 components: - type: Transform - pos: -51.5,-65.5 + pos: -47.5,-65.5 parent: 33 - - uid: 33573 + - uid: 33581 components: - type: Transform - pos: 37.5,25.5 + pos: -46.5,-65.5 parent: 33 - - uid: 33575 + - uid: 33583 components: - type: Transform - pos: 38.5,25.5 + pos: -45.5,-65.5 parent: 33 - - uid: 33576 + - uid: 33607 components: - type: Transform - pos: 39.5,25.5 + pos: -51.5,-65.5 parent: 33 - - uid: 33577 + - uid: 33636 components: - type: Transform - pos: 40.5,25.5 + pos: -52.5,-65.5 parent: 33 - - uid: 33578 + - uid: 33638 components: - type: Transform - pos: 41.5,25.5 + pos: -44.5,-65.5 parent: 33 - proto: Wirecutter entities: diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml index cca0d4cb695..036d57069ca 100644 --- a/Resources/Prototypes/Maps/hive.yml +++ b/Resources/Prototypes/Maps/hive.yml @@ -21,6 +21,7 @@ Passenger: [ -1, -1 ] Librarian: [ 1, 1 ] #command + AdministrativeAssistant: [ 1, 1 ] Captain: [ 1, 1 ] StationAi: [ 1, 1 ] #engineering diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml index 23d77af38f7..5594f418a93 100644 --- a/Resources/Prototypes/Maps/tortuga.yml +++ b/Resources/Prototypes/Maps/tortuga.yml @@ -20,6 +20,7 @@ Passenger: [ -1, -1 ] Librarian: [ 1, 1 ] #command + AdministrativeAssistant: [ 1, 1 ] Captain: [ 1, 1 ] StationAi: [ 1, 1 ] #engineering From 9903cd2bbbd9d00914aaa14aaf49cf2261ff2989 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 9 Jan 2025 03:19:26 +0000 Subject: [PATCH 02/45] enable cargo and admin assistants (#2597) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/Roles/Jobs/departments.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 110f75e0e9f..560f77d402a 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -8,7 +8,7 @@ - Quartermaster - SalvageSpecialist - Courier # DeltaV - Courier, see Resources/Prototypes/_DV/Roles/Jobs/Cargo/courier.yml - #- CargoAssistant # DeltaV - Uncomment once ready to deploy. + - CargoAssistant # DeltaV - type: department id: Civilian @@ -80,7 +80,7 @@ - ERTEngineer - DeathSquad - StationAi # DeltaV - added for playtime trackers - #- AdministrativeAssistant # Delta V - Uncomment once ready to deploy. Administrative Assistant, see Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml + - AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml primary: false weight: 100 From aa26ccd1d7bc45132f484351b0953f6967a5fae2 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 9 Jan 2025 04:19:46 +0100 Subject: [PATCH 03/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index f2be1671f1c..8d8abc7d26b 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: The vents contain more scary xenos! - type: Tweak - id: 381 - time: '2024-06-04T07:00:17.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1296 - author: Colin-Tel changes: - message: Security personnel no longer have service access by default. @@ -3843,3 +3836,11 @@ id: 880 time: '2025-01-08T11:39:09.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2647 +- author: Radezolid, noctyrn + changes: + - message: Added the Cargo Assistant and Administrative Assistant to support logistics + and command respectively. + type: Add + id: 881 + time: '2025-01-09T03:19:26.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2597 From d6b7f74fb9429bba90aa33b4c4564070e545a818 Mon Sep 17 00:00:00 2001 From: Stop-Signs Date: Wed, 8 Jan 2025 22:50:43 -0600 Subject: [PATCH 04/45] Butlerops PT 2 (#2661) Yummers --- Content.Server/_DV/NPC/Roboisseur/RoboisseurComponent.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Content.Server/_DV/NPC/Roboisseur/RoboisseurComponent.cs b/Content.Server/_DV/NPC/Roboisseur/RoboisseurComponent.cs index 81bf92f6d27..ced43835bdb 100644 --- a/Content.Server/_DV/NPC/Roboisseur/RoboisseurComponent.cs +++ b/Content.Server/_DV/NPC/Roboisseur/RoboisseurComponent.cs @@ -158,7 +158,10 @@ public sealed partial class RoboisseurComponent : Component "FoodMothHeartburnSoup", "FoodSoupBisque", "FoodCakeSlime", - "FoodBurgerCrazy" + "FoodBurgerCrazy", + "FoodMealPoachedPears", + "FoodMealPearsBelleHelene", + "FoodTartPearCheese", }; [DataField("robossuierRewards")] @@ -302,7 +305,8 @@ public sealed partial class RoboisseurComponent : Component "LeavesCannabisRainbowDried", "LeavesCannabisDried", "FoodCakeBrain", - "FoodBurgerBrain" + "FoodBurgerBrain", + "FoodMeatAnomaly", }; } } From 9a0abc357c727a9143f30fdd2059036b536a222a Mon Sep 17 00:00:00 2001 From: Janet Blackquill Date: Thu, 9 Jan 2025 01:34:45 -0500 Subject: [PATCH 05/45] Add surgeon access & role (#2645) * Add surgeon PDA and ID * Add surgeon access * Add surgeon job * Add Surgery door prototypes * Add Surgeon locker prototypes --- .../Components/IdCardConsoleComponent.cs | 1 + Resources/Locale/en-US/_DV/job/job-names.ftl | 1 + .../en-US/_DV/preferences/loadout-groups.ftl | 6 ++ .../en-US/_DV/prototypes/access/accesses.ftl | 1 + Resources/Prototypes/Access/medical.yml | 1 + Resources/Prototypes/Access/misc.yml | 1 + .../Objects/Tools/access_configurator.yml | 2 + .../Jobs/Medical/chief_medical_officer.yml | 1 + .../Roles/Jobs/Medical/medical_doctor.yml | 1 + .../Prototypes/Roles/Jobs/departments.yml | 1 + Resources/Prototypes/_DV/Access/medical.yml | 4 + .../_DV/Catalog/Fills/Items/Belts/belts.yml | 15 +++ .../_DV/Catalog/Fills/Lockers/medical.yml | 97 ++++++++++++++++++ .../_DV/Entities/Markers/Spawners/jobs.yml | 13 +++ .../Devices/Electronics/door_access.yml | 24 +++++ .../_DV/Entities/Objects/Devices/pda.yml | 30 ++++++ .../Objects/Misc/identification_cards.yml | 16 +++ .../Structures/Doors/Airlocks/access.yml | 46 +++++++++ .../Storage/Closets/Lockers/lockers.yml | 12 +++ .../_DV/Loadouts/Jobs/Medical/surgeon.yml | 63 ++++++++++++ .../_DV/Roles/Jobs/Medical/surgeon.yml | 27 +++++ .../_DV/Roles/play_time_trackers.yml | 3 + Resources/Prototypes/_DV/StatusIcon/job.yml | 7 ++ .../Interface/Misc/job_icons.rsi/Surgeon.png | Bin 0 -> 146 bytes .../Interface/Misc/job_icons.rsi/meta.json | 5 +- .../Textures/_DV/Markers/jobs.rsi/meta.json | 5 +- .../Textures/_DV/Markers/jobs.rsi/surgeon.png | Bin 0 -> 1112 bytes .../_DV/Objects/Devices/pda.rsi/meta.json | 5 +- .../Objects/Devices/pda.rsi/pda-surgeon.png | Bin 0 -> 335 bytes .../Objects/Misc/id_cards.rsi/idsurgeon.png | Bin 0 -> 552 bytes .../_DV/Objects/Misc/id_cards.rsi/meta.json | 5 +- .../Structures/Storage/closet.rsi/meta.json | 11 +- .../Structures/Storage/closet.rsi/surgeon.png | Bin 0 -> 246 bytes .../Storage/closet.rsi/surgeon_door.png | Bin 0 -> 249 bytes .../Storage/closet.rsi/surgeon_open.png | Bin 0 -> 209 bytes 35 files changed, 399 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_DV/Loadouts/Jobs/Medical/surgeon.yml create mode 100644 Resources/Prototypes/_DV/Roles/Jobs/Medical/surgeon.yml create mode 100644 Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Surgeon.png create mode 100644 Resources/Textures/_DV/Markers/jobs.rsi/surgeon.png create mode 100644 Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-surgeon.png create mode 100644 Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsurgeon.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_door.png create mode 100644 Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_open.png diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 7ae419a8ceb..c8e9b395bd0 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -92,6 +92,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, ListE`z75pUXO@geCwEU@-Oo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json index 8d4e9aea176..323657bb034 100644 --- a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024", "size": { "x": 8, "y": 8 @@ -48,6 +48,9 @@ }, { "name": "AdminAssistant" + }, + { + "name": "Surgeon" } ] } diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/meta.json b/Resources/Textures/_DV/Markers/jobs.rsi/meta.json index 649dd8ef9bd..721d8e0c6a9 100644 --- a/Resources/Textures/_DV/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/_DV/Markers/jobs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV. cargoassistant made by Radezolid, adminassistant made by noctyrnal (github)", + "copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV. cargoassistant made by Radezolid, adminassistant made by noctyrnal (github), surgeon made by Janet Blackquill 2024", "size": { "x": 32, "y": 32 @@ -54,6 +54,9 @@ }, { "name": "adminassistant" + }, + { + "name": "surgeon" } ] } diff --git a/Resources/Textures/_DV/Markers/jobs.rsi/surgeon.png b/Resources/Textures/_DV/Markers/jobs.rsi/surgeon.png new file mode 100644 index 0000000000000000000000000000000000000000..296088c60726786c4255d3cd216d7eb96a9e5f0f GIT binary patch literal 1112 zcmV-e1gHCnP)HD0I_ndoU2_g7D5i5nfddVU|?eFe>#LzN8pO;lB z0>|FnCz}-kEO?e$#p{iEmytTf=cP~X58DNv6cM5Xgo6J)HU>w*m(Zx=!#It&j908% z!FWJQC?Scnq9M#I-X59qz`hwXrx+kdS(!pk+KmC&5*;B{w* z8&O|^kcjldZR9o$&Ng3O<=6E0CzL*Tl?%x#Rby#+>+Eeph6_b=pxW(5;OZp|Jg}m< z$BRP?tkkm*F1H(QpAS+YTEOmewWPMBh>!k8dplHf=Rz%)V{~|!2QE~pxNlVAxguJ? zg?&3^pOq95w*8!ggHS1zJUAxWp))}$BrU-&ckUo3GZSUGxis$@1^YqTUSVp(9~Eh{ zC&1-$k=B+Lp>4jNh?+PvipPxDSk;B0YK_3l$jFFp7ObkgN7gS-M1EXwn)mK~A9s`I zp?J`UG+HuzT4zNzot=x$M0{U&k2D=w7M+8L1koG`83e{F_2!) zIc)S9CH?q~F45}D6ueX8=KaKo5H$nN-Z99ZodY`!z;M-452CB(_4{7`G_IB&NQ}== zkhPpxoh>tpm{CBPeiOM;prtuKf?|(Ru!n*_2|XS^-y4eO7ov9J@_K3kA>8=cf%*1z zz_xG0dv%N8YLG7A<=^WCL;f$o0prx^e#m{Gun zUHh?8r-MOb!@$4*0*@bad;MP@qVR>I0?&CWAK3I2uUjk@Vkkd`l^PASOD&NJVEB^; z*3dt**=*?V>qBO8GRUKcxV7yW?pNl#2An;MHwxdx`KpspC={H}`ia4e0{nEuo{ zcXsj_crT=TiI zsYq9Rf>pHKxZ-mRc_t5_#qWNH#OGqr)H4pLkR;&WU^&m;k|OyJ$pXCN((F+e!0^Zy z2y4gBi}`N^jE)B+*`qF?$KwyP1-}z!S-`crI&vaASl4PNFPb0s1@DE1hK31V6WMGq zL^lmDn$2XF(a4Y2uC6W~Y^n&>R?)ZO)YMcY(W7{RAH7erKKj;MQBg6?W_LJXGMR9` ex>{&I4gLWT)vcXR?TF9-0000", + "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician, modified interntech, added admin assistant and added the cargo assistant by Radezolid, added Psychiatrist, Therapist, and Social Worker versions by alterae , surgeon by Janet Blackquill 2024", "size": { "x": 32, "y": 32 @@ -293,6 +293,9 @@ { "name": "pda-resident" }, + { + "name": "pda-surgeon" + }, { "name": "pda-student" }, diff --git a/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-surgeon.png b/Resources/Textures/_DV/Objects/Devices/pda.rsi/pda-surgeon.png new file mode 100644 index 0000000000000000000000000000000000000000..d9aa66ac9d4f192f5755e6dbd2b179df1f3da56c GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ECYN(T!FNJ zfPkW+qMn|fg@r{S14AzZ!)ykI{rmTyI(6#m)vK>wz54(Ezpi(zaY&|fK~F^M!pNz+ zvNql|5KXQDY8EaD@(X4Fsz3vF_IGrF(n~#E978O6&tAUG*Q~(PkjVE+BwVugfBW1y zYPpTC{~poa&*HQq=)W+-k2&3Mtv~#asD9qS<*-&fyXV@r8b>BA4F`Ef!Gqf$Om@`P z2w*iyVvsXrvNvQ2?Qs+oo^X^$#gH|SBVmTX0VBoj35zzfiV7KAv}6`#((yUrY;0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!0Ch=3K~z|UV_+BsqhJ(_f{_jwiB;%WyXZf<*#71?qV?kfOvG9)B_+imB_+kM zuPK%R#>VC-nm7OkmSi|nY9D0|pamew0WmZ74y*%c0S4Rw1D*{>0Z~B+D~Lz|&z?Oa qDvBsd1Ngvb`WOYHU=)l3VgUf-gB_&P{%ex}0000 2024", "size": { "x": 32, "y": 32 @@ -45,6 +45,9 @@ }, { "name": "idadminassistant" + }, + { + "name": "idsurgeon" } ] } diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json index 30bc6b6194c..6012dc65cee 100644 --- a/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/_DV/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord)", + "copyright": "Taken from tgstation, added psych locker based on medical locker and admin assist based on captain's locker by Radezolid, CJ and Clerk lockers edited by Timemaster99 (Discord). Surgeon's locker by Janet Blackquill 2024", "license": "CC-BY-SA-3.0", "states": [ { @@ -16,6 +16,15 @@ { "name": "psych_open" }, + { + "name": "surgeon" + }, + { + "name": "surgeon_door" + }, + { + "name": "surgeon_open" + }, { "name": "locked" }, diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon.png new file mode 100644 index 0000000000000000000000000000000000000000..0ea69624743a868f36538ca7d21c0634e73ee51d GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|)B}7%T!HlK z*RS2(-2(ywPM10Q)0}4DWSEbe({;$vP_Lz0J>!?%pix}fIoNLbAO*cMJnbX~`6 eE-vIZBm0~Xj%_ZHbNYbxF?hQAxvXo* zd%8G=SoFS~xRLLG0tf5bt-o6S|Gyv9;my3ndothNtEX26oI2lo(uPg@375|mYt1*} zAr}t#uyCyWQ091oTjl;0N0o4ibqvBA65UlUC^ODfkP$yAUBZ``=xZdrFJMFOPo@h} fJmCUay?#l4{f{}NIlj7agBgTe~DWM4f?Il@8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_open.png b/Resources/Textures/_DV/Structures/Storage/closet.rsi/surgeon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..ca629c4fcc295113aa32bcc7acd55c810ba5c255 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyasfUeu0UEzNy)&#AR;27r>AH7 z^yy2NE?u{7-TwXiwL)9h)c>^ys^BUK@(X784+C|bB4I$$2u~Ns5R2ZYmkhZM81OJ3 z*its--~Xeb7j&w*L{^2ivpqJfo070fPwrS#ERzOI2r>mdKI;Vst0F-)5qyPW_ literal 0 HcmV?d00001 From 85a7f0bab3e136ed438c4cfe2a9834ba67105708 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 9 Jan 2025 07:35:05 +0100 Subject: [PATCH 06/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 8d8abc7d26b..811f456fde8 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Security personnel no longer have service access by default. - type: Remove - id: 382 - time: '2024-06-04T07:02:31.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1287 - author: dge21 changes: - message: the mime suit is craftable now! @@ -3844,3 +3837,10 @@ id: 881 time: '2025-01-09T03:19:26.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2597 +- author: pontaoski + changes: + - message: Added a Surgeon job & Surgery access + type: Add + id: 882 + time: '2025-01-09T06:34:46.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2645 From f49135686dafacf392f067c385939749ea2602b2 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Wed, 8 Jan 2025 22:43:32 -0800 Subject: [PATCH 07/45] Feedback popup command (#2663) * first commit * Localized entity command pro * Not sure this is amazing * evil lines are gone --- .../_DV/FeedbackPopup/FeedbackPopupCommand.cs | 68 +++++++++++++++++++ .../SharedFeedbackOverwatchSystem.cs | 44 ++++++++++-- .../en-US/_DV/feedbackpopup/feedbackpopup.ftl | 15 ++++ 3 files changed, 120 insertions(+), 7 deletions(-) create mode 100644 Content.Server/_DV/FeedbackPopup/FeedbackPopupCommand.cs diff --git a/Content.Server/_DV/FeedbackPopup/FeedbackPopupCommand.cs b/Content.Server/_DV/FeedbackPopup/FeedbackPopupCommand.cs new file mode 100644 index 00000000000..9f83a101880 --- /dev/null +++ b/Content.Server/_DV/FeedbackPopup/FeedbackPopupCommand.cs @@ -0,0 +1,68 @@ +using System.Linq; +using Content.Server.Administration; +using Content.Shared._DV.FeedbackOverwatch; +using Content.Shared.Administration; +using Robust.Shared.Console; +using Robust.Shared.Prototypes; + +namespace Content.Server._DV.FeedbackPopup; + +[AdminCommand(AdminFlags.Server)] +public sealed class FeedbackPopupCommand : LocalizedEntityCommands +{ + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly SharedFeedbackOverwatchSystem _feedback = default!; + + public override string Command => Loc.GetString("feedbackpopup-command-name"); + + public override void Execute(IConsoleShell shell, string argStr, string[] args) + { + if (args.Length != 2) + { + shell.WriteError(Loc.GetString("feedbackpopup-command-error-wrong-arguments")); + return; + } + + if (!int.TryParse(args[0], out var entityUidInt)) + { + shell.WriteError(Loc.GetString("feedbackpopup-command-error-invalid-uid")); + return; + } + + var netEnt = new NetEntity(entityUidInt); + + if (!EntityManager.TryGetEntity(netEnt, out var target)) + { + shell.WriteLine(Loc.GetString("feedbackpopup-command-error-entity-not-found")); + return; + } + + if (!_proto.HasIndex(args[1])) + { + shell.WriteError(Loc.GetString("feedbackpopup-command-error-invalid-proto")); + return; + } + + if (!_feedback.SendPopup(target, args[1])) + { + shell.WriteError(Loc.GetString("feedbackpopup-command-error-popup-send-fail")); + return; + } + + shell.WriteLine(Loc.GetString("feedbackpopup-command-success")); + } + + public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + if (args.Length == 1) + { + return CompletionResult.FromHint(Loc.GetString("feedbackpopup-command-hint-playerUid")); + } + + if (args.Length == 2) + { + return CompletionResult.FromHintOptions(_feedback.FeedbackPopupProtoIds, Loc.GetString("feedbackpopup-command-hint-protoId")); + } + return CompletionResult.Empty; + } +} diff --git a/Content.Shared/_DV/FeedbackOverwatch/SharedFeedbackOverwatchSystem.cs b/Content.Shared/_DV/FeedbackOverwatch/SharedFeedbackOverwatchSystem.cs index 24f67eaeb85..f12bf691201 100644 --- a/Content.Shared/_DV/FeedbackOverwatch/SharedFeedbackOverwatchSystem.cs +++ b/Content.Shared/_DV/FeedbackOverwatch/SharedFeedbackOverwatchSystem.cs @@ -6,9 +6,36 @@ namespace Content.Shared._DV.FeedbackOverwatch; public sealed partial class SharedFeedbackOverwatchSystem : EntitySystem { [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + + public List FeedbackPopupProtoIds { get; } = new(); + public override void Initialize() { InitializeEvents(); + SubscribeLocalEvent(OnPrototypesReloaded); + + LoadPrototypes(); + } + + private void OnPrototypesReloaded(PrototypesReloadedEventArgs args) + { + if (!args.WasModified()) + return; + + LoadPrototypes(); + } + + /// + /// Load all the prototype IDs into FeedbackPopupProtoIds. + /// + private void LoadPrototypes() + { + FeedbackPopupProtoIds.Clear(); + var protos = _proto.EnumeratePrototypes(); + foreach (var proto in protos) + FeedbackPopupProtoIds.Add(proto.ID); + FeedbackPopupProtoIds.Sort(); } /// @@ -16,15 +43,16 @@ public override void Initialize() /// /// UID of the entity the player is controlling. /// Popup to send them. - public void SendPopup(EntityUid? uid, ProtoId popupPrototype) + /// Returns true if the popup message was sent to the client successfully. + public bool SendPopup(EntityUid? uid, ProtoId popupPrototype) { if (uid == null) - return; + return false; if (!_mind.TryGetMind(uid.Value, out var mindUid, out _)) - return; + return false; - SendPopupMind(mindUid, popupPrototype); + return SendPopupMind(mindUid, popupPrototype); } /// @@ -32,15 +60,17 @@ public void SendPopup(EntityUid? uid, ProtoId popupProto /// /// UID of the players mind. /// Popup to send them. - public void SendPopupMind(EntityUid? uid, ProtoId popupPrototype) + /// Returns true if the popup message was sent to the client successfully. + public bool SendPopupMind(EntityUid? uid, ProtoId popupPrototype) { if (uid == null) - return; + return false; if (!_mind.TryGetSession(uid, out var session)) - return; + return false; var msg = new FeedbackPopupMessage(popupPrototype); RaiseNetworkEvent(msg, session); + return true; } } diff --git a/Resources/Locale/en-US/_DV/feedbackpopup/feedbackpopup.ftl b/Resources/Locale/en-US/_DV/feedbackpopup/feedbackpopup.ftl index 0e91f7a1d6c..943dc0408fe 100644 --- a/Resources/Locale/en-US/_DV/feedbackpopup/feedbackpopup.ftl +++ b/Resources/Locale/en-US/_DV/feedbackpopup/feedbackpopup.ftl @@ -7,3 +7,18 @@ feedbackpopup-discord-format-header = ```[Round number: {$roundNumber}, Player n feedbackpopup-discord-format-info = Feedback name: **{$feedbackName}** feedbackpopup-discord-format-spacer = ---- Feedback start ---- feedbackpopup-discord-format-feedbackbody = {$feedback} + +# Command strings +feedbackpopup-command-name = givefeedbackpopup +cmd-givefeedbackpopup-desc = Gives the targeted player a feedback popup. +cmd-givefeedbackpopup-help = Usage: givefeedbackpopup + +feedbackpopup-command-error-wrong-arguments = Wrong number of arguments. +feedbackpopup-command-error-invalid-uid = Invalid entity uid. +feedbackpopup-command-error-entity-not-found = Couldn't find entity. +feedbackpopup-command-error-invalid-proto = Invalid feedback popup prototype. +feedbackpopup-command-error-popup-send-fail = Couldn't send popup. There probably isn't a mind attached to the given entity. +feedbackpopup-command-success = Sent popup! + +feedbackpopup-command-hint-playerUid = +feedbackpopup-command-hint-protoId = From 6d2f6ce55932ccf98d7c96b4acf9d6187f532022 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 9 Jan 2025 07:43:51 +0100 Subject: [PATCH 08/45] Automatic changelog update --- Resources/Changelog/DeltaVAdmin.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/DeltaVAdmin.yml b/Resources/Changelog/DeltaVAdmin.yml index a4288ed4ad4..ac347e89cfd 100644 --- a/Resources/Changelog/DeltaVAdmin.yml +++ b/Resources/Changelog/DeltaVAdmin.yml @@ -79,5 +79,12 @@ Entries: id: 11 time: '2024-12-29T18:33:21.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2559 +- author: beck-thompson + changes: + - message: New givefeedbackpopup command to force a feedback popup for players! + type: Add + id: 12 + time: '2025-01-09T06:43:32.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2663 Name: Admin Order: 1 From e48d735dfc1ccc9747c4ebe2d44e62cca636116d Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Thu, 9 Jan 2025 03:13:50 -0600 Subject: [PATCH 09/45] Changes Curtains for QOL (#2657) Co-authored-by: Velcroboy --- .../Structures/Decoration/curtains.yml | 7 ++++--- .../Curtains/hospital.rsi/closed.png | Bin 0 -> 1794 bytes .../Curtains/hospital.rsi/meta.json | 19 ++++++++++++++++++ .../Decoration/Curtains/hospital.rsi/open.png | Bin 0 -> 1528 bytes 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/closed.png create mode 100644 Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/open.png diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml index fc7fe23bb87..aa35922a113 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml @@ -7,8 +7,10 @@ placement: mode: SnapgridCenter components: + - type: SpriteFade # DeltaV - Makes it so person behind curtain can see behind it - type: Occluder - type: AnimationPlayer + - type: InteractionOutline # DeltaV - Makes it clear what you're interacting with - type: Fixtures fixtures: fix1: @@ -59,9 +61,8 @@ suffix: Hospital description: Contains less than 1% mercury. components: - - type: Sprite - snapCardinals: true - sprite: Structures/Decoration/Curtains/hospital.rsi + - type: Sprite # DeltaV - Removed cardinal snapping + sprite: _DV/Structures/Decoration/Curtains/hospital.rsi # DeltaV - Changed sprite path layers: - state: closed map: ["enum.DoorVisualLayers.Base"] diff --git a/Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/closed.png b/Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..a71483f5e43350e0607317944309c493bb9dd23d GIT binary patch literal 1794 zcmV+d2mSboP)K50bo4o2Ko%^g)^w2zn{}2n7lh@XyJ13Z#Ig9Bj3)<3yR^ z&x+&@IYTa2E>K?_Y)B4wcIKOJempupK3>gcvt}}xH1_A}>Z*}EJ3BpX_MSc!t&N?D zG9|Ls`}bkTN?nzeKZSStq~9tgfAsqw59+k7)t{{rZvOdNZIV7~*Y1NrIIVcU`3Rfb zKl$E7@=4h-4-1)Mx*w%mv`B!L}$9L}gqG zT?oxG-v!pL%DRBSt&0>e9*>**`}>Xp>~ju7+;!-qv!gr=swv-70QCaxvr7QRL;s@T z7f9|$tH2lCn>3yR91vvp16c3FSJe>M1wqMv1bcU#R=@#V3<1pixL+`Js6+wWnVbuZ z$2(wccOHsAjs-Y=opS;1tGEi_*4l7cQ@-2<1PZWU`vTS;&5j_d?0M!!#rs?ZOu>Y= zTMRk}9266!++HeY> zT!6Ab#0EqAqr9KOpusIbS#h(53_N|`{ z0z+Qj$oHe1PywwhLz?ja@!1^Kx+sp%I`Yk0>HTq?Qh>b#{zg}DIeO}u^}*8pR!(X^ zUJltGb*CEg*)Z6b368go3lKaaOonn%{Ot4uEO63VYkdC$DDZ+@m&O2~$Kxjf3PX`W zy;MOmbOc0XFW}-O7?8sRIVxTk0}6aFiUAI5lVT78;B5@U=74KXGH1{H&tt&Q7&JTv z7~URZmmC$&!XO53S|+#yE_|oSRS^%U>4QUHfKJ9DMV0{9>R><+vvcBbO$@M{At~P! zZZ!tX`|#{ONAKxjVZ8{M@V=;DFz^aK;p!4n<5ObS!2I!Q2QX((Py(mMZofT zfZvz!_aDHS`|O#If&n`KjCUr(tBwI5K(ScAY%xGruqhD6B8gT&p$}7B9OLkNVJ?x( z1qdE+V2YyF*Nbui4+E%N0GJ+TZXCZyetv3NWAs{W+MEwsrlv7u^SMY721vu8Tff@~ z4{+i;RsE?}5t1q(R%D6w1vuVbQWYl8Oc9}8^?;0A053+h#s-rggU&u@Yx*0ty&A22%<0kMEAdhbr7IkIk-NQ^$W=VMs}yQ{IdJ=RG2a$ z`>c0S5)}rD%bO3V+#KcS1F%*8DcSQ!g-B)zkez)&%ppkklj|@ChJz*Ysr~)t1A6rL zk)FKiu^(T?&N1M>*;$6jd;!Y@LljdVQW z0(?F#;Q?H0s>B6iRGj7zWptk$zcjMu;OVoCW6Y zFAjq?v`M}Ihb!3@;0$uqkndRl63LrB^8v75md}r1-L0BKKG`q6!`z? z4Z>H&>C{-SBF+QMJWpRH#v!viE6lAOA`G)2*jE82K_ikGJ+x4Q0X1uqb$Ww>UjAZn zP5OGMfJecAk8q1G*}6P_E!zXs_4|?;9n2hYoXwp@vP!_;*l)me)_oS6TPl$s_8*GU zVW|n?%RJfSd;lY>e_tTT+9cT+$L_iqF!IJ?voMHgjBxTr81OH|+-suWS0fIy7yztm zc}ve8){yVb2&HE7hMLo}Unt%iT&Xs9b@`?TS^)!aUSHS$a^raaIl9C-v8J54PFlbFnQq)v~7?7-l^Ly@?TgnBh zm&CZ3S(1!!XAYhVnBs+~F%n{c{Ub%`tZoj5Sg;!g1Lp1IS?o?$e!cksIFX$%VCDnV k)E1mmG@l@mPs|*A2IGM@@HXP&UH||907*qoM6N<$f`yJ##{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/meta.json b/Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/meta.json new file mode 100644 index 00000000000..34b4004f09f --- /dev/null +++ b/Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by TheShuEd (github) for Space Station14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "open", + "directions": 4 + }, + { + "name": "closed", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/open.png b/Resources/Textures/_DV/Structures/Decoration/Curtains/hospital.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..7da4a3106b47dfa34315394ab8731aced3138c01 GIT binary patch literal 1528 zcmV8n`5GIpIfsYmv33g=|xhk*V%7v3FF7J1*aIbJkW2kWDDrcv=DuCf4u_M8dlmK>Y z-F&+oYPepKD^j}wi4ZVMipwSEE7Pn{b)3LH0Jd5bZ~cf_w?}a zaJufjF@8KAFKJ$NX_6#Szu%9h(`jx${&4z~i+iT`{(i{Ae?P;+1(8;+mQ{|9yC_K4==)qC7X-IwpE z?_agi=m)wRF3de^ULI4{*faqQkY>=-1bSow2V?>?Z9;!J6SyQ3!2MtXFUbVHre?xp zH)R4+{c%5eTmis$@&VVieZX?LjA^sm1l|*!#{*T3DLY@L7wiKX0I+D}1gn(R_jxM- z^g5F5Bzpd=A5CtikyjJ&EnwCBwKV`LgAHM^i4UlHK;P#z06S#!TbVpgKA>9wjFi*k z7g`NKY9nob`>b8k3?LJ>Z33j1E{ZZAfE5yNKy0y?llo6DQ6UYFN;Sc*4 z7Z=3#Z0m^)U)d}*N zS)0KpGJ`*A)dGEowsq&1>W^!&%1y{0uFQOJR^| zWI6R0cG6}L%v4y~zS^H73=#lfEM(Or3x_mdGOf=Ht?R8fJ-#Rr%KRM_0&?lFjUMZY z2AH%M%bGbspwdMEc8D94H4gR#kTkn`vzkzQ(!rR8rKZvD)f$H*-J`<*$o_;R8BoZaMb~5kZ)xh3K{Y@MTpSj4g&~9k45k6Lq$pebq)`A) zu+u((+f%qaZPS2!e?pix9q%Sk#m}3|UkOYIGY9|x@$;%>Jx{={vcsj~?#*mb^AdhD z!5}`Ms#DXf2ZZ(m0W?5=yH~grCIpJ|gw~rtB|ndhP<)>t_d}(`UNvAmUfDlZfD;OJ z_*fyccSXv9pL($OClEkiDIa*_F(2>@K(YEu9)Qi`XVCMW0my5B{B9TT9>-9EQA*Eu z5P+2i$S^1Qd5!`M2xo^p-nS$4tO3>hJOq_Z%&Yzc{naYArWC!IbjjmF0KD__Wltr} eH5I-}j{gA<5REZ$F?>J(0000 Date: Thu, 9 Jan 2025 10:14:10 +0100 Subject: [PATCH 10/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 811f456fde8..837717cc7b2 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: dge21 - changes: - - message: the mime suit is craftable now! - type: Add - id: 383 - time: '2024-06-04T15:49:58.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1286 - author: Leo, Velcroboy, and Timemaster changes: - message: Added The Justice Department >:) @@ -3844,3 +3837,11 @@ id: 882 time: '2025-01-09T06:34:46.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2645 +- author: Velcroboy + changes: + - message: Hospital curtains now take up less space when open and have interaction + outlines. This should make treating patients under them a little better. + type: Tweak + id: 883 + time: '2025-01-09T09:13:51.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2657 From cfdf734e7a0a85c3dbd3273d5e99026786fb97ac Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 9 Jan 2025 12:39:39 +0000 Subject: [PATCH 11/45] Revert "allow cloning living people (#932)" (#2667) This reverts commit c8ad050c69bffc7a832a64fdb1a52ccc8bb28610. Co-authored-by: deltanedas <@deltanedas:kde.org> --- Content.Server/Cloning/CloningConsoleSystem.cs | 2 +- Content.Server/Cloning/CloningSystem.cs | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Content.Server/Cloning/CloningConsoleSystem.cs b/Content.Server/Cloning/CloningConsoleSystem.cs index 8e8bf9ca838..ad0d642f547 100644 --- a/Content.Server/Cloning/CloningConsoleSystem.cs +++ b/Content.Server/Cloning/CloningConsoleSystem.cs @@ -213,7 +213,7 @@ private CloningConsoleBoundUserInterfaceState GetUserInterfaceState(CloningConso { scanBodyInfo = MetaData(scanBody.Value).EntityName; - if (false) // GoobStation: Lets you clone living people + if (!_mobStateSystem.IsDead(scanBody.Value)) { clonerStatus = ClonerStatus.ScannerOccupantAlive; } diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index 4b7dfc7082b..ab593b607c8 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/Content.Server/Cloning/CloningSystem.cs @@ -150,8 +150,7 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity Date: Thu, 9 Jan 2025 13:39:58 +0100 Subject: [PATCH 12/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 837717cc7b2..f2476fa1017 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Leo, Velcroboy, and Timemaster - changes: - - message: Added The Justice Department >:) - type: Add - id: 384 - time: '2024-06-07T13:22:37.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/660 - author: rosieposieeee changes: - message: Submarine Station has been removed from rotation. @@ -3845,3 +3838,10 @@ id: 883 time: '2025-01-09T09:13:51.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2657 +- author: deltanedas + changes: + - message: Fixed cloning not working. + type: Fix + id: 884 + time: '2025-01-09T12:39:39.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2667 From eabd05d3b633fee70bb7a33df294f2a66430bb90 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:06:00 +0000 Subject: [PATCH 13/45] add AI defense turret + let AI unlock buttons (#2665) * change locking to use ComplexInteraction * add AI defense turret * :trollface: --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Content.Shared/Lock/LockSystem.cs | 5 +++-- .../Entities/Objects/Weapons/Guns/turrets.yml | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/turrets.yml diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs index 411766d8c1f..10652800953 100644 --- a/Content.Shared/Lock/LockSystem.cs +++ b/Content.Shared/Lock/LockSystem.cs @@ -1,10 +1,10 @@ using Content.Shared.Access.Components; using Content.Shared.Access.Systems; +using Content.Shared.ActionBlocker; using Content.Shared.Construction.Components; using Content.Shared.DoAfter; using Content.Shared.Emag.Systems; using Content.Shared.Examine; -using Content.Shared.Hands.Components; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; using Content.Shared.Popups; @@ -26,6 +26,7 @@ namespace Content.Shared.Lock; public sealed class LockSystem : EntitySystem { [Dependency] private readonly AccessReaderSystem _accessReader = default!; + [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; [Dependency] private readonly ActivatableUISystem _activatableUI = default!; [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; @@ -246,7 +247,7 @@ public bool IsLocked(Entity ent) /// public bool CanToggleLock(EntityUid uid, EntityUid user, bool quiet = true) { - if (!HasComp(user)) + if (!_actionBlocker.CanComplexInteract(user)) return false; var ev = new LockToggleAttemptEvent(user, quiet); diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/turrets.yml new file mode 100644 index 00000000000..dcd65e7c66d --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/turrets.yml @@ -0,0 +1,17 @@ +# Shoots anything and lets doors close over it, letting it be used in AI cores "under" blast doors. +- type: entity + parent: WeaponTurretAllHostile + id: WeaponTurretAI + name: AI defense turret + description: A ballistic turret that retracts into the floor. Deployable by the station AI to defend its core against urgent threats. + components: + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.45 + density: 60 + mask: + - SmallMobMask # same as mouse, lets it go under doors but not phase through walls + layer: + - SmallMobLayer From c5a008cb81db2844d83453ab8ecd042f2e4adf9d Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:06:19 +0100 Subject: [PATCH 14/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index f2476fa1017..24c748ebe9a 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: rosieposieeee - changes: - - message: Submarine Station has been removed from rotation. - type: Remove - id: 385 - time: '2024-06-07T14:37:29.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1307 - author: Lyndomen changes: - message: Burning bodies no longer ash @@ -3845,3 +3838,11 @@ id: 884 time: '2025-01-09T12:39:39.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2667 +- author: deltanedas + changes: + - message: AI cores will soon have defense turrets that the AI can deploy to shoot + intruders. + type: Add + id: 885 + time: '2025-01-09T17:06:00.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2665 From 17d0861596adcdc875f7e6960d6b94136bea9ca4 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:02:34 +0000 Subject: [PATCH 15/45] make limb severing bleed instead of bloodloss damage (#2668) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Content.Server/Body/Systems/BodySystem.cs | 9 +++++++++ Content.Shared/Body/Part/BodyPartComponent.cs | 8 ++++---- .../Body/Systems/SharedBodySystem.Parts.cs | 14 ++------------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs index 9014d3fe232..3189b029630 100644 --- a/Content.Server/Body/Systems/BodySystem.cs +++ b/Content.Server/Body/Systems/BodySystem.cs @@ -23,6 +23,7 @@ namespace Content.Server.Body.Systems; public sealed class BodySystem : SharedBodySystem { + [Dependency] private readonly BloodstreamSystem _bloodstream = default!; // Shitmed Change [Dependency] private readonly GhostSystem _ghostSystem = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!; @@ -195,5 +196,13 @@ protected override void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceC Dirty(target, bodyAppearance); } + protected override void PartRemoveDamage(Entity bodyEnt, Entity partEnt) + { + var bleeding = partEnt.Comp.SeverBleeding; + if (partEnt.Comp.IsVital) + bleeding *= 2f; + _bloodstream.TryModifyBleedAmount(bodyEnt, bleeding); + } + // Shitmed Change End } diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs index ef5e7f08995..b9862c28c9c 100644 --- a/Content.Shared/Body/Part/BodyPartComponent.cs +++ b/Content.Shared/Body/Part/BodyPartComponent.cs @@ -32,11 +32,11 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent public BodyPartSlot? ParentSlot; /// - /// Shitmed Change: Amount of damage to deal when the part gets removed. - /// Only works if IsVital is true. + /// Shitmed Change: Bleeding stacks to give when this body part is severed. + /// Doubled for . parts. /// - [DataField, AutoNetworkedField] - public FixedPoint2 VitalDamage = 100; + [DataField] + public float SeverBleeding = 4f; [DataField, AlwaysPushInheritance] public string ToolName { get; set; } = "A body part"; diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index fabad1ecd34..d0f5b2cd7e2 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -383,19 +383,9 @@ private void RemoveLeg(Entity legEnt, Entity } } - private void PartRemoveDamage(Entity bodyEnt, Entity partEnt) + // Shitmed Change: made virtual, bleeding damage is done on server + protected virtual void PartRemoveDamage(Entity bodyEnt, Entity partEnt) { - if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false)) - return; - - if (!_timing.ApplyingState - && partEnt.Comp.IsVital - && !GetBodyChildrenOfType(bodyEnt, partEnt.Comp.PartType, bodyEnt.Comp).Any() - ) - { - var damage = new DamageSpecifier(Prototypes.Index("Bloodloss"), partEnt.Comp.VitalDamage); // Shitmed Change - Damageable.TryChangeDamage(bodyEnt, damage, partMultiplier: 0f); // Shitmed Change - } } /// From 8d04118a79214e15ff11c61912a1e0499925b493 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:02:54 +0100 Subject: [PATCH 16/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 24c748ebe9a..9559ef72855 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lyndomen - changes: - - message: Burning bodies no longer ash - type: Tweak - id: 386 - time: '2024-06-08T00:20:26.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1324 - author: Colin_Tel, Space Law Rewrite Team changes: - message: Added a guidebook entry for Justice under "Jobs" @@ -3846,3 +3839,11 @@ id: 885 time: '2025-01-09T17:06:00.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2665 +- author: deltanedas + changes: + - message: Losing a limb makes you bleed profusely instead of dealing bloodloss + damage. + type: Tweak + id: 886 + time: '2025-01-09T18:02:35.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2668 From 60c529140d9bb4f267ceb66a5a248129acafbedb Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:04:48 +0000 Subject: [PATCH 17/45] mediborg candy refactor (#2639) refactor borg candy and move to shared _DV namespace Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Borgs/FabricateCandyComponent.cs | 25 ---------- .../Abilities/Borgs/FabricateCandySystem.cs | 47 ------------------ .../Actions/FabricateCandyEvent.cs | 4 -- .../Silicons/Borgs/FabricateCandyComponent.cs | 46 +++++++++++++++++ .../Silicons/Borgs/FabricateCandySystem.cs | 45 +++++++++++++++++ .../en-US/nyanotrasen/abilities/borgs.ftl | 5 -- .../Prototypes/Nyanotrasen/Actions/types.yml | 21 -------- Resources/Prototypes/_DV/Actions/borgs.yml | 22 ++++++++ .../Objects/Consumable/Food/candy.yml | 28 ++++++----- Resources/Prototypes/borg_types.yml | 5 +- .../Consumable/Food/candy.rsi/meta.json | 34 ------------- .../Food/candy.rsi/gumball-shine.png | Bin .../Consumable/Food/candy.rsi/gumball.png | Bin .../Food/candy.rsi/lollipop-ball.png | Bin .../lollipop-equipped-MASK-vulpkanin.png | Bin .../Food/candy.rsi/lollipop-equipped-MASK.png | Bin .../Food/candy.rsi/lollipop-stickandshine.png | Bin .../Consumable/Food/candy.rsi/lollipop.png | Bin .../Consumable/Food/candy.rsi/meta.json | 34 +++++++++++++ 19 files changed, 167 insertions(+), 149 deletions(-) delete mode 100644 Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs delete mode 100644 Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs delete mode 100644 Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs create mode 100644 Content.Shared/_DV/Silicons/Borgs/FabricateCandyComponent.cs create mode 100644 Content.Shared/_DV/Silicons/Borgs/FabricateCandySystem.cs delete mode 100644 Resources/Locale/en-US/nyanotrasen/abilities/borgs.ftl create mode 100644 Resources/Prototypes/_DV/Actions/borgs.yml rename Resources/Prototypes/{Nyanotrasen => _DV}/Entities/Objects/Consumable/Food/candy.yml (73%) delete mode 100644 Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/meta.json rename Resources/Textures/{Nyanotrasen => _DV}/Objects/Consumable/Food/candy.rsi/gumball-shine.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Objects/Consumable/Food/candy.rsi/gumball.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Objects/Consumable/Food/candy.rsi/lollipop-ball.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK-vulpkanin.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Objects/Consumable/Food/candy.rsi/lollipop-stickandshine.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Objects/Consumable/Food/candy.rsi/lollipop.png (100%) create mode 100644 Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/meta.json diff --git a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs deleted file mode 100644 index 36546359829..00000000000 --- a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandyComponent.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Robust.Shared.Audio; - -namespace Content.Server.Abilities.Borgs; - -[RegisterComponent] -public sealed partial class FabricateCandyComponent : Component -{ - [DataField] - public EntityUid? LollipopAction; - - [DataField] - public EntityUid? GumballAction; - - /// - /// The sound played when fabricating candy. - /// - [DataField] - public SoundSpecifier FabricationSound = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg") - { - Params = new AudioParams - { - Volume = -2f - } - }; -} diff --git a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs b/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs deleted file mode 100644 index b9c7540d750..00000000000 --- a/Content.Server/Nyanotrasen/Abilities/Borgs/FabricateCandySystem.cs +++ /dev/null @@ -1,47 +0,0 @@ -using Robust.Server.Audio; -using Robust.Shared.Prototypes; -using Content.Shared.Actions; -using Content.Shared.Actions.Events; - -namespace Content.Server.Abilities.Borgs; - -public sealed partial class FabricateCandySystem : EntitySystem -{ - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly AudioSystem _audioSystem = default!; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnLollipop); - SubscribeLocalEvent(OnGumball); - } - - private void OnInit(EntityUid uid, FabricateCandyComponent component, ComponentInit args) - { - if (component.LollipopAction != null || component.GumballAction != null) - return; - - _actionsSystem.AddAction(uid, ref component.LollipopAction, "ActionFabricateLollipop"); - _actionsSystem.AddAction(uid, ref component.GumballAction, "ActionFabricateGumball"); - } - - private void OnLollipop(FabricateLollipopActionEvent args) - { - OnCandy("FoodLollipop", args); - } - - private void OnGumball(FabricateGumballActionEvent args) - { - OnCandy("FoodGumball", args); - } - - private void OnCandy(EntProtoId proto, BaseActionEvent evt) - { - Spawn(proto, Transform(evt.Performer).Coordinates); - if (TryComp(evt.Performer, out FabricateCandyComponent? comp)) - _audioSystem.PlayPvs(comp.FabricationSound, evt.Performer); - evt.Handled = true; - } -} diff --git a/Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs b/Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs deleted file mode 100644 index 3c9371d27eb..00000000000 --- a/Content.Shared/Nyanotrasen/Actions/FabricateCandyEvent.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace Content.Shared.Actions.Events; - -public sealed partial class FabricateLollipopActionEvent : InstantActionEvent {} -public sealed partial class FabricateGumballActionEvent : InstantActionEvent {} diff --git a/Content.Shared/_DV/Silicons/Borgs/FabricateCandyComponent.cs b/Content.Shared/_DV/Silicons/Borgs/FabricateCandyComponent.cs new file mode 100644 index 00000000000..bec671c42c5 --- /dev/null +++ b/Content.Shared/_DV/Silicons/Borgs/FabricateCandyComponent.cs @@ -0,0 +1,46 @@ +using Content.Shared.Actions; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared._DV.Silicons.Borgs; + +/// +/// Lets a medical borg spawn a number of candy items using actions. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class FabricateCandyComponent : Component +{ + /// + /// Actions to add to the entity. + /// + [DataField(required: true)] + public List Actions = new(); + + /// + /// The sound played when fabricating candy. + /// + [DataField] + public SoundSpecifier FabricationSound = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg") + { + Params = new AudioParams + { + Volume = -2f + } + }; +} + +/// +/// Action event to use for candy fabrication actions. +/// +public sealed partial class FabricateCandyActionEvent : InstantActionEvent +{ + /// + /// The item to spawn at the borg. + /// + /// + /// The client only sends a , no exploits possible with this being in the event. + /// + [DataField(required: true)] + public EntProtoId Item; +} diff --git a/Content.Shared/_DV/Silicons/Borgs/FabricateCandySystem.cs b/Content.Shared/_DV/Silicons/Borgs/FabricateCandySystem.cs new file mode 100644 index 00000000000..c1e7cc3402f --- /dev/null +++ b/Content.Shared/_DV/Silicons/Borgs/FabricateCandySystem.cs @@ -0,0 +1,45 @@ +using Content.Shared.Actions; +using Content.Shared.Administration.Logs; +using Content.Shared.Database; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Network; +using Robust.Shared.Prototypes; + +namespace Content.Shared._DV.Silicons.Borgs; + +public sealed partial class FabricateCandySystem : EntitySystem +{ + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnFabricate); + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + var (uid, comp) = ent; + foreach (var id in comp.Actions) + { + _actions.AddAction(uid, id); + } + } + + private void OnFabricate(Entity ent, ref FabricateCandyActionEvent args) + { + _audio.PlayPredicted(ent.Comp.FabricationSound, ent, ent); + args.Handled = true; + + if (_net.IsClient) + return; + + var spawned = Spawn(args.Item, Transform(ent).Coordinates); + _adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(ent):player} fabricated {ToPrettyString(spawned):item}"); + } +} diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/borgs.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/borgs.ftl deleted file mode 100644 index 833ba59885f..00000000000 --- a/Resources/Locale/en-US/nyanotrasen/abilities/borgs.ftl +++ /dev/null @@ -1,5 +0,0 @@ -action-name-fabricate-lollipop = Fabricate Lollipop -action-description-fabricate-lollipop = Fabricate a lollipop that contains a small dose of Omnizine. - -action-name-fabricate-gumball = Fabricate Gumball -action-description-fabricate-gumball = Fabricate a gumball full of sugar and medicine to treat small injuries. diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml index 6cf81a5f88d..31ea8f5316f 100644 --- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml +++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml @@ -142,24 +142,3 @@ - type: InstantAction icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png event: !type:RemovePsionicInvisibilityOffPowerActionEvent - -- type: entity - id: ActionFabricateLollipop - name: action-name-fabricate-lollipop - description: action-description-fabricate-lollipop - components: - - type: InstantAction - icon: { sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi, state: lollipop } - useDelay: 120 - event: !type:FabricateLollipopActionEvent - -- type: entity - id: ActionFabricateGumball - name: action-name-fabricate-gumball - description: action-description-fabricate-gumball - components: - - type: InstantAction - icon: { sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi, state: gumball } - iconColor: '#FFAED7' - useDelay: 40 - event: !type:FabricateGumballActionEvent diff --git a/Resources/Prototypes/_DV/Actions/borgs.yml b/Resources/Prototypes/_DV/Actions/borgs.yml new file mode 100644 index 00000000000..126e48d3e13 --- /dev/null +++ b/Resources/Prototypes/_DV/Actions/borgs.yml @@ -0,0 +1,22 @@ +- type: entity + id: ActionFabricateLollipop + name: Fabricate Lollipop + description: Fabricate a lollipop that contains a small dose of Omnizine. + components: + - type: InstantAction + icon: { sprite: _DV/Objects/Consumable/Food/candy.rsi, state: lollipop } + useDelay: 120 + event: !type:FabricateCandyActionEvent + item: FoodLollipop + +- type: entity + id: ActionFabricateGumball + name: Fabricate Gumball + description: Fabricate a gumball full of sugar and medicine to treat small injuries. + components: + - type: InstantAction + icon: { sprite: _DV/Objects/Consumable/Food/candy.rsi, state: gumball } + iconColor: '#FFAED7' + useDelay: 40 + event: !type:FabricateCandyActionEvent + item: FoodGumball diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/candy.yml b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Food/candy.yml similarity index 73% rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/candy.yml rename to Resources/Prototypes/_DV/Entities/Objects/Consumable/Food/candy.yml index 971748013b3..c29eef468ed 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/candy.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Food/candy.yml @@ -1,5 +1,15 @@ - type: entity + abstract: true parent: FoodBase + id: FoodCandyBase + components: + - type: Sprite + sprite: _DV/Objects/Consumable/Food/candy.rsi + - type: Appearance + - type: RandomizedCandy + +- type: entity + parent: FoodCandyBase id: FoodLollipop name: lollipop description: For being such a good sport! It's enriched with potent yet mostly safe-to-eat medicine. @@ -7,7 +17,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 15 + maxVol: 17 # 2 extra reagents: - ReagentId: Sugar Quantity: 3 @@ -20,29 +30,26 @@ - ReagentId: Vitamin Quantity: 3 - type: Sprite - sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi layers: - state: lollipop-ball map: [ "enum.CandyVisualLayers.Ball" ] - state: lollipop-stickandshine - type: Clothing - sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi + sprite: _DV/Objects/Consumable/Food/candy.rsi slots: [ mask ] equippedPrefix: lollipop - quickEquip: false # would block eating otherwise - - type: Appearance - - type: RandomizedCandy + quickEquip: false # would block eating otherwise - type: entity - parent: FoodBase + parent: FoodCandyBase id: FoodGumball name: gumball - description: Try as you might, you can't blow bubbles with it... it's enriched with medicine for minor ailments. + description: "Try as you might, you can't blow bubbles with it... it's enriched with medicine for minor ailments." components: - type: SolutionContainerManager solutions: food: - maxVol: 15 + maxVol: 15 # 1 extra reagents: - ReagentId: Sugar Quantity: 5 @@ -53,10 +60,7 @@ - ReagentId: Dylovene Quantity: 3 - type: Sprite - sprite: Nyanotrasen/Objects/Consumable/Food/candy.rsi layers: - state: gumball map: [ "enum.CandyVisualLayers.Ball" ] - state: gumball-shine - - type: Appearance - - type: RandomizedCandy diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index 99c5f4ee764..f5816b6956b 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -172,7 +172,10 @@ - type: ShowHealthIcons damageContainers: - Biological - - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine. + - type: FabricateCandy # DeltaV - The medical cyborg can generate candies filled with medicine. + actions: + - ActionFabricateLollipop + - ActionFabricateGumball - type: SurgeryTarget # Shitmed - type: Sanitized # Shitmed diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/meta.json deleted file mode 100644 index a81452e8c26..00000000000 --- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/meta.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, made colorable by pissdemon, equip sprites made by pissdemon based on cigarette.rsi taken from tgstation and paradise (see attributions in Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "gumball" - }, - { - "name": "gumball-shine" - }, - { - "name": "lollipop" - }, - { - "name": "lollipop-ball" - }, - { - "name": "lollipop-stickandshine" - }, - { - "name": "lollipop-equipped-MASK", - "directions": 4 - }, - { - "name": "lollipop-equipped-MASK-vulpkanin", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/gumball-shine.png b/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/gumball-shine.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/gumball-shine.png rename to Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/gumball-shine.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/gumball.png b/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/gumball.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/gumball.png rename to Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/gumball.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop-ball.png b/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop-ball.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop-ball.png rename to Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop-ball.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK-vulpkanin.png b/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK-vulpkanin.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK-vulpkanin.png rename to Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK-vulpkanin.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK.png b/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK.png rename to Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop-equipped-MASK.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop-stickandshine.png b/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop-stickandshine.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop-stickandshine.png rename to Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop-stickandshine.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop.png b/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi/lollipop.png rename to Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/lollipop.png diff --git a/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/meta.json new file mode 100644 index 00000000000..a3788448bfa --- /dev/null +++ b/Resources/Textures/_DV/Objects/Consumable/Food/candy.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, made colorable by pissdemon, equip sprites made by pissdemon based on cigarette.rsi taken from tgstation and paradise (see attributions in Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "gumball" + }, + { + "name": "gumball-shine" + }, + { + "name": "lollipop" + }, + { + "name": "lollipop-ball" + }, + { + "name": "lollipop-stickandshine" + }, + { + "name": "lollipop-equipped-MASK", + "directions": 4 + }, + { + "name": "lollipop-equipped-MASK-vulpkanin", + "directions": 4 + } + ] +} From 5af62a8a872283133f83020e23e03360553c46c6 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Thu, 9 Jan 2025 22:34:26 -0500 Subject: [PATCH 18/45] add painkillers to logi purchases (#2674) * pain ops * Update cargo_medical.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --- .../catalog/fills/crates/medical-crates.ftl | 2 ++ .../Prototypes/_DV/Catalog/Cargo/cargo_medical.yml | 10 ++++++++++ .../Prototypes/_DV/Catalog/Fills/Crates/medical.yml | 11 +++++++++++ 3 files changed, 23 insertions(+) create mode 100644 Resources/Locale/en-US/_DV/prototypes/catalog/fills/crates/medical-crates.ftl diff --git a/Resources/Locale/en-US/_DV/prototypes/catalog/fills/crates/medical-crates.ftl b/Resources/Locale/en-US/_DV/prototypes/catalog/fills/crates/medical-crates.ftl new file mode 100644 index 00000000000..08c8fb16433 --- /dev/null +++ b/Resources/Locale/en-US/_DV/prototypes/catalog/fills/crates/medical-crates.ftl @@ -0,0 +1,2 @@ +ent-CrateMedicalPainkiller = Painkillers crate + .desc = Contains a number of painkiller options. diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_medical.yml index 16a6d2c883e..8c96f1a7f1a 100644 --- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_medical.yml @@ -17,3 +17,13 @@ cost: 1500 category: Medical group: market + +- type: cargoProduct + id: PainkillerCrate + icon: + sprite: Objects/Specific/Chemistry/pills_canister.rsi + state: pill_canister + product: CratePainkillerBottles + cost: 1000 + category: Medical + group: market diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml index edcfcab151b..1299a45e38b 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml @@ -8,3 +8,14 @@ contents: - id: GenericRadioImplanter amount: 3 + +- type: entity + id: CratePainkillerBottles + parent: CrateMedical + name: painkiller crate + description: Running out of these is not an option. + components: + - type: StorageFill + contents: + - id: PillCanisterStubantazine + amount: 3 From 2d6d852dc27c81d5992eab80839efd95bcaefef3 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 04:34:45 +0100 Subject: [PATCH 19/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 9559ef72855..498a4b057dc 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin_Tel, Space Law Rewrite Team - changes: - - message: Added a guidebook entry for Justice under "Jobs" - type: Add - id: 387 - time: '2024-06-08T11:40:40.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1327 - author: adeinitas changes: - message: Justice has been brought to Shoukou Station. @@ -3847,3 +3840,11 @@ id: 886 time: '2025-01-09T18:02:35.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2668 +- author: Lyndomen + changes: + - message: Buy painkillers at logistics! They are not the good stuff however, and + might cause small amounts of nausea. + type: Add + id: 887 + time: '2025-01-10T03:34:26.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2674 From d361ecea172a18786f70a1659f5e40108175fdb9 Mon Sep 17 00:00:00 2001 From: Emily <182209267+Emily9031@users.noreply.github.com> Date: Thu, 9 Jan 2025 21:45:39 -0700 Subject: [PATCH 20/45] Add Machine Incompatible Trait (#2395) * Mostly done, just needs some messaging added Going to change the description for the unborgable brain and add a popup. * Inspection says if brain has trait * Comments * Moved comment, removed body, localized, etc. * move to shared, shitmed ready, add warning to health analyzer * pro * remove old component * untroll brain system * :trollface: * :trollface: * fix --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../UI/HealthAnalyzerWindow.xaml.cs | 14 ++++- .../Traits/Assorted/UnborgableComponent.cs | 10 ++++ .../_DV/Traits/Assorted/UnborgableSystem.cs | 54 +++++++++++++++++++ Resources/Locale/en-US/_DV/borg/borg.ftl | 2 + .../components/health-analyzer-component.ftl | 1 + Resources/Locale/en-US/_DV/traits/traits.ftl | 3 ++ .../Objects/Specific/Robotics/mmi.yml | 3 ++ .../Prototypes/_DV/Traits/disabilities.yml | 8 +++ 8 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 Content.Shared/_DV/Traits/Assorted/UnborgableComponent.cs create mode 100644 Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs create mode 100644 Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index 4a141072ccb..8ed6fc63e40 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Numerics; using Content.Client.Message; +using Content.Shared._DV.Traits.Assorted; // DeltaV using Content.Shared.Atmos; using Content.Client.UserInterface.Controls; using Content.Shared._Shitmed.Targeting; // Shitmed @@ -36,6 +37,7 @@ public sealed partial class HealthAnalyzerWindow : FancyWindow private readonly SpriteSystem _spriteSystem; private readonly IPrototypeManager _prototypes; private readonly IResourceCache _cache; + private readonly UnborgableSystem _unborgable; // DeltaV // Shitmed Change Start public event Action? OnBodyPartSelected; @@ -57,6 +59,7 @@ public HealthAnalyzerWindow() _spriteSystem = _entityManager.System(); _prototypes = dependencies.Resolve(); _cache = dependencies.Resolve(); + _unborgable = _entityManager.System(); // DeltaV // Shitmed Change Start _bodyPartControls = new Dictionary { @@ -184,7 +187,8 @@ public void Populate(HealthAnalyzerScannedUserMessage msg) // Alerts - var showAlerts = msg.Unrevivable == true || msg.Bleeding == true; + var unborgable = _unborgable.IsUnborgable(_target.Value); // DeltaV + var showAlerts = msg.Unrevivable == true || msg.Bleeding == true || unborgable; AlertsDivider.Visible = showAlerts; AlertsContainer.Visible = showAlerts; @@ -208,6 +212,14 @@ public void Populate(HealthAnalyzerScannedUserMessage msg) MaxWidth = 300 }); + if (unborgable) // DeltaV + AlertsContainer.AddChild(new RichTextLabel + { + Text = Loc.GetString("health-analyzer-window-entity-unborgable-text"), + Margin = new Thickness(0, 4), + MaxWidth = 300 + }); + // Damage Groups var damageSortedGroups = diff --git a/Content.Shared/_DV/Traits/Assorted/UnborgableComponent.cs b/Content.Shared/_DV/Traits/Assorted/UnborgableComponent.cs new file mode 100644 index 00000000000..752d745870d --- /dev/null +++ b/Content.Shared/_DV/Traits/Assorted/UnborgableComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._DV.Traits.Assorted; + +/// +/// This is used for the unborgable trait, which blacklists a brain from MMIs. +/// If this is added to a body, it gets moved to its brain if it has one. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class UnborgableComponent : Component; diff --git a/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs b/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs new file mode 100644 index 00000000000..5580e171531 --- /dev/null +++ b/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs @@ -0,0 +1,54 @@ +using Content.Shared.Body.Components; +using Content.Shared.Body.Organ; +using Content.Shared.Body.Systems; +using Content.Shared.Examine; +using Content.Shared.Movement.Components; // TODO: use BrainComponent instead of InputMover when shitmed is merged +using Robust.Shared.Utility; + +namespace Content.Shared._DV.Traits.Assorted; + +/// +/// Adds a warning examine message to brains with . +/// +public sealed class UnborgableSystem : EntitySystem +{ + [Dependency] private readonly SharedBodySystem _body = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnExamined); + } + + /// + /// Returns true if a mob's brain has . + /// + public bool IsUnborgable(Entity ent) + { + // technically this will apply for any organ not just brain, but assume nobody will be evil and do that + return _body.GetBodyOrganEntityComps(ent).Count > 0; + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + if (!TryComp(ent, out var body)) + return; + + var brains = _body.GetBodyOrganEntityComps((ent.Owner, body)); + foreach (var brain in brains) + { + EnsureComp(brain); + } + } + + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + // need a health analyzer to see if someone can't be borged, can't just look at them and know + if (!args.IsInDetailsRange || HasComp(ent)) + return; + + args.PushMarkup(Loc.GetString("brain-cannot-be-borged-message")); + } +} diff --git a/Resources/Locale/en-US/_DV/borg/borg.ftl b/Resources/Locale/en-US/_DV/borg/borg.ftl index 22c7e3850c6..afb1e15827d 100644 --- a/Resources/Locale/en-US/_DV/borg/borg.ftl +++ b/Resources/Locale/en-US/_DV/borg/borg.ftl @@ -1,3 +1,5 @@ borg-type-security-name = Security borg-type-security-desc = Assist security in the fight for justice by detaining dangerous criminals. borg-type-security-transponder = security cyborg + +brain-cannot-be-borged-message = [color=red]This brain is damaged beyond use.[/color] diff --git a/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl new file mode 100644 index 00000000000..7698576e4e5 --- /dev/null +++ b/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl @@ -0,0 +1 @@ +health-analyzer-window-entity-unborgable-text = [color=red]Patient's brain signatures are incompatible with MMI technology![/color] diff --git a/Resources/Locale/en-US/_DV/traits/traits.ftl b/Resources/Locale/en-US/_DV/traits/traits.ftl index 5fb2e7052bc..b7f66f0bf8d 100644 --- a/Resources/Locale/en-US/_DV/traits/traits.ftl +++ b/Resources/Locale/en-US/_DV/traits/traits.ftl @@ -32,3 +32,6 @@ trait-inpain-desc = You’re constantly in discomfort. You need painkillers to f trait-addicted-name = Addicted trait-addicted-desc = You crave the substance, and your thoughts keep drifting back to it. Without it, you feel incomplete, anxious, and on edge. + +trait-unborgable-name = Machine Incompatible +trait-unborgable-desc = Your brain cannot be put into a man-machine interface. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index 33eabbb60b5..4251a2447a5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -41,6 +41,9 @@ whitelist: components: - Brain + blacklist: # DeltaV + components: + - Unborgable - type: ContainerContainer containers: brain_slot: !type:ContainerSlot diff --git a/Resources/Prototypes/_DV/Traits/disabilities.yml b/Resources/Prototypes/_DV/Traits/disabilities.yml index 96ded539387..611933b2e15 100644 --- a/Resources/Prototypes/_DV/Traits/disabilities.yml +++ b/Resources/Prototypes/_DV/Traits/disabilities.yml @@ -22,3 +22,11 @@ category: Disabilities components: - type: Pain + +- type: trait + id: Unborgable + name: trait-unborgable-name + description: trait-unborgable-desc + category: Disabilities + components: + - type: Unborgable # Automatically gets moved to the brain From f9d5f344ac8213fd1b53bb09168823f1c1562cdf Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 05:45:58 +0100 Subject: [PATCH 21/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 498a4b057dc..a26a67b266a 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: adeinitas - changes: - - message: Justice has been brought to Shoukou Station. - type: Add - id: 388 - time: '2024-06-08T19:39:20.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1321 - author: Timemaster99 changes: - message: Added a Clerk access level. @@ -3848,3 +3841,11 @@ id: 887 time: '2025-01-10T03:34:26.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2674 +- author: Emily9031 + changes: + - message: New Machine Incompatible trait, makes characters unable to have their + brain put into a man-machine interface. + type: Add + id: 888 + time: '2025-01-10T04:45:39.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2395 From 801d5d46d3499813635182adb67777dcba83a027 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Fri, 10 Jan 2025 06:14:34 +0000 Subject: [PATCH 22/45] lighthouse update (#2664) * lighthouse update * use AI turrets * use cap access for turrets button --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Maps/lighthouse.yml | 3722 +++++++++++++++------- Resources/Prototypes/Maps/lighthouse.yml | 3 +- 2 files changed, 2603 insertions(+), 1122 deletions(-) diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index 1d710527b05..bd4aa1654ec 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -159,7 +159,7 @@ entities: version: 6 0,2: ind: 0,2 - tiles: IAAAAAAAIAAAAAACIAAAAAABfwAAAAAAIAAAAAAAIAAAAAADIAAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAADIAAAAAAAIAAAAAABIAAAAAADIAAAAAACfwAAAAAAIAAAAAABIAAAAAADIAAAAAADIAAAAAAAIAAAAAACIAAAAAADIAAAAAACIAAAAAACIAAAAAADIAAAAAAAIAAAAAACIAAAAAACIAAAAAACIAAAAAAAIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAACIAAAAAABIAAAAAACIAAAAAABIAAAAAADIAAAAAAAIAAAAAABIAAAAAACIAAAAAADIAAAAAAAIAAAAAACIAAAAAABfwAAAAAAIAAAAAADIAAAAAADIAAAAAADIAAAAAAAIAAAAAACfwAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAABIAAAAAADIAAAAAACIAAAAAADIAAAAAABIAAAAAACIAAAAAACIAAAAAAAIAAAAAACIAAAAAAAIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAABMgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACfwAAAAAAfwAAAAAAfwAAAAAATwAAAAABIAAAAAABIAAAAAACIAAAAAADIAAAAAAAIAAAAAADMgAAAAAAIAAAAAACIAAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAABfwAAAAAAIAAAAAADTwAAAAACIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAADfwAAAAAAIAAAAAADIAAAAAAAIAAAAAACIAAAAAACIAAAAAADIAAAAAABfwAAAAAATwAAAAACIAAAAAACTwAAAAACfwAAAAAAQQAAAAAAQQAAAAAAIAAAAAADIAAAAAAAIAAAAAABIAAAAAAAIAAAAAACIAAAAAABfwAAAAAAIAAAAAABIAAAAAACfwAAAAAAIAAAAAABTwAAAAAAIAAAAAADfwAAAAAAQQAAAAAAfwAAAAAAIAAAAAABIAAAAAAAIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAQQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQQAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAUAAAAAAAIAAAAAABIAAAAAACIAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAUAAAAAAAIAAAAAADIAAAAAAAIAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAADcQAAAAAAcQAAAAAAcQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAACIAAAAAACIAAAAAACIAAAAAADIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAIAAAAAABIAAAAAAC + tiles: IAAAAAAAIAAAAAACIAAAAAABUAAAAAAAIAAAAAAAIAAAAAADIAAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAADIAAAAAAAIAAAAAABIAAAAAADIAAAAAACfwAAAAAAIAAAAAABIAAAAAADIAAAAAADBAAAAAAAIAAAAAACIAAAAAADIAAAAAACIAAAAAACIAAAAAADIAAAAAAAIAAAAAACIAAAAAACIAAAAAACIAAAAAAAIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAACIAAAAAABIAAAAAACIAAAAAABIAAAAAADIAAAAAAAIAAAAAABIAAAAAACIAAAAAADIAAAAAAAIAAAAAACIAAAAAABUAAAAAAAIAAAAAADIAAAAAADIAAAAAADIAAAAAAAIAAAAAACfwAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAABIAAAAAADIAAAAAACIAAAAAADIAAAAAABIAAAAAACBAAAAAAAIAAAAAAAIAAAAAACIAAAAAAAIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAABMgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACfwAAAAAAfwAAAAAAfwAAAAAATwAAAAABIAAAAAABIAAAAAACIAAAAAADIAAAAAAAIAAAAAADMgAAAAAAIAAAAAACIAAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAABfwAAAAAAIAAAAAADTwAAAAACIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAADfwAAAAAAIAAAAAADIAAAAAAAIAAAAAACIAAAAAACIAAAAAADIAAAAAABfwAAAAAATwAAAAACIAAAAAACTwAAAAACfwAAAAAAQQAAAAAAQQAAAAAAIAAAAAADIAAAAAAAIAAAAAABIAAAAAAAIAAAAAACIAAAAAABfwAAAAAAIAAAAAABIAAAAAACfwAAAAAAIAAAAAABTwAAAAAAIAAAAAADfwAAAAAAQQAAAAAAfwAAAAAAIAAAAAABIAAAAAAAIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAQQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQQAAAAAAfwAAAAAAUAAAAAAAIAAAAAAAfwAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAUAAAAAAAIAAAAAABIAAAAAACIAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAUAAAAAAAIAAAAAADIAAAAAAAIAAAAAACcQAAAAAAcQAAAAAAcQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAADcQAAAAAAcQAAAAAAcQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAIAAAAAABcQAAAAAAcQAAAAAAcQAAAAAAfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAACIAAAAAACIAAAAAACIAAAAAADIAAAAAADIAAAAAABfwAAAAAAfwAAAAAAIAAAAAABIAAAAAAC version: 6 -2,2: ind: -2,2 @@ -291,7 +291,7 @@ entities: version: 6 -4,4: ind: -4,4 - tiles: fgAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAdwAAAAAAdwAAAAAAUAAAAAAAcgAAAAAAcgAAAAACcgAAAAAAdgAAAAACcgAAAAACcgAAAAAAcgAAAAABAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAdwAAAAAAdwAAAAAAdgAAAAADcgAAAAADcgAAAAADcgAAAAABfwAAAAAAcgAAAAABcgAAAAABcgAAAAABAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAdwAAAAAAdwAAAAAAfwAAAAAAfwAAAAAAdgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAABcgAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAAAcgAAAAACcgAAAAACcgAAAAAAdgAAAAADcgAAAAABcgAAAAADAAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAcgAAAAABcgAAAAAAcgAAAAADcgAAAAADUAAAAAAAcgAAAAADfwAAAAAAfgAAAAAAPAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAcgAAAAABcgAAAAABcgAAAAAAcgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgAAAAAAEgAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAEgAAAAAAEgAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAIAAAAAADbgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAIAAAAAAD + tiles: fgAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAdwAAAAAAdwAAAAAAUAAAAAAAcgAAAAAAcgAAAAACcgAAAAAAdgAAAAACcgAAAAACcgAAAAAAcgAAAAABAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAdwAAAAAAdwAAAAAAdgAAAAADcgAAAAADcgAAAAADcgAAAAABfwAAAAAAcgAAAAABcgAAAAABcgAAAAABAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAdwAAAAAAdwAAAAAAfwAAAAAAfwAAAAAAdgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAABcgAAAAAAfgAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAcgAAAAAAcgAAAAACcgAAAAACcgAAAAAAdgAAAAADcgAAAAABcgAAAAADfwAAAAAAPAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAcgAAAAABcgAAAAAAcgAAAAADcgAAAAADUAAAAAAAcgAAAAADfwAAAAAAfgAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAcgAAAAABcgAAAAABcgAAAAAAcgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgAAAAAAEgAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAEgAAAAAAEgAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAIAAAAAADbgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAIAAAAAAD version: 6 0,4: ind: 0,4 @@ -431,7 +431,7 @@ entities: version: 6 -5,4: ind: -5,4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAfwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAbgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAfwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAbgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAOQAAAAAAfwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAbQAAAAAAUAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAOQAAAAAAfwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAIAAAAAAAfwAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAbgAAAAAA version: 6 -4,6: ind: -4,6 @@ -439,7 +439,7 @@ entities: version: 6 -4,5: ind: -4,5 - tiles: EgAAAAAAEgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACbgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAADAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: EgAAAAAAEgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACbgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAAIAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAADfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -3,6: ind: -3,6 @@ -447,7 +447,15 @@ entities: version: 6 -5,5: ind: -5,5 - tiles: fgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -6,4: + ind: -6,4 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAA + version: 6 + -6,5: + ind: -6,5 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -4372,6 +4380,28 @@ entities: id: WarnCornerSW decals: 2802: -15,-2 + - node: + color: '#DA8B8BFF' + id: WarnCornerSmallGreyscaleNE + decals: + 2820: -71,78 + - node: + color: '#DA8B8BFF' + id: WarnCornerSmallGreyscaleNW + decals: + 2819: -75,78 + - node: + color: '#DA8B8BFF' + id: WarnCornerSmallGreyscaleSE + decals: + 2818: -71,74 + 2826: -66,76 + - node: + color: '#DA8B8BFF' + id: WarnCornerSmallGreyscaleSW + decals: + 2817: -75,74 + 2827: -64,76 - node: color: '#FFFFFFFF' id: WarnEndE @@ -4405,6 +4435,35 @@ entities: 1580: -46,-26 1581: -45,-26 1582: -45,-25 + - node: + color: '#DA8B8BFF' + id: WarnFullGreyscale + decals: + 2806: -76,79 + 2807: -70,79 + 2808: -76,73 + 2809: -70,73 + 2822: -65,75 + - node: + color: '#DA8B8BFF' + id: WarnLineGreyscaleE + decals: + 2814: -71,73 + 2815: -71,79 + 2824: -66,75 + - node: + color: '#DA8B8BFF' + id: WarnLineGreyscaleN + decals: + 2816: -70,78 + 2821: -76,78 + - node: + color: '#DA8B8BFF' + id: WarnLineGreyscaleS + decals: + 2810: -76,74 + 2811: -70,74 + 2825: -65,76 - node: color: '#52B4E9FF' id: WarnLineGreyscaleW @@ -4413,6 +4472,13 @@ entities: 2793: -9,41 2794: -9,40 2795: -9,39 + - node: + color: '#DA8B8BFF' + id: WarnLineGreyscaleW + decals: + 2812: -75,73 + 2813: -75,79 + 2823: -64,75 - node: color: '#FFFFFFFF' id: WarnLineN @@ -4919,8 +4985,6 @@ entities: 0: 18190 -1,-6: 0: 3268 - -1,-9: - 0: 36848 0,-8: 0: 65520 0,-7: @@ -5182,6 +5246,8 @@ entities: 0: 3823 -1,-10: 0: 65294 + -1,-9: + 0: 4080 -1,-13: 0: 65279 -1,-11: @@ -5205,13 +5271,13 @@ entities: 2,-12: 0: 65535 2,-11: - 0: 53247 + 0: 53246 2,-10: - 0: 3838 + 0: 3830 2,-13: 0: 36345 3,-12: - 0: 65535 + 0: 64511 3,-11: 0: 32639 3,-10: @@ -5811,7 +5877,7 @@ entities: 1: 7 8,12: 0: 30708 - 3: 32768 + 7: 32768 8,13: 0: 247 1: 61440 @@ -5957,7 +6023,7 @@ entities: 0: 65535 -7,-13: 0: 45155 - 4: 12 + 3: 12 -6,-12: 0: 65335 -6,-11: @@ -6284,7 +6350,7 @@ entities: 1: 47519 -16,16: 0: 8738 - 1: 13 + 1: 53261 -15,14: 0: 2187 1: 560 @@ -6381,24 +6447,24 @@ entities: 0: 65535 -3,-15: 0: 13104 - 4: 128 - 5: 32768 + 3: 128 + 4: 32768 -3,-14: 0: 13107 - 6: 128 - 7: 32768 + 5: 128 + 6: 32768 -3,-17: 0: 61457 1: 238 -2,-16: 0: 64447 -2,-15: - 4: 48 - 5: 12288 + 3: 48 + 4: 12288 0: 34952 -2,-14: - 6: 48 - 7: 12288 + 5: 48 + 6: 12288 0: 32904 -2,-17: 0: 47308 @@ -6452,13 +6518,14 @@ entities: 4,-14: 0: 65535 -17,16: - 1: 34713 + 1: 63385 0: 2048 -16,17: - 1: 52636 - 0: 34 + 0: 47 + 1: 52688 -17,17: - 1: 4088 + 0: 15 + 1: 4080 -16,18: 0: 61986 1: 3276 @@ -6473,16 +6540,16 @@ entities: 0: 51 1: 34764 -15,17: - 1: 12175 + 1: 16287 -15,18: - 1: 49394 + 1: 50419 0: 12288 -15,19: - 0: 35004 - 1: 17472 + 0: 59580 + 1: 5184 -15,20: - 1: 62580 - 0: 2184 + 1: 54597 + 0: 10938 -14,18: 1: 4592 -14,19: @@ -6667,7 +6734,7 @@ entities: 1: 57856 9,12: 0: 238 - 3: 61440 + 7: 61440 10,10: 1: 15 0: 47872 @@ -6678,7 +6745,7 @@ entities: 1: 8192 10,12: 0: 102 - 3: 4096 + 7: 4096 1: 49152 10,8: 0: 32768 @@ -6794,17 +6861,17 @@ entities: -7,-15: 0: 17 1: 4352 - 4: 52416 + 3: 52416 -7,-14: 1: 1 0: 12560 - 4: 17612 + 3: 17612 -6,-16: 0: 65520 -6,-15: - 4: 30576 + 3: 30576 -6,-14: - 4: 119 + 3: 119 0: 61440 -6,-17: 1: 4096 @@ -6923,7 +6990,7 @@ entities: 0: 63280 9,13: 1: 28672 - 3: 238 + 7: 238 9,14: 1: 18146 0: 8192 @@ -6933,7 +7000,7 @@ entities: 1: 7715 0: 8192 10,13: - 3: 17 + 7: 17 1: 9728 10,14: 1: 242 @@ -7082,30 +7149,43 @@ entities: -18,15: 1: 50252 -18,16: - 1: 20036 + 1: 65092 -20,17: - 1: 22350 + 1: 2063 + 0: 30704 + -21,17: + 1: 34944 -20,18: - 1: 54653 + 0: 4369 + 1: 8738 + -21,18: + 1: 34952 -20,19: - 1: 55133 + 0: 4371 + 1: 8736 + -21,19: + 1: 34952 -20,20: - 1: 36629 + 0: 58129 + 1: 7266 -19,17: - 1: 65327 + 1: 60687 + 0: 752 -19,18: 1: 1 - 0: 19648 - -19,20: - 1: 20465 + 0: 16368 -19,19: - 0: 52300 + 0: 65339 + -19,20: + 1: 3553 + 0: 61952 -18,17: - 1: 65524 + 1: 65473 + 0: 62 -18,18: - 0: 18288 + 0: 26480 -18,19: - 0: 30535 + 0: 30567 -17,20: 0: 255 1: 3840 @@ -7115,23 +7195,32 @@ entities: -13,24: 1: 15 -16,21: - 1: 116 + 1: 3853 + 0: 242 -17,21: - 1: 248 + 1: 3855 + 0: 240 + -15,21: + 0: 19 + 1: 868 -14,21: 1: 3106 -13,21: 1: 18240 -13,22: 1: 17476 + -21,20: + 1: 2184 -20,21: - 1: 12 + 1: 14 -19,21: - 1: 199 + 1: 2255 -18,20: - 1: 31728 + 1: 3056 + 0: 28672 -18,21: - 1: 244 + 0: 247 + 1: 3848 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -7182,7 +7271,7 @@ entities: temperature: 293.15 moles: - 0 - - 103.92799 + - 0 - 0 - 0 - 0 @@ -7199,7 +7288,7 @@ entities: - 0 - 0 - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -7211,10 +7300,10 @@ entities: - volume: 2500 temperature: 293.15 moles: + - 6666.982 - 0 - 0 - 0 - - 6666.982 - 0 - 0 - 0 @@ -7226,8 +7315,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 + - 6666.982 - 0 - 0 - 0 @@ -7242,7 +7331,7 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 + - 103.92799 - 0 - 0 - 0 @@ -9840,7 +9929,7 @@ entities: pos: -12.5,-46.5 parent: 100 - type: Door - secondsUntilStateChange: -971.60486 + secondsUntilStateChange: -4235.348 state: Opening - type: DeviceLinkSource lastSignals: @@ -10059,7 +10148,11 @@ entities: pos: -61.5,75.5 parent: 100 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 3957: + - DoorStatus: DoorBolt - proto: AirlockEVAGlassLocked entities: - uid: 3419 @@ -10278,6 +10371,12 @@ entities: rot: 1.5707963267948966 rad pos: -58.5,75.5 parent: 100 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20367: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassLocked entities: - uid: 57 @@ -12167,14 +12266,6 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,45.5 parent: 100 - - uid: 2863 - components: - - type: MetaData - name: Surgery - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,49.5 - parent: 100 - uid: 15155 components: - type: MetaData @@ -12775,6 +12866,15 @@ entities: - type: Transform pos: -5.5,6.5 parent: 100 +- proto: AirlockSurgeryLocked + entities: + - uid: 1855 + components: + - type: MetaData + name: Surgery + - type: Transform + pos: -16.5,49.5 + parent: 100 - proto: AirlockTheatreLocked entities: - uid: 38 @@ -13294,14 +13394,6 @@ entities: - type: Transform pos: -65.5,82.5 parent: 100 - - uid: 20329 - components: - - type: MetaData - name: AI Core APC - - type: Transform - rot: 1.5707963267948966 rad - pos: -74.5,76.5 - parent: 100 - uid: 20330 components: - type: MetaData @@ -13361,6 +13453,14 @@ entities: - type: Transform pos: -1.5,-55.5 parent: 100 + - uid: 21983 + components: + - type: MetaData + name: AI Core APC + - type: Transform + rot: 3.141592653589793 rad + pos: -71.5,72.5 + parent: 100 - proto: APCHighCapacity entities: - uid: 14184 @@ -13429,11 +13529,6 @@ entities: parent: 100 - proto: AsimovCircuitBoard entities: - - uid: 21244 - components: - - type: Transform - pos: -67.478355,81.66162 - parent: 100 - uid: 21245 components: - type: Transform @@ -14346,10 +14441,10 @@ entities: - type: Transform pos: -28.5,10.5 parent: 100 - - uid: 2007 + - uid: 1893 components: - type: Transform - pos: 9.5,40.5 + pos: 9.5,39.5 parent: 100 - uid: 2197 components: @@ -14797,10 +14892,10 @@ entities: parent: 100 - proto: BedsheetUSA entities: - - uid: 2008 + - uid: 20188 components: - type: Transform - pos: 9.5,40.5 + pos: 9.5,39.5 parent: 100 - proto: BedsheetYellow entities: @@ -14937,6 +15032,33 @@ entities: - type: Transform pos: -63.5,-2.5 parent: 100 +- proto: BlastDoorUnlinkedArmory + entities: + - uid: 21989 + components: + - type: Transform + pos: -75.5,79.5 + parent: 100 + - uid: 21990 + components: + - type: Transform + pos: -75.5,73.5 + parent: 100 + - uid: 21991 + components: + - type: Transform + pos: -69.5,73.5 + parent: 100 + - uid: 21992 + components: + - type: Transform + pos: -69.5,79.5 + parent: 100 + - uid: 21997 + components: + - type: Transform + pos: -64.5,75.5 + parent: 100 - proto: BlastDoorUnlinkedRobotics entities: - uid: 10378 @@ -15090,11 +15212,6 @@ entities: - type: Transform pos: 8.844926,33.617973 parent: 100 - - uid: 3047 - components: - - type: Transform - pos: 4.338551,49.44128 - parent: 100 - proto: Bookshelf entities: - uid: 2136 @@ -15236,6 +15353,13 @@ entities: - type: Transform pos: 39.5,53.5 parent: 100 +- proto: BookSpaceLaw + entities: + - uid: 1979 + components: + - type: Transform + pos: 7.86498,49.54243 + parent: 100 - proto: BoozeDispenser entities: - uid: 711 @@ -15470,6 +15594,13 @@ entities: - type: Transform pos: 11.357761,33.6287 parent: 100 +- proto: BoxLighttube + entities: + - uid: 21980 + components: + - type: Transform + pos: -69.250145,83.38305 + parent: 100 - proto: BoxZiptie entities: - uid: 3591 @@ -15523,6 +15654,13 @@ entities: 2000: - Start: Close - Timer: Open + - Timer: AutoClose + 18461: + - Start: Close + - Timer: Open + - Timer: AutoClose + 6249: + - Start: Close - uid: 13966 components: - type: Transform @@ -15536,6 +15674,13 @@ entities: 1747: - Start: Close - Timer: Open + - Timer: AutoClose + 18462: + - Timer: Open + - Timer: AutoClose + - Start: Close + 6255: + - Start: Close - proto: Brutepack entities: - uid: 17242 @@ -15634,6 +15779,12 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,-58.5 parent: 100 + - uid: 21995 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -72.5,75.5 + parent: 100 - proto: ButtonFrameExit entities: - uid: 15265 @@ -16150,6 +16301,16 @@ entities: - type: Transform pos: -40.5,63.5 parent: 100 + - uid: 2007 + components: + - type: Transform + pos: -71.5,78.5 + parent: 100 + - uid: 2008 + components: + - type: Transform + pos: -70.5,78.5 + parent: 100 - uid: 2023 components: - type: Transform @@ -16170,6 +16331,16 @@ entities: - type: Transform pos: -10.5,-1.5 parent: 100 + - uid: 2200 + components: + - type: Transform + pos: -70.5,77.5 + parent: 100 + - uid: 2208 + components: + - type: Transform + pos: -72.5,76.5 + parent: 100 - uid: 2305 components: - type: Transform @@ -16430,6 +16601,21 @@ entities: - type: Transform pos: -5.5,-47.5 parent: 100 + - uid: 4927 + components: + - type: Transform + pos: -74.5,78.5 + parent: 100 + - uid: 4928 + components: + - type: Transform + pos: -73.5,78.5 + parent: 100 + - uid: 4930 + components: + - type: Transform + pos: -72.5,78.5 + parent: 100 - uid: 5130 components: - type: Transform @@ -26410,6 +26596,11 @@ entities: - type: Transform pos: -43.5,-22.5 parent: 100 + - uid: 16150 + components: + - type: Transform + pos: -71.5,73.5 + parent: 100 - uid: 16153 components: - type: Transform @@ -26645,6 +26836,11 @@ entities: - type: Transform pos: -44.5,-28.5 parent: 100 + - uid: 16471 + components: + - type: Transform + pos: -71.5,72.5 + parent: 100 - uid: 16473 components: - type: Transform @@ -28600,6 +28796,36 @@ entities: - type: Transform pos: -42.5,-34.5 parent: 100 + - uid: 20190 + components: + - type: Transform + pos: -71.5,74.5 + parent: 100 + - uid: 20191 + components: + - type: Transform + pos: -74.5,76.5 + parent: 100 + - uid: 20245 + components: + - type: Transform + pos: -70.5,74.5 + parent: 100 + - uid: 20272 + components: + - type: Transform + pos: -73.5,74.5 + parent: 100 + - uid: 20318 + components: + - type: Transform + pos: -74.5,74.5 + parent: 100 + - uid: 20319 + components: + - type: Transform + pos: -72.5,74.5 + parent: 100 - uid: 20386 components: - type: Transform @@ -28638,17 +28864,12 @@ entities: - uid: 20393 components: - type: Transform - pos: -74.5,76.5 + pos: -74.5,75.5 parent: 100 - uid: 20394 components: - type: Transform - pos: -73.5,76.5 - parent: 100 - - uid: 20395 - components: - - type: Transform - pos: -72.5,76.5 + pos: -70.5,75.5 parent: 100 - uid: 20396 components: @@ -28670,16 +28891,6 @@ entities: - type: Transform pos: -68.5,76.5 parent: 100 - - uid: 20400 - components: - - type: Transform - pos: -71.5,77.5 - parent: 100 - - uid: 20401 - components: - - type: Transform - pos: -71.5,75.5 - parent: 100 - uid: 20402 components: - type: Transform @@ -28745,6 +28956,11 @@ entities: - type: Transform pos: -60.5,77.5 parent: 100 + - uid: 20435 + components: + - type: Transform + pos: -74.5,77.5 + parent: 100 - uid: 20587 components: - type: Transform @@ -29490,6 +29706,411 @@ entities: - type: Transform pos: -41.5,35.5 parent: 100 + - uid: 21840 + components: + - type: Transform + pos: -59.5,75.5 + parent: 100 + - uid: 21841 + components: + - type: Transform + pos: -58.5,75.5 + parent: 100 + - uid: 21842 + components: + - type: Transform + pos: -57.5,75.5 + parent: 100 + - uid: 21843 + components: + - type: Transform + pos: -59.5,77.5 + parent: 100 + - uid: 21844 + components: + - type: Transform + pos: -58.5,77.5 + parent: 100 + - uid: 21845 + components: + - type: Transform + pos: -57.5,77.5 + parent: 100 + - uid: 21846 + components: + - type: Transform + pos: -57.5,78.5 + parent: 100 + - uid: 21847 + components: + - type: Transform + pos: -57.5,79.5 + parent: 100 + - uid: 21848 + components: + - type: Transform + pos: -58.5,79.5 + parent: 100 + - uid: 21849 + components: + - type: Transform + pos: -58.5,80.5 + parent: 100 + - uid: 21850 + components: + - type: Transform + pos: -58.5,81.5 + parent: 100 + - uid: 21851 + components: + - type: Transform + pos: -58.5,82.5 + parent: 100 + - uid: 21852 + components: + - type: Transform + pos: -58.5,83.5 + parent: 100 + - uid: 21853 + components: + - type: Transform + pos: -58.5,84.5 + parent: 100 + - uid: 21854 + components: + - type: Transform + pos: -59.5,84.5 + parent: 100 + - uid: 21855 + components: + - type: Transform + pos: -59.5,85.5 + parent: 100 + - uid: 21856 + components: + - type: Transform + pos: -60.5,85.5 + parent: 100 + - uid: 21857 + components: + - type: Transform + pos: -61.5,85.5 + parent: 100 + - uid: 21858 + components: + - type: Transform + pos: -62.5,85.5 + parent: 100 + - uid: 21859 + components: + - type: Transform + pos: -63.5,85.5 + parent: 100 + - uid: 21860 + components: + - type: Transform + pos: -64.5,85.5 + parent: 100 + - uid: 21861 + components: + - type: Transform + pos: -65.5,85.5 + parent: 100 + - uid: 21862 + components: + - type: Transform + pos: -67.5,85.5 + parent: 100 + - uid: 21863 + components: + - type: Transform + pos: -68.5,85.5 + parent: 100 + - uid: 21864 + components: + - type: Transform + pos: -66.5,85.5 + parent: 100 + - uid: 21865 + components: + - type: Transform + pos: -69.5,85.5 + parent: 100 + - uid: 21866 + components: + - type: Transform + pos: -70.5,85.5 + parent: 100 + - uid: 21867 + components: + - type: Transform + pos: -70.5,84.5 + parent: 100 + - uid: 21868 + components: + - type: Transform + pos: -70.5,83.5 + parent: 100 + - uid: 21869 + components: + - type: Transform + pos: -71.5,83.5 + parent: 100 + - uid: 21870 + components: + - type: Transform + pos: -72.5,83.5 + parent: 100 + - uid: 21871 + components: + - type: Transform + pos: -73.5,83.5 + parent: 100 + - uid: 21872 + components: + - type: Transform + pos: -74.5,83.5 + parent: 100 + - uid: 21873 + components: + - type: Transform + pos: -75.5,83.5 + parent: 100 + - uid: 21874 + components: + - type: Transform + pos: -76.5,83.5 + parent: 100 + - uid: 21875 + components: + - type: Transform + pos: -77.5,83.5 + parent: 100 + - uid: 21876 + components: + - type: Transform + pos: -78.5,83.5 + parent: 100 + - uid: 21877 + components: + - type: Transform + pos: -78.5,82.5 + parent: 100 + - uid: 21878 + components: + - type: Transform + pos: -79.5,82.5 + parent: 100 + - uid: 21879 + components: + - type: Transform + pos: -79.5,81.5 + parent: 100 + - uid: 21880 + components: + - type: Transform + pos: -79.5,80.5 + parent: 100 + - uid: 21881 + components: + - type: Transform + pos: -79.5,79.5 + parent: 100 + - uid: 21882 + components: + - type: Transform + pos: -79.5,78.5 + parent: 100 + - uid: 21883 + components: + - type: Transform + pos: -79.5,77.5 + parent: 100 + - uid: 21884 + components: + - type: Transform + pos: -79.5,76.5 + parent: 100 + - uid: 21885 + components: + - type: Transform + pos: -79.5,75.5 + parent: 100 + - uid: 21886 + components: + - type: Transform + pos: -79.5,74.5 + parent: 100 + - uid: 21887 + components: + - type: Transform + pos: -79.5,73.5 + parent: 100 + - uid: 21888 + components: + - type: Transform + pos: -79.5,72.5 + parent: 100 + - uid: 21889 + components: + - type: Transform + pos: -79.5,71.5 + parent: 100 + - uid: 21890 + components: + - type: Transform + pos: -79.5,70.5 + parent: 100 + - uid: 21891 + components: + - type: Transform + pos: -78.5,70.5 + parent: 100 + - uid: 21892 + components: + - type: Transform + pos: -78.5,69.5 + parent: 100 + - uid: 21893 + components: + - type: Transform + pos: -77.5,69.5 + parent: 100 + - uid: 21894 + components: + - type: Transform + pos: -76.5,69.5 + parent: 100 + - uid: 21895 + components: + - type: Transform + pos: -75.5,69.5 + parent: 100 + - uid: 21896 + components: + - type: Transform + pos: -74.5,69.5 + parent: 100 + - uid: 21897 + components: + - type: Transform + pos: -73.5,69.5 + parent: 100 + - uid: 21898 + components: + - type: Transform + pos: -72.5,69.5 + parent: 100 + - uid: 21899 + components: + - type: Transform + pos: -71.5,69.5 + parent: 100 + - uid: 21900 + components: + - type: Transform + pos: -70.5,69.5 + parent: 100 + - uid: 21901 + components: + - type: Transform + pos: -70.5,68.5 + parent: 100 + - uid: 21902 + components: + - type: Transform + pos: -68.5,68.5 + parent: 100 + - uid: 21903 + components: + - type: Transform + pos: -67.5,68.5 + parent: 100 + - uid: 21904 + components: + - type: Transform + pos: -66.5,68.5 + parent: 100 + - uid: 21905 + components: + - type: Transform + pos: -65.5,68.5 + parent: 100 + - uid: 21906 + components: + - type: Transform + pos: -64.5,68.5 + parent: 100 + - uid: 21907 + components: + - type: Transform + pos: -63.5,68.5 + parent: 100 + - uid: 21908 + components: + - type: Transform + pos: -62.5,68.5 + parent: 100 + - uid: 21909 + components: + - type: Transform + pos: -61.5,68.5 + parent: 100 + - uid: 21910 + components: + - type: Transform + pos: -60.5,68.5 + parent: 100 + - uid: 21911 + components: + - type: Transform + pos: -69.5,68.5 + parent: 100 + - uid: 21912 + components: + - type: Transform + pos: -59.5,68.5 + parent: 100 + - uid: 21913 + components: + - type: Transform + pos: -59.5,70.5 + parent: 100 + - uid: 21914 + components: + - type: Transform + pos: -59.5,71.5 + parent: 100 + - uid: 21915 + components: + - type: Transform + pos: -59.5,72.5 + parent: 100 + - uid: 21916 + components: + - type: Transform + pos: -59.5,73.5 + parent: 100 + - uid: 21917 + components: + - type: Transform + pos: -59.5,69.5 + parent: 100 + - uid: 21918 + components: + - type: Transform + pos: -58.5,73.5 + parent: 100 + - uid: 21919 + components: + - type: Transform + pos: -57.5,73.5 + parent: 100 + - uid: 21920 + components: + - type: Transform + pos: -57.5,74.5 + parent: 100 - proto: CableApcStack entities: - uid: 10832 @@ -33021,11 +33642,6 @@ entities: - type: Transform pos: -3.5,55.5 parent: 100 - - uid: 12801 - components: - - type: Transform - pos: 43.5,26.5 - parent: 100 - uid: 12809 components: - type: Transform @@ -33036,11 +33652,6 @@ entities: - type: Transform pos: 27.5,35.5 parent: 100 - - uid: 12813 - components: - - type: Transform - pos: 43.5,27.5 - parent: 100 - uid: 12814 components: - type: Transform @@ -35353,6 +35964,11 @@ entities: parent: 100 - proto: CableHVStack1 entities: + - uid: 4395 + components: + - type: Transform + pos: 43.46603,27.63285 + parent: 100 - uid: 13328 components: - type: Transform @@ -35388,6 +36004,11 @@ entities: - type: Transform pos: -89.12147,36.787853 parent: 100 + - uid: 22007 + components: + - type: Transform + pos: 43.20311,26.295605 + parent: 1313 - proto: CableMV entities: - uid: 122 @@ -35710,6 +36331,11 @@ entities: - type: Transform pos: -2.5,-61.5 parent: 100 + - uid: 4908 + components: + - type: Transform + pos: -70.5,75.5 + parent: 100 - uid: 5640 components: - type: Transform @@ -37555,6 +38181,11 @@ entities: - type: Transform pos: -4.5,-37.5 parent: 100 + - uid: 16547 + components: + - type: Transform + pos: -70.5,74.5 + parent: 100 - uid: 16566 components: - type: Transform @@ -37590,6 +38221,11 @@ entities: - type: Transform pos: 13.5,-59.5 parent: 100 + - uid: 16741 + components: + - type: Transform + pos: -71.5,72.5 + parent: 100 - uid: 17224 components: - type: Transform @@ -37690,6 +38326,11 @@ entities: - type: Transform pos: 14.5,36.5 parent: 100 + - uid: 18401 + components: + - type: Transform + pos: -71.5,73.5 + parent: 100 - uid: 18454 components: - type: Transform @@ -38220,26 +38861,6 @@ entities: - type: Transform pos: -70.5,76.5 parent: 100 - - uid: 20318 - components: - - type: Transform - pos: -71.5,76.5 - parent: 100 - - uid: 20319 - components: - - type: Transform - pos: -72.5,76.5 - parent: 100 - - uid: 20320 - components: - - type: Transform - pos: -73.5,76.5 - parent: 100 - - uid: 20321 - components: - - type: Transform - pos: -74.5,76.5 - parent: 100 - uid: 20322 components: - type: Transform @@ -38290,6 +38911,11 @@ entities: - type: Transform pos: -61.5,76.5 parent: 100 + - uid: 20433 + components: + - type: Transform + pos: -71.5,74.5 + parent: 100 - uid: 20503 components: - type: Transform @@ -40663,13 +41289,6 @@ entities: - type: Transform pos: -54.5,-42.5 parent: 100 -- proto: CartridgeRocket - entities: - - uid: 16741 - components: - - type: Transform - pos: 13.52511,52.37902 - parent: 100 - proto: Catwalk entities: - uid: 141 @@ -40965,11 +41584,6 @@ entities: - type: Transform pos: 43.5,28.5 parent: 100 - - uid: 10903 - components: - - type: Transform - pos: 43.5,26.5 - parent: 100 - uid: 10904 components: - type: Transform @@ -41790,16 +42404,6 @@ entities: - type: Transform pos: 39.5,28.5 parent: 100 - - uid: 11267 - components: - - type: Transform - pos: 43.5,25.5 - parent: 100 - - uid: 11268 - components: - - type: Transform - pos: 43.5,27.5 - parent: 100 - uid: 11269 components: - type: Transform @@ -44597,6 +45201,11 @@ entities: - type: Transform pos: 33.70393,23.421307 parent: 100 + - uid: 21765 + components: + - type: Transform + pos: -77.64995,70.70427 + parent: 100 - proto: CigarCase entities: - uid: 17452 @@ -44975,6 +45584,11 @@ entities: - type: Transform pos: 34.46621,44.54063 parent: 100 + - uid: 21766 + components: + - type: Transform + pos: -77.19682,70.51677 + parent: 100 - proto: CigCartonBlue entities: - uid: 17768 @@ -45273,11 +45887,6 @@ entities: parent: 100 - proto: ClosetLegalFilled entities: - - uid: 12202 - components: - - type: Transform - pos: 26.5,24.5 - parent: 100 - uid: 19284 components: - type: Transform @@ -45538,7 +46147,7 @@ entities: - uid: 21503 components: - type: Transform - pos: -12.462943,50.684372 + pos: -12.577233,50.715103 parent: 100 - proto: ClothingBeltBandolier entities: @@ -46750,6 +47359,11 @@ entities: - type: Transform pos: -55.5,-46.5 parent: 100 + - uid: 14858 + components: + - type: Transform + pos: -77.5,71.5 + parent: 100 - uid: 14984 components: - type: Transform @@ -47056,17 +47670,16 @@ entities: rot: 3.141592653589793 rad pos: -31.5,56.5 parent: 100 - - uid: 20428 + - uid: 20501 components: - type: Transform rot: 3.141592653589793 rad - pos: -64.5,75.5 + pos: 6.5,21.5 parent: 100 - - uid: 20501 + - uid: 21993 components: - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,21.5 + pos: -63.5,77.5 parent: 100 - proto: ComputerFrame entities: @@ -47824,11 +48437,6 @@ entities: - type: Transform pos: -6.5,-0.5 parent: 100 - - uid: 10244 - components: - - type: Transform - pos: -12.5,49.5 - parent: 100 - proto: CrateNPCHamlet entities: - uid: 2939 @@ -48140,13 +48748,6 @@ entities: - type: Transform pos: -54.5,57.5 parent: 100 -- proto: DefaultStationBeaconAICore - entities: - - uid: 20184 - components: - - type: Transform - pos: -71.5,76.5 - parent: 100 - proto: DefaultStationBeaconAISatellite entities: - uid: 20185 @@ -53574,6 +54175,11 @@ entities: - type: Transform pos: -7.5,39.5 parent: 100 + - uid: 22000 + components: + - type: Transform + pos: -30.5,-4.5 + parent: 100 - proto: DonkpocketBoxSpawner entities: - uid: 10163 @@ -55315,13 +55921,6 @@ entities: - type: Transform pos: 15.5,-5.5 parent: 100 -- proto: filingCabinetDrawerRandom - entities: - - uid: 13869 - components: - - type: Transform - pos: 34.5,20.5 - parent: 100 - proto: filingCabinetRandom entities: - uid: 809 @@ -55329,11 +55928,6 @@ entities: - type: Transform pos: 29.5,20.5 parent: 100 - - uid: 2200 - components: - - type: Transform - pos: 11.5,27.5 - parent: 100 - uid: 11137 components: - type: Transform @@ -58985,6 +59579,13 @@ entities: parent: 100 - type: Fixtures fixtures: {} + - uid: 20439 + components: + - type: Transform + pos: -13.5,49.5 + parent: 100 + - type: Fixtures + fixtures: {} - uid: 21494 components: - type: Transform @@ -74220,13 +74821,6 @@ entities: parent: 100 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 15421 - components: - - type: Transform - pos: -13.5,48.5 - parent: 100 - - type: AtmosPipeColor - color: '#990000FF' - uid: 15422 components: - type: Transform @@ -85675,7 +86269,7 @@ entities: - uid: 15420 components: - type: Transform - pos: -13.5,49.5 + pos: -13.5,48.5 parent: 100 - type: DeviceNetwork deviceLists: @@ -87004,24 +87598,12 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,32.5 parent: 100 - - uid: 1877 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,32.5 - parent: 100 - uid: 1878 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,28.5 parent: 100 - - uid: 1879 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,35.5 - parent: 100 - uid: 1880 components: - type: Transform @@ -88625,11 +89207,6 @@ entities: rot: 3.141592653589793 rad pos: -14.5,-32.5 parent: 100 - - uid: 4908 - components: - - type: Transform - pos: -79.5,70.5 - parent: 100 - uid: 4909 components: - type: Transform @@ -88645,26 +89222,6 @@ entities: - type: Transform pos: 2.5,-63.5 parent: 100 - - uid: 4927 - components: - - type: Transform - pos: -76.5,68.5 - parent: 100 - - uid: 4928 - components: - - type: Transform - pos: -77.5,68.5 - parent: 100 - - uid: 4930 - components: - - type: Transform - pos: -79.5,71.5 - parent: 100 - - uid: 4931 - components: - - type: Transform - pos: -79.5,72.5 - parent: 100 - uid: 4991 components: - type: Transform @@ -89087,11 +89644,6 @@ entities: - type: Transform pos: 6.5,-38.5 parent: 100 - - uid: 10451 - components: - - type: Transform - pos: -69.5,84.5 - parent: 100 - uid: 10662 components: - type: Transform @@ -89292,6 +89844,11 @@ entities: - type: Transform pos: -53.5,-45.5 parent: 100 + - uid: 12460 + components: + - type: Transform + pos: -73.5,86.5 + parent: 100 - uid: 12465 components: - type: Transform @@ -89847,11 +90404,6 @@ entities: - type: Transform pos: 6.5,-43.5 parent: 100 - - uid: 14648 - components: - - type: Transform - pos: -73.5,68.5 - parent: 100 - uid: 14676 components: - type: Transform @@ -89902,21 +90454,11 @@ entities: - type: Transform pos: -15.5,47.5 parent: 100 - - uid: 15091 - components: - - type: Transform - pos: -75.5,68.5 - parent: 100 - uid: 15095 components: - type: Transform pos: -50.5,82.5 parent: 100 - - uid: 15214 - components: - - type: Transform - pos: -79.5,73.5 - parent: 100 - uid: 15276 components: - type: Transform @@ -89947,11 +90489,6 @@ entities: rot: 3.141592653589793 rad pos: 41.5,44.5 parent: 100 - - uid: 15466 - components: - - type: Transform - pos: -79.5,74.5 - parent: 100 - uid: 15480 components: - type: Transform @@ -90090,16 +90627,6 @@ entities: - type: Transform pos: -53.5,82.5 parent: 100 - - uid: 16471 - components: - - type: Transform - pos: -74.5,68.5 - parent: 100 - - uid: 16484 - components: - - type: Transform - pos: -78.5,68.5 - parent: 100 - uid: 16487 components: - type: Transform @@ -91787,16 +92314,6 @@ entities: - type: Transform pos: -64.5,64.5 parent: 100 - - uid: 18401 - components: - - type: Transform - pos: -64.5,65.5 - parent: 100 - - uid: 18402 - components: - - type: Transform - pos: -64.5,67.5 - parent: 100 - uid: 18415 components: - type: Transform @@ -92272,395 +92789,370 @@ entities: - type: Transform pos: -10.5,-59.5 parent: 100 - - uid: 20132 - components: - - type: Transform - pos: -79.5,75.5 - parent: 100 - - uid: 20133 - components: - - type: Transform - pos: -79.5,76.5 - parent: 100 - - uid: 20134 - components: - - type: Transform - pos: -79.5,77.5 - parent: 100 - - uid: 20135 - components: - - type: Transform - pos: -79.5,78.5 - parent: 100 - - uid: 20136 - components: - - type: Transform - pos: -79.5,79.5 - parent: 100 - - uid: 20137 + - uid: 20246 components: - type: Transform - pos: -79.5,80.5 + pos: -73.5,76.5 parent: 100 - - uid: 20138 + - uid: 20373 components: - type: Transform - pos: -79.5,81.5 + pos: -59.5,76.5 parent: 100 - - uid: 20139 + - uid: 20374 components: - type: Transform - pos: -79.5,82.5 + pos: -60.5,76.5 parent: 100 - - uid: 20140 + - uid: 20376 components: - type: Transform - pos: -77.5,80.5 + pos: -63.5,73.5 parent: 100 - - uid: 20141 + - uid: 20377 components: - type: Transform - pos: -77.5,79.5 + pos: -63.5,72.5 parent: 100 - - uid: 20142 + - uid: 20442 components: - type: Transform - pos: -77.5,78.5 + pos: -70.5,66.5 parent: 100 - - uid: 20143 + - uid: 20443 components: - type: Transform - pos: -77.5,77.5 + pos: -69.5,66.5 parent: 100 - - uid: 20144 + - uid: 20444 components: - type: Transform - pos: -77.5,76.5 + pos: -68.5,66.5 parent: 100 - - uid: 20145 + - uid: 20445 components: - type: Transform - pos: -77.5,75.5 + pos: -67.5,66.5 parent: 100 - - uid: 20146 + - uid: 20446 components: - type: Transform - pos: -77.5,74.5 + pos: -66.5,66.5 parent: 100 - - uid: 20147 + - uid: 20447 components: - type: Transform - pos: -77.5,73.5 + pos: -65.5,66.5 parent: 100 - - uid: 20148 + - uid: 20669 components: - type: Transform - pos: -77.5,72.5 + pos: -56.5,18.5 parent: 100 - - uid: 20149 + - uid: 21533 components: - type: Transform - pos: -77.5,71.5 + pos: 9.5,54.5 parent: 100 - - uid: 20150 + - uid: 21534 components: - type: Transform - pos: -77.5,70.5 + pos: 9.5,55.5 parent: 100 - - uid: 20151 + - uid: 21535 components: - type: Transform - pos: -77.5,69.5 + pos: 9.5,56.5 parent: 100 - - uid: 20152 + - uid: 21536 components: - type: Transform - pos: -77.5,82.5 + pos: 10.5,57.5 parent: 100 - - uid: 20153 + - uid: 21537 components: - type: Transform - pos: -77.5,84.5 + pos: 11.5,57.5 parent: 100 - - uid: 20154 + - uid: 21538 components: - type: Transform - pos: -76.5,84.5 + pos: 12.5,57.5 parent: 100 - - uid: 20155 + - uid: 21539 components: - type: Transform - pos: -75.5,84.5 + pos: 13.5,58.5 parent: 100 - - uid: 20156 + - uid: 21540 components: - type: Transform - pos: -74.5,84.5 + pos: 14.5,58.5 parent: 100 - - uid: 20157 + - uid: 21541 components: - type: Transform - pos: -76.5,83.5 + pos: 15.5,58.5 parent: 100 - - uid: 20158 + - uid: 21542 components: - type: Transform - pos: -76.5,82.5 + pos: 16.5,58.5 parent: 100 - - uid: 20159 + - uid: 21543 components: - type: Transform - pos: -73.5,85.5 + pos: 17.5,58.5 parent: 100 - - uid: 20160 + - uid: 21544 components: - type: Transform - pos: -72.5,85.5 + pos: 18.5,58.5 parent: 100 - - uid: 20161 + - uid: 21545 components: - type: Transform - pos: -71.5,85.5 + pos: 19.5,58.5 parent: 100 - - uid: 20162 + - uid: 21546 components: - type: Transform - pos: -70.5,85.5 + pos: 20.5,57.5 parent: 100 - - uid: 20163 + - uid: 21547 components: - type: Transform - pos: -69.5,85.5 + pos: 21.5,57.5 parent: 100 - - uid: 20164 + - uid: 21548 components: - type: Transform - pos: -68.5,85.5 + pos: 22.5,57.5 parent: 100 - - uid: 20165 + - uid: 21549 components: - type: Transform - pos: -67.5,85.5 + pos: 23.5,57.5 parent: 100 - - uid: 20166 + - uid: 21835 components: - type: Transform - pos: -66.5,85.5 + pos: -74.5,86.5 parent: 100 - - uid: 20167 + - uid: 21921 components: - type: Transform - pos: -65.5,85.5 + pos: -75.5,86.5 parent: 100 - - uid: 20168 + - uid: 21922 components: - type: Transform - pos: -64.5,85.5 + pos: -76.5,86.5 parent: 100 - - uid: 20169 + - uid: 21923 components: - type: Transform - pos: -63.5,85.5 + pos: -77.5,86.5 parent: 100 - - uid: 20170 + - uid: 21924 components: - type: Transform - pos: -62.5,85.5 + pos: -78.5,86.5 parent: 100 - - uid: 20373 + - uid: 21926 components: - type: Transform - pos: -59.5,76.5 + pos: -82.5,86.5 parent: 100 - - uid: 20374 + - uid: 21927 components: - type: Transform - pos: -60.5,76.5 + pos: -82.5,85.5 parent: 100 - - uid: 20376 + - uid: 21928 components: - type: Transform - pos: -63.5,73.5 + pos: -82.5,83.5 parent: 100 - - uid: 20377 + - uid: 21929 components: - type: Transform - pos: -63.5,72.5 + pos: -82.5,82.5 parent: 100 - - uid: 20429 + - uid: 21931 components: - type: Transform - pos: -69.5,83.5 + pos: -82.5,80.5 parent: 100 - - uid: 20432 + - uid: 21932 components: - type: Transform - pos: -61.5,85.5 + pos: -82.5,84.5 parent: 100 - - uid: 20433 + - uid: 21933 components: - type: Transform - pos: -61.5,84.5 + pos: -82.5,79.5 parent: 100 - - uid: 20434 + - uid: 21934 components: - type: Transform - pos: -76.5,79.5 + pos: -82.5,78.5 parent: 100 - - uid: 20435 + - uid: 21935 components: - type: Transform - pos: -74.5,69.5 + pos: -82.5,77.5 parent: 100 - - uid: 20436 + - uid: 21937 components: - type: Transform - pos: -74.5,70.5 + pos: -82.5,75.5 parent: 100 - - uid: 20437 + - uid: 21938 components: - type: Transform - pos: -71.5,69.5 + pos: -82.5,74.5 parent: 100 - - uid: 20438 + - uid: 21939 components: - type: Transform - pos: -70.5,69.5 + pos: -82.5,73.5 parent: 100 - - uid: 20439 + - uid: 21940 components: - type: Transform - pos: -69.5,69.5 + pos: -82.5,72.5 parent: 100 - - uid: 20440 + - uid: 21943 components: - type: Transform - pos: -68.5,69.5 + pos: -82.5,69.5 parent: 100 - - uid: 20441 + - uid: 21944 components: - type: Transform - pos: -67.5,69.5 + pos: -82.5,68.5 parent: 100 - - uid: 20442 + - uid: 21945 components: - type: Transform - pos: -70.5,66.5 + pos: -82.5,67.5 parent: 100 - - uid: 20443 + - uid: 21946 components: - type: Transform - pos: -69.5,66.5 + pos: -82.5,66.5 parent: 100 - - uid: 20444 + - uid: 21947 components: - type: Transform - pos: -68.5,66.5 + pos: -79.5,66.5 parent: 100 - - uid: 20445 + - uid: 21948 components: - type: Transform - pos: -67.5,66.5 + pos: -78.5,66.5 parent: 100 - - uid: 20446 + - uid: 21949 components: - type: Transform - pos: -66.5,66.5 + pos: -77.5,66.5 parent: 100 - - uid: 20447 + - uid: 21950 components: - type: Transform - pos: -65.5,66.5 + pos: -76.5,66.5 parent: 100 - - uid: 20669 + - uid: 21951 components: - type: Transform - pos: -56.5,18.5 + pos: -75.5,66.5 parent: 100 - - uid: 21533 + - uid: 21952 components: - type: Transform - pos: 9.5,54.5 + pos: -74.5,66.5 parent: 100 - - uid: 21534 + - uid: 21953 components: - type: Transform - pos: 9.5,55.5 + pos: -73.5,66.5 parent: 100 - - uid: 21535 + - uid: 21954 components: - type: Transform - pos: 9.5,56.5 + pos: -72.5,66.5 parent: 100 - - uid: 21536 + - uid: 21955 components: - type: Transform - pos: 10.5,57.5 + pos: -80.5,66.5 parent: 100 - - uid: 21537 + - uid: 21965 components: - type: Transform - pos: 11.5,57.5 + pos: -72.5,88.5 parent: 100 - - uid: 21538 + - uid: 21966 components: - type: Transform - pos: 12.5,57.5 + pos: -71.5,88.5 parent: 100 - - uid: 21539 + - uid: 21967 components: - type: Transform - pos: 13.5,58.5 + pos: -70.5,88.5 parent: 100 - - uid: 21540 + - uid: 21968 components: - type: Transform - pos: 14.5,58.5 + pos: -69.5,88.5 parent: 100 - - uid: 21541 + - uid: 21969 components: - type: Transform - pos: 15.5,58.5 + pos: -67.5,88.5 parent: 100 - - uid: 21542 + - uid: 21970 components: - type: Transform - pos: 16.5,58.5 + pos: -66.5,88.5 parent: 100 - - uid: 21543 + - uid: 21971 components: - type: Transform - pos: 17.5,58.5 + pos: -65.5,88.5 parent: 100 - - uid: 21544 + - uid: 21972 components: - type: Transform - pos: 18.5,58.5 + pos: -64.5,88.5 parent: 100 - - uid: 21545 + - uid: 21973 components: - type: Transform - pos: 19.5,58.5 + pos: -62.5,88.5 parent: 100 - - uid: 21546 + - uid: 21974 components: - type: Transform - pos: 20.5,57.5 + pos: -61.5,88.5 parent: 100 - - uid: 21547 + - uid: 21975 components: - type: Transform - pos: 21.5,57.5 + pos: -60.5,88.5 parent: 100 - - uid: 21548 + - uid: 21976 components: - type: Transform - pos: 22.5,57.5 + pos: -59.5,88.5 parent: 100 - - uid: 21549 + - uid: 21977 components: - type: Transform - pos: 23.5,57.5 + pos: -57.5,88.5 parent: 100 - proto: GrilleBroken entities: @@ -93058,6 +93550,11 @@ entities: - type: Transform pos: -54.5,-12.5 parent: 100 + - uid: 10881 + components: + - type: Transform + pos: -64.5,65.5 + parent: 100 - uid: 12344 components: - type: Transform @@ -93113,6 +93610,56 @@ entities: - type: Transform pos: -4.5,-73.5 parent: 100 + - uid: 21925 + components: + - type: Transform + pos: -71.5,66.5 + parent: 100 + - uid: 21941 + components: + - type: Transform + pos: -82.5,70.5 + parent: 100 + - uid: 21956 + components: + - type: Transform + pos: -81.5,85.5 + parent: 100 + - uid: 21957 + components: + - type: Transform + pos: -80.5,67.5 + parent: 100 + - uid: 21958 + components: + - type: Transform + pos: -80.5,85.5 + parent: 100 + - uid: 21959 + components: + - type: Transform + pos: -79.5,86.5 + parent: 100 + - uid: 21960 + components: + - type: Transform + pos: -68.5,88.5 + parent: 100 + - uid: 21961 + components: + - type: Transform + pos: -73.5,88.5 + parent: 100 + - uid: 21962 + components: + - type: Transform + pos: -63.5,88.5 + parent: 100 + - uid: 21963 + components: + - type: Transform + pos: -58.5,88.5 + parent: 100 - proto: GunpetInstrument entities: - uid: 11510 @@ -93120,6 +93667,13 @@ entities: - type: Transform pos: 22.658283,23.621946 parent: 100 +- proto: GunSafeDisabler + entities: + - uid: 18458 + components: + - type: Transform + pos: 16.5,45.5 + parent: 100 - proto: HandgunSafeSpawner entities: - uid: 6851 @@ -93308,10 +93862,10 @@ entities: parent: 100 - proto: HolopadAiCore entities: - - uid: 21678 + - uid: 20252 components: - type: Transform - pos: -73.5,76.5 + pos: -72.5,74.5 parent: 100 - proto: HolopadAiEntrance entities: @@ -93775,13 +94329,6 @@ entities: - type: Transform pos: 11.5,-2.5 parent: 100 -- proto: HolopadServiceMime - entities: - - uid: 21721 - components: - - type: Transform - pos: -28.5,12.5 - parent: 100 - proto: HolopadServiceNewsroom entities: - uid: 21702 @@ -94143,10 +94690,10 @@ entities: parent: 100 - proto: IntercomAll entities: - - uid: 20182 + - uid: 21996 components: - type: Transform - pos: -71.5,77.5 + pos: -72.5,77.5 parent: 100 - proto: IntercomCommand entities: @@ -94158,12 +94705,6 @@ entities: parent: 100 - proto: IntercomCommon entities: - - uid: 20183 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -71.5,75.5 - parent: 100 - uid: 21404 components: - type: Transform @@ -94600,6 +95141,13 @@ entities: - type: Transform pos: 28.91876,32.94909 parent: 100 +- proto: LiveLetLiveCircuitBoard + entities: + - uid: 1879 + components: + - type: Transform + pos: -66.50662,81.52481 + parent: 100 - proto: LockableButtonArmory entities: - uid: 15513 @@ -94644,6 +95192,28 @@ entities: linkedPorts: 14749: - Pressed: Trigger +- proto: LockableButtonCaptain + entities: + - uid: 21994 + components: + - type: MetaData + name: turrets button + - type: Transform + rot: 3.141592653589793 rad + pos: -72.5,75.5 + parent: 100 + - type: DeviceLinkSource + linkedPorts: + 21989: + - Pressed: Toggle + 21992: + - Pressed: Toggle + 21991: + - Pressed: Toggle + 21990: + - Pressed: Toggle + 21997: + - Pressed: Toggle - proto: LockableButtonRobotics entities: - uid: 15346 @@ -94924,48 +95494,6 @@ entities: - type: Transform pos: -7.5,43.5 parent: 100 -- proto: LockerMedicine - entities: - - uid: 18451 - components: - - type: MetaData - desc: Contains various treatments for mental woes. - name: pscyhologist's locker - - type: Transform - pos: -52.5,65.5 - parent: 100 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 18463 - - 18452 - - 18464 - - 18465 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerMedicineFilled entities: - uid: 3393 @@ -94990,6 +95518,13 @@ entities: - type: Transform pos: -5.5,40.5 parent: 100 +- proto: LockerPsychologistFilled + entities: + - uid: 21998 + components: + - type: Transform + pos: -52.5,65.5 + parent: 100 - proto: LockerQuarterMasterFilled entities: - uid: 8253 @@ -95075,6 +95610,18 @@ entities: - type: Transform pos: 13.5,43.5 parent: 100 +- proto: LockerSurgeonFilled + entities: + - uid: 6843 + components: + - type: Transform + pos: -12.5,48.5 + parent: 100 + - uid: 20437 + components: + - type: Transform + pos: -12.5,49.5 + parent: 100 - proto: LockerWallMedicalFilled entities: - uid: 21422 @@ -96267,7 +96814,7 @@ entities: - uid: 6170 components: - type: Transform - pos: -66.509605,81.552246 + pos: -67.45975,81.74356 parent: 100 - proto: NuclearBomb entities: @@ -96312,6 +96859,13 @@ entities: - type: Transform pos: -29.5,46.5 parent: 100 +- proto: OperatingTableCircuitboard + entities: + - uid: 20438 + components: + - type: Transform + pos: -12.278303,50.37072 + parent: 100 - proto: Oracle entities: - uid: 87 @@ -97081,88 +97635,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,11.5 parent: 100 -- proto: PillCanister - entities: - - uid: 18452 - components: - - type: MetaData - name: pill canister (space drugs) - - type: Transform - parent: 18451 - - type: Storage - storedItems: - 18453: - position: 0,0 - _rotation: South - 18457: - position: 1,0 - _rotation: South - 18458: - position: 2,0 - _rotation: South - 18461: - position: 3,0 - _rotation: South - 18462: - position: 4,0 - _rotation: South - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: - - 18453 - - 18457 - - 18458 - - 18461 - - 18462 - - type: Physics - canCollide: False - - type: Label - currentLabel: space drugs - - type: InsideEntityStorage -- proto: PillCanisterTricordrazine - entities: - - uid: 18463 - components: - - type: Transform - parent: 18451 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: PillSpaceDrugs - entities: - - uid: 18453 - components: - - type: Transform - parent: 18452 - - type: Physics - canCollide: False - - uid: 18457 - components: - - type: Transform - parent: 18452 - - type: Physics - canCollide: False - - uid: 18458 - components: - - type: Transform - parent: 18452 - - type: Physics - canCollide: False - - uid: 18461 - components: - - type: Transform - parent: 18452 - - type: Physics - canCollide: False - - uid: 18462 - components: - - type: Transform - parent: 18452 - - type: Physics - canCollide: False - proto: PlantBag entities: - uid: 11179 @@ -97247,6 +97719,24 @@ entities: rot: 1.5707963267948966 rad pos: -17.5,-11.5 parent: 100 +- proto: PlasmaWindoorSecureCommandLocked + entities: + - uid: 20271 + components: + - type: MetaData + name: AI Core + - type: Transform + rot: 1.5707963267948966 rad + pos: -71.5,76.5 + parent: 100 + - uid: 20329 + components: + - type: MetaData + name: AI Core + - type: Transform + rot: -1.5707963267948966 rad + pos: -71.5,76.5 + parent: 100 - proto: PlasticFlapsAirtightClear entities: - uid: 5607 @@ -97284,10 +97774,10 @@ entities: parent: 100 - proto: PlayerStationAi entities: - - uid: 20375 + - uid: 2863 components: - type: Transform - pos: -71.5,76.5 + pos: -72.5,76.5 parent: 100 - proto: PlushieAtmosian entities: @@ -97383,13 +97873,6 @@ entities: - type: Transform pos: -54.263374,69.69835 parent: 100 -- proto: PlushieNar - entities: - - uid: 20272 - components: - - type: Transform - pos: -70.47305,76.505104 - parent: 100 - proto: PlushieNuke entities: - uid: 927 @@ -97413,11 +97896,6 @@ entities: - type: Transform pos: -17.55133,-64.27779 parent: 100 - - uid: 20271 - components: - - type: Transform - pos: -72.53555,76.567604 - parent: 100 - proto: PlushieRGBee entities: - uid: 20818 @@ -99337,6 +99815,12 @@ entities: - type: Transform pos: -6.5,-28.5 parent: 100 + - uid: 12636 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -74.5,82.5 + parent: 100 - uid: 12678 components: - type: Transform @@ -99703,6 +100187,12 @@ entities: parent: 100 - type: ApcPowerReceiver powerLoad: 0 + - uid: 16147 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,76.5 + parent: 100 - uid: 16802 components: - type: Transform @@ -99784,23 +100274,6 @@ entities: - type: Transform pos: -64.5,77.5 parent: 100 - - uid: 20416 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -71.5,78.5 - parent: 100 - - uid: 20417 - components: - - type: Transform - pos: -71.5,74.5 - parent: 100 - - uid: 20418 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -73.5,76.5 - parent: 100 - uid: 20419 components: - type: Transform @@ -99837,6 +100310,45 @@ entities: rot: 3.141592653589793 rad pos: 18.5,57.5 parent: 100 + - uid: 21831 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -62.5,84.5 + parent: 100 + - uid: 21832 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -59.5,72.5 + parent: 100 + - uid: 21833 + components: + - type: Transform + pos: -62.5,69.5 + parent: 100 + - uid: 21834 + components: + - type: Transform + pos: -74.5,70.5 + parent: 100 + - uid: 22004 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -71.5,78.5 + parent: 100 + - uid: 22005 + components: + - type: Transform + pos: -71.5,74.5 + parent: 100 + - uid: 22006 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -75.5,76.5 + parent: 100 - proto: PoweredLightBlueInterior entities: - uid: 11428 @@ -101224,13 +101736,6 @@ entities: - type: Transform pos: 29.414343,-21.571545 parent: 100 -- proto: PresentRandomUnsafe - entities: - - uid: 19548 - components: - - type: Transform - pos: -61.401646,48.695385 - parent: 100 - proto: Protolathe entities: - uid: 13633 @@ -101272,21 +101777,11 @@ entities: - type: Transform pos: 14.5,45.5 parent: 100 - - uid: 1979 - components: - - type: Transform - pos: 13.5,52.5 - parent: 100 - uid: 2165 components: - type: Transform pos: 25.5,-44.5 parent: 100 - - uid: 2208 - components: - - type: Transform - pos: 16.5,45.5 - parent: 100 - uid: 2525 components: - type: Transform @@ -101568,6 +102063,11 @@ entities: - type: Transform pos: -2.5,-43.5 parent: 100 + - uid: 21979 + components: + - type: Transform + pos: -69.5,83.5 + parent: 100 - proto: RadioHandheld entities: - uid: 4631 @@ -105670,6 +106170,328 @@ entities: - type: Transform pos: 36.5,40.5 parent: 100 +- proto: RandomSolarPanelState + entities: + - uid: 18453 + components: + - type: Transform + pos: 58.5,21.5 + parent: 100 + - uid: 18463 + components: + - type: Transform + pos: 50.5,21.5 + parent: 100 + - uid: 18464 + components: + - type: Transform + pos: 50.5,30.5 + parent: 100 + - uid: 18465 + components: + - type: Transform + pos: 56.5,18.5 + parent: 100 + - uid: 18935 + components: + - type: Transform + pos: 50.5,20.5 + parent: 100 + - uid: 19413 + components: + - type: Transform + pos: 46.5,18.5 + parent: 100 + - uid: 19548 + components: + - type: Transform + pos: 48.5,22.5 + parent: 100 + - uid: 20132 + components: + - type: Transform + pos: 46.5,20.5 + parent: 100 + - uid: 20133 + components: + - type: Transform + pos: 48.5,18.5 + parent: 100 + - uid: 20134 + components: + - type: Transform + pos: 46.5,21.5 + parent: 100 + - uid: 20135 + components: + - type: Transform + pos: 56.5,20.5 + parent: 100 + - uid: 20136 + components: + - type: Transform + pos: 48.5,29.5 + parent: 100 + - uid: 20137 + components: + - type: Transform + pos: 50.5,19.5 + parent: 100 + - uid: 20138 + components: + - type: Transform + pos: 46.5,19.5 + parent: 100 + - uid: 20139 + components: + - type: Transform + pos: 48.5,26.5 + parent: 100 + - uid: 20140 + components: + - type: Transform + pos: 48.5,28.5 + parent: 100 + - uid: 20141 + components: + - type: Transform + pos: 52.5,19.5 + parent: 100 + - uid: 20142 + components: + - type: Transform + pos: 54.5,20.5 + parent: 100 + - uid: 20143 + components: + - type: Transform + pos: 56.5,29.5 + parent: 100 + - uid: 20144 + components: + - type: Transform + pos: 52.5,26.5 + parent: 100 + - uid: 20145 + components: + - type: Transform + pos: 48.5,27.5 + parent: 100 + - uid: 20146 + components: + - type: Transform + pos: 50.5,28.5 + parent: 100 + - uid: 20147 + components: + - type: Transform + pos: 56.5,21.5 + parent: 100 + - uid: 20148 + components: + - type: Transform + pos: 46.5,28.5 + parent: 100 + - uid: 20149 + components: + - type: Transform + pos: 50.5,18.5 + parent: 100 + - uid: 20150 + components: + - type: Transform + pos: 48.5,19.5 + parent: 100 + - uid: 20151 + components: + - type: Transform + pos: 52.5,20.5 + parent: 100 + - uid: 20152 + components: + - type: Transform + pos: 50.5,29.5 + parent: 100 + - uid: 20153 + components: + - type: Transform + pos: 52.5,21.5 + parent: 100 + - uid: 20154 + components: + - type: Transform + pos: 48.5,30.5 + parent: 100 + - uid: 20155 + components: + - type: Transform + pos: 56.5,22.5 + parent: 100 + - uid: 20156 + components: + - type: Transform + pos: 56.5,19.5 + parent: 100 + - uid: 20157 + components: + - type: Transform + pos: 52.5,18.5 + parent: 100 + - uid: 20158 + components: + - type: Transform + pos: 56.5,26.5 + parent: 100 + - uid: 20159 + components: + - type: Transform + pos: 52.5,22.5 + parent: 100 + - uid: 20160 + components: + - type: Transform + pos: 58.5,26.5 + parent: 100 + - uid: 20161 + components: + - type: Transform + pos: 54.5,19.5 + parent: 100 + - uid: 20162 + components: + - type: Transform + pos: 54.5,21.5 + parent: 100 + - uid: 20163 + components: + - type: Transform + pos: 54.5,22.5 + parent: 100 + - uid: 20164 + components: + - type: Transform + pos: 54.5,30.5 + parent: 100 + - uid: 20165 + components: + - type: Transform + pos: 46.5,29.5 + parent: 100 + - uid: 20166 + components: + - type: Transform + pos: 52.5,27.5 + parent: 100 + - uid: 20167 + components: + - type: Transform + pos: 52.5,30.5 + parent: 100 + - uid: 20168 + components: + - type: Transform + pos: 54.5,29.5 + parent: 100 + - uid: 20169 + components: + - type: Transform + pos: 56.5,30.5 + parent: 100 + - uid: 20170 + components: + - type: Transform + pos: 54.5,18.5 + parent: 100 + - uid: 20172 + components: + - type: Transform + pos: 48.5,21.5 + parent: 100 + - uid: 20173 + components: + - type: Transform + pos: 56.5,27.5 + parent: 100 + - uid: 20174 + components: + - type: Transform + pos: 64.5,26.5 + parent: 100 + - uid: 20175 + components: + - type: Transform + pos: 48.5,20.5 + parent: 100 + - uid: 20176 + components: + - type: Transform + pos: 46.5,27.5 + parent: 100 + - uid: 20177 + components: + - type: Transform + pos: 54.5,28.5 + parent: 100 + - uid: 20178 + components: + - type: Transform + pos: 46.5,26.5 + parent: 100 + - uid: 20179 + components: + - type: Transform + pos: 46.5,30.5 + parent: 100 + - uid: 20180 + components: + - type: Transform + pos: 52.5,28.5 + parent: 100 + - uid: 20181 + components: + - type: Transform + pos: 46.5,22.5 + parent: 100 + - uid: 20182 + components: + - type: Transform + pos: 50.5,22.5 + parent: 100 + - uid: 20183 + components: + - type: Transform + pos: 52.5,29.5 + parent: 100 + - uid: 20184 + components: + - type: Transform + pos: 50.5,27.5 + parent: 100 + - uid: 20186 + components: + - type: Transform + pos: 50.5,26.5 + parent: 100 + - uid: 20187 + components: + - type: Transform + pos: 54.5,26.5 + parent: 100 + - uid: 20400 + components: + - type: Transform + pos: 62.5,21.5 + parent: 100 + - uid: 20416 + components: + - type: Transform + pos: 58.5,22.5 + parent: 100 + - uid: 21964 + components: + - type: Transform + pos: 54.5,27.5 + parent: 100 - proto: RandomSpawner entities: - uid: 3466 @@ -105975,13 +106797,6 @@ entities: - type: Transform pos: 29.654558,46.20893 parent: 100 - - uid: 18465 - components: - - type: Transform - parent: 18451 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: Recycler entities: - uid: 10634 @@ -106305,6 +107120,21 @@ entities: - type: Transform pos: 13.5,57.5 parent: 100 + - uid: 21930 + components: + - type: Transform + pos: -82.5,81.5 + parent: 100 + - uid: 21936 + components: + - type: Transform + pos: -82.5,71.5 + parent: 100 + - uid: 21942 + components: + - type: Transform + pos: -82.5,76.5 + parent: 100 - proto: ReinforcedPlasmaWindow entities: - uid: 33 @@ -106515,6 +107345,11 @@ entities: - type: Transform pos: 9.5,-49.5 parent: 100 + - uid: 20247 + components: + - type: Transform + pos: -73.5,76.5 + parent: 100 - proto: ReinforcedWindow entities: - uid: 276 @@ -106887,12 +107722,6 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,28.5 parent: 100 - - uid: 1888 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,32.5 - parent: 100 - uid: 1891 components: - type: Transform @@ -106905,12 +107734,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,35.5 parent: 100 - - uid: 1893 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,35.5 - parent: 100 - uid: 1894 components: - type: Transform @@ -109875,6 +110698,62 @@ entities: - type: Transform pos: 30.810465,-28.460886 parent: 100 +- proto: SecureCabinetAttorney + entities: + - uid: 6270 + components: + - type: Transform + pos: 26.5,24.5 + parent: 100 +- proto: SecureCabinetCaptain + entities: + - uid: 22001 + components: + - type: Transform + pos: -18.5,67.5 + parent: 100 +- proto: SecureCabinetDetective + entities: + - uid: 6952 + components: + - type: Transform + pos: 34.5,20.5 + parent: 100 +- proto: SecureCabinetHoP + entities: + - uid: 22003 + components: + - type: Transform + pos: 20.5,9.5 + parent: 100 +- proto: SecureCabinetHoS + entities: + - uid: 20192 + components: + - type: Transform + pos: 4.5,49.5 + parent: 100 +- proto: SecureCabinetProsecutor + entities: + - uid: 6956 + components: + - type: Transform + pos: 11.5,27.5 + parent: 100 +- proto: SecureCabinetPsychologist + entities: + - uid: 16484 + components: + - type: Transform + pos: -54.5,63.5 + parent: 100 +- proto: SecureCabinetWarden + entities: + - uid: 1888 + components: + - type: Transform + pos: 9.5,40.5 + parent: 100 - proto: SecurityTechFab entities: - uid: 1942 @@ -110176,6 +111055,11 @@ entities: - type: Transform pos: 0.5,40.5 parent: 100 + - uid: 21988 + components: + - type: Transform + pos: -75.5,76.5 + parent: 100 - proto: ShowcaseRobotAntique entities: - uid: 12087 @@ -110195,6 +111079,16 @@ entities: - type: Transform pos: -56.5,55.5 parent: 100 + - uid: 21981 + components: + - type: Transform + pos: -75.5,75.5 + parent: 100 + - uid: 21982 + components: + - type: Transform + pos: -75.5,77.5 + parent: 100 - proto: ShuttersNormalOpen entities: - uid: 2052 @@ -111765,56 +112659,21 @@ entities: - type: Transform pos: 66.5,28.5 parent: 100 - - uid: 6249 - components: - - type: Transform - pos: 48.5,27.5 - parent: 100 - - uid: 6255 - components: - - type: Transform - pos: 52.5,26.5 - parent: 100 - - uid: 6270 + - uid: 4931 components: - type: Transform - pos: 54.5,18.5 + pos: 58.5,28.5 parent: 100 - uid: 6273 components: - type: Transform pos: 66.5,29.5 parent: 100 - - uid: 6274 - components: - - type: Transform - pos: 48.5,28.5 - parent: 100 - - uid: 6843 - components: - - type: Transform - pos: 48.5,20.5 - parent: 100 - - uid: 6844 - components: - - type: Transform - pos: 46.5,20.5 - parent: 100 - uid: 6848 components: - type: Transform pos: -91.5,34.5 parent: 100 - - uid: 6952 - components: - - type: Transform - pos: 48.5,22.5 - parent: 100 - - uid: 6956 - components: - - type: Transform - pos: 48.5,18.5 - parent: 100 - uid: 6957 components: - type: Transform @@ -111825,36 +112684,6 @@ entities: - type: Transform pos: 62.5,29.5 parent: 100 - - uid: 7338 - components: - - type: Transform - pos: 48.5,19.5 - parent: 100 - - uid: 7339 - components: - - type: Transform - pos: 54.5,20.5 - parent: 100 - - uid: 7340 - components: - - type: Transform - pos: 52.5,28.5 - parent: 100 - - uid: 7341 - components: - - type: Transform - pos: 48.5,30.5 - parent: 100 - - uid: 7342 - components: - - type: Transform - pos: 48.5,21.5 - parent: 100 - - uid: 7343 - components: - - type: Transform - pos: 48.5,26.5 - parent: 100 - uid: 9333 components: - type: Transform @@ -111885,81 +112714,6 @@ entities: - type: Transform pos: 68.5,18.5 parent: 100 - - uid: 10834 - components: - - type: Transform - pos: 52.5,29.5 - parent: 100 - - uid: 10835 - components: - - type: Transform - pos: 46.5,29.5 - parent: 100 - - uid: 10853 - components: - - type: Transform - pos: 56.5,18.5 - parent: 100 - - uid: 10855 - components: - - type: Transform - pos: 56.5,28.5 - parent: 100 - - uid: 10876 - components: - - type: Transform - pos: 52.5,20.5 - parent: 100 - - uid: 10877 - components: - - type: Transform - pos: 52.5,30.5 - parent: 100 - - uid: 10881 - components: - - type: Transform - pos: 52.5,21.5 - parent: 100 - - uid: 10882 - components: - - type: Transform - pos: 54.5,22.5 - parent: 100 - - uid: 10888 - components: - - type: Transform - pos: 50.5,30.5 - parent: 100 - - uid: 10889 - components: - - type: Transform - pos: 48.5,29.5 - parent: 100 - - uid: 10890 - components: - - type: Transform - pos: 46.5,21.5 - parent: 100 - - uid: 10892 - components: - - type: Transform - pos: 46.5,28.5 - parent: 100 - - uid: 10895 - components: - - type: Transform - pos: 52.5,22.5 - parent: 100 - - uid: 10896 - components: - - type: Transform - pos: 46.5,27.5 - parent: 100 - - uid: 10905 - components: - - type: Transform - pos: 52.5,27.5 - parent: 100 - uid: 10919 components: - type: Transform @@ -112065,36 +112819,11 @@ entities: - type: Transform pos: -73.5,31.5 parent: 100 - - uid: 11249 - components: - - type: Transform - pos: 54.5,21.5 - parent: 100 - - uid: 11261 - components: - - type: Transform - pos: 54.5,19.5 - parent: 100 - - uid: 11262 - components: - - type: Transform - pos: 46.5,30.5 - parent: 100 - - uid: 11265 - components: - - type: Transform - pos: 56.5,30.5 - parent: 100 - uid: 11266 components: - type: Transform pos: 62.5,30.5 parent: 100 - - uid: 11276 - components: - - type: Transform - pos: 46.5,26.5 - parent: 100 - uid: 11397 components: - type: Transform @@ -112155,11 +112884,6 @@ entities: - type: Transform pos: -91.5,32.5 parent: 100 - - uid: 12057 - components: - - type: Transform - pos: 56.5,26.5 - parent: 100 - uid: 12079 components: - type: Transform @@ -112170,26 +112894,6 @@ entities: - type: Transform pos: -79.5,39.5 parent: 100 - - uid: 12132 - components: - - type: Transform - pos: 56.5,20.5 - parent: 100 - - uid: 12150 - components: - - type: Transform - pos: 56.5,21.5 - parent: 100 - - uid: 12172 - components: - - type: Transform - pos: 56.5,22.5 - parent: 100 - - uid: 12179 - components: - - type: Transform - pos: 54.5,26.5 - parent: 100 - uid: 12189 components: - type: Transform @@ -112205,26 +112909,6 @@ entities: - type: Transform pos: 66.5,22.5 parent: 100 - - uid: 12206 - components: - - type: Transform - pos: 50.5,27.5 - parent: 100 - - uid: 12277 - components: - - type: Transform - pos: 50.5,22.5 - parent: 100 - - uid: 12318 - components: - - type: Transform - pos: 50.5,19.5 - parent: 100 - - uid: 12460 - components: - - type: Transform - pos: 54.5,27.5 - parent: 100 - uid: 12476 components: - type: Transform @@ -112600,11 +113284,6 @@ entities: - type: Transform pos: -85.5,31.5 parent: 100 - - uid: 16117 - components: - - type: Transform - pos: 56.5,27.5 - parent: 100 - uid: 16118 components: - type: Transform @@ -112640,21 +113319,6 @@ entities: - type: Transform pos: 66.5,19.5 parent: 100 - - uid: 16125 - components: - - type: Transform - pos: 56.5,19.5 - parent: 100 - - uid: 16126 - components: - - type: Transform - pos: 46.5,19.5 - parent: 100 - - uid: 16127 - components: - - type: Transform - pos: 56.5,29.5 - parent: 100 - uid: 16128 components: - type: Transform @@ -112690,26 +113354,11 @@ entities: - type: Transform pos: 60.5,26.5 parent: 100 - - uid: 16135 - components: - - type: Transform - pos: 58.5,21.5 - parent: 100 - uid: 16136 components: - type: Transform pos: 58.5,18.5 parent: 100 - - uid: 16137 - components: - - type: Transform - pos: 46.5,18.5 - parent: 100 - - uid: 16138 - components: - - type: Transform - pos: 50.5,28.5 - parent: 100 - uid: 16139 components: - type: Transform @@ -112730,50 +113379,20 @@ entities: - type: Transform pos: 62.5,26.5 parent: 100 - - uid: 16143 - components: - - type: Transform - pos: 54.5,28.5 - parent: 100 - uid: 16144 components: - type: Transform pos: 60.5,28.5 parent: 100 - - uid: 16145 - components: - - type: Transform - pos: 50.5,29.5 - parent: 100 - - uid: 16146 - components: - - type: Transform - pos: 50.5,26.5 - parent: 100 - - uid: 16147 - components: - - type: Transform - pos: 50.5,21.5 - parent: 100 - - uid: 16148 - components: - - type: Transform - pos: 50.5,18.5 - parent: 100 - - uid: 16149 - components: - - type: Transform - pos: 46.5,22.5 - parent: 100 - - uid: 16150 + - uid: 20395 components: - type: Transform - pos: 50.5,20.5 + pos: 58.5,30.5 parent: 100 - - uid: 16547 + - uid: 20401 components: - type: Transform - pos: 52.5,18.5 + pos: 58.5,29.5 parent: 100 - proto: SolarPanelBroken entities: @@ -112797,16 +113416,6 @@ entities: - type: Transform pos: -79.5,41.5 parent: 100 - - uid: 11993 - components: - - type: Transform - pos: 52.5,19.5 - parent: 100 - - uid: 12024 - components: - - type: Transform - pos: 54.5,30.5 - parent: 100 - uid: 13271 components: - type: Transform @@ -112961,6 +113570,13 @@ entities: - type: Transform pos: -7.5,13.5 parent: 100 +- proto: SpawnMobCatClippy + entities: + - uid: 21999 + components: + - type: Transform + pos: -30.5,-4.5 + parent: 100 - proto: SpawnMobCatRuntime entities: - uid: 20521 @@ -114045,6 +114661,18 @@ entities: - type: Transform pos: 10.5,-41.5 parent: 100 +- proto: SpawnPointSurgeon + entities: + - uid: 16149 + components: + - type: Transform + pos: -13.5,49.5 + parent: 100 + - uid: 20440 + components: + - type: Transform + pos: -13.5,48.5 + parent: 100 - proto: SpawnPointTechnicalAssistant entities: - uid: 20737 @@ -114074,10 +114702,10 @@ entities: parent: 100 - proto: SpawnPointWarden entities: - - uid: 12636 + - uid: 22002 components: - type: Transform - pos: 9.5,40.5 + pos: 9.5,39.5 parent: 100 - proto: Spear entities: @@ -114140,9 +114768,9 @@ entities: rot: 3.141592653589793 rad pos: -33.5,51.5 parent: 100 -- proto: StairStage +- proto: StairStageWood entities: - - uid: 14858 + - uid: 20189 components: - type: Transform pos: -40.5,53.5 @@ -114757,6 +115385,13 @@ entities: - type: Transform pos: 15.5,40.5 parent: 100 +- proto: SuperweaponSafeSpawner + entities: + - uid: 18457 + components: + - type: Transform + pos: 13.5,52.5 + parent: 100 - proto: SurveillanceCameraCommand entities: - uid: 166 @@ -114835,17 +115470,17 @@ entities: - SurveillanceCameraCommand nameSet: True id: AI Upload - - uid: 12059 + - uid: 10892 components: - type: Transform - rot: 3.141592653589793 rad - pos: -71.5,76.5 + rot: 1.5707963267948966 rad + pos: -78.5,75.5 parent: 100 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: AI Core + id: AI Satellite West - uid: 12113 components: - type: Transform @@ -114944,27 +115579,38 @@ entities: - SurveillanceCameraCommand nameSet: True id: Captain's Quarters - - uid: 21670 + - uid: 21671 components: - type: Transform - pos: -71.5,73.5 + rot: 3.141592653589793 rad + pos: -71.5,79.5 parent: 100 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: AI Core South - - uid: 21671 + id: AI Core + - uid: 21836 + components: + - type: Transform + pos: -67.5,84.5 + parent: 100 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Satellite North + - uid: 21837 components: - type: Transform rot: 3.141592653589793 rad - pos: -71.5,79.5 + pos: -68.5,69.5 parent: 100 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: AI Core North + id: AI Satellite South - proto: SurveillanceCameraEngineering entities: - uid: 2874 @@ -116038,13 +116684,6 @@ entities: - type: Transform pos: -56.408504,66.5 parent: 100 - - uid: 18464 - components: - - type: Transform - parent: 18451 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 21507 components: - type: Transform @@ -117119,6 +117758,11 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,36.5 parent: 100 + - uid: 15466 + components: + - type: Transform + pos: -77.5,70.5 + parent: 100 - uid: 15470 components: - type: Transform @@ -117582,6 +118226,16 @@ entities: - type: Transform pos: -40.5,-17.5 parent: 100 + - uid: 7338 + components: + - type: Transform + pos: 3.5,35.5 + parent: 100 + - uid: 7339 + components: + - type: Transform + pos: 3.5,32.5 + parent: 100 - uid: 11440 components: - type: Transform @@ -117782,11 +118436,6 @@ entities: - type: Transform pos: -24.5,13.5 parent: 100 - - uid: 1855 - components: - - type: Transform - pos: 4.5,49.5 - parent: 100 - uid: 1902 components: - type: Transform @@ -119048,16 +119697,18 @@ entities: rot: -1.5707963267948966 rad pos: -45.5,53.5 parent: 100 - - uid: 4395 + - uid: 6858 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,66.5 + pos: -37.5,28.5 parent: 100 - - uid: 6858 +- proto: ToiletGoldenDirtyWater + entities: + - uid: 20193 components: - type: Transform - pos: -37.5,28.5 + rot: 1.5707963267948966 rad + pos: -23.5,66.5 parent: 100 - proto: TomDrumsInstrument entities: @@ -119105,6 +119756,11 @@ entities: - type: Transform pos: -3.4894161,-58.0905 parent: 100 + - uid: 21978 + components: + - type: Transform + pos: -69.60952,83.679924 + parent: 100 - proto: ToolboxEmergencyFilled entities: - uid: 2256 @@ -124959,6 +125615,11 @@ entities: - type: Transform pos: 11.5,-31.5 parent: 100 + - uid: 6844 + components: + - type: Transform + pos: -77.5,72.5 + parent: 100 - uid: 6954 components: - type: Transform @@ -125427,11 +126088,46 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-40.5 parent: 100 + - uid: 11249 + components: + - type: Transform + pos: -76.5,77.5 + parent: 100 - uid: 11259 components: - type: Transform pos: -62.5,-7.5 parent: 100 + - uid: 11261 + components: + - type: Transform + pos: -76.5,76.5 + parent: 100 + - uid: 11262 + components: + - type: Transform + pos: -76.5,78.5 + parent: 100 + - uid: 11265 + components: + - type: Transform + pos: -76.5,75.5 + parent: 100 + - uid: 11267 + components: + - type: Transform + pos: -76.5,74.5 + parent: 100 + - uid: 11268 + components: + - type: Transform + pos: -76.5,73.5 + parent: 100 + - uid: 11276 + components: + - type: Transform + pos: -76.5,72.5 + parent: 100 - uid: 11284 components: - type: Transform @@ -125599,11 +126295,21 @@ entities: - type: Transform pos: 33.5,19.5 parent: 100 + - uid: 11993 + components: + - type: Transform + pos: -75.5,71.5 + parent: 100 - uid: 12021 components: - type: Transform pos: -51.5,33.5 parent: 100 + - uid: 12024 + components: + - type: Transform + pos: -76.5,71.5 + parent: 100 - uid: 12030 components: - type: Transform @@ -125614,6 +126320,11 @@ entities: - type: Transform pos: -31.5,-40.5 parent: 100 + - uid: 12057 + components: + - type: Transform + pos: -77.5,79.5 + parent: 100 - uid: 12095 components: - type: Transform @@ -126879,6 +127590,16 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,50.5 parent: 100 + - uid: 16137 + components: + - type: Transform + pos: -76.5,79.5 + parent: 100 + - uid: 16148 + components: + - type: Transform + pos: -77.5,78.5 + parent: 100 - uid: 16181 components: - type: Transform @@ -127822,11 +128543,21 @@ entities: - type: Transform pos: -62.5,49.5 parent: 100 + - uid: 18402 + components: + - type: Transform + pos: -77.5,77.5 + parent: 100 - uid: 18406 components: - type: Transform pos: -56.5,48.5 parent: 100 + - uid: 18451 + components: + - type: Transform + pos: -77.5,76.5 + parent: 100 - uid: 18489 components: - type: Transform @@ -128312,100 +129043,30 @@ entities: - type: Transform pos: 18.5,-30.5 parent: 100 - - uid: 20174 - components: - - type: Transform - pos: -71.5,77.5 - parent: 100 - - uid: 20175 - components: - - type: Transform - pos: -71.5,75.5 - parent: 100 - - uid: 20176 - components: - - type: Transform - pos: -72.5,77.5 - parent: 100 - - uid: 20177 - components: - - type: Transform - pos: -72.5,75.5 - parent: 100 - - uid: 20178 - components: - - type: Transform - pos: -70.5,75.5 - parent: 100 - - uid: 20179 - components: - - type: Transform - pos: -70.5,77.5 - parent: 100 - - uid: 20186 - components: - - type: Transform - pos: -75.5,79.5 - parent: 100 - - uid: 20187 - components: - - type: Transform - pos: -75.5,78.5 - parent: 100 - - uid: 20188 - components: - - type: Transform - pos: -75.5,77.5 - parent: 100 - - uid: 20189 - components: - - type: Transform - pos: -75.5,76.5 - parent: 100 - - uid: 20190 - components: - - type: Transform - pos: -75.5,75.5 - parent: 100 - - uid: 20191 - components: - - type: Transform - pos: -75.5,74.5 - parent: 100 - - uid: 20192 - components: - - type: Transform - pos: -75.5,73.5 - parent: 100 - - uid: 20193 - components: - - type: Transform - pos: -74.5,74.5 - parent: 100 - uid: 20194 components: - type: Transform - pos: -74.5,75.5 + pos: -75.5,81.5 parent: 100 - uid: 20195 components: - type: Transform - pos: -74.5,76.5 + pos: -77.5,74.5 parent: 100 - uid: 20196 components: - type: Transform - pos: -74.5,77.5 + pos: -76.5,80.5 parent: 100 - uid: 20197 components: - type: Transform - pos: -74.5,78.5 + pos: -77.5,73.5 parent: 100 - uid: 20198 components: - type: Transform - pos: -74.5,73.5 + pos: -77.5,75.5 parent: 100 - uid: 20221 components: @@ -128502,6 +129163,11 @@ entities: - type: Transform pos: -68.5,72.5 parent: 100 + - uid: 20244 + components: + - type: Transform + pos: -77.5,80.5 + parent: 100 - uid: 20248 components: - type: Transform @@ -128522,11 +129188,6 @@ entities: - type: Transform pos: -68.5,80.5 parent: 100 - - uid: 20252 - components: - - type: Transform - pos: -74.5,79.5 - parent: 100 - uid: 20253 components: - type: Transform @@ -128883,11 +129544,46 @@ entities: - type: Transform pos: -59.5,74.5 parent: 100 + - uid: 20375 + components: + - type: Transform + pos: -72.5,77.5 + parent: 100 + - uid: 20417 + components: + - type: Transform + pos: -72.5,75.5 + parent: 100 + - uid: 20418 + components: + - type: Transform + pos: -71.5,75.5 + parent: 100 + - uid: 20428 + components: + - type: Transform + pos: -73.5,77.5 + parent: 100 + - uid: 20429 + components: + - type: Transform + pos: -73.5,75.5 + parent: 100 - uid: 20431 components: - type: Transform pos: -29.5,58.5 parent: 100 + - uid: 20432 + components: + - type: Transform + pos: -76.5,81.5 + parent: 100 + - uid: 20434 + components: + - type: Transform + pos: -71.5,77.5 + parent: 100 - uid: 20861 components: - type: Transform @@ -135462,23 +136158,6 @@ entities: - type: Transform pos: -33.5,56.5 parent: 100 -- proto: WeaponDisabler - entities: - - uid: 18935 - components: - - type: Transform - pos: 16.523514,45.545307 - parent: 100 - - uid: 19413 - components: - - type: Transform - pos: 16.711014,45.342182 - parent: 100 - - uid: 21218 - components: - - type: Transform - pos: 16.289139,45.748432 - parent: 100 - proto: WeaponDisablerPractice entities: - uid: 18666 @@ -135545,13 +136224,6 @@ entities: - type: Transform pos: -36.375343,65.53589 parent: 100 -- proto: WeaponLauncherRocket - entities: - - uid: 13901 - components: - - type: Transform - pos: 13.496111,52.75586 - parent: 100 - proto: WeaponPistolFlintlock entities: - uid: 14631 @@ -135561,24 +136233,29 @@ entities: parent: 100 - type: BallisticAmmoProvider unspawnedCount: 1 -- proto: WeaponTurretSyndicateBroken +- proto: WeaponTurretAI entities: - - uid: 20244 + - uid: 6274 components: - type: Transform - pos: -73.5,73.5 + pos: -64.5,75.5 parent: 100 - - uid: 20245 + - uid: 21984 components: - type: Transform - pos: -73.5,79.5 + pos: -75.5,79.5 parent: 100 - - uid: 20246 + - uid: 21985 + components: + - type: Transform + pos: -75.5,73.5 + parent: 100 + - uid: 21986 components: - type: Transform pos: -69.5,73.5 parent: 100 - - uid: 20247 + - uid: 21987 components: - type: Transform pos: -69.5,79.5 @@ -136023,52 +136700,84 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,-31.5 parent: 100 - - uid: 20172 + - uid: 21276 components: - type: Transform rot: -1.5707963267948966 rad - pos: -70.5,76.5 + pos: -0.5,-57.5 parent: 100 - - uid: 20173 + - uid: 21277 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -72.5,76.5 + rot: -1.5707963267948966 rad + pos: -0.5,-56.5 parent: 100 - - uid: 20180 +- proto: WindoorSecureEngineeringLocked + entities: + - uid: 21272 components: + - type: MetaData + name: camera routers - type: Transform rot: -1.5707963267948966 rad - pos: -72.5,76.5 + pos: 4.5,-55.5 parent: 100 - - uid: 20181 + - uid: 21721 components: + - type: MetaData + name: AI Walkway - type: Transform rot: 1.5707963267948966 rad - pos: -70.5,76.5 + pos: -60.5,68.5 parent: 100 - - uid: 21276 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 21755: + - DoorStatus: DoorBolt + - uid: 21755 components: + - type: MetaData + name: AI Walkway - type: Transform rot: -1.5707963267948966 rad - pos: -0.5,-57.5 + pos: -61.5,68.5 parent: 100 - - uid: 21277 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 21721: + - DoorStatus: DoorBolt + - uid: 21838 components: + - type: MetaData + name: AI Walkway - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-56.5 + rot: 3.141592653589793 rad + pos: -58.5,80.5 parent: 100 -- proto: WindoorSecureEngineeringLocked - entities: - - uid: 21272 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 21839: + - DoorStatus: DoorBolt + - uid: 21839 components: - type: MetaData - name: camera routers + name: AI Walkway - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,-55.5 + pos: -57.5,79.5 parent: 100 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 21838: + - DoorStatus: DoorBolt - proto: WindoorSecureLawyerLocked entities: - uid: 20883 @@ -136185,6 +136894,22 @@ entities: - type: Transform pos: 16.5,44.5 parent: 100 + - uid: 6249 + components: + - type: MetaData + name: Prisoner Belongings + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,32.5 + parent: 100 + - uid: 6255 + components: + - type: MetaData + name: Prisoner Belongings + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,35.5 + parent: 100 - uid: 11174 components: - type: Transform @@ -136215,6 +136940,22 @@ entities: rot: 3.141592653589793 rad pos: 16.5,20.5 parent: 100 + - uid: 18461 + components: + - type: MetaData + name: Prisoner Belongings + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,32.5 + parent: 100 + - uid: 18462 + components: + - type: MetaData + name: Prisoner Belongings + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,35.5 + parent: 100 - proto: Window entities: - uid: 666 @@ -136943,6 +137684,12 @@ entities: - type: Transform pos: -5.5,43.5 parent: 100 + - uid: 1877 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -62.5,67.5 + parent: 100 - uid: 1934 components: - type: Transform @@ -137243,17 +137990,130 @@ entities: rot: -1.5707963267948966 rad pos: -63.5,79.5 parent: 100 + - uid: 7340 + components: + - type: Transform + pos: -67.5,69.5 + parent: 100 + - uid: 7341 + components: + - type: Transform + pos: -70.5,70.5 + parent: 100 + - uid: 7342 + components: + - type: Transform + pos: -66.5,69.5 + parent: 100 + - uid: 7343 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -75.5,82.5 + parent: 100 - uid: 8918 components: - type: Transform rot: -1.5707963267948966 rad pos: -14.5,-13.5 parent: 100 + - uid: 10244 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -73.5,82.5 + parent: 100 + - uid: 10451 + components: + - type: Transform + pos: -73.5,70.5 + parent: 100 - uid: 10820 components: - type: Transform pos: 48.5,49.5 parent: 100 + - uid: 10834 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -69.5,69.5 + parent: 100 + - uid: 10835 + components: + - type: Transform + pos: -68.5,69.5 + parent: 100 + - uid: 10853 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -67.5,67.5 + parent: 100 + - uid: 10855 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -66.5,67.5 + parent: 100 + - uid: 10876 + components: + - type: Transform + pos: -69.5,69.5 + parent: 100 + - uid: 10877 + components: + - type: Transform + pos: -71.5,70.5 + parent: 100 + - uid: 10882 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -63.5,67.5 + parent: 100 + - uid: 10888 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -65.5,67.5 + parent: 100 + - uid: 10889 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -64.5,67.5 + parent: 100 + - uid: 10890 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,78.5 + parent: 100 + - uid: 10895 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,79.5 + parent: 100 + - uid: 10896 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,80.5 + parent: 100 + - uid: 10903 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,81.5 + parent: 100 + - uid: 10905 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -77.5,82.5 + parent: 100 - uid: 11716 components: - type: Transform @@ -137327,12 +138187,65 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,-39.5 parent: 100 + - uid: 12059 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -63.5,84.5 + parent: 100 + - uid: 12132 + components: + - type: Transform + pos: -64.5,69.5 + parent: 100 + - uid: 12150 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -78.5,81.5 + parent: 100 - uid: 12161 components: - type: Transform rot: -1.5707963267948966 rad pos: 32.5,56.5 parent: 100 + - uid: 12172 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -71.5,82.5 + parent: 100 + - uid: 12179 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -75.5,82.5 + parent: 100 + - uid: 12202 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -72.5,82.5 + parent: 100 + - uid: 12206 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -73.5,82.5 + parent: 100 + - uid: 12277 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -76.5,82.5 + parent: 100 + - uid: 12318 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -77.5,82.5 + parent: 100 - uid: 12356 components: - type: Transform @@ -137435,6 +138348,18 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,37.5 parent: 100 + - uid: 12801 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -78.5,75.5 + parent: 100 + - uid: 12813 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,75.5 + parent: 100 - uid: 13420 components: - type: Transform @@ -137498,6 +138423,17 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,55.5 parent: 100 + - uid: 13869 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -73.5,70.5 + parent: 100 + - uid: 13901 + components: + - type: Transform + pos: -75.5,70.5 + parent: 100 - uid: 14167 components: - type: Transform @@ -137510,11 +138446,33 @@ entities: rot: -1.5707963267948966 rad pos: 42.5,-6.5 parent: 100 + - uid: 14648 + components: + - type: Transform + pos: -76.5,70.5 + parent: 100 + - uid: 15091 + components: + - type: Transform + pos: -78.5,72.5 + parent: 100 + - uid: 15214 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,74.5 + parent: 100 - uid: 15331 components: - type: Transform pos: 47.5,49.5 parent: 100 + - uid: 15421 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,73.5 + parent: 100 - uid: 15472 components: - type: Transform @@ -137539,6 +138497,56 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,30.5 parent: 100 + - uid: 16117 + components: + - type: Transform + pos: -72.5,70.5 + parent: 100 + - uid: 16125 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -76.5,70.5 + parent: 100 + - uid: 16126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,72.5 + parent: 100 + - uid: 16127 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -70.5,67.5 + parent: 100 + - uid: 16135 + components: + - type: Transform + pos: -63.5,69.5 + parent: 100 + - uid: 16138 + components: + - type: Transform + pos: -65.5,69.5 + parent: 100 + - uid: 16143 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -75.5,70.5 + parent: 100 + - uid: 16145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.5,84.5 + parent: 100 + - uid: 16146 + components: + - type: Transform + pos: -78.5,77.5 + parent: 100 - uid: 16513 components: - type: Transform @@ -137605,6 +138613,12 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,74.5 parent: 100 + - uid: 18452 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -63.5,69.5 + parent: 100 - uid: 18599 components: - type: Transform @@ -137690,6 +138704,30 @@ entities: - type: Transform pos: 14.5,17.5 parent: 100 + - uid: 20320 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -69.5,67.5 + parent: 100 + - uid: 20321 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -68.5,67.5 + parent: 100 + - uid: 20436 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,77.5 + parent: 100 + - uid: 20441 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.5,69.5 + parent: 100 - uid: 20499 components: - type: Transform @@ -137723,12 +138761,449 @@ entities: - type: Transform pos: 8.5,53.5 parent: 100 + - uid: 21218 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,67.5 + parent: 100 + - uid: 21244 + components: + - type: Transform + pos: -61.5,69.5 + parent: 100 - uid: 21274 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-54.5 parent: 100 + - uid: 21670 + components: + - type: Transform + pos: -60.5,69.5 + parent: 100 + - uid: 21678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -60.5,67.5 + parent: 100 + - uid: 21756 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -71.5,68.5 + parent: 100 + - uid: 21757 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -71.5,68.5 + parent: 100 + - uid: 21758 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -72.5,68.5 + parent: 100 + - uid: 21759 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -73.5,68.5 + parent: 100 + - uid: 21760 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -74.5,68.5 + parent: 100 + - uid: 21761 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -75.5,68.5 + parent: 100 + - uid: 21762 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -76.5,68.5 + parent: 100 + - uid: 21763 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -77.5,68.5 + parent: 100 + - uid: 21764 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -78.5,68.5 + parent: 100 + - uid: 21767 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -79.5,68.5 + parent: 100 + - uid: 21768 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,69.5 + parent: 100 + - uid: 21769 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,70.5 + parent: 100 + - uid: 21770 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,71.5 + parent: 100 + - uid: 21771 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,72.5 + parent: 100 + - uid: 21772 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,73.5 + parent: 100 + - uid: 21773 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,74.5 + parent: 100 + - uid: 21774 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,75.5 + parent: 100 + - uid: 21775 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,76.5 + parent: 100 + - uid: 21776 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,77.5 + parent: 100 + - uid: 21777 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,78.5 + parent: 100 + - uid: 21778 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,79.5 + parent: 100 + - uid: 21779 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,80.5 + parent: 100 + - uid: 21780 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,81.5 + parent: 100 + - uid: 21781 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -80.5,82.5 + parent: 100 + - uid: 21782 + components: + - type: Transform + pos: -79.5,83.5 + parent: 100 + - uid: 21783 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -79.5,83.5 + parent: 100 + - uid: 21784 + components: + - type: Transform + pos: -78.5,84.5 + parent: 100 + - uid: 21785 + components: + - type: Transform + pos: -77.5,84.5 + parent: 100 + - uid: 21786 + components: + - type: Transform + pos: -76.5,84.5 + parent: 100 + - uid: 21787 + components: + - type: Transform + pos: -75.5,84.5 + parent: 100 + - uid: 21788 + components: + - type: Transform + pos: -73.5,84.5 + parent: 100 + - uid: 21789 + components: + - type: Transform + pos: -72.5,84.5 + parent: 100 + - uid: 21790 + components: + - type: Transform + pos: -74.5,84.5 + parent: 100 + - uid: 21791 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -70.5,82.5 + parent: 100 + - uid: 21792 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -68.5,84.5 + parent: 100 + - uid: 21793 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -68.5,84.5 + parent: 100 + - uid: 21794 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -67.5,84.5 + parent: 100 + - uid: 21795 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -66.5,84.5 + parent: 100 + - uid: 21796 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -65.5,84.5 + parent: 100 + - uid: 21797 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -64.5,84.5 + parent: 100 + - uid: 21798 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -63.5,84.5 + parent: 100 + - uid: 21799 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,84.5 + parent: 100 + - uid: 21800 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -60.5,84.5 + parent: 100 + - uid: 21801 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -59.5,83.5 + parent: 100 + - uid: 21802 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -60.5,84.5 + parent: 100 + - uid: 21803 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -59.5,83.5 + parent: 100 + - uid: 21804 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -59.5,82.5 + parent: 100 + - uid: 21805 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -59.5,80.5 + parent: 100 + - uid: 21806 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -59.5,79.5 + parent: 100 + - uid: 21807 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -59.5,80.5 + parent: 100 + - uid: 21808 + components: + - type: Transform + pos: -59.5,82.5 + parent: 100 + - uid: 21809 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,80.5 + parent: 100 + - uid: 21810 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,81.5 + parent: 100 + - uid: 21811 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,82.5 + parent: 100 + - uid: 21812 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,83.5 + parent: 100 + - uid: 21813 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,84.5 + parent: 100 + - uid: 21814 + components: + - type: Transform + pos: -58.5,85.5 + parent: 100 + - uid: 21815 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -58.5,85.5 + parent: 100 + - uid: 21816 + components: + - type: Transform + pos: -59.5,86.5 + parent: 100 + - uid: 21817 + components: + - type: Transform + pos: -60.5,86.5 + parent: 100 + - uid: 21818 + components: + - type: Transform + pos: -61.5,86.5 + parent: 100 + - uid: 21819 + components: + - type: Transform + pos: -62.5,86.5 + parent: 100 + - uid: 21820 + components: + - type: Transform + pos: -63.5,86.5 + parent: 100 + - uid: 21821 + components: + - type: Transform + pos: -64.5,86.5 + parent: 100 + - uid: 21822 + components: + - type: Transform + pos: -65.5,86.5 + parent: 100 + - uid: 21823 + components: + - type: Transform + pos: -66.5,86.5 + parent: 100 + - uid: 21824 + components: + - type: Transform + pos: -68.5,86.5 + parent: 100 + - uid: 21825 + components: + - type: Transform + pos: -69.5,86.5 + parent: 100 + - uid: 21826 + components: + - type: Transform + pos: -67.5,86.5 + parent: 100 + - uid: 21827 + components: + - type: Transform + pos: -70.5,86.5 + parent: 100 + - uid: 21828 + components: + - type: Transform + pos: -71.5,86.5 + parent: 100 + - uid: 21829 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -72.5,85.5 + parent: 100 + - uid: 21830 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -72.5,84.5 + parent: 100 - proto: WindowTintedDirectional entities: - uid: 1357 @@ -137889,6 +139364,11 @@ entities: parent: 100 - proto: Wirecutter entities: + - uid: 3047 + components: + - type: Transform + pos: 43.669155,26.523476 + parent: 100 - uid: 10915 components: - type: Transform diff --git a/Resources/Prototypes/Maps/lighthouse.yml b/Resources/Prototypes/Maps/lighthouse.yml index 6bbb3d4d39a..12ae9173852 100644 --- a/Resources/Prototypes/Maps/lighthouse.yml +++ b/Resources/Prototypes/Maps/lighthouse.yml @@ -51,8 +51,9 @@ Chemist: [ 1, 2 ] Paramedic: [ 1, 2 ] Psychologist: [ 1, 1 ] - MedicalDoctor: [ 3, 4 ] + MedicalDoctor: [ 3, 3 ] MedicalIntern: [ 2, 3 ] + Surgeon: [ 1, 2 ] #science ResearchDirector: [ 1, 1 ] Chaplain: [ 1, 1 ] From b7610e4c285406dc66023565a7181b5dccc0cd55 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Fri, 10 Jan 2025 06:25:42 +0000 Subject: [PATCH 23/45] glacier update (#2666) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Maps/glacier.yml | 2076 +++++++++++++++++-------- Resources/Prototypes/Maps/glacier.yml | 1 + 2 files changed, 1450 insertions(+), 627 deletions(-) diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml index 8c8ca01b7ee..1a32685837f 100644 --- a/Resources/Maps/glacier.yml +++ b/Resources/Maps/glacier.yml @@ -225,7 +225,7 @@ entities: version: 6 2,3: ind: 2,3 - tiles: PAAAAAABPAAAAAACGAAAAAABPAAAAAAAPAAAAAAAGAAAAAACPAAAAAADPAAAAAADPAAAAAAAGAAAAAACPQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAGAAAAAABPAAAAAACPAAAAAACPAAAAAABPAAAAAADPAAAAAABPAAAAAADGAAAAAADGAAAAAACYQAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAGAAAAAADGAAAAAADGAAAAAAAGAAAAAAAGAAAAAACGAAAAAABGAAAAAACGAAAAAAAYQAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPQAAAAAAPQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAABAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAABAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAABAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAABAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAABAAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAARgAAAAAAYQAAAAAAYQAAAAAALgAAAAAAPQAAAAAAUQAAAAAAPQAAAAAALgAAAAAAYQAAAAAAYQAAAAAARgAAAAAAYAAAAAAACQAAAAAACQAAAAAACQAAAAAAFQAAAAAEFQAAAAADYQAAAAAALgAAAAAALgAAAAAAPQAAAAAAUQAAAAAAPQAAAAAALgAAAAAALgAAAAAAYQAAAAAARgAAAAAARgAAAAAACQAAAAAACQAAAAAACQAAAAAAFQAAAAAAFQAAAAACYQAAAAAALgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAALgAAAAAAFQAAAAAEFQAAAAAFFQAAAAAEFQAAAAABCQAAAAAACQAAAAAGBAAAAAAABAAAAAAABAAAAAAABAAAAAAANwAAAAAAFQAAAAAGYQAAAAAAFQAAAAAFNwAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAACFQAAAAADFQAAAAACFQAAAAADFQAAAAAFYQAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAFQAAAAAGYQAAAAAAFQAAAAAEEAAAAAAAEAAAAAAANwAAAAAAEAAAAAAAYQAAAAAAFQAAAAABFQAAAAABFQAAAAAG + tiles: PAAAAAABPAAAAAACGAAAAAABPAAAAAAAPAAAAAAAGAAAAAACPAAAAAADPAAAAAADPAAAAAAAGAAAAAACPQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAGAAAAAABPAAAAAACPAAAAAACPAAAAAABPAAAAAADPAAAAAABPAAAAAADGAAAAAADGAAAAAACYQAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAGAAAAAADGAAAAAADGAAAAAAAGAAAAAAAGAAAAAACGAAAAAABGAAAAAACGAAAAAAAYQAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPQAAAAAAPQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAYQAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAABAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAABAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAABAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAABAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAABAAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAARgAAAAAAYQAAAAAAYQAAAAAALgAAAAAAPQAAAAAAUQAAAAAAPQAAAAAALgAAAAAAYQAAAAAAYQAAAAAARgAAAAAAYAAAAAAACQAAAAAACQAAAAAACQAAAAAAFQAAAAAEFQAAAAADYQAAAAAALgAAAAAALgAAAAAAPQAAAAAAUQAAAAAAPQAAAAAALgAAAAAALgAAAAAAYQAAAAAARgAAAAAARgAAAAAACQAAAAAACQAAAAAACQAAAAAAFQAAAAAAFQAAAAACYQAAAAAALgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAALgAAAAAAFQAAAAAEFQAAAAAFFQAAAAAEFQAAAAABCQAAAAAACQAAAAAGBAAAAAAABAAAAAAABAAAAAAABAAAAAAANwAAAAAAFQAAAAAGYQAAAAAAFQAAAAAFNwAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAACFQAAAAADFQAAAAACFQAAAAADFQAAAAAFYQAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAFQAAAAAGGAAAAAAAFQAAAAAEEAAAAAAAEAAAAAAANwAAAAAAEAAAAAAAYQAAAAAAFQAAAAABFQAAAAABFQAAAAAG version: 6 -3,0: ind: -3,0 @@ -265,7 +265,7 @@ entities: version: 6 -5,0: ind: -5,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPQAAAAAAPQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAAFQAAAAAAFQAAAAACFQAAAAADFQAAAAAAFQAAAAABFQAAAAAEFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAFFQAAAAABFQAAAAADFQAAAAAEFQAAAAADFQAAAAAGFQAAAAADFQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAEFQAAAAABFQAAAAAFFQAAAAAFFQAAAAADFQAAAAAAFQAAAAACXgAAAAACXgAAAAABXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAFFQAAAAAAFQAAAAAFYQAAAAAAYQAAAAAAXgAAAAAAXgAAAAADXgAAAAADYQAAAAAAXgAAAAACXgAAAAACXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAGFQAAAAAAYQAAAAAAGAAAAAADGAAAAAAAGAAAAAABGAAAAAABYQAAAAAAXgAAAAADXgAAAAADXgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAABYQAAAAAAGAAAAAACGAAAAAADGAAAAAABGAAAAAACYQAAAAAAGAAAAAAAGAAAAAACGAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAACFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAPQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAGFQAAAAABFQAAAAABUQAAAAAANwAAAAAAXgAAAAACGAAAAAAAGAAAAAABGAAAAAACXgAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAFFQAAAAAEFQAAAAAAFQAAAAADYQAAAAAAXgAAAAABXgAAAAACXgAAAAABXgAAAAABXgAAAAACXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAACFQAAAAABFQAAAAADFQAAAAAGFQAAAAAENQAAAAAAXgAAAAAAGAAAAAACGAAAAAABGAAAAAADXgAAAAADXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAADFQAAAAAEFQAAAAADFQAAAAAGFQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAANwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPQAAAAAAPQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAAFQAAAAAAFQAAAAACFQAAAAADFQAAAAAAFQAAAAABFQAAAAAEFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAFFQAAAAABFQAAAAADFQAAAAAEFQAAAAADFQAAAAAGFQAAAAADFQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAEFQAAAAABFQAAAAAFFQAAAAAFFQAAAAADFQAAAAAAFQAAAAACXgAAAAACXgAAAAABXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAFFQAAAAAAFQAAAAAFYQAAAAAAYQAAAAAAXgAAAAAAXgAAAAADXgAAAAADYQAAAAAAXgAAAAACXgAAAAACXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAGFQAAAAAAYQAAAAAAGAAAAAADGAAAAAAAGAAAAAABGAAAAAABYQAAAAAAXgAAAAADXgAAAAADXgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAABYQAAAAAAGAAAAAACGAAAAAADGAAAAAABGAAAAAACYQAAAAAAGAAAAAAAGAAAAAACGAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAACFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAPQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAGFQAAAAABFQAAAAABUQAAAAAANwAAAAAAXgAAAAACGAAAAAAAGAAAAAABGAAAAAACXgAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAAFFQAAAAAEFQAAAAAAFQAAAAADYQAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAABXgAAAAACXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAACFQAAAAABFQAAAAADFQAAAAAGFQAAAAAENQAAAAAAXgAAAAAAGAAAAAACGAAAAAABGAAAAAADXgAAAAADXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAAAAADFQAAAAAEFQAAAAADFQAAAAAGFQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAANwAAAAAA version: 6 -2,2: ind: -2,2 @@ -353,7 +353,7 @@ entities: version: 6 2,4: ind: 2,4 - tiles: FQAAAAAFYQAAAAAAEAAAAAAAUQAAAAAAEAAAAAAAUQAAAAAAEAAAAAAAUQAAAAAAEAAAAAAAUQAAAAAAYQAAAAAAEAAAAAAAYQAAAAAAFQAAAAACFQAAAAAEFQAAAAAAFQAAAAAEYQAAAAAAEAAAAAAAUQAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUQAAAAAAYQAAAAAAEAAAAAAAYQAAAAAAFQAAAAABFQAAAAAGFQAAAAACFQAAAAADYQAAAAAAYQAAAAAAFQAAAAAFUQAAAAAAUQAAAAAAEAAAAAAAUQAAAAAAUQAAAAAAFQAAAAADFQAAAAAEFQAAAAACYQAAAAAAFQAAAAAGFQAAAAAFFQAAAAAGFQAAAAAFFQAAAAADYQAAAAAAYQAAAAAADgAAAAAADgAAAAAAEAAAAAAADgAAAAAADgAAAAAAFQAAAAAEFQAAAAABFQAAAAAEYQAAAAAAFQAAAAACFQAAAAADFQAAAAABFQAAAAAEFQAAAAAAYQAAAAAAYQAAAAAACQAAAAAADgAAAAAAEAAAAAAADgAAAAAACQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAABFQAAAAAAFQAAAAAFFQAAAAADFQAAAAAAYQAAAAAAYQAAAAAACQAAAAAADgAAAAAAEAAAAAAADgAAAAAACQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAADFQAAAAAEFQAAAAABFQAAAAAGFQAAAAAFFQAAAAAFYQAAAAAAYQAAAAAACQAAAAAAFQAAAAAAEAAAAAAAFQAAAAAACQAAAAAAYQAAAAAAYQAAAAAAFQAAAAADFQAAAAACFQAAAAAGFQAAAAAEFQAAAAAFFQAAAAAAFQAAAAABFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAAEFQAAAAAAFQAAAAAAFQAAAAACFQAAAAAAAAAAAAAAYQAAAAAAFQAAAAAFFQAAAAABFQAAAAAFYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAAAFQAAAAACFQAAAAADFQAAAAAAFQAAAAAGFQAAAAAARgAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAAAFQAAAAAAFQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: FQAAAAAFYQAAAAAAEAAAAAAAUQAAAAAAEAAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAEAAAAAAAUQAAAAAAYQAAAAAAEAAAAAAAYQAAAAAAFQAAAAACFQAAAAAEFQAAAAAAFQAAAAAEYQAAAAAAEAAAAAAAUQAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUQAAAAAAYQAAAAAAEAAAAAAAYQAAAAAAFQAAAAABFQAAAAAGFQAAAAACFQAAAAADYQAAAAAAYQAAAAAAFQAAAAAFUQAAAAAAUQAAAAAAEAAAAAAAUQAAAAAAUQAAAAAAFQAAAAADFQAAAAAEFQAAAAACYQAAAAAAFQAAAAAGFQAAAAAFFQAAAAAGFQAAAAAFFQAAAAADYQAAAAAAYQAAAAAADgAAAAAADgAAAAAAEAAAAAAADgAAAAAADgAAAAAAFQAAAAAEFQAAAAABFQAAAAAEYQAAAAAAFQAAAAACFQAAAAADFQAAAAABFQAAAAAEFQAAAAAAYQAAAAAAYQAAAAAACQAAAAAADgAAAAAAEAAAAAAADgAAAAAACQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAABFQAAAAAAFQAAAAAFFQAAAAADFQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAAEAAAAAAACQAAAAAACQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAADFQAAAAAEFQAAAAABFQAAAAAGFQAAAAAFFQAAAAAFYQAAAAAAYQAAAAAAGAAAAAAAFQAAAAAAEAAAAAAAFQAAAAAAGAAAAAAAYQAAAAAAYQAAAAAAFQAAAAADFQAAAAACFQAAAAAGFQAAAAAEFQAAAAAFFQAAAAAAFQAAAAABFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAAEFQAAAAAAFQAAAAAAFQAAAAACFQAAAAAAAAAAAAAAYQAAAAAAFQAAAAAFFQAAAAABFQAAAAAFYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAAAFQAAAAACFQAAAAADFQAAAAAAFQAAAAAGFQAAAAAARgAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAFQAAAAAAFQAAAAAAFQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,4: ind: 3,4 @@ -5366,11 +5366,31 @@ entities: decals: 2389: 26,53 5874: 43,-23 + - node: + color: '#951710FF' + id: WarnCornerSmallGreyscaleNE + decals: + 5992: 39,69 + - node: + color: '#951710FF' + id: WarnCornerSmallGreyscaleNW + decals: + 5991: 37,69 - node: color: '#FFFFFFFF' id: WarnCornerSmallGreyscaleNW decals: 1447: -17,26 + - node: + color: '#951710FF' + id: WarnCornerSmallGreyscaleSE + decals: + 5997: 37,64 + - node: + color: '#951710FF' + id: WarnCornerSmallGreyscaleSW + decals: + 5998: 39,64 - node: color: '#FFFFFFFF' id: WarnCornerSmallGreyscaleSW @@ -5449,6 +5469,13 @@ entities: 3666: 32,-19 3667: 28,-20 3668: 27,-20 + - node: + color: '#951710FF' + id: WarnFullGreyscale + decals: + 5983: 36,70 + 5984: 40,70 + 5995: 38,63 - node: color: '#FFFFFFFF' id: WarnLineE @@ -5469,6 +5496,17 @@ entities: 2481: 45,29 2482: 45,28 2483: 45,27 + - node: + color: '#951710FF' + id: WarnLineGreyscaleN + decals: + 5993: 36,69 + 5994: 40,69 + - node: + color: '#951710FF' + id: WarnLineGreyscaleS + decals: + 5996: 38,64 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleS @@ -9694,9 +9732,9 @@ entities: 0: 111 -4,12: 0: 30583 - 2: 34952 + 3: 34952 -4,10: - 3: 12 + 2: 12 0: 52224 -4,11: 0: 3276 @@ -9704,12 +9742,12 @@ entities: 0: 118 -3,10: 0: 4352 - 2: 26214 + 3: 26214 -3,11: 0: 281 - 2: 26214 + 3: 26214 -3,12: - 2: 63351 + 3: 63351 -2,9: 0: 2039 -2,10: @@ -9718,7 +9756,7 @@ entities: 0: 30591 -2,12: 0: 119 - 2: 61440 + 3: 61440 -1,9: 0: 30711 -1,10: @@ -9727,16 +9765,16 @@ entities: 0: 30503 -1,12: 0: 119 - 2: 61440 + 3: 61440 0,8: 0: 63351 0,9: 0: 63736 0,10: - 2: 61712 + 3: 61712 0: 232 0,11: - 2: 16255 + 3: 16255 0,-4: 0: 60428 0,-3: @@ -9852,17 +9890,17 @@ entities: 4,7: 0: 61663 0,12: - 2: 64443 + 3: 64443 1,9: 0: 32767 1,10: 0: 35507 - 2: 12288 + 3: 12288 1,11: - 2: 8994 + 3: 8994 0: 34944 1,12: - 2: 291 + 3: 291 2,9: 0: 4095 2,10: @@ -9879,7 +9917,7 @@ entities: 0: 65534 3,12: 0: 28927 - 2: 32768 + 3: 32768 4,8: 0: 65294 4,9: @@ -9994,7 +10032,7 @@ entities: 0: 56831 4,12: 0: 255 - 2: 61440 + 3: 61440 5,9: 0: 3838 5,10: @@ -10003,7 +10041,7 @@ entities: 0: 65528 5,12: 0: 33535 - 2: 28672 + 3: 28672 6,9: 0: 61439 6,10: @@ -10116,6 +10154,7 @@ entities: 0: 63479 12,3: 0: 30562 + 3: 32768 9,5: 0: 21831 9,6: @@ -10160,16 +10199,16 @@ entities: 0: 43008 10,12: 0: 19 - 2: 27784 + 3: 27784 11,9: 0: 65534 11,10: 0: 56559 11,11: 0: 477 - 2: 17408 + 3: 17408 11,12: - 2: 4407 + 3: 4407 12,8: 0: 30583 12,9: @@ -10179,112 +10218,114 @@ entities: 12,11: 0: 3327 0,13: - 2: 43929 + 3: 43929 -1,13: - 2: 2039 + 3: 2039 0,14: - 2: 61038 + 3: 61038 0: 128 -1,14: 0: 65535 0,15: - 2: 61166 + 3: 61166 -1,15: 0: 15 4: 65280 0,16: - 2: 43942 + 3: 43942 0: 8 1,13: - 2: 273 + 3: 273 0: 8 1,14: - 2: 51711 + 3: 51711 1,15: - 2: 39127 + 3: 39127 0: 8 1,16: - 2: 25823 + 3: 25823 2,13: 0: 3067 2,14: - 2: 60303 + 3: 60303 3,13: 0: 2867 - 2: 136 + 3: 136 3,14: 0: 65535 4,13: - 2: 255 + 3: 255 0: 36608 4,14: 0: 65535 5,13: - 2: 30583 + 3: 30583 0: 34952 5,14: - 2: 1911 + 3: 1911 0: 63624 6,13: 0: 61167 6,14: - 2: 45552 + 3: 45552 5,15: 0: 8 6,15: 0: 34959 7,13: 0: 13107 - 2: 34952 + 3: 34952 7,14: - 2: 62200 + 3: 53464 + 0: 8736 6,16: 0: 136 - 2: 34816 + 3: 34816 7,15: 0: 27718 7,16: 0: 53106 8,13: - 2: 17615 + 3: 139 + 0: 17476 8,14: - 2: 5828 - 0: 8192 + 3: 4736 + 0: 9284 12,4: 0: 6 13,6: - 0: 61440 + 0: 65024 13,7: 0: 63487 13,8: 0: 65535 14,6: - 0: 62528 + 0: 62784 14,7: 0: 65279 14,8: 0: 61439 15,6: 0: 20480 - 2: 35840 + 3: 35840 15,7: 0: 61661 16,6: - 2: 12288 + 3: 12288 16,7: 0: 61489 - 2: 70 + 3: 70 6,17: - 2: 2184 + 3: 2184 7,17: - 2: 25138 + 3: 25138 0: 34956 7,18: - 2: 36386 + 3: 36386 0: 8 8,18: 0: 241 - 2: 61952 + 3: 61952 13,9: 0: 28671 13,10: @@ -10309,10 +10350,10 @@ entities: 0: 28912 16,9: 0: 61489 - 2: 70 + 3: 70 16,10: 0: 12528 - 2: 16384 + 3: 16384 16,11: 0: 1 13,0: @@ -10321,9 +10362,10 @@ entities: 0: 2032 13,2: 0: 12407 + 3: 32768 13,3: 0: 51 - 2: 1024 + 3: 13448 13,-1: 0: 34963 -8,4: @@ -10428,20 +10470,20 @@ entities: 4,-6: 0: 33075 -8,-3: - 2: 12544 + 3: 12544 -9,-3: 0: 64250 - 2: 1285 + 3: 1285 -8,-1: 0: 61731 -9,-2: 0: 64170 - 2: 1365 + 3: 1365 -9,-1: 0: 64174 - 2: 1361 + 3: 1361 -8,-2: - 2: 512 + 3: 512 -8,0: 0: 65526 -7,-3: @@ -10450,7 +10492,7 @@ entities: 0: 62321 -7,-5: 0: 24576 - 2: 119 + 3: 119 -7,-4: 0: 49152 -7,-2: @@ -10471,27 +10513,27 @@ entities: 0: 30513 -9,0: 0: 64170 - 2: 1365 + 3: 1365 -8,1: - 2: 1799 + 3: 1799 0: 2296 -9,1: 0: 64250 - 2: 1285 + 3: 1285 -8,2: 0: 64384 -9,2: 0: 51200 - 2: 1 + 3: 1 -9,3: 0: 47308 -7,1: - 2: 1799 + 3: 1799 0: 2296 -7,2: 0: 65392 -6,1: - 2: 263 + 3: 263 0: 248 -6,2: 0: 52424 @@ -10502,32 +10544,33 @@ entities: 8,16: 0: 204 9,13: - 2: 34959 + 3: 7 + 0: 34952 9,14: - 2: 248 - 0: 62464 + 3: 112 + 0: 62600 9,15: 0: 4351 9,16: 0: 65535 10,13: - 2: 3 + 3: 3 10,14: 0: 36864 - 2: 32 + 3: 32 10,15: 0: 61499 10,16: 0: 4539 11,14: - 2: 8177 + 3: 8177 0: 57344 11,15: 0: 207 11,13: - 2: 4401 + 3: 4401 12,14: - 2: 12561 + 3: 12561 12,15: 0: 8209 11,16: @@ -10548,10 +10591,10 @@ entities: 0: 65535 -12,3: 0: 49151 - 2: 16384 + 3: 16384 -13,3: 0: 9215 - 2: 56320 + 3: 56320 -11,0: 0: 65535 -11,1: @@ -10559,7 +10602,7 @@ entities: -11,2: 0: 65535 -11,3: - 2: 1799 + 3: 1799 0: 63736 -11,-1: 0: 65535 @@ -10569,12 +10612,12 @@ entities: 0: 65535 -10,1: 0: 63999 - 2: 1536 + 3: 1536 -10,2: - 2: 1285 + 3: 1285 0: 31482 -10,3: - 2: 773 + 3: 773 0: 12338 -10,-1: 0: 65535 @@ -10588,19 +10631,19 @@ entities: 0: 61183 -13,5: 0: 58468 - 2: 2 + 3: 2 -13,6: 0: 26188 - 2: 48 + 3: 48 -12,7: 0: 45056 - 2: 16384 + 3: 16384 -12,8: - 2: 1799 + 3: 1799 0: 12536 -13,7: 0: 57344 - 2: 4914 + 3: 4914 -11,5: 0: 30583 -11,6: @@ -10608,7 +10651,7 @@ entities: -11,7: 0: 61986 -11,8: - 2: 1797 + 3: 1797 0: 59642 -10,6: 0: 52479 @@ -10617,7 +10660,7 @@ entities: -10,5: 0: 52430 -10,8: - 2: 771 + 3: 771 0: 29812 -9,6: 0: 12545 @@ -10626,7 +10669,7 @@ entities: -12,-4: 0: 61440 -12,-3: - 2: 1799 + 3: 1799 0: 63736 -13,-3: 0: 3935 @@ -10638,28 +10681,28 @@ entities: 0: 65535 -11,-4: 0: 12288 - 2: 16384 + 3: 16384 -11,-3: - 2: 1807 + 3: 1807 0: 63728 -11,-2: 0: 65535 -10,-3: - 2: 1797 + 3: 1797 0: 63736 -10,-2: 0: 65535 -10,-4: - 2: 6152 + 3: 6152 0: 49152 -10,-5: 0: 34952 -9,-4: - 2: 1365 + 3: 1365 0: 64170 -9,-5: 0: 64175 - 2: 1360 + 3: 1360 -16,-4: 0: 28671 -16,-5: @@ -10676,19 +10719,19 @@ entities: 0: 28398 -16,-1: 0: 49138 - 2: 16384 + 3: 16384 -17,-1: 0: 2240 - 2: 32768 + 3: 32768 -16,0: - 2: 1 + 3: 1 0: 1150 -15,-4: 0: 819 - 2: 32768 + 3: 32768 -15,-3: 0: 819 - 2: 34952 + 3: 34952 -15,-2: 0: 13107 -15,-1: @@ -10703,41 +10746,41 @@ entities: 0: 65534 -14,-4: 0: 57344 - 2: 64 + 3: 64 -14,-2: - 2: 15 + 3: 15 0: 51328 -14,0: 0: 65535 -13,-4: 0: 28672 - 2: 144 + 3: 144 -10,-6: 0: 32768 -9,-6: 0: 61440 -8,-5: - 2: 255 + 3: 255 -16,-6: - 2: 15 + 3: 15 0: 63232 -17,-6: - 2: 74 + 3: 74 0: 61696 -17,-5: 0: 57561 -16,-7: - 2: 8192 + 3: 8192 -15,-6: - 2: 16400 + 3: 16400 0: 45056 -14,-6: 0: 4096 - 2: 8192 + 3: 8192 -14,-5: - 2: 4352 + 3: 4352 -17,0: - 2: 8 + 3: 8 0: 2240 -16,1: 0: 3824 @@ -10754,7 +10797,7 @@ entities: -16,4: 0: 65535 -15,1: - 2: 752 + 3: 752 0: 8456 -15,3: 0: 20447 @@ -10762,29 +10805,29 @@ entities: 0: 50786 -15,4: 0: 9830 - 2: 2048 + 3: 2048 -14,1: 0: 61439 -14,2: 0: 62606 - 2: 320 + 3: 320 -14,3: 0: 8191 - 2: 57344 + 3: 57344 -14,4: - 2: 1834 + 3: 1834 0: 34944 -13,4: 0: 24578 - 2: 544 + 3: 544 -18,-7: - 2: 2112 + 3: 2112 -18,-6: 0: 51396 -18,-5: 0: 12 -17,-7: - 2: 40064 + 3: 40064 -19,2: 0: 9319 -19,3: @@ -10852,7 +10895,7 @@ entities: 0: 7103 8,-9: 0: 57344 - 2: 224 + 3: 224 9,-8: 0: 53755 9,-7: @@ -10861,7 +10904,7 @@ entities: 0: 4081 9,-9: 0: 47296 - 2: 16 + 3: 16 10,-8: 0: 56343 10,-7: @@ -10991,22 +11034,22 @@ entities: 17,-2: 0: 34955 17,-1: - 2: 22016 + 3: 22016 0: 43208 17,0: 0: 30475 - 2: 4 + 3: 4 18,-3: 0: 30591 18,-2: 0: 25207 - 2: 5376 + 3: 5376 18,-1: 0: 61203 - 2: 4196 + 3: 4196 18,0: 0: 49117 - 2: 16418 + 3: 16418 19,-3: 0: 49087 19,-1: @@ -11041,7 +11084,7 @@ entities: 0: 65532 -13,8: 0: 43257 - 2: 1798 + 3: 1798 -11,9: 0: 3104 -10,9: @@ -11064,40 +11107,40 @@ entities: 0: 65394 -14,7: 0: 45736 - 2: 19522 + 3: 19522 -14,8: 0: 9386 - 2: 51780 + 3: 51780 -4,13: 0: 119 - 2: 62600 + 3: 62600 -5,13: 0: 30632 -4,14: - 2: 65023 + 3: 65023 -5,14: - 2: 21882 + 3: 21882 0: 5 -4,15: - 2: 4383 + 3: 4383 -5,15: - 2: 29772 + 3: 29772 -4,16: - 2: 18255 + 3: 18255 -3,13: - 2: 14071 + 3: 14071 -3,14: - 2: 13107 + 3: 13107 0: 34952 -3,15: - 2: 8739 + 3: 8739 0: 8 4: 34816 -3,16: - 2: 60963 + 3: 60963 4: 8 -2,13: - 2: 3324 + 3: 3324 0: 49152 -2,14: 0: 65535 @@ -11106,64 +11149,64 @@ entities: 4: 65280 -2,16: 4: 15 - 2: 65280 + 3: 65280 -1,16: 4: 15 - 2: 7936 + 3: 7936 -5,16: - 2: 7962 + 3: 7962 0: 16452 -4,17: - 2: 47332 + 3: 47332 0: 16384 -5,17: - 2: 42567 + 3: 42567 0: 16384 -4,18: - 2: 35820 + 3: 35820 0: 1024 -5,18: - 2: 4030 + 3: 4030 -4,19: - 2: 51400 + 3: 51400 -3,17: - 2: 49722 + 3: 49722 0: 12288 -3,18: - 2: 3631 + 3: 3631 0: 256 -3,19: - 2: 4112 + 3: 4112 -4,20: - 2: 51400 + 3: 51400 -2,17: - 2: 61453 + 3: 61453 -2,18: - 2: 3455 + 3: 3455 0: 512 -1,17: - 2: 57617 + 3: 57617 0: 4096 -1,18: - 2: 36767 + 3: 36767 -1,19: - 2: 51400 + 3: 51400 0,17: - 2: 30891 + 3: 30891 0: 32768 0,18: - 2: 185 + 3: 185 0: 256 0,19: - 2: 4112 + 3: 4112 -1,20: - 2: 51400 + 3: 51400 1,17: - 2: 4372 + 3: 4372 1,18: - 2: 99 + 3: 99 2,16: - 2: 1 + 3: 1 -8,12: 0: 65328 -9,12: @@ -11179,9 +11222,9 @@ entities: -6,14: 0: 35055 -6,15: - 2: 34952 + 3: 34952 -6,16: - 2: 7960 + 3: 7960 0: 32896 21,-4: 0: 4096 @@ -11228,14 +11271,14 @@ entities: 15,-13: 0: 65409 21,-8: - 2: 32903 + 3: 32903 0: 32624 21,-7: - 2: 7 + 3: 7 22,-8: - 2: 18241 + 3: 18241 22,-7: - 2: 1 + 3: 1 -16,5: 0: 14199 -17,5: @@ -11246,63 +11289,63 @@ entities: 0: 61198 -15,5: 0: 4402 - 2: 17984 + 3: 17984 -15,6: - 2: 16 + 3: 16 0: 236 -14,6: 0: 8208 - 2: 224 + 3: 224 -14,5: - 2: 8 + 3: 8 -8,16: - 2: 20288 + 3: 20288 -7,16: - 2: 24400 + 3: 24400 -6,17: - 2: 34952 + 3: 34952 -6,18: - 2: 136 + 3: 136 0: 2048 12,16: 0: 23955 9,17: - 0: 1535 + 0: 1279 9,18: 0: 48 - 2: 62528 + 3: 62528 10,17: - 0: 273 + 0: 17 10,18: - 2: 63616 + 3: 63616 11,18: - 2: 15904 + 3: 15904 0: 4 11,17: 0: 2048 12,17: 0: 48 12,18: - 2: 1809 + 3: 1809 -7,-6: 0: 36864 - 2: 26222 + 3: 26222 -7,-8: - 2: 26342 + 3: 26342 -7,-9: - 2: 28262 + 3: 28262 -7,-7: - 2: 26222 + 3: 26222 -6,-8: - 2: 8244 + 3: 8244 0: 52424 -6,-7: - 2: 17 + 3: 17 0: 63342 -6,-6: 0: 179 -6,-9: - 2: 20300 + 3: 20300 0: 32768 -5,-8: 0: 63863 @@ -11310,7 +11353,7 @@ entities: 0: 34968 -5,-9: 0: 16382 - 2: 1 + 3: 1 -4,-8: 0: 17417 -4,-6: @@ -11384,20 +11427,20 @@ entities: 17,-14: 0: 4096 -3,20: - 2: 4112 + 3: 4112 -4,21: - 2: 136 + 3: 136 0,20: - 2: 4112 + 3: 4112 -1,21: - 2: 136 + 3: 136 -7,-10: 0: 2050 - 2: 26348 + 3: 26348 -6,-10: - 2: 17663 + 3: 17663 -5,-10: - 2: 17 + 3: 17 0: 51456 -5,-11: 0: 4096 @@ -11423,7 +11466,7 @@ entities: 1: 3 0: 3712 16,0: - 2: 4 + 3: 4 0: 51208 16,1: 0: 2248 @@ -11431,31 +11474,31 @@ entities: 0: 1911 18,1: 0: 4081 - 2: 14 + 3: 14 19,1: - 2: 13 + 3: 13 0: 3826 20,0: 0: 62208 - 2: 3072 + 3: 3072 20,1: 0: 1023 - 2: 3072 + 3: 3072 21,0: - 2: 9472 + 3: 9472 0: 4096 21,1: 0: 31 - 2: 3360 + 3: 3360 22,1: 0: 1367 - 2: 520 + 3: 520 22,0: - 2: 4096 + 3: 4096 23,1: - 2: 17 + 3: 17 23,0: - 2: 4096 + 3: 4096 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -11488,11 +11531,10 @@ entities: - 0 - 0 - volume: 2500 - immutable: True - temperature: 213.15 + temperature: 293.15 moles: - - 21.824879 - - 82.10312 + - 0 + - 6666.982 - 0 - 0 - 0 @@ -11504,10 +11546,11 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True + temperature: 213.15 moles: - - 0 - - 6666.982 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -11785,6 +11828,20 @@ entities: devices: - 9373 - 9448 + - uid: 7129 + components: + - type: MetaData + name: armory air alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,13.5 + parent: 2 + - type: DeviceList + devices: + - 10921 + - 9290 + - 9379 + - 9292 - uid: 8610 components: - type: MetaData @@ -12037,6 +12094,7 @@ entities: - type: DeviceList devices: - 18128 + - 18089 - uid: 18133 components: - type: MetaData @@ -12047,6 +12105,7 @@ entities: - type: DeviceList devices: - 18127 + - 17918 - uid: 18134 components: - type: MetaData @@ -12057,6 +12116,7 @@ entities: - type: DeviceList devices: - 18129 + - 17889 - uid: 18135 components: - type: MetaData @@ -12073,6 +12133,8 @@ entities: - 18125 - 18126 - 18124 + - 18245 + - 18246 - uid: 18139 components: - type: MetaData @@ -12084,6 +12146,8 @@ entities: devices: - 18131 - 18130 + - 18243 + - 18244 - proto: AirAlarmAssembly entities: - uid: 12 @@ -13611,20 +13675,6 @@ entities: - type: Transform pos: -1.5,-5.5 parent: 2 - - uid: 202 - components: - - type: MetaData - name: Surgery Room - - type: Transform - pos: -4.5,-4.5 - parent: 2 - - uid: 203 - components: - - type: MetaData - name: Surgery Room - - type: Transform - pos: -4.5,-3.5 - parent: 2 - proto: AirlockMedicalLocked entities: - uid: 204 @@ -14000,6 +14050,22 @@ entities: rot: 3.141592653589793 rad pos: 88.5,6.5 parent: 2 +- proto: AirlockSurgeryGlassLocked + entities: + - uid: 202 + components: + - type: MetaData + name: Surgery Room + - type: Transform + pos: -4.5,-3.5 + parent: 2 + - uid: 203 + components: + - type: MetaData + name: Surgery Room + - type: Transform + pos: -4.5,-4.5 + parent: 2 - proto: AirlockVirologyGlassLocked entities: - uid: 237 @@ -14083,12 +14149,6 @@ entities: parent: 2 - proto: AlwaysPoweredlightCyan entities: - - uid: 12560 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 38.5,64.5 - parent: 2 - uid: 13172 components: - type: Transform @@ -16785,6 +16845,23 @@ entities: - type: Transform pos: 1.5,19.5 parent: 2 +- proto: BlastDoorUnlinkedArmory + entities: + - uid: 6403 + components: + - type: Transform + pos: 38.5,63.5 + parent: 2 + - uid: 16316 + components: + - type: Transform + pos: 40.5,70.5 + parent: 2 + - uid: 17692 + components: + - type: Transform + pos: 36.5,70.5 + parent: 2 - proto: BlastDoorUnlinkedRobotics entities: - uid: 12146 @@ -17497,6 +17574,12 @@ entities: - type: Transform pos: -6.5,23.5 parent: 2 + - uid: 18313 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,70.5 + parent: 2 - proto: ButtonFrameExit entities: - uid: 12087 @@ -28747,6 +28830,11 @@ entities: - type: Transform pos: 49.5,14.5 parent: 2 + - uid: 9380 + components: + - type: Transform + pos: 39.5,64.5 + parent: 2 - uid: 9424 components: - type: Transform @@ -28792,6 +28880,16 @@ entities: - type: Transform pos: -2.5,-8.5 parent: 2 + - uid: 10917 + components: + - type: Transform + pos: 38.5,64.5 + parent: 2 + - uid: 10920 + components: + - type: Transform + pos: 37.5,64.5 + parent: 2 - uid: 11747 components: - type: Transform @@ -29742,26 +29840,11 @@ entities: - type: Transform pos: 40.5,64.5 parent: 2 - - uid: 17689 - components: - - type: Transform - pos: 39.5,64.5 - parent: 2 - - uid: 17690 - components: - - type: Transform - pos: 37.5,64.5 - parent: 2 - uid: 17691 components: - type: Transform pos: 36.5,64.5 parent: 2 - - uid: 17692 - components: - - type: Transform - pos: 38.5,64.5 - parent: 2 - uid: 17693 components: - type: Transform @@ -38286,16 +38369,6 @@ entities: - type: Transform pos: 40.5,65.5 parent: 2 - - uid: 17760 - components: - - type: Transform - pos: 38.5,65.5 - parent: 2 - - uid: 17761 - components: - - type: Transform - pos: 39.5,65.5 - parent: 2 - uid: 17762 components: - type: Transform @@ -38311,6 +38384,16 @@ entities: - type: Transform pos: 38.5,67.5 parent: 2 + - uid: 18316 + components: + - type: Transform + pos: 39.5,65.5 + parent: 2 + - uid: 18317 + components: + - type: Transform + pos: 38.5,65.5 + parent: 2 - proto: CableMVStack entities: - uid: 4622 @@ -39006,13 +39089,6 @@ entities: parent: 2 - type: CartridgeAmmo spent: True -- proto: CartridgeRocket - entities: - - uid: 14704 - components: - - type: Transform - pos: -15.463979,9.377803 - parent: 2 - proto: Catwalk entities: - uid: 541 @@ -47426,6 +47502,13 @@ entities: - type: Transform pos: 35.946735,41.4636 parent: 2 +- proto: ClothingOuterWinterColorBrown + entities: + - uid: 18311 + components: + - type: Transform + pos: -57.05961,2.4419374 + parent: 2 - proto: ClothingOuterWinterEngi entities: - uid: 6230 @@ -48713,8 +48796,8 @@ entities: immutable: False temperature: 293.1496 moles: - - 1.7459903 - - 6.568249 + - 1.8856695 + - 7.0937095 - 0 - 0 - 0 @@ -48799,13 +48882,6 @@ entities: - type: Transform pos: 6.5,1.5 parent: 2 -- proto: CrateMedicalSurgery - entities: - - uid: 6403 - components: - - type: Transform - pos: -6.634198,-7.457364 - parent: 2 - proto: CrateNPCCow entities: - uid: 6404 @@ -49361,13 +49437,6 @@ entities: parent: 2 - type: NavMapBeacon text: Shipyard Dock -- proto: DefaultStationBeaconAICore - entities: - - uid: 17918 - components: - - type: Transform - pos: 38.5,65.5 - parent: 2 - proto: DefaultStationBeaconAISatellite entities: - uid: 13628 @@ -54526,15 +54595,6 @@ entities: - type: Transform pos: -68.61537,14.714509 parent: 2 -- proto: DrinkJar - entities: - - uid: 7127 - components: - - type: Transform - parent: 7126 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: DrinkJarWhat entities: - uid: 7135 @@ -55399,11 +55459,6 @@ entities: - type: Transform pos: -9.5,26.5 parent: 2 - - uid: 7253 - components: - - type: Transform - pos: 26.5,23.5 - parent: 2 - proto: filingCabinetDrawer entities: - uid: 7254 @@ -55416,11 +55471,6 @@ entities: - type: Transform pos: 18.5,-1.5 parent: 2 - - uid: 7257 - components: - - type: Transform - pos: 8.5,40.5 - parent: 2 - uid: 7259 components: - type: Transform @@ -59231,6 +59281,82 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 18229 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -68.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18241 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.5,13.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18270 + components: + - type: Transform + pos: -38.5,12.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18271 + components: + - type: Transform + pos: -36.5,9.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18272 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -38.5,9.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18273 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -36.5,5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18306 + components: + - type: Transform + pos: -39.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18307 + components: + - type: Transform + pos: -35.5,8.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18308 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18309 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -39.5,8.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeFourway entities: - uid: 4960 @@ -59369,6 +59495,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 18230 + components: + - type: Transform + pos: -64.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeSensor entities: - uid: 7691 @@ -59541,6 +59674,30 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 7126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,65.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 7127 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 39.5,64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 7128 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,65.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7152 components: - type: Transform @@ -68391,8 +68548,7 @@ entities: - uid: 8988 components: - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,4.5 + pos: 38.5,65.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' @@ -69201,6 +69357,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 9788 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,65.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 9963 components: - type: Transform @@ -69225,6 +69389,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#DD2222FF' + - uid: 10918 + components: + - type: Transform + pos: -68.5,12.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 12213 components: - type: Transform @@ -69483,21 +69654,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 17871 - components: - - type: Transform - pos: 38.5,65.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 17872 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 39.5,64.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 17874 components: - type: Transform @@ -69530,30 +69686,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 17887 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,65.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 17888 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,65.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 17889 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 39.5,65.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 17895 components: - type: Transform @@ -69790,34 +69922,46 @@ entities: rot: 3.141592653589793 rad pos: -36.5,6.5 parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 18058 components: - type: Transform rot: 3.141592653589793 rad pos: -36.5,7.5 parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 18059 components: - type: Transform rot: 3.141592653589793 rad pos: -36.5,8.5 parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 18060 components: - type: Transform rot: 1.5707963267948966 rad pos: -37.5,9.5 parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 18061 components: - type: Transform pos: -38.5,10.5 parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 18062 components: - type: Transform pos: -38.5,11.5 parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 18063 components: - type: Transform @@ -70026,14 +70170,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 18089 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -69.5,13.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 18091 components: - type: Transform @@ -70187,6 +70323,571 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 18145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -68.5,12.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18189 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -68.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18221 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -68.5,10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18222 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -64.5,10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18223 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -64.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18224 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -64.5,12.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18225 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -62.5,10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18226 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -62.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18227 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -62.5,12.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18231 + components: + - type: Transform + pos: -64.5,13.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18232 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18233 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -66.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18234 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -68.5,13.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18235 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -63.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18236 + components: + - type: Transform + pos: -62.5,13.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18237 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18239 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -58.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18240 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -60.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18247 + components: + - type: Transform + pos: -64.5,19.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18248 + components: + - type: Transform + pos: -64.5,18.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18249 + components: + - type: Transform + pos: -64.5,17.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18250 + components: + - type: Transform + pos: -64.5,15.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18252 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18253 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -56.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18254 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -55.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18255 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -54.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18256 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18257 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18258 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -51.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18259 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -50.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18260 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -49.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18261 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18262 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -46.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18263 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -45.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18264 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -44.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18265 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -43.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18266 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -48.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18267 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18268 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -40.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18269 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -41.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18274 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18275 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18276 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18277 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18278 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18279 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18280 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18281 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18282 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18283 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18284 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18285 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18286 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -26.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18287 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18288 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18289 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -29.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18290 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18291 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18292 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18293 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18294 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18295 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,5.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18296 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,6.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18297 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,7.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18298 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,8.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18299 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -37.5,8.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18300 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -38.5,8.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18301 + components: + - type: Transform + pos: -39.5,9.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18302 + components: + - type: Transform + pos: -39.5,10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18303 + components: + - type: Transform + pos: -39.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18304 + components: + - type: Transform + pos: -39.5,12.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18305 + components: + - type: Transform + pos: -39.5,13.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeTJunction entities: - uid: 506 @@ -70342,6 +71043,30 @@ entities: - type: Transform pos: -12.5,60.5 parent: 2 + - uid: 7131 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 7253 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 7257 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 7602 components: - type: Transform @@ -71651,22 +72376,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 17878 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 37.5,64.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 17879 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 38.5,64.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 17880 components: - type: Transform @@ -71724,8 +72433,8 @@ entities: - uid: 18100 components: - type: Transform - rot: 3.141592653589793 rad - pos: -68.5,12.5 + rot: 1.5707963267948966 rad + pos: -69.5,13.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -71761,6 +72470,35 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 18228 + components: + - type: Transform + pos: -67.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18238 + components: + - type: Transform + pos: -59.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18242 + components: + - type: Transform + pos: -62.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18251 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -64.5,16.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPort entities: - uid: 544 @@ -72257,6 +72995,9 @@ entities: rot: 3.141592653589793 rad pos: -18.5,10.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 7129 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9291 @@ -72271,6 +73012,9 @@ entities: - type: Transform pos: -18.5,15.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 7129 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9293 @@ -73034,6 +73778,28 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 17889 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -62.5,9.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 18134 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 17918 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -64.5,9.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 18133 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 17947 components: - type: Transform @@ -73044,6 +73810,60 @@ entities: - 17946 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 18089 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -68.5,9.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 18132 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18243 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -60.5,13.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 18139 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18244 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -67.5,13.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 18139 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18245 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,16.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 18135 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 18246 + components: + - type: Transform + pos: -64.5,20.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 18135 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 5443 @@ -73144,14 +73964,9 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,14.5 parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 9380 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,10.5 - parent: 2 + - type: DeviceNetwork + deviceLists: + - 7129 - type: AtmosPipeColor color: '#990000FF' - uid: 9381 @@ -73772,6 +74587,17 @@ entities: - 17606 - type: AtmosPipeColor color: '#990000FF' + - uid: 10921 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,10.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 7129 + - type: AtmosPipeColor + color: '#990000FF' - uid: 14340 components: - type: Transform @@ -73945,6 +74771,7 @@ entities: - uid: 18130 components: - type: Transform + rot: -1.5707963267948966 rad pos: -68.5,13.5 parent: 2 - type: DeviceNetwork @@ -77184,13 +78011,6 @@ entities: parent: 2 - proto: HeadHuman entities: - - uid: 7128 - components: - - type: Transform - parent: 7126 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 10054 components: - type: Transform @@ -77304,13 +78124,6 @@ entities: - type: Transform pos: 38.5,59.5 parent: 2 -- proto: HolopadAiMain - entities: - - uid: 18145 - components: - - type: Transform - pos: 38.5,64.5 - parent: 2 - proto: HolopadAiUpload entities: - uid: 18146 @@ -77745,13 +78558,6 @@ entities: - type: Transform pos: 41.5,-5.5 parent: 2 -- proto: HolopadServiceMime - entities: - - uid: 18189 - components: - - type: Transform - pos: -25.5,-2.5 - parent: 2 - proto: HolopadServiceNewsroom entities: - uid: 18191 @@ -77802,6 +78608,30 @@ entities: rot: 1.5707963267948966 rad pos: 27.5,-32.5 parent: 2 + - uid: 10971 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-4.5 + parent: 2 + - uid: 13180 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-3.5 + parent: 2 + - uid: 17878 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-4.5 + parent: 2 + - uid: 17879 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-5.5 + parent: 2 - uid: 18012 components: - type: Transform @@ -78310,6 +79140,14 @@ entities: - type: Transform pos: 37.295227,37.70594 parent: 2 +- proto: IntercomAll + entities: + - uid: 17690 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,70.5 + parent: 2 - proto: IntercomEngineering entities: - uid: 17999 @@ -78801,6 +79639,24 @@ entities: linkedPorts: 712: - Pressed: Toggle +- proto: LockableButtonCaptain + entities: + - uid: 18312 + components: + - type: MetaData + name: turrets button + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,70.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 6403: + - Pressed: Toggle + 17692: + - Pressed: Toggle + 16316: + - Pressed: Toggle - proto: LockableButtonHeadOfSecurity entities: - uid: 9992 @@ -79223,49 +80079,6 @@ entities: - type: Transform pos: 14.5,18.5 parent: 2 -- proto: LockerFreezerBase - entities: - - uid: 7126 - components: - - type: Transform - pos: -8.5,-3.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 7127 - - 7128 - - 7131 - - 7129 - - 7133 - - 7134 - - 7132 - - 7130 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerFreezerVaultFilled entities: - uid: 12748 @@ -79448,6 +80261,18 @@ entities: - type: Transform pos: -24.5,40.5 parent: 2 +- proto: LockerSurgeonFilled + entities: + - uid: 7130 + components: + - type: Transform + pos: -6.5,-7.5 + parent: 2 + - uid: 7132 + components: + - type: Transform + pos: -8.5,-3.5 + parent: 2 - proto: LockerSyndicatePersonal entities: - uid: 6265 @@ -82805,31 +83630,11 @@ entities: - type: Transform pos: 45.5,72.5 parent: 2 - - uid: 10917 - components: - - type: Transform - pos: 42.5,67.5 - parent: 2 - - uid: 10918 - components: - - type: Transform - pos: 42.5,66.5 - parent: 2 - uid: 10919 components: - type: Transform pos: 43.5,70.5 parent: 2 - - uid: 10920 - components: - - type: Transform - pos: 43.5,67.5 - parent: 2 - - uid: 10921 - components: - - type: Transform - pos: 43.5,66.5 - parent: 2 - uid: 10922 components: - type: Transform @@ -83060,11 +83865,6 @@ entities: - type: Transform pos: 43.5,61.5 parent: 2 - - uid: 10971 - components: - - type: Transform - pos: 41.5,66.5 - parent: 2 - uid: 10972 components: - type: Transform @@ -83275,11 +84075,6 @@ entities: - type: Transform pos: 44.5,62.5 parent: 2 - - uid: 11014 - components: - - type: Transform - pos: 35.5,66.5 - parent: 2 - uid: 11015 components: - type: Transform @@ -83288,7 +84083,7 @@ entities: - uid: 11016 components: - type: Transform - pos: 43.5,62.5 + pos: 42.5,66.5 parent: 2 - uid: 11017 components: @@ -83385,40 +84180,10 @@ entities: - type: Transform pos: 42.5,71.5 parent: 2 - - uid: 11045 - components: - - type: Transform - pos: 41.5,67.5 - parent: 2 - - uid: 11046 - components: - - type: Transform - pos: 34.5,62.5 - parent: 2 - - uid: 11047 - components: - - type: Transform - pos: 35.5,62.5 - parent: 2 - - uid: 11048 - components: - - type: Transform - pos: 42.5,62.5 - parent: 2 - - uid: 11049 - components: - - type: Transform - pos: 37.5,62.5 - parent: 2 - - uid: 11051 - components: - - type: Transform - pos: 39.5,62.5 - parent: 2 - uid: 11052 components: - type: Transform - pos: 41.5,62.5 + pos: 35.5,62.5 parent: 2 - uid: 11053 components: @@ -83430,16 +84195,6 @@ entities: - type: Transform pos: 45.5,61.5 parent: 2 - - uid: 11055 - components: - - type: Transform - pos: 37.5,63.5 - parent: 2 - - uid: 11056 - components: - - type: Transform - pos: 39.5,63.5 - parent: 2 - uid: 11057 components: - type: Transform @@ -87870,11 +88625,26 @@ entities: - type: Transform pos: -73.5,12.5 parent: 2 + - uid: 12477 + components: + - type: Transform + pos: 41.5,62.5 + parent: 2 - uid: 12511 components: - type: Transform pos: 40.5,-15.5 parent: 2 + - uid: 12560 + components: + - type: Transform + pos: 39.5,62.5 + parent: 2 + - uid: 12723 + components: + - type: Transform + pos: 37.5,62.5 + parent: 2 - uid: 13982 components: - type: Transform @@ -88017,6 +88787,46 @@ entities: - type: Transform pos: -17.5,48.5 parent: 2 + - uid: 11014 + components: + - type: Transform + pos: 43.5,67.5 + parent: 2 + - uid: 11045 + components: + - type: Transform + pos: 42.5,67.5 + parent: 2 + - uid: 11046 + components: + - type: Transform + pos: 43.5,66.5 + parent: 2 + - uid: 11047 + components: + - type: Transform + pos: 41.5,66.5 + parent: 2 + - uid: 11049 + components: + - type: Transform + pos: 43.5,62.5 + parent: 2 + - uid: 11051 + components: + - type: Transform + pos: 41.5,67.5 + parent: 2 + - uid: 11055 + components: + - type: Transform + pos: 34.5,62.5 + parent: 2 + - uid: 11056 + components: + - type: Transform + pos: 42.5,62.5 + parent: 2 - uid: 12040 components: - type: Transform @@ -88242,6 +89052,21 @@ entities: - type: Transform pos: -6.5,-31.5 parent: 2 + - uid: 13173 + components: + - type: Transform + pos: 37.5,63.5 + parent: 2 + - uid: 13174 + components: + - type: Transform + pos: 39.5,63.5 + parent: 2 + - uid: 18315 + components: + - type: Transform + pos: 35.5,66.5 + parent: 2 - proto: MouseTimedSpawner entities: - uid: 12085 @@ -88433,51 +89258,6 @@ entities: - type: Transform pos: 17.419321,-49.841354 parent: 2 -- proto: OrganHumanEars - entities: - - uid: 7129 - components: - - type: Transform - parent: 7126 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: OrganHumanEyes - entities: - - uid: 7130 - components: - - type: Transform - parent: 7126 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: OrganHumanHeart - entities: - - uid: 7131 - components: - - type: Transform - parent: 7126 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: OrganHumanKidneys - entities: - - uid: 7132 - components: - - type: Transform - parent: 7126 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: OrganHumanLiver - entities: - - uid: 7133 - components: - - type: Transform - parent: 7126 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: OrganHumanTongue entities: - uid: 12112 @@ -88487,15 +89267,6 @@ entities: - type: Transform pos: 26.754776,-34.847332 parent: 2 -- proto: OrganSlimeLungs - entities: - - uid: 7134 - components: - - type: Transform - parent: 7126 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: OxygenCanister entities: - uid: 5350 @@ -90916,11 +91687,6 @@ entities: parent: 2 - type: ApcPowerReceiver powerLoad: 0 - - uid: 12477 - components: - - type: Transform - pos: -7.5,-3.5 - parent: 2 - uid: 12478 components: - type: Transform @@ -91184,6 +91950,12 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,17.5 parent: 2 + - uid: 17872 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-5.5 + parent: 2 - uid: 17916 components: - type: Transform @@ -92272,6 +93044,12 @@ entities: rot: -1.5707963267948966 rad pos: -23.5,42.5 parent: 2 + - uid: 18314 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,64.5 + parent: 2 - proto: PoweredSmallLightEmpty entities: - uid: 12684 @@ -92525,11 +93303,6 @@ entities: - type: Transform pos: 78.5,-24.5 parent: 2 - - uid: 12723 - components: - - type: Transform - pos: -15.5,9.5 - parent: 2 - uid: 12724 components: - type: Transform @@ -98679,6 +99452,41 @@ entities: - type: Transform pos: 88.33875,5.849103 parent: 2 +- proto: SecureCabinetCE + entities: + - uid: 7134 + components: + - type: Transform + pos: 8.5,40.5 + parent: 2 +- proto: SecureCabinetHoP + entities: + - uid: 7133 + components: + - type: Transform + pos: 26.5,23.5 + parent: 2 +- proto: SecureCabinetHoS + entities: + - uid: 16288 + components: + - type: Transform + pos: -14.5,33.5 + parent: 2 +- proto: SecureCabinetLogistics + entities: + - uid: 18310 + components: + - type: Transform + pos: 42.5,12.5 + parent: 2 +- proto: SecureCabinetPsychologist + entities: + - uid: 16054 + components: + - type: Transform + pos: -2.5,15.5 + parent: 2 - proto: SecurityTechFab entities: - uid: 13521 @@ -100395,6 +101203,15 @@ entities: rot: 1.5707963267948966 rad pos: 77.5,6.5 parent: 2 +- proto: SMESAdvanced + entities: + - uid: 13950 + components: + - type: MetaData + name: Main SMES 2 + - type: Transform + pos: 17.5,44.5 + parent: 2 - proto: SMESBasic entities: - uid: 13750 @@ -100411,13 +101228,6 @@ entities: - type: Transform pos: 16.5,44.5 parent: 2 - - uid: 13752 - components: - - type: MetaData - name: Main SMES 2 - - type: Transform - pos: 17.5,44.5 - parent: 2 - uid: 13753 components: - type: MetaData @@ -101429,11 +102239,6 @@ entities: - type: Transform pos: 6.5,-9.5 parent: 2 - - uid: 13950 - components: - - type: Transform - pos: -6.5,-4.5 - parent: 2 - proto: SpawnPointMedicalIntern entities: - uid: 15325 @@ -102091,6 +102896,29 @@ entities: - type: Transform pos: 15.5,46.5 parent: 2 +- proto: SpawnPointSurgeon + entities: + - uid: 14704 + components: + - type: Transform + pos: -6.5,-4.5 + parent: 2 + - uid: 17761 + components: + - type: Transform + pos: -6.5,-5.5 + parent: 2 + - uid: 17871 + components: + - type: Transform + pos: -6.5,-6.5 + parent: 2 + - uid: 17888 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-5.5 + parent: 2 - proto: SpawnPointTechnicalAssistant entities: - uid: 15043 @@ -102711,6 +103539,13 @@ entities: - type: Transform pos: -19.5,22.5 parent: 2 +- proto: SuperweaponSafeSpawner + entities: + - uid: 13752 + components: + - type: Transform + pos: -15.5,9.5 + parent: 2 - proto: SurveillanceCameraCommand entities: - uid: 6521 @@ -105740,6 +106575,13 @@ entities: - type: Transform pos: -66.5,24.5 parent: 2 +- proto: TapeRecorderFilled + entities: + - uid: 17887 + components: + - type: Transform + pos: -7.8004174,-7.498879 + parent: 2 - proto: TargetClown entities: - uid: 14533 @@ -109762,11 +110604,6 @@ entities: - type: Transform pos: 35.5,67.5 parent: 2 - - uid: 15209 - components: - - type: Transform - pos: 38.5,63.5 - parent: 2 - uid: 15210 components: - type: Transform @@ -114298,11 +115135,6 @@ entities: - type: Transform pos: -16.5,19.5 parent: 2 - - uid: 16054 - components: - - type: Transform - pos: -15.5,19.5 - parent: 2 - proto: WallWood entities: - uid: 300 @@ -115635,13 +116467,6 @@ entities: - type: Transform pos: -5.452237,-29.285027 parent: 2 -- proto: WeaponLauncherRocket - entities: - - uid: 16288 - components: - - type: Transform - pos: -15.497394,9.727219 - parent: 2 - proto: WeaponPulsePistol entities: - uid: 16290 @@ -115654,27 +116479,22 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: WeaponTurretSyndicateBroken +- proto: WeaponTurretAI entities: - - uid: 9788 + - uid: 11048 components: - type: Transform pos: 36.5,70.5 parent: 2 - - uid: 13173 - components: - - type: Transform - pos: 40.5,68.5 - parent: 2 - - uid: 13174 + - uid: 17689 components: - type: Transform pos: 40.5,70.5 parent: 2 - - uid: 13180 + - uid: 15209 components: - type: Transform - pos: 36.5,68.5 + pos: 38.5,63.5 parent: 2 - proto: WelderIndustrial entities: @@ -115837,11 +116657,6 @@ entities: rot: 3.141592653589793 rad pos: -16.5,11.5 parent: 2 - - uid: 16316 - components: - - type: Transform - pos: -15.5,10.5 - parent: 2 - uid: 16317 components: - type: Transform @@ -116080,6 +116895,13 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,0.5 parent: 2 +- proto: WindoorSecurePlasma + entities: + - uid: 17760 + components: + - type: Transform + pos: -15.5,10.5 + parent: 2 - proto: WindoorSecureSalvageLocked entities: - uid: 14295 @@ -116150,7 +116972,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -8493.267 + secondsUntilStateChange: -10354.103 state: Opening - type: Airlock autoClose: False @@ -116166,7 +116988,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -8492.7 + secondsUntilStateChange: -10353.536 state: Opening - type: Airlock autoClose: False @@ -116188,7 +117010,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -8492.233 + secondsUntilStateChange: -10353.069 state: Opening - type: Airlock autoClose: False @@ -116204,7 +117026,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -8493.767 + secondsUntilStateChange: -10354.603 state: Opening - type: Airlock autoClose: False diff --git a/Resources/Prototypes/Maps/glacier.yml b/Resources/Prototypes/Maps/glacier.yml index 402932dd41f..a26e4de5db8 100644 --- a/Resources/Prototypes/Maps/glacier.yml +++ b/Resources/Prototypes/Maps/glacier.yml @@ -56,6 +56,7 @@ MedicalDoctor: [ 2, 3 ] MedicalIntern: [ 2, 2 ] MedicalBorg: [ 1, 2 ] + Surgeon: [ 1, 2 ] #science ResearchDirector: [ 1, 1 ] Chaplain: [ 1, 1 ] From d4519a6c4223eef5ca77850a927dcc4552bc021f Mon Sep 17 00:00:00 2001 From: Field Command <159087063+FieldCommand@users.noreply.github.com> Date: Fri, 10 Jan 2025 07:34:47 +0100 Subject: [PATCH 24/45] Byoin surgery accommodation (#2648) * Byoin surgery accommodation * Add surgeon slot * Removed Lines --- Resources/Maps/byoin.yml | 982 ++++++++++++++++++---------- Resources/Prototypes/Maps/byoin.yml | 1 + 2 files changed, 640 insertions(+), 343 deletions(-) diff --git a/Resources/Maps/byoin.yml b/Resources/Maps/byoin.yml index c16b506f127..6dcb417ca43 100644 --- a/Resources/Maps/byoin.yml +++ b/Resources/Maps/byoin.yml @@ -114,7 +114,7 @@ entities: version: 6 -1,-2: ind: -1,-2 - tiles: AgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFAAAAAACFAAAAAABFAAAAAADFAAAAAABFAAAAAADFAAAAAACgQAAAAAAAgAAAAAAgQAAAAAAGAAAAAACGAAAAAACGAAAAAACGAAAAAABgQAAAAAAFAAAAAACFAAAAAABFAAAAAABFAAAAAABFAAAAAADFAAAAAAAFAAAAAABFAAAAAAAgQAAAAAAAgAAAAAAgQAAAAAAGAAAAAACGAAAAAAAGAAAAAABGAAAAAABgQAAAAAAFAAAAAACFAAAAAABFAAAAAACDQAAAAADDQAAAAADDQAAAAACDQAAAAACFAAAAAABAQAAAAAAAgAAAAAAgQAAAAAAGAAAAAADGAAAAAAAGAAAAAAAGAAAAAADgQAAAAAAFAAAAAAAFAAAAAAAFAAAAAABDQAAAAADDQAAAAADDQAAAAABDQAAAAAAFAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAABAAAAAAAgQAAAAAAgQAAAAAAFAAAAAABFAAAAAAAFAAAAAABDQAAAAAADQAAAAACDQAAAAACDQAAAAAAFAAAAAABgQAAAAAAFAAAAAABFAAAAAADFAAAAAAAFAAAAAACFAAAAAABFAAAAAABFAAAAAADFAAAAAACFAAAAAAAFAAAAAABDQAAAAADDQAAAAADDQAAAAAADQAAAAADFAAAAAADBAAAAAAADQAAAAABFAAAAAAADQAAAAAAFAAAAAACDQAAAAADFAAAAAABDQAAAAACFAAAAAADFAAAAAACFAAAAAAAFAAAAAABFAAAAAABFAAAAAABFAAAAAACFAAAAAABAQAAAAAAFAAAAAABFAAAAAADFAAAAAADFAAAAAACFAAAAAACFAAAAAAAFAAAAAADFAAAAAADFAAAAAAAFAAAAAACFAAAAAABFAAAAAAAFAAAAAABFAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAABAAAAAAABAAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAAAQAAAAAAgQAAAAAAFAAAAAADDgAAAAADHAAAAAAGDgAAAAADBAAAAAAAgQAAAAAAEQAAAAABAQAAAAAADgAAAAACDgAAAAADDgAAAAADDgAAAAACgQAAAAAAFAAAAAADFAAAAAACAQAAAAAAFAAAAAADHAAAAAABDgAAAAACDgAAAAACAQAAAAAAgQAAAAAAEQAAAAADgQAAAAAADgAAAAADDgAAAAADDgAAAAABDgAAAAACgQAAAAAAFAAAAAADFAAAAAACAQAAAAAAFAAAAAACDgAAAAACHAAAAAAGDgAAAAACgQAAAAAAgQAAAAAAEQAAAAACgQAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABgQAAAAAAFAAAAAAAFAAAAAADgQAAAAAAFAAAAAABDgAAAAAAHAAAAAAEHAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAADgAAAAACDgAAAAAADgAAAAACgQAAAAAAgQAAAAAAgQAAAAAADgAAAAACDgAAAAADDgAAAAABgQAAAAAACwAAAAAACwAAAAABCwAAAAADCwAAAAADCwAAAAABDQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADgAAAAACDgAAAAAADgAAAAAAgQAAAAAACwAAAAACCwAAAAAACwAAAAAACwAAAAACCwAAAAABDQAAAAADDgAAAAABHAAAAAAAHAAAAAAEgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAABAAAAAAAgQAAAAAAAQAAAAAAAQAAAAAAgQAAAAAABAAAAAAAAQAAAAAAgQAAAAAA + tiles: BAAAAAAABAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFAAAAAACFAAAAAABFAAAAAADFAAAAAABFAAAAAADFAAAAAACgQAAAAAAFAAAAAAAFAAAAAAAGAAAAAACGAAAAAACGAAAAAACGAAAAAABgQAAAAAAFAAAAAACFAAAAAABFAAAAAABFAAAAAABFAAAAAADFAAAAAAAFAAAAAABFAAAAAAAgQAAAAAAFAAAAAAAFAAAAAAAGAAAAAACGAAAAAAAGAAAAAABGAAAAAABgQAAAAAAFAAAAAACFAAAAAABFAAAAAACDQAAAAADDQAAAAADDQAAAAACDQAAAAACFAAAAAABAQAAAAAAFAAAAAAAFAAAAAAAGAAAAAADGAAAAAAAGAAAAAAAGAAAAAADgQAAAAAAFAAAAAAAFAAAAAAAFAAAAAABDQAAAAADDQAAAAADDQAAAAABDQAAAAAAFAAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAFAAAAAABFAAAAAAAFAAAAAABDQAAAAAADQAAAAACDQAAAAACDQAAAAAAFAAAAAABgQAAAAAAFAAAAAABFAAAAAADFAAAAAAAFAAAAAACFAAAAAABFAAAAAABFAAAAAADFAAAAAACFAAAAAAAFAAAAAABDQAAAAADDQAAAAADDQAAAAAADQAAAAADFAAAAAADBAAAAAAADQAAAAABFAAAAAAADQAAAAAAFAAAAAACDQAAAAADFAAAAAABDQAAAAACFAAAAAADFAAAAAACFAAAAAAAFAAAAAABFAAAAAABFAAAAAABFAAAAAACFAAAAAABAQAAAAAAFAAAAAABFAAAAAADFAAAAAADFAAAAAACFAAAAAACFAAAAAAAFAAAAAADFAAAAAADFAAAAAAAFAAAAAACFAAAAAABFAAAAAAAFAAAAAABFAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAABAAAAAAABAAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAAAQAAAAAAgQAAAAAAFAAAAAADDgAAAAADHAAAAAAGDgAAAAADBAAAAAAAgQAAAAAAEQAAAAABAQAAAAAADgAAAAACDgAAAAADDgAAAAADDgAAAAACgQAAAAAAFAAAAAADFAAAAAACAQAAAAAAFAAAAAADHAAAAAABDgAAAAACDgAAAAACAQAAAAAAgQAAAAAAEQAAAAADgQAAAAAADgAAAAADDgAAAAADDgAAAAABDgAAAAACgQAAAAAAFAAAAAADFAAAAAACAQAAAAAAFAAAAAACDgAAAAACHAAAAAAGDgAAAAACgQAAAAAAgQAAAAAAEQAAAAACgQAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABgQAAAAAAFAAAAAAAFAAAAAADgQAAAAAAFAAAAAABDgAAAAAAHAAAAAAEHAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAADgAAAAACDgAAAAAADgAAAAACgQAAAAAAgQAAAAAAgQAAAAAADgAAAAACDgAAAAADDgAAAAABgQAAAAAACwAAAAAACwAAAAABCwAAAAADCwAAAAADCwAAAAABDQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADgAAAAACDgAAAAAADgAAAAAAgQAAAAAACwAAAAACCwAAAAAACwAAAAAACwAAAAACCwAAAAABDQAAAAADDgAAAAABHAAAAAAAHAAAAAAEgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAABAAAAAAAgQAAAAAAAQAAAAAAAQAAAAAAgQAAAAAABAAAAAAAAQAAAAAAgQAAAAAA version: 6 -2,0: ind: -2,0 @@ -154,7 +154,7 @@ entities: version: 6 -2,-2: ind: -2,-2 - tiles: AAAAAAAAAAAAAAAABAAAAAAAFAAAAAACDQAAAAACFAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAABAAAAAAAFAAAAAAADQAAAAADFAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAABFAAAAAAAFAAAAAAAgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAFAAAAAABFAAAAAADFAAAAAAAgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAABAAAAAAABAAAAAAABAAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAADFAAAAAACFAAAAAACFAAAAAAAFAAAAAABFAAAAAABFAAAAAAAFAAAAAACFAAAAAABFAAAAAADFAAAAAACgQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAAADQAAAAADFAAAAAABDQAAAAAAFAAAAAADDQAAAAABFAAAAAABDQAAAAADFAAAAAABDQAAAAABFAAAAAACgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAACFAAAAAAAFAAAAAABFAAAAAABFAAAAAABFAAAAAADFAAAAAACFAAAAAAAFAAAAAABFAAAAAACFAAAAAABAQAAAAAAFAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAFAAAAAAADQAAAAABFAAAAAABDQAAAAADFAAAAAAADQAAAAAAFAAAAAACDQAAAAABFAAAAAAADQAAAAACFAAAAAACgQAAAAAAFAAAAAABAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAABFAAAAAABFAAAAAAAFAAAAAADFAAAAAAAFAAAAAABFAAAAAACFAAAAAAAFAAAAAADFAAAAAACFAAAAAAAAQAAAAAAFAAAAAACAgAAAAAAAgAAAAAAgQAAAAAAgQAAAAAABAAAAAAAgQAAAAAABAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAACHAAAAAAEDgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAACDgAAAAABDgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAADHAAAAAACDgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAAADgAAAAADDgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAADAAAAAACDAAAAAACDAAAAAABDAAAAAADDAAAAAACDAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAACwAAAAACCwAAAAACCwAAAAAACwAAAAADCwAAAAACDAAAAAABgQAAAAAA + tiles: AAAAAAAAAAAAAAAABAAAAAAAFAAAAAACDQAAAAACFAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAABAAAAAAAFAAAAAAADQAAAAADFAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAABFAAAAAAAFAAAAAAAgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAFAAAAAABFAAAAAADFAAAAAAAgQAAAAAAFAAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAABAAAAAAABAAAAAAABAAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAAQAAAAAAgQAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAADFAAAAAACFAAAAAACFAAAAAAAFAAAAAABFAAAAAABFAAAAAAAFAAAAAACFAAAAAABFAAAAAADFAAAAAACgQAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAAADQAAAAADFAAAAAABDQAAAAAAFAAAAAADDQAAAAABFAAAAAABDQAAAAADFAAAAAABDQAAAAABFAAAAAACgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAACFAAAAAAAFAAAAAABFAAAAAABFAAAAAABFAAAAAADFAAAAAACFAAAAAAAFAAAAAABFAAAAAACFAAAAAABAQAAAAAAFAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAFAAAAAAADQAAAAABFAAAAAABDQAAAAADFAAAAAAADQAAAAAAFAAAAAACDQAAAAABFAAAAAAADQAAAAACFAAAAAACgQAAAAAAFAAAAAABAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAABFAAAAAABFAAAAAAAFAAAAAADFAAAAAAAFAAAAAABFAAAAAACFAAAAAAAFAAAAAADFAAAAAACFAAAAAAAAQAAAAAAFAAAAAACAgAAAAAAAgAAAAAAgQAAAAAAgQAAAAAABAAAAAAAgQAAAAAABAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAACHAAAAAAEDgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAACDgAAAAABDgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAADHAAAAAACDgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAAADgAAAAADDgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAADAAAAAACDAAAAAACDAAAAAABDAAAAAADDAAAAAACDAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAACwAAAAACCwAAAAACCwAAAAAACwAAAAADCwAAAAACDAAAAAABgQAAAAAA version: 6 0,-3: ind: 0,-3 @@ -162,7 +162,7 @@ entities: version: 6 -1,-3: ind: -1,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAABAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAAAFAAAAAABFAAAAAACFAAAAAADFAAAAAACFAAAAAAAgQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAABAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAFAAAAAAAFAAAAAABFAAAAAACFAAAAAADFAAAAAACFAAAAAAAgQAAAAAA version: 6 3,0: ind: 3,0 @@ -312,6 +312,7 @@ entities: 1793: 14,-22 1836: 14,-29 1975: -2,-26 + 3011: -15,-29 - node: color: '#8C347F96' id: BrickTileWhiteCornerNe @@ -429,6 +430,7 @@ entities: 1739: -29,-31 1794: 12,-22 1974: 0,-26 + 3012: -17,-29 - node: color: '#8C347F96' id: BrickTileWhiteCornerNw @@ -551,6 +553,7 @@ entities: 1790: 10,-27 1795: 14,-27 1837: 14,-31 + 3013: -15,-31 - node: color: '#8C347F96' id: BrickTileWhiteCornerSe @@ -672,6 +675,7 @@ entities: 1796: 12,-27 1976: 0,-27 2372: -6,-19 + 3014: -17,-31 - node: color: '#8C347F96' id: BrickTileWhiteCornerSw @@ -1061,6 +1065,7 @@ entities: 1805: 14,-26 1833: 14,-30 1977: -2,-27 + 3015: -15,-30 - node: color: '#8C347F96' id: BrickTileWhiteLineE @@ -1306,6 +1311,7 @@ entities: 1792: 9,-26 1801: 13,-22 1835: 13,-29 + 3016: -16,-29 - node: color: '#8C347F96' id: BrickTileWhiteLineN @@ -1565,6 +1571,7 @@ entities: 1806: 13,-27 1834: 13,-31 2211: -5,-19 + 3017: -16,-31 - node: color: '#8C347F96' id: BrickTileWhiteLineS @@ -1768,6 +1775,7 @@ entities: 1800: 12,-23 1978: -2,-27 2373: -6,-18 + 3018: -17,-30 - node: color: '#8C347F96' id: BrickTileWhiteLineW @@ -2114,6 +2122,8 @@ entities: 2933: -20,-13 2934: -19,-13 2935: -16,-12 + 3009: -16,-28 + 3010: -12,-28 - node: color: '#334E6DC8' id: DiagonalCheckerAOverlay @@ -3222,13 +3232,11 @@ entities: 4: 48 0: 47104 -4,-8: - 4: 4369 - 0: 52416 + 0: 65520 -5,-8: - 4: 34952 - 0: 12851 + 0: 47795 -4,-7: - 0: 65528 + 0: 65529 -5,-7: 0: 64499 -4,-6: @@ -3238,11 +3246,11 @@ entities: -5,-5: 0: 30478 -4,-9: - 4: 12032 + 4: 36608 -3,-8: 0: 48048 -3,-7: - 0: 65528 + 0: 65529 -3,-6: 0: 48113 -2,-8: @@ -3468,7 +3476,8 @@ entities: 4: 34816 -6,-8: 4: 50 - 0: 63624 + 0: 47240 + 8: 16384 -6,-7: 0: 65535 -6,-9: @@ -3655,6 +3664,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: GasTileOverlay - type: RadiationGridResistance @@ -4612,20 +4636,6 @@ entities: - 8832 - 7697 - 8059 - - uid: 8493 - components: - - type: MetaData - name: 'Air Alarm: Surgery' - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,-30.5 - parent: 2 - - type: DeviceList - devices: - - 8056 - - 7611 - - 8492 - - 5923 - uid: 8726 components: - type: MetaData @@ -4665,6 +4675,26 @@ entities: - 8052 - 8053 - 7609 + - 6582 + - 1301 + - uid: 9612 + components: + - type: MetaData + name: 'Air Alarm: Surgery' + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-29.5 + parent: 2 + - type: DeviceList + devices: + - 5923 + - 6582 + - 1301 + - 1776 + - 9622 + - 9624 + - 9623 + - 9620 - proto: AirAlarmAssembly entities: - uid: 8027 @@ -5808,13 +5838,6 @@ entities: parent: 2 - proto: AirlockMedicalGlassLocked entities: - - uid: 95 - components: - - type: MetaData - name: Surgery - - type: Transform - pos: -12.5,-27.5 - parent: 2 - uid: 475 components: - type: MetaData @@ -5836,13 +5859,6 @@ entities: - type: Transform pos: -0.5,-25.5 parent: 2 - - uid: 5931 - components: - - type: MetaData - name: Cryonics - - type: Transform - pos: -0.5,-29.5 - parent: 2 - uid: 5935 components: - type: MetaData @@ -5869,6 +5885,15 @@ entities: - type: Transform pos: 9.5,-27.5 parent: 2 +- proto: AirlockMedicalLocked + entities: + - uid: 1669 + components: + - type: MetaData + name: Cryonics + - type: Transform + pos: -0.5,-29.5 + parent: 2 - proto: AirlockMedicalMorgueLocked entities: - uid: 506 @@ -6095,6 +6120,29 @@ entities: - type: Transform pos: 2.5,-3.5 parent: 2 +- proto: AirlockSurgeryLocked + entities: + - uid: 3794 + components: + - type: MetaData + name: Surgery Prep + - type: Transform + pos: -15.5,-27.5 + parent: 2 + - uid: 3806 + components: + - type: MetaData + name: Surgery + - type: Transform + pos: -11.5,-27.5 + parent: 2 + - uid: 5214 + components: + - type: MetaData + name: Surgery + - type: Transform + pos: -12.5,-27.5 + parent: 2 - proto: AirSensor entities: - uid: 398 @@ -6105,6 +6153,15 @@ entities: - type: DeviceNetwork deviceLists: - 2097 + - uid: 1776 + components: + - type: Transform + pos: -13.5,-29.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9613 + - 9612 - uid: 3168 components: - type: Transform @@ -6186,15 +6243,6 @@ entities: deviceLists: - 9580 - 8487 - - uid: 8492 - components: - - type: Transform - pos: -11.5,-29.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 8493 - - 8494 - uid: 8495 components: - type: Transform @@ -6779,14 +6827,6 @@ entities: rot: 1.5707963267948966 rad pos: 35.5,4.5 parent: 2 - - uid: 3306 - components: - - type: MetaData - name: 'APC: Service Areas' - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,-3.5 - parent: 2 - uid: 3307 components: - type: MetaData @@ -6902,6 +6942,13 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-3.5 parent: 2 + - uid: 9609 + components: + - type: MetaData + name: 'APC: Service Areas' + - type: Transform + pos: 12.5,-3.5 + parent: 2 - proto: APCConstructed entities: - uid: 7962 @@ -21864,6 +21911,12 @@ entities: rot: -1.5707963267948966 rad pos: -15.443747,-20.496946 parent: 2 + - uid: 9619 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.385771,-28.419926 + parent: 2 - proto: ChairFoldingSpawnFolded entities: - uid: 8030 @@ -22115,6 +22168,12 @@ entities: rot: -1.5707963267948966 rad pos: 11.451425,-32.32646 parent: 2 + - uid: 6362 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.698528,-28.609877 + parent: 2 - uid: 6661 components: - type: Transform @@ -22568,7 +22627,7 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-8.5 parent: 2 - - uid: 6502 + - uid: 5635 components: - type: Transform rot: 3.141592653589793 rad @@ -22733,6 +22792,11 @@ entities: - type: Transform pos: 14.494306,-25.26918 parent: 2 + - uid: 9633 + components: + - type: Transform + pos: -16.557411,-28.178982 + parent: 2 - proto: ClothingBeltKatanaSheathFilled entities: - uid: 296 @@ -22766,6 +22830,13 @@ entities: - type: Transform pos: 23.631704,-20.430853 parent: 2 +- proto: ClothingHandsGlovesNitrile + entities: + - uid: 9634 + components: + - type: Transform + pos: -16.622343,-29.45256 + parent: 2 - proto: ClothingHeadBandBotany entities: - uid: 9366 @@ -22892,16 +22963,6 @@ entities: - type: Transform pos: 14.400556,-24.941055 parent: 2 - - uid: 6575 - components: - - type: Transform - pos: -10.702629,-29.216972 - parent: 2 - - uid: 6576 - components: - - type: Transform - pos: -10.327629,-29.560722 - parent: 2 - proto: ClothingHeadHatWeldingMaskFlame entities: - uid: 8184 @@ -22959,6 +23020,11 @@ entities: - type: Transform pos: 13.678018,16.383213 parent: 2 + - uid: 9308 + components: + - type: Transform + pos: -16.368511,-28.928982 + parent: 2 - proto: ClothingMaskClown entities: - uid: 5917 @@ -22973,6 +23039,13 @@ entities: - type: Transform pos: 16.531595,-31.594517 parent: 2 +- proto: ClothingMaskSterile + entities: + - uid: 9643 + components: + - type: Transform + pos: -16.372343,-29.561935 + parent: 2 - proto: ClothingNeckCloakCJ entities: - uid: 3594 @@ -23059,6 +23132,18 @@ entities: - type: Transform pos: 34.533142,-4.4085665 parent: 2 +- proto: ClothingOuterHospitalGown + entities: + - uid: 6573 + components: + - type: Transform + pos: -10.296076,-29.475857 + parent: 2 + - uid: 9630 + components: + - type: Transform + pos: -10.609485,-29.349298 + parent: 2 - proto: ClothingOuterRobesJudge entities: - uid: 2025 @@ -23077,6 +23162,13 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: ClothingOuterVestTank + entities: + - uid: 9617 + components: + - type: Transform + pos: -16.401228,-29.113914 + parent: 2 - proto: ClothingOuterWinterColorWhite entities: - uid: 2278 @@ -23408,11 +23500,11 @@ entities: parent: 2 - proto: computerBodyScanner entities: - - uid: 6579 + - uid: 2543 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-30.5 + rot: -1.5707963267948966 rad + pos: -10.5,-30.5 parent: 2 - proto: ComputerBroken entities: @@ -23985,10 +24077,10 @@ entities: showEnts: False occludes: True ent: null - - uid: 6580 + - uid: 9632 components: - type: Transform - pos: -13.5,-30.5 + pos: -14.5,-30.5 parent: 2 - proto: CrateMedicalSecure entities: @@ -23997,13 +24089,6 @@ entities: - type: Transform pos: 14.5,-26.5 parent: 2 -- proto: CrateMedicalSurgery - entities: - - uid: 3806 - components: - - type: Transform - pos: -10.5,-30.5 - parent: 2 - proto: CrateNPCHamlet entities: - uid: 7733 @@ -24679,11 +24764,11 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-31.5 parent: 2 - - uid: 6582 + - uid: 6574 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,-29.5 + rot: 3.141592653589793 rad + pos: -12.5,-31.5 parent: 2 - proto: DeployableBarrier entities: @@ -28858,6 +28943,8 @@ entities: - 8995 - 8994 - 8491 + - 6582 + - 1301 - uid: 8489 components: - type: MetaData @@ -28870,18 +28957,6 @@ entities: devices: - 8979 - 8832 - - uid: 8494 - components: - - type: MetaData - name: 'Fire Alarm: Surgery' - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,-31.5 - parent: 2 - - type: DeviceList - devices: - - 8492 - - 5923 - uid: 8630 components: - type: MetaData @@ -28895,6 +28970,20 @@ entities: - 5236 - 5107 - 3168 + - uid: 9613 + components: + - type: MetaData + name: 'Fire Alarm: Surgery' + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-28.5 + parent: 2 + - type: DeviceList + devices: + - 5923 + - 6582 + - 1301 + - 1776 - proto: FireAxeCabinetFilled entities: - uid: 380 @@ -29246,6 +29335,17 @@ entities: deviceLists: - 7745 - 7747 + - uid: 1301 + components: + - type: Transform + pos: -15.5,-27.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9613 + - 9612 + - 8487 + - 9580 - uid: 1554 components: - type: Transform @@ -29388,8 +29488,8 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 8494 - - 8493 + - 9612 + - 9613 - 8487 - 9580 - uid: 6021 @@ -29422,6 +29522,17 @@ entities: - 5344 - 8112 - 1244 + - uid: 6582 + components: + - type: Transform + pos: -11.5,-27.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9613 + - 9612 + - 8487 + - 9580 - uid: 7732 components: - type: Transform @@ -30324,6 +30435,13 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 9611 + components: + - type: Transform + pos: -12.5,-28.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: FolderSpawner entities: - uid: 1918 @@ -31931,6 +32049,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 9625 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-28.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasPipeBroken entities: - uid: 8126 @@ -34240,6 +34366,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 1839 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-29.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 1925 components: - type: Transform @@ -35029,6 +35163,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 3606 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-28.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 3623 components: - type: Transform @@ -38863,6 +39005,37 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 9626 + components: + - type: Transform + pos: -11.5,-28.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 9627 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-29.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 9628 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-29.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 9629 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-29.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeTJunction entities: - uid: 5 @@ -38880,6 +39053,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 95 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-29.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 184 components: - type: Transform @@ -39420,6 +39601,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 3306 + components: + - type: Transform + pos: -13.5,-28.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 3532 components: - type: Transform @@ -41163,17 +41351,6 @@ entities: - 9580 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8056 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-28.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 8493 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 8058 components: - type: Transform @@ -41397,6 +41574,28 @@ entities: - 8234 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 9623 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-29.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9612 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 9624 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-30.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9612 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasVentPumpVox entities: - uid: 7727 @@ -42217,17 +42416,6 @@ entities: - 9580 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 7611 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-28.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 8493 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 7696 components: - type: Transform @@ -42438,6 +42626,28 @@ entities: - 8234 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 9620 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-28.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9612 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 9622 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-30.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9612 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVentScrubberVox entities: - uid: 7716 @@ -43111,11 +43321,6 @@ entities: - type: Transform pos: 19.5,33.5 parent: 2 - - uid: 2787 - components: - - type: Transform - pos: -17.5,-31.5 - parent: 2 - uid: 2826 components: - type: Transform @@ -43231,11 +43436,6 @@ entities: - type: Transform pos: -5.5,34.5 parent: 2 - - uid: 3805 - components: - - type: Transform - pos: -11.5,-27.5 - parent: 2 - uid: 3896 components: - type: Transform @@ -43451,11 +43651,6 @@ entities: - type: Transform pos: 27.5,-23.5 parent: 2 - - uid: 5214 - components: - - type: Transform - pos: -0.5,-30.5 - parent: 2 - uid: 5229 components: - type: Transform @@ -43536,6 +43731,11 @@ entities: - type: Transform pos: 5.5,-31.5 parent: 2 + - uid: 5931 + components: + - type: Transform + pos: -14.5,-33.5 + parent: 2 - uid: 5937 components: - type: Transform @@ -43646,6 +43846,11 @@ entities: - type: Transform pos: -22.5,-29.5 parent: 2 + - uid: 6502 + components: + - type: Transform + pos: -15.5,-33.5 + parent: 2 - uid: 6505 components: - type: Transform @@ -43681,6 +43886,21 @@ entities: - type: Transform pos: -25.5,-23.5 parent: 2 + - uid: 6581 + components: + - type: Transform + pos: -16.5,-31.5 + parent: 2 + - uid: 6583 + components: + - type: Transform + pos: -14.5,-31.5 + parent: 2 + - uid: 6617 + components: + - type: Transform + pos: -15.5,-31.5 + parent: 2 - uid: 6635 components: - type: Transform @@ -44493,11 +44713,6 @@ entities: - type: Transform pos: -7.5,34.5 parent: 2 - - uid: 5635 - components: - - type: Transform - pos: -15.5,-33.5 - parent: 2 - uid: 5918 components: - type: Transform @@ -45380,8 +45595,20 @@ entities: - type: Transform pos: 13.5,-22.5 parent: 2 +- proto: HolopadMedicalPsychologist + entities: + - uid: 6328 + components: + - type: Transform + pos: 8.5,-33.5 + parent: 2 - proto: HolopadMedicalSurgery entities: + - uid: 3569 + components: + - type: Transform + pos: -14.5,-29.5 + parent: 2 - uid: 9139 components: - type: Transform @@ -45443,16 +45670,66 @@ entities: - type: Transform pos: 34.5,6.5 parent: 2 + - uid: 2545 + components: + - type: Transform + pos: -6.5,-31.5 + parent: 2 - uid: 3294 components: - type: Transform pos: -7.5,-10.5 parent: 2 + - uid: 3724 + components: + - type: Transform + pos: -2.5,-31.5 + parent: 2 - uid: 4117 components: - type: Transform pos: 9.5,13.5 parent: 2 + - uid: 6089 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-31.5 + parent: 2 + - uid: 6435 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-31.5 + parent: 2 + - uid: 9631 + components: + - type: Transform + pos: -10.5,-28.5 + parent: 2 + - uid: 9638 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-31.5 + parent: 2 + - uid: 9639 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-29.5 + parent: 2 + - uid: 9640 + components: + - type: Transform + pos: -4.5,-31.5 + parent: 2 + - uid: 9641 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-30.5 + parent: 2 - proto: HotplateMachineCircuitboard entities: - uid: 8208 @@ -45782,6 +46059,11 @@ entities: parent: 2 - proto: IntercomMedical entities: + - uid: 2419 + components: + - type: Transform + pos: -13.5,-27.5 + parent: 2 - uid: 6775 components: - type: Transform @@ -45810,12 +46092,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-22.5 parent: 2 - - uid: 7224 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-31.5 - parent: 2 - uid: 7384 components: - type: Transform @@ -46671,10 +46947,10 @@ entities: parent: 2 - proto: LockerMedicine entities: - - uid: 6089 + - uid: 9642 components: - type: Transform - pos: -7.5,-29.5 + pos: -6.5,-31.5 parent: 2 - proto: LockerMedicineFilled entities: @@ -46775,18 +47051,25 @@ entities: - type: Transform pos: 26.5,8.5 parent: 2 +- proto: LockerSurgeonFilled + entities: + - uid: 9614 + components: + - type: Transform + pos: -14.5,-28.5 + parent: 2 - proto: LockerWallMedicalFilled entities: - - uid: 6442 + - uid: 4939 components: - type: Transform - pos: 6.5,-24.5 + rot: 3.141592653589793 rad + pos: -11.5,-31.5 parent: 2 - - uid: 6583 + - uid: 6442 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,-28.5 + pos: 6.5,-24.5 parent: 2 - proto: LunchboxGenericFilledRandom entities: @@ -47052,10 +47335,17 @@ entities: - type: Transform pos: -19.5,1.5 parent: 2 - - uid: 8830 + - uid: 7396 components: - type: Transform - pos: -15.5,-28.5 + pos: -12.5,-32.5 + parent: 2 +- proto: MaterialBiomass + entities: + - uid: 9309 + components: + - type: Transform + pos: -16.809843,-28.67131 parent: 2 - proto: MaterialCloth entities: @@ -47103,6 +47393,13 @@ entities: - type: Transform pos: -3.5,-32.5 parent: 2 +- proto: MedicalBiofabricator + entities: + - uid: 6355 + components: + - type: Transform + pos: -16.5,-30.5 + parent: 2 - proto: MedicalTechFab entities: - uid: 7728 @@ -47119,17 +47416,17 @@ entities: parent: 2 - proto: MedkitBruteFilled entities: - - uid: 3587 + - uid: 3686 components: - type: Transform - pos: -4.5916166,-28.476686 + pos: -4.3356338,-28.417305 parent: 2 - proto: MedkitBurnFilled entities: - - uid: 3685 + - uid: 3587 components: - type: Transform - pos: -4.2634916,-28.679811 + pos: -4.6950088,-28.667305 parent: 2 - proto: MedkitCombatFilled entities: @@ -47140,6 +47437,11 @@ entities: parent: 2 - proto: MedkitFilled entities: + - uid: 3629 + components: + - type: Transform + pos: -8.654368,-29.631096 + parent: 2 - uid: 3682 components: - type: Transform @@ -47150,11 +47452,6 @@ entities: - type: Transform pos: 0.6466397,-20.319164 parent: 2 - - uid: 6438 - components: - - type: Transform - pos: -8.3172655,-29.51701 - parent: 2 - uid: 7256 components: - type: Transform @@ -47172,10 +47469,10 @@ entities: parent: 2 - proto: MedkitOxygenFilled entities: - - uid: 6435 + - uid: 3604 components: - type: Transform - pos: -8.4891405,-29.657635 + pos: -8.248118,-29.64672 parent: 2 - uid: 7254 components: @@ -47189,17 +47486,17 @@ entities: parent: 2 - proto: MedkitRadiationFilled entities: - - uid: 3604 + - uid: 3685 components: - type: Transform - pos: -3.5603666,-28.461061 + pos: -3.2702427,-28.33422 parent: 2 - proto: MedkitToxinFilled entities: - - uid: 2545 + - uid: 6438 components: - type: Transform - pos: -3.3259916,-28.554811 + pos: -3.6793838,-28.68293 parent: 2 - proto: MicrowaveMachineCircuitboard entities: @@ -47355,6 +47652,13 @@ entities: - type: Transform pos: -7.342291,-15.595659 parent: 2 +- proto: NitrousOxideTankFilled + entities: + - uid: 9122 + components: + - type: Transform + pos: -16.544153,-28.902863 + parent: 2 - proto: NoticeBoard entities: - uid: 7850 @@ -48685,6 +48989,11 @@ entities: - type: Transform pos: -9.5,21.5 parent: 2 + - uid: 2454 + components: + - type: Transform + pos: -13.5,-28.5 + parent: 2 - uid: 2477 components: - type: Transform @@ -49104,12 +49413,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,15.5 parent: 2 - - uid: 6617 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-29.5 - parent: 2 - uid: 6682 components: - type: Transform @@ -49234,6 +49537,12 @@ entities: - type: Transform pos: -20.5,-13.5 parent: 2 + - uid: 9610 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-30.5 + parent: 2 - proto: PoweredlightEmpty entities: - uid: 8138 @@ -49621,10 +49930,9 @@ entities: - type: Transform pos: -7.5,-15.5 parent: 2 - - uid: 3686 + - uid: 3714 components: - type: Transform - rot: 3.141592653589793 rad pos: -4.5,-28.5 parent: 2 - uid: 3814 @@ -49750,6 +50058,11 @@ entities: - type: Transform pos: 23.5,-12.5 parent: 2 + - uid: 6570 + components: + - type: Transform + pos: -10.5,-29.5 + parent: 2 - uid: 6671 components: - type: Transform @@ -50438,11 +50751,6 @@ entities: - type: Transform pos: 9.5,-40.5 parent: 2 - - uid: 6015 - components: - - type: Transform - pos: -14.5,-33.5 - parent: 2 - uid: 6524 components: - type: Transform @@ -51104,11 +51412,6 @@ entities: - type: Transform pos: 4.5,31.5 parent: 2 - - uid: 4939 - components: - - type: Transform - pos: -17.5,-31.5 - parent: 2 - uid: 4977 components: - type: Transform @@ -51429,6 +51732,21 @@ entities: - type: Transform pos: 8.5,32.5 parent: 2 + - uid: 9635 + components: + - type: Transform + pos: -16.5,-31.5 + parent: 2 + - uid: 9636 + components: + - type: Transform + pos: -15.5,-31.5 + parent: 2 + - uid: 9637 + components: + - type: Transform + pos: -14.5,-31.5 + parent: 2 - proto: RemoteSignaller entities: - uid: 4482 @@ -52241,6 +52559,12 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-16.5 parent: 2 + - uid: 9618 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-28.5 + parent: 2 - proto: ShelfRWood entities: - uid: 6175 @@ -53202,10 +53526,11 @@ entities: parent: 2 - proto: SignSmoking entities: - - uid: 1839 + - uid: 2787 components: - type: Transform - pos: -10.5,-27.5 + rot: 3.141592653589793 rad + pos: -9.5,-23.5 parent: 2 - uid: 8077 components: @@ -53219,10 +53544,11 @@ entities: parent: 2 - proto: SignSurgery entities: - - uid: 6441 + - uid: 1987 components: - type: Transform - pos: -13.5,-27.5 + rot: 3.141592653589793 rad + pos: -10.5,-27.5 parent: 2 - proto: SignTelecomms entities: @@ -53257,13 +53583,6 @@ entities: - type: Transform pos: -17.5,-19.5 parent: 2 -- proto: SinkEmpty - entities: - - uid: 6581 - components: - - type: Transform - pos: -13.5,-28.5 - parent: 2 - proto: SinkWide entities: - uid: 688 @@ -53313,6 +53632,12 @@ entities: - type: Transform pos: 19.5,-19.5 parent: 2 + - uid: 9621 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-30.5 + parent: 2 - proto: SmallLight entities: - uid: 3684 @@ -53379,10 +53704,11 @@ entities: parent: 2 - proto: Soap entities: - - uid: 6577 + - uid: 9616 components: - type: Transform - pos: -10.468254,-28.482597 + rot: 3.141592653589793 rad + pos: -15.444353,-30.496613 parent: 2 - proto: SoapNT entities: @@ -54076,11 +54402,6 @@ entities: - type: Transform pos: -13.5,-8.5 parent: 2 - - uid: 9122 - components: - - type: Transform - pos: -19.5,-6.5 - parent: 2 - uid: 9587 components: - type: Transform @@ -54509,6 +54830,18 @@ entities: - type: Transform pos: -8.5,7.5 parent: 2 +- proto: SpawnPointSurgeon + entities: + - uid: 9608 + components: + - type: Transform + pos: -15.5,-29.5 + parent: 2 + - uid: 9615 + components: + - type: Transform + pos: -11.5,-30.5 + parent: 2 - proto: SpawnPointTechnicalAssistant entities: - uid: 2385 @@ -55274,6 +55607,16 @@ entities: id: Engi-Entrance - proto: SurveillanceCameraMedical entities: + - uid: 6413 + components: + - type: Transform + pos: -13.5,-30.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Surgery - uid: 7104 components: - type: Transform @@ -55372,16 +55715,6 @@ entities: - SurveillanceCameraMedical nameSet: True id: Medical Ward 2 - - uid: 7396 - components: - - type: Transform - pos: -11.5,-30.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraMedical - nameSet: True - id: Surgery - uid: 7397 components: - type: Transform @@ -56449,11 +56782,21 @@ entities: - type: Transform pos: 26.5,11.5 parent: 2 + - uid: 6015 + components: + - type: Transform + pos: -16.5,-29.5 + parent: 2 - uid: 6218 components: - type: Transform pos: -4.5,-27.5 parent: 2 + - uid: 6491 + components: + - type: Transform + pos: -16.5,-28.5 + parent: 2 - uid: 6675 components: - type: Transform @@ -56594,16 +56937,6 @@ entities: - type: Transform pos: 15.5,20.5 parent: 2 - - uid: 9308 - components: - - type: Transform - pos: -10.5,-28.5 - parent: 2 - - uid: 9309 - components: - - type: Transform - pos: -10.5,-29.5 - parent: 2 - proto: TableWood entities: - uid: 852 @@ -57241,18 +57574,6 @@ entities: - type: Transform pos: 45.37481,-8.230079 parent: 2 -- proto: UniformScrubsColorBlue - entities: - - uid: 6573 - components: - - type: Transform - pos: -10.640129,-29.435722 - parent: 2 - - uid: 6574 - components: - - type: Transform - pos: -10.374504,-29.216972 - parent: 2 - proto: UnstableMutagenChemistryBottle entities: - uid: 6011 @@ -57276,11 +57597,6 @@ entities: parent: 2 - proto: VendingMachineBooze entities: - - uid: 3648 - components: - - type: Transform - pos: -18.5,-22.5 - parent: 2 - uid: 5208 components: - type: Transform @@ -57293,6 +57609,11 @@ entities: - type: Transform pos: 17.5,22.5 parent: 2 + - uid: 6575 + components: + - type: Transform + pos: -18.5,-22.5 + parent: 2 - proto: VendingMachineCargoDrobe entities: - uid: 982 @@ -57644,11 +57965,11 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-33.5 parent: 2 - - uid: 1987 + - uid: 6576 components: - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,-27.5 + rot: -1.5707963267948966 rad + pos: -17.5,-27.5 parent: 2 - uid: 6782 components: @@ -58634,11 +58955,6 @@ entities: - type: Transform pos: 48.5,17.5 parent: 2 - - uid: 1301 - components: - - type: Transform - pos: -13.5,-31.5 - parent: 2 - uid: 1338 components: - type: Transform @@ -58774,11 +59090,6 @@ entities: - type: Transform pos: -17.5,17.5 parent: 2 - - uid: 1669 - components: - - type: Transform - pos: -10.5,-31.5 - parent: 2 - uid: 1670 components: - type: Transform @@ -58834,11 +59145,6 @@ entities: - type: Transform pos: -4.5,14.5 parent: 2 - - uid: 1776 - components: - - type: Transform - pos: -17.5,-30.5 - parent: 2 - uid: 1783 components: - type: Transform @@ -59049,11 +59355,6 @@ entities: - type: Transform pos: 4.5,-37.5 parent: 2 - - uid: 2419 - components: - - type: Transform - pos: -14.5,-28.5 - parent: 2 - uid: 2423 components: - type: Transform @@ -59064,11 +59365,6 @@ entities: - type: Transform pos: -22.5,18.5 parent: 2 - - uid: 2454 - components: - - type: Transform - pos: -14.5,-29.5 - parent: 2 - uid: 2464 components: - type: Transform @@ -59099,21 +59395,11 @@ entities: - type: Transform pos: -22.5,17.5 parent: 2 - - uid: 2531 - components: - - type: Transform - pos: -14.5,-30.5 - parent: 2 - uid: 2540 components: - type: Transform pos: -23.5,11.5 parent: 2 - - uid: 2543 - components: - - type: Transform - pos: -14.5,-31.5 - parent: 2 - uid: 2577 components: - type: Transform @@ -59349,11 +59635,6 @@ entities: - type: Transform pos: -17.5,-14.5 parent: 2 - - uid: 3569 - components: - - type: Transform - pos: -17.5,-28.5 - parent: 2 - uid: 3576 components: - type: Transform @@ -59369,11 +59650,6 @@ entities: - type: Transform pos: -29.5,-33.5 parent: 2 - - uid: 3606 - components: - - type: Transform - pos: -15.5,-27.5 - parent: 2 - uid: 3613 components: - type: Transform @@ -59424,6 +59700,11 @@ entities: - type: Transform pos: 2.5,-20.5 parent: 2 + - uid: 3648 + components: + - type: Transform + pos: -17.5,-31.5 + parent: 2 - uid: 3706 components: - type: Transform @@ -59499,11 +59780,6 @@ entities: - type: Transform pos: 7.5,-19.5 parent: 2 - - uid: 3794 - components: - - type: Transform - pos: -14.5,-27.5 - parent: 2 - uid: 3801 components: - type: Transform @@ -59949,21 +60225,11 @@ entities: - type: Transform pos: -6.5,-19.5 parent: 2 - - uid: 6328 - components: - - type: Transform - pos: -11.5,-31.5 - parent: 2 - uid: 6340 components: - type: Transform pos: -10.5,14.5 parent: 2 - - uid: 6355 - components: - - type: Transform - pos: -16.5,-27.5 - parent: 2 - uid: 6360 components: - type: Transform @@ -59989,11 +60255,6 @@ entities: - type: Transform pos: -29.5,-32.5 parent: 2 - - uid: 6413 - components: - - type: Transform - pos: -17.5,-29.5 - parent: 2 - uid: 6432 components: - type: Transform @@ -60014,11 +60275,6 @@ entities: - type: Transform pos: 42.5,-10.5 parent: 2 - - uid: 6491 - components: - - type: Transform - pos: -17.5,-27.5 - parent: 2 - uid: 6503 components: - type: Transform @@ -60044,11 +60300,16 @@ entities: - type: Transform pos: -22.5,16.5 parent: 2 - - uid: 6570 + - uid: 6577 components: - type: Transform pos: -12.5,-31.5 parent: 2 + - uid: 6579 + components: + - type: Transform + pos: -10.5,-31.5 + parent: 2 - uid: 6584 components: - type: Transform @@ -60514,6 +60775,11 @@ entities: - type: Transform pos: -15.5,-14.5 parent: 2 + - uid: 8056 + components: + - type: Transform + pos: -11.5,-31.5 + parent: 2 - uid: 8060 components: - type: Transform @@ -60619,6 +60885,11 @@ entities: - type: Transform pos: 8.5,35.5 parent: 2 + - uid: 8830 + components: + - type: Transform + pos: -13.5,-31.5 + parent: 2 - uid: 9180 components: - type: Transform @@ -61951,6 +62222,11 @@ entities: - type: Transform pos: 3.5,-33.5 parent: 2 + - uid: 3805 + components: + - type: Transform + pos: -0.5,-30.5 + parent: 2 - uid: 3923 components: - type: Transform @@ -62301,6 +62577,11 @@ entities: - type: Transform pos: 20.5,-18.5 parent: 2 + - uid: 6580 + components: + - type: Transform + pos: -17.5,-30.5 + parent: 2 - uid: 6597 components: - type: Transform @@ -62366,6 +62647,16 @@ entities: - type: Transform pos: 2.5,-33.5 parent: 2 + - uid: 7224 + components: + - type: Transform + pos: -17.5,-27.5 + parent: 2 + - uid: 7611 + components: + - type: Transform + pos: -14.5,-27.5 + parent: 2 - uid: 7641 components: - type: Transform @@ -62521,6 +62812,21 @@ entities: - type: Transform pos: -15.5,-17.5 parent: 2 + - uid: 8492 + components: + - type: Transform + pos: -16.5,-27.5 + parent: 2 + - uid: 8493 + components: + - type: Transform + pos: -17.5,-29.5 + parent: 2 + - uid: 8494 + components: + - type: Transform + pos: -17.5,-28.5 + parent: 2 - uid: 8749 components: - type: Transform @@ -63194,6 +63500,12 @@ entities: parent: 2 - proto: WindoorSecureMedicalLocked entities: + - uid: 2531 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-29.5 + parent: 2 - uid: 3657 components: - type: Transform @@ -63433,11 +63745,6 @@ entities: - type: Transform pos: 1.5,-19.5 parent: 2 - - uid: 5877 - components: - - type: Transform - pos: -0.5,-30.5 - parent: 2 - uid: 5991 components: - type: Transform @@ -63458,11 +63765,6 @@ entities: - type: Transform pos: 3.5,-34.5 parent: 2 - - uid: 6362 - components: - - type: Transform - pos: -11.5,-27.5 - parent: 2 - uid: 6530 components: - type: Transform @@ -63679,6 +63981,18 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-31.5 parent: 2 + - uid: 5877 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-30.5 + parent: 2 + - uid: 6441 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-28.5 + parent: 2 - uid: 7258 components: - type: Transform @@ -63731,12 +64045,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-10.5 parent: 2 - - uid: 3629 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-29.5 - parent: 2 - uid: 3632 components: - type: Transform @@ -63749,24 +64057,12 @@ entities: rot: 3.141592653589793 rad pos: -8.5,-29.5 parent: 2 - - uid: 3714 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-31.5 - parent: 2 - uid: 3723 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-32.5 parent: 2 - - uid: 3724 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-31.5 - parent: 2 - uid: 5007 components: - type: Transform diff --git a/Resources/Prototypes/Maps/byoin.yml b/Resources/Prototypes/Maps/byoin.yml index bb154020be5..fa9b581c48b 100644 --- a/Resources/Prototypes/Maps/byoin.yml +++ b/Resources/Prototypes/Maps/byoin.yml @@ -37,6 +37,7 @@ MedicalIntern: [ 1, 1 ] Psychologist: [ 1, 1 ] Paramedic: [ 1, 1 ] + Surgeon: [ 1, 1 ] #science ResearchAssistant: [ 1, 1 ] Scientist: [ 1, 1 ] From d74450ab4062fc54eca9beb347398521dc8d378e Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 07:35:07 +0100 Subject: [PATCH 25/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index a26a67b266a..bef4c5f042d 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,15 +1,4 @@ Entries: -- author: Timemaster99 - changes: - - message: Added a Clerk access level. - type: Add - - message: Added a 6 hour security playtime requirement for Prosecutor. - type: Add - - message: Fixed accesses for multiple Justice roles (and the LawDrobe). - type: Fix - id: 389 - time: '2024-06-10T10:17:38.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1340 - author: DLondon changes: - message: Added Reporter, Librarian, and Perma slots to Pebble! @@ -3849,3 +3838,10 @@ id: 888 time: '2025-01-10T04:45:39.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2395 +- author: Field Command + changes: + - message: Surgery room extension and adding missing equipment. + type: Tweak + id: 889 + time: '2025-01-10T06:34:48.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2648 From bf7be6df3ba3efc0bdabd20ed8bd55cab1ce5b7e Mon Sep 17 00:00:00 2001 From: Janet Blackquill Date: Fri, 10 Jan 2025 01:36:00 -0500 Subject: [PATCH 26/45] Add tank harnesses to the medical techfab (#2679) --- .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/_DV/Recipes/Lathes/medical.yml | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c9e3ea2302b..0317c97ed10 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1053,6 +1053,7 @@ - WhiteCane - AACTablet # DeltaV - BoneGel # Shitmed Change + - TankHarness # DeltaV dynamicRecipes: # Begin DeltaV additions - LauncherSyringe diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/medical.yml b/Resources/Prototypes/_DV/Recipes/Lathes/medical.yml index 945829974eb..9678ceef292 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/medical.yml @@ -22,3 +22,11 @@ materials: Plastic: 150 Steel: 50 + +- type: latheRecipe + id: TankHarness + result: ClothingOuterVestTank + completetime: 2 + materials: + Plastic: 300 + Steel: 100 From 2ff232e68548c27d3cebf107d531c99a051f5e61 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 07:36:20 +0100 Subject: [PATCH 27/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index bef4c5f042d..4ba238a37e6 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,13 +1,4 @@ Entries: -- author: DLondon - changes: - - message: Added Reporter, Librarian, and Perma slots to Pebble! - type: Add - - message: Adjusts various elements of Pebble Station - type: Tweak - id: 390 - time: '2024-06-11T02:22:45.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1342 - author: deltanedas changes: - message: Fixed ninja requirements not working. @@ -3845,3 +3836,10 @@ id: 889 time: '2025-01-10T06:34:48.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2648 +- author: pontaoski + changes: + - message: Tank harnesses can be now fabricated from the medical techfab + type: Add + id: 890 + time: '2025-01-10T06:36:01.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2679 From 3983e0d8905235b07489c4dba9a9ee732b209c71 Mon Sep 17 00:00:00 2001 From: LioValkyria <186877140+LioValkyria@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:47:08 +0100 Subject: [PATCH 28/45] Depression RP Trait (#2676) RP Depression Trait --- Resources/Locale/en-US/_DV/traits/traits.ftl | 3 +++ Resources/Prototypes/_DV/Traits/disabilities.yml | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/Resources/Locale/en-US/_DV/traits/traits.ftl b/Resources/Locale/en-US/_DV/traits/traits.ftl index b7f66f0bf8d..024fcd50a5f 100644 --- a/Resources/Locale/en-US/_DV/traits/traits.ftl +++ b/Resources/Locale/en-US/_DV/traits/traits.ftl @@ -35,3 +35,6 @@ trait-addicted-desc = You crave the substance, and your thoughts keep drifting b trait-unborgable-name = Machine Incompatible trait-unborgable-desc = Your brain cannot be put into a man-machine interface. + +trait-depression-name = Depression +trait-depression-desc = No mechanical effect. The world is dark but there is a light somewhere, calling to you. diff --git a/Resources/Prototypes/_DV/Traits/disabilities.yml b/Resources/Prototypes/_DV/Traits/disabilities.yml index 611933b2e15..de4d78f1a1b 100644 --- a/Resources/Prototypes/_DV/Traits/disabilities.yml +++ b/Resources/Prototypes/_DV/Traits/disabilities.yml @@ -30,3 +30,11 @@ category: Disabilities components: - type: Unborgable # Automatically gets moved to the brain + +- type: trait + id: Depression + name: trait-depression-name + description: trait-depression-desc + traitGear: PillCanisterNeurozenium + category: Disabilities + components: [] From c0f629327a4f6af27b1245b337fedbedfd01cc21 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:47:27 +0100 Subject: [PATCH 29/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 4ba238a37e6..822eeca34cf 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed ninja requirements not working. - type: Fix - id: 391 - time: '2024-06-12T16:12:38.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1358 - author: Lyndomen changes: - message: Space Dragons are once again roaming free @@ -3843,3 +3836,10 @@ id: 890 time: '2025-01-10T06:36:01.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2679 +- author: LioValkyria + changes: + - message: RP Depression trait + type: Add + id: 891 + time: '2025-01-10T19:47:08.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2676 From 87693ac3e75857c6410ae53a1545e4485517b409 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Fri, 10 Jan 2025 16:48:09 -0300 Subject: [PATCH 30/45] Remove the medical cybernetic eyes from the secfab (#2682) Shoo --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 0317c97ed10..1034a3d477f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -928,7 +928,6 @@ - WeaponBeamCannon # End DeltaV additions - SecurityCyberneticEyes # Shitmed Change - - MedicalCyberneticEyes # Shitmed Change - type: MaterialStorage whitelist: tags: From 1e45bd70f1b5d6abb051b4b69441ada2f2249a75 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:48:28 +0100 Subject: [PATCH 31/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 822eeca34cf..c7bd9554e6e 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lyndomen - changes: - - message: Space Dragons are once again roaming free - type: Tweak - id: 392 - time: '2024-06-12T16:17:24.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1329 - author: Colin_Tel, Lyndomen changes: - message: Added DeltaV alert procedure to the guidebook under the "Survival" tab. @@ -3843,3 +3836,10 @@ id: 891 time: '2025-01-10T19:47:08.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2676 +- author: Radezolid + changes: + - message: Removed the medical cybernetic eyes from the security techfab + type: Tweak + id: 892 + time: '2025-01-10T19:48:09.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2682 From 45c2bbf178d1ebd6ae9141ace512f57014732984 Mon Sep 17 00:00:00 2001 From: Janet Blackquill Date: Fri, 10 Jan 2025 14:51:41 -0500 Subject: [PATCH 32/45] Allow tank harnesses and hospital gowns to be operated through (#2678) --- Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs | 3 +++ Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs | 2 ++ Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml | 4 ++++ .../Prototypes/Entities/Clothing/OuterClothing/vests.yml | 4 ++++ Resources/Prototypes/_DV/tags.yml | 3 +++ 5 files changed, 16 insertions(+) diff --git a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs index a01077c77d2..c4555e90c1e 100644 --- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs +++ b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs @@ -283,6 +283,9 @@ private void OnToolCanPerform(Entity ent, ref SurgeryCanPe if (!containerSlot.ContainedEntity.HasValue) continue; + if (_tagSystem.HasTag(containerSlot.ContainedEntity.Value, "PermissibleForSurgery")) // DeltaV: allow some clothing items to be operated through + continue; + args.Invalid = StepInvalidReason.Armor; args.Popup = Loc.GetString("surgery-ui-window-steps-error-armor"); return; diff --git a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs index fe12eed8fe7..de32ebb4dc0 100644 --- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs +++ b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs @@ -21,6 +21,7 @@ using Content.Shared.Popups; using Content.Shared.Prototypes; using Content.Shared.Standing; +using Content.Shared.Tag; // DeltaV: surgery can operate through some clothing using Robust.Shared.Audio.Systems; using Robust.Shared.Map; using Robust.Shared.Network; @@ -47,6 +48,7 @@ public abstract partial class SharedSurgerySystem : EntitySystem [Dependency] private readonly RotateToFaceSystem _rotateToFace = default!; [Dependency] private readonly StandingStateSystem _standing = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly TagSystem _tagSystem = default!; // DeltaV: surgery can operate through some clothing /// /// Cache of all surgery prototypes' singleton entities. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 552000cbc01..a78a7e46db9 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -265,6 +265,10 @@ sprite: Clothing/OuterClothing/Misc/hospitalgown.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/hospitalgown.rsi + - type: Tag # DeltaV: tank harnesses can be used for surgery + tags: + - PermissibleForSurgery + - WhitelistChameleon - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 0cecbcab7e8..55412088eec 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -91,3 +91,7 @@ sprite: Clothing/OuterClothing/Vests/tankharness.rsi - type: Clothing sprite: Clothing/OuterClothing/Vests/tankharness.rsi + - type: Tag # DeltaV: tank harnesses can be used for surgery + tags: + - PermissibleForSurgery + - WhitelistChameleon diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml index 2557e71e9de..76b96a7595e 100644 --- a/Resources/Prototypes/_DV/tags.yml +++ b/Resources/Prototypes/_DV/tags.yml @@ -104,3 +104,6 @@ - type: Tag id: GlassesCorpsman # Prescription corpsman glasses. + +- type: Tag + id: PermissibleForSurgery # Can be worn on the body during surgery From 5a6185316c7becb97b224d86d8c203f85480dfd8 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:52:00 +0100 Subject: [PATCH 33/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index c7bd9554e6e..2e4533f5b30 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Colin_Tel, Lyndomen - changes: - - message: Added DeltaV alert procedure to the guidebook under the "Survival" tab. - type: Add - id: 393 - time: '2024-06-12T16:17:52.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1311 - author: Colin-Tel changes: - message: The rate at which non-Diona species become hungry has slightly increased, @@ -3843,3 +3836,10 @@ id: 892 time: '2025-01-10T19:48:09.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2682 +- author: pontaoski + changes: + - message: Tank harnesses and hospital gowns don't block surgery steps + type: Tweak + id: 893 + time: '2025-01-10T19:51:41.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2678 From d6997579603db0849177a0668bdec87138ae2dae Mon Sep 17 00:00:00 2001 From: Tomce795 <131245882+Tomce795@users.noreply.github.com> Date: Fri, 10 Jan 2025 21:57:41 +0200 Subject: [PATCH 34/45] Ported Reptilian Hiss for Reptilians, Kobolds and Lizards (#2689) * Snek hiss ops * Lizard mob changes In case we don't wanna merge this bit --- .../Voice/Reptilian/attributions.yml | 4 ++++ .../Voice/Reptilian/reptillian_hiss1.ogg | Bin 0 -> 34686 bytes .../Prototypes/Entities/Mobs/NPCs/animals.yml | 13 ++++++++++++- .../Entities/Mobs/Species/reptilian.yml | 2 +- .../Prototypes/Voice/speech_emote_sounds.yml | 4 ++++ .../_Impstation/SoundCollections/reptilian.yml | 4 ++++ 6 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Resources/Audio/_Impstation/Voice/Reptilian/attributions.yml create mode 100644 Resources/Audio/_Impstation/Voice/Reptilian/reptillian_hiss1.ogg create mode 100644 Resources/Prototypes/_Impstation/SoundCollections/reptilian.yml diff --git a/Resources/Audio/_Impstation/Voice/Reptilian/attributions.yml b/Resources/Audio/_Impstation/Voice/Reptilian/attributions.yml new file mode 100644 index 00000000000..254b73a3cd3 --- /dev/null +++ b/Resources/Audio/_Impstation/Voice/Reptilian/attributions.yml @@ -0,0 +1,4 @@ +- files: ["reptillian_hiss1.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from https://github.com/ss220-space/Paradise/commit/6572a5f522e32cb5e0af7fb3ca3e45a725e2e992. Downmixed to 1 channel, volume edited" + source: "https://github.com/ss220-space/Paradise/blob/4bbfb9eb00771b3fae7108fca1a1ba5879926e3e/sound/effects/unathihiss.ogg" diff --git a/Resources/Audio/_Impstation/Voice/Reptilian/reptillian_hiss1.ogg b/Resources/Audio/_Impstation/Voice/Reptilian/reptillian_hiss1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..675289796ca352554a2252c4fbf19bc5838da410 GIT binary patch literal 34686 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 literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index e8f25bfff57..84e6311cb63 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1515,7 +1515,7 @@ - type: Speech speechSounds: Lizard speechVerb: Reptilian - allowedEmotes: ['Thump'] + allowedEmotes: ['Thump', 'Hiss'] # Impstation - type: Vocal sounds: Male: MaleReptilian @@ -1902,6 +1902,17 @@ id: MobLizard description: A harmless dragon. components: + - type: ReplacementAccent # Impstation starts here + accent: kobold + - type: Speech + speechSounds: Lizard + speechVerb: Reptilian + allowedEmotes: ['Hiss'] # Can't thump tail because no body component + - type: Vocal + sounds: + Male: MaleReptilian + Female: FemaleReptilian + Unsexed: MaleReptilian # Impstation ends here - type: MovementSpeedModifier baseWalkSpeed: 2 baseSprintSpeed: 3 diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 50aed8f9f01..f3a2173dbec 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -31,7 +31,7 @@ - type: Speech speechSounds: Lizard speechVerb: Reptilian - allowedEmotes: ['Thump'] + allowedEmotes: ['Thump', 'Hiss'] # Impstation - type: TypingIndicator proto: lizard - type: Vocal diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 3bfce627e57..b8ed93dc748 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -92,6 +92,8 @@ path: /Audio/Voice/Reptilian/reptilian_scream.ogg Laugh: path: /Audio/Animals/lizard_happy.ogg + Hiss: + collection: ReptillianHiss # Impstation Honk: collection: BikeHorn Whistle: @@ -116,6 +118,8 @@ path: /Audio/Voice/Reptilian/reptilian_scream.ogg Laugh: path: /Audio/Animals/lizard_happy.ogg + Hiss: + collection: ReptillianHiss # Impstation Honk: collection: BikeHorn Whistle: diff --git a/Resources/Prototypes/_Impstation/SoundCollections/reptilian.yml b/Resources/Prototypes/_Impstation/SoundCollections/reptilian.yml new file mode 100644 index 00000000000..3c95aea037f --- /dev/null +++ b/Resources/Prototypes/_Impstation/SoundCollections/reptilian.yml @@ -0,0 +1,4 @@ +- type: soundCollection + id: ReptillianHiss + files: + - /Audio/_Impstation/Voice/Reptilian/reptillian_hiss1.ogg From 7fb28d98f9738d90a9cb0567f9528110f0ae8d85 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:58:01 +0100 Subject: [PATCH 35/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 2e4533f5b30..78bd643b4d3 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: The rate at which non-Diona species become hungry has slightly increased, - while Diona get thirsty more often. - type: Tweak - id: 394 - time: '2024-06-12T16:30:02.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1302 - author: NullWanderer changes: - message: Fixed the shipyard console not opening @@ -3843,3 +3835,11 @@ id: 893 time: '2025-01-10T19:51:41.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2678 +- author: Tomce795 + changes: + - message: Ported a Lizard hissing emote from Imp. Added it for Reptilians, Kobolds + and Lizards. Lizards now have a kobold accent. + type: Add + id: 894 + time: '2025-01-10T19:57:42.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2689 From 02c690fa3bdabd229a480f252ff027b30d12703e Mon Sep 17 00:00:00 2001 From: Radezolid Date: Fri, 10 Jan 2025 16:58:50 -0300 Subject: [PATCH 36/45] =?UTF-8?q?Steal=20imp=20station=20suits=20?= =?UTF-8?q?=F0=9F=98=88=20=20(#2675)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Suits Suits Suits * typo oops * Restructuring * Ctrl Z Oops * Learn Every Day * Whitespace cleaning * Forgot To Swap A Thing * Make the Bartender suit be a reward * Fix json formatting * Fix detdrobe.yml * Fix curadrobe.yml whitespace * Fix more whitespaces * Fix missing clothes from loadout * Raised to pass the test --------- Co-authored-by: unknown <193618231+MintyTheBinty@users.noreply.github.com> --- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../Catalog/Fills/Items/briefcases.yml | 2 +- .../VendingMachines/Inventories/bardrobe.yml | 2 + .../VendingMachines/Inventories/chapel.yml | 2 + .../VendingMachines/Inventories/curadrobe.yml | 2 + .../VendingMachines/Inventories/detdrobe.yml | 4 + .../VendingMachines/Inventories/lawdrobe.yml | 2 + .../VendingMachines/Inventories/theater.yml | 6 + .../Prototypes/Loadouts/loadout_groups.yml | 18 +++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 110 ++++++++++++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 110 ++++++++++++++++++ .../Loadouts/Jobs/Civilian/bartender.yml | 34 ++++++ .../Loadouts/Jobs/Civilian/chaplain.yml | 9 ++ .../Loadouts/Jobs/Civilian/lawyer.yml | 9 ++ .../Loadouts/Jobs/Civilian/librarian.yml | 9 ++ .../Loadouts/Jobs/Civilian/musician.yml | 9 ++ .../Loadouts/Jobs/Security/detective.yml | 19 +++ .../Loadouts/Jobs/Wildcards/reporter.yml | 9 ++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1060 bytes .../brosblazer.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 991 bytes .../Jumpskirt/brosblazer.rsi/icon.png | Bin 0 -> 511 bytes .../Jumpskirt/brosblazer.rsi/inhand-left.png | Bin 0 -> 653 bytes .../Jumpskirt/brosblazer.rsi/inhand-right.png | Bin 0 -> 664 bytes .../Jumpskirt/brosblazer.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1044 bytes .../brownsuit.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1040 bytes .../Uniforms/Jumpskirt/brownsuit.rsi/icon.png | Bin 0 -> 457 bytes .../Jumpskirt/brownsuit.rsi/inhand-left.png | Bin 0 -> 634 bytes .../Jumpskirt/brownsuit.rsi/inhand-right.png | Bin 0 -> 749 bytes .../Jumpskirt/brownsuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1070 bytes .../creamsuit.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1157 bytes .../Uniforms/Jumpskirt/creamsuit.rsi/icon.png | Bin 0 -> 530 bytes .../Jumpskirt/creamsuit.rsi/inhand-left.png | Bin 0 -> 672 bytes .../Jumpskirt/creamsuit.rsi/inhand-right.png | Bin 0 -> 666 bytes .../Jumpskirt/creamsuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1077 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1134 bytes .../Jumpskirt/detectivesuit.rsi/icon.png | Bin 0 -> 507 bytes .../detectivesuit.rsi/inhand-left.png | Bin 0 -> 652 bytes .../detectivesuit.rsi/inhand-right.png | Bin 0 -> 653 bytes .../Jumpskirt/detectivesuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1020 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 971 bytes .../Jumpskirt/funeralsuit.rsi/icon.png | Bin 0 -> 450 bytes .../Jumpskirt/funeralsuit.rsi/inhand-left.png | Bin 0 -> 581 bytes .../funeralsuit.rsi/inhand-right.png | Bin 0 -> 591 bytes .../Jumpskirt/funeralsuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1030 bytes .../hitmansuit.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1025 bytes .../Jumpskirt/hitmansuit.rsi/icon.png | Bin 0 -> 458 bytes .../Jumpskirt/hitmansuit.rsi/inhand-left.png | Bin 0 -> 595 bytes .../Jumpskirt/hitmansuit.rsi/inhand-right.png | Bin 0 -> 609 bytes .../Jumpskirt/hitmansuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1075 bytes .../miamivice.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1006 bytes .../Uniforms/Jumpskirt/miamivice.rsi/icon.png | Bin 0 -> 482 bytes .../Jumpskirt/miamivice.rsi/inhand-left.png | Bin 0 -> 711 bytes .../Jumpskirt/miamivice.rsi/inhand-right.png | Bin 0 -> 675 bytes .../Jumpskirt/miamivice.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1054 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1044 bytes .../Jumpskirt/mrspacewide.rsi/icon.png | Bin 0 -> 475 bytes .../Jumpskirt/mrspacewide.rsi/inhand-left.png | Bin 0 -> 583 bytes .../mrspacewide.rsi/inhand-right.png | Bin 0 -> 596 bytes .../Jumpskirt/mrspacewide.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1074 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1003 bytes .../Jumpskirt/nightclubsuit.rsi/icon.png | Bin 0 -> 440 bytes .../nightclubsuit.rsi/inhand-left.png | Bin 0 -> 669 bytes .../nightclubsuit.rsi/inhand-right.png | Bin 0 -> 636 bytes .../Jumpskirt/nightclubsuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1088 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1150 bytes .../Jumpskirt/senior_bartender.rsi/icon.png | Bin 0 -> 520 bytes .../senior_bartender.rsi/inhand-left.png | Bin 0 -> 715 bytes .../senior_bartender.rsi/inhand-right.png | Bin 0 -> 663 bytes .../Jumpskirt/senior_bartender.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1280 bytes .../brosblazer.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1114 bytes .../Uniforms/Jumpsuit/brosblazer.rsi/icon.png | Bin 0 -> 457 bytes .../Jumpsuit/brosblazer.rsi/inhand-left.png | Bin 0 -> 653 bytes .../Jumpsuit/brosblazer.rsi/inhand-right.png | Bin 0 -> 664 bytes .../Jumpsuit/brosblazer.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1239 bytes .../brownsuit.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1167 bytes .../Uniforms/Jumpsuit/brownsuit.rsi/icon.png | Bin 0 -> 464 bytes .../Jumpsuit/brownsuit.rsi/inhand-left.png | Bin 0 -> 634 bytes .../Jumpsuit/brownsuit.rsi/inhand-right.png | Bin 0 -> 749 bytes .../Uniforms/Jumpsuit/brownsuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1280 bytes .../creamsuit.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1291 bytes .../Uniforms/Jumpsuit/creamsuit.rsi/icon.png | Bin 0 -> 519 bytes .../Jumpsuit/creamsuit.rsi/inhand-left.png | Bin 0 -> 672 bytes .../Jumpsuit/creamsuit.rsi/inhand-right.png | Bin 0 -> 666 bytes .../Uniforms/Jumpsuit/creamsuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1284 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1290 bytes .../Jumpsuit/detectivesuit.rsi/icon.png | Bin 0 -> 477 bytes .../detectivesuit.rsi/inhand-left.png | Bin 0 -> 652 bytes .../detectivesuit.rsi/inhand-right.png | Bin 0 -> 653 bytes .../Jumpsuit/detectivesuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1170 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1104 bytes .../Jumpsuit/funeralsuit.rsi/icon.png | Bin 0 -> 423 bytes .../Jumpsuit/funeralsuit.rsi/inhand-left.png | Bin 0 -> 581 bytes .../Jumpsuit/funeralsuit.rsi/inhand-right.png | Bin 0 -> 591 bytes .../Jumpsuit/funeralsuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1185 bytes .../hitmansuit.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1108 bytes .../Uniforms/Jumpsuit/hitmansuit.rsi/icon.png | Bin 0 -> 456 bytes .../Jumpsuit/hitmansuit.rsi/inhand-left.png | Bin 0 -> 595 bytes .../Jumpsuit/hitmansuit.rsi/inhand-right.png | Bin 0 -> 609 bytes .../Jumpsuit/hitmansuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1303 bytes .../miamivice.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1178 bytes .../Uniforms/Jumpsuit/miamivice.rsi/icon.png | Bin 0 -> 504 bytes .../Jumpsuit/miamivice.rsi/inhand-left.png | Bin 0 -> 711 bytes .../Jumpsuit/miamivice.rsi/inhand-right.png | Bin 0 -> 675 bytes .../Uniforms/Jumpsuit/miamivice.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1258 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1188 bytes .../Jumpsuit/mrspacewide.rsi/icon.png | Bin 0 -> 474 bytes .../Jumpsuit/mrspacewide.rsi/inhand-left.png | Bin 0 -> 583 bytes .../Jumpsuit/mrspacewide.rsi/inhand-right.png | Bin 0 -> 596 bytes .../Jumpsuit/mrspacewide.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1234 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1093 bytes .../Jumpsuit/nightclubsuit.rsi/icon.png | Bin 0 -> 437 bytes .../nightclubsuit.rsi/inhand-left.png | Bin 0 -> 669 bytes .../nightclubsuit.rsi/inhand-right.png | Bin 0 -> 636 bytes .../Jumpsuit/nightclubsuit.rsi/meta.json | 30 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1256 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1259 bytes .../Jumpsuit/senior_bartender.rsi/icon.png | Bin 0 -> 490 bytes .../senior_bartender.rsi/inhand-left.png | Bin 0 -> 715 bytes .../senior_bartender.rsi/inhand-right.png | Bin 0 -> 663 bytes .../Jumpsuit/senior_bartender.rsi/meta.json | 30 +++++ 138 files changed, 956 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpskirts.yml create mode 100644 Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml create mode 100644 Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/bartender.yml create mode 100644 Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/chaplain.yml create mode 100644 Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/lawyer.yml create mode 100644 Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/librarian.yml create mode 100644 Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/musician.yml create mode 100644 Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml create mode 100644 Resources/Prototypes/_Impstation/Loadouts/Jobs/Wildcards/reporter.yml create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/inhand-left.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/inhand-right.png create mode 100644 Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index dc15a762277..ff15f5dabef 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 2100 # DeltaV + cost: 2200 # DeltaV category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index 6764cb8496a..817a84ce639 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -25,7 +25,7 @@ - id: MagazineBoxAntiMateriel - id: ClothingNeckTieRed - id: ClothingHandsGlovesLatex - - id: ClothingUniformJumpsuitLawyerBlack + - id: ClothingUniformHitmanSuit #imp - id: BarberScissors - type: entity diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index 58a9d5e7122..3048560ee88 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -10,6 +10,8 @@ ClothingOuterWinterBar: 2 ClothingUniformJumpsuitBartender: 2 ClothingUniformJumpskirtBartender: 2 + ClothingUniformNightclubSuit: 2 #imp + ClothingUniformNightclubSuitSkirt: 2 #imp ClothingUniformJumpsuitBartenderPurple: 2 ClothingShoesColorBlack: 2 ClothingOuterArmorDuraVest: 2 # DeltaV - ClothingOuterArmorBasicSlim replaced in favour of stabproof vest diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 9b0ca383ae3..80df851b70c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -3,6 +3,8 @@ startingInventory: ClothingUniformJumpsuitChaplain: 2 ClothingUniformJumpskirtChaplain: 2 + ClothingUniformFuneralSuit: 4 #imp + ClothingUniformFuneralSuitSkirt: 4 #imp ClothingUniformJumpsuitMonasticRobeDark: 1 ClothingUniformJumpsuitMonasticRobeLight: 1 ClothingNeckStoleChaplain: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml index fe332ea52dc..bdd9a8e31ed 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml @@ -12,6 +12,8 @@ ClothingUniformJumpskirtCurator: 3 ClothingUniformJumpsuitLibrarian: 3 ClothingUniformJumpskirtLibrarian: 3 + ClothingUniformBrownSuit: 2 #imp + ClothingUniformBrownSuitSkirt: 2 #imp ClothingShoesBootsLaceup: 2 ClothingHeadsetService: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index b6b1dc26be4..0f799b58e54 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -20,3 +20,7 @@ BoxFolderBlack: 2 # DeltaV BoxEvidenceMarkers: 1 # DeltaV HandLabeler: 1 # DeltaV + ClothingUniformDetectiveSuit: 2 #imp + ClothingUniformDetectiveSuitSkirt: 2 #imp + ClothingUniformMiamiVice: 2 #imp + ClothingUniformMiamiViceSkirt: 2 #imp diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 5c3fd1d9a3c..98834011e0f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -9,6 +9,8 @@ ClothingUniformJumpskirtLawyerRed: 1 ClothingUniformJumpsuitLawyerBlack: 1 ClothingUniformJumpskirtLawyerBlack: 1 + ClothingUniformCreamSuit: 1 #imp + ClothingUniformCreamSuitSkirt: 1 #imp ClothingUniformJumpsuitLawyerGood: 1 ClothingUniformJumpskirtLawyerGood: 1 ClothingShoesBootsLaceup: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index c88f8af55da..08d23316ba2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -25,6 +25,8 @@ ClothingHeadHatSkub: 2 ClothingOuterSkub: 2 ClothingHeadHatBeretFrench: 2 + ClothingUniformMrSpaceWide: 2 #imp + ClothingUniformMrSpaceWideSkirt: 2 #imp ClothingOuterSuitChicken: 2 ClothingHeadHatChickenhead: 2 ClothingOuterSuitMonkey: 2 @@ -105,6 +107,10 @@ ClothingMaskSexyMime: 1 # End of DeltaV modifications. + ClothingUniformHitmanSuit: 1 #imp + ClothingUniformHitmanSuitSkirt: 1 #imp + ClothingUniformBrosBlazer: 1 #imp + ClothingUniformBrosBlazerSkirt: 1 #imp emaggedInventory: ClothingShoesBling: 1 ClothingShoesBootsCowboyFancy: 1 diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 3cb721863c8..3a3d6dd0d73 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -317,6 +317,10 @@ - BartenderJumpsuit - BartenderJumpskirt - BartenderJumpsuitPurple + - ClothingUniformNightclubSuit #imp + - ClothingUniformNightclubSuitSkirt #imp + - ClothingUniformSeniorBartender #imp + - ClothingUniformSeniorBartenderSkirt #imp - type: loadoutGroup id: BartenderOuterClothing @@ -372,6 +376,8 @@ - LibrarianJumpskirt - CuratorJumpsuit - CuratorJumpskirt + - ClothingUniformCreamSuit #imp + - ClothingUniformCreamSuitSkirt #imp - type: loadoutGroup id: LawyerJumpsuit @@ -387,6 +393,8 @@ - LawyerJumpskirtRed - LawyerJumpsuitGood - LawyerJumpskirtGood + - ClothingUniformCreamSuit #imp + - ClothingUniformCreamSuitSkirt #imp - type: loadoutGroup id: LawyerNeck @@ -425,6 +433,8 @@ - ChaplainJumpskirt - ChaplainRobesLight - ChaplainRobesDark + - ClothingUniformFuneralSuit #imp + - ClothingUniformFuneralSuitSkirt #imp - type: loadoutGroup id: ChaplainOuterClothing @@ -657,6 +667,8 @@ loadouts: - MusicianJumpsuit - MusicianJumpskirt + - ClothingUniformMrSpaceWide #imp + - ClothingUniformMrSpaceWideSkirt #imp - type: loadoutGroup id: MusicianOuterClothing @@ -1284,6 +1296,10 @@ - ForensicSpecJumpskirt # DeltaV - ForensicSpecTurtlesuit # DeltaV - ForensicSpecTurtleskirt # DeltaV + - ClothingUniformMiamiVice #imp + - ClothingUniformMiamiViceSkirt #imp + - ClothingUniformDetectiveSuit #imp + - ClothingUniformDetectiveSuitSkirt #imp - type: loadoutGroup id: DetectiveOuterClothing @@ -1553,6 +1569,8 @@ loadouts: - ReporterJumpsuit - JournalistJumpsuit + - ClothingUniformBrosBlazer #imp + - ClothingUniformBrosBlazerSkirt #imp - type: loadoutGroup id: PsychologistJumpsuit diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpskirts.yml new file mode 100644 index 00000000000..33a41bd74c2 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpskirts.yml @@ -0,0 +1,110 @@ + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformHitmanSuitSkirt + name: contract killer suitskirt + description: The perfect outfit for blending in at any event, office, or space station. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformFuneralSuitSkirt + name: funeral suitskirt + description: For when no color is allowed and all must be mourned. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformNightclubSuitSkirt + name: nightclub suitskirt + description: ID please? + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformMrSpaceWideSkirt + name: mr space wide suitskirt + description: The unspoken attire for any hotel, motel, or branded inn activities. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformBrownSuitSkirt + name: brown suitskirt + description: Not even the worst coffee spills will show up on this puppy, guaranteed. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformCreamSuitSkirt + name: cream suitskirt + description: A suit fit for a humble, small town gentleman with something to say. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformDetectiveSuitSkirt + name: detective suitskirt + description: Now excuse me, if I may just have a moment of your time... + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformMiamiViceSkirt + name: miami vice suitskirt + description: When you need to arrest the clown at twelve o'clock and boogie board at one. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformSeniorBartenderSkirt + name: senior bartender suitskirt + description: But you are the bartender, you've always been the bartender. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformBrosBlazerSkirt + name: BROS blazer and jeans skirt + description: BROS... Two! + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml new file mode 100644 index 00000000000..b785951fee2 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml @@ -0,0 +1,110 @@ + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformHitmanSuit + name: contract killer suit + description: The perfect outfit for blending in at any event, office, or space station. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformFuneralSuit + name: funeral suit + description: For when no color is allowed and all must be mourned. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformNightclubSuit + name: nightclub suit + description: ID please? + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformMrSpaceWide + name: mr space wide suit + description: The unspoken attire for any hotel, motel, or branded inn activities. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformBrownSuit + name: brown suit + description: Not even the worst coffee spills will show up on this puppy, guaranteed. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformCreamSuit + name: cream suit + description: A suit fit for a humble, small town gentleman with something to say. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformDetectiveSuit + name: detective suit + description: Now excuse me, if I may just have a moment of your time... + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformMiamiVice + name: miami vice suit + description: When you need to arrest the clown at twelve o'clock and boogie board at one. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformSeniorBartender + name: senior bartender suit + description: But you are the bartender, you've always been the bartender. + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi + +- type: entity + parent: [ClothingUniformBase] + id: ClothingUniformBrosBlazer + name: BROS blazer and jeans + description: BROS... Two! + components: + - type: Sprite + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi + - type: Clothing + sprite: _Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/bartender.yml new file mode 100644 index 00000000000..9b3e526d7aa --- /dev/null +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/bartender.yml @@ -0,0 +1,34 @@ +- type: loadoutEffectGroup + id: SeniorBartender + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobBartender + time: 187200 # 52 hrs (1 hour per week for 1 year) + +- type: loadout + id: ClothingUniformNightclubSuit + equipment: + jumpsuit: ClothingUniformNightclubSuit #imp + +- type: loadout + id: ClothingUniformNightclubSuitSkirt + equipment: + jumpsuit: ClothingUniformNightclubSuitSkirt #imp + +- type: loadout + id: ClothingUniformSeniorBartender + effects: + - !type:GroupLoadoutEffect + proto: SeniorBartender + equipment: + jumpsuit: ClothingUniformSeniorBartender #imp + +- type: loadout + id: ClothingUniformSeniorBartenderSkirt + effects: + - !type:GroupLoadoutEffect + proto: SeniorBartender + equipment: + jumpsuit: ClothingUniformSeniorBartenderSkirt #imp diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/chaplain.yml new file mode 100644 index 00000000000..17fc0361593 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/chaplain.yml @@ -0,0 +1,9 @@ +- type: loadout + id: ClothingUniformFuneralSuit + equipment: + jumpsuit: ClothingUniformFuneralSuit #imp + +- type: loadout + id: ClothingUniformFuneralSuitSkirt + equipment: + jumpsuit: ClothingUniformFuneralSuitSkirt #imp diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/lawyer.yml new file mode 100644 index 00000000000..fc905a1a722 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/lawyer.yml @@ -0,0 +1,9 @@ +- type: loadout + id: ClothingUniformCreamSuit + equipment: + jumpsuit: ClothingUniformCreamSuit #imp + +- type: loadout + id: ClothingUniformCreamSuitSkirt + equipment: + jumpsuit: ClothingUniformCreamSuitSkirt #imp diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/librarian.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/librarian.yml new file mode 100644 index 00000000000..d3a5f4dfc73 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/librarian.yml @@ -0,0 +1,9 @@ +- type: loadout + id: ClothingUniformBrownSuit + equipment: + jumpsuit: ClothingUniformBrownSuit #imp + +- type: loadout + id: ClothingUniformBrownSuitSkirt + equipment: + jumpsuit: ClothingUniformBrownSuitSkirt #imp diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/musician.yml new file mode 100644 index 00000000000..bccff248168 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/musician.yml @@ -0,0 +1,9 @@ +- type: loadout + id: ClothingUniformMrSpaceWide + equipment: + jumpsuit: ClothingUniformMrSpaceWide #imp + +- type: loadout + id: ClothingUniformMrSpaceWideSkirt + equipment: + jumpsuit: ClothingUniformMrSpaceWideSkirt #imp diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml new file mode 100644 index 00000000000..0697a93d739 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/detective.yml @@ -0,0 +1,19 @@ +- type: loadout + id: ClothingUniformMiamiVice + equipment: + jumpsuit: ClothingUniformMiamiVice #imp + +- type: loadout + id: ClothingUniformMiamiViceSkirt + equipment: + jumpsuit: ClothingUniformMiamiViceSkirt #imp + +- type: loadout + id: ClothingUniformDetectiveSuit + equipment: + jumpsuit: ClothingUniformDetectiveSuit #imp + +- type: loadout + id: ClothingUniformDetectiveSuitSkirt + equipment: + jumpsuit: ClothingUniformDetectiveSuitSkirt #imp diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Wildcards/reporter.yml new file mode 100644 index 00000000000..cbca21331f0 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Wildcards/reporter.yml @@ -0,0 +1,9 @@ +- type: loadout + id: ClothingUniformBrosBlazer + equipment: + jumpsuit: ClothingUniformBrosBlazer #imp + +- type: loadout + id: ClothingUniformBrosBlazerSkirt + equipment: + jumpsuit: ClothingUniformBrosBlazerSkirt #imp diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..1138c7aee45f212b5175e03a89d00b996fa329ee GIT binary patch literal 1060 zcmV+<1l#+GP)3 zaguw_FaC4#_Yq1dMwv0y22_&;pxS_HvH(;YP)!zqY6Gen`2avEy>el!SF11#gW9%D zZQBmF+qO*&!=Q#?r0SLFJB~x!os)2J9Or_*$bL~uK}2SPgb=J(tEe{`RM&Oveff;T z=8y36yTxgg<`>}mJ^&EU^HSM)rhl%}1Gk-co(ItxuFxsKivz%ReG5CwE7)0H3Ewjl z01`hEqWZe7W6-*+eynSNWm)0+&hkpnd){;sBsI<;gaY8xXDqEv;QjOzmewYEwzGes z-e@G{v9JChn7-)P(nkP){=InC#iw7-FKlNF`|qt+t0+Av4b8CG(PykHG_kFmo zOMKtQ>gEAfHxFQ07JT1_uIq$1;ks@tLzltpN4H1yMY$pJCC70HThE)b^tL{SW^*_E zyii=kp?^r*u1omey*j!jZHQ-kdq-;p=J8M%(=+Z9tZ!^%I>5nx>iLaQ{SKDgc&#KgP8@0!-30Lr6nk=o-M#a7=>W z>=vWt@;D974n0OeYmp$3(wBnQXS&QsL2Hqm2FU751pu7wBmkh>LP3-L_3(uHj3IqU zUj(l@#L~F^U8WzoMN5w-9l&*CNDKLN%V=(btVfywE@*+ z0jM^hnk)d-22_&;pxS_HvH(;YP|e5(ApJ}b0B$~A2LMbyDq-sW9qc}NoTw>L7T>0{Gjcz?SnS1ym}PB=$*&N~MB!=LGG}3FW=;wMfwh38_U3bW<-fWkQqz3M+g86!{`Yh+O&{nj}U|R!0Yn9JkJw; z+#l-{xU3Gp|N3E^A%}+dBvb2_^Q7je*dXpj6 zJRon*(%;=Ky4`NLtx#M<%Rh`WoHT{vVo!qx^Ax8)Ah8AszEMHLF-fCF7%h({q5WS@ zg|%G&9)UPWp8~8#AFa=`_i6SBM75)@akR7QuxbOU$pTPqKs8wastu?n3qZ92)noyv eHlUi358w|SnPxSR_)#(d0000oaU2e4OT}*4|K0!bcin#ebCs)Z7@c@zZpd4|jM3_g#d86tBhNLL-nbQe?EBW`KuYeXXp6wc zj!mA1z4j{)KbhOMKY)cpQK5yS=Q~4#e?IG?uX`sJJ9QioiDdQpw}mBR-u9>ZG3+n? zPnseWDp6&xO}t4J3Gu9b2Ta zDus2%k@aVtl(KlR*X6q2jh1Jt4zZoAob;#oi{-!0`#b+cYQ%6b z9`gCcde=T6sWq zf2a`4gqQ11vsmcX#|dpQOSl$rQ>!2z9OF0=0$g}o{EqzIsbS|?Ox0!QX|k z!{(bkGdUGslvpt|^qS9RC{X9)SDvHkYRUO{c%F#ncGzrV~W7I0EndgR|f zJF|N^Nh?3zSjl<#g_Eqj+`_9_NAGz0n(+!^7rS4+Z`*S4xjnLzT=WX@Lxtf zlQS;$4c@%Q7v&!W9X|7w{YI9?RrwDB0pU&XT=DS%?+^Z7xvABs76>r`b1Z|WtDnm{ Hr-UW|H;K=U literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4417f550c55ed01dc14d62b0fb90c6ef974138fe GIT binary patch literal 511 zcmVt#@5Ky0H63uRe`s58b;mSu=*QJ0GsxrW2xFj#9*RbIb+!*n`L zkI3ld0Yy4NpJy|8Pzlbye7$$x1}5hxKs9J zz?O_!eY0C-V7u6%kSm9OlUG^TFo78Ts$L{VcVSg8Vu=Ef)eTt$F7=1G-jrWA97egS z7b*H{`z*BT0^r^nuRG4|f-C}$iRbYn>Igh0{s4WpvM37I)^Gp-002ovPDHLkV1n0_ B;*9_R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0ae12df7e9c776b31891e67d93ff5e036ec42259 GIT binary patch literal 653 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S%2 zr;B4q#hkY@4fAe0h`6*nu3CTSKoet9_UpYZ-ldj}jPVC!*B#t)d+CN=2Fph4pA0)0 zt3?@^R&3lF@cnX2i;(3duYb>4KH533dS)2NysKlH;}!aGR^?%{1It(r5Jfz@%FYm4 z`)$3m%eH;%x8|<)pL@TxBjfhA=>L`>>c@BAriF;bx2jL>?BbYH?4g-xH~;awM?wrA zULG&+;Fxw=HOR|DGqnEl%XxLnKYzSi&2XT7eZ0Z!vztn-ir$?~VKwn(ejZa_Q(oBl z`=#c&^?tvK&sm!I7Ed_$^D5`N<;!bl?6hJ}G-XNddA0YtK+`daueYDiJSJhfF3!?vtrdM^LKNaI}$cV9H{P}60|-4 z`@5Tb+H()49Z-AyRf^%k-v4iBEZy9{U0?B*?b@@A$FAILtz_6A7kD?wwyHkz<(tDL zY=5!?(hl6vVBEmFL6bN_raM&F_7uaKSs4jS7)v5dE-wD9^(Vb~&+5*&wPDr0y?Lw= zrWb9eJ$(`I#Oy@#_QTGTE-Ucgp`&Y$kERbF9?Fgc-SoN%V6 iiY+35DM32nv#`z9C%omeZ(RnaF9uInKbLh*2~7ZRB`LiC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..120d0e5d6dbc6387442278d5f7951d5fc08cd2bf GIT binary patch literal 664 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$n zr;B4q#hkY@4fAdrh_uy<&YaiI(88r+m>#FJc>6pBhjkOyUJnS*lby7{!GFS8ONaag zcbyv<;)De6#ZB{?AQ8AUip9U@C!?Io=}*V+E3v-TpCNhtjCv+xW)Z_Brb|y4mar~4 z$>_oDF`0RS*aS6p1ziPSK8GlWSuzb<8cZx1fC~HU7z~QPXDKSJd;RO|W+SDjFP}FX z?%%a;=l=cnacOnctOA0Z{wIKU?~H!q&2h%->&D z+nMXv)K{BV)?D2GC49B0u;7%Sf^!dFKR0GLFnzxLhMPGKE;rtPFF1G5GJMZviL}fA zey#mpw)^PetELPOZeM=iSbo`r`TarBfKbsXL3h7BJ*z2q{rTOK3=W#Dt5)4BbtwM0 zSAN~Pk2~y+KRuhdUH`>f{ibVC*P=EXwyoXz=k;$OnbVWF)>OY#>qyn_?t~9|2|W)t z>D-Juof^5xux{bXu!r#E)sqCBJcPBREY+?@F&FXB!I%*Apd@%v7DO{@b6pceB^Bg#@hzjy=6mCe zKWgU#k8wwR-|u|q&70ZzJ%urbT;?3L0cxB8s0~o#1VC+o8Ycj11JvYv0AP%r*f^b` z5L#=?nWkw>)3nTfP19IwZ8`IJJhpn}`iVq>ZEkO6S|X7+rY~|_j4_;-5&yL`&Ah4$ zcLNnje*eK9Ro=nN*auv@aUCC37wXE3+2{ zLqBup=b^xzhwZKX%y#SdK1OH0Dd}`tsy|t**3bDTL8$bTiO7CH8ZdCyQS$*M0VGb9f!fJi#N${j0X7?m` zRKKXG2mr9YzHUleI)MKT=Pp2PfEp(NY6H{=-3Aqf^v-7r(aAmMM}QLmwE=3J0H_U6 z;{-r$fEp(NY6H|b0Z<#DCg%f?ekTY31r415fXny&xO&@*$@&MDni8dIcd{ z^z{L->D!>bPS4xH+5i>|23a^9mg&wE;cytiV2}Y|1JM}tUVbf2GueWysY^i5@?_nAQgbVPM?j%$h}jWGJ~150f77n$Xb7&UD%ZD$~;C|2cCEn#?&O((OAP)Hg>VH zv76af<|{n2d7;c#cr1jD#v0Z;JTCqA*0Kc>XR%P?XnEWU?SJx7xWH|^M!*cFs>Avk zJ+IGm>|7&Y$NB`PI!tYV8Ycj11JpPHP#d7e34q!FHBJE32B^vT0R8}Gupi4NR!0i} O0000KaP)sw$z!ywu9_*Xo+Sb>r`LeS{E5-KN5lBpJxZ$3{@sT1XwMDE|42k00LQ z%h3$#VbJ>0HEEs9vx?ovHZQJ`nDbcdhrzBvPS@b zNH}0<1Hky$2;7bY${$i>gcKP{@bN~E@$&aHz&uz;k#Tc+h+?sbQni6%v51?~LxdE$ z>v>LLH4eR4^KU2owjyABYy{;>6IX?r-k00kHtYf5s!&6@(gYhVZorD)3QqXD8bCv@ zTxp_IZRq{f@rlT&p$!0~YC{*%ZxmSZ*R_Y|pXH_fy!^Hzpj2(((9mz}{JG=V^BDzJw0YjT&XLldTOdiqYb=yL$5Kp9$ z%;d2Y-!$~IQDD_xift!rFaH-vbZN zpck3IDSxjlz?BABAy)7*1v=$--GE_(D}RTdGJFF>3lI(80MP%a5Dnh|(E>!nH$b!i(coSc27rTu0|Ee(larW<&f--_5wdVlt83))`~tVPw*Y{R zjSX%c+zTS?_ckRc-| zD@}b(E}lpuo7(cEIKr%fa#3!xCf5rjSkUiq^x|nzLN>KEkPjoJY6IES7HGkQ5^Ptc zu-bUQWx$|6gE;}OM%S`{+eHzB;_}lV?+K}66#(=%@c)2#B8{2oEC66-KE`z}w*iUO zIYYaywJeL21_Aog%k6C==Wq;e1N!|Q?*@7mOYxxZ`T!P#$`WpB7@GP3uQUu*eSjAl zhN3>eOASL)AK+BOldBKl)zFs#&jHVVD(o8|T7YQy28b3Q8vg*E6n)Z~jXksg0000< KMNUMnLSTaF@7^2$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ee7c025560c2c2900bc7ee54d1b91fa60940e7c9 GIT binary patch literal 457 zcmV;)0XF`LP)o+=PbO_&LU-A^ zbfFS(9TZohR1{>on%EST8Lfzre>3FdF!P;DPDYecJW?+YJv{|T0aAbz;AsFv1QDUz zs;F+OqJkh$+9o0dL7?rk!N2*Xfynq?J+p{mwvc&06EWLGUyRS5dcvXF&Xs8c@BVe7K{Ljg$#@3p3!U_ z+oscLVg(q@)-0BLG^~kUO`I0XeVlGMW&ub<4VKdJgECd#)4D z0S%^m;BIpOxEP(D0bo7{j7jgM=eQB20Qb}nkF}{*e+vwf00000NkvXXu0mjfkVn4{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6447da39cac920978dd9bcc54b85affb48086528 GIT binary patch literal 634 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$e zr;B4q#hkY@H)h=qkZA3X3TV5QBE;qC=KnR}#3OSL+oz(F)}8yEVd@#DB=?0u()LJ! zW3o_)m87Sp-i+Id9!p9)*FV~CxA*M-Mt0911z%qNO8UZnEox8dy^Y)(0vX>h<%BTo zW{?&=pm)HHbpuwR%Fj#*Yw!LDHkSDkc5l68@|*eR_8%#@u=&`GsqeR(EqtlBjj649 z-rd`GBQ5vWS2XOsEBpLY>A8Oo51!g;X1T88Kg%SQOfIp|%=LPD@l%US3p*ES&0h0- z=cEpf74xHHT4(qkGdOl*^JC@T1?BxWQ+h18=FYqK-jcukyM?vgrehMf)t2)rG5PtO z7j#c7p0iBz(@&<%S!T~4X&gEE@@H7lEdh@+tW63IlT^ygBp)9>{(VN8Yw_CqZx?7y z|MBG~x7*^t4SL>M>-`Y-#y@mv3L)@5Y*a4twV;k8FHBJ9_!0NtSxw)%J0Q zJ>3*}tWac;*7PfLN;|kU_S=iTEw|n;v$^Qn$MAnZX`#z&Zv0s3`E*aqjs~Cs)9fGp zdS-Uwllzm;tfuL*i)KIA&z36ug%@97q6GPes3mF_6N9I#pUXO@geCxk!5vKi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5fd5ada0888d51964102fb868a77ea5761d8a8ce GIT binary patch literal 749 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V21 zPZ!6KiaBp*pUrxdAkua}Uq;03=v0l|>FeAaU%0Jbuz2=8Cu{Gwe^tCQs|D9~zq!5i z0@p;H+mjN*k{&&9u-L4@ndRdn^Hk-B?Sn)ApI6&@n&@*W9Wwmf8r>i*$*`Tl+=wBM zF)xMT4%3|z3_DnNOk^zJE>LEEAojqG?SSrqUY>^NhS`hx8C;&k##pVjdb#VJb@;W+ ztHQPa)?8k7`In|$?Dfo_-=2OInpn>Sln?c`oHJ+cuX_ukPN|x)T$es@s=czPtSd{i zJ#Y6zZg!5FEbsE)8*J8nFWI$7rRd@76{}uVp3CV53OdQ}7iyTDv~$8UY9?}3JWj^ljr=@r}5qHDX?WlEiS$uw(O z<@V51kuh<1Wr}P!{*=$(xF?oFae)R`Z#(l7ZpogWndR}D!&-7JfBbu_{_F2PiwjX@ zO&tqXy$X9DxBmI(Z>$V8eIc8}j;z05pXeuEa6CKZ%!eO;X014?|G4V*H0Hx|7Ki

}D-=-i=ga}M8n&w0COf_@4E!%wHQ)#V8c*XEyBH_JXc z^|hz^y7Cw1j<<^pjM7&A{1W@9f}JhFPu$>)rQH1Z*2Hr_yQ-(!h^+g5__DXk`(EpV zTQ;qI*|$~LMr>aZ_nXPFYCm46JHVp?Uz~M(ez4)1#oGEk9Wn>DU9(tG>ua^qym8C6 zV~#Fd3R&56j%jv?I7CH1)^K^n`e@sF&v)Y2)J=*Eom^gQlV14t^|tFCOxEJc?+zWh zb$y9`o$$tfrp(;l<{K|(Cjd419^q5S`#r0~^ RNCl=}22WQ%mvv4FO#si3Um*Yh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..345a263c81cc087814346bbf7fb832f61216f6b6 GIT binary patch literal 1070 zcmV+}1kwA6P){iqIX_MK{5&=n}RncL_tvz(=Mhrb|s-OWMk9tM~jNY2zk4xGmi7D-uLXR zFS+x9!?t&a@AK^0`@TCn@5?yn$Y%~w8=%GtfZ6~xRshrnsIdZ|Hb70@2XI*AB*qv3 zpx^IDdq)F5QqlkbOi>g7KqwUAKeiXq)ji0zwzhKRHKkwUy@V=Pb*gV2OsU8dSFHmVaj)nOb zINemQYuXIVs*?$!0JQ0=lvk9a`CJU;73F){)o&p>yXeKu=%20_^n< zGXRj)mkyw~xcHCf6BjX2LL$R z8gcT}34}W?nrcdvmZxv_@N6Lx(J+)&Z`QS>0?@A0r?1df+Ky*! zMwE0d)r;B-WNI0j1ogPySBiLam)q_3oNkoz*6ebnwbZnFQawPsPM?XD2j{akWdtL8 z0|5CsAmjS`(z~~krHrGe_1lwr2xDjn%*~APZ^?BmCD&7Jb!RRZ-lif;-I)vfLYSKw zW<4|7d2io-yE8lUMJ&tWJY!6?0M!T$P%S_;LIYF_P>s+4)dEx_ zG(fcg)p)B{V@j&)-01Mul*tL-QG2q*uw+@f8-m*3@e z{QYLSkzPM=8nC^!W@Ys`>h(je=5BIW`;#BO|DA8X{g8BKhC+S=O-oZP7XvY2duz># z#ghQE%tlwcv(3rh&wzm*0desHzi!+E;2-1fwlY9gpR@0jUl9D7mPXUk#Nx@WKhY-3 z-`9Z7&NMB}%;gClKYGAqYKq5?9x!ux0!>TzJkKlK`Vkk~`M($bfg&KQ&rvNGc~W?2 z*NtBq=i`qmj9(hJ>z))IQY{y8MvEVC<9CA>{+s#>{?z^V+R6Y;g`~yWm(>UVBt-BFHB*^}4{YPirjazpkPP6=gli%$H=&YCJ?`c4( za)FG##6;$L8&S(_aQy6;cVcgI{Os7S6PUs$3XYh#R8u1v2^)PaEyexHAge z%1;|7wgoCvu=gjXs7iByuNVbU~A*={^T@HdSk5~*p7T4|{Mqzw>vz^&}}vws%+ z1AhyM@DnpGw__qT&F1|(fvmCy#V_?SBxYQ_jzJ;_{(%e-?!Rsb5@?x?K%yW>{((mU z(W&z-+%g;X5l)}MAVvbO{Jwn+b_#JrkVBwXe%}okHTd#5{3atbK(zqX2n|pzKs7=G zR0~jz&;Zo}R3kJ%wE)!!4NxsWH9`Ya3s4Q|Rbhbj^>qtietw>7xkZwRca7~0}A;K z;52mV^+P)(jan)2i#KW|n@_y-#;8!pci)UbAZ>u#e*Ca|^s?xeEG2`X^8=hXi~In; zHH=JtKu{V+DnB3y4I_~s5Tu5Y$q(?V;f>1=kkv4h0p|hdekvRqpjv=xga)VUIF#`-`;sfvj zD#15knUDgZ&*if6Ps#2|KI}A_x{p*q+KR>Xv*kXES63?5`_kk~2{_j=K7U`x#hU-!{rS5I~}*UYFhhnF2hgM*c^X1B@Kt7PYCk UaQFPt@c;k-07*qoM6N<$f-8~kd;kCd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c2c57a492af7cd283449bd7b68b90509b218738e GIT binary patch literal 672 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Qf# zr;B4q#hkY@H)h=qkZA3nrn z@)qZX!NGbNoS`C0QKbPgFG{RW9x3cx@}%4^uh{;=g6t9tyI)JWt@^G>_0Kfj#%N~7 zKpfF;$B?o1ea#h>k0mdE&kFMTpZ!;DQpKvNLEhI(u4X=t&0zxa%zw@He*G?kTl(+W zYtOP}%eQR(5-mP=TZcVUpvYO?u+7}E@^W{*)a`7XOn1-7j=eh7MWx}_y2`qSlRMa# zPPupAyJX(nB%^l+KR1V!zu)Bt3nuBI$Q#^?J- z?lC4xSfx&5Vqj}7ee-Tkf+74zTTY8C9^6vaa~+=A}~$!*W%~=PS4ejs3(NYTYM&HPj&r+DUn@~m3~(< zopQu0I_|vIOVA=VY=P<;Z!2AOk(O)-5$2VUa_Dst-a9ESVQNh7g!$i!G?soj&VPKx z>=zF&9OXYFKk?Z4tH*pBN}6+0^e=34{Fh(Nc#`er35F~csg%Xc6EY_B-ez4_e4Xv) s3r--%wTyAHVHK0g2F4A%8-8+Iy;*R2qIT3~V3K3-boFyt=akR{01Mm^M*si- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fad9784d9fcb9767c11527557bbdc86634792020 GIT binary patch literal 666 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$f zr;B4q#hkaZHfG&+kU3_r8u=>cn972P5NF3y+pQ%Y)Al*bFW?t&ymugZzGL+w_6x~d zoE3tD`L?i#w04Baim+S7s%sAT;lXA$5ZoSdf5ur6%QGR zBVN`rObD{uE9Uahhf6W*{Ha9+*IqtPKmU_c@yVy(r$0{(x)$yra_-5$4+7tQtoX+K z`|#m&Z5uwUOX}~J+BXY}kFM?Qzvo#{Hk>FHJuFwIKY) z?HR{!{psDlbbq*}n`<2R-rZdHCaM+n0a5R`*Vc8k~PWQQgq4 z?pMxJ&z{P<{edTQ7ru_&&GqN~nmt@!c=;Nl8l;FJ9MU(eTw5r-mf2vdX$44$rjF6*2UngHC_IJE!( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..d41e1579914931e79816c38da355a2f76d31a2ff GIT binary patch literal 1077 zcmV-51j_q~P)>zcp ztiU#iAn>FRl7TlNs1~iL)Sy75j3PY5yIf8Tuj-pn}fG0r*inJv@?sBr_JHb9LV0JQ;X+yJNzP?ProfOEcX6Lbaw z=;~XCQ!r z-$`DnX=v;2LHu(J*DsvH)jLnHdrvtY^<6{MFmU(jOSZJMl#_!O`ccEk_`T>C`m%Sp zQd7Vz4ge!V!vKKAL~_mhN=-w@iKC8>gmnE%O+&VyRrPJ116VAAcsvfTrx5XY94r>G zH0=aV)yalb0Os@sp-^bet3Z4ULt|qOS+v&AhR~O-tvmwE^RMA#hh@KDqu*X{bEI@S0}0{ixsar5T@U|^w0+K3e+1vR);T4Sjn zHH=itrZ071st-ik4jTya`i5`6RgB5X<#RFkQc-qyzx4yu55nTRDKuhIXa0TEdGM1uC^1y9(@YY{LA^hn#PenxFZ=_ct~iZpf*5F-UsjpAa^;(yuGo@00000NkvXXu0mjfX6*Fc literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..3b1cec02e29ec627dc48c1ce18f91bd2a0706c84 GIT binary patch literal 1134 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|SeK zr;B4q#hkZMzCOZ^61A!!*WOiVE@XF2TEyO=K1s~qrIS%uKf~l0!@?MY19ue`sXI@p za9tP;fiOjW=&7|&02asRhYCb{=xnC^4BN78M6;Klt--R zWLc0E{X$a8P3tH3`gu0TPJfRt*!WAxjs3S{io8(QqYh4>v3K=_84fI4_Uy{$Qk{B5 z=B{0=8P7HC`urIf>at(<6f>;gWa*i>iF?ZY6LtbO+4uVt*=^~YzJCGZ&0fKq?75|! zD?_+KH?@Rlu>#pH-=6MW7cyh3v-Rx1dqw^&Qd*!U;NTP}(5d(AZ>-9$j+R9Yy<*l6 zRO;iHGhV2Qux7vZTx@f@@LNr;ZDz*?Db}<sOU!&z{*%=@6Y5 zYi4TxKJn}(W}W>vSx!v*{ONftoBs9t4(>aIw_cP0sxt1FHhp?;^0pQCp6d(baQvMu zbG%z@GViWCFCPoD*%u`2xcMUZ&aVFqvJd@^EZ*28K?in4K7N)cHcxr>V^@;wqz8Agv zHq+D1_r0YMt4{sQ=PxX`0fRK0@s`G3_RbJK)4l03jfbm0e7@84R@-sqpKZ3hY21d* z!m`^>o_&uAqhqwROv{>y9=e3vT@AV~=6`gr-?%I*b3I}VsFVtGz zs@!F7Z*AG86{&Tn!8PQhP@4MjA}im`;S~o>IdAQK{hFo1^wu`68*@bpV`APJov3y^ zf5Cu3!uZ2~2D4nfvh`D6N98dC)3x!rn<=exi|g(^+i|eyf~UTnaqOpr0_lWO`+IyM zUeg{mKK;WW=J%Z4V&TIhPuMM%9^Ce)A?W+_%Eaw#r++f)%sIth5OlcnB)>-J;gzTP yA6!j1*|536_<#5fQ->`K7Yld=bRA6oG5rva^0-&LYXYzUVeoYIb6Mw<&;$TWd6wO@bNw4nlPhL^|jz2rB5(hwuq} z2p6m9;3HThgOd(ANr)gw)qoM45{b5W4wBduEtgWQL;lOh-F;ks-~T=?CzMi*QxjwT zdI3-X6aWRle*h@yBncq^*lKJjfaTRq>h-!v)*Z)D$A`NBZ0|G$fbJEq?Z8%JLse~? zDN9nDo5k}ywZ1r`JkL|Lxml(xN!7MfNL>we1pCcB0G^^aGag1-07>-#(y9<$U*Y>c z)0T#6SjkZo7?+zEUgNz>jL1q zZdyH%$`%R>qG!NM-^H?FvbMC4 z>n6VbpS xsn))^01^$V?x1y=CXN)~H#PPbQ2{V^fDcX>w48K2m4E;M002ovPDHLkV1jIH*|7is literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1c5a9990cf7f8e01974da0e771477068f0b7061b GIT binary patch literal 652 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$t zr;B4q#hkY@4ZW2EMOx46C?%~Ct7+|QR?@k_p}it((3g4RrVf+`cDczojr4Uf^_Bkj}w0$(L3PAx`BH` zAmbaRoDhcH4AP_PwartDl58x;SjU z?3#1t#;vT}%r_QhY-jzx#}=(pP*U)mbmF@C#GNwQTT_>0axr*Z76GzS^xD_wD|t?O zVOz9Hz>~*q(F_0iK=<;0FE9N4p<(wy(QEtPD44N57oTqNd)hQT-KoLPc6a7C%{(nA z-5lRNA4r~gdSy;#2ltPcMhpiY{(E=BP&-{J|C7p$oiad8#q&*9&bb~jfp5=G!y~)_ zcUBwc8w6Qi7P!mu-&A9ELdFV)GDb74hS-K)t_1Of#Y{I?Z(tW{jGQ>jg+5Ybri$MYRj_sBD>Dd6Yx;Aa-%UmB zgd_Ka84B#W3^VGRWbUj#Pz)4Onw@ZhrJnmtH^}DC(i;kUd##qfZ38AR22WQ%mvv4F FO#oj-9^3!` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a5cf032fc58f1f17b011e61359f67e708b536406 GIT binary patch literal 653 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S%2 zr;B4q#hkaZH)h=q5NWHQ8ss%+pVC_HkEKF7B?BrbUwhpkp0uVl-JrK6K$Q_ zoZ7NErd&HYVWD@4X^Ew5S5wMwtDrd_USE68%)c$=&)xHra%u`xlp<2^ZD75T!LW@% zn)iTM!eYi7OgSbD(G9(93EUelGUPCtNj2ymaAO84T2sT&apLjX1dA8lTg#qp-}G?7 z{a5$TKl>S(z4T8-$+MD;@Brd)_x3cl=*|=@Z%+Uv{42wmWMt+mm@V6M`1rZsr~clM0CM*nvzm9-=-yNY&q*$q?m9gyT2p>) z!ZJ+;1>ay0Yo`oQaFWVJZ~Y|6X&?Jeh5y(1wY}Ej#p#Ft^y=>2e|-IiwO#GMrW+D5 zF>w!HZ{HHytsi{6x=P^5UXC<9_Z*&odww_EkVw(1PyIW6;mYmi2lA&gGVpyb*ZzLn zFZg}yeHP>Cj~{)~no+)gLFf1A`)#x3h3_yN-FbOc|6W&`TmLK!K_(O!FH0#acFc7bFg{Z=nm4&idtU$4tcDLq0p zrr$1FIIIXxmOuYXP2$y+3b}hPH}nH#?Ueq$|Ih`F&wot&xr0~i)=4P`rY{ChS3j3^ HP62wlzr*Y1)$lRkgKur+kt6Y?RJOu`>QB`Nc%Fw|uLl6=^?L9; zFVl1$9wA$_5OlIj%Lg>rZt=s~FAOP^Y6)Y_+CwITm zXpEhE*Soi0tD*d)oT(2a7dv)bg(aDjT-U|U-mZAowML`C8Dm&oT}j0I{l0c^aKKaN z;mg_CRHkJ01wjyiF{U|=Go&wrYzxo;XghnmiFmi$O$uWSmSyquc>wVC@`1FGERL2p z@y6WD)K9}0Ll6XG`cfCBIv`?M7T0whhG8HK!(eHI>DiR@kWSW#me<52k^g9yalKYP*VgzZGal7*Py16zWJs? zwsT+j7ElC0ZGf600BQr&6ai2hpr#0b+5k000MrJkS@-~y#{>c3{;Pcez{>M79zA}D z&o5u(YD$);A3oy8#U*}zItBpTynn4;iOK>A;C7x~lz5Q>s?};9*Ca)?TE*4PHLh;1 zht>$B=OS}mA0SB2(~A<%!|_U`!kf)z&X+n)v)M$YQsDsjQR@(CFRgZ)t4_$?xexF> z59O_G)a&)TRwYfnUPpOrJ9AxvDoO#Q=jo@Nj?NRYCP8=+tw5y?sbO(3B4nE8PynN| zw6PIwFc_$KP$KOit(*2W7!0I``;}UN>$*5TJxP+!;^N&il`3D8S%P?{^Akz%y^ggOFBz}6 z1#lx6z%76q!2oUn+z1A63*bgDfLj1JoD4|Q)TU`_CzDBO`8b(OEZu8Y-fI52&KGSP z{!Y`SaGItzNfKzSF@3nlEc=age=FNA;)0#Ot#HM-}@|EvMk&V&#c3$i-|r*KGAN}`jFvV~ z$6tp{_}7jB6naW2XsrPNQc3`T)*8l`Mfi~b0Eq_Vd7kGTI&TX_{<;CMc-@u%^}3tq=jZ5s|AxDp+a)64uhVscMxzl9kB>@& z<0cpmhqe7^txHi*ec_9XizVHw(0CdIfH;nAmALww{wW_Q@<&m$_}=MH*o1#=1k|DE zwh&^;ecvd4cC_x;2F?al2cUJK=mTx@H(m-;_|b~1?kI#n9LHXk!@l^PBA__stvdRQ z0w4U1B7odqH3bojF|$n(5Y*C`1y#=sa;S_?E4z|HS84FXu}uFomZ7r(Os z{~N-N5Vrts1OvDQa3dJNEr1)r0B!-?2nKKq;6^ZjTL3qL0o($(@!}0|-W3LbtE(#u z0NrjEhsQ^FBVz9xA$6GR+}_>XVmh4y0M5?N+;v!Mo!Y^{fu$y;wBzyEKIL;OrL?Yn zZQ7)i_9>s+@px>dl(wkJwJ)a#sMZN6rO@m3V2r_VI7A%B*7vqp9LIJv8sYQDPl%!j z#+XtzI89UQl8|-U5~C^&%E%PAsVRfI3j-+o3;fGcQ}v3M3K7Dt(_rh+@Aqr3d&vtl zLEA+U&v9K|UbfO#mMn3-w}&%q|AO zVwp}AN-2Mtp(Z)ET^P`&hOO%ZirCdG(WZvIsSog_VXx`~d}!E<`T(CA_M$$(r-r?& t4`^FMs1M*4z>Q!4w*YPg1Goin;}0I#?{-67OIH8@002ovPDHLkV1gBJ!4?1j literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0871afd115d858ec375ddf696189fe0c0e8e0ec8 GIT binary patch literal 450 zcmV;z0X_bSP)$;Umu?UfLiNO zd<)(^Nme}o5E0t8#cVbM0BklJv~3F_0s!pu6oAhMRsHiRr6@Bi5osw!bIwD|%$jr7 z)oL}wr4;q7tEvc|`#?%bP41jCfFJoq1Tn^;`t^D}sI=W~T?)7?*zIdT`f4bXxf>a9MC^QzE*X#ApJi797U6ka1gJ z{>K;r;Ot05u#eS?Q3@Qk+@*1>3N8h#dJ(yrCnBR&a4E2FtzU~8ArXOy4AomJdNAr7 s0C2Us!;QV?fQ!H*@ftUxiNGWA4O3O$wwt`Kx&QzG07*qoM6N<$g23Cj$^ZZW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..799b6dd4619edaedfa413efd073b2184b3813d20 GIT binary patch literal 581 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VoC zPZ!6KiaBp*ZOq%^z|(Sey@>jBvCv0V^QTq)RylvLIj7##carGb;6F^NyEG0QO>}zX zzbN5iZ(Cwvp>uNDm+3#-%^K909HbqD85i&_=w!IScEN=qgE>QqVGE;)Aj2(&SsVzZo3BO3hTFt3rfu7ntGhI1 zRo3Ng`b%f5it;*nYg=rM=$?{ocV?gFd$Fs}CB^Rj?|CjQzxK_)?$WYr-EG%&;W%f5 z=Q*pgEYp+If?zvaTck3E!} zo`0U1wf1b3t^Qoo@6YU5ve&98neZ@oa$JpCXyv_w-JnldP;lj|-NjSR37OwljLM!n z|BnBKpFH0gvesU{C~)yA^D*yq&g+UlE;sNTTr5a1wBUgn(;Y5cdxBxltc*p?Yz7Z6 zxm4FFY-Ep?dJ=0t;Rg42wx1c+4H>neOEQ zFKUS0a{te#h$x@bw373GoVXW!WVpbTVZ*S6L5iP2x8WGG16HA(zZp)Pd6wKXQ@7>A z!$?Wv`M-YNoEFbwAt(Cmul<$opvuc z)aTx7t`*bn?q8*)^eZ}OmDgc|3r~v{7Rq?Kyr|k6)U)xB&POx%J=dETqzLyIPU^T| zz@wrhlKdy_?|Q}S){+M-`dnO=tolD^{@j@N_p9ZPNjz8aRyuAi>CjVXrKMz*`uMie z_3F)>|5EtO4^|(<5k}}CdE#f$%HYSgeCz?QuKW~C;WFnV>R(aN*XBSE=T!HFU=gai~#r-DAIskbhyDvW!S?brj{RAIKd)KS5@Bd%^ hn6J2nVb*T`2mCpK+m*_5j)9U6gQu&X%Q~loCIDE>3giF) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..b0c525dd8cd6d819ca095fa4c278840dd3f0aa13 GIT binary patch literal 1030 zcmV+h1o``kP)GgVJ`XblG7!wbGiIIZQF^avmmQ_CLt6+G<{CD+r{~Ch;Fw#vY-D8txhK^kBRz|;QFFa`lmo8^i6(NL1~MYt<+l4V)g+S%s!y0W{w%c9NRbzSJXu9&9DBIn`j z@o_3sBKq-*Ptq4bC;$Ko0Br4SV|96j>AH@yv$ODEu~>xbx-5ELyS0zE7Y~GuB+(Bk0pi}@n z{Un0@tWYRqU~6{zqJ02I@qM2G;7u<43`{7|?I|#(uW1^5--oKIimIxR)t3zbs;Vlo zzsZugzUO(E)G93aD1ASzMD4)oK-2H`lnj zxgJ>~5S@$6bbSCPI#16_Fb~Hnl?rP%n;Bo~IL&4gl}d#HVC~jEqF!2^4wIdby>%a8 z+cwJU8#rw=Zd;Wwr;P^6>l=yd5@eAIAUaPUpN{6MMP@-G3SI|H)TjP17=~E6pvS_`c8L^YeUr%4-BhwBw&?wDZ|v zY6H~d0Z<#DCJ%tx05y34)CQ=@1E4lQ&D;m@3qSyyiY1R2`v3p{07*qoM6N<$f_69E Aq5uE@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..f136e33befd05a700ff4e316cfbb5afd87f84610 GIT binary patch literal 1025 zcmV+c1pfPpP)4a9A0QGwVm4Rv|j+Beu9js>dL~( zoFP*d7S@V(%oZtg_Ld~0VRzF7ZUGJtNY^E2?28loz?W+jKPhtV?D#!D|L#xjevS|V zn~WE>1=vPyfNcS`Q5#@efNj(U*cMHx3^}C~oO6Vi7nnwW@O^g|-_FnRI(UQThmRnHfH8)v zt1D;WO`q}buImB-;y9i=pFWr7FPiFal_jT?Cgq=JKd`sAhrjptNm*icov6|Tl|K)J zko2)Me_h7}Sjg$^eq0JPB0!SN1mzx0Mu7?bQV}5CUo-?s#BppS3QY2s zihx7wM7XM zS`nb`(=*0!aBzS)j?wG)@ppe;oIN}kjfSsVTjEQ zfKll%_&-E|F0>5@FE1AEy{{?)RLDGn@bW_Ye%jmPdEqDb<)SDuzBxh&5kU|D$Zzkn zbehs>a?i>S$ipfO(9vK#KR_YYz1@>grG~Z14=|-+t?~m*XjqH<0FxTlB0s>ShPBHN v(ADs)VQ>?$@hd{L0k#F$Ms0v?0k-iE(16wN2EyJK00000NkvXXu0mjfTGi8w literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2e2faa3679e109b5193662492ab446664ec90a73 GIT binary patch literal 458 zcmV;*0X6=KP)R9J=WmN9O_FbqYXiViY?EP_4c2-(y0YMnCr0J%Zii})6X zcOzW_jfysPv5dG*5jkxT1n^%3(S-T=DN0l!1n!BayGEZ0%miivGl7R8pp-%>MNt%? zD2h;3RfsmF6jfD)_$}K0l>k7V=fN0*)|&O^g{Eo3+hP%#rU~oK3tDT8G30qZ>2bNL z1fTC80DK*fgZ(vlPH~Fa1BeJ^S+ZKKSY{df{hqQc5fK17zW^lFAxQya4AxrOwjJ1` z0ugQ7Vy%rNl8~f;wHD`GzZVhex@MVW)OFow4-EWLkfgxjaOmZ9&h-bNbuhGw%6SbfK!`uF1-i&!$q{+ZU^hNP$@HEyjVnJ;4C7ennwjvXU*gioCf`E zKlK2@gc68I5D~Q20B2Vb8L4y$lN5+SIzngHo3vrf{`9n;gZF;23P}od2W#}xNXUDS z_rA}5N-Iw40vLC~8KOXX7bFq5B_3lUnhD$z-^p33-Bk9(+5i9m07*qoM6N<$g4^f9 Avj6}9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6b208dc42931cf18a95ac0d3fd5a910d16613b08 GIT binary patch literal 595 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|OJQ zr;B4q#hkaZ4D)U~2)NoaGqx>{+0ePybp6z0qS|sTp7-_qp!E`i`Gfx`tF{v`|durnu@9|zi;o}{Or#Cdk-JJ{8)PJ zesS!_3Ko|muXb%)mZ@_rLsRwl#+wmdCzE=vne<*Qwf(74aW=9jSFhaR{&x;VnYq8~ zDl5NOwlwT}A3k$4i#TKM?XcMEj-iT55^anO20Y9zEUUWKy}qz5ck8h^sv&YmJwpGU zR8|s8K4Q_gqq6SU`flzPfep9cE?BkMx%%wP;@o%M0il9U2hL9yZxL9q>WXFX4(=Q8 zzcVyQJieHIZH}hde8Z4X!@kESos!R1@|QENsMu0m`WHtUHx3vIVCg!0K>WW A`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6c5a036cc361b57670a87690ec0e8634ee37de4c GIT binary patch literal 609 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$= zr;B4q#hkaZH~PJH5O7^TUrBLU%udE_-}3jiotkQYMATJF>Vfqi#oNovn0uTW+n87_ zJFi!WUZ^-JbF%fZg=O{Ddmj7z6qPK}|7CJ#Br|3ZMHGKyba2_XP1Z$4v1M^}s>_xa zztfZJ6j>zq*~zT$kU7twB&2j`>wd}KO-I`{e71XX>%LEwyME*Hc6Xco`)cNHiCZsj z`N6qu-udeHw9);^cHwe9cUK-Ge-?{N&JvEsg$8)iDXyx7IZaG_MTgX2ukvdn<% zr5`UhTeJr6>3;YsUS$69PLDm`U;LKao}a&C|Bi-YzS(El&g@xnkbmam+6Wd`amTc_ zV!rbC?+eZ~&a998pYHLsk8Q)EUc5!a+@)@!Y>(+iOSBYoZx$RisF}VpA zD%Y=7^yJG=kWdCP_%<`0*lIe@ImmEQcDBuvCrLnA3%4Q$pkhO{+Ycpxbg~NjgzRjY i#T)+f&9?;GEI*CA?(2rXO*?^UhQZU-&t;ucLK6U6i3?!> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..0aef60021d5bbb979a179d6c78a20cf50e324c9c GIT binary patch literal 1075 zcmV-31kC%1P)if=* zUTo(BFAKA?@AJIRzWdJ1eqW7<(8!!pZ9p|a0IChBCI~>a0o4Qns5YRQh7SNlbZp~{ zkBwn*DMK@pvt&I!GdW9(OBvF2-B+(x{cPH(HamThaS@St09?FOuF&V{1YuXFE>gO;{i=1?SWRxQ9QK1ea?NQ7nQ`8@iX|9~P)CVA>FFga+R#yN3 zc{7h3c1tr1gZQ-X z0FX+4#FNL5wC7J>(3Q?Elyf_nn3%w~WYUqT`?`K zRH-gTZ{B^VHoo{+&tr_?%)@b418;ry60!MZTYbC5&w8GxR{?8VT*}Z|u0W-7<-n`# z>g%+5t$(8L1ocph>pr9c`1)&^&NVmNzIU#<8FR@Lg~MUjrbP9N=7wv1&3a3F9N}=7 zUt(;zd#hjD-Q7i@P>?d=MnBRX#oFo$?%wLx06I)J98rX$bsI{>fsr2^n4j>50O zAEqA)g#ZAiX*$xD4&Z;|L|+BGAP7LU0o62o074H#n&#P)?LR|wac}q;5CovwfNFvO zR2xuD5P)g}stE#6Z9p|a0IChBrr`q+dKjvO7d%=AZ{U3A1*EQB^3szqvH4{fKi83; zeh&cHemySViRk_S4lh;nmQ5S9M-?Oz3HKusB#}s9k1EKfjRSiGthGo_D?_z|x0a;% zUIE4!F~)o!JYx)uvATT;ygbH35Dmc5PryobZ@_Q2J;@R3X+ylH&2>Lgi=eemUt5mu z=<0TDMwD7D?j_P5#r=^{slT~h&j8MTFr@3cRxB31>b8!Ku5RJY5+X>=fb~yVm|t>8 zPQ5+!oWiT?u1z^1IrSFimmJnVWu-nR6~Ok{E$w1&n|6D6pzcq?RPv*gup8{OZVwM= z7kk^Z{S6etIQj{E|FuGfVZbnq>ake7&+#@DSz_@%yAbH=<*4+(x6-9CUZU1REhw5B zb+4t(P4vfOnjba7+VZ#;+9&c>*o%!397ok*YmJ`Q=Q)1v5%6PwLQox6Z9p|a0IChB tCI~>a0o4Qns5YRQAOO_{RMYSQ`~mVH(_>R%YkmL#002ovPDHLkV1mB#_*MV_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..67e40b4db58422deb211deb69aa9dc594ec6b89e GIT binary patch literal 1006 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|WB{ zPZ!6KiaBqi9J6m5NYwIqD>lo#nNi}GnCWrCi$6MX!<(=wiKWy3w*B4mw>z**W9ia0 zw%-K2JUoJLgh*e1`C{RPzKV9Ad6RDRrA7;8{#B4Tz3txR$ug0@?2eYk+N3{8;hxZY zhT$etin6i8HinxgcqZsNm>DsHgvArZMO|lF*zbR_gW<#H;|$gDc9r7$YyZAmSG$IZ z;a;AJy1bX*l>Zxx`D?ennRHXVv*{!>qKIY0F2EX~~QX>&~r<{U*bZ^_6XU zgk0UP&&<_x+w0dcUY`0gic`8edc)bm#krRc9lIx1vR33*Ow5m~houBlyh8qYC@%=h zUvU5RqbEN!zU-U)Sour!-2-u5+!OySWV^8N`ukExj*q97SI@RpZ>dn4)W>9BcYEi@ zb(?vYKHc+Yq8o!E%Wmu2T&hW~KGWa6%h6sFnc47kzcgR%`-MRHg_j>BKbJd~FTD8R zVV;TdmPa!_Fg#z{>HgVn(}Wd&4%{dxyW(4Zg6040g1!Led-ZkV7IQDw*PY(Dq3zWX z({Iv>oJ~JgKAc-7efI3xnS2R9pZhj1Wc$&`w?3wnwQ_NTOr+y2XFD!?MV7Y21();G zSM}d!IBdXlUOds|)}M*jnSQgkuS=BBSf$1ALyq_Gfqw@VPKXT){1el?aM3EK>s|}p zCoZsIsOc~Kp)Bcemw#51#=ACW#l;RP^-qoptevv2*fsR%-GUdgjsM>(%-ww1CFb9i zu;$B7e-suy^!yoYo^W%*siGg6n30b?P4K>pO-z`>&%ltnmZx@WPuA%Pn+gpqRM+K3 z#q}up*)&xC$-$2b+#P%y?Y7wk2wBBQOy?<>_F_tyz2T!?r`e_r7Z}lPi$ia6%v= z=0lcGuGosJ(i^(BXNHP%?5>!d#pGtj`^j#??mx`WKgGY zkruIzx@b)ZEof?}$hbwSJGFY6kE0Kw-W%0ToAG-{ zwx7`lD=aPjj1i<%Pf*?rqY_+p_5Cr(1 zTP#3wv*FABar7}YKRcFPUkCueX{#v!CUMLpjtQfX@q0)Zh3Qy!UEu(;O5S}Emz7Z? z$|`#oR6|YWe*&PCnwu{JV|)bd>l>|lQ>Qzd{=+kY8vgE3n0;=>asncP=Mdm%KwN;fRzJ$ Y0!zHP5))QLJpcdz07*qoM6N<$g4Vvz{r~^~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d1d2cb6fd4706862f301d84985be25f33d5e74cf GIT binary patch literal 711 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Qf~ zr;B4q#hkY@FJ?(OinRR?mf~2t*HEYF#24P0c|j8%8UK)aE3C3*qv|nj&jWiJ#3xC= zC-C6ZIzy{<_v@d2C1#DP4Sw5wFJDwOT6-~s>)SOZhBs?n zgEdp4lC5^REWfQc$4GCkZ$dSD$*x?ZV+;(h*0NoS?5bML$Y5}cWv1Gqgt_8hg<{Mu zhrBv?OTTK{i+@(K>-6~z!Wzt{X7V!Z%&g!0!-vDwYL3lqzYpI_el04wc5s{ECyC^Q zo`ciR&p+}0j!Nk%g}!$i^xqn-y`Z{5TUOzp9g?qht?PO zHP6YME5CC3%g}X9JFHJkWXXT3EaCMi=I7bsJ2|Rrt}QTSGI+ZBxvXC*z_Z@s-WeUvtJI;~!FQIhk_r2pwOo!aaXM_oUvJ ztUe14O*k6hxS+d9F+N=Ri*)alCGUA=vG3WSvm`yPcG9uWnt}%>R2~#d5N1l?-oVMY zf%QfU!wse!Cx#qGGew4N46_9oq8ofU8gvh+u^bRfF#f@ypmg(iK~<>?-8e75e^>R(;+mgdbc_GheRMW6mzI%}H+{GMld5sNj%t@u z&tr+(DhJQ^_kYx5F_`OnrK+?ycT$4PagX;w3=UP((=^wGU!QSK?a%3Xj}7llz5bxY zEHEmY;lRU>f}g%mxVEc6K>XDG3rDT}A1bbxqP2(5H}dM#>E6xnAH^;UVoXc8t)eM& zq~`ql$3nGxqtl!0ufJ9o{B!?CmH9d5E!S>lC+~}>GGu4iRW1IEahc1lWxMt6F*VFB zubhAIzvQaDtTB5J<$n1nSHp@ooT1TCa`Wc(bswEg^tz^f+?su-t(1W+e)looE9KHs-{an^LB{Ts5LKH68 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..cb9d1bfd3a17186ced93d363baaf9ef3516c5b55 GIT binary patch literal 1054 zcmV+(1mXLMP)rk^l7y_GRo@bs+X8*jS5E0s$3$hK!CJI2d0ogPzOL(y=B3XwE+XO&fQi@k>!fKK>AFrt1YOrj z(=@8>*Fz1#slT{fXlic#Km%}!*Y@k4zX1C#j1b)VPA#uvs;Y7a(9#;PRNR7PSpWdb zvanR#@-!U;LG^PI7kN&4{Ng3`_Gw%l_V#I*%H=6Nm{NQ>^QjMjOJ8^f6xY`P0Jd$z zvMkuPeeAdszrWtZ_&A0i-1pQ64hQRXTm-HeFglV(B9XxM_BOKFtYVrbIj4O-H-lHt zpDBBLd&JJ0oSejuT&^WkXXyhV_u!w5Jv^pgDwX&;=UFHW!@vR6aX|IPV)W_DbfdAw z$9bM%7`XIw!q>nPuiqfGuUeUD*i50ZNGl(Q*`xhwFRwzuI~iZ zSdZ^MgaY`!vPzxZ-Jaidc6Vbcm#2643P832*+c=zHXxfQ z0NDm)69pjKfNa`60Ir82H>}{17#qgr{wv7exfY}+Zc+=YFqeK|`~6n{z@K*$;+^pB z4`8rTHEX)A(*f0y$z=SGh?7hvg9EBV*Y#t21e~?VKr2J;!8=P*Y_o)>X=E5i=z}*5 z15QnMd5nd?8$e5c0VfMf1pvUkfxCXY;-;&s3)A1`g6T|T1~`9x_e@~L$*?gDqiGhp zeesSfkQu-@Dp!-Ls!F9&398#BuHU-Ny;*_>p#Yq9`j4NdJkKe=9f0!aLm=iv=A{o|Mvc&29uGqMT;2)? zu`zRflC8kWCbTYy+~10+4M$Hc~46aWAK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5a21b8420e8d4c8e00b0df7dca6ee0c63e25738a GIT binary patch literal 1044 zcmV+v1nc{WP)=M$5K>w~L#K8u zo%+XgDxETgOr>Kpg_Mxe5S$;A9q?d`BI89M>LxMBOQ6u}5KcWSlB|;@AFlO4$S0ld zJw1K8v+h2L5Q0U<1JMFRqcA|U0MRH65G_D73Ijw75RJkB(E>!{VcbbclE%vIu0;S~ z^Z7G4j^m$PUS1~q-+urA9zR+czbHen{Iy!mKRy@?5XC>~pRN>FfiFT@%QBkHrc|%jiRXDZJUvIXTtUBQ=VAiA`6OWZCm9eM0W7(u8-Drr_7<`%qh7BQ zTBgu+1MRLwvNR#c-|yM?>agc|_$T%OLFcRG3L4D|c%BCU@H`KV<^`(dO6+xM5!Q~T z8~zQmztiw1>I602K)+|>?4%J}@9d<3e$NgSG!63Pk9`Gb==FOxT-WuF2cI@uruDLT z6~g$hZmxYk_C~L6u0#0&#PTPK0M~V~vA!lzB1*=R(_#2R4Rc4YX_o}V27 zC>+O;9LI?zPJ$?YYPi+uU}bgn-UHy_Pc#g&py9Ri`3qE4h3mS=I^>h^yRHjWRbh2H zQ?qEQ$iT7YO228b3Q8ifI(1&Bsr zfM@}t!96Ps+~orRz|ztZWLZY5)e` zrb&RimFdIN^Rc-?-UJB{LL#>y+Fgr`e*f{ecGn{PpT9`EYZ1dR2o;tmOw%NWVT^GH zH6^`2LI{5!K-b~=J=>qA)^r2Ad;3$b1tx*#dDz|Cho&3;R5(qT2(A$(0ha-@TmnlA zUX7WJ0-A1MYkMcF<|47Ry_0DIMllTXUhwAS27tTNv_|tHb3tjqrp#B^1a7o=<^zJP{3(x|z09OOR z7z1Mr^Tm?pizOL`L1~OJ2E#BY&84wM0RX^uTrw>QjdSR_4y6pC>fVOkQl z<5qgP)LMe|dJO>RbUKvxYl(<{ZMNf5{PCH!V6`DBB`KvyN=dD<@+}R008}7mjOT=MTnyaNs{1jI3P)qESB%rIKZ(6Z|?eTv!b%m;IL{urQ?_aqN>w18eY(?6DUPDb zRbXX)Oc-O?py`@xoFk5+%mUxD@AtZ;#;pX9>fG$|XF#I>f2r&EB5DEtQeWP}3&R(k RH@pA<002ovPDHLkV1ikB&y)ZF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ed242f5a84d051f2ce17cf6ed536a8322beef026 GIT binary patch literal 583 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vnv zPZ!6KiaBp*8s;4`kZ6rxb?)Y-$aytP@{FagIalfJb-B7!Jkc>yVEM|b_7ju$rk;A{ z=NOu)s90ZF`qRF%k-@)TzfkDM>N&>iW=fYanrSt}HuQ2Oh$k#&y1{y51p{`WaD4{L z=STY|mhHCwQGeEQ`u^K>J!QL3pWE4d{><5#mtx;=WNhDk$K>q6Z@boAG&%d^Q?g&| zb@ugVPtNT6A!Kmu4R_W1;+~Id=13^-`Tl#&`JIzGI3&K$+9>wgm-~6lw|md`z2A6m zi@`O&Th;N!zxK6%x3hl!Y0ezW4vvc2%C?Q)UR3vN1+w;eoRe{3X%SfUd$*|5^@9=J zi4qJ9hYb!ybYCdlu|Ha|B_LKQoiFKmgMic2ASQ-2=DJBe5&2OJ4qll>nJee4{Bx@I zz>YS5*>lrRS+?zHxKPTlLEqLc{pp-X*Wa<+zklyv$T|NzUhK=JOb9x3`LXlXCq=4L zi@Us%tYShJJy$hcR1h(MqCv3Jv!sw|iP}Zwqns1w zDTu2(R5iuSVQ?sGidoWdUT3a?xUNG|Q_PlziK@aWA76e@oj60G+o#?8S-ei8DmYr? Zk8h~td^cfd1~6qXc)I$ztaD0e0suoD03ZMW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..03c2dfa80c1fecc2e27f68bf76e5e7617050e2ad GIT binary patch literal 596 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|OJA zr;B4q#hkaZZSz(;h`8OZD76O!LW^Cb~}HAz@e8$0rGtZC5k^rN7h=X{r!E@zwX!!gMGDo_A0iV zwq0N+;~Y6nqwCQl-cy@=%nm)UU8>RL`u?W#g52ncY=8e%tF%t?&NuqDaaE&e5=f>OYkSO(?;y!zO4G%_1?^<_w*7wMU_2>CRqV)GgE;Zd} zXa8;w=k~(x?~x48=TueKHfBqOL@j<_&ERnV`-&}X*;0GU9SHA{}os4zD>LFYV9%agr$>g_TQcQ(&W#>{XCw)U?CiK z4Z8g2O0)L3lr+RFKbDb#(+!u6GfJb{cr&T#<<=i+m)ikPi@CrY#a2+wAI zVr4q-@vEr`>w+I^Zod4`5~OkAll_PJ`#@3jlfT=+!D)xt={3M)!rMFpwgpUcC8 z2$F**JqUrKryjiLD0p2cyh~3HgutUGJ=i{|co8q+QK}DWitRF~CRw%+7!P*W%_h;A z-A#TxvmaPCyJ_e9o$t=>PG*KlDKX9*pf*5F767#YYO(;R4N#K>Ky84Uu@3-J%3p3i ziC+c_^i}F5r36#y2{Oj8 zSgBySR+E-x!7R+;C_j$NXJ@efb^{Hk4tM)Kgb)D09LE_-<$e8qoi0M>nd3N6?cplj z0%36gXo&9>{QC7v*YW=MskelvzGYb$^jTLw)-zzDvx|mP$Kk_A&~WOQ=0UES(rh!T8(8$RX0iPZh>A^6kp zNAM8rI`;blLWo$}+5!A-WN!g#1Jq;zP#d5|={3k0>6~E3E;;f1%Ep?e?vCgEtJdUH0q>8xm-rG-NL!~8#3%AJQtbz0tujZo*n@9 za#J{JaooB2Ck`FVv4w?&^lKc#wrw<99r^dlGc<(LH8n4Uz}?%o*^{NE(fu6uCrP*J zpOO}(%vSwVFfp4HtpLJTKRQEu?D&bqW>kr4`Ccr`!g8&qHO#Gb3vkZ60*EeJ80H!w zpRk9pZrGROILgEQS}h!V(euqx)h7Wo)At=pOhc|`=~v7 zo7w`2Q7n{*PLHRd{lDxAo2HpsS#fRw=6Rls&d>YDLtZ1$r5)YJ(avUvsSQw*1wd_p snk)cn1Jq;zP#d5o3xL`HHDe#ZH=bax;A4sNBme*a07*qoM6N<$g1PJddjJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e9141ca52fa112bfe635fe2ebde3894195720432 GIT binary patch literal 1003 zcmVJNRCt{2TD@=6KpcHR4CabbaykVmL;|9MDiE1UJ0Sr>#mL;5 zKcE{DLx&DXZ2be6nVA^?iHX1z1d15=kSt3`)|p1=Fhem*&YYcV;%j_4Me$pl^VxpS z&%gV~-LIA;36>eBTnliG$^h2_T%$6;wE)+s3~(*LH7WyK3vi9olPYVqTBghxO90^f zC2*WUYQ;CrL?e$GGSSvjrg#r9QPs=}TrdykIfocF_ETNP_ z2myAfiw0}qR=0yU{V#~Z0O7Yj2qEB{TQPw#mUx~A0EpvwtX{2C`KK8$F#=R_N@-e- zc!&mTVK_WY%MzpOk}^%m^XoteQICcBr}hCd>{OzoVSp$MP_M5d3IiMsgH*tA_nj2F z=MX|NFP!H#;V;w)QcA%&hwu9nuk(E$oO4Y3TBfkcKd}kO(Bqs#2$7!8JFb@Hb!9XK z9lsDFAMP36JU@Vm{DmSw2mv8PP5G^>m%nTI`dOj!>pDR7yea=g16Gz((Du#Qj{Nn_5-Le;V(Q40stW-kzsd=P@Fk?4!?i> z#9zTvA@WPvfXeTAUfSN3uRq3L+B`rC$dz?p!>R$M{H4qT@}$R=%WnJg;4l1NK!%^3 zap{huG1RR*{g;2MgM%kl zP1xOin7n@f0sf$ua_2RfBuE(d0dnC{zC0lWlv4PE9_sZ~)5jU3USEYj=z&rSxlh3P z|E)Pw7#T2+ou64@WnZ8O%1(-y7gse5n%;0_;~oIu&*wglhC!xICQaFdj$@_S!G)_` z0KnT9&y1dDygjZ9Ke;dG`@Z$f5kg4PZnpvG+xsY;rtl~*Q+|LB^Dw|fgZ2D?9I@%+ zPJ}WwEKGiYEe#8mA7DenLgWY7)UXiw0X8)(Tz-J5hM9)JWx&!;g)0MG3vi9f0M`Os Z;~zz^T^R{2E3W_m002ovPDHLkV1jGb!y*6x literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..82f04c0db8deb75a73ff1dba3fbb135c1eb81343 GIT binary patch literal 440 zcmV;p0Z0CcP))u5w0Er&JTFYu#QTvLE%d6e!an3cRIvRj;jt~N6Sst`2 z%aRZR0;`d#2SNzM7@NC9yYIefcQgR+y|LEjO$T4WGp}aU!L!%+xU_DwtJ}N*dB~nUF^fHPXwb}!~!RR&}YxjT( i;4jttAJG8NJHR&!!?EX+0r}nl0000k1zPX3H74@OR8I_=!Q4H?jZ?2lTinwt{9L`qzw{_aEml*#mIJGL zESB$dZ9A~c<66YFqFa;QDkJyEuh=oQ!e;N?na#3~_Z}~P#(JA!whRMtM7lh~p6}81 zOiG`g)V=-k=g|77d?%MbFMqby*Th~AQ$M!*7N>xqzLNhn{@v~Z6Ei+LKHpHi<<;(M ziff$rvh?|%dsqJM@Y8hrol?0=jCV>se7s!$d(?6DbnBgaO{KOUat*8yY}_h#&a&ip z{>OiJrEC6vll}aXL#b)ist0qLi_iV>Re$qun^ohC|I3P)s{S&r+3KDB`?vn|d26@6 z_{!e9Y)i?l1wsc(Y)s1MGFv=XP};Hf8AHSEEIz@;Vm_dd&+)^@VlQ9Hbawa7u#%e< z!1eVk3q!ztpAG4{t5!MH*2<;}l}qSp{4NJ{OSY~H%jTOrsgZ{)zu&Hio&Djq z+Ln^0YgSk8F&(^+w2^^fO6txpIX#_5YnKXlM{(Myyt($c?bxMEC))=5^(#Kiy0v59 zmXd1=uQC5~|Ch<{F_qXr2C6%-EW>xvWFCiXAzl?J2Zv;#xp&qU%;qebp=7#o^1%~& zFTb+i`290EGxsXX&Wf*AUiv$QF3eLK}L8(NrtBL=>3b7(8A5T-G@yGywptV;{i) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..563672c9173d0402dad3393b3cb875e1a6542c2e GIT binary patch literal 636 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$u zr;B4q#hkaZ4YO}MNVLU^IzKdCa`K^$W59V;T}iLyJZEQV+AGQ zL@;0%s+MQi^L_n#DZ!8F&!=afKjotG>Unx>9gwr{XI=50d%wR*Dk#Od6qs1P{MD4< zykc*-<*Ye5U*5$sef}+}w{Bg${gAJfAU9;o&Z~S50+_6B%dxchrY4!d@p2c>*74Lv_!U2kh+g zqi&zGl=1h!pRE(UvAbNmp?&x5Hm+e%sa*E!m_IC`9(#!cX^8~e;>%Z zw|HIi)!Atd_oc8NVKLAkxZ zIjXd5mels{v}D>=qctZhTgEAXVdb`CiaBeJ&02CxYX8v%X&P6r?KpYvY{06uh4Kfz u7kC0`@n&X^t)}mkH~;5*ZwZRgv+@65rfJ$bIWGeyCk9VfKbLh*2~7aVpA=>Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..faac7a68c871ceea329b7986efbd3ab7c8a13fe6 GIT binary patch literal 1088 zcmV-G1i$-%Oq#1Sc0c@Jh>-(E9nSTR|-($San(^usO#osXixHo?vGgH$d9*^VFhrP~4Cpm^@vnl+)t6CNOwR29{NI$A) zQ}|~*g+I5Q9{pRNzlN}Op7-dhqBIQpNhA`2a}L8W;JR*S?|B{outuYyRh}+k>yP}K zpjH4f{eB#s7l}k71Y4)4ui6JlnCE!{fUI(z{gDagKOO=-`i5b^^E`0Q8Rs0j`nmyt zbIx@CCrrBaUDw5+TA@OaPVhgkpF$^i>^L5e0|1)MW*}|t0KPY(QGnV2HBkW62B=XQ z1{otA`2rE@7oqQ&C;(~$)IlLY`w zT${sB7cbz|?cYN+rOL0*{>I0*JNWeSH2|RX^pSocItwI#uZtAqcC<(V>2x}bdr~5u zPGi4yfc@5i@O$ykMXD~4&}styd3w23tqQJR`%TnpHBl~?L%-Q>%H=X@wVL?j#!XSR zD)4*3>T{txAseU(_-W@$xCL927lNsa-{W{~2vagt-e zhvOm4Oihb-|GwA$dK=mTiPKmp(LFsLhW7vRRoF0$(8>zZ1eoV}qI-T`9uIkqz%lLa zeGu(vc9_}#HBkW62B?Vwpf*5F6acjWYN7zB4Nx=k0ek^>%v~3Q0&#@^0000Ecofbt_06 zbWjjGiCJ_z$e@eWsgn*_go0BebZeju1dK>0PXZ3wn@l5ze zD9z5%((D|q)oKG9Yqc6>+oII!8gVb@0~#d#j`f||sByN7DE3IH^p&!gFF zqFSvYosf}EDJTK-<16Y)r1TH_;C9kKDf5CZKc^cF8)9Uu#0ENWHOkapU29| z3S?PECX>P8@wS4R4BZ4bKidE9lTIl|Yw+C!Y1qe*BuQXl<*abX~{c z^VhZj0B9H;06-Wfc=0=RIC;JJ{XX^rO@akAiH6ZZ<;!=w@0<1lx~}7!_QLL~eEE)s z(eV^J4!roiFbey_U-<3N&(tOCaA|_pP|+514cMQ!HeH{*PXok?Vcw; zfT8?>BB0gnqiP*UjA($&)mOC+B&S(nz{zhMTAur`eqR2e23*#jVqtd&Pqy9<5V0jY zJvGo~c(U~#3%fhGtUV1Z#0yIs6)f!TU~#QH(9g_1slB*X#=`CnmNqKB9KMsF6Sw3U znw_4q+pTUN?l!wqQNYQsCS+{44{$RzW1H{A?>7kseh*-9hF3$8fRMvID1Qt6BmVZm zSm)!4073{Qgq*m)X__!iGqMO6g+G+Xpp#sdkKVYv)`SocLLzw`j*6da2r!akL7r>V zGarMthnIOxuU|E*!e%SLsl>A(iAb_Fn zMmYhF%I`M`avLyd2<<6wS`ix{T7YQ828b3Q8nFSQ1&Bs$fM@}t5gQ;{fM~=9h!!9k zu>qn5hz9p>aR69fU#9?&%jIzWMjjWY6d^wje)oIy)5j)sT?YWHuCDUy;3<#*{uU{e zX6NXubk;6b&@}D8)!b^DW*0`hN@uB4lY3vk0tv1^Lhd|$!{|Uw$oO^t4m3?eu~dT7Z)SR=Nze-gH3=91 ztnqSne#lNwg<60SKL&XZc<}Wz0AS{06MJ_bhAwCnENxV9{YD-Dusw5$>sW3B-dwph z&~}!rgk2fpg;uwZ0+Kd20PNj;h`kZd$8Es2S3Z8s96c}milulkQS||%XgD?X0a0m~ zsQQ2?G)zQ&K$IFLqCOx>4HH)%z^h@b`hc^5Gyf_a8z5SMXv7AH79bjb0M@kUA2eQP QssI2007*qoM6N<$g3gK#+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..958646dd86a6f9fa59a97a6a2b90abd79df33bdd GIT binary patch literal 520 zcmV+j0{8uiP)cq zo*+$%yh3W1=a%R?-XH~{u|g9W8k9S&t4R^|1dg5TIUvi@{mp21NAv$Pvp0L9syruN zJu7=HpcYUIs0F+j0V0BkFzNPn((P-OW$O1tge=R{pZUFm3IMn~J=0;_CT@r19ZB zqtS@zbjsbw&-6OY@_e>j@#)7+P#=OSFpS&GmMi9)oOf^f04x@Z()PA~U%uUNeiE@O z_Fo9P1D@QY*J;wby8camb-kDUe3LUG?_YsNZ~(le)D4gbMhtLA2YJr=s#_xJx=~3fvQ+s+9&&r50Fg)mr=yxMaP?jo@6WNL0c3>m5^Z-@Yy@(_Q>wTIfu0tYi)29f+|oH zg#dd&jWMMl=N!(tGW)H65Gq|l;IG;35+8IB9TP9(kEj-KO#A{LhqeT#(F+Iw0000< KMNUMnLSTY_3F(pm literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c03a2c718144b3e4138ef47ca0d2e91fb3c14da4 GIT binary patch literal 715 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Qg7 zr;B4q#hkY@74vTgh_v=EZ`APgev=dWIzuNRZ6Xhkk66fq`vH+$Ml$lNmTfRQu}4=| zTEgp}%S3Lkm=Nuh(j{zn8&8Ez_vxK`@69{S_mi3aERvCx-yd_@j!iIedZl`io|lvs?wok;>QPm> z=annJ22B^9#?ZC;*-bIA#fA(MUhmp+JuBHz>hR{ZUg7zX>Fckyz23#r@an~tM%9ML zn}aL1h06Wj*Kfe{@ORx#pr*d_e%UW~tlK@&Pj^RKg3R%fdv7n6?)N_`z%8W~`~5eN z8+cXs%+lbmcW$IPh`1gznax-s7dH7M%h7;2X~r&rDSy1@uG+wV(B$;Pn__i!f7#A& zn~=71#W|}R%sb+37#aNR>VG|s@Jg3`zg=-wn&q;aJn>e~>KA^Ndc%0<->k=C#eXVh zNuJp7@okrPx-6T!b&kZE;?7>J=i5H>J6kbiGGBVZu!PrRG4lj7gY^>l5H8HCA?3j6F1&YYT*B-DD6a zgq@CMGVF;GhYIHut@UeO6T=WFBFTSP@sf`F_RGf(o|R>5X5`Czcj4`piD{N{ZHG^( zt}0?=*u%SN5~E0g$q6s^0~Zyv%f%y}t>xWxi4iEG^LE224O?c53!s$n%zSgsK8H{K S%TEAPCxfS}pUXO@geCw-u`)6M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e8788bd2c4107a5a7e59c86881d6bf7b0e20ff25 GIT binary patch literal 663 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$% zr;B4q#hkaZ74vU9h#a54ywPW-)0;`xF3vdE*V@`Ani8MLWhyhbZPmqTGq*2wm6q^& zVdvQ3Ec|TNmcDBX%{SaEl9~Vb^{v0Pr+#}fmdQLV|9@w%%6FmmnJ*_)Hi|hYGcI7g z;K7i=Xd=WA#n8*rfK{mY1EYYk`1U!T=bu{im47>>X1o3J@AT5TLYd;9HI;kL?6GE6 zvz^}TIKS`jPrko6bkfD;CB9yoQ95E@j(*Lo_%f?*O@3zO_J#TUD?is9Hc+nr zdb^_jZ{_Z%drg`B&Y#bCQ+;$}P}j1{nwm?yih%}P{=E6Q++@N3PhxeO0!2O^HFz-l zV#ntsiw9TFQD^>3GTHU7A zDvLM1zxcg>e)rZ?=4JP8FLVU z23DcT-MMe2%r9CoMDITK+aQi{`2?6t(~>pS=!GvvILdR_2j|6%q%P^^BIUVo$Q V=a=5HKwwH^@O1TaS?83{1OSifHu?Yn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..1ed44c8b669660c3ba11d1f66974b9dcabea81c7 GIT binary patch literal 1280 zcmV+b1^@bqP)a%TT}BUZA@?38q zQr1_W4`q_R2vPw!jswfGh~qf8xUq|i8@ni#N+WfKWm$m?iRydnnx>7_MK~<-CCjo1 z`>g9a)ie#JX}ZS^!+@^ql>Z(8eDPpT+7Qpy%o+TgIx|t9XZQ;+rZ0lf&mfPk>$KnR zBWavlu)GWaBPY-HA3484*L6fO2Jq_7 zXs?ca$Ez=TVTA`m05GpF(b@T90DwWe>mK*iNZYz2BreMYefNqdwG8bzO;=wu0HHg; z%b?vwQp>pF9jECUI|wG}10YE)gPlJrQjeZ=0Q{97CO%e=5gH*dN6pM7!}r(Vzl=}-L&k*6+z*8Ryt zY`^-Gka`4KjRsnchHyP>{B&wJZv}2ssuO&g2=$H7vrHU-Y6Gf?15j;1HE{r{4X7p# zK(ztY!~v)_pqi-ixiO0=fgNBA@cb=x_doz_j;7~!p}vDE|8FV1o(M+whh+?&|EG@ z%jI&&r#eo#Tt+UJqX6jE<~8tMHY*h>J0ZL8KA==8A-k}MVzId2ri3XLi^wi4PF$BD zi&OyoJblpV=qO-b*j*s=x3aIrM*{H9(nh&Ph{1c{b$MU5Z3|EO26_Y@clCF^d?QGc z`-b-sI*yIBaT);d_n}8Z-X4ea#K^q91o*GRi)?j>tbV9VWS(WF{@>v^0M!Om q69=H$fNJ6ZR2xuD9Dr&As`(e!7 z`VY2BkS<%h2#|kBQu-ev7Dnm-0rGHbMa|L!!?Z8xHLy2@HM1j{mN*o}u_GQpkT|4x z&K%vjGveHUnX%6Jz_$S3=ne2Kz&CmWd<*c6-T>bMe4{tOw*c>8<~v_yL{Y?16!B;@ znmIWdjaZ*srB<6izq~N7dHnPG$IJ-kEro+1m?4)^f{5_fKYwE~{@0w_ezt=zKKmR( z2q>kHWm!;lzhw|b5r<(204R#$)_MD!&A(`=|6yHnDWy67<)@#qx3@QQtTDZg+ccrf zUj-qA{a%}YVFc)~vIP(kzKuTy0DSf157^(|Hv#}aDFpznL_!t6t;6Q6;$IX2wUVHe z5=tqI$KzY)e*fk>^LacTLn&1$b{Wj$x6y=ut^qpqlu{rf(=LR-i&sza>&_>5@#^W! zuRugb#Ii}TiodMG=54}XD*}iJL=*t;!wUdjza(6K`aSG+A_{DgZNTQQN`Q8|D}Svd zSS3hzTpvGF%rzj(vLMT{nKnJ$9335DYikRqr>Caf3d7*|_;_h?Rs40}!rv$Y0N~)@ zzD9$uvw#a4Ers=X3+0zH$6aBX6HIbkW(d|^2?Br+!dyIf_O)q08~~~F!~g({kS?J4ujmYKivc#m=G={PfF{4DNpK?~Z!EwS+Gv~K zZg<7nKM&{)@GZa<1yv8XyV@7QDG6TD8Qx6CT%Go|aYbjis^H1hN#lDuO@j{+tvnC- zKVzi^JcObMe4{tOw}2{iIep$s1G=0(@1+4}Crkr11aF>aTnUP;!aGIt(91e}1IF6k~IQ<Q*NH|A;-h|Md7eYWvi6lvors>MV zKzCkB2_Xc+Ftj&jo$u#lz#@VqNt^|^ViAX{39ZcnUG5LI$+h;=U~fQ^FA7HiF`AYB9}1BfWN z#(>|2I|#)lHm21n=V~(Dt!=+V_AU*N!~nWh;T>+a#&SAw*5Dig*E9)ofPo=Gv1xUF z(%Cwr9T7Wdd~7u~eDd gI-t)1z6JQke_d#vvgTYnPXGV_07*qoM6N<$g3;CbZvX%Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3147cd7269dea95f7e7101f568eecc898e153064 GIT binary patch literal 457 zcmV;)0XF`LP)+{Q>?HU=)ZRouh=UizsGamf~0O0!l4YS!SuO0x9Qo?GrQn{c?fpZQirLN6I zA9wdXu(oZ{h214p3Q|gCZ~!18Oy?tfPA)N>j|x=VwqRzYl>QeWZ>sIVpKch-&20~| z`@Kf$Dqv4FZ6O?0m9_NJ0n_LJ%U7#bP1bv6^v3L{|m* zU?HMX4LRRL1ZypTk_M9jG}`MN$diW4KH533dS)2NysKlH;}!aGR^?%{1It(r5Jfz@%FYm4 z`)$3m%eH;%x8|<)pL@TxBjfhA=>L`>>c@BAriF;bx2jL>?BbYH?4g-xH~;awM?wrA zULG&+;Fxw=HOR|DGqnEl%XxLnKYzSi&2XT7eZ0Z!vztn-ir$?~VKwn(ejZa_Q(oBl z`=#c&^?tvK&sm!I7Ed_$^D5`N<;!bl?6hJ}G-XNddA0YtK+`daueYDiJSJhfF3!?vtrdM^LKNaI}$cV9H{P}60|-4 z`@5Tb+H()49Z-AyRf^%k-v4iBEZy9{U0?B*?b@@A$FAILtz_6A7kD?wwyHkz<(tDL zY=5!?(hl6vVBEmFL6bN_raM&F_7uaKSs4jS7)v5dE-wD9^(Vb~&+5*&wPDr0y?Lw= zrWb9eJ$(`I#Oy@#_QTGTE-Ucgp`&Y$kERbF9?Fgc-SoN%V6 iiY+35DM32nv#`z9C%omeZ(RnaF9uInKbLh*2~7ZRB`LiC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brosblazer.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..120d0e5d6dbc6387442278d5f7951d5fc08cd2bf GIT binary patch literal 664 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$n zr;B4q#hkY@4fAdrh_uy<&YaiI(88r+m>#FJc>6pBhjkOyUJnS*lby7{!GFS8ONaag zcbyv<;)De6#ZB{?AQ8AUip9U@C!?Io=}*V+E3v-TpCNhtjCv+xW)Z_Brb|y4mar~4 z$>_oDF`0RS*aS6p1ziPSK8GlWSuzb<8cZx1fC~HU7z~QPXDKSJd;RO|W+SDjFP}FX z?%%a;=l=cnacOnctOA0Z{wIKU?~H!q&2h%->&D z+nMXv)K{BV)?D2GC49B0u;7%Sf^!dFKR0GLFnzxLhMPGKE;rtPFF1G5GJMZviL}fA zey#mpw)^PetELPOZeM=iSbo`r`TarBfKbsXL3h7BJ*z2q{rTOK3=W#Dt5)4BbtwM0 zSAN~Pk2~y+KRuhdUH`>f{ibVC*P=EXwyoXz=k;$OnbVWF)>OY#>qyn_?t~9|2|W)t z>D-Juof^5xux2VWm;FWo3(BO@5FplPhzPAJE`~Tjg5>T zc_!(q4*}!pXA(=;$3*s90NTlP!L?^h`N5jtLs&Ji)#^dCSt_-I{^4?E5>ZZjmgL<{Gy(6 z)pz2h&jRyp(8=n0)xP?4|HRwJYJT^8?yAV)ZMM_jV>=C8%4GJHi&l3x6qXSoMcEDX zVowi_k+N%tv{inA`ISe3JOfa8^jSx`xN3k?{9tD!`XEw|{`|@#yQ+WP(@I42g_;2E zbm)F3V$8QGKcM=}&CR>|i5Qt(wiEy;m&@M)S5e6XJfNa75WE+r87=Ua8 zvIzr_Z9q0*0J06prr`q+8Wer2cMJgV&L>H{`(Ye+&wuKxDONgf{*C`0Y+?JK0sygj z2=2E*I#o^g)3XZzpnNs-C8npRxebWW-`|hl|NH|0$Y@`eU4Hz7(+V9C3gm6jIZscw zy|n=(l}eG!ff<}2$Ye4|rBVa{nat+k^z!84GU1(&6>0)bHWqXEX)%Y@^(xK}epBz^ zn7En!)pbpR2wXM5IZuC7^8hSRFSHi${I73!fwtBrEX_>>zEEmuZh|-`X6uD30Ovft z7Y`=R)on@yk+lH;e+}@Qe_vg%avn+?H?2KSbYn)S6CCa9BAZWl>{VjGZWB1Fexa?k zsV0QczAloUUEm(Q^>ux~jXU?1Xfztw+#mo%qfvZu?juhRJBp@Ew(S;Q!LAZSI}PG4uktqSXEWeb$CH9k>Sy2Z30XI zyv{WI>u?x=Yy+|h1CVV%Hemp=4ag=8K(+zd{0~zJr)AHzZleGI002ovPDHLkV1gtv BK|cTh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..15eef0aecd259e571d71e4e99d4aadcac858f394 GIT binary patch literal 1167 zcmV;A1aSL_P)5<@AAybHHJ9-Hj3MH}Ub|{%jY3b6T z?$9Y6-h)7kA-hW<&_cxd6Hi(2ZOG-3I7JE`V+Ww1Y7= z^oZi&&1>x8&1B?o)?_WpJGSTkz@z;m1#?VfuaNa7I008eSJa=8ZCi0I<^(Ptv zHY8~~OUXOMIx5P#7!QM620h4TkpljR>PK(w=>W#ZfW*J!m`aNGc` zRtw+WzedqAN8YE3xPHjl=yw(Vi6UTWaR%*9AIEl=x1FAz4txT@vE4Ng$3t z4l4X31)$JtclvPLfVWc=066#b9XH@cOdADp{J!`9_!oJpU6y~M2yom02S+Cc0JJ-O zPF^m}aU-bx;ON8<#YzGqf7}Epw#)L56rghZ5w>;@@$}iNfp$`xoEM)806cy63R}B} zsN8-uu_1A&)wi*=dx%@L$5Qv*sy)Wm?jdUR?XiD5@iGVi>(v!jF3s_C+vy>CPERTg ztXEf9X<;^YjMFfQ@+Yzk#(_d^SV(4pXymCtNdWIGgyROdTAqjF2APZCdm(%;gzfbB zcUAl@dxP!t0039Z^ZfJJ?gFl|4N`F2fOC~gbKD+PNC_a0Ki>;cv`qM3$i<+QAT5*@ zW_i{}HW0V(g-Veq9RVVl?eus$9G8uy1>$$yfQzDvspbG$bF-WSNNAB?Y?sA_-w((I z&~1P$hAnxjOQF;x=(qvm^6X*lNkd!$MNG34N~OX-BT`F+e--2c=r%w%ashN3pc}aW zx((2cTman$=!VjMfGQ>_$;&$X)EWVXVQ5dcGZo-Ra5xI3A+WQv!vJ7;c^RvfHOv<+ zDX*d;sEX3{J@)0(Xa0V2V`D?QBk5m*;`=tMVB+qd&#_ur!@V2TR9}jSSg)?Izds(~ z%csxSfAM5sOD@_x1DUOKRKwQKfwJGre2@$mO zLe5iB!d_!DvrUn`#wMs>!YY`2J6>g1NJ@Y#9Gn)iHYTYGn-oaPLM{sy}G~>i4e?oYOl(9iT~X|HTvREB2vf2>eL@rjwWe z(L$U+z+eINegkcLR2x5dX3P* z(TPE&DM0qllMUif80P#WxbS&EE`V+WbYp4(bpAj}f?HVt+v)M@?JOri0&yPO-Sp}M hE&}p7K(_(9@gD=#qOwupR7U^+002ovPDHLkV1n0iAUyy8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c328db2a52b9b5b4b2808711fd8495533ee7c6ef GIT binary patch literal 464 zcmV;>0WbcEP)h<%BTo zW{?&=pm)HHbpuwR%Fj#*Yw!LDHkSDkc5l68@|*eR_8%#@u=&`GsqeR(EqtlBjj649 z-rd`GBQ5vWS2XOsEBpLY>A8Oo51!g;X1T88Kg%SQOfIp|%=LPD@l%US3p*ES&0h0- z=cEpf74xHHT4(qkGdOl*^JC@T1?BxWQ+h18=FYqK-jcukyM?vgrehMf)t2)rG5PtO z7j#c7p0iBz(@&<%S!T~4X&gEE@@H7lEdh@+tW63IlT^ygBp)9>{(VN8Yw_CqZx?7y z|MBG~x7*^t4SL>M>-`Y-#y@mv3L)@5Y*a4twV;k8FHBJ9_!0NtSxw)%J0Q zJ>3*}tWac;*7PfLN;|kU_S=iTEw|n;v$^Qn$MAnZX`#z&Zv0s3`E*aqjs~Cs)9fGp zdS-Uwllzm;tfuL*i)KIA&z36ug%@97q6GPes3mF_6N9I#pUXO@geCxk!5vKi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5fd5ada0888d51964102fb868a77ea5761d8a8ce GIT binary patch literal 749 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V21 zPZ!6KiaBp*pUrxdAkua}Uq;03=v0l|>FeAaU%0Jbuz2=8Cu{Gwe^tCQs|D9~zq!5i z0@p;H+mjN*k{&&9u-L4@ndRdn^Hk-B?Sn)ApI6&@n&@*W9Wwmf8r>i*$*`Tl+=wBM zF)xMT4%3|z3_DnNOk^zJE>LEEAojqG?SSrqUY>^NhS`hx8C;&k##pVjdb#VJb@;W+ ztHQPa)?8k7`In|$?Dfo_-=2OInpn>Sln?c`oHJ+cuX_ukPN|x)T$es@s=czPtSd{i zJ#Y6zZg!5FEbsE)8*J8nFWI$7rRd@76{}uVp3CV53OdQ}7iyTDv~$8UY9?}3JWj^ljr=@r}5qHDX?WlEiS$uw(O z<@V51kuh<1Wr}P!{*=$(xF?oFae)R`Z#(l7ZpogWndR}D!&-7JfBbu_{_F2PiwjX@ zO&tqXy$X9DxBmI(Z>$V8eIc8}j;z05pXeuEa6CKZ%!eO;X014?|G4V*H0Hx|7Ki

}D-=-i=ga}M8n&w0COf_@4E!%wHQ)#V8c*XEyBH_JXc z^|hz^y7Cw1j<<^pjM7&A{1W@9f}JhFPu$>)rQH1Z*2Hr_yQ-(!h^+g5__DXk`(EpV zTQ;qI*|$~LMr>aZ_nXPFYCm46JHVp?Uz~M(ez4)1#oGEk9Wn>DU9(tG>ua^qym8C6 zV~#Fd3R&56j%jv?I7CH1)^K^n`e@sF&v)Y2)J=*Eom^gQlV14t^|tFCOxEJc?+zWh zb$y9`o$$tfrp(;l<{K|(Cjd419^q5S`#r0~^ RNCl=}22WQ%mvv4FO#si3Um*Yh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/brownsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..07ee21d9a351f8fd106a6b66ebf2cd2179a79cdb GIT binary patch literal 1280 zcmV+b1^@bqP)IrP=8RYd1-$JnJ z=k<+>|Fd?c&l>>O5U`2^z)wG30|5MG{8@4wjzn=I`88D(g-e{5a{X{53a7tC^z1Xlpo^chV@n$YvcCYp{km9(>~kX%^s%%q*Z z6HK4CZ{a(@I{sQ(6x()2wO4OqYz(n8F-LuCD0ccha0QUttb-cq#d11_+-4og>l@g6 zvWK0WUF<#CLtfv&_{C|moX$aw^dh%ehpDM4SB7}?t=Q@F!g~i00OX^Qk4bymJ`G2r zIDBZ={DdP>%v`xZt>*#2ciXRU8?j@q{v>9UleYR+ob-9%S_hP~et!iW-F+p;jiKWe z=RLi3*-iH*JJVlcXBzl0ktk_*d%N4gy$%3?4+aM@`q{g-6Ox~60EURZ=L;bKxcker zDQ-6z`5i*J{<)D$=B>V(zCqnAgj@{)HtDeAnJX8#f2O>E>4!ogQ~$m9#|Z!wi$(K- z@gN+4^~xKDVcYH}PWsO#K{Piv^M88?4gp0`z*09118>J-XpKaWTv#Y+_iG3oq;JLZ zX8|jQVVKF^Tv|dw*DKon#7W;RLPKEW>{-Ol#E|_hi-NA>=F(C{`{k=wt1`r+UwB+Z zHoao%fAz&hw7%NxO26h`h&*=z6do6a+W!loAyCkD+cD?V?ln$2+4PF*K81b-o+o_! z6?oAI0+4M$HbDTg4ag=4K(+zd1Odo4Ae$fn*#=}&^8vVeDcU$Z0RU(jh~c%@k0Uem zmZzq8>An3c{&={Jom3WpyE=sM(;zEVv*VtDQ2-#Helm*r`FUXjZivU@`2L4k0HABB zS+jlV_5;G+2>J3fXsy$;&s_3408mZSXriow;|GaE0-B~#0CX;S9ab-cLtRv~AY1hu zp!K(7OV1#auCKN$ZZhe5Z0Q+j{q0rvB@}?QPG4RJI2t-uwHaQ@wU`%n7l`!bY7(^L z{CFes`aV?@#n<{^d)q$M`Wrp#Pv{P?*6E#iczb#W2q4vn&E za9-cQaD0+9G&G2M5Mnq!Np8)5L#-P$7;C9ny1MwYPzatZh1r)^Rn?2`4n$Q|496!c z_6fN~H~{OW1S_hl`dS%g7={6-pq;!Ogz!>WQ5460cz$n@5z+T_i_D8m%|8wY0mwEW qn;-z$24oWiAlra!f&gS2kj=lDwOl_R`PBaa0000}v`DT_rj|ejDN;Aq;%tePRjatk z_F!hbl2i91j#f8yJ3e#aMIzK4i3gKT;aq8LHBnD2`S2m9MbAQ%DwH0rf0 z=gsHL_B#pCRS1yA6CUi{0|5M`J%LX!=rI69<#lu5^x6xo z?5nDB#Se2itNpHefUZ@sy0#?%K)INw<^MFE)9<8wb!|&9i{%Dp`&JJ?b2+PhTLB8C zYmnp>j7zth%2idt+0!$;5x9Y~r)N!f1pvmS+mPfH6iU~+cEk#Qa1oNcg2%P1F>c4> zS_G230)KF^<8Qkj1_2`_7yzJk~M9J%a8ypf5>ARr;9RSG@V z#Vi0ZI=^&_{>^1maQng64qdBKTVW~Ivj|KAnB$LhKUGzz80Hb8AB=>j>8y|VKy0h3 z(sqQf!%+wjW4UY!BjIURV$q3xU8|x|uk{puj$Vg}aWdvQQQj#;XtR9)5GUsx)i?C( z0iFQ79blz()=A5slpNL9^+V7w4E%WiE95MOJ6)?y>=*#Bu&{ueiDiUF-s1As zRMVdshv^KCkB+9>xelYidgZ*tIHunOtxfk%Egu`?OHT{{faW^@zoZF4NNrN=r zhZ2ZCPWB?1UWZ%r1j@xc0>Ka(^&0%aMSTC=AGrU+XMODrpL~4J`1JF4ab7>7wp)F2 zJwd_@S&<=)CrJtC^&?D#Ct0gwW+FU^^ZF4;!bBh#qRa8^R*URl5}?!O$E`$$*#TBM z*q*yWP5B(e8<%U3~v}@yi2nX4C;=`%(h=xMD#&^Te&jUOGcsszGo&^|Gc9<2X%A=m^ za4djUDbVcgK|TNp#AYs=>R*1qFyK7{csszG{{V?|SK5%SA+-Pi002ovPDHLkV1izx BVa)&l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b752e9ba3667d8caeeb75cc8cde8bdc711a57696 GIT binary patch literal 519 zcmV+i0{H!jP)k`Bu?(c{^t`BCwHRZG|>%{R@;-1s>)S@@86CA_z~S?>^#y`QgwcI zBwB4x+F>~2`s$X8%T+cv0-7IIu)@9>cyQr4kJKK1noYHjM!!gl*R{_G}uHL}Lbh|NjD{o&D7Lui5=SkdM!+ zNT~rn z@)qZX!NGbNoS`C0QKbPgFG{RW9x3cx@}%4^uh{;=g6t9tyI)JWt@^G>_0Kfj#%N~7 zKpfF;$B?o1ea#h>k0mdE&kFMTpZ!;DQpKvNLEhI(u4X=t&0zxa%zw@He*G?kTl(+W zYtOP}%eQR(5-mP=TZcVUpvYO?u+7}E@^W{*)a`7XOn1-7j=eh7MWx}_y2`qSlRMa# zPPupAyJX(nB%^l+KR1V!zu)Bt3nuBI$Q#^?J- z?lC4xSfx&5Vqj}7ee-Tkf+74zTTY8C9^6vaa~+=A}~$!*W%~=PS4ejs3(NYTYM&HPj&r+DUn@~m3~(< zopQu0I_|vIOVA=VY=P<;Z!2AOk(O)-5$2VUa_Dst-a9ESVQNh7g!$i!G?soj&VPKx z>=zF&9OXYFKk?Z4tH*pBN}6+0^e=34{Fh(Nc#`er35F~csg%Xc6EY_B-ez4_e4Xv) s3r--%wTyAHVHK0g2F4A%8-8+Iy;*R2qIT3~V3K3-boFyt=akR{01Mm^M*si- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fad9784d9fcb9767c11527557bbdc86634792020 GIT binary patch literal 666 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$f zr;B4q#hkaZHfG&+kU3_r8u=>cn972P5NF3y+pQ%Y)Al*bFW?t&ymugZzGL+w_6x~d zoE3tD`L?i#w04Baim+S7s%sAT;lXA$5ZoSdf5ur6%QGR zBVN`rObD{uE9Uahhf6W*{Ha9+*IqtPKmU_c@yVy(r$0{(x)$yra_-5$4+7tQtoX+K z`|#m&Z5uwUOX}~J+BXY}kFM?Qzvo#{Hk>FHJuFwIKY) z?HR{!{psDlbbq*}n`<2R-rZdHCaM+n0a5R`*Vc8k~PWQQgq4 z?pMxJ&z{P<{edTQ7ru_&&GqN~nmt@!c=;Nl8l;FJ9MU(eTw5r-mf2vdX$44$rjF6*2UngHC_IJE!( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/creamsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..1b7ea4f7e4dc830daefa4697a3cf09939c72dfe4 GIT binary patch literal 1284 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 AqW}N^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8ed8a668f1b8c4553adf1a81cd0b9bb82c3cf084 GIT binary patch literal 477 zcmV<30V4j1P)T5otmx6Hf8Bi^?fe7?M$0Xu3vC>a|^(me*f~GM@|5?_W+(Op~F6-WXPu6V3Z8e zVINPH05YfG1W@&TVx>s+bfGWRQ(~pCur6A6F~v#|4HBqT@MH;3mI#6XfFKBFy&voJ z)0aU`30z&@2!Lpi5G%D9a?Zar0D$|4;9I5pr(GxCQUI*V(j(PV#PAgWF?=P}Q_9lI zS{2|p27Xek6jAS)omwS#t((3g4RrVf+`cDczojr4Uf^_Bkj}w0$(L3PAx`BH` zAmbaRoDhcH4AP_PwartDl58x;SjU z?3#1t#;vT}%r_QhY-jzx#}=(pP*U)mbmF@C#GNwQTT_>0axr*Z76GzS^xD_wD|t?O zVOz9Hz>~*q(F_0iK=<;0FE9N4p<(wy(QEtPD44N57oTqNd)hQT-KoLPc6a7C%{(nA z-5lRNA4r~gdSy;#2ltPcMhpiY{(E=BP&-{J|C7p$oiad8#q&*9&bb~jfp5=G!y~)_ zcUBwc8w6Qi7P!mu-&A9ELdFV)GDb74hS-K)t_1Of#Y{I?Z(tW{jGQ>jg+5Ybri$MYRj_sBD>Dd6Yx;Aa-%UmB zgd_Ka84B#W3^VGRWbUj#Pz)4Onw@ZhrJnmtH^}DC(i;kUd##qfZ38AR22WQ%mvv4F FO#oj-9^3!` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/detectivesuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a5cf032fc58f1f17b011e61359f67e708b536406 GIT binary patch literal 653 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S%2 zr;B4q#hkaZH)h=q5NWHQ8ss%+pVC_HkEKF7B?BrbUwhpkp0uVl-JrK6K$Q_ zoZ7NErd&HYVWD@4X^Ew5S5wMwtDrd_USE68%)c$=&)xHra%u`xlp<2^ZD75T!LW@% zn)iTM!eYi7OgSbD(G9(93EUelGUPCtNj2ymaAO84T2sT&apLjX1dA8lTg#qp-}G?7 z{a5$TKl>S(z4T8-$+MD;@Brd)_x3cl=*|=@Z%+Uv{42wmWMt+mm@V6M`1rZsr~clM0CM*nvzm9-=-yNY&q*$q?m9gyT2p>) z!ZJ+;1>ay0Yo`oQaFWVJZ~Y|6X&?Jeh5y(1wY}Ej#p#Ft^y=>2e|-IiwO#GMrW+D5 zF>w!HZ{HHytsi{6x=P^5UXC<9_Z*&odww_EkVw(1PyIW6;mYmi2lA&gGVpyb*ZzLn zFZg}yeHP>Cj~{)~no+)gLFf1A`)#x3h3_yN-FbOc|6W&`TmLK!K_(O!FH0#acFc7bFg{Z=nm4&idtU$4tcDLq0p zrr$1FIIIXxmOuYXP2$y+3b}hPH}nH#?Ueq$|Ih`F&wot&xr0~i)=4P`rY{ChS3j3^ HP6;@ohPp>#8)sL4?1poC0^h9oWsH8~qCcc&o~UWfQ8&$g7j zr<3k+wSFMZekbeu^y$54S^uX|O0mwor`mvO+5l7=P)!?vY6Gfi15j;1HESOLD5dY* z7~B0m48x#75YQk9^7bGIs9_k?FpNgMGW{ru=;85EzC}^AqAzk@lv42kn7CzGxu|7X zxf#o{8V!NhpX)4a%le`L2n~Vlejmfph!R2o0K3Ec0Dv@27v9hRUwa74`h*aay_VIl zGza*;k0eO|07;U-_x(cCbx_xF$`A^GPoJ^BzrXO;aU1||uEKCMs?B7Pei=+(^w`op zfOUJ{_wnl0zxma7U3X>QlU}{;ejoNVyHFpH*8daSYQm7vAf-zOvu(FL$aOKIh=> z_c*u<+#C!R+N*Z=A~caFLYnqE&~I+sz;9t#I3dkVX|vg^Hgn6!=!-t-k_x~uj9k2E zGHN=60{y(J6GAAjFB(9lA;2ab?!EBWR2>xQ1JDQ|h@vRJU?NBdz+d^Y*G=*keF^}b zPDlLgA%7pB5kfRVh?b@)uG==YHa8dAC66adsXn(!QRzmACBHWwBbiKA+MA?IzbaBg zU~6*|_B9*fUm=po1bgH0O8cFA_fBL;L_c{kMfl)huK&Y#-{O;vP9^=de;{(^0!Us= zrP|+x)DTD}lfp4q)?PPdI^lzdm5(WPBXpJ!y%9QdL!fTj08|@LO&fq}1FC5QP;Edp zZ2+nbsHP1-wE@+veE^jnihl6*HUQxK7dAfr^dtQF)t9xJ66LdBf5$)1UgF@75J1H` zgvsq_T392%*CK0OAHd-2^lY2g;b^zprGupk zP7@3U19ZDx3V`ko?}PU;9F3@KLH5LRfbaXTuUsvx4mXACy0EWYEnJr%i&Ox7o&L1y z03t9itQW|9_C%$zpGg819V-7uIr^9uG_Y@Hy)qvQ(<=U{Hl?rFijI#mT7hM zwkiP>b~82vn!NhJ>#*MvbhASM0OqSO%RbcTSD=i3txIJ7&#e8=;Whx(22|4qpxS_H k+5l7=P)!?vY6GhI4~$3*WW<0$%m4rY07*qoM6N<$f?^mY@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..589510234d3ece70d4fd79571a7b81c4ea8340a2 GIT binary patch literal 1104 zcmV-W1h4yvP)~!;=Rod`~w-88Tkj8@;7A2 zl!1x8?daJf$_^wM1AB;&KsWH?Ua#XijgaQg0wF~H zF3i6)2Bh7J5Q1K>huLff0GQ2Y==FNBfJMJ6i>&()LJ}QLbF1(d3WBcdf>MgW>r_;f7It8T^%bu1hviP%5hCeq3Y;JCHLCzQh0QkNS0AP&8Wa0@3frOA)bd{kX zTwmsw`D6$^Y5v>W+g$!a9>5p_W6T0DM9vKYK>#3xLDN>i%2g+bqFYVfIR*fV<3dYo&X>*U9AFy5ZJbz2)^>PEId;M zrG|hYqm-so&{`mOHj1K3!>?2j6y##gtuqkHPhXz%%RYd$Uk_*uU|N7G76rMo!B;5= zzK*-X?Ygmur%FDcln4BaSXnCkzo0RIX#u9u7{Igu(`XD}T7YRZ1~4taG#Ue#7GN4{ zZ-7!uVkajj8~|Fa7IyY_@#(`yBX3O)PmlcK>^$C|JUTj3*P&7%0lXC{c%H|7-;awG z9A~4pnp?-&hzlcp-{-QX^tIXwB!KySdP*s5+eQ>c2!a6n`}-?h76)FI#=|hg!NEby zoz|pMAfapku`De*FK>=!ZB6M$dV5SP%8Ke0)d~@%AXvw$Pf>I_oy>MsjoM}b-9-`0 zxQ>sHwcJbVH0U^=b>6NP4&`ZZa&-v+xHvn<;o)K8-1GAvJ*sl>!to)|76buy_I3dP zUpK!f-A_w>fCz;5_fNRFxn5}y+}hgaj`L!GMJvQ|Ag*;$w5SJE`8OTiUZ%|eDm%kf zmfPiGC>>Ca0rGCF*c3HUB_bOkuYzFPNY@I9T_aTu${rvD0Ejcf zx;mewL1chs3$)h$b+|ErX#u8D*#IVAkaTdD+8$4rtJN6*RdrNa4_F5@F~GC{)A$R{ W>ZD9hyTc&6T-ntcYC0cL<1;AH@a2tFr`1<$+0I2Gf zJw?=V8^#!2M5=9O==&b4)e76~7VGsI%v|SH75n|ZX&;&@ARuz{O=xCxF|J83?b~&C z1t+tqRD zfz~D*4ZzI5?suumSb+DYRcD=pdkCSP006Za$DRP7u>z0OYy1z)05iZN^$pMA#p2S< RjBvCv0V^QTq)RylvLIj7##carGb;6F^NyEG0QO>}zX zzbN5iZ(Cwvp>uNDm+3#-%^K909HbqD85i&_=w!IScEN=qgE>QqVGE;)Aj2(&SsVzZo3BO3hTFt3rfu7ntGhI1 zRo3Ng`b%f5it;*nYg=rM=$?{ocV?gFd$Fs}CB^Rj?|CjQzxK_)?$WYr-EG%&;W%f5 z=Q*pgEYp+If?zvaTck3E!} zo`0U1wf1b3t^Qoo@6YU5ve&98neZ@oa$JpCXyv_w-JnldP;lj|-NjSR37OwljLM!n z|BnBKpFH0gvesU{C~)yA^D*yq&g+UlE;sNTTr5a1wBUgn(;Y5cdxBxltc*p?Yz7Z6 zxm4FFY-Ep?dJ=0t;Rg42wx1c+4H>neOEQ zFKUS0a{te#h$x@bw373GoVXW!WVpbTVZ*S6L5iP2x8WGG16HA(zZp)Pd6wKXQ@7>A z!$?Wv`M-YNoEFbwAt(Cmul<$opvuc z)aTx7t`*bn?q8*)^eZ}OmDgc|3r~v{7Rq?Kyr|k6)U)xB&POx%J=dETqzLyIPU^T| zz@wrhlKdy_?|Q}S){+M-`dnO=tolD^{@j@N_p9ZPNjz8aRyuAi>CjVXrKMz*`uMie z_3F)>|5EtO4^|(<5k}}CdE#f$%HYSgeCz?QuKW~C;WFnV>R(aN*XBSE=T!HFU=gai~#r-DAIskbhyDvW!S?brj{RAIKd)KS5@Bd%^ hn6J2nVb*T`2mCpK+m*_5j)9U6gQu&X%Q~loCIDE>3giF) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/funeralsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..831a3caf71b6b41a372cde9ee3976400b0588571 GIT binary patch literal 1185 zcmV;S1YY}zP)u$3NUDuiCdF*61jf>}biTI-Zk?wr0R*Qq))wEbl ztyU}5gsAgeoP}~azG$C>r+{G?j8X~!IP4w(0D`w~7v9f5FWiLPW)t0BFOE+sMb>NC z__@{q$8q5MJ^;Y?eK?MjD!K@YY9|XJ1NhNDk7yLSz1|YC7U4%sOb1G7BEBd>Q(%98AJcG#X*dG_jK^b`rWqIB z44&Dq_k@L{@%pD9@c5gr6ZJt5BuZY0$c_*p1ORaB=1u(Wx~U7&Tm+d+Cb`9&hfI9Y zoh~T@bX|{wr!7Whn~)Npa2gmNU(^7hHQ+SSqQkux{+TL*wD=LU z`3;dvXMq3mja2=4NKFBMG)kRwS@lJe6~}$}D0iDu4?>p-(FdVRHwB8OGC;Ke)l>$k z7NDBS0M!CiQyHLIfNClOR0~ke${UbtQ}lyxcL4w&eP!X(&p%GxyT1s&`0Wq;`{ET| z|LFqAnTHTMM8FZ{>7z0~q<}`FQAD4FXfzr)nN4vrn=YIY;B%3MpAP^Q^Yl@f=iykr zUT2+7r{Jz8>2x}%*Xs-bJM12S*V66vm~29J={3M{99Y+`<9KIh*`|a!-r0e5?Rx6D z1X-jE;Pdnsl?M}`XNCZf+uL^%n}k^@@-j$^HP5ekVKy5q)9uIu(7tz{{Ckqy?a~e`G7DCiKb~Na}Cfm4VtE9YPexpw>+sHQSNwE)#r2B;RGn#usx0#x%KD+wl@jW@Q300000NkvXXu0mjfr8p}r literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..0b8348f601c1a1e4e062ad39cbe69462c7c9f5a9 GIT binary patch literal 1108 zcmV-a1grarP)@WGG}i|7!7-xE^rHQctE-?-1U4oan7-Qp!ky_;vez%`T5;@=X(!N z2!U0`3)cc%qc(tR0j^OSz_kF^s14v+fNRtSa4o<&gb*`7CW0UkK@f=HaF{qa91ev% zR;E^+|N8buedh7cyFVcWym?b$&+`)Glu~fc5nY^PI{Aa|o16G{dWzTK8?-)r1R(^B zFmDHYbIv{8SVchRPYZzhep~*z2IzD;7@dtV7z`c> zilPV`jRvA9f=M_S3@|zyqtoduEF=y6ejlT=F?zk8)$e+}9!6(l^!xqHa~Dp706+*) z(Rg=v7whZmxVpN+(a{kANLMX91?v2Skkm0Qhl$BwNE%GT!NGz0UUbk~6nZ?!i(FG- zIo`rBOl(($hbOH+_1xF89s=^aym(emy;8`fBO!;?<0<5voK>-khP8hazTPIrk1EFrD(U?s#;to zHX04I+ig%v)iSwOn6xE{%zl9~ki}tZgu=1_rL-~+D6$q=Xc~M99$*V=14I|+ zGi&cvd4LJoM-W|{TVF4Ce}J(c07`3-)1hagSu4bPf%Hi(iaw=((<#gVHkILJmfK}t zKvA%s3hUKaSro0hK>|n?L*{jmX2G^HqyPY_ zH@K>sPtzd#m-9Agt^Dh7Z2;E-Tw`eiR8bZ$lRH;=+-z5?G634@$eMJ`HNYyMjsdO( axW+%#|KebcX^VUS0000~{hc&z*5K__ksB7%sZD2h%W zmtHOS`uGF@e4kFOaUYqSuc5V8MI?=@s)F|(@3R?R*J~^m3ovt<4K09p4y y)Om3wqSkQ~kyi08%5vbAdW`>p0bl^QrG5a=o&%BrvuJMs0000{+0ePybp6z0qS|sTp7-_qp!E`i`Gfx`tF{v`|durnu@9|zi;o}{Or#Cdk-JJ{8)PJ zesS!_3Ko|muXb%)mZ@_rLsRwl#+wmdCzE=vne<*Qwf(74aW=9jSFhaR{&x;VnYq8~ zDl5NOwlwT}A3k$4i#TKM?XcMEj-iT55^anO20Y9zEUUWKy}qz5ck8h^sv&YmJwpGU zR8|s8K4Q_gqq6SU`flzPfep9cE?BkMx%%wP;@o%M0il9U2hL9yZxL9q>WXFX4(=Q8 zzcVyQJieHIZH}hde8Z4X!@kESos!R1@|QENsMu0m`WHtUHx3vIVCg!0K>WW A`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6c5a036cc361b57670a87690ec0e8634ee37de4c GIT binary patch literal 609 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$= zr;B4q#hkaZH~PJH5O7^TUrBLU%udE_-}3jiotkQYMATJF>Vfqi#oNovn0uTW+n87_ zJFi!WUZ^-JbF%fZg=O{Ddmj7z6qPK}|7CJ#Br|3ZMHGKyba2_XP1Z$4v1M^}s>_xa zztfZJ6j>zq*~zT$kU7twB&2j`>wd}KO-I`{e71XX>%LEwyME*Hc6Xco`)cNHiCZsj z`N6qu-udeHw9);^cHwe9cUK-Ge-?{N&JvEsg$8)iDXyx7IZaG_MTgX2ukvdn<% zr5`UhTeJr6>3;YsUS$69PLDm`U;LKao}a&C|Bi-YzS(El&g@xnkbmam+6Wd`amTc_ zV!rbC?+eZ~&a998pYHLsk8Q)EUc5!a+@)@!Y>(+iOSBYoZx$RisF}VpA zD%Y=7^yJG=kWdCP_%<`0*lIe@ImmEQcDBuvCrLnA3%4Q$pkhO{+Ycpxbg~NjgzRjY i#T)+f&9?;GEI*CA?(2rXO*?^UhQZU-&t;ucLK6U6i3?!> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/hitmansuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..07fbf87c961df46afafcdb44c7b9429ec8f5b34b GIT binary patch literal 1303 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..27170b6fb0af8537bdb4fc1f555c723bf6f0c7ff GIT binary patch literal 504 zcmV$@WI98c^&|l*If&6_j}0k*F!IPe)8?iRvJ|RcD8FCfNR7%ci{56YuDB{ z@RdTBG{cs$)>?)wV|7X6E5+LSMhfYwOj97C0Py$X!A_2|$a87cpPO4-)Eeb40T6^E z!qz=2pESXvQ2MgUN@*E@X#7Mh!so3`@3oqVoH|g{nplJ&9KGrb!V$3uMXg=Rx&y=_ z7-JYm5kUI2iIVX+iZI3yi~E!~0VFHi7{j37d(kuK_b|px`DX?IaCESr79I3^NGJr4 zf`l>!HR+ovKq6l$e5I%~sz@kQ8rAe(7G+MtqSh=_KfYC-C6ZIzy{<_v@d2C1#DP4Sw5wFJDwOT6-~s>)SOZhBs?n zgEdp4lC5^REWfQc$4GCkZ$dSD$*x?ZV+;(h*0NoS?5bML$Y5}cWv1Gqgt_8hg<{Mu zhrBv?OTTK{i+@(K>-6~z!Wzt{X7V!Z%&g!0!-vDwYL3lqzYpI_el04wc5s{ECyC^Q zo`ciR&p+}0j!Nk%g}!$i^xqn-y`Z{5TUOzp9g?qht?PO zHP6YME5CC3%g}X9JFHJkWXXT3EaCMi=I7bsJ2|Rrt}QTSGI+ZBxvXC*z_Z@s-WeUvtJI;~!FQIhk_r2pwOo!aaXM_oUvJ ztUe14O*k6hxS+d9F+N=Ri*)alCGUA=vG3WSvm`yPcG9uWnt}%>R2~#d5N1l?-oVMY zf%QfU!wse!Cx#qGGew4N46_9oq8ofU8gvh+u^bRfF#f@ypmg(iK~<>?-8e75e^>R(;+mgdbc_GheRMW6mzI%}H+{GMld5sNj%t@u z&tr+(DhJQ^_kYx5F_`OnrK+?ycT$4PagX;w3=UP((=^wGU!QSK?a%3Xj}7llz5bxY zEHEmY;lRU>f}g%mxVEc6K>XDG3rDT}A1bbxqP2(5H}dM#>E6xnAH^;UVoXc8t)eM& zq~`ql$3nGxqtl!0ufJ9o{B!?CmH9d5E!S>lC+~}>GGu4iRW1IEahc1lWxMt6F*VFB zubhAIzvQaDtTB5J<$n1nSHp@ooT1TCa`Wc(bswEg^tz^f+?su-t(1W+e)looE9KHs-{an^LB{Ts5LKH68 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/miamivice.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..720682d4aba091b5137439953c0c90b66466c8fd GIT binary patch literal 1258 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 Zk8h~td^cfd1~6qXc)I$ztaD0e0suoD03ZMW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/mrspacewide.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..03c2dfa80c1fecc2e27f68bf76e5e7617050e2ad GIT binary patch literal 596 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|OJA zr;B4q#hkaZZSz(;h`8OZD76O!LW^Cb~}HAz@e8$0rGtZC5k^rN7h=X{r!E@zwX!!gMGDo_A0iV zwq0N+;~Y6nqwCQl-cy@=%nm)UU8>RL`u?W#g52ncY=8e%tF%t?&NuqDaaE&e5=f>OYkSO(?;y!zO4G%_1?^<_w*7wMU_2>CRqV)GgE;Zd} zXa8;w=k~(x?~x48=TueKHfBqOL@j<_&ERnV`-&}X*;0GU9SHA{}os4zD>LFYV9%agr$>g_TQcQ(&W#>{XCw)U?CiK z4Z8g2O0)L3lr+RFKbDb#(+!u6GfJb{cr&T#<<=i+m)ikPi@CrY#a2+wAI zVr4q-@vEr`>w+I^Zod4`5~OkAll_PJ`#@3jlfT=+!D)xt={3M)!rt6sC)LU2SXrK)TD>HIT#9RilId6KNS6EH4NQ zlS8!2NZyTSR=XY&?*{_yNSgQN?auCKW(emTr& z)CVvk^CdzE0AR6H!dj)mN3#?7>HF`<%*+e`;Jv92_(5wM0Epu_NqOzlKTA!&e3v;G z)R!IL5t%O%LVR&bDU9qSGMO=aHam@9s}IrbcHp)ific!+B2Gm8o=zV^IdL3EIsmCI zAc_Oe69<5u=HtHO-sjvj&7f)`GpJ7~Mc8{){YdwK%;6ro-44db&!F4wAal4EXgUt! zswWJo0L1ih0 zynY`4n&$)cMS4#FzIFFD0f3HsAgv)4z#xrA1Ga7V9UF#m4!T03Is(u@8g*z%)%?Jm_YWbO-_ZMDW0)41^+e z0q>?G97{i@;vh&L0HKs(Yir9tVKOKOAfEZK_et^seGUMYWy!Z5>f-=HDJ7Ir!WhGq zTn@#2zOP)dK2<{Xg_jbM20~u)>(wfn_4<+WBni`xic%LS=JUv1%%S#Q4b6HT>(%O! z@|D%qp$y6BH=ndoyLaE$|Mu&z@b24IB>huAA@b4%(0tNXDnAaTF3_yk1N&T9dEA8Q z)b8DnT&L1N=w%|-8KGC1GyvTObdv_4+kkG;0CXGBO&Wl11G-5A&}~3Br#^s4lcJ-a zE&>3uALj7R#9R31+DEaPlI7CIU)b4xiq_vX01?+AIOoT{L>5aWn5N0S*M;e;eE*<> zLZJ{xo1`cd3fMpB;KKA(E_xByB4ygeIam8TJh)B|0Ns%{ah966e(e*yF*ZWx=jY>Z zu|T<8#(w9JuW$T;UFP&H%`?VO%;(9<>gvh;9rhMUz0DFQ!A|qBzc4#2N&$#xe{cqP zeEiJNW@H)E^1M(=u~w-l?fxEWX>4#c=p@z$MGvB`=*w{&sdfR1SAe)qAIA2N(<)WQ zMwGn)fMNhk3v=W_^%t_)TZb1B_X{LVkk;ni+vNWTzmuhfIi(5ANaFy@vbgKIa9!6g z>ur*VQk^okZ6682vMk9h&%=H}(8+cI0O;+)4Es@{k3bduShvW$%AESY w!)XAz4d^BfK(_(iqygwQpqn%R-3D~?45>Px{fw+9JOBUy07*qoM6N<$f;X^BZ~y=R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..dc0b9719f870059450078d004c8d3a4975713896 GIT binary patch literal 1093 zcmV-L1iJf)P)shFWX>+Cp=&#`^2;jMB>*Nt9OAOwGVbps9B3io@i1AEX*jX;9(MJPZN=Ata2(f6ozIT)d3mqhGl2 z@7REordrxOfDjT8LK6G9=q7RgLWaR4j9eQd_c$mO9rUt7jt6;>Ybq@ITf5zkY*&So zH!Z*Q-1k!M0^)D+@BkviQ`ucW-WDT-j8eOR-2X)L-&EA9gqjPV}OXbLPS-N-@ZKN=Y0WlzaCHpY(l_1xoXPvxsT)fHT(xibidKZUMSc8=zZ&Zqx?o7N8ro0lEd~ zMs0v@0lG2w2IN{2yMB8k0Dy)?(V#87+kc_utLee^)4+3`FgyMIb5B`^^4Fl8bu~>h zQY)~x_pA~lc6Xl#a$SPFBv)F21TdbbXN#poi|-y6Wwe(Op}IJ?O!*tZ~eZKpu%Etq{uz(o?x8dYb-Cr!WIlGQ+bhw~M-fqM#fD@s(krpqLJ6C!c6yCI01N;FzyR5 zx?SZe`%fJjj%3l^>h;H`T7HtwP%fRH_awU%X5v8XFXqy5e75s_$Bijpi45u9@v zV`89fQdQcvCBXg~fO8I21y(1p2@%F^+s1vVO0pmnm8#;L16IB_%}4Zq9Wti~i>4R!;`bPKA%1k=2bPT4YRwz7=wr~pFYOmB7!j{_f_2hf~>VM^Pi{_Kq$7d zEMw(&Rdx-8xw0(d`fN6f&$%_wsR+0E9Zn?|Ao*JWF*|RJiR}ohi)uZ1j*?E`FV*}1 fzyL4+^bYU^TNAx<+_H^`00000NkvXXu0mjfsOY*v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e28b0dde45107758e7bbe396a5e60f71678916c6 GIT binary patch literal 669 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S%4 zr;B4q#hkY@4YQ>k1zPX3H74@OR8I_=!Q4H?jZ?2lTinwt{9L`qzw{_aEml*#mIJGL zESB$dZ9A~c<66YFqFa;QDkJyEuh=oQ!e;N?na#3~_Z}~P#(JA!whRMtM7lh~p6}81 zOiG`g)V=-k=g|77d?%MbFMqby*Th~AQ$M!*7N>xqzLNhn{@v~Z6Ei+LKHpHi<<;(M ziff$rvh?|%dsqJM@Y8hrol?0=jCV>se7s!$d(?6DbnBgaO{KOUat*8yY}_h#&a&ip z{>OiJrEC6vll}aXL#b)ist0qLi_iV>Re$qun^ohC|I3P)s{S&r+3KDB`?vn|d26@6 z_{!e9Y)i?l1wsc(Y)s1MGFv=XP};Hf8AHSEEIz@;Vm_dd&+)^@VlQ9Hbawa7u#%e< z!1eVk3q!ztpAG4{t5!MH*2<;}l}qSp{4NJ{OSY~H%jTOrsgZ{)zu&Hio&Djq z+Ln^0YgSk8F&(^+w2^^fO6txpIX#_5YnKXlM{(Myyt($c?bxMEC))=5^(#Kiy0v59 zmXd1=uQC5~|Ch<{F_qXr2C6%-EW>xvWFCiXAzl?J2Zv;#xp&qU%;qebp=7#o^1%~& zFTb+i`290EGxsXX&Wf*AUiv$QF3eLK}L8(NrtBL=>3b7(8A5T-G@yGywptV;{i) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..563672c9173d0402dad3393b3cb875e1a6542c2e GIT binary patch literal 636 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$u zr;B4q#hkaZ4YO}MNVLU^IzKdCa`K^$W59V;T}iLyJZEQV+AGQ zL@;0%s+MQi^L_n#DZ!8F&!=afKjotG>Unx>9gwr{XI=50d%wR*Dk#Od6qs1P{MD4< zykc*-<*Ye5U*5$sef}+}w{Bg${gAJfAU9;o&Z~S50+_6B%dxchrY4!d@p2c>*74Lv_!U2kh+g zqi&zGl=1h!pRE(UvAbNmp?&x5Hm+e%sa*E!m_IC`9(#!cX^8~e;>%Z zw|HIi)!Atd_oc8NVKLAkxZ zIjXd5mels{v}D>=qctZhTgEAXVdb`CiaBeJ&02CxYX8v%X&P6r?KpYvY{06uh4Kfz u7kC0`@n&X^t)}mkH~;5*ZwZRgv+@65rfJ$bIWGeyCk9VfKbLh*2~7aVpA=>Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/nightclubsuit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..2fc0e4c25329482ddae5e205b6e92bc7aad88205 GIT binary patch literal 1256 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 V;Vw0Dg!lje002ovPDHLkV1fz_O&I_H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..459fea8bb7c2becfb248437b7055b00c719f11ec GIT binary patch literal 490 zcmV&IUjTfe?a8tD`5aj#f%((HAXvfbsQ>?#m|9^NFGeK!;(d0UbpV z((~!dCgbayLWj#`k%x`C-7aAmG8&C+J1;X4AY4wvNvos#vT56!WRLgwz;HNZKA)36 zz0eM>?D#U?^8B%Os)N%P=*uR{c#HIWYqVOe?6v(3EY35&!~Q0x3@qaS?V+|6j%kbEVVV= zBzpiBNqW@&`P`oZ7)j5!rh}ki%}sw%mEH;CJY$ihHWy`83c#4&-*%3|Sw_ww1Z)tE zxzX$U+TNQCxQ4LsPS~s0ke+`Oyg|^gOR%U40nD;g+<}&XZ&!c;P`g9n6#$MU_)ne3 g|3C#$0sN;v0lz%8*qCLYyZ`_I07*qoM6N<$g0(K-r~m)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c03a2c718144b3e4138ef47ca0d2e91fb3c14da4 GIT binary patch literal 715 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Qg7 zr;B4q#hkY@74vTgh_v=EZ`APgev=dWIzuNRZ6Xhkk66fq`vH+$Ml$lNmTfRQu}4=| zTEgp}%S3Lkm=Nuh(j{zn8&8Ez_vxK`@69{S_mi3aERvCx-yd_@j!iIedZl`io|lvs?wok;>QPm> z=annJ22B^9#?ZC;*-bIA#fA(MUhmp+JuBHz>hR{ZUg7zX>Fckyz23#r@an~tM%9ML zn}aL1h06Wj*Kfe{@ORx#pr*d_e%UW~tlK@&Pj^RKg3R%fdv7n6?)N_`z%8W~`~5eN z8+cXs%+lbmcW$IPh`1gznax-s7dH7M%h7;2X~r&rDSy1@uG+wV(B$;Pn__i!f7#A& zn~=71#W|}R%sb+37#aNR>VG|s@Jg3`zg=-wn&q;aJn>e~>KA^Ndc%0<->k=C#eXVh zNuJp7@okrPx-6T!b&kZE;?7>J=i5H>J6kbiGGBVZu!PrRG4lj7gY^>l5H8HCA?3j6F1&YYT*B-DD6a zgq@CMGVF;GhYIHut@UeO6T=WFBFTSP@sf`F_RGf(o|R>5X5`Czcj4`piD{N{ZHG^( zt}0?=*u%SN5~E0g$q6s^0~Zyv%f%y}t>xWxi4iEG^LE224O?c53!s$n%zSgsK8H{K S%TEAPCxfS}pUXO@geCw-u`)6M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e8788bd2c4107a5a7e59c86881d6bf7b0e20ff25 GIT binary patch literal 663 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$% zr;B4q#hkaZ74vU9h#a54ywPW-)0;`xF3vdE*V@`Ani8MLWhyhbZPmqTGq*2wm6q^& zVdvQ3Ec|TNmcDBX%{SaEl9~Vb^{v0Pr+#}fmdQLV|9@w%%6FmmnJ*_)Hi|hYGcI7g z;K7i=Xd=WA#n8*rfK{mY1EYYk`1U!T=bu{im47>>X1o3J@AT5TLYd;9HI;kL?6GE6 zvz^}TIKS`jPrko6bkfD;CB9yoQ95E@j(*Lo_%f?*O@3zO_J#TUD?is9Hc+nr zdb^_jZ{_Z%drg`B&Y#bCQ+;$}P}j1{nwm?yih%}P{=E6Q++@N3PhxeO0!2O^HFz-l zV#ntsiw9TFQD^>3GTHU7A zDvLM1zxcg>e)rZ?=4JP8FLVU z23DcT-MMe2%r9CoMDITK+aQi{`2?6t(~>pS=!GvvILdR_2j|6%q%P^^BIUVo$Q V=a=5HKwwH^@O1TaS?83{1OSifHu?Yn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/meta.json new file mode 100644 index 00000000000..f2a6caa97b6 --- /dev/null +++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/senior_bartender.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14. Modified by MintyTheBinty", + "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 + } + ] +} From 3472522b6111b979a4dc69d1ae4171fe8eb19e22 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:59:09 +0100 Subject: [PATCH 37/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 78bd643b4d3..b75d5d8b54e 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: NullWanderer - changes: - - message: Fixed the shipyard console not opening - type: Fix - id: 395 - time: '2024-06-12T16:46:41.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1364 - author: deltanedas changes: - message: Fixed listening post ops having TC and being counted as traitors. @@ -3843,3 +3836,11 @@ id: 894 time: '2025-01-10T19:57:42.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2689 +- author: MintyTheBinty, Radezolid + changes: + - message: Added suits from imp-station, check your loadouts and your local BarDrobe, + CuraDrobe, DetDrobe, LawDrobe and AutoDrobe! + type: Add + id: 895 + time: '2025-01-10T19:58:50.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2675 From 4e175ea8eed5578a2b54e14888166abfb06af9ce Mon Sep 17 00:00:00 2001 From: Janet Blackquill Date: Sat, 11 Jan 2025 01:23:27 -0500 Subject: [PATCH 38/45] Make chloral hydrate better suited for use as anesthesia (#2685) --- Resources/Prototypes/Reagents/toxins.yml | 1 + Resources/Prototypes/Recipes/Reactions/chemicals.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index bf5193bb841..f0f98bcc2e1 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -55,6 +55,7 @@ physicalDesc: reagent-physical-desc-nondescript metabolisms: Poison: + metabolismRate: 0.25 # DeltaV: chloral hydrate should last longer for surgery effects: - !type:Emote emote: Yawn diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index 78fdfec7c9a..a3986aa4d18 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -362,7 +362,7 @@ Water: amount: 1 products: - ChloralHydrate: 1 + ChloralHydrate: 3 # DeltaV: make chloral hydrate less outrageously expensive - type: reaction id: Pax From 1e886e036f47c4067bc70d0d24c65ccc815a962f Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 11 Jan 2025 07:23:47 +0100 Subject: [PATCH 39/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index b75d5d8b54e..b4f4ea2ddce 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed listening post ops having TC and being counted as traitors. - type: Fix - id: 396 - time: '2024-06-13T16:40:42.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1369 - author: Timemaster99 changes: - message: Prosecutor can no longer be an antagonist. @@ -3844,3 +3837,10 @@ id: 895 time: '2025-01-10T19:58:50.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2675 +- author: pontaoski + changes: + - message: Chloral hydrate is cheaper and lasts longer + type: Tweak + id: 896 + time: '2025-01-11T06:23:28.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2685 From b3a9cb8266e03fbacdfe0fe2f291be37f02d21b2 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sat, 11 Jan 2025 03:24:48 -0300 Subject: [PATCH 40/45] Tweaks to the paperwork belt (#2690) --- Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml index 82e8c4b38b2..425d471677e 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml @@ -102,5 +102,7 @@ - Document - Flashlight - Radio + - HandLabeler components: - FitsInDispenser + - Stamp From 6ebe75bed211fa3e17722da1d30eafd494da5c8b Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 11 Jan 2025 07:25:08 +0100 Subject: [PATCH 41/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index b4f4ea2ddce..e29958ffe7e 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Timemaster99 - changes: - - message: Prosecutor can no longer be an antagonist. - type: Tweak - id: 397 - time: '2024-06-13T16:42:27.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1360 - author: deltanedas changes: - message: Fixed reverse engineered items not resetting progress when done. @@ -3844,3 +3837,10 @@ id: 896 time: '2025-01-11T06:23:28.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2685 +- author: Radezolid + changes: + - message: Paperwork belts are now capable of holding hand labelers and stamps. + type: Tweak + id: 897 + time: '2025-01-11T06:24:49.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2690 From 056c98c054e11c377195c39d859604d32559f009 Mon Sep 17 00:00:00 2001 From: Janet Blackquill Date: Sat, 11 Jan 2025 01:44:50 -0500 Subject: [PATCH 42/45] Replace ForcedSleep with Anesthesia for surgery (#2684) * Replace ForcedSleeping with Anesthesia for surgery checks * Add Anesthesia to NO2, Nocturine, and ChloralHydrate --- .../_Shitmed/Medical/Surgery/SurgerySystem.cs | 5 +++-- Content.Shared/_DV/Surgery/AnesthesiaComponent.cs | 9 +++++++++ .../Prototypes/Entities/Mobs/NPCs/simplemob.yml | 2 ++ Resources/Prototypes/Entities/Mobs/Species/base.yml | 1 + Resources/Prototypes/Reagents/gases.yml | 12 ++++++++++++ Resources/Prototypes/Reagents/narcotics.yml | 5 +++++ Resources/Prototypes/Reagents/toxins.yml | 10 ++++++++++ Resources/Prototypes/_DV/status_effects.yml | 3 +++ 8 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 Content.Shared/_DV/Surgery/AnesthesiaComponent.cs diff --git a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs index 5e3147533a9..7055741a370 100644 --- a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs +++ b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs @@ -11,6 +11,7 @@ using Content.Shared.Eye.Blinding.Systems; using Content.Shared.Interaction; using Content.Shared.Inventory; +using Content.Shared._DV.Surgery; // DeltaV: expanded anesthesia using Content.Shared._Shitmed.Medical.Surgery; using Content.Shared._Shitmed.Medical.Surgery.Conditions; using Content.Shared._Shitmed.Medical.Surgery.Effects.Step; @@ -143,7 +144,7 @@ private void OnSurgeryStepDamage(Entity ent, ref Surgery private void OnSurgeryDamageChange(Entity ent, ref SurgeryStepEvent args) // DeltaV { var damageChange = ent.Comp.Damage; - if (HasComp(args.Body)) + if (HasComp(args.Body)) // DeltaV: anesthesia damageChange = damageChange * ent.Comp.SleepModifier; SetDamage(args.Body, damageChange, 0.5f, args.User, args.Part); @@ -162,7 +163,7 @@ private void OnSurgerySpecialDamageChange(Entity ent, ref SurgeryStepEvent args) { - if (HasComp(args.Body)) + if (HasComp(args.Body)) // DeltaV: anesthesia return; _chat.TryEmoteWithChat(args.Body, ent.Comp.Emote); diff --git a/Content.Shared/_DV/Surgery/AnesthesiaComponent.cs b/Content.Shared/_DV/Surgery/AnesthesiaComponent.cs new file mode 100644 index 00000000000..944adc2036e --- /dev/null +++ b/Content.Shared/_DV/Surgery/AnesthesiaComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._DV.Surgery; + +///

+/// Exists for use as a status effect. Allows surgical operations to not cause immense pain. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class AnesthesiaComponent : Component; diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml index f400680eb01..0525ec58586 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml @@ -30,6 +30,7 @@ - RadiationProtection - Drowsiness - Adrenaline + - Anesthesia # DeltaV - Anesthesia - type: Buckle - type: StandingState - type: Tag @@ -108,6 +109,7 @@ - RadiationProtection - Drowsiness - Adrenaline + - Anesthesia # DeltaV - Anesthesia - type: Bloodstream bloodMaxVolume: 150 - type: MobPrice diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 65400ad69f5..969e8a24650 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -142,6 +142,7 @@ - SuppressAddiction # DeltaV - Psych med addictions system - InPain # DeltaV - Pain system - SuppressPain # DeltaV - Pain system + - Anesthesia # DeltaV - Anesthesia - type: Body prototype: Human requiredLegs: 2 diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index caa2e5acdc6..634b2c473ed 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -284,6 +284,18 @@ component: ForcedSleeping time: 200 # This reeks, but I guess it works LMAO type: Add + - !type:GenericStatusEffect # DeltaV: anesthesia changes + conditions: + - !type:ReagentThreshold + reagent: NitrousOxide + min: 1 + - !type:OrganType + type: Slime + shouldHave: false + key: Anesthesia + component: Anesthesia + time: 200 + type: Add - !type:HealthChange conditions: - !type:ReagentThreshold diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 370d294f246..4eeeb099974 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -334,6 +334,11 @@ component: ForcedSleeping refresh: false type: Add + - !type:GenericStatusEffect # DeltaV: anesthesia + key: Anesthesia + component: Anesthesia + refresh: false + type: Add - type: reagent id: MuteToxin diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index f0f98bcc2e1..c08847f2443 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -70,6 +70,16 @@ time: 4 type: Add refresh: false + - !type:GenericStatusEffect # DeltaV: anesthesia + conditions: + - !type:ReagentThreshold + reagent: ChloralHydrate + min: 10 + key: Anesthesia + component: Anesthesia + refresh: false + time: 4.0 + type: Add - !type:HealthChange conditions: - !type:ReagentThreshold diff --git a/Resources/Prototypes/_DV/status_effects.yml b/Resources/Prototypes/_DV/status_effects.yml index cf1e8e25639..2fe5275d05a 100644 --- a/Resources/Prototypes/_DV/status_effects.yml +++ b/Resources/Prototypes/_DV/status_effects.yml @@ -9,3 +9,6 @@ - type: statusEffect id: SuppressPain + +- type: statusEffect + id: Anesthesia From 5af2d0b1a547653c972e32ec4e23ebd70ae495c2 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Sat, 11 Jan 2025 07:45:09 +0100 Subject: [PATCH 43/45] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index e29958ffe7e..49589ee4587 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed reverse engineered items not resetting progress when done. - type: Fix - id: 398 - time: '2024-06-13T20:32:19.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1376 - author: Timemaster99 changes: - message: Fixed prescription hud crafting @@ -3844,3 +3837,12 @@ id: 897 time: '2025-01-11T06:24:49.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2690 +- author: pontaoski + changes: + - message: Surgery now requires anesthesia rather than forced sleep + type: Tweak + - message: Chloral hydrate, nitrous oxide, and nocturine now serve as anesthesia + type: Tweak + id: 898 + time: '2025-01-11T06:44:50.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2684 From bd3dab23f515686e2311a6fa35716182381c734d Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 11 Jan 2025 07:03:58 +0000 Subject: [PATCH 44/45] add surgeon description (#2697) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Locale/en-US/_DV/job/job-description.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Locale/en-US/_DV/job/job-description.ftl b/Resources/Locale/en-US/_DV/job/job-description.ftl index eeaa7658771..a2e4a7cfec8 100644 --- a/Resources/Locale/en-US/_DV/job/job-description.ftl +++ b/Resources/Locale/en-US/_DV/job/job-description.ftl @@ -1,4 +1,5 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department. +job-description-surgeon = Fix missing limbs, tend to emergency patients, try not to play god and get fired. job-description-chief-justice = Manage the justice department, act as a judge, and ensure everyone recieves fair and just treatment. job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed. job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes. From 3270d4d2a1f29a1541175bbac01db58183b2e65f Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Sat, 11 Jan 2025 01:19:46 -0600 Subject: [PATCH 45/45] Adds a random spawner for laws (#2633) * Adds a random spawner for laws * lawsuit evasion * rekajigger * indent Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Velcroboy Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> --- .../Entities/Markers/Spawners/Random/laws.yml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/laws.yml diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/laws.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/laws.yml new file mode 100644 index 00000000000..e83613c30b6 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/laws.yml @@ -0,0 +1,27 @@ +- type: entity + parent: MarkerBase + id: LawSpawner + name: Law Board Random Spawner + placement: + mode: PlaceFree + components: + - type: Transform + anchored: false + - type: Sprite + sprite: Objects/Misc/module.rsi + layers: + - state: std_mod + - type: RandomSpawner + offset: 0 + prototypes: + - AsimovCircuitBoard + - CorporateCircuitBoard + - NTDefaultCircuitBoard + - CommandmentCircuitBoard + - PaladinCircuitBoard + - LiveLetLiveCircuitBoard + - StationEfficiencyCircuitBoard + - RobocopCircuitBoard + - GameMasterCircuitBoard + - ArtistCircuitBoard + - NutimovCircuitBoard