From 303b5c8393e1fad157326d0718a5da47cb92df65 Mon Sep 17 00:00:00 2001 From: osjarw Date: Tue, 9 Jul 2024 23:28:28 +0300 Subject: [PATCH 001/223] Air alarms check sensors upon power returning --- Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs index c1a5256fdd5..2bbd409b8f4 100644 --- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs @@ -151,6 +151,7 @@ private void OnPacketRecv(EntityUid uid, AtmosMonitorComponent component, Device } _deviceNetSystem.QueuePacket(uid, args.SenderAddress, payload); + Alert(uid, component.LastAlarmState); break; } } From 967f7f77ecaf4c1e96b7c9d0994e85aef89b48d4 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Fri, 23 Aug 2024 01:24:00 -0600 Subject: [PATCH 002/223] bagel update (#31342) --- Resources/Maps/bagel.yml | 810 +++++++++++++++++++++++++++++++++++---- 1 file changed, 730 insertions(+), 80 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 555827c7b68..a25472c0a96 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -326,7 +326,7 @@ entities: version: 6 -2,3: ind: -2,3 - tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAUQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAA + tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAUQAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAA version: 6 0,2: ind: 0,2 @@ -8107,7 +8107,7 @@ entities: 1: 39312 -12,8: 4: 12 - 6: 3072 + 5: 3072 -11,5: 0: 63351 -11,6: @@ -8116,7 +8116,7 @@ entities: -11,8: 4: 1 1: 17476 - 6: 256 + 5: 256 -11,7: 1: 17484 -10,5: @@ -8214,10 +8214,10 @@ entities: 0: 255 1: 57344 -8,11: - 5: 816 + 6: 816 1: 34952 -9,11: - 5: 2176 + 6: 2176 1: 8738 -8,12: 1: 34959 @@ -8237,7 +8237,7 @@ entities: -6,11: 0: 4095 -6,12: - 5: 61166 + 6: 61166 -5,9: 0: 65535 -5,10: @@ -8245,7 +8245,7 @@ entities: -5,11: 0: 36863 -5,12: - 5: 30515 + 6: 30515 0: 12 -4,9: 0: 65535 @@ -8255,7 +8255,7 @@ entities: 0: 4095 -4,12: 0: 1 - 5: 65518 + 6: 65518 -4,13: 1: 61680 -5,13: @@ -8269,7 +8269,7 @@ entities: -5,15: 1: 17487 -3,12: - 5: 13107 + 6: 13107 1: 34944 -3,13: 1: 47792 @@ -8335,7 +8335,7 @@ entities: 1: 61713 -12,9: 0: 16 - 5: 3084 + 6: 3084 -13,9: 1: 39305 -13,10: @@ -8345,18 +8345,18 @@ entities: 0: 12544 -12,10: 3: 12 - 5: 3072 + 6: 3072 -12,11: - 5: 12 + 6: 12 -11,9: - 5: 257 + 6: 257 1: 17476 -11,10: 3: 1 - 5: 256 + 6: 256 1: 17476 -11,11: - 5: 1 + 6: 1 1: 17476 -11,12: 1: 17487 @@ -8410,7 +8410,7 @@ entities: 1: 15 -13,12: 1: 34952 - 6: 48 + 5: 48 4: 12288 -12,13: 1: 61455 @@ -8444,11 +8444,11 @@ entities: 1: 62671 -7,14: 1: 244 - 5: 57344 + 6: 57344 0: 1024 -7,15: 1: 61440 - 5: 238 + 6: 238 0: 1024 -7,16: 1: 65524 @@ -8507,7 +8507,7 @@ entities: -14,12: 0: 1 1: 8738 - 6: 128 + 5: 128 4: 32768 -17,12: 0: 52232 @@ -9033,7 +9033,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9048,7 +9048,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -11009,6 +11009,26 @@ entities: parent: 60 - proto: AirlockCommandLocked entities: + - uid: 5803 + components: + - type: Transform + pos: -107.5,17.5 + parent: 60 + - uid: 7645 + components: + - type: Transform + pos: -111.5,6.5 + parent: 60 + - uid: 7705 + components: + - type: Transform + pos: -111.5,14.5 + parent: 60 + - uid: 11343 + components: + - type: Transform + pos: -101.5,17.5 + parent: 60 - uid: 13043 components: - type: MetaData @@ -12383,40 +12403,6 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-70.5 parent: 60 -- proto: AirlockHatch - entities: - - uid: 3341 - components: - - type: Transform - pos: -111.5,6.5 - parent: 60 - - uid: 5803 - components: - - type: Transform - pos: -111.5,14.5 - parent: 60 - - uid: 7645 - components: - - type: Transform - pos: -101.5,17.5 - parent: 60 - - uid: 7705 - components: - - type: Transform - pos: -107.5,17.5 - parent: 60 -- proto: AirlockHatchMaintenance - entities: - - uid: 9621 - components: - - type: Transform - pos: -121.5,17.5 - parent: 60 - - uid: 11343 - components: - - type: Transform - pos: -115.5,17.5 - parent: 60 - proto: AirlockHeadOfPersonnelLocked entities: - uid: 36 @@ -12540,6 +12526,18 @@ entities: rot: 3.141592653589793 rad pos: 39.5,-33.5 parent: 60 +- proto: AirlockMaintCommandLocked + entities: + - uid: 3341 + components: + - type: Transform + pos: -121.5,17.5 + parent: 60 + - uid: 9621 + components: + - type: Transform + pos: -115.5,17.5 + parent: 60 - proto: AirlockMaintDetectiveLocked entities: - uid: 9989 @@ -117353,6 +117351,12 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-43.5 parent: 60 + - uid: 24766 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,4.5 + parent: 60 - proto: ReinforcedGirder entities: - uid: 11134 @@ -129584,6 +129588,17 @@ entities: - SurveillanceCameraCommand nameSet: True id: Bridge Exterior Access + - uid: 24285 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -68.5,17.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Station Entrance - uid: 24286 components: - type: Transform @@ -129595,6 +129610,69 @@ entities: - SurveillanceCameraCommand nameSet: True id: Captain's Bathroom + - uid: 24717 + components: + - type: Transform + pos: 8.5,-32.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: HoP Bedroom + - uid: 24719 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-2.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Airlock + - uid: 24720 + components: + - type: Transform + pos: 4.5,-3.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Power Closet + - uid: 24757 + components: + - type: Transform + pos: -94.5,20.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Airlock Door + - uid: 24758 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -75.5,21.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Tunnel Exterior Camera + - uid: 24759 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.5,16.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Station Entrance Door - proto: SurveillanceCameraEngineering entities: - uid: 811 @@ -129867,6 +129945,196 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Engi Main Hall + - uid: 24707 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-53.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars South + - uid: 24728 + components: + - type: Transform + pos: 12.5,-20.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Bar North Substation Closet + - uid: 24733 + components: + - type: Transform + pos: -64.5,-19.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solar South West + - uid: 24734 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -70.5,-17.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars South West Airlock + - uid: 24738 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-37.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Disposals Atmos Closet + - uid: 24741 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-60.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars South Airlock + - uid: 24742 + components: + - type: Transform + pos: 62.5,-39.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars South East + - uid: 24743 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 67.5,-39.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars South East Airlock + - uid: 24751 + components: + - type: Transform + pos: -5.5,40.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Singulo Cage 1 + - uid: 24752 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,49.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering North Airlock + - uid: 24753 + components: + - type: Transform + pos: -24.5,51.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering North Airlock Door + - uid: 24754 + components: + - type: Transform + pos: -24.5,59.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: 'Solars North ' + - uid: 24755 + components: + - type: Transform + pos: -24.5,63.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: 'Solars North Airlock ' + - uid: 24756 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,57.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars North Airlock 2 + - uid: 24760 + components: + - type: Transform + pos: 5.5,13.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Lobby + - uid: 24761 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,18.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: CE Bedroom + - uid: 24762 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,20.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: CE Office + - uid: 24763 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,32.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Secure Storage - proto: SurveillanceCameraGeneral entities: - uid: 7157 @@ -129922,6 +130190,17 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Dorm Room 4 + - uid: 21081 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-4.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Boxing Ring - uid: 21086 components: - type: Transform @@ -130075,17 +130354,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Theatre Backroom - - uid: 24285 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-4.5 - parent: 60 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Bungle Zone - uid: 24290 components: - type: Transform @@ -130281,6 +130549,201 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Vox Box + - uid: 24711 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 28.5,-22.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hallway South East + - uid: 24716 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-38.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bar Maint Door + - uid: 24718 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-25.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Central Intersection + - uid: 24721 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,5.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Public Garden + - uid: 24722 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,11.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bathroom + - uid: 24724 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,14.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: News Room + - uid: 24731 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-15.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bagel Central Eva Closet + - uid: 24732 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-15.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bagel Central Eva Airlock + - uid: 24739 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-40.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Disposals Entrance + - uid: 24740 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-53.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Entrance + - uid: 24745 + components: + - type: Transform + pos: 32.5,7.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hallway Cargo + - uid: 24746 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 44.5,29.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac Airlock Left + - uid: 24747 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 54.5,29.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac Airlock Right + - uid: 24748 + components: + - type: Transform + pos: 49.5,31.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac Airlock Center + - uid: 24749 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,27.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall North East Airlock + - uid: 24750 + components: + - type: Transform + pos: 17.5,32.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: North East Airlock Door + - uid: 24764 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,38.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Singulo Cage Airlock + - uid: 24765 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,25.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Librarian's Room - proto: SurveillanceCameraMedical entities: - uid: 12352 @@ -130381,6 +130844,71 @@ entities: - SurveillanceCameraMedical nameSet: True id: CMO's Office + - uid: 24710 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-19.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Exam Room 2 + - uid: 24712 + components: + - type: Transform + pos: 30.5,-17.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Exam Room 1 + - uid: 24713 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-13.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: CMO Office + - uid: 24714 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-9.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: CMO Private Clinic + - uid: 24715 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,-12.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Med Storage + - uid: 24744 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,-31.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Virology Airlock - proto: SurveillanceCameraRouterCommand entities: - uid: 21019 @@ -130577,6 +131105,39 @@ entities: - SurveillanceCameraScience nameSet: True id: Robotics Bay + - uid: 24735 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -57.5,2.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Anomaly Generator + - uid: 24736 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -40.5,8.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: RD Bedroom + - uid: 24737 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -42.5,9.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: RD Room - proto: SurveillanceCameraSecurity entities: - uid: 1904 @@ -130885,28 +131446,28 @@ entities: - SurveillanceCameraService nameSet: True id: Bar - - uid: 21081 + - uid: 21082 components: - type: Transform - rot: 3.141592653589793 rad - pos: 24.5,-30.5 + rot: 1.5707963267948966 rad + pos: 35.5,-31.5 parent: 60 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraService nameSet: True - id: Kitchen - - uid: 21082 + id: Hydroponics + - uid: 23159 components: - type: Transform rot: 1.5707963267948966 rad - pos: 35.5,-31.5 + pos: 26.5,-34.5 parent: 60 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraService nameSet: True - id: Hydroponics + id: Kitchen - uid: 24306 components: - type: Transform @@ -130929,6 +131490,28 @@ entities: - SurveillanceCameraService nameSet: True id: Janitor's Office + - uid: 24708 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-35.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Hydroponics Backroom + - uid: 24709 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.5,-36.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Service Animal Pen - proto: SurveillanceCameraSupply entities: - uid: 6153 @@ -131006,6 +131589,69 @@ entities: - SurveillanceCameraSupply nameSet: True id: Salv Locker Room + - uid: 24723 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,14.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Bay North + - uid: 24725 + components: + - type: Transform + pos: 43.5,-1.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Salvage Bay Maint Door + - uid: 24726 + components: + - type: Transform + pos: 58.5,14.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock 1 + - uid: 24727 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 58.5,12.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock 2 + - uid: 24729 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,0.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Salvage Airlock 2 + - uid: 24730 + components: + - type: Transform + pos: 54.5,2.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Salvage Airlock 1 - proto: SurveillanceCameraWirelessRouterEntertainment entities: - uid: 17205 @@ -134071,13 +134717,6 @@ entities: - type: Transform pos: -116.54863,15.725244 parent: 60 -- proto: ToyAi - entities: - - uid: 23159 - components: - - type: Transform - pos: -111.5,25.5 - parent: 60 - proto: ToyFigurinePassenger entities: - uid: 6331 @@ -134398,6 +135037,17 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 24767 + components: + - type: Transform + pos: 50.5,4.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 24766: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: UnfinishedMachineFrame entities: - uid: 3769 From 783ef11628112785f201c6ccac4c800d0887331e Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Fri, 23 Aug 2024 01:24:34 -0600 Subject: [PATCH 003/223] packed update (#31343) --- Resources/Maps/packed.yml | 558 +++++++++++++++++++++++++++----------- 1 file changed, 402 insertions(+), 156 deletions(-) diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index 77c257b2cbb..c20327b9607 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -7547,7 +7547,7 @@ entities: pos: 24.5,-39.5 parent: 2 - type: Door - secondsUntilStateChange: -4432.6016 + secondsUntilStateChange: -5338.4673 state: Opening - type: DeviceLinkSource lastSignals: @@ -10510,11 +10510,6 @@ entities: - type: Transform pos: 48.5,-49.5 parent: 2 - - uid: 13593 - components: - - type: Transform - pos: 56.5,32.5 - parent: 2 - proto: BlastDoorOpen entities: - uid: 2834 @@ -33612,13 +33607,6 @@ entities: - type: Transform pos: 27.493172,5.5327587 parent: 2 -- proto: ClothingBackpackMerc - entities: - - uid: 12658 - components: - - type: Transform - pos: 74.49778,21.835997 - parent: 2 - proto: ClothingBeltChampion entities: - uid: 12103 @@ -33633,13 +33621,6 @@ entities: - type: Transform pos: 89.35728,1.548007 parent: 2 -- proto: ClothingBeltMercWebbing - entities: - - uid: 12667 - components: - - type: Transform - pos: 74.357155,21.929747 - parent: 2 - proto: ClothingBeltStorageWaistbag entities: - uid: 7821 @@ -33709,13 +33690,6 @@ entities: - type: Transform pos: 74.48007,-6.509521 parent: 2 -- proto: ClothingEyesGlassesMercenary - entities: - - uid: 12662 - components: - - type: Transform - pos: 74.46653,22.257872 - parent: 2 - proto: ClothingEyesGlassesMeson entities: - uid: 132 @@ -33792,20 +33766,6 @@ entities: - type: Transform pos: 76.51093,-13.595224 parent: 2 -- proto: ClothingHandsMercGlovesCombat - entities: - - uid: 12663 - components: - - type: Transform - pos: 74.46653,21.773497 - parent: 2 -- proto: ClothingHeadBandMerc - entities: - - uid: 12666 - components: - - type: Transform - pos: 74.419655,22.351622 - parent: 2 - proto: ClothingHeadFishCap entities: - uid: 2885 @@ -33827,13 +33787,6 @@ entities: - type: Transform pos: 62.47656,19.694616 parent: 2 -- proto: ClothingHeadHatBeretMerc - entities: - - uid: 12665 - components: - - type: Transform - pos: 74.513405,22.460997 - parent: 2 - proto: ClothingHeadHatBunny entities: - uid: 9109 @@ -33986,13 +33939,6 @@ entities: - type: Transform pos: 86.44739,10.61898 parent: 2 -- proto: ClothingHeadHelmetMerc - entities: - - uid: 12661 - components: - - type: Transform - pos: 74.46653,22.492247 - parent: 2 - proto: ClothingHeadHelmetRiot entities: - uid: 8425 @@ -34043,13 +33989,6 @@ entities: - type: Transform pos: 67.39722,4.505884 parent: 2 -- proto: ClothingMaskBreathMedicalSecurity - entities: - - uid: 7757 - components: - - type: Transform - pos: 74.46653,21.992247 - parent: 2 - proto: ClothingMaskClown entities: - uid: 8292 @@ -34089,13 +34028,6 @@ entities: - type: Transform pos: 81.53254,11.610725 parent: 2 -- proto: ClothingMaskGasMerc - entities: - - uid: 12659 - components: - - type: Transform - pos: 74.482155,22.210997 - parent: 2 - proto: ClothingMaskSexyMime entities: - uid: 8345 @@ -34283,13 +34215,6 @@ entities: priority: 0 component: Armor title: null -- proto: ClothingOuterCoatDetectiveLoadout - entities: - - uid: 12229 - components: - - type: Transform - pos: 69.639694,21.740335 - parent: 2 - proto: ClothingOuterCoatJensen entities: - uid: 7560 @@ -34318,6 +34243,13 @@ entities: - type: Transform pos: 52.52299,8.566419 parent: 2 +- proto: ClothingOuterCoatTrench + entities: + - uid: 7757 + components: + - type: Transform + pos: 69.55329,21.631119 + parent: 2 - proto: ClothingOuterHardsuitSecurity entities: - uid: 9478 @@ -34387,13 +34319,6 @@ entities: - type: Transform pos: 10.541297,21.522875 parent: 2 -- proto: ClothingOuterVestWebMerc - entities: - - uid: 12668 - components: - - type: Transform - pos: 74.450905,21.945372 - parent: 2 - proto: ClothingOuterWizard entities: - uid: 11159 @@ -34427,13 +34352,6 @@ entities: - type: Transform pos: 8.56214,-8.481274 parent: 2 -- proto: ClothingShoesBootsMercFilled - entities: - - uid: 12664 - components: - - type: Transform - pos: 74.43528,21.382872 - parent: 2 - proto: ClothingShoesFlippers entities: - uid: 6828 @@ -34568,13 +34486,6 @@ entities: - type: Transform pos: 19.93578,5.65267 parent: 2 -- proto: ClothingUniformJumpsuitMercenary - entities: - - uid: 12660 - components: - - type: Transform - pos: 74.46653,21.789122 - parent: 2 - proto: ClothingUniformJumpsuitMonasticRobeLight entities: - uid: 12654 @@ -34902,6 +34813,18 @@ entities: parent: 2 - proto: ComputerFrame entities: + - uid: 12660 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.5,34.5 + parent: 2 + - uid: 12661 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,34.5 + parent: 2 - uid: 13649 components: - type: Transform @@ -35327,12 +35250,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,15.5 parent: 2 - - uid: 6843 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,15.5 - parent: 2 - uid: 6844 components: - type: Transform @@ -64940,6 +64857,12 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-29.5 parent: 2 + - uid: 12229 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,16.5 + parent: 2 - proto: ReinforcedPlasmaWindow entities: - uid: 321 @@ -67337,6 +67260,13 @@ entities: - type: Transform pos: 66.473175,-3.547059 parent: 2 +- proto: ScrapCamera + entities: + - uid: 6843 + components: + - type: Transform + pos: 67.493965,34.506084 + parent: 2 - proto: Screen entities: - uid: 13232 @@ -68179,10 +68109,6 @@ entities: - type: Transform pos: 55.5,35.5 parent: 2 - - type: DeviceLinkSource - linkedPorts: - 13593: - - Pressed: Toggle - proto: SignAnomaly entities: - uid: 5066 @@ -68273,6 +68199,14 @@ entities: - type: Transform pos: 25.484035,39.437214 parent: 2 +- proto: SignCryo + entities: + - uid: 13541 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,16.5 + parent: 2 - proto: SignCryogenicsMed entities: - uid: 11804 @@ -68323,6 +68257,12 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,11.5 parent: 2 + - uid: 13540 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,14.5 + parent: 2 - proto: SignDirectionalEng entities: - uid: 11817 @@ -70483,12 +70423,6 @@ entities: rot: 3.141592653589793 rad pos: 20.5,9.5 parent: 2 - - uid: 7971 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,16.5 - parent: 2 - uid: 9360 components: - type: Transform @@ -71068,8 +71002,41 @@ entities: - SurveillanceCameraCommand nameSet: True id: AI Core Entrance + - uid: 13742 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 40.5,-15.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Secure Storage Boards - proto: SurveillanceCameraEngineering entities: + - uid: 5877 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 71.5,46.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: 'Solars Northwest ' + - uid: 12663 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-34.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars Southwest Door - uid: 12775 components: - type: Transform @@ -71189,8 +71156,232 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Locker Room + - uid: 13542 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-34.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: 'Solars Southwest ' + - uid: 13593 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-40.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: CE bedroom + - uid: 13614 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-41.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Singulo Cage Airlock + - uid: 13615 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,-40.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: PA room east + - uid: 13616 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-50.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + - uid: 13617 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-48.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + - uid: 13618 + components: + - type: Transform + pos: 41.5,-48.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: TEG Room + - uid: 13733 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-33.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos South + - uid: 13734 + components: + - type: Transform + pos: 36.5,-40.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Central Airlock + - uid: 13735 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-27.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos North + - uid: 13736 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,-22.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tanks North + - uid: 13737 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,-34.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tanks South + - uid: 13738 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-14.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Telecomms Airlock + - uid: 13748 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 75.5,46.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars Northwest Door - proto: SurveillanceCameraGeneral entities: + - uid: 7971 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,13.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Competitive Shitting + - uid: 12662 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-17.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: External Dock Airlock + - uid: 12664 + components: + - type: Transform + pos: 10.5,38.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Grav Gen External Airlock Door + - uid: 12665 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,37.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Vault + - uid: 12666 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,13.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bathroom + - uid: 12667 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,18.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Cryo + - uid: 12668 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,13.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorms - uid: 12714 components: - type: Transform @@ -71343,6 +71534,60 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Disposals + - uid: 13739 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,1.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: HoP Line + - uid: 13743 + components: + - type: Transform + pos: 36.5,-0.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Bar + - uid: 13744 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,15.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Security South + - uid: 13745 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 27.5,22.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Security/Cargo + - uid: 13747 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 27.5,-8.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Bar South - proto: SurveillanceCameraMedical entities: - uid: 12215 @@ -71498,6 +71743,17 @@ entities: - SurveillanceCameraMedical nameSet: True id: Exam + - uid: 13741 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 80.5,-2.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Virology Quarantine 1 - proto: SurveillanceCameraRouterCommand entities: - uid: 10318 @@ -71644,6 +71900,28 @@ entities: - SurveillanceCameraScience nameSet: True id: Robotics + - uid: 13740 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 64.5,24.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Artifact Chamber + - uid: 13746 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 55.5,15.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Entrance - proto: SurveillanceCameraSecurity entities: - uid: 12732 @@ -73455,6 +73733,16 @@ entities: showEnts: False occludes: True ents: [] + - uid: 12658 + components: + - type: Transform + pos: 52.5,33.5 + parent: 2 + - uid: 12659 + components: + - type: Transform + pos: 60.5,33.5 + parent: 2 - proto: TeslaCoil entities: - uid: 5664 @@ -73694,7 +73982,7 @@ entities: parent: 2 - type: DeviceLinkSource linkedPorts: - 6843: + 12229: - Left: Forward - Right: Reverse - Middle: Off @@ -84673,48 +84961,6 @@ entities: - type: Transform pos: 45.454727,23.618372 parent: 2 -- proto: WeaponTurretSyndicateBroken - entities: - - uid: 13540 - components: - - type: Transform - pos: 60.5,33.5 - parent: 2 - - uid: 13541 - components: - - type: Transform - pos: 59.5,37.5 - parent: 2 - - uid: 13542 - components: - - type: Transform - pos: 53.5,37.5 - parent: 2 - - uid: 13614 - components: - - type: Transform - pos: 52.5,33.5 - parent: 2 - - uid: 13615 - components: - - type: Transform - pos: 52.5,29.5 - parent: 2 - - uid: 13616 - components: - - type: Transform - pos: 60.5,29.5 - parent: 2 - - uid: 13617 - components: - - type: Transform - pos: 55.5,31.5 - parent: 2 - - uid: 13618 - components: - - type: Transform - pos: 57.5,31.5 - parent: 2 - proto: WeedSpray entities: - uid: 4061 From 73a9a75ddb45c357033af76e9cf568bb0e45a2fa Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Fri, 23 Aug 2024 01:24:50 -0600 Subject: [PATCH 004/223] omega update (#31344) --- Resources/Maps/omega.yml | 586 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 567 insertions(+), 19 deletions(-) diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index 14120497df9..02ae11fe569 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -19203,6 +19203,11 @@ entities: - type: Transform pos: -28.5,-23.5 parent: 4812 + - uid: 12629 + components: + - type: Transform + pos: 26.5,13.5 + parent: 4812 - proto: CableApcStack entities: - uid: 6196 @@ -30516,13 +30521,6 @@ entities: - type: Transform pos: -36.403183,-24.261238 parent: 4812 -- proto: ClothingUniformJumpskirtJanimaid - entities: - - uid: 9040 - components: - - type: Transform - pos: 10.492298,52.554813 - parent: 4812 - proto: ClothingUniformJumpskirtOperative entities: - uid: 9053 @@ -31811,6 +31809,14 @@ entities: - type: Transform pos: -36.5,30.5 parent: 4812 +- proto: CurtainsWhiteOpen + entities: + - uid: 12616 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,27.5 + parent: 4812 - proto: DawInstrumentMachineCircuitboard entities: - uid: 1723 @@ -55031,11 +55037,6 @@ entities: parent: 4812 - proto: HospitalCurtainsOpen entities: - - uid: 2495 - components: - - type: Transform - pos: -15.5,27.5 - parent: 4812 - uid: 3228 components: - type: Transform @@ -61594,6 +61595,12 @@ entities: rot: 1.5707963267948966 rad pos: 10.5,-38.5 parent: 4812 + - uid: 12628 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,11.5 + parent: 4812 - proto: ReinforcedPlasmaWindow entities: - uid: 4138 @@ -66937,6 +66944,49 @@ entities: parent: 4812 - proto: SurveillanceCameraCommand entities: + - uid: 2495 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,46.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Entrance + - uid: 3962 + components: + - type: Transform + pos: -6.5,32.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge West + - uid: 9040 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,45.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Maint + - uid: 11618 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,53.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core - uid: 12081 components: - type: Transform @@ -67033,6 +67083,28 @@ entities: - SurveillanceCameraCommand nameSet: True id: AI Core Entrance + - uid: 12322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,45.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Airlock + - uid: 12466 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,43.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Airlock Ext - uid: 12522 components: - type: Transform @@ -67064,6 +67136,39 @@ entities: - SurveillanceCameraCommand nameSet: True id: EvA Storage + - uid: 12617 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,26.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Entrance East + - uid: 12618 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,29.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Captain Bathroom + - uid: 12619 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,26.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Entrance West - proto: SurveillanceCameraEngineering entities: - uid: 12064 @@ -67120,6 +67225,189 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmospherics + - uid: 12587 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,3.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Lobby + - uid: 12588 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -41.5,9.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos North + - uid: 12589 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -50.5,-0.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tanks South + - uid: 12590 + components: + - type: Transform + pos: -50.5,13.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tanks North + - uid: 12591 + components: + - type: Transform + pos: -48.5,-4.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Airlock + - uid: 12592 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -43.5,-1.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Smes Room + - uid: 12593 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -40.5,-1.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Cleanroom + - uid: 12594 + components: + - type: Transform + pos: -31.5,-9.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Lobby + - uid: 12595 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -45.5,-14.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Maints Door + - uid: 12602 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,-24.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars Southwest Power Room + - uid: 12603 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -57.5,-22.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars Southwest Airlock + - uid: 12608 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-38.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars Southeast Power Room + - uid: 12609 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-36.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars Southeast Airlock + - uid: 12612 + components: + - type: Transform + pos: 23.5,3.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Technical Storage + - uid: 12614 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,8.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Secure Storage + - uid: 12625 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -36.5,-7.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engi Maint Junction + - uid: 12626 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -40.5,-5.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering - proto: SurveillanceCameraGeneral entities: - uid: 12060 @@ -67312,6 +67600,93 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Dormitory + - uid: 12583 + components: + - type: Transform + pos: 11.5,34.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: North Airlock External + - uid: 12584 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,32.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: North Airlock Internal + - uid: 12586 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,11.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Tool Room + - uid: 12604 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-32.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chaplain Crematorium + - uid: 12605 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,-37.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chaplain Office + - uid: 12606 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-35.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Disposals + - uid: 12615 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,20.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hallway Bridge + - uid: 12627 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-11.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Library - proto: SurveillanceCameraMedical entities: - uid: 12072 @@ -67336,6 +67711,70 @@ entities: - SurveillanceCameraMedical nameSet: True id: Virology + - uid: 12596 + components: + - type: Transform + pos: -18.5,-23.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Triage + - uid: 12597 + components: + - type: Transform + pos: -18.5,-18.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Morgue + - uid: 12598 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-16.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Cloning + - uid: 12599 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-26.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: CMO Office + - uid: 12600 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-26.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Surgery + - uid: 12601 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-27.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Storage - proto: SurveillanceCameraRouterCommand entities: - uid: 2732 @@ -67447,6 +67886,28 @@ entities: - SurveillanceCameraScience nameSet: True id: Research Director's Room + - uid: 12607 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-25.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Sci Maint Junction + - uid: 12610 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-27.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Anomaly Generator - proto: SurveillanceCameraSecurity entities: - uid: 12058 @@ -67534,6 +67995,67 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Detective office + - uid: 12611 + components: + - type: Transform + pos: 18.5,-12.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Detective Observation Room + - uid: 12620 + components: + - type: Transform + pos: -26.5,19.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security Cell 1 + - uid: 12621 + components: + - type: Transform + pos: -26.5,16.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security Cell 2 + - uid: 12622 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,23.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Entrance + - uid: 12623 + components: + - type: Transform + pos: -29.5,26.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Cell 1 + - uid: 12624 + components: + - type: Transform + pos: -25.5,26.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Cell 2 - proto: SurveillanceCameraService entities: - uid: 12546 @@ -67702,6 +68224,28 @@ entities: - SurveillanceCameraSupply nameSet: True id: Salvagers + - uid: 12585 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,30.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: QM office + - uid: 12613 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 27.5,15.5 + parent: 4812 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Salvage Bay Airlock - proto: Syringe entities: - uid: 6248 @@ -69604,13 +70148,6 @@ entities: - type: Transform pos: -53.589386,-16.742252 parent: 4812 -- proto: ToyAi - entities: - - uid: 3962 - components: - - type: Transform - pos: 10.469682,53.04013 - parent: 4812 - proto: ToyIan entities: - uid: 2503 @@ -69770,6 +70307,17 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 12630 + components: + - type: Transform + pos: 27.5,11.5 + parent: 4812 + - type: DeviceLinkSource + linkedPorts: + 12628: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: UniformPrinter entities: - uid: 2513 From 9b289c35a4ed6e512dde055cb0cd7c3b5e0d7bcd Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Fri, 23 Aug 2024 01:40:27 -0600 Subject: [PATCH 005/223] box update (#31345) * box update * remove invalid --- Resources/Maps/box.yml | 3307 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 3116 insertions(+), 191 deletions(-) diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 07c99276b39..2bd7181aa68 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -135,7 +135,7 @@ entities: version: 6 1,-3: ind: 1,-3 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdQAAAAADdQAAAAABdQAAAAAAdQAAAAACdQAAAAADeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAbAAAAAAAbAAAAAADbAAAAAADbAAAAAABeQAAAAAAeQAAAAAAdQAAAAACdQAAAAACdQAAAAACdQAAAAACdQAAAAADWQAAAAADLAAAAAAALAAAAAAALAAAAAAAeQAAAAAAbAAAAAAAbAAAAAADbAAAAAAAbAAAAAABeQAAAAAAaQAAAAAAdQAAAAAAdQAAAAACdQAAAAABdQAAAAAAdQAAAAABeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAbAAAAAAAWQAAAAADWQAAAAADWQAAAAACaQAAAAAAeQAAAAAAJgAAAAADJgAAAAABdQAAAAACJgAAAAADJgAAAAADeQAAAAAALAAAAAAALAAAAAAALAAAAAAAbAAAAAAAbAAAAAACWQAAAAABWQAAAAABWQAAAAABHQAAAAACeQAAAAAAJgAAAAACJgAAAAAAdQAAAAACJgAAAAAAJgAAAAAAeQAAAAAAUgAAAAACLAAAAAAALAAAAAAAeQAAAAAAbAAAAAADWQAAAAACWQAAAAADWQAAAAAB + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdQAAAAADdQAAAAABdQAAAAAAdQAAAAACdQAAAAADeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAbAAAAAAAbAAAAAADbAAAAAADbAAAAAABeQAAAAAAeQAAAAAAdQAAAAACdQAAAAACdQAAAAACdQAAAAACdQAAAAADWQAAAAADLAAAAAAALAAAAAAALAAAAAAAeQAAAAAAbAAAAAAAbAAAAAADbAAAAAAAbAAAAAABeQAAAAAAaQAAAAAAdQAAAAAAdQAAAAACdQAAAAABdQAAAAAAdQAAAAABeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAbAAAAAAAWQAAAAADWQAAAAADWQAAAAACaQAAAAAAeQAAAAAAJgAAAAADJgAAAAABdQAAAAACJgAAAAADJgAAAAADeQAAAAAALAAAAAAALAAAAAAALAAAAAAAbAAAAAAAbAAAAAACWQAAAAABWQAAAAABWQAAAAABHQAAAAACeQAAAAAAJgAAAAACJgAAAAAAdQAAAAACJgAAAAAAJgAAAAAAeQAAAAAAUgAAAAACLAAAAAAALAAAAAAAeQAAAAAAbAAAAAADWQAAAAACWQAAAAADWQAAAAAB version: 6 1,0: ind: 1,0 @@ -211,7 +211,7 @@ entities: version: 6 -6,0: ind: -6,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -5,-1: ind: -5,-1 @@ -351,15 +351,15 @@ entities: version: 6 2,-5: ind: 2,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAPgAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAPgAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAA version: 6 1,-5: ind: 1,-5 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAA version: 6 1,-4: ind: 1,-4 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAA version: 6 -1,-5: ind: -1,-5 @@ -379,7 +379,7 @@ entities: version: 6 0,-5: ind: 0,-5 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAACWQAAAAADWQAAAAADWQAAAAAAWQAAAAACaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAACaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAABWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAABWQAAAAAAWQAAAAABWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAACeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAWQAAAAABWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAABeQAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAABWQAAAAACWQAAAAABWQAAAAABWQAAAAABeQAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYgAAAAADeQAAAAAAeQAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAACWQAAAAADWQAAAAADWQAAAAAAWQAAAAACaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAACaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAABWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAABWQAAAAAAWQAAAAABWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAACHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAABeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAABWQAAAAACWQAAAAABWQAAAAABWQAAAAABeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYgAAAAADeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAA version: 6 0,-6: ind: 0,-6 @@ -391,11 +391,11 @@ entities: version: 6 1,-6: ind: 1,-6 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAEQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABeQAAAAAAHQAAAAABeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAACHQAAAAACHQAAAAACAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAABHQAAAAADeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAeQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAADHQAAAAACeQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAEQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABeQAAAAAAHQAAAAABeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAACHQAAAAACHQAAAAACAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAABHQAAAAADeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAeQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAADHQAAAAACeQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 2,-6: ind: 2,-6 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,-7: ind: 2,-7 @@ -777,6 +777,11 @@ entities: decals: 2460: 14,-42 2461: 14,-41 + - node: + color: '#334E6DC8' + id: BrickBoxOverlay + decals: + 3685: 11,-69 - node: color: '#FFFFFFFF' id: BrickTileDarkBox @@ -9970,27 +9975,6 @@ entities: - 26701 - 23177 - 23179 - - uid: 27486 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-68.5 - parent: 8364 - - type: DeviceList - devices: - - 27403 - - 27404 - - 27405 - - 27406 - - 23151 - - 16977 - - 27489 - - 22778 - - 16399 - - 17187 - - 17188 - - 23120 - - 23121 - proto: AirCanister entities: - uid: 444 @@ -10612,6 +10596,32 @@ entities: - type: Transform pos: -7.5,-10.5 parent: 8364 + - uid: 6597 + components: + - type: Transform + pos: 28.5,-88.5 + parent: 8364 + - uid: 6598 + components: + - type: Transform + pos: 28.5,-94.5 + parent: 8364 + - uid: 6599 + components: + - type: Transform + pos: 28.5,-82.5 + parent: 8364 + - uid: 16621 + components: + - type: Transform + pos: 10.5,-68.5 + parent: 8364 + - uid: 16631 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-85.5 + parent: 8364 - proto: AirlockDetectiveGlassLocked entities: - uid: 5713 @@ -11292,6 +11302,11 @@ entities: linkedPorts: 22633: - DoorStatus: DoorBolt + - uid: 6600 + components: + - type: Transform + pos: 30.5,-79.5 + parent: 8364 - uid: 9810 components: - type: Transform @@ -11382,6 +11397,11 @@ entities: linkedPorts: 5626: - DoorStatus: DoorBolt + - uid: 27848 + components: + - type: Transform + pos: 33.5,-79.5 + parent: 8364 - proto: AirlockExternalShuttleLocked entities: - uid: 593 @@ -11487,7 +11507,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -8052.6084 + secondsUntilStateChange: -10842.86 state: Opening - type: DeviceLinkSource lastSignals: @@ -16577,31 +16597,6 @@ entities: parent: 8364 - proto: BoxFolderBlack entities: - - uid: 6596 - components: - - type: Transform - pos: -11.5,13.5 - parent: 8364 - - uid: 6597 - components: - - type: Transform - pos: -11.5,13.5 - parent: 8364 - - uid: 6598 - components: - - type: Transform - pos: -11.5,13.5 - parent: 8364 - - uid: 6599 - components: - - type: Transform - pos: -11.5,13.5 - parent: 8364 - - uid: 6600 - components: - - type: Transform - pos: -11.5,13.5 - parent: 8364 - uid: 20894 components: - type: Transform @@ -31644,6 +31639,16 @@ entities: - type: Transform pos: 25.5,-56.5 parent: 8364 + - uid: 16623 + components: + - type: Transform + pos: 31.5,-116.5 + parent: 8364 + - uid: 16624 + components: + - type: Transform + pos: 31.5,-117.5 + parent: 8364 - uid: 16636 components: - type: Transform @@ -39254,6 +39259,56 @@ entities: - type: Transform pos: 86.5,-2.5 parent: 8364 + - uid: 27861 + components: + - type: Transform + pos: 25.5,-117.5 + parent: 8364 + - uid: 27862 + components: + - type: Transform + pos: 25.5,-116.5 + parent: 8364 + - uid: 27863 + components: + - type: Transform + pos: 24.5,-112.5 + parent: 8364 + - uid: 27864 + components: + - type: Transform + pos: 23.5,-112.5 + parent: 8364 + - uid: 27865 + components: + - type: Transform + pos: 32.5,-112.5 + parent: 8364 + - uid: 27866 + components: + - type: Transform + pos: 33.5,-112.5 + parent: 8364 + - uid: 27872 + components: + - type: Transform + pos: 29.5,-79.5 + parent: 8364 + - uid: 27873 + components: + - type: Transform + pos: 30.5,-79.5 + parent: 8364 + - uid: 27874 + components: + - type: Transform + pos: 31.5,-79.5 + parent: 8364 + - uid: 27875 + components: + - type: Transform + pos: 32.5,-79.5 + parent: 8364 - proto: CableApcStack entities: - uid: 1195 @@ -40496,6 +40551,11 @@ entities: - type: Transform pos: 1.5,-25.5 parent: 8364 + - uid: 6596 + components: + - type: Transform + pos: 27.5,-77.5 + parent: 8364 - uid: 6605 components: - type: Transform @@ -41201,6 +41261,11 @@ entities: - type: Transform pos: -6.5,-62.5 parent: 8364 + - uid: 7073 + components: + - type: Transform + pos: 27.5,-78.5 + parent: 8364 - uid: 7201 components: - type: Transform @@ -45686,16 +45751,186 @@ entities: - type: Transform pos: 81.5,-68.5 parent: 8364 + - uid: 21377 + components: + - type: Transform + pos: 28.5,-113.5 + parent: 8364 + - uid: 21378 + components: + - type: Transform + pos: 28.5,-114.5 + parent: 8364 + - uid: 21379 + components: + - type: Transform + pos: 29.5,-114.5 + parent: 8364 + - uid: 21380 + components: + - type: Transform + pos: 30.5,-114.5 + parent: 8364 + - uid: 21386 + components: + - type: Transform + pos: 27.5,-113.5 + parent: 8364 + - uid: 21494 + components: + - type: Transform + pos: 26.5,-113.5 + parent: 8364 + - uid: 21527 + components: + - type: Transform + pos: 26.5,-112.5 + parent: 8364 + - uid: 21579 + components: + - type: Transform + pos: 25.5,-112.5 + parent: 8364 + - uid: 21968 + components: + - type: Transform + pos: 24.5,-112.5 + parent: 8364 - uid: 22337 components: - type: Transform pos: -0.5,-31.5 parent: 8364 + - uid: 22454 + components: + - type: Transform + pos: 30.5,-113.5 + parent: 8364 + - uid: 22455 + components: + - type: Transform + pos: 30.5,-112.5 + parent: 8364 + - uid: 22456 + components: + - type: Transform + pos: 30.5,-111.5 + parent: 8364 + - uid: 22457 + components: + - type: Transform + pos: 30.5,-110.5 + parent: 8364 + - uid: 22527 + components: + - type: Transform + pos: 30.5,-109.5 + parent: 8364 + - uid: 22528 + components: + - type: Transform + pos: 29.5,-109.5 + parent: 8364 + - uid: 22529 + components: + - type: Transform + pos: 28.5,-109.5 + parent: 8364 + - uid: 22530 + components: + - type: Transform + pos: 28.5,-108.5 + parent: 8364 + - uid: 22536 + components: + - type: Transform + pos: 28.5,-107.5 + parent: 8364 + - uid: 22537 + components: + - type: Transform + pos: 28.5,-106.5 + parent: 8364 + - uid: 22538 + components: + - type: Transform + pos: 28.5,-105.5 + parent: 8364 + - uid: 22539 + components: + - type: Transform + pos: 28.5,-104.5 + parent: 8364 + - uid: 22540 + components: + - type: Transform + pos: 28.5,-103.5 + parent: 8364 + - uid: 22541 + components: + - type: Transform + pos: 28.5,-101.5 + parent: 8364 + - uid: 22542 + components: + - type: Transform + pos: 28.5,-100.5 + parent: 8364 + - uid: 22547 + components: + - type: Transform + pos: 28.5,-102.5 + parent: 8364 + - uid: 22548 + components: + - type: Transform + pos: 28.5,-98.5 + parent: 8364 - uid: 22583 components: - type: Transform pos: 4.5,-80.5 parent: 8364 + - uid: 22644 + components: + - type: Transform + pos: 28.5,-97.5 + parent: 8364 + - uid: 22736 + components: + - type: Transform + pos: 28.5,-96.5 + parent: 8364 + - uid: 22737 + components: + - type: Transform + pos: 28.5,-99.5 + parent: 8364 + - uid: 22747 + components: + - type: Transform + pos: 28.5,-93.5 + parent: 8364 + - uid: 22750 + components: + - type: Transform + pos: 28.5,-92.5 + parent: 8364 + - uid: 22758 + components: + - type: Transform + pos: 28.5,-95.5 + parent: 8364 + - uid: 22764 + components: + - type: Transform + pos: 28.5,-94.5 + parent: 8364 + - uid: 22770 + components: + - type: Transform + pos: 28.5,-91.5 + parent: 8364 - uid: 22807 components: - type: Transform @@ -45711,21 +45946,66 @@ entities: - type: Transform pos: 1.5,-80.5 parent: 8364 + - uid: 22858 + components: + - type: Transform + pos: 29.5,-91.5 + parent: 8364 + - uid: 22889 + components: + - type: Transform + pos: 30.5,-91.5 + parent: 8364 + - uid: 22921 + components: + - type: Transform + pos: 31.5,-91.5 + parent: 8364 - uid: 22961 components: - type: Transform pos: -10.5,-74.5 parent: 8364 + - uid: 22975 + components: + - type: Transform + pos: 31.5,-92.5 + parent: 8364 + - uid: 22976 + components: + - type: Transform + pos: 32.5,-92.5 + parent: 8364 + - uid: 22977 + components: + - type: Transform + pos: 33.5,-92.5 + parent: 8364 - uid: 22979 components: - type: Transform pos: 0.5,-80.5 parent: 8364 + - uid: 23133 + components: + - type: Transform + pos: 27.5,-109.5 + parent: 8364 - uid: 23203 components: - type: Transform pos: -14.5,-74.5 parent: 8364 + - uid: 23204 + components: + - type: Transform + pos: 26.5,-109.5 + parent: 8364 + - uid: 23211 + components: + - type: Transform + pos: 25.5,-109.5 + parent: 8364 - uid: 23221 components: - type: Transform @@ -45741,6 +46021,66 @@ entities: - type: Transform pos: -0.5,-80.5 parent: 8364 + - uid: 23915 + components: + - type: Transform + pos: 24.5,-109.5 + parent: 8364 + - uid: 24005 + components: + - type: Transform + pos: 23.5,-109.5 + parent: 8364 + - uid: 25012 + components: + - type: Transform + pos: 23.5,-108.5 + parent: 8364 + - uid: 25013 + components: + - type: Transform + pos: 23.5,-107.5 + parent: 8364 + - uid: 25225 + components: + - type: Transform + pos: 23.5,-106.5 + parent: 8364 + - uid: 25226 + components: + - type: Transform + pos: 23.5,-105.5 + parent: 8364 + - uid: 25228 + components: + - type: Transform + pos: 23.5,-104.5 + parent: 8364 + - uid: 25229 + components: + - type: Transform + pos: 23.5,-103.5 + parent: 8364 + - uid: 25230 + components: + - type: Transform + pos: 24.5,-103.5 + parent: 8364 + - uid: 25231 + components: + - type: Transform + pos: 24.5,-102.5 + parent: 8364 + - uid: 25232 + components: + - type: Transform + pos: 24.5,-101.5 + parent: 8364 + - uid: 25347 + components: + - type: Transform + pos: 24.5,-100.5 + parent: 8364 - uid: 25611 components: - type: Transform @@ -45761,6 +46101,21 @@ entities: - type: Transform pos: -10.5,26.5 parent: 8364 + - uid: 25677 + components: + - type: Transform + pos: 24.5,-99.5 + parent: 8364 + - uid: 25678 + components: + - type: Transform + pos: 24.5,-97.5 + parent: 8364 + - uid: 25784 + components: + - type: Transform + pos: 24.5,-96.5 + parent: 8364 - uid: 25839 components: - type: Transform @@ -45776,6 +46131,16 @@ entities: - type: Transform pos: -2.5,-80.5 parent: 8364 + - uid: 25892 + components: + - type: Transform + pos: 24.5,-95.5 + parent: 8364 + - uid: 25893 + components: + - type: Transform + pos: 24.5,-94.5 + parent: 8364 - uid: 25894 components: - type: Transform @@ -45786,11 +46151,61 @@ entities: - type: Transform pos: -6.5,-51.5 parent: 8364 + - uid: 25927 + components: + - type: Transform + pos: 24.5,-93.5 + parent: 8364 + - uid: 25949 + components: + - type: Transform + pos: 24.5,-92.5 + parent: 8364 + - uid: 25950 + components: + - type: Transform + pos: 24.5,-91.5 + parent: 8364 + - uid: 25981 + components: + - type: Transform + pos: 24.5,-98.5 + parent: 8364 + - uid: 25982 + components: + - type: Transform + pos: 25.5,-91.5 + parent: 8364 + - uid: 25983 + components: + - type: Transform + pos: 26.5,-91.5 + parent: 8364 + - uid: 25984 + components: + - type: Transform + pos: 27.5,-91.5 + parent: 8364 + - uid: 25985 + components: + - type: Transform + pos: 32.5,-93.5 + parent: 8364 + - uid: 25986 + components: + - type: Transform + pos: 32.5,-94.5 + parent: 8364 - uid: 25987 components: - type: Transform pos: -3.5,-80.5 parent: 8364 + - uid: 26000 + components: + - type: Transform + pos: 32.5,-95.5 + parent: 8364 - uid: 26001 components: - type: Transform @@ -45801,6 +46216,11 @@ entities: - type: Transform pos: -5.5,-80.5 parent: 8364 + - uid: 26003 + components: + - type: Transform + pos: 32.5,-96.5 + parent: 8364 - uid: 26005 components: - type: Transform @@ -45811,6 +46231,16 @@ entities: - type: Transform pos: -7.5,-80.5 parent: 8364 + - uid: 26007 + components: + - type: Transform + pos: 32.5,-97.5 + parent: 8364 + - uid: 26008 + components: + - type: Transform + pos: 32.5,-98.5 + parent: 8364 - uid: 26009 components: - type: Transform @@ -45841,6 +46271,21 @@ entities: - type: Transform pos: -9.5,-84.5 parent: 8364 + - uid: 26017 + components: + - type: Transform + pos: 32.5,-99.5 + parent: 8364 + - uid: 26018 + components: + - type: Transform + pos: 32.5,-100.5 + parent: 8364 + - uid: 26019 + components: + - type: Transform + pos: 32.5,-101.5 + parent: 8364 - uid: 26021 components: - type: Transform @@ -45891,6 +46336,11 @@ entities: - type: Transform pos: -15.5,-74.5 parent: 8364 + - uid: 26088 + components: + - type: Transform + pos: 32.5,-102.5 + parent: 8364 - uid: 26124 components: - type: Transform @@ -46126,6 +46576,66 @@ entities: - type: Transform pos: -20.5,51.5 parent: 8364 + - uid: 26381 + components: + - type: Transform + pos: 32.5,-103.5 + parent: 8364 + - uid: 26382 + components: + - type: Transform + pos: 33.5,-103.5 + parent: 8364 + - uid: 26383 + components: + - type: Transform + pos: 33.5,-104.5 + parent: 8364 + - uid: 26384 + components: + - type: Transform + pos: 33.5,-105.5 + parent: 8364 + - uid: 26385 + components: + - type: Transform + pos: 33.5,-106.5 + parent: 8364 + - uid: 26386 + components: + - type: Transform + pos: 33.5,-107.5 + parent: 8364 + - uid: 26387 + components: + - type: Transform + pos: 33.5,-108.5 + parent: 8364 + - uid: 26388 + components: + - type: Transform + pos: 32.5,-108.5 + parent: 8364 + - uid: 26389 + components: + - type: Transform + pos: 31.5,-108.5 + parent: 8364 + - uid: 26567 + components: + - type: Transform + pos: 31.5,-109.5 + parent: 8364 + - uid: 26568 + components: + - type: Transform + pos: 28.5,-90.5 + parent: 8364 + - uid: 26576 + components: + - type: Transform + pos: 28.5,-89.5 + parent: 8364 - uid: 26579 components: - type: Transform @@ -46166,6 +46676,26 @@ entities: - type: Transform pos: 9.5,-79.5 parent: 8364 + - uid: 26627 + components: + - type: Transform + pos: 28.5,-88.5 + parent: 8364 + - uid: 26628 + components: + - type: Transform + pos: 28.5,-87.5 + parent: 8364 + - uid: 26712 + components: + - type: Transform + pos: 28.5,-86.5 + parent: 8364 + - uid: 26738 + components: + - type: Transform + pos: 28.5,-85.5 + parent: 8364 - uid: 26742 components: - type: Transform @@ -46226,6 +46756,41 @@ entities: - type: Transform pos: -11.5,-61.5 parent: 8364 + - uid: 26797 + components: + - type: Transform + pos: 28.5,-84.5 + parent: 8364 + - uid: 26798 + components: + - type: Transform + pos: 28.5,-83.5 + parent: 8364 + - uid: 26799 + components: + - type: Transform + pos: 28.5,-82.5 + parent: 8364 + - uid: 26800 + components: + - type: Transform + pos: 28.5,-81.5 + parent: 8364 + - uid: 26801 + components: + - type: Transform + pos: 28.5,-80.5 + parent: 8364 + - uid: 26802 + components: + - type: Transform + pos: 28.5,-79.5 + parent: 8364 + - uid: 26803 + components: + - type: Transform + pos: 28.5,-78.5 + parent: 8364 - uid: 26911 components: - type: Transform @@ -46351,6 +46916,141 @@ entities: - type: Transform pos: 4.5,-68.5 parent: 8364 + - uid: 27809 + components: + - type: Transform + pos: 27.5,-76.5 + parent: 8364 + - uid: 27810 + components: + - type: Transform + pos: 27.5,-75.5 + parent: 8364 + - uid: 27811 + components: + - type: Transform + pos: 27.5,-74.5 + parent: 8364 + - uid: 27812 + components: + - type: Transform + pos: 27.5,-73.5 + parent: 8364 + - uid: 27813 + components: + - type: Transform + pos: 27.5,-72.5 + parent: 8364 + - uid: 27814 + components: + - type: Transform + pos: 27.5,-71.5 + parent: 8364 + - uid: 27815 + components: + - type: Transform + pos: 27.5,-70.5 + parent: 8364 + - uid: 27816 + components: + - type: Transform + pos: 27.5,-68.5 + parent: 8364 + - uid: 27817 + components: + - type: Transform + pos: 27.5,-69.5 + parent: 8364 + - uid: 27818 + components: + - type: Transform + pos: 26.5,-68.5 + parent: 8364 + - uid: 27819 + components: + - type: Transform + pos: 25.5,-68.5 + parent: 8364 + - uid: 27820 + components: + - type: Transform + pos: 24.5,-68.5 + parent: 8364 + - uid: 27821 + components: + - type: Transform + pos: 23.5,-68.5 + parent: 8364 + - uid: 27822 + components: + - type: Transform + pos: 22.5,-68.5 + parent: 8364 + - uid: 27823 + components: + - type: Transform + pos: 21.5,-68.5 + parent: 8364 + - uid: 27824 + components: + - type: Transform + pos: 20.5,-68.5 + parent: 8364 + - uid: 27825 + components: + - type: Transform + pos: 19.5,-68.5 + parent: 8364 + - uid: 27826 + components: + - type: Transform + pos: 18.5,-68.5 + parent: 8364 + - uid: 27827 + components: + - type: Transform + pos: 17.5,-68.5 + parent: 8364 + - uid: 27828 + components: + - type: Transform + pos: 16.5,-68.5 + parent: 8364 + - uid: 27829 + components: + - type: Transform + pos: 15.5,-68.5 + parent: 8364 + - uid: 27830 + components: + - type: Transform + pos: 13.5,-68.5 + parent: 8364 + - uid: 27831 + components: + - type: Transform + pos: 12.5,-68.5 + parent: 8364 + - uid: 27832 + components: + - type: Transform + pos: 11.5,-68.5 + parent: 8364 + - uid: 27833 + components: + - type: Transform + pos: 14.5,-68.5 + parent: 8364 + - uid: 27834 + components: + - type: Transform + pos: 10.5,-68.5 + parent: 8364 + - uid: 27835 + components: + - type: Transform + pos: 9.5,-68.5 + parent: 8364 - proto: CableHVStack entities: - uid: 1683 @@ -54690,11 +55390,41 @@ entities: - type: Transform pos: -10.5,-19.5 parent: 8364 + - uid: 22214 + components: + - type: Transform + pos: 24.5,-112.5 + parent: 8364 - uid: 22216 components: - type: Transform pos: 7.5,-86.5 parent: 8364 + - uid: 22220 + components: + - type: Transform + pos: 25.5,-112.5 + parent: 8364 + - uid: 22450 + components: + - type: Transform + pos: 26.5,-112.5 + parent: 8364 + - uid: 22451 + components: + - type: Transform + pos: 26.5,-111.5 + parent: 8364 + - uid: 22452 + components: + - type: Transform + pos: 26.5,-110.5 + parent: 8364 + - uid: 22453 + components: + - type: Transform + pos: 27.5,-110.5 + parent: 8364 - uid: 22634 components: - type: Transform @@ -56278,6 +57008,12 @@ entities: rot: -1.5707963267948966 rad pos: 81.5,-65.5 parent: 8364 + - uid: 21376 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 28.5,-114.5 + parent: 8364 - uid: 26965 components: - type: Transform @@ -60883,6 +61619,11 @@ entities: - type: Transform pos: 0.5,-76.5 parent: 8364 + - uid: 16634 + components: + - type: Transform + pos: 27.5,-76.5 + parent: 8364 - uid: 16714 components: - type: Transform @@ -61998,6 +62739,81 @@ entities: - type: Transform pos: 86.5,-13.5 parent: 8364 + - uid: 27836 + components: + - type: Transform + pos: 13.5,-68.5 + parent: 8364 + - uid: 27837 + components: + - type: Transform + pos: 14.5,-68.5 + parent: 8364 + - uid: 27838 + components: + - type: Transform + pos: 15.5,-68.5 + parent: 8364 + - uid: 27839 + components: + - type: Transform + pos: 16.5,-68.5 + parent: 8364 + - uid: 27840 + components: + - type: Transform + pos: 17.5,-68.5 + parent: 8364 + - uid: 27841 + components: + - type: Transform + pos: 18.5,-68.5 + parent: 8364 + - uid: 27842 + components: + - type: Transform + pos: 19.5,-68.5 + parent: 8364 + - uid: 27843 + components: + - type: Transform + pos: 21.5,-68.5 + parent: 8364 + - uid: 27844 + components: + - type: Transform + pos: 22.5,-68.5 + parent: 8364 + - uid: 27845 + components: + - type: Transform + pos: 20.5,-68.5 + parent: 8364 + - uid: 27846 + components: + - type: Transform + pos: 23.5,-68.5 + parent: 8364 + - uid: 27847 + components: + - type: Transform + pos: 24.5,-68.5 + parent: 8364 + - uid: 27876 + components: + - type: Transform + pos: 34.5,-80.5 + parent: 8364 + - uid: 27877 + components: + - type: Transform + pos: 34.5,-79.5 + parent: 8364 + - uid: 27878 + components: + - type: Transform + pos: 34.5,-78.5 + parent: 8364 - proto: Cautery entities: - uid: 21262 @@ -67373,13 +68189,6 @@ entities: - type: Transform pos: 46.43567,-24.34011 parent: 8364 -- proto: ClothingBeltMilitaryWebbing - entities: - - uid: 7073 - components: - - type: Transform - pos: 33.447113,-2.3700013 - parent: 8364 - proto: ClothingBeltUtility entities: - uid: 10603 @@ -69253,6 +70062,11 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-14.5 parent: 8364 + - uid: 16630 + components: + - type: Transform + pos: 30.5,-105.5 + parent: 8364 - uid: 19878 components: - type: Transform @@ -72484,6 +73298,11 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,-31.5 parent: 8364 + - uid: 27808 + components: + - type: Transform + pos: 27.5,-68.5 + parent: 8364 - proto: DisposalJunction entities: - uid: 4660 @@ -79500,6 +80319,156 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-68.5 parent: 8364 + - uid: 27704 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-78.5 + parent: 8364 + - uid: 27705 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-77.5 + parent: 8364 + - uid: 27706 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-76.5 + parent: 8364 + - uid: 27744 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-75.5 + parent: 8364 + - uid: 27762 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-74.5 + parent: 8364 + - uid: 27763 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-73.5 + parent: 8364 + - uid: 27764 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-72.5 + parent: 8364 + - uid: 27787 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-71.5 + parent: 8364 + - uid: 27788 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-70.5 + parent: 8364 + - uid: 27789 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-69.5 + parent: 8364 + - uid: 27790 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,-68.5 + parent: 8364 + - uid: 27791 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-68.5 + parent: 8364 + - uid: 27792 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-68.5 + parent: 8364 + - uid: 27793 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-68.5 + parent: 8364 + - uid: 27794 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-68.5 + parent: 8364 + - uid: 27795 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-68.5 + parent: 8364 + - uid: 27796 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-68.5 + parent: 8364 + - uid: 27797 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-68.5 + parent: 8364 + - uid: 27798 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-68.5 + parent: 8364 + - uid: 27799 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-68.5 + parent: 8364 + - uid: 27800 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-68.5 + parent: 8364 + - uid: 27801 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-68.5 + parent: 8364 + - uid: 27802 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-68.5 + parent: 8364 + - uid: 27803 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,-68.5 + parent: 8364 + - uid: 27807 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-68.5 + parent: 8364 - proto: DisposalRouter entities: - uid: 22062 @@ -79900,6 +80869,18 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-71.5 parent: 8364 + - uid: 27703 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-79.5 + parent: 8364 + - uid: 27804 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-68.5 + parent: 8364 - proto: DisposalUnit entities: - uid: 1432 @@ -80157,6 +81138,18 @@ entities: - type: Transform pos: 1.5,-71.5 parent: 8364 + - uid: 27702 + components: + - type: Transform + pos: 27.5,-79.5 + parent: 8364 + - uid: 27806 + components: + - type: MetaData + name: AI Core Chube + - type: Transform + pos: 11.5,-68.5 + parent: 8364 - proto: DisposalYJunction entities: - uid: 6145 @@ -81166,6 +82159,13 @@ entities: parent: 8364 - type: FaxMachine name: QM Office + - uid: 17710 + components: + - type: Transform + pos: -11.5,13.5 + parent: 8364 + - type: FaxMachine + name: Law Office - uid: 21200 components: - type: Transform @@ -83274,7 +84274,7 @@ entities: pos: -34.5,-14.5 parent: 8364 - type: Door - secondsUntilStateChange: -2241.1453 + secondsUntilStateChange: -5031.397 state: Closing - uid: 15010 components: @@ -86985,6 +87985,21 @@ entities: rot: 1.5707963267948966 rad pos: 21.5,-93.5 parent: 8364 + - uid: 27240 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-80.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27427 + components: + - type: Transform + pos: 27.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeFourway entities: - uid: 5316 @@ -91849,13 +92864,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 23133 - components: - - type: Transform - pos: 9.5,-68.5 - parent: 8364 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 23134 components: - type: Transform @@ -105409,18 +106417,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 25784 - components: - - type: Transform - anchored: False - rot: -1.5707963267948966 rad - pos: 14.5,31.5 - parent: 8364 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 25785 components: - type: Transform @@ -106056,6 +107052,134 @@ entities: - type: Transform pos: 22.5,-92.5 parent: 8364 + - uid: 27258 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-79.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27289 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-78.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27290 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-77.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27307 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-76.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27308 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-75.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27311 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-74.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27380 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-73.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27413 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27418 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-70.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-71.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27426 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-69.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27486 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27529 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27530 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27531 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27532 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 27548 components: - type: Transform @@ -106064,6 +107188,102 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' + - uid: 27549 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27550 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27552 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27564 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27618 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27619 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27620 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27621 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27622 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27623 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27624 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 27625 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeTJunction entities: - uid: 1 @@ -106150,6 +107370,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#990000FF' + - uid: 4485 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-68.5 + parent: 8364 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 4541 components: - type: Transform @@ -115013,11 +116241,6 @@ entities: - type: Transform pos: 30.5,-80.5 parent: 8364 - - uid: 4203 - components: - - type: Transform - pos: 30.5,-79.5 - parent: 8364 - uid: 4204 components: - type: Transform @@ -119445,6 +120668,36 @@ entities: - type: Transform pos: 86.5,-2.5 parent: 8364 + - uid: 27855 + components: + - type: Transform + pos: 33.5,-80.5 + parent: 8364 + - uid: 27856 + components: + - type: Transform + pos: 32.5,-80.5 + parent: 8364 + - uid: 27857 + components: + - type: Transform + pos: 31.5,-80.5 + parent: 8364 + - uid: 27858 + components: + - type: Transform + pos: 31.5,-78.5 + parent: 8364 + - uid: 27859 + components: + - type: Transform + pos: 32.5,-78.5 + parent: 8364 + - uid: 27860 + components: + - type: Transform + pos: 33.5,-78.5 + parent: 8364 - proto: GrilleBroken entities: - uid: 453 @@ -119842,21 +121095,11 @@ entities: parent: 8364 - proto: HighSecCommandLocked entities: - - uid: 742 - components: - - type: Transform - pos: 31.5,-85.5 - parent: 8364 - uid: 862 components: - type: Transform pos: 28.5,-104.5 parent: 8364 - - uid: 867 - components: - - type: Transform - pos: 28.5,-94.5 - parent: 8364 - uid: 876 components: - type: Transform @@ -119867,16 +121110,6 @@ entities: - type: Transform pos: 26.5,-91.5 parent: 8364 - - uid: 944 - components: - - type: Transform - pos: 28.5,-88.5 - parent: 8364 - - uid: 1224 - components: - - type: Transform - pos: 28.5,-82.5 - parent: 8364 - uid: 5335 components: - type: Transform @@ -128650,6 +129883,17 @@ entities: rot: 1.5707963267948966 rad pos: -41.5,-21.5 parent: 8364 + - uid: 27882 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-68.5 + parent: 8364 + - uid: 27883 + components: + - type: Transform + pos: 19.5,-68.5 + parent: 8364 - proto: PoweredlightExterior entities: - uid: 18 @@ -128753,6 +129997,40 @@ entities: parent: 8364 - type: ApcPowerReceiver powerLoad: 0 + - uid: 16626 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-100.5 + parent: 8364 + - uid: 16627 + components: + - type: Transform + pos: 24.5,-119.5 + parent: 8364 + - uid: 16628 + components: + - type: Transform + pos: 32.5,-119.5 + parent: 8364 + - uid: 16629 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,-100.5 + parent: 8364 + - uid: 16632 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-112.5 + parent: 8364 + - uid: 16633 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-112.5 + parent: 8364 - uid: 17476 components: - type: Transform @@ -130242,6 +131520,33 @@ entities: - type: Transform pos: 85.5,-5.5 parent: 8364 + - uid: 27867 + components: + - type: Transform + pos: 23.5,-95.5 + parent: 8364 + - uid: 27868 + components: + - type: Transform + pos: 33.5,-95.5 + parent: 8364 + - uid: 27869 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.5,-106.5 + parent: 8364 + - uid: 27870 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-106.5 + parent: 8364 + - uid: 27871 + components: + - type: Transform + pos: 32.5,-79.5 + parent: 8364 - proto: PoweredSmallLightEmpty entities: - uid: 15690 @@ -132421,6 +133726,12 @@ entities: - type: Transform pos: -58.5,-15.5 parent: 8364 + - uid: 16779 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,-38.5 + parent: 8364 - proto: ReinforcedPlasmaWindow entities: - uid: 120 @@ -135101,11 +136412,6 @@ entities: - type: Transform pos: 30.5,-80.5 parent: 8364 - - uid: 4485 - components: - - type: Transform - pos: 30.5,-79.5 - parent: 8364 - uid: 4486 components: - type: Transform @@ -137218,6 +138524,36 @@ entities: - type: Transform pos: -8.5,-64.5 parent: 8364 + - uid: 27849 + components: + - type: Transform + pos: 33.5,-78.5 + parent: 8364 + - uid: 27850 + components: + - type: Transform + pos: 32.5,-78.5 + parent: 8364 + - uid: 27851 + components: + - type: Transform + pos: 31.5,-78.5 + parent: 8364 + - uid: 27852 + components: + - type: Transform + pos: 31.5,-80.5 + parent: 8364 + - uid: 27853 + components: + - type: Transform + pos: 32.5,-80.5 + parent: 8364 + - uid: 27854 + components: + - type: Transform + pos: 33.5,-80.5 + parent: 8364 - proto: RemoteSignaller entities: - uid: 5286 @@ -138442,6 +139778,13 @@ entities: - type: Transform pos: 67.5,-75.5 parent: 8364 +- proto: SignAi + entities: + - uid: 742 + components: + - type: Transform + pos: 10.5,-67.5 + parent: 8364 - proto: SignalButton entities: - uid: 1910 @@ -143413,6 +144756,11 @@ entities: loadingNetworkDemand: 225.0009 currentSupply: 225.0009 supplyRampPosition: 225.0009 + - uid: 21385 + components: + - type: Transform + pos: 24.5,-112.5 + parent: 8364 - uid: 25700 components: - type: MetaData @@ -143707,6 +145055,61 @@ entities: - SurveillanceCameraCommand nameSet: True id: Drone Storage + - uid: 16635 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-10.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Upload + - uid: 16712 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-16.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Tunnel + - uid: 17153 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-7.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Entrance E + - uid: 17670 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-20.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Captain Bathroom + - uid: 17688 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,3.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: EVA Supply - uid: 21763 components: - type: Transform @@ -143718,6 +145121,201 @@ entities: - SurveillanceCameraCommand nameSet: True id: Grav Gen + - uid: 26849 + components: + - type: Transform + pos: 29.5,-81.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Airlock + - uid: 26852 + components: + - type: Transform + pos: 29.5,-87.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Monitor Station + - uid: 26875 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-90.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Entrance + - uid: 26876 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-92.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Closet + - uid: 26877 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-92.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Power + - uid: 26878 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-99.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext NW + - uid: 27197 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-99.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext NE + - uid: 27198 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-112.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core E + - uid: 27199 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,-112.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core W + - uid: 27200 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-105.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core Door + - uid: 27202 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-100.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Walkup + - uid: 27203 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-119.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext SE + - uid: 27204 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,-119.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext SW + - uid: 27205 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-112.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext W + - uid: 27206 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-112.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext E + - uid: 27207 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-84.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Closet + - uid: 27208 + components: + - type: Transform + pos: 24.5,-86.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext N + - uid: 27236 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-85.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext - uid: 27657 components: - type: Transform @@ -143729,6 +145327,49 @@ entities: - SurveillanceCameraCommand nameSet: True id: Show Room + - uid: 27879 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-68.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Chube + - uid: 27880 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-68.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Chube + - uid: 27881 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-68.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Chube + - uid: 27884 + components: + - type: Transform + pos: 28.5,-115.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core S - proto: SurveillanceCameraEngineering entities: - uid: 101 @@ -143786,6 +145427,59 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Circuitry + - uid: 16620 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-53.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos + - uid: 16622 + components: + - type: Transform + pos: -37.5,-62.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: 'Solars SW ' + - uid: 16625 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -42.5,-60.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars SW Airlock + - uid: 16802 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -50.5,22.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: 'Solars NW ' + - uid: 16803 + components: + - type: Transform + pos: -48.5,27.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars NW Door - uid: 16950 components: - type: Transform @@ -143830,6 +145524,17 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Telecomms + - uid: 17692 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,4.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: EVA Supply - uid: 17779 components: - type: Transform @@ -143841,6 +145546,196 @@ entities: - SurveillanceCameraEngineering nameSet: True id: AME Room + - uid: 21346 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,19.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars NE + - uid: 21347 + components: + - type: Transform + pos: 48.5,24.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars NE Door + - uid: 21352 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-55.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Telecomms Entrance + - uid: 21353 + components: + - type: Transform + pos: -4.5,-64.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: CE Office + - uid: 21354 + components: + - type: Transform + pos: -9.5,-66.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Secure Storage + - uid: 21357 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-41.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engi Construction Area + - uid: 21358 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-40.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmo North + - uid: 21359 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-43.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmo Tank 1 + - uid: 21360 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-47.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmo Tank 2 + - uid: 21361 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-51.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmo Tank 3 + - uid: 21362 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-55.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmo Tank 4 + - uid: 21364 + components: + - type: Transform + pos: 21.5,-66.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmo Tank Air + - uid: 21365 + components: + - type: Transform + pos: 17.5,-66.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmo Tank Oxy + - uid: 21366 + components: + - type: Transform + pos: 13.5,-66.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmo Tank Nitro + - uid: 21367 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-78.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Singulo Cage Airlock + - uid: 21368 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-80.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Singulo Cage + - uid: 21370 + components: + - type: Transform + pos: 13.5,-81.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Teg Burn Chamber + - uid: 21371 + components: + - type: Transform + pos: 25.5,-74.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Teg cooling loop - uid: 22987 components: - type: Transform @@ -144050,6 +145945,579 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Dorms + - uid: 836 + components: + - type: Transform + pos: -12.5,19.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Law + - uid: 4203 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 53.5,-0.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Gameroom + - uid: 16777 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-29.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Grav + - uid: 16778 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-29.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall HoP + - uid: 16788 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -47.5,-0.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Tool Room + - uid: 16789 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -43.5,-4.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Rec Room + - uid: 16790 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -43.5,-12.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Vox Box + - uid: 16791 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -45.5,-12.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bathroom + - uid: 16792 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -57.5,-3.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Arrivals + - uid: 16793 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -63.5,4.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 16794 + components: + - type: Transform + pos: -71.5,8.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals N + - uid: 16795 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -71.5,-3.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals S + - uid: 16796 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -73.5,-15.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Docks + - uid: 16801 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,16.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Shuttle Construction Room + - uid: 16804 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,-0.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Vault + - uid: 16877 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,-5.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arts & Crafts Room + - uid: 16940 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -63.5,-9.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: 'Arrivals Docks ' + - uid: 16941 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -57.5,-7.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Offices + - uid: 16958 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -59.5,-15.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Disposals + - uid: 16959 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,-5.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Closet + - uid: 16973 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-10.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Office + - uid: 16974 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-7.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bridge Entrance W + - uid: 17678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-0.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Eva + - uid: 17693 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,5.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall North + - uid: 20862 + components: + - type: Transform + pos: 21.5,-10.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bar + - uid: 20863 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,-12.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Bar + - uid: 20865 + components: + - type: Transform + pos: 39.5,-14.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Medical + - uid: 20866 + components: + - type: Transform + pos: 22.5,8.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Boxing Ring + - uid: 20867 + components: + - type: Transform + pos: 25.5,2.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: North Bar Room + - uid: 20868 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,11.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Holodeck W + - uid: 20869 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,18.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Cryosleep + - uid: 20870 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,12.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Holodeck E + - uid: 20871 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,15.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm 6 + - uid: 20873 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,15.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm 5 + - uid: 20874 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,12.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm 3 + - uid: 20875 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,15.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm 4 + - uid: 20876 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,9.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm 2 + - uid: 20877 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,6.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm 1 + - uid: 20878 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-0.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Dorms + - uid: 20887 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,15.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Boxing Ring + - uid: 21110 + components: + - type: Transform + pos: 59.5,-10.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Library + - uid: 21115 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 62.5,-2.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Librarian Room + - uid: 21144 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 66.5,1.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chaplain Office + - uid: 21231 + components: + - type: Transform + pos: 72.5,0.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel North + - uid: 21246 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 82.5,-6.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac 1 + - uid: 21268 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 85.5,-13.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac S + - uid: 21336 + components: + - type: Transform + pos: 85.5,-3.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac N + - uid: 21343 + components: + - type: Transform + pos: 68.5,-15.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Sci + - uid: 21348 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,7.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Shower Room + - uid: 21349 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,4.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Theater Room + - uid: 21350 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-19.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Bridge E + - uid: 21356 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-42.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Engi + - uid: 27902 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,-12.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Library - proto: SurveillanceCameraMedical entities: - uid: 234 @@ -144126,6 +146594,39 @@ entities: - SurveillanceCameraMedical nameSet: True id: Chemistry + - uid: 16797 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -80.5,8.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Arrivals Dock 1 + - uid: 16799 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -80.5,-5.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Arrivals Dock 2 + - uid: 16800 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -78.5,-14.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Arrivals Dock 3 - uid: 17461 components: - type: Transform @@ -144181,6 +146682,83 @@ entities: - SurveillanceCameraMedical nameSet: True id: Dissection + - uid: 27201 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-44.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical S Hallway + - uid: 27885 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-52.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Virology Airlock + - uid: 27886 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,-45.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Storage + - uid: 27887 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-33.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Hall + - uid: 27888 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 45.5,-31.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Breakroom + - uid: 27903 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,-22.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Hall N + - uid: 27904 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-24.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Hall W - proto: SurveillanceCameraRouterCommand entities: - uid: 27338 @@ -144279,6 +146857,28 @@ entities: - SurveillanceCameraScience nameSet: True id: RND + - uid: 21344 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 65.5,-18.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Sci Entrance + - uid: 21345 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 65.5,-22.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Sci Inside - uid: 27219 components: - type: Transform @@ -144290,6 +146890,146 @@ entities: - SurveillanceCameraScience nameSet: True id: Anomaly Lab + - uid: 27889 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,-36.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Breakroom + - uid: 27890 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 63.5,-34.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Canister Storage + - uid: 27891 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 71.5,-39.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Artifact Lab Chamber + - uid: 27892 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 77.5,-23.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Artifact Test Lab + - uid: 27893 + components: + - type: Transform + pos: 80.5,-30.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Artifact Lab Chamber + - uid: 27894 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 78.5,-37.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Toxins Storage Cans + - uid: 27895 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 65.5,-44.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Sci Hall S + - uid: 27896 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 65.5,-32.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Sci Hall + - uid: 27897 + components: + - type: Transform + pos: 71.5,-31.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science + - uid: 27898 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 56.5,-26.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Sci Hall E + - uid: 27899 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 56.5,-29.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Server Room + - uid: 27900 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,-22.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Robotics Surgery + - uid: 27901 + components: + - type: Transform + pos: 54.5,-20.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Robotics Bay - proto: SurveillanceCameraSecurity entities: - uid: 17 @@ -144433,6 +147173,137 @@ entities: - SurveillanceCameraSecurity nameSet: True id: sec hallway + - uid: 867 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,28.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security Entrance + - uid: 944 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,21.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security Front Door + - uid: 1224 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,41.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Visitation + - uid: 3871 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,40.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Entrance + - uid: 4839 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,35.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security + - uid: 17694 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,17.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Law Office + - uid: 17764 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,31.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Interrogation + - uid: 18310 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,30.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security External West + - uid: 20152 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,24.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Evidence Room + - uid: 20860 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,44.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Ext W + - uid: 20861 + components: + - type: Transform + pos: 0.5,53.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Ext N + - uid: 21239 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 77.5,-1.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Sec Checkpoint Evac - uid: 26391 components: - type: Transform @@ -144510,6 +147381,39 @@ entities: id: Perma Entryway - proto: SurveillanceCameraService entities: + - uid: 20939 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-0.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Bartender backroom + - uid: 20984 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-0.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Freezer + - uid: 20985 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 45.5,0.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Botany Backroom - uid: 27582 components: - type: Transform @@ -144555,6 +147459,80 @@ entities: - SurveillanceCameraSupply nameSet: True id: Salvage Bay + - uid: 16781 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -31.5,-36.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Salvage Bay Airlock + - uid: 16783 + components: + - type: Transform + pos: -36.5,-31.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Bay + - uid: 16784 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -43.5,-30.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Airlock 2 + - uid: 16785 + components: + - type: Transform + pos: -43.5,-28.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Airlock 1 + - uid: 16786 + components: + - type: Transform + pos: -30.5,-16.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Bay Closet + - uid: 16787 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -38.5,-20.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Bay North + - uid: 21351 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-21.5 + parent: 8364 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Lobby - proto: SurveillanceCameraWirelessRouterEntertainment entities: - uid: 27339 @@ -147781,6 +150759,11 @@ entities: - type: Transform pos: 53.5,-31.5 parent: 8364 + - uid: 16619 + components: + - type: Transform + pos: 32.5,-112.5 + parent: 8364 - uid: 27333 components: - type: Transform @@ -148367,13 +151350,6 @@ entities: - type: Transform pos: 7.435697,-65.321434 parent: 8364 -- proto: ToyAi - entities: - - uid: 836 - components: - - type: Transform - pos: 28.512953,-111.38849 - parent: 8364 - proto: ToyAmongPequeno entities: - uid: 27450 @@ -148644,6 +151620,17 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 16780 + components: + - type: Transform + pos: -24.5,-37.5 + parent: 8364 + - type: DeviceLinkSource + linkedPorts: + 16779: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 19935 components: - type: Transform @@ -153977,11 +156964,6 @@ entities: - type: Transform pos: 20.5,-70.5 parent: 8364 - - uid: 3871 - components: - - type: Transform - pos: 28.5,-59.5 - parent: 8364 - uid: 3873 components: - type: Transform @@ -156059,11 +159041,6 @@ entities: - type: Transform pos: -29.5,-74.5 parent: 8364 - - uid: 4839 - components: - - type: Transform - pos: 10.5,-68.5 - parent: 8364 - uid: 4852 components: - type: Transform @@ -159193,6 +162170,11 @@ entities: - type: Transform pos: -29.5,-24.5 parent: 8364 + - uid: 21363 + components: + - type: Transform + pos: 28.5,-59.5 + parent: 8364 - uid: 21460 components: - type: Transform @@ -159782,6 +162764,11 @@ entities: - type: Transform pos: 9.5,-84.5 parent: 8364 + - uid: 27805 + components: + - type: Transform + pos: 12.5,-68.5 + parent: 8364 - proto: WallShuttle entities: - uid: 2304 @@ -168974,68 +171961,6 @@ entities: - type: Transform pos: 16.540148,41.51879 parent: 8364 -- proto: WeaponTurretSyndicateBroken - entities: - - uid: 27197 - components: - - type: Transform - pos: 23.5,-93.5 - parent: 8364 - - uid: 27198 - components: - - type: Transform - pos: 27.5,-93.5 - parent: 8364 - - uid: 27199 - components: - - type: Transform - pos: 29.5,-93.5 - parent: 8364 - - uid: 27200 - components: - - type: Transform - pos: 33.5,-93.5 - parent: 8364 - - uid: 27201 - components: - - type: Transform - pos: 26.5,-97.5 - parent: 8364 - - uid: 27202 - components: - - type: Transform - pos: 30.5,-97.5 - parent: 8364 - - uid: 27203 - components: - - type: Transform - pos: 30.5,-101.5 - parent: 8364 - - uid: 27204 - components: - - type: Transform - pos: 26.5,-101.5 - parent: 8364 - - uid: 27205 - components: - - type: Transform - pos: 25.5,-113.5 - parent: 8364 - - uid: 27206 - components: - - type: Transform - pos: 31.5,-113.5 - parent: 8364 - - uid: 27207 - components: - - type: Transform - pos: 31.5,-110.5 - parent: 8364 - - uid: 27208 - components: - - type: Transform - pos: 25.5,-110.5 - parent: 8364 - proto: WeedSpray entities: - uid: 10453 From 7b5c6be67493ce72684d19ddee6ecae59b2840d5 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 23 Aug 2024 18:34:39 +1000 Subject: [PATCH 006/223] Make AI overlay use vis1 (#31348) * Make AI overlay use vis1 I think this is what get_hear in 13 uses idk this shit is esoteric. vis1 is luminosity vis2 is line of sight. * boark --- .../Silicons/StationAi/StationAiVisionSystem.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs index 33771cb963a..c144f330e11 100644 --- a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs +++ b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs @@ -482,11 +482,11 @@ public void Execute(int index) if (TargetTile != null) { - if (vis2.TryGetValue(TargetTile.Value, out var tileVis2)) + if (vis1.TryGetValue(TargetTile.Value, out var tileVis)) { DebugTools.Assert(seedTiles.Contains(TargetTile.Value)); - if (tileVis2 != 0) + if (tileVis != 0) { lock (System) { @@ -505,9 +505,9 @@ public void Execute(int index) if (!System._viewportTiles.Contains(tile)) continue; - var tileVis2 = vis2.GetValueOrDefault(tile, 0); + var tileVis = vis1.GetValueOrDefault(tile, 0); - if (tileVis2 != 0) + if (tileVis != 0) { // No idea if it's better to do this inside or out. lock (VisibleTiles) From 61a1e89339d0187f1a59b37284108935669c6826 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Fri, 23 Aug 2024 11:14:38 +0200 Subject: [PATCH 007/223] Add codeword highlighting (#30092) * Added codeword highlighting * Updated to support more codeword roles, color is set serverside * Review feedback * Change to a Component-based system using SessionSpecific * Tidied up CanGetState, set Access restrictions on component * Clean-up * Makes the injection ignore brackets, restore some codewords, remove "Taste/Touch" from adjectives --- Content.Client/Roles/RoleCodewordSystem.cs | 8 +++ .../Systems/Chat/ChatUIController.cs | 18 +++++++ .../GameTicking/Rules/TraitorRuleSystem.cs | 12 +++++ .../Roles/RoleCodeword/RoleCodewordSystem.cs | 8 +++ Content.Shared/Chat/SharedChatSystem.cs | 13 +++++ .../RoleCodeword/RoleCodewordComponent.cs | 37 ++++++++++++++ .../RoleCodeword/SharedRoleCodewordSystem.cs | 49 +++++++++++++++++++ Resources/Prototypes/Datasets/adjectives.yml | 1 - Resources/Prototypes/Datasets/verbs.yml | 3 +- 9 files changed, 146 insertions(+), 3 deletions(-) create mode 100644 Content.Client/Roles/RoleCodewordSystem.cs create mode 100644 Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs create mode 100644 Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs create mode 100644 Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs diff --git a/Content.Client/Roles/RoleCodewordSystem.cs b/Content.Client/Roles/RoleCodewordSystem.cs new file mode 100644 index 00000000000..8cc2e93099f --- /dev/null +++ b/Content.Client/Roles/RoleCodewordSystem.cs @@ -0,0 +1,8 @@ +using Content.Shared.Roles.RoleCodeword; + +namespace Content.Client.Roles; + +public sealed class RoleCodewordSystem : SharedRoleCodewordSystem +{ + +} diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 904b922baa0..8f66340a30f 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -9,6 +9,8 @@ using Content.Client.Examine; using Content.Client.Gameplay; using Content.Client.Ghost; +using Content.Client.Mind; +using Content.Client.Roles; using Content.Client.Stylesheets; using Content.Client.UserInterface.Screens; using Content.Client.UserInterface.Systems.Chat.Widgets; @@ -20,6 +22,7 @@ using Content.Shared.Decals; using Content.Shared.Input; using Content.Shared.Radio; +using Content.Shared.Roles.RoleCodeword; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Input; @@ -60,6 +63,8 @@ public sealed class ChatUIController : UIController [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default; [UISystemDependency] private readonly ChatSystem? _chatSys = default; [UISystemDependency] private readonly TransformSystem? _transform = default; + [UISystemDependency] private readonly MindSystem? _mindSystem = default!; + [UISystemDependency] private readonly RoleCodewordSystem? _roleCodewordSystem = default!; [ValidatePrototypeId] private const string ChatNamePalette = "ChatNames"; @@ -819,6 +824,19 @@ public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true) msg.WrappedMessage = SharedChatSystem.InjectTagInsideTag(msg, "Name", "color", GetNameColor(SharedChatSystem.GetStringInsideTag(msg, "Name"))); } + // Color any codewords for minds that have roles that use them + if (_player.LocalUser != null && _mindSystem != null && _roleCodewordSystem != null) + { + if (_mindSystem.TryGetMind(_player.LocalUser.Value, out var mindId) && _ent.TryGetComponent(mindId, out RoleCodewordComponent? codewordComp)) + { + foreach (var (_, codewordData) in codewordComp.RoleCodewords) + { + foreach (string codeword in codewordData.Codewords) + msg.WrappedMessage = SharedChatSystem.InjectTagAroundString(msg, codeword, "color", codewordData.Color.ToHex()); + } + } + } + // Log all incoming chat to repopulate when filter is un-toggled if (!msg.HideChat) { diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index 9e8a878a2d1..0465e1bac4e 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -10,8 +10,10 @@ using Content.Shared.NPC.Systems; using Content.Shared.Objectives.Components; using Content.Shared.PDA; +using Content.Shared.Radio; using Content.Shared.Roles; using Content.Shared.Roles.Jobs; +using Content.Shared.Roles.RoleCodeword; using Robust.Shared.Prototypes; using Robust.Shared.Random; using System.Linq; @@ -21,6 +23,8 @@ namespace Content.Server.GameTicking.Rules; public sealed class TraitorRuleSystem : GameRuleSystem { + private static readonly Color TraitorCodewordColor = Color.FromHex("#cc3b3b"); + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly NpcFactionSystem _npcFaction = default!; @@ -29,6 +33,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem [Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly SharedRoleSystem _roleSystem = default!; [Dependency] private readonly SharedJobSystem _jobs = default!; + [Dependency] private readonly SharedRoleCodewordSystem _roleCodewordSystem = default!; public override void Initialize() { @@ -102,6 +107,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool _antag.SendBriefing(traitor, GenerateBriefing(component.Codewords, code, issuer), null, component.GreetSoundNotification); + component.TraitorMinds.Add(mindId); // Assign briefing @@ -110,6 +116,12 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool Briefing = briefing }, mind, true); + // Send codewords to only the traitor client + var color = TraitorCodewordColor; // Fall back to a dark red Syndicate color if a prototype is not found + + RoleCodewordComponent codewordComp = EnsureComp(mindId); + _roleCodewordSystem.SetRoleCodewords(codewordComp, "traitor", component.Codewords.ToList(), color); + // Change the faction _npcFaction.RemoveFaction(traitor, component.NanoTrasenFaction, false); _npcFaction.AddFaction(traitor, component.SyndicateFaction); diff --git a/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs b/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs new file mode 100644 index 00000000000..a93d0f773b9 --- /dev/null +++ b/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs @@ -0,0 +1,8 @@ +using Content.Shared.Roles.RoleCodeword; + +namespace Content.Server.Roles.RoleCodeword; + +public sealed class RoleCodewordSystem : SharedRoleCodewordSystem +{ + +} diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs index 4f0b1465cd2..bd9ca4fa28c 100644 --- a/Content.Shared/Chat/SharedChatSystem.cs +++ b/Content.Shared/Chat/SharedChatSystem.cs @@ -1,4 +1,5 @@ using System.Collections.Frozen; +using System.Text.RegularExpressions; using Content.Shared.Popups; using Content.Shared.Radio; using Content.Shared.Speech; @@ -237,6 +238,18 @@ public static string InjectTagInsideTag(ChatMessage message, string outerTag, st return rawmsg; } + + /// + /// Injects a tag around all found instances of a specific string in a ChatMessage. + /// Excludes strings inside other tags and brackets. + /// + public static string InjectTagAroundString(ChatMessage message, string targetString, string tag, string? tagParameter) + { + var rawmsg = message.WrappedMessage; + rawmsg = Regex.Replace(rawmsg, "(?i)(" + targetString + ")(?-i)(?![^[]*])", $"[{tag}={tagParameter}]$1[/{tag}]"); + return rawmsg; + } + public static string GetStringInsideTag(ChatMessage message, string tag) { var rawmsg = message.WrappedMessage; diff --git a/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs b/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs new file mode 100644 index 00000000000..a1723dbc7ec --- /dev/null +++ b/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs @@ -0,0 +1,37 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared.Roles.RoleCodeword; + +/// +/// Used to display and highlight codewords in chat messages on the client. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedRoleCodewordSystem), Other = AccessPermissions.Read)] +public sealed partial class RoleCodewordComponent : Component +{ + /// + /// Contains the codewords tied to a role. + /// Key string should be unique for the role. + /// + [DataField, AutoNetworkedField] + public Dictionary RoleCodewords = new(); + + public override bool SessionSpecific => true; +} + +[DataDefinition, Serializable, NetSerializable] +public partial struct CodewordsData +{ + [DataField] + public Color Color; + + [DataField] + public List Codewords; + + public CodewordsData(Color color, List codewords) + { + Color = color; + Codewords = codewords; + } +} diff --git a/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs b/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs new file mode 100644 index 00000000000..9f860715fbd --- /dev/null +++ b/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs @@ -0,0 +1,49 @@ +using Content.Shared.Mind; +using Robust.Shared.GameStates; +using Robust.Shared.Player; + +namespace Content.Shared.Roles.RoleCodeword; + +public abstract class SharedRoleCodewordSystem : EntitySystem +{ + [Dependency] private readonly SharedMindSystem _mindSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnCodewordCompGetStateAttempt); + } + + /// + /// Determines if a codeword component should be sent to the client. + /// + private void OnCodewordCompGetStateAttempt(EntityUid uid, RoleCodewordComponent comp, ref ComponentGetStateAttemptEvent args) + { + args.Cancelled = !CanGetState(args.Player, comp); + } + + /// + /// The criteria that determine whether a codeword component should be sent to a client. + /// Sends the component if its owner is the player mind. + /// + /// The Player the component will be sent to. + /// The component being checked against + /// + private bool CanGetState(ICommonSession? player, RoleCodewordComponent comp) + { + if (!_mindSystem.TryGetMind(player, out EntityUid mindId, out var _)) + return false; + + if (!TryComp(mindId, out RoleCodewordComponent? playerComp) && comp != playerComp) + return false; + + return true; + } + + public void SetRoleCodewords(RoleCodewordComponent comp, string key, List codewords, Color color) + { + var data = new CodewordsData(color, codewords); + comp.RoleCodewords[key] = data; + } +} diff --git a/Resources/Prototypes/Datasets/adjectives.yml b/Resources/Prototypes/Datasets/adjectives.yml index 86fb2909521..fd243a88696 100644 --- a/Resources/Prototypes/Datasets/adjectives.yml +++ b/Resources/Prototypes/Datasets/adjectives.yml @@ -314,7 +314,6 @@ - slow - swift - young - - Taste/Touch - bitter - delicious - fresh diff --git a/Resources/Prototypes/Datasets/verbs.yml b/Resources/Prototypes/Datasets/verbs.yml index f53c18a71bf..ce245370213 100644 --- a/Resources/Prototypes/Datasets/verbs.yml +++ b/Resources/Prototypes/Datasets/verbs.yml @@ -1,4 +1,4 @@ -- type: dataset +- type: dataset id: verbs values: - accept @@ -616,7 +616,6 @@ - whine - whip - whirl - - whisper - whistle - wink - wipe From 17cf71d4ae94b86e8b93e79d4b54f16984f9d39a Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 23 Aug 2024 09:15:45 +0000 Subject: [PATCH 008/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index cb9e4ed7555..3b0105592b0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: ElectroJr - changes: - - message: The job/antag preferences window now has some buttons that link to relevant - guidebook entries - type: Add - id: 6691 - time: '2024-06-06T12:05:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28614 - author: Aeshus changes: - message: Space Law gives security exception for syndicate communication equipment. @@ -3865,3 +3857,10 @@ id: 7190 time: '2024-08-23T05:13:14.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30503 +- author: SlamBamActionman + changes: + - message: Codewords are now highlighted for traitors. + type: Add + id: 7191 + time: '2024-08-23T09:14:38.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30092 From 14567a1d3b722ec2b6604a30aa08117ae5fa800c Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 23 Aug 2024 11:58:58 +0200 Subject: [PATCH 009/223] fix metal pitcher name (#31351) --- .../Entities/Objects/Consumable/Drinks/drinks_flasks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index e053d2f36be..efd594ccdd0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -102,7 +102,7 @@ - type: entity parent: FlaskBase id: Pitcher - name: Metal Pitcher + name: metal pitcher description: A stainless steel insulated pitcher. Everyone's best friend in the morning. components: - type: SolutionContainerManager @@ -119,4 +119,4 @@ - type: Appearance - type: SolutionContainerVisuals maxFillLevels: 6 - fillBaseName: fill- \ No newline at end of file + fillBaseName: fill- From 9ee43eed2cef07e7d5ef9c20942b1585d9448aa5 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Fri, 23 Aug 2024 11:59:51 +0200 Subject: [PATCH 010/223] Add Galoshes slowdown over slippery surfaces (#30967) * first draft * Fixed it all, just need to rename stuff * Rename and add comments * Clean-up * Access added --- Content.Shared/Bed/Sleep/SleepingSystem.cs | 2 +- ...peedModifierContactCapClothingComponent.cs | 17 +++++ .../SpeedModifierContactCapClothingSystem.cs | 20 ++++++ .../Damage/Systems/SharedGodmodeSystem.cs | 2 +- .../Inventory/InventorySystem.Relay.cs | 3 + .../Events/GetSpeedModifierContactCapEvent.cs | 22 +++++++ .../Systems/SpeedModifierContactsSystem.cs | 66 +++++++++++++++---- .../GetSlowedOverSlipperyModifierEvent.cs | 10 +++ Content.Shared/Slippery/SlipperySystem.cs | 39 +++++++++-- .../Slippery/SlowedOverSlipperyComponent.cs | 13 ++++ .../Entities/Clothing/Shoes/specific.yml | 5 ++ 11 files changed, 179 insertions(+), 20 deletions(-) create mode 100644 Content.Shared/Clothing/Components/SpeedModifierContactCapClothingComponent.cs create mode 100644 Content.Shared/Clothing/EntitySystems/SpeedModifierContactCapClothingSystem.cs create mode 100644 Content.Shared/Movement/Events/GetSpeedModifierContactCapEvent.cs create mode 100644 Content.Shared/Slippery/GetSlowedOverSlipperyModifierEvent.cs create mode 100644 Content.Shared/Slippery/SlowedOverSlipperyComponent.cs diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs index 648d1b40103..0e29fcd98ae 100644 --- a/Content.Shared/Bed/Sleep/SleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -158,7 +158,7 @@ private void OnPointAttempt(Entity ent, ref PointAttemptEvent private void OnSlip(Entity ent, ref SlipAttemptEvent args) { - args.Cancel(); + args.NoSlip = true; } private void OnConsciousAttempt(Entity ent, ref ConsciousAttemptEvent args) diff --git a/Content.Shared/Clothing/Components/SpeedModifierContactCapClothingComponent.cs b/Content.Shared/Clothing/Components/SpeedModifierContactCapClothingComponent.cs new file mode 100644 index 00000000000..f23f5412782 --- /dev/null +++ b/Content.Shared/Clothing/Components/SpeedModifierContactCapClothingComponent.cs @@ -0,0 +1,17 @@ +using Content.Shared.Clothing.EntitySystems; +using Robust.Shared.GameStates; + +namespace Content.Shared.Clothing.Components; + +/// +/// When equipped, sets a max cap to the slowdown applied from contact speed modifiers. (E.g. glue puddles, kudzu). +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SpeedModifierContactCapClothingSystem))] +public sealed partial class SpeedModifierContactCapClothingComponent : Component +{ + [DataField, AutoNetworkedField] + public float MaxContactSprintSlowdown = 1f; + + [DataField, AutoNetworkedField] + public float MaxContactWalkSlowdown = 1f; +} diff --git a/Content.Shared/Clothing/EntitySystems/SpeedModifierContactCapClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SpeedModifierContactCapClothingSystem.cs new file mode 100644 index 00000000000..4b56b051678 --- /dev/null +++ b/Content.Shared/Clothing/EntitySystems/SpeedModifierContactCapClothingSystem.cs @@ -0,0 +1,20 @@ +using Content.Shared.Clothing.Components; +using Content.Shared.Inventory; +using Content.Shared.Movement.Events; + +namespace Content.Shared.Clothing.EntitySystems; + +public sealed class SpeedModifierContactCapClothingSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent>(OnGetMaxSlow); + } + + private void OnGetMaxSlow(Entity ent, ref InventoryRelayedEvent args) + { + args.Args.SetIfMax(ent.Comp.MaxContactSprintSlowdown, ent.Comp.MaxContactWalkSlowdown); + } +} diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs index d904c211eea..20e29ef4341 100644 --- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs +++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs @@ -21,7 +21,7 @@ public override void Initialize() private void OnSlipAttempt(EntityUid uid, GodmodeComponent component, SlipAttemptEvent args) { - args.Cancel(); + args.NoSlip = true; } private void OnBeforeDamageChanged(EntityUid uid, GodmodeComponent component, ref BeforeDamageChangedEvent args) diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs index f0bb73c1922..fc300b24afe 100644 --- a/Content.Shared/Inventory/InventorySystem.Relay.cs +++ b/Content.Shared/Inventory/InventorySystem.Relay.cs @@ -6,6 +6,7 @@ using Content.Shared.Gravity; using Content.Shared.IdentityManagement.Components; using Content.Shared.Inventory.Events; +using Content.Shared.Movement.Events; using Content.Shared.Movement.Systems; using Content.Shared.NameModifier.EntitySystems; using Content.Shared.Overlays; @@ -34,6 +35,8 @@ public void InitializeRelay() // by-ref events SubscribeLocalEvent(RefRelayInventoryEvent); SubscribeLocalEvent(RefRelayInventoryEvent); + SubscribeLocalEvent(RefRelayInventoryEvent); + SubscribeLocalEvent(RefRelayInventoryEvent); SubscribeLocalEvent(RefRelayInventoryEvent); // Eye/vision events diff --git a/Content.Shared/Movement/Events/GetSpeedModifierContactCapEvent.cs b/Content.Shared/Movement/Events/GetSpeedModifierContactCapEvent.cs new file mode 100644 index 00000000000..b72fe7d18ac --- /dev/null +++ b/Content.Shared/Movement/Events/GetSpeedModifierContactCapEvent.cs @@ -0,0 +1,22 @@ +using Content.Shared.Inventory; + +namespace Content.Shared.Movement.Events; + +/// +/// Raised on an entity to check if it has a max contact slowdown. +/// +[ByRefEvent] +public record struct GetSpeedModifierContactCapEvent() : IInventoryRelayEvent +{ + SlotFlags IInventoryRelayEvent.TargetSlots => ~SlotFlags.POCKET; + + public float MaxSprintSlowdown = 0f; + + public float MaxWalkSlowdown = 0f; + + public void SetIfMax(float valueSprint, float valueWalk) + { + MaxSprintSlowdown = MathF.Max(MaxSprintSlowdown, valueSprint); + MaxWalkSlowdown = MathF.Max(MaxWalkSlowdown, valueWalk); + } +} diff --git a/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs index 6e1b3a29aec..089fbbf9245 100644 --- a/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs +++ b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs @@ -1,4 +1,7 @@ +using Content.Shared.Inventory; using Content.Shared.Movement.Components; +using Content.Shared.Movement.Events; +using Content.Shared.Slippery; using Content.Shared.Whitelist; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Events; @@ -85,16 +88,37 @@ private void MovementSpeedCheck(EntityUid uid, SpeedModifiedByContactComponent c var entries = 0; foreach (var ent in _physics.GetContactingEntities(uid, physicsComponent)) { - if (!TryComp(ent, out var slowContactsComponent)) - continue; - - if (_whitelistSystem.IsWhitelistPass(slowContactsComponent.IgnoreWhitelist, uid)) - continue; - - walkSpeed += slowContactsComponent.WalkSpeedModifier; - sprintSpeed += slowContactsComponent.SprintSpeedModifier; - remove = false; - entries++; + bool speedModified = false; + + if (TryComp(ent, out var slowContactsComponent)) + { + if (_whitelistSystem.IsWhitelistPass(slowContactsComponent.IgnoreWhitelist, uid)) + continue; + + walkSpeed += slowContactsComponent.WalkSpeedModifier; + sprintSpeed += slowContactsComponent.SprintSpeedModifier; + speedModified = true; + } + + // SpeedModifierContactsComponent takes priority over SlowedOverSlipperyComponent, effectively overriding the slippery slow. + if (TryComp(ent, out var slipperyComponent) && speedModified == false) + { + var evSlippery = new GetSlowedOverSlipperyModifierEvent(); + RaiseLocalEvent(uid, ref evSlippery); + + if (evSlippery.SlowdownModifier != 1) + { + walkSpeed += evSlippery.SlowdownModifier; + sprintSpeed += evSlippery.SlowdownModifier; + speedModified = true; + } + } + + if (speedModified) + { + remove = false; + entries++; + } } if (entries > 0) @@ -102,6 +126,12 @@ private void MovementSpeedCheck(EntityUid uid, SpeedModifiedByContactComponent c walkSpeed /= entries; sprintSpeed /= entries; + var evMax = new GetSpeedModifierContactCapEvent(); + RaiseLocalEvent(uid, ref evMax); + + walkSpeed = MathF.Max(walkSpeed, evMax.MaxWalkSlowdown); + sprintSpeed = MathF.Max(sprintSpeed, evMax.MaxSprintSlowdown); + args.ModifySpeed(walkSpeed, sprintSpeed); } @@ -118,11 +148,19 @@ private void OnEntityExit(EntityUid uid, SpeedModifierContactsComponent componen private void OnEntityEnter(EntityUid uid, SpeedModifierContactsComponent component, ref StartCollideEvent args) { - var otherUid = args.OtherEntity; - if (!HasComp(otherUid)) + AddModifiedEntity(args.OtherEntity); + } + + /// + /// Add an entity to be checked for speed modification from contact with another entity. + /// + /// The entity to be added. + public void AddModifiedEntity(EntityUid uid) + { + if (!HasComp(uid)) return; - EnsureComp(otherUid); - _toUpdate.Add(otherUid); + EnsureComp(uid); + _toUpdate.Add(uid); } } diff --git a/Content.Shared/Slippery/GetSlowedOverSlipperyModifierEvent.cs b/Content.Shared/Slippery/GetSlowedOverSlipperyModifierEvent.cs new file mode 100644 index 00000000000..4036c6e1553 --- /dev/null +++ b/Content.Shared/Slippery/GetSlowedOverSlipperyModifierEvent.cs @@ -0,0 +1,10 @@ +using Content.Shared.Inventory; + +namespace Content.Shared.Slippery; +[ByRefEvent] +public record struct GetSlowedOverSlipperyModifierEvent() : IInventoryRelayEvent +{ + SlotFlags IInventoryRelayEvent.TargetSlots => ~SlotFlags.POCKET; + + public float SlowdownModifier = 1f; +} diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs index 5b2a2dfe452..19cc19aa19c 100644 --- a/Content.Shared/Slippery/SlipperySystem.cs +++ b/Content.Shared/Slippery/SlipperySystem.cs @@ -2,6 +2,8 @@ using Content.Shared.Database; using Content.Shared.Inventory; using Robust.Shared.Network; +using Content.Shared.Movement.Components; +using Content.Shared.Movement.Systems; using Content.Shared.Popups; using Content.Shared.StatusEffect; using Content.Shared.StepTrigger.Systems; @@ -12,11 +14,12 @@ using Robust.Shared.Containers; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Systems; +using Robust.Shared.Physics.Events; using Robust.Shared.Utility; namespace Content.Shared.Slippery; -[UsedImplicitly] +[UsedImplicitly] public sealed class SlipperySystem : EntitySystem { [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; @@ -25,6 +28,7 @@ public sealed class SlipperySystem : EntitySystem [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; [Dependency] private readonly SharedContainerSystem _container = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly SpeedModifierContactsSystem _speedModifier = default!; public override void Initialize() { @@ -33,9 +37,13 @@ public override void Initialize() SubscribeLocalEvent(HandleAttemptCollide); SubscribeLocalEvent(HandleStepTrigger); SubscribeLocalEvent(OnNoSlipAttempt); + SubscribeLocalEvent(OnSlowedOverSlipAttempt); SubscribeLocalEvent(OnThrownSlipAttempt); // as long as slip-resistant mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer). SubscribeLocalEvent>((e, c, ev) => OnNoSlipAttempt(e, c, ev.Args)); + SubscribeLocalEvent>((e, c, ev) => OnSlowedOverSlipAttempt(e, c, ev.Args)); + SubscribeLocalEvent>(OnGetSlowedOverSlipperyModifier); + SubscribeLocalEvent(OnEntityExit); } private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredOffEvent args) @@ -53,7 +61,12 @@ private void HandleAttemptCollide( private static void OnNoSlipAttempt(EntityUid uid, NoSlipComponent component, SlipAttemptEvent args) { - args.Cancel(); + args.NoSlip = true; + } + + private void OnSlowedOverSlipAttempt(EntityUid uid, SlowedOverSlipperyComponent component, SlipAttemptEvent args) + { + args.SlowOverSlippery = true; } private void OnThrownSlipAttempt(EntityUid uid, ThrownItemComponent comp, ref SlipCausingAttemptEvent args) @@ -61,6 +74,17 @@ private void OnThrownSlipAttempt(EntityUid uid, ThrownItemComponent comp, ref Sl args.Cancelled = true; } + private void OnGetSlowedOverSlipperyModifier(EntityUid uid, SlowedOverSlipperyComponent comp, ref InventoryRelayedEvent args) + { + args.Args.SlowdownModifier *= comp.SlowdownModifier; + } + + private void OnEntityExit(EntityUid uid, SlipperyComponent component, ref EndCollideEvent args) + { + if (HasComp(args.OtherEntity)) + _speedModifier.AddModifiedEntity(args.OtherEntity); + } + private bool CanSlip(EntityUid uid, EntityUid toSlip) { return !_container.IsEntityInContainer(uid) @@ -74,7 +98,10 @@ public void TrySlip(EntityUid uid, SlipperyComponent component, EntityUid other, var attemptEv = new SlipAttemptEvent(); RaiseLocalEvent(other, attemptEv); - if (attemptEv.Cancelled) + if (attemptEv.SlowOverSlippery) + _speedModifier.AddModifiedEntity(other); + + if (attemptEv.NoSlip) return; var attemptCausingEv = new SlipCausingAttemptEvent(); @@ -115,8 +142,12 @@ public void TrySlip(EntityUid uid, SlipperyComponent component, EntityUid other, /// /// Raised on an entity to determine if it can slip or not. /// -public sealed class SlipAttemptEvent : CancellableEntityEventArgs, IInventoryRelayEvent +public sealed class SlipAttemptEvent : EntityEventArgs, IInventoryRelayEvent { + public bool NoSlip; + + public bool SlowOverSlippery; + public SlotFlags TargetSlots { get; } = SlotFlags.FEET; } diff --git a/Content.Shared/Slippery/SlowedOverSlipperyComponent.cs b/Content.Shared/Slippery/SlowedOverSlipperyComponent.cs new file mode 100644 index 00000000000..1a2638bbef1 --- /dev/null +++ b/Content.Shared/Slippery/SlowedOverSlipperyComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Slippery; + +/// +/// Slows down the user when passing over an entity with . Does not prevent slipping, see . +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SlipperySystem))] +public sealed partial class SlowedOverSlipperyComponent : Component +{ + [DataField(required: true), AutoNetworkedField] + public float SlowdownModifier = 1f; +} diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index c8a3e615f3b..bd37135e98d 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -109,6 +109,11 @@ - type: Clothing sprite: Clothing/Shoes/Specific/galoshes.rsi - type: NoSlip + - type: SlowedOverSlippery + slowdownModifier: 0.7 + - type: SpeedModifierContactCapClothing + maxContactSprintSlowdown: 0.7 + maxContactWalkSlowdown: 0.7 - type: entity parent: [ClothingShoesBaseButcherable, BaseMajorContraband] From 390e310507460b8c9f7a8be5848e256eadd43432 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 23 Aug 2024 10:00:57 +0000 Subject: [PATCH 011/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3b0105592b0..2f3de8a89de 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Aeshus - changes: - - message: Space Law gives security exception for syndicate communication equipment. - type: Fix - id: 6692 - time: '2024-06-06T19:24:13.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28668 - author: Dutch-VanDerLinde changes: - message: Fixed janitors not spawning with a survival box in their bag @@ -3864,3 +3857,11 @@ id: 7191 time: '2024-08-23T09:14:38.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30092 +- author: SlamBamActionman + changes: + - message: Janitor's galoshes now apply slowdown over slippery surfaces, and has + a max slowdown cap over sticky surfaces. + type: Tweak + id: 7192 + time: '2024-08-23T09:59:51.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30967 From 7f91253bc010a4ba979c10fd28966215bd989d63 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 23 Aug 2024 12:26:56 +0200 Subject: [PATCH 012/223] very smol emergency boxes cleanup (#31355) --- Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index 540e05b453b..0b08acc3220 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -192,9 +192,7 @@ - type: entity parent: BoxSurvival id: BoxMime - name: survival box - description: It's a box with basic internals inside. - suffix: Emergency + suffix: Mime, Emergency components: - type: StorageFill contents: @@ -208,7 +206,7 @@ - type: entity parent: BoxSurvivalNitrogen id: BoxMimeNitrogen - suffix: Emergency N2 + suffix: Mime, Emergency N2 components: - type: StorageFill contents: From 8bf05ec863bc3cf98dcbc952356f7c7cf26a8f39 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 23 Aug 2024 12:53:22 +0200 Subject: [PATCH 013/223] cleanup bakery weapons (#31356) --- .../Prototypes/Entities/Objects/Weapons/Melee/baguette.yml | 4 +--- .../Entities/Objects/Weapons/Throwable/croissant.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml index 46bd430e5ac..25830216fff 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml @@ -1,8 +1,6 @@ - type: entity - name: baguette parent: FoodBreadBaguette id: WeaponBaguette - description: Bon appétit! suffix: Weapon components: - type: MeleeWeapon @@ -14,4 +12,4 @@ path: /Audio/Weapons/bladeslice.ogg - type: Reflect reflectProb: 0.05 - spread: 90 \ No newline at end of file + spread: 90 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml index 8ae52f4d735..f5cfd35b1d4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml @@ -1,8 +1,6 @@ - type: entity parent: FoodBakedCroissant id: WeaponCroissant - name: croissant - description: Buttery, flaky goodness. suffix: Weapon components: - type: Fixtures @@ -22,4 +20,4 @@ damage: types: Slash: 5 - Piercing: 10 \ No newline at end of file + Piercing: 10 From 01a211ae3f40418f0e7d2399298eb623dc40ec7b Mon Sep 17 00:00:00 2001 From: coolsurf6 Date: Sat, 24 Aug 2024 00:24:06 +1000 Subject: [PATCH 014/223] Increased Chest Marking Points for Reptilian Race (#30786) changed reptile chest marking count to 3 --- Resources/Prototypes/Species/reptilian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index f5cf1fa6ebf..321e01cfe73 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -56,7 +56,7 @@ points: 1 required: false Chest: - points: 1 + points: 3 required: false Legs: points: 2 From 2fcefeccc0827e0ebc2ab44c419150e526f6b8e0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 23 Aug 2024 14:25:13 +0000 Subject: [PATCH 015/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2f3de8a89de..d2ad3dd5d42 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Dutch-VanDerLinde - changes: - - message: Fixed janitors not spawning with a survival box in their bag - type: Fix - id: 6693 - time: '2024-06-06T22:26:13.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28669 - author: blueDev2 changes: - message: Rebalanced medicated suture and regen mesh to only require 1 brute pack/ointment @@ -3865,3 +3858,10 @@ id: 7192 time: '2024-08-23T09:59:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30967 +- author: coolsurf6 + changes: + - message: Increased the maximum number of reptilian chest markings to 3. + type: Tweak + id: 7193 + time: '2024-08-23T14:24:06.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30786 From 64630ee16bb32c4443446e120ad18a4b98b40da8 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sat, 24 Aug 2024 05:08:43 +1000 Subject: [PATCH 016/223] Update Core (#31353) add --- Resources/Maps/core.yml | 5881 +++++++++++++++++++++++++++++---------- 1 file changed, 4378 insertions(+), 1503 deletions(-) diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml index 25b921176fc..6e16c427ec0 100644 --- a/Resources/Maps/core.yml +++ b/Resources/Maps/core.yml @@ -81,139 +81,139 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: DgAAAAACDgAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAACDgAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAADegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAA + tiles: DgAAAAAADgAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAAADgAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAABXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAAAXQAAAAAAXQAAAAAAaAAAAAAAbAAAAAAAbAAAAAAAXQAAAAACaAAAAAACJAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADaAAAAAADJAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAAAXQAAAAADXQAAAAAAaAAAAAACbAAAAAAAbAAAAAAAXQAAAAAAaAAAAAACJAAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABaAAAAAACJAAAAAACJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: fgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAACaAAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACaAAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAXQAAAAADJAAAAAADXQAAAAACXQAAAAADaAAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAABfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAACaAAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADaAAAAAABXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAJAAAAAADJAAAAAACJAAAAAADXQAAAAACJAAAAAABXQAAAAABXQAAAAAAaAAAAAADXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAAAfgAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAABegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAACegAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-2: ind: -1,-2 - tiles: XQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAABaAAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAADaAAAAAACaAAAAAADaAAAAAACaAAAAAADaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAABTgAAAAACTgAAAAACaAAAAAAATgAAAAACTgAAAAABaAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADaAAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACHwAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACfgAAAAAAaAAAAAACaAAAAAAAXQAAAAADXQAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAABXQAAAAABXQAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAaAAAAAAAaAAAAAADXQAAAAAAJAAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAXQAAAAABTgAAAAAATgAAAAADTgAAAAADXQAAAAAAXQAAAAACTgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAXQAAAAACJAAAAAACJAAAAAAAJAAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACXQAAAAABaAAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAD + tiles: XQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAaAAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACaAAAAAADaAAAAAACaAAAAAADaAAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAADaAAAAAACaAAAAAABTgAAAAACTgAAAAAAaAAAAAABTgAAAAACTgAAAAABaAAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADaAAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAADHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAADXQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAaAAAAAADaAAAAAADXQAAAAABXQAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAAAJAAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAXQAAAAADTgAAAAADTgAAAAACTgAAAAABXQAAAAABXQAAAAAATgAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAAAXQAAAAABJAAAAAABJAAAAAABJAAAAAADfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAABaAAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAAA version: 6 0,-2: ind: 0,-2 - tiles: aAAAAAAAaAAAAAAAXQAAAAADXQAAAAADaAAAAAACXQAAAAABXQAAAAADXQAAAAABaAAAAAABXQAAAAADaAAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADTgAAAAABTgAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAHwAAAAAAJAAAAAAAJAAAAAABJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAADegAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAJAAAAAADfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADegAAAAAAegAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAHwAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAABJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAABHwAAAAABfgAAAAAAHwAAAAACJAAAAAABJAAAAAACJAAAAAAAJAAAAAABXQAAAAAAXQAAAAAAJAAAAAAAfgAAAAAAJAAAAAACaAAAAAADaAAAAAAAaAAAAAACXQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAATgAAAAACTgAAAAADJAAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAACXQAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAADaAAAAAACXQAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAADXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAACXQAAAAADXQAAAAABaAAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAACXQAAAAAAXQAAAAADaAAAAAADXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAAAaAAAAAAD + tiles: aAAAAAACaAAAAAAAXQAAAAACXQAAAAAAaAAAAAADXQAAAAADXQAAAAACXQAAAAAAaAAAAAADXQAAAAACaAAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADTgAAAAADTgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAaAAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAABJAAAAAADJAAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAACfgAAAAAAHwAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAJAAAAAACegAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAABJAAAAAACfgAAAAAAHwAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADegAAAAACegAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAACJAAAAAADJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADaAAAAAACXQAAAAABHwAAAAACfgAAAAAAHwAAAAADJAAAAAABJAAAAAABJAAAAAABJAAAAAACXQAAAAABXQAAAAADJAAAAAACfgAAAAAAJAAAAAADaAAAAAADaAAAAAABaAAAAAABXQAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAATgAAAAAATgAAAAABJAAAAAABfgAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAAAXQAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAACXQAAAAADXQAAAAADaAAAAAADaAAAAAAAaAAAAAACaAAAAAAAaAAAAAACXQAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAACXQAAAAABXQAAAAAAaAAAAAABXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAADaAAAAAACXQAAAAACHwAAAAAAHwAAAAADfgAAAAAAHwAAAAABXQAAAAACXQAAAAAAaAAAAAADHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAaAAAAAABaAAAAAABaAAAAAABaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAACXQAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAACXQAAAAACXQAAAAABaAAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAXQAAAAACXQAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABXQAAAAABXQAAAAADaAAAAAAA version: 6 1,-2: ind: 1,-2 - tiles: XQAAAAAAXQAAAAABaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAABHwAAAAABfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAHwAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAAJAAAAAABHwAAAAACfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAABaAAAAAABXQAAAAADaAAAAAACHwAAAAADHwAAAAACHwAAAAACJAAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAHwAAAAADaAAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAADHwAAAAABfgAAAAAAHwAAAAAAJAAAAAACHwAAAAABfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADHwAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAJAAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAJAAAAAADHwAAAAABfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAABaAAAAAADXQAAAAACfgAAAAAAHwAAAAABJAAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAJAAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAHwAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAABXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA + tiles: XQAAAAADXQAAAAABaAAAAAABXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAHwAAAAADaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAADHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAHwAAAAADaAAAAAACaAAAAAAAaAAAAAABaAAAAAAAaAAAAAABHwAAAAACfgAAAAAAHwAAAAACJAAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAaAAAAAADaAAAAAACaAAAAAADXQAAAAADaAAAAAAAHwAAAAAAHwAAAAABHwAAAAAAJAAAAAACHwAAAAADfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAHwAAAAABaAAAAAAAaAAAAAADaAAAAAADaAAAAAADaAAAAAACHwAAAAAAfgAAAAAAHwAAAAADJAAAAAABHwAAAAABfgAAAAAAaAAAAAADaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAACHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACJAAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAABaAAAAAABXQAAAAADfgAAAAAAHwAAAAADJAAAAAAAHwAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAAAJAAAAAADXQAAAAADXQAAAAADXQAAAAADfgAAAAAAHwAAAAADfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAACXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA version: 6 1,-1: ind: 1,-1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAD + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAA version: 6 -2,-2: ind: -2,-2 - tiles: EgAAAAADXQAAAAABegAAAAABegAAAAABXQAAAAADfgAAAAAAJAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAaAAAAAAAXQAAAAADXQAAAAADXQAAAAADEgAAAAAAXQAAAAACegAAAAABegAAAAADXQAAAAADfgAAAAAAXQAAAAADTgAAAAADTgAAAAACaAAAAAADTgAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAAAaAAAAAAAEgAAAAABXQAAAAACegAAAAADegAAAAABXQAAAAABfgAAAAAAXQAAAAABTgAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADaAAAAAADXQAAAAADXQAAAAAAXQAAAAACEgAAAAACXQAAAAADegAAAAAAegAAAAACXQAAAAABaAAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAEgAAAAABXQAAAAAAegAAAAAAegAAAAABXQAAAAADaAAAAAADXQAAAAADTgAAAAACXQAAAAADXQAAAAACaAAAAAADHwAAAAACHwAAAAADJgAAAAACJgAAAAABJgAAAAACEgAAAAABXQAAAAABegAAAAACegAAAAABXQAAAAACfgAAAAAAXQAAAAABTgAAAAADXQAAAAAAXQAAAAADaAAAAAAAHwAAAAAAHwAAAAAATgAAAAABTgAAAAADTgAAAAADXQAAAAAAXQAAAAAAKAAAAAABKAAAAAADXQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAXQAAAAAAaAAAAAADHwAAAAAAHwAAAAADJgAAAAADJgAAAAABJgAAAAACKAAAAAAAKAAAAAABKAAAAAACKAAAAAADXQAAAAACfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAACegAAAAACegAAAAACegAAAAADegAAAAACegAAAAADegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAA + tiles: EgAAAAAAXQAAAAAAegAAAAABegAAAAABXQAAAAACfgAAAAAAJAAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAACXQAAAAACXQAAAAABXQAAAAADEgAAAAADXQAAAAAAegAAAAAAegAAAAABXQAAAAAAfgAAAAAAXQAAAAACTgAAAAADTgAAAAACaAAAAAAATgAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAEgAAAAABXQAAAAABegAAAAACegAAAAABXQAAAAACfgAAAAAAXQAAAAACTgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABaAAAAAADXQAAAAAAXQAAAAACXQAAAAABEgAAAAACXQAAAAACegAAAAAAegAAAAAAXQAAAAAAaAAAAAABXQAAAAABaAAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADEgAAAAABXQAAAAAAegAAAAADegAAAAADXQAAAAACaAAAAAABXQAAAAABTgAAAAAAXQAAAAAAXQAAAAAAaAAAAAACHwAAAAACHwAAAAACJgAAAAACJgAAAAAAJgAAAAABEgAAAAADXQAAAAACegAAAAADegAAAAAAXQAAAAADfgAAAAAAXQAAAAAATgAAAAABXQAAAAADXQAAAAACaAAAAAADHwAAAAADHwAAAAADTgAAAAACTgAAAAAATgAAAAAAXQAAAAABXQAAAAADKAAAAAAAKAAAAAABXQAAAAACfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABaAAAAAABHwAAAAACHwAAAAACJgAAAAABJgAAAAABJgAAAAACKAAAAAACKAAAAAABKAAAAAAAKAAAAAADXQAAAAADfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAegAAAAABegAAAAACegAAAAABegAAAAAAegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAACegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAegAAAAACegAAAAADegAAAAAAegAAAAAAegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAA version: 6 -2,-1: ind: -2,-1 - tiles: egAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAACaAAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAegAAAAABegAAAAABegAAAAADewAAAAADewAAAAABfgAAAAAATgAAAAABTgAAAAABKAAAAAADTgAAAAAATgAAAAACaAAAAAACXQAAAAACaAAAAAACXQAAAAABfgAAAAAAegAAAAABegAAAAABegAAAAADewAAAAAAewAAAAABbAAAAAAATgAAAAADTgAAAAABKAAAAAABTgAAAAACTgAAAAACaAAAAAABXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAADewAAAAACewAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAACaAAAAAABXQAAAAACaAAAAAADXQAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAADewAAAAABewAAAAADfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAewAAAAABewAAAAAAewAAAAACfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAACKAAAAAACKAAAAAACfgAAAAAAXQAAAAABaAAAAAAAaAAAAAACXQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABQAAAAAAAQAAAAAAAXQAAAAABfgAAAAAAKAAAAAABKAAAAAAAKAAAAAACfgAAAAAAXQAAAAABXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAACaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAJAAAAAABXwAAAAADXwAAAAABXwAAAAAAXQAAAAAAXQAAAAADXQAAAAABaAAAAAAAegAAAAACegAAAAACegAAAAABegAAAAABegAAAAADXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAADaAAAAAABegAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAACXQAAAAABXQAAAAACfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAABXQAAAAACXQAAAAAAXQAAAAACaAAAAAABegAAAAADegAAAAACegAAAAABegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAADXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACegAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAaAAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAAC + tiles: egAAAAACegAAAAADegAAAAADegAAAAACegAAAAAAaAAAAAACXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAegAAAAAAegAAAAABegAAAAACewAAAAADewAAAAABfgAAAAAATgAAAAAATgAAAAACKAAAAAACTgAAAAADTgAAAAAAaAAAAAACXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAegAAAAABegAAAAAAegAAAAACewAAAAACewAAAAAAbAAAAAAATgAAAAABTgAAAAAAKAAAAAABTgAAAAACTgAAAAADaAAAAAADXQAAAAACaAAAAAACXQAAAAABfgAAAAAAegAAAAADegAAAAADegAAAAACewAAAAACewAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAADegAAAAADegAAAAADaAAAAAACXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAegAAAAADegAAAAADegAAAAADewAAAAACewAAAAABfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAewAAAAADewAAAAADewAAAAABfgAAAAAAXQAAAAACaAAAAAACXQAAAAACXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAADQAAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAKAAAAAAAKAAAAAACKAAAAAACfgAAAAAAXQAAAAACaAAAAAAAaAAAAAACXQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAQAAAAAAAQAAAAAAAXQAAAAABfgAAAAAAKAAAAAAAKAAAAAACKAAAAAADfgAAAAAAXQAAAAADXQAAAAABaAAAAAACXQAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAJAAAAAACXwAAAAADXwAAAAACXwAAAAADXQAAAAADXQAAAAACXQAAAAACaAAAAAADegAAAAADegAAAAACegAAAAACegAAAAACegAAAAADXQAAAAABXQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAXQAAAAABXQAAAAACXQAAAAABaAAAAAABegAAAAABegAAAAACegAAAAAAegAAAAAAegAAAAAAXQAAAAAAXQAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAABXQAAAAACXQAAAAAAaAAAAAACegAAAAABegAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACXQAAAAAAXQAAAAAAXQAAAAACaAAAAAADegAAAAACegAAAAACegAAAAABegAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABaAAAAAAAegAAAAAAegAAAAACegAAAAACegAAAAACegAAAAAA version: 6 1,0: ind: 1,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAADaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAaAAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAABTgAAAAACaAAAAAABaAAAAAACbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAABXQAAAAADXQAAAAADJAAAAAACJAAAAAACJAAAAAAAXQAAAAAAXQAAAAADaAAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAADXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAACXQAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAABaAAAAAABaAAAAAADfgAAAAAAaAAAAAADaAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABaAAAAAABaAAAAAACHQAAAAAAaAAAAAACaAAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAaAAAAAACaAAAAAAAXQAAAAADaAAAAAABaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABaAAAAAAAaAAAAAABXQAAAAAAaAAAAAACaAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADaAAAAAAAaAAAAAADfgAAAAAAaAAAAAADaAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAB + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAACaAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAABaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAATgAAAAABTgAAAAADaAAAAAABaAAAAAADbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAADXQAAAAABXQAAAAADJAAAAAACJAAAAAACJAAAAAADXQAAAAABXQAAAAAAaAAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACfgAAAAAAJAAAAAADJAAAAAADJAAAAAABXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADfgAAAAAAJAAAAAADJAAAAAABJAAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAJAAAAAADJAAAAAACJAAAAAACXQAAAAACXQAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABaAAAAAADaAAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACaAAAAAACaAAAAAACHQAAAAAAaAAAAAADaAAAAAACXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAADaAAAAAACaAAAAAAAXQAAAAACaAAAAAADaAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAACaAAAAAAAaAAAAAADXQAAAAACaAAAAAABaAAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADaAAAAAAAaAAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAAB version: 6 2,-2: ind: 2,-2 - tiles: HwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAHwAAAAABHwAAAAADewAAAAABfgAAAAAAewAAAAABHwAAAAACHwAAAAABMwAAAAAAHwAAAAABHwAAAAABewAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAewAAAAABewAAAAAAewAAAAAAHwAAAAADHwAAAAACMwAAAAAAHwAAAAAAHwAAAAACewAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAewAAAAABfgAAAAAAewAAAAAAHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACewAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABewAAAAACewAAAAACewAAAAADewAAAAADewAAAAABewAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAXQAAAAACegAAAAACegAAAAAAegAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACXQAAAAADXQAAAAACegAAAAAAJAAAAAACfgAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAABegAAAAACegAAAAABegAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAcAAAAAAAcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAAAaAAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAADXQAAAAADTgAAAAACTgAAAAAAaAAAAAACTgAAAAACTgAAAAAAaAAAAAAAaAAAAAABTgAAAAADaAAAAAAATgAAAAABTgAAAAAATgAAAAADaAAAAAACTgAAAAABaAAAAAACaAAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAADXQAAAAACXQAAAAADXQAAAAACaAAAAAACXQAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: HwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAHwAAAAACHwAAAAADewAAAAABfgAAAAAAewAAAAACHwAAAAADHwAAAAADMwAAAAAAHwAAAAAAHwAAAAADewAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAADewAAAAADewAAAAACewAAAAADHwAAAAACHwAAAAACMwAAAAAAHwAAAAADHwAAAAABewAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAADewAAAAAAfgAAAAAAewAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABewAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACewAAAAACewAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAACfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAegAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACXQAAAAABegAAAAAAegAAAAABegAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADXQAAAAADXQAAAAABegAAAAAAJAAAAAAAfgAAAAAAHwAAAAABXQAAAAABXQAAAAADXQAAAAACegAAAAAAegAAAAACegAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAcAAAAAADcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAaAAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAACaAAAAAADXQAAAAAATgAAAAACTgAAAAAAaAAAAAAATgAAAAAATgAAAAAAaAAAAAABaAAAAAADTgAAAAACaAAAAAABTgAAAAADTgAAAAABTgAAAAADaAAAAAACTgAAAAABaAAAAAACaAAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAADaAAAAAACXQAAAAABXQAAAAACXQAAAAAAaAAAAAABXQAAAAACXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 2,-1: ind: 2,-1 - tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAAdQAAAAACdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAdQAAAAABdQAAAAACcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACaAAAAAACXQAAAAACfgAAAAAAdQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAdQAAAAACdQAAAAACcAAAAAACJAAAAAADJAAAAAABJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAfgAAAAAAdQAAAAADdQAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAABfgAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAdQAAAAABdQAAAAADcAAAAAAA + tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAdQAAAAACdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAdQAAAAAAdQAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAdQAAAAABdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAABaAAAAAAAXQAAAAAAfgAAAAAAdQAAAAACdQAAAAAAcAAAAAABJAAAAAADJAAAAAAAJAAAAAADfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAABXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAdQAAAAABdQAAAAABcAAAAAAB version: 6 -2,0: ind: -2,0 - tiles: aAAAAAACaAAAAAACaAAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAADaAAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAAAegAAAAADaAAAAAADaAAAAAADXwAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABaAAAAAADegAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAADaAAAAAADaAAAAAABXwAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAAAegAAAAADaAAAAAABaAAAAAACaAAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADaAAAAAADegAAAAADegAAAAACegAAAAACegAAAAAAegAAAAACewAAAAABewAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACAwAAAAAAegAAAAAAegAAAAAAegAAAAACegAAAAACXQAAAAABXQAAAAACXQAAAAACHwAAAAACewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAABXQAAAAACAwAAAAAAegAAAAACHwAAAAACHwAAAAACHwAAAAADfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAADXQAAAAAAAwAAAAAAegAAAAACJAAAAAABJAAAAAABJAAAAAABfgAAAAAAJAAAAAADHwAAAAAAHwAAAAABewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAABXQAAAAABAwAAAAAAegAAAAAAJAAAAAACJAAAAAAAJAAAAAABfgAAAAAAJAAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACaAAAAAACaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAeQAAAAADeQAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAADXQAAAAABXQAAAAABXQAAAAAAaAAAAAAAXQAAAAADeQAAAAACeQAAAAADeQAAAAADeQAAAAAAeQAAAAABeQAAAAACLgAAAAAALgAAAAAAAQAAAAACaAAAAAAAaAAAAAABAQAAAAACfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAJAAAAAABeQAAAAADeQAAAAACeQAAAAABeQAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAAAXQAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAfgAAAAAALgAAAAAAXQAAAAACXQAAAAABPAAAAAAAAQAAAAADXQAAAAABXQAAAAAAaAAAAAABXQAAAAACXQAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAABfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAABfgAAAAAAXQAAAAACaAAAAAACXQAAAAACfgAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAfgAAAAAAfgAAAAAA + tiles: aAAAAAADaAAAAAACaAAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAACaAAAAAAAegAAAAACegAAAAADegAAAAACegAAAAABegAAAAABaAAAAAADaAAAAAACXwAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAaAAAAAABegAAAAABegAAAAABegAAAAAAegAAAAABegAAAAAAaAAAAAADaAAAAAADXwAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAABaAAAAAACegAAAAABegAAAAAAegAAAAABegAAAAABegAAAAABaAAAAAADaAAAAAADaAAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACaAAAAAACegAAAAACegAAAAACegAAAAABegAAAAACegAAAAAAewAAAAABewAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAACAwAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAADXQAAAAAAXQAAAAAAXQAAAAABHwAAAAAAewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAAAXQAAAAAAAwAAAAAAegAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAJAAAAAACHwAAAAADHwAAAAABewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAABXQAAAAAAAwAAAAAAegAAAAACJAAAAAABJAAAAAACJAAAAAABfgAAAAAAJAAAAAACHwAAAAACHwAAAAACewAAAAACAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAACXQAAAAABAwAAAAAAegAAAAAAJAAAAAABJAAAAAADJAAAAAAAfgAAAAAAJAAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABaAAAAAADaAAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAABaAAAAAAAaAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAeQAAAAABeQAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADaAAAAAABXQAAAAACXQAAAAABXQAAAAABaAAAAAADXQAAAAADeQAAAAAAeQAAAAAAeQAAAAABeQAAAAACeQAAAAABeQAAAAADLgAAAAAALgAAAAAAAQAAAAACaAAAAAADaAAAAAACAQAAAAABfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACfgAAAAAAJAAAAAACeQAAAAAAeQAAAAACeQAAAAAAeQAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAAAXQAAAAADXQAAAAAAaAAAAAACXQAAAAACXQAAAAADYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAABfgAAAAAALgAAAAAAXQAAAAAAXQAAAAAAPAAAAAAAAQAAAAABXQAAAAACXQAAAAAAaAAAAAADXQAAAAACXQAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAABfgAAAAAAXQAAAAACaAAAAAADXQAAAAAAfgAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAADfgAAAAAAfgAAAAAA version: 6 1,-3: ind: 1,-3 - tiles: bQAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABJAAAAAACJAAAAAABJAAAAAABJAAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACJAAAAAACJAAAAAAAJAAAAAAAJAAAAAACfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAJAAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAABXQAAAAAAaAAAAAACXQAAAAACXQAAAAACXQAAAAACfgAAAAAAHwAAAAACaAAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAHwAAAAACfgAAAAAAHwAAAAADTgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABfgAAAAAAHwAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAADHwAAAAACfgAAAAAAHwAAAAAA + tiles: bQAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAJAAAAAACJAAAAAAAJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADJAAAAAAAJAAAAAABJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADHwAAAAADHwAAAAAAHwAAAAADHwAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAABJAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADJAAAAAABJAAAAAACJAAAAAACJAAAAAADfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAJAAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAAAXQAAAAADaAAAAAABXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAHwAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAADaAAAAAACHwAAAAADfgAAAAAAHwAAAAABTgAAAAACaAAAAAADaAAAAAACaAAAAAABaAAAAAABXQAAAAABfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAAAaAAAAAADaAAAAAABaAAAAAADHwAAAAACfgAAAAAAHwAAAAAA version: 6 0,-3: ind: 0,-3 - tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABJAAAAAABJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAaAAAAAACaAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABaAAAAAADaAAAAAABJAAAAAACfgAAAAAAXQAAAAAAXQAAAAADHwAAAAAAHwAAAAAAHwAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAAAHwAAAAACHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAaAAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAABaAAAAAABaAAAAAADaAAAAAACaAAAAAABTgAAAAADaAAAAAAATgAAAAACaAAAAAAA + tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACJAAAAAADJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADaAAAAAACaAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAaAAAAAACaAAAAAABJAAAAAABfgAAAAAAXQAAAAADXQAAAAABHwAAAAAAHwAAAAADHwAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAAAHwAAAAAAHwAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACaAAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAADTgAAAAABaAAAAAADTgAAAAAAaAAAAAAA version: 6 1,1: ind: 1,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAJAAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABaAAAAAABXQAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAAAXQAAAAADaAAAAAABaAAAAAADaAAAAAABXQAAAAADaAAAAAADaAAAAAACaAAAAAAAaAAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAADaAAAAAAAaAAAAAAAaAAAAAABXQAAAAACaAAAAAADaAAAAAACaAAAAAABXQAAAAACXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAACJAAAAAADfgAAAAAAXQAAAAACaAAAAAADaAAAAAACaAAAAAADXQAAAAABaAAAAAADaAAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAdQAAAAACdAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAADJAAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAaAAAAAADXQAAAAADXQAAAAABaAAAAAACXQAAAAADfgAAAAAAXQAAAAAAaAAAAAADaAAAAAABaAAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAAAXQAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAADaAAAAAABXQAAAAADaAAAAAABaAAAAAADaAAAAAAAXQAAAAACXQAAAAACaAAAAAABXQAAAAABXQAAAAAAXQAAAAADJAAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAADXQAAAAADaAAAAAAAaAAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAABdQAAAAADdAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,1: ind: 0,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAACaAAAAAAAaAAAAAAAaAAAAAADXQAAAAAAXQAAAAACXQAAAAADaAAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAABcAAAAAABcAAAAAAAdQAAAAACdAAAAAAAdAAAAAAAdAAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAAAcAAAAAADdQAAAAACdAAAAAACdAAAAAACdAAAAAAAfgAAAAAAXQAAAAADXQAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAABdAAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAADdQAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAABcAAAAAADaAAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAACHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADaAAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAACaAAAAAACaAAAAAADaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAABXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAABHwAAAAACHwAAAAADHwAAAAADfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAABcAAAAAAAcAAAAAADdQAAAAACdAAAAAAAdAAAAAABdAAAAAACXQAAAAACXQAAAAACXQAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACcAAAAAADcAAAAAABdQAAAAACdAAAAAABdAAAAAAAdAAAAAABfgAAAAAAXQAAAAAAXQAAAAADHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAADdAAAAAAAdAAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAADdQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAADcAAAAAADaAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAACHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA version: 6 -1,1: ind: -1,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADaAAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADTgAAAAADTgAAAAABaAAAAAABTgAAAAADTgAAAAAAaAAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAACaAAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAACHwAAAAABHwAAAAABXQAAAAADfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXQAAAAABJAAAAAACJAAAAAACXQAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAHwAAAAACTgAAAAACTgAAAAADHwAAAAADTgAAAAABTgAAAAABTgAAAAABHwAAAAADTgAAAAAATgAAAAACHwAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAACJAAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADJAAAAAAAJAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAD + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAaAAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABaAAAAAACaAAAAAADaAAAAAADaAAAAAADaAAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAACaAAAAAADTgAAAAABTgAAAAABaAAAAAAATgAAAAABTgAAAAACaAAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAABaAAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABHwAAAAADHwAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAAHwAAAAADHwAAAAAAXQAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAXQAAAAAAJAAAAAADJAAAAAAAXQAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAABTgAAAAAATgAAAAABHwAAAAADTgAAAAADTgAAAAADTgAAAAABHwAAAAAATgAAAAABTgAAAAADHwAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADJAAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAABHwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACJAAAAAACJAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAD version: 6 -2,1: ind: -2,1 - tiles: AQAAAAAAAQAAAAADAQAAAAACJAAAAAACfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAACfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAKAAAAAABKAAAAAADKAAAAAACKAAAAAADKAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAXwAAAAACXwAAAAABXwAAAAABXwAAAAAAXwAAAAAAXwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAACXwAAAAACXwAAAAADXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAABaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABJAAAAAADKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAABXQAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACegAAAAAAegAAAAADegAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAC + tiles: AQAAAAABAQAAAAACAQAAAAADJAAAAAABfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAADfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABKAAAAAADKAAAAAADKAAAAAACKAAAAAADKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAXwAAAAACXwAAAAAAXwAAAAACXwAAAAABXwAAAAABXwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAACaAAAAAABaAAAAAACaAAAAAACaAAAAAADaAAAAAACaAAAAAACaAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAADXwAAAAADXwAAAAADXwAAAAAAXwAAAAAAXwAAAAABXwAAAAADaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAJAAAAAABKAAAAAAAKAAAAAACKAAAAAADKAAAAAAAKAAAAAAAKAAAAAACXQAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAegAAAAABegAAAAACegAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAB version: 6 -1,-3: ind: -1,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXgAAAAAAYQAAAAADXgAAAAABXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYQAAAAAAfgAAAAAAggAAAAABfgAAAAAAXgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAggAAAAABfgAAAAAAfgAAAAAAggAAAAACfgAAAAAAfgAAAAAAYQAAAAABXQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAggAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAggAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAggAAAAABYQAAAAACXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXgAAAAABYQAAAAACXgAAAAABXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYQAAAAAEfgAAAAAAggAAAAACfgAAAAAAXgAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAggAAAAACfgAAAAAAfgAAAAAAggAAAAAAfgAAAAAAfgAAAAAAYQAAAAABXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAggAAAAABgQAAAAAAfgAAAAAAgQAAAAAAggAAAAACfgAAAAAAfgAAAAAAfgAAAAAAggAAAAABYQAAAAABXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAADfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD version: 6 2,-3: ind: 2,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABJAAAAAADJAAAAAABJAAAAAACJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAABJAAAAAADJAAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAABJAAAAAADJAAAAAADJAAAAAADJAAAAAABJAAAAAADJAAAAAADJAAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAADJAAAAAADJAAAAAABJgAAAAABJgAAAAAAJgAAAAABJgAAAAADJgAAAAAAJgAAAAAAJgAAAAABJgAAAAABJgAAAAAAJgAAAAADJgAAAAABJgAAAAADJAAAAAACJAAAAAABJAAAAAADJgAAAAABJgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAADJgAAAAADJgAAAAADJAAAAAAAJAAAAAADJAAAAAACJgAAAAABJgAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAADJgAAAAADJgAAAAADJAAAAAAAHwAAAAABHwAAAAADJAAAAAACJAAAAAAAHwAAAAADHwAAAAADJAAAAAADJAAAAAACJAAAAAADJAAAAAACJAAAAAACHwAAAAADHwAAAAAAJAAAAAABJAAAAAADHwAAAAAAHwAAAAABHwAAAAAAJgAAAAABJAAAAAADJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAAAJAAAAAABJAAAAAABJAAAAAABJgAAAAADHwAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAJAAAAAABJAAAAAADJAAAAAACJAAAAAACJAAAAAADJAAAAAABJAAAAAACJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAACJAAAAAAAJAAAAAACJAAAAAABJAAAAAACJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAACJAAAAAACJAAAAAADJAAAAAABJAAAAAABJAAAAAABJgAAAAAAJgAAAAABJgAAAAABJgAAAAABJgAAAAABJgAAAAACJgAAAAABJgAAAAACJgAAAAABJgAAAAADJgAAAAAAJgAAAAADJAAAAAADJAAAAAADJAAAAAADJgAAAAABJgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADJgAAAAABJgAAAAADJAAAAAABJAAAAAACJAAAAAACJgAAAAAAJgAAAAABHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAABJgAAAAACJgAAAAABJAAAAAACHwAAAAADHwAAAAABJAAAAAABJAAAAAACHwAAAAAAHwAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAAAJAAAAAADHwAAAAABHwAAAAADJAAAAAADJAAAAAABHwAAAAABHwAAAAAAHwAAAAABJgAAAAAAJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABJAAAAAADJAAAAAACJAAAAAADJAAAAAAAJAAAAAABJAAAAAACJAAAAAABJgAAAAABHwAAAAAB version: 6 3,-2: ind: 3,-2 - tiles: HwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAABHwAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABHwAAAAAAHwAAAAADfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADHwAAAAAAHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABJAAAAAADfgAAAAAAXQAAAAADTgAAAAACTgAAAAACaAAAAAABTgAAAAABTgAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAACaAAAAAABaAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAAD + tiles: HwAAAAACHwAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABHwAAAAAAHwAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAHwAAAAADHwAAAAADfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAACHwAAAAACHwAAAAABfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAaAAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAJAAAAAADfgAAAAAAXQAAAAACTgAAAAADTgAAAAADaAAAAAABTgAAAAABTgAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAADaAAAAAADaAAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADfgAAAAAAXQAAAAAD version: 6 3,-3: ind: 3,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAACwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAALBwAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAADJAAAAAADfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAADJAAAAAACJAAAAAACHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAABOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAAfwAAAAAAJAAAAAACJAAAAAACfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAOAAAAAAAHwAAAAABOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAALHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAACwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAABBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAFJAAAAAADfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAABwAAAAAMBwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAADJAAAAAABfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAADJAAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAJAAAAAABJAAAAAADfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAADHwAAAAADOAAAAAAAHwAAAAADOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAABwAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAHwAAAAAAHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAD version: 6 -2,-3: ind: -2,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAegAAAAACFQAAAAACegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAFQAAAAAFgQAAAAAAFQAAAAAFegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAJAAAAAADfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAAAKAAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAADfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAACfgAAAAAAfgAAAAAAewAAAAACewAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAACKAAAAAABKAAAAAADKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAewAAAAABewAAAAABfgAAAAAAegAAAAABegAAAAABegAAAAACKAAAAAABKAAAAAACKAAAAAADKAAAAAABKAAAAAAAKAAAAAADKAAAAAAAKAAAAAABfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAADegAAAAADegAAAAADegAAAAADJAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADKAAAAAADKAAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABKAAAAAAAKAAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAAAegAAAAACegAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAegAAAAABFQAAAAAFegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAFQAAAAAEgQAAAAAAFQAAAAAEegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACJAAAAAADfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAACKAAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABKAAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAABegAAAAADegAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAABegAAAAAAfgAAAAAAfgAAAAAAewAAAAADewAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAACKAAAAAABKAAAAAAAKAAAAAAAKAAAAAABKAAAAAAAKAAAAAAAKAAAAAACKAAAAAACfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAegAAAAACegAAAAABegAAAAACKAAAAAABKAAAAAACKAAAAAAAKAAAAAADKAAAAAACKAAAAAACKAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADKAAAAAACKAAAAAACKAAAAAABKAAAAAABKAAAAAAAKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAABegAAAAADegAAAAADegAAAAABegAAAAADJAAAAAADfgAAAAAAfgAAAAAAKAAAAAABKAAAAAABKAAAAAADKAAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACKAAAAAACKAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD version: 6 -3,-1: ind: -3,-1 - tiles: HwAAAAABfgAAAAAAewAAAAACewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAAAegAAAAACegAAAAACegAAAAADegAAAAAAegAAAAABegAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADTgAAAAABTgAAAAADKAAAAAABTgAAAAAATgAAAAAAKAAAAAAAHwAAAAACfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAATgAAAAABTgAAAAACKAAAAAADTgAAAAABTgAAAAAAKAAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAADfgAAAAAAewAAAAAAewAAAAABewAAAAABfgAAAAAAaAAAAAABKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAAAZQAAAAADfgAAAAAAKAAAAAAAKAAAAAADKAAAAAABfgAAAAAAaAAAAAABKAAAAAADBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAABZQAAAAABfgAAAAAAKAAAAAACKAAAAAADKAAAAAABfgAAAAAAXQAAAAABXQAAAAACBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAXwAAAAACXwAAAAADXwAAAAADXwAAAAAAJAAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACfgAAAAAAXQAAAAACXQAAAAADJAAAAAABJAAAAAACJAAAAAACJAAAAAAAJAAAAAACXQAAAAABXQAAAAABfgAAAAAAXwAAAAADHwAAAAABHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAABXQAAAAADfgAAAAAAXwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAACJAAAAAAAJAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAC + tiles: HwAAAAACfgAAAAAAewAAAAADewAAAAABewAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAACegAAAAACegAAAAACegAAAAACegAAAAADegAAAAABegAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADTgAAAAADTgAAAAADKAAAAAADTgAAAAADTgAAAAADKAAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADTgAAAAAATgAAAAADKAAAAAABTgAAAAABTgAAAAACKAAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAAAegAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAAAZQAAAAAAfgAAAAAAewAAAAABewAAAAAAewAAAAACfgAAAAAAaAAAAAAAKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAACZQAAAAABfgAAAAAAKAAAAAACKAAAAAADKAAAAAABfgAAAAAAaAAAAAADKAAAAAABBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAABZQAAAAAAfgAAAAAAKAAAAAACKAAAAAABKAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXwAAAAADXwAAAAACXwAAAAADXwAAAAACJAAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAXwAAAAADHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAXQAAAAACXQAAAAADJAAAAAADJAAAAAAAJAAAAAADJAAAAAACJAAAAAAAXQAAAAADXQAAAAADfgAAAAAAXwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAACXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABJAAAAAABJAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAC version: 6 -3,0: ind: -3,0 - tiles: ZQAAAAACZQAAAAADZQAAAAABZQAAAAACZQAAAAACXQAAAAABaAAAAAADaAAAAAAAXQAAAAABXQAAAAAAaAAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAXQAAAAADTgAAAAAATgAAAAACaAAAAAAATgAAAAACTgAAAAABaAAAAAACaAAAAAADaAAAAAACXQAAAAABXQAAAAACXwAAAAADaAAAAAAAaAAAAAABaAAAAAAAXwAAAAACaAAAAAABZQAAAAAAZQAAAAABZQAAAAACZQAAAAAAZQAAAAABXQAAAAABaAAAAAABaAAAAAABXQAAAAABXQAAAAABXwAAAAAAaAAAAAADaAAAAAABaAAAAAACXwAAAAAAaAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAACJAAAAAADXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABaAAAAAADaAAAAAACaAAAAAABaAAAAAADaAAAAAACaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAABewAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAADJAAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAACXQAAAAACXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAADewAAAAACfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAAgAAAAAAJAAAAAADJAAAAAACHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABewAAAAADewAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAADAgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADAQAAAAAAPAAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAA + tiles: ZQAAAAAAZQAAAAADZQAAAAABZQAAAAACZQAAAAABXQAAAAADaAAAAAADaAAAAAAAXQAAAAAAXQAAAAADaAAAAAAAaAAAAAACaAAAAAACaAAAAAADaAAAAAAAXQAAAAAATgAAAAADTgAAAAAAaAAAAAADTgAAAAACTgAAAAACaAAAAAACaAAAAAABaAAAAAADXQAAAAAAXQAAAAABXwAAAAACaAAAAAACaAAAAAAAaAAAAAABXwAAAAAAaAAAAAACZQAAAAACZQAAAAACZQAAAAABZQAAAAACZQAAAAAAXQAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAABXwAAAAABaAAAAAACaAAAAAADaAAAAAAAXwAAAAACaAAAAAAAJAAAAAACJAAAAAACJAAAAAADJAAAAAABJAAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAADXQAAAAABaAAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAewAAAAABewAAAAACewAAAAADewAAAAACewAAAAABJAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAABXQAAAAABXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAADJAAAAAADJAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAADewAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAADAgAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAABewAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAACAgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAAQAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADAQAAAAABPAAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAADPAAAAAAAPAAAAAAA version: 6 -3,1: ind: -3,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAACRQAAAAAAIwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAEgQAAAAAAegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAAGegAAAAABfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAggAAAAACegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAAFfgAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAFQAAAAADfgAAAAAAgQAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAACegAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAACegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAAARQAAAAAAIwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAABgQAAAAAAegAAAAACegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAACFQAAAAABegAAAAAAfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAABgQAAAAAAgQAAAAAAgQAAAAAAggAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAACfgAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAFQAAAAAAfgAAAAAAgQAAAAAAegAAAAAAegAAAAACegAAAAADegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAABegAAAAACegAAAAABfgAAAAAAegAAAAACegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -3,-2: ind: -3,-2 - tiles: aAAAAAADaAAAAAACaAAAAAAAaAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABegAAAAADegAAAAADXQAAAAABEgAAAAACEgAAAAACEgAAAAACEgAAAAADEgAAAAADfgAAAAAAfgAAAAAAJAAAAAACaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABegAAAAADegAAAAADXQAAAAACEgAAAAADEgAAAAACEgAAAAAAEgAAAAACEgAAAAABAwAAAAAAAwAAAAAAJAAAAAACaAAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABegAAAAAAegAAAAABXQAAAAADEgAAAAACEgAAAAADEgAAAAABEgAAAAABEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAADaAAAAAABaAAAAAACXQAAAAAAaAAAAAABXQAAAAABegAAAAADegAAAAABXQAAAAABEgAAAAADEgAAAAABEgAAAAADEgAAAAAAEgAAAAADAwAAAAAAAwAAAAAAJAAAAAACaAAAAAABaAAAAAACXQAAAAAAaAAAAAADXQAAAAAAegAAAAAAegAAAAADXQAAAAABEgAAAAABEgAAAAADEgAAAAAAEgAAAAACEgAAAAABAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAADegAAAAAAegAAAAADXQAAAAABEgAAAAAAEgAAAAADEgAAAAABEgAAAAACEgAAAAADfgAAAAAAfgAAAAAAJAAAAAABaAAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAKAAAAAADKAAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAKAAAAAADKAAAAAABKAAAAAACKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADaAAAAAACaAAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAADewAAAAACewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAADewAAAAADewAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAC + tiles: aAAAAAADaAAAAAACaAAAAAADaAAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADegAAAAADegAAAAADXQAAAAADEgAAAAACEgAAAAABEgAAAAACEgAAAAAAEgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAaAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABegAAAAADegAAAAAAXQAAAAAAEgAAAAAAEgAAAAADEgAAAAACEgAAAAABEgAAAAACAwAAAAAAAwAAAAAAJAAAAAACaAAAAAACXQAAAAABXQAAAAACfgAAAAAAXQAAAAACegAAAAACegAAAAACXQAAAAADEgAAAAACEgAAAAAAEgAAAAACEgAAAAAAEgAAAAADAwAAAAAAAwAAAAAAJAAAAAACaAAAAAACaAAAAAAAXQAAAAADaAAAAAADXQAAAAADegAAAAABegAAAAAAXQAAAAABEgAAAAACEgAAAAABEgAAAAABEgAAAAAAEgAAAAACAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAADaAAAAAADXQAAAAAAaAAAAAABXQAAAAABegAAAAAAegAAAAABXQAAAAAAEgAAAAAAEgAAAAACEgAAAAADEgAAAAACEgAAAAABAwAAAAAAAwAAAAAAJAAAAAABaAAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACegAAAAADegAAAAABXQAAAAACEgAAAAADEgAAAAADEgAAAAAAEgAAAAABEgAAAAABfgAAAAAAfgAAAAAAJAAAAAADaAAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAKAAAAAACKAAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABaAAAAAABaAAAAAAAaAAAAAACaAAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABKAAAAAABKAAAAAAAKAAAAAABKAAAAAADKAAAAAACKAAAAAADKAAAAAABKAAAAAAAaAAAAAADaAAAAAABXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAADKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAABewAAAAABewAAAAADfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAAAewAAAAADewAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADKAAAAAAC version: 6 -3,-3: ind: -3,-3 - tiles: XQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADaAAAAAAAXQAAAAABfgAAAAAABwAAAAALBwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAACTgAAAAACaAAAAAACTgAAAAAATgAAAAABaAAAAAAAaAAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAACHwAAAAAAfgAAAAAAegAAAAACaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAACHwAAAAACfgAAAAAAegAAAAACaAAAAAADXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAACHwAAAAAAfgAAAAAAegAAAAAATgAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAADfgAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAKBwAAAAAGBwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAATgAAAAAAXQAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAADTgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAADaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAACKAAAAAAAKAAAAAABKAAAAAABKAAAAAACaAAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAABKAAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAA + tiles: XQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAABwAAAAACBwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAACTgAAAAACaAAAAAADTgAAAAADTgAAAAABaAAAAAABaAAAAAADaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAJAAAAAACJAAAAAADHwAAAAAAHwAAAAAAfgAAAAAAegAAAAABaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACHwAAAAABHwAAAAACfgAAAAAAegAAAAACaAAAAAACXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADHwAAAAADHwAAAAABfgAAAAAAegAAAAADTgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAADBwAAAAACBwAAAAAJBwAAAAAHfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABXQAAAAAATgAAAAACXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAADTgAAAAAAXQAAAAADXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAACTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAKAAAAAACKAAAAAAAKAAAAAABKAAAAAADKAAAAAAAKAAAAAABKAAAAAADKAAAAAACaAAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAAAKAAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAB version: 6 -4,0: ind: -4,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAADXQAAAAACZQAAAAADZQAAAAADZQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAABTgAAAAACTgAAAAADaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAADXQAAAAACZQAAAAADZQAAAAABZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAADJAAAAAABJAAAAAADJAAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABXQAAAAADXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAAAXQAAAAACJAAAAAACJAAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAAAZQAAAAACZQAAAAADZQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAACaAAAAAADTgAAAAACTgAAAAACaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAADXQAAAAADXQAAAAACZQAAAAABZQAAAAADZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAACJAAAAAABJAAAAAACJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAXQAAAAADXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAACXQAAAAAAJAAAAAACJAAAAAADJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAJAAAAAABJAAAAAAAJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -4,-1: ind: -4,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAABXQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADXQAAAAACJAAAAAAAJAAAAAABJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAAAXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABJAAAAAABJAAAAAABJAAAAAAAJAAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAACfgAAAAAAHwAAAAADHwAAAAADHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAABXQAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAACXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAADfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADXQAAAAADJAAAAAAAJAAAAAAAJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABXQAAAAABXQAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADJAAAAAAAJAAAAAAAJAAAAAACJAAAAAAD version: 6 -4,-2: ind: -4,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAADJAAAAAABAwAAAAAAbAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAABfgAAAAAAXQAAAAACaAAAAAADJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAXQAAAAADaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAAaAAAAAABJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAACHwAAAAADfgAAAAAAaAAAAAADaAAAAAACaAAAAAADaAAAAAADaAAAAAACXQAAAAACaAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADXQAAAAAAaAAAAAACaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABaAAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADaAAAAAADaAAAAAADaAAAAAACaAAAAAABaAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAAB + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAXQAAAAABaAAAAAACJAAAAAAAAwAAAAAAbAAAAAAAfgAAAAAAJAAAAAADHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAXQAAAAABaAAAAAABJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAXQAAAAACaAAAAAADJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAABHwAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACaAAAAAABJAAAAAADAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAACHwAAAAABfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAaAAAAAACXQAAAAACaAAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAACaAAAAAAAXQAAAAABaAAAAAADaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAADaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAAAaAAAAAADfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAC version: 6 -4,-3: ind: -4,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACaAAAAAABTgAAAAACTgAAAAADaAAAAAACTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXgAAAAABXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXgAAAAABXgAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAYQAAAAAEYQAAAAADXgAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAACaAAAAAABaAAAAAAATgAAAAADTgAAAAABaAAAAAACTgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXgAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXgAAAAAAXgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAYQAAAAAAYQAAAAADXgAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAB version: 6 2,0: ind: 2,0 - tiles: HwAAAAABHwAAAAABHwAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAACaAAAAAADXQAAAAABdQAAAAACdQAAAAABdQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABJAAAAAADXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACXQAAAAABXQAAAAADTgAAAAACXQAAAAACdQAAAAADdQAAAAADdQAAAAADfgAAAAAAaAAAAAADaAAAAAACaAAAAAACaAAAAAABTgAAAAABTgAAAAABaAAAAAACaAAAAAADaAAAAAADTgAAAAABTgAAAAACXQAAAAADdQAAAAACdQAAAAABaAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABdQAAAAACdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAAAcAAAAAAAcAAAAAACcAAAAAADcAAAAAACcAAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAABcAAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAdQAAAAAAdQAAAAABcAAAAAABcAAAAAABcAAAAAAAcAAAAAADcAAAAAABdQAAAAADXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAAAdQAAAAAATgAAAAADcAAAAAAAdQAAAAAAcAAAAAAATgAAAAADdQAAAAACXQAAAAABXQAAAAADXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACcAAAAAACcAAAAAABcAAAAAADcAAAAAABcAAAAAADdQAAAAABXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAADdQAAAAAAdQAAAAABdQAAAAACdAAAAAABdQAAAAAAfgAAAAAAXQAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAADdQAAAAABdQAAAAADdQAAAAABdAAAAAADJAAAAAACXQAAAAAAXQAAAAACegAAAAADegAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACcAAAAAABcAAAAAADcAAAAAACcAAAAAABcAAAAAAAcAAAAAAAfgAAAAAAXQAAAAACegAAAAACegAAAAACegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAABHwAAAAACJAAAAAABfgAAAAAAXQAAAAADegAAAAAAegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAADTwAAAAAATwAAAAAA + tiles: HwAAAAACHwAAAAADHwAAAAABfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAADaAAAAAADXQAAAAADdQAAAAACdQAAAAADdQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABJAAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAABXQAAAAADXQAAAAACTgAAAAADXQAAAAADdQAAAAAAdQAAAAABdQAAAAACfgAAAAAAaAAAAAABaAAAAAADaAAAAAADaAAAAAAATgAAAAAATgAAAAADaAAAAAAAaAAAAAACaAAAAAACTgAAAAABTgAAAAACXQAAAAAAdQAAAAABdQAAAAABaAAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAADaAAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAAAdQAAAAACdQAAAAAAdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACcAAAAAAAcAAAAAADcAAAAAABcAAAAAADcAAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADfgAAAAAAcAAAAAABcAAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAdQAAAAACdQAAAAABcAAAAAADcAAAAAADcAAAAAACcAAAAAADcAAAAAAAdQAAAAADXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAABdQAAAAACTgAAAAACcAAAAAACdQAAAAAAcAAAAAADTgAAAAACdQAAAAABXQAAAAAAXQAAAAACXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABcAAAAAADcAAAAAAAcAAAAAACcAAAAAABdQAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAADdQAAAAADdQAAAAABdQAAAAABdAAAAAADdQAAAAAAfgAAAAAAXQAAAAAAegAAAAABegAAAAABegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAABdQAAAAABdQAAAAAAdQAAAAACdAAAAAABJAAAAAABXQAAAAADXQAAAAACegAAAAABegAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAAAcAAAAAACcAAAAAABcAAAAAAAcAAAAAADcAAAAAABfgAAAAAAXQAAAAADegAAAAADegAAAAABegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAABHwAAAAADJAAAAAADfgAAAAAAXQAAAAACegAAAAAAegAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACTwAAAAAATwAAAAAA version: 6 -5,-2: ind: -5,-2 @@ -221,71 +221,71 @@ entities: version: 6 0,2: ind: 0,2 - tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAdAAAAAADdAAAAAACdQAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAADHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAdAAAAAAAdAAAAAAAdQAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAABHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,2: ind: -1,2 - tiles: HwAAAAABHwAAAAAAewAAAAADewAAAAAAewAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABJAAAAAABJAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAHwAAAAACewAAAAABewAAAAABewAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAABewAAAAAAewAAAAABewAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAABXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAHwAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAADdAAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAgQAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAJAAAAAAAJAAAAAACJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAD + tiles: HwAAAAACHwAAAAACewAAAAABewAAAAAAewAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAAAJAAAAAABJAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAHwAAAAADewAAAAADewAAAAACewAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAABHwAAAAACHwAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAHwAAAAAAewAAAAADewAAAAAAewAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAACXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADHwAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAAAdAAAAAACfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAgQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAC version: 6 -2,2: ind: -2,2 - tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABXQAAAAACfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA + tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACXQAAAAACfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,3: ind: -1,3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACJAAAAAADXQAAAAACXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACHwAAAAABHwAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAACXQAAAAABXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAHwAAAAACHwAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,3: ind: 0,3 - tiles: XQAAAAABHwAAAAAAHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAABHwAAAAACHwAAAAABJAAAAAACfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAABHwAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,1: ind: 2,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAADTwAAAAAATwAAAAAAfgAAAAAAJAAAAAADHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAACTgAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAATgAAAAABTgAAAAADHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABaAAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADJAAAAAAATwAAAAAATwAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAACTgAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAATgAAAAAATgAAAAADHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABaAAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,0: ind: 3,0 - tiles: fgAAAAAAdQAAAAAAdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABfgAAAAAAdQAAAAADdQAAAAAAdQAAAAABcAAAAAABdQAAAAACcAAAAAACfgAAAAAAcAAAAAADcAAAAAADdQAAAAABdQAAAAADdQAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAACdQAAAAACdQAAAAACdQAAAAAAcAAAAAABdQAAAAADcAAAAAACcAAAAAABcAAAAAACcAAAAAACdQAAAAABdQAAAAACdQAAAAADdQAAAAAAdQAAAAABdQAAAAABcAAAAAABcAAAAAAAcAAAAAAAdQAAAAACcAAAAAACdQAAAAADcAAAAAABcAAAAAADcAAAAAACcAAAAAABdQAAAAAAdQAAAAABdQAAAAACfgAAAAAAcAAAAAAAdQAAAAADdQAAAAABdQAAAAACdQAAAAADdQAAAAADcAAAAAACdQAAAAADcAAAAAACfgAAAAAAcAAAAAADcAAAAAACdQAAAAACdQAAAAACdQAAAAAAfgAAAAAAcAAAAAADcAAAAAABfgAAAAAAdQAAAAADdQAAAAADdQAAAAABcAAAAAAAdQAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACcAAAAAAAfgAAAAAAcAAAAAADcAAAAAADcAAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABdQAAAAABcAAAAAABcAAAAAAAcAAAAAACdQAAAAAAdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAAAcAAAAAABfgAAAAAAcAAAAAADdQAAAAAAdQAAAAACdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABdQAAAAABcAAAAAABdQAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABfgAAAAAAcAAAAAABdQAAAAADcAAAAAACfgAAAAAAJAAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAcAAAAAADdQAAAAABcAAAAAADcAAAAAAAcAAAAAACHwAAAAACHwAAAAABHwAAAAADfgAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAcAAAAAACfgAAAAAAcAAAAAADHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABdQAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdQAAAAAAdQAAAAADdQAAAAAAcAAAAAAAcAAAAAACcAAAAAACdQAAAAADcAAAAAADcAAAAAACcAAAAAAAcAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAAAdQAAAAAAdQAAAAADcAAAAAADfgAAAAAAfgAAAAAA + tiles: fgAAAAAAdQAAAAACdQAAAAABdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACfgAAAAAAdQAAAAACdQAAAAACdQAAAAAAcAAAAAADdQAAAAABcAAAAAABfgAAAAAAcAAAAAADcAAAAAADdQAAAAADdQAAAAABdQAAAAACfgAAAAAAcAAAAAACdQAAAAACdQAAAAADdQAAAAAAdQAAAAACdQAAAAADcAAAAAACdQAAAAACcAAAAAAAcAAAAAABcAAAAAACcAAAAAADdQAAAAABdQAAAAACdQAAAAADdQAAAAAAdQAAAAAAdQAAAAADcAAAAAACcAAAAAACcAAAAAACdQAAAAACcAAAAAAAdQAAAAADcAAAAAABcAAAAAADcAAAAAADcAAAAAADdQAAAAABdQAAAAACdQAAAAABfgAAAAAAcAAAAAADdQAAAAAAdQAAAAABdQAAAAADdQAAAAAAdQAAAAABcAAAAAACdQAAAAACcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAACdQAAAAABdQAAAAADdQAAAAADfgAAAAAAcAAAAAAAcAAAAAACfgAAAAAAdQAAAAAAdQAAAAAAdQAAAAADcAAAAAAAdQAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAAAcAAAAAACfgAAAAAAcAAAAAACcAAAAAACcAAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAADdQAAAAACcAAAAAAAcAAAAAABcAAAAAADdQAAAAACdQAAAAABdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdQAAAAABdQAAAAAAcAAAAAACfgAAAAAAcAAAAAAAdQAAAAAAdQAAAAABdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADdQAAAAAAcAAAAAACdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABfgAAAAAAcAAAAAABdQAAAAACcAAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAABegAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACdQAAAAACcAAAAAACcAAAAAABcAAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAAAcAAAAAAAfgAAAAAAcAAAAAADHwAAAAACHwAAAAABHwAAAAABfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAAAdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdQAAAAAAdQAAAAAAdQAAAAAAcAAAAAAAcAAAAAABcAAAAAADdQAAAAACcAAAAAADcAAAAAACcAAAAAABcAAAAAADcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAAAdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAADdQAAAAACdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAA version: 6 3,1: ind: 3,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAABdQAAAAAAdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAACcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXgAAAAABZAAAAAAAXQAAAAADXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAADXQAAAAABXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABfgAAAAAAegAAAAAAegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAADdQAAAAACdQAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAABegAAAAABegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXgAAAAAAZAAAAAAAXQAAAAABXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAADXQAAAAABXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAegAAAAACegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -4,-4: ind: -4,-4 - tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAADJAAAAAABJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAABJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABJAAAAAACJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA + tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAADJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADJAAAAAADJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAABJAAAAAACJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADHwAAAAADJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAAAJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA version: 6 -3,-4: ind: -3,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAAAfgAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAACHwAAAAACHwAAAAACHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -4,-5: ind: -4,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -3,-5: ind: -3,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAA version: 6 3,-1: ind: 3,-1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAADJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAABdQAAAAABdQAAAAACcAAAAAABfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAcAAAAAABcAAAAAADcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAAAcAAAAAACcAAAAAADcAAAAAAAdQAAAAACdQAAAAACfgAAAAAAcAAAAAAAdQAAAAADdQAAAAABdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAADdQAAAAABcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAAAdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACdQAAAAADdQAAAAADcAAAAAACcAAAAAABdQAAAAABcAAAAAACcAAAAAACcAAAAAADaAAAAAAAaAAAAAABaAAAAAABcAAAAAADfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACdQAAAAACcAAAAAAAcAAAAAACcAAAAAABdQAAAAADcAAAAAABcAAAAAAAcAAAAAABaAAAAAABaAAAAAADaAAAAAADcAAAAAABfgAAAAAAfgAAAAAAcAAAAAACcAAAAAAAdQAAAAADcAAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAAAdQAAAAABdQAAAAABcAAAAAADfgAAAAAAdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAdQAAAAAAdQAAAAABcAAAAAADcAAAAAACdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACfgAAAAAAXQAAAAABHwAAAAADHwAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADHwAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAACJAAAAAADJAAAAAADJAAAAAADJAAAAAABJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAACJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAACdQAAAAAAdQAAAAAAcAAAAAACfgAAAAAAdQAAAAACdQAAAAACfgAAAAAAcAAAAAACcAAAAAADcAAAAAADbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAADdQAAAAACcAAAAAAAcAAAAAABcAAAAAAAdQAAAAACdQAAAAAAfgAAAAAAcAAAAAADdQAAAAAAdQAAAAAAdQAAAAAAcAAAAAADfgAAAAAAfgAAAAAAcAAAAAADcAAAAAABdQAAAAAAcAAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAAAdQAAAAACdQAAAAABcAAAAAABfgAAAAAAfgAAAAAAcAAAAAADdQAAAAABdQAAAAACdQAAAAAAcAAAAAABcAAAAAACdQAAAAADcAAAAAABcAAAAAABcAAAAAABaAAAAAAAaAAAAAACaAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAABdQAAAAACcAAAAAACcAAAAAAAcAAAAAACdQAAAAADcAAAAAACcAAAAAADcAAAAAAAaAAAAAACaAAAAAABaAAAAAABcAAAAAACfgAAAAAAfgAAAAAAcAAAAAADcAAAAAAAdQAAAAAAcAAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADdQAAAAACdQAAAAAAcAAAAAADfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACdQAAAAACdQAAAAACcAAAAAABcAAAAAABdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 4,0: ind: 4,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,-1: ind: 4,-1 - tiles: XQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAADfgAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAABaAAAAAADfgAAAAAAXQAAAAABbQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAATgAAAAABXQAAAAACfgAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAAAaAAAAAABfgAAAAAAXQAAAAADbQAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAXQAAAAABbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAATgAAAAABXQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAABaAAAAAACaAAAAAAAfgAAAAAAXQAAAAACbQAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABaAAAAAACaAAAAAABaAAAAAABaAAAAAADaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADaAAAAAACaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAXQAAAAABXQAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,1: ind: 4,1 - tiles: fgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAABfgAAAAAAgQAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAggAAAAACbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAggAAAAABbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,-2: ind: 4,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAJAAAAAACJAAAAAACJAAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAJAAAAAABHwAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAABegAAAAAAegAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAaAAAAAACXQAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAABegAAAAAAegAAAAAAXQAAAAAAXQAAAAADJAAAAAADfgAAAAAAaAAAAAAAXQAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAAAegAAAAAAegAAAAADfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADJAAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADbQAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADbQAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAATgAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABJAAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAJAAAAAAAJAAAAAABJAAAAAADXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACJAAAAAABHwAAAAADXQAAAAACXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAADXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAADegAAAAADegAAAAABXQAAAAABXQAAAAACXQAAAAACfgAAAAAAaAAAAAACXQAAAAADegAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAAAegAAAAABegAAAAABXQAAAAAAXQAAAAADJAAAAAAAfgAAAAAAaAAAAAADXQAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAaAAAAAACXQAAAAACJAAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAABbQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAAAbQAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAATgAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADbQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAA version: 6 5,-1: ind: 5,-1 @@ -293,27 +293,27 @@ entities: version: 6 5,-2: ind: 5,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAABXQAAAAACaAAAAAAAaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABXQAAAAABXQAAAAADJAAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADXQAAAAADXQAAAAACJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAXQAAAAABXQAAAAAAaAAAAAABaAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAXQAAAAAAXQAAAAAAJAAAAAACJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABXQAAAAAAXQAAAAAAJAAAAAACJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA version: 6 4,-3: ind: 4,-3 - tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: CwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 1,-4: ind: 1,-4 - tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAACJAAAAAACfgAAAAAAfgAAAAAABwAAAAAEBwAAAAAABwAAAAACfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAHBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAEBwAAAAAABwAAAAAIBwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAABHwAAAAACEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAALBwAAAAAHfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAADfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAABwAAAAAAfgAAAAAABwAAAAAABwAAAAAGfwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfwAAAAAABwAAAAAABwAAAAAAfgAAAAAABwAAAAAABwAAAAALfwAAAAAABwAAAAACBwAAAAADBwAAAAAAfgAAAAAAfwAAAAAABwAAAAALBwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAADfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACJAAAAAACHwAAAAAAHwAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 0,-4: ind: 0,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAEBwAAAAADBwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAB version: 6 -5,-3: ind: -5,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAggAAAAAAfgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAgQAAAAAAfgAAAAAAggAAAAACfgAAAAAA version: 6 -3,2: ind: -3,2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-4: ind: -1,-4 @@ -325,11 +325,11 @@ entities: version: 6 5,-3: ind: 5,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAGWwAAAAAAWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,2: ind: 1,2 - tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -2,-4: ind: -2,-4 @@ -337,15 +337,23 @@ entities: version: 6 2,-4: ind: 2,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAACBwAAAAAEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAMBwAAAAAABwAAAAAJBwAAAAAABwAAAAAIfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAABBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAJBwAAAAAIBwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAIfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,-4: ind: 3,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAAfwAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAIBwAAAAAABwAAAAAFBwAAAAACBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAEBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAJBwAAAAAABwAAAAAKBwAAAAACBwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAJfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAKBwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA version: 6 4,-4: ind: 4,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAADfgAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 1,-5: + ind: 1,-5 + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACEQAAAAAAfgAAAAAAEQAAAAAAfgAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABEQAAAAAAHwAAAAABEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAATwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAAAEQAAAAAATwAAAAAAEQAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAADEQAAAAAATwAAAAAAEQAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAAAEQAAAAAATwAAAAAAEQAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAADHwAAAAACJAAAAAADHwAAAAAAHwAAAAABfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-5: + ind: 0,-5 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAD version: 6 - type: Broadphase - type: Physics @@ -642,12 +650,6 @@ entities: 226: -1,-26 289: 15,-21 290: 15,-22 - - node: - color: '#FFFFFF4A' - id: Bot - decals: - 6421: 18,-56 - 6422: 19,-56 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' @@ -781,8 +783,6 @@ entities: 6391: -24,-42 6401: 3,48 6506: 54,-33 - 6510: 22,-59 - 6511: 15,-59 6514: -19,-38 6540: 7,-48 6541: 7,-49 @@ -886,6 +886,15 @@ entities: 7016: 1,-17 7017: -67,-33 7018: -66,-33 + 7046: 19,-63 + 7047: 19,-55 + 7048: 16,-75 + 7049: 16,-68 + 7050: 22,-68 + 7051: 22,-75 + 7128: 24,-66 + 7151: 23,-54 + 7153: 23,-52 - node: cleanable: True color: '#FFFFFFFF' @@ -1076,6 +1085,14 @@ entities: 6831: 61,-8 6925: 66,-25 6926: 66,-24 + 7090: 16,-69 + 7091: 22,-69 + 7092: 16,-74 + 7094: 22,-74 + 7131: 17,-66 + 7132: 21,-66 + 7144: 18,-55 + 7145: 20,-55 - node: color: '#52B4E996' id: BrickCornerOverlaySW @@ -1101,7 +1118,6 @@ entities: 1013: 28,-29 1375: 58,-34 1790: 69,-29 - 1981: 22,-53 6539: 9,-48 - node: color: '#FFFFFFFF' @@ -1112,7 +1128,6 @@ entities: 1011: 24,-29 1372: 56,-34 1789: 70,-29 - 1984: 15,-53 6538: 7,-48 - node: color: '#FFFFFFFF' @@ -1123,8 +1138,6 @@ entities: 1012: 28,-34 1373: 58,-36 1792: 69,-30 - 1959: 17,-53 - 1983: 22,-60 6537: 9,-49 - node: color: '#FFFFFFFF' @@ -1135,8 +1148,6 @@ entities: 1014: 24,-34 1374: 56,-36 1791: 70,-30 - 1960: 20,-53 - 1982: 15,-60 6536: 7,-49 - node: color: '#FFFFFFFF' @@ -1149,10 +1160,6 @@ entities: 1714: 70,-11 1769: 74,-17 1772: 74,-14 - 1975: 15,-60 - 1980: 22,-53 - 1987: 21,-53 - 1988: 22,-54 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNw @@ -1163,10 +1170,6 @@ entities: 1097: -1,21 1366: 58,-36 1713: 68,-11 - 1976: 22,-60 - 1979: 15,-53 - 1985: 16,-53 - 1986: 15,-54 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe @@ -1176,9 +1179,6 @@ entities: 1365: 56,-34 1770: 74,-15 1771: 74,-19 - 1974: 15,-53 - 1977: 22,-60 - 1989: 21,-60 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw @@ -1186,9 +1186,6 @@ entities: 45: -12,-14 451: -25,-1 1364: 58,-34 - 1973: 22,-53 - 1978: 15,-60 - 1990: 16,-60 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE @@ -1285,11 +1282,6 @@ entities: 1883: 27,-44 1884: 27,-43 1885: 27,-42 - 1969: 15,-58 - 1970: 15,-57 - 1971: 15,-55 - 1972: 15,-54 - 1995: 16,-60 6092: 53,12 6093: 53,11 - node: @@ -1378,10 +1370,6 @@ entities: 1796: 68,-29 1894: 28,-43 1895: 29,-43 - 1963: 16,-60 - 1964: 21,-60 - 1991: 15,-57 - 1992: 22,-57 5808: -14,-23 5809: -15,-23 5810: -16,-23 @@ -1472,10 +1460,6 @@ entities: 1794: 71,-30 1896: 28,-46 1897: 29,-46 - 1961: 16,-53 - 1962: 21,-53 - 1993: 22,-55 - 1994: 15,-55 2018: 10,-40 2019: 11,-40 2081: -42,-54 @@ -1605,11 +1589,6 @@ entities: 1369: 56,-35 1787: 70,-30 1788: 70,-29 - 1965: 22,-58 - 1966: 22,-57 - 1967: 22,-55 - 1968: 22,-54 - 1996: 21,-60 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe @@ -3139,6 +3118,9 @@ entities: 6236: 60,-24 6237: 60,-23 6336: 32,21 + 7284: 16,-65 + 7286: 22,-65 + 7287: 21,-53 - node: cleanable: True angle: 1.5707963267948966 rad @@ -3521,15 +3503,6 @@ entities: 5482: 18,-48 5483: 19,-49 5484: 18,-50 - 5485: 20,-53 - 5486: 18,-54 - 5487: 17,-54 - 5488: 16,-54 - 5489: 16,-58 - 5490: 16,-59 - 5491: 19,-58 - 5492: 21,-58 - 5493: 21,-59 5494: 13,-47 5495: 14,-47 5496: 13,-48 @@ -5350,24 +5323,6 @@ entities: 5072: 14,-48 5073: 13,-48 5074: 15,-47 - 5081: 21,-54 - 5082: 20,-54 - 5083: 18,-54 - 5084: 16,-54 - 5085: 16,-55 - 5086: 18,-53 - 5087: 19,-53 - 5088: 21,-55 - 5089: 21,-58 - 5090: 21,-59 - 5091: 20,-58 - 5092: 18,-58 - 5093: 17,-58 - 5094: 16,-58 - 5095: 16,-59 - 5096: 19,-59 - 5097: 19,-59 - 5098: 18,-59 5099: 27,-46 5100: 26,-45 5101: 26,-44 @@ -5560,6 +5515,57 @@ entities: 7010: -34,-5 7011: -32,-3 7012: -34,-2 + 7155: 17,-69 + 7156: 16,-68 + 7157: 17,-68 + 7158: 16,-70 + 7159: 16,-72 + 7160: 16,-73 + 7161: 17,-76 + 7162: 18,-76 + 7163: 17,-73 + 7164: 17,-72 + 7165: 16,-71 + 7166: 18,-71 + 7167: 18,-69 + 7168: 20,-68 + 7169: 20,-69 + 7170: 20,-70 + 7171: 21,-71 + 7172: 22,-70 + 7173: 21,-69 + 7174: 22,-68 + 7175: 22,-72 + 7176: 21,-73 + 7177: 22,-73 + 7178: 21,-75 + 7179: 21,-76 + 7180: 19,-76 + 7181: 19,-73 + 7182: 19,-74 + 7183: 18,-66 + 7184: 17,-64 + 7185: 18,-64 + 7186: 19,-65 + 7187: 20,-65 + 7188: 21,-64 + 7189: 21,-63 + 7190: 19,-63 + 7191: 17,-63 + 7192: 14,-64 + 7193: 14,-65 + 7194: 14,-66 + 7195: 15,-65 + 7196: 23,-65 + 7197: 23,-66 + 7198: 24,-66 + 7276: 23,-53 + 7277: 23,-54 + 7278: 19,-53 + 7279: 18,-54 + 7280: 21,-53 + 7281: 16,-65 + 7282: 22,-65 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6476,6 +6482,42 @@ entities: 6997: -34,-2 6998: -31,-5 6999: -32,-5 + 7199: 15,-64 + 7200: 18,-65 + 7201: 18,-64 + 7202: 19,-64 + 7203: 21,-65 + 7204: 21,-63 + 7205: 19,-66 + 7206: 20,-68 + 7207: 20,-70 + 7208: 21,-69 + 7209: 21,-70 + 7210: 22,-68 + 7211: 22,-71 + 7212: 22,-72 + 7213: 21,-73 + 7214: 22,-75 + 7215: 21,-75 + 7216: 20,-76 + 7217: 18,-76 + 7218: 17,-76 + 7219: 17,-74 + 7220: 16,-75 + 7221: 16,-73 + 7222: 16,-72 + 7223: 17,-70 + 7224: 16,-69 + 7225: 16,-68 + 7226: 18,-70 + 7227: 15,-66 + 7269: 18,-53 + 7270: 20,-52 + 7271: 19,-54 + 7272: 20,-55 + 7273: 22,-54 + 7274: 23,-54 + 7275: 23,-52 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6540,6 +6582,30 @@ entities: 7003: -33,-4 7004: -32,-4 7005: -34,-5 + 7228: 16,-69 + 7229: 17,-69 + 7230: 17,-70 + 7231: 16,-72 + 7232: 16,-73 + 7233: 17,-74 + 7234: 19,-74 + 7235: 18,-73 + 7236: 18,-73 + 7237: 21,-70 + 7238: 20,-70 + 7239: 20,-69 + 7240: 21,-72 + 7241: 22,-73 + 7242: 24,-65 + 7243: 19,-65 + 7244: 20,-66 + 7245: 21,-64 + 7263: 18,-55 + 7264: 20,-54 + 7265: 20,-55 + 7266: 20,-53 + 7267: 19,-52 + 7268: 22,-52 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6600,6 +6666,23 @@ entities: 7007: -33,-3 7008: -34,-3 7009: -34,-4 + 7246: 19,-64 + 7247: 17,-65 + 7248: 17,-70 + 7249: 21,-69 + 7250: 22,-72 + 7251: 20,-73 + 7252: 20,-76 + 7253: 17,-76 + 7254: 18,-71 + 7255: 20,-68 + 7256: 14,-66 + 7257: 14,-65 + 7258: 20,-63 + 7259: 20,-52 + 7260: 18,-52 + 7261: 19,-54 + 7262: 22,-53 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6847,6 +6930,13 @@ entities: id: HalfTileOverlayGreyscale decals: 5940: 44,7 + - node: + color: '#D4D4D411' + id: HalfTileOverlayGreyscale + decals: + 7118: 18,-64 + 7119: 19,-64 + 7120: 20,-64 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale @@ -6887,6 +6977,15 @@ entities: id: HalfTileOverlayGreyscale180 decals: 5941: 44,9 + - node: + color: '#D4D4D411' + id: HalfTileOverlayGreyscale180 + decals: + 7103: 16,-70 + 7108: 22,-70 + 7115: 18,-66 + 7116: 19,-66 + 7117: 20,-66 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale180 @@ -6905,6 +7004,18 @@ entities: id: HalfTileOverlayGreyscale270 decals: 5942: 45,8 + - node: + color: '#D4D4D411' + id: HalfTileOverlayGreyscale270 + decals: + 7106: 21,-69 + 7107: 21,-68 + 7110: 22,-73 + 7122: 17,-65 + 7123: 15,-66 + 7124: 15,-65 + 7125: 15,-64 + 7127: 23,-65 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -6920,6 +7031,15 @@ entities: id: HalfTileOverlayGreyscale90 decals: 5943: 43,8 + - node: + color: '#D4D4D411' + id: HalfTileOverlayGreyscale90 + decals: + 7104: 17,-69 + 7105: 17,-68 + 7109: 16,-73 + 7121: 21,-65 + 7126: 24,-65 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale90 @@ -6984,6 +7104,7 @@ entities: 2079: -40,-59 2080: -40,-66 5878: -45,23 + 7154: 23,-53 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -6992,6 +7113,7 @@ entities: 349: 45,-22 1680: 63,-26 5879: -44,22 + 7133: 21,-63 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' @@ -8229,6 +8351,12 @@ entities: decals: 6822: 57.998478,-4.7559896 6823: 60.004295,-4.7682204 + - node: + color: '#D4D4D411' + id: ThreeQuarterTileOverlayGreyscale + decals: + 7102: 22,-72 + 7111: 17,-64 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale @@ -8239,6 +8367,12 @@ entities: id: ThreeQuarterTileOverlayGreyscale decals: 65: -9,-16 + - node: + color: '#D4D4D411' + id: ThreeQuarterTileOverlayGreyscale180 + decals: + 7099: 17,-70 + 7114: 21,-66 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale180 @@ -8249,6 +8383,12 @@ entities: id: ThreeQuarterTileOverlayGreyscale180 decals: 64: -5,-18 + - node: + color: '#D4D4D411' + id: ThreeQuarterTileOverlayGreyscale270 + decals: + 7100: 21,-70 + 7113: 17,-66 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale270 @@ -8259,6 +8399,12 @@ entities: id: ThreeQuarterTileOverlayGreyscale270 decals: 63: -9,-18 + - node: + color: '#D4D4D411' + id: ThreeQuarterTileOverlayGreyscale90 + decals: + 7101: 16,-72 + 7112: 21,-64 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale90 @@ -8280,12 +8426,14 @@ entities: decals: 1128: 6,32 6248: 91,-13 + 7143: 21,-64 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: 1127: 3,32 6249: 88,-13 + 7142: 17,-64 - node: color: '#EFB34196' id: WarnCornerSE @@ -8420,6 +8568,7 @@ entities: decals: 1382: 55,-33 5984: 51,15 + 7077: 21,-71 - node: color: '#EFB34131' id: WarnCornerSmallSW @@ -8434,6 +8583,11 @@ entities: decals: 10: 2,-12 193: 16,-26 + - node: + color: '#FFFFFFFF' + id: WarnCornerSmallSW + decals: + 7076: 17,-71 - node: color: '#EFB34131' id: WarnLineE @@ -8497,6 +8651,17 @@ entities: 6373: -33,-10 6747: 46,16 6846: 57,-4 + 7060: 18,-73 + 7065: 18,-71 + 7066: 18,-70 + 7067: 18,-69 + 7068: 18,-68 + 7078: 21,-72 + 7079: 21,-73 + 7080: 21,-74 + 7081: 21,-75 + 7082: 21,-76 + 7137: 21,-65 - node: color: '#52B4E996' id: WarnLineGreyscaleE @@ -8615,6 +8780,14 @@ entities: 6545: 8,-47 6546: 9,-47 6745: 47,15 + 7088: 16,-71 + 7089: 22,-71 + 7134: 18,-66 + 7135: 19,-66 + 7136: 20,-66 + 7148: 18,-54 + 7149: 19,-54 + 7150: 20,-54 - node: color: '#EFB34131' id: WarnLineS @@ -8670,6 +8843,17 @@ entities: 6371: -33,-11 6744: 46,16 6825: 61,-4 + 7054: 17,-76 + 7055: 17,-75 + 7056: 17,-74 + 7058: 17,-73 + 7059: 20,-73 + 7061: 20,-71 + 7062: 20,-70 + 7063: 20,-69 + 7064: 20,-68 + 7083: 17,-72 + 7138: 17,-65 - node: color: '#EFB34118' id: WarnLineW @@ -8753,6 +8937,15 @@ entities: 6505: 35,-11 6748: 47,15 6824: 59,-5 + 7084: 17,-71 + 7085: 16,-71 + 7086: 21,-71 + 7087: 22,-71 + 7129: 23,-65 + 7130: 24,-65 + 7139: 18,-64 + 7140: 19,-64 + 7141: 20,-64 - node: color: '#FFFFFFFF' id: WoodTrimThinBox @@ -9341,7 +9534,7 @@ entities: 1: 4352 0,1: 0: 2451 - 1: 61452 + 1: 57356 -1,1: 0: 552 1: 61447 @@ -9357,7 +9550,7 @@ entities: 1: 61695 1,0: 0: 23 - 1: 39304 + 1: 39296 1,1: 1: 63625 1,2: @@ -9436,7 +9629,7 @@ entities: 1: 273 -2,0: 0: 53533 - 1: 8738 + 1: 8736 -2,1: 0: 4113 1: 57890 @@ -9467,7 +9660,7 @@ entities: 0: 36608 0,-2: 0: 39183 - 1: 240 + 1: 224 -1,-2: 0: 8719 1: 240 @@ -9724,8 +9917,7 @@ entities: -8,-5: 1: 36317 -9,-5: - 1: 52942 - 6: 32 + 1: 52974 -8,-4: 1: 65535 -7,-8: @@ -9963,6 +10155,7 @@ entities: 1: 65520 5,-13: 0: 8704 + 1: 13 6,-12: 1: 65520 6,-11: @@ -10021,10 +10214,9 @@ entities: 2,-10: 1: 4095 2,-13: - 1: 47104 + 1: 47105 3,-13: 1: 65280 - 0: 1 4,5: 1: 12543 0: 32768 @@ -10079,8 +10271,7 @@ entities: 1,5: 1: 47359 1,6: - 1: 15289 - 7: 2 + 1: 15291 1,7: 1: 65307 1,8: @@ -10114,8 +10305,7 @@ entities: -3,7: 1: 53503 -3,8: - 1: 3533 - 8: 16 + 1: 3549 -2,5: 1: 28927 -2,6: @@ -10532,6 +10722,9 @@ entities: 1: 61166 -16,-8: 1: 53759 + -17,-8: + 1: 247 + 0: 28672 -16,-7: 1: 56797 -17,-7: @@ -10563,9 +10756,10 @@ entities: -14,-9: 1: 19867 -16,-9: - 0: 1860 + 0: 1911 -17,-9: - 0: 2048 + 0: 255 + 1: 28672 -16,-10: 0: 17486 -15,-10: @@ -10619,14 +10813,16 @@ entities: 12,3: 1: 61182 -18,-8: - 0: 35840 - -18,-6: - 0: 51200 - -17,-8: - 0: 1792 + 1: 128 + 0: 32768 + -18,-9: + 1: 32768 + 0: 136 -17,-6: 1: 7 - 0: 28672 + 0: 30464 + -18,-6: + 0: 34816 0,9: 1: 3824 -1,9: @@ -10646,9 +10842,10 @@ entities: 1,10: 1: 3822 1,11: - 0: 17478 + 0: 2 + 1: 17476 1,12: - 0: 17476 + 1: 17476 2,9: 1: 12792 0: 32768 @@ -10677,12 +10874,13 @@ entities: -3,9: 1: 64783 -3,10: - 1: 157 - 0: 64512 + 1: 19613 + 0: 45056 -3,11: - 0: 17476 + 1: 17476 -3,12: - 0: 2252 + 1: 68 + 0: 2184 -2,9: 1: 3823 -2,10: @@ -10727,23 +10925,25 @@ entities: -5,12: 0: 13091 -2,13: - 0: 36450 + 1: 546 + 0: 35904 -2,14: - 0: 8 + 1: 8 -1,13: 1: 239 0: 4096 -1,14: - 0: 15 + 1: 15 0,13: 1: 127 0: 32768 0,14: - 0: 15 + 1: 15 1,13: - 0: 5988 + 0: 4896 + 1: 1092 1,14: - 0: 1 + 1: 1 8,6: 0: 14 9,4: @@ -11075,36 +11275,41 @@ entities: 1: 4096 19,-9: 0: 1792 + 4,-17: + 1: 65039 4,-16: - 0: 15 - 1: 49152 + 1: 37102 + 0: 24576 3,-16: - 0: 4431 + 1: 12 + 0: 273 4,-15: - 1: 16349 + 1: 65433 + 0: 102 3,-15: - 1: 34952 - 0: 4369 + 0: 240 4,-14: - 1: 65534 - 3,-14: - 1: 34944 - 0: 4369 + 1: 52416 5,-16: - 0: 143 + 1: 8763 5,-15: - 1: 30566 + 1: 20474 5,-14: - 1: 30577 + 1: 64784 + 5,-17: + 1: 64263 6,-16: - 0: 3 - 1: 24576 + 1: 34953 + 0: 1092 + 6,-17: + 1: 4356 + 0: 17408 6,-15: - 1: 132 + 1: 140 6,-14: 4: 64 7,-15: - 1: 12816 + 1: 13056 0: 3072 7,-14: 1: 33842 @@ -11126,6 +11331,17 @@ entities: 0: 4096 1,-14: 0: 4369 + 2,-14: + 1: 26760 + 2,-16: + 1: 34952 + 2,-15: + 1: 34952 + 3,-14: + 1: 48 + 3,-17: + 0: 4352 + 1: 52225 -10,9: 0: 34952 -10,10: @@ -11194,6 +11410,35 @@ entities: 1: 1646 16,-15: 1: 1024 + 4,-20: + 1: 15 + 3,-20: + 1: 4364 + 0: 9920 + 4,-19: + 1: 64318 + 4,-18: + 1: 65523 + 5,-20: + 1: 15 + 0: 128 + 5,-19: + 1: 30307 + 5,-18: + 1: 30582 + 6,-20: + 1: 17409 + 0: 8976 + 6,-18: + 0: 8704 + 1: 17476 + 6,-19: + 1: 17476 + 3,-19: + 1: 4369 + 3,-18: + 1: 4369 + 0: 8704 uniqueMixes: - volume: 2500 immutable: True @@ -11285,51 +11530,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 21.813705 - - 82.06108 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 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.15 - moles: - - 21.824806 - - 82.102844 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -12609,21 +12809,6 @@ entities: - 20039 - 20037 - 20038 - - uid: 8433 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-58.5 - parent: 2 - - type: DeviceList - devices: - - 14939 - - 14940 - - 14938 - - 14937 - - 20087 - - 9078 - - 9034 - uid: 8434 components: - type: Transform @@ -12841,7 +13026,6 @@ entities: - 8549 - 8555 - 18580 - - 18579 - 18577 - uid: 8451 components: @@ -13693,6 +13877,73 @@ entities: - 21959 - 8815 - 21957 + - uid: 22148 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-71.5 + parent: 2 + - type: DeviceList + devices: + - 22139 + - 22107 + - 22108 + - 22110 + - 22144 + - uid: 22149 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-63.5 + parent: 2 + - type: DeviceList + devices: + - 22139 + - 22107 + - 22108 + - 22110 + - 22144 + - 22201 + - 22202 + - 22111 + - 22112 + - 22167 + - uid: 22150 + components: + - type: Transform + pos: 20.5,-50.5 + parent: 2 + - type: DeviceList + devices: + - 22153 + - 22154 + - 22203 + - 22168 + - 14937 + - 14938 + - uid: 22429 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -50.5,-5.5 + parent: 2 + - type: DeviceList + devices: + - 22407 + - 22408 + - 22428 + - uid: 22431 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-54.5 + parent: 2 + - type: DeviceList + devices: + - 22151 + - 22152 + - 22203 + - 22430 - proto: AirCanister entities: - uid: 4 @@ -13770,6 +14021,11 @@ entities: - type: Transform pos: 2.5,-7.5 parent: 21128 + - uid: 22096 + components: + - type: Transform + pos: 24.5,-65.5 + parent: 2 - proto: Airlock entities: - uid: 6 @@ -14083,6 +14339,13 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-46.5 parent: 2 + - uid: 22033 + components: + - type: MetaData + name: AI upload airlock + - type: Transform + pos: 21.5,-52.5 + parent: 2 - proto: AirlockCommandLocked entities: - uid: 21 @@ -14146,17 +14409,31 @@ entities: - uid: 7742 components: - type: MetaData - name: AI room airlock + name: High security mainframe airlock - type: Transform pos: 18.5,-42.5 parent: 2 - uid: 7747 components: - type: MetaData - name: AI room airlock + name: High security mainframe airlock - type: Transform pos: 19.5,-42.5 parent: 2 + - uid: 22030 + components: + - type: MetaData + name: Break room airlock + - type: Transform + pos: 16.5,-64.5 + parent: 2 + - uid: 22031 + components: + - type: MetaData + name: Power generation airlock + - type: Transform + pos: 22.5,-64.5 + parent: 2 - proto: AirlockDetectiveLocked entities: - uid: 4930 @@ -14438,6 +14715,34 @@ entities: parent: 2 - proto: AirlockExternal entities: + - uid: 605 + components: + - type: MetaData + name: Arrivals external airlock + - type: Transform + pos: -40.5,-65.5 + parent: 2 + - uid: 612 + components: + - type: MetaData + name: Arrivals external airlock + - type: Transform + pos: -54.5,-58.5 + parent: 2 + - uid: 1442 + components: + - type: MetaData + name: Arrivals external airlock + - type: Transform + pos: -54.5,-65.5 + parent: 2 + - uid: 10656 + components: + - type: MetaData + name: Arrivals external airlock + - type: Transform + pos: -40.5,-58.5 + parent: 2 - uid: 16076 components: - type: MetaData @@ -14479,6 +14784,20 @@ entities: linkedPorts: 44: - DoorStatus: DoorBolt + - uid: 7832 + components: + - type: MetaData + name: external AI airlock + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-61.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 22093: + - DoorStatus: DoorBolt - uid: 15050 components: - type: MetaData @@ -14490,6 +14809,20 @@ entities: linkedPorts: 15057: - DoorStatus: DoorBolt + - uid: 22093 + components: + - type: MetaData + name: external AI airlock + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-59.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 7832: + - DoorStatus: DoorBolt - proto: AirlockExternalGlass entities: - uid: 3607 @@ -14531,38 +14864,6 @@ entities: - type: Transform pos: -22.5,-45.5 parent: 2 - - uid: 6295 - components: - - type: MetaData - name: Arrivals external airlock - - type: Transform - rot: -1.5707963267948966 rad - pos: -40.5,-58.5 - parent: 2 - - uid: 6324 - components: - - type: MetaData - name: Arrivals external airlock - - type: Transform - rot: -1.5707963267948966 rad - pos: -40.5,-65.5 - parent: 2 - - uid: 6325 - components: - - type: MetaData - name: Arrivals external airlock - - type: Transform - rot: -1.5707963267948966 rad - pos: -54.5,-65.5 - parent: 2 - - uid: 6326 - components: - - type: MetaData - name: Arrivals external airlock - - type: Transform - rot: -1.5707963267948966 rad - pos: -54.5,-58.5 - parent: 2 - uid: 15198 components: - type: MetaData @@ -14587,7 +14888,7 @@ entities: - uid: 17259 components: - type: MetaData - name: Hermit room airlock + name: Outpost airlock - type: Transform pos: 64.5,-53.5 parent: 2 @@ -15003,6 +15304,14 @@ entities: rot: -1.5707963267948966 rad pos: -22.5,-18.5 parent: 2 + - uid: 1443 + components: + - type: MetaData + name: Arrivals airlock + - type: Transform + rot: 3.141592653589793 rad + pos: -54.5,-48.5 + parent: 2 - uid: 1661 components: - type: MetaData @@ -15688,14 +15997,6 @@ entities: rot: -1.5707963267948966 rad pos: -53.5,-48.5 parent: 2 - - uid: 6371 - components: - - type: MetaData - name: Arrivals airlock - - type: Transform - rot: -1.5707963267948966 rad - pos: -54.5,-48.5 - parent: 2 - uid: 6375 components: - type: MetaData @@ -17589,12 +17890,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,-47.5 parent: 2 - - uid: 20087 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-57.5 - parent: 2 - uid: 20177 components: - type: Transform @@ -17669,6 +17964,52 @@ entities: - type: DeviceNetwork deviceLists: - 21958 + - uid: 22144 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-70.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22148 + - 22149 + - uid: 22167 + components: + - type: Transform + pos: 19.5,-64.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22149 + - 22351 + - uid: 22168 + components: + - type: Transform + pos: 19.5,-52.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22150 + - 22357 + - uid: 22428 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -50.5,-7.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22429 + - uid: 22430 + components: + - type: Transform + pos: 22.5,-52.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22432 + - 22431 - proto: AltarHeaven entities: - uid: 16557 @@ -17791,12 +18132,6 @@ entities: rot: -1.5707963267948966 rad pos: -53.5,-69.5 parent: 2 - - uid: 17355 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 12.5,-55.5 - parent: 2 - uid: 20403 components: - type: Transform @@ -18147,13 +18482,6 @@ entities: - type: Transform pos: 22.5,-34.5 parent: 2 - - uid: 10633 - components: - - type: MetaData - name: AI APC - - type: Transform - pos: 21.5,-51.5 - parent: 2 - uid: 17199 components: - type: MetaData @@ -18190,6 +18518,16 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-6.5 parent: 21128 + - uid: 22146 + components: + - type: MetaData + name: AI Core APC + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-71.5 + parent: 2 + - type: Apc + hasAccess: True - proto: APCHighCapacity entities: - uid: 10502 @@ -18267,11 +18605,91 @@ entities: parent: 2 - proto: AsteroidRock entities: + - uid: 3961 + components: + - type: Transform + pos: 21.5,-56.5 + parent: 2 + - uid: 6326 + components: + - type: Transform + pos: 24.5,-57.5 + parent: 2 + - uid: 7792 + components: + - type: Transform + pos: 24.5,-56.5 + parent: 2 + - uid: 7830 + components: + - type: Transform + pos: 23.5,-55.5 + parent: 2 + - uid: 8041 + components: + - type: Transform + pos: 20.5,-56.5 + parent: 2 + - uid: 8068 + components: + - type: Transform + pos: 24.5,-59.5 + parent: 2 + - uid: 8069 + components: + - type: Transform + pos: 24.5,-58.5 + parent: 2 + - uid: 8330 + components: + - type: Transform + pos: 14.5,-54.5 + parent: 2 + - uid: 8433 + components: + - type: Transform + pos: 15.5,-55.5 + parent: 2 + - uid: 8967 + components: + - type: Transform + pos: 23.5,-60.5 + parent: 2 + - uid: 9016 + components: + - type: Transform + pos: 25.5,-59.5 + parent: 2 + - uid: 9034 + components: + - type: Transform + pos: 15.5,-52.5 + parent: 2 - uid: 10504 components: - type: Transform pos: 26.5,-55.5 parent: 2 + - uid: 12830 + components: + - type: Transform + pos: 12.5,-53.5 + parent: 2 + - uid: 12831 + components: + - type: Transform + pos: 13.5,-53.5 + parent: 2 + - uid: 14939 + components: + - type: Transform + pos: 11.5,-51.5 + parent: 2 + - uid: 14940 + components: + - type: Transform + pos: 9.5,-51.5 + parent: 2 - uid: 16706 components: - type: Transform @@ -18287,11 +18705,6 @@ entities: - type: Transform pos: 26.5,-57.5 parent: 2 - - uid: 16713 - components: - - type: Transform - pos: 27.5,-57.5 - parent: 2 - uid: 16715 components: - type: Transform @@ -18362,11 +18775,6 @@ entities: - type: Transform pos: 26.5,-51.5 parent: 2 - - uid: 16730 - components: - - type: Transform - pos: 25.5,-59.5 - parent: 2 - uid: 16731 components: - type: Transform @@ -18647,6 +19055,16 @@ entities: - type: Transform pos: 48.5,-57.5 parent: 2 + - uid: 17022 + components: + - type: Transform + pos: 23.5,-56.5 + parent: 2 + - uid: 17030 + components: + - type: Transform + pos: 15.5,-54.5 + parent: 2 - uid: 17075 components: - type: Transform @@ -19102,6 +19520,21 @@ entities: - type: Transform pos: 65.5,-57.5 parent: 2 + - uid: 17608 + components: + - type: Transform + pos: 10.5,-51.5 + parent: 2 + - uid: 19157 + components: + - type: Transform + pos: 13.5,-51.5 + parent: 2 + - uid: 20087 + components: + - type: Transform + pos: 12.5,-52.5 + parent: 2 - uid: 21037 components: - type: Transform @@ -19127,6 +19560,16 @@ entities: - type: Transform pos: -35.5,-47.5 parent: 2 + - uid: 21547 + components: + - type: Transform + pos: 25.5,-60.5 + parent: 2 + - uid: 21548 + components: + - type: Transform + pos: 24.5,-60.5 + parent: 2 - proto: AsteroidRockArtifactFragment entities: - uid: 5857 @@ -19171,6 +19614,11 @@ entities: - type: Transform pos: 26.5,-52.5 parent: 2 + - uid: 7840 + components: + - type: Transform + pos: 24.5,-55.5 + parent: 2 - uid: 17133 components: - type: Transform @@ -19309,6 +19757,36 @@ entities: parent: 2 - proto: AsteroidRockQuartz entities: + - uid: 8071 + components: + - type: Transform + pos: 15.5,-51.5 + parent: 2 + - uid: 8329 + components: + - type: Transform + pos: 12.5,-51.5 + parent: 2 + - uid: 9054 + components: + - type: Transform + pos: 13.5,-52.5 + parent: 2 + - uid: 9078 + components: + - type: Transform + pos: 14.5,-53.5 + parent: 2 + - uid: 12829 + components: + - type: Transform + pos: 15.5,-53.5 + parent: 2 + - uid: 14915 + components: + - type: Transform + pos: 14.5,-52.5 + parent: 2 - uid: 16661 components: - type: Transform @@ -19728,6 +20206,11 @@ entities: rot: 3.141592653589793 rad pos: 62.5,-35.5 parent: 2 + - uid: 22433 + components: + - type: Transform + pos: 14.5,-51.5 + parent: 2 - proto: AtmosFixNitrogenMarker entities: - uid: 118 @@ -20736,16 +21219,6 @@ entities: - type: Transform pos: -0.5,-4.5 parent: 21128 - - uid: 21401 - components: - - type: Transform - pos: 18.5,-51.5 - parent: 2 - - uid: 21460 - components: - - type: Transform - pos: 19.5,-51.5 - parent: 2 - proto: BodyBagFolded entities: - uid: 161 @@ -20941,6 +21414,16 @@ entities: - type: Transform pos: 52.5,-23.5 parent: 2 + - uid: 7870 + components: + - type: Transform + pos: 23.5,-51.5 + parent: 2 + - uid: 7991 + components: + - type: Transform + pos: 23.5,-53.5 + parent: 2 - uid: 8237 components: - type: Transform @@ -21342,6 +21825,12 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-37.5 parent: 2 + - uid: 615 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 64.5,-51.5 + parent: 2 - uid: 19830 components: - type: Transform @@ -21382,6 +21871,12 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-12.5 parent: 2 + - uid: 22200 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-73.5 + parent: 2 - proto: ButtonFrameCautionSecurity entities: - uid: 20290 @@ -32492,171 +32987,6 @@ entities: - type: Transform pos: -7.5,-37.5 parent: 2 - - uid: 12807 - components: - - type: Transform - pos: 21.5,-51.5 - parent: 2 - - uid: 12808 - components: - - type: Transform - pos: 21.5,-52.5 - parent: 2 - - uid: 12809 - components: - - type: Transform - pos: 20.5,-52.5 - parent: 2 - - uid: 12810 - components: - - type: Transform - pos: 19.5,-52.5 - parent: 2 - - uid: 12811 - components: - - type: Transform - pos: 18.5,-52.5 - parent: 2 - - uid: 12812 - components: - - type: Transform - pos: 17.5,-52.5 - parent: 2 - - uid: 12813 - components: - - type: Transform - pos: 17.5,-54.5 - parent: 2 - - uid: 12814 - components: - - type: Transform - pos: 17.5,-53.5 - parent: 2 - - uid: 12815 - components: - - type: Transform - pos: 17.5,-55.5 - parent: 2 - - uid: 12816 - components: - - type: Transform - pos: 17.5,-56.5 - parent: 2 - - uid: 12817 - components: - - type: Transform - pos: 17.5,-57.5 - parent: 2 - - uid: 12818 - components: - - type: Transform - pos: 16.5,-57.5 - parent: 2 - - uid: 12819 - components: - - type: Transform - pos: 16.5,-58.5 - parent: 2 - - uid: 12820 - components: - - type: Transform - pos: 16.5,-59.5 - parent: 2 - - uid: 12821 - components: - - type: Transform - pos: 18.5,-57.5 - parent: 2 - - uid: 12822 - components: - - type: Transform - pos: 19.5,-57.5 - parent: 2 - - uid: 12823 - components: - - type: Transform - pos: 20.5,-57.5 - parent: 2 - - uid: 12824 - components: - - type: Transform - pos: 20.5,-56.5 - parent: 2 - - uid: 12825 - components: - - type: Transform - pos: 20.5,-55.5 - parent: 2 - - uid: 12826 - components: - - type: Transform - pos: 20.5,-54.5 - parent: 2 - - uid: 12827 - components: - - type: Transform - pos: 20.5,-53.5 - parent: 2 - - uid: 12828 - components: - - type: Transform - pos: 21.5,-57.5 - parent: 2 - - uid: 12829 - components: - - type: Transform - pos: 21.5,-58.5 - parent: 2 - - uid: 12830 - components: - - type: Transform - pos: 21.5,-59.5 - parent: 2 - - uid: 12831 - components: - - type: Transform - pos: 22.5,-52.5 - parent: 2 - - uid: 12832 - components: - - type: Transform - pos: 15.5,-52.5 - parent: 2 - - uid: 12833 - components: - - type: Transform - pos: 16.5,-52.5 - parent: 2 - - uid: 12834 - components: - - type: Transform - pos: 15.5,-57.5 - parent: 2 - - uid: 12835 - components: - - type: Transform - pos: 22.5,-57.5 - parent: 2 - - uid: 12836 - components: - - type: Transform - pos: 22.5,-54.5 - parent: 2 - - uid: 12837 - components: - - type: Transform - pos: 21.5,-54.5 - parent: 2 - - uid: 12838 - components: - - type: Transform - pos: 16.5,-54.5 - parent: 2 - - uid: 12839 - components: - - type: Transform - pos: 15.5,-54.5 - parent: 2 - uid: 12840 components: - type: Transform @@ -38017,6 +38347,326 @@ entities: - type: Transform pos: -68.5,-31.5 parent: 2 + - uid: 22057 + components: + - type: Transform + pos: 18.5,-50.5 + parent: 2 + - uid: 22058 + components: + - type: Transform + pos: 18.5,-51.5 + parent: 2 + - uid: 22059 + components: + - type: Transform + pos: 18.5,-52.5 + parent: 2 + - uid: 22060 + components: + - type: Transform + pos: 18.5,-53.5 + parent: 2 + - uid: 22061 + components: + - type: Transform + pos: 18.5,-54.5 + parent: 2 + - uid: 22062 + components: + - type: Transform + pos: 19.5,-52.5 + parent: 2 + - uid: 22063 + components: + - type: Transform + pos: 20.5,-52.5 + parent: 2 + - uid: 22064 + components: + - type: Transform + pos: 21.5,-52.5 + parent: 2 + - uid: 22065 + components: + - type: Transform + pos: 22.5,-52.5 + parent: 2 + - uid: 22066 + components: + - type: Transform + pos: 23.5,-52.5 + parent: 2 + - uid: 22204 + components: + - type: Transform + pos: 18.5,-71.5 + parent: 2 + - uid: 22205 + components: + - type: Transform + pos: 18.5,-70.5 + parent: 2 + - uid: 22206 + components: + - type: Transform + pos: 17.5,-70.5 + parent: 2 + - uid: 22207 + components: + - type: Transform + pos: 16.5,-70.5 + parent: 2 + - uid: 22208 + components: + - type: Transform + pos: 19.5,-70.5 + parent: 2 + - uid: 22209 + components: + - type: Transform + pos: 20.5,-70.5 + parent: 2 + - uid: 22210 + components: + - type: Transform + pos: 21.5,-70.5 + parent: 2 + - uid: 22211 + components: + - type: Transform + pos: 22.5,-71.5 + parent: 2 + - uid: 22212 + components: + - type: Transform + pos: 22.5,-70.5 + parent: 2 + - uid: 22213 + components: + - type: Transform + pos: 22.5,-72.5 + parent: 2 + - uid: 22214 + components: + - type: Transform + pos: 22.5,-73.5 + parent: 2 + - uid: 22215 + components: + - type: Transform + pos: 22.5,-74.5 + parent: 2 + - uid: 22216 + components: + - type: Transform + pos: 22.5,-69.5 + parent: 2 + - uid: 22217 + components: + - type: Transform + pos: 22.5,-68.5 + parent: 2 + - uid: 22218 + components: + - type: Transform + pos: 22.5,-67.5 + parent: 2 + - uid: 22219 + components: + - type: Transform + pos: 16.5,-69.5 + parent: 2 + - uid: 22220 + components: + - type: Transform + pos: 16.5,-68.5 + parent: 2 + - uid: 22221 + components: + - type: Transform + pos: 16.5,-67.5 + parent: 2 + - uid: 22222 + components: + - type: Transform + pos: 16.5,-71.5 + parent: 2 + - uid: 22223 + components: + - type: Transform + pos: 16.5,-72.5 + parent: 2 + - uid: 22224 + components: + - type: Transform + pos: 16.5,-73.5 + parent: 2 + - uid: 22225 + components: + - type: Transform + pos: 16.5,-74.5 + parent: 2 + - uid: 22226 + components: + - type: Transform + pos: 19.5,-69.5 + parent: 2 + - uid: 22227 + components: + - type: Transform + pos: 19.5,-68.5 + parent: 2 + - uid: 22228 + components: + - type: Transform + pos: 19.5,-67.5 + parent: 2 + - uid: 22229 + components: + - type: Transform + pos: 19.5,-71.5 + parent: 2 + - uid: 22230 + components: + - type: Transform + pos: 19.5,-72.5 + parent: 2 + - uid: 22231 + components: + - type: Transform + pos: 19.5,-73.5 + parent: 2 + - uid: 22232 + components: + - type: Transform + pos: 17.5,-74.5 + parent: 2 + - uid: 22233 + components: + - type: Transform + pos: 17.5,-75.5 + parent: 2 + - uid: 22234 + components: + - type: Transform + pos: 18.5,-75.5 + parent: 2 + - uid: 22235 + components: + - type: Transform + pos: 19.5,-75.5 + parent: 2 + - uid: 22236 + components: + - type: Transform + pos: 20.5,-75.5 + parent: 2 + - uid: 22237 + components: + - type: Transform + pos: 21.5,-75.5 + parent: 2 + - uid: 22238 + components: + - type: Transform + pos: 21.5,-74.5 + parent: 2 + - uid: 22239 + components: + - type: Transform + pos: 19.5,-66.5 + parent: 2 + - uid: 22240 + components: + - type: Transform + pos: 19.5,-65.5 + parent: 2 + - uid: 22241 + components: + - type: Transform + pos: 19.5,-64.5 + parent: 2 + - uid: 22242 + components: + - type: Transform + pos: 19.5,-63.5 + parent: 2 + - uid: 22243 + components: + - type: Transform + pos: 19.5,-62.5 + parent: 2 + - uid: 22244 + components: + - type: Transform + pos: 20.5,-64.5 + parent: 2 + - uid: 22245 + components: + - type: Transform + pos: 21.5,-64.5 + parent: 2 + - uid: 22246 + components: + - type: Transform + pos: 22.5,-64.5 + parent: 2 + - uid: 22247 + components: + - type: Transform + pos: 23.5,-64.5 + parent: 2 + - uid: 22248 + components: + - type: Transform + pos: 18.5,-64.5 + parent: 2 + - uid: 22249 + components: + - type: Transform + pos: 24.5,-64.5 + parent: 2 + - uid: 22250 + components: + - type: Transform + pos: 17.5,-64.5 + parent: 2 + - uid: 22251 + components: + - type: Transform + pos: 16.5,-64.5 + parent: 2 + - uid: 22252 + components: + - type: Transform + pos: 15.5,-64.5 + parent: 2 + - uid: 22253 + components: + - type: Transform + pos: 14.5,-64.5 + parent: 2 + - uid: 22254 + components: + - type: Transform + pos: 21.5,-63.5 + parent: 2 + - uid: 22255 + components: + - type: Transform + pos: 21.5,-62.5 + parent: 2 + - uid: 22256 + components: + - type: Transform + pos: 21.5,-61.5 + parent: 2 + - uid: 22257 + components: + - type: Transform + pos: 21.5,-60.5 + parent: 2 - proto: CableApcStack entities: - uid: 264 @@ -41731,76 +42381,6 @@ entities: - type: Transform pos: 48.5,-20.5 parent: 2 - - uid: 10636 - components: - - type: Transform - pos: 15.5,-58.5 - parent: 2 - - uid: 10637 - components: - - type: Transform - pos: 15.5,-57.5 - parent: 2 - - uid: 10638 - components: - - type: Transform - pos: 16.5,-57.5 - parent: 2 - - uid: 10639 - components: - - type: Transform - pos: 17.5,-57.5 - parent: 2 - - uid: 10640 - components: - - type: Transform - pos: 18.5,-57.5 - parent: 2 - - uid: 10641 - components: - - type: Transform - pos: 18.5,-58.5 - parent: 2 - - uid: 10642 - components: - - type: Transform - pos: 18.5,-59.5 - parent: 2 - - uid: 10643 - components: - - type: Transform - pos: 22.5,-58.5 - parent: 2 - - uid: 10644 - components: - - type: Transform - pos: 22.5,-57.5 - parent: 2 - - uid: 10645 - components: - - type: Transform - pos: 21.5,-57.5 - parent: 2 - - uid: 10646 - components: - - type: Transform - pos: 20.5,-57.5 - parent: 2 - - uid: 10647 - components: - - type: Transform - pos: 19.5,-57.5 - parent: 2 - - uid: 10660 - components: - - type: Transform - pos: 18.5,-60.5 - parent: 2 - - uid: 10661 - components: - - type: Transform - pos: 19.5,-60.5 - parent: 2 - uid: 10708 components: - type: Transform @@ -43171,56 +43751,6 @@ entities: - type: Transform pos: 82.5,-20.5 parent: 2 - - uid: 21522 - components: - - type: Transform - pos: 20.5,-56.5 - parent: 2 - - uid: 21523 - components: - - type: Transform - pos: 20.5,-55.5 - parent: 2 - - uid: 21524 - components: - - type: Transform - pos: 20.5,-54.5 - parent: 2 - - uid: 21525 - components: - - type: Transform - pos: 20.5,-53.5 - parent: 2 - - uid: 21526 - components: - - type: Transform - pos: 17.5,-56.5 - parent: 2 - - uid: 21527 - components: - - type: Transform - pos: 17.5,-55.5 - parent: 2 - - uid: 21528 - components: - - type: Transform - pos: 17.5,-54.5 - parent: 2 - - uid: 21529 - components: - - type: Transform - pos: 17.5,-53.5 - parent: 2 - - uid: 21530 - components: - - type: Transform - pos: 18.5,-53.5 - parent: 2 - - uid: 21531 - components: - - type: Transform - pos: 19.5,-53.5 - parent: 2 - uid: 21532 components: - type: Transform @@ -43296,16 +43826,111 @@ entities: - type: Transform pos: 18.5,-50.5 parent: 2 - - uid: 21547 + - uid: 22072 components: - type: Transform - pos: 18.5,-51.5 + pos: 23.5,-63.5 parent: 2 - - uid: 21548 + - uid: 22073 + components: + - type: Transform + pos: 24.5,-63.5 + parent: 2 + - uid: 22074 + components: + - type: Transform + pos: 23.5,-64.5 + parent: 2 + - uid: 22075 + components: + - type: Transform + pos: 22.5,-64.5 + parent: 2 + - uid: 22076 + components: + - type: Transform + pos: 21.5,-64.5 + parent: 2 + - uid: 22077 + components: + - type: Transform + pos: 20.5,-64.5 + parent: 2 + - uid: 22078 + components: + - type: Transform + pos: 19.5,-64.5 + parent: 2 + - uid: 22079 + components: + - type: Transform + pos: 19.5,-63.5 + parent: 2 + - uid: 22080 + components: + - type: Transform + pos: 19.5,-62.5 + parent: 2 + - uid: 22081 + components: + - type: Transform + pos: 19.5,-61.5 + parent: 2 + - uid: 22082 + components: + - type: Transform + pos: 19.5,-60.5 + parent: 2 + - uid: 22083 + components: + - type: Transform + pos: 19.5,-59.5 + parent: 2 + - uid: 22084 + components: + - type: Transform + pos: 19.5,-58.5 + parent: 2 + - uid: 22085 + components: + - type: Transform + pos: 19.5,-57.5 + parent: 2 + - uid: 22086 + components: + - type: Transform + pos: 19.5,-56.5 + parent: 2 + - uid: 22087 + components: + - type: Transform + pos: 19.5,-55.5 + parent: 2 + - uid: 22088 + components: + - type: Transform + pos: 18.5,-53.5 + parent: 2 + - uid: 22089 + components: + - type: Transform + pos: 19.5,-54.5 + parent: 2 + - uid: 22090 + components: + - type: Transform + pos: 18.5,-54.5 + parent: 2 + - uid: 22091 components: - type: Transform pos: 18.5,-52.5 parent: 2 + - uid: 22092 + components: + - type: Transform + pos: 18.5,-51.5 + parent: 2 - proto: CableHVStack entities: - uid: 336 @@ -47210,66 +47835,6 @@ entities: - type: Transform pos: 48.5,-36.5 parent: 2 - - uid: 10648 - components: - - type: Transform - pos: 21.5,-51.5 - parent: 2 - - uid: 10649 - components: - - type: Transform - pos: 21.5,-52.5 - parent: 2 - - uid: 10650 - components: - - type: Transform - pos: 20.5,-52.5 - parent: 2 - - uid: 10651 - components: - - type: Transform - pos: 20.5,-53.5 - parent: 2 - - uid: 10652 - components: - - type: Transform - pos: 20.5,-54.5 - parent: 2 - - uid: 10653 - components: - - type: Transform - pos: 20.5,-55.5 - parent: 2 - - uid: 10654 - components: - - type: Transform - pos: 20.5,-56.5 - parent: 2 - - uid: 10655 - components: - - type: Transform - pos: 20.5,-57.5 - parent: 2 - - uid: 10656 - components: - - type: Transform - pos: 19.5,-57.5 - parent: 2 - - uid: 10657 - components: - - type: Transform - pos: 19.5,-58.5 - parent: 2 - - uid: 10658 - components: - - type: Transform - pos: 19.5,-59.5 - parent: 2 - - uid: 10659 - components: - - type: Transform - pos: 19.5,-60.5 - parent: 2 - uid: 10738 components: - type: Transform @@ -48185,6 +48750,471 @@ entities: - type: Transform pos: -3.5,55.5 parent: 2 + - uid: 22021 + components: + - type: Transform + pos: 11.5,-56.5 + parent: 2 + - uid: 22258 + components: + - type: Transform + pos: 11.5,-57.5 + parent: 2 + - uid: 22259 + components: + - type: Transform + pos: 11.5,-58.5 + parent: 2 + - uid: 22260 + components: + - type: Transform + pos: 11.5,-59.5 + parent: 2 + - uid: 22261 + components: + - type: Transform + pos: 11.5,-60.5 + parent: 2 + - uid: 22262 + components: + - type: Transform + pos: 11.5,-61.5 + parent: 2 + - uid: 22263 + components: + - type: Transform + pos: 11.5,-62.5 + parent: 2 + - uid: 22264 + components: + - type: Transform + pos: 11.5,-63.5 + parent: 2 + - uid: 22265 + components: + - type: Transform + pos: 11.5,-64.5 + parent: 2 + - uid: 22266 + components: + - type: Transform + pos: 11.5,-65.5 + parent: 2 + - uid: 22267 + components: + - type: Transform + pos: 11.5,-66.5 + parent: 2 + - uid: 22268 + components: + - type: Transform + pos: 12.5,-66.5 + parent: 2 + - uid: 22269 + components: + - type: Transform + pos: 12.5,-67.5 + parent: 2 + - uid: 22270 + components: + - type: Transform + pos: 12.5,-68.5 + parent: 2 + - uid: 22271 + components: + - type: Transform + pos: 12.5,-69.5 + parent: 2 + - uid: 22272 + components: + - type: Transform + pos: 12.5,-70.5 + parent: 2 + - uid: 22273 + components: + - type: Transform + pos: 12.5,-71.5 + parent: 2 + - uid: 22274 + components: + - type: Transform + pos: 12.5,-72.5 + parent: 2 + - uid: 22275 + components: + - type: Transform + pos: 12.5,-73.5 + parent: 2 + - uid: 22276 + components: + - type: Transform + pos: 12.5,-74.5 + parent: 2 + - uid: 22277 + components: + - type: Transform + pos: 12.5,-75.5 + parent: 2 + - uid: 22278 + components: + - type: Transform + pos: 12.5,-76.5 + parent: 2 + - uid: 22279 + components: + - type: Transform + pos: 12.5,-77.5 + parent: 2 + - uid: 22280 + components: + - type: Transform + pos: 12.5,-78.5 + parent: 2 + - uid: 22281 + components: + - type: Transform + pos: 13.5,-78.5 + parent: 2 + - uid: 22282 + components: + - type: Transform + pos: 13.5,-79.5 + parent: 2 + - uid: 22283 + components: + - type: Transform + pos: 14.5,-79.5 + parent: 2 + - uid: 22284 + components: + - type: Transform + pos: 15.5,-79.5 + parent: 2 + - uid: 22285 + components: + - type: Transform + pos: 11.5,-53.5 + parent: 2 + - uid: 22286 + components: + - type: Transform + pos: 16.5,-79.5 + parent: 2 + - uid: 22287 + components: + - type: Transform + pos: 17.5,-79.5 + parent: 2 + - uid: 22288 + components: + - type: Transform + pos: 18.5,-79.5 + parent: 2 + - uid: 22289 + components: + - type: Transform + pos: 19.5,-79.5 + parent: 2 + - uid: 22290 + components: + - type: Transform + pos: 20.5,-79.5 + parent: 2 + - uid: 22291 + components: + - type: Transform + pos: 21.5,-79.5 + parent: 2 + - uid: 22292 + components: + - type: Transform + pos: 23.5,-79.5 + parent: 2 + - uid: 22293 + components: + - type: Transform + pos: 22.5,-79.5 + parent: 2 + - uid: 22294 + components: + - type: Transform + pos: 24.5,-79.5 + parent: 2 + - uid: 22295 + components: + - type: Transform + pos: 25.5,-79.5 + parent: 2 + - uid: 22296 + components: + - type: Transform + pos: 25.5,-78.5 + parent: 2 + - uid: 22297 + components: + - type: Transform + pos: 26.5,-78.5 + parent: 2 + - uid: 22298 + components: + - type: Transform + pos: 26.5,-77.5 + parent: 2 + - uid: 22299 + components: + - type: Transform + pos: 26.5,-76.5 + parent: 2 + - uid: 22300 + components: + - type: Transform + pos: 26.5,-75.5 + parent: 2 + - uid: 22301 + components: + - type: Transform + pos: 26.5,-74.5 + parent: 2 + - uid: 22302 + components: + - type: Transform + pos: 26.5,-73.5 + parent: 2 + - uid: 22303 + components: + - type: Transform + pos: 26.5,-72.5 + parent: 2 + - uid: 22304 + components: + - type: Transform + pos: 26.5,-71.5 + parent: 2 + - uid: 22305 + components: + - type: Transform + pos: 26.5,-70.5 + parent: 2 + - uid: 22306 + components: + - type: Transform + pos: 26.5,-69.5 + parent: 2 + - uid: 22307 + components: + - type: Transform + pos: 26.5,-68.5 + parent: 2 + - uid: 22308 + components: + - type: Transform + pos: 26.5,-67.5 + parent: 2 + - uid: 22309 + components: + - type: Transform + pos: 26.5,-66.5 + parent: 2 + - uid: 22310 + components: + - type: Transform + pos: 27.5,-66.5 + parent: 2 + - uid: 22311 + components: + - type: Transform + pos: 27.5,-65.5 + parent: 2 + - uid: 22312 + components: + - type: Transform + pos: 27.5,-64.5 + parent: 2 + - uid: 22313 + components: + - type: Transform + pos: 27.5,-63.5 + parent: 2 + - uid: 22314 + components: + - type: Transform + pos: 27.5,-62.5 + parent: 2 + - uid: 22315 + components: + - type: Transform + pos: 27.5,-61.5 + parent: 2 + - uid: 22316 + components: + - type: Transform + pos: 27.5,-60.5 + parent: 2 + - uid: 22317 + components: + - type: Transform + pos: 27.5,-59.5 + parent: 2 + - uid: 22318 + components: + - type: Transform + pos: 27.5,-58.5 + parent: 2 + - uid: 22319 + components: + - type: Transform + pos: 11.5,-54.5 + parent: 2 + - uid: 22320 + components: + - type: Transform + pos: 11.5,-52.5 + parent: 2 + - uid: 22322 + components: + - type: Transform + pos: 27.5,-57.5 + parent: 2 + - uid: 22323 + components: + - type: Transform + pos: 18.5,-71.5 + parent: 2 + - uid: 22324 + components: + - type: Transform + pos: 18.5,-70.5 + parent: 2 + - uid: 22325 + components: + - type: Transform + pos: 19.5,-70.5 + parent: 2 + - uid: 22326 + components: + - type: Transform + pos: 19.5,-69.5 + parent: 2 + - uid: 22327 + components: + - type: Transform + pos: 19.5,-68.5 + parent: 2 + - uid: 22328 + components: + - type: Transform + pos: 19.5,-67.5 + parent: 2 + - uid: 22329 + components: + - type: Transform + pos: 19.5,-66.5 + parent: 2 + - uid: 22330 + components: + - type: Transform + pos: 19.5,-65.5 + parent: 2 + - uid: 22331 + components: + - type: Transform + pos: 19.5,-64.5 + parent: 2 + - uid: 22332 + components: + - type: Transform + pos: 20.5,-64.5 + parent: 2 + - uid: 22333 + components: + - type: Transform + pos: 21.5,-64.5 + parent: 2 + - uid: 22334 + components: + - type: Transform + pos: 22.5,-64.5 + parent: 2 + - uid: 22335 + components: + - type: Transform + pos: 23.5,-64.5 + parent: 2 + - uid: 22336 + components: + - type: Transform + pos: 24.5,-64.5 + parent: 2 + - uid: 22337 + components: + - type: Transform + pos: 24.5,-63.5 + parent: 2 + - uid: 22338 + components: + - type: Transform + pos: 19.5,-63.5 + parent: 2 + - uid: 22339 + components: + - type: Transform + pos: 19.5,-62.5 + parent: 2 + - uid: 22340 + components: + - type: Transform + pos: 19.5,-61.5 + parent: 2 + - uid: 22341 + components: + - type: Transform + pos: 19.5,-60.5 + parent: 2 + - uid: 22342 + components: + - type: Transform + pos: 19.5,-59.5 + parent: 2 + - uid: 22343 + components: + - type: Transform + pos: 19.5,-58.5 + parent: 2 + - uid: 22344 + components: + - type: Transform + pos: 18.5,-58.5 + parent: 2 + - uid: 22345 + components: + - type: Transform + pos: 17.5,-58.5 + parent: 2 + - uid: 22346 + components: + - type: Transform + pos: 16.5,-58.5 + parent: 2 + - uid: 22347 + components: + - type: Transform + pos: 15.5,-58.5 + parent: 2 + - uid: 22348 + components: + - type: Transform + pos: 14.5,-58.5 + parent: 2 + - uid: 22349 + components: + - type: Transform + pos: 13.5,-58.5 + parent: 2 + - uid: 22350 + components: + - type: Transform + pos: 12.5,-58.5 + parent: 2 - proto: CableMVStack entities: - uid: 446 @@ -48223,11 +49253,6 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-17.5 parent: 2 - - uid: 8032 - components: - - type: Transform - pos: 18.5,-59.5 - parent: 2 - uid: 8099 components: - type: Transform @@ -48266,6 +49291,12 @@ entities: rot: 1.5707963267948966 rad pos: 87.5,-22.5 parent: 2 + - uid: 22071 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-64.5 + parent: 2 - proto: CandyBowl entities: - uid: 20483 @@ -50388,11 +51419,6 @@ entities: - type: Transform pos: -7.5,0.5 parent: 2 - - uid: 597 - components: - - type: Transform - pos: -6.5,0.5 - parent: 2 - uid: 598 components: - type: Transform @@ -50428,11 +51454,6 @@ entities: - type: Transform pos: -0.5,8.5 parent: 2 - - uid: 605 - components: - - type: Transform - pos: 7.5,0.5 - parent: 2 - uid: 606 components: - type: Transform @@ -50463,11 +51484,6 @@ entities: - type: Transform pos: 1.5,7.5 parent: 2 - - uid: 612 - components: - - type: Transform - pos: 0.5,7.5 - parent: 2 - uid: 613 components: - type: Transform @@ -50478,11 +51494,6 @@ entities: - type: Transform pos: 1.5,-7.5 parent: 2 - - uid: 615 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 2 - uid: 616 components: - type: Transform @@ -51636,16 +52647,6 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-13.5 parent: 2 - - uid: 7889 - components: - - type: Transform - pos: 18.5,-51.5 - parent: 2 - - uid: 7890 - components: - - type: Transform - pos: 19.5,-51.5 - parent: 2 - uid: 7917 components: - type: Transform @@ -51756,65 +52757,40 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-39.5 parent: 2 - - uid: 8022 + - uid: 8028 components: - type: Transform - rot: 3.141592653589793 rad + rot: -1.5707963267948966 rad pos: 19.5,-60.5 parent: 2 - - uid: 8024 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-60.5 - parent: 2 - - uid: 8033 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-55.5 - parent: 2 - - uid: 8034 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-56.5 - parent: 2 - - uid: 8039 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-54.5 - parent: 2 - - uid: 8040 + - uid: 8057 components: - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-54.5 + rot: -1.5707963267948966 rad + pos: 19.5,-57.5 parent: 2 - - uid: 8041 + - uid: 8060 components: - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-54.5 + rot: -1.5707963267948966 rad + pos: 19.5,-56.5 parent: 2 - - uid: 8042 + - uid: 8061 components: - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-54.5 + rot: -1.5707963267948966 rad + pos: 19.5,-59.5 parent: 2 - - uid: 8043 + - uid: 8062 components: - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-55.5 + rot: -1.5707963267948966 rad + pos: 19.5,-58.5 parent: 2 - - uid: 8044 + - uid: 8070 components: - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-56.5 + pos: 13.5,-76.5 parent: 2 - uid: 8084 components: @@ -55877,6 +56853,51 @@ entities: rot: 3.141592653589793 rad pos: -67.5,-31.5 parent: 2 + - uid: 22008 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-60.5 + parent: 2 + - uid: 22020 + components: + - type: Transform + pos: 15.5,-78.5 + parent: 2 + - uid: 22022 + components: + - type: Transform + pos: 23.5,-78.5 + parent: 2 + - uid: 22023 + components: + - type: Transform + pos: 25.5,-76.5 + parent: 2 + - uid: 22173 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-67.5 + parent: 2 + - uid: 22181 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-68.5 + parent: 2 + - uid: 22182 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-69.5 + parent: 2 + - uid: 22183 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-70.5 + parent: 2 - proto: Chair entities: - uid: 678 @@ -57343,26 +58364,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-46.5 parent: 2 - - uid: 8061 - components: - - type: Transform - pos: 16.5,-52.5 - parent: 2 - - uid: 8062 - components: - - type: Transform - pos: 17.5,-52.5 - parent: 2 - - uid: 8063 - components: - - type: Transform - pos: 20.5,-52.5 - parent: 2 - - uid: 8064 - components: - - type: Transform - pos: 21.5,-52.5 - parent: 2 - uid: 8096 components: - type: Transform @@ -57949,6 +58950,12 @@ entities: - type: Transform pos: 15.5,36.5 parent: 2 + - uid: 22028 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-65.5 + parent: 2 - proto: ChairOfficeLight entities: - uid: 825 @@ -59346,11 +60353,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,12.5 parent: 2 - - uid: 8330 - components: - - type: Transform - pos: 20.5,-51.5 - parent: 2 - uid: 8332 components: - type: Transform @@ -59363,6 +60365,12 @@ entities: rot: 3.141592653589793 rad pos: -32.5,-40.5 parent: 2 + - uid: 22396 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-66.5 + parent: 2 - proto: ClosetWallFire entities: - uid: 8277 @@ -59543,11 +60551,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,-19.5 parent: 2 - - uid: 8329 - components: - - type: Transform - pos: 17.5,-51.5 - parent: 2 - uid: 8331 components: - type: Transform @@ -59583,6 +60586,12 @@ entities: rot: -1.5707963267948966 rad pos: -54.5,-57.5 parent: 2 + - uid: 22398 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-66.5 + parent: 2 - proto: ClothingBackpackClown entities: - uid: 8189 @@ -60423,10 +61432,10 @@ entities: parent: 2 - proto: ClothingUniformJumpsuitJournalist entities: - - uid: 17543 + - uid: 8072 components: - type: Transform - pos: 12.626299,-51.869915 + pos: 14.5,-51.5 parent: 2 - proto: ClothingUniformJumpsuitMusician entities: @@ -60898,6 +61907,12 @@ entities: rot: 3.141592653589793 rad pos: 39.5,-38.5 parent: 2 + - uid: 22053 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-65.5 + parent: 2 - proto: ComputerAnalysisConsole entities: - uid: 5523 @@ -60935,12 +61950,6 @@ entities: parent: 2 - proto: ComputerBroken entities: - - uid: 8065 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-54.5 - parent: 2 - uid: 15088 components: - type: Transform @@ -61046,11 +62055,11 @@ entities: parent: 2 - proto: ComputerFrame entities: - - uid: 8066 + - uid: 7868 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-53.5 + rot: -1.5707963267948966 rad + pos: 23.5,-52.5 parent: 2 - uid: 15087 components: @@ -61124,6 +62133,12 @@ entities: - type: Transform pos: 40.5,-32.5 parent: 2 + - uid: 8046 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 40.5,21.5 + parent: 2 - proto: ComputerResearchAndDevelopment entities: - uid: 4073 @@ -61166,11 +62181,11 @@ entities: parent: 2 - proto: ComputerShuttleSalvage entities: - - uid: 14915 + - uid: 22410 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 40.5,21.5 + rot: 1.5707963267948966 rad + pos: 33.5,19.5 parent: 2 - proto: ComputerSolarControl entities: @@ -61967,10 +62982,10 @@ entities: parent: 2 - proto: DefaultStationBeaconAICore entities: - - uid: 20820 + - uid: 22368 components: - type: Transform - pos: 18.5,-54.5 + pos: 19.5,-69.5 parent: 2 - proto: DefaultStationBeaconAME entities: @@ -63527,6 +64542,36 @@ entities: - type: Transform pos: -14.5,-38.5 parent: 2 + - uid: 8029 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-60.5 + parent: 2 + - uid: 8032 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-59.5 + parent: 2 + - uid: 8033 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-57.5 + parent: 2 + - uid: 8034 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-58.5 + parent: 2 + - uid: 8067 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-61.5 + parent: 2 - uid: 9042 components: - type: Transform @@ -66887,6 +67932,18 @@ entities: rot: 1.5707963267948966 rad pos: 32.5,-36.5 parent: 2 + - uid: 21529 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-55.5 + parent: 2 + - uid: 21530 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-56.5 + parent: 2 - uid: 21578 components: - type: Transform @@ -67500,11 +68557,22 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,-40.5 parent: 2 + - uid: 8066 + components: + - type: Transform + pos: 19.5,-54.5 + parent: 2 - uid: 8350 components: - type: Transform pos: 57.5,15.5 parent: 2 + - uid: 10648 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-62.5 + parent: 2 - uid: 12936 components: - type: Transform @@ -67945,11 +69013,21 @@ entities: - type: Transform pos: 28.5,-46.5 parent: 2 + - uid: 7867 + components: + - type: Transform + pos: 19.5,-54.5 + parent: 2 - uid: 7951 components: - type: Transform pos: 41.5,-9.5 parent: 2 + - uid: 8014 + components: + - type: Transform + pos: 19.5,-62.5 + parent: 2 - uid: 8501 components: - type: Transform @@ -68867,17 +69945,6 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,-31.5 parent: 2 - - uid: 17431 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-57.5 - parent: 2 - - uid: 17432 - components: - - type: Transform - pos: 20.5,-52.5 - parent: 2 - uid: 17433 components: - type: Transform @@ -69118,6 +70185,30 @@ entities: rot: 3.141592653589793 rad pos: -1.5,45.5 parent: 2 + - uid: 22321 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-53.5 + parent: 2 + - uid: 22369 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-65.5 + parent: 2 + - uid: 22370 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-70.5 + parent: 2 + - uid: 22371 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-70.5 + parent: 2 - proto: EmergencyMedipen entities: - uid: 3579 @@ -69311,11 +70402,6 @@ entities: - type: Transform pos: 3.5,-17.5 parent: 2 - - uid: 20331 - components: - - type: Transform - pos: 16.5,-51.5 - parent: 2 - uid: 20332 components: - type: Transform @@ -69361,6 +70447,11 @@ entities: - type: Transform pos: 3.5,44.5 parent: 2 + - uid: 22397 + components: + - type: Transform + pos: 22.5,-65.5 + parent: 2 - proto: FancyTableSpawner entities: - uid: 15081 @@ -70294,19 +71385,6 @@ entities: - 14937 - 14938 - 20039 - - uid: 17608 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-58.5 - parent: 2 - - type: DeviceList - devices: - - 14939 - - 14940 - - 14938 - - 14937 - - 20087 - uid: 17609 components: - type: Transform @@ -71304,6 +72382,38 @@ entities: devices: - 21115 - 21114 + - uid: 22351 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-65.5 + parent: 2 + - type: DeviceList + devices: + - 22167 + - 22202 + - 22201 + - uid: 22357 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-52.5 + parent: 2 + - type: DeviceList + devices: + - 22203 + - 14937 + - 14938 + - 22168 + - uid: 22432 + components: + - type: Transform + pos: 22.5,-50.5 + parent: 2 + - type: DeviceList + devices: + - 22203 + - 22430 - proto: FireAxeCabinetFilled entities: - uid: 1003 @@ -72137,12 +73247,20 @@ entities: rot: 3.141592653589793 rad pos: 18.5,-50.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 22150 + - 22357 - uid: 14938 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,-50.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 22150 + - 22357 - uid: 14941 components: - type: Transform @@ -72288,6 +73406,24 @@ entities: - 21113 - 17594 - 8387 + - uid: 22201 + components: + - type: Transform + pos: 16.5,-64.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22351 + - 22149 + - uid: 22202 + components: + - type: Transform + pos: 22.5,-64.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22351 + - 22149 - proto: FirelockEdge entities: - uid: 491 @@ -72507,18 +73643,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-45.5 parent: 2 - - uid: 14939 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-58.5 - parent: 2 - - uid: 14940 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-58.5 - parent: 2 - uid: 16204 components: - type: Transform @@ -74198,6 +75322,17 @@ entities: rot: 3.141592653589793 rad pos: 63.5,18.5 parent: 2 + - uid: 22203 + components: + - type: Transform + pos: 21.5,-52.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22357 + - 22150 + - 22432 + - 22431 - proto: Fireplace entities: - uid: 1067 @@ -74260,6 +75395,13 @@ entities: - type: Transform pos: 83.5,-33.5 parent: 2 +- proto: Flash + entities: + - uid: 22355 + components: + - type: Transform + pos: 18.519085,-62.508186 + parent: 2 - proto: FlashlightLantern entities: - uid: 7252 @@ -74441,11 +75583,6 @@ entities: - type: Transform pos: 62.19926,-39.235546 parent: 2 - - uid: 16734 - components: - - type: Transform - pos: 27.5218,-58.352764 - parent: 2 - uid: 16748 components: - type: Transform @@ -74456,6 +75593,11 @@ entities: - type: Transform pos: 64.49504,-36.465317 parent: 2 + - uid: 17021 + components: + - type: Transform + pos: 28.54376,-56.43803 + parent: 2 - uid: 17299 components: - type: Transform @@ -75011,6 +76153,13 @@ entities: - type: Transform pos: -30.5,-0.5 parent: 2 + - uid: 22098 + components: + - type: Transform + pos: 17.5,-59.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasPipeBend entities: - uid: 1113 @@ -76708,6 +77857,97 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 22106 + components: + - type: Transform + pos: 24.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22117 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-63.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22118 + components: + - type: Transform + pos: 21.5,-63.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22126 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-69.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-69.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22155 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-52.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22156 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-52.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22164 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-53.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22409 + components: + - type: Transform + pos: 34.5,19.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22411 + components: + - type: Transform + pos: -50.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22412 + components: + - type: Transform + pos: -44.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasPipeFourway entities: - uid: 7063 @@ -77421,6 +78661,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 8063 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,19.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 8373 components: - type: Transform @@ -84866,13 +86114,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 19151 - components: - - type: Transform - pos: -54.5,-2.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 19152 components: - type: Transform @@ -84908,13 +86149,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 19157 - components: - - type: Transform - pos: -52.5,-3.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 19158 components: - type: Transform @@ -89576,22 +90810,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 20088 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-52.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 20089 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-51.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 20090 components: - type: Transform @@ -89648,14 +90866,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 20097 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-51.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 20098 components: - type: Transform @@ -90144,14 +91354,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 20201 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-52.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 20202 components: - type: Transform @@ -90232,6 +91434,400 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 22067 + components: + - type: Transform + pos: 19.5,-51.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22068 + components: + - type: Transform + pos: 18.5,-51.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22101 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-61.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22102 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-62.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22103 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22115 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22116 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22119 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-63.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22120 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-63.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22121 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22122 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-65.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22123 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-66.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22124 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-67.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22125 + components: + - type: Transform + pos: 20.5,-68.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-70.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22130 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-71.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22131 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-72.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22132 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-69.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22134 + components: + - type: Transform + pos: 20.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22135 + components: + - type: Transform + pos: 20.5,-65.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22136 + components: + - type: Transform + pos: 20.5,-66.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22137 + components: + - type: Transform + pos: 20.5,-67.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22138 + components: + - type: Transform + pos: 19.5,-68.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22142 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-70.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22143 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-72.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22147 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-71.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22157 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-52.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22159 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-52.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22160 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-53.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22161 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-53.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22163 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-52.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22165 + components: + - type: Transform + pos: 20.5,-53.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22166 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-69.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22169 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-69.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22413 + components: + - type: Transform + pos: -44.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22414 + components: + - type: Transform + pos: -44.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22415 + components: + - type: Transform + pos: -50.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22416 + components: + - type: Transform + pos: -50.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22417 + components: + - type: Transform + pos: -50.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22418 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -46.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22419 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -45.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22420 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22421 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -48.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22422 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -49.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22423 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -50.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22424 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -51.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22425 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -51.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22426 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22427 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeTJunction entities: - uid: 575 @@ -90310,6 +91906,22 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 8055 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -52.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8056 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -54.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 8168 components: - type: Transform @@ -92134,6 +93746,51 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 22114 + components: + - type: Transform + pos: 19.5,-64.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22128 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-69.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22133 + components: + - type: Transform + pos: 20.5,-63.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22141 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-69.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22158 + components: + - type: Transform + pos: 20.5,-52.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22162 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-53.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasPort entities: - uid: 1198 @@ -92229,6 +93886,14 @@ entities: rot: 3.141592653589793 rad pos: 45.5,14.5 parent: 2 + - uid: 22100 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-65.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPressurePump entities: - uid: 1204 @@ -92390,6 +94055,13 @@ entities: rot: 1.5707963267948966 rad pos: 28.5,-10.5 parent: 2 + - uid: 22099 + components: + - type: Transform + pos: 17.5,-60.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVentPump entities: - uid: 7019 @@ -92411,14 +94083,6 @@ entities: - type: DeviceNetwork deviceLists: - 21958 - - uid: 9034 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-53.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 17707 components: - type: Transform @@ -93478,6 +95142,72 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 22107 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-73.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22148 + - 22149 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22112 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-65.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22149 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22139 + components: + - type: Transform + pos: 16.5,-68.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22148 + - 22149 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22151 + components: + - type: Transform + pos: 22.5,-51.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22431 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22154 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-54.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22150 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22407 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -50.5,-6.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22429 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasVentScrubber entities: - uid: 893 @@ -93516,14 +95246,6 @@ entities: - 15596 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9078 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-53.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 10878 components: - type: Transform @@ -93864,14 +95586,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 18579 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,19.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 18590 components: - type: Transform @@ -94562,6 +96276,81 @@ entities: - type: DeviceNetwork deviceLists: - 21958 + - uid: 22108 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-73.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22148 + - 22149 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22110 + components: + - type: Transform + pos: 22.5,-68.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22148 + - 22149 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22111 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-65.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22149 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22152 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-53.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22431 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22153 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-54.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22150 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22406 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,18.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22408 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -44.5,-6.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 22429 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVolumePump entities: - uid: 9163 @@ -95980,6 +97769,11 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,-22.5 parent: 2 + - uid: 3960 + components: + - type: Transform + pos: 12.5,-74.5 + parent: 2 - uid: 3991 components: - type: Transform @@ -97067,6 +98861,11 @@ entities: - type: Transform pos: 25.5,-49.5 parent: 2 + - uid: 7807 + components: + - type: Transform + pos: 26.5,-71.5 + parent: 2 - uid: 7810 components: - type: Transform @@ -97079,15 +98878,20 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-47.5 parent: 2 - - uid: 7884 + - uid: 7836 components: - type: Transform - pos: 19.5,-61.5 + pos: 26.5,-70.5 parent: 2 - - uid: 7885 + - uid: 7837 components: - type: Transform - pos: 18.5,-61.5 + pos: 26.5,-69.5 + parent: 2 + - uid: 7877 + components: + - type: Transform + pos: 12.5,-73.5 parent: 2 - uid: 7901 components: @@ -97101,17 +98905,45 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,-45.5 parent: 2 - - uid: 8049 + - uid: 8002 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-56.5 + pos: -6.5,0.5 parent: 2 - - uid: 8050 + - uid: 8011 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-56.5 + pos: 0.5,7.5 + parent: 2 + - uid: 8037 + components: + - type: Transform + pos: 26.5,-75.5 + parent: 2 + - uid: 8038 + components: + - type: Transform + pos: 26.5,-73.5 + parent: 2 + - uid: 8043 + components: + - type: Transform + pos: 26.5,-77.5 + parent: 2 + - uid: 8044 + components: + - type: Transform + pos: 26.5,-67.5 + parent: 2 + - uid: 8045 + components: + - type: Transform + pos: 26.5,-68.5 + parent: 2 + - uid: 8054 + components: + - type: Transform + pos: 27.5,-59.5 parent: 2 - uid: 8075 components: @@ -97195,6 +99027,41 @@ entities: - type: Transform pos: -22.5,10.5 parent: 2 + - uid: 9022 + components: + - type: Transform + pos: 22.5,-57.5 + parent: 2 + - uid: 10639 + components: + - type: Transform + pos: 26.5,-74.5 + parent: 2 + - uid: 10642 + components: + - type: Transform + pos: 27.5,-61.5 + parent: 2 + - uid: 10650 + components: + - type: Transform + pos: 27.5,-62.5 + parent: 2 + - uid: 10651 + components: + - type: Transform + pos: 27.5,-60.5 + parent: 2 + - uid: 10654 + components: + - type: Transform + pos: 26.5,-72.5 + parent: 2 + - uid: 10661 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 2 - uid: 12800 components: - type: Transform @@ -97205,6 +99072,76 @@ entities: - type: Transform pos: -13.5,-41.5 parent: 2 + - uid: 12815 + components: + - type: Transform + pos: 11.5,-63.5 + parent: 2 + - uid: 12816 + components: + - type: Transform + pos: 12.5,-70.5 + parent: 2 + - uid: 12817 + components: + - type: Transform + pos: 12.5,-75.5 + parent: 2 + - uid: 12818 + components: + - type: Transform + pos: 12.5,-77.5 + parent: 2 + - uid: 12819 + components: + - type: Transform + pos: 16.5,-79.5 + parent: 2 + - uid: 12820 + components: + - type: Transform + pos: 17.5,-79.5 + parent: 2 + - uid: 12821 + components: + - type: Transform + pos: 23.5,-79.5 + parent: 2 + - uid: 12822 + components: + - type: Transform + pos: 22.5,-56.5 + parent: 2 + - uid: 12823 + components: + - type: Transform + pos: 22.5,-79.5 + parent: 2 + - uid: 12824 + components: + - type: Transform + pos: 20.5,-79.5 + parent: 2 + - uid: 12825 + components: + - type: Transform + pos: 18.5,-79.5 + parent: 2 + - uid: 12826 + components: + - type: Transform + pos: 15.5,-79.5 + parent: 2 + - uid: 12827 + components: + - type: Transform + pos: 12.5,-72.5 + parent: 2 + - uid: 12828 + components: + - type: Transform + pos: 11.5,-61.5 + parent: 2 - uid: 13182 components: - type: Transform @@ -98224,53 +100161,35 @@ entities: - type: Transform pos: -25.5,-46.5 parent: 2 - - uid: 17018 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,-63.5 - parent: 2 - - uid: 17019 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,-63.5 - parent: 2 - - uid: 17020 + - uid: 17024 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-63.5 + pos: 11.5,-59.5 parent: 2 - - uid: 17021 + - uid: 17025 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-63.5 + pos: 11.5,-60.5 parent: 2 - - uid: 17022 + - uid: 17026 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-63.5 + pos: 14.5,-79.5 parent: 2 - - uid: 17023 + - uid: 17027 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,-63.5 + pos: 19.5,-79.5 parent: 2 - - uid: 17024 + - uid: 17028 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-63.5 + pos: 24.5,-79.5 parent: 2 - - uid: 17025 + - uid: 17029 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-63.5 + pos: 12.5,-68.5 parent: 2 - uid: 17032 components: @@ -98362,6 +100281,11 @@ entities: - type: Transform pos: -17.5,-43.5 parent: 2 + - uid: 17069 + components: + - type: Transform + pos: 21.5,-79.5 + parent: 2 - uid: 17208 components: - type: Transform @@ -98458,11 +100382,31 @@ entities: - type: Transform pos: 60.5,-56.5 parent: 2 + - uid: 17355 + components: + - type: Transform + pos: 12.5,-76.5 + parent: 2 + - uid: 17431 + components: + - type: Transform + pos: 12.5,-71.5 + parent: 2 + - uid: 17432 + components: + - type: Transform + pos: 12.5,-69.5 + parent: 2 - uid: 17486 components: - type: Transform pos: -62.5,-68.5 parent: 2 + - uid: 17543 + components: + - type: Transform + pos: 11.5,-62.5 + parent: 2 - uid: 19315 components: - type: Transform @@ -98838,6 +100782,11 @@ entities: - type: Transform pos: -18.5,54.5 parent: 2 + - uid: 20820 + components: + - type: Transform + pos: 27.5,-63.5 + parent: 2 - uid: 20884 components: - type: Transform @@ -99091,6 +101040,16 @@ entities: - type: Transform pos: 91.5,-16.5 parent: 2 + - uid: 21522 + components: + - type: Transform + pos: 26.5,-76.5 + parent: 2 + - uid: 21531 + components: + - type: Transform + pos: 12.5,-67.5 + parent: 2 - uid: 21870 components: - type: Transform @@ -99220,8 +101179,83 @@ entities: rot: 3.141592653589793 rad pos: -68.5,-28.5 parent: 2 + - uid: 22010 + components: + - type: Transform + pos: 16.5,-59.5 + parent: 2 + - uid: 22011 + components: + - type: Transform + pos: 16.5,-59.5 + parent: 2 + - uid: 22015 + components: + - type: Transform + pos: 16.5,-60.5 + parent: 2 + - uid: 22035 + components: + - type: Transform + pos: 13.5,-64.5 + parent: 2 + - uid: 22036 + components: + - type: Transform + pos: 13.5,-65.5 + parent: 2 + - uid: 22039 + components: + - type: Transform + pos: 13.5,-63.5 + parent: 2 + - uid: 22040 + components: + - type: Transform + pos: 19.5,-71.5 + parent: 2 + - uid: 22046 + components: + - type: Transform + pos: 25.5,-63.5 + parent: 2 + - uid: 22047 + components: + - type: Transform + pos: 25.5,-64.5 + parent: 2 + - uid: 22048 + components: + - type: Transform + pos: 25.5,-65.5 + parent: 2 + - uid: 22055 + components: + - type: Transform + pos: 19.5,-61.5 + parent: 2 + - uid: 22056 + components: + - type: Transform + pos: 19.5,-55.5 + parent: 2 + - uid: 22373 + components: + - type: Transform + pos: 7.5,0.5 + parent: 2 - proto: GrilleBroken entities: + - uid: 8042 + components: + - type: Transform + pos: 27.5,-58.5 + parent: 2 + - uid: 12814 + components: + - type: Transform + pos: 28.5,-57.5 + parent: 2 - uid: 15037 components: - type: Transform @@ -99296,6 +101330,11 @@ entities: - type: Transform pos: -34.5,31.5 parent: 2 + - uid: 17023 + components: + - type: Transform + pos: 11.5,-57.5 + parent: 2 - uid: 17310 components: - type: Transform @@ -99486,6 +101525,21 @@ entities: - type: Transform pos: -66.5,-28.5 parent: 2 + - uid: 22013 + components: + - type: Transform + pos: 16.5,-56.5 + parent: 2 + - uid: 22014 + components: + - type: Transform + pos: 16.5,-57.5 + parent: 2 + - uid: 22094 + components: + - type: Transform + pos: 11.5,-53.5 + parent: 2 - proto: GrilleSpawner entities: - uid: 5534 @@ -99498,6 +101552,11 @@ entities: - type: Transform pos: 23.5,26.5 parent: 2 + - uid: 7876 + components: + - type: Transform + pos: 11.5,-58.5 + parent: 2 - uid: 15257 components: - type: Transform @@ -99848,36 +101907,6 @@ entities: - type: Transform pos: -25.5,-45.5 parent: 2 - - uid: 17026 - components: - - type: Transform - pos: 15.5,-63.5 - parent: 2 - - uid: 17027 - components: - - type: Transform - pos: 12.5,-63.5 - parent: 2 - - uid: 17028 - components: - - type: Transform - pos: 17.5,-63.5 - parent: 2 - - uid: 17029 - components: - - type: Transform - pos: 20.5,-63.5 - parent: 2 - - uid: 17030 - components: - - type: Transform - pos: 21.5,-63.5 - parent: 2 - - uid: 17031 - components: - - type: Transform - pos: 25.5,-63.5 - parent: 2 - uid: 17037 components: - type: Transform @@ -100133,6 +102162,16 @@ entities: - type: Transform pos: -67.5,-28.5 parent: 2 + - uid: 22009 + components: + - type: Transform + pos: 22.5,-58.5 + parent: 2 + - uid: 22012 + components: + - type: Transform + pos: 16.5,-58.5 + parent: 2 - proto: GunSafeDisabler entities: - uid: 16916 @@ -100281,11 +102320,15 @@ entities: parent: 2 - uid: 7755 components: + - type: MetaData + name: AI entrance door - type: Transform pos: 19.5,-50.5 parent: 2 - uid: 7802 components: + - type: MetaData + name: AI entrance door - type: Transform pos: 18.5,-50.5 parent: 2 @@ -100301,6 +102344,13 @@ entities: - type: Transform pos: 8.5,-45.5 parent: 2 + - uid: 22032 + components: + - type: MetaData + name: AI core door + - type: Transform + pos: 19.5,-66.5 + parent: 2 - proto: HighSecDoor entities: - uid: 20388 @@ -100714,6 +102764,14 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: IntercomAll + entities: + - uid: 22197 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-73.5 + parent: 2 - proto: IntercomCommand entities: - uid: 16922 @@ -101262,6 +103320,24 @@ entities: - type: Transform pos: 38.5,17.5 parent: 2 +- proto: LockableButtonCommand + entities: + - uid: 22198 + components: + - type: MetaData + name: Lockdown button + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-73.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 22199: + - Pressed: Toggle + 22049: + - Pressed: DoorBolt + 22050: + - Pressed: DoorBolt - proto: LockerAtmosphericsFilled entities: - uid: 1479 @@ -102137,9 +104213,9 @@ entities: showEnts: False occludes: True ents: - - 20229 - - 20230 - 5718 + - 20230 + - 20229 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -102211,12 +104287,6 @@ entities: - type: Transform pos: 66.5,-8.5 parent: 2 - - uid: 8068 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,-54.5 - parent: 2 - uid: 15084 components: - type: Transform @@ -102245,11 +104315,6 @@ entities: parent: 21128 - proto: MachineFrameDestroyed entities: - - uid: 8070 - components: - - type: Transform - pos: 21.5,-56.5 - parent: 2 - uid: 15085 components: - type: Transform @@ -102773,15 +104838,15 @@ entities: - type: Transform pos: 68.38368,-28.50458 parent: 2 - - uid: 21461 + - uid: 22191 components: - type: Transform - pos: 22.458467,-56.55068 + pos: 23.524303,-65.49107 parent: 2 - - uid: 21462 + - uid: 22194 components: - type: Transform - pos: 22.580774,-56.391678 + pos: 23.45092,-65.60115 parent: 2 - proto: MicrophoneInstrument entities: @@ -103651,6 +105716,8 @@ entities: parent: 2 - uid: 21960 components: + - type: MetaData + name: Vox box setup notes - type: Transform pos: -30.522171,-4.355038 parent: 2 @@ -103968,11 +106035,6 @@ entities: - type: Transform pos: 36.516296,-28.475197 parent: 2 - - uid: 8047 - components: - - type: Transform - pos: 19.503874,-55.494072 - parent: 2 - uid: 15934 components: - type: Transform @@ -104003,6 +106065,11 @@ entities: - type: Transform pos: 3.5027413,42.47381 parent: 2 + - uid: 22352 + components: + - type: Transform + pos: 14.551649,-63.606083 + parent: 2 - proto: PhoneInstrument entities: - uid: 4062 @@ -104478,16 +106545,6 @@ entities: parent: 2 - proto: PortableGeneratorPacman entities: - - uid: 1442 - components: - - type: Transform - pos: 22.5,-58.5 - parent: 2 - - uid: 1443 - components: - - type: Transform - pos: 15.5,-58.5 - parent: 2 - uid: 4890 components: - type: Transform @@ -104637,13 +106694,6 @@ entities: rot: 1.5707963267948966 rad pos: 55.5,-21.5 parent: 2 -- proto: PotatoAI - entities: - - uid: 21374 - components: - - type: Transform - pos: 15.488632,-56.545853 - parent: 2 - proto: PottedPlantRandom entities: - uid: 1580 @@ -105001,16 +107051,6 @@ entities: - type: Transform pos: 21.5,-42.5 parent: 2 - - uid: 8071 - components: - - type: Transform - pos: 16.5,-59.5 - parent: 2 - - uid: 8072 - components: - - type: Transform - pos: 21.5,-59.5 - parent: 2 - uid: 8158 components: - type: Transform @@ -105071,6 +107111,16 @@ entities: - type: Transform pos: 9.5,0.5 parent: 21128 + - uid: 22054 + components: + - type: Transform + pos: 15.5,-63.5 + parent: 2 + - uid: 22195 + components: + - type: Transform + pos: 20.5,-62.5 + parent: 2 - proto: PottedPlantRandomPlastic entities: - uid: 21380 @@ -107101,15 +109151,6 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 - - uid: 7811 - components: - - type: Transform - pos: 21.5,-52.5 - parent: 2 - - type: PointLight - enabled: False - - type: ApcPowerReceiver - powerLoad: 0 - uid: 7812 components: - type: Transform @@ -107148,35 +109189,6 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 - - uid: 7990 - components: - - type: Transform - pos: 16.5,-52.5 - parent: 2 - - type: PointLight - enabled: False - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 7991 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-59.5 - parent: 2 - - type: PointLight - enabled: False - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 7992 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,-59.5 - parent: 2 - - type: PointLight - enabled: False - - type: ApcPowerReceiver - powerLoad: 0 - uid: 8159 components: - type: Transform @@ -107436,6 +109448,35 @@ entities: rot: 3.141592653589793 rad pos: -36.5,-4.5 parent: 2 + - uid: 22045 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-54.5 + parent: 2 + - uid: 22171 + components: + - type: Transform + pos: 19.5,-62.5 + parent: 2 + - uid: 22172 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-71.5 + parent: 2 + - uid: 22175 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,-52.5 + parent: 2 + - uid: 22178 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-71.5 + parent: 2 - proto: PoweredlightLED entities: - uid: 4915 @@ -107988,6 +110029,29 @@ entities: rot: -1.5707963267948966 rad pos: -65.5,-31.5 parent: 2 + - uid: 22037 + components: + - type: Transform + pos: 19.5,-75.5 + parent: 2 + - uid: 22176 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-70.5 + parent: 2 + - uid: 22179 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-64.5 + parent: 2 + - uid: 22180 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-64.5 + parent: 2 - proto: PoweredSmallLightEmpty entities: - uid: 16926 @@ -108273,16 +110337,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,-47.5 parent: 2 - - uid: 8059 - components: - - type: Transform - pos: 15.5,-56.5 - parent: 2 - - uid: 8060 - components: - - type: Transform - pos: 22.5,-56.5 - parent: 2 - uid: 9121 components: - type: Transform @@ -108457,6 +110511,23 @@ entities: - type: Transform pos: 34.5,-1.5 parent: 2 + - uid: 22097 + components: + - type: Transform + pos: 23.5,-65.5 + parent: 2 + - uid: 22192 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-62.5 + parent: 2 + - uid: 22193 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-62.5 + parent: 2 - proto: RadiationCollectorFullTank entities: - uid: 1731 @@ -109892,11 +111963,6 @@ entities: - type: Transform pos: 28.5,-50.5 parent: 2 - - uid: 21463 - components: - - type: Transform - pos: 26.5,-59.5 - parent: 2 - uid: 21464 components: - type: Transform @@ -111470,6 +113536,16 @@ entities: - type: Transform pos: 62.5,-4.5 parent: 2 + - uid: 22402 + components: + - type: Transform + pos: 15.5,-62.5 + parent: 2 + - uid: 22403 + components: + - type: Transform + pos: 20.5,-47.5 + parent: 2 - proto: RandomProduce entities: - uid: 21375 @@ -111538,6 +113614,16 @@ entities: - type: Transform pos: -13.5,-37.5 parent: 2 + - uid: 22400 + components: + - type: Transform + pos: 18.5,-64.5 + parent: 2 + - uid: 22401 + components: + - type: Transform + pos: 21.5,-69.5 + parent: 2 - proto: RandomSpawner100 entities: - uid: 1924 @@ -112184,16 +114270,6 @@ entities: - type: Transform pos: 84.5,-18.5 parent: 2 - - uid: 7878 - components: - - type: Transform - pos: 18.5,-61.5 - parent: 2 - - uid: 7879 - components: - - type: Transform - pos: 19.5,-61.5 - parent: 2 - uid: 20553 components: - type: Transform @@ -113802,6 +115878,17 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-47.5 parent: 2 + - uid: 7839 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-61.5 + parent: 2 + - uid: 7890 + components: + - type: Transform + pos: 25.5,-65.5 + parent: 2 - uid: 7899 components: - type: Transform @@ -113814,6 +115901,11 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,-45.5 parent: 2 + - uid: 7992 + components: + - type: Transform + pos: -6.5,0.5 + parent: 2 - uid: 8005 components: - type: Transform @@ -113832,17 +115924,10 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-40.5 parent: 2 - - uid: 8045 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-56.5 - parent: 2 - - uid: 8046 + - uid: 8017 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-56.5 + pos: 13.5,-63.5 parent: 2 - uid: 8087 components: @@ -113889,6 +115974,16 @@ entities: rot: 3.141592653589793 rad pos: -14.5,-41.5 parent: 2 + - uid: 9099 + components: + - type: Transform + pos: 25.5,-63.5 + parent: 2 + - uid: 10658 + components: + - type: Transform + pos: 0.5,7.5 + parent: 2 - uid: 11658 components: - type: Transform @@ -113904,6 +115999,11 @@ entities: - type: Transform pos: 41.5,19.5 parent: 2 + - uid: 12810 + components: + - type: Transform + pos: 25.5,-64.5 + parent: 2 - uid: 13965 components: - type: Transform @@ -114268,6 +116368,17 @@ entities: - type: Transform pos: -23.5,-47.5 parent: 2 + - uid: 17019 + components: + - type: Transform + pos: 13.5,-65.5 + parent: 2 + - uid: 17031 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-55.5 + parent: 2 - uid: 17254 components: - type: Transform @@ -114345,6 +116456,11 @@ entities: - type: Transform pos: 64.5,13.5 parent: 2 + - uid: 21374 + components: + - type: Transform + pos: 13.5,-64.5 + parent: 2 - uid: 21377 components: - type: Transform @@ -114381,6 +116497,21 @@ entities: rot: 3.141592653589793 rad pos: -68.5,-31.5 parent: 2 + - uid: 22034 + components: + - type: Transform + pos: 19.5,-71.5 + parent: 2 + - uid: 22367 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 2 + - uid: 22372 + components: + - type: Transform + pos: 7.5,0.5 + parent: 2 - proto: RemoteSignaller entities: - uid: 3270 @@ -114409,7 +116540,7 @@ entities: components: - type: MetaData desc: Just incase you need a double layer of security to the armory! - name: perma door remote + name: perma blast door remote - type: Transform parent: 4586 - type: DeviceLinkSource @@ -114426,7 +116557,8 @@ entities: - uid: 20230 components: - type: MetaData - name: armory door remote + desc: Helpful for troublesome prisoners trying to break out in perma! + name: armory blast door remote - type: Transform parent: 4586 - type: DeviceLinkSource @@ -114643,16 +116775,6 @@ entities: - type: Transform pos: 22.5,-19.5 parent: 2 - - uid: 20804 - components: - - type: Transform - pos: 21.5,-55.5 - parent: 2 - - uid: 20805 - components: - - type: Transform - pos: 16.5,-55.5 - parent: 2 - uid: 20806 components: - type: Transform @@ -114708,6 +116830,26 @@ entities: - type: Transform pos: -33.5,8.5 parent: 2 + - uid: 22184 + components: + - type: Transform + pos: 21.5,-51.5 + parent: 2 + - uid: 22188 + components: + - type: Transform + pos: 19.5,-74.5 + parent: 2 + - uid: 22189 + components: + - type: Transform + pos: 21.5,-66.5 + parent: 2 + - uid: 22190 + components: + - type: Transform + pos: 17.5,-66.5 + parent: 2 - proto: Screwdriver entities: - uid: 2052 @@ -115408,6 +117550,12 @@ entities: - type: Transform pos: -21.5,10.5 parent: 2 + - uid: 22199 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-71.5 + parent: 2 - proto: ShuttersRadiationOpen entities: - uid: 2069 @@ -115568,6 +117716,11 @@ entities: - type: Transform pos: 17.5,-41.5 parent: 2 + - uid: 22196 + components: + - type: Transform + pos: 18.5,-61.5 + parent: 2 - proto: SignAiUpload entities: - uid: 21887 @@ -115575,6 +117728,11 @@ entities: - type: Transform pos: 20.5,-41.5 parent: 2 + - uid: 22186 + components: + - type: Transform + pos: 21.5,-53.5 + parent: 2 - proto: SignalButton entities: - uid: 2074 @@ -116241,6 +118399,8 @@ entities: - Pressed: Toggle - uid: 17526 components: + - type: MetaData + name: Lockdown button - type: Transform rot: 1.5707963267948966 rad pos: 64.5,-51.5 @@ -116546,10 +118706,10 @@ entities: - type: Transform pos: 30.5,-52.5 parent: 2 - - uid: 17069 + - uid: 20805 components: - type: Transform - pos: 28.5,-57.5 + pos: 27.5,-57.5 parent: 2 - uid: 21077 components: @@ -116561,6 +118721,11 @@ entities: - type: Transform pos: 50.5,-43.5 parent: 2 + - uid: 22095 + components: + - type: Transform + pos: 11.5,-52.5 + parent: 2 - proto: SignDirectionalBar entities: - uid: 13599 @@ -117005,6 +119170,11 @@ entities: - type: Transform pos: 13.5,-23.5 parent: 2 + - uid: 7864 + components: + - type: Transform + pos: 13.5,-78.5 + parent: 2 - uid: 8356 components: - type: Transform @@ -117081,6 +119251,26 @@ entities: rot: 3.141592653589793 rad pos: 53.5,-37.5 parent: 2 + - uid: 22016 + components: + - type: Transform + pos: 27.5,-66.5 + parent: 2 + - uid: 22018 + components: + - type: Transform + pos: 11.5,-66.5 + parent: 2 + - uid: 22019 + components: + - type: Transform + pos: 25.5,-78.5 + parent: 2 + - uid: 22029 + components: + - type: Transform + pos: 22.5,-63.5 + parent: 2 - proto: SignEngine entities: - uid: 6819 @@ -117448,6 +119638,26 @@ entities: - type: Transform pos: 53.5,-35.5 parent: 2 + - uid: 22024 + components: + - type: Transform + pos: 15.5,-67.5 + parent: 2 + - uid: 22025 + components: + - type: Transform + pos: 15.5,-74.5 + parent: 2 + - uid: 22026 + components: + - type: Transform + pos: 23.5,-74.5 + parent: 2 + - uid: 22027 + components: + - type: Transform + pos: 23.5,-67.5 + parent: 2 - proto: SignSecureMedRed entities: - uid: 6826 @@ -117544,6 +119754,11 @@ entities: rot: 3.141592653589793 rad pos: -68.5,-31.5 parent: 2 + - uid: 22185 + components: + - type: Transform + pos: 20.5,-61.5 + parent: 2 - proto: SignSurgery entities: - uid: 6886 @@ -117696,13 +119911,6 @@ entities: - type: Transform pos: -12.5,-16.5 parent: 2 - - uid: 7886 - components: - - type: MetaData - name: AI SMES - - type: Transform - pos: 18.5,-60.5 - parent: 2 - uid: 8097 components: - type: MetaData @@ -117745,6 +119953,13 @@ entities: - type: Transform pos: 88.5,-22.5 parent: 2 + - uid: 22070 + components: + - type: MetaData + name: AI Core SMES + - type: Transform + pos: 23.5,-63.5 + parent: 2 - proto: SodaDispenser entities: - uid: 2102 @@ -119306,6 +121521,12 @@ entities: rot: 3.141592653589793 rad pos: -52.5,-48.5 parent: 2 + - uid: 22399 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-53.5 + parent: 2 - proto: StoolBar entities: - uid: 2152 @@ -119496,13 +121717,6 @@ entities: - type: Transform pos: -37.5,-37.5 parent: 2 - - uid: 7877 - components: - - type: MetaData - name: AI Substation - - type: Transform - pos: 19.5,-60.5 - parent: 2 - uid: 8524 components: - type: MetaData @@ -119573,6 +121787,13 @@ entities: - type: Transform pos: 89.5,-22.5 parent: 2 + - uid: 22069 + components: + - type: MetaData + name: AI Core substation + - type: Transform + pos: 24.5,-63.5 + parent: 2 - proto: SubstationMachineCircuitboard entities: - uid: 5879 @@ -119782,17 +122003,6 @@ entities: - SurveillanceCameraCommand nameSet: True id: Telecommunications - - uid: 8967 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-52.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraCommand - nameSet: True - id: AI centre - uid: 8968 components: - type: Transform @@ -119978,6 +122188,111 @@ entities: - SurveillanceCameraCommand nameSet: True id: High security + - uid: 22356 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-51.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI core entrance + - uid: 22358 + components: + - type: Transform + pos: 22.5,-53.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI upload room + - uid: 22359 + components: + - type: Transform + pos: 18.5,-65.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI core lobby + - uid: 22360 + components: + - type: Transform + pos: 19.5,-73.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI core mainframe + - uid: 22361 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-74.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: East AI core mainframe + - uid: 22362 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-74.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: West AI core mainframe + - uid: 22363 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-48.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: High security mainframe hallway + - uid: 22364 + components: + - type: Transform + pos: 14.5,-65.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI core break room + - uid: 22365 + components: + - type: Transform + pos: 23.5,-65.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI core power generation + - uid: 22382 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 40.5,-32.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: North bridge - proto: SurveillanceCameraEngineering entities: - uid: 6780 @@ -119991,6 +122306,17 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Command substation + - uid: 8010 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,4.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: North west outer singularity - uid: 8945 components: - type: Transform @@ -120131,7 +122457,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Atmospherics + id: East atmospherics - uid: 8960 components: - type: Transform @@ -120218,80 +122544,50 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Drone room - - uid: 9095 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,-13.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Engineering maints - - uid: 9096 + - uid: 10655 components: - type: Transform rot: 1.5707963267948966 rad - pos: 14.5,-4.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Atmospherics maints - - uid: 9097 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,5.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: East singularity maints 3 - - uid: 9098 - components: - - type: Transform - pos: 12.5,14.5 + pos: 10.5,4.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: East singularity maints 2 - - uid: 9099 + id: North east outer singularity + - uid: 10657 components: - type: Transform - pos: 2.5,14.5 + rot: 3.141592653589793 rad + pos: 0.5,6.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: East singularity maints 1 - - uid: 9100 + id: North inner singularity + - uid: 10659 components: - type: Transform - pos: -7.5,14.5 + rot: -1.5707963267948966 rad + pos: -9.5,-3.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: West singularity maints 2 - - uid: 9101 + id: South west outer singularity + - uid: 10660 components: - type: Transform rot: 1.5707963267948966 rad - pos: -13.5,11.5 + pos: 10.5,-3.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: West singularity maints 1 + id: South east outer singularity - uid: 18066 components: - type: Transform @@ -120398,6 +122694,97 @@ entities: - SurveillanceCameraEngineering nameSet: True id: West substation + - uid: 22374 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,0.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: West inner singularity + - uid: 22375 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: South inner singularity + - uid: 22376 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,0.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: East inner singularity + - uid: 22377 + components: + - type: Transform + pos: 34.5,-16.5 + parent: 2 + - uid: 22378 + components: + - type: Transform + pos: 18.5,-18.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: South atmospherics + - uid: 22379 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-9.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: West atmospherics + - uid: 22380 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-8.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: North atmospherics + - uid: 22381 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-11.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmospherics blast chamber + - uid: 22405 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -31.5,38.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Shuttle preperations room - proto: SurveillanceCameraGeneral entities: - uid: 7289 @@ -120562,16 +122949,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: South east arrivals - - uid: 9054 - components: - - type: Transform - pos: -38.5,-65.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: South east arrivals 2 - uid: 9055 components: - type: Transform @@ -120643,7 +123020,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True - id: Dorms-Cafeteria hallway + id: Dorms-cafeteria hallway - uid: 9062 components: - type: Transform @@ -120794,7 +123171,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True - id: Med-Cargo hallway + id: Medical-cargo hallway - uid: 9076 components: - type: Transform @@ -120902,7 +123279,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True - id: EVA-Atmos hallway + id: EVA-atmos hallway - uid: 9087 components: - type: Transform @@ -120943,7 +123320,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True - id: Engineering-Janitorial hallway + id: Engineering-janitorial hallway - uid: 9092 components: - type: Transform @@ -120977,6 +123354,16 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Dorms exterior + - uid: 12807 + components: + - type: Transform + pos: -38.5,-65.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: South east arrivals 2 - uid: 18921 components: - type: Transform @@ -120987,7 +123374,49 @@ entities: setupAvailableNetworks: - SurveillanceCameraGeneral nameSet: True - id: Bridge-Med hallway + id: Bridge-medical hallway + - uid: 22393 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,21.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dining area + - uid: 22394 + components: + - type: Transform + pos: -52.5,-21.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: North west lounge + - uid: 22395 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -54.5,-9.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evacuation-lounge hallway + - uid: 22404 + components: + - type: Transform + pos: 10.5,23.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: West bathroom - proto: SurveillanceCameraMedical entities: - uid: 9023 @@ -121032,7 +123461,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraMedical nameSet: True - id: Examination + id: Examination bay - uid: 9028 components: - type: Transform @@ -121118,6 +123547,87 @@ entities: - SurveillanceCameraMedical nameSet: True id: Chemistry + - uid: 22383 + components: + - type: Transform + pos: 45.5,-4.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Examination room 2 + - uid: 22384 + components: + - type: Transform + pos: 45.5,-1.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Examination room 1 + - uid: 22385 + components: + - type: Transform + pos: 45.5,-7.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Examination room 3 + - uid: 22386 + components: + - type: Transform + pos: 55.5,-1.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Examination room 4 + - uid: 22387 + components: + - type: Transform + pos: 55.5,-7.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Examination room 5 + - uid: 22388 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 62.5,4.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Surgery room 1 + - uid: 22389 + components: + - type: Transform + pos: 62.5,0.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Surgery room 2 + - uid: 22390 + components: + - type: Transform + pos: 54.5,14.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Virology connective hallway - proto: SurveillanceCameraRouterCommand entities: - uid: 7976 @@ -121458,6 +123968,28 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Lawyer conference room + - uid: 12808 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,38.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security-perma hallway + - uid: 12809 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,43.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma entrance - uid: 20212 components: - type: Transform @@ -121708,6 +124240,17 @@ entities: - SurveillanceCameraService nameSet: True id: Chapel + - uid: 22392 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -42.5,12.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Arcade reception - proto: SurveillanceCameraSupply entities: - uid: 9014 @@ -121731,17 +124274,6 @@ entities: - SurveillanceCameraSupply nameSet: True id: Cargo front - - uid: 9016 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,22.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraSupply - nameSet: True - id: Storage bay - uid: 9018 components: - type: Transform @@ -121785,27 +124317,28 @@ entities: - SurveillanceCameraSupply nameSet: True id: Salvage supply - - uid: 9022 + - uid: 20086 components: - type: Transform - pos: 40.5,20.5 + rot: -1.5707963267948966 rad + pos: 30.5,13.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSupply nameSet: True - id: Salvage externals - - uid: 20086 + id: Hallway + - uid: 22391 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,13.5 + rot: 3.141592653589793 rad + pos: 27.5,23.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSupply nameSet: True - id: Hallway + id: Storage bay - proto: SurveillanceCameraWirelessRouterEntertainment entities: - uid: 7959 @@ -123782,6 +126315,18 @@ entities: - type: Transform pos: 27.5,-44.5 parent: 2 + - uid: 22051 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-63.5 + parent: 2 + - uid: 22052 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-64.5 + parent: 2 - proto: TableReinforcedGlass entities: - uid: 6925 @@ -124522,6 +127067,11 @@ entities: - type: Transform pos: 1.5326661,-19.32547 parent: 2 + - uid: 22353 + components: + - type: Transform + pos: 17.546753,-62.23559 + parent: 2 - proto: ToolboxEmergencyFilled entities: - uid: 2322 @@ -124541,6 +127091,13 @@ entities: - type: Transform pos: 54.499077,-35.417862 parent: 2 +- proto: ToolboxMechanical + entities: + - uid: 22354 + components: + - type: Transform + pos: 17.546753,-62.492435 + parent: 2 - proto: ToolboxMechanicalFilled entities: - uid: 2323 @@ -124560,10 +127117,10 @@ entities: parent: 2 - proto: ToyAi entities: - - uid: 8048 + - uid: 22366 components: - type: Transform - pos: 18.488733,-55.347305 + pos: 19.5,-73.5 parent: 2 - proto: ToyFigurineClown entities: @@ -124807,18 +127364,6 @@ entities: - Middle: Off - proto: UnfinishedMachineFrame entities: - - uid: 8067 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,-53.5 - parent: 2 - - uid: 8069 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-56.5 - parent: 2 - uid: 15086 components: - type: Transform @@ -127023,6 +129568,11 @@ entities: - type: Transform pos: 30.5,-35.5 parent: 2 + - uid: 3959 + components: + - type: Transform + pos: 21.5,-53.5 + parent: 2 - uid: 3965 components: - type: Transform @@ -128027,7 +130577,7 @@ entities: - uid: 5779 components: - type: Transform - pos: 20.5,-51.5 + pos: 27.5,-57.5 parent: 2 - uid: 5780 components: @@ -128595,6 +131145,12 @@ entities: rot: -1.5707963267948966 rad pos: -41.5,-66.5 parent: 2 + - uid: 6295 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-54.5 + parent: 2 - uid: 6298 components: - type: Transform @@ -128679,6 +131235,12 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,-66.5 parent: 2 + - uid: 6325 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-51.5 + parent: 2 - uid: 6486 components: - type: Transform @@ -129873,6 +132435,12 @@ entities: - type: Transform pos: 15.5,-45.5 parent: 2 + - uid: 7800 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-63.5 + parent: 2 - uid: 7801 components: - type: Transform @@ -129883,85 +132451,78 @@ entities: - type: Transform pos: 15.5,-42.5 parent: 2 - - uid: 7817 + - uid: 7805 components: - type: Transform - pos: 17.5,-51.5 + rot: -1.5707963267948966 rad + pos: 22.5,-62.5 parent: 2 - - uid: 7821 + - uid: 7811 components: - type: Transform - pos: 15.5,-50.5 + pos: 26.5,-78.5 parent: 2 - - uid: 7824 + - uid: 7815 components: - type: Transform - pos: 14.5,-52.5 + pos: 27.5,-65.5 parent: 2 - - uid: 7825 + - uid: 7821 components: - type: Transform - pos: 14.5,-53.5 + pos: 15.5,-50.5 parent: 2 - - uid: 7826 + - uid: 7823 components: - type: Transform - pos: 14.5,-55.5 + pos: 24.5,-62.5 parent: 2 - - uid: 7827 + - uid: 7825 components: - type: Transform - pos: 14.5,-56.5 + pos: 13.5,-62.5 parent: 2 - uid: 7829 components: - type: Transform - pos: 14.5,-58.5 - parent: 2 - - uid: 7830 - components: - - type: Transform - pos: 14.5,-59.5 - parent: 2 - - uid: 7833 - components: - - type: Transform - pos: 15.5,-61.5 + rot: -1.5707963267948966 rad + pos: 17.5,-53.5 parent: 2 - - uid: 7836 + - uid: 7838 components: - type: Transform - pos: 22.5,-51.5 + pos: 13.5,-78.5 parent: 2 - - uid: 7840 + - uid: 7841 components: - type: Transform - pos: 13.5,-61.5 + rot: -1.5707963267948966 rad + pos: 20.5,-66.5 parent: 2 - - uid: 7841 + - uid: 7842 components: - type: Transform - pos: 13.5,-60.5 + pos: 25.5,-79.5 parent: 2 - - uid: 7842 + - uid: 7843 components: - type: Transform - pos: 13.5,-59.5 + pos: 11.5,-64.5 parent: 2 - uid: 7844 components: - type: Transform - pos: 13.5,-57.5 + pos: 24.5,-66.5 parent: 2 - uid: 7847 components: - type: Transform - pos: 13.5,-54.5 + pos: 12.5,-66.5 parent: 2 - uid: 7850 components: - type: Transform - pos: 13.5,-51.5 + pos: 17.5,-55.5 parent: 2 - uid: 7851 components: @@ -129976,95 +132537,74 @@ entities: - uid: 7853 components: - type: Transform - pos: 24.5,-51.5 + pos: 17.5,-77.5 parent: 2 - uid: 7854 components: - type: Transform - pos: 24.5,-52.5 - parent: 2 - - uid: 7855 - components: - - type: Transform - pos: 24.5,-53.5 - parent: 2 - - uid: 7856 - components: - - type: Transform - pos: 24.5,-54.5 - parent: 2 - - uid: 7858 - components: - - type: Transform - pos: 23.5,-56.5 - parent: 2 - - uid: 7859 - components: - - type: Transform - pos: 23.5,-55.5 + pos: 15.5,-77.5 parent: 2 - - uid: 7861 + - uid: 7857 components: - type: Transform - pos: 23.5,-53.5 + pos: 21.5,-54.5 parent: 2 - - uid: 7862 + - uid: 7860 components: - type: Transform - pos: 23.5,-52.5 + pos: 24.5,-53.5 parent: 2 - uid: 7863 components: - type: Transform - pos: 24.5,-56.5 - parent: 2 - - uid: 7864 - components: - - type: Transform - pos: 22.5,-60.5 + rot: -1.5707963267948966 rad + pos: 16.5,-66.5 parent: 2 - - uid: 7866 + - uid: 7865 components: - type: Transform - pos: 23.5,-61.5 + pos: 23.5,-54.5 parent: 2 - - uid: 7868 + - uid: 7879 components: - type: Transform - pos: 24.5,-60.5 + rot: -1.5707963267948966 rad + pos: 22.5,-65.5 parent: 2 - - uid: 7870 + - uid: 7880 components: - type: Transform - pos: 24.5,-58.5 + rot: -1.5707963267948966 rad + pos: 21.5,-66.5 parent: 2 - - uid: 7871 + - uid: 7882 components: - type: Transform - pos: 24.5,-57.5 + rot: -1.5707963267948966 rad + pos: 16.5,-62.5 parent: 2 - - uid: 7874 + - uid: 7884 components: - type: Transform - pos: 23.5,-59.5 + rot: -1.5707963267948966 rad + pos: 17.5,-52.5 parent: 2 - - uid: 7876 + - uid: 7885 components: - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-60.5 + rot: -1.5707963267948966 rad + pos: 16.5,-61.5 parent: 2 - - uid: 7880 + - uid: 7886 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-61.5 + rot: -1.5707963267948966 rad + pos: 20.5,-61.5 parent: 2 - - uid: 7882 + - uid: 7889 components: - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,-61.5 + pos: 14.5,-61.5 parent: 2 - uid: 7891 components: @@ -130140,6 +132680,11 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,-43.5 parent: 2 + - uid: 7990 + components: + - type: Transform + pos: 24.5,-61.5 + parent: 2 - uid: 7997 components: - type: Transform @@ -130157,12 +132702,23 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-41.5 parent: 2 + - uid: 8012 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-55.5 + parent: 2 - uid: 8013 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-33.5 parent: 2 + - uid: 8015 + components: + - type: Transform + pos: 25.5,-62.5 + parent: 2 - uid: 8018 components: - type: Transform @@ -130175,23 +132731,47 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-38.5 parent: 2 - - uid: 8026 + - uid: 8022 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-58.5 + pos: 27.5,-66.5 parent: 2 - - uid: 8028 + - uid: 8040 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-60.5 + pos: 15.5,-69.5 parent: 2 - - uid: 8029 + - uid: 8049 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-58.5 + pos: 15.5,-67.5 + parent: 2 + - uid: 8050 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-60.5 + parent: 2 + - uid: 8051 + components: + - type: Transform + pos: 24.5,-68.5 + parent: 2 + - uid: 8052 + components: + - type: Transform + pos: 24.5,-70.5 + parent: 2 + - uid: 8058 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-66.5 + parent: 2 + - uid: 8064 + components: + - type: Transform + pos: 23.5,-74.5 parent: 2 - uid: 8088 components: @@ -130304,6 +132884,26 @@ entities: rot: 3.141592653589793 rad pos: 52.5,-27.5 parent: 2 + - uid: 9095 + components: + - type: Transform + pos: 14.5,-67.5 + parent: 2 + - uid: 9098 + components: + - type: Transform + pos: 14.5,-74.5 + parent: 2 + - uid: 9100 + components: + - type: Transform + pos: 21.5,-77.5 + parent: 2 + - uid: 9101 + components: + - type: Transform + pos: 13.5,-67.5 + parent: 2 - uid: 9106 components: - type: Transform @@ -130428,6 +133028,52 @@ entities: - type: Transform pos: -39.5,-37.5 parent: 2 + - uid: 10638 + components: + - type: Transform + pos: 15.5,-68.5 + parent: 2 + - uid: 10640 + components: + - type: Transform + pos: 22.5,-77.5 + parent: 2 + - uid: 10641 + components: + - type: Transform + pos: 23.5,-67.5 + parent: 2 + - uid: 10643 + components: + - type: Transform + pos: 14.5,-76.5 + parent: 2 + - uid: 10644 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-55.5 + parent: 2 + - uid: 10645 + components: + - type: Transform + pos: 23.5,-71.5 + parent: 2 + - uid: 10647 + components: + - type: Transform + pos: 14.5,-66.5 + parent: 2 + - uid: 10649 + components: + - type: Transform + pos: 14.5,-70.5 + parent: 2 + - uid: 10652 + components: + - type: Transform + pos: 25.5,-66.5 + parent: 2 - uid: 11665 components: - type: Transform @@ -130444,6 +133090,31 @@ entities: rot: 1.5707963267948966 rad pos: 54.5,-28.5 parent: 2 + - uid: 12832 + components: + - type: Transform + pos: 11.5,-52.5 + parent: 2 + - uid: 12833 + components: + - type: Transform + pos: 17.5,-76.5 + parent: 2 + - uid: 12835 + components: + - type: Transform + pos: 15.5,-74.5 + parent: 2 + - uid: 12836 + components: + - type: Transform + pos: 15.5,-72.5 + parent: 2 + - uid: 12839 + components: + - type: Transform + pos: 20.5,-76.5 + parent: 2 - uid: 13730 components: - type: Transform @@ -130889,6 +133560,16 @@ entities: - type: Transform pos: 17.5,34.5 parent: 2 + - uid: 16713 + components: + - type: Transform + pos: 22.5,-75.5 + parent: 2 + - uid: 16734 + components: + - type: Transform + pos: 23.5,-70.5 + parent: 2 - uid: 16773 components: - type: Transform @@ -130922,11 +133603,6 @@ entities: rot: 1.5707963267948966 rad pos: 54.5,-26.5 parent: 2 - - uid: 16827 - components: - - type: Transform - pos: 28.5,-57.5 - parent: 2 - uid: 16828 components: - type: Transform @@ -130962,6 +133638,16 @@ entities: - type: Transform pos: -6.5,51.5 parent: 2 + - uid: 17018 + components: + - type: Transform + pos: 24.5,-67.5 + parent: 2 + - uid: 17020 + components: + - type: Transform + pos: 24.5,-74.5 + parent: 2 - uid: 17070 components: - type: Transform @@ -131042,6 +133728,36 @@ entities: rot: -1.5707963267948966 rad pos: 62.5,-4.5 parent: 2 + - uid: 18579 + components: + - type: Transform + pos: 15.5,-75.5 + parent: 2 + - uid: 19151 + components: + - type: Transform + pos: 19.5,-76.5 + parent: 2 + - uid: 20088 + components: + - type: Transform + pos: 16.5,-75.5 + parent: 2 + - uid: 20089 + components: + - type: Transform + pos: 23.5,-75.5 + parent: 2 + - uid: 20097 + components: + - type: Transform + pos: 22.5,-76.5 + parent: 2 + - uid: 20201 + components: + - type: Transform + pos: 19.5,-77.5 + parent: 2 - uid: 20303 components: - type: Transform @@ -131188,6 +133904,36 @@ entities: - type: Transform pos: -64.5,-33.5 parent: 2 + - uid: 21460 + components: + - type: Transform + pos: 24.5,-76.5 + parent: 2 + - uid: 21461 + components: + - type: Transform + pos: 14.5,-71.5 + parent: 2 + - uid: 21463 + components: + - type: Transform + pos: 15.5,-62.5 + parent: 2 + - uid: 21525 + components: + - type: Transform + pos: 24.5,-72.5 + parent: 2 + - uid: 21526 + components: + - type: Transform + pos: 24.5,-73.5 + parent: 2 + - uid: 21528 + components: + - type: Transform + pos: 11.5,-66.5 + parent: 2 - uid: 21587 components: - type: Transform @@ -131217,8 +133963,54 @@ entities: - type: Transform pos: 42.5,16.5 parent: 2 + - uid: 22006 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-59.5 + parent: 2 + - uid: 22038 + components: + - type: Transform + pos: 20.5,-71.5 + parent: 2 + - uid: 22041 + components: + - type: Transform + pos: 18.5,-71.5 + parent: 2 + - uid: 22042 + components: + - type: Transform + pos: 20.5,-74.5 + parent: 2 + - uid: 22043 + components: + - type: Transform + pos: 18.5,-74.5 + parent: 2 + - uid: 22044 + components: + - type: Transform + pos: 19.5,-74.5 + parent: 2 + - uid: 22174 + components: + - type: Transform + pos: 18.5,-73.5 + parent: 2 + - uid: 22177 + components: + - type: Transform + pos: 20.5,-73.5 + parent: 2 - proto: WallReinforcedRust entities: + - uid: 597 + components: + - type: Transform + pos: 14.5,-73.5 + parent: 2 - uid: 2330 components: - type: Transform @@ -134830,6 +137622,16 @@ entities: rot: 1.5707963267948966 rad pos: 46.5,-8.5 parent: 2 + - uid: 6324 + components: + - type: Transform + pos: 21.5,-51.5 + parent: 2 + - uid: 6371 + components: + - type: Transform + pos: 23.5,-72.5 + parent: 2 - uid: 6487 components: - type: Transform @@ -136109,71 +138911,43 @@ entities: rot: 1.5707963267948966 rad pos: 17.5,-42.5 parent: 2 - - uid: 7792 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-51.5 - parent: 2 - uid: 7794 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,-50.5 parent: 2 - - uid: 7800 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-51.5 - parent: 2 - uid: 7804 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,-50.5 parent: 2 - - uid: 7805 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-51.5 - parent: 2 - uid: 7806 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,-50.5 parent: 2 - - uid: 7807 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-51.5 - parent: 2 - - uid: 7815 + - uid: 7816 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-57.5 + pos: 18.5,-55.5 parent: 2 - - uid: 7816 + - uid: 7817 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-60.5 + pos: 18.5,-61.5 parent: 2 - uid: 7818 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-60.5 + pos: 22.5,-66.5 parent: 2 - uid: 7819 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-54.5 + pos: 23.5,-61.5 parent: 2 - uid: 7820 components: @@ -136187,119 +138961,111 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,-50.5 parent: 2 - - uid: 7823 + - uid: 7824 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-51.5 + pos: 25.5,-67.5 + parent: 2 + - uid: 7826 + components: + - type: Transform + pos: 14.5,-62.5 + parent: 2 + - uid: 7827 + components: + - type: Transform + pos: 17.5,-51.5 parent: 2 - uid: 7828 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-61.5 + pos: 17.5,-54.5 parent: 2 - uid: 7831 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-58.5 + pos: 13.5,-66.5 parent: 2 - - uid: 7832 + - uid: 7833 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-56.5 + pos: 21.5,-55.5 parent: 2 - uid: 7834 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-55.5 + pos: 20.5,-55.5 parent: 2 - uid: 7835 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-53.5 + pos: 18.5,-66.5 parent: 2 - - uid: 7837 + - uid: 7845 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-52.5 + pos: 12.5,-78.5 parent: 2 - - uid: 7838 + - uid: 7846 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 24.5,-55.5 + pos: 11.5,-65.5 parent: 2 - - uid: 7839 + - uid: 7848 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-54.5 + pos: 15.5,-61.5 parent: 2 - - uid: 7843 + - uid: 7849 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,-61.5 + pos: 17.5,-61.5 parent: 2 - - uid: 7845 + - uid: 7855 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 24.5,-61.5 + pos: 16.5,-52.5 parent: 2 - - uid: 7846 + - uid: 7856 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 24.5,-59.5 + pos: 16.5,-53.5 parent: 2 - - uid: 7848 + - uid: 7858 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-57.5 + pos: 25.5,-61.5 parent: 2 - - uid: 7849 + - uid: 7859 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-58.5 + pos: 23.5,-62.5 parent: 2 - - uid: 7857 + - uid: 7861 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-60.5 + pos: 16.5,-63.5 parent: 2 - - uid: 7860 + - uid: 7862 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-60.5 + pos: 24.5,-54.5 parent: 2 - - uid: 7865 + - uid: 7866 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-61.5 + pos: 22.5,-54.5 parent: 2 - - uid: 7867 + - uid: 7869 components: - type: Transform rot: 1.5707963267948966 rad - pos: 16.5,-61.5 + pos: 7.5,-38.5 parent: 2 - - uid: 7869 + - uid: 7871 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-38.5 + pos: 23.5,-76.5 parent: 2 - uid: 7872 components: @@ -136313,12 +139079,22 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,-41.5 parent: 2 + - uid: 7874 + components: + - type: Transform + pos: 22.5,-61.5 + parent: 2 - uid: 7875 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,-41.5 parent: 2 + - uid: 7878 + components: + - type: Transform + pos: 16.5,-65.5 + parent: 2 - uid: 7881 components: - type: Transform @@ -136427,89 +139203,87 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-38.5 parent: 2 - - uid: 8002 + - uid: 8023 components: - type: Transform rot: 1.5707963267948966 rad - pos: 16.5,-55.5 + pos: -3.5,-37.5 parent: 2 - - uid: 8010 + - uid: 8024 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-55.5 + pos: 26.5,-66.5 parent: 2 - - uid: 8011 + - uid: 8025 components: - type: Transform rot: 1.5707963267948966 rad - pos: 17.5,-59.5 + pos: 4.5,-41.5 parent: 2 - - uid: 8012 + - uid: 8026 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-59.5 + pos: 25.5,-78.5 parent: 2 - - uid: 8014 + - uid: 8027 components: - type: Transform rot: 1.5707963267948966 rad - pos: 20.5,-60.5 + pos: 4.5,-42.5 parent: 2 - - uid: 8015 + - uid: 8030 components: - type: Transform rot: 1.5707963267948966 rad - pos: 21.5,-55.5 + pos: 5.5,-43.5 parent: 2 - - uid: 8017 + - uid: 8031 components: - type: Transform rot: 1.5707963267948966 rad - pos: 22.5,-55.5 + pos: 6.5,-43.5 parent: 2 - - uid: 8023 + - uid: 8035 components: - type: Transform rot: 1.5707963267948966 rad - pos: -3.5,-37.5 + pos: 9.5,-43.5 parent: 2 - - uid: 8025 + - uid: 8036 components: - type: Transform rot: 1.5707963267948966 rad - pos: 4.5,-41.5 + pos: 13.5,-36.5 parent: 2 - - uid: 8027 + - uid: 8039 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-42.5 + pos: 24.5,-71.5 parent: 2 - - uid: 8030 + - uid: 8047 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-43.5 + pos: 24.5,-51.5 parent: 2 - - uid: 8031 + - uid: 8048 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-43.5 + pos: 14.5,-69.5 parent: 2 - - uid: 8035 + - uid: 8053 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-43.5 + pos: 15.5,-70.5 parent: 2 - - uid: 8036 + - uid: 8059 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-36.5 + pos: 24.5,-52.5 + parent: 2 + - uid: 8065 + components: + - type: Transform + pos: 18.5,-76.5 parent: 2 - uid: 8079 components: @@ -136667,6 +139441,16 @@ entities: rot: 1.5707963267948966 rad pos: 68.5,18.5 parent: 2 + - uid: 9096 + components: + - type: Transform + pos: 23.5,-73.5 + parent: 2 + - uid: 9097 + components: + - type: Transform + pos: 24.5,-75.5 + parent: 2 - uid: 9105 components: - type: Transform @@ -136871,6 +139655,31 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,20.5 parent: 2 + - uid: 10633 + components: + - type: Transform + pos: 13.5,-79.5 + parent: 2 + - uid: 10636 + components: + - type: Transform + pos: 13.5,-61.5 + parent: 2 + - uid: 10637 + components: + - type: Transform + pos: 16.5,-77.5 + parent: 2 + - uid: 10646 + components: + - type: Transform + pos: 15.5,-71.5 + parent: 2 + - uid: 10653 + components: + - type: Transform + pos: 14.5,-75.5 + parent: 2 - uid: 11666 components: - type: Transform @@ -136883,6 +139692,36 @@ entities: rot: 1.5707963267948966 rad pos: -30.5,35.5 parent: 2 + - uid: 12811 + components: + - type: Transform + pos: 23.5,-69.5 + parent: 2 + - uid: 12812 + components: + - type: Transform + pos: 27.5,-64.5 + parent: 2 + - uid: 12813 + components: + - type: Transform + pos: 20.5,-60.5 + parent: 2 + - uid: 12834 + components: + - type: Transform + pos: 23.5,-77.5 + parent: 2 + - uid: 12837 + components: + - type: Transform + pos: 20.5,-77.5 + parent: 2 + - uid: 12838 + components: + - type: Transform + pos: 16.5,-76.5 + parent: 2 - uid: 14192 components: - type: Transform @@ -137542,6 +140381,11 @@ entities: rot: 1.5707963267948966 rad pos: 53.5,-43.5 parent: 2 + - uid: 16730 + components: + - type: Transform + pos: 15.5,-66.5 + parent: 2 - uid: 16754 components: - type: Transform @@ -137554,6 +140398,11 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,38.5 parent: 2 + - uid: 16827 + components: + - type: Transform + pos: 15.5,-76.5 + parent: 2 - uid: 16834 components: - type: Transform @@ -137680,6 +140529,11 @@ entities: rot: 1.5707963267948966 rad pos: -42.5,25.5 parent: 2 + - uid: 20331 + components: + - type: Transform + pos: 14.5,-72.5 + parent: 2 - uid: 20358 components: - type: Transform @@ -137794,6 +140648,11 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,-48.5 parent: 2 + - uid: 20804 + components: + - type: Transform + pos: 14.5,-68.5 + parent: 2 - uid: 20880 components: - type: Transform @@ -137818,6 +140677,31 @@ entities: rot: 1.5707963267948966 rad pos: 60.5,7.5 parent: 2 + - uid: 21401 + components: + - type: Transform + pos: 15.5,-73.5 + parent: 2 + - uid: 21462 + components: + - type: Transform + pos: 24.5,-69.5 + parent: 2 + - uid: 21523 + components: + - type: Transform + pos: 21.5,-76.5 + parent: 2 + - uid: 21524 + components: + - type: Transform + pos: 18.5,-77.5 + parent: 2 + - uid: 21527 + components: + - type: Transform + pos: 23.5,-68.5 + parent: 2 - uid: 21647 components: - type: Transform @@ -137833,6 +140717,16 @@ entities: - type: Transform pos: -68.5,-29.5 parent: 2 + - uid: 22007 + components: + - type: Transform + pos: 22.5,-59.5 + parent: 2 + - uid: 22017 + components: + - type: Transform + pos: 23.5,-66.5 + parent: 2 - proto: WallShuttle entities: - uid: 21142 @@ -143481,45 +146375,45 @@ entities: - type: Transform pos: 9.5,-44.5 parent: 2 - - uid: 8055 + - uid: 8171 components: - type: Transform - pos: 15.5,-59.5 + pos: 7.5,-44.5 parent: 2 - - uid: 8056 + - uid: 20391 components: - type: Transform - pos: 15.5,-52.5 + pos: 16.5,42.5 parent: 2 - - uid: 8057 + - uid: 20392 components: - type: Transform - pos: 22.5,-52.5 + pos: 16.5,39.5 parent: 2 - - uid: 8058 + - uid: 21060 components: - type: Transform - pos: 22.5,-59.5 + pos: -34.5,-45.5 parent: 2 - - uid: 8171 + - uid: 22109 components: - type: Transform - pos: 7.5,-44.5 + pos: 16.5,-67.5 parent: 2 - - uid: 20391 + - uid: 22140 components: - type: Transform - pos: 16.5,42.5 + pos: 22.5,-67.5 parent: 2 - - uid: 20392 + - uid: 22145 components: - type: Transform - pos: 16.5,39.5 + pos: 22.5,-74.5 parent: 2 - - uid: 21060 + - uid: 22170 components: - type: Transform - pos: -34.5,-45.5 + pos: 16.5,-74.5 parent: 2 - proto: WeaponWaterPistol entities: @@ -144063,17 +146957,17 @@ entities: - type: Transform pos: 13.5,-45.5 parent: 2 - - uid: 8037 + - uid: 22049 components: - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-59.5 + rot: -1.5707963267948966 rad + pos: 18.5,-72.5 parent: 2 - - uid: 8038 + - uid: 22050 components: - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-59.5 + rot: 1.5707963267948966 rad + pos: 20.5,-72.5 parent: 2 - proto: WindoorSecureDetectiveLocked entities: @@ -144845,30 +147739,6 @@ entities: rot: 3.141592653589793 rad pos: -11.5,-40.5 parent: 2 - - uid: 8051 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-56.5 - parent: 2 - - uid: 8052 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-55.5 - parent: 2 - - uid: 8053 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-56.5 - parent: 2 - - uid: 8054 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-55.5 - parent: 2 - uid: 9185 components: - type: Transform @@ -145198,4 +148068,9 @@ entities: - type: Transform pos: 1.7595062,-8.203196 parent: 21128 + - uid: 22187 + components: + - type: Transform + pos: 23.770426,-65.39776 + parent: 2 ... From b396996af88b19014ff90a440bdee06c147288b8 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sat, 24 Aug 2024 01:45:13 +0200 Subject: [PATCH 017/223] Fix server crash on shutdown due to DB notifications (#31379) Fixes #31365 --- Content.Server/Database/ServerDbPostgres.Notifications.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Database/ServerDbPostgres.Notifications.cs b/Content.Server/Database/ServerDbPostgres.Notifications.cs index fe358923bf0..69cf2c7d775 100644 --- a/Content.Server/Database/ServerDbPostgres.Notifications.cs +++ b/Content.Server/Database/ServerDbPostgres.Notifications.cs @@ -97,6 +97,8 @@ private async Task NotificationListener(CancellationToken cancellationToken) _notifyLog.Error($"Error in notification listener: {e}"); } } + + _notificationConnection.Dispose(); } private void OnNotification(object _, NpgsqlNotificationEventArgs notification) @@ -116,6 +118,5 @@ public override void Shutdown() return; _notificationConnection.Notification -= OnNotification; - _notificationConnection.Dispose(); } } From a2025e895caca1463b35315441238318c92f11dd Mon Sep 17 00:00:00 2001 From: FATFSAAM2 Date: Sat, 24 Aug 2024 03:40:09 +0330 Subject: [PATCH 018/223] new boxer figurine voicelines (#31382) initial comnit --- Resources/Locale/en-US/datasets/figurines.ftl | 3 +++ Resources/Prototypes/Datasets/figurines.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl index aa05aa3a98c..778d93ed9fe 100644 --- a/Resources/Locale/en-US/datasets/figurines.ftl +++ b/Resources/Locale/en-US/datasets/figurines.ftl @@ -28,6 +28,9 @@ figurines-musician-1 = Never gonna give you up! figurines-musician-2 = Never gonna let you down! figurines-boxer-1 = The first rule of Fight Club is... +figurines-boxer-2 = We settle this in the ring, alright? +figurines-boxer-3 = I. AM. THE. CHAMPION!! +figurines-boxer-4 = Don't look at me, he was shot, not punched. figurines-captain-1 = Glory to NT! figurines-captain-2 = How did I get hired? Yes. diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml index 2b905321a43..e312debd90f 100644 --- a/Resources/Prototypes/Datasets/figurines.yml +++ b/Resources/Prototypes/Datasets/figurines.yml @@ -44,7 +44,7 @@ id: FigurinesBoxer values: prefix: figurines-boxer- - count: 1 + count: 4 - type: localizedDataset id: FigurinesCaptain From b7ec4f9740a4ee789816b7c3e2228b76d8df89c1 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 24 Aug 2024 00:11:17 +0000 Subject: [PATCH 019/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index d2ad3dd5d42..6b1ef2a00c3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: blueDev2 - changes: - - message: Rebalanced medicated suture and regen mesh to only require 1 brute pack/ointment - respectively - type: Tweak - id: 6694 - time: '2024-06-07T01:24:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28679 - author: AJCM-git changes: - message: Guidebook no longer lists every single rule @@ -3865,3 +3857,10 @@ id: 7193 time: '2024-08-23T14:24:06.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30786 +- author: FATFSAAM2 + changes: + - message: Added 3 new voicelines for the boxer figurine. + type: Add + id: 7194 + time: '2024-08-24T00:10:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31382 From 9f5d97228d2238d82506f5e53db83cd61aa7540e Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Sat, 24 Aug 2024 03:16:25 +0300 Subject: [PATCH 020/223] Fix the folded chair damage inspection (#31378) * Fix the folded folding chair * Whoops --- Resources/Prototypes/Entities/Structures/Furniture/chairs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 52149de193c..33fd5192fad 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -349,6 +349,7 @@ - type: Construction graph: Seat node: chairFolding + - type: DamageExaminable - type: entity parent: ChairFolding From 8c55057a1027f74dccc850ece244d9fe515e9bd6 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 24 Aug 2024 00:17:33 +0000 Subject: [PATCH 021/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 6b1ef2a00c3..b13c1aa4b6c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: AJCM-git - changes: - - message: Guidebook no longer lists every single rule - type: Fix - id: 6695 - time: '2024-06-07T11:28:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28680 - author: Plykiya changes: - message: You can now place construction ghosts without getting blocked by things @@ -3864,3 +3857,10 @@ id: 7194 time: '2024-08-24T00:10:10.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31382 +- author: Winkarst-cpu + changes: + - message: The damage dealt by the folded chair can now be inspected. + type: Fix + id: 7195 + time: '2024-08-24T00:16:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31378 From 8f4ee7ac9612ce550f12b4f0857e0088602b6174 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sat, 24 Aug 2024 03:31:02 +0200 Subject: [PATCH 022/223] Make storage implant closable using the action again (#31381) --- .../EntitySystems/SharedStorageSystem.cs | 32 +++++++++++-------- Resources/Prototypes/Actions/types.yml | 5 +-- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 2689d7750d5..def9d797c48 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -41,23 +41,23 @@ namespace Content.Shared.Storage.EntitySystems; public abstract class SharedStorageSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] protected readonly IRobustRandom Random = default!; [Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!; - [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; [Dependency] protected readonly SharedEntityStorageSystem EntityStorage = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; + [Dependency] private readonly InventorySystem _inventory = default!; [Dependency] protected readonly SharedItemSystem ItemSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!; - [Dependency] private readonly SharedStackSystem _stack = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!; + [Dependency] private readonly SharedStackSystem _stack = default!; [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; [Dependency] protected readonly UseDelaySystem UseDelay = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; @@ -403,7 +403,13 @@ private void OnImplantActivate(EntityUid uid, StorageComponent storageComp, Open if (args.Handled) return; - OpenStorageUI(uid, args.Performer, storageComp, false); + var uiOpen = _ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.Performer); + + if (uiOpen) + _ui.CloseUi(uid, StorageComponent.StorageUiKey.Key, args.Performer); + else + OpenStorageUI(uid, args.Performer, storageComp, false); + args.Handled = true; } @@ -1395,7 +1401,7 @@ private void HandleToggleSlotUI(ICommonSession? session, string slot) if (session is not { } playerSession) return; - if (playerSession.AttachedEntity is not {Valid: true} playerEnt || !Exists(playerEnt)) + if (playerSession.AttachedEntity is not { Valid: true } playerEnt || !Exists(playerEnt)) return; if (!_inventory.TryGetSlotEntity(playerEnt, slot, out var storageEnt)) diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 4fa9ed3135e..5430a3f005a 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -44,8 +44,8 @@ - type: entity id: ActionOpenStorageImplant - name: Open Storage Implant - description: Opens the storage implant embedded under your skin + name: Toggle Storage Implant + description: Opens or closes the storage implant embedded under your skin components: - type: InstantAction itemIconStyle: BigAction @@ -54,6 +54,7 @@ sprite: Clothing/Back/Backpacks/backpack.rsi state: icon event: !type:OpenStorageImplantEvent + useDelay: 1 - type: entity parent: BaseSuicideAction From c31ffff9ac2c24926efd409b408568c76e2b8eda Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Fri, 23 Aug 2024 22:06:37 -0400 Subject: [PATCH 023/223] add new salv loot into the vgroid procgen (#31290) add new loot into vgroid procgen --- .../DungeonJob.EntityTableDunGen.cs | 59 +++ .../Procedural/DungeonJob/DungeonJob.cs | 3 + .../DungeonLayers/EntityTableDunGen.cs | 21 + .../Spawners/Random/Salvage/spawners.yml | 358 +++++++++--------- Resources/Prototypes/Procedural/vgroid.yml | 34 +- 5 files changed, 304 insertions(+), 171 deletions(-) create mode 100644 Content.Server/Procedural/DungeonJob/DungeonJob.EntityTableDunGen.cs create mode 100644 Content.Shared/Procedural/DungeonLayers/EntityTableDunGen.cs diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.EntityTableDunGen.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.EntityTableDunGen.cs new file mode 100644 index 00000000000..8f9be822724 --- /dev/null +++ b/Content.Server/Procedural/DungeonJob/DungeonJob.EntityTableDunGen.cs @@ -0,0 +1,59 @@ +using System.Linq; +using System.Threading.Tasks; +using Content.Server.Ghost.Roles.Components; +using Content.Server.NPC.Systems; +using Content.Shared.EntityTable; +using Content.Shared.Physics; +using Content.Shared.Procedural; +using Content.Shared.Procedural.DungeonLayers; +using Robust.Shared.Collections; + +namespace Content.Server.Procedural.DungeonJob; + +public sealed partial class DungeonJob +{ + private async Task PostGen( + EntityTableDunGen gen, + Dungeon dungeon, + Random random) + { + var availableRooms = new ValueList(); + availableRooms.AddRange(dungeon.Rooms); + var availableTiles = new ValueList(dungeon.AllTiles); + + var count = random.Next(gen.MinCount, gen.MaxCount + 1); + var npcs = _entManager.System(); + + for (var i = 0; i < count; i++) + { + while (availableTiles.Count > 0) + { + var tile = availableTiles.RemoveSwap(random.Next(availableTiles.Count)); + + if (!_anchorable.TileFree(_grid, + tile, + (int) CollisionGroup.MachineLayer, + (int) CollisionGroup.MachineLayer)) + { + continue; + } + + var entities = _entManager.System().GetSpawns(gen.Table, random).ToList(); + foreach (var ent in entities) + { + var uid = _entManager.SpawnAtPosition(ent, _maps.GridTileToLocal(_gridUid, _grid, tile)); + _entManager.RemoveComponent(uid); + _entManager.RemoveComponent(uid); + npcs.SleepNPC(uid); + } + + break; + } + + await SuspendDungeon(); + + if (!ValidateResume()) + return; + } + } +} diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.cs index 6631eb24b01..5a6a8510fff 100644 --- a/Content.Server/Procedural/DungeonJob/DungeonJob.cs +++ b/Content.Server/Procedural/DungeonJob/DungeonJob.cs @@ -239,6 +239,9 @@ private async Task RunLayer( case MobsDunGen mob: await PostGen(mob, dungeons[^1], random); break; + case EntityTableDunGen entityTable: + await PostGen(entityTable, dungeons[^1], random); + break; case NoiseDistanceDunGen distance: dungeons.Add(await GenerateNoiseDistanceDunGen(position, distance, reservedTiles, seed, random)); break; diff --git a/Content.Shared/Procedural/DungeonLayers/EntityTableDunGen.cs b/Content.Shared/Procedural/DungeonLayers/EntityTableDunGen.cs new file mode 100644 index 00000000000..71e9bae0cc1 --- /dev/null +++ b/Content.Shared/Procedural/DungeonLayers/EntityTableDunGen.cs @@ -0,0 +1,21 @@ +using Content.Shared.EntityTable.EntitySelectors; + +namespace Content.Shared.Procedural.DungeonLayers; + + +/// +/// Spawns entities inside of the dungeon randomly. +/// +public sealed partial class EntityTableDunGen : IDunGenLayer +{ + // Counts separate to config to avoid some duplication. + + [DataField] + public int MinCount = 1; + + [DataField] + public int MaxCount = 1; + + [DataField(required: true)] + public EntityTableSelector Table; +} diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml index 81a71095751..503fcc33802 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml @@ -121,6 +121,54 @@ tableId: SalvageScrapSpawnerValuable prob: 0.75 +- type: entityTable + id: SalvageTreasureSpawnerCommon + table: !type:GroupSelector + children: + # 80% chance of some treasure + - !type:GroupSelector + weight: 80 + children: + - !type:NestedSelector + tableId: SalvageTreasureCommon + weight: 60 + - !type:NestedSelector + tableId: SalvageTreasureUncommon + weight: 30 + - !type:NestedSelector + tableId: SalvageTreasureRare + weight: 9 + - !type:NestedSelector + tableId: SalvageTreasureLegendary + weight: 1 + # 10% chance of low-level equipment + - !type:GroupSelector + weight: 10 + children: + - !type:NestedSelector + tableId: SalvageEquipmentCommon + weight: 60 + - !type:NestedSelector + tableId: SalvageEquipmentUncommon + weight: 40 + # 5% chance of moderate scrap + - !type:GroupSelector + weight: 5 + children: + - !type:NestedSelector + tableId: SalvageScrapLowValue + weight: 60 + - !type:NestedSelector + tableId: SalvageScrapHighValue + weight: 30 + - !type:NestedSelector + tableId: SalvageScrapLarge + weight: 10 + # 5% chance of maintenance fluff + - !type:NestedSelector + tableId: MaintFluffTable + weight: 5 + - type: entity parent: MarkerBase id: SalvageSpawnerTreasure @@ -134,52 +182,62 @@ state: diamond - type: EntityTableSpawner offset: 0.4 - table: !type:GroupSelector + table: !type:NestedSelector + tableId: SalvageTreasureSpawnerCommon prob: 0.75 + +- type: entityTable + id: SalvageTreasureSpawnerValuable + table: !type:GroupSelector + children: + # 80% chance of some treasure + - !type:GroupSelector + weight: 80 children: - # 80% chance of some treasure - - !type:GroupSelector - weight: 80 - children: - - !type:NestedSelector - tableId: SalvageTreasureCommon - weight: 60 - - !type:NestedSelector - tableId: SalvageTreasureUncommon - weight: 30 - - !type:NestedSelector - tableId: SalvageTreasureRare - weight: 9 - - !type:NestedSelector - tableId: SalvageTreasureLegendary - weight: 1 - # 10% chance of low-level equipment - - !type:GroupSelector - weight: 10 - children: - - !type:NestedSelector - tableId: SalvageEquipmentCommon - weight: 60 - - !type:NestedSelector - tableId: SalvageEquipmentUncommon - weight: 40 - # 5% chance of moderate scrap - - !type:GroupSelector - weight: 5 - children: - - !type:NestedSelector - tableId: SalvageScrapLowValue - weight: 60 - - !type:NestedSelector - tableId: SalvageScrapHighValue - weight: 30 - - !type:NestedSelector - tableId: SalvageScrapLarge - weight: 10 - # 5% chance of maintenance fluff - !type:NestedSelector - tableId: MaintFluffTable + tableId: SalvageTreasureCommon + weight: 45 + - !type:NestedSelector + tableId: SalvageTreasureUncommon + weight: 35 + - !type:NestedSelector + tableId: SalvageTreasureRare + weight: 15 + - !type:NestedSelector + tableId: SalvageTreasureLegendary weight: 5 + # 10% chance of low-level equipment + - !type:GroupSelector + weight: 10 + children: + - !type:NestedSelector + tableId: SalvageEquipmentCommon + weight: 50 + - !type:NestedSelector + tableId: SalvageEquipmentUncommon + weight: 40 + - !type:NestedSelector + tableId: SalvageEquipmentUncommon + weight: 10 + # 5% chance of moderate scrap + - !type:GroupSelector + weight: 5 + children: + - !type:NestedSelector + tableId: SalvageScrapLowValue + weight: 30 + - !type:NestedSelector + tableId: SalvageScrapHighValue + weight: 45 + - !type:NestedSelector + tableId: SalvageScrapLarge + weight: 25 + # 5% chance of maintenance fluff + - !type:NestedSelector + tableId: MaintFluffTable + weight: 5 + rolls: !type:RangeNumberSelector + range: 1, 2 - type: entity parent: MarkerBase @@ -194,57 +252,51 @@ state: diamond - type: EntityTableSpawner offset: 0.4 - table: !type:GroupSelector + table: !type:NestedSelector + tableId: SalvageTreasureSpawnerValuable prob: 0.75 + +- type: entityTable + id: SalvageEquipmentSpawnerCommon + table: !type:GroupSelector + children: + # 80% chance of equipment item + - !type:GroupSelector + weight: 80 children: - # 80% chance of some treasure - - !type:GroupSelector - weight: 80 - children: - - !type:NestedSelector - tableId: SalvageTreasureCommon - weight: 45 - - !type:NestedSelector - tableId: SalvageTreasureUncommon - weight: 35 - - !type:NestedSelector - tableId: SalvageTreasureRare - weight: 15 - - !type:NestedSelector - tableId: SalvageTreasureLegendary - weight: 5 - # 10% chance of low-level equipment - - !type:GroupSelector - weight: 10 - children: - - !type:NestedSelector - tableId: SalvageEquipmentCommon - weight: 50 - - !type:NestedSelector - tableId: SalvageEquipmentUncommon - weight: 40 - - !type:NestedSelector - tableId: SalvageEquipmentUncommon - weight: 10 - # 5% chance of moderate scrap - - !type:GroupSelector + - !type:NestedSelector + tableId: SalvageEquipmentCommon + weight: 60 + - !type:NestedSelector + tableId: SalvageEquipmentUncommon + weight: 30 + - !type:NestedSelector + tableId: SalvageEquipmentRare + weight: 9 + - !type:NestedSelector + tableId: SalvageEquipmentLegendary + weight: 1 + # 15% chance of decent-ish treasure + - !type:GroupSelector + weight: 15 + children: + - !type:NestedSelector + tableId: SalvageTreasureCommon + weight: 75 + - !type:NestedSelector + tableId: SalvageTreasureUncommon + weight: 20 + - !type:NestedSelector + tableId: SalvageTreasureRare weight: 5 - children: - - !type:NestedSelector - tableId: SalvageScrapLowValue - weight: 30 - - !type:NestedSelector - tableId: SalvageScrapHighValue - weight: 45 - - !type:NestedSelector - tableId: SalvageScrapLarge - weight: 25 - # 5% chance of maintenance fluff + # 5% chance of decent maintenance loot + - !type:GroupSelector + weight: 5 + children: + - !type:NestedSelector + tableId: MaintToolsTable - !type:NestedSelector tableId: MaintFluffTable - weight: 5 - rolls: !type:RangeNumberSelector - range: 1, 2 - type: entity parent: MarkerBase @@ -259,46 +311,57 @@ state: walkietalkie - type: EntityTableSpawner offset: 0.4 - table: !type:GroupSelector + table: !type:NestedSelector + tableId: SalvageEquipmentSpawnerCommon prob: 0.75 + +- type: entityTable + id: SalvageEquipmentSpawnerValuable + table: !type:GroupSelector + children: + # 80% chance of equipment item + - !type:GroupSelector + weight: 80 children: - # 80% chance of equipment item - - !type:GroupSelector - weight: 80 - children: - - !type:NestedSelector - tableId: SalvageEquipmentCommon - weight: 60 - - !type:NestedSelector - tableId: SalvageEquipmentUncommon - weight: 30 - - !type:NestedSelector - tableId: SalvageEquipmentRare - weight: 9 - - !type:NestedSelector - tableId: SalvageEquipmentLegendary - weight: 1 - # 15% chance of decent-ish treasure - - !type:GroupSelector + - !type:NestedSelector + tableId: SalvageEquipmentCommon + weight: 45 + - !type:NestedSelector + tableId: SalvageEquipmentUncommon + weight: 35 + - !type:NestedSelector + tableId: SalvageEquipmentRare weight: 15 - children: - - !type:NestedSelector - tableId: SalvageTreasureCommon - weight: 75 - - !type:NestedSelector - tableId: SalvageTreasureUncommon - weight: 20 - - !type:NestedSelector - tableId: SalvageTreasureRare - weight: 5 - # 5% chance of decent maintenance loot - - !type:GroupSelector + - !type:NestedSelector + tableId: SalvageEquipmentLegendary weight: 5 - children: - - !type:NestedSelector - tableId: MaintToolsTable - - !type:NestedSelector - tableId: MaintFluffTable + # 14% chance of decent-ish treasure + - !type:GroupSelector + weight: 14 + children: + - !type:NestedSelector + tableId: SalvageTreasureCommon + weight: 60 + - !type:NestedSelector + tableId: SalvageTreasureUncommon + weight: 30 + - !type:NestedSelector + tableId: SalvageTreasureRare + weight: 10 + # 5% chance of decent maintenance loot + - !type:GroupSelector + weight: 5 + children: + - !type:NestedSelector + tableId: MaintToolsTable + - !type:NestedSelector + tableId: MaintFluffTable + # 1% chance of syndie maintenance loot + - !type:GroupSelector + weight: 1 + children: + - !type:NestedSelector + tableId: SyndieMaintLoot - type: entity parent: MarkerBase @@ -313,52 +376,9 @@ state: walkietalkie - type: EntityTableSpawner offset: 0.4 - table: !type:GroupSelector + table: !type:NestedSelector + tableId: SalvageEquipmentSpawnerValuable prob: 0.75 - children: - # 80% chance of equipment item - - !type:GroupSelector - weight: 80 - children: - - !type:NestedSelector - tableId: SalvageEquipmentCommon - weight: 45 - - !type:NestedSelector - tableId: SalvageEquipmentUncommon - weight: 35 - - !type:NestedSelector - tableId: SalvageEquipmentRare - weight: 15 - - !type:NestedSelector - tableId: SalvageEquipmentLegendary - weight: 5 - # 14% chance of decent-ish treasure - - !type:GroupSelector - weight: 14 - children: - - !type:NestedSelector - tableId: SalvageTreasureCommon - weight: 60 - - !type:NestedSelector - tableId: SalvageTreasureUncommon - weight: 30 - - !type:NestedSelector - tableId: SalvageTreasureRare - weight: 10 - # 5% chance of decent maintenance loot - - !type:GroupSelector - weight: 5 - children: - - !type:NestedSelector - tableId: MaintToolsTable - - !type:NestedSelector - tableId: MaintFluffTable - # 1% chance of syndie maintenance loot - - !type:GroupSelector - weight: 1 - children: - - !type:NestedSelector - tableId: SyndieMaintLoot - type: entity name: Salvage Canister Spawner diff --git a/Resources/Prototypes/Procedural/vgroid.yml b/Resources/Prototypes/Procedural/vgroid.yml index 315f908fad2..8c8d9147c42 100644 --- a/Resources/Prototypes/Procedural/vgroid.yml +++ b/Resources/Prototypes/Procedural/vgroid.yml @@ -141,9 +141,39 @@ layers: - !type:ExteriorDunGen proto: Experiment + - !type:EntityTableDunGen + minCount: 25 + maxCount: 40 + table: !type:NestedSelector + tableId: SalvageScrapSpawnerCommon + - !type:EntityTableDunGen + minCount: 30 + maxCount: 40 + table: !type:NestedSelector + tableId: SalvageScrapSpawnerValuable + - !type:EntityTableDunGen + minCount: 15 + maxCount: 25 + table: !type:NestedSelector + tableId: SalvageTreasureSpawnerCommon + - !type:EntityTableDunGen + minCount: 15 + maxCount: 25 + table: !type:NestedSelector + tableId: SalvageEquipmentSpawnerCommon + - !type:EntityTableDunGen + minCount: 15 + maxCount: 20 + table: !type:NestedSelector + tableId: SalvageTreasureSpawnerValuable + - !type:EntityTableDunGen + minCount: 15 + maxCount: 20 + table: !type:NestedSelector + tableId: SalvageEquipmentSpawnerValuable - !type:MobsDunGen - minCount: 5 - maxCount: 8 + minCount: 8 + maxCount: 15 groups: - id: MobGoliath amount: 1 From 907411d0d1f5359a4265b91b501aac9b41e64060 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 24 Aug 2024 02:07:44 +0000 Subject: [PATCH 024/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b13c1aa4b6c..1caf0a81838 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: You can now place construction ghosts without getting blocked by things - like grilles or windows. - type: Fix - id: 6696 - time: '2024-06-08T00:57:07.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28706 - author: Lyndomen changes: - message: Space Dragons will drop bodies upon being gibbed/butchered @@ -3864,3 +3856,11 @@ id: 7195 time: '2024-08-24T00:16:26.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31378 +- author: EmoGarbage404 + changes: + - message: The mining asteroid dungeons now spawn with more equipment, scrap, and + treasure in them. + type: Add + id: 7196 + time: '2024-08-24T02:06:38.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31290 From b52686ea3851e422bffbf8391f5b88f9c75845d4 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Fri, 23 Aug 2024 22:09:36 -0400 Subject: [PATCH 025/223] Add space debris to salvage magnet (#31113) * add space debris to salvage magnet * multiplication * necessary mercy for NPCs * back and forth on mercy --- .../UI/SalvageMagnetBoundUserInterface.cs | 13 +- .../Magnet/SalvageMagnetDataComponent.cs | 2 +- .../Salvage/SalvageSystem.Magnet.cs | 8 +- Content.Shared/CCVar/CCVars.cs | 2 +- .../Salvage/Magnet/DebrisOffering.cs | 9 ++ .../Salvage/SharedSalvageSystem.Magnet.cs | 112 ++++++++++------- .../Locale/en-US/salvage/salvage-magnet.ftl | 3 + .../Procedural/Magnet/space_debris.yml | 40 ++++++ .../Magnet/space_debris_templates.yml | 115 ++++++++++++++++++ 9 files changed, 251 insertions(+), 53 deletions(-) create mode 100644 Content.Shared/Salvage/Magnet/DebrisOffering.cs create mode 100644 Resources/Prototypes/Procedural/Magnet/space_debris.yml create mode 100644 Resources/Prototypes/Procedural/Magnet/space_debris_templates.yml diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs index 7e99426f87b..d691f9acef3 100644 --- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs @@ -53,9 +53,9 @@ protected override void UpdateState(BoundUserInterfaceState state) option.Claimed = current.ActiveSeed == seed; var claimIndex = i; - option.ClaimPressed += args => + option.ClaimPressed += _ => { - SendMessage(new MagnetClaimOfferEvent() + SendMessage(new MagnetClaimOfferEvent { Index = claimIndex }); @@ -72,20 +72,20 @@ protected override void UpdateState(BoundUserInterfaceState state) { var count = asteroid.MarkerLayers[resource]; - var container = new BoxContainer() + var container = new BoxContainer { Orientation = BoxContainer.LayoutOrientation.Horizontal, HorizontalExpand = true, }; - var resourceLabel = new Label() + var resourceLabel = new Label { Text = Loc.GetString("salvage-magnet-resources", ("resource", resource)), HorizontalAlignment = Control.HAlignment.Left, }; - var countLabel = new Label() + var countLabel = new Label { Text = Loc.GetString("salvage-magnet-resources-count", ("count", count)), HorizontalAlignment = Control.HAlignment.Right, @@ -98,6 +98,9 @@ protected override void UpdateState(BoundUserInterfaceState state) option.AddContent(container); } + break; + case DebrisOffering debris: + option.Title = Loc.GetString($"salvage-magnet-debris-{debris.Id}"); break; case SalvageOffering salvage: option.Title = Loc.GetString($"salvage-map-wreck"); diff --git a/Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs b/Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs index 4c4a2222801..07a8fe1f38c 100644 --- a/Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs +++ b/Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs @@ -44,7 +44,7 @@ public sealed partial class SalvageMagnetDataComponent : Component public List Offered = new(); [DataField] - public int OfferCount = 6; + public int OfferCount = 5; [DataField] public int ActiveSeed; diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs index 57a57d3c633..81db78fb201 100644 --- a/Content.Server/Salvage/SalvageSystem.Magnet.cs +++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs @@ -4,6 +4,7 @@ using Content.Server.Salvage.Magnet; using Content.Shared.Humanoid; using Content.Shared.Mobs.Components; +using Content.Shared.Procedural; using Content.Shared.Radio; using Content.Shared.Salvage.Magnet; using Robust.Server.Maps; @@ -269,6 +270,11 @@ private async Task TakeMagnetOffer(Entity data, int var grid = _mapManager.CreateGridEntity(salvMap); await _dungeon.GenerateDungeonAsync(asteroid.DungeonConfig, grid.Owner, grid.Comp, Vector2i.Zero, seed); break; + case DebrisOffering debris: + var debrisProto = _prototypeManager.Index(debris.Id); + var debrisGrid = _mapManager.CreateGridEntity(salvMap); + await _dungeon.GenerateDungeonAsync(debrisProto, debrisGrid.Owner, debrisGrid.Comp, Vector2i.Zero, seed); + break; case SalvageOffering wreck: var salvageProto = wreck.SalvageMap; @@ -309,7 +315,7 @@ private async Task TakeMagnetOffer(Entity data, int bounds = bounds?.Union(childAABB) ?? childAABB; // Update mass scanner names as relevant. - if (offering is AsteroidOffering) + if (offering is AsteroidOffering or DebrisOffering) { _metaData.SetEntityName(mapChild, Loc.GetString("salvage-asteroid-name")); _gravity.EnableGravity(mapChild); diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 7e61ec8a582..c3307c53fb6 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -2134,7 +2134,7 @@ public static readonly CVarDef /// Whether or not world generation is enabled. /// public static readonly CVarDef WorldgenEnabled = - CVarDef.Create("worldgen.enabled", true, CVar.SERVERONLY); + CVarDef.Create("worldgen.enabled", false, CVar.SERVERONLY); /// /// The worldgen config to use. diff --git a/Content.Shared/Salvage/Magnet/DebrisOffering.cs b/Content.Shared/Salvage/Magnet/DebrisOffering.cs new file mode 100644 index 00000000000..953b9dcad9f --- /dev/null +++ b/Content.Shared/Salvage/Magnet/DebrisOffering.cs @@ -0,0 +1,9 @@ +namespace Content.Shared.Salvage.Magnet; + +/// +/// Space debis offered for the magnet. +/// +public record struct DebrisOffering : ISalvageMagnetOffering +{ + public string Id; +} diff --git a/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs b/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs index 7285e36126e..a530844598d 100644 --- a/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs +++ b/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs @@ -5,6 +5,7 @@ using Content.Shared.Random.Helpers; using Content.Shared.Salvage.Magnet; using Robust.Shared.Prototypes; +using Robust.Shared.Random; using Robust.Shared.Utility; namespace Content.Shared.Salvage; @@ -13,6 +14,13 @@ public abstract partial class SharedSalvageSystem { private readonly List _salvageMaps = new(); + private Dictionary _offeringWeights = new() + { + { new AsteroidOffering(), 3.0f }, + { new DebrisOffering(), 4.0f }, + { new SalvageOffering(), 1.0f } + }; + private readonly List> _asteroidConfigs = new() { "BlobAsteroid", @@ -25,61 +33,75 @@ public abstract partial class SharedSalvageSystem private readonly MinMax _asteroidOreCount = new(5, 7); + private readonly List> _debrisConfigs = new() + { + "ChunkDebris" + }; + public ISalvageMagnetOffering GetSalvageOffering(int seed) { var rand = new System.Random(seed); - // Asteroid seed - if (seed % 2 == 0) + var type = SharedRandomExtensions.Pick(_offeringWeights, rand); + switch (type) { - var configId = _asteroidConfigs[rand.Next(_asteroidConfigs.Count)]; - var configProto =_proto.Index(configId); - var layers = new Dictionary(); - - var data = new DungeonData(); - data.Apply(configProto.Data); + case AsteroidOffering: + var configId = _asteroidConfigs[rand.Next(_asteroidConfigs.Count)]; + var configProto =_proto.Index(configId); + var layers = new Dictionary(); - var config = new DungeonConfig() - { - Data = data, - Layers = new(configProto.Layers), - MaxCount = configProto.MaxCount, - MaxOffset = configProto.MaxOffset, - MinCount = configProto.MinCount, - MinOffset = configProto.MinOffset, - ReserveTiles = configProto.ReserveTiles - }; + var data = new DungeonData(); + data.Apply(configProto.Data); - var count = _asteroidOreCount.Next(rand); - var weightedProto = _proto.Index(_asteroidOreWeights); - for (var i = 0; i < count; i++) - { - var ore = weightedProto.Pick(rand); - config.Layers.Add(_proto.Index(ore)); + var config = new DungeonConfig + { + Data = data, + Layers = new(configProto.Layers), + MaxCount = configProto.MaxCount, + MaxOffset = configProto.MaxOffset, + MinCount = configProto.MinCount, + MinOffset = configProto.MinOffset, + ReserveTiles = configProto.ReserveTiles + }; - var layerCount = layers.GetOrNew(ore); - layerCount++; - layers[ore] = layerCount; - } + var count = _asteroidOreCount.Next(rand); + var weightedProto = _proto.Index(_asteroidOreWeights); + for (var i = 0; i < count; i++) + { + var ore = weightedProto.Pick(rand); + config.Layers.Add(_proto.Index(ore)); - return new AsteroidOffering - { - Id = configId, - DungeonConfig = config, - MarkerLayers = layers, - }; - } + var layerCount = layers.GetOrNew(ore); + layerCount++; + layers[ore] = layerCount; + } - // Salvage map seed - _salvageMaps.Clear(); - _salvageMaps.AddRange(_proto.EnumeratePrototypes()); - _salvageMaps.Sort((x, y) => string.Compare(x.ID, y.ID, StringComparison.Ordinal)); - var mapIndex = rand.Next(_salvageMaps.Count); - var map = _salvageMaps[mapIndex]; + return new AsteroidOffering + { + Id = configId, + DungeonConfig = config, + MarkerLayers = layers, + }; + case DebrisOffering: + var id = rand.Pick(_debrisConfigs); + return new DebrisOffering + { + Id = id + }; + case SalvageOffering: + // Salvage map seed + _salvageMaps.Clear(); + _salvageMaps.AddRange(_proto.EnumeratePrototypes()); + _salvageMaps.Sort((x, y) => string.Compare(x.ID, y.ID, StringComparison.Ordinal)); + var mapIndex = rand.Next(_salvageMaps.Count); + var map = _salvageMaps[mapIndex]; - return new SalvageOffering() - { - SalvageMap = map, - }; + return new SalvageOffering + { + SalvageMap = map, + }; + default: + throw new NotImplementedException($"Salvage type {type} not implemented!"); + } } } diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl index 5ed2649569c..e160a8c0e04 100644 --- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl +++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl @@ -31,6 +31,9 @@ salvage-magnet-resources-count = {$count -> *[other] (Extraordinary) } +# Debris +salvage-magnet-debris-ChunkDebris = Space Debris + # Asteroids dungeon-config-proto-BlobAsteroid = Asteroid clump dungeon-config-proto-ClusterAsteroid = Asteroid cluster diff --git a/Resources/Prototypes/Procedural/Magnet/space_debris.yml b/Resources/Prototypes/Procedural/Magnet/space_debris.yml new file mode 100644 index 00000000000..26b4ae25c80 --- /dev/null +++ b/Resources/Prototypes/Procedural/Magnet/space_debris.yml @@ -0,0 +1,40 @@ +- type: dungeonConfig + id: ChunkDebris + # Floor generation + layers: + - !type:NoiseDunGen + tileCap: 500 + capStd: 32 + iterations: 5 + layers: + - tile: FloorSteel + threshold: 0.50 + noise: + frequency: 0.05 + noiseType: OpenSimplex2 + fractalType: FBm + octaves: 3 + lacunarity: 3 + gain: 0.5 + - tile: Plating + threshold: 0.35 + noise: + frequency: 0.05 + noiseType: OpenSimplex2 + fractalType: FBm + octaves: 3 + lacunarity: 3 + gain: 0.3 + - tile: Lattice + threshold: 0.25 + noise: + frequency: 0.05 + noiseType: OpenSimplex2 + fractalType: FBm + octaves: 3 + lacunarity: 3 + gain: 0.5 + + # Generate biome + - !type:BiomeDunGen + biomeTemplate: SpaceDebris diff --git a/Resources/Prototypes/Procedural/Magnet/space_debris_templates.yml b/Resources/Prototypes/Procedural/Magnet/space_debris_templates.yml new file mode 100644 index 00000000000..6500f4415b1 --- /dev/null +++ b/Resources/Prototypes/Procedural/Magnet/space_debris_templates.yml @@ -0,0 +1,115 @@ +# Asteroid +- type: biomeTemplate + id: SpaceDebris + layers: + - !type:BiomeEntityLayer + threshold: 0.20 + noise: + seed: 0 + noiseType: OpenSimplex2 + fractalType: Ridged + octaves: 4 + frequency: 0.065 + gain: 5 + lacunarity: 1.5 + allowedTiles: + - Plating + - FloorSteel + entities: + - WallSolid + - AirlockMaintLocked + - Girder + - Girder + - WallReinforced + - WallSolid + - WallSolid + - !type:BiomeEntityLayer + threshold: 0.5 + noise: + seed: 0 + noiseType: OpenSimplex2 + fractalType: Ridged + octaves: 4 + frequency: 0.065 + gain: 2 + lacunarity: 1.5 + allowedTiles: + - Plating + - Lattice + entities: + - Grille + - Grille + - Grille + - GrilleBroken + - !type:BiomeDecalLayer + allowedTiles: + - FloorSteel + threshold: -0.5 + divisions: 1 + noise: + seed: 1 + frequency: 1 + decals: + - DirtHeavy + - DirtHeavy + - DirtHeavy + - DirtMedium + - DirtMedium + - DirtLight + - !type:BiomeEntityLayer + threshold: 0.45 + noise: + seed: 1 + noiseType: OpenSimplex2 + fractalType: Ridged + octaves: 4 + frequency: 0.065 + gain: 2 + lacunarity: 1.5 + allowedTiles: + - Plating + - FloorSteel + entities: + - WeldingFuelTankFull + - Table + - SalvageCanisterSpawner + - Rack + - ClosetMaintenanceFilledRandom + - ClosetMaintenanceFilledRandom + - !type:BiomeEntityLayer + allowedTiles: + - FloorSteel + - Plating + threshold: 0.2 + noise: + seed: 1 + frequency: 1 + entities: + - SalvageSpawnerScrapCommon + - SalvageSpawnerScrapCommon75 + - SalvageSpawnerScrapCommon75 + - SalvageSpawnerScrapValuable + - SalvageSpawnerScrapValuable75 + - !type:BiomeEntityLayer + allowedTiles: + - FloorSteel + threshold: 0.7 + noise: + seed: 1 + frequency: 1 + entities: + - SalvageSpawnerTreasureValuable + - SalvageSpawnerEquipmentValuable + - SalvageSpawnerTreasure + - SalvageSpawnerTreasure + - SalvageSpawnerEquipment + - SalvageSpawnerEquipment + - !type:BiomeEntityLayer + allowedTiles: + - FloorSteel + threshold: 0.85 + noise: + seed: 1 + frequency: 1 + entities: + - SalvageSpawnerMobMagnet75 From 65423e49aec3ecfe29c84dce6ffe6ce08940eeb9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 24 Aug 2024 02:10:42 +0000 Subject: [PATCH 026/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1caf0a81838..b27335118f3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lyndomen - changes: - - message: Space Dragons will drop bodies upon being gibbed/butchered - type: Fix - id: 6697 - time: '2024-06-08T05:49:42.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28709 - author: metalgearsloth changes: - message: Fix some loadout groups not getting validated properly. @@ -3864,3 +3857,17 @@ id: 7196 time: '2024-08-24T02:06:38.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31290 +- author: EmoGarbage404 + changes: + - message: The salvage magnet can now pull in large chunks of space debris. Be wary + of space carp infestations! + type: Add + - message: The small asteroids and pieces of debris that generated around the station + have been removed. + type: Remove + - message: The salvage magnet now randomly picks what type of pulls will be offered + instead of always having a consistent number of each. + type: Tweak + id: 7197 + time: '2024-08-24T02:09:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31113 From b410f4ba88a9d8696ee097472c3657d428e780a5 Mon Sep 17 00:00:00 2001 From: Zachary Yona <58833995+Magicalus@users.noreply.github.com> Date: Fri, 23 Aug 2024 23:24:15 -0400 Subject: [PATCH 027/223] Stop nanotrasen sign from rotating (#31388) make snapCardinals false for the nanotrasen sign. Co-authored-by: Zachary Yona --- .../Entities/Structures/Wallmounts/Signs/signs.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 7911e63bfbd..7560bc35ba2 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -1235,6 +1235,7 @@ components: - type: Sprite state: nanotrasen_sign1 + snapCardinals: false - type: entity parent: BaseSign @@ -1244,6 +1245,7 @@ components: - type: Sprite state: nanotrasen_sign2 + snapCardinals: false - type: entity parent: BaseSign @@ -1253,6 +1255,7 @@ components: - type: Sprite state: nanotrasen_sign3 + snapCardinals: false - type: entity parent: BaseSign @@ -1262,6 +1265,7 @@ components: - type: Sprite state: nanotrasen_sign4 + snapCardinals: false - type: entity parent: BaseSign @@ -1271,6 +1275,7 @@ components: - type: Sprite state: nanotrasen_sign5 + snapCardinals: false - type: entity parent: BaseSign From 56eed8e0bbf1ea8ab6d4e35403341ff44da39b73 Mon Sep 17 00:00:00 2001 From: Spessmann <156740760+Spessmann@users.noreply.github.com> Date: Fri, 23 Aug 2024 22:25:30 -0700 Subject: [PATCH 028/223] Cog update (AI ready) (#31384) real --- Resources/Maps/cog.yml | 7433 ++++++++++++++++------------------------ 1 file changed, 2919 insertions(+), 4514 deletions(-) diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml index 7294645832b..5f4fb440225 100644 --- a/Resources/Maps/cog.yml +++ b/Resources/Maps/cog.yml @@ -71,19 +71,19 @@ entities: chunks: 0,0: ind: 0,0 - tiles: EgAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAACwAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAABgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: EgAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAACwAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAABgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,0: ind: -1,0 - tiles: YAAAAAABYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAEgAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: YAAAAAABYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAIAAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAIAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: YAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACOQAAAAAAOQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAAC + tiles: YAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAOQAAAAAAOQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAABIAAAAAAAIAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: OQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAOQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAYAAAAAABgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAA + tiles: OQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAOQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,-2: ind: -1,-2 @@ -107,7 +107,7 @@ entities: version: 6 -3,0: ind: -3,0 - tiles: AAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: AAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -3,-1: ind: -3,-1 @@ -115,7 +115,7 @@ entities: version: 6 -3,-2: ind: -3,-2 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAADgQAAAAAAcwAAAAACcwAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAABcwAAAAADcwAAAAAAcwAAAAABcwAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAABcwAAAAABcwAAAAACgQAAAAAAcwAAAAAAcwAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACcwAAAAACcwAAAAABcwAAAAACcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAACcwAAAAAAcwAAAAACcwAAAAACcwAAAAACgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAAAcwAAAAABcwAAAAACcwAAAAADcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABcwAAAAADcwAAAAAAcwAAAAACcwAAAAACgQAAAAAAIAAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAABIAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABgQAAAAAAIAAAAAAAIAAAAAABIAAAAAAAIAAAAAAAIAAAAAABIAAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAIAAAAAADIAAAAAADIAAAAAAAIAAAAAACIAAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAABIAAAAAADIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAIAAAAAADIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAIAAAAAADIAAAAAACIAAAAAABIAAAAAABIAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAADgQAAAAAAcwAAAAACcwAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAABcwAAAAADcwAAAAAAcwAAAAABcwAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAABcwAAAAABcwAAAAACgQAAAAAAcwAAAAAAcwAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACcwAAAAACcwAAAAABcwAAAAACcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAACcwAAAAAAcwAAAAACcwAAAAACcwAAAAACgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAAAcwAAAAABcwAAAAACcwAAAAADcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABcwAAAAADcwAAAAAAcwAAAAACcwAAAAACgQAAAAAAIAAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAABIAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABgQAAAAAAIAAAAAAAIAAAAAABIAAAAAAAIAAAAAAAIAAAAAABIAAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAIAAAAAADIAAAAAADIAAAAAAAIAAAAAACIAAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAABIAAAAAADIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAIAAAAAADIAAAAAACIAAAAAABIAAAAAABIAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAA version: 6 -1,-3: ind: -1,-3 @@ -167,7 +167,7 @@ entities: version: 6 1,-1: ind: 1,-1 - tiles: YAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAYAAAAAABgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAAA + tiles: YAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAYAAAAAABgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAAA version: 6 1,0: ind: 1,0 @@ -175,7 +175,7 @@ entities: version: 6 2,-1: ind: 2,-1 - tiles: YAAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAACgQAAAAAAgQAAAAAABwAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAABwAAAAAABwAAAAAAgQAAAAAAYAAAAAABBwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgQAAAAAAYAAAAAABgQAAAAAABwAAAAAABwAAAAAABwAAAAAAYAAAAAADgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADBwAAAAAAgQAAAAAAYAAAAAABYAAAAAACBwAAAAAAYAAAAAACBwAAAAAAYAAAAAADgQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAfQAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAfQAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: YAAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAACgQAAAAAAgQAAAAAABwAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAABwAAAAAABwAAAAAAgQAAAAAAYAAAAAABBwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgQAAAAAAYAAAAAABgQAAAAAABwAAAAAABwAAAAAABwAAAAAAYAAAAAADgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACBwAAAAAAYAAAAAACBwAAAAAAYAAAAAADgQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAfQAAAAABYAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAfQAAAAACgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 2,0: ind: 2,0 @@ -251,7 +251,7 @@ entities: version: 6 -3,1: ind: -3,1 - tiles: AAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAACgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAACAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAACAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAABgAAAAAAAgAAAAAAAgQAAAAAAIAAAAAADIAAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAADIAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAACIAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAAAIAAAAAAAIAAAAAADYAAAAAADYAAAAAADIAAAAAABIAAAAAACIAAAAAAAIAAAAAACIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABIAAAAAADIAAAAAACYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAIAAAAAADIAAAAAACIAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAUQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAADgQAAAAAAYAAAAAADYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: gAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAACgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAACAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAACAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAABgAAAAAAAgAAAAAAAgQAAAAAAIAAAAAADIAAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAADIAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAACIAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAAAIAAAAAAAIAAAAAADYAAAAAADYAAAAAADIAAAAAABIAAAAAACIAAAAAAAIAAAAAACIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAABIAAAAAADIAAAAAACYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAIAAAAAADIAAAAAACIAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAUQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAADgQAAAAAAYAAAAAADYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -2,1: ind: -2,1 @@ -263,11 +263,11 @@ entities: version: 6 -4,1: ind: -4,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAIAAAAAACIAAAAAABIAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAHAAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAIAAAAAADIAAAAAADIAAAAAADIAAAAAABIAAAAAACIAAAAAABIAAAAAADYAAAAAABYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAACIAAAAAADYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAACIAAAAAABIAAAAAAAIAAAAAADIAAAAAABIAAAAAADIAAAAAAAYAAAAAACYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAAAIAAAAAADIAAAAAAAIAAAAAADgQAAAAAAYAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAACIAAAAAADYAAAAAABYAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAADIAAAAAABIAAAAAADYAAAAAAAYAAAAAACYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAADIAAAAAABIAAAAAACIAAAAAABIAAAAAABIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAACIAAAAAABIAAAAAAAIAAAAAACIAAAAAAAIAAAAAAAYAAAAAADYAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAACIAAAAAABIAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHAAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAIAAAAAADIAAAAAADIAAAAAADIAAAAAABIAAAAAACIAAAAAABIAAAAAADYAAAAAABYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAACIAAAAAADYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAACIAAAAAABIAAAAAAAIAAAAAADIAAAAAABIAAAAAADIAAAAAAAYAAAAAACYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAAAIAAAAAADIAAAAAAAIAAAAAADgQAAAAAAYAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAACIAAAAAADYAAAAAABYAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAADIAAAAAABIAAAAAADYAAAAAAAYAAAAAACYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAIAAAAAADIAAAAAABIAAAAAACIAAAAAABIAAAAAABIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAACIAAAAAABIAAAAAAAIAAAAAACIAAAAAAAIAAAAAAAYAAAAAADYAAAAAAA version: 6 -3,2: ind: -3,2 - tiles: YAAAAAADYAAAAAACgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAABIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAAAYAAAAAABgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADIAAAAAADIAAAAAACIAAAAAADIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAAAIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAABIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAA + tiles: YAAAAAADYAAAAAACgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAQgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAQgAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAABIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAAAYAAAAAABgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADIAAAAAADIAAAAAACIAAAAAADIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAAAIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAABIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAA version: 6 -2,2: ind: -2,2 @@ -375,15 +375,15 @@ entities: version: 6 -4,2: ind: -4,2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAADIAAAAAADIAAAAAABIAAAAAADIAAAAAADIAAAAAADYAAAAAACYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAACIAAAAAAAIAAAAAACIAAAAAAAYAAAAAADYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAIAAAAAABEgAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAABIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAADIAAAAAADIAAAAAABIAAAAAADIAAAAAADIAAAAAADYAAAAAACYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAIAAAAAABIAAAAAABIAAAAAADIAAAAAACIAAAAAAAIAAAAAACIAAAAAAAYAAAAAADYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAIAAAAAABEgAAAAAAEgAAAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAABIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -4,0: ind: -4,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAA version: 6 -5,2: ind: -5,2 - tiles: YAAAAAABYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAA version: 6 -4,3: ind: -4,3 @@ -399,7 +399,7 @@ entities: version: 6 -2,3: ind: -2,3 - tiles: CwAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAEwAAAAADEwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAADQAAAAAAcAAAAAAAgQAAAAAAfQAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAADgQAAAAAABAAAAAAABAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAACBAAAAAAABAAAAAAABAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFQAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFQAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAACwAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAADQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAADQAAAAAAgQAAAAAAYAAAAAAC + tiles: CwAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAEwAAAAADEwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAADQAAAAAAcAAAAAAAgQAAAAAAfQAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAADgQAAAAAABAAAAAAABAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAACBAAAAAAABAAAAAAABAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFQAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAACgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFQAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAACwAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAADQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAADQAAAAAAgQAAAAAAYAAAAAAC version: 6 -4,4: ind: -4,4 @@ -413,18 +413,6 @@ entities: ind: -2,4 tiles: gQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - -5,1: - ind: -5,1 - tiles: gAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAIAAAAAAAIAAAAAABgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAIAAAAAAAIAAAAAADIAAAAAAAIAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACEgAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAABgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgAAAAAAIAAAAAACEgAAAAAAEgAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgAAAAAAIAAAAAABEgAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAACIAAAAAABIAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABEgAAAAAAEgAAAAAAEgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAACIAAAAAAAIAAAAAABgQAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADgQAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -6,1: - ind: -6,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAIAAAAAABIAAAAAADIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAACIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAA - version: 6 - -6,2: - ind: -6,2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 4,0: ind: 4,0 tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAA @@ -660,7 +648,6 @@ entities: 2090: -29,11 2091: -29,7 2092: -32,7 - 2207: -83,38 2238: -45,38 2239: -45,39 2240: -45,41 @@ -767,6 +754,10 @@ entities: 5553: -26,58 5554: -27,58 5555: -28,58 + 5779: 31,-8 + 5786: 31,-2 + 5798: 0,-4 + 5799: -2,-4 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -995,100 +986,6 @@ entities: 2506: 8,39 4060: 66,44 4071: 66,53 - - node: - color: '#334E6DC8' - id: BrickTileWhiteLineN - decals: - 2175: -78,23 - - node: - color: '#52B4E996' - id: BrickTileWhiteLineN - decals: - 2164: -82,23 - - node: - color: '#9FED5896' - id: BrickTileWhiteLineN - decals: - 2174: -77,26 - - node: - color: '#A4610696' - id: BrickTileWhiteLineN - decals: - 2168: -83,26 - - node: - color: '#D381C996' - id: BrickTileWhiteLineN - decals: - 2169: -79,26 - - node: - color: '#D4D4D428' - id: BrickTileWhiteLineN - decals: - 2181: -82,26 - 2182: -78,26 - 2183: -80,23 - - node: - color: '#D4D4D496' - id: BrickTileWhiteLineN - decals: - 2170: -81,26 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteLineN - decals: - 2178: -77,23 - - node: - color: '#EFB34196' - id: BrickTileWhiteLineN - decals: - 2165: -83,23 - - node: - color: '#334E6DC8' - id: BrickTileWhiteLineS - decals: - 2176: -79,23 - - node: - color: '#52B4E996' - id: BrickTileWhiteLineS - decals: - 2163: -81,23 - - node: - color: '#9FED5896' - id: BrickTileWhiteLineS - decals: - 2173: -77,26 - - node: - color: '#A4610696' - id: BrickTileWhiteLineS - decals: - 2167: -83,26 - - node: - color: '#D381C996' - id: BrickTileWhiteLineS - decals: - 2172: -78,26 - - node: - color: '#D4D4D428' - id: BrickTileWhiteLineS - decals: - 2179: -82,23 - 2180: -78,23 - 2184: -80,26 - - node: - color: '#D4D4D496' - id: BrickTileWhiteLineS - decals: - 2171: -82,26 - - node: - color: '#DE3A3A96' - id: BrickTileWhiteLineS - decals: - 2177: -77,23 - - node: - color: '#EFB34196' - id: BrickTileWhiteLineS - decals: - 2166: -83,23 - node: color: '#FFFFFFFF' id: BushAThree @@ -1282,8 +1179,6 @@ entities: 2055: -43,4 2056: -43,14 2057: -37,14 - 2080: -4,-15 - 2081: 2,-15 2228: -40,39 2229: -40,41 2230: -36,44 @@ -1306,6 +1201,8 @@ entities: 5380: -33,68 5381: -38,68 5400: 51,-22 + 5749: -4,-16 + 5750: 2,-16 - node: cleanable: True color: '#FFFFFFFF' @@ -1646,8 +1543,6 @@ entities: 4283: 25,5 4284: 28,3 4285: 29,2 - 4286: 30,-4 - 4288: 30,0 4289: 36,-2 4290: 36,-1 4291: 34,1 @@ -1945,9 +1840,7 @@ entities: 5453: -9,-15 5454: -9,-13 5455: -9,-11 - 5456: -9,-9 5457: -9,-7 - 5458: -9,-5 5459: -9,-4 5460: -9,-2 5461: -9,0 @@ -1961,6 +1854,108 @@ entities: 5469: -6,7 5470: -6,8 5471: -6,9 + 5628: -26,53 + 5629: -25,53 + 5630: -26,54 + 5631: -25,54 + 5632: -25,55 + 5633: -26,55 + 5634: -24,55 + 5635: -28,53 + 5636: -29,55 + 5637: -28,56 + 5638: -30,50 + 5639: -31,50 + 5640: -27,51 + 5641: -24,52 + 5642: -23,52 + 5643: -23,53 + 5644: -24,53 + 5645: -24,54 + 5646: -23,55 + 5647: -24,55 + 5648: -25,55 + 5649: -25,54 + 5650: -26,53 + 5651: -25,54 + 5652: -19,55 + 5653: -23,61 + 5654: -24,62 + 5655: -27,64 + 5656: -29,63 + 5657: -28,67 + 5658: -29,68 + 5659: -27,69 + 5660: -29,72 + 5661: -31,72 + 5662: -33,72 + 5663: -35,72 + 5664: -37,72 + 5665: -40,72 + 5666: -45,67 + 5667: -44,70 + 5668: -45,72 + 5669: -42,69 + 5670: -42,68 + 5671: -42,66 + 5672: -42,65 + 5673: -43,65 + 5674: -45,65 + 5675: -47,65 + 5676: -49,65 + 5677: -50,65 + 5678: -51,65 + 5679: -51,65 + 5680: -51,64 + 5681: -51,62 + 5683: -53,61 + 5684: -54,61 + 5685: -54,62 + 5686: -53,62 + 5687: -51,61 + 5688: -51,59 + 5689: -51,56 + 5690: -51,54 + 5691: -51,51 + 5692: -51,50 + 5693: -51,49 + 5694: -50,49 + 5695: -49,44 + 5696: -49,44 + 5697: -47,46 + 5698: -47,46 + 5699: -46,46 + 5700: -46,47 + 5701: -45,47 + 5702: -47,45 + 5703: -48,45 + 5704: -48,44 + 5705: -43,44 + 5706: -41,44 + 5707: -40,48 + 5708: -40,45 + 5709: -43,48 + 5710: -35,46 + 5711: -36,48 + 5712: -34,49 + 5713: -28,47 + 5714: -31,44 + 5715: -28,44 + 5716: -30,46 + 5717: -23,44 + 5718: -22,46 + 5719: -21,44 + 5720: -19,49 + 5721: -20,49 + 5722: -21,49 + 5723: -24,57 + 5724: -23,57 + 5725: -26,59 + 5726: -27,60 + 5727: -23,64 + 5728: -24,65 + 5729: -22,65 + 5730: -23,64 - node: cleanable: True color: '#FFFFFFFF' @@ -2027,7 +2022,6 @@ entities: 1854: 46,63 1855: 46,64 2992: 0,-2 - 2993: 0,-4 2994: -2,-8 2995: -7,-7 2996: -16,-7 @@ -2318,7 +2312,6 @@ entities: 3289: 35,50 3290: 31,49 3291: 26,46 - 3292: 23,45 3293: 25,49 3295: 21,49 3296: 19,46 @@ -2396,7 +2389,6 @@ entities: 3368: 38,23 3369: 38,22 3370: 24,26 - 3371: 24,28 3372: 20,29 3373: 21,30 3374: 23,29 @@ -2439,7 +2431,6 @@ entities: 3412: 43,7 3413: 36,-3 3415: 30,2 - 3416: 30,-3 3417: 25,3 3418: 21,2 3419: 20,4 @@ -2917,14 +2908,6 @@ entities: 3911: -3,15 3912: -2,16 3913: -2,16 - 3915: -78,20 - 3916: -80,23 - 3917: -81,24 - 3918: -78,24 - 3919: -79,26 - 3920: -80,30 - 3921: -78,32 - 3922: -81,33 4206: -35,27 4207: -34,27 4208: -32,27 @@ -3169,6 +3152,8 @@ entities: 5612: -51,29 5621: -58,27 5622: -57,33 + 5760: 39,-5 + 5958: -54,38 - node: color: '#3EB38896' id: FullTileOverlayGreyscale @@ -3229,6 +3214,7 @@ entities: 2426: -5,65 2976: -17,-41 2977: -16,-41 + 5763: 35,-5 - node: color: '#52B4E9FF' id: FullTileOverlayGreyscale @@ -3293,6 +3279,7 @@ entities: 2865: 53,46 2866: 52,47 2867: 52,48 + 5766: 36,-8 - node: color: '#A4610696' id: FullTileOverlayGreyscale @@ -3308,6 +3295,7 @@ entities: 1177: 62,-19 1178: 63,-19 1335: 48,-21 + 5765: 33,-5 - node: color: '#D381C996' id: FullTileOverlayGreyscale @@ -3324,6 +3312,7 @@ entities: 3942: -19,-22 3943: -19,-21 3944: -19,-20 + 5762: 36,-5 - node: zIndex: 1 color: '#D381C996' @@ -3335,6 +3324,17 @@ entities: 212: -44,-33 213: -45,-33 214: -43,-33 + - node: + color: '#D4D4D428' + id: FullTileOverlayGreyscale + decals: + 5854: -5,46 + 5888: 25,28 + - node: + color: '#D4D4D496' + id: FullTileOverlayGreyscale + decals: + 5764: 34,-5 - node: color: '#DE3A3A96' id: FullTileOverlayGreyscale @@ -3353,6 +3353,7 @@ entities: 2773: 20,58 5389: -47,52 5515: -30,62 + 5761: 38,-5 - node: color: '#DE3A3AFF' id: FullTileOverlayGreyscale @@ -3380,20 +3381,14 @@ entities: 693: 31,-19 703: 34,-22 832: 35,-2 - 843: 31,-2 - 844: 30,-3 - 845: 30,-4 - 846: 30,-5 847: 29,-14 848: 29,-13 849: 29,-12 864: 20,3 1360: 12,-25 1361: 13,-25 - 1521: 30,-2 - 1522: 30,-1 - 1523: 30,0 2825: 45,46 + 5767: 35,-8 - node: color: '#FFFFFFFF' id: Grassa4 @@ -3516,6 +3511,12 @@ entities: 4690: -35,23 4691: -34,23 4692: -33,23 + 5734: -1,-8 + 5742: -2,-10 + 5743: -1,-10 + 5744: 0,-10 + 5955: -42,30 + 5956: -44,30 - node: color: '#3EB38896' id: HalfTileOverlayGreyscale @@ -3729,6 +3730,31 @@ entities: 1890: -22,5 1891: -21,5 1892: -20,5 + 5846: -12,45 + 5847: -13,45 + 5848: -14,45 + 5849: -6,45 + 5850: -5,45 + 5864: 14,45 + 5865: 13,45 + 5866: 11,45 + 5867: 12,45 + 5868: 10,45 + 5869: 9,45 + 5870: 8,45 + 5871: 6,45 + 5872: 7,45 + 5873: 5,45 + 5929: 44,56 + 5930: 45,56 + 5931: 46,56 + 5932: 47,56 + 5935: -23,29 + 5936: -24,29 + 5937: -25,29 + 5938: -27,29 + 5939: -28,29 + 5940: -29,29 - node: color: '#D4D4D496' id: HalfTileOverlayGreyscale @@ -3825,13 +3851,6 @@ entities: 1394: -23,-3 1395: -22,-3 1396: -21,-3 - 2200: -82,38 - 2201: -81,38 - 2202: -82,33 - 2203: -81,33 - 2204: -80,33 - 2205: -79,33 - 2206: -78,33 2786: 45,53 2787: 46,53 2788: 47,53 @@ -3899,6 +3918,11 @@ entities: 5625: -53,16 5626: -52,16 5627: -51,16 + 5731: -1,-6 + 5746: -1,-4 + 5952: -44,27 + 5953: -43,27 + 5954: -42,27 - node: color: '#43990996' id: HalfTileOverlayGreyscale180 @@ -4110,6 +4134,47 @@ entities: 1917: -23,-1 1918: -24,-1 1919: -25,-1 + 5821: -19,26 + 5822: -20,26 + 5823: -21,26 + 5838: -12,43 + 5839: -11,43 + 5840: -10,43 + 5841: -9,43 + 5842: -8,43 + 5843: -6,43 + 5844: -5,43 + 5855: 5,43 + 5856: 4,43 + 5857: 2,43 + 5858: 1,43 + 5859: 0,43 + 5863: 10,43 + 5906: 43,41 + 5907: 42,41 + 5908: 41,41 + 5909: 39,41 + 5910: 40,41 + 5911: 38,41 + 5912: 48,43 + 5913: 47,43 + 5914: 44,43 + 5915: 45,43 + 5916: 46,43 + 5917: 57,44 + 5918: 56,44 + 5919: 55,44 + 5920: 54,44 + 5921: 53,44 + 5922: 52,44 + 5923: 51,44 + 5942: -23,26 + 5943: -24,26 + 5944: -25,26 + 5946: -28,25 + 5947: -29,25 + 5948: -30,25 + 5965: 38,-7 - node: color: '#D4D4D496' id: HalfTileOverlayGreyscale180 @@ -4213,8 +4278,6 @@ entities: 1390: -24,-8 1391: -23,-8 1392: -22,-8 - 2196: -82,35 - 2197: -81,35 2401: -48,24 2784: 45,47 2785: 44,47 @@ -4246,6 +4309,7 @@ entities: 4328: -58,31 5609: -50,27 5610: -50,30 + 5732: 0,-7 - node: color: '#3EB38896' id: HalfTileOverlayGreyscale270 @@ -4402,6 +4466,28 @@ entities: 1911: -18,1 1912: -18,2 1913: -18,3 + 5811: -18,15 + 5812: -18,18 + 5813: -18,19 + 5814: -18,20 + 5815: -18,21 + 5816: -18,22 + 5817: -18,23 + 5818: -18,24 + 5819: -18,25 + 5860: 11,40 + 5861: 11,41 + 5862: 11,42 + 5879: 18,26 + 5880: 18,27 + 5881: 18,28 + 5882: 18,29 + 5883: 18,30 + 5925: 48,57 + 5926: 48,58 + 5927: 48,59 + 5961: 33,-7 + 5962: 33,-6 - node: color: '#D4D4D496' id: HalfTileOverlayGreyscale270 @@ -4478,9 +4564,6 @@ entities: 1933: -18,-7 1934: -18,-6 1935: -18,-5 - 2192: -83,32 - 2193: -83,36 - 2194: -83,37 2812: 29,46 2815: 50,46 2816: 50,47 @@ -4501,6 +4584,12 @@ entities: 4965: 7,2 4968: 9,-8 4969: 9,-7 + 5787: 29,-5 + 5788: 29,-4 + 5789: 29,-3 + 5790: 29,-2 + 5791: 29,-1 + 5792: 29,0 - node: color: '#FA750096' id: HalfTileOverlayGreyscale270 @@ -4517,6 +4606,8 @@ entities: 4322: -46,27 4693: -32,21 4694: -32,22 + 5733: -2,-7 + 5748: -11,-7 - node: color: '#3EB38896' id: HalfTileOverlayGreyscale90 @@ -4708,16 +4799,53 @@ entities: 1920: -15,-9 1921: -15,-8 1922: -15,-7 - 1923: -15,-6 1924: -15,-5 1925: -15,-4 1926: -15,-3 1927: -15,-2 1928: -15,-1 1929: -15,0 - 1930: -15,1 1931: -15,2 1932: -15,3 + 5800: -15,-6 + 5801: -15,1 + 5802: -15,15 + 5803: -15,16 + 5804: -15,17 + 5805: -15,18 + 5806: -15,19 + 5807: -15,20 + 5808: -15,21 + 5809: -15,22 + 5810: -15,23 + 5824: -15,32 + 5825: -15,33 + 5826: -15,34 + 5827: -15,35 + 5828: -15,36 + 5829: -15,37 + 5830: -15,38 + 5831: -15,39 + 5832: -15,40 + 5878: 15,43 + 5884: 24,26 + 5887: 24,30 + 5891: 35,22 + 5892: 35,24 + 5893: 35,25 + 5894: 35,26 + 5895: 35,27 + 5896: 35,28 + 5897: 35,29 + 5898: 35,30 + 5899: 35,31 + 5900: 35,32 + 5901: 35,33 + 5902: 35,34 + 5903: 35,35 + 5904: 35,36 + 5905: 35,37 + 5963: 39,-6 - node: color: '#D4D4D496' id: HalfTileOverlayGreyscale90 @@ -4793,9 +4921,6 @@ entities: 1397: -20,-4 1398: -20,-5 1399: -20,-6 - 2195: -77,32 - 2198: -79,36 - 2199: -79,37 2831: 48,48 2832: 48,49 2833: 48,50 @@ -4814,6 +4939,11 @@ entities: 4960: 13,3 4961: 13,2 5619: -50,30 + 5793: 31,-1 + 5794: 31,0 + 5795: 31,-3 + 5796: 31,-4 + 5797: 31,-5 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' @@ -4900,6 +5030,7 @@ entities: 4685: -33,19 4686: -32,19 5614: -50,29 + 5738: 0,-8 - node: color: '#3EB38896' id: QuarterTileOverlayGreyscale @@ -5050,6 +5181,9 @@ entities: id: QuarterTileOverlayGreyscale decals: 1883: -18,11 + 5851: -4,45 + 5852: -11,45 + 5933: 48,56 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale @@ -5108,6 +5242,7 @@ entities: 4679: -34,25 4680: -33,25 4681: -32,25 + 5735: -2,-6 - node: color: '#3EB38896' id: QuarterTileOverlayGreyscale180 @@ -5247,6 +5382,14 @@ entities: decals: 1885: -26,15 1901: -26,7 + 5833: -15,41 + 5834: -14,42 + 5835: -13,43 + 5876: 9,43 + 5890: 24,27 + 5924: 50,44 + 5959: 34,-8 + 5960: 36,-7 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale180 @@ -5294,7 +5437,6 @@ entities: decals: 759: 23,-29 819: 23,-18 - 1366: 31,-10 1367: 31,-11 1368: 31,-12 1369: 31,-13 @@ -5309,6 +5451,9 @@ entities: 4977: 11,2 4978: 12,2 4979: 11,-6 + 5768: 31,-10 + 5769: 31,-9 + 5770: 31,-7 - node: color: '#FA750096' id: QuarterTileOverlayGreyscale180 @@ -5319,6 +5464,7 @@ entities: id: QuarterTileOverlayGreyscale270 decals: 5613: -50,28 + 5736: 0,-6 - node: color: '#3EB38896' id: QuarterTileOverlayGreyscale270 @@ -5397,6 +5543,10 @@ entities: id: QuarterTileOverlayGreyscale270 decals: 1900: -18,7 + 5820: -18,26 + 5845: -4,43 + 5875: 11,43 + 5877: 6,43 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale270 @@ -5503,11 +5653,21 @@ entities: 2621: 17,61 2824: 50,55 4967: 9,0 + 5774: 29,-11 + 5775: 29,-10 + 5776: 29,-9 + 5777: 29,-8 + 5778: 29,-7 - node: color: '#FA750096' id: QuarterTileOverlayGreyscale270 decals: 202: -34,-45 + - node: + color: '#334E6DC8' + id: QuarterTileOverlayGreyscale90 + decals: + 5737: -2,-8 - node: color: '#3EB38896' id: QuarterTileOverlayGreyscale90 @@ -5590,6 +5750,10 @@ entities: decals: 1884: -26,11 1905: -26,3 + 5853: -7,45 + 5874: 4,45 + 5889: 24,29 + 5941: -30,29 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale90 @@ -5879,7 +6043,6 @@ entities: 850: 25,-21 860: 20,4 1388: -25,-3 - 2185: -83,33 2827: 44,53 2828: 43,49 - node: @@ -5947,6 +6110,13 @@ entities: 125: -24,-26 234: -43,-31 5601: -30,-40 + - node: + color: '#D4D4D428' + id: ThreeQuarterTileOverlayGreyscale180 + decals: + 5836: -14,41 + 5837: -13,42 + 5964: 39,-7 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale180 @@ -5973,8 +6143,6 @@ entities: 863: 22,1 1385: -21,-8 1386: -20,-7 - 2188: -82,31 - 2189: -77,31 2830: 48,47 - node: color: '#FA750096' @@ -6060,9 +6228,6 @@ entities: 852: 25,-24 862: 20,1 1384: -25,-8 - 2186: -83,31 - 2187: -78,31 - 2190: -83,35 2826: 43,47 4963: 7,0 - node: @@ -6166,7 +6331,6 @@ entities: 851: 27,-21 861: 22,4 1387: -20,-3 - 2191: -77,33 2829: 48,53 4962: 13,5 - node: @@ -6199,11 +6363,6 @@ entities: id: WarnBox decals: 4106: -34,50 - - node: - color: '#EF000093' - id: WarnBox - decals: - 924: 29,-9 - node: color: '#EFB341FF' id: WarnBox @@ -6220,11 +6379,6 @@ entities: 1703: 37,8 2226: -33,53 2227: -32,48 - - node: - color: '#00FFFFFF' - id: WarnBoxGreyscale - decals: - 925: 29,-8 - node: angle: 3.141592653589793 rad color: '#3EB388FF' @@ -6309,12 +6463,6 @@ entities: 2746: 25,82 2767: 54,61 4941: 10,-12 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: WarnCornerSmallNE - decals: - 1530: 30,-2 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW @@ -6340,12 +6488,6 @@ entities: 3935: 29,4 4939: 7,3 4940: 10,-9 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: WarnCornerSmallSE - decals: - 1529: 30,-2 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW @@ -6354,16 +6496,6 @@ entities: 1253: 57,-25 2744: 11,77 4949: 10,-1 - - node: - color: '#FFFFFFFF' - id: WarnEndE - decals: - 2213: -53,38 - - node: - color: '#FFFFFFFF' - id: WarnEndW - decals: - 2208: -80,38 - node: color: '#FFFFFFFF' id: WarnFull @@ -6404,9 +6536,6 @@ entities: 896: 10,-15 897: 10,-14 920: 36,0 - 936: 30,-5 - 937: 30,-4 - 938: 30,-3 1227: 62,-22 1259: 57,-38 2069: -15,5 @@ -6461,13 +6590,6 @@ entities: 4942: 10,-11 4943: 10,-10 5598: -35,62 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: WarnLineE - decals: - 1526: 30,-1 - 1527: 30,0 - node: color: '#FFFFFFFF' id: WarnLineN @@ -6496,10 +6618,6 @@ entities: 577: 0,-44 906: 8,-15 918: 35,-1 - 929: 29,-7 - 930: 30,-7 - 931: 31,-7 - 939: 31,-2 973: -1,-14 1221: 59,-23 1222: 60,-23 @@ -6516,8 +6634,6 @@ entities: 1709: 50,19 1710: 51,19 1711: 52,19 - 2209: -79,38 - 2212: -54,38 2224: -31,49 2225: -30,49 4937: 8,3 @@ -6567,9 +6683,6 @@ entities: 914: 18,6 915: 18,7 921: 34,0 - 932: 30,-5 - 933: 30,-4 - 934: 30,-3 1228: 58,-22 1406: -28,-11 1407: -28,-10 @@ -6643,9 +6756,6 @@ entities: 541: -6,-53 548: -6,-52 549: -6,-51 - 1524: 30,-1 - 1525: 30,0 - 1528: 30,-2 - node: color: '#FFFFFFFF' id: WarnLineW @@ -6676,10 +6786,6 @@ entities: 900: 13,-17 901: 14,-17 919: 35,1 - 926: 29,-10 - 927: 30,-10 - 928: 31,-10 - 935: 31,-2 974: -1,-14 1224: 59,-21 1225: 60,-21 @@ -6695,8 +6801,6 @@ entities: 1514: 15,0 1515: 16,0 1704: 37,7 - 2210: -79,38 - 2211: -54,38 2222: -31,49 2223: -30,49 2375: -37,62 @@ -6720,12 +6824,14 @@ entities: 4701: 14,58 4719: 30,49 5396: 49,-11 + 5756: -42,34 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: 4700: 8,58 5395: 46,-11 + 5755: -45,34 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe @@ -6747,6 +6853,8 @@ entities: 4703: 14,56 4704: 14,55 5397: 49,-12 + 5758: -42,33 + 5759: -42,32 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN @@ -6763,6 +6871,8 @@ entities: 4720: 29,49 5398: 47,-11 5399: 48,-11 + 5752: -44,34 + 5753: -43,34 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS @@ -6780,6 +6890,7 @@ entities: 4711: 8,56 4712: 8,57 5394: 46,-12 + 5757: -45,33 - node: cleanable: True color: '#780000FF' @@ -6851,7 +6962,7 @@ entities: 0,-1: 0: 30577 -1,0: - 0: 15167 + 0: 47935 0,1: 0: 7 1: 4096 @@ -6923,7 +7034,7 @@ entities: 0: 1 2: 53232 4,3: - 0: 4097 + 0: 1 1: 26112 2: 12 -4,0: @@ -6957,10 +7068,10 @@ entities: -3,4: 0: 255 2: 28672 + -3,-1: + 0: 50274 -3,0: 0: 2184 - -3,-1: - 0: 34952 -2,0: 0: 13090 -2,2: @@ -6988,29 +7099,29 @@ entities: 0: 43144 2: 34 -4,-2: - 0: 46067 + 0: 48123 -5,-2: 0: 57304 -5,-1: 0: 56541 -4,-5: 0: 11063 - -3,-2: - 0: 35064 - 2: 8192 -3,-3: - 2: 8192 - 0: 34952 + 0: 12900 + 2: 32768 + -3,-2: + 0: 12528 + 2: 32768 -3,-4: - 0: 34952 + 0: 51336 -3,-5: 0: 36495 - -2,-2: - 0: 33008 - 2: 8192 -2,-3: - 2: 8192 - 0: 32904 + 2: 61440 + 0: 136 + -2,-2: + 0: 240 + 2: 61440 -2,-4: 1: 68 0: 32768 @@ -7273,19 +7384,21 @@ entities: -5,4: 0: 52479 2: 4096 + -12,3: + 2: 7952 + -13,3: + 2: 752 + -12,4: + 2: 49 + 0: 136 -12,1: 2: 14 - -12,3: - 2: 3584 -12,-1: 2: 57344 -12,0: 0: 2176 -11,0: 0: 12272 - -12,4: - 0: 136 - 2: 48 -11,-1: 2: 61952 -11,1: @@ -7330,7 +7443,6 @@ entities: 2: 240 -11,-5: 0: 4111 - 2: 3072 -10,-4: 0: 61440 -10,-3: @@ -7722,8 +7834,10 @@ entities: 8,-4: 0: 36667 8,-3: - 0: 139 - 2: 57856 + 0: 11 + 2: 3584 + 8,-2: + 0: 61167 8,-1: 0: 61408 4,4: @@ -7769,15 +7883,13 @@ entities: 0: 3886 8,3: 0: 36623 - 8,-2: - 2: 61166 9,-4: 0: 65295 9,-3: - 0: 51455 - 2: 4096 + 0: 51407 + 2: 256 9,-2: - 2: 4369 + 0: 57297 9,-1: 0: 13104 2: 32768 @@ -7792,8 +7904,8 @@ entities: 2: 8738 0: 34952 10,-1: - 0: 59528 2: 34 + 0: 59528 10,0: 0: 34954 2: 13104 @@ -8316,19 +8428,26 @@ entities: -2,8: 0: 63731 -16,5: - 2: 3855 - 1: 240 - -17,5: - 2: 3855 - 1: 240 + 2: 32768 + -16,6: + 2: 34952 -15,5: - 2: 1799 - 1: 112 + 2: 5905 -15,6: - 2: 2 + 2: 3 0: 52360 + -16,7: + 2: 34952 -15,7: + 2: 17 0: 52428 + -16,8: + 2: 2184 + -15,4: + 2: 65160 + -14,4: + 2: 4099 + 0: 51336 -14,5: 0: 4060 -14,6: @@ -8337,12 +8456,11 @@ entities: 0: 65535 -15,8: 0: 136 - 2: 57376 + 2: 4400 + -14,3: + 2: 6640 -14,8: 0: 3839 - -14,4: - 2: 32 - 0: 51336 -13,5: 0: 6007 -13,8: @@ -9063,37 +9181,29 @@ entities: 2: 2048 6,22: 2: 1092 - -16,9: - 2: 15 - 1: 65520 - -17,9: - 2: 15 - 1: 65520 -16,10: - 2: 65295 + 2: 65280 -17,10: - 2: 65295 + 2: 65280 -16,11: 2: 61455 -17,11: 2: 61455 -16,12: 2: 255 - -15,9: - 2: 15 - 1: 65520 -15,10: - 2: 65295 + 2: 65484 -15,11: 2: 64719 + -15,9: + 2: 50255 -15,12: 2: 52479 -14,9: 2: 1 - 1: 272 0: 3276 -14,10: - 2: 61711 + 2: 63999 -14,11: 2: 3 0: 36736 @@ -9102,52 +9212,12 @@ entities: -13,12: 0: 8936 2: 32768 - -20,8: - 0: 33535 - -20,7: - 0: 53599 - -21,8: - 0: 59630 - -20,9: - 0: 831 - 1: 34816 - -21,9: - 0: 36590 - -20,10: - 0: 51 - 2: 22536 - 1: 8192 - -21,10: - 0: 238 - 2: 20480 - 1: 8192 - -20,11: - 2: 80 - -21,11: - 2: 208 - -19,9: - 0: 3 - 1: 65476 - 2: 8 - -19,10: - 2: 3935 - -19,8: - 2: 514 - 1: 17508 - -19,7: - 1: 17508 - 2: 514 - -18,9: - 2: 15 - 1: 65520 - -18,10: - 2: 4383 -19,11: 2: 32768 -19,12: 2: 136 -18,11: - 2: 61713 + 2: 61696 -18,12: 2: 511 -17,12: @@ -9212,20 +9282,16 @@ entities: -8,16: 0: 52428 -7,13: - 0: 4368 - 2: 64 - 1: 19584 + 0: 56784 -7,14: 0: 63233 - 1: 4 + 2: 4 -7,15: 0: 29431 -7,16: 0: 13175 -6,13: - 2: 289 - 1: 4114 - 0: 57472 + 0: 61875 -6,14: 0: 61872 -6,15: @@ -9285,55 +9351,6 @@ entities: 2: 1092 -5,18: 0: 631 - -20,4: - 2: 2571 - 1: 1024 - -21,4: - 2: 2571 - 1: 1024 - -20,5: - 0: 65535 - -21,5: - 0: 61166 - -20,6: - 0: 65535 - -21,6: - 0: 61166 - -21,7: - 0: 24654 - -19,4: - 2: 7 - -19,5: - 2: 2570 - 1: 17632 - -19,6: - 2: 514 - 1: 17508 - -18,5: - 2: 3855 - 1: 240 - -22,4: - 2: 8750 - -22,5: - 2: 10762 - 1: 128 - -22,6: - 2: 10762 - 1: 128 - -22,7: - 2: 10762 - 1: 128 - -22,8: - 2: 10762 - 1: 128 - -22,9: - 2: 10762 - 1: 128 - -22,10: - 2: 10762 - 1: 128 - -22,11: - 2: 226 17,1: 2: 8751 1: 34816 @@ -10220,33 +10237,20 @@ entities: - 26327 - 26569 - 8461 - - uid: 22311 - components: - - type: Transform - pos: -76.5,34.5 - parent: 12 - - type: DeviceList - devices: - - 22314 - - 21954 - - 22313 - - 21953 - - 21955 - - 22328 - - 22329 - - 22330 - - uid: 22312 + - uid: 22248 components: - type: Transform - rot: 3.141592653589793 rad - pos: -78.5,35.5 + rot: 1.5707963267948966 rad + pos: 32.5,-5.5 parent: 12 - type: DeviceList devices: - - 22248 - - 22315 - - 22316 - - 22317 + - 22250 + - 22247 + - 22246 + - 22249 + - 22245 + - 22244 - uid: 22393 components: - type: Transform @@ -11208,14 +11212,6 @@ entities: - type: Transform pos: -4.5,11.5 parent: 12 - - uid: 21952 - components: - - type: Transform - anchored: True - pos: -82.5,41.5 - parent: 12 - - type: Physics - bodyType: Static - uid: 23700 components: - type: Transform @@ -11513,6 +11509,19 @@ entities: rot: 3.141592653589793 rad pos: -54.5,22.5 parent: 12 +- proto: AirlockCommandGlassLocked + entities: + - uid: 21940 + components: + - type: Transform + pos: -4.5,-6.5 + parent: 12 + - uid: 22232 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,-5.5 + parent: 12 - proto: AirlockCommandLocked entities: - uid: 146 @@ -11570,6 +11579,11 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,37.5 parent: 12 + - uid: 21325 + components: + - type: Transform + pos: -9.5,-6.5 + parent: 12 - proto: AirlockDetectiveLocked entities: - uid: 13590 @@ -11611,11 +11625,6 @@ entities: parent: 12 - proto: AirlockEngineeringLocked entities: - - uid: 57 - components: - - type: Transform - pos: 16.5,15.5 - parent: 12 - uid: 1016 components: - type: Transform @@ -11778,23 +11787,11 @@ entities: rot: 3.141592653589793 rad pos: -9.5,-19.5 parent: 12 - - uid: 22318 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -80.5,34.5 - parent: 12 - - uid: 22319 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,29.5 - parent: 12 - - uid: 22320 + - uid: 22224 components: - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,31.5 + rot: -1.5707963267948966 rad + pos: 32.5,-7.5 parent: 12 - uid: 24482 components: @@ -12213,18 +12210,6 @@ entities: - DoorStatus: DoorBolt - proto: AirlockExternalGlass entities: - - uid: 256 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-6.5 - parent: 12 - - uid: 274 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-6.5 - parent: 12 - uid: 288 components: - type: Transform @@ -12475,17 +12460,6 @@ entities: rot: 3.141592653589793 rad pos: -28.5,-10.5 parent: 12 - - uid: 9523 - components: - - type: Transform - pos: -20.5,55.5 - parent: 12 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 19828: - - DoorStatus: DoorBolt - uid: 10785 components: - type: Transform @@ -12546,18 +12520,6 @@ entities: linkedPorts: 11947: - DoorStatus: DoorBolt - - uid: 19828 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,55.5 - parent: 12 - - type: DeviceLinkSink - invokeCounter: 3 - - type: DeviceLinkSource - linkedPorts: - 9523: - - DoorStatus: DoorBolt - uid: 19844 components: - type: Transform @@ -12570,18 +12532,6 @@ entities: linkedPorts: 19847: - DoorStatus: DoorBolt - - uid: 22179 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -74.5,36.5 - parent: 12 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 22178: - - DoorStatus: DoorBolt - uid: 27232 components: - type: Transform @@ -12841,18 +12791,6 @@ entities: linkedPorts: 19844: - DoorStatus: DoorBolt - - uid: 22178 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -77.5,36.5 - parent: 12 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 22179: - - DoorStatus: DoorBolt - proto: AirlockFreezerLocked entities: - uid: 15387 @@ -13171,6 +13109,13 @@ entities: - type: Transform pos: 19.5,55.5 parent: 12 +- proto: AirlockHatchMaintenance + entities: + - uid: 21605 + components: + - type: Transform + pos: -21.5,55.5 + parent: 12 - proto: AirlockHeadOfPersonnelLocked entities: - uid: 18846 @@ -13337,12 +13282,6 @@ entities: - type: Transform pos: 7.5,-21.5 parent: 12 - - uid: 22321 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -80.5,39.5 - parent: 12 - uid: 28529 components: - type: Transform @@ -13587,6 +13526,16 @@ entities: - type: Transform pos: -18.5,33.5 parent: 12 + - uid: 21890 + components: + - type: Transform + pos: -12.5,-7.5 + parent: 12 + - uid: 21999 + components: + - type: Transform + pos: -12.5,-5.5 + parent: 12 - uid: 22340 components: - type: Transform @@ -13739,18 +13688,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,8.5 parent: 12 - - uid: 28519 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-7.5 - parent: 12 - - uid: 28520 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-5.5 - parent: 12 - uid: 29517 components: - type: Transform @@ -14986,51 +14923,24 @@ entities: - type: DeviceNetwork deviceLists: - 18887 - - uid: 22313 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,26.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 22311 - - uid: 22314 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,33.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 22311 - - uid: 22315 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -80.5,36.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 22312 - - uid: 22316 + - uid: 22249 components: - type: Transform - rot: 3.141592653589793 rad - pos: -75.5,36.5 + rot: 1.5707963267948966 rad + pos: 35.5,-5.5 parent: 12 - type: DeviceNetwork deviceLists: - - 22312 - - uid: 22317 + - 22248 + - uid: 22250 components: - type: Transform - rot: 3.141592653589793 rad - pos: -80.5,40.5 + rot: 1.5707963267948966 rad + pos: 39.5,-5.5 parent: 12 - type: DeviceNetwork deviceLists: - - 22312 + - 22248 - uid: 22390 components: - type: Transform @@ -15792,12 +15702,6 @@ entities: - type: Transform pos: -46.5,53.5 parent: 12 - - uid: 526 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -40.5,-21.5 - parent: 12 - uid: 853 components: - type: Transform @@ -15988,12 +15892,6 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,61.5 parent: 12 - - uid: 11034 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,2.5 - parent: 12 - uid: 11127 components: - type: Transform @@ -16185,15 +16083,23 @@ entities: - type: Transform pos: -11.5,46.5 parent: 12 - - uid: 21957 + - uid: 21918 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -39.5,-25.5 + parent: 12 + - uid: 21922 components: - type: Transform - pos: -80.5,42.5 + rot: 3.141592653589793 rad + pos: -0.5,1.5 parent: 12 - - uid: 21958 + - uid: 22225 components: - type: Transform - pos: -79.5,34.5 + rot: -1.5707963267948966 rad + pos: 40.5,-5.5 parent: 12 - uid: 24703 components: @@ -16613,11 +16519,6 @@ entities: - type: Transform pos: 17.5,14.5 parent: 12 - - uid: 3023 - components: - - type: Transform - pos: -73.5,21.5 - parent: 12 - uid: 3893 components: - type: Transform @@ -17236,366 +17137,6 @@ entities: - type: Transform pos: -34.5,-0.5 parent: 12 - - uid: 25394 - components: - - type: Transform - pos: -73.5,35.5 - parent: 12 - - uid: 26120 - components: - - type: Transform - pos: -74.5,21.5 - parent: 12 - - uid: 26122 - components: - - type: Transform - pos: -72.5,21.5 - parent: 12 - - uid: 26123 - components: - - type: Transform - pos: -71.5,21.5 - parent: 12 - - uid: 26124 - components: - - type: Transform - pos: -70.5,21.5 - parent: 12 - - uid: 26125 - components: - - type: Transform - pos: -69.5,21.5 - parent: 12 - - uid: 26126 - components: - - type: Transform - pos: -68.5,21.5 - parent: 12 - - uid: 26127 - components: - - type: Transform - pos: -67.5,21.5 - parent: 12 - - uid: 26128 - components: - - type: Transform - pos: -66.5,21.5 - parent: 12 - - uid: 26129 - components: - - type: Transform - pos: -64.5,21.5 - parent: 12 - - uid: 26130 - components: - - type: Transform - pos: -63.5,21.5 - parent: 12 - - uid: 26131 - components: - - type: Transform - pos: -62.5,21.5 - parent: 12 - - uid: 26132 - components: - - type: Transform - pos: -61.5,21.5 - parent: 12 - - uid: 26133 - components: - - type: Transform - pos: -60.5,21.5 - parent: 12 - - uid: 26134 - components: - - type: Transform - pos: -59.5,21.5 - parent: 12 - - uid: 26135 - components: - - type: Transform - pos: -58.5,21.5 - parent: 12 - - uid: 26136 - components: - - type: Transform - pos: -65.5,21.5 - parent: 12 - - uid: 26137 - components: - - type: Transform - pos: -57.5,21.5 - parent: 12 - - uid: 26140 - components: - - type: Transform - pos: -55.5,37.5 - parent: 12 - - uid: 26141 - components: - - type: Transform - pos: -55.5,38.5 - parent: 12 - - uid: 26142 - components: - - type: Transform - pos: -56.5,37.5 - parent: 12 - - uid: 26143 - components: - - type: Transform - pos: -56.5,38.5 - parent: 12 - - uid: 26144 - components: - - type: Transform - pos: -57.5,37.5 - parent: 12 - - uid: 26145 - components: - - type: Transform - pos: -57.5,38.5 - parent: 12 - - uid: 26146 - components: - - type: Transform - pos: -58.5,37.5 - parent: 12 - - uid: 26147 - components: - - type: Transform - pos: -58.5,38.5 - parent: 12 - - uid: 26148 - components: - - type: Transform - pos: -59.5,37.5 - parent: 12 - - uid: 26149 - components: - - type: Transform - pos: -59.5,38.5 - parent: 12 - - uid: 26150 - components: - - type: Transform - pos: -60.5,37.5 - parent: 12 - - uid: 26151 - components: - - type: Transform - pos: -60.5,38.5 - parent: 12 - - uid: 26152 - components: - - type: Transform - pos: -61.5,37.5 - parent: 12 - - uid: 26153 - components: - - type: Transform - pos: -61.5,38.5 - parent: 12 - - uid: 26154 - components: - - type: Transform - pos: -62.5,37.5 - parent: 12 - - uid: 26155 - components: - - type: Transform - pos: -62.5,38.5 - parent: 12 - - uid: 26156 - components: - - type: Transform - pos: -63.5,37.5 - parent: 12 - - uid: 26157 - components: - - type: Transform - pos: -63.5,38.5 - parent: 12 - - uid: 26158 - components: - - type: Transform - pos: -64.5,37.5 - parent: 12 - - uid: 26159 - components: - - type: Transform - pos: -64.5,38.5 - parent: 12 - - uid: 26160 - components: - - type: Transform - pos: -65.5,37.5 - parent: 12 - - uid: 26161 - components: - - type: Transform - pos: -65.5,38.5 - parent: 12 - - uid: 26162 - components: - - type: Transform - pos: -66.5,37.5 - parent: 12 - - uid: 26163 - components: - - type: Transform - pos: -66.5,38.5 - parent: 12 - - uid: 26164 - components: - - type: Transform - pos: -67.5,37.5 - parent: 12 - - uid: 26165 - components: - - type: Transform - pos: -67.5,38.5 - parent: 12 - - uid: 26166 - components: - - type: Transform - pos: -68.5,37.5 - parent: 12 - - uid: 26167 - components: - - type: Transform - pos: -68.5,38.5 - parent: 12 - - uid: 26168 - components: - - type: Transform - pos: -69.5,37.5 - parent: 12 - - uid: 26169 - components: - - type: Transform - pos: -69.5,38.5 - parent: 12 - - uid: 26170 - components: - - type: Transform - pos: -70.5,37.5 - parent: 12 - - uid: 26171 - components: - - type: Transform - pos: -70.5,38.5 - parent: 12 - - uid: 26172 - components: - - type: Transform - pos: -71.5,37.5 - parent: 12 - - uid: 26173 - components: - - type: Transform - pos: -71.5,38.5 - parent: 12 - - uid: 26174 - components: - - type: Transform - pos: -72.5,37.5 - parent: 12 - - uid: 26175 - components: - - type: Transform - pos: -72.5,38.5 - parent: 12 - - uid: 26176 - components: - - type: Transform - pos: -73.5,37.5 - parent: 12 - - uid: 26177 - components: - - type: Transform - pos: -73.5,38.5 - parent: 12 - - uid: 26178 - components: - - type: Transform - pos: -74.5,38.5 - parent: 12 - - uid: 26179 - components: - - type: Transform - pos: -75.5,38.5 - parent: 12 - - uid: 26180 - components: - - type: Transform - pos: -76.5,38.5 - parent: 12 - - uid: 26181 - components: - - type: Transform - pos: -73.5,36.5 - parent: 12 - - uid: 26182 - components: - - type: Transform - pos: -22.5,52.5 - parent: 12 - - uid: 26183 - components: - - type: Transform - pos: -22.5,53.5 - parent: 12 - - uid: 26184 - components: - - type: Transform - pos: -23.5,52.5 - parent: 12 - - uid: 26185 - components: - - type: Transform - pos: -23.5,53.5 - parent: 12 - - uid: 26186 - components: - - type: Transform - pos: -24.5,53.5 - parent: 12 - - uid: 26187 - components: - - type: Transform - pos: -24.5,54.5 - parent: 12 - - uid: 26190 - components: - - type: Transform - pos: -25.5,53.5 - parent: 12 - - uid: 26191 - components: - - type: Transform - pos: -25.5,54.5 - parent: 12 - - uid: 26192 - components: - - type: Transform - pos: -25.5,56.5 - parent: 12 - - uid: 26193 - components: - - type: Transform - pos: -25.5,55.5 - parent: 12 - - uid: 26194 - components: - - type: Transform - pos: -23.5,54.5 - parent: 12 - - uid: 26195 - components: - - type: Transform - pos: -23.5,55.5 - parent: 12 - uid: 26206 components: - type: Transform @@ -17811,241 +17352,6 @@ entities: - type: Transform pos: 26.5,-4.5 parent: 12 - - uid: 29346 - components: - - type: Transform - pos: -73.5,22.5 - parent: 12 - - uid: 29347 - components: - - type: Transform - pos: -74.5,25.5 - parent: 12 - - uid: 29348 - components: - - type: Transform - pos: -74.5,29.5 - parent: 12 - - uid: 29349 - components: - - type: Transform - pos: -74.5,33.5 - parent: 12 - - uid: 29350 - components: - - type: Transform - pos: -77.5,18.5 - parent: 12 - - uid: 29351 - components: - - type: Transform - pos: -81.5,18.5 - parent: 12 - - uid: 29352 - components: - - type: Transform - pos: -73.5,34.5 - parent: 12 - - uid: 29353 - components: - - type: Transform - pos: -73.5,33.5 - parent: 12 - - uid: 29354 - components: - - type: Transform - pos: -73.5,32.5 - parent: 12 - - uid: 29355 - components: - - type: Transform - pos: -73.5,31.5 - parent: 12 - - uid: 29356 - components: - - type: Transform - pos: -73.5,30.5 - parent: 12 - - uid: 29357 - components: - - type: Transform - pos: -73.5,29.5 - parent: 12 - - uid: 29358 - components: - - type: Transform - pos: -73.5,27.5 - parent: 12 - - uid: 29359 - components: - - type: Transform - pos: -84.5,21.5 - parent: 12 - - uid: 29360 - components: - - type: Transform - pos: -73.5,26.5 - parent: 12 - - uid: 29361 - components: - - type: Transform - pos: -73.5,28.5 - parent: 12 - - uid: 29362 - components: - - type: Transform - pos: -73.5,25.5 - parent: 12 - - uid: 29363 - components: - - type: Transform - pos: -84.5,25.5 - parent: 12 - - uid: 29364 - components: - - type: Transform - pos: -73.5,24.5 - parent: 12 - - uid: 29365 - components: - - type: Transform - pos: -73.5,23.5 - parent: 12 - - uid: 29366 - components: - - type: Transform - pos: -84.5,29.5 - parent: 12 - - uid: 29367 - components: - - type: Transform - pos: -84.5,33.5 - parent: 12 - - uid: 29368 - components: - - type: Transform - pos: -84.5,37.5 - parent: 12 - - uid: 29369 - components: - - type: Transform - pos: -84.5,41.5 - parent: 12 - - uid: 29370 - components: - - type: Transform - pos: -82.5,43.5 - parent: 12 - - uid: 29371 - components: - - type: Transform - pos: -78.5,43.5 - parent: 12 - - uid: 29373 - components: - - type: Transform - pos: -76.5,39.5 - parent: 12 - - uid: 29374 - components: - - type: Transform - pos: -75.5,39.5 - parent: 12 - - uid: 29375 - components: - - type: Transform - pos: -74.5,39.5 - parent: 12 - - uid: 29376 - components: - - type: Transform - pos: -73.5,39.5 - parent: 12 - - uid: 29377 - components: - - type: Transform - pos: -72.5,39.5 - parent: 12 - - uid: 29378 - components: - - type: Transform - pos: -71.5,39.5 - parent: 12 - - uid: 29379 - components: - - type: Transform - pos: -70.5,39.5 - parent: 12 - - uid: 29380 - components: - - type: Transform - pos: -69.5,39.5 - parent: 12 - - uid: 29381 - components: - - type: Transform - pos: -68.5,39.5 - parent: 12 - - uid: 29382 - components: - - type: Transform - pos: -67.5,39.5 - parent: 12 - - uid: 29383 - components: - - type: Transform - pos: -66.5,39.5 - parent: 12 - - uid: 29384 - components: - - type: Transform - pos: -65.5,39.5 - parent: 12 - - uid: 29385 - components: - - type: Transform - pos: -64.5,39.5 - parent: 12 - - uid: 29386 - components: - - type: Transform - pos: -62.5,39.5 - parent: 12 - - uid: 29387 - components: - - type: Transform - pos: -63.5,39.5 - parent: 12 - - uid: 29388 - components: - - type: Transform - pos: -61.5,39.5 - parent: 12 - - uid: 29389 - components: - - type: Transform - pos: -60.5,39.5 - parent: 12 - - uid: 29390 - components: - - type: Transform - pos: -59.5,39.5 - parent: 12 - - uid: 29391 - components: - - type: Transform - pos: -58.5,39.5 - parent: 12 - - uid: 29392 - components: - - type: Transform - pos: -57.5,39.5 - parent: 12 - - uid: 29393 - components: - - type: Transform - pos: -56.5,39.5 - parent: 12 - proto: AtmosFixFreezerMarker entities: - uid: 15421 @@ -18343,12 +17649,6 @@ entities: - type: Transform pos: 36.5,8.5 parent: 12 - - uid: 6222 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-13.5 - parent: 12 - uid: 9825 components: - type: Transform @@ -18360,18 +17660,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,5.5 parent: 12 - - uid: 17958 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-15.5 - parent: 12 - - uid: 17963 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-13.5 - parent: 12 - uid: 23564 components: - type: Transform @@ -19487,11 +18775,31 @@ entities: rot: 1.5707963267948966 rad pos: -45.5,48.5 parent: 12 + - uid: 21960 + components: + - type: Transform + pos: -4.5,-10.5 + parent: 12 + - uid: 21976 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 12 + - uid: 21977 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 12 - uid: 22154 components: - type: Transform pos: 33.5,16.5 parent: 12 + - uid: 22189 + components: + - type: Transform + pos: 3.5,-10.5 + parent: 12 - uid: 23619 components: - type: Transform @@ -19743,7 +19051,7 @@ entities: - uid: 18873 components: - type: Transform - pos: -41.870697,21.539446 + pos: -43.973763,21.753422 parent: 12 - uid: 21443 components: @@ -20171,6 +19479,12 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,29.5 parent: 12 + - uid: 15861 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.5,-24.5 + parent: 12 - uid: 16487 components: - type: Transform @@ -20217,11 +19531,26 @@ entities: - type: Transform pos: 56.5,61.5 parent: 12 + - uid: 51 + components: + - type: Transform + pos: -21.5,55.5 + parent: 12 + - uid: 57 + components: + - type: Transform + pos: -9.5,-2.5 + parent: 12 - uid: 66 components: - type: Transform pos: 51.5,-12.5 parent: 12 + - uid: 72 + components: + - type: Transform + pos: -38.5,-24.5 + parent: 12 - uid: 75 components: - type: Transform @@ -20242,30 +19571,15 @@ entities: - type: Transform pos: -9.5,-19.5 parent: 12 - - uid: 129 - components: - - type: Transform - pos: 52.5,-11.5 - parent: 12 - - uid: 234 - components: - - type: Transform - pos: -8.5,-4.5 - parent: 12 - - uid: 235 - components: - - type: Transform - pos: -8.5,-6.5 - parent: 12 - - uid: 237 + - uid: 114 components: - type: Transform - pos: -8.5,-3.5 + pos: -8.5,-7.5 parent: 12 - - uid: 238 + - uid: 129 components: - type: Transform - pos: -9.5,-6.5 + pos: 52.5,-11.5 parent: 12 - uid: 628 components: @@ -20647,11 +19961,6 @@ entities: - type: Transform pos: -41.5,-23.5 parent: 12 - - uid: 1437 - components: - - type: Transform - pos: -40.5,-21.5 - parent: 12 - uid: 1438 components: - type: Transform @@ -23212,6 +22521,36 @@ entities: - type: Transform pos: 10.5,1.5 parent: 12 + - uid: 5133 + components: + - type: Transform + pos: -7.5,-7.5 + parent: 12 + - uid: 5153 + components: + - type: Transform + pos: -4.5,-7.5 + parent: 12 + - uid: 5154 + components: + - type: Transform + pos: -3.5,-7.5 + parent: 12 + - uid: 5155 + components: + - type: Transform + pos: -3.5,-5.5 + parent: 12 + - uid: 5156 + components: + - type: Transform + pos: -7.5,-5.5 + parent: 12 + - uid: 5157 + components: + - type: Transform + pos: -8.5,-5.5 + parent: 12 - uid: 5221 components: - type: Transform @@ -24717,11 +24056,31 @@ entities: - type: Transform pos: 49.5,-0.5 parent: 12 + - uid: 7355 + components: + - type: Transform + pos: -9.5,-12.5 + parent: 12 + - uid: 7361 + components: + - type: Transform + pos: -9.5,-11.5 + parent: 12 + - uid: 7362 + components: + - type: Transform + pos: -9.5,-10.5 + parent: 12 - uid: 7386 components: - type: Transform pos: 5.5,13.5 parent: 12 + - uid: 7442 + components: + - type: Transform + pos: -8.5,-6.5 + parent: 12 - uid: 7516 components: - type: Transform @@ -24757,6 +24116,11 @@ entities: - type: Transform pos: 63.5,2.5 parent: 12 + - uid: 7564 + components: + - type: Transform + pos: -9.5,-6.5 + parent: 12 - uid: 7720 components: - type: Transform @@ -26132,6 +25496,16 @@ entities: - type: Transform pos: 78.5,10.5 parent: 12 + - uid: 8463 + components: + - type: Transform + pos: -10.5,-8.5 + parent: 12 + - uid: 8467 + components: + - type: Transform + pos: -11.5,-8.5 + parent: 12 - uid: 8773 components: - type: Transform @@ -26217,6 +25591,21 @@ entities: - type: Transform pos: 48.5,-29.5 parent: 12 + - uid: 8995 + components: + - type: Transform + pos: -10.5,-10.5 + parent: 12 + - uid: 9043 + components: + - type: Transform + pos: -10.5,-9.5 + parent: 12 + - uid: 9044 + components: + - type: Transform + pos: -10.5,-2.5 + parent: 12 - uid: 9126 components: - type: Transform @@ -26627,6 +26016,11 @@ entities: - type: Transform pos: 7.5,19.5 parent: 12 + - uid: 9547 + components: + - type: Transform + pos: -1.5,-15.5 + parent: 12 - uid: 9553 components: - type: Transform @@ -31537,6 +30931,46 @@ entities: - type: Transform pos: 72.5,8.5 parent: 12 + - uid: 16425 + components: + - type: Transform + pos: -10.5,-3.5 + parent: 12 + - uid: 16426 + components: + - type: Transform + pos: -12.5,-4.5 + parent: 12 + - uid: 16427 + components: + - type: Transform + pos: -11.5,-4.5 + parent: 12 + - uid: 16428 + components: + - type: Transform + pos: -10.5,-4.5 + parent: 12 + - uid: 16429 + components: + - type: Transform + pos: -12.5,-8.5 + parent: 12 + - uid: 16430 + components: + - type: Transform + pos: -12.5,-7.5 + parent: 12 + - uid: 16431 + components: + - type: Transform + pos: -12.5,-6.5 + parent: 12 + - uid: 16432 + components: + - type: Transform + pos: -12.5,-5.5 + parent: 12 - uid: 16658 components: - type: Transform @@ -32742,11 +32176,6 @@ entities: - type: Transform pos: -18.5,72.5 parent: 12 - - uid: 18277 - components: - - type: Transform - pos: -4.5,-6.5 - parent: 12 - uid: 18281 components: - type: Transform @@ -32827,11 +32256,6 @@ entities: - type: Transform pos: -15.5,3.5 parent: 12 - - uid: 18297 - components: - - type: Transform - pos: -5.5,-6.5 - parent: 12 - uid: 18298 components: - type: Transform @@ -32852,16 +32276,6 @@ entities: - type: Transform pos: 27.5,-27.5 parent: 12 - - uid: 18302 - components: - - type: Transform - pos: -10.5,-6.5 - parent: 12 - - uid: 18303 - components: - - type: Transform - pos: -11.5,-6.5 - parent: 12 - uid: 18304 components: - type: Transform @@ -32872,16 +32286,6 @@ entities: - type: Transform pos: -6.5,-7.5 parent: 12 - - uid: 18309 - components: - - type: Transform - pos: -10.5,-7.5 - parent: 12 - - uid: 18310 - components: - - type: Transform - pos: -10.5,-5.5 - parent: 12 - uid: 18314 components: - type: Transform @@ -33552,10 +32956,10 @@ entities: - type: Transform pos: 60.5,12.5 parent: 12 - - uid: 19263 + - uid: 19556 components: - type: Transform - pos: -6.5,-6.5 + pos: -0.5,-15.5 parent: 12 - uid: 19569 components: @@ -33572,6 +32976,11 @@ entities: - type: Transform pos: 4.5,17.5 parent: 12 + - uid: 19643 + components: + - type: Transform + pos: 0.5,-15.5 + parent: 12 - uid: 19818 components: - type: Transform @@ -34607,6 +34016,11 @@ entities: - type: Transform pos: -33.5,64.5 parent: 12 + - uid: 20820 + components: + - type: Transform + pos: -22.5,55.5 + parent: 12 - uid: 20870 components: - type: Transform @@ -34622,11 +34036,21 @@ entities: - type: Transform pos: -19.5,40.5 parent: 12 + - uid: 21064 + components: + - type: Transform + pos: -39.5,-25.5 + parent: 12 - uid: 21065 components: - type: Transform pos: 9.5,3.5 parent: 12 + - uid: 21068 + components: + - type: Transform + pos: -39.5,-24.5 + parent: 12 - uid: 21093 components: - type: Transform @@ -35262,185 +34686,50 @@ entities: - type: Transform pos: -24.5,22.5 parent: 12 - - uid: 21959 - components: - - type: Transform - pos: -79.5,34.5 - parent: 12 - - uid: 21960 - components: - - type: Transform - pos: -79.5,32.5 - parent: 12 - - uid: 21961 - components: - - type: Transform - pos: -79.5,31.5 - parent: 12 - - uid: 21962 - components: - - type: Transform - pos: -79.5,33.5 - parent: 12 - - uid: 21963 + - uid: 21920 components: - type: Transform - pos: -79.5,30.5 + pos: -4.5,-5.5 parent: 12 - - uid: 21964 + - uid: 21923 components: - type: Transform - pos: -79.5,29.5 + pos: -5.5,-5.5 parent: 12 - - uid: 21965 + - uid: 21936 components: - type: Transform - pos: -79.5,28.5 + pos: -23.5,55.5 parent: 12 - uid: 21966 components: - type: Transform - pos: -79.5,27.5 - parent: 12 - - uid: 21967 - components: - - type: Transform - pos: -79.5,26.5 - parent: 12 - - uid: 21968 - components: - - type: Transform - pos: -80.5,26.5 - parent: 12 - - uid: 21969 - components: - - type: Transform - pos: -80.5,25.5 - parent: 12 - - uid: 21970 - components: - - type: Transform - pos: -80.5,24.5 - parent: 12 - - uid: 21971 - components: - - type: Transform - pos: -80.5,23.5 - parent: 12 - - uid: 21972 - components: - - type: Transform - pos: -79.5,23.5 - parent: 12 - - uid: 21973 - components: - - type: Transform - pos: -79.5,22.5 - parent: 12 - - uid: 21974 - components: - - type: Transform - pos: -79.5,21.5 - parent: 12 - - uid: 21975 - components: - - type: Transform - pos: -78.5,24.5 - parent: 12 - - uid: 21976 - components: - - type: Transform - pos: -78.5,25.5 - parent: 12 - - uid: 21977 - components: - - type: Transform - pos: -78.5,26.5 - parent: 12 - - uid: 21978 - components: - - type: Transform - pos: -78.5,23.5 - parent: 12 - - uid: 21979 - components: - - type: Transform - pos: -80.5,21.5 - parent: 12 - - uid: 21980 - components: - - type: Transform - pos: -81.5,21.5 - parent: 12 - - uid: 21981 - components: - - type: Transform - pos: -78.5,21.5 - parent: 12 - - uid: 21982 - components: - - type: Transform - pos: -77.5,21.5 - parent: 12 - - uid: 21983 - components: - - type: Transform - pos: -77.5,23.5 - parent: 12 - - uid: 21984 - components: - - type: Transform - pos: -81.5,23.5 - parent: 12 - - uid: 21985 - components: - - type: Transform - pos: -81.5,26.5 - parent: 12 - - uid: 21986 - components: - - type: Transform - pos: -77.5,26.5 - parent: 12 - - uid: 21987 - components: - - type: Transform - pos: -78.5,28.5 - parent: 12 - - uid: 21988 - components: - - type: Transform - pos: -77.5,28.5 - parent: 12 - - uid: 21989 - components: - - type: Transform - pos: -81.5,28.5 + pos: -5.5,-7.5 parent: 12 - - uid: 21990 + - uid: 21998 components: - type: Transform - pos: -80.5,28.5 + pos: -9.5,-0.5 parent: 12 - - uid: 21991 + - uid: 22000 components: - type: Transform - pos: -80.5,32.5 + pos: -9.5,-1.5 parent: 12 - - uid: 21992 + - uid: 22058 components: - type: Transform - pos: -81.5,32.5 + pos: -23.5,54.5 parent: 12 - - uid: 21993 + - uid: 22059 components: - type: Transform - pos: -78.5,32.5 + pos: -23.5,53.5 parent: 12 - - uid: 21994 + - uid: 22060 components: - type: Transform - pos: -77.5,32.5 + pos: -24.5,55.5 parent: 12 - uid: 22099 components: @@ -35462,90 +34751,65 @@ entities: - type: Transform pos: 75.5,0.5 parent: 12 - - uid: 22289 - components: - - type: Transform - pos: 8.5,5.5 - parent: 12 - - uid: 22295 - components: - - type: Transform - pos: -74.5,36.5 - parent: 12 - - uid: 22296 - components: - - type: Transform - pos: -75.5,36.5 - parent: 12 - - uid: 22297 - components: - - type: Transform - pos: -76.5,36.5 - parent: 12 - - uid: 22298 - components: - - type: Transform - pos: -77.5,36.5 - parent: 12 - - uid: 22299 + - uid: 22217 components: - type: Transform - pos: -78.5,36.5 + pos: 33.5,-5.5 parent: 12 - - uid: 22300 + - uid: 22218 components: - type: Transform - pos: -79.5,36.5 + pos: 34.5,-5.5 parent: 12 - - uid: 22301 + - uid: 22219 components: - type: Transform - pos: -80.5,36.5 + pos: 35.5,-5.5 parent: 12 - - uid: 22302 + - uid: 22220 components: - type: Transform - pos: -81.5,36.5 + pos: 36.5,-5.5 parent: 12 - - uid: 22303 + - uid: 22221 components: - type: Transform - pos: -82.5,36.5 + pos: 37.5,-5.5 parent: 12 - - uid: 22304 + - uid: 22222 components: - type: Transform - pos: -80.5,35.5 + pos: 38.5,-5.5 parent: 12 - - uid: 22305 + - uid: 22223 components: - type: Transform - pos: -80.5,37.5 + pos: 39.5,-5.5 parent: 12 - - uid: 22306 + - uid: 22228 components: - type: Transform - pos: -80.5,38.5 + pos: 40.5,-5.5 parent: 12 - - uid: 22307 + - uid: 22229 components: - type: Transform - pos: -80.5,39.5 + pos: 32.5,-7.5 parent: 12 - - uid: 22308 + - uid: 22230 components: - type: Transform - pos: -80.5,40.5 + pos: 33.5,-7.5 parent: 12 - - uid: 22309 + - uid: 22231 components: - type: Transform - pos: -80.5,41.5 + pos: 33.5,-6.5 parent: 12 - - uid: 22310 + - uid: 22289 components: - type: Transform - pos: -80.5,42.5 + pos: 8.5,5.5 parent: 12 - uid: 22519 components: @@ -38612,46 +37876,6 @@ entities: - type: Transform pos: -8.5,-12.5 parent: 12 - - uid: 28499 - components: - - type: Transform - pos: -8.5,-11.5 - parent: 12 - - uid: 28500 - components: - - type: Transform - pos: -8.5,-10.5 - parent: 12 - - uid: 28501 - components: - - type: Transform - pos: -8.5,-9.5 - parent: 12 - - uid: 28502 - components: - - type: Transform - pos: -8.5,-8.5 - parent: 12 - - uid: 28503 - components: - - type: Transform - pos: -8.5,-7.5 - parent: 12 - - uid: 28504 - components: - - type: Transform - pos: -8.5,-5.5 - parent: 12 - - uid: 28505 - components: - - type: Transform - pos: -8.5,-2.5 - parent: 12 - - uid: 28506 - components: - - type: Transform - pos: -8.5,-1.5 - parent: 12 - uid: 28507 components: - type: Transform @@ -39671,6 +38895,11 @@ entities: - type: Transform pos: 43.532734,64.52736 parent: 12 + - uid: 22062 + components: + - type: Transform + pos: -22.412212,55.392742 + parent: 12 - proto: CableApcStack10 entities: - uid: 17622 @@ -39685,6 +38914,11 @@ entities: - type: Transform pos: 38.480755,62.51571 parent: 12 + - uid: 22063 + components: + - type: Transform + pos: -24.345606,55.376434 + parent: 12 - proto: CableHV entities: - uid: 21 @@ -39692,10 +38926,10 @@ entities: - type: Transform pos: 50.5,62.5 parent: 12 - - uid: 72 + - uid: 71 components: - type: Transform - pos: -73.5,21.5 + pos: -9.5,-0.5 parent: 12 - uid: 108 components: @@ -41172,11 +40406,6 @@ entities: - type: Transform pos: 66.5,-5.5 parent: 12 - - uid: 5948 - components: - - type: Transform - pos: -55.5,37.5 - parent: 12 - uid: 5961 components: - type: Transform @@ -41192,11 +40421,6 @@ entities: - type: Transform pos: -31.5,-7.5 parent: 12 - - uid: 6280 - components: - - type: Transform - pos: -73.5,23.5 - parent: 12 - uid: 6414 components: - type: Transform @@ -41887,21 +41111,6 @@ entities: - type: Transform pos: -48.5,25.5 parent: 12 - - uid: 6941 - components: - - type: Transform - pos: -73.5,24.5 - parent: 12 - - uid: 6986 - components: - - type: Transform - pos: -78.5,37.5 - parent: 12 - - uid: 7281 - components: - - type: Transform - pos: -73.5,32.5 - parent: 12 - uid: 7301 components: - type: Transform @@ -44592,61 +43801,6 @@ entities: - type: Transform pos: -6.5,36.5 parent: 12 - - uid: 16422 - components: - - type: Transform - pos: -73.5,22.5 - parent: 12 - - uid: 16423 - components: - - type: Transform - pos: -73.5,30.5 - parent: 12 - - uid: 16424 - components: - - type: Transform - pos: -73.5,31.5 - parent: 12 - - uid: 16425 - components: - - type: Transform - pos: -73.5,34.5 - parent: 12 - - uid: 16426 - components: - - type: Transform - pos: -73.5,33.5 - parent: 12 - - uid: 16427 - components: - - type: Transform - pos: -73.5,26.5 - parent: 12 - - uid: 16428 - components: - - type: Transform - pos: -73.5,25.5 - parent: 12 - - uid: 16429 - components: - - type: Transform - pos: -73.5,28.5 - parent: 12 - - uid: 16430 - components: - - type: Transform - pos: -73.5,35.5 - parent: 12 - - uid: 16431 - components: - - type: Transform - pos: -73.5,27.5 - parent: 12 - - uid: 16432 - components: - - type: Transform - pos: -73.5,29.5 - parent: 12 - uid: 16640 components: - type: Transform @@ -45022,35 +44176,30 @@ entities: - type: Transform pos: -54.5,37.5 parent: 12 - - uid: 17964 - components: - - type: Transform - pos: -56.5,37.5 - parent: 12 - uid: 17965 components: - type: Transform - pos: -57.5,37.5 + pos: -12.5,-8.5 parent: 12 - uid: 17966 components: - type: Transform - pos: -58.5,37.5 + pos: -11.5,-8.5 parent: 12 - uid: 17967 components: - type: Transform - pos: -59.5,37.5 + pos: -10.5,-8.5 parent: 12 - uid: 17968 components: - type: Transform - pos: -60.5,37.5 + pos: -10.5,-9.5 parent: 12 - uid: 17969 components: - type: Transform - pos: -61.5,37.5 + pos: -10.5,-10.5 parent: 12 - uid: 17978 components: @@ -45437,6 +44586,21 @@ entities: - type: Transform pos: -50.5,47.5 parent: 12 + - uid: 18277 + components: + - type: Transform + pos: -9.5,-11.5 + parent: 12 + - uid: 18297 + components: + - type: Transform + pos: -9.5,-12.5 + parent: 12 + - uid: 18302 + components: + - type: Transform + pos: -9.5,-10.5 + parent: 12 - uid: 18383 components: - type: Transform @@ -46682,6 +45846,11 @@ entities: - type: Transform pos: -25.5,59.5 parent: 12 + - uid: 20312 + components: + - type: Transform + pos: -12.5,-7.5 + parent: 12 - uid: 20342 components: - type: Transform @@ -46742,120 +45911,110 @@ entities: - type: Transform pos: 76.5,2.5 parent: 12 - - uid: 21924 - components: - - type: Transform - pos: -62.5,37.5 - parent: 12 - - uid: 21925 - components: - - type: Transform - pos: -63.5,37.5 - parent: 12 - - uid: 21926 + - uid: 21859 components: - type: Transform - pos: -64.5,37.5 + pos: 36.5,-5.5 parent: 12 - - uid: 21927 + - uid: 21860 components: - type: Transform - pos: -65.5,37.5 + pos: 38.5,-6.5 parent: 12 - - uid: 21928 + - uid: 21865 components: - type: Transform - pos: -66.5,37.5 + pos: 34.5,-5.5 parent: 12 - - uid: 21929 + - uid: 21866 components: - type: Transform - pos: -67.5,37.5 + pos: 38.5,-5.5 parent: 12 - - uid: 21930 + - uid: 21867 components: - type: Transform - pos: -68.5,37.5 + pos: 35.5,-5.5 parent: 12 - - uid: 21931 + - uid: 21870 components: - type: Transform - pos: -69.5,37.5 + pos: 33.5,-7.5 parent: 12 - - uid: 21932 + - uid: 21895 components: - type: Transform - pos: -70.5,37.5 + pos: -12.5,-6.5 parent: 12 - - uid: 21933 + - uid: 21896 components: - type: Transform - pos: -72.5,37.5 + pos: -10.5,-4.5 parent: 12 - - uid: 21934 + - uid: 21899 components: - type: Transform - pos: -73.5,37.5 + pos: -12.5,-4.5 parent: 12 - - uid: 21935 + - uid: 21902 components: - type: Transform - pos: -71.5,37.5 + pos: -10.5,-2.5 parent: 12 - - uid: 21936 + - uid: 21912 components: - type: Transform - pos: -73.5,36.5 + pos: 33.5,-6.5 parent: 12 - - uid: 21937 + - uid: 21913 components: - type: Transform - pos: -74.5,36.5 + pos: 39.5,-6.5 parent: 12 - - uid: 21938 + - uid: 21914 components: - type: Transform - pos: -75.5,36.5 + pos: 37.5,-5.5 parent: 12 - - uid: 21939 + - uid: 21915 components: - type: Transform - pos: -76.5,36.5 + pos: 33.5,-5.5 parent: 12 - - uid: 21940 + - uid: 21937 components: - type: Transform - pos: -77.5,36.5 + pos: 32.5,-7.5 parent: 12 - - uid: 21941 + - uid: 21950 components: - type: Transform - pos: -78.5,36.5 + pos: -11.5,-4.5 parent: 12 - - uid: 21947 + - uid: 21951 components: - type: Transform - pos: -78.5,38.5 + pos: -9.5,-1.5 parent: 12 - - uid: 21950 + - uid: 21953 components: - type: Transform - pos: -78.5,40.5 + pos: -9.5,-2.5 parent: 12 - - uid: 21951 + - uid: 21954 components: - type: Transform - pos: -78.5,41.5 + pos: -10.5,-3.5 parent: 12 - - uid: 22053 + - uid: 21955 components: - type: Transform - pos: -79.5,41.5 + pos: -12.5,-5.5 parent: 12 - - uid: 22054 + - uid: 21992 components: - type: Transform - pos: -78.5,39.5 + pos: 31.5,-7.5 parent: 12 - uid: 22712 components: @@ -47672,86 +46831,6 @@ entities: - type: Transform pos: -56.5,21.5 parent: 12 - - uid: 26089 - components: - - type: Transform - pos: -57.5,21.5 - parent: 12 - - uid: 26090 - components: - - type: Transform - pos: -58.5,21.5 - parent: 12 - - uid: 26091 - components: - - type: Transform - pos: -59.5,21.5 - parent: 12 - - uid: 26092 - components: - - type: Transform - pos: -60.5,21.5 - parent: 12 - - uid: 26093 - components: - - type: Transform - pos: -61.5,21.5 - parent: 12 - - uid: 26094 - components: - - type: Transform - pos: -62.5,21.5 - parent: 12 - - uid: 26095 - components: - - type: Transform - pos: -63.5,21.5 - parent: 12 - - uid: 26096 - components: - - type: Transform - pos: -64.5,21.5 - parent: 12 - - uid: 26097 - components: - - type: Transform - pos: -70.5,21.5 - parent: 12 - - uid: 26098 - components: - - type: Transform - pos: -71.5,21.5 - parent: 12 - - uid: 26099 - components: - - type: Transform - pos: -72.5,21.5 - parent: 12 - - uid: 26115 - components: - - type: Transform - pos: -65.5,21.5 - parent: 12 - - uid: 26116 - components: - - type: Transform - pos: -66.5,21.5 - parent: 12 - - uid: 26117 - components: - - type: Transform - pos: -67.5,21.5 - parent: 12 - - uid: 26118 - components: - - type: Transform - pos: -68.5,21.5 - parent: 12 - - uid: 26119 - components: - - type: Transform - pos: -69.5,21.5 - parent: 12 - uid: 26465 components: - type: Transform @@ -48977,61 +48056,6 @@ entities: - type: Transform pos: -8.5,-0.5 parent: 12 - - uid: 28549 - components: - - type: Transform - pos: -8.5,-1.5 - parent: 12 - - uid: 28550 - components: - - type: Transform - pos: -8.5,-2.5 - parent: 12 - - uid: 28551 - components: - - type: Transform - pos: -8.5,-3.5 - parent: 12 - - uid: 28552 - components: - - type: Transform - pos: -8.5,-4.5 - parent: 12 - - uid: 28553 - components: - - type: Transform - pos: -8.5,-5.5 - parent: 12 - - uid: 28554 - components: - - type: Transform - pos: -8.5,-6.5 - parent: 12 - - uid: 28555 - components: - - type: Transform - pos: -8.5,-7.5 - parent: 12 - - uid: 28556 - components: - - type: Transform - pos: -8.5,-8.5 - parent: 12 - - uid: 28557 - components: - - type: Transform - pos: -8.5,-9.5 - parent: 12 - - uid: 28558 - components: - - type: Transform - pos: -8.5,-10.5 - parent: 12 - - uid: 28559 - components: - - type: Transform - pos: -8.5,-11.5 - parent: 12 - uid: 28560 components: - type: Transform @@ -50156,20 +49180,10 @@ entities: parent: 12 - proto: CableMV entities: - - uid: 11 - components: - - type: Transform - pos: -2.5,2.5 - parent: 12 - - uid: 18 - components: - - type: Transform - pos: -2.5,1.5 - parent: 12 - - uid: 90 + - uid: 87 components: - type: Transform - pos: -2.5,0.5 + pos: 0.5,2.5 parent: 12 - uid: 465 components: @@ -50186,6 +49200,26 @@ entities: - type: Transform pos: 67.5,12.5 parent: 12 + - uid: 601 + components: + - type: Transform + pos: -56.5,44.5 + parent: 12 + - uid: 611 + components: + - type: Transform + pos: -56.5,43.5 + parent: 12 + - uid: 632 + components: + - type: Transform + pos: -56.5,45.5 + parent: 12 + - uid: 904 + components: + - type: Transform + pos: -53.5,43.5 + parent: 12 - uid: 908 components: - type: Transform @@ -50196,6 +49230,11 @@ entities: - type: Transform pos: 24.5,2.5 parent: 12 + - uid: 1059 + components: + - type: Transform + pos: -52.5,43.5 + parent: 12 - uid: 1070 components: - type: Transform @@ -50211,6 +49250,11 @@ entities: - type: Transform pos: 73.5,12.5 parent: 12 + - uid: 1437 + components: + - type: Transform + pos: -55.5,43.5 + parent: 12 - uid: 1455 components: - type: Transform @@ -50424,7 +49468,7 @@ entities: - uid: 1500 components: - type: Transform - pos: -40.5,-21.5 + pos: -54.5,43.5 parent: 12 - uid: 1503 components: @@ -50656,6 +49700,16 @@ entities: - type: Transform pos: -27.5,-17.5 parent: 12 + - uid: 1975 + components: + - type: Transform + pos: -52.5,40.5 + parent: 12 + - uid: 2018 + components: + - type: Transform + pos: -53.5,40.5 + parent: 12 - uid: 2055 components: - type: Transform @@ -50676,6 +49730,16 @@ entities: - type: Transform pos: -2.5,-2.5 parent: 12 + - uid: 2119 + components: + - type: Transform + pos: -52.5,42.5 + parent: 12 + - uid: 2120 + components: + - type: Transform + pos: -52.5,41.5 + parent: 12 - uid: 2125 components: - type: Transform @@ -50766,6 +49830,11 @@ entities: - type: Transform pos: -2.5,-9.5 parent: 12 + - uid: 2249 + components: + - type: Transform + pos: -56.5,40.5 + parent: 12 - uid: 2259 components: - type: Transform @@ -50781,16 +49850,51 @@ entities: - type: Transform pos: 45.5,-20.5 parent: 12 + - uid: 2581 + components: + - type: Transform + pos: -56.5,39.5 + parent: 12 + - uid: 2767 + components: + - type: Transform + pos: -54.5,40.5 + parent: 12 + - uid: 2775 + components: + - type: Transform + pos: -55.5,40.5 + parent: 12 + - uid: 2795 + components: + - type: Transform + pos: -57.5,37.5 + parent: 12 - uid: 2821 components: - type: Transform pos: 0.5,-41.5 parent: 12 + - uid: 2837 + components: + - type: Transform + pos: -57.5,36.5 + parent: 12 + - uid: 2866 + components: + - type: Transform + pos: -57.5,39.5 + parent: 12 - uid: 2882 components: - type: Transform pos: 0.5,-40.5 parent: 12 + - uid: 2946 + components: + - type: Transform + pos: -57.5,38.5 + parent: 12 - uid: 2984 components: - type: Transform @@ -51176,11 +50280,6 @@ entities: - type: Transform pos: 15.5,10.5 parent: 12 - - uid: 3977 - components: - - type: Transform - pos: -1.5,2.5 - parent: 12 - uid: 3984 components: - type: Transform @@ -51341,11 +50440,6 @@ entities: - type: Transform pos: 57.5,56.5 parent: 12 - - uid: 4901 - components: - - type: Transform - pos: -1.5,0.5 - parent: 12 - uid: 4933 components: - type: Transform @@ -51621,6 +50715,11 @@ entities: - type: Transform pos: 57.5,55.5 parent: 12 + - uid: 5132 + components: + - type: Transform + pos: -1.5,1.5 + parent: 12 - uid: 5220 components: - type: Transform @@ -51636,6 +50735,11 @@ entities: - type: Transform pos: 9.5,-8.5 parent: 12 + - uid: 5290 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 12 - uid: 5311 components: - type: Transform @@ -51646,6 +50750,31 @@ entities: - type: Transform pos: -55.5,46.5 parent: 12 + - uid: 5431 + components: + - type: Transform + pos: -59.5,35.5 + parent: 12 + - uid: 5432 + components: + - type: Transform + pos: -59.5,34.5 + parent: 12 + - uid: 5468 + components: + - type: Transform + pos: -58.5,36.5 + parent: 12 + - uid: 5469 + components: + - type: Transform + pos: -59.5,36.5 + parent: 12 + - uid: 5491 + components: + - type: Transform + pos: -60.5,29.5 + parent: 12 - uid: 5496 components: - type: Transform @@ -51871,6 +51000,26 @@ entities: - type: Transform pos: 74.5,-3.5 parent: 12 + - uid: 5934 + components: + - type: Transform + pos: -60.5,28.5 + parent: 12 + - uid: 5935 + components: + - type: Transform + pos: -60.5,34.5 + parent: 12 + - uid: 5936 + components: + - type: Transform + pos: -60.5,33.5 + parent: 12 + - uid: 5948 + components: + - type: Transform + pos: -60.5,32.5 + parent: 12 - uid: 5965 components: - type: Transform @@ -51991,6 +51140,31 @@ entities: - type: Transform pos: -53.5,54.5 parent: 12 + - uid: 6157 + components: + - type: Transform + pos: -60.5,31.5 + parent: 12 + - uid: 6184 + components: + - type: Transform + pos: -60.5,30.5 + parent: 12 + - uid: 6222 + components: + - type: Transform + pos: -60.5,26.5 + parent: 12 + - uid: 6272 + components: + - type: Transform + pos: -60.5,25.5 + parent: 12 + - uid: 6280 + components: + - type: Transform + pos: -60.5,27.5 + parent: 12 - uid: 6891 components: - type: Transform @@ -52736,11 +51910,26 @@ entities: - type: Transform pos: 61.5,12.5 parent: 12 + - uid: 9070 + components: + - type: Transform + pos: 1.5,-15.5 + parent: 12 + - uid: 9076 + components: + - type: Transform + pos: 1.5,-13.5 + parent: 12 - uid: 9253 components: - type: Transform pos: -39.5,70.5 parent: 12 + - uid: 9333 + components: + - type: Transform + pos: -2.5,-15.5 + parent: 12 - uid: 9334 components: - type: Transform @@ -52836,6 +52025,11 @@ entities: - type: Transform pos: 16.5,13.5 parent: 12 + - uid: 9523 + components: + - type: Transform + pos: -2.5,-13.5 + parent: 12 - uid: 9619 components: - type: Transform @@ -53191,6 +52385,26 @@ entities: - type: Transform pos: -0.5,-20.5 parent: 12 + - uid: 10196 + components: + - type: Transform + pos: -55.5,15.5 + parent: 12 + - uid: 10197 + components: + - type: Transform + pos: -55.5,14.5 + parent: 12 + - uid: 10198 + components: + - type: Transform + pos: -55.5,13.5 + parent: 12 + - uid: 10259 + components: + - type: Transform + pos: -54.5,13.5 + parent: 12 - uid: 10307 components: - type: Transform @@ -53391,6 +52605,11 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 12 + - uid: 11034 + components: + - type: Transform + pos: -47.5,15.5 + parent: 12 - uid: 11450 components: - type: Transform @@ -54866,6 +54085,11 @@ entities: - type: Transform pos: 23.5,55.5 parent: 12 + - uid: 15853 + components: + - type: Transform + pos: 1.5,-14.5 + parent: 12 - uid: 15999 components: - type: Transform @@ -55371,11 +54595,36 @@ entities: - type: Transform pos: 78.5,-0.5 parent: 12 + - uid: 16534 + components: + - type: Transform + pos: 0.5,1.5 + parent: 12 + - uid: 16536 + components: + - type: Transform + pos: -0.5,3.5 + parent: 12 - uid: 16644 components: - type: Transform pos: -41.5,53.5 parent: 12 + - uid: 16647 + components: + - type: Transform + pos: -1.5,3.5 + parent: 12 + - uid: 16648 + components: + - type: Transform + pos: -41.5,-23.5 + parent: 12 + - uid: 16657 + components: + - type: Transform + pos: 0.5,3.5 + parent: 12 - uid: 16659 components: - type: Transform @@ -55391,6 +54640,11 @@ entities: - type: Transform pos: 78.5,8.5 parent: 12 + - uid: 16798 + components: + - type: Transform + pos: -1.5,2.5 + parent: 12 - uid: 16942 components: - type: Transform @@ -55966,6 +55220,11 @@ entities: - type: Transform pos: -55.5,33.5 parent: 12 + - uid: 17550 + components: + - type: Transform + pos: -60.5,24.5 + parent: 12 - uid: 17552 components: - type: Transform @@ -56051,6 +55310,26 @@ entities: - type: Transform pos: -45.5,32.5 parent: 12 + - uid: 17757 + components: + - type: Transform + pos: -60.5,23.5 + parent: 12 + - uid: 17776 + components: + - type: Transform + pos: -59.5,23.5 + parent: 12 + - uid: 17777 + components: + - type: Transform + pos: -59.5,22.5 + parent: 12 + - uid: 17778 + components: + - type: Transform + pos: -59.5,21.5 + parent: 12 - uid: 17780 components: - type: Transform @@ -56171,11 +55450,56 @@ entities: - type: Transform pos: -50.5,46.5 parent: 12 + - uid: 17946 + components: + - type: Transform + pos: -59.5,20.5 + parent: 12 - uid: 17948 components: - type: Transform pos: 76.5,2.5 parent: 12 + - uid: 17949 + components: + - type: Transform + pos: -59.5,19.5 + parent: 12 + - uid: 17950 + components: + - type: Transform + pos: -58.5,19.5 + parent: 12 + - uid: 17951 + components: + - type: Transform + pos: -58.5,18.5 + parent: 12 + - uid: 17955 + components: + - type: Transform + pos: -57.5,18.5 + parent: 12 + - uid: 17956 + components: + - type: Transform + pos: -56.5,18.5 + parent: 12 + - uid: 17957 + components: + - type: Transform + pos: -55.5,16.5 + parent: 12 + - uid: 17958 + components: + - type: Transform + pos: -56.5,16.5 + parent: 12 + - uid: 17959 + components: + - type: Transform + pos: -56.5,17.5 + parent: 12 - uid: 18278 components: - type: Transform @@ -56336,6 +55660,11 @@ entities: - type: Transform pos: -39.5,62.5 parent: 12 + - uid: 19266 + components: + - type: Transform + pos: -51.5,13.5 + parent: 12 - uid: 19459 components: - type: Transform @@ -56401,31 +55730,86 @@ entities: - type: Transform pos: 22.5,2.5 parent: 12 + - uid: 19554 + components: + - type: Transform + pos: -49.5,13.5 + parent: 12 - uid: 19557 components: - type: Transform pos: -38.5,70.5 parent: 12 + - uid: 19558 + components: + - type: Transform + pos: -53.5,13.5 + parent: 12 - uid: 19568 components: - type: Transform pos: -37.5,70.5 parent: 12 + - uid: 19614 + components: + - type: Transform + pos: -50.5,13.5 + parent: 12 + - uid: 19615 + components: + - type: Transform + pos: -52.5,13.5 + parent: 12 + - uid: 19621 + components: + - type: Transform + pos: -47.5,13.5 + parent: 12 - uid: 19816 components: - type: Transform pos: 80.5,-1.5 parent: 12 + - uid: 19817 + components: + - type: Transform + pos: -48.5,13.5 + parent: 12 + - uid: 19828 + components: + - type: Transform + pos: -47.5,14.5 + parent: 12 - uid: 19834 components: - type: Transform pos: -28.5,61.5 parent: 12 + - uid: 19850 + components: + - type: Transform + pos: -47.5,16.5 + parent: 12 + - uid: 19883 + components: + - type: Transform + pos: -48.5,17.5 + parent: 12 - uid: 19887 components: - type: Transform pos: -24.5,59.5 parent: 12 + - uid: 20073 + components: + - type: Transform + pos: -47.5,17.5 + parent: 12 + - uid: 20074 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 12 - uid: 20343 components: - type: Transform @@ -57641,160 +57025,60 @@ entities: - type: Transform pos: -6.5,32.5 parent: 12 - - uid: 22006 - components: - - type: Transform - pos: 80.5,3.5 - parent: 12 - - uid: 22024 - components: - - type: Transform - pos: 77.5,3.5 - parent: 12 - - uid: 22027 - components: - - type: Transform - pos: -54.5,49.5 - parent: 12 - - uid: 22028 - components: - - type: Transform - pos: -53.5,49.5 - parent: 12 - - uid: 22030 - components: - - type: Transform - pos: -32.5,70.5 - parent: 12 - - uid: 22049 - components: - - type: Transform - pos: 55.5,12.5 - parent: 12 - - uid: 22052 - components: - - type: Transform - pos: -79.5,41.5 - parent: 12 - - uid: 22055 - components: - - type: Transform - pos: -80.5,41.5 - parent: 12 - - uid: 22056 - components: - - type: Transform - pos: -80.5,42.5 - parent: 12 - - uid: 22057 - components: - - type: Transform - pos: -80.5,40.5 - parent: 12 - - uid: 22058 - components: - - type: Transform - pos: -80.5,39.5 - parent: 12 - - uid: 22059 - components: - - type: Transform - pos: -80.5,38.5 - parent: 12 - - uid: 22060 - components: - - type: Transform - pos: -80.5,37.5 - parent: 12 - - uid: 22061 - components: - - type: Transform - pos: -80.5,35.5 - parent: 12 - - uid: 22062 - components: - - type: Transform - pos: -80.5,34.5 - parent: 12 - - uid: 22063 - components: - - type: Transform - pos: -80.5,33.5 - parent: 12 - - uid: 22064 - components: - - type: Transform - pos: -80.5,32.5 - parent: 12 - - uid: 22065 - components: - - type: Transform - pos: -80.5,36.5 - parent: 12 - - uid: 22066 - components: - - type: Transform - pos: -79.5,32.5 - parent: 12 - - uid: 22067 - components: - - type: Transform - pos: -80.5,31.5 - parent: 12 - - uid: 22068 + - uid: 21901 components: - type: Transform - pos: -80.5,30.5 + pos: 39.5,-6.5 parent: 12 - - uid: 22069 + - uid: 22001 components: - type: Transform - pos: -80.5,29.5 + pos: -39.5,-25.5 parent: 12 - - uid: 22070 + - uid: 22006 components: - type: Transform - pos: -81.5,30.5 + pos: 80.5,3.5 parent: 12 - - uid: 22071 + - uid: 22007 components: - type: Transform - pos: -82.5,30.5 + pos: 0.5,-14.5 parent: 12 - - uid: 22072 + - uid: 22008 components: - type: Transform - pos: -78.5,32.5 + pos: 32.5,-6.5 parent: 12 - - uid: 22073 + - uid: 22024 components: - type: Transform - pos: -78.5,31.5 + pos: 77.5,3.5 parent: 12 - - uid: 22074 + - uid: 22027 components: - type: Transform - pos: -78.5,30.5 + pos: -54.5,49.5 parent: 12 - - uid: 22075 + - uid: 22028 components: - type: Transform - pos: -78.5,29.5 + pos: -53.5,49.5 parent: 12 - - uid: 22076 + - uid: 22030 components: - type: Transform - pos: -77.5,30.5 + pos: -32.5,70.5 parent: 12 - - uid: 22077 + - uid: 22049 components: - type: Transform - pos: -76.5,30.5 + pos: 55.5,12.5 parent: 12 - - uid: 22078 + - uid: 22054 components: - type: Transform - pos: -79.5,34.5 + pos: -0.5,1.5 parent: 12 - uid: 22079 components: @@ -57911,10 +57195,60 @@ entities: - type: Transform pos: 61.5,14.5 parent: 12 - - uid: 22152 + - uid: 22188 components: - type: Transform - pos: -78.5,41.5 + pos: 39.5,-5.5 + parent: 12 + - uid: 22208 + components: + - type: Transform + pos: 38.5,-5.5 + parent: 12 + - uid: 22209 + components: + - type: Transform + pos: 37.5,-5.5 + parent: 12 + - uid: 22210 + components: + - type: Transform + pos: 36.5,-5.5 + parent: 12 + - uid: 22211 + components: + - type: Transform + pos: 35.5,-5.5 + parent: 12 + - uid: 22212 + components: + - type: Transform + pos: 34.5,-5.5 + parent: 12 + - uid: 22213 + components: + - type: Transform + pos: 33.5,-5.5 + parent: 12 + - uid: 22214 + components: + - type: Transform + pos: 33.5,-6.5 + parent: 12 + - uid: 22215 + components: + - type: Transform + pos: 37.5,-6.5 + parent: 12 + - uid: 22226 + components: + - type: Transform + pos: 37.5,-4.5 + parent: 12 + - uid: 22227 + components: + - type: Transform + pos: 40.5,-5.5 parent: 12 - uid: 22336 components: @@ -60876,11 +60210,10 @@ entities: rot: 1.5707963267948966 rad pos: 55.5,60.5 parent: 12 - - uid: 21948 + - uid: 21861 components: - type: Transform - rot: 3.141592653589793 rad - pos: -78.5,40.5 + pos: 38.5,-5.5 parent: 12 - uid: 27377 components: @@ -60973,18 +60306,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: CapacitorStockPart - entities: - - uid: 22238 - components: - - type: Transform - pos: -81.97429,20.401426 - parent: 12 - - uid: 22239 - components: - - type: Transform - pos: -82.288284,20.740337 - parent: 12 - proto: CaptainIDCard entities: - uid: 17377 @@ -64842,6 +64163,18 @@ entities: rot: -1.5707963267948966 rad pos: 82.5,-34.5 parent: 12 + - uid: 8452 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-10.5 + parent: 12 + - uid: 8453 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-12.5 + parent: 12 - uid: 8746 components: - type: Transform @@ -64944,6 +64277,12 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,-18.5 parent: 12 + - uid: 9066 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-9.5 + parent: 12 - uid: 9528 components: - type: Transform @@ -65810,6 +65149,24 @@ entities: - type: Transform pos: -5.5,33.5 parent: 12 + - uid: 16424 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-8.5 + parent: 12 + - uid: 16433 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-11.5 + parent: 12 + - uid: 16434 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-10.5 + parent: 12 - uid: 16445 components: - type: Transform @@ -66397,6 +65754,66 @@ entities: - type: Transform pos: 43.5,58.5 parent: 12 + - uid: 21959 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-8.5 + parent: 12 + - uid: 21997 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-8.5 + parent: 12 + - uid: 22170 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-4.5 + parent: 12 + - uid: 22174 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-4.5 + parent: 12 + - uid: 22175 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-4.5 + parent: 12 + - uid: 22176 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-3.5 + parent: 12 + - uid: 22177 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-2.5 + parent: 12 + - uid: 22178 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-2.5 + parent: 12 + - uid: 22179 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-1.5 + parent: 12 + - uid: 22180 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-0.5 + parent: 12 - uid: 22470 components: - type: Transform @@ -66442,11 +65859,6 @@ entities: rot: 3.141592653589793 rad pos: 57.5,60.5 parent: 12 - - uid: 24456 - components: - - type: Transform - pos: -55.5,37.5 - parent: 12 - uid: 24512 components: - type: Transform @@ -67082,101 +66494,6 @@ entities: - type: Transform pos: 32.5,17.5 parent: 12 - - uid: 24642 - components: - - type: Transform - pos: -56.5,37.5 - parent: 12 - - uid: 24643 - components: - - type: Transform - pos: -57.5,37.5 - parent: 12 - - uid: 24644 - components: - - type: Transform - pos: -58.5,37.5 - parent: 12 - - uid: 24645 - components: - - type: Transform - pos: -59.5,37.5 - parent: 12 - - uid: 24646 - components: - - type: Transform - pos: -60.5,37.5 - parent: 12 - - uid: 24647 - components: - - type: Transform - pos: -61.5,37.5 - parent: 12 - - uid: 24648 - components: - - type: Transform - pos: -62.5,37.5 - parent: 12 - - uid: 24649 - components: - - type: Transform - pos: -63.5,37.5 - parent: 12 - - uid: 24650 - components: - - type: Transform - pos: -64.5,37.5 - parent: 12 - - uid: 24651 - components: - - type: Transform - pos: -65.5,37.5 - parent: 12 - - uid: 24652 - components: - - type: Transform - pos: -67.5,37.5 - parent: 12 - - uid: 24653 - components: - - type: Transform - pos: -66.5,37.5 - parent: 12 - - uid: 24654 - components: - - type: Transform - pos: -68.5,37.5 - parent: 12 - - uid: 24655 - components: - - type: Transform - pos: -69.5,37.5 - parent: 12 - - uid: 24656 - components: - - type: Transform - pos: -70.5,37.5 - parent: 12 - - uid: 24657 - components: - - type: Transform - pos: -71.5,37.5 - parent: 12 - - uid: 24658 - components: - - type: Transform - pos: -72.5,37.5 - parent: 12 - - uid: 24659 - components: - - type: Transform - pos: -73.5,37.5 - parent: 12 - - uid: 24660 - components: - - type: Transform - pos: -73.5,36.5 - parent: 12 - uid: 24670 components: - type: Transform @@ -68102,46 +67419,11 @@ entities: - type: Transform pos: -8.5,-0.5 parent: 12 - - uid: 28613 - components: - - type: Transform - pos: -8.5,-1.5 - parent: 12 - - uid: 28614 - components: - - type: Transform - pos: -8.5,-2.5 - parent: 12 - - uid: 28615 - components: - - type: Transform - pos: -8.5,-3.5 - parent: 12 - - uid: 28616 - components: - - type: Transform - pos: -8.5,-4.5 - parent: 12 - uid: 28617 components: - type: Transform pos: -8.5,0.5 parent: 12 - - uid: 28618 - components: - - type: Transform - pos: -8.5,-8.5 - parent: 12 - - uid: 28619 - components: - - type: Transform - pos: -8.5,-9.5 - parent: 12 - - uid: 28620 - components: - - type: Transform - pos: -8.5,-11.5 - parent: 12 - uid: 28621 components: - type: Transform @@ -68187,11 +67469,6 @@ entities: - type: Transform pos: -8.5,-20.5 parent: 12 - - uid: 28630 - components: - - type: Transform - pos: -8.5,-10.5 - parent: 12 - uid: 28631 components: - type: Transform @@ -70725,6 +70002,11 @@ entities: - type: Transform pos: -25.366394,45.399204 parent: 12 + - uid: 22064 + components: + - type: Transform + pos: -23.224808,54.359283 + parent: 12 - proto: CheapRollerBedSpawnFolded entities: - uid: 2513 @@ -71085,11 +70367,6 @@ entities: - type: Transform pos: -23.5,24.5 parent: 12 - - uid: 22324 - components: - - type: Transform - pos: -76.5,35.5 - parent: 12 - uid: 23648 components: - type: Transform @@ -71332,11 +70609,6 @@ entities: - type: Transform pos: -22.5,24.5 parent: 12 - - uid: 22322 - components: - - type: Transform - pos: -82.5,38.5 - parent: 12 - uid: 23649 components: - type: Transform @@ -72395,12 +71667,12 @@ entities: - type: Transform pos: -28.339855,7.670552 parent: 12 -- proto: ClothingNeckCloakGoliathCloak +- proto: ClothingNeckCloakAce entities: - - uid: 11451 + - uid: 18303 components: - type: Transform - pos: 54.46059,14.458246 + pos: 54.553955,14.563015 parent: 12 - proto: ClothingNeckCloakTrans entities: @@ -73180,11 +72452,6 @@ entities: rot: 1.5707963267948966 rad pos: -33.5,30.5 parent: 12 - - uid: 22118 - components: - - type: Transform - pos: 49.5,-7.5 - parent: 12 - uid: 22361 components: - type: Transform @@ -73339,6 +72606,12 @@ entities: - type: Transform pos: -12.5,-37.5 parent: 12 + - uid: 6986 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-13.5 + parent: 12 - uid: 17580 components: - type: Transform @@ -73356,12 +72629,6 @@ entities: - type: Transform pos: -40.5,56.5 parent: 12 - - uid: 22281 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -81.5,31.5 - parent: 12 - proto: ComputerCriminalRecords entities: - uid: 7260 @@ -73504,12 +72771,6 @@ entities: parent: 12 - proto: ComputerRadar entities: - - uid: 87 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,-8.5 - parent: 12 - uid: 2447 components: - type: Transform @@ -73538,6 +72799,12 @@ entities: rot: 1.5707963267948966 rad pos: -49.5,27.5 parent: 12 + - uid: 18309 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,-8.5 + parent: 12 - proto: ComputerResearchAndDevelopment entities: - uid: 784 @@ -73691,6 +72958,12 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,36.5 parent: 12 + - uid: 7281 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-13.5 + parent: 12 - uid: 11470 components: - type: Transform @@ -73715,12 +72988,6 @@ entities: rot: -1.5707963267948966 rad pos: -37.5,34.5 parent: 12 - - uid: 22280 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -82.5,33.5 - parent: 12 - uid: 23576 components: - type: Transform @@ -73734,12 +73001,6 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,37.5 parent: 12 - - uid: 22255 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -78.5,32.5 - parent: 12 - proto: ComputerTechnologyDiskTerminal entities: - uid: 1707 @@ -74966,10 +74227,10 @@ entities: parent: 12 - proto: CrateEngineeringAMEJar entities: - - uid: 27169 + - uid: 21863 components: - type: Transform - pos: 33.5,0.5 + pos: 37.5,-2.5 parent: 12 - proto: CrateEngineeringAMEShielding entities: @@ -75448,10 +74709,10 @@ entities: parent: 12 - proto: CrewMonitoringServer entities: - - uid: 22207 + - uid: 7277 components: - type: Transform - pos: -79.5,25.5 + pos: -0.5,-15.5 parent: 12 - proto: Crowbar entities: @@ -75554,6 +74815,32 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,30.5 parent: 12 +- proto: CurtainsBlueOpen + entities: + - uid: 21983 + components: + - type: Transform + pos: -53.5,19.5 + parent: 12 + - uid: 21984 + components: + - type: Transform + pos: -9.5,-38.5 + parent: 12 +- proto: CurtainsGreenOpen + entities: + - uid: 21982 + components: + - type: Transform + pos: -41.5,24.5 + parent: 12 +- proto: CurtainsOrangeOpen + entities: + - uid: 21963 + components: + - type: Transform + pos: 46.5,-8.5 + parent: 12 - proto: CurtainsPinkOpen entities: - uid: 22896 @@ -75561,8 +74848,27 @@ entities: - type: Transform pos: 5.5,55.5 parent: 12 +- proto: CurtainsPurpleOpen + entities: + - uid: 21985 + components: + - type: Transform + pos: -37.5,-19.5 + parent: 12 +- proto: CurtainsRedOpen + entities: + - uid: 22052 + components: + - type: Transform + pos: -44.5,33.5 + parent: 12 - proto: CurtainsWhiteOpen entities: + - uid: 21980 + components: + - type: Transform + pos: 27.5,-22.5 + parent: 12 - uid: 22895 components: - type: Transform @@ -75671,6 +74977,13 @@ entities: text: Pool - type: WarpPoint location: Pool +- proto: DefaultStationBeaconAI + entities: + - uid: 115 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 12 - proto: DefaultStationBeaconAICore entities: - uid: 24246 @@ -76106,10 +75419,10 @@ entities: parent: 12 - proto: DefaultStationBeaconTelecoms entities: - - uid: 24254 + - uid: 21869 components: - type: Transform - pos: -79.5,23.5 + pos: 36.5,-5.5 parent: 12 - proto: DefaultStationBeaconToolRoom entities: @@ -76410,6 +75723,11 @@ entities: rot: 3.141592653589793 rad pos: 50.5,49.5 parent: 12 + - uid: 5131 + components: + - type: Transform + pos: -23.5,53.5 + parent: 12 - uid: 5396 components: - type: Transform @@ -76518,12 +75836,6 @@ entities: - type: Transform pos: 43.5,-11.5 parent: 12 - - uid: 9070 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 35.5,-11.5 - parent: 12 - uid: 9300 components: - type: Transform @@ -76932,6 +76244,33 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-38.5 parent: 12 + - uid: 19288 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,-11.5 + parent: 12 + - uid: 20076 + components: + - type: Transform + pos: -8.5,-12.5 + parent: 12 + - uid: 20077 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-12.5 + parent: 12 + - uid: 20078 + components: + - type: Transform + pos: -9.5,-10.5 + parent: 12 + - uid: 20079 + components: + - type: Transform + pos: -10.5,-8.5 + parent: 12 - uid: 20220 components: - type: Transform @@ -76989,6 +76328,24 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,37.5 parent: 12 + - uid: 20288 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-10.5 + parent: 12 + - uid: 20289 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-8.5 + parent: 12 + - uid: 20290 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-4.5 + parent: 12 - uid: 20291 components: - type: Transform @@ -77004,7 +76361,31 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: -23.5,55.5 + pos: -10.5,-2.5 + parent: 12 + - uid: 20314 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-2.5 + parent: 12 + - uid: 20315 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-4.5 + parent: 12 + - uid: 20316 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-0.5 + parent: 12 + - uid: 20435 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-0.5 parent: 12 - uid: 22441 components: @@ -78723,11 +78104,11 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,45.5 parent: 12 - - uid: 4696 + - uid: 4695 components: - type: Transform rot: -1.5707963267948966 rad - pos: -60.5,38.5 + pos: -24.5,53.5 parent: 12 - uid: 4710 components: @@ -79649,24 +79030,6 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,-11.5 parent: 12 - - uid: 9066 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 38.5,-11.5 - parent: 12 - - uid: 9067 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,-11.5 - parent: 12 - - uid: 9068 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 36.5,-11.5 - parent: 12 - uid: 9339 components: - type: Transform @@ -79956,12 +79319,6 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,5.5 parent: 12 - - uid: 9547 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -63.5,38.5 - parent: 12 - uid: 9552 components: - type: Transform @@ -81570,24 +80927,6 @@ entities: rot: -1.5707963267948966 rad pos: 38.5,51.5 parent: 12 - - uid: 15864 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -57.5,38.5 - parent: 12 - - uid: 15890 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -58.5,38.5 - parent: 12 - - uid: 15899 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -59.5,38.5 - parent: 12 - uid: 16388 components: - type: Transform @@ -82139,12 +81478,6 @@ entities: rot: 3.141592653589793 rad pos: -47.5,29.5 parent: 12 - - uid: 17757 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -62.5,38.5 - parent: 12 - uid: 18563 components: - type: Transform @@ -82876,16 +82209,6 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,55.5 parent: 12 - - uid: 20288 - components: - - type: Transform - pos: -23.5,54.5 - parent: 12 - - uid: 20289 - components: - - type: Transform - pos: -23.5,53.5 - parent: 12 - uid: 20294 components: - type: Transform @@ -82982,12 +82305,6 @@ entities: rot: 3.141592653589793 rad pos: -35.5,41.5 parent: 12 - - uid: 21064 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -55.5,38.5 - parent: 12 - uid: 21326 components: - type: Transform @@ -83004,108 +82321,6 @@ entities: - type: Transform pos: -25.5,27.5 parent: 12 - - uid: 21876 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -61.5,38.5 - parent: 12 - - uid: 21879 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -56.5,38.5 - parent: 12 - - uid: 21881 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -64.5,38.5 - parent: 12 - - uid: 21882 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -65.5,38.5 - parent: 12 - - uid: 21895 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -66.5,38.5 - parent: 12 - - uid: 21912 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -54.5,38.5 - parent: 12 - - uid: 21913 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -67.5,38.5 - parent: 12 - - uid: 21914 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -68.5,38.5 - parent: 12 - - uid: 21915 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -69.5,38.5 - parent: 12 - - uid: 21916 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -70.5,38.5 - parent: 12 - - uid: 21917 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -71.5,38.5 - parent: 12 - - uid: 21918 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -72.5,38.5 - parent: 12 - - uid: 21919 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -73.5,38.5 - parent: 12 - - uid: 21920 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -74.5,38.5 - parent: 12 - - uid: 21921 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -75.5,38.5 - parent: 12 - - uid: 21922 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -77.5,38.5 - parent: 12 - - uid: 21923 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -76.5,38.5 - parent: 12 - uid: 22418 components: - type: Transform @@ -85393,78 +84608,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,-13.5 parent: 12 - - uid: 29176 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-12.5 - parent: 12 - - uid: 29177 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-11.5 - parent: 12 - - uid: 29178 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-10.5 - parent: 12 - - uid: 29179 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-9.5 - parent: 12 - - uid: 29180 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-8.5 - parent: 12 - - uid: 29181 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-7.5 - parent: 12 - - uid: 29182 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-6.5 - parent: 12 - - uid: 29183 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-4.5 - parent: 12 - - uid: 29184 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-3.5 - parent: 12 - - uid: 29185 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-2.5 - parent: 12 - - uid: 29186 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-5.5 - parent: 12 - - uid: 29187 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-0.5 - parent: 12 - uid: 29188 components: - type: Transform @@ -85477,12 +84620,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,1.5 parent: 12 - - uid: 29190 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-1.5 - parent: 12 - uid: 29191 components: - type: Transform @@ -85534,17 +84671,17 @@ entities: parent: 12 - proto: DisposalPipeBroken entities: - - uid: 9045 + - uid: 4901 components: - type: Transform rot: 1.5707963267948966 rad - pos: 42.5,-18.5 + pos: -23.5,55.5 parent: 12 - - uid: 20290 + - uid: 9045 components: - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,52.5 + rot: 1.5707963267948966 rad + pos: 42.5,-18.5 parent: 12 - uid: 20296 components: @@ -85651,6 +84788,18 @@ entities: - type: Transform pos: 43.5,39.5 parent: 12 + - uid: 4709 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,52.5 + parent: 12 + - uid: 5067 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,53.5 + parent: 12 - uid: 5376 components: - type: Transform @@ -85724,11 +84873,6 @@ entities: - type: Transform pos: 59.5,-18.5 parent: 12 - - uid: 9044 - components: - - type: Transform - pos: 35.5,-10.5 - parent: 12 - uid: 9111 components: - type: Transform @@ -85914,17 +85058,10 @@ entities: - type: Transform pos: -14.5,45.5 parent: 12 - - uid: 21909 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -78.5,38.5 - parent: 12 - - uid: 21911 + - uid: 22010 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -53.5,38.5 + pos: 38.5,-10.5 parent: 12 - uid: 22414 components: @@ -86144,6 +85281,11 @@ entities: - type: Transform pos: 35.5,-23.5 parent: 12 + - uid: 4708 + components: + - type: Transform + pos: -23.5,52.5 + parent: 12 - uid: 6738 components: - type: Transform @@ -86184,11 +85326,6 @@ entities: - type: Transform pos: 59.5,-18.5 parent: 12 - - uid: 9043 - components: - - type: Transform - pos: 35.5,-10.5 - parent: 12 - uid: 9110 components: - type: Transform @@ -86323,15 +85460,10 @@ entities: - type: Transform pos: -14.5,45.5 parent: 12 - - uid: 21907 - components: - - type: Transform - pos: -78.5,38.5 - parent: 12 - - uid: 21910 + - uid: 21894 components: - type: Transform - pos: -53.5,38.5 + pos: 38.5,-10.5 parent: 12 - uid: 22204 components: @@ -86466,15 +85598,10 @@ entities: parent: 12 - proto: DogBed entities: - - uid: 2249 - components: - - type: Transform - pos: -39.5,-20.5 - parent: 12 - - uid: 11476 + - uid: 18310 components: - type: Transform - pos: 47.5,-8.5 + pos: 49.5,-7.5 parent: 12 - uid: 18663 components: @@ -86486,6 +85613,11 @@ entities: - type: Transform pos: -30.5,-41.5 parent: 12 + - uid: 21986 + components: + - type: Transform + pos: -39.5,-20.5 + parent: 12 - uid: 22097 components: - type: Transform @@ -86830,7 +85962,7 @@ entities: - uid: 18874 components: - type: Transform - pos: -43.771072,21.5421 + pos: -43.471462,21.802345 parent: 12 - uid: 21410 components: @@ -87886,24 +87018,24 @@ entities: parent: 12 - proto: EncryptionKeyCommon entities: - - uid: 22246 + - uid: 22253 components: - type: Transform - pos: -80.30383,20.526949 + pos: 33.718956,-6.4224234 parent: 12 - proto: EncryptionKeyEngineering entities: - - uid: 4714 + - uid: 22251 components: - type: Transform - pos: -80.48427,32.57216 + pos: 33.319225,-6.41427 parent: 12 - proto: EncryptionKeyMedicalScience entities: - - uid: 21800 + - uid: 22252 components: - type: Transform - pos: -81.42165,20.78353 + pos: 33.51501,-6.2675023 parent: 12 - proto: EpinephrineChemistryBottle entities: @@ -88329,16 +87461,6 @@ entities: - type: Transform pos: 28.5,27.5 parent: 12 - - uid: 15800 - components: - - type: Transform - pos: 11.5,38.5 - parent: 12 - - uid: 20820 - components: - - type: Transform - pos: -44.5,36.5 - parent: 12 - uid: 25367 components: - type: Transform @@ -88479,7 +87601,7 @@ entities: - 23918 - 9329 - 9330 - - 9333 + - 21889 - 23915 - 23914 - uid: 23925 @@ -89987,15 +89109,6 @@ entities: deviceLists: - 2614 - 28360 - - uid: 9333 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-6.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 23917 - uid: 9513 components: - type: Transform @@ -91298,12 +90411,6 @@ entities: - type: Transform pos: -5.5,52.5 parent: 12 - - uid: 19829 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,55.5 - parent: 12 - uid: 19846 components: - type: Transform @@ -91484,45 +90591,36 @@ entities: - type: DeviceNetwork deviceLists: - 23630 - - uid: 22043 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -58.5,-18.5 - parent: 12 - - uid: 22177 + - uid: 21889 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -77.5,36.5 + pos: -9.5,-6.5 parent: 12 - - uid: 22328 + - type: DeviceNetwork + deviceLists: + - 23917 + - uid: 22043 components: - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,29.5 + rot: 1.5707963267948966 rad + pos: -58.5,-18.5 parent: 12 - - type: DeviceNetwork - deviceLists: - - 22311 - - uid: 22329 + - uid: 22246 components: - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,31.5 + pos: 32.5,-7.5 parent: 12 - type: DeviceNetwork deviceLists: - - 22311 - - uid: 22330 + - 22248 + - uid: 22247 components: - type: Transform - rot: 3.141592653589793 rad - pos: -80.5,34.5 + pos: 37.5,-5.5 parent: 12 - type: DeviceNetwork deviceLists: - - 22311 + - 22248 - uid: 22521 components: - type: Transform @@ -93126,6 +92224,11 @@ entities: parent: 12 - type: AtmosPipeColor color: '#FFA500FF' + - uid: 19263 + components: + - type: Transform + pos: -24.5,54.5 + parent: 12 - uid: 26744 components: - type: Transform @@ -93163,6 +92266,12 @@ entities: parent: 12 - proto: GasPassiveVent entities: + - uid: 4763 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,54.5 + parent: 12 - uid: 15414 components: - type: Transform @@ -93187,6 +92296,11 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,31.5 parent: 12 + - uid: 22005 + components: + - type: Transform + pos: -25.5,56.5 + parent: 12 - uid: 26749 components: - type: Transform @@ -93227,12 +92341,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 904 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,-7.5 - parent: 12 - uid: 965 components: - type: Transform @@ -93754,6 +92862,12 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 4694 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,53.5 + parent: 12 - uid: 4759 components: - type: Transform @@ -93806,51 +92920,11 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 5141 - components: - - type: Transform - pos: 35.5,-5.5 - parent: 12 - - uid: 5145 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-5.5 - parent: 12 - - uid: 5146 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 35.5,-8.5 - parent: 12 - - uid: 5147 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 33.5,-4.5 - parent: 12 - uid: 5149 components: - type: Transform pos: -45.5,-18.5 parent: 12 - - uid: 5152 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,-8.5 - parent: 12 - - uid: 5153 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 36.5,-8.5 - parent: 12 - - uid: 5154 - components: - - type: Transform - pos: 36.5,-4.5 - parent: 12 - uid: 5219 components: - type: Transform @@ -95113,28 +94187,19 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 22253 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -82.5,40.5 - parent: 12 - - uid: 22254 - components: - - type: Transform - pos: -80.5,40.5 - parent: 12 - - uid: 22258 + - uid: 21906 components: - type: Transform - pos: -76.5,33.5 + pos: -22.5,53.5 parent: 12 - - uid: 22285 + - uid: 22243 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -79.5,33.5 + rot: -1.5707963267948966 rad + pos: 35.5,-7.5 parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 22552 components: - type: Transform @@ -96232,11 +95297,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 22260 - components: - - type: Transform - pos: -80.5,36.5 - parent: 12 - uid: 26981 components: - type: Transform @@ -96246,6 +95306,22 @@ entities: color: '#0055CCFF' - proto: GasPipeStraight entities: + - uid: 18 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 24 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 79 components: - type: Transform @@ -97696,12 +96772,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2866 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 36.5,-7.5 - parent: 12 - uid: 2885 components: - type: Transform @@ -97753,12 +96823,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#00FFFFFF' - - uid: 2978 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 36.5,-6.5 - parent: 12 - uid: 3003 components: - type: Transform @@ -97781,30 +96845,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3031 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 33.5,-5.5 - parent: 12 - - uid: 3033 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,-8.5 - parent: 12 - - uid: 3034 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 36.5,-5.5 - parent: 12 - - uid: 3050 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 33.5,-6.5 - parent: 12 - uid: 3490 components: - type: Transform @@ -99501,12 +98541,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 4780 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -80.5,37.5 - parent: 12 - uid: 4781 components: - type: Transform @@ -100055,18 +99089,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 5155 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-8.5 - parent: 12 - - uid: 5156 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-7.5 - parent: 12 - uid: 5210 components: - type: Transform @@ -100306,22 +99328,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 5289 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 5290 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.5,-6.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 5291 components: - type: Transform @@ -100773,22 +99779,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 5431 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 5432 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-8.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 5433 components: - type: Transform @@ -100924,18 +99914,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 6157 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 30.5,-7.5 - parent: 12 - - uid: 6184 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 30.5,-8.5 - parent: 12 - uid: 6279 components: - type: Transform @@ -101978,6 +100956,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 7745 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 8518 components: - type: Transform @@ -112095,98 +111081,85 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 22262 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -80.5,38.5 - parent: 12 - - uid: 22263 + - uid: 21874 components: - type: Transform rot: 3.141592653589793 rad - pos: -80.5,39.5 - parent: 12 - - uid: 22264 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -79.5,36.5 - parent: 12 - - uid: 22265 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -78.5,36.5 + pos: 29.5,-8.5 parent: 12 - - uid: 22266 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 22234 components: - type: Transform rot: 1.5707963267948966 rad - pos: -77.5,36.5 - parent: 12 - - uid: 22267 - components: - - type: Transform - pos: -80.5,35.5 - parent: 12 - - uid: 22268 - components: - - type: Transform - pos: -80.5,34.5 - parent: 12 - - uid: 22269 - components: - - type: Transform - pos: -80.5,33.5 - parent: 12 - - uid: 22270 - components: - - type: Transform - pos: -79.5,31.5 + pos: 30.5,-7.5 parent: 12 - - uid: 22271 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 22235 components: - type: Transform - pos: -79.5,29.5 + pos: 30.5,-7.5 parent: 12 - - uid: 22272 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 22236 components: - type: Transform - pos: -79.5,30.5 + rot: -1.5707963267948966 rad + pos: 31.5,-7.5 parent: 12 - - uid: 22273 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 22237 components: - type: Transform - pos: -79.5,27.5 + rot: -1.5707963267948966 rad + pos: 32.5,-7.5 parent: 12 - - uid: 22274 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 22238 components: - type: Transform - pos: -79.5,28.5 + rot: -1.5707963267948966 rad + pos: 33.5,-7.5 parent: 12 - - uid: 22275 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 22239 components: - type: Transform rot: -1.5707963267948966 rad - pos: -80.5,26.5 + pos: 34.5,-7.5 parent: 12 - - uid: 22276 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 22240 components: - type: Transform rot: -1.5707963267948966 rad - pos: -78.5,26.5 + pos: 31.5,-6.5 parent: 12 - - uid: 22282 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 22241 components: - type: Transform - pos: -76.5,32.5 + rot: -1.5707963267948966 rad + pos: 32.5,-6.5 parent: 12 - - uid: 22283 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 22242 components: - type: Transform - pos: -77.5,32.5 + rot: -1.5707963267948966 rad + pos: 33.5,-6.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 22555 components: - type: Transform @@ -119984,29 +118957,22 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 22249 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -79.5,32.5 - parent: 12 - - uid: 22256 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,26.5 - parent: 12 - - uid: 22257 + - uid: 21875 components: - type: Transform - rot: 3.141592653589793 rad - pos: -80.5,32.5 + rot: 1.5707963267948966 rad + pos: 30.5,-6.5 parent: 12 - - uid: 22284 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 22233 components: - type: Transform - pos: -77.5,33.5 + rot: 1.5707963267948966 rad + pos: 29.5,-7.5 parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 22551 components: - type: Transform @@ -120369,17 +119335,11 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-62.5 parent: 12 - - uid: 5161 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 29.5,-8.5 - parent: 12 - - uid: 5162 + - uid: 4938 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 29.5,-7.5 + rot: 3.141592653589793 rad + pos: -22.5,52.5 parent: 12 - uid: 7149 components: @@ -120543,17 +119503,6 @@ entities: - type: Transform pos: -4.5,11.5 parent: 12 - - uid: 22250 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -77.5,31.5 - parent: 12 - - uid: 22252 - components: - - type: Transform - pos: -82.5,41.5 - parent: 12 - uid: 22496 components: - type: Transform @@ -120656,17 +119605,11 @@ entities: - type: Transform pos: 59.5,2.5 parent: 12 - - uid: 5157 + - uid: 4696 components: - type: Transform rot: -1.5707963267948966 rad - pos: 31.5,-8.5 - parent: 12 - - uid: 5158 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 31.5,-7.5 + pos: -23.5,53.5 parent: 12 - uid: 7147 components: @@ -120743,12 +119686,6 @@ entities: - type: Transform pos: -47.5,46.5 parent: 12 - - uid: 22251 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -81.5,40.5 - parent: 12 - uid: 26693 components: - type: Transform @@ -120827,12 +119764,6 @@ entities: - type: Transform pos: -46.5,47.5 parent: 12 - - uid: 20958 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -76.5,31.5 - parent: 12 - uid: 26645 components: - type: Transform @@ -120911,6 +119842,13 @@ entities: parent: 12 - type: GasValve open: False + - uid: 4780 + components: + - type: Transform + pos: -25.5,55.5 + parent: 12 + - type: GasValve + open: False - uid: 7158 components: - type: Transform @@ -120937,14 +119875,6 @@ entities: - type: Transform pos: -46.5,44.5 parent: 12 - - uid: 22259 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -78.5,33.5 - parent: 12 - - type: GasValve - open: False - uid: 27023 components: - type: Transform @@ -122167,48 +121097,16 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 21953 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -77.5,26.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 22311 - - uid: 21954 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -81.5,32.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 22311 - - uid: 21955 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -81.5,26.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 22311 - - uid: 22176 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -76.5,36.5 - parent: 12 - - uid: 22248 + - uid: 22245 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -81.5,36.5 + pos: 35.5,-6.5 parent: 12 - type: DeviceNetwork deviceLists: - - 22312 + - 22248 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 22331 components: - type: Transform @@ -123871,6 +122769,17 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 22244 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-6.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 22248 + - type: AtmosPipeColor + color: '#990000FF' - uid: 22332 components: - type: Transform @@ -124269,21 +123178,6 @@ entities: rot: 1.5707963267948966 rad pos: 53.5,22.5 parent: 12 - - uid: 19614 - components: - - type: Transform - pos: -25.5,53.5 - parent: 12 - - uid: 19615 - components: - - type: Transform - pos: -24.5,54.5 - parent: 12 - - uid: 19619 - components: - - type: Transform - pos: -25.5,55.5 - parent: 12 - uid: 21532 components: - type: Transform @@ -124439,7 +123333,7 @@ entities: - uid: 28 components: - type: Transform - pos: -0.5,3.5 + pos: -20.5,55.5 parent: 12 - uid: 82 components: @@ -124456,6 +123350,36 @@ entities: - type: Transform pos: -9.5,-13.5 parent: 12 + - uid: 118 + components: + - type: Transform + pos: -47.5,13.5 + parent: 12 + - uid: 120 + components: + - type: Transform + pos: -53.5,13.5 + parent: 12 + - uid: 135 + components: + - type: Transform + pos: -51.5,13.5 + parent: 12 + - uid: 136 + components: + - type: Transform + pos: -52.5,13.5 + parent: 12 + - uid: 147 + components: + - type: Transform + pos: -50.5,13.5 + parent: 12 + - uid: 148 + components: + - type: Transform + pos: -55.5,15.5 + parent: 12 - uid: 176 components: - type: Transform @@ -124516,30 +123440,115 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-17.5 parent: 12 - - uid: 232 + - uid: 222 components: - type: Transform - pos: -10.5,-5.5 + pos: -55.5,16.5 + parent: 12 + - uid: 223 + components: + - type: Transform + pos: -56.5,16.5 + parent: 12 + - uid: 224 + components: + - type: Transform + pos: -48.5,13.5 + parent: 12 + - uid: 233 + components: + - type: Transform + pos: -55.5,14.5 + parent: 12 + - uid: 234 + components: + - type: Transform + pos: -56.5,17.5 + parent: 12 + - uid: 235 + components: + - type: Transform + pos: -56.5,18.5 parent: 12 - uid: 236 components: - type: Transform pos: -6.5,-5.5 parent: 12 + - uid: 237 + components: + - type: Transform + pos: -57.5,18.5 + parent: 12 + - uid: 238 + components: + - type: Transform + pos: -54.5,13.5 + parent: 12 - uid: 239 components: - type: Transform pos: -6.5,-7.5 parent: 12 + - uid: 241 + components: + - type: Transform + pos: -47.5,15.5 + parent: 12 + - uid: 242 + components: + - type: Transform + pos: -60.5,34.5 + parent: 12 - uid: 243 components: - type: Transform - pos: -10.5,-7.5 + pos: -60.5,32.5 + parent: 12 + - uid: 244 + components: + - type: Transform + pos: -60.5,31.5 + parent: 12 + - uid: 255 + components: + - type: Transform + pos: -60.5,33.5 + parent: 12 + - uid: 256 + components: + - type: Transform + pos: -57.5,39.5 + parent: 12 + - uid: 258 + components: + - type: Transform + pos: -56.5,39.5 + parent: 12 + - uid: 260 + components: + - type: Transform + pos: -57.5,37.5 + parent: 12 + - uid: 265 + components: + - type: Transform + pos: -57.5,38.5 + parent: 12 + - uid: 271 + components: + - type: Transform + pos: -52.5,42.5 parent: 12 - uid: 273 components: - type: Transform - pos: -12.5,-4.5 + pos: -52.5,43.5 + parent: 12 + - uid: 274 + components: + - type: Transform + pos: -52.5,40.5 parent: 12 - uid: 283 components: @@ -124813,6 +123822,11 @@ entities: - type: Transform pos: -32.5,-17.5 parent: 12 + - uid: 526 + components: + - type: Transform + pos: -52.5,41.5 + parent: 12 - uid: 534 components: - type: Transform @@ -126362,23 +125376,6 @@ entities: - type: Transform pos: 32.5,-0.5 parent: 12 - - uid: 5131 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-7.5 - parent: 12 - - uid: 5132 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-8.5 - parent: 12 - - uid: 5235 - components: - - type: Transform - pos: -54.5,38.5 - parent: 12 - uid: 5269 components: - type: Transform @@ -126495,11 +125492,6 @@ entities: - type: Transform pos: 58.5,-2.5 parent: 12 - - uid: 5935 - components: - - type: Transform - pos: 36.5,-9.5 - parent: 12 - uid: 5974 components: - type: Transform @@ -127116,6 +126108,11 @@ entities: - type: Transform pos: 34.5,-24.5 parent: 12 + - uid: 6941 + components: + - type: Transform + pos: -60.5,30.5 + parent: 12 - uid: 7262 components: - type: Transform @@ -127138,21 +126135,6 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,-14.5 parent: 12 - - uid: 7355 - components: - - type: Transform - pos: -9.5,-1.5 - parent: 12 - - uid: 7361 - components: - - type: Transform - pos: -9.5,-11.5 - parent: 12 - - uid: 7375 - components: - - type: Transform - pos: -9.5,-2.5 - parent: 12 - uid: 7379 components: - type: Transform @@ -127231,16 +126213,6 @@ entities: rot: -1.5707963267948966 rad pos: 47.5,-29.5 parent: 12 - - uid: 7438 - components: - - type: Transform - pos: -9.5,-0.5 - parent: 12 - - uid: 7442 - components: - - type: Transform - pos: -9.5,-10.5 - parent: 12 - uid: 7463 components: - type: Transform @@ -127608,16 +126580,6 @@ entities: rot: 3.141592653589793 rad pos: 49.5,-9.5 parent: 12 - - uid: 8444 - components: - - type: Transform - pos: -3.5,-4.5 - parent: 12 - - uid: 8445 - components: - - type: Transform - pos: -3.5,-8.5 - parent: 12 - uid: 8446 components: - type: Transform @@ -127640,6 +126602,11 @@ entities: rot: 1.5707963267948966 rad pos: 55.5,-50.5 parent: 12 + - uid: 9068 + components: + - type: Transform + pos: -58.5,36.5 + parent: 12 - uid: 9308 components: - type: Transform @@ -130378,11 +129345,61 @@ entities: - type: Transform pos: 5.5,42.5 parent: 12 + - uid: 15864 + components: + - type: Transform + pos: -47.5,14.5 + parent: 12 - uid: 15892 components: - type: Transform pos: 1.5,46.5 parent: 12 + - uid: 15899 + components: + - type: Transform + pos: -60.5,24.5 + parent: 12 + - uid: 15900 + components: + - type: Transform + pos: -60.5,25.5 + parent: 12 + - uid: 15910 + components: + - type: Transform + pos: -60.5,26.5 + parent: 12 + - uid: 15911 + components: + - type: Transform + pos: -60.5,27.5 + parent: 12 + - uid: 15912 + components: + - type: Transform + pos: -60.5,28.5 + parent: 12 + - uid: 15913 + components: + - type: Transform + pos: -60.5,29.5 + parent: 12 + - uid: 15914 + components: + - type: Transform + pos: -59.5,22.5 + parent: 12 + - uid: 15915 + components: + - type: Transform + pos: -59.5,19.5 + parent: 12 + - uid: 15916 + components: + - type: Transform + pos: -49.5,13.5 + parent: 12 - uid: 16355 components: - type: Transform @@ -130394,21 +129411,31 @@ entities: - type: Transform pos: -53.5,-15.5 parent: 12 + - uid: 16413 + components: + - type: Transform + pos: -59.5,20.5 + parent: 12 + - uid: 16414 + components: + - type: Transform + pos: -58.5,19.5 + parent: 12 - uid: 16416 components: - type: Transform rot: -1.5707963267948966 rad pos: 55.5,-12.5 parent: 12 - - uid: 16657 + - uid: 16422 components: - type: Transform - pos: -9.5,-12.5 + pos: -59.5,21.5 parent: 12 - - uid: 16798 + - uid: 16423 components: - type: Transform - pos: -0.5,1.5 + pos: -59.5,23.5 parent: 12 - uid: 16801 components: @@ -130635,6 +129662,16 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,46.5 parent: 12 + - uid: 17544 + components: + - type: Transform + pos: -59.5,34.5 + parent: 12 + - uid: 17545 + components: + - type: Transform + pos: -59.5,35.5 + parent: 12 - uid: 17599 components: - type: Transform @@ -130694,11 +129731,6 @@ entities: rot: 1.5707963267948966 rad pos: -44.5,48.5 parent: 12 - - uid: 17957 - components: - - type: Transform - pos: -54.5,37.5 - parent: 12 - uid: 18577 components: - type: Transform @@ -131027,12 +130059,7 @@ entities: - uid: 19620 components: - type: Transform - pos: -25.5,54.5 - parent: 12 - - uid: 19621 - components: - - type: Transform - pos: -25.5,56.5 + pos: -57.5,36.5 parent: 12 - uid: 19636 components: @@ -131189,6 +130216,11 @@ entities: rot: 3.141592653589793 rad pos: 72.5,14.5 parent: 12 + - uid: 20958 + components: + - type: Transform + pos: -54.5,38.5 + parent: 12 - uid: 21315 components: - type: Transform @@ -131200,55 +130232,94 @@ entities: - type: Transform pos: -1.5,15.5 parent: 12 - - uid: 21995 + - uid: 21862 components: - type: Transform - pos: -82.5,30.5 + pos: 37.5,-6.5 parent: 12 - - uid: 21996 + - uid: 21903 components: - type: Transform - pos: -81.5,30.5 + pos: -0.5,1.5 parent: 12 - - uid: 21997 + - uid: 21904 components: - type: Transform - pos: -80.5,30.5 + pos: -54.5,37.5 parent: 12 - - uid: 21998 + - uid: 21907 components: - type: Transform - pos: -80.5,29.5 + pos: -4.5,-7.5 parent: 12 - - uid: 21999 + - uid: 21911 components: - type: Transform - pos: -80.5,31.5 + pos: 37.5,-4.5 parent: 12 - - uid: 22000 + - uid: 21987 components: - type: Transform - pos: -78.5,29.5 + pos: -1.5,2.5 parent: 12 - - uid: 22001 + - uid: 21990 components: - type: Transform - pos: -78.5,30.5 + pos: -3.5,-7.5 parent: 12 - - uid: 22002 + - uid: 21993 components: - type: Transform - pos: -78.5,31.5 + pos: -5.5,-7.5 parent: 12 - - uid: 22003 + - uid: 21994 components: - type: Transform - pos: -77.5,30.5 + pos: -4.5,-5.5 parent: 12 - - uid: 22004 + - uid: 21995 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-7.5 + parent: 12 + - uid: 21996 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 12 + - uid: 22011 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-5.5 + parent: 12 + - uid: 22012 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-7.5 + parent: 12 + - uid: 22013 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-5.5 + parent: 12 + - uid: 22016 + components: + - type: Transform + pos: -3.5,-5.5 + parent: 12 + - uid: 22021 + components: + - type: Transform + pos: -9.5,1.5 + parent: 12 + - uid: 22022 components: - type: Transform - pos: -76.5,30.5 + pos: -10.5,0.5 parent: 12 - uid: 22026 components: @@ -131277,7 +130348,57 @@ entities: - uid: 22050 components: - type: Transform - pos: -77.5,38.5 + pos: -9.5,0.5 + parent: 12 + - uid: 22065 + components: + - type: Transform + pos: -11.5,-2.5 + parent: 12 + - uid: 22066 + components: + - type: Transform + pos: -11.5,-1.5 + parent: 12 + - uid: 22067 + components: + - type: Transform + pos: -11.5,-10.5 + parent: 12 + - uid: 22068 + components: + - type: Transform + pos: -11.5,-11.5 + parent: 12 + - uid: 22069 + components: + - type: Transform + pos: -10.5,-11.5 + parent: 12 + - uid: 22070 + components: + - type: Transform + pos: -10.5,-12.5 + parent: 12 + - uid: 22071 + components: + - type: Transform + pos: -10.5,-13.5 + parent: 12 + - uid: 22072 + components: + - type: Transform + pos: -10.5,-1.5 + parent: 12 + - uid: 22073 + components: + - type: Transform + pos: -10.5,-0.5 + parent: 12 + - uid: 22075 + components: + - type: Transform + pos: -9.5,2.5 parent: 12 - uid: 22098 components: @@ -131339,26 +130460,11 @@ entities: - type: Transform pos: 62.5,14.5 parent: 12 - - uid: 22144 - components: - - type: Transform - pos: -4.5,-8.5 - parent: 12 - - uid: 22150 - components: - - type: Transform - pos: -4.5,-4.5 - parent: 12 - uid: 22151 components: - type: Transform pos: 80.5,11.5 parent: 12 - - uid: 22156 - components: - - type: Transform - pos: -75.5,16.5 - parent: 12 - uid: 22193 components: - type: Transform @@ -131377,11 +130483,6 @@ entities: rot: 3.141592653589793 rad pos: -27.5,75.5 parent: 12 - - uid: 22338 - components: - - type: Transform - pos: -79.5,45.5 - parent: 12 - uid: 22686 components: - type: Transform @@ -131433,12 +130534,6 @@ entities: - type: Transform pos: 49.5,9.5 parent: 12 - - uid: 23896 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-8.5 - parent: 12 - uid: 24664 components: - type: Transform @@ -131518,51 +130613,6 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,73.5 parent: 12 - - uid: 25472 - components: - - type: Transform - pos: -80.5,16.5 - parent: 12 - - uid: 25473 - components: - - type: Transform - pos: -86.5,28.5 - parent: 12 - - uid: 25474 - components: - - type: Transform - pos: -86.5,22.5 - parent: 12 - - uid: 25475 - components: - - type: Transform - pos: -79.5,16.5 - parent: 12 - - uid: 25476 - components: - - type: Transform - pos: -86.5,27.5 - parent: 12 - - uid: 25477 - components: - - type: Transform - pos: -86.5,24.5 - parent: 12 - - uid: 25478 - components: - - type: Transform - pos: -86.5,26.5 - parent: 12 - - uid: 25482 - components: - - type: Transform - pos: -86.5,34.5 - parent: 12 - - uid: 25484 - components: - - type: Transform - pos: -86.5,31.5 - parent: 12 - uid: 25489 components: - type: Transform @@ -131599,26 +130649,6 @@ entities: - type: Transform pos: 11.5,6.5 parent: 12 - - uid: 25542 - components: - - type: Transform - pos: -86.5,36.5 - parent: 12 - - uid: 25543 - components: - - type: Transform - pos: -86.5,35.5 - parent: 12 - - uid: 25544 - components: - - type: Transform - pos: -86.5,38.5 - parent: 12 - - uid: 25545 - components: - - type: Transform - pos: -76.5,16.5 - parent: 12 - uid: 25546 components: - type: Transform @@ -131960,46 +130990,11 @@ entities: - type: Transform pos: -56.5,-15.5 parent: 12 - - uid: 26104 - components: - - type: Transform - pos: -78.5,16.5 - parent: 12 - - uid: 26105 - components: - - type: Transform - pos: -86.5,32.5 - parent: 12 - - uid: 26106 - components: - - type: Transform - pos: -86.5,30.5 - parent: 12 - - uid: 26107 - components: - - type: Transform - pos: -86.5,40.5 - parent: 12 - - uid: 26108 - components: - - type: Transform - pos: -81.5,45.5 - parent: 12 - - uid: 26109 - components: - - type: Transform - pos: -86.5,39.5 - parent: 12 - uid: 26110 components: - type: Transform pos: -41.5,56.5 parent: 12 - - uid: 26111 - components: - - type: Transform - pos: -80.5,45.5 - parent: 12 - uid: 26112 components: - type: Transform @@ -132117,16 +131112,6 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,67.5 parent: 12 - - uid: 26449 - components: - - type: Transform - pos: -86.5,23.5 - parent: 12 - - uid: 26450 - components: - - type: Transform - pos: -82.5,16.5 - parent: 12 - uid: 26471 components: - type: Transform @@ -133090,91 +132075,6 @@ entities: - type: Transform pos: 12.5,12.5 parent: 12 - - uid: 29323 - components: - - type: Transform - pos: -74.5,16.5 - parent: 12 - - uid: 29324 - components: - - type: Transform - pos: -73.5,16.5 - parent: 12 - - uid: 29325 - components: - - type: Transform - pos: -83.5,16.5 - parent: 12 - - uid: 29326 - components: - - type: Transform - pos: -84.5,16.5 - parent: 12 - - uid: 29327 - components: - - type: Transform - pos: -85.5,16.5 - parent: 12 - - uid: 29328 - components: - - type: Transform - pos: -86.5,16.5 - parent: 12 - - uid: 29329 - components: - - type: Transform - pos: -86.5,17.5 - parent: 12 - - uid: 29330 - components: - - type: Transform - pos: -86.5,19.5 - parent: 12 - - uid: 29331 - components: - - type: Transform - pos: -86.5,20.5 - parent: 12 - - uid: 29332 - components: - - type: Transform - pos: -86.5,18.5 - parent: 12 - - uid: 29333 - components: - - type: Transform - pos: -86.5,42.5 - parent: 12 - - uid: 29334 - components: - - type: Transform - pos: -86.5,43.5 - parent: 12 - - uid: 29335 - components: - - type: Transform - pos: -86.5,44.5 - parent: 12 - - uid: 29336 - components: - - type: Transform - pos: -86.5,45.5 - parent: 12 - - uid: 29337 - components: - - type: Transform - pos: -85.5,45.5 - parent: 12 - - uid: 29338 - components: - - type: Transform - pos: -84.5,45.5 - parent: 12 - - uid: 29339 - components: - - type: Transform - pos: -83.5,45.5 - parent: 12 - uid: 29421 components: - type: Transform @@ -133638,40 +132538,6 @@ entities: parent: 12 - proto: HeatExchanger entities: - - uid: 2767 - components: - - type: Transform - pos: 34.5,-6.5 - parent: 12 - - uid: 2775 - components: - - type: Transform - pos: 34.5,-7.5 - parent: 12 - - uid: 2795 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 35.5,-4.5 - parent: 12 - - uid: 2946 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-4.5 - parent: 12 - - uid: 2989 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 35.5,-7.5 - parent: 12 - - uid: 3009 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 35.5,-6.5 - parent: 12 - uid: 5988 components: - type: Transform @@ -134095,11 +132961,6 @@ entities: - type: Transform pos: -25.5,17.5 parent: 12 - - uid: 22294 - components: - - type: Transform - pos: -81.5,34.5 - parent: 12 - uid: 23622 components: - type: Transform @@ -134160,6 +133021,12 @@ entities: rot: 3.141592653589793 rad pos: -47.5,23.5 parent: 12 + - uid: 22254 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-8.5 + parent: 12 - uid: 24142 components: - type: Transform @@ -134827,6 +133694,36 @@ entities: - type: Transform pos: 27.5,-21.5 parent: 12 + - 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: + - 5490 + - 5489 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: LockerChiefMedicalOfficerFilledHardsuit entities: - uid: 2579 @@ -135748,34 +134645,6 @@ entities: - type: Transform pos: 41.5,48.5 parent: 12 - - uid: 17955 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-14.5 - parent: 12 - - uid: 22219 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -81.5,27.5 - parent: 12 - - uid: 22222 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -77.5,22.5 - parent: 12 - - uid: 22233 - components: - - type: Transform - pos: -79.5,24.5 - parent: 12 - - uid: 22247 - components: - - type: Transform - pos: -78.5,34.5 - parent: 12 - uid: 24028 components: - type: Transform @@ -135793,11 +134662,6 @@ entities: - type: Transform pos: 53.5,25.5 parent: 12 - - uid: 22215 - components: - - type: Transform - pos: -77.5,27.5 - parent: 12 - proto: MagazinePistolSubMachineGunTopMounted entities: - uid: 27841 @@ -136150,18 +135014,6 @@ entities: - type: Transform pos: -33.443954,20.520542 parent: 12 -- proto: MatterBinStockPart - entities: - - uid: 22242 - components: - - type: Transform - pos: -78.645935,20.388874 - parent: 12 - - uid: 22243 - components: - - type: Transform - pos: -78.156105,20.42653 - parent: 12 - proto: MedicalBed entities: - uid: 2323 @@ -136277,7 +135129,7 @@ entities: - uid: 18991 components: - type: Transform - pos: -42.396534,21.484627 + pos: -44.528492,21.940958 parent: 12 - uid: 19273 components: @@ -136355,18 +135207,6 @@ entities: - type: Transform pos: 1.5853901,-37.412144 parent: 12 -- proto: MicroManipulatorStockPart - entities: - - uid: 22240 - components: - - type: Transform - pos: -76.62381,20.451637 - parent: 12 - - uid: 22241 - components: - - type: Transform - pos: -76.43541,20.8031 - parent: 12 - proto: MicrophoneInstrument entities: - uid: 9383 @@ -136408,6 +135248,11 @@ entities: - type: Transform pos: 39.515476,63.508766 parent: 12 + - uid: 19619 + components: + - type: Transform + pos: -22.51786,53.46946 + parent: 12 - uid: 21391 components: - type: Transform @@ -136636,6 +135481,11 @@ entities: - type: Transform pos: -47.5,40.5 parent: 12 + - uid: 19616 + components: + - type: Transform + pos: -22.5,52.5 + parent: 12 - uid: 21501 components: - type: Transform @@ -137446,7 +136296,7 @@ entities: - uid: 18872 components: - type: Transform - pos: -41.953915,21.511538 + pos: -43.378246,21.468042 parent: 12 - uid: 18882 components: @@ -137875,6 +136725,11 @@ entities: parent: 12 - proto: PortableGeneratorJrPacman entities: + - uid: 2978 + components: + - type: Transform + pos: 40.5,59.5 + parent: 12 - uid: 9087 components: - type: Transform @@ -137890,6 +136745,21 @@ entities: - type: Transform pos: -35.5,-9.5 parent: 12 + - uid: 15859 + components: + - type: Transform + pos: -44.5,46.5 + parent: 12 + - uid: 17963 + components: + - type: Transform + pos: 40.5,25.5 + parent: 12 + - uid: 17964 + components: + - type: Transform + pos: -19.5,73.5 + parent: 12 - uid: 27835 components: - type: Transform @@ -137934,14 +136804,11 @@ entities: - type: Transform pos: 8.5,-11.5 parent: 12 - - uid: 17544 + - uid: 2989 components: - type: Transform - anchored: True - pos: -78.5,40.5 + pos: 3.5,-5.5 parent: 12 - - type: Physics - bodyType: Static - uid: 27309 components: - type: Transform @@ -138098,10 +136965,11 @@ entities: parent: 12 - proto: PosterContrabandLamarr entities: - - uid: 2018 + - uid: 21975 components: - type: Transform - pos: -39.5,-25.5 + rot: 3.141592653589793 rad + pos: -40.5,-25.5 parent: 12 - proto: PosterContrabandRevolver entities: @@ -138901,12 +137769,6 @@ entities: - type: Transform pos: -36.5,-19.5 parent: 12 - - uid: 1975 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -38.5,-24.5 - parent: 12 - uid: 1976 components: - type: Transform @@ -140975,29 +139837,11 @@ entities: rot: 3.141592653589793 rad pos: -9.5,74.5 parent: 12 - - uid: 22186 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -82.5,26.5 - parent: 12 - - uid: 22187 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -76.5,26.5 - parent: 12 - - uid: 22188 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -76.5,23.5 - parent: 12 - - uid: 22189 + - uid: 21919 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -82.5,23.5 + rot: 3.141592653589793 rad + pos: -38.5,-24.5 parent: 12 - uid: 22499 components: @@ -141922,35 +140766,11 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,32.5 parent: 12 - - uid: 22180 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -76.5,35.5 - parent: 12 - - uid: 22182 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,36.5 - parent: 12 - - uid: 22183 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,40.5 - parent: 12 - - uid: 22184 + - uid: 22061 components: - type: Transform rot: 1.5707963267948966 rad - pos: -82.5,32.5 - parent: 12 - - uid: 22185 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -76.5,32.5 + pos: -25.5,54.5 parent: 12 - uid: 22709 components: @@ -142425,6 +141245,12 @@ entities: - type: Transform pos: -31.5,7.5 parent: 12 + - uid: 11476 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-6.5 + parent: 12 - uid: 12318 components: - type: Transform @@ -142539,40 +141365,16 @@ entities: - type: Transform pos: -5.5,17.5 parent: 12 - - uid: 22169 - components: - - type: Transform - pos: -51.5,38.5 - parent: 12 - - uid: 22277 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -82.5,35.5 - parent: 12 - - uid: 22278 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -82.5,36.5 - parent: 12 - - uid: 22279 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -82.5,37.5 - parent: 12 - - uid: 22286 + - uid: 21893 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -80.5,32.5 + pos: -50.5,38.5 parent: 12 - - uid: 22287 + - uid: 22018 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -76.5,33.5 + rot: 3.141592653589793 rad + pos: 3.5,-7.5 parent: 12 - uid: 22406 components: @@ -143002,21 +141804,6 @@ entities: - type: Transform pos: -50.73859,36.80472 parent: 12 - - uid: 22244 - components: - - type: Transform - pos: -80.98206,20.526949 - parent: 12 - - uid: 22245 - components: - - type: Transform - pos: -80.693184,20.765442 - parent: 12 - - uid: 22290 - components: - - type: Transform - pos: -76.49026,33.377193 - parent: 12 - uid: 23614 components: - type: Transform @@ -143733,6 +142520,11 @@ entities: - type: Transform pos: -37.5,-37.5 parent: 12 + - uid: 5141 + components: + - type: Transform + pos: 39.5,-24.5 + parent: 12 - uid: 8992 components: - type: Transform @@ -143748,11 +142540,6 @@ entities: - type: Transform pos: 9.5,-28.5 parent: 12 - - uid: 8995 - components: - - type: Transform - pos: 37.5,-24.5 - parent: 12 - uid: 18633 components: - type: Transform @@ -143980,12 +142767,6 @@ entities: rot: 3.141592653589793 rad pos: -50.5,43.5 parent: 12 - - uid: 24340 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -83.5,36.5 - parent: 12 - uid: 24341 components: - type: Transform @@ -144936,25 +143717,24 @@ entities: - uid: 5484 components: - type: Transform - pos: 26.418453,-23.311213 + pos: 25.628305,-22.194756 parent: 12 - proto: RCDAmmo entities: - uid: 5489 components: - type: Transform - pos: 25.898321,-23.49367 - parent: 12 + parent: 5466 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 5490 components: - type: Transform - pos: 25.539557,-23.379519 - parent: 12 - - uid: 5491 - components: - - type: Transform - pos: 25.254177,-23.061522 - parent: 12 + parent: 5466 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 26775 components: - type: Transform @@ -144975,19 +143755,6 @@ entities: rot: -1.5707963267948966 rad pos: 39.5,14.5 parent: 12 -- proto: ReinforcedGirder - entities: - - uid: 19616 - components: - - type: Transform - pos: -24.5,53.5 - parent: 12 - - uid: 19830 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,52.5 - parent: 12 - proto: ReinforcedPlasmaWindow entities: - uid: 728 @@ -145171,11 +143938,6 @@ entities: - type: Transform pos: 0.5,2.5 parent: 12 - - uid: 3 - components: - - type: Transform - pos: -0.5,3.5 - parent: 12 - uid: 4 components: - type: Transform @@ -145186,11 +143948,6 @@ entities: - type: Transform pos: -1.5,1.5 parent: 12 - - uid: 10 - components: - - type: Transform - pos: -0.5,1.5 - parent: 12 - uid: 69 components: - type: Transform @@ -145220,11 +143977,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-15.5 parent: 12 - - uid: 244 - components: - - type: Transform - pos: -10.5,-5.5 - parent: 12 - uid: 248 components: - type: Transform @@ -145235,11 +143987,6 @@ entities: - type: Transform pos: -6.5,-7.5 parent: 12 - - uid: 255 - components: - - type: Transform - pos: -10.5,-7.5 - parent: 12 - uid: 285 components: - type: Transform @@ -146434,18 +145181,6 @@ entities: - type: Transform pos: 59.5,-3.5 parent: 12 - - uid: 5133 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-8.5 - parent: 12 - - uid: 5134 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-7.5 - parent: 12 - uid: 5135 components: - type: Transform @@ -146458,11 +145193,6 @@ entities: rot: -1.5707963267948966 rad pos: -45.5,-38.5 parent: 12 - - uid: 5232 - components: - - type: Transform - pos: -54.5,38.5 - parent: 12 - uid: 5313 components: - type: Transform @@ -146530,11 +145260,6 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,-21.5 parent: 12 - - uid: 5936 - components: - - type: Transform - pos: 36.5,-9.5 - parent: 12 - uid: 5985 components: - type: Transform @@ -147420,16 +146145,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-21.5 parent: 12 - - uid: 8463 - components: - - type: Transform - pos: -9.5,-10.5 - parent: 12 - - uid: 8467 - components: - - type: Transform - pos: -9.5,-13.5 - parent: 12 - uid: 8477 components: - type: Transform @@ -149756,11 +148471,6 @@ entities: rot: -1.5707963267948966 rad pos: -54.5,47.5 parent: 12 - - uid: 17956 - components: - - type: Transform - pos: -54.5,37.5 - parent: 12 - uid: 18573 components: - type: Transform @@ -149976,11 +148686,6 @@ entities: - type: Transform pos: -42.5,54.5 parent: 12 - - uid: 19288 - components: - - type: Transform - pos: -9.5,-12.5 - parent: 12 - uid: 19291 components: - type: Transform @@ -150185,72 +148890,171 @@ entities: - type: Transform pos: 12.5,-1.5 parent: 12 + - uid: 21063 + components: + - type: Transform + pos: -54.5,38.5 + parent: 12 - uid: 21369 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-52.5 parent: 12 - - uid: 21883 + - uid: 21868 components: - type: Transform - pos: -80.5,29.5 + pos: 37.5,-6.5 parent: 12 - - uid: 21886 + - uid: 21871 components: - type: Transform - pos: -80.5,30.5 + pos: 37.5,-4.5 parent: 12 - - uid: 21887 + - uid: 21888 components: - type: Transform - pos: -76.5,30.5 + pos: -4.5,-5.5 parent: 12 - - uid: 21888 + - uid: 21897 components: - type: Transform - pos: -78.5,30.5 + pos: -10.5,0.5 parent: 12 - - uid: 21889 + - uid: 21898 components: - type: Transform - pos: -77.5,30.5 + pos: -9.5,0.5 parent: 12 - - uid: 21890 + - uid: 21900 components: - type: Transform - pos: -82.5,30.5 + pos: -5.5,-7.5 parent: 12 - - uid: 21891 + - uid: 21908 components: - type: Transform - pos: -81.5,30.5 + pos: -3.5,-7.5 parent: 12 - - uid: 21893 + - uid: 21938 components: - type: Transform - pos: -78.5,29.5 + pos: -1.5,2.5 parent: 12 - - uid: 21894 + - uid: 21939 + components: + - type: Transform + pos: -3.5,-5.5 + parent: 12 + - uid: 21952 components: - type: Transform - pos: -78.5,31.5 + pos: -54.5,37.5 parent: 12 - - uid: 21901 + - uid: 21957 components: - type: Transform - pos: -77.5,38.5 + pos: -9.5,1.5 parent: 12 - - uid: 21903 + - uid: 21958 + components: + - type: Transform + pos: -9.5,2.5 + parent: 12 + - uid: 21964 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 12 + - uid: 21991 + components: + - type: Transform + pos: -4.5,-7.5 + parent: 12 + - uid: 22014 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-7.5 + parent: 12 + - uid: 22015 components: - type: Transform - pos: -80.5,31.5 + pos: -0.5,1.5 + parent: 12 + - uid: 22017 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-5.5 + parent: 12 + - uid: 22019 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-5.5 + parent: 12 + - uid: 22023 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-7.5 parent: 12 - uid: 22025 components: - type: Transform pos: -54.5,61.5 parent: 12 + - uid: 22074 + components: + - type: Transform + pos: -9.5,-13.5 + parent: 12 + - uid: 22076 + components: + - type: Transform + pos: -10.5,-0.5 + parent: 12 + - uid: 22077 + components: + - type: Transform + pos: -10.5,-1.5 + parent: 12 + - uid: 22078 + components: + - type: Transform + pos: -11.5,-1.5 + parent: 12 + - uid: 22118 + components: + - type: Transform + pos: -11.5,-2.5 + parent: 12 + - uid: 22144 + components: + - type: Transform + pos: -11.5,-10.5 + parent: 12 + - uid: 22150 + components: + - type: Transform + pos: -11.5,-11.5 + parent: 12 + - uid: 22152 + components: + - type: Transform + pos: -10.5,-11.5 + parent: 12 + - uid: 22156 + components: + - type: Transform + pos: -10.5,-12.5 + parent: 12 + - uid: 22169 + components: + - type: Transform + pos: -10.5,-13.5 + parent: 12 - uid: 22856 components: - type: Transform @@ -150925,26 +149729,6 @@ entities: - type: Transform pos: -9.5,-15.5 parent: 12 - - uid: 28465 - components: - - type: Transform - pos: -9.5,-11.5 - parent: 12 - - uid: 28532 - components: - - type: Transform - pos: -9.5,-1.5 - parent: 12 - - uid: 28533 - components: - - type: Transform - pos: -9.5,-2.5 - parent: 12 - - uid: 28534 - components: - - type: Transform - pos: -9.5,-0.5 - parent: 12 - uid: 28785 components: - type: Transform @@ -151367,6 +150151,19 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,-40.5 parent: 12 +- proto: RemoteSignaller + entities: + - uid: 3009 + components: + - type: MetaData + name: TEG shutter door remote + - type: Transform + pos: 15.512024,16.164919 + parent: 12 + - type: DeviceLinkSource + linkedPorts: + 11: + - Pressed: Toggle - proto: ResearchAndDevelopmentServer entities: - uid: 785 @@ -151603,11 +150400,21 @@ entities: - type: Transform pos: 35.5,-24.5 parent: 12 + - uid: 5152 + components: + - type: Transform + pos: -53.5,23.5 + parent: 12 - uid: 5586 components: - type: Transform pos: -36.5,-43.5 parent: 12 + - uid: 8444 + components: + - type: Transform + pos: -2.5,-7.5 + parent: 12 - uid: 9874 components: - type: Transform @@ -151624,24 +150431,12 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,-39.5 parent: 12 - - uid: 16534 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,-7.5 - parent: 12 - uid: 16535 components: - type: Transform rot: -1.5707963267948966 rad pos: -24.5,6.5 parent: 12 - - uid: 16536 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-7.5 - parent: 12 - uid: 16537 components: - type: Transform @@ -151713,11 +150508,6 @@ entities: - type: Transform pos: -50.5,34.5 parent: 12 - - uid: 17946 - components: - - type: Transform - pos: -50.5,23.5 - parent: 12 - uid: 17947 components: - type: Transform @@ -151748,6 +150538,11 @@ entities: - type: Transform pos: -31.5,54.5 parent: 12 + - uid: 21909 + components: + - type: Transform + pos: -17.5,-16.5 + parent: 12 - uid: 24167 components: - type: Transform @@ -151873,11 +150668,6 @@ entities: - type: Transform pos: -19.5,-2.5 parent: 12 - - uid: 22237 - components: - - type: Transform - pos: -77.51556,20.573431 - parent: 12 - proto: SheetPlasma entities: - uid: 5503 @@ -151887,13 +150677,13 @@ entities: parent: 12 - proto: SheetPlasma1 entities: - - uid: 24196 + - uid: 22020 components: - type: Transform - pos: -81.53757,41.52209 + pos: 3.553358,-7.460674 parent: 12 - type: Stack - count: 10 + count: 5 - uid: 27218 components: - type: Transform @@ -152515,6 +151305,11 @@ entities: parent: 12 - proto: ShuttersWindow entities: + - uid: 11 + components: + - type: Transform + pos: 16.5,15.5 + parent: 12 - uid: 7800 components: - type: Transform @@ -153562,6 +152357,11 @@ entities: rot: 3.141592653589793 rad pos: -25.5,75.5 parent: 12 + - uid: 11451 + components: + - type: Transform + pos: -55.5,39.5 + parent: 12 - uid: 16447 components: - type: Transform @@ -153577,6 +152377,16 @@ entities: - type: Transform pos: 60.5,14.5 parent: 12 + - uid: 19829 + components: + - type: Transform + pos: -60.5,23.5 + parent: 12 + - uid: 20072 + components: + - type: Transform + pos: -55.5,13.5 + parent: 12 - uid: 20523 components: - type: Transform @@ -153698,6 +152508,11 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,-40.5 parent: 12 + - uid: 5147 + components: + - type: Transform + pos: -50.5,23.5 + parent: 12 - uid: 17267 components: - type: Transform @@ -153716,6 +152531,11 @@ entities: rot: 1.5707963267948966 rad pos: 27.5,-19.5 parent: 12 + - uid: 21961 + components: + - type: Transform + pos: -40.5,35.5 + parent: 12 - uid: 26570 components: - type: Transform @@ -154021,15 +152841,11 @@ entities: parent: 12 - proto: SignTelecomms entities: - - uid: 24255 - components: - - type: Transform - pos: -74.5,37.5 - parent: 12 - - uid: 24256 + - uid: 21800 components: - type: Transform - pos: -80.5,31.5 + rot: 3.141592653589793 rad + pos: 32.5,-8.5 parent: 12 - proto: SignToolStorage entities: @@ -154236,10 +153052,10 @@ entities: - type: Transform pos: 56.5,60.5 parent: 12 - - uid: 22051 + - uid: 21864 components: - type: Transform - pos: -78.5,41.5 + pos: 38.5,-6.5 parent: 12 - proto: SMESMachineCircuitboard entities: @@ -155618,7 +154434,7 @@ entities: parent: 12 - proto: SpawnMobBandito entities: - - uid: 4763 + - uid: 21962 components: - type: Transform pos: -39.5,-20.5 @@ -155764,10 +154580,10 @@ entities: parent: 12 - proto: SpawnMobRaccoonMorticia entities: - - uid: 7277 + - uid: 22004 components: - type: Transform - pos: 47.5,-8.5 + pos: 49.5,-7.5 parent: 12 - proto: SpawnMobShiva entities: @@ -156585,6 +155401,12 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,59.5 parent: 12 + - uid: 21969 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-7.5 + parent: 12 - uid: 23180 components: - type: Transform @@ -156933,11 +155755,6 @@ entities: - type: Transform pos: -13.5,-8.5 parent: 12 - - uid: 2837 - components: - - type: Transform - pos: -3.5,-5.5 - parent: 12 - uid: 2840 components: - type: Transform @@ -156983,6 +155800,11 @@ entities: - type: Transform pos: -14.5,29.5 parent: 12 + - uid: 7569 + components: + - type: Transform + pos: -2.5,-5.5 + parent: 12 - uid: 9393 components: - type: Transform @@ -157715,10 +156537,10 @@ entities: - type: Transform pos: 58.5,60.5 parent: 12 - - uid: 21949 + - uid: 21910 components: - type: Transform - pos: -79.5,41.5 + pos: 39.5,-6.5 parent: 12 - uid: 24688 components: @@ -157903,6 +156725,17 @@ entities: - SurveillanceCameraCommand nameSet: True id: AI entrance + - uid: 3033 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -51.5,38.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Command camera room - uid: 3065 components: - type: Transform @@ -157924,6 +156757,49 @@ entities: - SurveillanceCameraCommand nameSet: True id: RD's room + - uid: 5145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-8.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI core bridge + - uid: 5146 + components: + - type: Transform + pos: -10.5,23.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Command materials room + - uid: 5166 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -45.5,27.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge east + - uid: 8451 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,-4.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Telecomms - uid: 9822 components: - type: Transform @@ -158021,28 +156897,28 @@ entities: - SurveillanceCameraCommand nameSet: True id: Captain's room - - uid: 19883 + - uid: 21289 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-10.5 + rot: -1.5707963267948966 rad + pos: -44.5,35.5 parent: 12 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: AI upload - - uid: 21289 + id: Hos' office + - uid: 22055 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,35.5 + rot: 3.141592653589793 rad + pos: 1.5,-10.5 parent: 12 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: Hos' office + id: AI upload - uid: 24206 components: - type: Transform @@ -158133,6 +157009,17 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Storage hallway + - uid: 5158 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 72.5,2.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos east - uid: 8416 components: - type: Transform @@ -158216,37 +157103,61 @@ entities: - SurveillanceCameraEngineering nameSet: True id: TEG - - uid: 22325 + - uid: 21925 components: - type: Transform - pos: -79.5,20.5 + rot: 3.141592653589793 rad + pos: 23.5,5.5 parent: 12 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Telecomms - - uid: 22326 + id: PA room + - uid: 21927 components: - type: Transform - pos: -81.5,35.5 + rot: 3.141592653589793 rad + pos: 55.5,2.5 parent: 12 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Telecomms entrance - - uid: 22327 + id: Atmos west + - uid: 21931 components: - type: Transform - rot: 3.141592653589793 rad - pos: -79.5,33.5 + rot: 1.5707963267948966 rad + pos: 26.5,-14.5 parent: 12 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Telecomms controls + id: South engineering airlock + - uid: 21967 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 53.5,5.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos locker room + - uid: 21968 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-3.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Central containment - uid: 24215 components: - type: Transform @@ -158293,6 +157204,27 @@ entities: id: Generator storage - proto: SurveillanceCameraGeneral entities: + - uid: 3 + components: + - type: Transform + pos: -8.5,58.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorms + - uid: 113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,82.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals west - uid: 2897 components: - type: Transform @@ -158336,6 +157268,26 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Hallway north A + - uid: 3031 + components: + - type: Transform + pos: -47.5,67.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Roller rink + - uid: 3034 + components: + - type: Transform + pos: -9.5,74.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Observitory - uid: 3060 components: - type: Transform @@ -158422,6 +157374,16 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Hallway south B + - uid: 5232 + components: + - type: Transform + pos: -21.5,-0.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Port meeting room - uid: 9632 components: - type: Transform @@ -158517,6 +157479,17 @@ entities: - SurveillanceCameraGeneral nameSet: True id: South docking arm + - uid: 18840 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,82.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals east - uid: 21455 components: - type: Transform @@ -158528,6 +157501,59 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Court + - uid: 21916 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-1.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Atmos walkway + - uid: 21921 + components: + - type: Transform + pos: -15.5,58.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Green dorm + - uid: 21926 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,28.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bee room + - uid: 21928 + components: + - type: Transform + pos: -3.5,58.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Blue dorm + - uid: 21930 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,49.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Salon - uid: 22542 components: - type: Transform @@ -158756,75 +157782,85 @@ entities: - SurveillanceCameraMedical nameSet: True id: Biohazard surgery room + - uid: 21924 + components: + - type: Transform + pos: 30.5,35.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Med checkpoint - proto: SurveillanceCameraMonitorCircuitboard entities: - - uid: 22170 + - uid: 21948 components: - type: Transform - pos: -51.450497,38.472504 + pos: -50.491573,38.521393 parent: 12 -- proto: SurveillanceCameraRouterCircuitboard +- proto: SurveillanceCameraRouterCommand entities: - - uid: 22292 + - uid: 22057 components: - type: Transform - pos: -82.39337,36.55259 + pos: -53.5,38.5 parent: 12 -- proto: SurveillanceCameraRouterCommand +- proto: SurveillanceCameraRouterConstructed entities: - - uid: 22234 + - uid: 21932 components: - type: Transform - pos: -78.5,22.5 + pos: 2.5,-15.5 parent: 12 - proto: SurveillanceCameraRouterEngineering entities: - - uid: 22218 + - uid: 21974 components: - type: Transform - pos: -82.5,22.5 + pos: 25.5,-23.5 parent: 12 - proto: SurveillanceCameraRouterGeneral entities: - - uid: 22223 + - uid: 21933 components: - type: Transform - pos: -80.5,27.5 + pos: -3.5,-15.5 parent: 12 - proto: SurveillanceCameraRouterMedical entities: - - uid: 22224 + - uid: 21973 components: - type: Transform - pos: -80.5,22.5 + pos: -12.5,-39.5 parent: 12 - proto: SurveillanceCameraRouterScience entities: - - uid: 22232 + - uid: 21917 components: - type: Transform - pos: -78.5,27.5 + pos: -39.5,-21.5 parent: 12 - proto: SurveillanceCameraRouterSecurity entities: - - uid: 22220 + - uid: 21314 components: - type: Transform - pos: -76.5,22.5 + pos: -44.5,36.5 parent: 12 - proto: SurveillanceCameraRouterService entities: - - uid: 22221 + - uid: 21978 components: - type: Transform - pos: -76.5,27.5 + pos: -41.5,21.5 parent: 12 - proto: SurveillanceCameraRouterSupply entities: - - uid: 22217 + - uid: 21067 components: - type: Transform - pos: -82.5,27.5 + pos: 47.5,-8.5 parent: 12 - proto: SurveillanceCameraScience entities: @@ -158874,17 +157910,27 @@ entities: - type: Transform pos: -23.5,-31.5 parent: 12 - - uid: 9076 + - uid: 3977 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -42.5,-24.5 + rot: 3.141592653589793 rad + pos: -47.5,-21.5 parent: 12 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraScience nameSet: True - id: Xenoarchaeology lab + id: Artifact room north + - uid: 4129 + components: + - type: Transform + pos: -47.5,-27.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Artifact room south - uid: 9846 components: - type: Transform @@ -158896,6 +157942,16 @@ entities: - SurveillanceCameraScience nameSet: True id: Robotics + - uid: 21970 + components: + - type: Transform + pos: -20.5,-25.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science entrance airlock - proto: SurveillanceCameraSecurity entities: - uid: 2165 @@ -158909,6 +157965,17 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Armory entrance + - uid: 3050 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -48.5,56.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Brigmed - uid: 8717 components: - type: Transform @@ -159105,6 +158172,47 @@ entities: id: Security evac pod and airlock - proto: SurveillanceCameraService entities: + - uid: 10 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,57.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + - uid: 5161 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 53.5,29.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Chapel meeting room + - uid: 5162 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 73.5,55.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Botany north + - uid: 5235 + components: + - type: Transform + pos: 7.5,-52.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Janitor's room south - uid: 12287 components: - type: Transform @@ -159178,6 +158286,26 @@ entities: - SurveillanceCameraService nameSet: True id: Kitchen + - uid: 17534 + components: + - type: Transform + pos: 11.5,35.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Reporter's room + - uid: 21971 + components: + - type: Transform + pos: 20.5,26.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Musical observitory - uid: 24194 components: - type: Transform @@ -159274,18 +158402,18 @@ entities: - SurveillanceCameraService nameSet: True id: Bartender's room - - uid: 28429 +- proto: SurveillanceCameraSupply + entities: + - uid: 90 components: - type: Transform - pos: 20.5,26.5 + pos: 78.5,-32.5 parent: 12 - type: SurveillanceCamera setupAvailableNetworks: - - SurveillanceCameraService + - SurveillanceCameraSupply nameSet: True - id: Music lounge -- proto: SurveillanceCameraSupply - entities: + id: Salvaging platform - uid: 9828 components: - type: Transform @@ -159362,26 +158490,12 @@ entities: - SurveillanceCameraSupply nameSet: True id: Cargo front -- proto: SurveillanceCameraWirelessRouterCircuitboard - entities: - - uid: 22293 - components: - - type: Transform - pos: -82.39337,37.430485 - parent: 12 -- proto: SurveillanceCameraWirelessRouterConstructed - entities: - - uid: 22235 - components: - - type: Transform - pos: -77.5,29.5 - parent: 12 - proto: SurveillanceCameraWirelessRouterEntertainment entities: - - uid: 22236 + - uid: 21981 components: - type: Transform - pos: -81.5,29.5 + pos: 11.5,38.5 parent: 12 - proto: SurveillanceWirelessCameraAnchoredCircuitboard entities: @@ -159637,11 +158751,6 @@ entities: - type: Transform pos: -19.5,-47.5 parent: 12 - - uid: 2581 - components: - - type: Transform - pos: -12.5,-39.5 - parent: 12 - uid: 2582 components: - type: Transform @@ -159842,16 +158951,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-36.5 parent: 12 - - uid: 5468 - components: - - type: Transform - pos: 25.5,-23.5 - parent: 12 - - uid: 5469 - components: - - type: Transform - pos: 26.5,-23.5 - parent: 12 - uid: 5470 components: - type: Transform @@ -160768,41 +159867,6 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,36.5 parent: 12 - - uid: 22225 - components: - - type: Transform - pos: -82.5,20.5 - parent: 12 - - uid: 22226 - components: - - type: Transform - pos: -81.5,20.5 - parent: 12 - - uid: 22227 - components: - - type: Transform - pos: -80.5,20.5 - parent: 12 - - uid: 22228 - components: - - type: Transform - pos: -78.5,20.5 - parent: 12 - - uid: 22229 - components: - - type: Transform - pos: -77.5,20.5 - parent: 12 - - uid: 22230 - components: - - type: Transform - pos: -76.5,20.5 - parent: 12 - - uid: 22231 - components: - - type: Transform - pos: -82.5,31.5 - parent: 12 - uid: 22364 components: - type: Transform @@ -161325,18 +160389,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-2.5 parent: 12 - - uid: 2119 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-0.5 - parent: 12 - - uid: 2120 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-0.5 - parent: 12 - uid: 2244 components: - type: Transform @@ -162609,11 +161661,6 @@ entities: - type: Transform pos: -42.5,21.5 parent: 12 - - uid: 18845 - components: - - type: Transform - pos: -41.5,21.5 - parent: 12 - uid: 21432 components: - type: Transform @@ -162831,71 +161878,71 @@ entities: color: '#FF3300FF' - proto: TelecomServerCircuitboard entities: - - uid: 21324 + - uid: 15800 components: - type: Transform - pos: -3.4589167,-0.52088284 + pos: 33.433434,-6.6018057 parent: 12 - - uid: 22291 + - uid: 21324 components: - type: Transform - pos: -82.38081,35.57848 + pos: 2.5938406,-2.5623384 parent: 12 - proto: TelecomServerFilledCargo entities: - - uid: 22205 + - uid: 21873 components: - type: Transform - pos: -82.5,25.5 + pos: 33.5,-4.5 parent: 12 - proto: TelecomServerFilledCommand entities: - - uid: 22213 + - uid: 21872 components: - type: Transform - pos: -77.5,24.5 + pos: 39.5,-4.5 parent: 12 - proto: TelecomServerFilledCommon entities: - - uid: 22208 + - uid: 21883 components: - type: Transform - pos: -81.5,25.5 + pos: 34.5,-4.5 parent: 12 - proto: TelecomServerFilledEngineering entities: - - uid: 22209 + - uid: 21941 components: - type: Transform - pos: -82.5,24.5 + pos: 35.5,-7.5 parent: 12 - proto: TelecomServerFilledMedical entities: - - uid: 22210 + - uid: 21882 components: - type: Transform - pos: -81.5,24.5 + pos: 35.5,-4.5 parent: 12 - proto: TelecomServerFilledScience entities: - - uid: 22211 + - uid: 21891 components: - type: Transform - pos: -77.5,25.5 + pos: 36.5,-4.5 parent: 12 - proto: TelecomServerFilledSecurity entities: - - uid: 22214 + - uid: 21947 components: - type: Transform - pos: -76.5,24.5 + pos: 38.5,-4.5 parent: 12 - proto: TelecomServerFilledService entities: - - uid: 22212 + - uid: 21892 components: - type: Transform - pos: -76.5,25.5 + pos: 36.5,-7.5 parent: 12 - proto: TeslaCoilFlatpack entities: @@ -163295,11 +162342,6 @@ entities: - type: Transform pos: -7.477878,11.357933 parent: 12 - - uid: 22323 - components: - - type: Transform - pos: -76.54076,33.47504 - parent: 12 - uid: 23673 components: - type: Transform @@ -163407,7 +162449,7 @@ entities: - uid: 2580 components: - type: Transform - pos: -12.455891,-39.46825 + pos: -10.176425,-37.273155 parent: 12 - proto: ToyFigurineClown entities: @@ -164436,18 +163478,6 @@ entities: - Middle: Off - proto: UnfinishedMachineFrame entities: - - uid: 17959 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-14.5 - parent: 12 - - uid: 22216 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -81.5,22.5 - parent: 12 - uid: 24029 components: - type: Transform @@ -165214,6 +164244,11 @@ entities: parent: 12 - proto: WallmountTelevision entities: + - uid: 5134 + components: + - type: Transform + pos: 37.5,-24.5 + parent: 12 - uid: 17664 components: - type: Transform @@ -165236,11 +164271,6 @@ entities: - type: Transform pos: 31.5,9.5 parent: 12 - - uid: 24 - components: - - type: Transform - pos: -1.5,2.5 - parent: 12 - uid: 27 components: - type: Transform @@ -165352,11 +164382,6 @@ entities: - type: Transform pos: -4.5,-0.5 parent: 12 - - uid: 51 - components: - - type: Transform - pos: -78.5,19.5 - parent: 12 - uid: 52 components: - type: Transform @@ -165379,11 +164404,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-20.5 parent: 12 - - uid: 71 - components: - - type: Transform - pos: -76.5,19.5 - parent: 12 - uid: 76 components: - type: Transform @@ -165414,21 +164434,6 @@ entities: - type: Transform pos: 7.5,-5.5 parent: 12 - - uid: 113 - components: - - type: Transform - pos: -75.5,31.5 - parent: 12 - - uid: 114 - components: - - type: Transform - pos: -75.5,32.5 - parent: 12 - - uid: 115 - components: - - type: Transform - pos: -75.5,28.5 - parent: 12 - uid: 116 components: - type: Transform @@ -165441,24 +164446,12 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-3.5 parent: 12 - - uid: 118 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-4.5 - parent: 12 - uid: 119 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-3.5 parent: 12 - - uid: 120 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-4.5 - parent: 12 - uid: 121 components: - type: Transform @@ -165531,18 +164524,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-5.5 parent: 12 - - uid: 135 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-5.5 - parent: 12 - - uid: 136 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-5.5 - parent: 12 - uid: 137 components: - type: Transform @@ -165585,18 +164566,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-7.5 parent: 12 - - uid: 147 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-7.5 - parent: 12 - - uid: 148 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-7.5 - parent: 12 - uid: 150 components: - type: Transform @@ -165902,48 +164871,26 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,5.5 parent: 12 - - uid: 233 + - uid: 232 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-4.5 + pos: -55.5,13.5 parent: 12 - uid: 240 components: - type: Transform pos: -7.5,-19.5 parent: 12 - - uid: 241 - components: - - type: Transform - pos: -7.5,-5.5 - parent: 12 - - uid: 242 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-7.5 - parent: 12 - uid: 257 components: - type: Transform pos: -11.5,-9.5 parent: 12 - - uid: 258 - components: - - type: Transform - pos: -11.5,-8.5 - parent: 12 - uid: 259 components: - type: Transform pos: -11.5,-7.5 parent: 12 - - uid: 260 - components: - - type: Transform - pos: -12.5,-7.5 - parent: 12 - uid: 261 components: - type: Transform @@ -165964,11 +164911,6 @@ entities: - type: Transform pos: -11.5,-5.5 parent: 12 - - uid: 265 - components: - - type: Transform - pos: -11.5,-4.5 - parent: 12 - uid: 266 components: - type: Transform @@ -165994,11 +164936,6 @@ entities: - type: Transform pos: -13.5,-5.5 parent: 12 - - uid: 271 - components: - - type: Transform - pos: -12.5,-5.5 - parent: 12 - uid: 272 components: - type: Transform @@ -166514,11 +165451,6 @@ entities: - type: Transform pos: -35.5,-25.5 parent: 12 - - uid: 601 - components: - - type: Transform - pos: -38.5,-25.5 - parent: 12 - uid: 602 components: - type: Transform @@ -166554,26 +165486,16 @@ entities: - type: Transform pos: -42.5,-21.5 parent: 12 - - uid: 611 - components: - - type: Transform - pos: -42.5,-18.5 - parent: 12 - uid: 612 components: - type: Transform - pos: -41.5,-18.5 + pos: -47.5,16.5 parent: 12 - uid: 613 components: - type: Transform pos: -40.5,-18.5 parent: 12 - - uid: 632 - components: - - type: Transform - pos: -40.5,-21.5 - parent: 12 - uid: 633 components: - type: Transform @@ -167025,12 +165947,6 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,-51.5 parent: 12 - - uid: 1059 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,56.5 - parent: 12 - uid: 1074 components: - type: Transform @@ -167695,11 +166611,6 @@ entities: - type: Transform pos: 7.5,-53.5 parent: 12 - - uid: 4129 - components: - - type: Transform - pos: -72.5,25.5 - parent: 12 - uid: 4141 components: - type: Transform @@ -168139,31 +167050,16 @@ entities: rot: 3.141592653589793 rad pos: 72.5,13.5 parent: 12 - - uid: 4694 - components: - - type: Transform - pos: -81.5,42.5 - parent: 12 - - uid: 4695 - components: - - type: Transform - pos: -82.5,19.5 - parent: 12 - uid: 4706 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,3.5 parent: 12 - - uid: 4708 - components: - - type: Transform - pos: -75.5,29.5 - parent: 12 - - uid: 4709 + - uid: 4714 components: - type: Transform - pos: -75.5,25.5 + pos: -24.5,56.5 parent: 12 - uid: 4733 components: @@ -168323,11 +167219,6 @@ entities: - type: Transform pos: 32.5,-4.5 parent: 12 - - uid: 5067 - components: - - type: Transform - pos: 32.5,-5.5 - parent: 12 - uid: 5068 components: - type: Transform @@ -168431,12 +167322,6 @@ entities: rot: 1.5707963267948966 rad pos: 37.5,-9.5 parent: 12 - - uid: 5166 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-9.5 - parent: 12 - uid: 5167 components: - type: Transform @@ -168727,11 +167612,6 @@ entities: rot: 1.5707963267948966 rad pos: 60.5,-47.5 parent: 12 - - uid: 5934 - components: - - type: Transform - pos: 35.5,-9.5 - parent: 12 - uid: 5950 components: - type: Transform @@ -168841,11 +167721,6 @@ entities: - type: Transform pos: 31.5,-36.5 parent: 12 - - uid: 6272 - components: - - type: Transform - pos: -73.5,19.5 - parent: 12 - uid: 6273 components: - type: Transform @@ -169022,16 +167897,17 @@ entities: rot: -1.5707963267948966 rad pos: 46.5,-6.5 parent: 12 - - uid: 7362 + - uid: 7363 components: - type: Transform - pos: -7.5,-3.5 + rot: -1.5707963267948966 rad + pos: 46.5,-9.5 parent: 12 - - uid: 7363 + - uid: 7375 components: - type: Transform rot: -1.5707963267948966 rad - pos: 46.5,-9.5 + pos: -10.5,-5.5 parent: 12 - uid: 7414 components: @@ -169177,6 +168053,12 @@ entities: rot: -1.5707963267948966 rad pos: 54.5,-30.5 parent: 12 + - uid: 7438 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -40.5,-21.5 + parent: 12 - uid: 7478 components: - type: Transform @@ -169303,21 +168185,11 @@ entities: rot: -1.5707963267948966 rad pos: -45.5,55.5 parent: 12 - - uid: 7564 - components: - - type: Transform - pos: -7.5,-4.5 - parent: 12 - uid: 7565 components: - type: Transform pos: -9.5,-4.5 parent: 12 - - uid: 7569 - components: - - type: Transform - pos: -7.5,-2.5 - parent: 12 - uid: 7575 components: - type: Transform @@ -169626,11 +168498,6 @@ entities: - type: Transform pos: -9.5,-5.5 parent: 12 - - uid: 7745 - components: - - type: Transform - pos: -7.5,-8.5 - parent: 12 - uid: 7746 components: - type: Transform @@ -169658,32 +168525,21 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,2.5 parent: 12 - - uid: 8447 - components: - - type: Transform - pos: -6.5,-19.5 - parent: 12 - - uid: 8450 - components: - - type: Transform - pos: -7.5,-13.5 - parent: 12 - - uid: 8451 + - uid: 8445 components: - type: Transform rot: -1.5707963267948966 rad - pos: -5.5,-8.5 + pos: -10.5,-7.5 parent: 12 - - uid: 8452 + - uid: 8447 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-5.5 + pos: -6.5,-19.5 parent: 12 - - uid: 8453 + - uid: 8450 components: - type: Transform - pos: -7.5,-9.5 + pos: -7.5,-13.5 parent: 12 - uid: 8454 components: @@ -169761,6 +168617,11 @@ entities: - type: Transform pos: 79.5,7.5 parent: 12 + - uid: 9067 + components: + - type: Transform + pos: -59.5,36.5 + parent: 12 - uid: 9072 components: - type: Transform @@ -170164,21 +169025,6 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,5.5 parent: 12 - - uid: 10196 - components: - - type: Transform - pos: -75.5,30.5 - parent: 12 - - uid: 10197 - components: - - type: Transform - pos: -79.5,19.5 - parent: 12 - - uid: 10198 - components: - - type: Transform - pos: -80.5,19.5 - parent: 12 - uid: 10253 components: - type: Transform @@ -170203,11 +169049,6 @@ entities: rot: 1.5707963267948966 rad pos: -30.5,20.5 parent: 12 - - uid: 10259 - components: - - type: Transform - pos: -75.5,26.5 - parent: 12 - uid: 10303 components: - type: Transform @@ -172675,60 +171516,10 @@ entities: - type: Transform pos: -32.5,11.5 parent: 12 - - uid: 15853 - components: - - type: Transform - pos: -77.5,16.5 - parent: 12 - - uid: 15859 - components: - - type: Transform - pos: -75.5,27.5 - parent: 12 - - uid: 15861 - components: - - type: Transform - pos: -83.5,42.5 - parent: 12 - - uid: 15900 - components: - - type: Transform - pos: -85.5,34.5 - parent: 12 - - uid: 15910 - components: - - type: Transform - pos: -75.5,34.5 - parent: 12 - - uid: 15911 - components: - - type: Transform - pos: -83.5,23.5 - parent: 12 - - uid: 15912 - components: - - type: Transform - pos: -83.5,22.5 - parent: 12 - - uid: 15913 - components: - - type: Transform - pos: -77.5,34.5 - parent: 12 - - uid: 15914 - components: - - type: Transform - pos: -83.5,24.5 - parent: 12 - - uid: 15915 - components: - - type: Transform - pos: -83.5,19.5 - parent: 12 - - uid: 15916 + - uid: 15890 components: - type: Transform - pos: -85.5,42.5 + pos: -60.5,23.5 parent: 12 - uid: 16001 components: @@ -172739,7 +171530,7 @@ entities: - uid: 16066 components: - type: Transform - pos: -85.5,31.5 + pos: -58.5,18.5 parent: 12 - uid: 16365 components: @@ -172752,16 +171543,6 @@ entities: - type: Transform pos: -8.5,21.5 parent: 12 - - uid: 16413 - components: - - type: Transform - pos: -85.5,25.5 - parent: 12 - - uid: 16414 - components: - - type: Transform - pos: -85.5,38.5 - parent: 12 - uid: 16420 components: - type: Transform @@ -172772,16 +171553,6 @@ entities: - type: Transform pos: 60.5,11.5 parent: 12 - - uid: 16433 - components: - - type: Transform - pos: -73.5,20.5 - parent: 12 - - uid: 16434 - components: - - type: Transform - pos: -72.5,29.5 - parent: 12 - uid: 16435 components: - type: Transform @@ -172802,16 +171573,6 @@ entities: - type: Transform pos: -30.5,12.5 parent: 12 - - uid: 16647 - components: - - type: Transform - pos: -78.5,39.5 - parent: 12 - - uid: 16648 - components: - - type: Transform - pos: -75.5,24.5 - parent: 12 - uid: 16799 components: - type: Transform @@ -172995,11 +171756,6 @@ entities: - type: Transform pos: -27.5,11.5 parent: 12 - - uid: 17534 - components: - - type: Transform - pos: -75.5,20.5 - parent: 12 - uid: 17536 components: - type: Transform @@ -173036,11 +171792,6 @@ entities: - type: Transform pos: 57.5,59.5 parent: 12 - - uid: 17550 - components: - - type: Transform - pos: -75.5,23.5 - parent: 12 - uid: 17607 components: - type: Transform @@ -173147,21 +171898,6 @@ entities: - type: Transform pos: -32.5,6.5 parent: 12 - - uid: 17776 - components: - - type: Transform - pos: -79.5,39.5 - parent: 12 - - uid: 17777 - components: - - type: Transform - pos: -82.5,39.5 - parent: 12 - - uid: 17778 - components: - - type: Transform - pos: -77.5,42.5 - parent: 12 - uid: 17803 components: - type: Transform @@ -173330,21 +172066,6 @@ entities: rot: 3.141592653589793 rad pos: -53.5,68.5 parent: 12 - - uid: 17949 - components: - - type: Transform - pos: -79.5,42.5 - parent: 12 - - uid: 17950 - components: - - type: Transform - pos: -81.5,39.5 - parent: 12 - - uid: 17951 - components: - - type: Transform - pos: -80.5,42.5 - parent: 12 - uid: 17972 components: - type: Transform @@ -173384,6 +172105,12 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-0.5 parent: 12 + - uid: 18845 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,-3.5 + parent: 12 - uid: 18896 components: - type: Transform @@ -173898,11 +172625,6 @@ entities: rot: 3.141592653589793 rad pos: -45.5,54.5 parent: 12 - - uid: 19266 - components: - - type: Transform - pos: -7.5,-10.5 - parent: 12 - uid: 19267 components: - type: Transform @@ -174177,27 +172899,14 @@ entities: - uid: 19552 components: - type: Transform - pos: -81.5,17.5 + rot: 3.141592653589793 rad + pos: 37.5,-10.5 parent: 12 - uid: 19553 components: - type: Transform - pos: -82.5,17.5 - parent: 12 - - uid: 19554 - components: - - type: Transform - pos: -77.5,19.5 - parent: 12 - - uid: 19556 - components: - - type: Transform - pos: -79.5,17.5 - parent: 12 - - uid: 19558 - components: - - type: Transform - pos: -76.5,17.5 + rot: 3.141592653589793 rad + pos: 40.5,-3.5 parent: 12 - uid: 19564 components: @@ -174385,11 +173094,6 @@ entities: - type: Transform pos: 7.5,71.5 parent: 12 - - uid: 19817 - components: - - type: Transform - pos: -85.5,35.5 - parent: 12 - uid: 19826 components: - type: Transform @@ -174407,57 +173111,12 @@ entities: rot: 1.5707963267948966 rad pos: 51.5,65.5 parent: 12 - - uid: 19850 - components: - - type: Transform - pos: -75.5,17.5 - parent: 12 - uid: 19857 components: - type: Transform rot: 3.141592653589793 rad pos: 47.5,67.5 parent: 12 - - uid: 20072 - components: - - type: Transform - pos: -85.5,19.5 - parent: 12 - - uid: 20073 - components: - - type: Transform - pos: -85.5,41.5 - parent: 12 - - uid: 20074 - components: - - type: Transform - pos: -85.5,21.5 - parent: 12 - - uid: 20075 - components: - - type: Transform - pos: -85.5,22.5 - parent: 12 - - uid: 20076 - components: - - type: Transform - pos: -85.5,20.5 - parent: 12 - - uid: 20077 - components: - - type: Transform - pos: -85.5,24.5 - parent: 12 - - uid: 20078 - components: - - type: Transform - pos: -85.5,23.5 - parent: 12 - - uid: 20079 - components: - - type: Transform - pos: -85.5,27.5 - parent: 12 - uid: 20097 components: - type: Transform @@ -174475,31 +173134,6 @@ entities: rot: 3.141592653589793 rad pos: 50.5,66.5 parent: 12 - - uid: 20312 - components: - - type: Transform - pos: -85.5,26.5 - parent: 12 - - uid: 20314 - components: - - type: Transform - pos: -85.5,28.5 - parent: 12 - - uid: 20315 - components: - - type: Transform - pos: -85.5,36.5 - parent: 12 - - uid: 20316 - components: - - type: Transform - pos: -85.5,29.5 - parent: 12 - - uid: 20435 - components: - - type: Transform - pos: -85.5,30.5 - parent: 12 - uid: 20521 components: - type: Transform @@ -174520,7 +173154,8 @@ entities: - uid: 20885 components: - type: Transform - pos: -85.5,32.5 + rot: 3.141592653589793 rad + pos: 35.5,-10.5 parent: 12 - uid: 21059 components: @@ -174531,32 +173166,8 @@ entities: - uid: 21060 components: - type: Transform - pos: -75.5,22.5 - parent: 12 - - uid: 21063 - components: - - type: Transform - pos: -75.5,19.5 - parent: 12 - - uid: 21067 - components: - - type: Transform - pos: -83.5,25.5 - parent: 12 - - uid: 21068 - components: - - type: Transform - pos: -83.5,26.5 - parent: 12 - - uid: 21314 - components: - - type: Transform - pos: -85.5,39.5 - parent: 12 - - uid: 21325 - components: - - type: Transform - pos: -83.5,27.5 + rot: 3.141592653589793 rad + pos: 36.5,-8.5 parent: 12 - uid: 21527 components: @@ -174564,265 +173175,79 @@ entities: rot: 3.141592653589793 rad pos: -1.5,10.5 parent: 12 - - uid: 21605 - components: - - type: Transform - pos: -83.5,28.5 - parent: 12 - - uid: 21859 - components: - - type: Transform - pos: -83.5,29.5 - parent: 12 - - uid: 21860 - components: - - type: Transform - pos: -83.5,30.5 - parent: 12 - - uid: 21861 - components: - - type: Transform - pos: -83.5,31.5 - parent: 12 - - uid: 21862 - components: - - type: Transform - pos: -83.5,33.5 - parent: 12 - - uid: 21863 - components: - - type: Transform - pos: -83.5,34.5 - parent: 12 - - uid: 21864 - components: - - type: Transform - pos: -83.5,32.5 - parent: 12 - - uid: 21865 - components: - - type: Transform - pos: -83.5,35.5 - parent: 12 - - uid: 21866 - components: - - type: Transform - pos: -83.5,37.5 - parent: 12 - - uid: 21867 - components: - - type: Transform - pos: -83.5,38.5 - parent: 12 - - uid: 21868 - components: - - type: Transform - pos: -83.5,39.5 - parent: 12 - - uid: 21869 - components: - - type: Transform - pos: -83.5,40.5 - parent: 12 - - uid: 21870 - components: - - type: Transform - pos: -85.5,33.5 - parent: 12 - - uid: 21871 - components: - - type: Transform - pos: -83.5,36.5 - parent: 12 - - uid: 21872 - components: - - type: Transform - pos: -76.5,34.5 - parent: 12 - - uid: 21873 - components: - - type: Transform - pos: -77.5,35.5 - parent: 12 - - uid: 21874 - components: - - type: Transform - pos: -74.5,35.5 - parent: 12 - - uid: 21875 + - uid: 21876 components: - type: Transform - pos: -75.5,35.5 + rot: 3.141592653589793 rad + pos: 33.5,-8.5 parent: 12 - uid: 21877 components: - type: Transform - pos: -77.5,40.5 + rot: 3.141592653589793 rad + pos: 40.5,-4.5 parent: 12 - uid: 21878 components: - type: Transform - pos: -77.5,39.5 - parent: 12 - - uid: 21880 - components: - - type: Transform - pos: -77.5,41.5 - parent: 12 - - uid: 21884 - components: - - type: Transform - pos: -85.5,37.5 - parent: 12 - - uid: 21885 - components: - - type: Transform - pos: -75.5,33.5 - parent: 12 - - uid: 21892 - components: - - type: Transform - pos: -82.5,34.5 - parent: 12 - - uid: 21896 - components: - - type: Transform - pos: -75.5,37.5 - parent: 12 - - uid: 21897 - components: - - type: Transform - pos: -77.5,37.5 - parent: 12 - - uid: 21898 - components: - - type: Transform - pos: -76.5,37.5 - parent: 12 - - uid: 21899 - components: - - type: Transform - pos: -74.5,37.5 + rot: 3.141592653589793 rad + pos: 40.5,-6.5 parent: 12 - - uid: 21900 + - uid: 21879 components: - type: Transform - pos: -79.5,34.5 + rot: 3.141592653589793 rad + pos: 40.5,-5.5 parent: 12 - - uid: 21902 + - uid: 21880 components: - type: Transform - pos: -76.5,29.5 + rot: 3.141592653589793 rad + pos: 34.5,-8.5 parent: 12 - - uid: 21904 + - uid: 21881 components: - type: Transform - pos: -82.5,29.5 + rot: 3.141592653589793 rad + pos: 32.5,-8.5 parent: 12 - - uid: 21905 + - uid: 21934 components: - type: Transform - pos: -81.5,34.5 + rot: 3.141592653589793 rad + pos: -38.5,-25.5 parent: 12 - - uid: 21906 + - uid: 21949 components: - type: Transform - pos: -79.5,35.5 + rot: 3.141592653589793 rad + pos: 36.5,-10.5 parent: 12 - - uid: 21908 + - uid: 21988 components: - type: Transform - pos: -78.5,35.5 + pos: 2.5,-4.5 parent: 12 - - uid: 22005 + - uid: 21989 components: - type: Transform - pos: -85.5,40.5 + pos: 3.5,-4.5 parent: 12 - - uid: 22007 + - uid: 22002 components: - type: Transform - pos: -83.5,41.5 + pos: -42.5,-18.5 parent: 12 - - uid: 22008 + - uid: 22003 components: - type: Transform - pos: -82.5,44.5 + pos: -41.5,-18.5 parent: 12 - uid: 22009 components: - type: Transform - pos: -81.5,44.5 - parent: 12 - - uid: 22010 - components: - - type: Transform - pos: -79.5,44.5 - parent: 12 - - uid: 22011 - components: - - type: Transform - pos: -77.5,44.5 - parent: 12 - - uid: 22012 - components: - - type: Transform - pos: -77.5,17.5 - parent: 12 - - uid: 22013 - components: - - type: Transform - pos: -81.5,16.5 - parent: 12 - - uid: 22014 - components: - - type: Transform - pos: -86.5,41.5 - parent: 12 - - uid: 22015 - components: - - type: Transform - pos: -86.5,33.5 - parent: 12 - - uid: 22016 - components: - - type: Transform - pos: -86.5,37.5 - parent: 12 - - uid: 22017 - components: - - type: Transform - pos: -86.5,21.5 - parent: 12 - - uid: 22018 - components: - - type: Transform - pos: -78.5,44.5 - parent: 12 - - uid: 22019 - components: - - type: Transform - pos: -78.5,42.5 - parent: 12 - - uid: 22020 - components: - - type: Transform - pos: -83.5,17.5 - parent: 12 - - uid: 22021 - components: - - type: Transform - pos: -83.5,21.5 - parent: 12 - - uid: 22022 - components: - - type: Transform - pos: -81.5,19.5 - parent: 12 - - uid: 22023 - components: - - type: Transform - pos: -75.5,21.5 + rot: 3.141592653589793 rad + pos: 35.5,-8.5 parent: 12 - uid: 22032 components: @@ -174989,11 +173414,53 @@ entities: - type: Transform pos: -30.5,62.5 parent: 12 + - uid: 22182 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-1.5 + parent: 12 + - uid: 22183 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-3.5 + parent: 12 + - uid: 22184 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-2.5 + parent: 12 + - uid: 22185 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-9.5 + parent: 12 + - uid: 22186 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-10.5 + parent: 12 + - uid: 22187 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-11.5 + parent: 12 - uid: 22190 components: - type: Transform pos: -30.5,63.5 parent: 12 + - uid: 22216 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-5.5 + parent: 12 - uid: 22339 components: - type: Transform @@ -175067,11 +173534,6 @@ entities: - type: Transform pos: -54.5,63.5 parent: 12 - - uid: 24665 - components: - - type: Transform - pos: -85.5,43.5 - parent: 12 - uid: 24666 components: - type: Transform @@ -175129,11 +173591,6 @@ entities: - type: Transform pos: -53.5,63.5 parent: 12 - - uid: 25395 - components: - - type: Transform - pos: -85.5,44.5 - parent: 12 - uid: 25418 components: - type: Transform @@ -175413,26 +173870,6 @@ entities: - type: Transform pos: -18.5,-31.5 parent: 12 - - uid: 26068 - components: - - type: Transform - pos: -86.5,25.5 - parent: 12 - - uid: 26069 - components: - - type: Transform - pos: -78.5,45.5 - parent: 12 - - uid: 26100 - components: - - type: Transform - pos: -86.5,29.5 - parent: 12 - - uid: 26101 - components: - - type: Transform - pos: -82.5,45.5 - parent: 12 - uid: 26197 components: - type: Transform @@ -175712,11 +174149,6 @@ entities: - type: Transform pos: 54.5,-1.5 parent: 12 - - uid: 26586 - components: - - type: Transform - pos: -72.5,33.5 - parent: 12 - uid: 26590 components: - type: Transform @@ -175922,36 +174354,6 @@ entities: - type: Transform pos: 74.5,10.5 parent: 12 - - uid: 27094 - components: - - type: Transform - pos: -78.5,17.5 - parent: 12 - - uid: 27095 - components: - - type: Transform - pos: -80.5,17.5 - parent: 12 - - uid: 27096 - components: - - type: Transform - pos: -83.5,20.5 - parent: 12 - - uid: 27098 - components: - - type: Transform - pos: -80.5,44.5 - parent: 12 - - uid: 27099 - components: - - type: Transform - pos: -82.5,42.5 - parent: 12 - - uid: 27101 - components: - - type: Transform - pos: -83.5,44.5 - parent: 12 - uid: 27105 components: - type: Transform @@ -176134,21 +174536,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-15.5 parent: 12 - - uid: 27996 - components: - - type: Transform - pos: -9.5,0.5 - parent: 12 - - uid: 27997 - components: - - type: Transform - pos: -9.5,2.5 - parent: 12 - - uid: 28045 - components: - - type: Transform - pos: -7.5,-7.5 - parent: 12 - uid: 28046 components: - type: Transform @@ -176316,11 +174703,6 @@ entities: - type: Transform pos: 44.5,6.5 parent: 12 - - uid: 28434 - components: - - type: Transform - pos: -9.5,1.5 - parent: 12 - uid: 28521 components: - type: Transform @@ -176446,41 +174828,6 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,64.5 parent: 12 - - uid: 29322 - components: - - type: Transform - pos: -84.5,44.5 - parent: 12 - - uid: 29340 - components: - - type: Transform - pos: -84.5,17.5 - parent: 12 - - uid: 29341 - components: - - type: Transform - pos: -85.5,17.5 - parent: 12 - - uid: 29342 - components: - - type: Transform - pos: -85.5,18.5 - parent: 12 - - uid: 29343 - components: - - type: Transform - pos: -74.5,17.5 - parent: 12 - - uid: 29344 - components: - - type: Transform - pos: -73.5,17.5 - parent: 12 - - uid: 29345 - components: - - type: Transform - pos: -73.5,18.5 - parent: 12 - uid: 29657 components: - type: Transform @@ -182631,11 +180978,6 @@ entities: - type: Transform pos: -6.5,70.5 parent: 12 - - uid: 19643 - components: - - type: Transform - pos: -9.5,73.5 - parent: 12 - uid: 19682 components: - type: Transform @@ -183088,6 +181430,11 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,64.5 parent: 12 + - uid: 22051 + components: + - type: Transform + pos: -9.5,73.5 + parent: 12 - uid: 22159 components: - type: Transform @@ -184484,11 +182831,6 @@ entities: - type: Transform pos: -52.5,34.5 parent: 12 - - uid: 18840 - components: - - type: Transform - pos: -41.5,21.5 - parent: 12 - uid: 20825 components: - type: Transform @@ -184511,6 +182853,11 @@ entities: - type: Transform pos: -23.5,41.5 parent: 12 + - uid: 21979 + components: + - type: Transform + pos: -42.5,21.5 + parent: 12 - uid: 22042 components: - type: Transform @@ -184592,6 +182939,16 @@ entities: - type: Transform pos: -3.5,0.5 parent: 12 + - uid: 22205 + components: + - type: Transform + pos: -3.5,-8.5 + parent: 12 + - uid: 22207 + components: + - type: Transform + pos: -3.5,-4.5 + parent: 12 - uid: 28259 components: - type: Transform @@ -185268,11 +183625,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-0.5 parent: 12 - - uid: 224 - components: - - type: Transform - pos: 0.5,-9.5 - parent: 12 - uid: 5233 components: - type: Transform @@ -185285,14 +183637,31 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-2.5 parent: 12 -- proto: WindoorSecureEngineeringLocked - entities: - - uid: 4938 + - uid: 5289 components: - type: Transform rot: 3.141592653589793 rad - pos: 24.5,0.5 + pos: -0.5,-13.5 parent: 12 + - uid: 19830 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -52.5,38.5 + parent: 12 + - uid: 21887 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,3.5 + parent: 12 + - uid: 22056 + components: + - type: Transform + pos: -0.5,-9.5 + parent: 12 +- proto: WindoorSecureEngineeringLocked + entities: - uid: 5519 components: - type: Transform @@ -186860,16 +185229,6 @@ entities: - type: Transform pos: 2.5,-13.5 parent: 12 - - uid: 222 - components: - - type: Transform - pos: -1.5,-9.5 - parent: 12 - - uid: 223 - components: - - type: Transform - pos: -0.5,-9.5 - parent: 12 - uid: 705 components: - type: Transform @@ -187016,6 +185375,12 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-32.5 parent: 12 + - uid: 3023 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-13.5 + parent: 12 - uid: 4971 components: - type: Transform @@ -187412,6 +185777,12 @@ entities: rot: 3.141592653589793 rad pos: -19.5,39.5 parent: 12 + - uid: 20075 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-13.5 + parent: 12 - uid: 20853 components: - type: Transform @@ -187459,17 +185830,56 @@ entities: - type: Transform pos: -8.5,52.5 parent: 12 - - uid: 22174 + - uid: 21884 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,54.5 + parent: 12 + - uid: 21885 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,54.5 + parent: 12 + - uid: 21886 components: - type: Transform rot: 1.5707963267948966 rad - pos: -52.5,38.5 + pos: -24.5,54.5 parent: 12 - - uid: 22175 + - uid: 21905 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -79.5,38.5 + rot: 1.5707963267948966 rad + pos: -24.5,53.5 + parent: 12 + - uid: 21929 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -52.5,37.5 + parent: 12 + - uid: 21935 + components: + - type: Transform + pos: -25.5,56.5 + parent: 12 + - uid: 21965 + components: + - type: Transform + pos: -1.5,-9.5 + parent: 12 + - uid: 21972 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,37.5 + parent: 12 + - uid: 22053 + components: + - type: Transform + pos: 0.5,-9.5 parent: 12 - uid: 22638 components: @@ -187703,11 +186113,6 @@ entities: - type: Transform pos: -12.698894,10.215696 parent: 12 - - uid: 17545 - components: - - type: Transform - pos: -79.48283,40.617027 - parent: 12 - uid: 21072 components: - type: Transform From 551d3197f80b85d84c8444b1fbd51b68ad3540ad Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Sat, 24 Aug 2024 00:47:50 -0600 Subject: [PATCH 029/223] fland update (#31391) --- Resources/Maps/fland.yml | 3690 +++++++++++++++++++++++++++++++++----- 1 file changed, 3264 insertions(+), 426 deletions(-) diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 5b1d6932cad..b30f883bd23 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -404,7 +404,7 @@ entities: version: 6 5,-1: ind: 5,-1 - tiles: fgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAUQAAAAAAfgAAAAAAHwAAAAABTwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAfgAAAAAAHwAAAAADbAAAAAAAbAAAAAAAbAAAAAAATwAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAACfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAADfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAABbAAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADbAAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAACbAAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAVgAAAAAAHwAAAAACVgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAA + tiles: fgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAUQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAfgAAAAAATwAAAAAAbAAAAAAAbAAAAAAAbAAAAAAATwAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAACfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAADfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAABbAAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADbAAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAACbAAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAVgAAAAAAHwAAAAACVgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAUQAAAAAA version: 6 6,-4: ind: 6,-4 @@ -17359,6 +17359,75 @@ entities: devices: - 31136 - 31132 + - uid: 35618 + components: + - type: Transform + pos: 103.5,45.5 + parent: 13329 + - type: DeviceList + devices: + - 29840 + - 29841 + - uid: 35619 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 98.5,47.5 + parent: 13329 + - type: DeviceList + devices: + - 29843 + - 29838 + - uid: 35620 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 94.5,50.5 + parent: 13329 + - type: DeviceList + devices: + - 29751 + - 29752 + - uid: 35621 + components: + - type: Transform + pos: 107.5,57.5 + parent: 13329 + - type: DeviceList + devices: + - 29839 + - 29842 + - uid: 35622 + components: + - type: Transform + pos: 113.5,51.5 + parent: 13329 + - type: DeviceList + devices: + - 29846 + - 29847 + - uid: 35623 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 111.5,47.5 + parent: 13329 + - type: DeviceList + devices: + - 29844 + - 29845 + - uid: 35624 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 121.5,43.5 + parent: 13329 + - type: DeviceList + devices: + - 29865 + - 29866 + - 29864 + - 29863 - proto: AirCanister entities: - uid: 4699 @@ -26127,306 +26196,6 @@ entities: - type: Transform pos: 123.5,-10.5 parent: 13329 - - uid: 22344 - components: - - type: Transform - pos: 112.5,46.5 - parent: 13329 - - uid: 22345 - components: - - type: Transform - pos: 113.5,46.5 - parent: 13329 - - uid: 22346 - components: - - type: Transform - pos: 114.5,46.5 - parent: 13329 - - uid: 22347 - components: - - type: Transform - pos: 115.5,46.5 - parent: 13329 - - uid: 22348 - components: - - type: Transform - pos: 116.5,46.5 - parent: 13329 - - uid: 22349 - components: - - type: Transform - pos: 115.5,45.5 - parent: 13329 - - uid: 22350 - components: - - type: Transform - pos: 115.5,44.5 - parent: 13329 - - uid: 22351 - components: - - type: Transform - pos: 115.5,43.5 - parent: 13329 - - uid: 22352 - components: - - type: Transform - pos: 116.5,45.5 - parent: 13329 - - uid: 22353 - components: - - type: Transform - pos: 116.5,44.5 - parent: 13329 - - uid: 22354 - components: - - type: Transform - pos: 116.5,43.5 - parent: 13329 - - uid: 22355 - components: - - type: Transform - pos: 117.5,43.5 - parent: 13329 - - uid: 22356 - components: - - type: Transform - pos: 117.5,42.5 - parent: 13329 - - uid: 22357 - components: - - type: Transform - pos: 118.5,42.5 - parent: 13329 - - uid: 22358 - components: - - type: Transform - pos: 119.5,42.5 - parent: 13329 - - uid: 22359 - components: - - type: Transform - pos: 120.5,42.5 - parent: 13329 - - uid: 22360 - components: - - type: Transform - pos: 121.5,42.5 - parent: 13329 - - uid: 22361 - components: - - type: Transform - pos: 122.5,42.5 - parent: 13329 - - uid: 22362 - components: - - type: Transform - pos: 123.5,42.5 - parent: 13329 - - uid: 22363 - components: - - type: Transform - pos: 124.5,42.5 - parent: 13329 - - uid: 22364 - components: - - type: Transform - pos: 125.5,42.5 - parent: 13329 - - uid: 22365 - components: - - type: Transform - pos: 126.5,42.5 - parent: 13329 - - uid: 22366 - components: - - type: Transform - pos: 127.5,42.5 - parent: 13329 - - uid: 22367 - components: - - type: Transform - pos: 128.5,42.5 - parent: 13329 - - uid: 22368 - components: - - type: Transform - pos: 128.5,43.5 - parent: 13329 - - uid: 22369 - components: - - type: Transform - pos: 129.5,43.5 - parent: 13329 - - uid: 22370 - components: - - type: Transform - pos: 129.5,44.5 - parent: 13329 - - uid: 22371 - components: - - type: Transform - pos: 130.5,44.5 - parent: 13329 - - uid: 22372 - components: - - type: Transform - pos: 130.5,45.5 - parent: 13329 - - uid: 22373 - components: - - type: Transform - pos: 130.5,46.5 - parent: 13329 - - uid: 22374 - components: - - type: Transform - pos: 130.5,47.5 - parent: 13329 - - uid: 22375 - components: - - type: Transform - pos: 130.5,49.5 - parent: 13329 - - uid: 22376 - components: - - type: Transform - pos: 130.5,51.5 - parent: 13329 - - uid: 22377 - components: - - type: Transform - pos: 130.5,52.5 - parent: 13329 - - uid: 22378 - components: - - type: Transform - pos: 130.5,53.5 - parent: 13329 - - uid: 22379 - components: - - type: Transform - pos: 130.5,54.5 - parent: 13329 - - uid: 22380 - components: - - type: Transform - pos: 129.5,54.5 - parent: 13329 - - uid: 22381 - components: - - type: Transform - pos: 129.5,55.5 - parent: 13329 - - uid: 22382 - components: - - type: Transform - pos: 128.5,55.5 - parent: 13329 - - uid: 22383 - components: - - type: Transform - pos: 128.5,56.5 - parent: 13329 - - uid: 22384 - components: - - type: Transform - pos: 127.5,56.5 - parent: 13329 - - uid: 22385 - components: - - type: Transform - pos: 126.5,56.5 - parent: 13329 - - uid: 22386 - components: - - type: Transform - pos: 125.5,56.5 - parent: 13329 - - uid: 22387 - components: - - type: Transform - pos: 124.5,56.5 - parent: 13329 - - uid: 22388 - components: - - type: Transform - pos: 123.5,56.5 - parent: 13329 - - uid: 22389 - components: - - type: Transform - pos: 122.5,56.5 - parent: 13329 - - uid: 22390 - components: - - type: Transform - pos: 121.5,56.5 - parent: 13329 - - uid: 22391 - components: - - type: Transform - pos: 120.5,56.5 - parent: 13329 - - uid: 22392 - components: - - type: Transform - pos: 119.5,56.5 - parent: 13329 - - uid: 22393 - components: - - type: Transform - pos: 118.5,56.5 - parent: 13329 - - uid: 22394 - components: - - type: Transform - pos: 117.5,56.5 - parent: 13329 - - uid: 22395 - components: - - type: Transform - pos: 117.5,55.5 - parent: 13329 - - uid: 22396 - components: - - type: Transform - pos: 116.5,55.5 - parent: 13329 - - uid: 22397 - components: - - type: Transform - pos: 116.5,54.5 - parent: 13329 - - uid: 22398 - components: - - type: Transform - pos: 116.5,53.5 - parent: 13329 - - uid: 22399 - components: - - type: Transform - pos: 116.5,52.5 - parent: 13329 - - uid: 22400 - components: - - type: Transform - pos: 115.5,52.5 - parent: 13329 - - uid: 22401 - components: - - type: Transform - pos: 114.5,52.5 - parent: 13329 - - uid: 22402 - components: - - type: Transform - pos: 113.5,52.5 - parent: 13329 - - uid: 22403 - components: - - type: Transform - pos: 112.5,52.5 - parent: 13329 - uid: 23555 components: - type: Transform @@ -28814,6 +28583,16 @@ entities: - type: Transform pos: 35.547684,59.74187 parent: 13329 + - uid: 35757 + components: + - type: Transform + pos: 78.54361,57.685932 + parent: 13329 + - uid: 35758 + components: + - type: Transform + pos: 78.73111,57.560932 + parent: 13329 - proto: Bed entities: - uid: 1433 @@ -30062,6 +29841,31 @@ entities: - type: Transform pos: 58.5,18.5 parent: 13329 + - uid: 35592 + components: + - type: Transform + pos: 128.5,46.5 + parent: 13329 + - uid: 35625 + components: + - type: Transform + pos: 106.5,42.5 + parent: 13329 + - uid: 35626 + components: + - type: Transform + pos: 107.5,42.5 + parent: 13329 + - uid: 35737 + components: + - type: Transform + pos: 108.5,54.5 + parent: 13329 + - uid: 35738 + components: + - type: Transform + pos: 109.5,54.5 + parent: 13329 - proto: BoxBeaker entities: - uid: 15545 @@ -30223,6 +30027,11 @@ entities: - type: Transform pos: 61.37949,46.65781 parent: 13329 + - uid: 35633 + components: + - type: Transform + pos: 105.65974,46.68083 + parent: 13329 - proto: BoxFolderGrey entities: - uid: 6318 @@ -41194,6 +41003,16 @@ entities: - type: Transform pos: 64.5,61.5 parent: 13329 + - uid: 16563 + components: + - type: Transform + pos: 130.5,48.5 + parent: 13329 + - uid: 16564 + components: + - type: Transform + pos: 130.5,47.5 + parent: 13329 - uid: 17679 components: - type: Transform @@ -43394,6 +43213,286 @@ entities: - type: Transform pos: 43.5,-49.5 parent: 13329 + - uid: 20556 + components: + - type: Transform + pos: 130.5,44.5 + parent: 13329 + - uid: 22344 + components: + - type: Transform + pos: 130.5,45.5 + parent: 13329 + - uid: 22345 + components: + - type: Transform + pos: 130.5,46.5 + parent: 13329 + - uid: 22347 + components: + - type: Transform + pos: 114.5,46.5 + parent: 13329 + - uid: 22348 + components: + - type: Transform + pos: 129.5,43.5 + parent: 13329 + - uid: 22349 + components: + - type: Transform + pos: 113.5,46.5 + parent: 13329 + - uid: 22350 + components: + - type: Transform + pos: 128.5,43.5 + parent: 13329 + - uid: 22351 + components: + - type: Transform + pos: 129.5,44.5 + parent: 13329 + - uid: 22352 + components: + - type: Transform + pos: 116.5,46.5 + parent: 13329 + - uid: 22353 + components: + - type: Transform + pos: 117.5,42.5 + parent: 13329 + - uid: 22354 + components: + - type: Transform + pos: 119.5,42.5 + parent: 13329 + - uid: 22355 + components: + - type: Transform + pos: 120.5,42.5 + parent: 13329 + - uid: 22356 + components: + - type: Transform + pos: 116.5,43.5 + parent: 13329 + - uid: 22357 + components: + - type: Transform + pos: 117.5,43.5 + parent: 13329 + - uid: 22358 + components: + - type: Transform + pos: 115.5,45.5 + parent: 13329 + - uid: 22359 + components: + - type: Transform + pos: 115.5,43.5 + parent: 13329 + - uid: 22360 + components: + - type: Transform + pos: 115.5,44.5 + parent: 13329 + - uid: 22361 + components: + - type: Transform + pos: 115.5,46.5 + parent: 13329 + - uid: 22362 + components: + - type: Transform + pos: 116.5,45.5 + parent: 13329 + - uid: 22363 + components: + - type: Transform + pos: 118.5,42.5 + parent: 13329 + - uid: 22364 + components: + - type: Transform + pos: 116.5,44.5 + parent: 13329 + - uid: 22365 + components: + - type: Transform + pos: 121.5,42.5 + parent: 13329 + - uid: 22366 + components: + - type: Transform + pos: 128.5,42.5 + parent: 13329 + - uid: 22367 + components: + - type: Transform + pos: 127.5,42.5 + parent: 13329 + - uid: 22368 + components: + - type: Transform + pos: 126.5,42.5 + parent: 13329 + - uid: 22369 + components: + - type: Transform + pos: 125.5,42.5 + parent: 13329 + - uid: 22370 + components: + - type: Transform + pos: 124.5,42.5 + parent: 13329 + - uid: 22371 + components: + - type: Transform + pos: 123.5,42.5 + parent: 13329 + - uid: 22373 + components: + - type: Transform + pos: 113.5,52.5 + parent: 13329 + - uid: 22374 + components: + - type: Transform + pos: 112.5,52.5 + parent: 13329 + - uid: 22375 + components: + - type: Transform + pos: 114.5,52.5 + parent: 13329 + - uid: 22376 + components: + - type: Transform + pos: 115.5,52.5 + parent: 13329 + - uid: 22377 + components: + - type: Transform + pos: 116.5,52.5 + parent: 13329 + - uid: 22378 + components: + - type: Transform + pos: 116.5,53.5 + parent: 13329 + - uid: 22379 + components: + - type: Transform + pos: 116.5,54.5 + parent: 13329 + - uid: 22380 + components: + - type: Transform + pos: 116.5,55.5 + parent: 13329 + - uid: 22381 + components: + - type: Transform + pos: 125.5,56.5 + parent: 13329 + - uid: 22382 + components: + - type: Transform + pos: 117.5,55.5 + parent: 13329 + - uid: 22383 + components: + - type: Transform + pos: 124.5,56.5 + parent: 13329 + - uid: 22384 + components: + - type: Transform + pos: 117.5,56.5 + parent: 13329 + - uid: 22385 + components: + - type: Transform + pos: 119.5,56.5 + parent: 13329 + - uid: 22386 + components: + - type: Transform + pos: 123.5,56.5 + parent: 13329 + - uid: 22387 + components: + - type: Transform + pos: 118.5,56.5 + parent: 13329 + - uid: 22388 + components: + - type: Transform + pos: 122.5,56.5 + parent: 13329 + - uid: 22389 + components: + - type: Transform + pos: 121.5,56.5 + parent: 13329 + - uid: 22390 + components: + - type: Transform + pos: 120.5,56.5 + parent: 13329 + - uid: 22391 + components: + - type: Transform + pos: 126.5,56.5 + parent: 13329 + - uid: 22392 + components: + - type: Transform + pos: 128.5,56.5 + parent: 13329 + - uid: 22393 + components: + - type: Transform + pos: 128.5,55.5 + parent: 13329 + - uid: 22394 + components: + - type: Transform + pos: 129.5,55.5 + parent: 13329 + - uid: 22395 + components: + - type: Transform + pos: 129.5,54.5 + parent: 13329 + - uid: 22396 + components: + - type: Transform + pos: 130.5,52.5 + parent: 13329 + - uid: 22397 + components: + - type: Transform + pos: 130.5,54.5 + parent: 13329 + - uid: 22398 + components: + - type: Transform + pos: 130.5,53.5 + parent: 13329 + - uid: 22399 + components: + - type: Transform + pos: 130.5,51.5 + parent: 13329 + - uid: 22400 + components: + - type: Transform + pos: 130.5,50.5 + parent: 13329 - uid: 22904 components: - type: Transform @@ -46794,6 +46893,11 @@ entities: - type: Transform pos: 47.5,-55.5 parent: 13329 + - uid: 26356 + components: + - type: Transform + pos: 129.5,49.5 + parent: 13329 - uid: 26366 components: - type: Transform @@ -50679,6 +50783,36 @@ entities: - type: Transform pos: 102.5,33.5 parent: 13329 + - uid: 30175 + components: + - type: Transform + pos: 122.5,42.5 + parent: 13329 + - uid: 30176 + components: + - type: Transform + pos: 122.5,43.5 + parent: 13329 + - uid: 30177 + components: + - type: Transform + pos: 128.5,49.5 + parent: 13329 + - uid: 30178 + components: + - type: Transform + pos: 122.5,41.5 + parent: 13329 + - uid: 30179 + components: + - type: Transform + pos: 122.5,44.5 + parent: 13329 + - uid: 30180 + components: + - type: Transform + pos: 122.5,45.5 + parent: 13329 - uid: 30473 components: - type: Transform @@ -54069,6 +54203,56 @@ entities: - type: Transform pos: 129.5,-3.5 parent: 13329 + - uid: 35001 + components: + - type: Transform + pos: -41.5,-4.5 + parent: 13329 + - uid: 35002 + components: + - type: Transform + pos: -41.5,-5.5 + parent: 13329 + - uid: 35003 + components: + - type: Transform + pos: -41.5,-6.5 + parent: 13329 + - uid: 35004 + components: + - type: Transform + pos: -41.5,-7.5 + parent: 13329 + - uid: 35092 + components: + - type: Transform + pos: -41.5,-8.5 + parent: 13329 + - uid: 35093 + components: + - type: Transform + pos: -41.5,-9.5 + parent: 13329 + - uid: 35094 + components: + - type: Transform + pos: -42.5,-8.5 + parent: 13329 + - uid: 35095 + components: + - type: Transform + pos: -43.5,-8.5 + parent: 13329 + - uid: 35096 + components: + - type: Transform + pos: -44.5,-8.5 + parent: 13329 + - uid: 35097 + components: + - type: Transform + pos: -44.5,-9.5 + parent: 13329 - uid: 35382 components: - type: Transform @@ -54114,6 +54298,201 @@ entities: - type: Transform pos: 28.5,37.5 parent: 13329 + - uid: 35481 + components: + - type: Transform + pos: 130.5,49.5 + parent: 13329 + - uid: 35482 + components: + - type: Transform + pos: 131.5,49.5 + parent: 13329 + - uid: 35483 + components: + - type: Transform + pos: 122.5,53.5 + parent: 13329 + - uid: 35484 + components: + - type: Transform + pos: 122.5,54.5 + parent: 13329 + - uid: 35485 + components: + - type: Transform + pos: 122.5,55.5 + parent: 13329 + - uid: 35486 + components: + - type: Transform + pos: 127.5,56.5 + parent: 13329 + - uid: 35487 + components: + - type: Transform + pos: 122.5,57.5 + parent: 13329 + - uid: 35555 + components: + - type: Transform + pos: 123.5,41.5 + parent: 13329 + - uid: 35556 + components: + - type: Transform + pos: 124.5,41.5 + parent: 13329 + - uid: 35557 + components: + - type: Transform + pos: 125.5,41.5 + parent: 13329 + - uid: 35558 + components: + - type: Transform + pos: 127.5,41.5 + parent: 13329 + - uid: 35559 + components: + - type: Transform + pos: 128.5,41.5 + parent: 13329 + - uid: 35560 + components: + - type: Transform + pos: 129.5,41.5 + parent: 13329 + - uid: 35561 + components: + - type: Transform + pos: 126.5,41.5 + parent: 13329 + - uid: 35562 + components: + - type: Transform + pos: 129.5,42.5 + parent: 13329 + - uid: 35563 + components: + - type: Transform + pos: 130.5,42.5 + parent: 13329 + - uid: 35564 + components: + - type: Transform + pos: 130.5,43.5 + parent: 13329 + - uid: 35565 + components: + - type: Transform + pos: 131.5,43.5 + parent: 13329 + - uid: 35566 + components: + - type: Transform + pos: 131.5,44.5 + parent: 13329 + - uid: 35567 + components: + - type: Transform + pos: 131.5,45.5 + parent: 13329 + - uid: 35568 + components: + - type: Transform + pos: 131.5,46.5 + parent: 13329 + - uid: 35569 + components: + - type: Transform + pos: 131.5,47.5 + parent: 13329 + - uid: 35570 + components: + - type: Transform + pos: 131.5,48.5 + parent: 13329 + - uid: 35571 + components: + - type: Transform + pos: 131.5,50.5 + parent: 13329 + - uid: 35572 + components: + - type: Transform + pos: 131.5,51.5 + parent: 13329 + - uid: 35573 + components: + - type: Transform + pos: 131.5,52.5 + parent: 13329 + - uid: 35574 + components: + - type: Transform + pos: 131.5,53.5 + parent: 13329 + - uid: 35575 + components: + - type: Transform + pos: 131.5,54.5 + parent: 13329 + - uid: 35576 + components: + - type: Transform + pos: 131.5,55.5 + parent: 13329 + - uid: 35577 + components: + - type: Transform + pos: 130.5,55.5 + parent: 13329 + - uid: 35578 + components: + - type: Transform + pos: 130.5,56.5 + parent: 13329 + - uid: 35579 + components: + - type: Transform + pos: 129.5,56.5 + parent: 13329 + - uid: 35580 + components: + - type: Transform + pos: 129.5,57.5 + parent: 13329 + - uid: 35581 + components: + - type: Transform + pos: 128.5,57.5 + parent: 13329 + - uid: 35582 + components: + - type: Transform + pos: 127.5,57.5 + parent: 13329 + - uid: 35583 + components: + - type: Transform + pos: 126.5,57.5 + parent: 13329 + - uid: 35584 + components: + - type: Transform + pos: 125.5,57.5 + parent: 13329 + - uid: 35585 + components: + - type: Transform + pos: 123.5,57.5 + parent: 13329 + - uid: 35586 + components: + - type: Transform + pos: 124.5,57.5 + parent: 13329 - proto: CableApcStack entities: - uid: 12137 @@ -67425,6 +67804,331 @@ entities: - type: Transform pos: 100.5,-1.5 parent: 13329 + - uid: 35488 + components: + - type: Transform + pos: 90.5,55.5 + parent: 13329 + - uid: 35489 + components: + - type: Transform + pos: 91.5,55.5 + parent: 13329 + - uid: 35490 + components: + - type: Transform + pos: 92.5,55.5 + parent: 13329 + - uid: 35491 + components: + - type: Transform + pos: 93.5,55.5 + parent: 13329 + - uid: 35492 + components: + - type: Transform + pos: 94.5,55.5 + parent: 13329 + - uid: 35493 + components: + - type: Transform + pos: 95.5,55.5 + parent: 13329 + - uid: 35494 + components: + - type: Transform + pos: 96.5,55.5 + parent: 13329 + - uid: 35495 + components: + - type: Transform + pos: 96.5,54.5 + parent: 13329 + - uid: 35496 + components: + - type: Transform + pos: 96.5,53.5 + parent: 13329 + - uid: 35497 + components: + - type: Transform + pos: 96.5,52.5 + parent: 13329 + - uid: 35498 + components: + - type: Transform + pos: 96.5,51.5 + parent: 13329 + - uid: 35499 + components: + - type: Transform + pos: 96.5,50.5 + parent: 13329 + - uid: 35500 + components: + - type: Transform + pos: 96.5,49.5 + parent: 13329 + - uid: 35501 + components: + - type: Transform + pos: 97.5,49.5 + parent: 13329 + - uid: 35502 + components: + - type: Transform + pos: 98.5,49.5 + parent: 13329 + - uid: 35503 + components: + - type: Transform + pos: 99.5,49.5 + parent: 13329 + - uid: 35504 + components: + - type: Transform + pos: 100.5,49.5 + parent: 13329 + - uid: 35505 + components: + - type: Transform + pos: 101.5,49.5 + parent: 13329 + - uid: 35506 + components: + - type: Transform + pos: 102.5,49.5 + parent: 13329 + - uid: 35507 + components: + - type: Transform + pos: 103.5,49.5 + parent: 13329 + - uid: 35508 + components: + - type: Transform + pos: 105.5,49.5 + parent: 13329 + - uid: 35509 + components: + - type: Transform + pos: 104.5,49.5 + parent: 13329 + - uid: 35510 + components: + - type: Transform + pos: 106.5,49.5 + parent: 13329 + - uid: 35511 + components: + - type: Transform + pos: 107.5,49.5 + parent: 13329 + - uid: 35512 + components: + - type: Transform + pos: 108.5,49.5 + parent: 13329 + - uid: 35513 + components: + - type: Transform + pos: 109.5,49.5 + parent: 13329 + - uid: 35514 + components: + - type: Transform + pos: 110.5,49.5 + parent: 13329 + - uid: 35515 + components: + - type: Transform + pos: 111.5,49.5 + parent: 13329 + - uid: 35516 + components: + - type: Transform + pos: 112.5,49.5 + parent: 13329 + - uid: 35517 + components: + - type: Transform + pos: 113.5,49.5 + parent: 13329 + - uid: 35518 + components: + - type: Transform + pos: 118.5,49.5 + parent: 13329 + - uid: 35519 + components: + - type: Transform + pos: 114.5,49.5 + parent: 13329 + - uid: 35520 + components: + - type: Transform + pos: 119.5,49.5 + parent: 13329 + - uid: 35521 + components: + - type: Transform + pos: 120.5,49.5 + parent: 13329 + - uid: 35522 + components: + - type: Transform + pos: 117.5,49.5 + parent: 13329 + - uid: 35523 + components: + - type: Transform + pos: 115.5,49.5 + parent: 13329 + - uid: 35524 + components: + - type: Transform + pos: 116.5,49.5 + parent: 13329 + - uid: 35525 + components: + - type: Transform + pos: 120.5,48.5 + parent: 13329 + - uid: 35526 + components: + - type: Transform + pos: 120.5,47.5 + parent: 13329 + - uid: 35527 + components: + - type: Transform + pos: 120.5,46.5 + parent: 13329 + - uid: 35528 + components: + - type: Transform + pos: 121.5,46.5 + parent: 13329 + - uid: 35529 + components: + - type: Transform + pos: 122.5,46.5 + parent: 13329 + - uid: 35530 + components: + - type: Transform + pos: 123.5,46.5 + parent: 13329 + - uid: 35531 + components: + - type: Transform + pos: 124.5,46.5 + parent: 13329 + - uid: 35532 + components: + - type: Transform + pos: 125.5,46.5 + parent: 13329 + - uid: 35533 + components: + - type: Transform + pos: 126.5,46.5 + parent: 13329 + - uid: 35534 + components: + - type: Transform + pos: 127.5,46.5 + parent: 13329 + - uid: 35535 + components: + - type: Transform + pos: 127.5,47.5 + parent: 13329 + - uid: 35536 + components: + - type: Transform + pos: 127.5,48.5 + parent: 13329 + - uid: 35537 + components: + - type: Transform + pos: 128.5,48.5 + parent: 13329 + - uid: 35538 + components: + - type: Transform + pos: 128.5,49.5 + parent: 13329 + - uid: 35539 + components: + - type: Transform + pos: 128.5,50.5 + parent: 13329 + - uid: 35540 + components: + - type: Transform + pos: 127.5,50.5 + parent: 13329 + - uid: 35541 + components: + - type: Transform + pos: 127.5,51.5 + parent: 13329 + - uid: 35542 + components: + - type: Transform + pos: 127.5,52.5 + parent: 13329 + - uid: 35543 + components: + - type: Transform + pos: 128.5,52.5 + parent: 13329 + - uid: 35644 + components: + - type: Transform + pos: 103.5,48.5 + parent: 13329 + - uid: 35645 + components: + - type: Transform + pos: 103.5,47.5 + parent: 13329 + - uid: 35646 + components: + - type: Transform + pos: 103.5,46.5 + parent: 13329 + - uid: 35647 + components: + - type: Transform + pos: 103.5,50.5 + parent: 13329 + - uid: 35648 + components: + - type: Transform + pos: 103.5,51.5 + parent: 13329 + - uid: 35649 + components: + - type: Transform + pos: 103.5,52.5 + parent: 13329 + - uid: 35650 + components: + - type: Transform + pos: 109.5,44.5 + parent: 13329 + - uid: 35651 + components: + - type: Transform + pos: 109.5,43.5 + parent: 13329 + - uid: 35652 + components: + - type: Transform + pos: 109.5,42.5 + parent: 13329 - proto: CableHVStack entities: - uid: 26657 @@ -77754,6 +78458,36 @@ entities: - type: Transform pos: 101.5,-11.5 parent: 13329 + - uid: 35546 + components: + - type: Transform + pos: 128.5,52.5 + parent: 13329 + - uid: 35547 + components: + - type: Transform + pos: 127.5,52.5 + parent: 13329 + - uid: 35548 + components: + - type: Transform + pos: 126.5,52.5 + parent: 13329 + - uid: 35549 + components: + - type: Transform + pos: 126.5,51.5 + parent: 13329 + - uid: 35550 + components: + - type: Transform + pos: 126.5,50.5 + parent: 13329 + - uid: 35551 + components: + - type: Transform + pos: 126.5,49.5 + parent: 13329 - proto: CableMVStack entities: - uid: 26655 @@ -77850,6 +78584,12 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,68.5 parent: 13329 + - uid: 35544 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 128.5,48.5 + parent: 13329 - proto: CandyBowl entities: - uid: 26508 @@ -87754,6 +88494,78 @@ entities: - type: Transform pos: -4.5,75.5 parent: 13329 + - uid: 35714 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 104.5,52.5 + parent: 13329 + - uid: 35715 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 104.5,46.5 + parent: 13329 + - uid: 35716 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,46.5 + parent: 13329 + - uid: 35717 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,52.5 + parent: 13329 + - uid: 35718 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,48.5 + parent: 13329 + - uid: 35719 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,50.5 + parent: 13329 + - uid: 35720 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 118.5,53.5 + parent: 13329 + - uid: 35721 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 127.5,53.5 + parent: 13329 + - uid: 35722 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 127.5,45.5 + parent: 13329 + - uid: 35723 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 118.5,45.5 + parent: 13329 + - uid: 35724 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 99.5,46.5 + parent: 13329 + - uid: 35725 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 99.5,52.5 + parent: 13329 - proto: Chair entities: - uid: 2323 @@ -94553,13 +95365,6 @@ entities: - type: Transform pos: 90.33867,46.51819 parent: 13329 -- proto: ClothingNeckCloakGoliathCloak - entities: - - uid: 32127 - components: - - type: Transform - pos: -23.522526,76.500786 - parent: 13329 - proto: ClothingNeckCloakMiner entities: - uid: 33335 @@ -95789,6 +96594,12 @@ entities: - type: Transform pos: 69.5,48.5 parent: 13329 + - uid: 35605 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 106.5,54.5 + parent: 13329 - proto: ComputerAnalysisConsole entities: - uid: 15397 @@ -96030,6 +96841,12 @@ entities: rot: 1.5707963267948966 rad pos: 57.5,46.5 parent: 13329 + - uid: 35637 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 104.5,54.5 + parent: 13329 - proto: ComputerCriminalRecords entities: - uid: 2213 @@ -96129,17 +96946,6 @@ entities: rot: 3.141592653589793 rad pos: 74.5,31.5 parent: 13329 - - uid: 30213 - components: - - type: Transform - pos: 108.5,50.5 - parent: 13329 - - uid: 30214 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 108.5,48.5 - parent: 13329 - uid: 31887 components: - type: Transform @@ -96158,6 +96964,17 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,40.5 parent: 13329 + - uid: 35746 + components: + - type: Transform + pos: 108.5,50.5 + parent: 13329 + - uid: 35747 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,48.5 + parent: 13329 - proto: ComputerId entities: - uid: 30663 @@ -96513,6 +97330,12 @@ entities: - type: Transform pos: 69.5,54.5 parent: 13329 + - uid: 35606 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 99.5,43.5 + parent: 13329 - proto: ComputerTechnologyDiskTerminal entities: - uid: 19546 @@ -97414,6 +98237,13 @@ entities: - 0 - 0 - 0 +- proto: CrateEngineeringFoamGrenade + entities: + - uid: 35597 + components: + - type: Transform + pos: 103.5,42.5 + parent: 13329 - proto: CrateEngineeringSingularityEmitter entities: - uid: 32729 @@ -98058,6 +98888,11 @@ entities: - type: Transform pos: 93.53844,56.395863 parent: 13329 + - uid: 35634 + components: + - type: Transform + pos: 105.51911,52.446453 + parent: 13329 - proto: CryogenicSleepUnit entities: - uid: 18634 @@ -110107,6 +110942,56 @@ entities: - type: Transform pos: 85.5,17.5 parent: 13329 + - uid: 35726 + components: + - type: Transform + pos: 100.5,45.5 + parent: 13329 + - uid: 35727 + components: + - type: Transform + pos: 94.5,48.5 + parent: 13329 + - uid: 35728 + components: + - type: Transform + pos: 98.5,42.5 + parent: 13329 + - uid: 35729 + components: + - type: Transform + pos: 89.5,37.5 + parent: 13329 + - uid: 35730 + components: + - type: Transform + pos: 53.5,38.5 + parent: 13329 + - uid: 35731 + components: + - type: Transform + pos: 73.5,37.5 + parent: 13329 + - uid: 35732 + components: + - type: Transform + pos: 57.5,7.5 + parent: 13329 + - uid: 35733 + components: + - type: Transform + pos: 75.5,11.5 + parent: 13329 + - uid: 35734 + components: + - type: Transform + pos: 95.5,18.5 + parent: 13329 + - uid: 35748 + components: + - type: Transform + pos: 104.5,53.5 + parent: 13329 - proto: FaxMachineBase entities: - uid: 1988 @@ -111781,6 +112666,11 @@ entities: - 21409 - proto: FireAxeCabinetFilled entities: + - uid: 22994 + components: + - type: Transform + pos: 79.5,54.5 + parent: 13329 - uid: 25199 components: - type: Transform @@ -111788,11 +112678,6 @@ entities: parent: 13329 - type: Lock locked: False - - uid: 30597 - components: - - type: Transform - pos: 79.5,54.5 - parent: 13329 - proto: FireExtinguisher entities: - uid: 11680 @@ -113782,6 +114667,16 @@ entities: - type: Transform pos: 68.47122,57.57736 parent: 13329 + - uid: 35596 + components: + - type: Transform + pos: 128.55579,48.487343 + parent: 13329 + - uid: 35632 + components: + - type: Transform + pos: 105.53474,46.55583 + parent: 13329 - proto: FlashlightLantern entities: - uid: 2607 @@ -115230,6 +116125,13 @@ entities: - type: Transform pos: -12.641854,22.481508 parent: 13329 +- proto: FuelDispenser + entities: + - uid: 35735 + components: + - type: Transform + pos: 102.5,45.5 + parent: 13329 - proto: GalaxythistleSeeds entities: - uid: 1788 @@ -151620,6 +152522,9 @@ entities: rot: -1.5707963267948966 rad pos: 96.5,47.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35620 - type: AtmosPipeColor color: '#0335FCFF' - uid: 29841 @@ -151628,6 +152533,9 @@ entities: rot: 3.141592653589793 rad pos: 107.5,42.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35618 - type: AtmosPipeColor color: '#0335FCFF' - uid: 29842 @@ -151635,6 +152543,9 @@ entities: - type: Transform pos: 107.5,56.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35621 - type: AtmosPipeColor color: '#0335FCFF' - uid: 29843 @@ -151643,6 +152554,9 @@ entities: rot: -1.5707963267948966 rad pos: 102.5,49.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35619 - type: AtmosPipeColor color: '#0335FCFF' - uid: 29844 @@ -151651,6 +152565,9 @@ entities: rot: 3.141592653589793 rad pos: 110.5,47.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35623 - type: AtmosPipeColor color: '#0335FCFF' - uid: 29847 @@ -151658,6 +152575,9 @@ entities: - type: Transform pos: 116.5,49.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35622 - type: AtmosPipeColor color: '#0335FCFF' - uid: 29865 @@ -151666,6 +152586,9 @@ entities: rot: 3.141592653589793 rad pos: 119.5,45.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35624 - type: AtmosPipeColor color: '#0335FCFF' - uid: 29866 @@ -151674,6 +152597,9 @@ entities: rot: 3.141592653589793 rad pos: 126.5,45.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35624 - type: AtmosPipeColor color: '#0335FCFF' - uid: 30302 @@ -153370,6 +154296,9 @@ entities: rot: 1.5707963267948966 rad pos: 96.5,51.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35620 - type: AtmosPipeColor color: '#FF1212FF' - uid: 29838 @@ -153378,6 +154307,9 @@ entities: rot: 1.5707963267948966 rad pos: 99.5,49.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35619 - type: AtmosPipeColor color: '#FF1212FF' - uid: 29839 @@ -153385,6 +154317,9 @@ entities: - type: Transform pos: 100.5,56.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35621 - type: AtmosPipeColor color: '#FF1212FF' - uid: 29840 @@ -153393,6 +154328,9 @@ entities: rot: 3.141592653589793 rad pos: 100.5,42.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35618 - type: AtmosPipeColor color: '#FF1212FF' - uid: 29845 @@ -153400,6 +154338,9 @@ entities: - type: Transform pos: 110.5,51.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35623 - type: AtmosPipeColor color: '#FF1212FF' - uid: 29846 @@ -153408,6 +154349,9 @@ entities: rot: 3.141592653589793 rad pos: 112.5,49.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35622 - type: AtmosPipeColor color: '#FF1212FF' - uid: 29863 @@ -153415,6 +154359,9 @@ entities: - type: Transform pos: 119.5,53.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35624 - type: AtmosPipeColor color: '#FF1212FF' - uid: 29864 @@ -153422,6 +154369,9 @@ entities: - type: Transform pos: 126.5,53.5 parent: 13329 + - type: DeviceNetwork + deviceLists: + - 35624 - type: AtmosPipeColor color: '#FF1212FF' - uid: 30315 @@ -157389,6 +158339,12 @@ entities: - type: Transform pos: 131.5,-27.5 parent: 13329 + - uid: 22372 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 113.5,52.5 + parent: 13329 - uid: 22529 components: - type: Transform @@ -159226,6 +160182,12 @@ entities: - type: Transform pos: 34.5,39.5 parent: 13329 + - uid: 29379 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 114.5,52.5 + parent: 13329 - uid: 30070 components: - type: Transform @@ -159271,6 +160233,12 @@ entities: - type: Transform pos: 109.5,44.5 parent: 13329 + - uid: 30174 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 112.5,52.5 + parent: 13329 - uid: 31706 components: - type: Transform @@ -159991,6 +160959,354 @@ entities: - type: Transform pos: 99.5,-0.5 parent: 13329 + - uid: 35653 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 115.5,52.5 + parent: 13329 + - uid: 35654 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,52.5 + parent: 13329 + - uid: 35655 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,53.5 + parent: 13329 + - uid: 35656 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,55.5 + parent: 13329 + - uid: 35657 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,54.5 + parent: 13329 + - uid: 35658 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 117.5,55.5 + parent: 13329 + - uid: 35659 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 117.5,56.5 + parent: 13329 + - uid: 35660 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 118.5,56.5 + parent: 13329 + - uid: 35661 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 119.5,56.5 + parent: 13329 + - uid: 35662 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 120.5,56.5 + parent: 13329 + - uid: 35663 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 121.5,56.5 + parent: 13329 + - uid: 35664 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 122.5,56.5 + parent: 13329 + - uid: 35665 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,56.5 + parent: 13329 + - uid: 35666 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 124.5,56.5 + parent: 13329 + - uid: 35667 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 125.5,56.5 + parent: 13329 + - uid: 35668 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 127.5,56.5 + parent: 13329 + - uid: 35669 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 128.5,56.5 + parent: 13329 + - uid: 35670 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 126.5,56.5 + parent: 13329 + - uid: 35671 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 128.5,55.5 + parent: 13329 + - uid: 35672 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 129.5,55.5 + parent: 13329 + - uid: 35673 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 129.5,54.5 + parent: 13329 + - uid: 35674 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,54.5 + parent: 13329 + - uid: 35675 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,53.5 + parent: 13329 + - uid: 35676 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,52.5 + parent: 13329 + - uid: 35677 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,51.5 + parent: 13329 + - uid: 35678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,50.5 + parent: 13329 + - uid: 35679 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,49.5 + parent: 13329 + - uid: 35680 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,47.5 + parent: 13329 + - uid: 35681 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,46.5 + parent: 13329 + - uid: 35682 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,45.5 + parent: 13329 + - uid: 35683 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,44.5 + parent: 13329 + - uid: 35684 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,48.5 + parent: 13329 + - uid: 35685 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 129.5,44.5 + parent: 13329 + - uid: 35686 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 129.5,43.5 + parent: 13329 + - uid: 35687 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 128.5,43.5 + parent: 13329 + - uid: 35688 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 128.5,42.5 + parent: 13329 + - uid: 35689 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 127.5,42.5 + parent: 13329 + - uid: 35690 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 126.5,42.5 + parent: 13329 + - uid: 35691 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 125.5,42.5 + parent: 13329 + - uid: 35692 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 124.5,42.5 + parent: 13329 + - uid: 35693 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,42.5 + parent: 13329 + - uid: 35694 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 122.5,42.5 + parent: 13329 + - uid: 35695 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 121.5,42.5 + parent: 13329 + - uid: 35696 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 120.5,42.5 + parent: 13329 + - uid: 35697 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 119.5,42.5 + parent: 13329 + - uid: 35698 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 118.5,42.5 + parent: 13329 + - uid: 35699 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 117.5,42.5 + parent: 13329 + - uid: 35700 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 117.5,43.5 + parent: 13329 + - uid: 35701 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,43.5 + parent: 13329 + - uid: 35702 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 115.5,43.5 + parent: 13329 + - uid: 35703 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 115.5,44.5 + parent: 13329 + - uid: 35704 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,44.5 + parent: 13329 + - uid: 35705 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,45.5 + parent: 13329 + - uid: 35706 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 115.5,45.5 + parent: 13329 + - uid: 35707 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 116.5,46.5 + parent: 13329 + - uid: 35708 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 115.5,46.5 + parent: 13329 + - uid: 35709 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 114.5,46.5 + parent: 13329 + - uid: 35710 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 113.5,46.5 + parent: 13329 - proto: GrilleBroken entities: - uid: 2603 @@ -160713,6 +162029,28 @@ entities: - type: Transform pos: 62.5,51.5 parent: 13329 + - uid: 35604 + components: + - type: Transform + pos: 114.5,51.5 + parent: 13329 + - uid: 35749 + components: + - type: Transform + pos: 99.5,45.5 + parent: 13329 + - uid: 35750 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 99.5,45.5 + parent: 13329 + - uid: 35751 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 102.5,53.5 + parent: 13329 - proto: IntercomCommon entities: - uid: 1106 @@ -163629,6 +164967,16 @@ entities: - type: Transform pos: 36.5,68.5 parent: 13329 + - uid: 22346 + components: + - type: Transform + pos: 112.5,46.5 + parent: 13329 + - uid: 22401 + components: + - type: Transform + pos: -23.5,76.5 + parent: 13329 - uid: 29283 components: - type: Transform @@ -164882,6 +166230,11 @@ entities: - type: Transform pos: 50.5,36.5 parent: 13329 + - uid: 35629 + components: + - type: Transform + pos: 101.5,42.5 + parent: 13329 - proto: NitrogenTankFilled entities: - uid: 3730 @@ -165125,6 +166478,11 @@ entities: - type: Transform pos: 49.5,36.5 parent: 13329 + - uid: 35628 + components: + - type: Transform + pos: 102.5,42.5 + parent: 13329 - proto: OxygenTankFilled entities: - uid: 28161 @@ -165835,6 +167193,11 @@ entities: - type: Transform pos: 65.6013,-40.46559 parent: 13329 + - uid: 35636 + components: + - type: Transform + pos: 99.69515,54.568993 + parent: 13329 - proto: PillCanister entities: - uid: 18599 @@ -166137,6 +167500,11 @@ entities: - type: Transform pos: 40.5,48.5 parent: 13329 + - uid: 35736 + components: + - type: Transform + pos: 111.5,42.5 + parent: 13329 - proto: PortableGeneratorPacman entities: - uid: 13110 @@ -166597,6 +167965,12 @@ entities: - type: Transform pos: 66.5,41.5 parent: 13329 + - uid: 35752 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 111.5,48.5 + parent: 13329 - proto: PosterLegitNoERP entities: - uid: 18812 @@ -167004,6 +168378,18 @@ entities: - type: Transform pos: -5.5,-25.5 parent: 13329 +- proto: PottedPlant24 + entities: + - uid: 35712 + components: + - type: Transform + pos: 112.4819,48.239693 + parent: 13329 + - uid: 35713 + components: + - type: Transform + pos: 112.4819,50.224068 + parent: 13329 - proto: PottedPlant3 entities: - uid: 6598 @@ -167412,6 +168798,13 @@ entities: - type: Transform pos: 98.5,16.5 parent: 13329 +- proto: PowerCellHigh + entities: + - uid: 35631 + components: + - type: Transform + pos: 110.52529,42.64839 + parent: 13329 - proto: PowerCellRecharger entities: - uid: 6961 @@ -167525,6 +168918,16 @@ entities: - type: Transform pos: 51.5,40.5 parent: 13329 + - uid: 35627 + components: + - type: Transform + pos: 99.5,42.5 + parent: 13329 + - uid: 35630 + components: + - type: Transform + pos: 113.5,44.5 + parent: 13329 - proto: PowerCellSmallPrinted entities: - uid: 15537 @@ -170469,6 +171872,35 @@ entities: parent: 13329 - type: ApcPowerReceiver powerLoad: 0 + - uid: 35711 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 122.5,58.5 + parent: 13329 + - uid: 35753 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 132.5,49.5 + parent: 13329 + - uid: 35754 + components: + - type: Transform + pos: 122.5,40.5 + parent: 13329 + - uid: 35755 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 131.5,42.5 + parent: 13329 + - uid: 35756 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,57.5 + parent: 13329 - proto: PoweredlightLED entities: - uid: 13646 @@ -173086,6 +174518,11 @@ entities: - type: Transform pos: 71.5,4.5 parent: 13329 + - uid: 22402 + components: + - type: Transform + pos: 99.5,54.5 + parent: 13329 - uid: 26106 components: - type: Transform @@ -173556,60 +174993,62 @@ entities: parent: 13329 - proto: RadiationCollector entities: - - uid: 22994 + - uid: 28288 components: - type: Transform - pos: 116.5,-6.5 + pos: 93.5,-17.5 + parent: 13329 + - uid: 28289 + components: + - type: Transform + pos: 93.5,-16.5 parent: 13329 +- proto: RadiationCollectorFullTank + entities: - uid: 23041 components: - type: Transform - pos: 116.5,-4.5 + pos: 116.5,-6.5 parent: 13329 - uid: 23042 components: - type: Transform - pos: 116.5,-5.5 + pos: 116.5,-4.5 parent: 13329 - uid: 23043 components: - type: Transform - pos: 107.5,2.5 + pos: 116.5,-5.5 parent: 13329 - uid: 23044 components: - type: Transform - pos: 108.5,2.5 + pos: 107.5,2.5 parent: 13329 - uid: 23045 components: - type: Transform - pos: 109.5,2.5 + pos: 108.5,2.5 parent: 13329 - uid: 23077 components: - type: Transform - pos: 109.5,-13.5 + pos: 109.5,2.5 parent: 13329 - uid: 23078 components: - type: Transform - pos: 108.5,-13.5 + pos: 109.5,-13.5 parent: 13329 - uid: 23079 components: - type: Transform - pos: 107.5,-13.5 - parent: 13329 - - uid: 28288 - components: - - type: Transform - pos: 93.5,-17.5 + pos: 108.5,-13.5 parent: 13329 - - uid: 28289 + - uid: 23703 components: - type: Transform - pos: 93.5,-16.5 + pos: 107.5,-13.5 parent: 13329 - proto: RadioHandheld entities: @@ -175139,6 +176578,36 @@ entities: - type: Transform pos: 58.5,-3.5 parent: 13329 + - uid: 35740 + components: + - type: Transform + pos: 107.5,46.5 + parent: 13329 + - uid: 35741 + components: + - type: Transform + pos: 108.5,46.5 + parent: 13329 + - uid: 35742 + components: + - type: Transform + pos: 109.5,46.5 + parent: 13329 + - uid: 35743 + components: + - type: Transform + pos: 109.5,52.5 + parent: 13329 + - uid: 35744 + components: + - type: Transform + pos: 108.5,52.5 + parent: 13329 + - uid: 35745 + components: + - type: Transform + pos: 107.5,52.5 + parent: 13329 - proto: RandomDrinkBottle entities: - uid: 34065 @@ -180753,6 +182222,56 @@ entities: - type: Transform pos: 80.5,11.5 parent: 13329 + - uid: 35607 + components: + - type: Transform + pos: 115.5,51.5 + parent: 13329 + - uid: 35608 + components: + - type: Transform + pos: 117.5,51.5 + parent: 13329 + - uid: 35609 + components: + - type: Transform + pos: 119.5,54.5 + parent: 13329 + - uid: 35610 + components: + - type: Transform + pos: 126.5,54.5 + parent: 13329 + - uid: 35611 + components: + - type: Transform + pos: 126.5,44.5 + parent: 13329 + - uid: 35612 + components: + - type: Transform + pos: 119.5,44.5 + parent: 13329 + - uid: 35613 + components: + - type: Transform + pos: 94.5,47.5 + parent: 13329 + - uid: 35614 + components: + - type: Transform + pos: 94.5,51.5 + parent: 13329 + - uid: 35615 + components: + - type: Transform + pos: 98.5,52.5 + parent: 13329 + - uid: 35616 + components: + - type: Transform + pos: 105.5,53.5 + parent: 13329 - proto: Screwdriver entities: - uid: 11821 @@ -181094,6 +182613,11 @@ entities: - type: Transform pos: -44.54539,-1.6449262 parent: 13329 + - uid: 35635 + components: + - type: Transform + pos: 99.49203,54.615868 + parent: 13329 - proto: ShowcaseRobot entities: - uid: 26063 @@ -181566,6 +183090,17 @@ entities: - type: Transform pos: 56.5,42.5 parent: 13329 + - uid: 35590 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 123.5,50.5 + parent: 13329 + - uid: 35591 + components: + - type: Transform + pos: 123.5,48.5 + parent: 13329 - proto: ShuttersRadiationOpen entities: - uid: 25901 @@ -181578,11 +183113,6 @@ entities: - type: Transform pos: 94.5,-1.5 parent: 13329 - - uid: 32378 - components: - - type: Transform - pos: 98.5,-4.5 - parent: 13329 - uid: 32379 components: - type: Transform @@ -181721,6 +183251,25 @@ entities: - type: Transform pos: -31.455948,-40.471146 parent: 13329 +- proto: SignAi + entities: + - uid: 35598 + components: + - type: Transform + pos: 98.5,50.5 + parent: 13329 + - uid: 35600 + components: + - type: Transform + pos: 111.5,50.5 + parent: 13329 +- proto: SignAiUpload + entities: + - uid: 35599 + components: + - type: Transform + pos: 98.5,48.5 + parent: 13329 - proto: SignalButton entities: - uid: 938 @@ -182296,6 +183845,18 @@ entities: linkedPorts: 29006: - Pressed: DoorBolt + - uid: 35603 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 125.5,49.5 + parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 35591: + - Pressed: Toggle + 35590: + - Pressed: Toggle - proto: SignAnomaly entities: - uid: 20083 @@ -182454,6 +184015,14 @@ entities: - type: Transform pos: 66.5,57.5 parent: 13329 +- proto: SignCryo + entities: + - uid: 35461 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 95.5,21.5 + parent: 13329 - proto: SignCryogenicsMed entities: - uid: 18588 @@ -183104,6 +184673,11 @@ entities: - type: Transform pos: -13.5,53.5 parent: 13329 + - uid: 22403 + components: + - type: Transform + pos: 100.5,53.5 + parent: 13329 - uid: 26096 components: - type: Transform @@ -183435,6 +185009,18 @@ entities: - type: Transform pos: 125.5,-21.5 parent: 13329 + - uid: 35638 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 110.5,57.5 + parent: 13329 + - uid: 35639 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 103.5,48.5 + parent: 13329 - proto: SignSecureMed entities: - uid: 2862 @@ -183741,6 +185327,30 @@ entities: - type: Transform pos: 26.5,-21.5 parent: 13329 + - uid: 35640 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 129.5,49.5 + parent: 13329 + - uid: 35641 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 114.5,43.5 + parent: 13329 + - uid: 35642 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,45.5 + parent: 13329 + - uid: 35643 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 103.5,50.5 + parent: 13329 - proto: SignSmoking entities: - uid: 1636 @@ -186839,6 +188449,11 @@ entities: - type: Transform pos: 1.5,-3.5 parent: 13329 + - uid: 35739 + components: + - type: Transform + pos: 114.5,49.5 + parent: 13329 - proto: SpawnMobCorgi entities: - uid: 31610 @@ -188786,6 +190401,11 @@ entities: - type: Transform pos: 98.5,1.5 parent: 13329 + - uid: 35545 + components: + - type: Transform + pos: 128.5,52.5 + parent: 13329 - proto: SuitStorageAtmos entities: - uid: 13439 @@ -188926,6 +190546,71 @@ entities: - SurveillanceCameraCommand nameSet: True id: Arrivals Command Post + - uid: 30181 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 99.5,48.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core First Room + - uid: 30182 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 110.5,50.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Upload + - uid: 30183 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 114.5,50.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core Entrance + - uid: 30184 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 111.5,44.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Power + - uid: 30185 + components: + - type: Transform + pos: 104.5,54.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Construction Room + - uid: 30212 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 104.5,44.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Closet - uid: 30756 components: - type: Transform @@ -189077,6 +190762,148 @@ entities: - SurveillanceCameraCommand nameSet: True id: Vault Exterior North + - uid: 35471 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 63.5,51.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: HoP Bedroom + - uid: 35475 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 90.5,72.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Command Dock Airlock + - uid: 35476 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 95.5,49.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Entrance + - uid: 35477 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 121.5,50.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core + - uid: 35478 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 116.5,30.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: 'Solars NE ' + - uid: 35480 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 126.5,49.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core + - uid: 35552 + components: + - type: Transform + pos: 122.5,58.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext N + - uid: 35553 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 132.5,49.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext E + - uid: 35554 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 122.5,40.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext S + - uid: 35587 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 131.5,56.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext NE + - uid: 35588 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 130.5,41.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext SE + - uid: 35589 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,50.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core Core + - uid: 35602 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 112.5,40.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Powerline - proto: SurveillanceCameraEngineering entities: - uid: 13142 @@ -189101,17 +190928,28 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Rock Dock Supply Room - - uid: 23703 + - uid: 23954 components: - type: Transform rot: -1.5707963267948966 rad - pos: 96.5,-36.5 + pos: 100.5,1.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Singulo Cage + - uid: 26354 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 103.5,-30.5 parent: 13329 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: TEG Room + id: Atmos Airlock Ext - uid: 26618 components: - type: Transform @@ -189263,6 +191101,17 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Telecomms + - uid: 30213 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 116.5,-8.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Singulo Cage - uid: 34705 components: - type: Transform @@ -189274,6 +191123,244 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Project Room + - uid: 34778 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,-20.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engi Construction Room + - uid: 34779 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-9.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engi Arrivals Supply Closet + - uid: 34918 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 60.5,2.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Tech Vault Secure Storage + - uid: 34920 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 74.5,-0.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Closet + - uid: 34948 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 65.5,-17.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Desk + - uid: 35099 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,2.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: 'Solars SW ' + - uid: 35279 + components: + - type: Transform + pos: 75.5,-26.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Gear Room + - uid: 35280 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 79.5,-23.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Drone Room + - uid: 35344 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 82.5,-40.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos + - uid: 35449 + components: + - type: Transform + pos: 95.5,-31.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Teg Entrance + - uid: 35450 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 89.5,-36.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos + - uid: 35451 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 101.5,-33.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: TEG + - uid: 35452 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 84.5,-18.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tank Room + - uid: 35453 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 97.5,-19.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engi Maint Tunnel + - uid: 35454 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 84.5,-15.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: CE Bedroom + - uid: 35455 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 91.5,-14.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engi Storage + - uid: 35457 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 95.5,-10.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: PA Hall + - uid: 35458 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 97.5,-0.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Singulo Cage Airlock + - uid: 35459 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 99.5,6.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engi Construction Room + - uid: 35472 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 88.5,33.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Telecomms Entrance + - uid: 35473 + components: + - type: Transform + pos: 95.5,35.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Telecomms Storage + - uid: 35479 + components: + - type: Transform + pos: 113.5,30.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars NE - proto: SurveillanceCameraGeneral entities: - uid: 10903 @@ -189407,6 +191494,297 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Tool Room + - uid: 30214 + components: + - type: Transform + pos: -23.5,60.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Librarian Room + - uid: 30592 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,61.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel + - uid: 30597 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,71.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chaplain Office + - uid: 31694 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,71.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall North Airlock + - uid: 34645 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,50.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac Breakroom + - uid: 34646 + components: + - type: Transform + pos: -19.5,48.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Library + - uid: 34767 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,52.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Library + - uid: 34768 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,46.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Botany + - uid: 34769 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,34.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Morgue + - uid: 34772 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,33.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac + - uid: 34773 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,10.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Bar + - uid: 34774 + components: + - type: Transform + pos: -15.5,-2.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Smoke Room + - uid: 34775 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -32.5,-10.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 34776 + components: + - type: Transform + pos: -32.5,-20.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 34777 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-18.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Arrivals + - uid: 34781 + components: + - type: Transform + pos: 1.5,-7.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Cargo + - uid: 34787 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-21.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Cargo/Sci + - uid: 34911 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-1.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Shop Backroom 2 + - uid: 34912 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,4.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Shop Backroom 1 + - uid: 34917 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,4.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Sec/Dorms + - uid: 34919 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 74.5,11.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Swimming Pool + - uid: 34949 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 45.5,-9.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Showroom Exterior + - uid: 34951 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-32.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Airlock Ext + - uid: 35000 + components: + - type: Transform + pos: -40.5,-22.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 35098 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -44.5,-7.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 35100 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,27.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac Bathroom + - uid: 35101 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,28.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac Kitchen Storeroom - uid: 35345 components: - type: Transform @@ -189665,6 +192043,135 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Arboretum + - uid: 35456 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 122.5,-3.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Disposals + - uid: 35460 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 96.5,18.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Cryosleep + - uid: 35462 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,15.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Dorms + - uid: 35463 + components: + - type: Transform + pos: 62.5,14.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm Bathroom + - uid: 35464 + components: + - type: Transform + pos: 67.5,18.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm Washroom + - uid: 35465 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 70.5,18.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm Laundry + - uid: 35467 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 46.5,34.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Eva + - uid: 35468 + components: + - type: Transform + pos: 35.5,32.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Sec/Med + - uid: 35469 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,30.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Court + - uid: 35470 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 78.5,40.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Bridge + - uid: 35474 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 74.5,33.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bridge Offices + - uid: 35601 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 97.5,41.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: 'Main Hall AI ' - proto: SurveillanceCameraMedical entities: - uid: 18347 @@ -189788,6 +192295,126 @@ entities: - SurveillanceCameraMedical nameSet: True id: Viro Entrance + - uid: 32127 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,68.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Storage + - uid: 32378 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,68.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Breakroom + - uid: 34203 + components: + - type: Transform + pos: 6.5,70.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Storage Backroom + - uid: 34205 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,63.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Med Hall + - uid: 34561 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,55.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Exam Room 2 + - uid: 34594 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,59.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Exam Room 1 + - uid: 34595 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,59.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Surgery Viewing + - uid: 34598 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,46.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Virology + - uid: 34626 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,63.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: CMO Office + - uid: 34636 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,63.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: CMO Private Practice + - uid: 34637 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,45.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Paramedic Storage - uid: 35370 components: - type: Transform @@ -189983,6 +192610,104 @@ entities: - SurveillanceCameraScience nameSet: True id: Toxins Storage + - uid: 34786 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.5,-23.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Robotics Bay + - uid: 34789 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 46.5,-25.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Hall Entrance + - uid: 34790 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,-39.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: RD Bedroom + - uid: 34791 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,-39.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Toxins Storage + - uid: 34793 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 60.5,-26.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Artifact Chamber + - uid: 35103 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 39.5,-34.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Hall + - uid: 35104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-29.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Server Room + - uid: 35105 + components: + - type: Transform + pos: 32.5,-39.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Breakroom + - uid: 35107 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-33.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Shooting Range - proto: SurveillanceCameraSecurity entities: - uid: 10160 @@ -190333,6 +193058,92 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Lawyer Office + - uid: 34780 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-8.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Arrivals Sec Checkpoint + - uid: 34788 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 43.5,-22.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Science Security Checkpoint + - uid: 34913 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,19.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Evidence Room + - uid: 34914 + components: + - type: Transform + pos: 39.5,24.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: HOS Bedroom + - uid: 34915 + components: + - type: Transform + pos: 22.5,5.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security Entrance + - uid: 34916 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,4.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security Secondary Entrance + - uid: 35102 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-9.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security Cargo Checkpoint + - uid: 35466 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.5,27.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma North - proto: SurveillanceCameraService entities: - uid: 10975 @@ -190433,6 +193244,27 @@ entities: - SurveillanceCameraService nameSet: True id: Service Hall + - uid: 34770 + components: + - type: Transform + pos: -16.5,37.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Botany Backroom + - uid: 34771 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,30.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Bartender Backroom - proto: SurveillanceCameraSupply entities: - uid: 11801 @@ -190511,6 +193343,60 @@ entities: - SurveillanceCameraSupply nameSet: True id: Supply Storage + - uid: 34782 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-25.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: QM Bedroom + - uid: 34783 + components: + - type: Transform + pos: 3.5,-35.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock 1 + - uid: 34784 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-37.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock 2 + - uid: 34785 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-34.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Salvage Airlock + - uid: 34950 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-18.5 + parent: 13329 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Closet Entrance - proto: SurveillanceCameraWirelessRouterConstructed entities: - uid: 35428 @@ -195713,6 +198599,11 @@ entities: - type: Transform pos: 104.80289,42.547157 parent: 13329 + - uid: 35593 + components: + - type: Transform + pos: 128.47766,48.596718 + parent: 13329 - proto: ToolboxEmergencyFilled entities: - uid: 2321 @@ -195869,6 +198760,11 @@ entities: - type: Transform pos: 9.462639,25.591267 parent: 13329 + - uid: 35594 + components: + - type: Transform + pos: 128.50891,50.659218 + parent: 13329 - proto: ToyAi entities: - uid: 26091 @@ -195876,11 +198772,6 @@ entities: - type: Transform pos: 48.527782,-7.346234 parent: 13329 - - uid: 30212 - components: - - type: Transform - pos: 124.491325,49.6419 - parent: 13329 - proto: ToyAmongPequeno entities: - uid: 21980 @@ -195985,6 +198876,13 @@ entities: - type: Transform pos: 132.28911,-3.4132915 parent: 13329 +- proto: trayScanner + entities: + - uid: 35595 + components: + - type: Transform + pos: 128.49329,50.518593 + parent: 13329 - proto: TwoWayLever entities: - uid: 11497 @@ -196970,6 +199868,11 @@ entities: rot: 3.141592653589793 rad pos: 124.5,48.5 parent: 13329 + - uid: 35617 + components: + - type: Transform + pos: 105.5,45.5 + parent: 13329 - proto: WallmountTelevision entities: - uid: 13294 @@ -206500,16 +209403,6 @@ entities: - type: Transform pos: 128.5,47.5 parent: 13329 - - uid: 16563 - components: - - type: Transform - pos: 130.5,48.5 - parent: 13329 - - uid: 16564 - components: - - type: Transform - pos: 130.5,50.5 - parent: 13329 - uid: 16565 components: - type: Transform @@ -220677,68 +223570,6 @@ entities: - type: Transform pos: 35.515594,20.647896 parent: 13329 -- proto: WeaponTurretSyndicateBroken - entities: - - uid: 30174 - components: - - type: Transform - pos: 118.5,53.5 - parent: 13329 - - uid: 30175 - components: - - type: Transform - pos: 127.5,53.5 - parent: 13329 - - uid: 30176 - components: - - type: Transform - pos: 127.5,45.5 - parent: 13329 - - uid: 30177 - components: - - type: Transform - pos: 118.5,45.5 - parent: 13329 - - uid: 30178 - components: - - type: Transform - pos: 116.5,48.5 - parent: 13329 - - uid: 30179 - components: - - type: Transform - pos: 116.5,50.5 - parent: 13329 - - uid: 30180 - components: - - type: Transform - pos: 110.5,46.5 - parent: 13329 - - uid: 30181 - components: - - type: Transform - pos: 110.5,52.5 - parent: 13329 - - uid: 30182 - components: - - type: Transform - pos: 99.5,52.5 - parent: 13329 - - uid: 30183 - components: - - type: Transform - pos: 104.5,52.5 - parent: 13329 - - uid: 30184 - components: - - type: Transform - pos: 104.5,46.5 - parent: 13329 - - uid: 30185 - components: - - type: Transform - pos: 99.5,46.5 - parent: 13329 - proto: WeedSpray entities: - uid: 1426 @@ -220775,6 +223606,13 @@ entities: - type: Transform pos: 79.52918,1.5092251 parent: 13329 +- proto: WelderMini + entities: + - uid: 35759 + components: + - type: Transform + pos: 78.965485,57.764057 + parent: 13329 - proto: WeldingFuelTankFull entities: - uid: 2318 From 95b3d05efa025bff741bbeb065015efe5235c35d Mon Sep 17 00:00:00 2001 From: achookh <150765643+achookh@users.noreply.github.com> Date: Sat, 24 Aug 2024 18:30:14 +0900 Subject: [PATCH 030/223] Change anomaly sign to have the same m as the other ones (#31394) * Delete Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png * Add files via upload --- .../Structures/Wallmounts/signs.rsi/anomaly.png | Bin 515 -> 510 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png index 6b7361f21c23104e4436986be17713b0d964dc82..4b0cfb03478161b941efe2afc0a5530f9249289a 100644 GIT binary patch delta 485 zcmVQKhC`5JD<@KEU#ly`Ry{+43db zGAEzGp2f-sWTz5BERaYDwlct3jycC?k^u?cl=`l|=eu|31mLgZY|NN!cBi=l)z5ci zEGL0vvpYqX5v-!sm*MU(2_cuM?@ zYkP=wMoj-PuuD+otqxS>?YGS{Q9_lsnjHGiMnKhSPKRZm>^*~j3Vgxl*ate12OI23}s@;rMvuPeL1} zuw1n@Marpv5CNK>O4@zKWftrN2AHr3Fpizty&K$coL7zr!1ZBVm z2Bbu1W0nlqpt2AOuL$jFS2XEBfRx>Y?|SwUz?zzZ%U(pOH>T`pQX7UKxDETRhxKw1Tz?9gD539q()K$)OiU7!qkqBm bY4(o~$)X*)^JD0900000NkvXXu0mjfbB*gY delta 490 zcmVPx$y-7qtR9J=WSG`WdFc3ZvLs6yvEC?Z$ zy$@h{$==6k=4^SAZkdzEV9#RZ0kTsGAr?p^1Y21+%Q5HVj%26=-_q9S=KFm2-N^y? z>$vC(M(f>aDx&iBf#eDbh}OH)@_Gr2+qBSpG^7Yp0DqF--`$KRM?5~gkRmQa zf8d;4M;fv!1|8|ay`kp?1%%)dn$kd`axkUo2$JARvROwO5|!KU`@`18inIn(8ZgR$ zjhu|dK+-_hspLN!;_4?e6 zCiOk=_WlXS=Ocd-`f!aEs;z5MPW?p!u%2i#f8u3T+{q57{s6xyftv+t68ifPp%REj zF-|yl?D_(SJmN!?0Ut<6na;-~8Sp`6K??RHbSGX`#bX^4QgQclv;eHDYq~_`mVk Date: Sat, 24 Aug 2024 12:37:30 +0300 Subject: [PATCH 031/223] Make holding down an arrow key traverse the pointer in chat (#31380) * Make holding down an arrow key traverse the pointer in chat * Better way --- Resources/keybinds.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 43deb8d89b8..3b8158b7c7a 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -499,15 +499,19 @@ binds: - function: ArcadeUp type: State key: Up + priority: -1 - function: ArcadeDown type: State key: Down + priority: -1 - function: ArcadeLeft type: State key: Left + priority: -1 - function: ArcadeRight type: State key: Right + priority: -1 - function: Arcade1 type: State key: Space From 06bf0ca25009b123a6bc747aa5fb964da30c50f2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 24 Aug 2024 09:38:38 +0000 Subject: [PATCH 032/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b27335118f3..8edf9daa3cd 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - message: Fix some loadout groups not getting validated properly. - type: Fix - id: 6698 - time: '2024-06-08T10:03:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28731 - author: ElectroJr changes: - message: Fixed RGB lights & eswords sometimes not working and showing up as black. @@ -3871,3 +3864,10 @@ id: 7197 time: '2024-08-24T02:09:36.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31113 +- author: Winkarst-cpu + changes: + - message: Now you can move the pointer in chat by holding down the arrow keys. + type: Fix + id: 7198 + time: '2024-08-24T09:37:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31380 From 1f623ae432d6fe05932c86460fa822235a91754c Mon Sep 17 00:00:00 2001 From: erohrs2 <157842463+erohrs2@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:56:44 -0500 Subject: [PATCH 033/223] ID Change to Dinnerware Vending Machine (#31225) Dinnerware Vending Machine access changed from Service to Kitchen Co-authored-by: Preston Smith <92108534+thetolbean@users.noreply.github.com> --- .../Entities/Structures/Machines/vending_machines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 3e931aeb330..87a673609b2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -680,7 +680,7 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AccessReader - access: [["Service"]] + access: [["Kitchen"]] - type: PointLight radius: 1.5 energy: 1.6 From 938af4dd501f0e1186c01b6c2a92acb971b15768 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 24 Aug 2024 15:57:50 +0000 Subject: [PATCH 034/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8edf9daa3cd..783263eca3f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ElectroJr - changes: - - message: Fixed RGB lights & eswords sometimes not working and showing up as black. - type: Fix - id: 6699 - time: '2024-06-08T10:27:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28741 - author: Whisper, DrSmugleaf changes: - message: Players can now add ' to their character names. Please ensure your character @@ -3871,3 +3864,10 @@ id: 7198 time: '2024-08-24T09:37:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31380 +- author: erohrs2 + changes: + - message: Dinnerware Vending Machine access changed from "Service" to "Kitchen". + type: Tweak + id: 7199 + time: '2024-08-24T15:56:44.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31225 From 6538687bece1f90a59dcfd2f3ac2214b8689a406 Mon Sep 17 00:00:00 2001 From: Adeinitas <147965189+adeinitas@users.noreply.github.com> Date: Sat, 24 Aug 2024 18:03:02 -0300 Subject: [PATCH 035/223] Line 44, story-generation.ftl: "chrisp" is spelled as "crisp" (#31401) chrisp is spelled as crisp --- Resources/Locale/en-US/paper/story-generation.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/paper/story-generation.ftl b/Resources/Locale/en-US/paper/story-generation.ftl index f33280baa99..98a9c9d0360 100644 --- a/Resources/Locale/en-US/paper/story-generation.ftl +++ b/Resources/Locale/en-US/paper/story-generation.ftl @@ -45,7 +45,7 @@ story-gen-book-appearance16= dirty story-gen-book-appearance17= elegant story-gen-book-appearance18= ornate story-gen-book-appearance19= weathered -story-gen-book-appearance20= chrisp +story-gen-book-appearance20= crisp story-gen-book-appearance21= lavish story-gen-book-appearance22= tattered story-gen-book-appearance23= polished From 2d05be37402e607eafb25278c31576d30178d526 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Thu, 22 Aug 2024 16:38:58 +0100 Subject: [PATCH 036/223] Make component fields datafields --- .../Monitor/Components/AirAlarmComponent.cs | 4 +-- .../Trinary/Components/GasFilterComponent.cs | 28 ++++++++----------- .../Components/GasVentScrubberComponent.cs | 20 ++++++------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs index 93f704fe21b..643b0ce7823 100644 --- a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs @@ -11,8 +11,8 @@ namespace Content.Server.Atmos.Monitor.Components; [RegisterComponent] public sealed partial class AirAlarmComponent : Component { - [ViewVariables] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering; - [ViewVariables] public bool AutoMode { get; set; } = true; + [DataField] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering; + [DataField] public bool AutoMode { get; set; } = true; // Remember to null this afterwards. [ViewVariables] public IAirAlarmModeUpdate? CurrentModeUpdater { get; set; } diff --git a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs index eac8dc83123..4400387dc8a 100644 --- a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs +++ b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs @@ -5,31 +5,25 @@ namespace Content.Server.Atmos.Piping.Trinary.Components [RegisterComponent] public sealed partial class GasFilterComponent : Component { - [ViewVariables(VVAccess.ReadWrite)] - [DataField("enabled")] - public bool Enabled { get; set; } = true; + [DataField] + public bool Enabled = true; - [ViewVariables(VVAccess.ReadWrite)] [DataField("inlet")] - public string InletName { get; set; } = "inlet"; + public string InletName = "inlet"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("filter")] - public string FilterName { get; set; } = "filter"; + public string FilterName = "filter"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("outlet")] - public string OutletName { get; set; } = "outlet"; + public string OutletName = "outlet"; - [ViewVariables(VVAccess.ReadWrite)] + [DataField] + public float TransferRate = Atmospherics.MaxTransferRate; - [DataField("transferRate")] - public float TransferRate { get; set; } = Atmospherics.MaxTransferRate; + [DataField] + public float MaxTransferRate = Atmospherics.MaxTransferRate; - [DataField("maxTransferRate")] - public float MaxTransferRate { get; set; } = Atmospherics.MaxTransferRate; - - [ViewVariables(VVAccess.ReadWrite)] - public Gas? FilteredGas { get; set; } + [DataField] + public Gas? FilteredGas; } } diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs index 33168d9db9c..b2143283f73 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs @@ -9,26 +9,25 @@ namespace Content.Server.Atmos.Piping.Unary.Components [Access(typeof(GasVentScrubberSystem))] public sealed partial class GasVentScrubberComponent : Component { - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public bool Enabled { get; set; } = false; - [ViewVariables] + [DataField] public bool IsDirty { get; set; } = false; - [ViewVariables(VVAccess.ReadWrite)] [DataField("outlet")] public string OutletName { get; set; } = "pipe"; - [ViewVariables] - public readonly HashSet FilterGases = new(GasVentScrubberData.DefaultFilterGases); + [DataField] + public HashSet FilterGases = new(GasVentScrubberData.DefaultFilterGases); - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public ScrubberPumpDirection PumpDirection { get; set; } = ScrubberPumpDirection.Scrubbing; /// /// Target volume to transfer. If is enabled, actual transfer rate will be much higher. /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public float TransferRate { get => _transferRate; @@ -37,18 +36,17 @@ public float TransferRate private float _transferRate = Atmospherics.MaxTransferRate; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("maxTransferRate")] + [DataField] public float MaxTransferRate = Atmospherics.MaxTransferRate; /// /// As pressure difference approaches this number, the effective volume rate may be smaller than /// - [DataField("maxPressure")] + [DataField] public float MaxPressure = Atmospherics.MaxOutputPressure; - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public bool WideNet { get; set; } = false; public GasVentScrubberData ToAirAlarmData() From 608a179626aec4bbebe7d708e6d6305c32df22c0 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Thu, 22 Aug 2024 16:38:21 +0100 Subject: [PATCH 037/223] Add Vox atmosphere marker, vents, and air alarms --- .../AtmosphereSystem.Commands.cs | 5 +- .../Prototypes/Atmospherics/thresholds.yml | 14 ++++++ .../Entities/Markers/atmos_blocker.yml | 9 ++++ .../Structures/Specific/Atmospherics/vox.yml | 50 +++++++++++++++++++ 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Structures/Specific/Atmospherics/vox.yml diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs index 5a41a7567b2..b790493c448 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs @@ -36,7 +36,7 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar return; } - var mixtures = new GasMixture[7]; + var mixtures = new GasMixture[8]; for (var i = 0; i < mixtures.Length; i++) mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C }; @@ -65,6 +65,9 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar mixtures[6].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard); mixtures[6].Temperature = 235f; // Little colder than an actual freezer but gives a grace period to get e.g. themomachines set up, should keep warm for a few door openings + // 7: Nitrogen (101kpa) for vox rooms + mixtures[7].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellStandard); + foreach (var arg in args) { if (!NetEntity.TryParse(arg, out var netEntity) || !TryGetEntity(netEntity, out var euid)) diff --git a/Resources/Prototypes/Atmospherics/thresholds.yml b/Resources/Prototypes/Atmospherics/thresholds.yml index 5d8eebd5220..260fadbe713 100644 --- a/Resources/Prototypes/Atmospherics/thresholds.yml +++ b/Resources/Prototypes/Atmospherics/thresholds.yml @@ -89,3 +89,17 @@ id: danger # just any gas you don't want at all upperBound: !type:AlarmThresholdSetting threshold: 0.0001 + +- type: alarmThreshold + id: voxOxygen + upperBound: !type:AlarmThresholdSetting + threshold: 0.02 # 2% + upperWarnAround: !type:AlarmThresholdSetting + threshold: 0.5 # 1% + +- type: alarmThreshold + id: voxNitrogen + lowerBound: !type:AlarmThresholdSetting + threshold: 0.8 # danger below 80% nitrogen + lowerWarnAround: !type:AlarmThresholdSetting + threshold: 1.125 # warning below 90% diff --git a/Resources/Prototypes/Entities/Markers/atmos_blocker.yml b/Resources/Prototypes/Entities/Markers/atmos_blocker.yml index a5e91e6e536..011e49696e4 100644 --- a/Resources/Prototypes/Entities/Markers/atmos_blocker.yml +++ b/Resources/Prototypes/Entities/Markers/atmos_blocker.yml @@ -99,3 +99,12 @@ state: freeze - type: AtmosFixMarker mode: 6 + +- type: entity + parent: AtmosFixNitrogenMarker + id: AtmosFixVoxMarker + suffix: Vox Atmosphere + description: "Nitrogen @ 101 kPa, 20C" + components: + - type: AtmosFixMarker + mode: 7 diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/vox.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/vox.yml new file mode 100644 index 00000000000..a13d3760429 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/vox.yml @@ -0,0 +1,50 @@ +- type: entity + abstract: true + parent: AirSensorBase + id: AirSensorVoxBase + suffix: Vox Atmosphere + components: + - type: AtmosMonitor + gasThresholdPrototypes: + Oxygen: voxOxygen + Nitrogen: voxNitrogen + CarbonDioxide: stationCO2 + Plasma: stationPlasma + Tritium: stationTritium + WaterVapor: stationWaterVapor + Ammonia: stationAmmonia + NitrousOxide: stationNO + Frezon: danger + +- type: entity + parent: [AirSensorVoxBase, AirSensor] + id: AirSensorVox + +- type: entity + parent: [AirSensorVoxBase, GasVentPump] + id: GasVentPumpVox + +- type: entity + parent: [AirSensorVoxBase, GasVentScrubber] + id: GasVentScrubberVox + components: + - type: GasVentScrubber + wideNet: true # Air alarm with auto mode overrides filters with hardcoded defaults so default to widenet + filterGases: + - Oxygen # filter out oxygen as well as regular harmful gases + - CarbonDioxide + - Plasma + - Tritium + - WaterVapor + - Ammonia + - NitrousOxide + - Frezon + +# use this to prevent overriding filters with hardcoded defaults +- type: entity + parent: AirAlarm + id: AirAlarmVox + suffix: Vox Atmosphere, auto mode disabled + components: + - type: AirAlarm + autoMode: false From fedb7c8594a8147512bedbc10da9b165d614daf0 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sat, 24 Aug 2024 23:22:19 +0200 Subject: [PATCH 038/223] "LV" is an acronym (#31402) --- SpaceStation14.sln.DotSettings | 1 + 1 file changed, 1 insertion(+) diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings index 800617c0fd7..fe8e82b3bda 100644 --- a/SpaceStation14.sln.DotSettings +++ b/SpaceStation14.sln.DotSettings @@ -65,6 +65,7 @@ IL IP KHR + LV MMI MS MV From 4a335b14ed129b239f245df814912490634cb667 Mon Sep 17 00:00:00 2001 From: DevilishMilk Date: Sat, 24 Aug 2024 19:30:32 -0400 Subject: [PATCH 039/223] Moths can now eat all bandanas (#31405) * Update bandanas.yml * Update bandanas.yml * Re-add ClothMade to botany bandana --- Resources/Prototypes/Entities/Clothing/Head/bandanas.yml | 1 + Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index 007cba3f220..a813e862be4 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml @@ -27,6 +27,7 @@ - type: Tag tags: - Bandana + - ClothMade - type: entity parent: [ClothingHeadBandBase, ClothingMaskBandBlack] diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml index bb5d6f2d2fd..0f519fdcf8a 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml @@ -29,6 +29,7 @@ - type: Tag tags: - Bandana + - ClothMade - type: HideLayerClothing slots: - Snout @@ -68,8 +69,8 @@ sprite: Clothing/Head/Bandanas/botany.rsi - type: Tag tags: - - ClothMade - WhitelistChameleon + - ClothMade - type: entity parent: ClothingMaskBandanaBase From 303fa07e2a9c7ee9890521813f77523f08a6046b Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 24 Aug 2024 23:31:39 +0000 Subject: [PATCH 040/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 783263eca3f..e24e23a86dc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Whisper, DrSmugleaf - changes: - - message: Players can now add ' to their character names. Please ensure your character - names still follow server naming conventions. - type: Add - id: 6700 - time: '2024-06-08T10:37:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28652 - author: EmoGarbage404 changes: - message: Fixed singularity decay being underpowered, leading to continuous growth @@ -3871,3 +3863,10 @@ id: 7199 time: '2024-08-24T15:56:44.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31225 +- author: DevilishMilk + changes: + - message: Moths and mothroaches are now able to eat bandanas. + type: Tweak + id: 7200 + time: '2024-08-24T23:30:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31405 From 1ef67e023b0bd8ce9361de36b9840d5b81f39744 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 25 Aug 2024 11:54:40 +1000 Subject: [PATCH 041/223] Update Credits (#31409) Co-authored-by: PJBot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index cb735f4f679..4a6fe75e499 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, BombasterDS, brainfood1183, Brandon-Huu, Bright0, brndd, BYONDFuckery, c4llv07e, CaasGit, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, dffdff2423, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, Ian321, icekot8, IgorAnt028, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, marboww, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, MerrytheManokit, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, MureixloI, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, NakataRin, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, Spessmann, SphiraI, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem +0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, beck-thompson, BGare, bhenrich, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, BombasterDS, brainfood1183, Brandon-Huu, Bright0, brndd, c4llv07e, CaasGit, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, dffdff2423, DieselMohawk, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, Ian321, icekot8, IgorAnt028, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, Magicalus, MagnusCrowe, ManelNavola, Mangohydra, marboww, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, MerrytheManokit, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, MureixloI, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, NakataRin, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, SaphireLattice, Sarahon, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, Spessmann, SphiraI, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, thetolbean, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Unkn0wnGh0st333, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem From 059c84c2cf2cea141af67c9e347dcaadecfbc2b5 Mon Sep 17 00:00:00 2001 From: Mervill Date: Sat, 24 Aug 2024 18:55:02 -0700 Subject: [PATCH 042/223] Replace obsolete code in GasPortableSystem (#31407) --- .../Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs index 7cb8102a388..b6271c22d4c 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs @@ -15,6 +15,7 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems [UsedImplicitly] public sealed class GasPortableSystem : EntitySystem { + [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; @@ -33,7 +34,7 @@ private void OnPortableAnchorAttempt(EntityUid uid, GasPortableComponent compone return; // If we can't find any ports, cancel the anchoring. - if(!FindGasPortIn(transform.GridUid, transform.Coordinates, out _)) + if (!FindGasPortIn(transform.GridUid, transform.Coordinates, out _)) args.Cancel(); } @@ -57,7 +58,7 @@ public bool FindGasPortIn(EntityUid? gridId, EntityCoordinates coordinates, [Not if (!TryComp(gridId, out var grid)) return false; - foreach (var entityUid in grid.GetLocal(coordinates)) + foreach (var entityUid in _mapSystem.GetLocal(gridId.Value, grid, coordinates)) { if (EntityManager.TryGetComponent(entityUid, out port)) { From c1aee02c7439daec2e2b302cd4023acd17a80a1d Mon Sep 17 00:00:00 2001 From: PursuitInAshes Date: Sat, 24 Aug 2024 18:55:31 -0700 Subject: [PATCH 043/223] Change `Resave` Permission Requirement to Host (#31397) ChangePermissionFlagToHost --- Content.Server/Maps/ResaveCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Maps/ResaveCommand.cs b/Content.Server/Maps/ResaveCommand.cs index a966070d3e4..cc4d13ddedf 100644 --- a/Content.Server/Maps/ResaveCommand.cs +++ b/Content.Server/Maps/ResaveCommand.cs @@ -13,7 +13,7 @@ namespace Content.Server.Maps; /// /// Loads every map and resaves it into the data folder. /// -[AdminCommand(AdminFlags.Mapping)] +[AdminCommand(AdminFlags.Host)] public sealed class ResaveCommand : LocalizedCommands { [Dependency] private readonly IEntityManager _entManager = default!; From a1ab4a3dcd89593b411f602a4cd9a3b7887c19d7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 01:56:39 +0000 Subject: [PATCH 044/223] Automatic changelog update --- Resources/Changelog/Admin.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index da87e520e93..bd42b8ee7bd 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -491,5 +491,13 @@ Entries: id: 61 time: '2024-08-23T00:11:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31045 +- author: PursuitInAshes + changes: + - message: The resave command is no longer usable with the mapping permission, instead + it requires host permissions. + type: Tweak + id: 62 + time: '2024-08-25T01:55:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31397 Name: Admin Order: 1 From b0375f115c17564ecec1e58bf6851644fee1b723 Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Sun, 25 Aug 2024 03:01:46 +0100 Subject: [PATCH 045/223] Remove client state from server AirAlarmComponent (#31236) * Remove client state from server AirAlarmComponent Send information for all connected devices, not just the ones for the current tab, as attempting to limit this breaks multiple users viewing the same UI. Fixes #12842 * Send device data as a list, rather than a dictionary --------- Co-authored-by: Eoin Mcloughlin --- .../Monitor/UI/AirAlarmBoundUserInterface.cs | 6 --- .../Atmos/Monitor/UI/AirAlarmWindow.xaml.cs | 8 ---- .../Monitor/Components/AirAlarmComponent.cs | 2 - .../Atmos/Monitor/Systems/AirAlarmSystem.cs | 46 +++++-------------- .../Components/SharedAirAlarmComponent.cs | 30 ++---------- 5 files changed, 17 insertions(+), 75 deletions(-) diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs index 2ae15188355..d9e94e373b4 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs @@ -30,7 +30,6 @@ protected override void Open() _window.AirAlarmModeChanged += OnAirAlarmModeChanged; _window.AutoModeChanged += OnAutoModeChanged; _window.ResyncAllRequested += ResyncAllDevices; - _window.AirAlarmTabChange += OnTabChanged; } private void ResyncAllDevices() @@ -63,11 +62,6 @@ private void OnThresholdChanged(string address, AtmosMonitorThresholdType type, SendMessage(new AirAlarmUpdateAlarmThresholdMessage(address, type, threshold, gas)); } - private void OnTabChanged(AirAlarmTab tab) - { - SendMessage(new AirAlarmTabSetMessage(tab)); - } - protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs index eeec11c7660..e1425ac491b 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs @@ -23,7 +23,6 @@ public sealed partial class AirAlarmWindow : FancyWindow public event Action? AirAlarmModeChanged; public event Action? AutoModeChanged; public event Action? ResyncAllRequested; - public event Action? AirAlarmTabChange; private RichTextLabel _address => CDeviceAddress; private RichTextLabel _deviceTotal => CDeviceTotal; @@ -80,11 +79,6 @@ public AirAlarmWindow() _tabContainer.SetTabTitle(1, Loc.GetString("air-alarm-ui-window-tab-scrubbers")); _tabContainer.SetTabTitle(2, Loc.GetString("air-alarm-ui-window-tab-sensors")); - _tabContainer.OnTabChanged += idx => - { - AirAlarmTabChange!((AirAlarmTab) idx); - }; - _resyncDevices.OnPressed += _ => { _ventDevices.RemoveAllChildren(); @@ -117,8 +111,6 @@ public void UpdateState(AirAlarmUIState state) { UpdateDeviceData(addr, dev); } - - _tabContainer.CurrentTab = (int) state.Tab; } public void UpdateModeSelector(AirAlarmMode mode) diff --git a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs index 643b0ce7823..a4e83594f20 100644 --- a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs @@ -17,8 +17,6 @@ public sealed partial class AirAlarmComponent : Component // Remember to null this afterwards. [ViewVariables] public IAirAlarmModeUpdate? CurrentModeUpdater { get; set; } - [ViewVariables] public AirAlarmTab CurrentTab { get; set; } - public readonly HashSet KnownDevices = new(); public readonly Dictionary VentData = new(); public readonly Dictionary ScrubberData = new(); diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs index f4650861dbc..7212865baaf 100644 --- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs @@ -173,7 +173,6 @@ public override void Initialize() subs.Event(OnUpdateThreshold); subs.Event(OnUpdateDeviceData); subs.Event(OnCopyDeviceData); - subs.Event(OnTabChange); }); } @@ -200,12 +199,6 @@ private void OnDeviceListUpdate(EntityUid uid, AirAlarmComponent component, Devi SyncRegisterAllDevices(uid); } - private void OnTabChange(EntityUid uid, AirAlarmComponent component, AirAlarmTabSetMessage msg) - { - component.CurrentTab = msg.Tab; - UpdateUI(uid, component); - } - private void OnPowerChanged(EntityUid uid, AirAlarmComponent component, ref PowerChangedEvent args) { if (args.Powered) @@ -598,34 +591,19 @@ public void UpdateUI(EntityUid uid, AirAlarmComponent? alarm = null, DeviceNetwo var pressure = CalculatePressureAverage(alarm); var temperature = CalculateTemperatureAverage(alarm); - var dataToSend = new Dictionary(); + var dataToSend = new List<(string, IAtmosDeviceData)>(); - if (alarm.CurrentTab != AirAlarmTab.Settings) + foreach (var (addr, data) in alarm.VentData) { - switch (alarm.CurrentTab) - { - case AirAlarmTab.Vent: - foreach (var (addr, data) in alarm.VentData) - { - dataToSend.Add(addr, data); - } - - break; - case AirAlarmTab.Scrubber: - foreach (var (addr, data) in alarm.ScrubberData) - { - dataToSend.Add(addr, data); - } - - break; - case AirAlarmTab.Sensors: - foreach (var (addr, data) in alarm.SensorData) - { - dataToSend.Add(addr, data); - } - - break; - } + dataToSend.Add((addr, data)); + } + foreach (var (addr, data) in alarm.ScrubberData) + { + dataToSend.Add((addr, data)); + } + foreach (var (addr, data) in alarm.SensorData) + { + dataToSend.Add((addr, data)); } var deviceCount = alarm.KnownDevices.Count; @@ -638,7 +616,7 @@ public void UpdateUI(EntityUid uid, AirAlarmComponent? alarm = null, DeviceNetwo _ui.SetUiState( uid, SharedAirAlarmInterfaceKey.Key, - new AirAlarmUIState(devNet.Address, deviceCount, pressure, temperature, dataToSend, alarm.CurrentMode, alarm.CurrentTab, highestAlarm.Value, alarm.AutoMode)); + new AirAlarmUIState(devNet.Address, deviceCount, pressure, temperature, dataToSend, alarm.CurrentMode, highestAlarm.Value, alarm.AutoMode)); } private const float Delay = 8f; diff --git a/Content.Shared/Atmos/Monitor/Components/SharedAirAlarmComponent.cs b/Content.Shared/Atmos/Monitor/Components/SharedAirAlarmComponent.cs index e40099dc72a..ce3f00094af 100644 --- a/Content.Shared/Atmos/Monitor/Components/SharedAirAlarmComponent.cs +++ b/Content.Shared/Atmos/Monitor/Components/SharedAirAlarmComponent.cs @@ -37,7 +37,7 @@ public interface IAtmosDeviceData [Serializable, NetSerializable] public sealed class AirAlarmUIState : BoundUserInterfaceState { - public AirAlarmUIState(string address, int deviceCount, float pressureAverage, float temperatureAverage, Dictionary deviceData, AirAlarmMode mode, AirAlarmTab tab, AtmosAlarmType alarmType, bool autoMode) + public AirAlarmUIState(string address, int deviceCount, float pressureAverage, float temperatureAverage, List<(string, IAtmosDeviceData)> deviceData, AirAlarmMode mode, AtmosAlarmType alarmType, bool autoMode) { Address = address; DeviceCount = deviceCount; @@ -45,7 +45,6 @@ public AirAlarmUIState(string address, int deviceCount, float pressureAverage, f TemperatureAverage = temperatureAverage; DeviceData = deviceData; Mode = mode; - Tab = tab; AlarmType = alarmType; AutoMode = autoMode; } @@ -57,27 +56,16 @@ public AirAlarmUIState(string address, int deviceCount, float pressureAverage, f /// /// Every single device data that can be seen from this /// air alarm. This includes vents, scrubbers, and sensors. - /// The device data you get, however, depends on the current - /// selected tab. + /// Each entry is a tuple of device address and the device + /// data. The same address may appear multiple times, if + /// that device provides multiple functions. /// - public Dictionary DeviceData { get; } + public List<(string, IAtmosDeviceData)> DeviceData { get; } public AirAlarmMode Mode { get; } - public AirAlarmTab Tab { get; } public AtmosAlarmType AlarmType { get; } public bool AutoMode { get; } } -[Serializable, NetSerializable] -public sealed class AirAlarmTabSetMessage : BoundUserInterfaceMessage -{ - public AirAlarmTabSetMessage(AirAlarmTab tab) - { - Tab = tab; - } - - public AirAlarmTab Tab { get; } -} - [Serializable, NetSerializable] public sealed class AirAlarmResyncAllDevicesMessage : BoundUserInterfaceMessage {} @@ -144,11 +132,3 @@ public AirAlarmUpdateAlarmThresholdMessage(string address, AtmosMonitorThreshold Gas = gas; } } - -public enum AirAlarmTab -{ - Vent, - Scrubber, - Sensors, - Settings -} From d15869f6007b2c772380c023153bfbfd264a328a Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sun, 25 Aug 2024 04:02:33 +0200 Subject: [PATCH 046/223] Fix ChemVend jugs again (#31398) This re-introduces the dummy entity naming code, originally introduced in #29178 and randomly removed by #30064 with no technical justification given. Fixes #31373 --- .../UI/VendingMachineMenu.xaml.cs | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs index efe6ef8e9ab..ee7a0e41fae 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs +++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs @@ -7,6 +7,7 @@ using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow; using Robust.Client.UserInterface; using Content.Client.UserInterface.Controls; +using Content.Shared.IdentityManagement; using Robust.Client.Graphics; namespace Content.Client.VendingMachines.UI @@ -15,6 +16,9 @@ namespace Content.Client.VendingMachines.UI public sealed partial class VendingMachineMenu : FancyWindow { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IEntityManager _entityManager = default!; + + private readonly Dictionary _dummies = []; public event Action? OnItemSelected; @@ -32,6 +36,22 @@ public VendingMachineMenu() VendingContents.ItemKeyBindDown += (args, data) => OnItemSelected?.Invoke(args, data); } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + // Don't clean up dummies during disposal or we'll just have to spawn them again + if (!disposing) + return; + + // Delete any dummy items we spawned + foreach (var entity in _dummies.Values) + { + _entityManager.QueueDeleteEntity(entity); + } + _dummies.Clear(); + } + private bool DataFilterCondition(string filter, ListData data) { if (data is not VendorItemsListData { ItemText: var text }) @@ -91,7 +111,14 @@ public void Populate(List inventory) if (!_prototypeManager.TryIndex(entry.ID, out var prototype)) continue; - var itemText = $"{prototype.Name} [{entry.Amount}]"; + if (!_dummies.TryGetValue(entry.ID, out var dummy)) + { + dummy = _entityManager.Spawn(entry.ID); + _dummies.Add(entry.ID, dummy); + } + + var itemName = Identity.Name(dummy, _entityManager); + var itemText = $"{itemName} [{entry.Amount}]"; if (itemText.Length > longestEntry.Length) longestEntry = itemText; From d7bbb94857d58895b3c3bd818791ec2e1ac7bd6d Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 02:03:40 +0000 Subject: [PATCH 047/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e24e23a86dc..6ace9c9212c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Fixed singularity decay being underpowered, leading to continuous growth - on higher PA strengths. - type: Fix - id: 6701 - time: '2024-06-08T14:36:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28743 - author: metalgearsloth changes: - message: Fix sometimes spawning without bags. @@ -3870,3 +3862,10 @@ id: 7200 time: '2024-08-24T23:30:33.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31405 +- author: PJB3005 + changes: + - message: Fix the ChemVend jug names again + type: Fix + id: 7201 + time: '2024-08-25T02:02:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31398 From 60b34b57f35ab1a1d0851172cdbafdea8f319425 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 14:48:29 +1000 Subject: [PATCH 048/223] Fix dungeon spawn + ftl overlap (#31413) * Fix dungeon spawn + ftl overlap * Better fixes --- .../Procedural/DungeonJob/DungeonJob.cs | 11 ++ Content.Server/Procedural/DungeonSystem.cs | 9 +- .../Systems/ShuttleSystem.FasterThanLight.cs | 124 ++++++++++++------ .../Systems/ShuttleSystem.GridFill.cs | 11 +- 4 files changed, 110 insertions(+), 45 deletions(-) diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.cs index 5a6a8510fff..cdf1f002052 100644 --- a/Content.Server/Procedural/DungeonJob/DungeonJob.cs +++ b/Content.Server/Procedural/DungeonJob/DungeonJob.cs @@ -4,6 +4,7 @@ using Content.Server.NPC.Components; using Content.Server.NPC.HTN; using Content.Server.NPC.Systems; +using Content.Server.Shuttles.Systems; using Content.Shared.Construction.EntitySystems; using Content.Shared.Maps; using Content.Shared.Procedural; @@ -51,6 +52,8 @@ public sealed partial class DungeonJob : Job> private readonly EntityUid _gridUid; private readonly MapGridComponent _grid; + private readonly EntityCoordinates? _targetCoordinates; + private readonly ISawmill _sawmill; public DungeonJob( @@ -70,6 +73,7 @@ public DungeonJob( EntityUid gridUid, int seed, Vector2i position, + EntityCoordinates? targetCoordinates = null, CancellationToken cancellation = default) : base(maxTime, cancellation) { _sawmill = sawmill; @@ -94,6 +98,7 @@ public DungeonJob( _gridUid = gridUid; _seed = seed; _position = position; + _targetCoordinates = targetCoordinates; } /// @@ -151,6 +156,12 @@ private async Task> GetDungeons( // To make it slightly more deterministic treat this RNG as separate ig. // Post-processing after finishing loading. + if (_targetCoordinates != null) + { + var oldMap = _xformQuery.Comp(_gridUid).MapUid; + _entManager.System().TryFTLProximity(_gridUid, _targetCoordinates.Value); + _entManager.DeleteEntity(oldMap); + } // Defer splitting so they don't get spammed and so we don't have to worry about tracking the grid along the way. _grid.CanSplit = true; diff --git a/Content.Server/Procedural/DungeonSystem.cs b/Content.Server/Procedural/DungeonSystem.cs index 68c4a986105..706f63ffd7d 100644 --- a/Content.Server/Procedural/DungeonSystem.cs +++ b/Content.Server/Procedural/DungeonSystem.cs @@ -183,11 +183,16 @@ public MapId GetOrCreateTemplate(DungeonRoomPrototype proto) return mapId; } + /// + /// Generates a dungeon in the background with the specified config. + /// + /// Coordinates to move the dungeon to afterwards. Will delete the original map public void GenerateDungeon(DungeonConfig gen, EntityUid gridUid, MapGridComponent grid, Vector2i position, - int seed) + int seed, + EntityCoordinates? coordinates = null) { var cancelToken = new CancellationTokenSource(); var job = new DungeonJob.DungeonJob( @@ -207,6 +212,7 @@ public void GenerateDungeon(DungeonConfig gen, gridUid, seed, position, + coordinates, cancelToken.Token); _dungeonJobs.Add(job, cancelToken); @@ -238,6 +244,7 @@ public async Task> GenerateDungeonAsync( gridUid, seed, position, + null, cancelToken.Token); _dungeonJobs.Add(job, cancelToken); diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 518867b5558..afe7a7b6db6 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -66,7 +66,7 @@ public sealed partial class ShuttleSystem /// /// How many times we try to proximity warp close to something before falling back to map-wideAABB. /// - private const int FTLProximityIterations = 3; + private const int FTLProximityIterations = 5; private readonly HashSet _lookupEnts = new(); private readonly HashSet _immuneEnts = new(); @@ -321,7 +321,7 @@ public void FTLToDock( hyperspace.TargetCoordinates = config.Coordinates; hyperspace.TargetAngle = config.Angle; } - else if (TryGetFTLProximity(shuttleUid, target, out var coords, out var targAngle)) + else if (TryGetFTLProximity(shuttleUid, new EntityCoordinates(target, Vector2.Zero), out var coords, out var targAngle)) { hyperspace.TargetCoordinates = coords; hyperspace.TargetAngle = targAngle; @@ -377,10 +377,11 @@ private void UpdateFTLStarting(Entity entity) var fromMatrix = _transform.GetWorldMatrix(xform); var fromRotation = _transform.GetWorldRotation(xform); - var width = Comp(uid).LocalAABB.Width; + var grid = Comp(uid); + var width = grid.LocalAABB.Width; var ftlMap = EnsureFTLMap(); var body = _physicsQuery.GetComponent(entity); - var shuttleCenter = body.LocalCenter; + var shuttleCenter = grid.LocalAABB.Center; // Leave audio at the old spot // Just so we don't clip @@ -500,6 +501,7 @@ private void UpdateFTLArriving(Entity entity) // Position ftl else { + // TODO: This should now use tryftlproximity mapId = target.GetMapId(EntityManager); _transform.SetCoordinates(uid, xform, target, rotation: entity.Comp1.TargetAngle); } @@ -698,16 +700,23 @@ public void FTLDock(Entity shuttle, DockingConfig config) } /// - /// Tries to get the target position to FTL near to another grid. + /// Tries to get the target position to FTL near the target coordinates. + /// If the target coordinates have a mapgrid then will try to offset the AABB. /// - private bool TryGetFTLProximity(EntityUid shuttleUid, EntityUid targetUid, + /// Min offset for the final FTL. + /// Max offset for the final FTL from the box we spawn. + private bool TryGetFTLProximity( + EntityUid shuttleUid, + EntityCoordinates targetCoordinates, out EntityCoordinates coordinates, out Angle angle, + float minOffset = 0f, float maxOffset = 64f, TransformComponent? xform = null, TransformComponent? targetXform = null) { + DebugTools.Assert(minOffset < maxOffset); coordinates = EntityCoordinates.Invalid; angle = Angle.Zero; - if (!Resolve(targetUid, ref targetXform) || + if (!Resolve(targetCoordinates.EntityId, ref targetXform) || targetXform.MapUid == null || !targetXform.MapUid.Value.IsValid() || !Resolve(shuttleUid, ref xform)) @@ -715,26 +724,24 @@ private bool TryGetFTLProximity(EntityUid shuttleUid, EntityUid targetUid, return false; } - - var xformQuery = GetEntityQuery(); - var shuttleAABB = Comp(shuttleUid).LocalAABB; - Box2 targetLocalAABB; - - // Spawn nearby. // We essentially expand the Box2 of the target area until nothing else is added then we know it's valid. // Can't just get an AABB of every grid as we may spawn very far away. - if (TryComp(targetXform.GridUid, out var targetGrid)) - { - targetLocalAABB = targetGrid.LocalAABB; - } - else - { - targetLocalAABB = new Box2(); - } - - var targetAABB = _transform.GetWorldMatrix(targetXform, xformQuery) - .TransformBox(targetLocalAABB).Enlarged(shuttleAABB.Size.Length()); var nearbyGrids = new HashSet(); + var shuttleAABB = Comp(shuttleUid).LocalAABB; + + // Start with small point. + // If our target pos is offset we mot even intersect our target's AABB so we don't include it. + var targetLocalAABB = Box2.CenteredAround(targetCoordinates.Position, Vector2.One); + + // How much we expand the target AABB be. + // We half it because we only need the width / height in each direction if it's placed at a particular spot. + var expansionAmount = MathF.Max(shuttleAABB.Width / 2f, shuttleAABB.Height / 2f); + + // Expand the starter AABB so we have something to query to start with. + var targetAABB = _transform.GetWorldMatrix(targetXform) + .TransformBox(targetLocalAABB) + .Enlarged(expansionAmount); + var iteration = 0; var lastCount = nearbyGrids.Count; var mapId = targetXform.MapID; @@ -743,15 +750,21 @@ private bool TryGetFTLProximity(EntityUid shuttleUid, EntityUid targetUid, while (iteration < FTLProximityIterations) { grids.Clear(); - _mapManager.FindGridsIntersecting(mapId, targetAABB, ref grids); + // We pass in an expanded offset here so we can safely do a random offset later. + // We don't include this in the actual targetAABB because then we would be double-expanding it. + // Once in this loop, then again when placing the shuttle later. + // Note that targetAABB already has expansionAmount factored in already. + _mapManager.FindGridsIntersecting(mapId, targetAABB.Enlarged(maxOffset), ref grids); foreach (var grid in grids) { if (!nearbyGrids.Add(grid)) continue; - targetAABB = targetAABB.Union(_transform.GetWorldMatrix(grid, xformQuery) - .TransformBox(Comp(grid).LocalAABB)); + // Include the other grid's AABB (expanded by ours) as well. + targetAABB = targetAABB.Union( + _transform.GetWorldMatrix(grid) + .TransformBox(Comp(grid).LocalAABB.Enlarged(expansionAmount))); } // Can do proximity @@ -760,7 +773,6 @@ private bool TryGetFTLProximity(EntityUid shuttleUid, EntityUid targetUid, break; } - targetAABB = targetAABB.Enlarged(shuttleAABB.Size.Length() / 2f); iteration++; lastCount = nearbyGrids.Count; @@ -775,13 +787,15 @@ private bool TryGetFTLProximity(EntityUid shuttleUid, EntityUid targetUid, if (nearbyGrids.Contains(uid)) continue; - targetAABB = targetAABB.Union(_transform.GetWorldMatrix(uid, xformQuery) - .TransformBox(Comp(uid).LocalAABB)); + targetAABB = targetAABB.Union( + _transform.GetWorldMatrix(uid) + .TransformBox(Comp(uid).LocalAABB.Enlarged(expansionAmount))); } break; } + // Now we have a targetAABB. This has already been expanded to account for our fat ass. Vector2 spawnPos; if (TryComp(shuttleUid, out var shuttleBody)) @@ -790,21 +804,32 @@ private bool TryGetFTLProximity(EntityUid shuttleUid, EntityUid targetUid, _physics.SetAngularVelocity(shuttleUid, 0f, body: shuttleBody); } + // TODO: This should prefer the position's angle instead. // TODO: This is pretty crude for multiple landings. if (nearbyGrids.Count > 1 || !HasComp(targetXform.GridUid)) { - var minRadius = (MathF.Max(targetAABB.Width, targetAABB.Height) + MathF.Max(shuttleAABB.Width, shuttleAABB.Height)) / 2f; - spawnPos = targetAABB.Center + _random.NextVector2(minRadius, minRadius + 64f); + // Pick a random angle + var offsetAngle = _random.NextAngle(); + + // Our valid spawn positions are away. + var minRadius = MathF.Max(targetAABB.Width / 2f, targetAABB.Height / 2f); + spawnPos = targetAABB.Center + offsetAngle.RotateVec(new Vector2(_random.NextFloat(minRadius + minOffset, minRadius + maxOffset), 0f)); } else if (shuttleBody != null) { - var (targetPos, targetRot) = _transform.GetWorldPositionRotation(targetXform, xformQuery); - var transform = new Transform(targetPos, targetRot); - spawnPos = Robust.Shared.Physics.Transform.Mul(transform, -shuttleBody.LocalCenter); + (spawnPos, angle) = _transform.GetWorldPositionRotation(targetXform); } else { - spawnPos = _transform.GetWorldPosition(targetXform, xformQuery); + spawnPos = _transform.GetWorldPosition(targetXform); + } + + var offset = Vector2.Zero; + + // Offset it because transform does not correspond to AABB position. + if (TryComp(shuttleUid, out MapGridComponent? shuttleGrid)) + { + offset = -shuttleGrid.LocalAABB.Center; } if (!HasComp(targetXform.GridUid)) @@ -816,7 +841,11 @@ private bool TryGetFTLProximity(EntityUid shuttleUid, EntityUid targetUid, angle = Angle.Zero; } - coordinates = new EntityCoordinates(targetXform.MapUid.Value, spawnPos); + // Rotate our localcenter around so we spawn exactly where we "think" we should (center of grid on the dot). + var transform = new Transform(spawnPos, angle); + spawnPos = Robust.Shared.Physics.Transform.Mul(transform, offset); + + coordinates = new EntityCoordinates(targetXform.MapUid.Value, spawnPos - offset); return true; } @@ -833,13 +862,31 @@ public bool TryFTLProximity(EntityUid shuttleUid, EntityUid targetUid, Transform return false; } - if (!TryGetFTLProximity(shuttleUid, targetUid, out var coords, out var angle, xform, targetXform)) + if (!TryGetFTLProximity(shuttleUid, new EntityCoordinates(targetUid, Vector2.Zero), out var coords, out var angle, xform: xform, targetXform: targetXform)) return false; _transform.SetCoordinates(shuttleUid, xform, coords, rotation: angle); return true; } + /// + /// Tries to FTL to the target coordinates; will move nearby if not possible. + /// + public bool TryFTLProximity(Entity shuttle, EntityCoordinates targetCoordinates) + { + if (!Resolve(shuttle.Owner, ref shuttle.Comp) || + _transform.GetMap(targetCoordinates)?.IsValid() != true) + { + return false; + } + + if (!TryGetFTLProximity(shuttle, targetCoordinates, out var coords, out var angle)) + return false; + + _transform.SetCoordinates(shuttle, shuttle.Comp, coords, rotation: angle); + return true; + } + /// /// Flattens / deletes everything under the grid upon FTL. /// @@ -861,7 +908,6 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom var aabb = fixture.Shape.ComputeAABB(transform, 0); // Shift it slightly - aabb = aabb.Translated(-grid.TileSizeHalfVector); // Create a small border around it. aabb = aabb.Enlarged(0.2f); aabbs.Add(aabb); diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs index c0eff119314..4760e92e212 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs @@ -85,7 +85,7 @@ private void CargoSpawn(EntityUid uid, StationCargoShuttleComponent component) _mapManager.DeleteMap(mapId); } - private bool TryDungeonSpawn(Entity targetGrid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned) + private bool TryDungeonSpawn(Entity targetGrid, DungeonSpawnGroup group, out EntityUid spawned) { spawned = EntityUid.Invalid; @@ -110,11 +110,12 @@ private bool TryDungeonSpawn(Entity targetGrid, MapId mapId, spawnCoords = spawnCoords.Offset(_random.NextVector2(distancePadding + group.MinimumDistance, distancePadding + group.MaximumDistance)); } - var spawnMapCoords = _transform.ToMapCoordinates(spawnCoords); + _maps.CreateMap(out var mapId); + var spawnedGrid = _mapManager.CreateGridEntity(mapId); - _transform.SetMapCoordinates(spawnedGrid, spawnMapCoords); - _dungeon.GenerateDungeon(dungeonProto, spawnedGrid.Owner, spawnedGrid.Comp, Vector2i.Zero, _random.Next()); + _transform.SetMapCoordinates(spawnedGrid, new MapCoordinates(Vector2.Zero, mapId)); + _dungeon.GenerateDungeon(dungeonProto, spawnedGrid.Owner, spawnedGrid.Comp, Vector2i.Zero, _random.Next(), spawnCoords); spawned = spawnedGrid.Owner; return true; @@ -192,7 +193,7 @@ private void GridSpawns(EntityUid uid, GridSpawnComponent component) switch (group) { case DungeonSpawnGroup dungeon: - if (!TryDungeonSpawn(targetGrid.Value, mapId, dungeon, out spawned)) + if (!TryDungeonSpawn(targetGrid.Value, dungeon, out spawned)) continue; break; From 759b9e7a449f317fe62f0f4cbcca6b77d97b8356 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 04:49:35 +0000 Subject: [PATCH 049/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 6ace9c9212c..b659a4c5716 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - message: Fix sometimes spawning without bags. - type: Fix - id: 6702 - time: '2024-06-08T18:48:09.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28734 - author: UBlueberry changes: - message: The guidebook has been heavily reorganized to improve convenience for @@ -3869,3 +3862,10 @@ id: 7201 time: '2024-08-25T02:02:34.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31398 +- author: metalgearsloth + changes: + - message: Fix grids sometimes overlapping on roundstart. + type: Fix + id: 7202 + time: '2024-08-25T04:48:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31413 From c46a78b8e35fe8388433a064f2fe61a87339b664 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Sun, 25 Aug 2024 00:57:36 -0400 Subject: [PATCH 050/223] Fix firelockedge rotation (#31371) save --- .../Entities/Structures/Doors/Firelocks/frame.yml | 2 -- .../Recipes/Construction/Graphs/structures/firelock.yml | 6 ++++++ Resources/Prototypes/Recipes/Construction/structures.yml | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml index 3f4306e4aa1..c728d279330 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml @@ -52,5 +52,3 @@ layer: - HighImpassable - MidImpassable - - type: Transform - noRot: true diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml index 74ac16eabd2..6b6d5c4895a 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml @@ -138,6 +138,9 @@ steps: - tool: Anchoring doAfter: 0.25 + completed: + - !type:SnapToGrid + southRotation: true - node: FirelockGlassFrame edges: @@ -168,6 +171,9 @@ steps: - tool: Anchoring doAfter: 1 + completed: + - !type:SnapToGrid + southRotation: true - node: FirelockEdge entity: FirelockEdge diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 2adf8c85023..a273f667405 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -774,6 +774,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter + canRotate: false canBuildInImpassable: false conditions: - !type:TileNotBlocked @@ -791,6 +792,7 @@ state: closed objectType: Structure placementMode: SnapgridCenter + canRotate: false canBuildInImpassable: false conditions: - !type:TileNotBlocked From 647ca1f0bd2918bc1564983ec41e57bf229c9c6c Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 04:58:42 +0000 Subject: [PATCH 051/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b659a4c5716..3db24b501f3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: UBlueberry - changes: - - message: The guidebook has been heavily reorganized to improve convenience for - all types of users. - type: Tweak - id: 6703 - time: '2024-06-08T23:00:44.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28603 - author: Psychpsyo changes: - message: New lobby background art! @@ -3869,3 +3861,10 @@ id: 7202 time: '2024-08-25T04:48:29.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31413 +- author: themias + changes: + - message: Thin firelocks now respect rotation when built + type: Fix + id: 7203 + time: '2024-08-25T04:57:37.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31371 From 3b0d7e7aad5d32b9c29cc968f04ed4974b39698c Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Sun, 25 Aug 2024 01:42:19 -0400 Subject: [PATCH 052/223] Update Oasis (#31415) * Cameras and junk * I forgot to clear my multitool --- Resources/Maps/oasis.yml | 2226 +++++++++++++++++++++++++++++--------- 1 file changed, 1720 insertions(+), 506 deletions(-) diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index 0406aa27ef2..29d779c582a 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -174,7 +174,7 @@ entities: version: 6 2,-3: ind: 2,-3 - tiles: gQAAAAAAbwAAAAAAKQAAAAADKQAAAAADbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAKQAAAAACbwAAAAAAKQAAAAADKQAAAAADbwAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAKQAAAAABKQAAAAADgQAAAAAAKQAAAAADKQAAAAACKQAAAAADKQAAAAACKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAKQAAAAACKQAAAAABIQAAAAAAKQAAAAADKQAAAAAAKQAAAAAAKQAAAAADKQAAAAACgQAAAAAAgQAAAAAAJAAAAAAAgQAAAAAAdwAAAAAAYAAAAAADYAAAAAADgQAAAAAAKQAAAAAAKQAAAAAAgQAAAAAAKQAAAAABJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAADgQAAAAAAKQAAAAADKQAAAAABKQAAAAADdwAAAAADYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAACKQAAAAADKQAAAAAAgQAAAAAAKQAAAAAAKQAAAAACKQAAAAACdwAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAIQAAAAACgQAAAAAAgQAAAAAAKQAAAAACKQAAAAABKQAAAAACKQAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAACKQAAAAADIQAAAAABKQAAAAACKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAABKQAAAAADKQAAAAACgQAAAAAAKQAAAAACKQAAAAAAKQAAAAADKQAAAAABKQAAAAADKQAAAAADKQAAAAABKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAADgQAAAAAAgQAAAAAAJAAAAAADgQAAAAAAKQAAAAADKQAAAAAAKQAAAAAAKQAAAAACKQAAAAAAKQAAAAACKQAAAAACIQAAAAAAKQAAAAABKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABgQAAAAAAbwAAAAAAbwAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAACKQAAAAAAKQAAAAADKQAAAAACKQAAAAACKQAAAAADKQAAAAABKQAAAAACKQAAAAABKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: gQAAAAAAbwAAAAAAKQAAAAADKQAAAAADbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAKQAAAAACbwAAAAAAKQAAAAADKQAAAAADbwAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAKQAAAAABKQAAAAADgQAAAAAAKQAAAAADKQAAAAACKQAAAAADKQAAAAACKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAKQAAAAACKQAAAAABIQAAAAAAKQAAAAADKQAAAAAAKQAAAAAAKQAAAAADKQAAAAACgQAAAAAAgQAAAAAAJAAAAAAAgQAAAAAAdwAAAAAAYAAAAAADYAAAAAADgQAAAAAAKQAAAAAAKQAAAAAAgQAAAAAAKQAAAAABJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAADgQAAAAAAKQAAAAADKQAAAAABKQAAAAADdwAAAAADYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAACKQAAAAADKQAAAAAAgQAAAAAAKQAAAAAAKQAAAAACKQAAAAACdwAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAIQAAAAACgQAAAAAAgQAAAAAAKQAAAAACKQAAAAABKQAAAAACKQAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAACKQAAAAADIQAAAAABKQAAAAACKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAABKQAAAAADKQAAAAACgQAAAAAAKQAAAAACKQAAAAAAKQAAAAADKQAAAAABKQAAAAADKQAAAAADKQAAAAABKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAADgQAAAAAAgQAAAAAAJAAAAAADgQAAAAAAKQAAAAADKQAAAAAAKQAAAAAAKQAAAAACKQAAAAAAKQAAAAACKQAAAAACIQAAAAAAKQAAAAABKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABgQAAAAAAbwAAAAAAbwAAAAAAKQAAAAADKQAAAAACKQAAAAAAKQAAAAACKQAAAAAAKQAAAAADKQAAAAACKQAAAAACKQAAAAADKQAAAAABKQAAAAACKQAAAAABKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 2,-1: ind: 2,-1 @@ -202,11 +202,11 @@ entities: version: 6 -3,0: ind: -3,0 - tiles: YAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAABgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAKQAAAAABKQAAAAABgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: YAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAABgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAKQAAAAABKQAAAAABgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -3,1: ind: -3,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 0,-4: ind: 0,-4 @@ -6668,7 +6668,7 @@ entities: -8,-8: 0: 65327 -8,-9: - 0: 62207 + 0: 62079 -9,-8: 0: 43071 -8,-7: @@ -6688,7 +6688,7 @@ entities: -7,-6: 0: 57583 -7,-9: - 0: 61679 + 0: 61695 -6,-8: 0: 65039 -6,-7: @@ -6781,13 +6781,13 @@ entities: 4,-10: 0: 16383 -8,-12: - 0: 30591 + 0: 30583 -9,-12: 0: 2039 -8,-11: 0: 28791 -8,-10: - 0: 61559 + 0: 28791 -9,-11: 0: 61559 -9,-10: @@ -6799,7 +6799,7 @@ entities: -7,-11: 0: 65295 -7,-10: - 0: 57599 + 0: 61695 -7,-13: 0: 65287 -6,-12: @@ -6893,7 +6893,7 @@ entities: 9,-13: 0: 4369 10,-12: - 0: 14560 + 0: 7904 10,-11: 0: 65295 10,-10: @@ -7021,7 +7021,7 @@ entities: 0: 65427 -13,-12: 0: 56524 - 6: 17 + 7: 17 -12,-11: 0: 60931 -13,-11: @@ -7034,20 +7034,22 @@ entities: 0: 30583 -12,-8: 0: 4087 + -11,-10: + 0: 61167 + -11,-9: + 0: 65534 -11,-12: 0: 61166 -11,-11: 0: 61166 - -11,-10: - 0: 3808 - -11,-9: - 0: 1636 + -11,-8: + 0: 61438 -10,-12: 0: 32767 -10,-11: 0: 30583 -10,-10: - 0: 26222 + 0: 30590 -10,-9: 0: 61158 -10,-8: @@ -7064,8 +7066,6 @@ entities: 0: 119 -13,-5: 0: 58982 - -11,-8: - 0: 61424 -11,-7: 0: 61422 -11,-5: @@ -7129,23 +7129,22 @@ entities: 3: 34952 -11,2: 3: 255 - 1: 57344 + 4: 57344 -12,4: 3: 53192 -11,3: 3: 61440 - 4: 224 + 5: 224 -10,1: 0: 40847 -10,2: - 3: 8755 - 0: 34952 + 3: 51 + 0: 43656 -10,3: - 3: 12834 - 0: 34952 + 3: 12288 + 0: 35498 -10,4: - 3: 8738 - 0: 34952 + 0: 43690 -13,4: 3: 32630 -12,7: @@ -7158,27 +7157,26 @@ entities: 3: 34952 -11,6: 3: 61440 - 6: 224 + 7: 224 -11,7: 3: 65535 -12,8: 3: 34952 -11,4: - 5: 224 - 6: 57344 + 6: 224 + 7: 57344 -11,5: - 6: 57568 + 7: 57568 -11,8: 3: 65535 -10,6: - 3: 12834 - 0: 34952 + 3: 12288 + 0: 35498 -10,7: 3: 13107 0: 34952 -10,5: - 3: 8738 - 0: 34952 + 0: 43690 -10,8: 3: 62259 0: 136 @@ -7245,7 +7243,7 @@ entities: -2,-14: 0: 65520 -9,-15: - 6: 2048 + 7: 2048 -8,-14: 0: 4080 -9,-14: @@ -7255,11 +7253,11 @@ entities: -9,-13: 0: 4095 -7,-15: - 6: 61184 + 7: 61184 -7,-14: 0: 32752 -6,-15: - 6: 256 + 7: 256 0: 32768 -6,-14: 0: 65528 @@ -7268,31 +7266,31 @@ entities: -13,-16: 3: 65520 -12,-15: - 6: 53128 + 7: 53128 -12,-14: 0: 30483 - 6: 4 + 7: 4 -13,-14: 0: 52232 3: 23 -11,-16: - 6: 4352 + 7: 4352 -11,-15: - 6: 65425 + 7: 65425 -11,-14: 0: 65520 -11,-13: 0: 831 -10,-15: - 6: 14327 + 7: 14327 -10,-14: 0: 16304 -10,-13: 0: 2187 -10,-16: - 6: 8704 + 7: 8704 -10,-17: - 6: 49152 + 7: 49152 -16,-7: 3: 52416 -16,-6: @@ -7317,7 +7315,7 @@ entities: 0: 52416 -15,-9: 0: 34952 - 6: 256 + 7: 256 -14,-8: 0: 49080 -14,-7: @@ -7337,31 +7335,31 @@ entities: -13,-7: 0: 26214 -16,-12: - 6: 32 + 7: 32 -16,-11: - 6: 32768 + 7: 32768 -16,-10: - 6: 8 + 7: 8 -15,-11: - 6: 13036 + 7: 13036 0: 32768 -15,-10: - 6: 307 + 7: 307 0: 34952 -15,-12: - 6: 51336 + 7: 51336 -14,-12: - 6: 4607 + 7: 4607 0: 49152 -14,-11: - 6: 17 + 7: 17 0: 61644 -14,-10: 0: 65535 -14,-13: - 6: 59392 + 7: 59392 -13,-13: - 6: 4352 + 7: 4352 0: 1604 8,9: 0: 65535 @@ -7390,7 +7388,7 @@ entities: 10,10: 0: 3549 10,11: - 6: 275 + 7: 275 10,12: 0: 305 3: 3276 @@ -7570,9 +7568,9 @@ entities: 14,-9: 0: 36623 15,-8: - 6: 16 + 7: 16 15,-6: - 6: 16 + 7: 16 0: 4096 3: 32768 15,-9: @@ -7580,16 +7578,16 @@ entities: 16,-5: 3: 304 12,-11: - 6: 49156 + 7: 49156 12,-12: 3: 12 12,-13: 3: 52303 13,-12: 3: 15 - 6: 16384 + 7: 16384 13,-11: - 6: 65228 + 7: 65228 13,-10: 0: 65520 13,-13: @@ -7597,7 +7595,7 @@ entities: 14,-12: 3: 15 14,-11: - 6: 65521 + 7: 65521 14,-10: 0: 65392 14,-13: @@ -7605,14 +7603,14 @@ entities: 15,-12: 3: 1 15,-11: - 6: 4112 + 7: 4112 15,-10: - 6: 52451 + 7: 52451 0: 4096 15,-13: 3: 4511 16,-10: - 6: 19 + 7: 19 -4,9: 0: 7421 -5,9: @@ -7627,13 +7625,13 @@ entities: 0: 32767 -4,12: 0: 34945 - 6: 13072 + 7: 13072 -3,9: 0: 4095 -3,10: 0: 65535 -3,11: - 6: 61408 + 7: 61408 -2,9: 0: 4095 -2,10: @@ -7677,7 +7675,7 @@ entities: 0: 65535 -5,12: 0: 13111 - 6: 34816 + 7: 34816 -12,9: 3: 65497 -13,9: @@ -7686,19 +7684,19 @@ entities: 3: 52428 -11,9: 3: 4607 - 6: 49152 + 7: 49152 -11,10: 3: 33041 - 6: 204 + 7: 204 -12,11: 3: 136 -11,11: 3: 248 -10,9: 3: 52479 - 6: 4096 + 7: 4096 -10,10: - 6: 17 + 7: 17 3: 34952 -10,11: 3: 2296 @@ -7753,14 +7751,14 @@ entities: 3: 49 -5,13: 0: 51 - 6: 51208 + 7: 51208 -5,14: - 6: 264 + 7: 264 -4,13: - 6: 29443 + 7: 29443 0: 136 -4,14: - 6: 3 + 7: 3 -3,12: 0: 65520 -3,13: @@ -7776,7 +7774,7 @@ entities: 0,13: 0: 35003 1,13: - 0: 8866 + 0: 41634 1,14: 0: 8710 3: 34952 @@ -7787,7 +7785,7 @@ entities: 0: 8738 3: 34952 2,13: - 0: 184 + 0: 4280 2,14: 3: 49023 2,15: @@ -7799,7 +7797,8 @@ entities: 3,14: 3: 44847 3,15: - 3: 44975 + 3: 44463 + 0: 512 3,16: 3: 12207 4,14: @@ -7807,15 +7806,15 @@ entities: 4,15: 3: 44971 4,13: - 0: 224 + 0: 49376 4,16: 3: 65515 5,15: - 3: 1279 - 0: 8192 + 0: 8243 + 3: 1228 5,13: 0: 8738 - 6: 136 + 7: 136 5,14: 0: 546 3: 16384 @@ -7990,7 +7989,7 @@ entities: -15,-16: 3: 65520 -15,-13: - 6: 64 + 7: 64 -14,-16: 3: 24404 -14,-15: @@ -8095,7 +8094,7 @@ entities: -10,-19: 3: 4096 -10,-18: - 0: 4 + 7: 4 -18,-12: 3: 68 -18,-13: @@ -8188,7 +8187,7 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 + - 103.92799 - 0 - 0 - 0 @@ -8229,6 +8228,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -9549,18 +9563,6 @@ entities: - 15445 - 1922 - 412 - - uid: 7089 - components: - - type: Transform - pos: -10.5,18.5 - parent: 2 - - type: DeviceList - devices: - - 9276 - - 29004 - - 29003 - - 29050 - - 28969 - uid: 8130 components: - type: Transform @@ -11149,13 +11151,20 @@ entities: - 2175 - 28966 - 29041 -- proto: AirAlarmAssembly +- proto: AirAlarmVox entities: - - uid: 2171 + - uid: 231 components: - type: Transform - pos: -16.5,18.5 + pos: -10.5,18.5 parent: 2 + - type: DeviceList + devices: + - 29003 + - 29004 + - 29050 + - 9276 + - 28969 - proto: AirCanister entities: - uid: 4223 @@ -12083,12 +12092,6 @@ entities: rot: 1.5707963267948966 rad pos: 45.5,26.5 parent: 2 - - uid: 21027 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 42.5,-46.5 - parent: 2 - uid: 23669 components: - type: Transform @@ -14311,7 +14314,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -28169.445 + secondsUntilStateChange: -34766 state: Opening - uid: 6934 components: @@ -14323,7 +14326,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -28172.08 + secondsUntilStateChange: -34768.633 state: Opening - uid: 6935 components: @@ -14335,7 +14338,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -28170.93 + secondsUntilStateChange: -34767.484 state: Opening - uid: 6936 components: @@ -14346,7 +14349,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -28170.146 + secondsUntilStateChange: -34766.7 state: Opening - proto: AirlockTheatreLocked entities: @@ -14438,7 +14441,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 7089 + - 231 - uid: 18245 components: - type: Transform @@ -34825,6 +34828,11 @@ entities: parent: 21002 - proto: AtmosDeviceFanDirectional entities: + - uid: 5191 + components: + - type: Transform + pos: -13.5,-58.5 + parent: 2 - uid: 10677 components: - type: Transform @@ -34867,59 +34875,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-68.5 parent: 2 - - uid: 13210 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-80.5 - parent: 2 - - uid: 13747 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-82.5 - parent: 2 - - uid: 13773 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -61.5,-17.5 - parent: 2 - - uid: 16803 - components: - - type: Transform - pos: -13.5,-58.5 - parent: 2 - - uid: 18705 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,-80.5 - parent: 2 - - uid: 19542 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,-82.5 - parent: 2 - - uid: 25960 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -61.5,-1.5 - parent: 2 - - uid: 26097 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -61.5,-5.5 - parent: 2 - - uid: 26114 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-80.5 - parent: 2 - proto: AtmosDeviceFanTiny entities: - uid: 45 @@ -36121,144 +36076,146 @@ entities: - type: Transform pos: -42.5,11.5 parent: 2 - - uid: 29002 +- proto: AtmosFixOxygenMarker + entities: + - uid: 5580 components: - type: Transform - pos: -11.5,16.5 + pos: -42.5,13.5 parent: 2 - - uid: 29018 + - uid: 9284 components: - type: Transform - pos: -11.5,17.5 + pos: -41.5,13.5 parent: 2 - - uid: 29019 + - uid: 9285 components: - type: Transform - pos: -10.5,17.5 + pos: -40.5,13.5 parent: 2 - - uid: 29020 +- proto: AtmosFixPlasmaMarker + entities: + - uid: 9287 components: - type: Transform - pos: -11.5,18.5 + pos: -40.5,17.5 parent: 2 - - uid: 29021 + - uid: 9288 components: - type: Transform - pos: -11.5,19.5 + pos: -41.5,17.5 parent: 2 - - uid: 29022 + - uid: 9289 components: - type: Transform - pos: -12.5,19.5 + pos: -42.5,17.5 parent: 2 - - uid: 29023 +- proto: AtmosFixVoxMarker + entities: + - uid: 10285 components: - type: Transform - pos: -13.5,19.5 + pos: -15.5,17.5 parent: 2 - - uid: 29024 + - uid: 10466 components: - type: Transform - pos: -14.5,19.5 + pos: -14.5,16.5 parent: 2 - - uid: 29025 + - uid: 10655 components: - type: Transform - pos: -14.5,18.5 + pos: -15.5,16.5 parent: 2 - - uid: 29026 + - uid: 10656 components: - type: Transform - pos: -13.5,18.5 + pos: -14.5,18.5 parent: 2 - - uid: 29027 + - uid: 10691 components: - type: Transform - pos: -12.5,18.5 + pos: -13.5,19.5 parent: 2 - - uid: 29028 + - uid: 11130 components: - type: Transform - pos: -12.5,17.5 + pos: -13.5,18.5 parent: 2 - - uid: 29029 + - uid: 12566 components: - type: Transform pos: -13.5,17.5 parent: 2 - - uid: 29030 + - uid: 12567 components: - type: Transform - pos: -14.5,17.5 + pos: -13.5,16.5 parent: 2 - - uid: 29031 + - uid: 12882 components: - type: Transform - pos: -15.5,17.5 + pos: -12.5,16.5 parent: 2 - - uid: 29032 + - uid: 12883 components: - type: Transform - pos: -16.5,17.5 + pos: -11.5,16.5 parent: 2 - - uid: 29033 + - uid: 12884 components: - type: Transform - pos: -16.5,16.5 + pos: -14.5,19.5 parent: 2 - - uid: 29034 + - uid: 12885 components: - type: Transform - pos: -15.5,16.5 + pos: -14.5,17.5 parent: 2 - - uid: 29035 + - uid: 12886 components: - type: Transform - pos: -14.5,16.5 + pos: -11.5,17.5 parent: 2 - - uid: 29036 + - uid: 12888 components: - type: Transform - pos: -13.5,16.5 + pos: -12.5,17.5 parent: 2 - - uid: 29037 + - uid: 12889 components: - type: Transform - pos: -12.5,16.5 + pos: -12.5,19.5 parent: 2 -- proto: AtmosFixOxygenMarker - entities: - - uid: 5580 + - uid: 12934 components: - type: Transform - pos: -42.5,13.5 + pos: -10.5,17.5 parent: 2 - - uid: 9284 + - uid: 12935 components: - type: Transform - pos: -41.5,13.5 + pos: -11.5,19.5 parent: 2 - - uid: 9285 + - uid: 12937 components: - type: Transform - pos: -40.5,13.5 + pos: -11.5,18.5 parent: 2 -- proto: AtmosFixPlasmaMarker - entities: - - uid: 9287 + - uid: 12938 components: - type: Transform - pos: -40.5,17.5 + pos: -12.5,18.5 parent: 2 - - uid: 9288 + - uid: 13010 components: - type: Transform - pos: -41.5,17.5 + pos: -16.5,16.5 parent: 2 - - uid: 9289 + - uid: 13030 components: - type: Transform - pos: -42.5,17.5 + pos: -16.5,17.5 parent: 2 - proto: Autolathe entities: @@ -37290,35 +37247,6 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-6.5 parent: 2 - - uid: 7941 - components: - - type: Transform - pos: 51.5,16.5 - parent: 2 - - type: EntityStorage - open: True - removedMasks: 20 - - type: Fixtures - fixtures: - fix1: - shape: !type:PolygonShape - radius: 0.01 - vertices: - - -0.45,-0.45 - - 0.45,-0.45 - - 0.45,0.45 - - -0.45,0.45 - mask: - - Impassable - - TableLayer - - LowImpassable - layer: - - BulletImpassable - - Opaque - density: 190 - hard: True - restitution: 0 - friction: 0.4 - uid: 10179 components: - type: Transform @@ -37330,6 +37258,11 @@ entities: - type: Transform pos: -7.5,-54.5 parent: 2 + - uid: 29023 + components: + - type: Transform + pos: 61.5,17.5 + parent: 2 - proto: BoxBeaker entities: - uid: 10428 @@ -39440,11 +39373,6 @@ entities: - type: Transform pos: 31.5,6.5 parent: 2 - - uid: 2494 - components: - - type: Transform - pos: 31.5,6.5 - parent: 2 - uid: 2495 components: - type: Transform @@ -47475,11 +47403,6 @@ entities: - type: Transform pos: 40.5,-44.5 parent: 2 - - uid: 11130 - components: - - type: Transform - pos: 41.5,-44.5 - parent: 2 - uid: 11131 components: - type: Transform @@ -54850,6 +54773,11 @@ entities: - type: Transform pos: 43.5,61.5 parent: 21002 + - uid: 25960 + components: + - type: Transform + pos: 40.5,-43.5 + parent: 2 - uid: 26463 components: - type: Transform @@ -55335,6 +55263,16 @@ entities: - type: Transform pos: -44.5,37.5 parent: 2 + - uid: 29036 + components: + - type: Transform + pos: -14.5,19.5 + parent: 2 + - uid: 29077 + components: + - type: Transform + pos: -14.5,20.5 + parent: 2 - proto: CableApcStack1 entities: - uid: 23589 @@ -55356,11 +55294,6 @@ entities: parent: 2 - proto: CableHV entities: - - uid: 231 - components: - - type: Transform - pos: 44.5,-46.5 - parent: 2 - uid: 1409 components: - type: Transform @@ -58606,16 +58539,6 @@ entities: - type: Transform pos: 4.5,-57.5 parent: 2 - - uid: 10656 - components: - - type: Transform - pos: 41.5,-46.5 - parent: 2 - - uid: 10691 - components: - - type: Transform - pos: 42.5,-46.5 - parent: 2 - uid: 10716 components: - type: Transform @@ -59096,16 +59019,6 @@ entities: - type: Transform pos: 52.5,19.5 parent: 2 - - uid: 12888 - components: - - type: Transform - pos: 44.5,24.5 - parent: 2 - - uid: 12889 - components: - - type: Transform - pos: 45.5,24.5 - parent: 2 - uid: 12890 components: - type: Transform @@ -59311,16 +59224,6 @@ entities: - type: Transform pos: 56.5,13.5 parent: 2 - - uid: 12937 - components: - - type: Transform - pos: 44.5,11.5 - parent: 2 - - uid: 12938 - components: - - type: Transform - pos: 45.5,11.5 - parent: 2 - uid: 12959 components: - type: Transform @@ -59466,6 +59369,31 @@ entities: - type: Transform pos: 56.5,9.5 parent: 2 + - uid: 13034 + components: + - type: Transform + pos: 43.5,-45.5 + parent: 2 + - uid: 13037 + components: + - type: Transform + pos: 51.5,23.5 + parent: 2 + - uid: 13210 + components: + - type: Transform + pos: 51.5,22.5 + parent: 2 + - uid: 13747 + components: + - type: Transform + pos: 51.5,20.5 + parent: 2 + - uid: 13773 + components: + - type: Transform + pos: 51.5,21.5 + parent: 2 - uid: 15404 components: - type: Transform @@ -59511,6 +59439,11 @@ entities: - type: Transform pos: 31.5,39.5 parent: 2 + - uid: 18705 + components: + - type: Transform + pos: 42.5,-45.5 + parent: 2 - uid: 18738 components: - type: Transform @@ -60781,16 +60714,6 @@ entities: - type: Transform pos: 40.5,-44.5 parent: 2 - - uid: 19956 - components: - - type: Transform - pos: 41.5,-44.5 - parent: 2 - - uid: 19959 - components: - - type: Transform - pos: 43.5,-46.5 - parent: 2 - uid: 19983 components: - type: Transform @@ -62716,6 +62639,106 @@ entities: - type: Transform pos: 22.5,-24.5 parent: 21002 + - uid: 29022 + components: + - type: Transform + pos: 40.5,-43.5 + parent: 2 + - uid: 29025 + components: + - type: Transform + pos: 41.5,-46.5 + parent: 2 + - uid: 29033 + components: + - type: Transform + pos: 41.5,-45.5 + parent: 2 + - uid: 29151 + components: + - type: Transform + pos: 60.5,10.5 + parent: 2 + - uid: 29152 + components: + - type: Transform + pos: 60.5,11.5 + parent: 2 + - uid: 29153 + components: + - type: Transform + pos: 60.5,12.5 + parent: 2 + - uid: 29154 + components: + - type: Transform + pos: 60.5,13.5 + parent: 2 + - uid: 29155 + components: + - type: Transform + pos: 60.5,14.5 + parent: 2 + - uid: 29156 + components: + - type: Transform + pos: 60.5,15.5 + parent: 2 + - uid: 29157 + components: + - type: Transform + pos: 60.5,16.5 + parent: 2 + - uid: 29158 + components: + - type: Transform + pos: 59.5,16.5 + parent: 2 + - uid: 29159 + components: + - type: Transform + pos: 58.5,16.5 + parent: 2 + - uid: 29160 + components: + - type: Transform + pos: 57.5,16.5 + parent: 2 + - uid: 29161 + components: + - type: Transform + pos: 56.5,16.5 + parent: 2 + - uid: 29162 + components: + - type: Transform + pos: 55.5,16.5 + parent: 2 + - uid: 29163 + components: + - type: Transform + pos: 54.5,16.5 + parent: 2 + - uid: 29164 + components: + - type: Transform + pos: 53.5,16.5 + parent: 2 + - uid: 29165 + components: + - type: Transform + pos: 53.5,17.5 + parent: 2 + - uid: 29166 + components: + - type: Transform + pos: 53.5,19.5 + parent: 2 + - uid: 29167 + components: + - type: Transform + pos: 53.5,18.5 + parent: 2 - proto: CableMV entities: - uid: 418 @@ -66713,41 +66736,6 @@ entities: - type: Transform pos: 52.5,17.5 parent: 2 - - uid: 12882 - components: - - type: Transform - pos: 53.5,18.5 - parent: 2 - - uid: 12883 - components: - - type: Transform - pos: 54.5,18.5 - parent: 2 - - uid: 12884 - components: - - type: Transform - pos: 54.5,17.5 - parent: 2 - - uid: 12885 - components: - - type: Transform - pos: 54.5,16.5 - parent: 2 - - uid: 12886 - components: - - type: Transform - pos: 55.5,16.5 - parent: 2 - - uid: 12934 - components: - - type: Transform - pos: 56.5,16.5 - parent: 2 - - uid: 12935 - components: - - type: Transform - pos: 57.5,16.5 - parent: 2 - uid: 12992 components: - type: Transform @@ -66803,46 +66791,6 @@ entities: - type: Transform pos: 57.5,11.5 parent: 2 - - uid: 13030 - components: - - type: Transform - pos: 60.5,12.5 - parent: 2 - - uid: 13031 - components: - - type: Transform - pos: 60.5,12.5 - parent: 2 - - uid: 13032 - components: - - type: Transform - pos: 60.5,13.5 - parent: 2 - - uid: 13033 - components: - - type: Transform - pos: 60.5,14.5 - parent: 2 - - uid: 13034 - components: - - type: Transform - pos: 60.5,15.5 - parent: 2 - - uid: 13035 - components: - - type: Transform - pos: 60.5,16.5 - parent: 2 - - uid: 13036 - components: - - type: Transform - pos: 59.5,16.5 - parent: 2 - - uid: 13037 - components: - - type: Transform - pos: 58.5,16.5 - parent: 2 - uid: 13072 components: - type: Transform @@ -68399,12 +68347,6 @@ entities: - type: Transform pos: 52.5,20.5 parent: 2 - - uid: 10285 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 41.5,-47.5 - parent: 2 - uid: 16678 components: - type: Transform @@ -68451,6 +68393,18 @@ entities: - type: Transform pos: 22.5,-23.5 parent: 21002 + - uid: 29019 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 41.5,-45.5 + parent: 2 + - uid: 29149 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 53.5,19.5 + parent: 2 - proto: Candle entities: - uid: 23174 @@ -71638,18 +71592,6 @@ entities: rot: -1.5707963267948966 rad pos: 38.5,-44.5 parent: 2 - - uid: 12566 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 39.5,-44.5 - parent: 2 - - uid: 12567 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 40.5,-44.5 - parent: 2 - uid: 12568 components: - type: Transform @@ -72334,6 +72276,12 @@ entities: rot: -1.5707963267948966 rad pos: -20.5,29.5 parent: 2 + - uid: 13035 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,-46.5 + parent: 2 - uid: 13135 components: - type: Transform @@ -74027,6 +73975,18 @@ entities: rot: 3.141592653589793 rad pos: 57.5,-31.5 parent: 2 + - uid: 29021 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-44.5 + parent: 2 + - uid: 29024 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,-45.5 + parent: 2 - proto: Chair entities: - uid: 495 @@ -76907,6 +76867,12 @@ entities: rot: -1.5707963267948966 rad pos: -48.5,-37.5 parent: 2 + - uid: 29138 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.5,9.5 + parent: 2 - proto: Cobweb2 entities: - uid: 2182 @@ -76919,6 +76885,11 @@ entities: - type: Transform pos: 41.5,23.5 parent: 2 + - uid: 29136 + components: + - type: Transform + pos: 44.5,23.5 + parent: 2 - proto: ComfyChair entities: - uid: 1044 @@ -92359,7 +92330,7 @@ entities: pos: -13.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -19493.426 + secondsUntilStateChange: -26089.98 - type: DeviceNetwork deviceLists: - 18275 @@ -92367,7 +92338,7 @@ entities: - 18282 - 18271 - type: Firelock - emergencyCloseCooldown: 16782.4165529 + emergencyCloseCooldown: 16782.4165528 - uid: 167 components: - type: Transform @@ -126246,7 +126217,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 7089 + - 231 - proto: GasVentScrubber entities: - uid: 53 @@ -128166,7 +128137,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 7089 + - 231 - type: AtmosPipeColor color: '#FF1212FF' - uid: 29003 @@ -128177,7 +128148,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 7089 + - 231 - type: AtmosPipeColor color: '#FF1212FF' - uid: 29004 @@ -128188,7 +128159,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 7089 + - 231 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasVolumePump @@ -136687,7 +136658,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -56325.273 + secondsUntilStateChange: -62921.83 state: Opening - uid: 5211 components: @@ -137858,6 +137829,11 @@ entities: - type: Transform pos: 12.5,43.5 parent: 2 + - uid: 26114 + components: + - type: Transform + pos: 41.5,-46.5 + parent: 2 - proto: LockerEngineerFilled entities: - uid: 6703 @@ -138917,6 +138893,11 @@ entities: - type: Transform pos: -18.5,18.5 parent: 2 + - uid: 21027 + components: + - type: Transform + pos: 40.5,-44.5 + parent: 2 - uid: 23232 components: - type: Transform @@ -138952,11 +138933,6 @@ entities: - type: Transform pos: -22.5,20.5 parent: 2 - - uid: 28882 - components: - - type: Transform - pos: 41.5,-44.5 - parent: 2 - proto: MaintenanceToolSpawner entities: - uid: 10274 @@ -141561,11 +141537,6 @@ entities: - type: Transform pos: 42.5,5.5 parent: 2 - - uid: 13010 - components: - - type: Transform - pos: 61.5,17.5 - parent: 2 - uid: 13013 components: - type: Transform @@ -141676,6 +141647,11 @@ entities: - type: Transform pos: 3.5,-41.5 parent: 2 + - uid: 29026 + components: + - type: Transform + pos: 61.5,16.5 + parent: 2 - proto: PottedPlantRD entities: - uid: 9902 @@ -144418,6 +144394,12 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,-56.5 parent: 2 + - uid: 13036 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,-46.5 + parent: 2 - uid: 13533 components: - type: Transform @@ -144686,12 +144668,6 @@ entities: rot: 3.141592653589793 rad pos: 64.5,-3.5 parent: 2 - - uid: 20194 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 43.5,-45.5 - parent: 2 - uid: 20197 components: - type: Transform @@ -155322,6 +155298,13 @@ entities: parent: 2 - proto: SMESBasic entities: + - uid: 2494 + components: + - type: MetaData + name: SE Solars + - type: Transform + pos: 42.5,-45.5 + parent: 2 - uid: 6414 components: - type: MetaData @@ -155379,11 +155362,6 @@ entities: - type: Transform pos: 14.5,42.5 parent: 2 - - uid: 10260 - components: - - type: Transform - pos: 41.5,-46.5 - parent: 2 - uid: 10731 components: - type: Transform @@ -155396,6 +155374,8 @@ entities: parent: 2 - uid: 19639 components: + - type: MetaData + name: SW Solars - type: Transform pos: -46.5,-53.5 parent: 2 @@ -157882,10 +157862,11 @@ entities: - type: Transform pos: 13.5,61.5 parent: 2 - - uid: 28414 + - uid: 29074 components: - type: Transform - pos: 51.5,16.5 + rot: 3.141592653589793 rad + pos: 59.5,18.5 parent: 2 - proto: SpawnPointBotanist entities: @@ -159387,6 +159368,58 @@ entities: parent: 2 - proto: SurveillanceCameraCommand entities: + - uid: 13031 + components: + - type: Transform + pos: 35.5,20.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Captain's lavatory + - uid: 19542 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,6.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge 2 + - uid: 19956 + components: + - type: Transform + pos: 36.5,12.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Captain's Bedroom 2 + - uid: 19959 + components: + - type: Transform + pos: 35.5,17.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Captain's Closet + - uid: 20194 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,-9.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: HoP bedroom - uid: 20877 components: - type: Transform @@ -159394,6 +159427,8 @@ entities: pos: 22.5,9.5 parent: 2 - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand id: Bridge - uid: 20878 components: @@ -159416,6 +159451,8 @@ entities: pos: 40.5,12.5 parent: 2 - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand id: Captain's Bedroom - uid: 20881 components: @@ -159424,7 +159461,10 @@ entities: pos: 39.5,-4.5 parent: 2 - type: SurveillanceCamera - id: HoP's + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: HoP office - uid: 20882 components: - type: Transform @@ -159449,6 +159489,17 @@ entities: parent: 2 - type: SurveillanceCamera id: Board Storage + - uid: 20902 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,18.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Briefing - uid: 20911 components: - type: Transform @@ -159488,6 +159539,49 @@ entities: parent: 2 - type: SurveillanceCamera id: Telecoms + - uid: 29135 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 44.5,23.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Compliance N + - uid: 29137 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,9.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Compliance S + - uid: 29141 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,-39.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: HOS' Office + - uid: 29178 + components: + - type: Transform + pos: -49.5,5.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: QM's Bedroom - proto: SurveillanceCameraEngineering entities: - uid: 20897 @@ -159504,7 +159598,10 @@ entities: pos: -32.5,12.5 parent: 2 - type: SurveillanceCamera - id: Atmos 1 + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Distro - uid: 20899 components: - type: Transform @@ -159512,7 +159609,10 @@ entities: pos: -30.5,24.5 parent: 2 - type: SurveillanceCamera - id: Atmos 2 + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos W - uid: 20901 components: - type: Transform @@ -159521,14 +159621,6 @@ entities: parent: 2 - type: SurveillanceCamera id: Atmos Lockeroom - - uid: 20902 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,47.5 - parent: 2 - - type: SurveillanceCamera - id: TEG - uid: 20903 components: - type: Transform @@ -159553,8 +159645,8 @@ entities: - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering - id: Main Engine - - type: ActiveUserInterface + nameSet: True + id: Main Engine E - uid: 20906 components: - type: Transform @@ -159593,7 +159685,7 @@ entities: pos: 47.5,27.5 parent: 2 - type: SurveillanceCamera - id: East Solars + id: E Solars - uid: 23805 components: - type: Transform @@ -159627,7 +159719,28 @@ entities: - SurveillanceCameraEngineering nameSet: True id: SMES C - - uid: 28860 + - uid: 28861 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,37.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Pressure Bank + - uid: 29027 + components: + - type: Transform + pos: -14.5,40.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: TEG S + - uid: 29028 components: - type: Transform rot: 3.141592653589793 rad @@ -159637,20 +159750,284 @@ entities: setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Atmos 3 - - uid: 28861 + id: Atmos N + - uid: 29107 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-6.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Courtyard Power + - uid: 29113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,11.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos S + - uid: 29114 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,24.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos E + - uid: 29115 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,36.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Primary Airlock + - uid: 29116 + components: + - type: Transform + pos: -30.5,8.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Gas Tanks + - uid: 29117 components: - type: Transform rot: 3.141592653589793 rad - pos: -27.5,37.5 + pos: -20.5,53.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Pressure Bank + id: TEG N + - uid: 29118 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,45.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: TEG Center + - uid: 29119 + components: + - type: Transform + pos: -2.5,40.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Misc Storage + - uid: 29123 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,47.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: CE's Bedroom + - uid: 29124 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,35.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Desk + - uid: 29125 + components: + - type: Transform + pos: 4.5,49.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Airlock + - uid: 29126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,62.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Main Engine W + - uid: 29127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,47.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering W + - uid: 29128 + components: + - type: Transform + pos: 25.5,42.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Hall A + - uid: 29129 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,45.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering E + - uid: 29130 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,28.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Backrooms + - uid: 29131 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,43.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Hall B + - uid: 29133 + components: + - type: Transform + pos: 36.5,48.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Dock + - uid: 29150 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,48.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engine Storage + - uid: 29169 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -48.5,-52.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: SW Solars + - uid: 29170 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,-45.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: SE Solars - proto: SurveillanceCameraGeneral entities: + - uid: 7089 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-10.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Atrium B + - uid: 10260 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,3.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bridge Redress + - uid: 10262 + components: + - type: Transform + pos: -8.5,3.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Food Court C + - uid: 13032 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,11.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Parkway E + - uid: 20943 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,3.5 + parent: 2 - uid: 20951 components: - type: Transform @@ -159658,7 +160035,10 @@ entities: pos: -3.5,2.5 parent: 2 - type: SurveillanceCamera - id: Rotunda + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Rotunda West - uid: 20952 components: - type: Transform @@ -159666,7 +160046,10 @@ entities: pos: -16.5,11.5 parent: 2 - type: SurveillanceCamera - id: Parkway NW + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Food Court A - uid: 20953 components: - type: Transform @@ -159674,14 +160057,20 @@ entities: pos: 11.5,17.5 parent: 2 - type: SurveillanceCamera - id: Parkway NE + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Parkway N - uid: 20954 components: - type: Transform pos: -10.5,-16.5 parent: 2 - type: SurveillanceCamera - id: Zoo 1 + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Zoo S - uid: 20955 components: - type: Transform @@ -159689,7 +160078,10 @@ entities: pos: -16.5,-10.5 parent: 2 - type: SurveillanceCamera - id: Zoo 2 + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Zoo W - uid: 20956 components: - type: Transform @@ -159697,7 +160089,10 @@ entities: pos: -9.5,-8.5 parent: 2 - type: SurveillanceCamera - id: Zoo 3 + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Zoo Center - uid: 20957 components: - type: Transform @@ -159705,7 +160100,10 @@ entities: pos: 8.5,-6.5 parent: 2 - type: SurveillanceCamera - id: Parkway SE + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Atrium A - uid: 20958 components: - type: Transform @@ -159743,7 +160141,10 @@ entities: pos: -3.5,-56.5 parent: 2 - type: SurveillanceCamera - id: Arrivals + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals N - uid: 23677 components: - type: Transform @@ -159754,6 +160155,415 @@ entities: - SurveillanceCameraGeneral nameSet: True id: North Dock + - uid: 29018 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,-4.5 + parent: 2 + - uid: 29035 + components: + - type: Transform + pos: 11.5,-16.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Atrium C + - uid: 29037 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Rotunda East + - uid: 29075 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,9.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Parkway W + - uid: 29076 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,18.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Food Court B + - uid: 29079 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-2.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Zoo N + - uid: 29081 + components: + - type: Transform + pos: -1.5,-13.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Zoo E + - uid: 29082 + components: + - type: Transform + pos: -18.5,-19.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Zoo Serpents + - uid: 29088 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -44.5,-37.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Games + - uid: 29092 + components: + - type: Transform + pos: 2.5,-62.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals S + - uid: 29093 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-70.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Hallway W-1 + - uid: 29094 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-77.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Hallway W-2 + - uid: 29095 + components: + - type: Transform + pos: -11.5,-80.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Dock A-1 + - uid: 29096 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-82.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Dock A-2 + - uid: 29097 + components: + - type: Transform + pos: 2.5,-50.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: South Hall C + - uid: 29098 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-70.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Hallway E-1 + - uid: 29099 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-77.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Hallway E-2 + - uid: 29100 + components: + - type: Transform + pos: 7.5,-80.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Dock B-1 + - uid: 29101 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-82.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Dock B-2 + - uid: 29102 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-34.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: South Hall B + - uid: 29103 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-21.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: South Hall A + - uid: 29105 + components: + - type: Transform + pos: -24.5,-1.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: West Hall A + - uid: 29108 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -43.5,1.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: West Hall B + - uid: 29109 + components: + - type: Transform + pos: -46.5,-4.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: West Hall C + - uid: 29110 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-19.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Aux Hall B + - uid: 29111 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -40.5,-9.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Aux Hall A + - uid: 29112 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -40.5,-31.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Aux Hall C + - uid: 29120 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,45.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: North Hall C + - uid: 29121 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,33.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: North Hall B + - uid: 29122 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,25.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: North Hall A + - uid: 29132 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 28.5,53.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Pods + - uid: 29142 + components: + - type: Transform + pos: 22.5,-0.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: East Hall A + - uid: 29143 + components: + - type: Transform + pos: 34.5,-0.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: East Hall B + - uid: 29144 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,1.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: East Hall C + - uid: 29171 + components: + - type: Transform + pos: -38.5,-8.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Washroom + - uid: 29172 + components: + - type: Transform + pos: -38.5,-16.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm A + - uid: 29173 + components: + - type: Transform + pos: -38.5,-21.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm B + - uid: 29174 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -37.5,-24.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorm C + - uid: 29181 + components: + - type: Transform + pos: -18.5,27.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Gambling Den - proto: SurveillanceCameraMedical entities: - uid: 20915 @@ -159808,7 +160618,10 @@ entities: pos: -32.5,-16.5 parent: 2 - type: SurveillanceCamera - id: Virology + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Virology W - uid: 20925 components: - type: Transform @@ -159844,7 +160657,10 @@ entities: pos: -37.5,-44.5 parent: 2 - type: SurveillanceCamera - id: Psych + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Psych S - uid: 20929 components: - type: Transform @@ -159859,7 +160675,95 @@ entities: pos: -25.5,-38.5 parent: 2 - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical id: OR I + - uid: 29083 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-15.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Virology E + - uid: 29084 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-44.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Backrooms + - uid: 29085 + components: + - type: Transform + pos: -12.5,-29.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: EMS + - uid: 29086 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,-42.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Inpatient Ward + - uid: 29087 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-47.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Cloning + - uid: 29089 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -34.5,-30.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Psych Lobby + - uid: 29090 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -39.5,-36.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Psych N + - uid: 29091 + components: + - type: Transform + pos: -28.5,-32.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Admin Hall - proto: SurveillanceCameraMonitorCircuitboard entities: - uid: 5815 @@ -159964,7 +160868,10 @@ entities: pos: 7.5,-35.5 parent: 2 - type: SurveillanceCamera - id: Xeno Lab + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Xeno Lab N - uid: 20936 components: - type: Transform @@ -159988,6 +160895,39 @@ entities: parent: 2 - type: SurveillanceCamera id: Server Room + - uid: 29104 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-37.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Xeno Lab S + - uid: 29106 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-29.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: RD's Bedroom + - uid: 29168 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-48.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Test Chamber - proto: SurveillanceCameraSecurity entities: - uid: 13070 @@ -160061,8 +161001,8 @@ entities: - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity - id: Armory - - type: ActiveUserInterface + nameSet: True + id: Armory A - uid: 20886 components: - type: Transform @@ -160078,7 +161018,10 @@ entities: pos: 30.5,-33.5 parent: 2 - type: SurveillanceCamera - id: Lockeroom + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Lockerroom W - uid: 20888 components: - type: Transform @@ -160123,8 +161066,104 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Security Desk + - uid: 29134 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,23.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Detective's Office + - uid: 29139 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 55.5,-35.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Range + - uid: 29140 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,-25.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + - uid: 29145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,-3.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Main Entrance + - uid: 29146 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 40.5,-34.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Evidence + - uid: 29147 + components: + - type: Transform + pos: 27.5,-32.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Back Entrance + - uid: 29148 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,-30.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Lockerroom E - proto: SurveillanceCameraService entities: + - uid: 3264 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-11.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Chapel Apse + - uid: 7941 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-18.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Chaplain's Office - uid: 9387 components: - type: Transform @@ -160133,6 +161172,27 @@ entities: parent: 2 - type: SurveillanceCamera id: Engi Bar + - uid: 10210 + components: + - type: Transform + pos: 4.5,-23.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Chapel Crematorium + - uid: 10263 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-22.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Chapel Priory - uid: 20939 components: - type: Transform @@ -160140,6 +161200,8 @@ entities: pos: -5.5,22.5 parent: 2 - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService id: Kitchen - uid: 20940 components: @@ -160164,14 +161226,6 @@ entities: parent: 2 - type: SurveillanceCamera id: Law Office - - uid: 20943 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,38.5 - parent: 2 - - type: SurveillanceCamera - id: Library - uid: 20944 components: - type: Transform @@ -160179,7 +161233,10 @@ entities: pos: 23.5,-22.5 parent: 2 - type: SurveillanceCamera - id: Chapel + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Chapel Sanctuary - uid: 20945 components: - type: Transform @@ -160195,6 +161252,8 @@ entities: pos: 6.5,24.5 parent: 2 - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService id: Botany - uid: 20948 components: @@ -160211,7 +161270,94 @@ entities: pos: 4.5,-53.5 parent: 2 - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService id: Arrival Stand + - uid: 29078 + components: + - type: Transform + pos: -15.5,21.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Freezer + - uid: 29080 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,23.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Botany Lockers + - uid: 29175 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -44.5,-27.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Reporter + - uid: 29176 + components: + - type: Transform + pos: -55.5,-30.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Disposals + - uid: 29180 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,15.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Pun Pun's Office + - uid: 29182 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,33.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Librarian's Office + - uid: 29183 + components: + - type: Transform + pos: -10.5,35.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Library W + - uid: 29184 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,38.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Library E - proto: SurveillanceCameraSupply entities: - uid: 20893 @@ -160221,6 +161367,8 @@ entities: pos: -50.5,-1.5 parent: 2 - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply id: Cargo Desk - uid: 20894 components: @@ -160246,6 +161394,27 @@ entities: parent: 2 - type: SurveillanceCamera id: Salvage + - uid: 29177 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -60.5,-4.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock S + - uid: 29179 + components: + - type: Transform + pos: -60.5,-2.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock N - proto: SurveillanceCameraWirelessRouterEntertainment entities: - uid: 23224 @@ -168836,11 +170005,6 @@ entities: - type: Transform pos: 35.5,9.5 parent: 2 - - uid: 5191 - components: - - type: Transform - pos: -39.5,-31.5 - parent: 2 - uid: 5197 components: - type: Transform @@ -172196,12 +173360,6 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,-11.5 parent: 2 - - uid: 10210 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,-45.5 - parent: 2 - uid: 10224 components: - type: Transform @@ -172250,18 +173408,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-36.5 parent: 2 - - uid: 10262 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,-47.5 - parent: 2 - - uid: 10263 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-47.5 - parent: 2 - uid: 10287 components: - type: Transform @@ -172305,12 +173451,6 @@ entities: - type: Transform pos: -38.5,-9.5 parent: 2 - - uid: 10466 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 42.5,-45.5 - parent: 2 - uid: 10482 components: - type: Transform @@ -172397,12 +173537,6 @@ entities: - type: Transform pos: 5.5,-63.5 parent: 2 - - uid: 10655 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 42.5,-44.5 - parent: 2 - uid: 10657 components: - type: Transform @@ -181198,6 +182332,12 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-52.5 parent: 2 + - uid: 13033 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-44.5 + parent: 2 - uid: 13615 components: - type: Transform @@ -181700,6 +182840,38 @@ entities: rot: 3.141592653589793 rad pos: 18.5,-7.5 parent: 2 + - uid: 29029 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -39.5,-31.5 + parent: 2 + - uid: 29031 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-47.5 + parent: 2 + - uid: 29032 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-47.5 + parent: 2 + - uid: 29034 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,-44.5 + parent: 2 +- proto: WallSolidDiagonal + entities: + - uid: 29030 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,-45.5 + parent: 2 - proto: WallSolidRust entities: - uid: 24642 @@ -183062,6 +184234,12 @@ entities: rot: 3.141592653589793 rad pos: 33.5,49.5 parent: 2 + - uid: 26097 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-46.5 + parent: 2 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 3412 @@ -184189,6 +185367,11 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,-12.5 parent: 2 + - uid: 2171 + components: + - type: Transform + pos: -11.5,16.5 + parent: 2 - uid: 2329 components: - type: Transform @@ -184412,6 +185595,12 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-41.5 parent: 2 + - uid: 16803 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-45.5 + parent: 2 - uid: 20823 components: - type: Transform @@ -184496,6 +185685,21 @@ entities: rot: 3.141592653589793 rad pos: -15.5,15.5 parent: 2 + - uid: 28414 + components: + - type: Transform + pos: -13.5,16.5 + parent: 2 + - uid: 28860 + components: + - type: Transform + pos: -14.5,16.5 + parent: 2 + - uid: 28882 + components: + - type: Transform + pos: -15.5,16.5 + parent: 2 - uid: 28976 components: - type: Transform @@ -184532,6 +185736,16 @@ entities: rot: 3.141592653589793 rad pos: -10.5,15.5 parent: 2 + - uid: 29002 + components: + - type: Transform + pos: -16.5,16.5 + parent: 2 + - uid: 29020 + components: + - type: Transform + pos: -12.5,16.5 + parent: 2 - uid: 29042 components: - type: Transform @@ -184613,7 +185827,7 @@ entities: pos: 24.5,2.5 parent: 21002 - type: Door - secondsUntilStateChange: -401529.88 + secondsUntilStateChange: -408126.44 state: Opening - uid: 28863 components: From 54723053f241d4958fb923af4340db15c820680a Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 05:43:26 +0000 Subject: [PATCH 053/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3db24b501f3..69e075278b2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Psychpsyo - changes: - - message: New lobby background art! - type: Add - id: 6704 - time: '2024-06-08T23:29:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28724 - author: AJCM-git changes: - message: When people with less than an hour playing join the game, the guidebook @@ -3868,3 +3861,10 @@ id: 7203 time: '2024-08-25T04:57:37.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31371 +- author: IProduceWidgets + changes: + - message: Oasis Voxbox is no longer a pressure bomb. (Thanks Delta) + type: Fix + id: 7204 + time: '2024-08-25T05:42:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31415 From 7fe5f721a58414cca820a403ec752e20f53cdf58 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Sun, 25 Aug 2024 00:45:42 -0600 Subject: [PATCH 054/223] marathon update (#31421) --- Resources/Maps/marathon.yml | 2150 ++++++++++++++++++++++++++++++----- 1 file changed, 1886 insertions(+), 264 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index dc56c601a3b..80f9ba58b92 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -129,7 +129,7 @@ entities: version: 6 -2,2: ind: -2,2 - tiles: XQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAADJgAAAAADegAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACegAAAAACegAAAAADegAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAACegAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAdAAAAAACcwAAAAAAdAAAAAADdAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAbQAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAADJAAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAJAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAACTQAAAAACTQAAAAABfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAXQAAAAACXQAAAAADXQAAAAADbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAA + tiles: XQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAADJgAAAAADegAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACegAAAAACegAAAAADegAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAACegAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAdAAAAAACcwAAAAAAdAAAAAADdAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAbQAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAADJAAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAJAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAACTQAAAAACTQAAAAABfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAA version: 6 -3,2: ind: -3,2 @@ -153,7 +153,7 @@ entities: version: 6 -2,3: ind: -2,3 - tiles: XQAAAAACXQAAAAACXQAAAAAAHwAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAACXQAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABXQAAAAABHwAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABegAAAAACegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAACXQAAAAACXQAAAAAAHwAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAACXQAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABXQAAAAABHwAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABegAAAAACegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -3,4: ind: -3,4 @@ -165,15 +165,15 @@ entities: version: 6 -1,2: ind: -1,2 - tiles: HwAAAAAAHwAAAAABHwAAAAABQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABHwAAAAACHwAAAAAAJAAAAAADHwAAAAACegAAAAADHwAAAAACHwAAAAADfgAAAAAAQAAAAAAAegAAAAABegAAAAABegAAAAABegAAAAAAegAAAAACQAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACegAAAAABHwAAAAADHwAAAAABfgAAAAAAQAAAAAAAegAAAAACLwAAAAAALwAAAAADLwAAAAADegAAAAACQAAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAQAAAAAAAegAAAAACegAAAAADegAAAAABegAAAAAAegAAAAABQAAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAegAAAAABegAAAAAAHwAAAAABHwAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADJAAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAABHwAAAAACJAAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAADDAAAAAACDAAAAAACDAAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAABJAAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAA + tiles: HwAAAAAAHwAAAAABHwAAAAABQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABHwAAAAACHwAAAAAAJAAAAAADHwAAAAACegAAAAADHwAAAAACHwAAAAADfgAAAAAAQAAAAAAAegAAAAABegAAAAABegAAAAABegAAAAAAegAAAAACQAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACegAAAAABHwAAAAADHwAAAAABfgAAAAAAQAAAAAAAegAAAAACLwAAAAAALwAAAAADLwAAAAADegAAAAACQAAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAQAAAAAAAegAAAAACegAAAAADegAAAAABegAAAAAAegAAAAABQAAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAegAAAAABegAAAAAAHwAAAAABHwAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADJAAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAABHwAAAAACJAAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAADDAAAAAACDAAAAAACDAAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAABJAAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAA version: 6 0,2: ind: 0,2 - tiles: egAAAAADegAAAAADegAAAAABegAAAAADegAAAAABegAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACegAAAAACegAAAAACegAAAAABKAAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAOAAAAAAAHwAAAAADOAAAAAAAHwAAAAADfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAHwAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAA + tiles: egAAAAADegAAAAADegAAAAABegAAAAADegAAAAABegAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACegAAAAACegAAAAACegAAAAABKAAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAOAAAAAAAHwAAAAADOAAAAAAAHwAAAAADfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAHwAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAA version: 6 -1,3: ind: -1,3 - tiles: AAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAA + tiles: AAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAA version: 6 1,1: ind: 1,1 @@ -285,7 +285,7 @@ entities: version: 6 0,3: ind: 0,3 - tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAAAegAAAAABegAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAABegAAAAAAegAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAAAegAAAAABegAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 3,2: ind: 3,2 @@ -373,19 +373,19 @@ entities: version: 6 0,4: ind: 0,4 - tiles: HwAAAAACHwAAAAADfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADHwAAAAACbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAATwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: HwAAAAACHwAAAAADfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADHwAAAAACbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAATwAAAAAAcAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,4: ind: -1,4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAABHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACTwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAHwAAAAABHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAcAAAAAAATwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAA version: 6 -1,5: ind: -1,5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAATwAAAAAAEQAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAATwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAcAAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAcAAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAcAAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAATwAAAAAAEQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAcAAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAcAAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAcAAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAcAAAAAAATwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,5: ind: 0,5 - tiles: fgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAADEQAAAAAATwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAATwAAAAAAHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAEQAAAAAATwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAcAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAATwAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,3: ind: 2,3 @@ -9136,13 +9136,6 @@ entities: parent: 30 - proto: AirlockCaptainLocked entities: - - uid: 1357 - components: - - type: MetaData - name: Drone Storage - - type: Transform - pos: -37.5,25.5 - parent: 30 - uid: 4935 components: - type: Transform @@ -9341,6 +9334,18 @@ entities: - type: Transform pos: -19.5,41.5 parent: 30 + - uid: 20883 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,73.5 + parent: 30 + - uid: 20885 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,67.5 + parent: 30 - proto: AirlockDetectiveLocked entities: - uid: 783 @@ -9427,6 +9432,11 @@ entities: - type: Transform pos: -40.5,16.5 parent: 30 + - uid: 1357 + components: + - type: Transform + pos: -37.5,25.5 + parent: 30 - uid: 3198 components: - type: Transform @@ -10572,6 +10582,52 @@ entities: - type: Transform pos: -8.5,-13.5 parent: 30 +- proto: AirlockMaintCommandLocked + entities: + - uid: 20265 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,66.5 + parent: 30 + - uid: 20266 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,66.5 + parent: 30 + - uid: 20267 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,74.5 + parent: 30 + - uid: 20736 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,74.5 + parent: 30 + - uid: 20981 + components: + - type: Transform + pos: 5.5,73.5 + parent: 30 + - uid: 20983 + components: + - type: Transform + pos: -6.5,73.5 + parent: 30 + - uid: 20985 + components: + - type: Transform + pos: 5.5,67.5 + parent: 30 + - uid: 20987 + components: + - type: Transform + pos: -6.5,67.5 + parent: 30 - proto: AirlockMaintDetectiveLocked entities: - uid: 1423 @@ -10810,46 +10866,6 @@ entities: - type: Transform pos: -45.5,-25.5 parent: 30 - - uid: 20264 - components: - - type: Transform - pos: -3.5,66.5 - parent: 30 - - uid: 20265 - components: - - type: Transform - pos: -6.5,67.5 - parent: 30 - - uid: 20266 - components: - - type: Transform - pos: 2.5,66.5 - parent: 30 - - uid: 20267 - components: - - type: Transform - pos: 5.5,67.5 - parent: 30 - - uid: 20268 - components: - - type: Transform - pos: 2.5,74.5 - parent: 30 - - uid: 20269 - components: - - type: Transform - pos: 5.5,73.5 - parent: 30 - - uid: 20270 - components: - - type: Transform - pos: -3.5,74.5 - parent: 30 - - uid: 20271 - components: - - type: Transform - pos: -6.5,73.5 - parent: 30 - proto: AirlockMaintMedLocked entities: - uid: 7067 @@ -10999,7 +11015,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -22976.215 + secondsUntilStateChange: -25025.113 state: Opening - type: DeviceLinkSource lastSignals: @@ -12297,11 +12313,29 @@ entities: - type: Transform pos: 0.5,85.5 parent: 30 + - uid: 20226 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,66.5 + parent: 30 + - uid: 20227 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,75.5 + parent: 30 - uid: 20367 components: - type: Transform pos: 1.5,-42.5 parent: 30 + - uid: 20828 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,66.5 + parent: 30 - uid: 22213 components: - type: MetaData @@ -19213,6 +19247,11 @@ entities: - type: Transform pos: 9.5,35.5 parent: 30 + - uid: 5646 + components: + - type: Transform + pos: -3.5,75.5 + parent: 30 - uid: 5735 components: - type: Transform @@ -27158,6 +27197,11 @@ entities: - type: Transform pos: -79.5,-57.5 parent: 30 + - uid: 18249 + components: + - type: Transform + pos: -2.5,75.5 + parent: 30 - uid: 18814 components: - type: Transform @@ -29468,16 +29512,6 @@ entities: - type: Transform pos: -0.5,78.5 parent: 30 - - uid: 20206 - components: - - type: Transform - pos: -0.5,77.5 - parent: 30 - - uid: 20207 - components: - - type: Transform - pos: -0.5,76.5 - parent: 30 - uid: 20208 components: - type: Transform @@ -29568,16 +29602,6 @@ entities: - type: Transform pos: -2.5,66.5 parent: 30 - - uid: 20226 - components: - - type: Transform - pos: -3.5,66.5 - parent: 30 - - uid: 20227 - components: - - type: Transform - pos: -4.5,66.5 - parent: 30 - uid: 20228 components: - type: Transform @@ -29636,12 +29660,7 @@ entities: - uid: 20239 components: - type: Transform - pos: -4.5,74.5 - parent: 30 - - uid: 20240 - components: - - type: Transform - pos: -3.5,74.5 + pos: -8.5,66.5 parent: 30 - uid: 20241 components: @@ -29663,16 +29682,6 @@ entities: - type: Transform pos: 1.5,74.5 parent: 30 - - uid: 20245 - components: - - type: Transform - pos: 2.5,74.5 - parent: 30 - - uid: 20246 - components: - - type: Transform - pos: 3.5,74.5 - parent: 30 - uid: 20247 components: - type: Transform @@ -29726,17 +29735,12 @@ entities: - uid: 20257 components: - type: Transform - pos: 4.5,66.5 - parent: 30 - - uid: 20258 - components: - - type: Transform - pos: 3.5,66.5 + pos: -7.5,66.5 parent: 30 - uid: 20259 components: - type: Transform - pos: 2.5,66.5 + pos: 7.5,66.5 parent: 30 - uid: 20260 components: @@ -29748,6 +29752,11 @@ entities: - type: Transform pos: 0.5,66.5 parent: 30 + - uid: 20263 + components: + - type: Transform + pos: 6.5,66.5 + parent: 30 - uid: 20320 components: - type: Transform @@ -30478,6 +30487,31 @@ entities: - type: Transform pos: -56.5,51.5 parent: 30 + - uid: 21240 + components: + - type: Transform + pos: 5.5,65.5 + parent: 30 + - uid: 21243 + components: + - type: Transform + pos: 5.5,64.5 + parent: 30 + - uid: 21246 + components: + - type: Transform + pos: 6.5,64.5 + parent: 30 + - uid: 21247 + components: + - type: Transform + pos: -7.5,65.5 + parent: 30 + - uid: 21248 + components: + - type: Transform + pos: -7.5,64.5 + parent: 30 - uid: 21263 components: - type: Transform @@ -36997,6 +37031,326 @@ entities: - type: Transform pos: -26.5,-41.5 parent: 30 + - uid: 20737 + components: + - type: Transform + pos: -2.5,37.5 + parent: 30 + - uid: 20738 + components: + - type: Transform + pos: -0.5,40.5 + parent: 30 + - uid: 20739 + components: + - type: Transform + pos: -0.5,39.5 + parent: 30 + - uid: 20740 + components: + - type: Transform + pos: -0.5,38.5 + parent: 30 + - uid: 20741 + components: + - type: Transform + pos: -0.5,37.5 + parent: 30 + - uid: 20742 + components: + - type: Transform + pos: -1.5,37.5 + parent: 30 + - uid: 20753 + components: + - type: Transform + pos: -0.5,41.5 + parent: 30 + - uid: 20754 + components: + - type: Transform + pos: -0.5,43.5 + parent: 30 + - uid: 20755 + components: + - type: Transform + pos: -0.5,42.5 + parent: 30 + - uid: 20756 + components: + - type: Transform + pos: -0.5,44.5 + parent: 30 + - uid: 20757 + components: + - type: Transform + pos: -0.5,45.5 + parent: 30 + - uid: 20758 + components: + - type: Transform + pos: -0.5,46.5 + parent: 30 + - uid: 20759 + components: + - type: Transform + pos: -0.5,48.5 + parent: 30 + - uid: 20760 + components: + - type: Transform + pos: -0.5,47.5 + parent: 30 + - uid: 20761 + components: + - type: Transform + pos: -0.5,49.5 + parent: 30 + - uid: 20762 + components: + - type: Transform + pos: -0.5,50.5 + parent: 30 + - uid: 20763 + components: + - type: Transform + pos: -0.5,51.5 + parent: 30 + - uid: 20764 + components: + - type: Transform + pos: -0.5,52.5 + parent: 30 + - uid: 20765 + components: + - type: Transform + pos: -0.5,53.5 + parent: 30 + - uid: 20766 + components: + - type: Transform + pos: -0.5,54.5 + parent: 30 + - uid: 20767 + components: + - type: Transform + pos: -0.5,55.5 + parent: 30 + - uid: 20768 + components: + - type: Transform + pos: -0.5,56.5 + parent: 30 + - uid: 20769 + components: + - type: Transform + pos: -0.5,57.5 + parent: 30 + - uid: 20770 + components: + - type: Transform + pos: -0.5,58.5 + parent: 30 + - uid: 20771 + components: + - type: Transform + pos: -0.5,59.5 + parent: 30 + - uid: 20772 + components: + - type: Transform + pos: -0.5,60.5 + parent: 30 + - uid: 20773 + components: + - type: Transform + pos: -0.5,61.5 + parent: 30 + - uid: 20774 + components: + - type: Transform + pos: -0.5,62.5 + parent: 30 + - uid: 20775 + components: + - type: Transform + pos: -0.5,63.5 + parent: 30 + - uid: 20776 + components: + - type: Transform + pos: -0.5,64.5 + parent: 30 + - uid: 20777 + components: + - type: Transform + pos: -0.5,65.5 + parent: 30 + - uid: 20779 + components: + - type: Transform + pos: -0.5,66.5 + parent: 30 + - uid: 20780 + components: + - type: Transform + pos: -0.5,67.5 + parent: 30 + - uid: 20781 + components: + - type: Transform + pos: -0.5,69.5 + parent: 30 + - uid: 20782 + components: + - type: Transform + pos: -0.5,68.5 + parent: 30 + - uid: 20783 + components: + - type: Transform + pos: -0.5,70.5 + parent: 30 + - uid: 20784 + components: + - type: Transform + pos: -0.5,71.5 + parent: 30 + - uid: 20785 + components: + - type: Transform + pos: -0.5,73.5 + parent: 30 + - uid: 20786 + components: + - type: Transform + pos: -0.5,74.5 + parent: 30 + - uid: 20794 + components: + - type: Transform + pos: -0.5,75.5 + parent: 30 + - uid: 20795 + components: + - type: Transform + pos: -0.5,72.5 + parent: 30 + - uid: 20796 + components: + - type: Transform + pos: -0.5,76.5 + parent: 30 + - uid: 20797 + components: + - type: Transform + pos: -0.5,77.5 + parent: 30 + - uid: 20800 + components: + - type: Transform + pos: -0.5,78.5 + parent: 30 + - uid: 20801 + components: + - type: Transform + pos: 0.5,78.5 + parent: 30 + - uid: 20802 + components: + - type: Transform + pos: 1.5,78.5 + parent: 30 + - uid: 20803 + components: + - type: Transform + pos: 2.5,78.5 + parent: 30 + - uid: 20804 + components: + - type: Transform + pos: 3.5,78.5 + parent: 30 + - uid: 20808 + components: + - type: Transform + pos: 4.5,78.5 + parent: 30 + - uid: 20809 + components: + - type: Transform + pos: 4.5,79.5 + parent: 30 + - uid: 20810 + components: + - type: Transform + pos: 4.5,80.5 + parent: 30 + - uid: 20811 + components: + - type: Transform + pos: 4.5,81.5 + parent: 30 + - uid: 20812 + components: + - type: Transform + pos: 4.5,82.5 + parent: 30 + - uid: 20813 + components: + - type: Transform + pos: 4.5,83.5 + parent: 30 + - uid: 20814 + components: + - type: Transform + pos: 3.5,83.5 + parent: 30 + - uid: 20815 + components: + - type: Transform + pos: 2.5,83.5 + parent: 30 + - uid: 20816 + components: + - type: Transform + pos: 1.5,83.5 + parent: 30 + - uid: 20817 + components: + - type: Transform + pos: 0.5,83.5 + parent: 30 + - uid: 20991 + components: + - type: Transform + pos: -1.5,74.5 + parent: 30 + - uid: 20993 + components: + - type: Transform + pos: -2.5,74.5 + parent: 30 + - uid: 20994 + components: + - type: Transform + pos: -3.5,74.5 + parent: 30 + - uid: 20995 + components: + - type: Transform + pos: -4.5,74.5 + parent: 30 + - uid: 20996 + components: + - type: Transform + pos: -4.5,75.5 + parent: 30 + - uid: 20997 + components: + - type: Transform + pos: -4.5,76.5 + parent: 30 - uid: 21289 components: - type: Transform @@ -38466,6 +38820,21 @@ entities: - type: Transform pos: 8.5,42.5 parent: 30 + - uid: 5642 + components: + - type: Transform + pos: -4.5,83.5 + parent: 30 + - uid: 5643 + components: + - type: Transform + pos: -4.5,82.5 + parent: 30 + - uid: 5645 + components: + - type: Transform + pos: -3.5,83.5 + parent: 30 - uid: 5863 components: - type: Transform @@ -40891,6 +41260,11 @@ entities: - type: Transform pos: 23.5,-5.5 parent: 30 + - uid: 16931 + components: + - type: Transform + pos: -3.5,78.5 + parent: 30 - uid: 17584 components: - type: Transform @@ -41556,6 +41930,51 @@ entities: - type: Transform pos: 0.5,85.5 parent: 30 + - uid: 20206 + components: + - type: Transform + pos: -4.5,78.5 + parent: 30 + - uid: 20207 + components: + - type: Transform + pos: -4.5,81.5 + parent: 30 + - uid: 20240 + components: + - type: Transform + pos: -0.5,78.5 + parent: 30 + - uid: 20245 + components: + - type: Transform + pos: -1.5,78.5 + parent: 30 + - uid: 20246 + components: + - type: Transform + pos: -4.5,80.5 + parent: 30 + - uid: 20258 + components: + - type: Transform + pos: -2.5,78.5 + parent: 30 + - uid: 20262 + components: + - type: Transform + pos: 0.5,78.5 + parent: 30 + - uid: 20268 + components: + - type: Transform + pos: -2.5,83.5 + parent: 30 + - uid: 20269 + components: + - type: Transform + pos: -4.5,79.5 + parent: 30 - uid: 20338 components: - type: Transform @@ -41581,6 +42000,266 @@ entities: - type: Transform pos: 1.5,-42.5 parent: 30 + - uid: 20829 + components: + - type: Transform + pos: 1.5,78.5 + parent: 30 + - uid: 20830 + components: + - type: Transform + pos: 2.5,78.5 + parent: 30 + - uid: 20831 + components: + - type: Transform + pos: 3.5,78.5 + parent: 30 + - uid: 20832 + components: + - type: Transform + pos: 3.5,79.5 + parent: 30 + - uid: 20833 + components: + - type: Transform + pos: 3.5,80.5 + parent: 30 + - uid: 20834 + components: + - type: Transform + pos: 3.5,81.5 + parent: 30 + - uid: 20835 + components: + - type: Transform + pos: 3.5,82.5 + parent: 30 + - uid: 20836 + components: + - type: Transform + pos: 3.5,83.5 + parent: 30 + - uid: 20837 + components: + - type: Transform + pos: 2.5,83.5 + parent: 30 + - uid: 20838 + components: + - type: Transform + pos: 1.5,83.5 + parent: 30 + - uid: 20839 + components: + - type: Transform + pos: -0.5,77.5 + parent: 30 + - uid: 20840 + components: + - type: Transform + pos: -0.5,76.5 + parent: 30 + - uid: 20841 + components: + - type: Transform + pos: -0.5,75.5 + parent: 30 + - uid: 20842 + components: + - type: Transform + pos: -0.5,74.5 + parent: 30 + - uid: 20843 + components: + - type: Transform + pos: -0.5,73.5 + parent: 30 + - uid: 20844 + components: + - type: Transform + pos: -0.5,72.5 + parent: 30 + - uid: 20845 + components: + - type: Transform + pos: -0.5,71.5 + parent: 30 + - uid: 20846 + components: + - type: Transform + pos: -0.5,70.5 + parent: 30 + - uid: 20847 + components: + - type: Transform + pos: -0.5,69.5 + parent: 30 + - uid: 20848 + components: + - type: Transform + pos: -0.5,68.5 + parent: 30 + - uid: 20849 + components: + - type: Transform + pos: -0.5,67.5 + parent: 30 + - uid: 20850 + components: + - type: Transform + pos: -0.5,66.5 + parent: 30 + - uid: 20851 + components: + - type: Transform + pos: -1.5,66.5 + parent: 30 + - uid: 20852 + components: + - type: Transform + pos: -2.5,66.5 + parent: 30 + - uid: 20853 + components: + - type: Transform + pos: -3.5,66.5 + parent: 30 + - uid: 20854 + components: + - type: Transform + pos: -4.5,66.5 + parent: 30 + - uid: 20855 + components: + - type: Transform + pos: -5.5,66.5 + parent: 30 + - uid: 20856 + components: + - type: Transform + pos: -6.5,66.5 + parent: 30 + - uid: 20857 + components: + - type: Transform + pos: -8.5,66.5 + parent: 30 + - uid: 20858 + components: + - type: Transform + pos: -7.5,66.5 + parent: 30 + - uid: 20859 + components: + - type: Transform + pos: 0.5,66.5 + parent: 30 + - uid: 20860 + components: + - type: Transform + pos: 1.5,66.5 + parent: 30 + - uid: 20861 + components: + - type: Transform + pos: 2.5,66.5 + parent: 30 + - uid: 20862 + components: + - type: Transform + pos: 3.5,66.5 + parent: 30 + - uid: 20863 + components: + - type: Transform + pos: 4.5,66.5 + parent: 30 + - uid: 20864 + components: + - type: Transform + pos: 5.5,66.5 + parent: 30 + - uid: 20865 + components: + - type: Transform + pos: 6.5,66.5 + parent: 30 + - uid: 20866 + components: + - type: Transform + pos: 7.5,66.5 + parent: 30 + - uid: 20867 + components: + - type: Transform + pos: -1.5,74.5 + parent: 30 + - uid: 20868 + components: + - type: Transform + pos: -2.5,74.5 + parent: 30 + - uid: 20869 + components: + - type: Transform + pos: -3.5,74.5 + parent: 30 + - uid: 20870 + components: + - type: Transform + pos: -3.5,75.5 + parent: 30 + - uid: 20871 + components: + - type: Transform + pos: -6.5,67.5 + parent: 30 + - uid: 20872 + components: + - type: Transform + pos: -6.5,68.5 + parent: 30 + - uid: 20873 + components: + - type: Transform + pos: -6.5,69.5 + parent: 30 + - uid: 20874 + components: + - type: Transform + pos: -6.5,70.5 + parent: 30 + - uid: 20875 + components: + - type: Transform + pos: -6.5,71.5 + parent: 30 + - uid: 20876 + components: + - type: Transform + pos: -6.5,72.5 + parent: 30 + - uid: 20877 + components: + - type: Transform + pos: -6.5,73.5 + parent: 30 + - uid: 20878 + components: + - type: Transform + pos: -6.5,74.5 + parent: 30 + - uid: 20879 + components: + - type: Transform + pos: -5.5,74.5 + parent: 30 + - uid: 20882 + components: + - type: Transform + pos: -4.5,74.5 + parent: 30 - uid: 20893 components: - type: Transform @@ -46782,6 +47461,71 @@ entities: - type: Transform pos: -59.5,4.5 parent: 30 + - uid: 21002 + components: + - type: Transform + pos: -4.5,74.5 + parent: 30 + - uid: 21003 + components: + - type: Transform + pos: -5.5,74.5 + parent: 30 + - uid: 21005 + components: + - type: Transform + pos: -6.5,74.5 + parent: 30 + - uid: 21006 + components: + - type: Transform + pos: -6.5,68.5 + parent: 30 + - uid: 21034 + components: + - type: Transform + pos: -6.5,69.5 + parent: 30 + - uid: 21048 + components: + - type: Transform + pos: -6.5,70.5 + parent: 30 + - uid: 21049 + components: + - type: Transform + pos: -6.5,71.5 + parent: 30 + - uid: 21164 + components: + - type: Transform + pos: -6.5,72.5 + parent: 30 + - uid: 21181 + components: + - type: Transform + pos: 5.5,72.5 + parent: 30 + - uid: 21183 + components: + - type: Transform + pos: 5.5,71.5 + parent: 30 + - uid: 21184 + components: + - type: Transform + pos: 5.5,70.5 + parent: 30 + - uid: 21186 + components: + - type: Transform + pos: 5.5,69.5 + parent: 30 + - uid: 21191 + components: + - type: Transform + pos: 5.5,68.5 + parent: 30 - uid: 21610 components: - type: Transform @@ -51947,6 +52691,11 @@ entities: - type: Transform pos: -61.5,-20.5 parent: 30 + - uid: 20887 + components: + - type: Transform + pos: -6.5,76.5 + parent: 30 - proto: ComputerAnalysisConsole entities: - uid: 15282 @@ -52121,25 +52870,17 @@ entities: parent: 30 - proto: ComputerFrame entities: - - uid: 20279 - components: - - type: Transform - pos: -6.5,76.5 - parent: 30 - - uid: 20280 + - uid: 21198 components: - type: Transform - pos: -4.5,76.5 - parent: 30 - - uid: 20281 - components: - - type: Transform - pos: -5.5,76.5 + rot: 1.5707963267948966 rad + pos: -3.5,62.5 parent: 30 - - uid: 20283 + - uid: 21199 components: - type: Transform - pos: 4.5,76.5 + rot: 1.5707963267948966 rad + pos: -3.5,64.5 parent: 30 - proto: ComputerId entities: @@ -52217,6 +52958,11 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-45.5 parent: 30 + - uid: 20886 + components: + - type: Transform + pos: -5.5,76.5 + parent: 30 - proto: ComputerRadar entities: - uid: 22100 @@ -52254,6 +53000,11 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,9.5 parent: 30 + - uid: 20961 + components: + - type: Transform + pos: 4.5,76.5 + parent: 30 - proto: ComputerRoboticsControl entities: - uid: 10251 @@ -52307,6 +53058,11 @@ entities: - type: Transform pos: -64.5,44.5 parent: 30 + - uid: 20888 + components: + - type: Transform + pos: -4.5,76.5 + parent: 30 - proto: ComputerStationRecords entities: - uid: 1397 @@ -59842,6 +60598,11 @@ entities: - type: Transform pos: 22.5,22.5 parent: 30 + - uid: 20960 + components: + - type: Transform + pos: 5.5,76.5 + parent: 30 - proto: ExtendedEmergencyOxygenTankFilled entities: - uid: 20295 @@ -94815,16 +95576,6 @@ entities: - type: Transform pos: -0.5,76.5 parent: 30 - - uid: 20262 - components: - - type: Transform - pos: -0.5,67.5 - parent: 30 - - uid: 20263 - components: - - type: Transform - pos: -0.5,73.5 - parent: 30 - proto: HolofanProjector entities: - uid: 21278 @@ -95187,11 +95938,17 @@ entities: parent: 30 - proto: IntercomCommand entities: - - uid: 22513 + - uid: 21194 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,82.5 + rot: 3.141592653589793 rad + pos: 0.5,73.5 + parent: 30 + - uid: 21195 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,62.5 parent: 30 - proto: IntercomCommon entities: @@ -95240,12 +95997,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-33.5 parent: 30 - - uid: 22514 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,82.5 - parent: 30 - proto: IntercomMedical entities: - uid: 7346 @@ -95260,11 +96011,6 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-8.5 parent: 30 - - uid: 22516 - components: - - type: Transform - pos: -1.5,85.5 - parent: 30 - proto: IntercomScience entities: - uid: 14357 @@ -95285,12 +96031,6 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,23.5 parent: 30 - - uid: 22518 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,84.5 - parent: 30 - proto: IntercomSecurity entities: - uid: 4377 @@ -95316,12 +96056,6 @@ entities: rot: 1.5707963267948966 rad pos: -49.5,44.5 parent: 30 - - uid: 22515 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,81.5 - parent: 30 - proto: IntercomService entities: - uid: 4386 @@ -95340,11 +96074,6 @@ entities: - type: Transform pos: -9.5,15.5 parent: 30 - - uid: 22517 - components: - - type: Transform - pos: -0.5,85.5 - parent: 30 - proto: IntercomSupply entities: - uid: 22295 @@ -95359,12 +96088,6 @@ entities: rot: 3.141592653589793 rad pos: 30.5,-8.5 parent: 30 - - uid: 22519 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,84.5 - parent: 30 - proto: IronRockMining entities: - uid: 1955 @@ -100049,7 +100772,7 @@ entities: - uid: 20308 components: - type: Transform - pos: -0.61799335,65.47986 + pos: 2.470478,63.557354 parent: 30 - proto: PhoneInstrument entities: @@ -100377,11 +101100,6 @@ entities: - type: Transform pos: -19.5,-37.5 parent: 30 - - uid: 21948 - components: - - type: Transform - pos: 0.5,84.5 - parent: 30 - proto: PortableScrubber entities: - uid: 8285 @@ -103781,6 +104499,12 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 21229 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,42.5 + parent: 30 - uid: 21362 components: - type: Transform @@ -103843,6 +104567,48 @@ entities: - type: Transform pos: -12.5,-58.5 parent: 30 + - uid: 20747 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,71.5 + parent: 30 + - uid: 20749 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,71.5 + parent: 30 + - uid: 20751 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,63.5 + parent: 30 + - uid: 20752 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,63.5 + parent: 30 + - uid: 21230 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,84.5 + parent: 30 + - uid: 21238 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,84.5 + parent: 30 + - uid: 21239 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,90.5 + parent: 30 - proto: PoweredlightLED entities: - uid: 10291 @@ -110661,6 +111427,11 @@ entities: - type: Transform pos: -25.514673,-43.671646 parent: 30 + - uid: 20979 + components: + - type: Transform + pos: 3.6399727,76.41426 + parent: 30 - proto: SheetPlasma entities: - uid: 11365 @@ -110894,6 +111665,11 @@ entities: - type: Transform pos: -21.483423,-47.53102 parent: 30 + - uid: 20966 + components: + - type: Transform + pos: 3.4368477,76.554886 + parent: 30 - proto: SheetUranium entities: - uid: 19800 @@ -111398,6 +112174,11 @@ entities: - type: Transform pos: -1.5,60.5 parent: 30 + - uid: 20734 + components: + - type: Transform + pos: -18.5,41.5 + parent: 30 - proto: SignalButton entities: - uid: 381 @@ -113034,11 +113815,6 @@ entities: - type: Transform pos: -20.5,41.5 parent: 30 - - uid: 22461 - components: - - type: Transform - pos: -18.5,41.5 - parent: 30 - proto: SignSecureMedRed entities: - uid: 2407 @@ -116371,6 +117147,252 @@ entities: parent: 30 - proto: SurveillanceCameraCommand entities: + - uid: 20270 + components: + - type: Transform + pos: -0.5,87.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core + - uid: 20271 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,83.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core + - uid: 20279 + components: + - type: Transform + pos: 4.5,74.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: 'AI Core ' + - uid: 20280 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,79.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core + - uid: 20281 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,84.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext E + - uid: 20283 + components: + - type: Transform + pos: 0.5,74.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: 'AI Core ' + - uid: 20284 + components: + - type: Transform + pos: -5.5,74.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: 'AI Core ' + - uid: 20307 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,84.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext W + - uid: 20735 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,83.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core + - uid: 20743 + components: + - type: Transform + pos: -3.5,68.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Bridge + - uid: 20744 + components: + - type: Transform + pos: 2.5,68.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Bridge + - uid: 20745 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,72.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Bridge + - uid: 20746 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,72.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Bridge + - uid: 20818 + components: + - type: Transform + pos: -0.5,90.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext N + - uid: 20819 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,84.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Core Core + - uid: 20820 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,66.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Entrance + - uid: 20821 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,66.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core + - uid: 20822 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,66.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core + - uid: 20823 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,71.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext W + - uid: 20824 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,71.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext E + - uid: 20825 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,63.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext SE + - uid: 20826 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,63.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext SW + - uid: 20827 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,58.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext S - uid: 21172 components: - type: Transform @@ -116457,6 +117479,70 @@ entities: - SurveillanceCameraCommand nameSet: True id: Vault + - uid: 21201 + components: + - type: Transform + pos: 0.5,42.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Airlock + - uid: 21202 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,38.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Airlock + - uid: 21209 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,35.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: HoP Bedroom + - uid: 21218 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,39.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Captain's Bathroom + - uid: 21227 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -18.5,40.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Junction + - uid: 21228 + components: + - type: Transform + pos: -18.5,42.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Tube - uid: 21286 components: - type: Transform @@ -116652,6 +117738,166 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmos Hall + - uid: 21313 + components: + - type: Transform + pos: 1.5,-41.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Entrance + - uid: 21314 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-47.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: TEG Room + - uid: 21356 + components: + - type: Transform + pos: -1.5,-53.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: TEG Room + - uid: 21361 + components: + - type: Transform + pos: -5.5,-36.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: CE Office + - uid: 21377 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-42.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering + - uid: 21392 + components: + - type: Transform + pos: -15.5,-37.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Secure Storage + - uid: 21393 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-47.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: AME Room + - uid: 21394 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,-39.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering Breakroom + - uid: 21395 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,-46.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Lockerroom + - uid: 21396 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,-47.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: PA Entrance + - uid: 21397 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-54.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Particle Accelerator + - uid: 21398 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,-58.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Singulo Cage + - uid: 21399 + components: + - type: Transform + pos: -9.5,-56.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Tesla Storage + - uid: 21451 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -38.5,26.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Materials Room + - uid: 21452 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -63.5,44.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars NW - proto: SurveillanceCameraGeneral entities: - uid: 1039 @@ -116697,6 +117943,49 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Game Room + - uid: 21210 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,27.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bridge Hallway + - uid: 21214 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -28.5,27.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Toolroom + - uid: 21216 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,24.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Material Room + - uid: 21217 + components: + - type: Transform + pos: -33.5,35.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Security - uid: 21231 components: - type: Transform @@ -116763,6 +118052,313 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Tool Room + - uid: 21254 + components: + - type: Transform + pos: 14.5,25.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall robotics + - uid: 21255 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,28.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Dorms + - uid: 21256 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,27.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bathroom + - uid: 21280 + components: + - type: Transform + pos: 21.5,42.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Laundry Room + - uid: 21308 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,29.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Shower Room + - uid: 21309 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,42.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Cryosleep + - uid: 21400 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-18.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Atmos + - uid: 21401 + components: + - type: Transform + pos: -60.5,-35.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel Courtyard + - uid: 21402 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -60.5,-51.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel Farm + - uid: 21403 + components: + - type: Transform + pos: -79.5,-40.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chaplain Office + - uid: 21404 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -73.5,-42.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel Courtyard + - uid: 21405 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -55.5,-39.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel Airlock + - uid: 21406 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -63.5,-62.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Library + - uid: 21407 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -73.5,-53.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel Kitchen + - uid: 21408 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -75.5,-53.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel Kitchen + - uid: 21409 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -48.5,-22.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel Tunnel + - uid: 21410 + components: + - type: Transform + pos: -58.5,-9.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 21411 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,10.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 21424 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -45.5,0.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 21426 + components: + - type: Transform + pos: -31.5,1.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Jani + - uid: 21430 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,11.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Arrivals + - uid: 21450 + components: + - type: Transform + pos: -43.5,13.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Evac + - uid: 21453 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -32.5,23.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Musician Room + - uid: 21459 + components: + - type: Transform + pos: 3.5,6.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bar + - uid: 21460 + components: + - type: Transform + pos: 3.5,13.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Theater Room + - uid: 21461 + components: + - type: Transform + pos: 10.5,1.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Cargo + - uid: 21466 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-3.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Spacebucks + - uid: 21469 + components: + - type: Transform + pos: 2.5,-10.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Spacebucks + - uid: 21495 + components: + - type: Transform + pos: -20.5,1.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Botany - proto: SurveillanceCameraMedical entities: - uid: 8290 @@ -117071,6 +118667,48 @@ entities: - SurveillanceCameraScience nameSet: True id: Sci Lobby + - uid: 21257 + components: + - type: Transform + pos: 30.5,18.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Anomaly Gen + - uid: 21258 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,13.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: RD Bedroom + - uid: 21261 + components: + - type: Transform + pos: 26.5,7.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: RND + - uid: 21279 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,11.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Sci Server Room - proto: SurveillanceCameraSecurity entities: - uid: 1947 @@ -117274,6 +118912,17 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Lawyer's Office + - uid: 21310 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,41.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Court Room - proto: SurveillanceCameraService entities: - uid: 1944 @@ -117353,6 +119002,37 @@ entities: - SurveillanceCameraService nameSet: True id: Freezer + - uid: 21429 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,6.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Jani Closet + - uid: 21457 + components: + - type: Transform + pos: -23.5,15.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Botany Backroom + - uid: 21458 + components: + - type: Transform + pos: -30.5,12.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Jani Backroom - proto: SurveillanceCameraSupply entities: - uid: 15202 @@ -117431,6 +119111,27 @@ entities: - SurveillanceCameraSupply nameSet: True id: Quartermaster's Room + - uid: 21311 + components: + - type: Transform + pos: 37.5,-6.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock 2 + - uid: 21312 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,-2.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock 1 - proto: SynthesizerInstrument entities: - uid: 15112 @@ -118534,6 +120235,12 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-26.5 parent: 30 + - uid: 20264 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,63.5 + parent: 30 - uid: 20272 components: - type: Transform @@ -120485,13 +122192,6 @@ entities: - type: Transform pos: 6.5231524,64.57765 parent: 30 -- proto: ToyAi - entities: - - uid: 20307 - components: - - type: Transform - pos: -0.49299335,82.64046 - parent: 30 - proto: ToyFigurineSpaceDragon entities: - uid: 20547 @@ -120770,11 +122470,6 @@ entities: - type: Transform pos: 23.5,22.5 parent: 30 - - uid: 20284 - components: - - type: Transform - pos: 5.5,76.5 - parent: 30 - uid: 21161 components: - type: Transform @@ -136773,58 +138468,6 @@ entities: - type: Transform pos: -22.590364,53.546127 parent: 30 -- proto: WeaponTurretSyndicateBroken - entities: - - uid: 22089 - components: - - type: Transform - pos: -4.5,79.5 - parent: 30 - - uid: 22090 - components: - - type: Transform - pos: 3.5,79.5 - parent: 30 - - uid: 22091 - components: - - type: Transform - pos: 4.5,83.5 - parent: 30 - - uid: 22092 - components: - - type: Transform - pos: 3.5,87.5 - parent: 30 - - uid: 22093 - components: - - type: Transform - pos: -4.5,87.5 - parent: 30 - - uid: 22094 - components: - - type: Transform - pos: -5.5,83.5 - parent: 30 - - uid: 22095 - components: - - type: Transform - pos: -3.5,71.5 - parent: 30 - - uid: 22096 - components: - - type: Transform - pos: -3.5,69.5 - parent: 30 - - uid: 22097 - components: - - type: Transform - pos: 2.5,69.5 - parent: 30 - - uid: 22098 - components: - - type: Transform - pos: 2.5,71.5 - parent: 30 - proto: Welder entities: - uid: 1633 @@ -137891,33 +139534,12 @@ entities: rot: -1.5707963267948966 rad pos: -17.5,43.5 parent: 30 - - uid: 5642 - components: - - type: Transform - pos: -19.5,44.5 - parent: 30 - - uid: 5643 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,43.5 - parent: 30 - uid: 5644 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,42.5 parent: 30 - - uid: 5645 - components: - - type: Transform - pos: -18.5,44.5 - parent: 30 - - uid: 5646 - components: - - type: Transform - pos: -20.5,44.5 - parent: 30 - uid: 5827 components: - type: Transform @@ -138488,17 +140110,17 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,-34.5 parent: 30 - - uid: 22456 + - uid: 20748 components: - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,43.5 + rot: -1.5707963267948966 rad + pos: -17.5,44.5 parent: 30 - - uid: 22457 + - uid: 20750 components: - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,43.5 + rot: 1.5707963267948966 rad + pos: -18.5,44.5 parent: 30 - uid: 22458 components: From 60cf24d56e7ac241b625e74d291ca1179db3fd48 Mon Sep 17 00:00:00 2001 From: PopGamer46 Date: Sun, 25 Aug 2024 08:58:51 +0200 Subject: [PATCH 055/223] Give sec cadets jackboots instead of combat boots (#31419) give cadets jackboots --- Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 4561d1adb0e..cee8a88264e 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -28,7 +28,7 @@ - type: startingGear id: SecurityCadetGear equipment: - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsJackFilled outerClothing: ClothingOuterArmorBasic id: SecurityCadetPDA ears: ClothingHeadsetSecurity From 0ced72d3ac94efbcf6bf645530705a07b171e1e8 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 06:59:57 +0000 Subject: [PATCH 056/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 69e075278b2..c081db7a5a3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: AJCM-git - changes: - - message: When people with less than an hour playing join the game, the guidebook - is automatically opened for them. - type: Tweak - id: 6705 - time: '2024-06-09T16:26:48.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28774 - author: Aeshus changes: - message: Salvage has a comprehensive guide. @@ -3868,3 +3860,10 @@ id: 7204 time: '2024-08-25T05:42:19.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31415 +- author: PopGamer46 + changes: + - message: Security cadets now spawn with jackboots instead of combat boots + type: Tweak + id: 7205 + time: '2024-08-25T06:58:51.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31419 From 0adb28e9837aad5c3f5c6fd6a4183a8562c6f5a7 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Sun, 25 Aug 2024 01:26:03 -0600 Subject: [PATCH 057/223] meta update (#31423) --- Resources/Maps/meta.yml | 1554 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 1450 insertions(+), 104 deletions(-) diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 1cc77d85da2..6434c6ef774 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -171,7 +171,7 @@ entities: version: 6 3,-2: ind: 3,-2 - tiles: eQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: eQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 3,-1: ind: 3,-1 @@ -283,11 +283,11 @@ entities: version: 6 4,-1: ind: 4,-1 - tiles: eQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: eQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,-2: ind: 4,-2 - tiles: eAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATgAAAAAATgAAAAAATgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAA + tiles: eAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAA version: 6 3,-3: ind: 3,-3 @@ -411,7 +411,7 @@ entities: version: 6 6,0: ind: 6,0 - tiles: HQAAAAABHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAADHQAAAAABHQAAAAACHQAAAAACeQAAAAAAHQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAABHQAAAAADHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAABeAAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAACeQAAAAAAHQAAAAADHQAAAAADHQAAAAACHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAACHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADEQAAAAAAEQAAAAAAHQAAAAACEQAAAAAAEQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAEQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAEQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAEQAAAAAAeQAAAAAANgAAAAAAeQAAAAAAEQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAANgAAAAAAHQAAAAABEQAAAAAAHQAAAAACHQAAAAABHQAAAAACEQAAAAAAHQAAAAADNgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADEQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAHQAAAAABeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAA + tiles: HQAAAAABHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAADHQAAAAABHQAAAAACHQAAAAACeQAAAAAAHQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAABHQAAAAADHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAABeAAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAACeQAAAAAATQAAAAAAHQAAAAADHQAAAAACHQAAAAABTQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAACHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADEQAAAAAAEQAAAAAAHQAAAAACEQAAAAAAEQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAEQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAEQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAEQAAAAAAeQAAAAAANgAAAAAAeQAAAAAAEQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAANgAAAAAAHQAAAAABEQAAAAAAHQAAAAACHQAAAAABHQAAAAACEQAAAAAAHQAAAAADNgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADEQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAHQAAAAABeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAA version: 6 6,-1: ind: 6,-1 @@ -630,6 +630,7 @@ entities: 3259: 45,17 3260: 49,7 3261: 49,9 + 3515: 62,-1 - node: color: '#FFFFFFFF' id: BotGreyscale @@ -3616,6 +3617,11 @@ entities: 95: -16,-17 1967: 106,-1 1968: 105,-1 + 3504: 59,-3 + 3505: 61,-3 + 3506: 58,-3 + 3507: 60,-3 + 3508: 62,-3 - node: color: '#52B4E92E' id: QuarterTileOverlayGreyscale180 @@ -4214,6 +4220,12 @@ entities: 1944: 106,1 1945: 105,1 1946: 105,2 + 3509: 62,1 + 3510: 61,1 + 3511: 60,1 + 3512: 59,1 + 3513: 58,1 + 3514: 57,1 - node: color: '#52B4E92E' id: QuarterTileOverlayGreyscale90 @@ -10244,13 +10256,6 @@ entities: - type: Transform pos: 9.5,2.5 parent: 5350 - - uid: 8919 - components: - - type: MetaData - name: Drone Closet - - type: Transform - pos: 44.5,-1.5 - parent: 5350 - proto: AirlockCargoGlassLocked entities: - uid: 3393 @@ -10420,6 +10425,18 @@ entities: - type: Transform pos: 0.5,-17.5 parent: 5350 + - uid: 10775 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-1.5 + parent: 5350 + - uid: 12075 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-2.5 + parent: 5350 - uid: 26226 components: - type: Transform @@ -10483,6 +10500,11 @@ entities: - DoorStatus: DoorBolt - proto: AirlockEngineeringLocked entities: + - uid: 1032 + components: + - type: Transform + pos: 44.5,-1.5 + parent: 5350 - uid: 1109 components: - type: Transform @@ -10804,7 +10826,7 @@ entities: pos: -42.5,29.5 parent: 5350 - type: Door - secondsUntilStateChange: -2186.3599 + secondsUntilStateChange: -3920.309 state: Opening - type: DeviceLinkSink invokeCounter: 2 @@ -15461,6 +15483,12 @@ entities: - type: Transform pos: 57.5,1.5 parent: 5350 + - uid: 26810 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,0.5 + parent: 5350 - proto: BoxBeaker entities: - uid: 3708 @@ -34400,6 +34428,56 @@ entities: - type: Transform pos: 18.5,-27.5 parent: 5350 + - uid: 26658 + components: + - type: Transform + pos: 7.5,-14.5 + parent: 5350 + - uid: 26659 + components: + - type: Transform + pos: 6.5,-14.5 + parent: 5350 + - uid: 26660 + components: + - type: Transform + pos: 9.5,-14.5 + parent: 5350 + - uid: 26686 + components: + - type: Transform + pos: 10.5,-14.5 + parent: 5350 + - uid: 26767 + components: + - type: Transform + pos: -6.5,61.5 + parent: 5350 + - uid: 26768 + components: + - type: Transform + pos: -7.5,61.5 + parent: 5350 + - uid: 26769 + components: + - type: Transform + pos: -5.5,61.5 + parent: 5350 + - uid: 26842 + components: + - type: Transform + pos: 76.5,5.5 + parent: 5350 + - uid: 26843 + components: + - type: Transform + pos: 76.5,4.5 + parent: 5350 + - uid: 26844 + components: + - type: Transform + pos: 76.5,3.5 + parent: 5350 - proto: CableApcStack entities: - uid: 1550 @@ -37644,6 +37722,11 @@ entities: - type: Transform pos: 42.5,-17.5 parent: 5350 + - uid: 12076 + components: + - type: Transform + pos: 97.5,0.5 + parent: 5350 - uid: 12385 components: - type: Transform @@ -42589,11 +42672,26 @@ entities: - type: Transform pos: 31.5,-46.5 parent: 5350 + - uid: 22700 + components: + - type: Transform + pos: 99.5,0.5 + parent: 5350 + - uid: 22704 + components: + - type: Transform + pos: 95.5,0.5 + parent: 5350 - uid: 22769 components: - type: Transform pos: -11.5,-43.5 parent: 5350 + - uid: 23129 + components: + - type: Transform + pos: 96.5,0.5 + parent: 5350 - uid: 23399 components: - type: Transform @@ -43234,6 +43332,11 @@ entities: - type: Transform pos: 47.5,-23.5 parent: 5350 + - uid: 25808 + components: + - type: Transform + pos: 104.5,13.5 + parent: 5350 - uid: 25988 components: - type: Transform @@ -43254,6 +43357,21 @@ entities: - type: Transform pos: 111.5,2.5 parent: 5350 + - uid: 26232 + components: + - type: Transform + pos: 100.5,0.5 + parent: 5350 + - uid: 26304 + components: + - type: Transform + pos: 101.5,0.5 + parent: 5350 + - uid: 26305 + components: + - type: Transform + pos: 102.5,0.5 + parent: 5350 - uid: 26389 components: - type: Transform @@ -43274,6 +43392,101 @@ entities: - type: Transform pos: 110.5,-0.5 parent: 5350 + - uid: 26416 + components: + - type: Transform + pos: 103.5,0.5 + parent: 5350 + - uid: 26417 + components: + - type: Transform + pos: 104.5,0.5 + parent: 5350 + - uid: 26811 + components: + - type: Transform + pos: 98.5,0.5 + parent: 5350 + - uid: 26812 + components: + - type: Transform + pos: 104.5,1.5 + parent: 5350 + - uid: 26813 + components: + - type: Transform + pos: 104.5,2.5 + parent: 5350 + - uid: 26814 + components: + - type: Transform + pos: 104.5,3.5 + parent: 5350 + - uid: 26815 + components: + - type: Transform + pos: 104.5,4.5 + parent: 5350 + - uid: 26816 + components: + - type: Transform + pos: 104.5,5.5 + parent: 5350 + - uid: 26817 + components: + - type: Transform + pos: 104.5,6.5 + parent: 5350 + - uid: 26818 + components: + - type: Transform + pos: 103.5,6.5 + parent: 5350 + - uid: 26819 + components: + - type: Transform + pos: 102.5,6.5 + parent: 5350 + - uid: 26820 + components: + - type: Transform + pos: 102.5,7.5 + parent: 5350 + - uid: 26821 + components: + - type: Transform + pos: 102.5,8.5 + parent: 5350 + - uid: 26822 + components: + - type: Transform + pos: 102.5,9.5 + parent: 5350 + - uid: 26823 + components: + - type: Transform + pos: 102.5,10.5 + parent: 5350 + - uid: 26824 + components: + - type: Transform + pos: 102.5,11.5 + parent: 5350 + - uid: 26825 + components: + - type: Transform + pos: 102.5,12.5 + parent: 5350 + - uid: 26826 + components: + - type: Transform + pos: 103.5,12.5 + parent: 5350 + - uid: 26827 + components: + - type: Transform + pos: 103.5,13.5 + parent: 5350 - proto: CableHVStack entities: - uid: 1551 @@ -50188,11 +50401,6 @@ entities: - type: Transform pos: 105.5,6.5 parent: 5350 - - uid: 25976 - components: - - type: Transform - pos: 105.5,7.5 - parent: 5350 - uid: 25977 components: - type: Transform @@ -50353,6 +50561,56 @@ entities: - type: Transform pos: 8.5,-27.5 parent: 5350 + - uid: 26830 + components: + - type: Transform + pos: 104.5,13.5 + parent: 5350 + - uid: 26831 + components: + - type: Transform + pos: 104.5,12.5 + parent: 5350 + - uid: 26832 + components: + - type: Transform + pos: 105.5,12.5 + parent: 5350 + - uid: 26833 + components: + - type: Transform + pos: 106.5,12.5 + parent: 5350 + - uid: 26834 + components: + - type: Transform + pos: 106.5,11.5 + parent: 5350 + - uid: 26835 + components: + - type: Transform + pos: 106.5,10.5 + parent: 5350 + - uid: 26836 + components: + - type: Transform + pos: 106.5,9.5 + parent: 5350 + - uid: 26837 + components: + - type: Transform + pos: 106.5,8.5 + parent: 5350 + - uid: 26838 + components: + - type: Transform + pos: 106.5,7.5 + parent: 5350 + - uid: 26839 + components: + - type: Transform + pos: 105.5,7.5 + parent: 5350 - proto: CableMVStack entities: - uid: 1548 @@ -50434,6 +50692,12 @@ entities: rot: 3.141592653589793 rad pos: 47.5,-24.5 parent: 5350 + - uid: 25869 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 103.5,12.5 + parent: 5350 - uid: 25992 components: - type: Transform @@ -60650,6 +60914,11 @@ entities: - type: Transform pos: 41.583923,-36.62425 parent: 5350 + - uid: 26807 + components: + - type: Transform + pos: 61.47438,1.4628983 + parent: 5350 - proto: ClothingMaskBreathMedical entities: - uid: 15675 @@ -62662,6 +62931,11 @@ entities: - 0 - 0 - 0 + - uid: 26793 + components: + - type: Transform + pos: 42.5,-0.5 + parent: 5350 - proto: CrateEngineeringCableHV entities: - uid: 17216 @@ -63049,6 +63323,11 @@ entities: - type: Transform pos: 22.529781,-29.351112 parent: 5350 + - uid: 26804 + components: + - type: Transform + pos: 59.646255,1.4628983 + parent: 5350 - proto: CrowbarRed entities: - uid: 1535 @@ -70419,6 +70698,11 @@ entities: - type: Transform pos: -26.549986,39.52742 parent: 5350 + - uid: 26806 + components: + - type: Transform + pos: 61.38063,1.6503983 + parent: 5350 - proto: EmergencyRollerBedSpawnFolded entities: - uid: 22948 @@ -73360,6 +73644,11 @@ entities: - type: Transform pos: 12.432602,37.803913 parent: 5350 + - uid: 26805 + components: + - type: Transform + pos: 60.427505,1.5878983 + parent: 5350 - proto: FlashlightSeclite entities: - uid: 10004 @@ -115114,16 +115403,6 @@ entities: - type: Transform pos: 56.5,37.5 parent: 5350 - - uid: 12075 - components: - - type: Transform - pos: 57.5,-2.5 - parent: 5350 - - uid: 12076 - components: - - type: Transform - pos: 57.5,-1.5 - parent: 5350 - uid: 26234 components: - type: Transform @@ -115564,6 +115843,12 @@ entities: rot: 1.5707963267948966 rad pos: 103.5,8.5 parent: 5350 + - uid: 26808 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-0.5 + parent: 5350 - proto: IntercomCommon entities: - uid: 24804 @@ -124117,6 +124402,11 @@ entities: parent: 5350 - type: ApcPowerReceiver powerLoad: 0 + - uid: 26845 + components: + - type: Transform + pos: 76.5,1.5 + parent: 5350 - proto: PoweredlightSodium entities: - uid: 23878 @@ -131986,26 +132276,6 @@ entities: - type: Transform pos: 1.5,-13.5 parent: 5350 - - uid: 26459 - components: - - type: Transform - pos: 103.5,2.5 - parent: 5350 - - uid: 26460 - components: - - type: Transform - pos: 105.5,2.5 - parent: 5350 - - uid: 26461 - components: - - type: Transform - pos: 105.5,-2.5 - parent: 5350 - - uid: 26462 - components: - - type: Transform - pos: 103.5,-2.5 - parent: 5350 - proto: ShowcaseRobotAntique entities: - uid: 1975 @@ -132659,6 +132929,13 @@ entities: - type: Transform pos: 56.5,-0.5 parent: 5350 +- proto: SignAiUpload + entities: + - uid: 24179 + components: + - type: Transform + pos: -8.5,11.5 + parent: 5350 - proto: SignalButton entities: - uid: 1369 @@ -134064,6 +134341,30 @@ entities: - type: Transform pos: 74.5,31.5 parent: 5350 +- proto: SignRedOne + entities: + - uid: 26775 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,49.5 + parent: 5350 +- proto: SignRedThree + entities: + - uid: 26777 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,49.5 + parent: 5350 +- proto: SignRedTwo + entities: + - uid: 26776 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,49.5 + parent: 5350 - proto: SignRND entities: - uid: 22989 @@ -134167,11 +134468,6 @@ entities: - type: Transform pos: -12.5,11.5 parent: 5350 - - uid: 10775 - components: - - type: Transform - pos: -8.5,11.5 - parent: 5350 - uid: 14060 components: - type: Transform @@ -134197,6 +134493,12 @@ entities: - type: Transform pos: 20.5,-48.5 parent: 5350 + - uid: 26809 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,-3.5 + parent: 5350 - proto: SignSecureMedRed entities: - uid: 10471 @@ -134781,10 +135083,10 @@ entities: - type: Transform pos: 109.5,2.5 parent: 5350 - - uid: 25869 + - uid: 26828 components: - type: Transform - pos: 104.5,13.5 + pos: 103.5,13.5 parent: 5350 - proto: SmokingPipeFilledCannabis entities: @@ -137806,6 +138108,11 @@ entities: - type: Transform pos: 108.5,2.5 parent: 5350 + - uid: 26829 + components: + - type: Transform + pos: 104.5,13.5 + parent: 5350 - proto: SuitStorageCaptain entities: - uid: 1505 @@ -138097,6 +138404,17 @@ entities: - SurveillanceCameraCommand nameSet: True id: Vault + - uid: 8919 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 112.5,-4.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Ext E - uid: 10749 components: - type: Transform @@ -138160,6 +138478,17 @@ entities: - SurveillanceCameraCommand nameSet: True id: Telecomms + - uid: 25814 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 69.5,1.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Tunnel - uid: 26400 components: - type: Transform @@ -138268,6 +138597,60 @@ entities: rot: 3.141592653589793 rad pos: 92.5,5.5 parent: 5350 + - uid: 26418 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,2.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Captain's Bathroom + - uid: 26657 + components: + - type: Transform + pos: -4.5,-16.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Showroom + - uid: 26782 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 58.5,-0.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Tunnel + - uid: 26801 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 105.5,-2.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Telecomms Command Room + - uid: 26846 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 78.5,2.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Core Tunnel - proto: SurveillanceCameraEngineering entities: - uid: 11516 @@ -138476,6 +138859,167 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Grav Gen + - uid: 26745 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,-5.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Desk + - uid: 26764 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,44.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars NW + - uid: 26783 + components: + - type: Transform + pos: 56.5,-30.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tank Oxy + - uid: 26784 + components: + - type: Transform + pos: 52.5,-30.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tank Nitro + - uid: 26785 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,-19.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tank Co2 + - uid: 26786 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,-15.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tank Plasma + - uid: 26787 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,-11.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tank Waste + - uid: 26788 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 69.5,-7.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Tank Mixer + - uid: 26789 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 68.5,-23.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Exterior + - uid: 26792 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 43.5,-0.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Materials Room + - uid: 26794 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 62.5,37.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars NE + - uid: 26795 + components: + - type: Transform + pos: 56.5,43.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Grav Gen Exterior + - uid: 26802 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 99.5,-3.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Telecomms Entrance + - uid: 26849 + components: + - type: Transform + pos: 37.5,-60.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars SE + - uid: 26850 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -38.5,-62.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solars SW - proto: SurveillanceCameraGeneral entities: - uid: 23189 @@ -138585,6 +139129,451 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Tool Room + - uid: 26419 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-3.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall HoP + - uid: 26420 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,8.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Cargo Lobby + - uid: 26459 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,-8.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Library + - uid: 26460 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -31.5,-15.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: GameRoom + - uid: 26461 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-15.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Librarian Room + - uid: 26462 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -19.5,-18.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Chem + - uid: 26645 + components: + - type: Transform + pos: -6.5,-63.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac 1 + - uid: 26646 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-69.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Evac 2 + - uid: 26648 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-67.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chapel + - uid: 26649 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-55.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Evac + - uid: 26650 + components: + - type: Transform + pos: -25.5,-67.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chaplain Office + - uid: 26651 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-70.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Chaplain Funerary + - uid: 26652 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-48.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Genetics + - uid: 26653 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-37.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Robotics + - uid: 26656 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-18.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Showroom + - uid: 26696 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-18.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Vault + - uid: 26742 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-17.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Botany + - uid: 26747 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-7.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Captain + - uid: 26748 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,4.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Bar + - uid: 26749 + components: + - type: Transform + pos: 6.5,8.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Courtroom + - uid: 26750 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -34.5,0.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Cargo + - uid: 26751 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -46.5,1.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Arrivals + - uid: 26752 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,-2.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Club + - uid: 26753 + components: + - type: Transform + pos: -59.5,-9.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 26754 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -54.5,6.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 26755 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -64.5,8.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 26756 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -71.5,8.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 26757 + components: + - type: Transform + pos: -72.5,-9.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals + - uid: 26758 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -69.5,-17.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals Docks + - uid: 26762 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,23.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Jani + - uid: 26779 + components: + - type: Transform + pos: 33.5,37.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Boxing Ring + - uid: 26780 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,37.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Holodeck + - uid: 26781 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,29.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Dorms Hall + - uid: 26790 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,-9.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Theater Room + - uid: 26791 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,4.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Engi + - uid: 26796 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.5,47.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Boxing Ring Escape Pod + - uid: 26797 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,20.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Cryosleep + - uid: 26799 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,17.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Sec + - uid: 26800 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,6.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Bridge Shop + - uid: 26847 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,7.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Tool Room + - uid: 26848 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,11.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Main Hall Bridge - proto: SurveillanceCameraMedical entities: - uid: 14402 @@ -138706,6 +139695,113 @@ entities: - SurveillanceCameraMedical nameSet: True id: Cryonics + - uid: 26501 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,-33.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Storage + - uid: 26502 + components: + - type: Transform + pos: -30.5,-47.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Surgery Hallway + - uid: 26503 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-49.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: 'Medical Hall ' + - uid: 26526 + components: + - type: Transform + pos: -18.5,-55.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical South + - uid: 26636 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-57.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Storage 2 + - uid: 26637 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-54.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Medical Breakroom + - uid: 26640 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -49.5,-56.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Virology + - uid: 26643 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,-51.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Viro Chamber + - uid: 26644 + components: + - type: Transform + pos: -53.5,-52.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Viro Room 1 + - uid: 26655 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-31.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Paramedic Garage - proto: SurveillanceCameraRouterCommand entities: - uid: 24071 @@ -138883,6 +139979,80 @@ entities: - SurveillanceCameraScience nameSet: True id: Sci Lobby + - uid: 26654 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-29.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Robotics Bay + - uid: 26704 + components: + - type: Transform + pos: 8.5,-32.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Entrance + - uid: 26705 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-43.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Center + - uid: 26738 + components: + - type: Transform + pos: 10.5,-55.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Toxins + - uid: 26739 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-54.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Lockerroom + - uid: 26740 + components: + - type: Transform + pos: 26.5,-43.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Science Hall + - uid: 26741 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-28.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Artifact Lab - proto: SurveillanceCameraSecurity entities: - uid: 10469 @@ -139034,6 +140204,113 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Gun Range + - uid: 26647 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-70.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Evac Security post + - uid: 26765 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,38.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Security Hall + - uid: 26766 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,48.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Hall + - uid: 26770 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,57.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Exterior + - uid: 26771 + components: + - type: Transform + pos: -3.5,63.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Exterior + - uid: 26772 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,51.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Brig 3 + - uid: 26773 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,51.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Brig 2 + - uid: 26774 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,51.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Brig 1 + - uid: 26778 + components: + - type: Transform + pos: 1.5,50.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Med + - uid: 26798 + components: + - type: Transform + pos: 13.5,17.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Law Office - proto: SurveillanceCameraService entities: - uid: 23214 @@ -139057,6 +140334,39 @@ entities: - SurveillanceCameraService nameSet: True id: Freezer + - uid: 26743 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,-15.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Hydroponics + - uid: 26744 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.5,-22.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Botany Backroom + - uid: 26746 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-8.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Bar - proto: SurveillanceCameraSupply entities: - uid: 23184 @@ -139114,6 +140424,60 @@ entities: - SurveillanceCameraSupply nameSet: True id: Salvage Bay + - uid: 26423 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,10.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Breakroom + - uid: 26759 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -43.5,31.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Salvage Dock + - uid: 26760 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -44.5,19.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock 1 + - uid: 26761 + components: + - type: Transform + pos: -44.5,15.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Dock 2 + - uid: 26763 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -37.5,22.5 + parent: 5350 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Bay North - proto: SurveillanceCameraWirelessRouterConstructed entities: - uid: 26558 @@ -142817,6 +144181,16 @@ entities: showEnts: False occludes: True ents: [] + - uid: 26840 + components: + - type: Transform + pos: 108.5,9.5 + parent: 5350 + - uid: 26841 + components: + - type: Transform + pos: 100.5,9.5 + parent: 5350 - proto: TeslaCoil entities: - uid: 23612 @@ -143121,11 +144495,6 @@ entities: parent: 5350 - proto: ToiletEmpty entities: - - uid: 1032 - components: - - type: Transform - pos: 8.5,2.5 - parent: 5350 - uid: 7817 components: - type: Transform @@ -143164,6 +144533,13 @@ entities: - type: Transform pos: -39.5,-10.5 parent: 5350 +- proto: ToiletGoldenDirtyWater + entities: + - uid: 25811 + components: + - type: Transform + pos: 8.5,2.5 + parent: 5350 - proto: TomatoSeeds entities: - uid: 3141 @@ -143308,11 +144684,6 @@ entities: - type: Transform pos: 1.5618443,-16.342892 parent: 5350 - - uid: 26423 - components: - - type: Transform - pos: 104.485725,8.611769 - parent: 5350 - proto: ToyAmongPequeno entities: - uid: 14514 @@ -153343,11 +154714,6 @@ entities: - type: Transform pos: 103.5,14.5 parent: 5350 - - uid: 25808 - components: - - type: Transform - pos: 103.5,13.5 - parent: 5350 - uid: 25809 components: - type: Transform @@ -153358,11 +154724,6 @@ entities: - type: Transform pos: 105.5,14.5 parent: 5350 - - uid: 25811 - components: - - type: Transform - pos: 105.5,13.5 - parent: 5350 - uid: 25812 components: - type: Transform @@ -153373,11 +154734,6 @@ entities: - type: Transform pos: 101.5,13.5 parent: 5350 - - uid: 25814 - components: - - type: Transform - pos: 106.5,13.5 - parent: 5350 - uid: 25815 components: - type: Transform @@ -153608,6 +154964,11 @@ entities: - type: Transform pos: 108.5,-11.5 parent: 5350 + - uid: 25976 + components: + - type: Transform + pos: 105.5,13.5 + parent: 5350 - uid: 26215 components: - type: Transform @@ -153628,6 +154989,11 @@ entities: - type: Transform pos: 108.5,-2.5 parent: 5350 + - uid: 26231 + components: + - type: Transform + pos: 106.5,13.5 + parent: 5350 - uid: 26335 components: - type: Transform @@ -161884,31 +163250,6 @@ entities: parent: 5350 - proto: WeaponTurretSyndicateBroken entities: - - uid: 26416 - components: - - type: Transform - pos: 106.5,2.5 - parent: 5350 - - uid: 26417 - components: - - type: Transform - pos: 102.5,2.5 - parent: 5350 - - uid: 26418 - components: - - type: Transform - pos: 104.5,6.5 - parent: 5350 - - uid: 26419 - components: - - type: Transform - pos: 107.5,6.5 - parent: 5350 - - uid: 26420 - components: - - type: Transform - pos: 101.5,6.5 - parent: 5350 - uid: 26421 components: - type: Transform @@ -167183,4 +168524,9 @@ entities: - type: Transform pos: 45.520813,-8.421944 parent: 5350 + - uid: 26803 + components: + - type: Transform + pos: 59.615005,1.5566483 + parent: 5350 ... From adea4c91dec874c74a140ebe40fb2a6561546787 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Sun, 25 Aug 2024 03:35:22 -0700 Subject: [PATCH 058/223] Adds the Head of Greytide stamp (#30189) suggested changes from discord discussion, sprite change, add to refactored loot table --- Resources/Locale/en-US/paper/stamp-component.ftl | 1 + .../Markers/Spawners/Random/maintenance.yml | 1 + .../Entities/Objects/Misc/rubber_stamp.yml | 13 +++++++++++++ .../Objects/Misc/bureaucracy.rsi/meta.json | 5 ++++- .../bureaucracy.rsi/paper_stamp-greytide.png | Bin 0 -> 168 bytes .../Textures/Objects/Misc/stamps.rsi/meta.json | 5 ++++- .../Objects/Misc/stamps.rsi/stamp-greytide.png | Bin 0 -> 1219 bytes 7 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png create mode 100644 Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index c7dc1a1bdac..36be70d61fb 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -17,3 +17,4 @@ stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate stamp-component-stamped-name-ce = Chief Engineer +stamp-component-stamped-name-greytide = Greytide diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 521dde5a65e..58586f32168 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -161,6 +161,7 @@ - id: CigarGold - id: ClothingUniformJumpsuitFamilyGuy - id: WristwatchGold + - id: RubberStampGreytide - type: entity name: Maint Loot Spawner diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index fc362bb9c72..66ff215f30f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -271,3 +271,16 @@ stampState: "paper_stamp-detective" - type: Sprite state: stamp-detective + +- type: entity + name: greytide's rubber stamp + parent: RubberStampBase + id: RubberStampGreytide + description: A rubber stamp for stamping important documents. The tide washes over you, just looking at it... + components: + - type: Stamp + stampedName: stamp-component-stamped-name-greytide + stampedColor: "#323232" + stampState: "paper_stamp-greytide" + - type: Sprite + state: stamp-greytide diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index af1f3ce5d3d..17ac88cefd6 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser", "size": { "x": 32, "y": 32 @@ -224,6 +224,9 @@ }, { "name": "paper_stamp-generic" + }, + { + "name": "paper_stamp-greytide" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png new file mode 100644 index 0000000000000000000000000000000000000000..067be8405becf99fc333e85881a38792ce6af2dd GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^3Lq@N1|*eVE!z&H@;zM~Lo)8Yy}FV2fC7(8;A!p+ z-R234LwFvxnMU+8Dh0WiEb(v`__^Nk!UAhaMJAvYh6Cwm&YX$b9e#H6yQ`s1?IJ-Q zf4|tIi7s5tvOaF_t`iYQwk?+P*4g-FV*NYw`q#7S#s943*vAOcX&fshWjpQCe90vs No~Nsy%Q~loCIAbTJktOG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json index 8ce4882a2f8..4e3d2cda76b 100644 --- a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap. paper_stamp-greytide is a grey and shaded in version of stamp-hos.", "size": { "x": 32, "y": 32 @@ -60,6 +60,9 @@ }, { "name": "stamp-warden" + }, + { + "name": "stamp-greytide" } ] } diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png new file mode 100644 index 0000000000000000000000000000000000000000..064c74a2a87965a8563591031f516e7ac2757667 GIT binary patch literal 1219 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|`P642dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#UlzV7jc#>OT#`Vdv9x*?*dhT7<3vEK&dYpckh z)Z+Y{Qc$?t8JPji#1KWq07ORwRvpNq=sE&2@=Nl8DXJ(l*)y*swWy#7n7SY~LhZw? z0^KZx<)L|*C3Z$o1JHz#bRor#m19v!d45rL2skDX!H81{)EG#RBBfAB@&^Y$F#X$c z+33Ubk{wstCygb*40grS#W5s;^KGyp*I@&m5bx;@)A%@5f;+bVIUN7u{^!=T43A|# z>y})LjN-C-aY3oEcAD^;*GunSfAOfrWL|fZUhV%3UGJmPMS|aFu=YImD2?5JA-3}W>x1`o_kWJA znK!#c#^-9xpU#&3i+|c_@4vpA`CWtchkCv{j8oDa3M#uVh=2+ZPgg&ebxsLQ08}E3 AbN~PV literal 0 HcmV?d00001 From cc710fa46b7c7f85f7cf3151cbdaf9c4022eede1 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 10:36:28 +0000 Subject: [PATCH 059/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c081db7a5a3..b3e754695ec 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Aeshus - changes: - - message: Salvage has a comprehensive guide. - type: Add - - message: Cargo's guide is up-to-date. - type: Tweak - id: 6706 - time: '2024-06-09T18:28:46.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28775 - author: Zonespace27 changes: - message: Fixed a typo under the "Cargonia" header in the glossary. @@ -3867,3 +3858,10 @@ id: 7205 time: '2024-08-25T06:58:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31419 +- author: ArtisticRoomba + changes: + - message: Added the greytide stamp. This stamp can be rarely found in maints lockers. + type: Add + id: 7206 + time: '2024-08-25T10:35:22.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30189 From 7cb6b5e972cbb0bd28e0891e370f90ff79b24194 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:05:39 +1000 Subject: [PATCH 060/223] Verb tweaks (#31309) * Verb tweaks Remove the LOS check because this is already done above in CanExamine. * Fix outlines * import --- .../Commands/SetMenuVisibilityCommand.cs | 1 + .../ContextMenu/UI/EntityMenuUIController.cs | 19 ++++++-- Content.Client/Verbs/VerbSystem.cs | 45 ++++--------------- Content.Shared/Verbs/SharedVerbSystem.cs | 24 ++++++++++ 4 files changed, 49 insertions(+), 40 deletions(-) diff --git a/Content.Client/Commands/SetMenuVisibilityCommand.cs b/Content.Client/Commands/SetMenuVisibilityCommand.cs index ddfb0b16920..17a544dabaf 100644 --- a/Content.Client/Commands/SetMenuVisibilityCommand.cs +++ b/Content.Client/Commands/SetMenuVisibilityCommand.cs @@ -1,4 +1,5 @@ using Content.Client.Verbs; +using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Shared.Console; diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs index 0462c095ba8..bda831394d3 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs @@ -9,6 +9,7 @@ using Content.Shared.Examine; using Content.Shared.IdentityManagement; using Content.Shared.Input; +using Content.Shared.Verbs; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Input; @@ -194,8 +195,20 @@ public override void FrameUpdate(FrameEventArgs args) return; // Do we need to do in-range unOccluded checks? - var ignoreFov = !_eyeManager.CurrentEye.DrawFov || - (_verbSystem.Visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov; + var visibility = _verbSystem.Visibility; + + if (!_eyeManager.CurrentEye.DrawFov) + { + visibility &= ~MenuVisibility.NoFov; + } + + var ev = new MenuVisibilityEvent() + { + Visibility = visibility, + }; + + _entityManager.EventBus.RaiseLocalEvent(player, ref ev); + visibility = ev.Visibility; _entityManager.TryGetComponent(player, out ExaminerComponent? examiner); var xformQuery = _entityManager.GetEntityQuery(); @@ -209,7 +222,7 @@ public override void FrameUpdate(FrameEventArgs args) continue; } - if (ignoreFov) + if ((visibility & MenuVisibility.NoFov) == MenuVisibility.NoFov) continue; var pos = new MapCoordinates(_xform.GetWorldPosition(xform, xformQuery), xform.MapID); diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index 5f1f49e5fd0..c3e03528a79 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -67,6 +67,14 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true ? Visibility : Visibility | MenuVisibility.NoFov; + var ev = new MenuVisibilityEvent() + { + TargetPos = targetPos, + Visibility = visibility, + }; + + RaiseLocalEvent(player.Value, ref ev); + visibility = ev.Visibility; // Get entities List entities; @@ -77,13 +85,8 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true var entitiesUnderMouse = gameScreenBase.GetClickableEntities(targetPos).ToHashSet(); bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e); - // first check the general location. - if (!_examine.CanExamine(player.Value, targetPos, Predicate)) - return false; - TryComp(player.Value, out ExaminerComponent? examiner); - // Then check every entity entities = new(); foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize)) { @@ -137,27 +140,6 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true } } - // Remove any entities that do not have LOS - if ((visibility & MenuVisibility.NoFov) == 0) - { - var xformQuery = GetEntityQuery(); - var playerPos = _transform.GetMapCoordinates(player.Value, xform: xformQuery.GetComponent(player.Value)); - - for (var i = entities.Count - 1; i >= 0; i--) - { - var entity = entities[i]; - - if (!_examine.InRangeUnOccluded( - playerPos, - _transform.GetMapCoordinates(entity, xform: xformQuery.GetComponent(entity)), - ExamineSystemShared.ExamineRange, - null)) - { - entities.RemoveSwap(i); - } - } - } - if (entities.Count == 0) return false; @@ -229,15 +211,4 @@ private void HandleVerbResponse(VerbsResponseEvent msg) OnVerbsResponse?.Invoke(msg); } } - - [Flags] - public enum MenuVisibility - { - // What entities can a user see on the entity menu? - Default = 0, // They can only see entities in FoV. - NoFov = 1 << 0, // They ignore FoV restrictions - InContainer = 1 << 1, // They can see through containers. - Invisible = 1 << 2, // They can see entities without sprites and the "HideContextMenu" tag is ignored. - All = NoFov | InContainer | Invisible - } } diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs index 319f927c7b3..db17599d87f 100644 --- a/Content.Shared/Verbs/SharedVerbSystem.cs +++ b/Content.Shared/Verbs/SharedVerbSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.Interaction; using Content.Shared.Inventory.VirtualItem; using Robust.Shared.Containers; +using Robust.Shared.Map; namespace Content.Shared.Verbs { @@ -173,4 +174,27 @@ public virtual void ExecuteVerb(Verb verb, EntityUid user, EntityUid target, boo _interactionSystem.DoContactInteraction(user, target); } } + + // Does nothing on server + /// + /// Raised directed when trying to get the entity menu visibility for entities. + /// + [ByRefEvent] + public record struct MenuVisibilityEvent + { + public MapCoordinates TargetPos; + public MenuVisibility Visibility; + } + + // Does nothing on server + [Flags] + public enum MenuVisibility + { + // What entities can a user see on the entity menu? + Default = 0, // They can only see entities in FoV. + NoFov = 1 << 0, // They ignore FoV restrictions + InContainer = 1 << 1, // They can see through containers. + Invisible = 1 << 2, // They can see entities without sprites and the "HideContextMenu" tag is ignored. + All = NoFov | InContainer | Invisible + } } From f03fc585baa5d22e3b962321b5082a8e7e4f7726 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:06:06 +1000 Subject: [PATCH 061/223] Add ContainerComp (#31311) Applies EntProtoId changes upon insertion / removal from container. Can also be useful for borgs / mechs / vehicles in future but atm I just used it for AI. --- .../Containers/ContainerCompComponent.cs | 17 +++++++ .../Containers/ContainerCompSystem.cs | 44 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 Content.Shared/Containers/ContainerCompComponent.cs create mode 100644 Content.Shared/Containers/ContainerCompSystem.cs diff --git a/Content.Shared/Containers/ContainerCompComponent.cs b/Content.Shared/Containers/ContainerCompComponent.cs new file mode 100644 index 00000000000..b1415e0d8b5 --- /dev/null +++ b/Content.Shared/Containers/ContainerCompComponent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Containers; + +/// +/// Applies container changes whenever an entity is inserted into the specified container on this entity. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class ContainerCompComponent : Component +{ + [DataField(required: true)] + public EntProtoId Proto; + + [DataField(required: true)] + public string Container = string.Empty; +} diff --git a/Content.Shared/Containers/ContainerCompSystem.cs b/Content.Shared/Containers/ContainerCompSystem.cs new file mode 100644 index 00000000000..1e1983a331b --- /dev/null +++ b/Content.Shared/Containers/ContainerCompSystem.cs @@ -0,0 +1,44 @@ +using Robust.Shared.Containers; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Containers; + +/// +/// Applies / removes an entity prototype from a child entity when it's inserted into a container. +/// +public sealed class ContainerCompSystem : EntitySystem +{ + [Dependency] private readonly IPrototypeManager _proto = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnConInsert); + SubscribeLocalEvent(OnConRemove); + } + + private void OnConRemove(Entity ent, ref EntRemovedFromContainerMessage args) + { + if (args.Container.ID != ent.Comp.Container) + return; + + if (_proto.TryIndex(ent.Comp.Container, out var entProto)) + { + foreach (var entry in entProto.Components.Values) + { + RemComp(args.Entity, entry.Component); + } + } + } + + private void OnConInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + if (args.Container.ID != ent.Comp.Container) + return; + + if (_proto.TryIndex(ent.Comp.Proto, out var entProto)) + { + EntityManager.AddComponents(args.Entity, entProto.Components); + } + } +} From 85b7d183bd9010feab003af1cef0980790d6cd7a Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 25 Aug 2024 08:06:50 -0400 Subject: [PATCH 062/223] Blueprints (#31138) * Blueprints * Update tables_loot.yml * doink * mark as required --- Content.Server/Lathe/LatheSystem.cs | 4 +- Content.Shared/Lathe/LatheComponent.cs | 2 +- .../Research/Components/BlueprintComponent.cs | 19 +++ .../Components/BlueprintReceiverComponent.cs | 18 +++ .../Research/Systems/BlueprintSystem.cs | 114 ++++++++++++++++++ .../en-US/research/components/blueprint.ftl | 2 + .../Spawners/Random/Salvage/tables_loot.yml | 3 + .../Entities/Objects/Tools/blueprint.yml | 49 ++++++++ .../Entities/Structures/Machines/lathe.yml | 14 ++- .../Prototypes/Recipes/Lathes/salvage.yml | 14 ++- Resources/Prototypes/tags.yml | 3 + .../Objects/Tools/blueprint.rsi/icon.png | Bin 0 -> 449 bytes .../Tools/blueprint.rsi/inhand-left.png | Bin 0 -> 341 bytes .../Tools/blueprint.rsi/inhand-right.png | Bin 0 -> 358 bytes .../Objects/Tools/blueprint.rsi/meta.json | 22 ++++ 15 files changed, 259 insertions(+), 5 deletions(-) create mode 100644 Content.Shared/Research/Components/BlueprintComponent.cs create mode 100644 Content.Shared/Research/Components/BlueprintReceiverComponent.cs create mode 100644 Content.Shared/Research/Systems/BlueprintSystem.cs create mode 100644 Resources/Locale/en-US/research/components/blueprint.ftl create mode 100644 Resources/Prototypes/Entities/Objects/Tools/blueprint.yml create mode 100644 Resources/Textures/Objects/Tools/blueprint.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/blueprint.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/blueprint.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/blueprint.rsi/meta.json diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs index 5ece533a628..6d7d4e45331 100644 --- a/Content.Server/Lathe/LatheSystem.cs +++ b/Content.Server/Lathe/LatheSystem.cs @@ -155,10 +155,10 @@ public List> GetAvailableRecipes(EntityUid uid, La { var ev = new LatheGetRecipesEvent(uid, getUnavailable) { - Recipes = new List>(component.StaticRecipes) + Recipes = new HashSet>(component.StaticRecipes) }; RaiseLocalEvent(uid, ev); - return ev.Recipes; + return ev.Recipes.ToList(); } public static List> GetAllBaseRecipes(LatheComponent component) diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs index 7924a0ec944..de4311e5595 100644 --- a/Content.Shared/Lathe/LatheComponent.cs +++ b/Content.Shared/Lathe/LatheComponent.cs @@ -83,7 +83,7 @@ public sealed class LatheGetRecipesEvent : EntityEventArgs public bool getUnavailable; - public List> Recipes = new(); + public HashSet> Recipes = new(); public LatheGetRecipesEvent(EntityUid lathe, bool forced) { diff --git a/Content.Shared/Research/Components/BlueprintComponent.cs b/Content.Shared/Research/Components/BlueprintComponent.cs new file mode 100644 index 00000000000..71ed3da0343 --- /dev/null +++ b/Content.Shared/Research/Components/BlueprintComponent.cs @@ -0,0 +1,19 @@ +using Content.Shared.Research.Prototypes; +using Content.Shared.Research.Systems; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Research.Components; + +/// +/// This is used for an item that is inserted directly into a given lathe to provide it with a recipe. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(BlueprintSystem))] +public sealed partial class BlueprintComponent : Component +{ + /// + /// The recipes that this blueprint provides. + /// + [DataField(required: true)] + public HashSet> ProvidedRecipes = new(); +} diff --git a/Content.Shared/Research/Components/BlueprintReceiverComponent.cs b/Content.Shared/Research/Components/BlueprintReceiverComponent.cs new file mode 100644 index 00000000000..94c323eb868 --- /dev/null +++ b/Content.Shared/Research/Components/BlueprintReceiverComponent.cs @@ -0,0 +1,18 @@ +using Content.Shared.Research.Systems; +using Content.Shared.Whitelist; +using Robust.Shared.GameStates; + +namespace Content.Shared.Research.Components; + +/// +/// This is used for a lathe that can utilize s to gain more recipes. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(BlueprintSystem))] +public sealed partial class BlueprintReceiverComponent : Component +{ + [DataField] + public string ContainerId = "blueprint"; + + [DataField(required: true)] + public EntityWhitelist Whitelist = new(); +} diff --git a/Content.Shared/Research/Systems/BlueprintSystem.cs b/Content.Shared/Research/Systems/BlueprintSystem.cs new file mode 100644 index 00000000000..237ff703002 --- /dev/null +++ b/Content.Shared/Research/Systems/BlueprintSystem.cs @@ -0,0 +1,114 @@ +using Content.Shared.IdentityManagement; +using Content.Shared.Interaction; +using Content.Shared.Lathe; +using Content.Shared.Popups; +using Content.Shared.Research.Components; +using Content.Shared.Research.Prototypes; +using Content.Shared.Whitelist; +using Robust.Shared.Containers; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Research.Systems; + +public sealed class BlueprintSystem : EntitySystem +{ + [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + + /// + public override void Initialize() + { + SubscribeLocalEvent(OnStartup); + SubscribeLocalEvent(OnAfterInteract); + SubscribeLocalEvent(OnGetRecipes); + } + + private void OnStartup(Entity ent, ref ComponentStartup args) + { + _container.EnsureContainer(ent, ent.Comp.ContainerId); + } + + private void OnAfterInteract(Entity ent, ref AfterInteractUsingEvent args) + { + if (args.Handled || !args.CanReach || !TryComp(args.Used, out var blueprintComponent)) + return; + args.Handled = TryInsertBlueprint(ent, (args.Used, blueprintComponent), args.User); + } + + private void OnGetRecipes(Entity ent, ref LatheGetRecipesEvent args) + { + var recipes = GetBlueprintRecipes(ent); + foreach (var recipe in recipes) + { + args.Recipes.Add(recipe); + } + } + + public bool TryInsertBlueprint(Entity ent, Entity blueprint, EntityUid? user) + { + if (!CanInsertBlueprint(ent, blueprint, user)) + return false; + + if (user is not null) + { + var userId = Identity.Entity(user.Value, EntityManager); + var bpId = Identity.Entity(blueprint, EntityManager); + var machineId = Identity.Entity(ent, EntityManager); + var msg = Loc.GetString("blueprint-receiver-popup-insert", + ("user", userId), + ("blueprint", bpId), + ("receiver", machineId)); + _popup.PopupPredicted(msg, ent, user); + } + + _container.Insert(blueprint.Owner, _container.GetContainer(ent, ent.Comp.ContainerId)); + + var ev = new TechnologyDatabaseModifiedEvent(); + RaiseLocalEvent(ent, ref ev); + return true; + } + + public bool CanInsertBlueprint(Entity ent, Entity blueprint, EntityUid? user) + { + if (_entityWhitelist.IsWhitelistFail(ent.Comp.Whitelist, blueprint)) + { + return false; + } + + if (blueprint.Comp.ProvidedRecipes.Count == 0) + { + Log.Error($"Attempted to insert blueprint {ToPrettyString(blueprint)} with no recipes."); + return false; + } + + // Don't add new blueprints if there are no new recipes. + var currentRecipes = GetBlueprintRecipes(ent); + if (currentRecipes.Count != 0 && currentRecipes.IsSupersetOf(blueprint.Comp.ProvidedRecipes)) + { + _popup.PopupPredicted(Loc.GetString("blueprint-receiver-popup-recipe-exists"), ent, user); + return false; + } + + return _container.CanInsert(blueprint, _container.GetContainer(ent, ent.Comp.ContainerId)); + } + + public HashSet> GetBlueprintRecipes(Entity ent) + { + var contained = _container.GetContainer(ent, ent.Comp.ContainerId); + + var recipes = new HashSet>(); + foreach (var blueprint in contained.ContainedEntities) + { + if (!TryComp(blueprint, out var blueprintComponent)) + continue; + + foreach (var provided in blueprintComponent.ProvidedRecipes) + { + recipes.Add(provided); + } + } + + return recipes; + } +} diff --git a/Resources/Locale/en-US/research/components/blueprint.ftl b/Resources/Locale/en-US/research/components/blueprint.ftl new file mode 100644 index 00000000000..34c3a3c80e8 --- /dev/null +++ b/Resources/Locale/en-US/research/components/blueprint.ftl @@ -0,0 +1,2 @@ +blueprint-receiver-popup-insert = { CAPITALIZE(THE($user)) } inserted { THE($blueprint) } into { THE($receiver) }. +blueprint-receiver-popup-recipe-exists = The same blueprint was already inserted! diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 5e128e8f962..61b3d108171 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -207,6 +207,7 @@ id: SalvageEquipmentRare table: !type:GroupSelector children: + - id: BlueprintFlare - id: FultonBeacon - id: Fulton amount: !type:RangeNumberSelector @@ -228,6 +229,8 @@ id: SalvageEquipmentLegendary table: !type:GroupSelector children: + - id: BlueprintFulton + - id: BlueprintSeismicCharge - id: WeaponCrusherGlaive - id: ClothingOuterHardsuitSalvage - id: OmnizineChemistryBottle diff --git a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml new file mode 100644 index 00000000000..ba26baf3626 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml @@ -0,0 +1,49 @@ +- type: entity + parent: BaseItem + id: BaseBlueprint + name: blueprint + description: A blueprint for some machine. It can be inserted into an autolathe. + abstract: true + components: + - type: Sprite + sprite: Objects/Tools/blueprint.rsi + state: icon + - type: Item + sprite: Objects/Tools/blueprint.rsi + size: Normal + - type: Blueprint + - type: StaticPrice + price: 1000 + - type: Tag + tags: + - BlueprintAutolathe + +- type: entity + parent: BaseBlueprint + id: BlueprintFulton + name: fulton blueprint + description: A blueprint with a schematic of a fulton. It can be inserted into an autolathe. + components: + - type: Blueprint + providedRecipes: + - Fulton + +- type: entity + parent: BaseBlueprint + id: BlueprintSeismicCharge + name: seismic charge blueprint + description: A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe. + components: + - type: Blueprint + providedRecipes: + - SeismicCharge + +- type: entity + parent: BaseBlueprint + id: BlueprintFlare + name: flare blueprint + description: A blueprint with a schematic of a flare. It can be inserted into an autolathe. + components: + - type: Blueprint + providedRecipes: + - Flare diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index bf4d4de7833..91ac7b049a4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -89,7 +89,7 @@ id: Autolathe parent: BaseLatheLube name: autolathe - description: It produces basic items using metal and glass. + description: It produces basic items using metal and glass. Has the ability to process blueprints to print new recipes. components: - type: Sprite sprite: Structures/Machines/autolathe.rsi @@ -226,6 +226,18 @@ - RiotShield - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + - type: BlueprintReceiver + whitelist: + tags: + - BlueprintAutolathe + - type: ContainerContainer + containers: + machine_board: !type:Container + machine_parts: !type:Container + blueprint: !type:Container + - type: EmptyOnMachineDeconstruct + containers: + - blueprint - type: entity id: AutolatheHyperConvection diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml index 84047ae75d8..2def767e917 100644 --- a/Resources/Prototypes/Recipes/Lathes/salvage.yml +++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml @@ -1,20 +1,32 @@ - type: latheRecipe id: Fulton result: Fulton1 + category: Tools completetime: 1 materials: Steel: 200 - Cloth: 100 + Cloth: 500 - type: latheRecipe id: FultonBeacon result: FultonBeacon + category: Tools completetime: 5 materials: Steel: 1000 Glass: 500 # If they get spammed make it cost silver. +- type: latheRecipe + id: SeismicCharge + result: SeismicCharge + category: Tools + completetime: 1 + materials: + Plastic: 1500 + Steel: 100 + Silver: 100 + - type: latheRecipe id: MiningDrill result: MiningDrill diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 9b11570a252..b52e2c4e8c5 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -60,6 +60,9 @@ - type: Tag id: Bloodpack +- type: Tag + id: BlueprintAutolathe + - type: Tag id: BodyBag diff --git a/Resources/Textures/Objects/Tools/blueprint.rsi/icon.png b/Resources/Textures/Objects/Tools/blueprint.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fe8b37fa2534c7753ee8f254ce486466886bacee GIT binary patch literal 449 zcmV;y0Y3hTP)Px$dr3q=R9J=WRxMA&KoET;{D+E$P+3!3#EA+*0=A+8g(B$QFX#`TnxIf8NLUL= zgQy@W`pn6aWks<#Oi{bp>j#-F*C6Oin(j{9d2e=Rb_>jyG2@S6nSKzYc{B8^7NTQ& zyS*^x7(~o?6Eohte}1VeNb}A(X1w`Hs1CBanDM4sZ#s6CgaCjjE0oRkJ={kJB;Wf~ z0ez%8F-t;3Spk-WNb;KOYi|s3loeYM_X(RsfFAA8^FCoafh;V&0Q-tDNb@FUoK%3o zh!n^OWwgJI*hoNIOkXNY>%gcDvlCm*7t0l1uFnCWvkH^7p-yBwj%qs{leVEGXpd_l zPzwQ;gjg(BM*fTi=ut;mp$O%Q$h1&llmfjA+FP(bcYTlSb94&ydT85TpPtG7NR=uN zB6-}}j)PhVb(fHHlOve40@Zp0*Y|LAdJKz~YWz_?z~beW-Qp#c8vtPi4lnP>+bUrG r12Xusdv;|+Ts_|G?$2k&jDLl14J=gpqz$|D^@QWdRP{hmYuV%YrD%(Iltw|?|0L! z)BALofu=DqWIs){eUfUMqxwBVRzpYn^~J(OD~3xKu0Kwboc+@0^+AJp#$BJqdap{# zF;{Qm(^+-Q>XPa8RQ?Y&tZR1eVRF4X!|aCgfchzZz7pvbaz0bX5AG^k? zXR}v-UO&CKB<-nF>8WSyjxSG(U!tb?WE<0xpt}<+s~i6HPT@^2UgMm5{r{Rx8>fB< jpZy?W=gv}~XA<=7Omvp4aq--j2eRJN)z4*}Q$iB}L4J)+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/blueprint.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/blueprint.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..37dd59e5c3a6ade73d6c428765d5c01995bda25f GIT binary patch literal 358 zcmV-s0h#`ZP)Px$AW1|)RCt{2+OZLWKoEuD!*R^)z&c2cY`{`%z@Y(4u>m4d>#zed6O49dhv8(G z;W*L%OC0rXc^n)DYX|@U0000WrmX6&tm-azjxpYx8*9<&k@B!+HZ4F1A>1!VSK%Ba zn`E^ZT>yQ;p2E54jFyYFwH7|#nu(E?<<05d0&6hq7LbDHTeFHqNRqXz>h9UTx^Mp} zlzfskN%2{WCa{*A0000000000V0lICi=pPi<9aH_#(dJB?>V+-zQa{W(+mbaT|O7;TPzYBV19yF!nXSKXra_UmK+M@ZG4k1l}q;IX@4Zj0XmLnr-g zU(qYrUod&E>sa=%9wT$5<(-1-At)r|FFXVR008i>-o@yotipFaz5oCK07*qoM6N<$ Ef>{QlGXMYp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/blueprint.rsi/meta.json b/Resources/Textures/Objects/Tools/blueprint.rsi/meta.json new file mode 100644 index 00000000000..ab9e7fb2a9b --- /dev/null +++ b/Resources/Textures/Objects/Tools/blueprint.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/dd749c36c416a6960782732cecf25e5ebac326e8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} From 42865ae7050274d4c3304f42279a6f2483064c1b Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 12:07:56 +0000 Subject: [PATCH 063/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b3e754695ec..82252b03da6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Zonespace27 - changes: - - message: Fixed a typo under the "Cargonia" header in the glossary. - type: Fix - id: 6707 - time: '2024-06-10T13:19:24.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28818 - author: EmoGarbage404 changes: - message: Fixed drinks page not having a search bar. @@ -3865,3 +3858,11 @@ id: 7206 time: '2024-08-25T10:35:22.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30189 +- author: EmoGarbage404 + changes: + - message: Added blueprints! These can be found by salvagers and inserted into an + autolathe in order to unlock new recipes. + type: Add + id: 7207 + time: '2024-08-25T12:06:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31138 From e1df251cbc3c2deced8a254676b248f0ee5f3f15 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 25 Aug 2024 12:17:03 +0000 Subject: [PATCH 064/223] decouple ItemToggle from PowerCellDraw (#31392) * remove ItemToggle from PowerCellDraw query * add EntityQuery for resolves, make them all optional * move integration to ToggleCellDraw * add ToggleCellDraw to almost every PowerCellDraw prototype * :trollface: * :trollface: * :trollface: * let it disable on mapinit * set update time on mapinit, make borg power logic consistent now * :trollface: --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../PowerCell/PowerCellSystem.Draw.cs | 14 +++--- Content.Server/Silicons/Borgs/BorgSystem.cs | 2 + .../Item/ItemToggle/ItemToggleSystem.cs | 12 +++-- .../Components/ToggleCellDrawComponent.cs | 10 ++++ .../PowerCell/PowerCellDrawComponent.cs | 4 +- .../PowerCell/SharedPowerCellSystem.cs | 26 +++++----- .../PowerCell/ToggleCellDrawSystem.cs | 49 +++++++++++++++++++ .../Entities/Clothing/OuterClothing/suits.yml | 1 + .../Entities/Clothing/Shoes/misc.yml | 1 + .../Mobs/Cyborgs/base_borg_chassis.yml | 1 + .../Objects/Devices/base_handheld.yml | 1 + .../Specific/Medical/healthanalyzer.yml | 1 + .../Objects/Specific/Research/anomaly.yml | 2 + .../Objects/Tools/handheld_mass_scanner.yml | 1 + .../Weapons/Guns/Launchers/launchers.yml | 2 + 15 files changed, 99 insertions(+), 28 deletions(-) create mode 100644 Content.Shared/PowerCell/Components/ToggleCellDrawComponent.cs create mode 100644 Content.Shared/PowerCell/ToggleCellDrawSystem.cs diff --git a/Content.Server/PowerCell/PowerCellSystem.Draw.cs b/Content.Server/PowerCell/PowerCellSystem.Draw.cs index 9ebd677f473..ae43b6dae9d 100644 --- a/Content.Server/PowerCell/PowerCellSystem.Draw.cs +++ b/Content.Server/PowerCell/PowerCellSystem.Draw.cs @@ -1,5 +1,4 @@ using Content.Server.Power.Components; -using Content.Shared.Item.ItemToggle.Components; using Content.Shared.PowerCell; using Content.Shared.PowerCell.Components; @@ -14,11 +13,11 @@ public sealed partial class PowerCellSystem public override void Update(float frameTime) { base.Update(frameTime); - var query = EntityQueryEnumerator(); + var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var comp, out var slot, out var toggle)) + while (query.MoveNext(out var uid, out var comp, out var slot)) { - if (!comp.Enabled || !toggle.Activated) + if (!comp.Enabled) continue; if (Timing.CurTime < comp.NextUpdateTime) @@ -32,8 +31,6 @@ public override void Update(float frameTime) if (_battery.TryUseCharge(batteryEnt.Value, comp.DrawRate, battery)) continue; - Toggle.TryDeactivate((uid, toggle)); - var ev = new PowerCellSlotEmptyEvent(); RaiseLocalEvent(uid, ref ev); } @@ -60,7 +57,10 @@ private void OnDrawCellChanged(EntityUid uid, PowerCellDrawComponent component, var canUse = !args.Ejected && HasActivatableCharge(uid, component); if (!canDraw) - Toggle.TryDeactivate(uid); + { + var ev = new PowerCellSlotEmptyEvent(); + RaiseLocalEvent(uid, ref ev); + } if (canUse != component.CanUse || canDraw != component.CanDraw) { diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs index 3f32afbffbd..bd85282a0f5 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.cs @@ -282,6 +282,7 @@ public void BorgActivate(EntityUid uid, BorgChassisComponent component) { Popup.PopupEntity(Loc.GetString("borg-mind-added", ("name", Identity.Name(uid, EntityManager))), uid); Toggle.TryActivate(uid); + _powerCell.SetDrawEnabled(uid, _mobState.IsAlive(uid)); _appearance.SetData(uid, BorgVisuals.HasPlayer, true); } @@ -292,6 +293,7 @@ public void BorgDeactivate(EntityUid uid, BorgChassisComponent component) { Popup.PopupEntity(Loc.GetString("borg-mind-removed", ("name", Identity.Name(uid, EntityManager))), uid); Toggle.TryDeactivate(uid); + _powerCell.SetDrawEnabled(uid, false); _appearance.SetData(uid, BorgVisuals.HasPlayer, false); } diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs index 6b969d1d62b..1cc8699d70c 100644 --- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs +++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs @@ -23,10 +23,14 @@ public sealed class ItemToggleSystem : EntitySystem [Dependency] private readonly SharedPointLightSystem _light = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + private EntityQuery _query; + public override void Initialize() { base.Initialize(); + _query = GetEntityQuery(); + SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(TurnOffOnUnwielded); @@ -69,7 +73,7 @@ private void OnUseInHand(Entity ent, ref UseInHandEvent arg /// Same as public bool Toggle(Entity ent, EntityUid? user = null, bool predicted = true) { - if (!Resolve(ent, ref ent.Comp)) + if (!_query.Resolve(ent, ref ent.Comp, false)) return false; return TrySetActive(ent, !ent.Comp.Activated, user, predicted); @@ -92,7 +96,7 @@ public bool TrySetActive(Entity ent, bool active, EntityUi /// public bool TryActivate(Entity ent, EntityUid? user = null, bool predicted = true) { - if (!Resolve(ent, ref ent.Comp)) + if (!_query.Resolve(ent, ref ent.Comp, false)) return false; var uid = ent.Owner; @@ -135,7 +139,7 @@ public bool TryActivate(Entity ent, EntityUid? user = null /// public bool TryDeactivate(Entity ent, EntityUid? user = null, bool predicted = true) { - if (!Resolve(ent, ref ent.Comp)) + if (!_query.Resolve(ent, ref ent.Comp, false)) return false; var uid = ent.Owner; @@ -230,7 +234,7 @@ private void TurnOnOnWielded(Entity ent, ref ItemWieldedEve public bool IsActivated(Entity ent) { - if (!Resolve(ent, ref ent.Comp, false)) + if (!_query.Resolve(ent, ref ent.Comp, false)) return true; // assume always activated if no component return ent.Comp.Activated; diff --git a/Content.Shared/PowerCell/Components/ToggleCellDrawComponent.cs b/Content.Shared/PowerCell/Components/ToggleCellDrawComponent.cs new file mode 100644 index 00000000000..20e2d4fe02e --- /dev/null +++ b/Content.Shared/PowerCell/Components/ToggleCellDrawComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.PowerCell.Components; + +/// +/// Integrate PowerCellDraw and ItemToggle. +/// Make toggling this item require power, and deactivates the item when power runs out. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class ToggleCellDrawComponent : Component; diff --git a/Content.Shared/PowerCell/PowerCellDrawComponent.cs b/Content.Shared/PowerCell/PowerCellDrawComponent.cs index 94de7c77878..9c2f72661de 100644 --- a/Content.Shared/PowerCell/PowerCellDrawComponent.cs +++ b/Content.Shared/PowerCell/PowerCellDrawComponent.cs @@ -8,7 +8,6 @@ namespace Content.Shared.PowerCell; /// /// /// With ActivatableUI it will activate and deactivate when the ui is opened and closed, drawing power inbetween. -/// Requires to work. /// [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause] public sealed partial class PowerCellDrawComponent : Component @@ -30,9 +29,8 @@ public sealed partial class PowerCellDrawComponent : Component #endregion /// - /// Whether drawing is enabled, regardless of ItemToggle. + /// Whether drawing is enabled. /// Having no cell will still disable it. - /// Only use this if you really don't want it to use power for some time. /// [DataField, AutoNetworkedField] public bool Enabled = true; diff --git a/Content.Shared/PowerCell/SharedPowerCellSystem.cs b/Content.Shared/PowerCell/SharedPowerCellSystem.cs index 2b2a836633c..f098f575c4e 100644 --- a/Content.Shared/PowerCell/SharedPowerCellSystem.cs +++ b/Content.Shared/PowerCell/SharedPowerCellSystem.cs @@ -1,6 +1,4 @@ using Content.Shared.Containers.ItemSlots; -using Content.Shared.Item.ItemToggle; -using Content.Shared.Item.ItemToggle.Components; using Content.Shared.PowerCell.Components; using Content.Shared.Rejuvenate; using Robust.Shared.Containers; @@ -13,19 +11,22 @@ public abstract class SharedPowerCellSystem : EntitySystem [Dependency] protected readonly IGameTiming Timing = default!; [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] protected readonly ItemToggleSystem Toggle = default!; public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnRejuvenate); SubscribeLocalEvent(OnCellInserted); SubscribeLocalEvent(OnCellRemoved); SubscribeLocalEvent(OnCellInsertAttempt); + } - SubscribeLocalEvent(OnActivateAttempt); - SubscribeLocalEvent(OnToggled); + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + QueueUpdate((ent, ent.Comp)); } private void OnRejuvenate(EntityUid uid, PowerCellSlotComponent component, RejuvenateEvent args) @@ -70,16 +71,13 @@ protected virtual void OnCellRemoved(EntityUid uid, PowerCellSlotComponent compo RaiseLocalEvent(uid, new PowerCellChangedEvent(true), false); } - private void OnActivateAttempt(Entity ent, ref ItemToggleActivateAttemptEvent args) - { - if (!HasDrawCharge(ent, ent.Comp, user: args.User) - || !HasActivatableCharge(ent, ent.Comp, user: args.User)) - args.Cancelled = true; - } - - private void OnToggled(Entity ent, ref ItemToggledEvent args) + /// + /// Makes the draw logic update in the next tick. + /// + public void QueueUpdate(Entity ent) { - ent.Comp.NextUpdateTime = Timing.CurTime; + if (Resolve(ent, ref ent.Comp)) + ent.Comp.NextUpdateTime = Timing.CurTime; } public void SetDrawEnabled(Entity ent, bool enabled) diff --git a/Content.Shared/PowerCell/ToggleCellDrawSystem.cs b/Content.Shared/PowerCell/ToggleCellDrawSystem.cs new file mode 100644 index 00000000000..070937b8b49 --- /dev/null +++ b/Content.Shared/PowerCell/ToggleCellDrawSystem.cs @@ -0,0 +1,49 @@ +using Content.Shared.Item.ItemToggle; +using Content.Shared.Item.ItemToggle.Components; +using Content.Shared.PowerCell.Components; + +namespace Content.Shared.PowerCell; + +/// +/// Handles events to integrate PowerCellDraw with ItemToggle +/// +public sealed class ToggleCellDrawSystem : EntitySystem +{ + [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private readonly SharedPowerCellSystem _cell = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnActivateAttempt); + SubscribeLocalEvent(OnToggled); + SubscribeLocalEvent(OnEmpty); + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + _cell.SetDrawEnabled(ent.Owner, _toggle.IsActivated(ent.Owner)); + } + + private void OnActivateAttempt(Entity ent, ref ItemToggleActivateAttemptEvent args) + { + if (!_cell.HasDrawCharge(ent, user: args.User) + || !_cell.HasActivatableCharge(ent, user: args.User)) + args.Cancelled = true; + } + + private void OnToggled(Entity ent, ref ItemToggledEvent args) + { + var uid = ent.Owner; + var draw = Comp(uid); + _cell.QueueUpdate((uid, draw)); + _cell.SetDrawEnabled((uid, draw), args.Activated); + } + + private void OnEmpty(Entity ent, ref PowerCellSlotEmptyEvent args) + { + _toggle.TryDeactivate(ent.Owner); + } +} diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index a04bdde31fb..0f1b9536da6 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -160,6 +160,7 @@ lastVisibility: 0.1 - type: PowerCellDraw drawRate: 1.8 # 200 seconds on the default cell + - type: ToggleCellDraw # throwing star ability - type: ItemCreator action: ActionCreateThrowingStar diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index fae87172238..ea4c9d9c7cd 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -116,6 +116,7 @@ price: 500 - type: PowerCellDraw drawRate: 4 + - type: ToggleCellDraw - type: ItemSlots slots: cell_slot: diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index b701bbd8f48..15f34bd81f8 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -126,6 +126,7 @@ # TODO: or just have sentient speedboots be fast idk - type: PowerCellDraw drawRate: 0.6 + # no ToggleCellDraw since dont want to lose access when power is gone - type: ItemSlots slots: cell_slot: diff --git a/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml index 259323fede3..c377519ddb4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml @@ -9,3 +9,4 @@ - type: PowerCellDraw drawRate: 0 useRate: 20 + - type: ToggleCellDraw diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml index 97a41a50df4..e3f2e1cd1e7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml @@ -47,6 +47,7 @@ components: - type: PowerCellDraw drawRate: 1.2 #Calculated for 5 minutes on a small cell + - type: ToggleCellDraw - type: ActivatableUIRequiresPowerCell - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml index 929f509710e..ff53218e222 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml @@ -68,6 +68,7 @@ - type: PowerCellDraw drawRate: 1 useRate: 0 + - type: ToggleCellDraw - type: entity id: AnomalyLocatorEmpty @@ -101,6 +102,7 @@ - type: PowerCellDraw drawRate: 1 useRate: 0 + - type: ToggleCellDraw - type: entity id: AnomalyLocatorWideEmpty diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml index de45119cddd..e10c5b84af5 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml @@ -26,6 +26,7 @@ False: { visible: false } - type: PowerCellDraw drawRate: 1.5 + - type: ToggleCellDraw - type: ActivatableUI key: enum.RadarConsoleUiKey.Key inHandsOnly: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 3abb32a37fb..5ea853cd8d1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -169,6 +169,7 @@ - type: ItemToggle onUse: false - type: PowerCellDraw + - type: ToggleCellDraw - type: Sprite sprite: Objects/Weapons/Guns/Launchers/tether_gun.rsi layers: @@ -216,6 +217,7 @@ - type: ItemToggle onUse: false - type: PowerCellDraw + - type: ToggleCellDraw - type: Sprite sprite: Objects/Weapons/Guns/Launchers/force_gun.rsi layers: From 3d145875a48e11cc6edd44339905f1e0e362bca2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 12:18:09 +0000 Subject: [PATCH 065/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 82252b03da6..9cbb76317e2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Fixed drinks page not having a search bar. - type: Fix - id: 6708 - time: '2024-06-10T13:20:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28815 - author: Aquif changes: - message: It is now possible to save after chaining you job unavailable preference. @@ -3866,3 +3859,10 @@ id: 7207 time: '2024-08-25T12:06:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31138 +- author: deltanedas + changes: + - message: Fixed borgs losing access when they run out of power. + type: Fix + id: 7208 + time: '2024-08-25T12:17:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31392 From a89d4c750b7f571f02487100089332091b2e8620 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:18:42 +1000 Subject: [PATCH 066/223] Power stuff (#31314) * Power stuff - Add shared IsPowered - Add shared ResolveApc - Move PowerChangedEvent to shared for now - Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it. * big update * boing --- .../UI/BanList/BanListWindow.xaml.cs | 1 + .../UI/Bwoink/BwoinkControl.xaml.cs | 3 +- .../UI/SetOutfit/SetOutfitMenu.xaml.cs | 1 + .../Cartridges/CrewManifestUiFragment.xaml.cs | 3 +- .../UI/FlatpackCreatorMenu.xaml.cs | 1 + .../CrewManifest/CrewManifestUi.xaml.cs | 1 + .../UI/LobbyCharacterPreviewPanel.xaml.cs | 1 + Content.Client/Lobby/UI/LobbyGui.xaml.cs | 1 + .../UI/SignalTimerWindow.xaml.cs | 1 + Content.Client/Options/UI/OptionsMenu.xaml.cs | 1 + .../EntitySystems/PowerReceiverSystem.cs | 13 ++++ .../Power/Generator/GeneratorWindow.xaml.cs | 1 + Content.Client/Radio/Ui/IntercomMenu.xaml.cs | 1 + .../StationRecords/GeneralRecord.xaml.cs | 1 + .../StorageContainerVisualsComponent.cs | 1 + .../Ui/AnalysisConsoleMenu.xaml.cs | 1 + .../AlertLevel/AlertLevelDisplaySystem.cs | 1 + .../Ame/EntitySystems/AmeControllerSystem.cs | 1 + .../Anomaly/AnomalySynchronizerSystem.cs | 1 + .../Anomaly/AnomalySystem.Generator.cs | 1 + .../Arcade/BlockGame/BlockGameArcadeSystem.cs | 1 + .../SpaceVillainArcadeSystem.cs | 1 + .../Atmos/Monitor/Systems/AirAlarmSystem.cs | 1 + .../Monitor/Systems/AtmosAlarmableSystem.cs | 1 + .../Monitor/Systems/AtmosMonitoringSystem.cs | 1 + .../Unary/EntitySystems/GasVentPumpSystem.cs | 1 + .../EntitySystems/GasVentScrubberSystem.cs | 1 + .../Atmos/Portable/PortableScrubberSystem.cs | 1 + .../Atmos/Portable/SpaceHeaterSystem.cs | 1 + Content.Server/Audio/AmbientSoundSystem.cs | 1 + Content.Server/Audio/Jukebox/JukeboxSystem.cs | 1 + Content.Server/Bed/BedSystem.cs | 1 + .../Buckle/Systems/AntiRotOnBuckleSystem.cs | 1 + .../Cargo/Systems/CargoSystem.Telepad.cs | 1 + .../SolutionContainerMixerSystem.cs | 1 + .../EntitySystems/SolutionHeaterSystem.cs | 1 + .../Cloning/CloningConsoleSystem.cs | 1 + .../ConstructionSystem.Computer.cs | 1 + Content.Server/Construction/FlatpackSystem.cs | 1 + .../Components/PowerSensorComponent.cs | 1 + .../DeviceNetworkRequiresPowerSystem.cs | 1 + .../Systems/SingletonDeviceNetServerSystem.cs | 1 + .../Unit/EntitySystems/DisposalUnitSystem.cs | 1 + Content.Server/Doors/Systems/AirlockSystem.cs | 1 + Content.Server/Doors/Systems/DoorSystem.cs | 2 +- .../Doors/Systems/FirelockSystem.cs | 1 + Content.Server/Fax/FaxSystem.cs | 1 + .../EntitySystems/ReagentGrinderSystem.cs | 1 + Content.Server/Lathe/LatheSystem.cs | 1 + .../EntitySystems/EmergencyLightSystem.cs | 1 + .../Light/EntitySystems/LitOnPoweredSystem.cs | 2 + .../Light/EntitySystems/PoweredLightSystem.cs | 2 + .../Materials/MaterialReclaimerSystem.cs | 1 + .../BiomassReclaimerSystem.cs | 1 + Content.Server/Medical/CryoPodSystem.cs | 1 + .../EntitySystems/FatExtractorSystem.cs | 1 + .../Paper/PaperRandomStoryComponent.cs | 1 + .../ParticleAcceleratorSystem.ControlBox.cs | 1 + .../Physics/Controllers/ConveyorController.cs | 1 + .../Components/ApcPowerReceiverComponent.cs | 7 -- .../Power/Components/CableComponent.cs | 9 +-- .../ActivatableUIRequiresPowerSystem.cs | 1 + .../EntitySystems/CableMultitoolSystem.cs | 5 +- .../Power/EntitySystems/ChargerSystem.cs | 1 + .../Power/EntitySystems/PowerNetSystem.cs | 1 + .../EntitySystems/PowerReceiverSystem.cs | 13 ++++ .../Power/Generation/Teg/TegSystem.cs | 2 + .../Power/Generator/GasPowerReceiverSystem.cs | 2 + .../GeneratorSignalControlComponent.cs | 1 + .../Radio/EntitySystems/RadioDeviceSystem.cs | 1 + .../Shuttles/Systems/ShuttleConsoleSystem.cs | 1 + .../Shuttles/Systems/ThrusterSystem.cs | 1 + .../EntitySystems/EmitterSystem.cs | 1 + .../Sound/SpamEmitSoundRequirePowerSystem.cs | 2 + .../SurveillanceCameraMonitorSystem.cs | 1 + .../Systems/SurveillanceCameraRouterSystem.cs | 1 + .../Systems/SurveillanceCameraSystem.cs | 1 + .../Temperature/Systems/EntityHeaterSystem.cs | 1 + .../VendingMachines/VendingMachineSystem.cs | 1 + Content.Server/Wires/WiresSystem.cs | 1 + .../Systems/ArtifactAnalyzerSystem.cs | 1 + .../Systems/ArtifactCrusherSystem.cs | 1 + .../Cabinet/ItemCabinetComponent.cs | 1 + .../Cargo/Components/CashComponent.cs | 2 +- .../Chemistry/Components/Solution.cs | 1 + .../Components/PilotedByClothingComponent.cs | 1 + .../Components/ToggleClothingComponent.cs | 2 + .../Containers/ContainerFillComponent.cs | 1 + .../Components/SlimPoweredLightComponent.cs | 17 +++++ .../EntitySystems/SlimPoweredLightSystem.cs | 67 +++++++++++++++++++ .../UnpoweredFlashlightSystem.cs | 2 + Content.Shared/Objectives/ObjectiveInfo.cs | 1 + .../Components/PayloadTriggerComponent.cs | 1 + .../SharedPowerReceiverSystem.cs | 11 +++ Content.Shared/Power/PowerChangedEvent.cs | 8 +++ .../PowerCell/PowerCellDrawComponent.cs | 1 + .../Tools/Systems/SharedToolSystem.cs | 3 + .../Weapons/Melee/MeleeSoundSystem.cs | 1 + 98 files changed, 236 insertions(+), 18 deletions(-) create mode 100644 Content.Shared/Light/Components/SlimPoweredLightComponent.cs create mode 100644 Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs create mode 100644 Content.Shared/Power/PowerChangedEvent.cs diff --git a/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs b/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs index c95f8f204dd..fad55f96273 100644 --- a/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs +++ b/Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs @@ -1,4 +1,5 @@ using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs index dd8e3e22121..b4e9a07ef88 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs +++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs @@ -11,9 +11,8 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Network; -using Robust.Shared.Utility; -using Robust.Shared.Timing; using Robust.Shared.Configuration; +using Robust.Shared.Utility; namespace Content.Client.Administration.UI.Bwoink { diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs index a2faf208d92..7cb32b43df5 100644 --- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs +++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs @@ -1,4 +1,5 @@ using System.Numerics; +using Content.Client.UserInterface.Controls; using Content.Shared.Roles; using Robust.Client.AutoGenerated; using Robust.Client.Console; diff --git a/Content.Client/CartridgeLoader/Cartridges/CrewManifestUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/CrewManifestUiFragment.xaml.cs index 273707cb6ea..27ddd51815e 100644 --- a/Content.Client/CartridgeLoader/Cartridges/CrewManifestUiFragment.xaml.cs +++ b/Content.Client/CartridgeLoader/Cartridges/CrewManifestUiFragment.xaml.cs @@ -1,4 +1,5 @@ -using Content.Shared.CrewManifest; +using Content.Client.CrewManifest.UI; +using Content.Shared.CrewManifest; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs index 269694ebf9e..81410dc7e6d 100644 --- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs +++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Client.Materials; +using Content.Client.Materials.UI; using Content.Client.Message; using Content.Client.UserInterface.Controls; using Content.Shared.Construction.Components; diff --git a/Content.Client/CrewManifest/CrewManifestUi.xaml.cs b/Content.Client/CrewManifest/CrewManifestUi.xaml.cs index 4183c908141..f07e54eb65b 100644 --- a/Content.Client/CrewManifest/CrewManifestUi.xaml.cs +++ b/Content.Client/CrewManifest/CrewManifestUi.xaml.cs @@ -1,3 +1,4 @@ +using Content.Client.CrewManifest.UI; using Content.Shared.CrewManifest; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs index 14709f8b1f0..619cac68391 100644 --- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs +++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs @@ -1,5 +1,6 @@ using System.Numerics; using Content.Client.UserInterface.Controls; +using Prometheus; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs index 6471edb6f37..81230130a1d 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs +++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs @@ -2,6 +2,7 @@ using Content.Client.UserInterface.Systems.EscapeMenu; using Robust.Client.AutoGenerated; using Robust.Client.Console; +using Robust.Client.State; using Robust.Client.UserInterface; using Robust.Client.UserInterface.XAML; diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs index 6133abfcb70..441ca9ea365 100644 --- a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs +++ b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs @@ -3,6 +3,7 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.Timing; using Content.Client.TextScreen; +using Robust.Client.UserInterface.Controls; namespace Content.Client.MachineLinking.UI; diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs index 61037f4e4af..b749d1f234d 100644 --- a/Content.Client/Options/UI/OptionsMenu.xaml.cs +++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs @@ -1,3 +1,4 @@ +using Content.Client.Options.UI.Tabs; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; diff --git a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs index 61e20f751ca..ebf6c18c953 100644 --- a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs @@ -1,3 +1,4 @@ +using System.Diagnostics.CodeAnalysis; using Content.Client.Power.Components; using Content.Shared.Power.Components; using Content.Shared.Power.EntitySystems; @@ -27,4 +28,16 @@ private void OnHandleState(EntityUid uid, ApcPowerReceiverComponent component, r component.Powered = state.Powered; } + + public override bool ResolveApc(EntityUid entity, [NotNullWhen(true)] ref SharedApcPowerReceiverComponent? component) + { + if (component != null) + return true; + + if (!TryComp(entity, out ApcPowerReceiverComponent? receiver)) + return false; + + component = receiver; + return true; + } } diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs index e975e5d466e..161482e0905 100644 --- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs +++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs @@ -3,6 +3,7 @@ using Content.Shared.Power.Generator; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.XAML; +using Robust.Shared.Network; namespace Content.Client.Power.Generator; diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs index 20d2e4a3e54..f66b3db000e 100644 --- a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs +++ b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs @@ -1,3 +1,4 @@ +using System.Threading.Channels; using Content.Client.UserInterface.Controls; using Content.Shared.Radio.Components; using Robust.Client.AutoGenerated; diff --git a/Content.Client/StationRecords/GeneralRecord.xaml.cs b/Content.Client/StationRecords/GeneralRecord.xaml.cs index 6a2622fba9e..e84c2dc0982 100644 --- a/Content.Client/StationRecords/GeneralRecord.xaml.cs +++ b/Content.Client/StationRecords/GeneralRecord.xaml.cs @@ -2,6 +2,7 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.XAML; +using Robust.Shared.Enums; namespace Content.Client.StationRecords; diff --git a/Content.Client/Storage/Components/StorageContainerVisualsComponent.cs b/Content.Client/Storage/Components/StorageContainerVisualsComponent.cs index 9f07867da85..9ef6c65e890 100644 --- a/Content.Client/Storage/Components/StorageContainerVisualsComponent.cs +++ b/Content.Client/Storage/Components/StorageContainerVisualsComponent.cs @@ -1,4 +1,5 @@ using Content.Client.Chemistry.Visualizers; +using Content.Shared.Chemistry.Components; namespace Content.Client.Storage.Components; diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs index 2890bb3dbf7..2723db1efbf 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs @@ -1,6 +1,7 @@ using Content.Client.Stylesheets; using Content.Client.UserInterface.Controls; using Content.Shared.Xenoarchaeology.Equipment; +using Microsoft.VisualBasic; using Robust.Client.AutoGenerated; using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; diff --git a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs index 4f2108748b8..3dd216c5dce 100644 --- a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs +++ b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs @@ -1,6 +1,7 @@ using Content.Server.Power.Components; using Content.Server.Station.Systems; using Content.Shared.AlertLevel; +using Content.Shared.Power; namespace Content.Server.AlertLevel; diff --git a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs index bac2648307c..bc3b57bd5a3 100644 --- a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs +++ b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs @@ -10,6 +10,7 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.Database; using Content.Shared.Mind.Components; +using Content.Shared.Power; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs index 9f18a412925..d4a3a0d5faa 100644 --- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs +++ b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Popups; +using Content.Shared.Power; using Robust.Shared.Audio.Systems; using Content.Shared.Verbs; diff --git a/Content.Server/Anomaly/AnomalySystem.Generator.cs b/Content.Server/Anomaly/AnomalySystem.Generator.cs index 056a985cbe2..6eb84b94418 100644 --- a/Content.Server/Anomaly/AnomalySystem.Generator.cs +++ b/Content.Server/Anomaly/AnomalySystem.Generator.cs @@ -13,6 +13,7 @@ using Robust.Shared.Physics.Components; using Robust.Shared.Map; using System.Numerics; +using Content.Shared.Power; using Robust.Server.GameObjects; namespace Content.Server.Anomaly; diff --git a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs index 561cad8d7ee..b0bf3895092 100644 --- a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs +++ b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Advertise; using Content.Server.Advertise.Components; using Content.Shared.Arcade; +using Content.Shared.Power; using Robust.Server.GameObjects; using Robust.Shared.Player; diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs index f7758f11f17..b359a13bd12 100644 --- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs +++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs @@ -2,6 +2,7 @@ using Content.Shared.UserInterface; using Content.Server.Advertise; using Content.Server.Advertise.Components; +using Content.Shared.Power; using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent; using Robust.Server.GameObjects; using Robust.Shared.Audio; diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs index 7212865baaf..eebac18501a 100644 --- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs @@ -18,6 +18,7 @@ using Content.Shared.DeviceNetwork; using Content.Shared.DeviceNetwork.Systems; using Content.Shared.Interaction; +using Content.Shared.Power; using Content.Shared.Wires; using Robust.Server.GameObjects; using Robust.Shared.Player; diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs index 1b3b11068c5..81a3968e6ff 100644 --- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs @@ -7,6 +7,7 @@ using Content.Server.Power.Components; using Content.Shared.Atmos.Monitor; using Content.Shared.DeviceNetwork; +using Content.Shared.Power; using Content.Shared.Tag; using Robust.Server.Audio; using Robust.Server.GameObjects; diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs index c1a5256fdd5..2c9a3587559 100644 --- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Monitor; using Content.Shared.DeviceNetwork; +using Content.Shared.Power; using Content.Shared.Tag; using Robust.Shared.Prototypes; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs index 2859c7f19d0..dbbbf2d0083 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs @@ -18,6 +18,7 @@ using Content.Shared.Audio; using Content.Shared.DeviceNetwork; using Content.Shared.Examine; +using Content.Shared.Power; using Content.Shared.Tools.Systems; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs index b27689ed586..a35cf6c2e30 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs @@ -16,6 +16,7 @@ using Content.Shared.Atmos.Piping.Unary.Components; using Content.Shared.Audio; using Content.Shared.DeviceNetwork; +using Content.Shared.Power; using Content.Shared.Tools.Systems; using JetBrains.Annotations; using Robust.Server.GameObjects; diff --git a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs index bc5db2e22cb..b1b6ed36789 100644 --- a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs +++ b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs @@ -15,6 +15,7 @@ using Content.Server.NodeContainer.EntitySystems; using Content.Shared.Atmos; using Content.Shared.Database; +using Content.Shared.Power; namespace Content.Server.Atmos.Portable { diff --git a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs index cbf63f54043..36ef59e743b 100644 --- a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs +++ b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs @@ -6,6 +6,7 @@ using Content.Server.Power.EntitySystems; using Content.Shared.Atmos.Piping.Portable.Components; using Content.Shared.Atmos.Visuals; +using Content.Shared.Power; using Content.Shared.UserInterface; using Robust.Server.GameObjects; diff --git a/Content.Server/Audio/AmbientSoundSystem.cs b/Content.Server/Audio/AmbientSoundSystem.cs index e78970d1243..1f4abf34f77 100644 --- a/Content.Server/Audio/AmbientSoundSystem.cs +++ b/Content.Server/Audio/AmbientSoundSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Power.EntitySystems; using Content.Shared.Audio; using Content.Shared.Mobs; +using Content.Shared.Power; namespace Content.Server.Audio; diff --git a/Content.Server/Audio/Jukebox/JukeboxSystem.cs b/Content.Server/Audio/Jukebox/JukeboxSystem.cs index cc9235e3d7a..3535f6b2382 100644 --- a/Content.Server/Audio/Jukebox/JukeboxSystem.cs +++ b/Content.Server/Audio/Jukebox/JukeboxSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Audio.Jukebox; +using Content.Shared.Power; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Audio.Components; diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs index a6b61da591f..2cc8085e725 100644 --- a/Content.Server/Bed/BedSystem.cs +++ b/Content.Server/Bed/BedSystem.cs @@ -10,6 +10,7 @@ using Content.Shared.Damage; using Content.Shared.Emag.Systems; using Content.Shared.Mobs.Systems; +using Content.Shared.Power; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Content.Server/Buckle/Systems/AntiRotOnBuckleSystem.cs b/Content.Server/Buckle/Systems/AntiRotOnBuckleSystem.cs index 4458b020a11..6f356baf073 100644 --- a/Content.Server/Buckle/Systems/AntiRotOnBuckleSystem.cs +++ b/Content.Server/Buckle/Systems/AntiRotOnBuckleSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Power.Components; using Content.Shared.Atmos.Rotting; using Content.Shared.Buckle.Components; +using Content.Shared.Power; namespace Content.Server.Buckle.Systems; diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs index f83ec1a5123..5b699740776 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs @@ -6,6 +6,7 @@ using Content.Shared.Cargo; using Content.Shared.Cargo.Components; using Content.Shared.DeviceLinking; +using Content.Shared.Power; using Robust.Shared.Audio; using Robust.Shared.Random; using Robust.Shared.Utility; diff --git a/Content.Server/Chemistry/EntitySystems/SolutionContainerMixerSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionContainerMixerSystem.cs index a942d34e7a8..45a85010b19 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionContainerMixerSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionContainerMixerSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Power.EntitySystems; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Power; namespace Content.Server.Chemistry.EntitySystems; diff --git a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs index 6e6373e10bf..cd39d20b753 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Placeable; +using Content.Shared.Power; namespace Content.Server.Chemistry.EntitySystems; diff --git a/Content.Server/Cloning/CloningConsoleSystem.cs b/Content.Server/Cloning/CloningConsoleSystem.cs index 950a6599a89..050e2b7f064 100644 --- a/Content.Server/Cloning/CloningConsoleSystem.cs +++ b/Content.Server/Cloning/CloningConsoleSystem.cs @@ -15,6 +15,7 @@ using Content.Shared.Mind; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; +using Content.Shared.Power; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Server.Player; diff --git a/Content.Server/Construction/ConstructionSystem.Computer.cs b/Content.Server/Construction/ConstructionSystem.Computer.cs index 0685b08f4ff..6951d44b4d5 100644 --- a/Content.Server/Construction/ConstructionSystem.Computer.cs +++ b/Content.Server/Construction/ConstructionSystem.Computer.cs @@ -1,6 +1,7 @@ using Content.Server.Construction.Components; using Content.Server.Power.Components; using Content.Shared.Computer; +using Content.Shared.Power; using Robust.Shared.Containers; namespace Content.Server.Construction; diff --git a/Content.Server/Construction/FlatpackSystem.cs b/Content.Server/Construction/FlatpackSystem.cs index af2132723cd..11303e7f2ee 100644 --- a/Content.Server/Construction/FlatpackSystem.cs +++ b/Content.Server/Construction/FlatpackSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Construction; using Content.Shared.Construction.Components; using Content.Shared.Containers.ItemSlots; +using Content.Shared.Power; using Robust.Shared.Prototypes; using Robust.Shared.Timing; diff --git a/Content.Server/DeviceLinking/Components/PowerSensorComponent.cs b/Content.Server/DeviceLinking/Components/PowerSensorComponent.cs index d9599546aea..b67a2fcd950 100644 --- a/Content.Server/DeviceLinking/Components/PowerSensorComponent.cs +++ b/Content.Server/DeviceLinking/Components/PowerSensorComponent.cs @@ -1,5 +1,6 @@ using Content.Server.DeviceLinking.Systems; using Content.Shared.DeviceLinking; +using Content.Shared.Power.Generator; using Content.Shared.Tools; using Robust.Shared.Audio; using Robust.Shared.Prototypes; diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs index 6e7bd255c5d..f47a5df8ac4 100644 --- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs @@ -1,6 +1,7 @@ using Content.Server.DeviceNetwork.Components; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; +using Content.Shared.Power.EntitySystems; namespace Content.Server.DeviceNetwork.Systems; diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs index cdc083feacd..d189afc0a02 100644 --- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Medical.CrewMonitoring; using Content.Server.Power.Components; using Content.Server.Station.Systems; +using Content.Shared.Power; namespace Content.Server.DeviceNetwork.Systems; diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs index 7726acfc93a..f1d182fc668 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs @@ -25,6 +25,7 @@ using Content.Shared.Item; using Content.Shared.Movement.Events; using Content.Shared.Popups; +using Content.Shared.Power; using Content.Shared.Verbs; using Robust.Server.Audio; using Robust.Server.GameObjects; diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs index fd5d3a9ceba..e9f1db13ffb 100644 --- a/Content.Server/Doors/Systems/AirlockSystem.cs +++ b/Content.Server/Doors/Systems/AirlockSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Doors.Components; using Content.Shared.Doors.Systems; using Content.Shared.Interaction; +using Content.Shared.Power; using Content.Shared.Wires; using Robust.Shared.Player; diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs index 5968e445c19..292f8ec8e97 100644 --- a/Content.Server/Doors/Systems/DoorSystem.cs +++ b/Content.Server/Doors/Systems/DoorSystem.cs @@ -1,9 +1,9 @@ using Content.Server.Access; using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; -using Content.Server.Power.Components; using Content.Shared.Doors.Components; using Content.Shared.Doors.Systems; +using Content.Shared.Power; using Robust.Shared.Physics.Components; namespace Content.Server.Doors.Systems; diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs index 87e5887c422..6bb1972b6ec 100644 --- a/Content.Server/Doors/Systems/FirelockSystem.cs +++ b/Content.Server/Doors/Systems/FirelockSystem.cs @@ -8,6 +8,7 @@ using Content.Shared.Atmos.Monitor; using Content.Shared.Doors.Components; using Content.Shared.Doors.Systems; +using Content.Shared.Power; using Robust.Server.GameObjects; using Robust.Shared.Map.Components; diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs index 18852ac7555..a43d0171e60 100644 --- a/Content.Server/Fax/FaxSystem.cs +++ b/Content.Server/Fax/FaxSystem.cs @@ -29,6 +29,7 @@ using Robust.Shared.Player; using Robust.Shared.Prototypes; using Content.Shared.NameModifier.Components; +using Content.Shared.Power; namespace Content.Server.Fax; diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs index b4023bbdb9f..f7e0c6fde22 100644 --- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -21,6 +21,7 @@ using System.Linq; using Content.Server.Jittering; using Content.Shared.Jittering; +using Content.Shared.Power; namespace Content.Server.Kitchen.EntitySystems { diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs index 6d7d4e45331..18f246dcef4 100644 --- a/Content.Server/Lathe/LatheSystem.cs +++ b/Content.Server/Lathe/LatheSystem.cs @@ -19,6 +19,7 @@ using Content.Shared.Examine; using Content.Shared.Lathe; using Content.Shared.Materials; +using Content.Shared.Power; using Content.Shared.ReagentSpeed; using Content.Shared.Research.Components; using Content.Shared.Research.Prototypes; diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs index b6810aa33be..6bd5750460a 100644 --- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs +++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.Examine; using Content.Shared.Light; using Content.Shared.Light.Components; +using Content.Shared.Power; using Content.Shared.Station.Components; using Robust.Server.GameObjects; using Color = Robust.Shared.Maths.Color; diff --git a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs index 752fb8f5fe6..3c5f7eaecb2 100644 --- a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs +++ b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs @@ -1,6 +1,8 @@ using Content.Server.Light.Components; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; +using Content.Shared.Power; +using Content.Shared.Power.Components; namespace Content.Server.Light.EntitySystems { diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index 33b7ce0782f..6e1363dee2a 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -25,6 +25,8 @@ using Robust.Shared.Audio.Systems; using Content.Shared.Damage.Systems; using Content.Shared.Damage.Components; +using Content.Shared.Power; +using Content.Shared.Power.Components; namespace Content.Server.Light.EntitySystems { diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs index e66c27343c8..b02212844b0 100644 --- a/Content.Server/Materials/MaterialReclaimerSystem.cs +++ b/Content.Server/Materials/MaterialReclaimerSystem.cs @@ -24,6 +24,7 @@ using Content.Shared.Database; using Content.Shared.Destructible; using Content.Shared.Emag.Components; +using Content.Shared.Power; using Robust.Shared.Prototypes; namespace Content.Server.Materials; diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs index c5beed718ed..868e6d99f25 100644 --- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs +++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs @@ -24,6 +24,7 @@ using Content.Shared.Mobs.Systems; using Content.Shared.Nutrition.Components; using Content.Shared.Popups; +using Content.Shared.Power; using Content.Shared.Throwing; using Robust.Server.Player; using Robust.Shared.Audio.Systems; diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs index 8d54fc6dd95..2c9f58616a2 100644 --- a/Content.Server/Medical/CryoPodSystem.cs +++ b/Content.Server/Medical/CryoPodSystem.cs @@ -29,6 +29,7 @@ using Content.Shared.Interaction; using Content.Shared.Medical.Cryogenics; using Content.Shared.MedicalScanner; +using Content.Shared.Power; using Content.Shared.Verbs; using Robust.Server.GameObjects; using Robust.Shared.Containers; diff --git a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs index 180e40d1e42..c91a6f795b2 100644 --- a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs @@ -8,6 +8,7 @@ using Content.Shared.Emag.Systems; using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; +using Content.Shared.Power; using Content.Shared.Storage.Components; using Robust.Shared.Audio.Systems; using Robust.Shared.Timing; diff --git a/Content.Server/Paper/PaperRandomStoryComponent.cs b/Content.Server/Paper/PaperRandomStoryComponent.cs index b8e07f0ee81..7b6624ac85d 100644 --- a/Content.Server/Paper/PaperRandomStoryComponent.cs +++ b/Content.Server/Paper/PaperRandomStoryComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Paper; using Content.Shared.StoryGen; using Robust.Shared.Prototypes; diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs index 4d39a5ce305..17943c1c987 100644 --- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs +++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs @@ -6,6 +6,7 @@ using System.Diagnostics; using Content.Server.Administration.Managers; using Content.Shared.CCVar; +using Content.Shared.Power; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Timing; diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs index e2788fa54cf..3c0db7f85a3 100644 --- a/Content.Server/Physics/Controllers/ConveyorController.cs +++ b/Content.Server/Physics/Controllers/ConveyorController.cs @@ -7,6 +7,7 @@ using Content.Shared.Maps; using Content.Shared.Physics; using Content.Shared.Physics.Controllers; +using Content.Shared.Power; using Robust.Shared.Physics; using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Physics.Components; diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs index 9a68e2aabb8..ebb3c6b42f3 100644 --- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs +++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs @@ -59,11 +59,4 @@ public bool PowerDisabled { public float PowerReceived => NetworkLoad.ReceivingPower; } - - /// - /// Raised whenever an ApcPowerReceiver becomes powered / unpowered. - /// Does nothing on the client. - /// - [ByRefEvent] - public readonly record struct PowerChangedEvent(bool Powered, float ReceivingPower); } diff --git a/Content.Server/Power/Components/CableComponent.cs b/Content.Server/Power/Components/CableComponent.cs index a2a02a60f68..7398bc0616e 100644 --- a/Content.Server/Power/Components/CableComponent.cs +++ b/Content.Server/Power/Components/CableComponent.cs @@ -4,6 +4,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using System.Diagnostics.Tracing; +using Content.Shared.Tools.Systems; namespace Content.Server.Power.Components; @@ -14,11 +15,11 @@ namespace Content.Server.Power.Components; [Access(typeof(CableSystem))] public sealed partial class CableComponent : Component { - [DataField("cableDroppedOnCutPrototype", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string CableDroppedOnCutPrototype = "CableHVStack1"; + [DataField] + public EntProtoId CableDroppedOnCutPrototype = "CableHVStack1"; - [DataField("cuttingQuality", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string CuttingQuality = "Cutting"; + [DataField] + public ProtoId CuttingQuality = SharedToolSystem.CutQuality; /// /// Checked by to determine if there is diff --git a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs index 11f35634b20..9fd824a3c49 100644 --- a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs +++ b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs @@ -1,4 +1,5 @@ using Content.Server.Power.Components; +using Content.Shared.Power; using Content.Shared.Power.Components; using Content.Shared.Power.EntitySystems; using Content.Shared.UserInterface; diff --git a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs index 15b967bb1d5..4a63be894ef 100644 --- a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs +++ b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Tools; using Content.Shared.Examine; using Content.Shared.Interaction; +using Content.Shared.Tools.Systems; using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Shared.Utility; @@ -27,7 +28,7 @@ public override void Initialize() private void OnAfterInteractUsing(EntityUid uid, CableComponent component, AfterInteractUsingEvent args) { - if (args.Handled || args.Target == null || !args.CanReach || !_toolSystem.HasQuality(args.Used, "Pulsing")) + if (args.Handled || args.Target == null || !args.CanReach || !_toolSystem.HasQuality(args.Used, SharedToolSystem.PulseQuality)) return; var markup = FormattedMessage.FromMarkup(GenerateCableMarkup(uid)); @@ -45,7 +46,7 @@ private void OnGetExamineVerbs(EntityUid uid, CableComponent component, GetVerbs // Pulsing is hardcoded here because I don't think it needs to be more complex than that right now. // Update if I'm wrong. - var enabled = held != null && _toolSystem.HasQuality(held.Value, "Pulsing"); + var enabled = held != null && _toolSystem.HasQuality(held.Value, SharedToolSystem.PulseQuality); var verb = new ExamineVerb { Disabled = !enabled, diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index 4e2543d2a70..df7bd2a54f7 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -8,6 +8,7 @@ using JetBrains.Annotations; using Robust.Shared.Containers; using System.Diagnostics.CodeAnalysis; +using Content.Shared.Power.Components; using Content.Shared.Storage.Components; using Robust.Server.Containers; using Content.Shared.Whitelist; diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs index a7098649cef..9ce48141396 100644 --- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs @@ -5,6 +5,7 @@ using Content.Server.Power.Pow3r; using Content.Shared.CCVar; using Content.Shared.Power; +using Content.Shared.Power.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Configuration; diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs index 9b15bdfd287..38d7376e547 100644 --- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs @@ -1,3 +1,4 @@ +using System.Diagnostics.CodeAnalysis; using Content.Server.Administration.Logs; using Content.Server.Administration.Managers; using Content.Server.Power.Components; @@ -197,5 +198,17 @@ public void SetLoad(ApcPowerReceiverComponent comp, float load) { comp.Load = load; } + + public override bool ResolveApc(EntityUid entity, [NotNullWhen(true)] ref SharedApcPowerReceiverComponent? component) + { + if (component != null) + return true; + + if (!TryComp(entity, out ApcPowerReceiverComponent? receiver)) + return false; + + component = receiver; + return true; + } } } diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs index 02412ca5fb5..edf0693954c 100644 --- a/Content.Server/Power/Generation/Teg/TegSystem.cs +++ b/Content.Server/Power/Generation/Teg/TegSystem.cs @@ -10,6 +10,8 @@ using Content.Shared.Atmos; using Content.Shared.DeviceNetwork; using Content.Shared.Examine; +using Content.Shared.Power; +using Content.Shared.Power.Components; using Content.Shared.Power.Generation.Teg; using Content.Shared.Rounding; using Robust.Server.GameObjects; diff --git a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs index 5f79906c995..5a1bd31a15c 100644 --- a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs +++ b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs @@ -5,6 +5,8 @@ using Content.Server.NodeContainer.Nodes; using Content.Server.Power.Components; using Content.Shared.Atmos; +using Content.Shared.Power; +using Content.Shared.Power.Components; namespace Content.Server.Power.Generator; diff --git a/Content.Server/Power/Generator/GeneratorSignalControlComponent.cs b/Content.Server/Power/Generator/GeneratorSignalControlComponent.cs index f16a09eae37..19ae0bd6876 100644 --- a/Content.Server/Power/Generator/GeneratorSignalControlComponent.cs +++ b/Content.Server/Power/Generator/GeneratorSignalControlComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.DeviceLinking; +using Content.Shared.Power.Generator; using Robust.Shared.Prototypes; namespace Content.Server.Power.Generator; diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs index 1258e0b8c7e..c977fbc0489 100644 --- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs @@ -9,6 +9,7 @@ using Content.Server.Speech.Components; using Content.Shared.Examine; using Content.Shared.Interaction; +using Content.Shared.Power; using Content.Shared.Radio; using Content.Shared.Radio.Components; using Robust.Shared.Prototypes; diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs index 00a913aad86..81a2b29beb4 100644 --- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs @@ -12,6 +12,7 @@ using Content.Shared.Shuttles.Systems; using Content.Shared.Tag; using Content.Shared.Movement.Systems; +using Content.Shared.Power; using Content.Shared.Shuttles.UI.MapObjects; using Content.Shared.Timing; using Robust.Server.GameObjects; diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs index fd149630814..af780df44af 100644 --- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs +++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs @@ -19,6 +19,7 @@ using Robust.Shared.Timing; using Robust.Shared.Utility; using Content.Shared.Localizations; +using Content.Shared.Power; namespace Content.Server.Shuttles.Systems; diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs index a9763b64d90..1ada60e1d64 100644 --- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs @@ -11,6 +11,7 @@ using Content.Shared.Interaction; using Content.Shared.Lock; using Content.Shared.Popups; +using Content.Shared.Power; using Content.Shared.Projectiles; using Content.Shared.Singularity.Components; using Content.Shared.Singularity.EntitySystems; diff --git a/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs index 9cc85060c6e..d2c2a8a1ca7 100644 --- a/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs +++ b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs @@ -1,5 +1,7 @@ using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; +using Content.Shared.Power; +using Content.Shared.Power.Components; using Content.Shared.Sound; using Content.Shared.Sound.Components; diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs index f61c57a4a6b..5e50740ae69 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs @@ -3,6 +3,7 @@ using Content.Server.DeviceNetwork.Systems; using Content.Server.Power.Components; using Content.Shared.DeviceNetwork; +using Content.Shared.Power; using Content.Shared.UserInterface; using Content.Shared.SurveillanceCamera; using Robust.Server.GameObjects; diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs index d0c2cd78d32..315273a0cc4 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Power.Components; using Content.Shared.ActionBlocker; using Content.Shared.DeviceNetwork; +using Content.Shared.Power; using Content.Shared.SurveillanceCamera; using Content.Shared.Verbs; using Robust.Server.GameObjects; diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs index 8dd253269d0..9d1dd00590a 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs @@ -5,6 +5,7 @@ using Content.Server.Power.Components; using Content.Shared.ActionBlocker; using Content.Shared.DeviceNetwork; +using Content.Shared.Power; using Content.Shared.SurveillanceCamera; using Content.Shared.Verbs; using Robust.Server.GameObjects; diff --git a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs index ffc796cbb22..c4b5b72a9cb 100644 --- a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs +++ b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.Examine; using Content.Shared.Placeable; using Content.Shared.Popups; +using Content.Shared.Power; using Content.Shared.Temperature; using Content.Shared.Verbs; using Robust.Server.Audio; diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 2866b14a835..a265ce2d431 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -16,6 +16,7 @@ using Content.Shared.Emag.Systems; using Content.Shared.Emp; using Content.Shared.Popups; +using Content.Shared.Power; using Content.Shared.Throwing; using Content.Shared.UserInterface; using Content.Shared.VendingMachines; diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs index 92dcbb504f8..92a0322ecb8 100644 --- a/Content.Server/Wires/WiresSystem.cs +++ b/Content.Server/Wires/WiresSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Hands.Components; using Content.Shared.Interaction; using Content.Shared.Popups; +using Content.Shared.Power; using Content.Shared.Tools.Components; using Content.Shared.Wires; using Robust.Server.GameObjects; diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs index 8fc2f26fa63..3681e3d402a 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs @@ -11,6 +11,7 @@ using Content.Shared.Paper; using Content.Shared.Placeable; using Content.Shared.Popups; +using Content.Shared.Power; using Content.Shared.Research.Components; using Content.Shared.Xenoarchaeology.Equipment; using Content.Shared.Xenoarchaeology.XenoArtifacts; diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs index f65ba46f7a5..f841ea910e7 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs @@ -7,6 +7,7 @@ using Content.Server.Xenoarchaeology.XenoArtifacts; using Content.Shared.Body.Components; using Content.Shared.Damage; +using Content.Shared.Power; using Content.Shared.Verbs; using Content.Shared.Whitelist; using Content.Shared.Xenoarchaeology.Equipment; diff --git a/Content.Shared/Cabinet/ItemCabinetComponent.cs b/Content.Shared/Cabinet/ItemCabinetComponent.cs index b1d7e4a263f..f83f6a96ada 100644 --- a/Content.Shared/Cabinet/ItemCabinetComponent.cs +++ b/Content.Shared/Cabinet/ItemCabinetComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Containers.ItemSlots; using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Cargo/Components/CashComponent.cs b/Content.Shared/Cargo/Components/CashComponent.cs index 10a47ff803a..89af094e04a 100644 --- a/Content.Shared/Cargo/Components/CashComponent.cs +++ b/Content.Shared/Cargo/Components/CashComponent.cs @@ -3,7 +3,7 @@ namespace Content.Shared.Cargo.Components; /// -/// Can be inserted into a to increase the station's bank account. +/// Can be inserted into a to increase the station's bank account. /// [RegisterComponent, NetworkedComponent] public sealed partial class CashComponent : Component diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs index 35ab28f34a1..fc25781005f 100644 --- a/Content.Shared/Chemistry/Components/Solution.cs +++ b/Content.Shared/Chemistry/Components/Solution.cs @@ -6,6 +6,7 @@ using Robust.Shared.Utility; using System.Collections; using System.Linq; +using Content.Shared.Chemistry.Components.SolutionManager; namespace Content.Shared.Chemistry.Components { diff --git a/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs b/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs index cd4d0d62030..a5303ac1212 100644 --- a/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs +++ b/Content.Shared/Clothing/Components/PilotedByClothingComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Clothing.EntitySystems; using Robust.Shared.GameStates; namespace Content.Shared.Clothing.Components; diff --git a/Content.Shared/Clothing/Components/ToggleClothingComponent.cs b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs index c77aa03475f..04bc3ed4e83 100644 --- a/Content.Shared/Clothing/Components/ToggleClothingComponent.cs +++ b/Content.Shared/Clothing/Components/ToggleClothingComponent.cs @@ -1,5 +1,7 @@ using Content.Shared.Actions; using Content.Shared.Clothing.EntitySystems; +using Content.Shared.Item.ItemToggle.Components; +using Content.Shared.Toggleable; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Containers/ContainerFillComponent.cs b/Content.Shared/Containers/ContainerFillComponent.cs index 8c63cbc66af..7ce5fa88502 100644 --- a/Content.Shared/Containers/ContainerFillComponent.cs +++ b/Content.Shared/Containers/ContainerFillComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Storage; +using Content.Shared.Storage.Components; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager; using Robust.Shared.Serialization.Markdown.Mapping; diff --git a/Content.Shared/Light/Components/SlimPoweredLightComponent.cs b/Content.Shared/Light/Components/SlimPoweredLightComponent.cs new file mode 100644 index 00000000000..bf6ae0e5251 --- /dev/null +++ b/Content.Shared/Light/Components/SlimPoweredLightComponent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Light.Components; + +// All content light code is terrible and everything is baked-in. Power code got predicted before light code did. +/// +/// Handles turning a pointlight on / off based on power. Nothing else +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class SlimPoweredLightComponent : Component +{ + /// + /// Used to make this as being lit. If unpowered then the light will still be off. + /// + [DataField, AutoNetworkedField] + public bool Enabled = true; +} diff --git a/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs new file mode 100644 index 00000000000..6d984ed19a3 --- /dev/null +++ b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs @@ -0,0 +1,67 @@ +using Content.Shared.Light.Components; +using Content.Shared.Power; +using Content.Shared.Power.Components; +using Content.Shared.Power.EntitySystems; + +namespace Content.Shared.Light.EntitySystems; + +public sealed class SlimPoweredLightSystem : EntitySystem +{ + [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; + [Dependency] private readonly SharedPointLightSystem _lights = default!; + + private bool _setting; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnLightAttempt); + SubscribeLocalEvent(OnLightPowerChanged); + } + + private void OnLightAttempt(Entity ent, ref AttemptPointLightToggleEvent args) + { + // Early-out to avoid having to trycomp stuff if we're the caller setting it + if (_setting) + return; + + if (args.Enabled && !_receiver.IsPowered(ent.Owner)) + args.Cancelled = true; + } + + private void OnLightPowerChanged(Entity ent, ref PowerChangedEvent args) + { + // Early out if we don't need to trycomp. + if (args.Powered) + { + if (!ent.Comp.Enabled) + return; + } + else + { + if (!ent.Comp.Enabled) + return; + } + + if (!_lights.TryGetLight(ent.Owner, out var light)) + return; + + var enabled = ent.Comp.Enabled && args.Powered; + _setting = true; + _lights.SetEnabled(ent.Owner, enabled, light); + _setting = false; + } + + public void SetEnabled(Entity entity, bool enabled) + { + if (!Resolve(entity.Owner, ref entity.Comp, false)) + return; + + if (entity.Comp.Enabled == enabled) + return; + + entity.Comp.Enabled = enabled; + Dirty(entity); + _lights.SetEnabled(entity.Owner, enabled); + } +} diff --git a/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs b/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs index 42e55bea55d..8754de50583 100644 --- a/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs +++ b/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs @@ -13,6 +13,8 @@ namespace Content.Shared.Light.EntitySystems; public sealed class UnpoweredFlashlightSystem : EntitySystem { + // TODO: Split some of this to ItemTogglePointLight + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; diff --git a/Content.Shared/Objectives/ObjectiveInfo.cs b/Content.Shared/Objectives/ObjectiveInfo.cs index 689fe17e6c8..0b7e7a15f6e 100644 --- a/Content.Shared/Objectives/ObjectiveInfo.cs +++ b/Content.Shared/Objectives/ObjectiveInfo.cs @@ -1,3 +1,4 @@ +using Content.Shared.Objectives.Components; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs index 6d3df41ac97..b064e91198c 100644 --- a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs +++ b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Explosion.Components; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs index 37ac7518896..2bc2af78314 100644 --- a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs +++ b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs @@ -1,3 +1,4 @@ +using System.Diagnostics.CodeAnalysis; using Content.Shared.Examine; using Content.Shared.Power.Components; @@ -5,6 +6,16 @@ namespace Content.Shared.Power.EntitySystems; public abstract class SharedPowerReceiverSystem : EntitySystem { + public abstract bool ResolveApc(EntityUid entity, [NotNullWhen(true)] ref SharedApcPowerReceiverComponent? component); + + public bool IsPowered(Entity entity) + { + if (!ResolveApc(entity.Owner, ref entity.Comp)) + return true; + + return entity.Comp.Powered; + } + protected string GetExamineText(bool powered) { return Loc.GetString("power-receiver-component-on-examine-main", diff --git a/Content.Shared/Power/PowerChangedEvent.cs b/Content.Shared/Power/PowerChangedEvent.cs new file mode 100644 index 00000000000..578a34142a8 --- /dev/null +++ b/Content.Shared/Power/PowerChangedEvent.cs @@ -0,0 +1,8 @@ +namespace Content.Shared.Power; + +/// +/// Raised whenever an ApcPowerReceiver becomes powered / unpowered. +/// Does nothing on the client. +/// +[ByRefEvent] +public readonly record struct PowerChangedEvent(bool Powered, float ReceivingPower); \ No newline at end of file diff --git a/Content.Shared/PowerCell/PowerCellDrawComponent.cs b/Content.Shared/PowerCell/PowerCellDrawComponent.cs index 9c2f72661de..7af44420a71 100644 --- a/Content.Shared/PowerCell/PowerCellDrawComponent.cs +++ b/Content.Shared/PowerCell/PowerCellDrawComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Item.ItemToggle.Components; using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs index 201eb19a88b..86b91dcda46 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs @@ -33,6 +33,9 @@ public abstract partial class SharedToolSystem : EntitySystem [Dependency] private readonly TurfSystem _turfs = default!; [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainer = default!; + public const string CutQuality = "Cutting"; + public const string PulseQuality = "Pulsing"; + public override void Initialize() { InitializeMultipleTool(); diff --git a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs index 5bf74802026..3add18365af 100644 --- a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs +++ b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Weapons.Melee.Components; +using Content.Shared.Weapons.Melee.Events; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; From c0a07614c088b64303af8fe13686aa0134ed50b8 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:30:28 +1000 Subject: [PATCH 067/223] ItemToggle + slots stuff (#31312) * ItemToggle + slots stuff - Add component for itemslot locks to match LockComponent (surprised this didn't exist). - Add thing for pointlight to match itemtoggle. In future should be used for PDAs and stuff but need to fix some other stuff first. * Also this * grill --- .../ItemSlot/ItemSlotsLockComponent.cs | 13 ++++++ .../ItemSlot/ItemSlotsSystem.Lock.cs | 36 +++++++++++++++++ .../Containers/ItemSlot/ItemSlotsSystem.cs | 4 +- .../Components/ItemToggleComponent.cs | 12 +++--- .../Item/ItemToggle/ItemToggleSystem.cs | 40 ++++++++++++++----- .../ItemTogglePointLightComponent.cs | 12 ++++++ .../ItemTogglePointLightSystem.cs | 29 ++++++++++++++ .../ItemSlotRequiresPowerComponent.cs | 9 +++++ .../ItemSlotRequiresPowerSystem.cs | 23 +++++++++++ Resources/Locale/en-US/items/toggle.ftl | 2 + 10 files changed, 163 insertions(+), 17 deletions(-) create mode 100644 Content.Shared/Containers/ItemSlot/ItemSlotsLockComponent.cs create mode 100644 Content.Shared/Containers/ItemSlot/ItemSlotsSystem.Lock.cs create mode 100644 Content.Shared/Light/Components/ItemTogglePointLightComponent.cs create mode 100644 Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs create mode 100644 Content.Shared/Power/Components/ItemSlotRequiresPowerComponent.cs create mode 100644 Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs create mode 100644 Resources/Locale/en-US/items/toggle.ftl diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsLockComponent.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsLockComponent.cs new file mode 100644 index 00000000000..0d8901028d7 --- /dev/null +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsLockComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Containers.ItemSlots; + +/// +/// Updates the relevant ItemSlots locks based on +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class ItemSlotsLockComponent : Component +{ + [DataField(required: true)] + public List Slots = new(); +} diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.Lock.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.Lock.cs new file mode 100644 index 00000000000..ee5178df95b --- /dev/null +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.Lock.cs @@ -0,0 +1,36 @@ +using Content.Shared.Lock; + +namespace Content.Shared.Containers.ItemSlots; + +public sealed partial class ItemSlotsSystem +{ + private void InitializeLock() + { + SubscribeLocalEvent(OnLockMapInit); + SubscribeLocalEvent(OnLockToggled); + } + + private void OnLockMapInit(Entity ent, ref MapInitEvent args) + { + if (!TryComp(ent.Owner, out LockComponent? lockComp)) + return; + + UpdateLocks(ent, lockComp.Locked); + } + + private void OnLockToggled(Entity ent, ref LockToggledEvent args) + { + UpdateLocks(ent, args.Locked); + } + + private void UpdateLocks(Entity ent, bool value) + { + foreach (var slot in ent.Comp.Slots) + { + if (!TryGetSlot(ent.Owner, slot, out var itemSlot)) + continue; + + SetLock(ent.Owner, itemSlot, value); + } + } +} diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index 48f4f07cbe1..f41fa2b22d2 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -24,7 +24,7 @@ namespace Content.Shared.Containers.ItemSlots /// Note when using popups on entities with many slots with InsertOnInteract, EjectOnInteract or EjectOnUse: /// A single use will try to insert to/eject from every slot and generate a popup for each that fails. /// - public sealed class ItemSlotsSystem : EntitySystem + public sealed partial class ItemSlotsSystem : EntitySystem { [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; @@ -38,6 +38,8 @@ public override void Initialize() { base.Initialize(); + InitializeLock(); + SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(Oninitialize); diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs index 46249fdd0de..47edec135d8 100644 --- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs +++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs @@ -19,6 +19,12 @@ public sealed partial class ItemToggleComponent : Component [DataField, AutoNetworkedField] public bool Activated = false; + /// + /// Can the entity be activated in the world. + /// + [DataField] + public bool OnActivate = true; + /// /// If this is set to false then the item can't be toggled by pressing Z. /// Use another system to do it then. @@ -52,12 +58,6 @@ public sealed partial class ItemToggleComponent : Component /// [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] public SoundSpecifier? SoundFailToActivate; - - /// - /// Whether or not to toggle the entity's lights on or off. - /// - [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] - public bool ToggleLight = true; } /// diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs index 1cc8699d70c..33b88dbaf82 100644 --- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs +++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs @@ -1,8 +1,10 @@ +using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Popups; using Content.Shared.Temperature; using Content.Shared.Toggleable; +using Content.Shared.Verbs; using Content.Shared.Wieldable; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; @@ -20,7 +22,6 @@ public sealed class ItemToggleSystem : EntitySystem [Dependency] private readonly INetManager _netManager = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; private EntityQuery _query; @@ -36,6 +37,8 @@ public override void Initialize() SubscribeLocalEvent(TurnOffOnUnwielded); SubscribeLocalEvent(TurnOnOnWielded); SubscribeLocalEvent(OnUseInHand); + SubscribeLocalEvent>(OnActivateVerb); + SubscribeLocalEvent(OnActivate); SubscribeLocalEvent(OnIsHotEvent); @@ -66,6 +69,32 @@ private void OnUseInHand(Entity ent, ref UseInHandEvent arg Toggle((ent, ent.Comp), args.User, predicted: ent.Comp.Predictable); } + private void OnActivateVerb(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract) + return; + + var user = args.User; + + args.Verbs.Add(new ActivationVerb() + { + Text = !ent.Comp.Activated ? Loc.GetString("item-toggle-activate") : Loc.GetString("item-toggle-deactivate"), + Act = () => + { + Toggle((ent.Owner, ent.Comp), user, predicted: ent.Comp.Predictable); + } + }); + } + + private void OnActivate(Entity ent, ref ActivateInWorldEvent args) + { + if (args.Handled || !ent.Comp.OnActivate) + return; + + args.Handled = true; + Toggle((ent.Owner, ent.Comp), args.User, predicted: ent.Comp.Predictable); + } + /// /// Used when an item is attempted to be toggled. /// Sets its state to the opposite of what it is. @@ -203,16 +232,7 @@ private void UpdateVisuals(Entity ent) if (TryComp(ent, out AppearanceComponent? appearance)) { _appearance.SetData(ent, ToggleVisuals.Toggled, ent.Comp.Activated, appearance); - - if (ent.Comp.ToggleLight) - _appearance.SetData(ent, ToggleableLightVisuals.Enabled, ent.Comp.Activated, appearance); } - - if (!ent.Comp.ToggleLight) - return; - - if (_light.TryGetLight(ent, out var light)) - _light.SetEnabled(ent, ent.Comp.Activated, light); } /// diff --git a/Content.Shared/Light/Components/ItemTogglePointLightComponent.cs b/Content.Shared/Light/Components/ItemTogglePointLightComponent.cs new file mode 100644 index 00000000000..6ac1bf236d7 --- /dev/null +++ b/Content.Shared/Light/Components/ItemTogglePointLightComponent.cs @@ -0,0 +1,12 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Light.Components; + +/// +/// Toggles point light on an entity whenever ItemToggle hits. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class ItemTogglePointLightComponent : Component +{ + +} diff --git a/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs b/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs new file mode 100644 index 00000000000..7030c538c1d --- /dev/null +++ b/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs @@ -0,0 +1,29 @@ +using Content.Shared.Item.ItemToggle.Components; +using Content.Shared.Toggleable; +using ItemTogglePointLightComponent = Content.Shared.Light.Components.ItemTogglePointLightComponent; + +namespace Content.Shared.Light.EntitySystems; + +/// +/// Handles ItemToggle for PointLight +/// +public sealed class ItemTogglePointLightSystem : EntitySystem +{ + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedPointLightSystem _light = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnLightToggled); + } + + private void OnLightToggled(Entity ent, ref ItemToggledEvent args) + { + if (!_light.TryGetLight(ent.Owner, out var light)) + return; + + _appearance.SetData(ent, ToggleableLightVisuals.Enabled, args.Activated); + _light.SetEnabled(ent.Owner, args.Activated, comp: light); + } +} diff --git a/Content.Shared/Power/Components/ItemSlotRequiresPowerComponent.cs b/Content.Shared/Power/Components/ItemSlotRequiresPowerComponent.cs new file mode 100644 index 00000000000..6e3b9eaca05 --- /dev/null +++ b/Content.Shared/Power/Components/ItemSlotRequiresPowerComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Power.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class ItemSlotRequiresPowerComponent : Component +{ + +} diff --git a/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs b/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs new file mode 100644 index 00000000000..3df8b91a985 --- /dev/null +++ b/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs @@ -0,0 +1,23 @@ +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Power.Components; + +namespace Content.Shared.Power.EntitySystems; + +public sealed class ItemSlotRequiresPowerSystem : EntitySystem +{ + [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnInsertAttempt); + } + + private void OnInsertAttempt(Entity ent, ref ItemSlotInsertAttemptEvent args) + { + if (!_receiver.IsPowered(ent.Owner)) + { + args.Cancelled = true; + } + } +} diff --git a/Resources/Locale/en-US/items/toggle.ftl b/Resources/Locale/en-US/items/toggle.ftl new file mode 100644 index 00000000000..bcf5c161a6f --- /dev/null +++ b/Resources/Locale/en-US/items/toggle.ftl @@ -0,0 +1,2 @@ +item-toggle-activate = Activate +item-toggle-deactivate = Deactivate From 948bb726de503f28521dd358a353515cb21255cf Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:36:22 +1000 Subject: [PATCH 068/223] Run actions on press (#31191) I know UI generallys want to do stuff on key-up not key-down. With that being said the delay on release for these is noticeable. e.g. ActivateInWorld / UseInHand / any in-world interactions are on-press. This is especially noticeable if you have the same event on action + verb. --- .../UserInterface/Systems/Actions/ActionUIController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs index 1c76b300755..d67c5cbcd63 100644 --- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs +++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs @@ -121,7 +121,7 @@ public void OnStateEntered(GameplayState state) var boundKey = hotbarKeys[i]; builder = builder.Bind(boundKey, new PointerInputCmdHandler((in PointerInputCmdArgs args) => { - if (args.State != BoundKeyState.Up) + if (args.State != BoundKeyState.Down) return false; TriggerAction(boundId); From f96dddd9fb0cbce243e93b4538ed6349cba7b405 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 12:37:28 +0000 Subject: [PATCH 069/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9cbb76317e2..89483e26635 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Aquif - changes: - - message: It is now possible to save after chaining you job unavailable preference. - type: Fix - id: 6709 - time: '2024-06-11T02:48:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28839 - author: lzk228 changes: - message: Added reward info in cargo bounty label. @@ -3866,3 +3859,10 @@ id: 7208 time: '2024-08-25T12:17:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31392 +- author: metalgearsloth + changes: + - message: Actions now activate on key-down, not key-up. + type: Tweak + id: 7209 + time: '2024-08-25T12:36:22.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31191 From 2e029a7d5b51a557206f261da123c37d8b4dbd9a Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:43:31 +1000 Subject: [PATCH 070/223] Action stuff (#31305) * Action stuff - Cleanup some event stuff - Avoid dirtying entity unnecessarily - Add ActionGrant as an easy way to apply / remove actions via compregistry. * Fix merge --- Content.Client/Actions/ActionsSystem.cs | 6 -- .../Systems/Actions/ActionUIController.cs | 6 -- .../Actions/ActionOnInteractSystem.cs | 12 ---- .../NPC/Systems/NPCUseActionOnTargetSystem.cs | 2 - Content.Shared/Actions/ActionEvents.cs | 7 +- .../Actions/ActionGrantComponent.cs | 17 +++++ Content.Shared/Actions/ActionGrantSystem.cs | 48 +++++++++++++ .../Events/ActionComponentChangeEvent.cs | 27 ++++++++ .../Actions/ItemActionGrantComponent.cs | 14 ++++ Content.Shared/Actions/SharedActionsSystem.cs | 69 +++++++++++++++---- 10 files changed, 168 insertions(+), 40 deletions(-) create mode 100644 Content.Shared/Actions/ActionGrantComponent.cs create mode 100644 Content.Shared/Actions/ActionGrantSystem.cs create mode 100644 Content.Shared/Actions/Events/ActionComponentChangeEvent.cs create mode 100644 Content.Shared/Actions/ItemActionGrantComponent.cs diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index f05e4455880..26a22fa8b8d 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -259,12 +259,6 @@ public void TriggerAction(EntityUid actionId, BaseActionComponent action) if (action.ClientExclusive) { - if (instantAction.Event != null) - { - instantAction.Event.Performer = user; - instantAction.Event.Action = actionId; - } - PerformAction(user, actions, actionId, instantAction, instantAction.Event, GameTiming.CurTime); } else diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs index d67c5cbcd63..1dffeb8d2d4 100644 --- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs +++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs @@ -219,8 +219,6 @@ private bool TryTargetWorld(in PointerInputCmdArgs args, EntityUid actionId, Wor if (action.Event != null) { action.Event.Target = coords; - action.Event.Performer = user; - action.Event.Action = actionId; } _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime); @@ -254,8 +252,6 @@ private bool TryTargetEntity(in PointerInputCmdArgs args, EntityUid actionId, En if (action.Event != null) { action.Event.Target = entity; - action.Event.Performer = user; - action.Event.Action = actionId; } _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime); @@ -295,8 +291,6 @@ private bool TryTargetEntityWorld(in PointerInputCmdArgs args, { action.Event.Entity = entity; action.Event.Coords = coords; - action.Event.Performer = user; - action.Event.Action = actionId; } _actionsSystem.PerformAction(user, actionComp, actionId, action, action.Event, _timing.CurTime); diff --git a/Content.Server/Actions/ActionOnInteractSystem.cs b/Content.Server/Actions/ActionOnInteractSystem.cs index a1f02ed1ecb..af9b0b1ddbd 100644 --- a/Content.Server/Actions/ActionOnInteractSystem.cs +++ b/Content.Server/Actions/ActionOnInteractSystem.cs @@ -55,12 +55,6 @@ private void OnActivate(EntityUid uid, ActionOnInteractComponent component, Acti return; var (actId, act) = _random.Pick(options); - if (act.Event != null) - { - act.Event.Performer = args.User; - act.Event.Action = actId; - } - _actions.PerformAction(args.User, null, actId, act, act.Event, _timing.CurTime, false); args.Handled = true; } @@ -94,8 +88,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component, var (entActId, entAct) = _random.Pick(entOptions); if (entAct.Event != null) { - entAct.Event.Performer = args.User; - entAct.Event.Action = entActId; entAct.Event.Target = args.Target.Value; } @@ -119,8 +111,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component, var (entActId, entAct) = _random.Pick(entWorldOptions); if (entAct.Event != null) { - entAct.Event.Performer = args.User; - entAct.Event.Action = entActId; entAct.Event.Entity = args.Target; entAct.Event.Coords = args.ClickLocation; } @@ -145,8 +135,6 @@ private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component, var (actId, act) = _random.Pick(options); if (act.Event != null) { - act.Event.Performer = args.User; - act.Event.Action = actId; act.Event.Target = args.ClickLocation; } diff --git a/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs b/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs index f6cc2d14689..33bc8f9074c 100644 --- a/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs +++ b/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs @@ -36,8 +36,6 @@ public bool TryUseTentacleAttack(Entity user, En if (action.Event != null) { - action.Event.Performer = user; - action.Event.Action = user.Comp.ActionEnt.Value; action.Event.Coords = Transform(target).Coordinates; } diff --git a/Content.Shared/Actions/ActionEvents.cs b/Content.Shared/Actions/ActionEvents.cs index 4f1cd6da44a..6ff86604589 100644 --- a/Content.Shared/Actions/ActionEvents.cs +++ b/Content.Shared/Actions/ActionEvents.cs @@ -187,5 +187,10 @@ public abstract partial class BaseActionEvent : HandledEntityEventArgs /// /// The action the event belongs to. /// - public EntityUid Action; + public Entity Action; + + /// + /// Should we toggle the action entity? + /// + public bool Toggle; } diff --git a/Content.Shared/Actions/ActionGrantComponent.cs b/Content.Shared/Actions/ActionGrantComponent.cs new file mode 100644 index 00000000000..94c3a0bbd1d --- /dev/null +++ b/Content.Shared/Actions/ActionGrantComponent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Actions; + +/// +/// Grants actions on MapInit and removes them on shutdown +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(ActionGrantSystem))] +public sealed partial class ActionGrantComponent : Component +{ + [DataField(required: true), AutoNetworkedField, AlwaysPushInheritance] + public List Actions = new(); + + [DataField, AutoNetworkedField] + public List ActionEntities = new(); +} diff --git a/Content.Shared/Actions/ActionGrantSystem.cs b/Content.Shared/Actions/ActionGrantSystem.cs new file mode 100644 index 00000000000..f73ecf8a460 --- /dev/null +++ b/Content.Shared/Actions/ActionGrantSystem.cs @@ -0,0 +1,48 @@ +namespace Content.Shared.Actions; + +/// +/// +/// +public sealed class ActionGrantSystem : EntitySystem +{ + [Dependency] private readonly SharedActionsSystem _actions = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnShutdown); + SubscribeLocalEvent(OnItemGet); + } + + private void OnItemGet(Entity ent, ref GetItemActionsEvent args) + { + if (!TryComp(ent.Owner, out ActionGrantComponent? grant)) + return; + + foreach (var action in grant.ActionEntities) + { + args.AddAction(action); + } + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + foreach (var action in ent.Comp.Actions) + { + EntityUid? actionEnt = null; + _actions.AddAction(ent.Owner, ref actionEnt, action); + + if (actionEnt != null) + ent.Comp.ActionEntities.Add(actionEnt.Value); + } + } + + private void OnShutdown(Entity ent, ref ComponentShutdown args) + { + foreach (var actionEnt in ent.Comp.ActionEntities) + { + _actions.RemoveAction(ent.Owner, actionEnt); + } + } +} diff --git a/Content.Shared/Actions/Events/ActionComponentChangeEvent.cs b/Content.Shared/Actions/Events/ActionComponentChangeEvent.cs new file mode 100644 index 00000000000..c9c4db145da --- /dev/null +++ b/Content.Shared/Actions/Events/ActionComponentChangeEvent.cs @@ -0,0 +1,27 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared.Actions.Events; + +/// +/// Adds / removes the component upon action. +/// +[Virtual] +public partial class ActionComponentChangeEvent : InstantActionEvent +{ + [DataField(required: true)] + public ComponentRegistry Components = new(); +} + +/// +/// Similar to except raises an event to attempt to relay it. +/// +public sealed partial class RelayedActionComponentChangeEvent : ActionComponentChangeEvent +{ + +} + +[ByRefEvent] +public record struct AttemptRelayActionComponentChangeEvent +{ + public EntityUid? Target; +} diff --git a/Content.Shared/Actions/ItemActionGrantComponent.cs b/Content.Shared/Actions/ItemActionGrantComponent.cs new file mode 100644 index 00000000000..d1769b51a2f --- /dev/null +++ b/Content.Shared/Actions/ItemActionGrantComponent.cs @@ -0,0 +1,14 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Actions; + +/// +/// Works in tandem with by granting those actions to the equipper entity. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(ActionGrantSystem))] +public sealed partial class ItemActionGrantComponent : Component +{ + [DataField(required: true), AutoNetworkedField, AlwaysPushInheritance] + public List Actions = new(); +} diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index fb9415096fb..27563454282 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -11,7 +11,6 @@ using Content.Shared.Rejuvenate; using Content.Shared.Whitelist; using Robust.Shared.Audio.Systems; -using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.Map; using Robust.Shared.Timing; @@ -45,6 +44,8 @@ public override void Initialize() SubscribeLocalEvent(OnActionShutdown); SubscribeLocalEvent(OnActionShutdown); + SubscribeLocalEvent(OnActionCompChange); + SubscribeLocalEvent(OnRelayActionCompChange); SubscribeLocalEvent(OnDidEquip); SubscribeLocalEvent(OnHandEquipped); SubscribeLocalEvent(OnDidUnequip); @@ -490,12 +491,6 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg break; } - if (performEvent != null) - { - performEvent.Performer = user; - performEvent.Action = actionEnt; - } - // All checks passed. Perform the action! PerformAction(user, component, actionEnt, action, performEvent, curTime); } @@ -641,6 +636,8 @@ public void PerformAction(EntityUid performer, ActionsComponent? component, Enti // This here is required because of client-side prediction (RaisePredictiveEvent results in event re-use). actionEvent.Handled = false; var target = performer; + actionEvent.Performer = performer; + actionEvent.Action = (actionId, action); if (!action.RaiseOnUser && action.Container != null && !HasComp(action.Container)) target = action.Container.Value; @@ -653,10 +650,14 @@ public void PerformAction(EntityUid performer, ActionsComponent? component, Enti return; // no interaction occurred. // play sound, reduce charges, start cooldown, and mark as dirty (if required). + if (actionEvent?.Toggle == true) + { + action.Toggled = !action.Toggled; + } - _audio.PlayPredicted(action.Sound, performer,predicted ? performer : null); + _audio.PlayPredicted(action.Sound, performer, predicted ? performer : null); - var dirty = toggledBefore == action.Toggled; + var dirty = toggledBefore != action.Toggled; if (action.Charges != null) { @@ -673,10 +674,11 @@ public void PerformAction(EntityUid performer, ActionsComponent? component, Enti action.Cooldown = (curTime, curTime + action.UseDelay.Value); } - Dirty(actionId, action); - - if (dirty && component != null) - Dirty(performer, component); + if (dirty) + { + Dirty(actionId, action); + UpdateAction(actionId, action); + } var ev = new ActionPerformedEvent(performer); RaiseLocalEvent(actionId, ref ev); @@ -975,6 +977,47 @@ public bool ValidAction(BaseActionComponent action, bool canReach = true) #endregion + private void OnRelayActionCompChange(Entity ent, ref RelayedActionComponentChangeEvent args) + { + if (args.Handled) + return; + + var ev = new AttemptRelayActionComponentChangeEvent(); + RaiseLocalEvent(ent.Owner, ref ev); + var target = ev.Target ?? ent.Owner; + + args.Handled = true; + args.Toggle = true; + + if (!args.Action.Comp.Toggled) + { + EntityManager.AddComponents(target, args.Components); + } + else + { + EntityManager.RemoveComponents(target, args.Components); + } + } + + private void OnActionCompChange(Entity ent, ref ActionComponentChangeEvent args) + { + if (args.Handled) + return; + + args.Handled = true; + args.Toggle = true; + var target = ent.Owner; + + if (!args.Action.Comp.Toggled) + { + EntityManager.AddComponents(target, args.Components); + } + else + { + EntityManager.RemoveComponents(target, args.Components); + } + } + #region EquipHandlers private void OnDidEquip(EntityUid uid, ActionsComponent component, DidEquipEvent args) { From ae310878a696d9f9b033895ff97e065b391cb1ef Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:53:13 +1000 Subject: [PATCH 071/223] Update submodule to 231.0.0 (#31430) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 36a5b672e5f..f2ee9a43f94 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 36a5b672e5f4d0c569a4a17f7f833d72dad2d16d +Subproject commit f2ee9a43f94288be4662861e6e591da10234c0c7 From ff412a65bae3ba4347b5b9e735524be4e273dc02 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 25 Aug 2024 20:20:47 +0500 Subject: [PATCH 072/223] Weather fix (#30857) * weather fix * localize errors --- Content.Server/Weather/WeatherSystem.cs | 54 ++++++++----------- Content.Shared/Weather/SharedWeatherSystem.cs | 7 ++- Resources/Locale/en-US/weather/weather.ftl | 4 ++ 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/Content.Server/Weather/WeatherSystem.cs b/Content.Server/Weather/WeatherSystem.cs index c3af49944d9..dbee62a72fc 100644 --- a/Content.Server/Weather/WeatherSystem.cs +++ b/Content.Server/Weather/WeatherSystem.cs @@ -33,58 +33,50 @@ private void WeatherTwo(IConsoleShell shell, string argStr, string[] args) { if (args.Length < 2) { - shell.WriteError($"A"); + shell.WriteError(Loc.GetString("cmd-weather-error-no-arguments")); return; } if (!int.TryParse(args[0], out var mapInt)) - { return; - } var mapId = new MapId(mapInt); if (!MapManager.MapExists(mapId)) - { return; + + if (!_mapSystem.TryGetMap(mapId, out var mapUid)) + return; + + var weatherComp = EnsureComp(mapUid.Value); + + //Weather Proto parsing + WeatherPrototype? weather = null; + if (!args[1].Equals("null")) + { + if (!ProtoMan.TryIndex(args[1], out weather)) + { + shell.WriteError(Loc.GetString("cmd-weather-error-unknown-proto")); + return; + } } + //Time parsing TimeSpan? endTime = null; - if (args.Length == 3) { + var curTime = Timing.CurTime; if (int.TryParse(args[2], out var durationInt)) { - var curTime = Timing.CurTime; - var maxTime = TimeSpan.MaxValue; - - // If it's already running then just fade out with how much time we're into the weather. - if (_mapSystem.TryGetMap(mapId, out var mapUid) && - TryComp(mapUid, out var weatherComp) && - weatherComp.Weather.TryGetValue(args[1], out var existing)) - { - maxTime = curTime - existing.StartTime; - } - endTime = curTime + TimeSpan.FromSeconds(durationInt); - - if (endTime > maxTime) - endTime = maxTime; + } + else + { + shell.WriteError(Loc.GetString("cmd-weather-error-wrong-time")); } } - if (args[1].Equals("null")) - { - SetWeather(mapId, null, endTime); - } - else if (ProtoMan.TryIndex(args[1], out var weatherProto)) - { - SetWeather(mapId, weatherProto, endTime); - } - else - { - shell.WriteError($"Unable to parse weather prototype"); - } + SetWeather(mapId, weather, endTime); } private CompletionResult WeatherCompletion(IConsoleShell shell, string[] args) diff --git a/Content.Shared/Weather/SharedWeatherSystem.cs b/Content.Shared/Weather/SharedWeatherSystem.cs index 61419021247..acd43055388 100644 --- a/Content.Shared/Weather/SharedWeatherSystem.cs +++ b/Content.Shared/Weather/SharedWeatherSystem.cs @@ -156,11 +156,14 @@ public void SetWeather(MapId mapId, WeatherPrototype? proto, TimeSpan? endTime) foreach (var (eProto, weather) in weatherComp.Weather) { + // if we turn off the weather, we don't want endTime = null + if (proto == null) + endTime ??= Timing.CurTime + WeatherComponent.ShutdownTime; + // Reset cooldown if it's an existing one. - if (proto == null || eProto == proto.ID) + if (proto is not null && eProto == proto.ID) { weather.EndTime = endTime; - if (weather.State == WeatherState.Ending) weather.State = WeatherState.Running; diff --git a/Resources/Locale/en-US/weather/weather.ftl b/Resources/Locale/en-US/weather/weather.ftl index de5dbd88905..67e6eec35f2 100644 --- a/Resources/Locale/en-US/weather/weather.ftl +++ b/Resources/Locale/en-US/weather/weather.ftl @@ -1,3 +1,7 @@ cmd-weather-desc = Sets the weather for the current map. cmd-weather-help = weather cmd-weather-hint = Weather prototype + +cmd-weather-error-no-arguments = Not enough arguments! +cmd-weather-error-unknown-proto = Unknown Weather prototype! +cmd-weather-error-wrong-time = Time is in the wrong format! \ No newline at end of file From ae4c7ad0bc1a684ec02445adb4697c6c3ee003f2 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 26 Aug 2024 01:22:01 +1000 Subject: [PATCH 073/223] ContainerComp fix (#31434) Forgot to push these ones on the branch. --- Content.Shared/Containers/ContainerCompSystem.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Content.Shared/Containers/ContainerCompSystem.cs b/Content.Shared/Containers/ContainerCompSystem.cs index 1e1983a331b..75908efea3a 100644 --- a/Content.Shared/Containers/ContainerCompSystem.cs +++ b/Content.Shared/Containers/ContainerCompSystem.cs @@ -1,5 +1,6 @@ using Robust.Shared.Containers; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; namespace Content.Shared.Containers; @@ -8,6 +9,7 @@ namespace Content.Shared.Containers; /// public sealed class ContainerCompSystem : EntitySystem { + [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IPrototypeManager _proto = default!; public override void Initialize() @@ -19,21 +21,18 @@ public override void Initialize() private void OnConRemove(Entity ent, ref EntRemovedFromContainerMessage args) { - if (args.Container.ID != ent.Comp.Container) + if (args.Container.ID != ent.Comp.Container || _timing.ApplyingState) return; - if (_proto.TryIndex(ent.Comp.Container, out var entProto)) + if (_proto.TryIndex(ent.Comp.Proto, out var entProto)) { - foreach (var entry in entProto.Components.Values) - { - RemComp(args.Entity, entry.Component); - } + EntityManager.RemoveComponents(args.Entity, entProto.Components); } } private void OnConInsert(Entity ent, ref EntInsertedIntoContainerMessage args) { - if (args.Container.ID != ent.Comp.Container) + if (args.Container.ID != ent.Comp.Container || _timing.ApplyingState) return; if (_proto.TryIndex(ent.Comp.Proto, out var entProto)) From 513183562876293c9426e0e97f50f4ab31626024 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 26 Aug 2024 01:29:10 +1000 Subject: [PATCH 074/223] togglelight updates (#31435) Missed in the green checkmark sea --- .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml | 2 +- Resources/Prototypes/Entities/Objects/Devices/pda.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 15f34bd81f8..d56b7fb7e77 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -120,7 +120,7 @@ - type: ItemToggle activated: false # gets activated when a mind is added onUse: false # no item-borg toggling sorry - toggleLight: false + - type: ItemTogglePointLight - type: AccessToggle # TODO: refactor movement to just be based on toggle like speedboots but for the boots themselves # TODO: or just have sentient speedboots be fast idk diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index ac564eac66b..4ae62527e16 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -120,8 +120,8 @@ abstract: true components: - type: ItemToggle - toggleLight: false onUse: false + - type: ItemTogglePointLight - type: HealthAnalyzer scanDelay: 1 scanningEndSound: From bec832fbebd4b9f5941c9714ad257a71a5136bc6 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sun, 25 Aug 2024 18:11:27 +0200 Subject: [PATCH 075/223] Increase (SUPER)PACMAN ramp rate/tolerance (#31403) All PACMANs used to use the same ramping parameters, this meant a SUPERPACMAN (50 kW) took literally a 100 seconds to get up to its full output level. Ouch. PACMAN has been raised to 5000 W/s with 1500 W tolerance, SUPERPACMAN to 7500 W/s with 2500 W tolerance --- .../Structures/Power/Generation/portable_generator.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml index 86cfb0f7991..c822e0c0b31 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml @@ -182,6 +182,9 @@ - output_mv sprite: Structures/Power/Generation/portable_generator.rsi state: portgen0 + - type: PowerSupplier + supplyRampRate: 5000 + supplyRampTolerance: 1500 - type: entity name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator @@ -235,6 +238,9 @@ - output_mv sprite: Structures/Power/Generation/portable_generator.rsi state: portgen1 + - type: PowerSupplier + supplyRampRate: 7500 + supplyRampTolerance: 2500 - type: entity name: J.R.P.A.C.M.A.N.-type portable generator From 19b67cf55f14be688e98ffd707d990ed53de52d9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 16:12:33 +0000 Subject: [PATCH 076/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 89483e26635..81d2b47386b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Added reward info in cargo bounty label. - type: Tweak - id: 6710 - time: '2024-06-11T09:33:36.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28853 - author: Tayrtahn changes: - message: Announcements for the location of the evac shuttle, the armed nuke, and @@ -3866,3 +3859,10 @@ id: 7209 time: '2024-08-25T12:36:22.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31191 +- author: PJB3005 + changes: + - message: PACMAN and SUPERPACMAN now ramp their power output significantly faster. + type: Tweak + id: 7210 + time: '2024-08-25T16:11:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31403 From 453c28f8255fff6241dbd9383902448b3fda1c65 Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Sun, 25 Aug 2024 11:47:10 -0500 Subject: [PATCH 077/223] Make space scanning T1 technology (#31321) make space scanning and mass scanner t1 tech --- Resources/Prototypes/Research/industrial.yml | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 373333ad43f..5d6af070b77 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -17,6 +17,20 @@ - OreProcessorIndustrialMachineCircuitboard - ClothingMaskWeldingGas +- type: technology + id: SpaceScanning + name: research-technology-space-scanning + icon: + sprite: Objects/Tools/handheld_mass_scanner.rsi + state: icon + discipline: Industrial + tier: 1 + cost: 5000 + recipeUnlocks: + - RadarConsoleCircuitboard + - HandHeldMassScanner + - BorgModuleGPS + - type: technology id: AdvancedPowercells name: research-technology-advanced-powercells @@ -109,20 +123,6 @@ # Tier 2 -- type: technology - id: SpaceScanning - name: research-technology-space-scanning - icon: - sprite: Objects/Tools/handheld_mass_scanner.rsi - state: icon - discipline: Industrial - tier: 2 - cost: 7500 - recipeUnlocks: - - RadarConsoleCircuitboard - - HandHeldMassScanner - - BorgModuleGPS - - type: technology id: Shuttlecraft name: research-technology-shuttlecraft From 2d70c7d473b9809419d11fee5246e54f61a45542 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 16:48:17 +0000 Subject: [PATCH 078/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 81d2b47386b..7994756119a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Tayrtahn - changes: - - message: Announcements for the location of the evac shuttle, the armed nuke, and - more will no longer send you in the opposite direction. - type: Fix - id: 6711 - time: '2024-06-11T22:18:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28869 - author: Boaz1111 changes: - message: Refactors Cluster's Armoury @@ -3866,3 +3858,11 @@ id: 7210 time: '2024-08-25T16:11:27.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31403 +- author: Blackern5000 + changes: + - message: Space scanning technology is now T1 industrial, this includes cyborg + GPS modules and handheld mass scanners. + type: Tweak + id: 7211 + time: '2024-08-25T16:47:11.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31321 From 5c0753b1362728a99c256cbe31fefaefcb7569d9 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Sun, 25 Aug 2024 10:09:51 -0700 Subject: [PATCH 079/223] Add a bool to disable buckling on InteractHand (#30001) --- Content.Shared/Buckle/Components/StrapComponent.cs | 6 ++++++ Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs | 2 +- .../Prototypes/Entities/Structures/Furniture/rollerbeds.yml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Buckle/Components/StrapComponent.cs b/Content.Shared/Buckle/Components/StrapComponent.cs index b8186e2b79f..101c388a8bf 100644 --- a/Content.Shared/Buckle/Components/StrapComponent.cs +++ b/Content.Shared/Buckle/Components/StrapComponent.cs @@ -90,6 +90,12 @@ public sealed partial class StrapComponent : Component /// [DataField] public float BuckleDoafterTime = 2f; + + /// + /// Whether InteractHand will buckle the user to the strap. + /// + [DataField] + public bool BuckleOnInteractHand = true; } public enum StrapPosition diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs index 381789f32d6..7677e800fe9 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs @@ -84,7 +84,7 @@ private void OnStrapInteractHand(EntityUid uid, StrapComponent component, Intera if (!TryComp(args.User, out BuckleComponent? buckle)) return; - if (buckle.BuckledTo == null) + if (buckle.BuckledTo == null && component.BuckleOnInteractHand) TryBuckle(args.User, args.User, uid, buckle, popup: true); else if (buckle.BuckledTo == uid) TryUnbuckle(args.User, args.User, buckle, popup: true); diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml index f7b1be8ecde..965c8261cce 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml @@ -55,6 +55,7 @@ rotation: -90 buckleOffset: "0,0.15" unbuckleOffset: "0,0.15" + buckleOnInteractHand: False - type: Appearance - type: GenericVisualizer visuals: From d067e8010038b301b86577515e09dd8279d97c66 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 25 Aug 2024 17:10:58 +0000 Subject: [PATCH 080/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7994756119a..d3682dc07c3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Boaz1111 - changes: - - message: Refactors Cluster's Armoury - type: Tweak - id: 6712 - time: '2024-06-12T01:07:37.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28854 - author: Deserty0 changes: - message: '"no materials loaded" messege now appears in lathes!' @@ -3866,3 +3859,10 @@ id: 7211 time: '2024-08-25T16:47:11.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31321 +- author: ShadowCommander + changes: + - message: Rollerbeds no longer buckle yourself when clicked on. + type: Remove + id: 7212 + time: '2024-08-25T17:09:51.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30001 From cf6f7830aa23006f2e5766c145eb9eea70a5b8e4 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sun, 25 Aug 2024 18:21:32 +0000 Subject: [PATCH 081/223] fix(FieldGenerators): Don't show nonsense popup (#30469) * . --- .../EntitySystems/ContainmentFieldGeneratorSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs index ca32beb8dbb..05262f29996 100644 --- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs @@ -166,11 +166,12 @@ private void RemoveConnections(Entity genera ChangeFieldVisualizer(value.Item1); } component.Connections.Clear(); + if (component.IsConnected) + _popupSystem.PopupEntity(Loc.GetString("comp-containment-disconnected"), uid, PopupType.LargeCaution); component.IsConnected = false; ChangeOnLightVisualizer(generator); ChangeFieldVisualizer(generator); _adminLogger.Add(LogType.FieldGeneration, LogImpact.Medium, $"{ToPrettyString(uid)} lost field connections"); // Ideally LogImpact would depend on if there is a singulo nearby - _popupSystem.PopupEntity(Loc.GetString("comp-containment-disconnected"), uid, PopupType.LargeCaution); } #endregion From 2d87d65debedbc47238ff3d1dccbe084814587e1 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Sun, 25 Aug 2024 13:22:29 -0600 Subject: [PATCH 082/223] bagel update (#31440) * bagel update * fixgridatmos * qm office * sci cam fix * jesus christ so many routers * remove invalids --- Resources/Maps/bagel.yml | 462 +++++++++++++++++++++++---------------- 1 file changed, 276 insertions(+), 186 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index a25472c0a96..0e8cf62a272 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -266,7 +266,7 @@ entities: version: 6 2,1: ind: 2,1 - tiles: fgAAAAAAfgAAAAAAJgAAAAABJgAAAAAAJgAAAAAAJgAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACbAAAAAAAfgAAAAAAJgAAAAABLwAAAAABLwAAAAADLwAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAJgAAAAACLwAAAAABLwAAAAADLwAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADTQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAAATQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACTQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAJgAAAAABJgAAAAAAJgAAAAAAJgAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAegAAAAAAegAAAAAAegAAAAAAXQAAAAABXQAAAAACbAAAAAAAfgAAAAAAJgAAAAABLwAAAAABLwAAAAADLwAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAJgAAAAACLwAAAAABLwAAAAADLwAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADTQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAAATQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACTQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 4,-2: ind: 4,-2 @@ -6400,18 +6400,21 @@ entities: 1: 136 2,-4: 1: 4369 - 0: 52228 + 0: 4 + 2: 52224 2,-5: 1: 4352 0: 58379 2,-3: 1: 33825 - 0: 140 + 2: 140 3,-4: - 0: 65419 + 0: 52363 + 2: 13056 3,-3: - 0: 35007 + 2: 51 1: 12288 + 0: 34956 3,-1: 1: 8739 0: 34952 @@ -6739,10 +6742,10 @@ entities: 0: 56797 5,-8: 0: 15359 - 2: 32768 + 3: 32768 5,-7: 0: 61491 - 2: 136 + 3: 136 5,-6: 0: 65535 5,-5: @@ -6753,9 +6756,9 @@ entities: 0: 65311 6,-8: 0: 255 - 2: 28672 + 3: 28672 6,-7: - 2: 119 + 3: 119 0: 61952 6,-6: 0: 61695 @@ -7979,8 +7982,7 @@ entities: 9,3: 0: 49080 10,4: - 0: 13107 - 1: 128 + 0: 13115 10,5: 0: 65535 10,6: @@ -7991,8 +7993,8 @@ entities: 10,3: 0: 48059 11,4: - 1: 560 - 0: 2184 + 0: 2187 + 1: 512 11,5: 0: 32767 11,6: @@ -8007,7 +8009,7 @@ entities: 0: 112 1: 28672 17,-7: - 3: 1 + 4: 1 1: 4104 17,-6: 1: 4593 @@ -8106,17 +8108,17 @@ entities: -13,7: 1: 39312 -12,8: - 4: 12 - 5: 3072 + 5: 12 + 7: 3072 -11,5: 0: 63351 -11,6: 0: 4607 1: 49152 -11,8: - 4: 1 + 5: 1 1: 17476 - 5: 256 + 7: 256 -11,7: 1: 17484 -10,5: @@ -8228,7 +8230,7 @@ entities: -7,11: 0: 20206 -7,12: - 1: 16385 + 1: 49153 0: 1228 -6,9: 0: 65518 @@ -8344,7 +8346,7 @@ entities: 1: 35033 0: 12544 -12,10: - 3: 12 + 4: 12 6: 3072 -12,11: 6: 12 @@ -8352,7 +8354,7 @@ entities: 6: 257 1: 17476 -11,10: - 3: 1 + 4: 1 6: 256 1: 17476 -11,11: @@ -8410,8 +8412,8 @@ entities: 1: 15 -13,12: 1: 34952 - 5: 48 - 4: 12288 + 7: 48 + 5: 12288 -12,13: 1: 61455 -13,13: @@ -8507,8 +8509,8 @@ entities: -14,12: 0: 1 1: 8738 - 5: 128 - 4: 32768 + 7: 128 + 5: 32768 -17,12: 0: 52232 -16,13: @@ -8985,6 +8987,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 103.92799 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 235 moles: @@ -9033,7 +9050,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -9048,7 +9065,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9367,8 +9384,8 @@ entities: id: docking43669 localAnchorB: -47.5,-40 localAnchorA: 0.5,0 - damping: 1560.1493 - stiffness: 14003.869 + damping: 1560.1505 + stiffness: 14003.88 - proto: AcousticGuitarInstrument entities: - uid: 2133 @@ -10505,18 +10522,6 @@ entities: - 24361 - 24358 - 9016 - - uid: 24662 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,-14.5 - parent: 60 - - type: DeviceList - devices: - - 24659 - - 24661 - - 24665 - - 24657 - proto: AirAlarmElectronics entities: - uid: 13488 @@ -10536,6 +10541,20 @@ entities: rot: -1.5707963267948966 rad pos: -1.5599055,29.41489 parent: 60 +- proto: AirAlarmVox + entities: + - uid: 930 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-14.5 + parent: 60 + - type: DeviceList + devices: + - 24661 + - 24665 + - 24657 + - 24659 - proto: AirCanister entities: - uid: 1679 @@ -12972,19 +12991,19 @@ entities: rot: -1.5707963267948966 rad pos: 48.5,-15.5 parent: 60 -- proto: AirlockQuartermasterGlassLocked +- proto: AirlockQuartermasterLocked entities: - - uid: 13086 + - uid: 1622 components: - type: MetaData - name: Quartermaster's Office + name: QM Room - type: Transform pos: 44.5,11.5 parent: 60 -- proto: AirlockQuartermasterLocked - entities: - uid: 13039 components: + - type: MetaData + name: QM Room - type: Transform pos: 46.5,13.5 parent: 60 @@ -13752,7 +13771,7 @@ entities: parent: 60 - type: DeviceNetwork deviceLists: - - 24662 + - 930 - proto: AltarSpawner entities: - uid: 14509 @@ -15000,6 +15019,83 @@ entities: - type: Transform pos: -45.5,40.5 parent: 60 +- proto: AtmosFixVoxMarker + entities: + - uid: 2925 + components: + - type: Transform + pos: 10.5,-12.5 + parent: 60 + - uid: 21758 + components: + - type: Transform + pos: 10.5,-13.5 + parent: 60 + - uid: 21762 + components: + - type: Transform + pos: 10.5,-11.5 + parent: 60 + - uid: 24768 + components: + - type: Transform + pos: 11.5,-13.5 + parent: 60 + - uid: 24769 + components: + - type: Transform + pos: 11.5,-12.5 + parent: 60 + - uid: 24770 + components: + - type: Transform + pos: 11.5,-11.5 + parent: 60 + - uid: 24771 + components: + - type: Transform + pos: 12.5,-13.5 + parent: 60 + - uid: 24772 + components: + - type: Transform + pos: 12.5,-12.5 + parent: 60 + - uid: 24773 + components: + - type: Transform + pos: 12.5,-11.5 + parent: 60 + - uid: 24774 + components: + - type: Transform + pos: 13.5,-13.5 + parent: 60 + - uid: 24775 + components: + - type: Transform + pos: 13.5,-12.5 + parent: 60 + - uid: 24776 + components: + - type: Transform + pos: 13.5,-11.5 + parent: 60 + - uid: 24777 + components: + - type: Transform + pos: 11.5,-10.5 + parent: 60 + - uid: 24778 + components: + - type: Transform + pos: 12.5,-10.5 + parent: 60 + - uid: 24779 + components: + - type: Transform + pos: 13.5,-10.5 + parent: 60 - proto: Autolathe entities: - uid: 5288 @@ -15252,6 +15348,11 @@ entities: - type: Transform pos: 30.5,-14.5 parent: 60 + - uid: 2923 + components: + - type: Transform + pos: 45.5,16.5 + parent: 60 - uid: 3230 components: - type: Transform @@ -15262,11 +15363,6 @@ entities: - type: Transform pos: -63.5,3.5 parent: 60 - - uid: 4515 - components: - - type: Transform - pos: 44.5,15.5 - parent: 60 - uid: 4529 components: - type: Transform @@ -15541,10 +15637,10 @@ entities: parent: 60 - proto: BedsheetQM entities: - - uid: 2923 + - uid: 5932 components: - type: Transform - pos: 44.5,15.5 + pos: 45.5,16.5 parent: 60 - proto: BedsheetRD entities: @@ -55937,12 +56033,6 @@ entities: - type: Transform pos: -19.5,-16.5 parent: 60 - - uid: 2419 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 43.577686,12.682198 - parent: 60 - uid: 2590 components: - type: Transform @@ -55982,6 +56072,12 @@ entities: rot: -1.5707963267948966 rad pos: -66.5,12.5 parent: 60 + - uid: 4515 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 43.634438,14.652265 + parent: 60 - uid: 4627 components: - type: Transform @@ -56120,11 +56216,6 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,9.5 parent: 60 - - uid: 13094 - components: - - type: Transform - pos: 44.5,14.5 - parent: 60 - uid: 13255 components: - type: Transform @@ -56282,6 +56373,12 @@ entities: - type: Transform pos: -44.5,-9.5 parent: 60 + - uid: 24780 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.431313,14.60539 + parent: 60 - proto: ChairOfficeLight entities: - uid: 128 @@ -67326,15 +67423,15 @@ entities: - type: Transform pos: -44.5,2.5 parent: 60 - - uid: 5535 + - uid: 2419 components: - type: Transform - pos: -63.5,2.5 + pos: 43.5,15.5 parent: 60 - - uid: 5932 + - uid: 5535 components: - type: Transform - pos: 43.5,14.5 + pos: -63.5,2.5 parent: 60 - uid: 6352 components: @@ -67481,10 +67578,10 @@ entities: parent: 60 - proto: DresserQuarterMasterFilled entities: - - uid: 1622 + - uid: 12640 components: - type: Transform - pos: 45.5,15.5 + pos: 44.5,16.5 parent: 60 - proto: DresserResearchDirectorFilled entities: @@ -68611,11 +68708,6 @@ entities: - type: Transform pos: -53.5,8.5 parent: 60 - - uid: 15570 - components: - - type: Transform - pos: 10.5,17.5 - parent: 60 - uid: 16408 components: - type: Transform @@ -96513,7 +96605,7 @@ entities: parent: 60 - type: DeviceNetwork deviceLists: - - 24662 + - 930 - proto: GasVentScrubber entities: - uid: 61 @@ -97868,7 +97960,7 @@ entities: parent: 60 - type: DeviceNetwork deviceLists: - - 24662 + - 930 - uid: 24665 components: - type: Transform @@ -97877,7 +97969,7 @@ entities: parent: 60 - type: DeviceNetwork deviceLists: - - 24662 + - 930 - proto: GasVolumePump entities: - uid: 14850 @@ -101566,6 +101658,11 @@ entities: - type: Transform pos: -79.5,12.5 parent: 60 + - uid: 13086 + components: + - type: Transform + pos: 44.5,17.5 + parent: 60 - uid: 13110 components: - type: Transform @@ -101616,26 +101713,6 @@ entities: - type: Transform pos: 58.5,10.5 parent: 60 - - uid: 13193 - components: - - type: Transform - pos: 45.5,16.5 - parent: 60 - - uid: 13194 - components: - - type: Transform - pos: 44.5,16.5 - parent: 60 - - uid: 13195 - components: - - type: Transform - pos: 43.5,16.5 - parent: 60 - - uid: 13196 - components: - - type: Transform - pos: 42.5,17.5 - parent: 60 - uid: 13197 components: - type: Transform @@ -101664,7 +101741,7 @@ entities: - uid: 13202 components: - type: Transform - pos: 46.5,17.5 + pos: 43.5,17.5 parent: 60 - uid: 13251 components: @@ -103232,6 +103309,11 @@ entities: - type: Transform pos: 22.5,10.5 parent: 60 + - uid: 19408 + components: + - type: Transform + pos: 45.5,17.5 + parent: 60 - uid: 19409 components: - type: Transform @@ -108042,10 +108124,10 @@ entities: parent: 60 - proto: LockerQuarterMasterFilled entities: - - uid: 6038 + - uid: 15570 components: - type: Transform - pos: 43.5,15.5 + pos: 43.5,16.5 parent: 60 - proto: LockerResearchDirectorFilledHardsuit entities: @@ -111911,6 +111993,11 @@ entities: - type: Transform pos: -41.5,25.5 parent: 60 + - uid: 13193 + components: + - type: Transform + pos: -11.5,-26.5 + parent: 60 - uid: 17268 components: - type: Transform @@ -112028,14 +112115,6 @@ entities: - type: Transform pos: 34.5,9.5 parent: 60 - - uid: 21187 - components: - - type: Transform - pos: -10.5,-26.5 - parent: 60 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot {} - uid: 21363 components: - type: Transform @@ -115019,6 +115098,12 @@ entities: rot: -1.5707963267948966 rad pos: 61.5,-27.5 parent: 60 + - uid: 13194 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 43.5,15.5 + parent: 60 - uid: 13484 components: - type: Transform @@ -115309,14 +115394,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 19408 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 43.5,14.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 19410 components: - type: Transform @@ -120187,11 +120264,6 @@ entities: - type: Transform pos: 21.5,27.5 parent: 60 - - uid: 11746 - components: - - type: Transform - pos: 43.5,16.5 - parent: 60 - uid: 11749 components: - type: Transform @@ -120281,7 +120353,7 @@ entities: - uid: 11972 components: - type: Transform - pos: 45.5,16.5 + pos: 45.5,17.5 parent: 60 - uid: 11973 components: @@ -120384,21 +120456,11 @@ entities: - type: Transform pos: 51.5,30.5 parent: 60 - - uid: 12640 - components: - - type: Transform - pos: 42.5,17.5 - parent: 60 - uid: 12644 components: - type: Transform pos: 25.5,27.5 parent: 60 - - uid: 12653 - components: - - type: Transform - pos: 44.5,16.5 - parent: 60 - uid: 12656 components: - type: Transform @@ -120525,6 +120587,11 @@ entities: - type: Transform pos: 45.5,19.5 parent: 60 + - uid: 13094 + components: + - type: Transform + pos: 43.5,17.5 + parent: 60 - uid: 13097 components: - type: Transform @@ -120540,10 +120607,10 @@ entities: - type: Transform pos: 42.5,18.5 parent: 60 - - uid: 13192 + - uid: 13196 components: - type: Transform - pos: 46.5,17.5 + pos: 44.5,17.5 parent: 60 - uid: 13207 components: @@ -122580,6 +122647,18 @@ entities: - type: Transform pos: -33.5,-21.5 parent: 60 + - uid: 21085 + components: + - type: Transform + pos: 44.5,17.5 + parent: 60 + - uid: 21186 + components: + - type: Transform + pos: 43.5,17.5 + parent: 60 + - type: DeviceLinkSink + invokeCounter: 1 - uid: 21334 components: - type: Transform @@ -122603,33 +122682,18 @@ entities: - uid: 21753 components: - type: Transform - pos: 43.5,16.5 + pos: 43.5,11.5 parent: 60 - uid: 21754 components: - type: Transform - pos: 44.5,16.5 + pos: 45.5,17.5 parent: 60 - uid: 21755 - components: - - type: Transform - pos: 45.5,16.5 - parent: 60 - - uid: 21758 components: - type: Transform pos: 45.5,11.5 parent: 60 - - uid: 21759 - components: - - type: Transform - pos: 43.5,11.5 - parent: 60 - - uid: 21760 - components: - - type: Transform - pos: 44.5,11.5 - parent: 60 - uid: 22463 components: - type: Transform @@ -123180,25 +123244,6 @@ entities: linkedPorts: 11697: - Pressed: Toggle - - uid: 21762 - components: - - type: Transform - pos: 46.5,15.5 - parent: 60 - - type: DeviceLinkSource - linkedPorts: - 21753: - - Pressed: Toggle - 21754: - - Pressed: Toggle - 21755: - - Pressed: Toggle - 21759: - - Pressed: Toggle - 21760: - - Pressed: Toggle - 21758: - - Pressed: Toggle - proto: SignalButtonDirectional entities: - uid: 1240 @@ -123814,6 +123859,29 @@ entities: 24352: - On: On - Off: Off + - uid: 21187 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,15.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 21186: + - On: Open + - Off: Close + 21085: + - On: Open + - Off: Close + 21754: + - On: Open + - Off: Close + 21753: + - On: Open + - Off: Close + 21755: + - On: Open + - Off: Close - proto: SignAnomaly entities: - uid: 9496 @@ -130916,17 +130984,19 @@ entities: - type: Transform pos: 4.5,-7.5 parent: 60 -- proto: SurveillanceCameraRouterGeneral +- proto: SurveillanceCameraRouterEngineering entities: - - uid: 21085 + - uid: 11746 components: - type: Transform - pos: 24.5,18.5 + pos: 10.5,17.5 parent: 60 - - uid: 21186 +- proto: SurveillanceCameraRouterGeneral + entities: + - uid: 24662 components: - type: Transform - pos: -49.5,7.5 + pos: 8.5,-29.5 parent: 60 - proto: SurveillanceCameraRouterMedical entities: @@ -130949,19 +131019,12 @@ entities: - type: Transform pos: -22.5,2.5 parent: 60 -- proto: SurveillanceCameraRouterService - entities: - - uid: 930 - components: - - type: Transform - pos: -11.5,-26.5 - parent: 60 - proto: SurveillanceCameraRouterSupply entities: - - uid: 2925 + - uid: 6038 components: - type: Transform - pos: 8.5,-29.5 + pos: 43.5,12.5 parent: 60 - proto: SurveillanceCameraScience entities: @@ -131652,6 +131715,13 @@ entities: - SurveillanceCameraSupply nameSet: True id: Salvage Airlock 1 +- proto: SurveillanceCameraWirelessRouterConstructed + entities: + - uid: 21760 + components: + - type: Transform + pos: -49.5,7.5 + parent: 60 - proto: SurveillanceCameraWirelessRouterEntertainment entities: - uid: 17205 @@ -132326,6 +132396,11 @@ entities: - type: Transform pos: 36.5,-1.5 parent: 60 + - uid: 13192 + components: + - type: Transform + pos: 44.5,14.5 + parent: 60 - uid: 13204 components: - type: Transform @@ -134324,6 +134399,11 @@ entities: - type: Transform pos: -51.5,8.5 parent: 60 + - uid: 21759 + components: + - type: Transform + pos: 24.5,18.5 + parent: 60 - proto: TelecomServerCircuitboard entities: - uid: 18879 @@ -141574,6 +141654,11 @@ entities: - type: Transform pos: 22.5,27.5 parent: 60 + - uid: 12653 + components: + - type: Transform + pos: 42.5,17.5 + parent: 60 - uid: 12674 components: - type: Transform @@ -141845,6 +141930,11 @@ entities: rot: -1.5707963267948966 rad pos: 57.5,16.5 parent: 60 + - uid: 13195 + components: + - type: Transform + pos: 46.5,17.5 + parent: 60 - uid: 13224 components: - type: Transform From ff3d79797d4e373dc145b4cf9dbba505e04e2039 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 26 Aug 2024 04:20:58 +0200 Subject: [PATCH 083/223] Fix-Resprite emote icons (#31447) * Fix-Resprite emote icons * change scream --- Resources/Prototypes/Voice/speech_emotes.yml | 2 +- .../Textures/Interface/Emotes/attributions.yml | 7 ++++++- Resources/Textures/Interface/Emotes/scream.png | Bin 0 -> 506 bytes Resources/Textures/Interface/Emotes/vocal.png | Bin 358 -> 336 bytes 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Interface/Emotes/scream.png diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index a249218d71c..c39bf1f3791 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -3,7 +3,7 @@ id: Scream name: chat-emote-name-scream category: Vocal - icon: Interface/Actions/scream.png + icon: Interface/Emotes/scream.png whitelist: components: - Vocal diff --git a/Resources/Textures/Interface/Emotes/attributions.yml b/Resources/Textures/Interface/Emotes/attributions.yml index c65eeb25da0..4cb2faa076e 100644 --- a/Resources/Textures/Interface/Emotes/attributions.yml +++ b/Resources/Textures/Interface/Emotes/attributions.yml @@ -76,6 +76,11 @@ copyright: "Created by Sarahon" source: "https://github.com/Sarahon" +- files: ["scream.png"] + license: "CC-BY-SA-3.0" + copyright: "Created by lzk228(discord 455630609641897984), based on sprite by Sarahon" + source: "https://github.com/lzk228" + - files: ["sigh.png"] license: "CC-BY-SA-3.0" copyright: "Created by Sarahon" @@ -98,7 +103,7 @@ - files: ["vocal.png"] license: "CC-BY-SA-3.0" - copyright: "Created by Sarahon" + copyright: "Created by Sarahon, modified by lzk228(discord 455630609641897984)" source: "https://github.com/Sarahon" - files: ["weh.png"] diff --git a/Resources/Textures/Interface/Emotes/scream.png b/Resources/Textures/Interface/Emotes/scream.png new file mode 100644 index 0000000000000000000000000000000000000000..e4e36ed3a4adb1d7d6d54b440dac30511b7e4ffd GIT binary patch literal 506 zcmVUw)A?QiJzBM0WXyD6~) zh%x)bhUFx{>NyCB0f5n2Un=F|Ih6!9p?t1WgLSV1s(Q&O+j@u#RsyDa7x>A~IpL9p z&jqIgruv0eLN6bG1s2{aFn$k}HIEbS6yL9GS?pDven;v4-DVtfz)Gtxtt}a z%LSi$@g@ZGc}js;$w~3=7QUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Emotes/vocal.png b/Resources/Textures/Interface/Emotes/vocal.png index 55cddaa02e4b66c0b95507fc17460d6a1e4d9e90..73c5042b22ea853e9ca71523cc20943d46e3a002 100644 GIT binary patch delta 309 zcmV-50m}a70?-1GB!3BTNLh0L01FZT01FZU(%pXi00033NklonJ%o)UhfPE@SbLnnZ-v|Szs6;2uMCqpaJ2mFNOlBqlh>H4m3F^SA>CD>u*W*T> zBM876i{kT~WH|r;Xe9vvzzq99ygyY4h(fL33+osb%Zsh8{nX;B4h zZCES0S(fg1Uqt55h0wrlE)0Tu_WLSga}pOK^x}buG?9fk+MK13 d%SKcbMQ^Upe@MH+uZ#cy002ovPDHLkV1n|Om^}ah From 2871e692684f164460a217b79a637ee5616906df Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 26 Aug 2024 04:46:16 +0200 Subject: [PATCH 084/223] Moff cooking. Part one. (#30668) * yml part * guidebook * commit * some fixes * a little * change --- .../Objects/Consumable/Food/Baked/bread.yml | 61 +++++++++++++++++ .../Objects/Consumable/Food/Baked/pizza.yml | 63 ++++++++++++++++++ .../Objects/Consumable/Food/ingredients.yml | 44 ++++++++++++ .../Construction/Graphs/food/cottonpizza.yml | 13 ++++ .../Recipes/Cooking/meal_recipes.yml | 17 +++++ .../Prototypes/Recipes/Reactions/food.yml | 16 +++++ .../Guidebook/Service/FoodRecipes.xml | 6 ++ .../Food/Baked/bread.rsi/cotton-slice.png | Bin 0 -> 721 bytes .../Food/Baked/bread.rsi/cotton.png | Bin 0 -> 1187 bytes .../Consumable/Food/Baked/bread.rsi/meta.json | 8 ++- .../Food/Baked/pizza.rsi/cotton-pizza.png | Bin 0 -> 672 bytes .../Food/Baked/pizza.rsi/cotton-slice.png | Bin 0 -> 501 bytes .../Consumable/Food/Baked/pizza.rsi/meta.json | 8 ++- .../ingredients.rsi/cotton-dough-flat.png | Bin 0 -> 765 bytes .../Food/ingredients.rsi/cotton-dough.png | Bin 0 -> 904 bytes .../Consumable/Food/ingredients.rsi/meta.json | 8 ++- 16 files changed, 241 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-slice.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-flat.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 31e92931dbd..0fb3df4d278 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -121,6 +121,67 @@ - Bread - Slice +- type: entity + name: cotton bread + parent: FoodBreadBase + id: FoodBreadCotton + description: Bread, but for moff. + components: + - type: FlavorProfile + flavors: + - cotton + - bread + - type: Food + requiresSpecialDigestion: true + - type: Sprite + layers: + - state: cotton + - type: SliceableFood + slice: FoodBreadCottonSlice + - type: Tag + tags: + - ClothMade + - Bread + - type: SolutionContainerManager + solutions: + food: + maxVol: 26 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Fiber + Quantity: 10 + +- type: entity + name: cotton bread slice + parent: FoodBreadSliceBase + id: FoodBreadCottonSlice + description: A slice of (maybe) delicious cotton bread. + components: + - type: FlavorProfile + flavors: + - cotton + - bread + - type: Food + requiresSpecialDigestion: true + - type: Sprite + layers: + - state: cotton-slice + - type: Tag + tags: + - ClothMade + - Bread + - Slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Fiber + Quantity: 2 + - type: entity name: cornbread parent: FoodBreadBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 652c60722d9..ff38363c9ea 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -618,3 +618,66 @@ Quantity: 2 # Tastes like crust, tomato, cheese, radiation. + +- type: entity + name: cotton pizza + parent: FoodPizzaBase + id: FoodPizzaCotton + description: Flat fabric cotton dough with cotton topping. Incredible. + components: + - type: FlavorProfile + flavors: + - cotton + - bread + - type: Sprite + layers: + - state: cotton-pizza + - type: Food + requiresSpecialDigestion: true + - type: SliceableFood + slice: FoodPizzaCottonSlice + - type: Tag + tags: + - ClothMade + - Pizza + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Fiber + Quantity: 10 + +- type: entity + name: slice of cotton pizza + parent: FoodPizzaSliceBase + id: FoodPizzaCottonSlice + description: A slice of cotton pizza. Cotton included. + components: + - type: FlavorProfile + flavors: + - cotton + - bread + - type: Sprite + layers: + - state: cotton-slice + - type: Tag + tags: + - ClothMade + - Pizza + - Slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 3.5 + - ReagentId: Vitamin + Quantity: 0.8 + - ReagentId: Fiber + Quantity: 1.5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 6e481bb9618..1a80a5fe532 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -414,6 +414,38 @@ graph: Tortilla node: flat +- type: entity + name: cotton dough + parent: FoodBakingBase + id: FoodDoughCotton + description: A piece of fabric dough. + components: + - type: FlavorProfile + flavors: + - dough + - cotton + - type: Sprite + state: cotton-dough + # - type: SliceableFood # TODO add it + # count: 3 + # slice: FoodDoughCottonSlice + - type: Construction + graph: CottonPizza + node: start + - type: Tag + tags: + - Ingredient + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 18 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Fiber + Quantity: 10 + - type: entity name: raw pastry base parent: FoodBakingBase @@ -456,6 +488,18 @@ count: 3 slice: FoodCroissantRaw +- type: entity + name: flat cotton dough + parent: FoodBakingBase + id: FoodDoughCottonFlat + description: A flattened cotton dough. + components: + - type: Sprite + state: cotton-dough-flat + - type: Construction + graph: CottonPizza + node: flat + - type: entity name: pizza bread parent: FoodBakingBase diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml new file mode 100644 index 00000000000..2292d4d299f --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/cottonpizza.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: CottonPizza + start: start + graph: + - node: start + entity: FoodDoughCotton + edges: + - to: flat + steps: + - tool: Rolling + doAfter: 1 + - node: flat + entity: FoodDoughCottonFlat diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 9a59ab50234..ce381256270 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -399,6 +399,14 @@ solids: FoodDough: 1 +- type: microwaveMealRecipe + id: RecipeBreadCotton + name: cotton bread recipe + result: FoodBreadCotton + time: 10 + solids: + FoodDoughCotton: 1 + - type: microwaveMealRecipe id: RecipeSausageBread name: sausage bread recipe @@ -602,6 +610,15 @@ FoodTomato: 2 SheetUranium1: 2 +- type: microwaveMealRecipe + id: RecipeCottonPizza + name: cotton pizza recipe + result: FoodPizzaCotton + time: 30 + solids: + FoodDoughCottonFlat: 1 + CottonBol: 4 + #Italian - type: microwaveMealRecipe id: RecipeBoiledSpaghetti diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 24dca890ed7..7d524a9c7ae 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -72,6 +72,22 @@ - !type:CreateEntityReactionEffect entity: FoodDoughTortilla +- type: reaction + id: CreateDoughCotton + impact: Low + quantized: true + conserveEnergy: false + reactants: + Fiber: + amount: 10 + Flour: + amount: 5 + Water: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: FoodDoughCotton + - type: reaction id: CreateCakeBatter impact: Low diff --git a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml index 450f5f088ba..3eb9c2ca2f2 100644 --- a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml +++ b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml @@ -22,9 +22,15 @@ WARNING: This is not an automatically generated list, things here may become out - Chocolate = 6 Cocoa Powder, 2 Milk, 2 Sugar - Uncooked Animal Protein: Grind Raw Meat +Buzz! Don't forget about Moth diet! +- Cotton Dough = 5 Flour, 10 Fabric, 10 Water +- Cotton bread baked the same as default but with cotton dough instead +- Cotton Pizza: Microwave 1 Flat Cotton Dough and 4 Cotton Bolls for 30 Seconds + + diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton-slice.png new file mode 100644 index 0000000000000000000000000000000000000000..0b92e30ae1403dd0b4f78c7e24245cc849ee34ed GIT binary patch literal 721 zcmV;?0xtcDP)7h3fO2K+*#e<;5 zQwv4V90WxVT0x6o@lri%6||sukRo^x^&k;N!BE5&D@CZ6h&C}+JKTC1Mqo2Sp%4^B!A#*W&yU@H+mMik1-v>vz=a7yFoJs}AM`*gk114D zMc>Iu=w%mXFy4@mx+-r*2aTO_0pXFeaJ$M_HM$rUiA0b}ETSXQgG3_1IX`mz)X>WF z6dx`fMBkNIO-{`T0#kwh=qUzE!EVcD%DYQBXqs99`(?CuY-K?d9=Rg2q^#w&22U@i_=WE>y$C8rn-y)^d3N<~fF=m;d6~_Q1lD zf}Vx@P`me|#a)JujA?V_v=sEMWm#rXDN_LTg*drrMq1-XksVMz%^}?8xAs@RxNNg# zvQQ`@zx)WrQl1?MN-L%q71Gad*x*}Z5d@~wv(>*XCntnJ0jFA-ADS(yW)Hl6Fll^E z=aHR%#~Y~^JT2S!)Zf1>ajvNAf1I4ICPi#&0_5VBZ~(hU4>8=%ep*}i7F^udYjlSF zW)oI^HhXro0Rv56pn&{)l4`_K@2 z2Txd6Fn;}vHJ8k2n0P#2_i#-Ks20*casWP`ms8Jf&BAMx5ZWX|Nvk;bWU(QzsMpkD zv5B6u)8htp_RG5u+3ss|%j>RHUDtVc9B>@?{~Y)Q3Yrfabj#tx00000NkvXXu0mjf D_B}(r literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..baa9dc777f23cac67e1f24c7d2b324248459ea55 GIT binary patch literal 1187 zcmV;U1YG-xP)a$T@PBu}bd&+t#$&r255&e%sZ`*8a05P<6I<;b zq%#`2gI;;Iug=39jLH~sKT|jaB2*@W-F>~ zeQ;I(#@tE`;c!@lB<}uzmFwTa**8)*FXA*IU(!*uI7CRm>&CH%Gj&(8f6mF=S3dr} ziLar92`eBwHxS z?u#>bLPSp>>5HBbV%pC4U2Ptnj)F{m`s7P!bGp%c>0P9gX>|0D zHjq;UL2`qb&JbJSA$;@c2a;C?tVUxkwSdtJQA|%y3z^GqSG#s#c6Js~zlybbCpkr} zZ3Pf&&jL!s^3^X8c;ihJN@Xms>h*)?(_NNdwoR-*aMSLU%Cg|zLhho9aPmpV&+7DvC*ieQ>Y{{L#?AQXr^$xIZxCR)H-RK#^5L$QMaU2Qq1=c@AB*Dd{eIP{ zO4GoF%Wq-n?kxmW$If~lH?H3nqI7Y8u9?y8t~Kqx$pLmS=EY(WZtn@K<>uvSkaPDD z&j$3(CyC@+jRViWi1KP0wYH=x%_q@d2#CzX41!@LQ9Tc$F(7KxRNKLE&!*VSTp)~7 zkmLroYBnjsI~%=Ha;$Ts=2>oR2ixrO^Nfx)5gQ#10$7T~t(kSH0-l0&gJMW-Qf^Qb z%aPz=!wh#1ossu2Qc~;e=TS^>jC1;wOT90gJK6!pP%Cd>U|>Kdl8hn@P>gXeu#cHd zGM;<}wzqer$tPVfPR0Fm_N!^y1=da<%)eg4bnaETexLE`kf`fZu=)qMKqjzO`e*j!4khJ?fZMR&k|#z z@jn2;ofed^gLv<|+yDCipy{JlN6Ueh1OK%H{{Whh5shRn#{2*P002ovPDHLkV1l$A BHDmw) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json index 2761d79f986..f35aa5f4ced 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955", + "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380)", "size": { "x": 32, "y": 32 @@ -70,6 +70,12 @@ { "name": "crostini" }, + { + "name": "cotton" + }, + { + "name": "cotton-slice" + }, { "name": "french-toast" }, diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/cotton-pizza.png new file mode 100644 index 0000000000000000000000000000000000000000..e047c757fcd952d27343daa0072ae2e1179cf47a GIT binary patch literal 672 zcmV;R0$=@!P)+f4kN(l%?IIO;)c6@4hs(g(ob1*e);jt{8Ixy zy;@_?;z@(Xo=?)5)tEyN1XQcl$n!jEwOaAHZQH!Zx38NINintf+cYvqvMK{Os*o3N zlY8tc?b|CHRxX#>VE{KxlXP9@J;1RS-xii1QBb3R)Dx=Ye^K?2Lj+LF)6KzQm5a5Pka6$kInMI|RWpP5ZAz697UXKaM zvYbgei^S1n3ot~w@`lJ*CD(P?VW>pdU@(ZP`3)jSioIwPR#7zyXf~UKqJr(`6w&@; zsTug`?DF7*-(L`by4^0js;b;$c#;qZ0st<+p_*tFNWjqsfMc$Jk+g{!`1W)u94=hp z!I{5wpJS0ESuJKj3?uq2B*$E!MIe@(3lRG9_8vKIkFMQ)nZnGxh9F@qE>XufNmA1n z<;1x)CRD9fnH;LezTc1D0Bi3(uY(aKVn;aV8jcSduy6pgnN0*H7m><$;1er_*KA#VvPzbUtL(?=i zf&}TE>WZSUS~8hr#uEF>m|r_~G}3Ze8Mr-(82*7Eg8g$S7K;dn!^q`ws8*{?jA~A& z6WMH*)#xsl%WUlX-8K^OgQnut&wBtSy-q@pN7*L9Q3$KwtPR~tyD zu3L)RGN5V|$jLJFLJawvEmMR9^Z7g^Nn)nxNd})!SD5hmix}_m_1Ob7G8Ms_7M#k~A z6O_2wqP67|g&Rc+T(gD48bM%LKxbhFW|wi!9UmEBW_GD8oSVG7 zdEayHx%a*y^2}4fQ@~T;A1kmhFMg?1(w)wHFTbNpR|<38d7#Z!&{!-+!{Lyk(dYz^ zU-fT1?li01*Ecul@{K$D-tW5M#pC;WcI5(PG8w*9Q4|V=LXO{J9etzGASkleYr7J0 zBwz(^Hk%CE@AoMj4s#Du0D|orAlp0Im?-8dl?ny*9xLLehAja|4xmwQiva?Gpdq_T zk!Xy^+CZh>+94*BOeRTgnX-dKDwP_mWF@iw=>uKA{a^;~uw6poV#K&%czVpgM~h3R z83e%oBSAibdD3L+b^|mr=FK@%jdok*GgdP3lPxAOcSzbu_-j-ymVN zQEz)lEgS-c|UB6isAg{D*++aanHAtJP+1ZQ&A74MC z^4sSG5@2ujYPG1-F&(qo3;`qxHX;Ez&W4F9 z=*e9Im;gYJ22dE15DohPE>y&Ml%rh|&Je(%YV{|rudVVWcwqWXVz>dHioMmw|2$RByj(BhkT-?8KTL=09V%v80%tV3i3umB@thlW#{xv#~ZO245Gr> zfTInqu7A?sRJ%oSsK8w8Z}DZal?CQ)y2#l@veZVggMC z63K*Wte7+j1DDElPrw~jO_22#_Iv*4SLO@q2^z|RvRE?jwL(*YmFYf!IJ);^FKS&D zB$;Pr)}^?^`3wF*$OSxfkvZZInJp-~2WZ%AHcbMW3iyKw41IZxG7AAD-KA4WR*d?9 zu3n{6v$d3b4Q4ifnT#hK7-b7;WnmHnpWp6X0fFanz|{o%_PPb?5co9$yH!L~A7`D? zu)B_6-1iP3Dufn8%zV@bbWJ;}otj^orUI9*UFYbgqd>G<-@pfWnoff=SA)}K>MEDf zVec72q!F<#QT2f`1}zEn*-X;?th>`&@4S&raUgpJ(f9`ZGkzGw5>S&yA`v(%ofsV( zWlw6n_ivtq=I3%3WZi^22|l>fDOc4uBep!xj*G07Y}S+ry_jgsP7Hx6m#wk<`@8~q e1@a0g3j785Fk8L?fLE*l0000 Date: Mon, 26 Aug 2024 02:47:24 +0000 Subject: [PATCH 085/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index d3682dc07c3..747f148443d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Deserty0 - changes: - - message: '"no materials loaded" messege now appears in lathes!' - type: Fix - id: 6713 - time: '2024-06-12T10:32:11.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28885 - author: robertGN changes: - message: Syndicate communications consoles can no longer recall the emergency @@ -3866,3 +3859,10 @@ id: 7212 time: '2024-08-25T17:09:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30001 +- author: lzk228 + changes: + - message: Cotton dough added to the game! Check the guidebook for new recipes. + type: Add + id: 7213 + time: '2024-08-26T02:46:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30668 From dd7c395fb7cf5ffa56f943e00e35f7ae24cc95c8 Mon Sep 17 00:00:00 2001 From: Spessmann <156740760+Spessmann@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:45:16 -0700 Subject: [PATCH 086/223] Cog update (#31458) made disposals less bad --- Resources/Maps/cog.yml | 4553 ++++++++++++++++++++++------------------ 1 file changed, 2497 insertions(+), 2056 deletions(-) diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml index 5f4fb440225..53aac9f5b7a 100644 --- a/Resources/Maps/cog.yml +++ b/Resources/Maps/cog.yml @@ -99,7 +99,7 @@ entities: version: 6 -2,-2: ind: -2,-2 - tiles: gQAAAAAAYAAAAAABYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAACcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAADcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAADcwAAAAABcwAAAAABcwAAAAACcwAAAAABcwAAAAABYAAAAAADYAAAAAACUQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAcwAAAAABcwAAAAADcwAAAAABcwAAAAABcwAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAABgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAADcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAB + tiles: gQAAAAAAYAAAAAABYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAACcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAADcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAADcwAAAAABcwAAAAABcwAAAAACcwAAAAABcwAAAAABYAAAAAADYAAAAAACUQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAcwAAAAABcwAAAAADcwAAAAABcwAAAAABcwAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAABgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAADcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAB version: 6 -2,0: ind: -2,0 @@ -127,7 +127,7 @@ entities: version: 6 -3,-3: ind: -3,-3 - tiles: gQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAACcwAAAAABcwAAAAADgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAADgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAADcwAAAAADcwAAAAACYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAABcwAAAAACcwAAAAADcwAAAAADgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADcwAAAAACcwAAAAABcwAAAAADcwAAAAABcwAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAADgQAAAAAAYAAAAAABYAAAAAACcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAA + tiles: gQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAACcwAAAAABcwAAAAADgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAADgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAADcwAAAAADcwAAAAACYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAABcwAAAAACcwAAAAADcwAAAAADgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADcwAAAAACcwAAAAABcwAAAAADcwAAAAABcwAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAADgQAAAAAAYAAAAAABYAAAAAACcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAA version: 6 -4,-2: ind: -4,-2 @@ -179,7 +179,7 @@ entities: version: 6 2,0: ind: 2,0 - tiles: gQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAAwAAAAABBwAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAgAAAAABBwAAAAAAAgAAAAABBwAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAgQAAAAAAYAAAAAADBwAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAgAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: gQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAAwAAAAABBwAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAgAAAAAAAwAAAAAAgQAAAAAAAgAAAAABBwAAAAAAAgAAAAABBwAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAABwAAAAAAgQAAAAAABwAAAAAAAwAAAAAAYAAAAAADBwAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 2,-2: ind: 2,-2 @@ -283,15 +283,15 @@ entities: version: 6 2,1: ind: 2,1 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAIAAAAAACIAAAAAACIAAAAAADIAAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAABgQAAAAAAgQAAAAAAQgAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAIAAAAAADIAAAAAABIAAAAAADIAAAAAACgQAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAADgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAYAAAAAABgQAAAAAAIAAAAAADIAAAAAADIAAAAAACIAAAAAADIAAAAAADIAAAAAAAIAAAAAABIAAAAAABIAAAAAAAgQAAAAAAIAAAAAAAQgAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAIAAAAAAAIAAAAAADIAAAAAABIAAAAAACgQAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAAAIAAAAAACIAAAAAACQgAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAIAAAAAADIAAAAAABIAAAAAACIAAAAAAAgQAAAAAAIAAAAAABIAAAAAADIAAAAAAAIAAAAAABgQAAAAAAgQAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAgQAAAAAAgQAAAAAAYAAAAAADCwAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAgQAAAAAADQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAIAAAAAACIAAAAAACIAAAAAADIAAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAABgQAAAAAAgQAAAAAAQgAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAIAAAAAADIAAAAAABIAAAAAADIAAAAAACgQAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAADgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAYAAAAAABgQAAAAAAIAAAAAADIAAAAAADIAAAAAACIAAAAAADIAAAAAADIAAAAAAAIAAAAAABIAAAAAABIAAAAAAAgQAAAAAAIAAAAAAAQgAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAIAAAAAAAIAAAAAADIAAAAAABIAAAAAACgQAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAAAIAAAAAACIAAAAAACQgAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAIAAAAAADIAAAAAABIAAAAAACIAAAAAAAgQAAAAAAIAAAAAABIAAAAAADIAAAAAAAIAAAAAABgQAAAAAAgQAAAAAA version: 6 3,0: ind: 3,0 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,1: ind: 3,1 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABYAAAAAADYAAAAAABAgAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAwAAAAACBwAAAAAAAgAAAAABAgAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABgQAAAAAAIAAAAAACIAAAAAADgQAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABYAAAAAADYAAAAAABAgAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAwAAAAACBwAAAAAAAgAAAAABAgAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABgQAAAAAAIAAAAAACIAAAAAADgQAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,2: ind: 3,2 @@ -387,7 +387,7 @@ entities: version: 6 -4,3: ind: -4,3 - tiles: gAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAA + tiles: gAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAA version: 6 -3,3: ind: -3,3 @@ -687,11 +687,6 @@ entities: 2847: 31,47 2848: 30,47 2849: 29,47 - 2850: 29,45 - 2851: 30,45 - 2852: 33,45 - 2853: 34,45 - 2854: 35,45 2855: 35,46 2856: 35,47 2948: 59,42 @@ -1167,8 +1162,6 @@ entities: 1276: 54,-37 1277: 54,-20 1355: 19,3 - 1716: 41,13 - 1717: 41,11 1781: 33,35 1782: 33,36 1783: 33,37 @@ -1360,18 +1353,11 @@ entities: 1575: 39,8 1576: 38,7 1577: 37,6 - 1578: 36,7 1579: 35,7 1580: 34,7 1581: 34,7 1582: 34,8 1583: 35,8 - 1584: 37,8 - 1585: 37,8 - 1586: 36,6 - 1587: 36,6 - 1588: 37,7 - 1589: 36,7 1590: 38,8 1591: 39,7 1592: 34,10 @@ -1379,9 +1365,6 @@ entities: 1594: 36,10 1595: 36,10 1596: 35,10 - 1597: 41,12 - 1598: 41,12 - 1599: 41,12 1679: 52,22 1680: 52,23 1681: 53,24 @@ -1578,9 +1561,7 @@ entities: 4412: -34,-27 4413: -33,-29 4414: -37,-28 - 4415: -33,-26 4416: -30,-26 - 4417: -32,-25 4418: -36,-25 4419: -39,-23 4420: -41,-24 @@ -1593,7 +1574,6 @@ entities: 4427: -33,-21 4428: -25,-31 4429: -22,-29 - 4430: -23,-31 4431: -36,-48 4432: -32,-47 4433: -31,-48 @@ -1678,7 +1658,6 @@ entities: 4906: -15,-31 4907: -17,-30 4908: -13,-28 - 4909: -22,-31 4910: -22,-29 4911: -25,-29 4912: 13,-11 @@ -1956,6 +1935,73 @@ entities: 5728: -24,65 5729: -22,65 5730: -23,64 + 5970: 37,10 + 5971: 34,11 + 5972: 33,11 + 5973: 33,12 + 5974: 32,12 + 5975: 37,14 + 5976: 36,14 + 5977: 35,14 + 5978: 35,15 + 5979: 35,15 + 5980: 35,17 + 5981: 35,17 + 5982: 35,18 + 5983: 38,16 + 5984: 37,17 + 5985: 37,18 + 5986: 39,18 + 5987: 39,19 + 5988: 44,14 + 5989: 46,14 + 5990: 48,14 + 5991: 50,14 + 5992: 48,14 + 5993: 47,14 + 5994: 46,14 + 5995: 45,14 + 5996: 44,14 + 5997: 46,14 + 5998: 46,14 + 5999: 47,14 + 6000: 48,14 + 6001: 49,14 + 6002: 49,14 + 6003: 51,14 + 6004: 51,14 + 6005: 52,15 + 6006: 51,15 + 6007: 51,16 + 6008: 51,16 + 6009: 52,16 + 6010: 52,17 + 6011: 53,17 + 6012: 53,17 + 6013: 54,17 + 6014: 54,17 + 6015: 48,10 + 6016: 47,11 + 6017: 45,11 + 6018: 44,10 + 6019: 44,11 + 6020: 45,11 + 6021: 47,10 + 6022: 48,10 + 6023: 48,11 + 6024: 48,11 + 6025: 47,12 + 6026: 49,12 + 6027: 50,12 + 6028: 51,12 + 6029: 52,13 + 6030: 52,13 + 6031: 52,12 + 6032: 40,11 + 6033: 38,12 + 6034: 38,11 + 6035: 36,11 + 6036: 37,10 - node: cleanable: True color: '#FFFFFFFF' @@ -2305,7 +2351,6 @@ entities: 3282: 40,48 3283: 40,49 3284: 40,47 - 3285: 34,45 3286: 32,46 3287: 31,45 3288: 29,46 @@ -2665,7 +2710,6 @@ entities: 3661: -22,-47 3662: -21,-45 3663: -23,-45 - 3664: -27,-44 3665: -30,-43 3666: -31,-44 3667: -35,-44 @@ -2684,15 +2728,11 @@ entities: 3681: -30,-29 3682: -30,-27 3683: -33,-28 - 3684: -33,-27 - 3685: -29,-25 3686: -27,-25 3687: -26,-25 3688: -25,-25 3689: -26,-31 - 3690: -26,-29 3691: -24,-31 - 3692: -23,-31 3693: -22,-30 3694: -20,-25 3695: -22,-21 @@ -3394,6 +3434,11 @@ entities: id: Grassa4 decals: 2155: -1.7855573,23.949152 + - node: + color: '#FFFFFFFF' + id: Grassb4 + decals: + 6047: 0.3860445,30.988146 - node: color: '#FFFFFFFF' id: Grassb5 @@ -3440,6 +3485,11 @@ entities: 4079: 68.65254,42.701946 4080: 69.952675,44.10507 4081: 74.31514,52.17988 + 6042: 0.5364504,30.177677 + 6043: 1.2951236,30.04314 + 6044: 0.95249677,30.984898 + 6045: -3.5628335,30.935976 + 6046: -3.489414,24.993238 - node: color: '#FFFFFFFF' id: Grassd3 @@ -4077,8 +4127,6 @@ entities: decals: 72: -29,-26 73: -28,-26 - 74: -27,-26 - 75: -26,-26 76: -25,-26 94: -36,-29 95: -35,-29 @@ -4108,7 +4156,6 @@ entities: 3947: -31,-22 3948: -30,-22 4514: -32,-22 - 4515: -22,-32 4516: -26,-32 5602: -32,-40 5603: -31,-40 @@ -4284,6 +4331,9 @@ entities: 2809: 32,45 2810: 31,45 4966: 8,0 + 6038: 30,45 + 6040: 33,45 + 6041: 34,45 - node: color: '#FA750096' id: HalfTileOverlayGreyscale180 @@ -4293,6 +4343,9 @@ entities: 194: -30,-45 195: -31,-45 196: -35,-45 + 6048: -34,-45 + 6049: -32,-45 + 6050: -33,-45 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale270 @@ -4447,11 +4500,9 @@ entities: 616: -18,-21 617: -18,-20 4506: -27,-31 - 4507: -27,-30 - 4508: -27,-29 - 4509: -27,-28 4728: -18,-24 5607: -46,27 + 6090: -27,-30 - node: color: '#D4D4D428' id: HalfTileOverlayGreyscale270 @@ -4786,6 +4837,7 @@ entities: 638: -15,-20 5599: -30,-38 5600: -30,-39 + 6087: -22,-31 - node: color: '#D4D4D428' id: HalfTileOverlayGreyscale90 @@ -4958,12 +5010,15 @@ entities: 1357: 22,-1 1358: 20,-1 1359: 21,-1 + 6106: -27,-28 + 6108: -26,-28 - node: - angle: 1.5707963267948966 rad + angle: 3.141592653589793 rad color: '#FFFFFFFF' id: LoadingArea decals: - 1702: 36,6 + 6080: -26,-26 + 6081: -27,-26 - node: color: '#D381C996' id: MiniTileBoxOverlay @@ -5233,6 +5288,20 @@ entities: 2840: 44,49 4980: 12,-7 4981: 13,-7 + - node: + color: '#FA750096' + id: QuarterTileOverlayGreyscale + decals: + 6062: -34,-44 + 6063: -33,-44 + 6064: -32,-44 + 6065: -31,-44 + 6066: -30,-44 + 6067: -29,-44 + 6068: -28,-44 + 6069: -27,-44 + 6070: -26,-44 + 6071: -35,-44 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale180 @@ -5458,7 +5527,15 @@ entities: color: '#FA750096' id: QuarterTileOverlayGreyscale180 decals: - 201: -32,-45 + 6053: -35,-43 + 6054: -34,-43 + 6055: -33,-43 + 6056: -32,-43 + 6057: -31,-43 + 6058: -30,-43 + 6059: -29,-43 + 6060: -28,-43 + 6061: -27,-43 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale270 @@ -5538,6 +5615,7 @@ entities: decals: 122: -31,-29 5606: -32,-36 + 6095: -27,-29 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale270 @@ -5658,11 +5736,6 @@ entities: 5776: 29,-9 5777: 29,-8 5778: 29,-7 - - node: - color: '#FA750096' - id: QuarterTileOverlayGreyscale270 - decals: - 202: -34,-45 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale90 @@ -5871,11 +5944,6 @@ entities: 2610: 22,69 4955: 13,-12 5046: 28,43 - - node: - color: '#FA750096' - id: QuarterTileOverlayGreyscale90 - decals: - 203: -26,-43 - node: color: '#FFFFFFFF' id: Rock01 @@ -6110,6 +6178,7 @@ entities: 125: -24,-26 234: -43,-31 5601: -30,-40 + 6086: -22,-32 - node: color: '#D4D4D428' id: ThreeQuarterTileOverlayGreyscale180 @@ -6144,6 +6213,7 @@ entities: 1385: -21,-8 1386: -20,-7 2830: 48,47 + 6039: 35,45 - node: color: '#FA750096' id: ThreeQuarterTileOverlayGreyscale180 @@ -6230,6 +6300,7 @@ entities: 1384: -25,-8 2826: 43,47 4963: 7,0 + 6037: 29,45 - node: color: '#FA750096' id: ThreeQuarterTileOverlayGreyscale270 @@ -6301,6 +6372,7 @@ entities: id: ThreeQuarterTileOverlayGreyscale90 decals: 126: -24,-24 + 6084: -24,-28 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale90 @@ -6344,6 +6416,8 @@ entities: decals: 5192: 66,50 5194: -26,-51 + 5966: 37,19 + 5967: 43,14 - node: angle: 3.141592653589793 rad color: '#000000FF' @@ -6376,7 +6450,6 @@ entities: decals: 249: -28,-50 717: 32,-19 - 1703: 37,8 2226: -33,53 2227: -32,48 - node: @@ -6392,6 +6465,12 @@ entities: decals: 5193: 66,50 5195: -26,-51 + - node: + color: '#8C347FFF' + id: WarnBoxGreyscale + decals: + 5968: 37,19 + 5969: 43,14 - node: color: '#52B4E9FF' id: WarnCornerNE @@ -6694,8 +6773,6 @@ entities: 1413: -28,-4 1414: -28,-3 1431: -37,-11 - 1705: 36,7 - 1706: 36,8 1715: 36,17 2060: -13,5 2061: -13,6 @@ -6800,7 +6877,6 @@ entities: 1421: -36,-10 1514: 15,0 1515: 16,0 - 1704: 37,7 2222: -31,49 2223: -30,49 2375: -37,62 @@ -7334,7 +7410,7 @@ entities: -8,-9: 0: 26231 -7,-7: - 0: 65454 + 0: 65422 -7,-6: 0: 65311 -7,-8: @@ -7529,7 +7605,7 @@ entities: -8,-12: 0: 61687 -9,-12: - 0: 61695 + 0: 62719 -8,-11: 0: 4095 -9,-11: @@ -7878,11 +7954,11 @@ entities: 0: 238 8,1: 2: 15 - 0: 60928 + 0: 28160 8,2: - 0: 3886 + 0: 50982 8,3: - 0: 36623 + 0: 40759 9,-4: 0: 65295 9,-3: @@ -7939,30 +8015,30 @@ entities: 2: 15 0: 65280 9,2: - 0: 3887 + 0: 65327 9,3: - 0: 3855 + 0: 36623 9,4: 0: 61182 10,1: 2: 35 0: 59528 10,2: - 0: 44847 + 0: 47919 10,3: - 0: 12207 + 0: 10799 10,4: 0: 48059 11,1: 0: 12288 11,2: - 0: 57103 + 0: 65295 11,3: 0: 4063 11,4: 0: 63487 12,2: - 0: 44815 + 0: 48911 12,3: 0: 44943 8,-9: @@ -9228,10 +9304,14 @@ entities: 2: 4095 -15,13: 2: 4095 + -15,15: + 0: 3212 -14,13: 2: 20309 -14,15: - 0: 3780 + 0: 4079 + -14,14: + 0: 35016 -14,16: 2: 17604 -13,15: @@ -9559,6 +9639,12 @@ entities: parent: 2922 - type: InstantAction container: 2922 + - uid: 12128 + components: + - type: Transform + parent: 23717 + - type: InstantAction + container: 23717 - uid: 27130 components: - type: Transform @@ -9573,6 +9659,18 @@ entities: parent: 8997 - type: InstantAction container: 8997 + - uid: 12036 + components: + - type: Transform + parent: 4313 + - type: InstantAction + container: 4313 + - uid: 12037 + components: + - type: Transform + parent: 12064 + - type: InstantAction + container: 12064 - uid: 18678 components: - type: Transform @@ -10065,6 +10163,20 @@ entities: - 5280 - 10003 - 10026 + - uid: 12032 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -50.5,-24.5 + parent: 12 + - type: DeviceList + devices: + - 9988 + - 801 + - 9987 + - 800 + - 23933 + - 23934 - uid: 13076 components: - type: Transform @@ -10636,6 +10748,7 @@ entities: - 1306 - 2094 - 25373 + - 12725 - uid: 25516 components: - type: Transform @@ -11197,6 +11310,11 @@ entities: - type: Transform pos: -22.5,-7.5 parent: 12 + - uid: 12143 + components: + - type: Transform + pos: 31.5,47.5 + parent: 12 - uid: 13514 components: - type: Transform @@ -11212,11 +11330,6 @@ entities: - type: Transform pos: -4.5,11.5 parent: 12 - - uid: 23700 - components: - - type: Transform - pos: 33.5,45.5 - parent: 12 - uid: 23899 components: - type: Transform @@ -11227,6 +11340,11 @@ entities: - type: Transform pos: -20.5,61.5 parent: 12 + - uid: 26068 + components: + - type: Transform + pos: 38.5,12.5 + parent: 12 - uid: 26913 components: - type: Transform @@ -12334,6 +12452,12 @@ entities: rot: -1.5707963267948966 rad pos: 25.5,71.5 parent: 12 + - uid: 22328 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,59.5 + parent: 12 - proto: AirlockExternalGlassAtmosphericsLocked entities: - uid: 4390 @@ -12454,6 +12578,12 @@ entities: - DoorStatus: DoorBolt 478: - DoorStatus: DoorBolt + - uid: 1061 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -55.5,62.5 + parent: 12 - uid: 2041 components: - type: Transform @@ -12532,6 +12662,12 @@ entities: linkedPorts: 19847: - DoorStatus: DoorBolt + - uid: 22277 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -55.5,60.5 + parent: 12 - uid: 27232 components: - type: Transform @@ -12684,6 +12820,12 @@ entities: - type: Transform pos: -16.5,-62.5 parent: 12 + - uid: 22322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,57.5 + parent: 12 - uid: 24238 components: - type: Transform @@ -12696,11 +12838,6 @@ entities: rot: -1.5707963267948966 rad pos: -56.5,-39.5 parent: 12 - - uid: 29395 - components: - - type: Transform - pos: -53.5,60.5 - parent: 12 - proto: AirlockExternalGlassShuttleLocked entities: - uid: 1968 @@ -12765,17 +12902,23 @@ entities: - type: Transform pos: -36.5,13.5 parent: 12 - - uid: 26256 + - uid: 22320 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 60.5,-48.5 + rot: -1.5707963267948966 rad + pos: -57.5,62.5 parent: 12 - - uid: 29394 + - uid: 22321 components: - type: Transform rot: -1.5707963267948966 rad - pos: -54.5,62.5 + pos: -57.5,60.5 + parent: 12 + - uid: 26256 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,-48.5 parent: 12 - proto: AirlockExternalLocked entities: @@ -13471,6 +13614,27 @@ entities: rot: 3.141592653589793 rad pos: 31.5,23.5 parent: 12 + - uid: 12011 + components: + - type: Transform + pos: 32.5,15.5 + parent: 12 + - uid: 12019 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 42.5,12.5 + parent: 12 + - uid: 12028 + components: + - type: Transform + pos: 33.5,9.5 + parent: 12 + - uid: 12122 + components: + - type: Transform + pos: 35.5,11.5 + parent: 12 - uid: 14946 components: - type: Transform @@ -13536,6 +13700,11 @@ entities: - type: Transform pos: -12.5,-5.5 parent: 12 + - uid: 22304 + components: + - type: Transform + pos: 37.5,9.5 + parent: 12 - uid: 22340 components: - type: Transform @@ -13908,12 +14077,6 @@ entities: parent: 12 - proto: AirlockMedicalLocked entities: - - uid: 1081 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -36.5,-46.5 - parent: 12 - uid: 2431 components: - type: Transform @@ -13988,6 +14151,13 @@ entities: rot: 3.141592653589793 rad pos: -39.5,-48.5 parent: 12 +- proto: AirlockMedicalScienceLocked + entities: + - uid: 514 + components: + - type: Transform + pos: -36.5,-46.5 + parent: 12 - proto: AirlockQuartermasterLocked entities: - uid: 8437 @@ -14626,12 +14796,18 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,-26.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 12032 - uid: 9988 components: - type: Transform rot: 1.5707963267948966 rad pos: -53.5,-22.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 12032 - uid: 9989 components: - type: Transform @@ -15634,11 +15810,6 @@ entities: - type: Transform pos: 5.3721876,30.61469 parent: 12 - - uid: 23716 - components: - - type: Transform - pos: 33.66482,47.484264 - parent: 12 - uid: 26399 components: - type: Transform @@ -15753,6 +15924,11 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-9.5 parent: 12 + - uid: 2448 + components: + - type: Transform + pos: 31.5,15.5 + parent: 12 - uid: 2543 components: - type: Transform @@ -15909,11 +16085,11 @@ entities: - type: Transform pos: 43.5,26.5 parent: 12 - - uid: 12086 + - uid: 11512 components: - type: Transform rot: 1.5707963267948966 rad - pos: 36.5,19.5 + pos: 36.5,18.5 parent: 12 - uid: 12423 components: @@ -16364,11 +16540,6 @@ entities: rot: 1.5707963267948966 rad pos: 64.5,-13.5 parent: 12 - - uid: 8533 - components: - - type: Transform - pos: -53.5,60.5 - parent: 12 - uid: 9039 components: - type: Transform @@ -16413,6 +16584,24 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,76.5 parent: 12 + - uid: 12033 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,57.5 + parent: 12 + - uid: 12057 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,62.5 + parent: 12 + - uid: 12645 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,60.5 + parent: 12 - uid: 13558 components: - type: Transform @@ -16461,12 +16650,6 @@ entities: rot: 3.141592653589793 rad pos: -18.5,74.5 parent: 12 - - uid: 25445 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -54.5,62.5 - parent: 12 - proto: AtmosFixBlockerMarker entities: - uid: 93 @@ -17644,11 +17827,6 @@ entities: parent: 12 - proto: BaseComputer entities: - - uid: 689 - components: - - type: Transform - pos: 36.5,8.5 - parent: 12 - uid: 9825 components: - type: Transform @@ -18362,16 +18540,6 @@ entities: - type: Transform pos: -47.5,51.5 parent: 12 - - uid: 11959 - components: - - type: Transform - pos: 38.5,14.5 - parent: 12 - - uid: 11960 - components: - - type: Transform - pos: 34.5,14.5 - parent: 12 - uid: 16503 components: - type: Transform @@ -18541,6 +18709,13 @@ entities: - type: Transform pos: 6.5,66.5 parent: 12 +- proto: BlockGameArcadeComputerCircuitboard + entities: + - uid: 22318 + components: + - type: Transform + pos: 34.946262,45.383537 + parent: 12 - proto: Bloodpack entities: - uid: 13830 @@ -19126,6 +19301,12 @@ entities: parent: 12 - proto: BoxingBell entities: + - uid: 12634 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,53.5 + parent: 12 - uid: 22635 components: - type: Transform @@ -19621,6 +19802,11 @@ entities: - type: Transform pos: -43.5,-13.5 parent: 12 + - uid: 1087 + components: + - type: Transform + pos: 37.5,6.5 + parent: 12 - uid: 1315 components: - type: Transform @@ -22086,6 +22272,11 @@ entities: - type: Transform pos: 0.5,-34.5 parent: 12 + - uid: 3892 + components: + - type: Transform + pos: 51.5,12.5 + parent: 12 - uid: 4119 components: - type: Transform @@ -22506,6 +22697,11 @@ entities: - type: Transform pos: 63.5,-5.5 parent: 12 + - uid: 5038 + components: + - type: Transform + pos: 52.5,11.5 + parent: 12 - uid: 5052 components: - type: Transform @@ -22576,6 +22772,16 @@ entities: - type: Transform pos: 27.5,-1.5 parent: 12 + - uid: 5554 + components: + - type: Transform + pos: 52.5,10.5 + parent: 12 + - uid: 5555 + components: + - type: Transform + pos: 51.5,10.5 + parent: 12 - uid: 5643 components: - type: Transform @@ -25506,6 +25712,11 @@ entities: - type: Transform pos: -11.5,-8.5 parent: 12 + - uid: 8533 + components: + - type: Transform + pos: 37.5,11.5 + parent: 12 - uid: 8773 components: - type: Transform @@ -25576,6 +25787,11 @@ entities: - type: Transform pos: 85.5,-33.5 parent: 12 + - uid: 8864 + components: + - type: Transform + pos: 38.5,11.5 + parent: 12 - uid: 8877 components: - type: Transform @@ -26526,6 +26742,11 @@ entities: - type: Transform pos: 47.5,-0.5 parent: 12 + - uid: 11366 + components: + - type: Transform + pos: -53.5,61.5 + parent: 12 - uid: 11367 components: - type: Transform @@ -26536,6 +26757,11 @@ entities: - type: Transform pos: 43.5,26.5 parent: 12 + - uid: 11400 + components: + - type: Transform + pos: -52.5,61.5 + parent: 12 - uid: 11484 components: - type: Transform @@ -26546,11 +26772,61 @@ entities: - type: Transform pos: 31.5,30.5 parent: 12 + - uid: 11980 + components: + - type: Transform + pos: 36.5,11.5 + parent: 12 + - uid: 11981 + components: + - type: Transform + pos: 35.5,11.5 + parent: 12 + - uid: 11985 + components: + - type: Transform + pos: 32.5,13.5 + parent: 12 + - uid: 11998 + components: + - type: Transform + pos: 38.5,15.5 + parent: 12 + - uid: 11999 + components: + - type: Transform + pos: 38.5,18.5 + parent: 12 + - uid: 12010 + components: + - type: Transform + pos: 30.5,17.5 + parent: 12 + - uid: 12012 + components: + - type: Transform + pos: 29.5,17.5 + parent: 12 + - uid: 12013 + components: + - type: Transform + pos: 28.5,17.5 + parent: 12 + - uid: 12029 + components: + - type: Transform + pos: 34.5,11.5 + parent: 12 - uid: 12072 components: - type: Transform pos: -42.5,53.5 parent: 12 + - uid: 12077 + components: + - type: Transform + pos: 38.5,16.5 + parent: 12 - uid: 12087 components: - type: Transform @@ -26611,16 +26887,6 @@ entities: - type: Transform pos: 37.5,8.5 parent: 12 - - uid: 12099 - components: - - type: Transform - pos: 36.5,8.5 - parent: 12 - - uid: 12100 - components: - - type: Transform - pos: 35.5,8.5 - parent: 12 - uid: 12101 components: - type: Transform @@ -26656,21 +26922,6 @@ entities: - type: Transform pos: 33.5,9.5 parent: 12 - - uid: 12108 - components: - - type: Transform - pos: 30.5,10.5 - parent: 12 - - uid: 12109 - components: - - type: Transform - pos: 31.5,10.5 - parent: 12 - - uid: 12110 - components: - - type: Transform - pos: 32.5,10.5 - parent: 12 - uid: 12111 components: - type: Transform @@ -26681,85 +26932,20 @@ entities: - type: Transform pos: 34.5,10.5 parent: 12 - - uid: 12113 - components: - - type: Transform - pos: 35.5,10.5 - parent: 12 - - uid: 12114 - components: - - type: Transform - pos: 36.5,10.5 - parent: 12 - uid: 12115 components: - type: Transform pos: 37.5,10.5 parent: 12 - - uid: 12116 - components: - - type: Transform - pos: 38.5,10.5 - parent: 12 - - uid: 12117 - components: - - type: Transform - pos: 39.5,10.5 - parent: 12 - - uid: 12118 - components: - - type: Transform - pos: 40.5,10.5 - parent: 12 - uid: 12119 components: - type: Transform pos: 41.5,10.5 parent: 12 - - uid: 12120 - components: - - type: Transform - pos: 42.5,10.5 - parent: 12 - - uid: 12121 - components: - - type: Transform - pos: 43.5,10.5 - parent: 12 - - uid: 12122 - components: - - type: Transform - pos: 44.5,10.5 - parent: 12 - - uid: 12123 - components: - - type: Transform - pos: 45.5,10.5 - parent: 12 - uid: 12124 components: - type: Transform - pos: 46.5,10.5 - parent: 12 - - uid: 12125 - components: - - type: Transform - pos: 47.5,10.5 - parent: 12 - - uid: 12126 - components: - - type: Transform - pos: 48.5,10.5 - parent: 12 - - uid: 12127 - components: - - type: Transform - pos: 49.5,10.5 - parent: 12 - - uid: 12128 - components: - - type: Transform - pos: 49.5,11.5 + pos: 50.5,12.5 parent: 12 - uid: 12129 components: @@ -26806,36 +26992,6 @@ entities: - type: Transform pos: 41.5,12.5 parent: 12 - - uid: 12138 - components: - - type: Transform - pos: 40.5,12.5 - parent: 12 - - uid: 12139 - components: - - type: Transform - pos: 39.5,12.5 - parent: 12 - - uid: 12140 - components: - - type: Transform - pos: 38.5,12.5 - parent: 12 - - uid: 12141 - components: - - type: Transform - pos: 37.5,12.5 - parent: 12 - - uid: 12142 - components: - - type: Transform - pos: 36.5,12.5 - parent: 12 - - uid: 12143 - components: - - type: Transform - pos: 35.5,12.5 - parent: 12 - uid: 12144 components: - type: Transform @@ -26851,46 +27007,11 @@ entities: - type: Transform pos: 32.5,12.5 parent: 12 - - uid: 12147 - components: - - type: Transform - pos: 31.5,12.5 - parent: 12 - - uid: 12148 - components: - - type: Transform - pos: 30.5,12.5 - parent: 12 - - uid: 12149 - components: - - type: Transform - pos: 30.5,11.5 - parent: 12 - - uid: 12150 - components: - - type: Transform - pos: 30.5,13.5 - parent: 12 - - uid: 12151 - components: - - type: Transform - pos: 30.5,14.5 - parent: 12 - - uid: 12152 - components: - - type: Transform - pos: 31.5,14.5 - parent: 12 - uid: 12153 components: - type: Transform pos: 32.5,14.5 parent: 12 - - uid: 12154 - components: - - type: Transform - pos: 33.5,14.5 - parent: 12 - uid: 12155 components: - type: Transform @@ -26921,11 +27042,6 @@ entities: - type: Transform pos: 39.5,14.5 parent: 12 - - uid: 12161 - components: - - type: Transform - pos: 40.5,14.5 - parent: 12 - uid: 12162 components: - type: Transform @@ -27246,6 +27362,11 @@ entities: - type: Transform pos: 12.5,22.5 parent: 12 + - uid: 12636 + components: + - type: Transform + pos: 52.5,12.5 + parent: 12 - uid: 12714 components: - type: Transform @@ -34811,6 +34932,31 @@ entities: - type: Transform pos: 8.5,5.5 parent: 12 + - uid: 22298 + components: + - type: Transform + pos: 32.5,16.5 + parent: 12 + - uid: 22299 + components: + - type: Transform + pos: 32.5,15.5 + parent: 12 + - uid: 22300 + components: + - type: Transform + pos: 32.5,17.5 + parent: 12 + - uid: 22305 + components: + - type: Transform + pos: 31.5,17.5 + parent: 12 + - uid: 22313 + components: + - type: Transform + pos: 38.5,17.5 + parent: 12 - uid: 22519 components: - type: Transform @@ -34836,6 +34982,26 @@ entities: - type: Transform pos: 42.5,43.5 parent: 12 + - uid: 24196 + components: + - type: Transform + pos: -54.5,61.5 + parent: 12 + - uid: 24255 + components: + - type: Transform + pos: -55.5,61.5 + parent: 12 + - uid: 24256 + components: + - type: Transform + pos: -56.5,61.5 + parent: 12 + - uid: 24300 + components: + - type: Transform + pos: -52.5,60.5 + parent: 12 - uid: 24332 components: - type: Transform @@ -34846,6 +35012,26 @@ entities: - type: Transform pos: -28.5,10.5 parent: 12 + - uid: 24340 + components: + - type: Transform + pos: -52.5,59.5 + parent: 12 + - uid: 24456 + components: + - type: Transform + pos: -52.5,58.5 + parent: 12 + - uid: 24642 + components: + - type: Transform + pos: -52.5,57.5 + parent: 12 + - uid: 24651 + components: + - type: Transform + pos: 40.5,11.5 + parent: 12 - uid: 24803 components: - type: Transform @@ -38671,11 +38857,6 @@ entities: - type: Transform pos: -52.5,62.5 parent: 12 - - uid: 29744 - components: - - type: Transform - pos: -53.5,62.5 - parent: 12 - uid: 29745 components: - type: Transform @@ -38811,21 +38992,6 @@ entities: - type: Transform pos: -41.5,68.5 parent: 12 - - uid: 29819 - components: - - type: Transform - pos: -53.5,61.5 - parent: 12 - - uid: 29821 - components: - - type: Transform - pos: -54.5,62.5 - parent: 12 - - uid: 29823 - components: - - type: Transform - pos: -53.5,60.5 - parent: 12 - uid: 29856 components: - type: Transform @@ -42671,6 +42837,11 @@ entities: - type: Transform pos: 10.5,17.5 parent: 12 + - uid: 11292 + components: + - type: Transform + pos: 40.5,11.5 + parent: 12 - uid: 11313 components: - type: Transform @@ -42891,6 +43062,71 @@ entities: - type: Transform pos: -2.5,34.5 parent: 12 + - uid: 11986 + components: + - type: Transform + pos: 39.5,11.5 + parent: 12 + - uid: 11987 + components: + - type: Transform + pos: 38.5,11.5 + parent: 12 + - uid: 11988 + components: + - type: Transform + pos: 37.5,11.5 + parent: 12 + - uid: 11989 + components: + - type: Transform + pos: 34.5,11.5 + parent: 12 + - uid: 11990 + components: + - type: Transform + pos: 34.5,12.5 + parent: 12 + - uid: 11991 + components: + - type: Transform + pos: 33.5,12.5 + parent: 12 + - uid: 11992 + components: + - type: Transform + pos: 32.5,12.5 + parent: 12 + - uid: 11993 + components: + - type: Transform + pos: 32.5,13.5 + parent: 12 + - uid: 11994 + components: + - type: Transform + pos: 32.5,14.5 + parent: 12 + - uid: 11995 + components: + - type: Transform + pos: 32.5,15.5 + parent: 12 + - uid: 11996 + components: + - type: Transform + pos: 32.5,16.5 + parent: 12 + - uid: 12125 + components: + - type: Transform + pos: 35.5,11.5 + parent: 12 + - uid: 12140 + components: + - type: Transform + pos: 36.5,11.5 + parent: 12 - uid: 13080 components: - type: Transform @@ -51165,6 +51401,11 @@ entities: - type: Transform pos: -60.5,27.5 parent: 12 + - uid: 6281 + components: + - type: Transform + pos: 32.5,16.5 + parent: 12 - uid: 6891 components: - type: Transform @@ -52610,6 +52851,11 @@ entities: - type: Transform pos: -47.5,15.5 parent: 12 + - uid: 11359 + components: + - type: Transform + pos: 32.5,15.5 + parent: 12 - uid: 11450 components: - type: Transform @@ -52630,6 +52876,16 @@ entities: - type: Transform pos: -46.5,53.5 parent: 12 + - uid: 11487 + components: + - type: Transform + pos: -52.5,59.5 + parent: 12 + - uid: 11517 + components: + - type: Transform + pos: 36.5,18.5 + parent: 12 - uid: 11525 components: - type: Transform @@ -52640,6 +52896,21 @@ entities: - type: Transform pos: -23.5,-24.5 parent: 12 + - uid: 12014 + components: + - type: Transform + pos: 31.5,15.5 + parent: 12 + - uid: 12142 + components: + - type: Transform + pos: 37.5,18.5 + parent: 12 + - uid: 12292 + components: + - type: Transform + pos: 39.5,17.5 + parent: 12 - uid: 12346 components: - type: Transform @@ -52865,11 +53136,6 @@ entities: - type: Transform pos: 37.5,19.5 parent: 12 - - uid: 12391 - components: - - type: Transform - pos: 36.5,19.5 - parent: 12 - uid: 12412 components: - type: Transform @@ -52935,6 +53201,11 @@ entities: - type: Transform pos: 50.5,25.5 parent: 12 + - uid: 12640 + components: + - type: Transform + pos: -52.5,58.5 + parent: 12 - uid: 12856 components: - type: Transform @@ -57250,21 +57521,56 @@ entities: - type: Transform pos: 40.5,-5.5 parent: 12 + - uid: 22311 + components: + - type: Transform + pos: 39.5,18.5 + parent: 12 + - uid: 22330 + components: + - type: Transform + pos: -53.5,57.5 + parent: 12 - uid: 22336 components: - type: Transform pos: -53.5,52.5 parent: 12 + - uid: 22338 + components: + - type: Transform + pos: -53.5,56.5 + parent: 12 - uid: 22524 components: - type: Transform pos: -2.5,34.5 parent: 12 + - uid: 23122 + components: + - type: Transform + pos: -53.5,58.5 + parent: 12 - uid: 23123 components: - type: Transform pos: -31.5,70.5 parent: 12 + - uid: 23713 + components: + - type: Transform + pos: -55.5,61.5 + parent: 12 + - uid: 23715 + components: + - type: Transform + pos: -57.5,61.5 + parent: 12 + - uid: 23716 + components: + - type: Transform + pos: -56.5,61.5 + parent: 12 - uid: 23897 components: - type: Transform @@ -57880,11 +58186,6 @@ entities: - type: Transform pos: -29.5,-42.5 parent: 12 - - uid: 25387 - components: - - type: Transform - pos: -53.5,55.5 - parent: 12 - uid: 25388 components: - type: Transform @@ -57910,6 +58211,21 @@ entities: - type: Transform pos: -53.5,51.5 parent: 12 + - uid: 25441 + components: + - type: Transform + pos: 40.5,17.5 + parent: 12 + - uid: 25443 + components: + - type: Transform + pos: 41.5,17.5 + parent: 12 + - uid: 25445 + components: + - type: Transform + pos: 41.5,16.5 + parent: 12 - uid: 25446 components: - type: Transform @@ -57940,6 +58256,46 @@ entities: - type: Transform pos: -27.5,64.5 parent: 12 + - uid: 25471 + components: + - type: Transform + pos: 41.5,15.5 + parent: 12 + - uid: 25472 + components: + - type: Transform + pos: 41.5,14.5 + parent: 12 + - uid: 25473 + components: + - type: Transform + pos: 41.5,13.5 + parent: 12 + - uid: 25474 + components: + - type: Transform + pos: 41.5,12.5 + parent: 12 + - uid: 25475 + components: + - type: Transform + pos: 41.5,11.5 + parent: 12 + - uid: 25476 + components: + - type: Transform + pos: 40.5,11.5 + parent: 12 + - uid: 25477 + components: + - type: Transform + pos: 39.5,11.5 + parent: 12 + - uid: 25478 + components: + - type: Transform + pos: 38.5,11.5 + parent: 12 - uid: 25479 components: - type: Transform @@ -57955,16 +58311,46 @@ entities: - type: Transform pos: 80.5,-0.5 parent: 12 + - uid: 25482 + components: + - type: Transform + pos: 37.5,11.5 + parent: 12 - uid: 25483 components: - type: Transform pos: 80.5,2.5 parent: 12 + - uid: 25484 + components: + - type: Transform + pos: 36.5,11.5 + parent: 12 - uid: 25539 components: - type: Transform pos: 12.5,-8.5 parent: 12 + - uid: 25542 + components: + - type: Transform + pos: 35.5,11.5 + parent: 12 + - uid: 25543 + components: + - type: Transform + pos: 34.5,11.5 + parent: 12 + - uid: 25544 + components: + - type: Transform + pos: 34.5,12.5 + parent: 12 + - uid: 25545 + components: + - type: Transform + pos: 33.5,12.5 + parent: 12 - uid: 25633 components: - type: Transform @@ -58095,6 +58481,21 @@ entities: - type: Transform pos: -30.5,12.5 parent: 12 + - uid: 25833 + components: + - type: Transform + pos: 32.5,12.5 + parent: 12 + - uid: 25837 + components: + - type: Transform + pos: 32.5,13.5 + parent: 12 + - uid: 25838 + components: + - type: Transform + pos: 32.5,14.5 + parent: 12 - uid: 25870 components: - type: Transform @@ -60240,7 +60641,7 @@ entities: - uid: 13243 components: - type: Transform - pos: 47.56619,32.22632 + pos: 47.5362,32.56305 parent: 12 - uid: 13252 components: @@ -60262,6 +60663,18 @@ entities: - type: Transform pos: 50.394928,18.488558 parent: 12 + - uid: 22262 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 48.5,36.5 + parent: 12 + - uid: 22267 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 48.5,38.5 + parent: 12 - uid: 25974 components: - type: Transform @@ -60292,6 +60705,30 @@ entities: rot: -1.5707963267948966 rad pos: 40.87812,39.779 parent: 12 + - uid: 26093 + components: + - type: Transform + pos: 55.5,39.5 + parent: 12 + - uid: 26094 + components: + - type: Transform + pos: 55.5,35.5 + parent: 12 +- proto: CandleSmall + entities: + - uid: 16858 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,39.5 + parent: 12 + - uid: 22266 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,35.5 + parent: 12 - proto: CannabisSeeds entities: - uid: 4189 @@ -62359,12 +62796,24 @@ entities: rot: -1.5707963267948966 rad pos: -37.5,-21.5 parent: 12 + - uid: 12116 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 49.5,39.5 + parent: 12 - uid: 12806 components: - type: Transform rot: 1.5707963267948966 rad pos: 52.5,34.5 parent: 12 + - uid: 12884 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 50.5,38.5 + parent: 12 - uid: 13096 components: - type: Transform @@ -62461,12 +62910,6 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,38.5 parent: 12 - - uid: 13188 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 49.5,39.5 - parent: 12 - uid: 13189 components: - type: Transform @@ -62533,12 +62976,6 @@ entities: rot: 1.5707963267948966 rad pos: 51.5,41.5 parent: 12 - - uid: 13210 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 50.5,38.5 - parent: 12 - uid: 13211 components: - type: Transform @@ -63003,6 +63440,26 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,-53.5 parent: 12 + - uid: 2301 + components: + - type: Transform + pos: 33.5,12.5 + parent: 12 + - uid: 2311 + components: + - type: Transform + pos: 38.5,11.5 + parent: 12 + - uid: 2322 + components: + - type: Transform + pos: 40.5,11.5 + parent: 12 + - uid: 2324 + components: + - type: Transform + pos: 39.5,11.5 + parent: 12 - uid: 2487 components: - type: Transform @@ -63365,6 +63822,30 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,10.5 parent: 12 + - uid: 5556 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,14.5 + parent: 12 + - uid: 5559 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,12.5 + parent: 12 + - uid: 5560 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,12.5 + parent: 12 + - uid: 5561 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.5,12.5 + parent: 12 - uid: 5805 components: - type: Transform @@ -64283,6 +64764,11 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-9.5 parent: 12 + - uid: 9511 + components: + - type: Transform + pos: 37.5,11.5 + parent: 12 - uid: 9528 components: - type: Transform @@ -64634,6 +65120,11 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,68.5 parent: 12 + - uid: 11233 + components: + - type: Transform + pos: 34.5,11.5 + parent: 12 - uid: 11285 components: - type: Transform @@ -64705,6 +65196,11 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,26.5 parent: 12 + - uid: 11333 + components: + - type: Transform + pos: 32.5,14.5 + parent: 12 - uid: 11338 components: - type: Transform @@ -64715,6 +65211,11 @@ entities: - type: Transform pos: -3.5,9.5 parent: 12 + - uid: 11356 + components: + - type: Transform + pos: 32.5,13.5 + parent: 12 - uid: 11357 components: - type: Transform @@ -64802,6 +65303,58 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,62.5 parent: 12 + - uid: 12004 + components: + - type: Transform + pos: 41.5,13.5 + parent: 12 + - uid: 12052 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,12.5 + parent: 12 + - uid: 12073 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,13.5 + parent: 12 + - uid: 12075 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,13.5 + parent: 12 + - uid: 12086 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 48.5,12.5 + parent: 12 + - uid: 12108 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,12.5 + parent: 12 + - uid: 12109 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,12.5 + parent: 12 + - uid: 12147 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,12.5 + parent: 12 + - uid: 12161 + components: + - type: Transform + pos: 32.5,16.5 + parent: 12 - uid: 12701 components: - type: Transform @@ -65814,6 +66367,23 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-0.5 parent: 12 + - uid: 22286 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,12.5 + parent: 12 + - uid: 22291 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.5,12.5 + parent: 12 + - uid: 22317 + components: + - type: Transform + pos: 41.5,10.5 + parent: 12 - uid: 22470 components: - type: Transform @@ -66494,6 +67064,34 @@ entities: - type: Transform pos: 32.5,17.5 parent: 12 + - uid: 24647 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,12.5 + parent: 12 + - uid: 24648 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,12.5 + parent: 12 + - uid: 24649 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,11.5 + parent: 12 + - uid: 24652 + components: + - type: Transform + pos: 41.5,11.5 + parent: 12 + - uid: 24653 + components: + - type: Transform + pos: 41.5,12.5 + parent: 12 - uid: 24670 components: - type: Transform @@ -68226,6 +68824,11 @@ entities: rot: 3.141592653589793 rad pos: 37.48719,-39.759666 parent: 12 + - uid: 22319 + components: + - type: Transform + pos: 35.647026,45.447662 + parent: 12 - proto: CentrifugeMachineCircuitboard entities: - uid: 13003 @@ -68509,6 +69112,12 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,23.5 parent: 12 + - uid: 12020 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 44.5,10.5 + parent: 12 - uid: 12281 components: - type: Transform @@ -68575,12 +69184,6 @@ entities: rot: 3.141592653589793 rad pos: 44.5,28.5 parent: 12 - - uid: 13481 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 42.5,33.5 - parent: 12 - uid: 13482 components: - type: Transform @@ -70083,10 +70686,10 @@ entities: parent: 12 - proto: ChemistryHotplate entities: - - uid: 2301 + - uid: 12644 components: - type: Transform - pos: -32.5,-43.5 + pos: -32.5,-44.5 parent: 12 - uid: 26234 components: @@ -70141,6 +70744,14 @@ entities: rot: 3.141592653589793 rad pos: -14.476033,37.570534 parent: 12 +- proto: ChurchBell + entities: + - uid: 11461 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 42.5,33.5 + parent: 12 - proto: ChurchOrganInstrument entities: - uid: 13110 @@ -70307,11 +70918,6 @@ entities: - type: Transform pos: 5.5,-15.5 parent: 12 - - uid: 8884 - components: - - type: Transform - pos: 55.5,-31.5 - parent: 12 - uid: 9567 components: - type: Transform @@ -70327,6 +70933,21 @@ entities: - type: Transform pos: -26.5,-5.5 parent: 12 + - uid: 11467 + components: + - type: Transform + pos: 76.5,-30.5 + parent: 12 + - uid: 12024 + components: + - type: Transform + pos: 49.5,11.5 + parent: 12 + - uid: 12031 + components: + - type: Transform + pos: 29.5,16.5 + parent: 12 - uid: 13940 components: - type: Transform @@ -70594,6 +71215,11 @@ entities: - type: Transform pos: 47.5,-36.5 parent: 12 + - uid: 12023 + components: + - type: Transform + pos: 49.5,10.5 + parent: 12 - uid: 13942 components: - type: Transform @@ -70836,10 +71462,20 @@ entities: - type: Transform pos: 37.5,-23.5 parent: 12 - - uid: 9511 + - uid: 12021 components: - type: Transform - pos: -52.5,61.5 + pos: 43.5,10.5 + parent: 12 + - uid: 12022 + components: + - type: Transform + pos: 36.5,10.5 + parent: 12 + - uid: 12113 + components: + - type: Transform + pos: -52.5,56.5 parent: 12 - uid: 12246 components: @@ -70916,6 +71552,11 @@ entities: - type: Transform pos: 0.5,54.5 parent: 12 + - uid: 24655 + components: + - type: Transform + pos: 30.5,10.5 + parent: 12 - uid: 24994 components: - type: Transform @@ -71176,6 +71817,11 @@ entities: - type: Transform pos: -26.5,52.5 parent: 12 + - uid: 23712 + components: + - type: Transform + pos: -54.5,63.5 + parent: 12 - uid: 25358 components: - type: Transform @@ -71200,6 +71846,11 @@ entities: - type: Transform pos: -27.5,49.5 parent: 12 + - uid: 23760 + components: + - type: Transform + pos: -52.5,63.5 + parent: 12 - uid: 25345 components: - type: Transform @@ -71223,7 +71874,7 @@ entities: - uid: 2043 components: - type: Transform - pos: -21.5,-19.5 + pos: -18.489782,-21.02709 parent: 12 - uid: 9108 components: @@ -71235,6 +71886,11 @@ entities: - type: Transform pos: -19.5,-3.5 parent: 12 + - uid: 12034 + components: + - type: Transform + pos: 29.404346,45.5935 + parent: 12 - uid: 16475 components: - type: Transform @@ -71540,11 +72196,6 @@ entities: - type: Transform pos: -21.489107,31.8025 parent: 12 - - uid: 23720 - components: - - type: Transform - pos: 33.493465,47.80226 - parent: 12 - proto: ClothingHeadHelmetRiot entities: - uid: 20866 @@ -71907,11 +72558,6 @@ entities: - type: Transform pos: -21.760761,31.400925 parent: 12 - - uid: 23721 - components: - - type: Transform - pos: 33.493465,47.484264 - parent: 12 - proto: ClothingOuterSuitMonkey entities: - uid: 2751 @@ -72545,6 +73191,11 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,22.5 parent: 12 + - uid: 22307 + components: + - type: Transform + pos: 36.5,8.5 + parent: 12 - proto: ComputerCargoBounty entities: - uid: 8469 @@ -72850,10 +73501,11 @@ entities: parent: 12 - proto: ComputerRoboticsControl entities: - - uid: 2072 + - uid: 12138 components: - type: Transform - pos: -25.5,-27.5 + rot: 1.5707963267948966 rad + pos: -26.5,-30.5 parent: 12 - proto: ComputerSalvageExpedition entities: @@ -73507,6 +74159,102 @@ entities: rot: -1.5707963267948966 rad pos: 75.5,-37.5 parent: 12 + - uid: 11462 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 75.5,-38.5 + parent: 12 + - uid: 11497 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,16.5 + parent: 12 + - uid: 11498 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,14.5 + parent: 12 + - uid: 11499 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 36.5,14.5 + parent: 12 + - uid: 11507 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,14.5 + parent: 12 + - uid: 11518 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 51.5,14.5 + parent: 12 + - uid: 11519 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 50.5,14.5 + parent: 12 + - uid: 11528 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 49.5,14.5 + parent: 12 + - uid: 11529 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 48.5,14.5 + parent: 12 + - uid: 11531 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 47.5,14.5 + parent: 12 + - uid: 11532 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,14.5 + parent: 12 + - uid: 11533 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,14.5 + parent: 12 + - uid: 11534 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 44.5,14.5 + parent: 12 + - uid: 11958 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 43.5,14.5 + parent: 12 + - uid: 11959 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,16.5 + parent: 12 + - uid: 11960 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,15.5 + parent: 12 - uid: 11972 components: - type: Transform @@ -73533,514 +74281,106 @@ entities: pos: 35.5,15.5 parent: 12 - uid: 11977 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 35.5,14.5 - parent: 12 - - uid: 11978 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 36.5,14.5 - parent: 12 - - uid: 11979 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,14.5 - parent: 12 - - uid: 11980 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 38.5,14.5 - parent: 12 - - uid: 11981 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,14.5 - parent: 12 - - uid: 11982 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 33.5,14.5 - parent: 12 - - uid: 11983 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.5,14.5 - parent: 12 - - uid: 11985 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 37.5,8.5 - parent: 12 - - uid: 11986 components: - type: Transform rot: 3.141592653589793 rad - pos: 37.5,9.5 - parent: 12 - - uid: 11987 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,10.5 - parent: 12 - - uid: 11988 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 40.5,14.5 - parent: 12 - - uid: 11989 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 41.5,14.5 + pos: 52.5,14.5 parent: 12 - - uid: 11990 + - uid: 12030 components: - type: Transform rot: 1.5707963267948966 rad - pos: 42.5,14.5 + pos: 34.5,14.5 parent: 12 - - uid: 11991 + - uid: 12079 components: - type: Transform rot: 1.5707963267948966 rad - pos: 43.5,14.5 + pos: 52.5,17.5 parent: 12 - - uid: 11992 + - uid: 12081 components: - type: Transform rot: 1.5707963267948966 rad - pos: 44.5,14.5 + pos: 53.5,17.5 parent: 12 - - uid: 11993 + - uid: 12082 components: - type: Transform rot: 1.5707963267948966 rad - pos: 45.5,14.5 + pos: 54.5,17.5 parent: 12 - - uid: 11994 + - uid: 12083 components: - type: Transform rot: 1.5707963267948966 rad - pos: 46.5,14.5 + pos: 55.5,17.5 parent: 12 - - uid: 11995 + - uid: 12123 components: - type: Transform rot: 1.5707963267948966 rad - pos: 47.5,14.5 + pos: 35.5,14.5 parent: 12 - - uid: 11996 + - uid: 12290 components: - type: Transform rot: 1.5707963267948966 rad - pos: 48.5,14.5 + pos: 35.5,6.5 parent: 12 - - uid: 11997 + - uid: 12610 components: - type: Transform rot: 1.5707963267948966 rad - pos: 49.5,14.5 + pos: 56.5,40.5 parent: 12 - - uid: 11998 + - uid: 12611 components: - type: Transform rot: 1.5707963267948966 rad - pos: 50.5,14.5 + pos: 57.5,40.5 parent: 12 - - uid: 11999 + - uid: 12612 components: - type: Transform rot: 1.5707963267948966 rad - pos: 51.5,14.5 - parent: 12 - - uid: 12000 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,14.5 - parent: 12 - - uid: 12001 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,15.5 - parent: 12 - - uid: 12002 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,16.5 - parent: 12 - - uid: 12003 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.5,11.5 - parent: 12 - - uid: 12004 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.5,12.5 - parent: 12 - - uid: 12005 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.5,13.5 - parent: 12 - - uid: 12006 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.5,14.5 - parent: 12 - - uid: 12007 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,10.5 - parent: 12 - - uid: 12008 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 31.5,10.5 - parent: 12 - - uid: 12009 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,10.5 - parent: 12 - - uid: 12010 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 33.5,10.5 - parent: 12 - - uid: 12011 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 33.5,9.5 - parent: 12 - - uid: 12012 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,8.5 - parent: 12 - - uid: 12013 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,8.5 - parent: 12 - - uid: 12014 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 35.5,8.5 + pos: 58.5,40.5 parent: 12 - - uid: 12015 + - uid: 12613 components: - type: Transform rot: 1.5707963267948966 rad - pos: 35.5,7.5 + pos: 59.5,40.5 parent: 12 - - uid: 12016 + - uid: 12632 components: - type: Transform rot: 1.5707963267948966 rad - pos: 34.5,7.5 - parent: 12 - - uid: 12017 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 33.5,7.5 - parent: 12 - - uid: 12018 - components: - - type: Transform - rot: -1.5707963267948966 rad pos: 33.5,6.5 parent: 12 - - uid: 12019 + - uid: 12633 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 1.5707963267948966 rad pos: 34.5,6.5 parent: 12 - - uid: 12020 + - uid: 12642 components: - type: Transform rot: -1.5707963267948966 rad - pos: 35.5,6.5 - parent: 12 - - uid: 12021 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 38.5,10.5 - parent: 12 - - uid: 12022 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 39.5,10.5 - parent: 12 - - uid: 12023 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 40.5,10.5 - parent: 12 - - uid: 12024 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 41.5,10.5 - parent: 12 - - uid: 12025 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 42.5,10.5 - parent: 12 - - uid: 12026 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 43.5,10.5 - parent: 12 - - uid: 12027 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 44.5,10.5 - parent: 12 - - uid: 12028 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 45.5,10.5 - parent: 12 - - uid: 12029 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 46.5,10.5 - parent: 12 - - uid: 12030 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 47.5,10.5 + pos: 77.5,-38.5 parent: 12 - - uid: 12031 + - uid: 22295 components: - type: Transform rot: 1.5707963267948966 rad - pos: 48.5,10.5 - parent: 12 - - uid: 12032 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,10.5 - parent: 12 - - uid: 12033 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,11.5 - parent: 12 - - uid: 12034 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 49.5,12.5 - parent: 12 - - uid: 12035 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 48.5,12.5 - parent: 12 - - uid: 12036 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 47.5,12.5 - parent: 12 - - uid: 12037 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 46.5,12.5 - parent: 12 - - uid: 12038 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 45.5,12.5 - parent: 12 - - uid: 12039 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 44.5,12.5 - parent: 12 - - uid: 12040 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 43.5,12.5 - parent: 12 - - uid: 12041 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 42.5,12.5 - parent: 12 - - uid: 12042 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,12.5 - parent: 12 - - uid: 12043 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 40.5,12.5 - parent: 12 - - uid: 12044 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 39.5,12.5 + pos: 36.5,6.5 parent: 12 - - uid: 12045 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,12.5 - parent: 12 - - uid: 12046 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,12.5 - parent: 12 - - uid: 12047 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 36.5,12.5 - parent: 12 - - uid: 12048 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 35.5,12.5 - parent: 12 - - uid: 12049 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,12.5 - parent: 12 - - uid: 12050 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,12.5 - parent: 12 - - uid: 12051 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,12.5 - parent: 12 - - uid: 12052 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 31.5,12.5 - parent: 12 - - uid: 12053 + - uid: 22312 components: - type: Transform rot: 3.141592653589793 rad - pos: 31.5,13.5 - parent: 12 - - uid: 12054 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 31.5,14.5 - parent: 12 - - uid: 12079 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 52.5,17.5 - parent: 12 - - uid: 12081 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,17.5 - parent: 12 - - uid: 12082 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 54.5,17.5 - parent: 12 - - uid: 12083 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 55.5,17.5 - parent: 12 - - uid: 12610 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 56.5,40.5 - parent: 12 - - uid: 12611 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 57.5,40.5 - parent: 12 - - uid: 12612 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 58.5,40.5 - parent: 12 - - uid: 12613 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,40.5 + pos: 39.5,15.5 parent: 12 - proto: CrateAirlockKit entities: @@ -74746,11 +75086,6 @@ entities: - type: Transform pos: -21.553009,31.481783 parent: 12 - - uid: 23719 - components: - - type: Transform - pos: 33.38331,47.39865 - parent: 12 - proto: CryogenicSleepUnit entities: - uid: 21356 @@ -75166,6 +75501,11 @@ entities: parent: 12 - proto: DefaultStationBeaconEscapePod entities: + - uid: 509 + components: + - type: Transform + pos: -52.5,57.5 + parent: 12 - uid: 627 components: - type: Transform @@ -75181,11 +75521,6 @@ entities: - type: Transform pos: -16.5,-61.5 parent: 12 - - uid: 6281 - components: - - type: Transform - pos: 34.5,-42.5 - parent: 12 - uid: 7275 components: - type: Transform @@ -75201,11 +75536,6 @@ entities: - type: Transform pos: -22.5,65.5 parent: 12 - - uid: 29722 - components: - - type: Transform - pos: -53.5,61.5 - parent: 12 - proto: DefaultStationBeaconEvac entities: - uid: 7264 @@ -76018,6 +76348,28 @@ entities: rot: -1.5707963267948966 rad pos: 39.5,17.5 parent: 12 + - uid: 12006 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,12.5 + parent: 12 + - uid: 12007 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,12.5 + parent: 12 + - uid: 12008 + components: + - type: Transform + pos: 46.5,14.5 + parent: 12 + - uid: 12139 + components: + - type: Transform + pos: 41.5,19.5 + parent: 12 - uid: 12304 components: - type: Transform @@ -77202,6 +77554,12 @@ entities: rot: -1.5707963267948966 rad pos: -31.5,-42.5 parent: 12 + - uid: 789 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 39.5,19.5 + parent: 12 - uid: 886 components: - type: Transform @@ -77220,6 +77578,18 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-10.5 parent: 12 + - uid: 1084 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,12.5 + parent: 12 + - uid: 1086 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,19.5 + parent: 12 - uid: 1864 components: - type: Transform @@ -80011,6 +80381,26 @@ entities: rot: 1.5707963267948966 rad pos: 22.5,-17.5 parent: 12 + - uid: 11492 + components: + - type: Transform + pos: 41.5,18.5 + parent: 12 + - uid: 11493 + components: + - type: Transform + pos: 41.5,17.5 + parent: 12 + - uid: 11495 + components: + - type: Transform + pos: 41.5,15.5 + parent: 12 + - uid: 11496 + components: + - type: Transform + pos: 41.5,14.5 + parent: 12 - uid: 11961 components: - type: Transform @@ -80047,6 +80437,24 @@ entities: rot: 3.141592653589793 rad pos: 39.5,20.5 parent: 12 + - uid: 12002 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.5,12.5 + parent: 12 + - uid: 12003 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 46.5,13.5 + parent: 12 + - uid: 12099 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,12.5 + parent: 12 - uid: 12295 components: - type: Transform @@ -80101,6 +80509,17 @@ entities: rot: 1.5707963267948966 rad pos: 46.5,17.5 parent: 12 + - uid: 12391 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,14.5 + parent: 12 + - uid: 12635 + components: + - type: Transform + pos: 41.5,16.5 + parent: 12 - uid: 12660 components: - type: Transform @@ -80279,6 +80698,12 @@ entities: rot: 1.5707963267948966 rad pos: 33.5,23.5 parent: 12 + - uid: 13188 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,12.5 + parent: 12 - uid: 13597 components: - type: Transform @@ -82321,6 +82746,17 @@ entities: - type: Transform pos: -25.5,27.5 parent: 12 + - uid: 22275 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,19.5 + parent: 12 + - uid: 22308 + components: + - type: Transform + pos: 41.5,13.5 + parent: 12 - uid: 22418 components: - type: Transform @@ -84914,6 +85350,18 @@ entities: rot: -1.5707963267948966 rad pos: 47.5,17.5 parent: 12 + - uid: 12333 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 44.5,14.5 + parent: 12 + - uid: 12637 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,19.5 + parent: 12 - uid: 12702 components: - type: Transform @@ -85346,6 +85794,13 @@ entities: - type: Transform pos: -8.5,-24.5 parent: 12 + - uid: 11503 + components: + - type: MetaData + name: disposal unit to waste ejection + - type: Transform + pos: 37.5,19.5 + parent: 12 - uid: 12307 components: - type: Transform @@ -86158,6 +86613,13 @@ entities: - type: Transform pos: 77.61463,48.901142 parent: 12 +- proto: ElectricGuitarInstrument + entities: + - uid: 13481 + components: + - type: Transform + pos: -31.423407,7.5807095 + parent: 12 - proto: EmergencyFunnyOxygenTankFilled entities: - uid: 27129 @@ -87809,6 +88271,21 @@ entities: - type: Transform pos: -21.497362,-25.426727 parent: 12 + - uid: 12149 + components: + - type: Transform + pos: 80.2891,-38.43335 + parent: 12 + - uid: 12293 + components: + - type: Transform + pos: 80.56647,-38.438786 + parent: 12 + - uid: 12921 + components: + - type: Transform + pos: 80.773125,-38.438786 + parent: 12 - uid: 13505 components: - type: Transform @@ -87844,16 +88321,6 @@ entities: - type: Transform pos: 49.010647,46.51752 parent: 12 - - uid: 23711 - components: - - type: Transform - pos: 35.217464,45.578423 - parent: 12 - - uid: 23722 - components: - - type: Transform - pos: 33.741333,47.545418 - parent: 12 - proto: FirelockEdge entities: - uid: 2114 @@ -89264,6 +89731,15 @@ entities: rot: 3.141592653589793 rad pos: 36.5,23.5 parent: 12 + - uid: 12725 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,-45.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 25448 - uid: 13165 components: - type: Transform @@ -90911,6 +91387,7 @@ entities: deviceLists: - 23930 - 1699 + - 12032 - uid: 23934 components: - type: Transform @@ -90920,6 +91397,7 @@ entities: deviceLists: - 23930 - 1699 + - 12032 - uid: 23935 components: - type: Transform @@ -91276,23 +91754,41 @@ entities: - uid: 4313 components: - type: Transform - pos: 78.68511,-38.520813 + pos: 79.504265,-32.459354 parent: 12 + - type: HandheldLight + toggleActionEntity: 12036 + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + actions: !type:Container + showEnts: False + occludes: True + ents: + - 12036 + - type: ActionsContainer - uid: 12064 components: - type: Transform - pos: 78.33654,-38.539158 - parent: 12 - - uid: 23759 - components: - - type: Transform - pos: 71.5,42.5 - parent: 12 - - uid: 23760 - components: - - type: Transform - pos: 71.5,55.5 + pos: 78.500854,-32.475662 parent: 12 + - type: HandheldLight + toggleActionEntity: 12037 + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + actions: !type:Container + showEnts: False + occludes: True + ents: + - 12037 + - type: ActionsContainer - proto: FloorDrain entities: - uid: 2303 @@ -93457,6 +93953,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#FFA500FF' + - uid: 12047 + components: + - type: Transform + pos: 34.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 12671 components: - type: Transform @@ -94200,6 +94703,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 22316 + components: + - type: Transform + pos: 48.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 22552 components: - type: Transform @@ -94732,6 +95242,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 24645 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,11.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 25092 components: - type: Transform @@ -96610,6 +97128,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2072 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 43.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2110 components: - type: Transform @@ -102966,6 +103492,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 10693 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 10891 components: - type: Transform @@ -103470,6 +104004,22 @@ entities: parent: 12 - type: AtmosPipeColor color: '#FFA500FF' + - uid: 11426 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,11.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 11427 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.5,11.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 11863 components: - type: Transform @@ -103598,6 +104148,70 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 11979 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,9.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 12040 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,8.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 12041 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 47.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 12042 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 42.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 12046 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 44.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 12048 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 12051 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,14.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 12150 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,10.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 12276 components: - type: Transform @@ -112866,14 +113480,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 23122 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 36.5,12.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 23125 components: - type: Transform @@ -113667,6 +114273,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 23711 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,11.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 23884 components: - type: Transform @@ -114010,6 +114624,22 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 24643 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,11.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 24644 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 40.5,11.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 24804 components: - type: Transform @@ -114041,13 +114671,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 26070 - components: - - type: Transform - pos: 41.5,11.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 26201 components: - type: Transform @@ -115140,14 +115763,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 27736 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,12.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 27894 components: - type: Transform @@ -115228,22 +115843,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#FFA500FF' - - uid: 27914 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 40.5,12.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 27915 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,12.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 27916 components: - type: Transform @@ -115268,38 +115867,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 27919 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,12.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 27920 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 35.5,12.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 27921 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,12.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 28216 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 39.5,12.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 28217 components: - type: Transform @@ -116621,6 +117188,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 2309 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,13.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2637 components: - type: Transform @@ -117168,14 +117743,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 6154 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,12.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 6751 components: - type: Transform @@ -117716,6 +118283,30 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 12043 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,11.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 12044 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 41.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 12045 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,12.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 12265 components: - type: Transform @@ -119050,6 +119641,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 23720 + components: + - type: Transform + pos: 37.5,11.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 23948 components: - type: Transform @@ -119673,6 +120271,11 @@ entities: targetPressure: 4500 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 12050 + components: + - type: Transform + pos: -45.5,-21.5 + parent: 12 - uid: 13521 components: - type: Transform @@ -119835,13 +120438,6 @@ entities: bodyType: Dynamic - proto: GasValve entities: - - uid: 789 - components: - - type: Transform - pos: -45.5,-21.5 - parent: 12 - - type: GasValve - open: False - uid: 4780 components: - type: Transform @@ -120438,6 +121034,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 12049 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,11.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 12735 components: - type: Transform @@ -120491,14 +121095,6 @@ entities: - 2611 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 12884 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 32.5,14.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 12998 components: - type: Transform @@ -121107,6 +121703,14 @@ entities: - 22248 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 22310 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,7.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 22331 components: - type: Transform @@ -121331,6 +121935,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 24646 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,13.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 26312 components: - type: Transform @@ -121627,12 +122239,18 @@ entities: rot: 1.5707963267948966 rad pos: -52.5,-27.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 12032 - uid: 801 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,-23.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 12032 - uid: 993 components: - type: Transform @@ -123150,15 +123768,15 @@ entities: - type: Transform pos: 28.5,13.5 parent: 12 - - uid: 11532 + - uid: 11535 components: - type: Transform - pos: 47.5,11.5 + pos: 47.5,13.5 parent: 12 - - uid: 11535 + - uid: 11983 components: - type: Transform - pos: 47.5,13.5 + pos: 34.5,10.5 parent: 12 - uid: 12065 components: @@ -123183,6 +123801,12 @@ entities: - type: Transform pos: -3.5,16.5 parent: 12 + - uid: 22309 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,11.5 + parent: 12 - uid: 23438 components: - type: Transform @@ -123251,11 +123875,6 @@ entities: - type: Transform pos: -44.677162,44.579002 parent: 12 - - uid: 23712 - components: - - type: Transform - pos: 35.731533,45.223732 - parent: 12 - uid: 29613 components: - type: Transform @@ -123806,12 +124425,6 @@ entities: rot: 3.141592653589793 rad pos: -30.5,0.5 parent: 12 - - uid: 508 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,-26.5 - parent: 12 - uid: 520 components: - type: Transform @@ -124243,12 +124856,6 @@ entities: rot: 3.141592653589793 rad pos: -35.5,-45.5 parent: 12 - - uid: 1061 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -34.5,-45.5 - parent: 12 - uid: 1062 components: - type: Transform @@ -124261,6 +124868,12 @@ entities: rot: 3.141592653589793 rad pos: -30.5,-45.5 parent: 12 + - uid: 1065 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,56.5 + parent: 12 - uid: 1285 components: - type: Transform @@ -124337,6 +124950,11 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,-11.5 parent: 12 + - uid: 2048 + components: + - type: Transform + pos: 35.5,8.5 + parent: 12 - uid: 2090 components: - type: Transform @@ -125341,11 +125959,6 @@ entities: - type: Transform pos: 46.5,0.5 parent: 12 - - uid: 5038 - components: - - type: Transform - pos: 42.5,-2.5 - parent: 12 - uid: 5079 components: - type: Transform @@ -125465,11 +126078,6 @@ entities: rot: 3.141592653589793 rad pos: -53.5,65.5 parent: 12 - - uid: 5858 - components: - - type: Transform - pos: -54.5,61.5 - parent: 12 - uid: 5878 components: - type: Transform @@ -127339,11 +127947,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,22.5 parent: 12 - - uid: 11233 - components: - - type: Transform - pos: 44.5,-5.5 - parent: 12 - uid: 11242 components: - type: Transform @@ -127398,11 +128001,6 @@ entities: rot: -1.5707963267948966 rad pos: 25.5,27.5 parent: 12 - - uid: 11292 - components: - - type: Transform - pos: 45.5,-1.5 - parent: 12 - uid: 11301 components: - type: Transform @@ -127415,16 +128013,6 @@ entities: rot: 3.141592653589793 rad pos: 38.5,-2.5 parent: 12 - - uid: 11356 - components: - - type: Transform - pos: 42.5,5.5 - parent: 12 - - uid: 11359 - components: - - type: Transform - pos: 44.5,5.5 - parent: 12 - uid: 11360 components: - type: Transform @@ -127435,16 +128023,6 @@ entities: - type: Transform pos: 53.5,19.5 parent: 12 - - uid: 11428 - components: - - type: Transform - pos: 32.5,15.5 - parent: 12 - - uid: 11429 - components: - - type: Transform - pos: 33.5,15.5 - parent: 12 - uid: 11448 components: - type: Transform @@ -127462,16 +128040,6 @@ entities: - type: Transform pos: 51.5,11.5 parent: 12 - - uid: 11461 - components: - - type: Transform - pos: 51.5,13.5 - parent: 12 - - uid: 11462 - components: - - type: Transform - pos: 52.5,13.5 - parent: 12 - uid: 11468 components: - type: Transform @@ -127499,16 +128067,6 @@ entities: - type: Transform pos: 37.5,15.5 parent: 12 - - uid: 11511 - components: - - type: Transform - pos: 39.5,15.5 - parent: 12 - - uid: 11512 - components: - - type: Transform - pos: 40.5,15.5 - parent: 12 - uid: 11513 components: - type: Transform @@ -127524,36 +128082,11 @@ entities: - type: Transform pos: 49.5,15.5 parent: 12 - - uid: 11528 - components: - - type: Transform - pos: 46.5,11.5 - parent: 12 - - uid: 11529 - components: - - type: Transform - pos: 46.5,13.5 - parent: 12 - uid: 11530 components: - type: Transform pos: 44.5,13.5 parent: 12 - - uid: 11531 - components: - - type: Transform - pos: 43.5,13.5 - parent: 12 - - uid: 11533 - components: - - type: Transform - pos: 44.5,11.5 - parent: 12 - - uid: 11534 - components: - - type: Transform - pos: 43.5,11.5 - parent: 12 - uid: 11536 components: - type: Transform @@ -127920,6 +128453,17 @@ entities: - type: Transform pos: 59.5,38.5 parent: 12 + - uid: 11982 + components: + - type: Transform + pos: 33.5,13.5 + parent: 12 + - uid: 12055 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,-45.5 + parent: 12 - uid: 12231 components: - type: Transform @@ -130477,6 +131021,38 @@ entities: rot: 3.141592653589793 rad pos: -34.5,75.5 parent: 12 + - uid: 22276 + components: + - type: Transform + pos: 38.5,15.5 + parent: 12 + - uid: 22294 + components: + - type: Transform + pos: 35.5,7.5 + parent: 12 + - uid: 22302 + components: + - type: Transform + pos: 45.5,15.5 + parent: 12 + - uid: 22303 + components: + - type: Transform + pos: 46.5,15.5 + parent: 12 + - uid: 22323 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,61.5 + parent: 12 + - uid: 22325 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,58.5 + parent: 12 - uid: 22337 components: - type: Transform @@ -130529,11 +131105,22 @@ entities: rot: 3.141592653589793 rad pos: -30.5,75.5 parent: 12 + - uid: 23759 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -55.5,61.5 + parent: 12 - uid: 23887 components: - type: Transform pos: 49.5,9.5 parent: 12 + - uid: 24654 + components: + - type: Transform + pos: 30.5,11.5 + parent: 12 - uid: 24664 components: - type: Transform @@ -130573,16 +131160,6 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,51.5 parent: 12 - - uid: 25441 - components: - - type: Transform - pos: 45.5,0.5 - parent: 12 - - uid: 25443 - components: - - type: Transform - pos: -52.5,60.5 - parent: 12 - uid: 25447 components: - type: Transform @@ -131620,11 +132197,6 @@ entities: - type: Transform pos: -32.5,-45.5 parent: 12 - - uid: 27734 - components: - - type: Transform - pos: -33.5,-45.5 - parent: 12 - uid: 27843 components: - type: Transform @@ -131993,11 +132565,6 @@ entities: - type: Transform pos: 74.5,-6.5 parent: 12 - - uid: 29095 - components: - - type: Transform - pos: 42.5,1.5 - parent: 12 - uid: 29096 components: - type: Transform @@ -132016,33 +132583,11 @@ entities: rot: 3.141592653589793 rad pos: 42.5,2.5 parent: 12 - - uid: 29099 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 42.5,-5.5 - parent: 12 - - uid: 29104 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 42.5,-6.5 - parent: 12 - - uid: 29113 - components: - - type: Transform - pos: 44.5,1.5 - parent: 12 - uid: 29148 components: - type: Transform pos: 49.5,-1.5 parent: 12 - - uid: 29160 - components: - - type: Transform - pos: 44.5,-2.5 - parent: 12 - uid: 29210 components: - type: Transform @@ -132284,6 +132829,11 @@ entities: - type: Transform pos: 44.5,-16.5 parent: 12 + - uid: 12027 + components: + - type: Transform + pos: 46.5,13.5 + parent: 12 - uid: 12315 components: - type: Transform @@ -132773,6 +133323,18 @@ entities: - type: Transform pos: 66.5,45.5 parent: 12 + - uid: 12038 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 71.5,42.5 + parent: 12 + - uid: 12039 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 71.5,55.5 + parent: 12 - uid: 21359 components: - type: Transform @@ -132875,6 +133437,13 @@ entities: - type: Transform pos: 66.5,52.5 parent: 12 +- proto: HydroponicsTrayMachineCircuitboard + entities: + - uid: 12053 + components: + - type: Transform + pos: 35.258915,45.758537 + parent: 12 - proto: InflatableDoor entities: - uid: 28196 @@ -134351,6 +134920,11 @@ entities: parent: 12 - proto: LootSpawnerIndustrialFluff entities: + - uid: 2310 + components: + - type: Transform + pos: 34.5,6.5 + parent: 12 - uid: 2514 components: - type: Transform @@ -134396,11 +134970,6 @@ entities: - type: Transform pos: -12.5,68.5 parent: 12 - - uid: 25837 - components: - - type: Transform - pos: 35.5,12.5 - parent: 12 - uid: 27004 components: - type: Transform @@ -134418,11 +134987,6 @@ entities: - type: Transform pos: 39.5,-19.5 parent: 12 - - uid: 25839 - components: - - type: Transform - pos: 31.5,14.5 - parent: 12 - uid: 25951 components: - type: Transform @@ -134435,11 +134999,6 @@ entities: - type: Transform pos: -22.5,14.5 parent: 12 - - uid: 25840 - components: - - type: Transform - pos: 49.5,10.5 - parent: 12 - proto: LootSpawnerMedicalClassy entities: - uid: 26302 @@ -134484,11 +135043,6 @@ entities: - type: Transform pos: -23.5,50.5 parent: 12 - - uid: 25838 - components: - - type: Transform - pos: 33.5,8.5 - parent: 12 - uid: 25952 components: - type: Transform @@ -134565,17 +135119,17 @@ entities: parent: 12 - proto: MachineCentrifuge entities: - - uid: 2324 + - uid: 12069 components: - type: Transform - pos: -30.5,-43.5 + pos: -30.5,-44.5 parent: 12 - proto: MachineElectrolysisUnit entities: - - uid: 2322 + - uid: 26090 components: - type: Transform - pos: -31.5,-43.5 + pos: -31.5,-44.5 parent: 12 - proto: MachineFrame entities: @@ -134691,6 +135245,11 @@ entities: - type: Transform pos: 35.5,-11.5 parent: 12 + - uid: 11490 + components: + - type: Transform + pos: 37.5,21.5 + parent: 12 - uid: 19550 components: - type: Transform @@ -134793,11 +135352,31 @@ entities: - type: Transform pos: 42.5,58.5 parent: 12 + - uid: 24658 + components: + - type: Transform + pos: 33.5,14.5 + parent: 12 + - uid: 24659 + components: + - type: Transform + pos: 40.5,19.5 + parent: 12 + - uid: 24660 + components: + - type: Transform + pos: 39.5,10.5 + parent: 12 - uid: 24684 components: - type: Transform pos: 23.5,61.5 parent: 12 + - uid: 25058 + components: + - type: Transform + pos: 46.5,13.5 + parent: 12 - uid: 25809 components: - type: Transform @@ -134825,6 +135404,11 @@ entities: parent: 12 - proto: MaintenanceToolSpawner entities: + - uid: 689 + components: + - type: Transform + pos: 37.5,25.5 + parent: 12 - uid: 892 components: - type: Transform @@ -134880,6 +135464,11 @@ entities: - type: Transform pos: 2.5,64.5 parent: 12 + - uid: 24657 + components: + - type: Transform + pos: 30.5,14.5 + parent: 12 - uid: 24685 components: - type: Transform @@ -135144,7 +135733,7 @@ entities: - uid: 23435 components: - type: Transform - pos: 30.520699,45.458954 + pos: 30.665386,45.27058 parent: 12 - uid: 26224 components: @@ -135219,6 +135808,13 @@ entities: - type: Transform pos: 13.5,52.5 parent: 12 +- proto: MicrowaveMachineCircuitboard + entities: + - uid: 12035 + components: + - type: Transform + pos: 34.227154,45.685623 + parent: 12 - proto: Mirror entities: - uid: 60 @@ -135516,6 +136112,11 @@ entities: - type: Transform pos: -20.5,63.5 parent: 12 + - uid: 25839 + components: + - type: Transform + pos: 36.5,12.5 + parent: 12 - uid: 26386 components: - type: Transform @@ -135754,6 +136355,16 @@ entities: - type: Transform pos: -20.5,62.5 parent: 12 + - uid: 25840 + components: + - type: Transform + pos: 37.5,12.5 + parent: 12 + - uid: 26089 + components: + - type: Transform + pos: 30.5,16.5 + parent: 12 - uid: 26385 components: - type: Transform @@ -135809,8 +136420,16 @@ entities: - uid: 23717 components: - type: Transform - pos: 29.491083,45.55183 + pos: 30.165138,45.510162 parent: 12 + - type: GasTank + toggleActionEntity: 12128 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 12128 - proto: PackPaperRollingFilters entities: - uid: 506 @@ -136576,11 +137195,6 @@ entities: parent: 12 - proto: PlasticFlapsClear entities: - - uid: 514 - components: - - type: Transform - pos: -26.5,-26.5 - parent: 12 - uid: 7468 components: - type: Transform @@ -136591,25 +137205,15 @@ entities: - type: Transform pos: 47.5,-21.5 parent: 12 - - uid: 12056 - components: - - type: Transform - pos: 37.5,9.5 - parent: 12 - - uid: 12057 - components: - - type: Transform - pos: 33.5,9.5 - parent: 12 - - uid: 12058 + - uid: 11511 components: - type: Transform - pos: 35.5,16.5 + pos: 39.5,15.5 parent: 12 - - uid: 12059 + - uid: 22293 components: - type: Transform - pos: 40.5,14.5 + pos: 35.5,6.5 parent: 12 - proto: PlasticFlapsOpaque entities: @@ -136633,6 +137237,16 @@ entities: - type: Transform pos: 41.5,-15.5 parent: 12 + - uid: 12001 + components: + - type: Transform + pos: 34.5,14.5 + parent: 12 + - uid: 12141 + components: + - type: Transform + pos: 35.5,16.5 + parent: 12 - proto: Plunger entities: - uid: 22413 @@ -136745,6 +137359,11 @@ entities: - type: Transform pos: -35.5,-9.5 parent: 12 + - uid: 12025 + components: + - type: Transform + pos: 40.5,10.5 + parent: 12 - uid: 15859 components: - type: Transform @@ -136862,6 +137481,11 @@ entities: - type: Transform pos: 34.5,-30.5 parent: 12 + - uid: 12631 + components: + - type: Transform + pos: 33.5,47.5 + parent: 12 - uid: 16570 components: - type: Transform @@ -136877,11 +137501,6 @@ entities: - type: Transform pos: -24.5,20.5 parent: 12 - - uid: 23701 - components: - - type: Transform - pos: 31.5,47.5 - parent: 12 - uid: 23702 components: - type: Transform @@ -136904,12 +137523,6 @@ entities: parent: 12 - proto: PosterBroken entities: - - uid: 12227 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 45.5,11.5 - parent: 12 - uid: 12228 components: - type: Transform @@ -137847,11 +138460,6 @@ entities: - type: Transform pos: -26.5,-41.5 parent: 12 - - uid: 2478 - components: - - type: Transform - pos: -23.5,-41.5 - parent: 12 - uid: 2479 components: - type: Transform @@ -138739,6 +139347,48 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,-33.5 parent: 12 + - uid: 12016 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,18.5 + parent: 12 + - uid: 12148 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-45.5 + parent: 12 + - uid: 12151 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 68.5,55.5 + parent: 12 + - uid: 12152 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 74.5,42.5 + parent: 12 + - uid: 12154 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 74.5,55.5 + parent: 12 + - uid: 12227 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,6.5 + parent: 12 + - uid: 12243 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,29.5 + parent: 12 - uid: 12507 components: - type: Transform @@ -138788,12 +139438,6 @@ entities: - type: Transform pos: 42.5,31.5 parent: 12 - - uid: 12910 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,27.5 - parent: 12 - uid: 12914 components: - type: Transform @@ -139301,24 +139945,12 @@ entities: - type: Transform pos: 65.5,50.5 parent: 12 - - uid: 16852 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 69.5,42.5 - parent: 12 - uid: 16853 components: - type: Transform rot: 1.5707963267948966 rad pos: 66.5,43.5 parent: 12 - - uid: 16854 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 73.5,42.5 - parent: 12 - uid: 16855 components: - type: Transform @@ -139331,16 +139963,6 @@ entities: rot: -1.5707963267948966 rad pos: 77.5,51.5 parent: 12 - - uid: 16857 - components: - - type: Transform - pos: 73.5,55.5 - parent: 12 - - uid: 16858 - components: - - type: Transform - pos: 69.5,55.5 - parent: 12 - uid: 16859 components: - type: Transform @@ -139376,12 +139998,6 @@ entities: - type: Transform pos: 72.5,45.5 parent: 12 - - uid: 16865 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 66.5,54.5 - parent: 12 - uid: 16866 components: - type: Transform @@ -139843,6 +140459,12 @@ entities: rot: 3.141592653589793 rad pos: -38.5,-24.5 parent: 12 + - uid: 22329 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 68.5,42.5 + parent: 12 - uid: 22499 components: - type: Transform @@ -140448,62 +141070,26 @@ entities: - type: Transform pos: 54.5,-18.5 parent: 12 - - uid: 12069 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 37.5,6.5 - parent: 12 - - uid: 12070 - components: - - type: Transform - pos: 34.5,8.5 - parent: 12 - - uid: 12071 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 41.5,11.5 - parent: 12 - - uid: 12073 + - uid: 12005 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,17.5 + pos: 40.5,25.5 parent: 12 - uid: 12074 components: - type: Transform pos: 29.5,17.5 parent: 12 - - uid: 12075 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 30.5,13.5 - parent: 12 - - uid: 12076 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 44.5,20.5 - parent: 12 - - uid: 12077 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 45.5,16.5 - parent: 12 - uid: 12078 components: - type: Transform pos: 50.5,20.5 parent: 12 - - uid: 12921 + - uid: 12291 components: - type: Transform - rot: 3.141592653589793 rad - pos: 42.5,24.5 + rot: 1.5707963267948966 rad + pos: 37.5,16.5 parent: 12 - uid: 12922 components: @@ -140517,12 +141103,6 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,27.5 parent: 12 - - uid: 12924 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,22.5 - parent: 12 - uid: 12925 components: - type: Transform @@ -140772,6 +141352,12 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,54.5 parent: 12 + - uid: 22296 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,11.5 + parent: 12 - uid: 22709 components: - type: Transform @@ -140828,6 +141414,12 @@ entities: rot: 1.5707963267948966 rad pos: -52.5,47.5 parent: 12 + - uid: 25413 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.5,13.5 + parent: 12 - uid: 25586 components: - type: Transform @@ -141257,12 +141849,6 @@ entities: rot: 1.5707963267948966 rad pos: -32.5,64.5 parent: 12 - - uid: 16374 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-19.5 - parent: 12 - uid: 16451 components: - type: Transform @@ -141402,28 +141988,16 @@ entities: - type: Transform pos: 48.5,53.5 parent: 12 - - uid: 23704 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 35.5,45.5 - parent: 12 - uid: 23705 components: - type: Transform rot: 1.5707963267948966 rad pos: 35.5,46.5 parent: 12 - - uid: 23706 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 35.5,47.5 - parent: 12 - - uid: 23715 + - uid: 24656 components: - type: Transform - pos: 33.5,47.5 + pos: 30.5,14.5 parent: 12 - uid: 25008 components: @@ -141879,17 +142453,17 @@ entities: - type: Transform pos: -29.5,-9.5 parent: 12 - - uid: 12290 + - uid: 12017 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 35.5,8.5 + rot: 3.141592653589793 rad + pos: 52.5,13.5 parent: 12 - - uid: 12291 + - uid: 12294 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 35.5,7.5 + rot: -1.5707963267948966 rad + pos: 40.5,16.5 parent: 12 - uid: 19862 components: @@ -141897,6 +142471,12 @@ entities: rot: 3.141592653589793 rad pos: 7.5,2.5 parent: 12 + - uid: 22287 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,13.5 + parent: 12 - uid: 22594 components: - type: Transform @@ -142498,6 +143078,26 @@ entities: rot: 3.141592653589793 rad pos: -2.5,18.5 parent: 12 + - uid: 24665 + components: + - type: Transform + pos: 34.5,13.5 + parent: 12 + - uid: 25387 + components: + - type: Transform + pos: 34.5,9.5 + parent: 12 + - uid: 25394 + components: + - type: Transform + pos: 49.5,13.5 + parent: 12 + - uid: 25395 + components: + - type: Transform + pos: 36.5,19.5 + parent: 12 - uid: 25713 components: - type: Transform @@ -142540,6 +143140,11 @@ entities: - type: Transform pos: 9.5,-28.5 parent: 12 + - uid: 12628 + components: + - type: Transform + pos: 16.5,54.5 + parent: 12 - uid: 18633 components: - type: Transform @@ -142635,12 +143240,6 @@ entities: rot: 3.141592653589793 rad pos: 32.5,52.5 parent: 12 - - uid: 24300 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,53.5 - parent: 12 - uid: 24301 components: - type: Transform @@ -142836,11 +143435,21 @@ entities: - type: Transform pos: 31.5,10.5 parent: 12 + - uid: 5858 + components: + - type: Transform + pos: 36.5,14.5 + parent: 12 - uid: 6153 components: - type: Transform pos: 48.5,25.5 parent: 12 + - uid: 6154 + components: + - type: Transform + pos: 35.5,17.5 + parent: 12 - uid: 6156 components: - type: Transform @@ -142856,25 +143465,30 @@ entities: - type: Transform pos: 30.5,12.5 parent: 12 - - uid: 13969 + - uid: 13971 components: - type: Transform - pos: 36.5,14.5 + pos: 40.5,12.5 parent: 12 - - uid: 13970 + - uid: 21705 components: - type: Transform - pos: 45.5,10.5 + pos: 16.5,7.5 parent: 12 - - uid: 13971 + - uid: 23706 components: - type: Transform - pos: 40.5,12.5 + pos: -44.5,58.5 parent: 12 - - uid: 21705 + - uid: 23721 components: - type: Transform - pos: 16.5,7.5 + pos: -56.5,62.5 + parent: 12 + - uid: 23722 + components: + - type: Transform + pos: -52.5,60.5 parent: 12 - uid: 23982 components: @@ -143749,11 +144363,17 @@ entities: parent: 12 - proto: Recycler entities: - - uid: 28462 + - uid: 12076 components: - type: Transform rot: -1.5707963267948966 rad - pos: 39.5,14.5 + pos: 38.5,14.5 + parent: 12 + - uid: 26092 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 76.5,-38.5 parent: 12 - proto: ReinforcedPlasmaWindow entities: @@ -144155,10 +144775,11 @@ entities: rot: 3.141592653589793 rad pos: -30.5,0.5 parent: 12 - - uid: 509 + - uid: 510 components: - type: Transform - pos: -23.5,-26.5 + rot: -1.5707963267948966 rad + pos: -53.5,56.5 parent: 12 - uid: 519 components: @@ -144511,12 +145132,6 @@ entities: rot: 3.141592653589793 rad pos: -35.5,-45.5 parent: 12 - - uid: 1065 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -34.5,-45.5 - parent: 12 - uid: 1066 components: - type: Transform @@ -144632,11 +145247,6 @@ entities: rot: -1.5707963267948966 rad pos: -20.5,-62.5 parent: 12 - - uid: 2448 - components: - - type: Transform - pos: -52.5,60.5 - parent: 12 - uid: 2454 components: - type: Transform @@ -144937,11 +145547,6 @@ entities: - type: Transform pos: 20.5,-33.5 parent: 12 - - uid: 3892 - components: - - type: Transform - pos: 45.5,0.5 - parent: 12 - uid: 4110 components: - type: Transform @@ -146944,11 +147549,6 @@ entities: rot: 3.141592653589793 rad pos: 38.5,-2.5 parent: 12 - - uid: 11333 - components: - - type: Transform - pos: 44.5,-2.5 - parent: 12 - uid: 11336 components: - type: Transform @@ -146960,27 +147560,22 @@ entities: - type: Transform pos: 42.5,4.5 parent: 12 - - uid: 11363 - components: - - type: Transform - pos: 42.5,5.5 - parent: 12 - uid: 11365 components: - type: Transform pos: 44.5,4.5 parent: 12 - - uid: 11366 - components: - - type: Transform - pos: 44.5,5.5 - parent: 12 - uid: 11444 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-44.5 parent: 12 + - uid: 11516 + components: + - type: Transform + pos: 45.5,15.5 + parent: 12 - uid: 11584 components: - type: Transform @@ -147264,6 +147859,11 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,-46.5 parent: 12 + - uid: 12015 + components: + - type: Transform + pos: 46.5,15.5 + parent: 12 - uid: 12224 components: - type: Transform @@ -147601,6 +148201,12 @@ entities: - type: Transform pos: 64.5,59.5 parent: 12 + - uid: 12639 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,-45.5 + parent: 12 - uid: 13049 components: - type: Transform @@ -149000,11 +149606,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-7.5 parent: 12 - - uid: 22025 - components: - - type: Transform - pos: -54.5,61.5 - parent: 12 - uid: 22074 components: - type: Transform @@ -149055,6 +149656,22 @@ entities: - type: Transform pos: -10.5,-13.5 parent: 12 + - uid: 22314 + components: + - type: Transform + pos: 44.5,15.5 + parent: 12 + - uid: 22315 + components: + - type: Transform + pos: 43.5,15.5 + parent: 12 + - uid: 22326 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,58.5 + parent: 12 - uid: 22856 components: - type: Transform @@ -149073,10 +149690,17 @@ entities: rot: 3.141592653589793 rad pos: 13.5,22.5 parent: 12 - - uid: 23177 + - uid: 23710 components: - type: Transform - pos: 45.5,-1.5 + rot: -1.5707963267948966 rad + pos: -57.5,61.5 + parent: 12 + - uid: 23896 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -55.5,61.5 parent: 12 - uid: 24192 components: @@ -149202,11 +149826,6 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,-26.5 parent: 12 - - uid: 25833 - components: - - type: Transform - pos: 42.5,-2.5 - parent: 12 - uid: 25871 components: - type: Transform @@ -149634,11 +150253,6 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,-25.5 parent: 12 - - uid: 27735 - components: - - type: Transform - pos: -33.5,-45.5 - parent: 12 - uid: 27854 components: - type: Transform @@ -149896,17 +150510,6 @@ entities: rot: 3.141592653589793 rad pos: 50.5,-1.5 parent: 12 - - uid: 29094 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 44.5,-5.5 - parent: 12 - - uid: 29101 - components: - - type: Transform - pos: 42.5,1.5 - parent: 12 - uid: 29102 components: - type: Transform @@ -149919,18 +150522,6 @@ entities: rot: 3.141592653589793 rad pos: 44.5,-4.5 parent: 12 - - uid: 29105 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 42.5,-6.5 - parent: 12 - - uid: 29106 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 42.5,-5.5 - parent: 12 - uid: 29107 components: - type: Transform @@ -149943,11 +150534,6 @@ entities: rot: 3.141592653589793 rad pos: 42.5,-3.5 parent: 12 - - uid: 29109 - components: - - type: Transform - pos: 44.5,1.5 - parent: 12 - uid: 29114 components: - type: Transform @@ -150826,6 +151412,11 @@ entities: - type: Transform pos: 59.56368,-40.504784 parent: 12 + - uid: 12121 + components: + - type: Transform + pos: 81.46926,-38.476837 + parent: 12 - uid: 22201 components: - type: Transform @@ -150925,11 +151516,23 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-22.5 parent: 12 + - uid: 11491 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-26.5 + parent: 12 - uid: 14198 components: - type: Transform pos: 41.5,62.5 parent: 12 + - uid: 22278 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-26.5 + parent: 12 - uid: 29667 components: - type: Transform @@ -151653,18 +152256,6 @@ entities: - Pressed: Toggle 9718: - Pressed: Toggle - - uid: 11958 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 38.5,15.5 - parent: 12 - - type: DeviceLinkSource - linkedPorts: - 11960: - - Pressed: Toggle - 11959: - - Pressed: Toggle - uid: 13643 components: - type: Transform @@ -152714,10 +153305,11 @@ entities: parent: 12 - proto: SignRobo entities: - - uid: 2048 + - uid: 12638 components: - type: Transform - pos: -25.5,-26.5 + rot: 3.141592653589793 rad + pos: -23.5,-26.5 parent: 12 - proto: SignSalvage entities: @@ -152982,17 +153574,23 @@ entities: parent: 12 - proto: SmallLight entities: - - uid: 25412 + - uid: 13210 components: - type: Transform rot: -1.5707963267948966 rad - pos: -41.5,65.5 + pos: -52.5,57.5 parent: 12 - - uid: 25413 + - uid: 24254 components: - type: Transform - rot: 3.141592653589793 rad - pos: -52.5,61.5 + rot: 1.5707963267948966 rad + pos: -56.5,61.5 + parent: 12 + - uid: 25412 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -41.5,65.5 parent: 12 - uid: 27184 components: @@ -154379,15 +154977,6 @@ entities: parent: 12 - type: Stack count: 110 -- proto: SpaceCash1000 - entities: - - uid: 17437 - components: - - type: Transform - pos: -31.339855,7.33164 - parent: 12 - - type: Stack - count: 2000 - proto: SpaceVillainArcadeFilled entities: - uid: 12223 @@ -155854,6 +156443,12 @@ entities: parent: 12 - proto: Stool entities: + - uid: 1081 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.443993,16.6724 + parent: 12 - uid: 2240 components: - type: Transform @@ -155886,192 +156481,12 @@ entities: - type: Transform pos: 44.528526,-31.458952 parent: 12 - - uid: 12333 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 36.498535,7.7225566 - parent: 12 - - uid: 12628 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 54.5,36.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12629 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 54.5,35.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12630 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 54.5,34.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12631 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 54.5,33.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12632 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 54.5,38.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12633 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 54.5,39.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12634 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 54.5,40.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12635 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 54.5,41.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12636 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 52.5,41.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12637 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 52.5,40.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12638 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 52.5,39.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12639 + - uid: 11438 components: - type: Transform - anchored: True rot: 1.5707963267948966 rad pos: 52.5,38.5 parent: 12 - - type: Physics - bodyType: Static - - uid: 12640 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 52.5,35.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12641 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 52.5,36.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12642 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 52.5,34.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12643 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 52.5,33.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12644 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 50.5,35.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12645 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 50.5,36.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12646 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 50.5,38.5 - parent: 12 - - type: Physics - bodyType: Static - - uid: 12647 - components: - - type: Transform - anchored: True - rot: 1.5707963267948966 rad - pos: 50.5,39.5 - parent: 12 - - type: Physics - bodyType: Static - uid: 12652 components: - type: Transform @@ -156108,6 +156523,12 @@ entities: - type: Transform pos: 43.618725,30.520502 parent: 12 + - uid: 13970 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 50.5,38.5 + parent: 12 - uid: 14949 components: - type: Transform @@ -156132,6 +156553,12 @@ entities: rot: 3.141592653589793 rad pos: 9.5,31.5 parent: 12 + - uid: 16374 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,35.5 + parent: 12 - uid: 16513 components: - type: Transform @@ -156155,6 +156582,30 @@ entities: rot: 1.5707963267948966 rad pos: -14.507796,2.708015 parent: 12 + - uid: 16852 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,34.5 + parent: 12 + - uid: 16854 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,33.5 + parent: 12 + - uid: 16857 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,36.5 + parent: 12 + - uid: 16865 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,39.5 + parent: 12 - uid: 17114 components: - type: Transform @@ -156185,6 +156636,12 @@ entities: rot: 3.141592653589793 rad pos: 5.5,52.5 parent: 12 + - uid: 17437 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,40.5 + parent: 12 - uid: 21348 components: - type: Transform @@ -156232,6 +156689,66 @@ entities: rot: 3.141592653589793 rad pos: -31.5,55.5 parent: 12 + - uid: 22025 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 50.5,39.5 + parent: 12 + - uid: 22255 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,41.5 + parent: 12 + - uid: 22256 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,40.5 + parent: 12 + - uid: 22257 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,39.5 + parent: 12 + - uid: 22258 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,33.5 + parent: 12 + - uid: 22259 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,38.5 + parent: 12 + - uid: 22260 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,34.5 + parent: 12 + - uid: 22263 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 50.5,36.5 + parent: 12 + - uid: 22264 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 50.5,35.5 + parent: 12 + - uid: 22265 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,41.5 + parent: 12 - uid: 22601 components: - type: Transform @@ -156292,6 +156809,29 @@ entities: rot: 3.141592653589793 rad pos: 8.585284,67.665504 parent: 12 + - uid: 26069 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,7.5 + parent: 12 + - uid: 26070 + components: + - type: Transform + pos: 34.5,7.5 + parent: 12 + - uid: 26091 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,36.5 + parent: 12 + - uid: 26095 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,35.5 + parent: 12 - proto: StoolBar entities: - uid: 14997 @@ -157608,6 +158148,17 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Ship construction tool room + - uid: 25396 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,18.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Disposals - uid: 28426 components: - type: Transform @@ -158565,6 +159116,11 @@ entities: parent: 12 - proto: Table entities: + - uid: 508 + components: + - type: Transform + pos: 33.5,45.5 + parent: 12 - uid: 1196 components: - type: Transform @@ -158721,21 +159277,6 @@ entities: - type: Transform pos: -6.5,-52.5 parent: 12 - - uid: 2309 - components: - - type: Transform - pos: -32.5,-43.5 - parent: 12 - - uid: 2310 - components: - - type: Transform - pos: -31.5,-43.5 - parent: 12 - - uid: 2311 - components: - - type: Transform - pos: -30.5,-43.5 - parent: 12 - uid: 2472 components: - type: Transform @@ -159170,6 +159711,12 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,24.5 parent: 12 + - uid: 11437 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,-44.5 + parent: 12 - uid: 11524 components: - type: Transform @@ -159182,6 +159729,12 @@ entities: rot: -1.5707963267948966 rad pos: 39.5,7.5 parent: 12 + - uid: 12120 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -31.5,-44.5 + parent: 12 - uid: 12271 components: - type: Transform @@ -159192,6 +159745,17 @@ entities: - type: Transform pos: 46.5,18.5 parent: 12 + - uid: 12629 + components: + - type: Transform + pos: 34.5,45.5 + parent: 12 + - uid: 12643 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -30.5,-44.5 + parent: 12 - uid: 12717 components: - type: Transform @@ -159867,6 +160431,29 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,36.5 parent: 12 + - uid: 22269 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -27.5,-41.5 + parent: 12 + - uid: 22270 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-44.5 + parent: 12 + - uid: 22271 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -28.5,-41.5 + parent: 12 + - uid: 22274 + components: + - type: Transform + pos: 35.5,45.5 + parent: 12 - uid: 22364 components: - type: Transform @@ -160344,25 +160931,6 @@ entities: parent: 12 - proto: TableCounterMetal entities: - - uid: 1084 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -35.5,-44.5 - parent: 12 - - uid: 1086 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -27.5,-41.5 - parent: 12 - - type: Label - - uid: 1087 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -28.5,-41.5 - parent: 12 - uid: 1726 components: - type: Transform @@ -160858,6 +161426,12 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,65.5 parent: 12 + - uid: 12114 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,-45.5 + parent: 12 - uid: 13789 components: - type: Transform @@ -162010,7 +162584,7 @@ entities: - uid: 23708 components: - type: Transform - pos: 35.758244,47.302937 + pos: 33.80236,45.260162 parent: 12 - proto: ThermomachineHeaterMachineCircuitBoard entities: @@ -162022,7 +162596,7 @@ entities: - uid: 23707 components: - type: Transform - pos: 35.45225,47.645393 + pos: 33.333378,45.58308 parent: 12 - proto: Thruster entities: @@ -162246,6 +162820,11 @@ entities: - type: Transform pos: -7.5195446,10.430849 parent: 12 + - uid: 22272 + components: + - type: Transform + pos: 35.611034,46.54325 + parent: 12 - uid: 23672 components: - type: Transform @@ -162261,7 +162840,7 @@ entities: - uid: 8874 components: - type: Transform - pos: 79.6497,-38.50015 + pos: 79.54402,-38.46053 parent: 12 - uid: 9250 components: @@ -162283,11 +162862,6 @@ entities: - type: Transform pos: 17.45795,68.52991 parent: 12 - - uid: 23713 - components: - - type: Transform - pos: 35.611134,46.38351 - parent: 12 - uid: 23714 components: - type: Transform @@ -162337,6 +162911,11 @@ entities: - type: Transform pos: -22.5,-4.5 parent: 12 + - uid: 11488 + components: + - type: Transform + pos: 35.4026,46.314083 + parent: 12 - uid: 16474 components: - type: Transform @@ -163103,15 +163682,11 @@ entities: - Left: Forward - Middle: Off - Right: Forward - 11980: - - Left: Forward - - Right: Reverse - - Middle: Off - 11979: + 11959: - Left: Forward - Right: Reverse - Middle: Off - 11978: + 11960: - Left: Forward - Right: Reverse - Middle: Off @@ -163119,214 +163694,67 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - 11981: - - Left: Forward - - Right: Reverse - - Middle: Off - 11982: - - Left: Forward - - Right: Reverse - - Middle: Off - 11983: - - Left: Forward - - Right: Reverse - - Middle: Off - 28462: - - Left: Forward - - Right: Reverse - - Middle: Off - 11988: - - Left: Forward - - Right: Reverse - - Middle: Off - 11989: - - Left: Forward - - Right: Reverse - - Middle: Off - 11990: - - Left: Forward - - Right: Reverse - - Middle: Off - 11991: - - Left: Forward - - Right: Reverse - - Middle: Off - 11992: - - Left: Forward - - Right: Reverse - - Middle: Off - 11993: - - Left: Forward - - Right: Reverse - - Middle: Off - 11995: - - Left: Forward - - Right: Reverse - - Middle: Off - 11994: - - Left: Forward - - Right: Reverse - - Middle: Off - 11996: - - Left: Forward - - Right: Reverse - - Middle: Off - 11997: - - Left: Forward - - Right: Reverse - - Middle: Off - 11998: - - Left: Forward - - Right: Reverse - - Middle: Off - 11999: + 11518: - Left: Forward - Right: Reverse - Middle: Off - 12006: + 11519: - Left: Forward - Right: Reverse - Middle: Off - 12005: + 11531: - Left: Forward - Right: Reverse - Middle: Off - 12004: + 11529: - Left: Forward - Right: Reverse - Middle: Off - 12003: - - Left: Forward - - Right: Reverse - - Middle: Off - 12007: - - Left: Forward - - Right: Reverse - - Middle: Off - 12008: - - Left: Forward - - Right: Reverse - - Middle: Off - 12009: - - Left: Forward - - Right: Reverse - - Middle: Off - 12010: - - Left: Forward - - Right: Reverse - - Middle: Off - 12011: - - Left: Forward - - Right: Reverse - - Middle: Off - 12012: - - Left: Forward - - Right: Reverse - - Middle: Off - 12013: - - Left: Forward - - Right: Reverse - - Middle: Off - 12014: - - Left: Forward - - Right: Reverse - - Middle: Off - 12017: - - Left: Forward - - Right: Reverse - - Middle: Off - 12016: - - Left: Forward - - Right: Reverse - - Middle: Off - 12015: - - Left: Forward - - Right: Reverse - - Middle: Off - 12018: - - Left: Forward - - Right: Reverse - - Middle: Off - 12019: - - Left: Forward - - Right: Reverse - - Middle: Off - 12020: - - Left: Forward - - Right: Reverse - - Middle: Off - 12054: - - Left: Forward - - Right: Reverse - - Middle: Off - 12000: - - Left: Forward - - Right: Reverse - - Middle: Off - 12001: - - Left: Forward - - Right: Reverse - - Middle: Off - 12002: - - Left: Forward - - Right: Reverse - - Middle: Off - 2489: - - Left: Forward - - Middle: Off - - Right: Forward - - uid: 12055 - components: - - type: Transform - pos: 38.5,8.5 - parent: 12 - - type: DeviceLinkSource - linkedPorts: - 11985: + 11532: - Left: Forward - Right: Reverse - Middle: Off - 11986: + 11533: - Left: Forward - Right: Reverse - Middle: Off - 11987: + 11534: - Left: Forward - Right: Reverse - Middle: Off - 12021: + 11497: - Left: Forward - Right: Reverse - Middle: Off - 12022: + 11958: - Left: Forward - Right: Reverse - Middle: Off - 12023: + 22312: - Left: Forward - Right: Reverse - Middle: Off - 12024: + 11507: - Left: Forward - Right: Reverse - Middle: Off - 12025: + 12076: - Left: Forward - Right: Reverse - Middle: Off - 12026: + 11498: - Left: Forward - Right: Reverse - Middle: Off - 12027: + 11528: - Left: Forward - Right: Reverse - Middle: Off - 12028: + 11499: - Left: Forward - Right: Reverse - Middle: Off - 12029: + 12123: - Left: Forward - Right: Reverse - Middle: Off @@ -163334,145 +163762,114 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - 12031: - - Left: Forward - - Right: Reverse - - Middle: Off - 12032: - - Left: Forward - - Right: Reverse - - Middle: Off - 12033: - - Left: Forward - - Right: Reverse - - Middle: Off - 12034: - - Left: Forward - - Right: Reverse - - Middle: Off - 12035: - - Left: Forward - - Right: Reverse - - Middle: Off - 12036: - - Left: Forward - - Right: Reverse - - Middle: Off - 12037: - - Left: Forward - - Right: Reverse - - Middle: Off - 12038: - - Left: Forward - - Right: Reverse - - Middle: Off - 12039: - - Left: Forward - - Right: Reverse - - Middle: Off - 12040: - - Left: Forward - - Right: Reverse - - Middle: Off - 12041: - - Left: Forward - - Right: Reverse - - Middle: Off - 12042: - - Left: Forward - - Right: Reverse - - Middle: Off - 12043: - - Left: Forward - - Right: Reverse - - Middle: Off - 12044: - - Left: Forward - - Right: Reverse - - Middle: Off - 12045: - - Left: Forward - - Right: Reverse - - Middle: Off - 12046: + 2489: - Left: Forward - - Right: Reverse - Middle: Off - 12047: + - Right: Forward + - uid: 12085 + components: + - type: Transform + pos: 51.5,16.5 + parent: 12 + - type: DeviceLinkSource + linkedPorts: + 12083: - Left: Forward - Right: Reverse - Middle: Off - 12049: + 12082: - Left: Forward - Right: Reverse - Middle: Off - 12048: + 12081: - Left: Forward - Right: Reverse - Middle: Off - 12050: + 12079: - Left: Forward - Right: Reverse - Middle: Off - 12051: + - uid: 12127 + components: + - type: Transform + pos: 78.5,-38.5 + parent: 12 + - type: DeviceLinkSource + linkedPorts: + 12642: - Left: Forward - Right: Reverse - Middle: Off - 12052: + 26092: - Left: Forward - Right: Reverse - Middle: Off - 12053: + 11462: - Left: Forward - Right: Reverse - Middle: Off - - uid: 12085 + - uid: 12615 components: - type: Transform - pos: 51.5,16.5 + pos: 56.5,39.5 parent: 12 - type: DeviceLinkSource linkedPorts: - 12083: + 12614: + - Left: Open + - Right: Open + - Middle: Close + 12613: - Left: Forward - Right: Reverse - Middle: Off - 12082: + 12612: - Left: Forward - Right: Reverse - Middle: Off - 12081: + 12611: - Left: Forward - Right: Reverse - Middle: Off - 12079: + 12610: - Left: Forward - Right: Reverse - Middle: Off - - uid: 12615 + - uid: 12924 components: - type: Transform - pos: 56.5,39.5 + pos: -25.5,-28.5 parent: 12 - type: DeviceLinkSource linkedPorts: - 12614: + 11491: - Left: Open - Right: Open - Middle: Close - 12613: + 22278: + - Left: Open + - Right: Open + - Middle: Close + - uid: 13969 + components: + - type: Transform + pos: 33.5,7.5 + parent: 12 + - type: DeviceLinkSource + linkedPorts: + 12632: - Left: Forward - Right: Reverse - Middle: Off - 12612: + 12633: - Left: Forward - Right: Reverse - Middle: Off - 12611: + 12290: - Left: Forward - Right: Reverse - Middle: Off - 12610: + 22295: - Left: Forward - Right: Reverse - Middle: Off @@ -164128,10 +164525,10 @@ entities: parent: 12 - proto: VendingMachineTankDispenserEVA entities: - - uid: 8864 + - uid: 12059 components: - type: Transform - pos: 76.5,-30.5 + pos: 55.5,-31.5 parent: 12 - uid: 16412 components: @@ -164182,15 +164579,15 @@ entities: - type: Transform pos: 43.5,-38.5 parent: 12 - - uid: 23651 + - uid: 12630 components: - type: Transform - pos: 48.5,52.5 + pos: 35.5,47.5 parent: 12 - - uid: 23703 + - uid: 23651 components: - type: Transform - pos: 34.5,45.5 + pos: 48.5,52.5 parent: 12 - proto: VendingMachineViroDrobe entities: @@ -170207,15 +170604,21 @@ entities: - type: Transform pos: 27.5,20.5 parent: 12 - - uid: 11435 + - uid: 11428 components: - type: Transform - pos: 36.5,15.5 + rot: 1.5707963267948966 rad + pos: 36.5,19.5 parent: 12 - - uid: 11437 + - uid: 11429 components: - type: Transform - pos: 36.5,19.5 + pos: 42.5,1.5 + parent: 12 + - uid: 11435 + components: + - type: Transform + pos: 36.5,15.5 parent: 12 - uid: 11439 components: @@ -170623,6 +171026,41 @@ entities: - type: Transform pos: 59.5,37.5 parent: 12 + - uid: 12009 + components: + - type: Transform + pos: 42.5,14.5 + parent: 12 + - uid: 12056 + components: + - type: Transform + pos: 44.5,-2.5 + parent: 12 + - uid: 12058 + components: + - type: Transform + pos: 42.5,5.5 + parent: 12 + - uid: 12100 + components: + - type: Transform + pos: 43.5,13.5 + parent: 12 + - uid: 12110 + components: + - type: Transform + pos: 44.5,1.5 + parent: 12 + - uid: 12117 + components: + - type: Transform + pos: 42.5,-5.5 + parent: 12 + - uid: 12118 + components: + - type: Transform + pos: 42.5,-6.5 + parent: 12 - uid: 12392 components: - type: Transform @@ -170713,6 +171151,21 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,28.5 parent: 12 + - uid: 12641 + components: + - type: Transform + pos: 45.5,0.5 + parent: 12 + - uid: 12646 + components: + - type: Transform + pos: 45.5,-1.5 + parent: 12 + - uid: 12647 + components: + - type: Transform + pos: 42.5,-2.5 + parent: 12 - uid: 12724 components: - type: Transform @@ -170729,6 +171182,16 @@ entities: - type: Transform pos: 31.5,26.5 parent: 12 + - uid: 12868 + components: + - type: Transform + pos: 44.5,5.5 + parent: 12 + - uid: 12910 + components: + - type: Transform + pos: 44.5,-5.5 + parent: 12 - uid: 13197 components: - type: Transform @@ -173461,6 +173924,53 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,-5.5 parent: 12 + - uid: 22279 + components: + - type: Transform + pos: 29.5,-19.5 + parent: 12 + - uid: 22280 + components: + - type: Transform + pos: 29.5,-24.5 + parent: 12 + - uid: 22281 + components: + - type: Transform + pos: 32.5,-24.5 + parent: 12 + - uid: 22282 + components: + - type: Transform + pos: 36.5,-23.5 + parent: 12 + - uid: 22283 + components: + - type: Transform + pos: 36.5,-24.5 + parent: 12 + - uid: 22284 + components: + - type: Transform + pos: 35.5,-24.5 + parent: 12 + - uid: 22290 + components: + - type: Transform + pos: 42.5,13.5 + parent: 12 + - uid: 22324 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,59.5 + parent: 12 + - uid: 22327 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,55.5 + parent: 12 - uid: 22339 components: - type: Transform @@ -173496,6 +174006,48 @@ entities: rot: 3.141592653589793 rad pos: 14.5,22.5 parent: 12 + - uid: 23177 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,63.5 + parent: 12 + - uid: 23700 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -57.5,59.5 + parent: 12 + - uid: 23701 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -54.5,59.5 + parent: 12 + - uid: 23703 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -55.5,63.5 + parent: 12 + - uid: 23704 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -55.5,59.5 + parent: 12 + - uid: 23709 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -56.5,59.5 + parent: 12 + - uid: 23719 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -56.5,63.5 + parent: 12 - uid: 23773 components: - type: Transform @@ -175083,12 +175635,6 @@ entities: rot: -1.5707963267948966 rad pos: 31.5,18.5 parent: 12 - - uid: 11438 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,15.5 - parent: 12 - uid: 11441 components: - type: Transform @@ -175376,11 +175922,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-20.5 parent: 12 - - uid: 25396 - components: - - type: Transform - pos: -54.5,60.5 - parent: 12 - uid: 25403 components: - type: Transform @@ -175687,11 +176228,6 @@ entities: - type: Transform pos: -18.5,-23.5 parent: 12 - - uid: 510 - components: - - type: Transform - pos: -25.5,-26.5 - parent: 12 - uid: 511 components: - type: Transform @@ -176379,6 +176915,12 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-46.5 parent: 12 + - uid: 2478 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 42.5,10.5 + parent: 12 - uid: 2596 components: - type: Transform @@ -177073,21 +177615,6 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,-32.5 parent: 12 - - uid: 5554 - components: - - type: Transform - pos: 29.5,-19.5 - parent: 12 - - uid: 5555 - components: - - type: Transform - pos: 29.5,-24.5 - parent: 12 - - uid: 5556 - components: - - type: Transform - pos: 32.5,-24.5 - parent: 12 - uid: 5557 components: - type: Transform @@ -177098,21 +177625,6 @@ entities: - type: Transform pos: -22.5,-17.5 parent: 12 - - uid: 5559 - components: - - type: Transform - pos: 35.5,-24.5 - parent: 12 - - uid: 5560 - components: - - type: Transform - pos: 36.5,-24.5 - parent: 12 - - uid: 5561 - components: - - type: Transform - pos: 36.5,-23.5 - parent: 12 - uid: 5577 components: - type: Transform @@ -177897,6 +178409,11 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,26.5 parent: 12 + - uid: 8884 + components: + - type: Transform + pos: 35.5,10.5 + parent: 12 - uid: 9133 components: - type: Transform @@ -178176,12 +178693,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,18.5 parent: 12 - - uid: 10693 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 36.5,16.5 - parent: 12 - uid: 10694 components: - type: Transform @@ -178321,6 +178832,11 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,20.5 parent: 12 + - uid: 11363 + components: + - type: Transform + pos: 40.5,14.5 + parent: 12 - uid: 11390 components: - type: Transform @@ -178368,11 +178884,6 @@ entities: - type: Transform pos: 48.5,13.5 parent: 12 - - uid: 11467 - components: - - type: Transform - pos: 48.5,11.5 - parent: 12 - uid: 11475 components: - type: Transform @@ -178403,66 +178914,6 @@ entities: - type: Transform pos: 39.5,9.5 parent: 12 - - uid: 11487 - components: - - type: Transform - pos: 42.5,11.5 - parent: 12 - - uid: 11488 - components: - - type: Transform - pos: 42.5,13.5 - parent: 12 - - uid: 11490 - components: - - type: Transform - pos: 45.5,11.5 - parent: 12 - - uid: 11491 - components: - - type: Transform - pos: 40.5,11.5 - parent: 12 - - uid: 11492 - components: - - type: Transform - pos: 39.5,11.5 - parent: 12 - - uid: 11493 - components: - - type: Transform - pos: 38.5,11.5 - parent: 12 - - uid: 11495 - components: - - type: Transform - pos: 36.5,11.5 - parent: 12 - - uid: 11496 - components: - - type: Transform - pos: 35.5,11.5 - parent: 12 - - uid: 11497 - components: - - type: Transform - pos: 34.5,11.5 - parent: 12 - - uid: 11498 - components: - - type: Transform - pos: 33.5,11.5 - parent: 12 - - uid: 11499 - components: - - type: Transform - pos: 32.5,11.5 - parent: 12 - - uid: 11503 - components: - - type: Transform - pos: 33.5,13.5 - parent: 12 - uid: 11504 components: - type: Transform @@ -178478,11 +178929,6 @@ entities: - type: Transform pos: 36.5,13.5 parent: 12 - - uid: 11507 - components: - - type: Transform - pos: 37.5,13.5 - parent: 12 - uid: 11508 components: - type: Transform @@ -179135,6 +179581,17 @@ entities: - type: Transform pos: 41.5,33.5 parent: 12 + - uid: 12000 + components: + - type: Transform + pos: 40.5,15.5 + parent: 12 + - uid: 12054 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-26.5 + parent: 12 - uid: 12066 components: - type: Transform @@ -181596,11 +182053,6 @@ entities: - type: Transform pos: 51.5,9.5 parent: 12 - - uid: 25471 - components: - - type: Transform - pos: 46.5,15.5 - parent: 12 - uid: 25492 components: - type: Transform @@ -181738,11 +182190,6 @@ entities: rot: 3.141592653589793 rad pos: -43.5,61.5 parent: 12 - - uid: 26542 - components: - - type: Transform - pos: 45.5,15.5 - parent: 12 - uid: 26939 components: - type: Transform @@ -181910,12 +182357,6 @@ entities: - type: Transform pos: -48.5,66.5 parent: 12 - - uid: 11400 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,11.5 - parent: 12 - uid: 11520 components: - type: Transform @@ -181928,10 +182369,22 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,34.5 parent: 12 - - uid: 12868 + - uid: 11978 components: - type: Transform - pos: 32.5,13.5 + pos: 33.5,11.5 + parent: 12 + - uid: 12018 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 42.5,11.5 + parent: 12 + - uid: 12071 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,15.5 parent: 12 - uid: 12953 components: @@ -182194,12 +182647,33 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,64.5 parent: 12 + - uid: 22273 + components: + - type: Transform + pos: 32.5,11.5 + parent: 12 + - uid: 22285 + components: + - type: Transform + pos: 37.5,13.5 + parent: 12 + - uid: 22301 + components: + - type: Transform + pos: 36.5,16.5 + parent: 12 - uid: 23894 components: - type: Transform rot: -1.5707963267948966 rad pos: 41.5,63.5 parent: 12 + - uid: 24650 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,12.5 + parent: 12 - uid: 25591 components: - type: Transform @@ -182647,11 +183121,6 @@ entities: - type: Transform pos: 53.5,-10.5 parent: 12 - - uid: 12725 - components: - - type: Transform - pos: 49.5,32.5 - parent: 12 - uid: 16645 components: - type: Transform @@ -182677,6 +183146,11 @@ entities: - type: Transform pos: -6.5,58.5 parent: 12 + - uid: 22306 + components: + - type: Transform + pos: 49.5,32.5 + parent: 12 - uid: 24169 components: - type: Transform @@ -183053,15 +183527,15 @@ entities: - type: Transform pos: 43.5,47.5 parent: 12 - - uid: 12243 + - uid: 12026 components: - type: Transform - pos: 50.5,16.5 + pos: 46.5,10.5 parent: 12 - - uid: 12294 + - uid: 12070 components: - type: Transform - pos: 32.5,16.5 + pos: 33.5,17.5 parent: 12 - uid: 16463 components: @@ -183113,11 +183587,6 @@ entities: - type: Transform pos: 48.5,-32.5 parent: 12 - - uid: 25058 - components: - - type: Transform - pos: 52.5,11.5 - parent: 12 - uid: 26803 components: - type: Transform @@ -183443,6 +183912,11 @@ entities: rot: 3.141592653589793 rad pos: 52.5,-30.5 parent: 12 + - uid: 12126 + components: + - type: Transform + pos: -33.5,-45.5 + parent: 12 - uid: 12234 components: - type: Transform @@ -183617,6 +184091,12 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-43.5 parent: 12 + - uid: 22268 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,-45.5 + parent: 12 - proto: WindoorSecureCommandLocked entities: - uid: 6 @@ -184157,16 +184637,6 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,14.5 parent: 12 - - uid: 11426 - components: - - type: Transform - pos: 32.5,15.5 - parent: 12 - - uid: 11427 - components: - - type: Transform - pos: 33.5,15.5 - parent: 12 - uid: 11485 components: - type: Transform @@ -184182,26 +184652,6 @@ entities: - type: Transform pos: 37.5,15.5 parent: 12 - - uid: 11516 - components: - - type: Transform - pos: 39.5,15.5 - parent: 12 - - uid: 11517 - components: - - type: Transform - pos: 40.5,15.5 - parent: 12 - - uid: 11518 - components: - - type: Transform - pos: 43.5,15.5 - parent: 12 - - uid: 11519 - components: - - type: Transform - pos: 44.5,15.5 - parent: 12 - uid: 11538 components: - type: Transform @@ -184282,6 +184732,11 @@ entities: - type: Transform pos: 41.5,35.5 parent: 12 + - uid: 11997 + components: + - type: Transform + pos: 38.5,15.5 + parent: 12 - uid: 12524 components: - type: Transform @@ -184802,6 +185257,16 @@ entities: - type: Transform pos: 53.5,10.5 parent: 12 + - uid: 22292 + components: + - type: Transform + pos: 35.5,7.5 + parent: 12 + - uid: 22297 + components: + - type: Transform + pos: 35.5,8.5 + parent: 12 - uid: 22688 components: - type: Transform @@ -185516,18 +185981,6 @@ entities: - type: Transform pos: 46.5,-12.5 parent: 12 - - uid: 12292 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 31.5,12.5 - parent: 12 - - uid: 12293 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 31.5,13.5 - parent: 12 - uid: 12326 components: - type: Transform @@ -186124,18 +186577,6 @@ entities: - type: Transform pos: 44.512337,53.244392 parent: 12 - - uid: 23709 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 35.45002,45.578423 - parent: 12 - - uid: 23710 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 35.596897,45.394962 - parent: 12 - uid: 27207 components: - type: Transform From 2e1b486e8bb880dd14b563954fb638acf67fc4c8 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:39:48 +1000 Subject: [PATCH 087/223] Add BUI ctor tests (#31463) 5 lines of eaten iocmanager.injectdependencies led to this. --- .../Controls/ProgressTextureRect.cs | 7 ++- .../Tests/UserInterface/UiControlTest.cs | 58 +++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 Content.IntegrationTests/Tests/UserInterface/UiControlTest.cs diff --git a/Content.Client/UserInterface/Controls/ProgressTextureRect.cs b/Content.Client/UserInterface/Controls/ProgressTextureRect.cs index 2b8d93a5d47..8454ae0892b 100644 --- a/Content.Client/UserInterface/Controls/ProgressTextureRect.cs +++ b/Content.Client/UserInterface/Controls/ProgressTextureRect.cs @@ -9,7 +9,12 @@ public sealed class ProgressTextureRect : TextureRect { public float Progress; - private readonly ProgressColorSystem _progressColor = IoCManager.Resolve().System(); + private readonly ProgressColorSystem _progressColor; + + public ProgressTextureRect() + { + _progressColor = IoCManager.Resolve().System(); + } protected override void Draw(DrawingHandleScreen handle) { diff --git a/Content.IntegrationTests/Tests/UserInterface/UiControlTest.cs b/Content.IntegrationTests/Tests/UserInterface/UiControlTest.cs new file mode 100644 index 00000000000..c8378bb6612 --- /dev/null +++ b/Content.IntegrationTests/Tests/UserInterface/UiControlTest.cs @@ -0,0 +1,58 @@ +using System.Linq; +using Content.Client.Chat.UI; +using Content.Client.LateJoin; +using Robust.Client.UserInterface.CustomControls; +using Robust.Shared.ContentPack; +using Robust.Shared.IoC; +using Robust.Shared.Reflection; + +namespace Content.IntegrationTests.Tests.UserInterface; + +[TestFixture] +public sealed class UiControlTest +{ + // You should not be adding to this. + private Type[] _ignored = new Type[] + { + typeof(EmotesMenu), + typeof(LateJoinGui), + }; + + /// + /// Tests that all windows can be instantiated successfully. + /// + [Test] + public async Task TestWindows() + { + var pair = await PoolManager.GetServerClient(new PoolSettings() + { + Connected = true, + }); + var activator = pair.Client.ResolveDependency(); + var refManager = pair.Client.ResolveDependency(); + var loader = pair.Client.ResolveDependency(); + + await pair.Client.WaitAssertion(() => + { + foreach (var type in refManager.GetAllChildren(typeof(BaseWindow))) + { + if (type.IsAbstract || _ignored.Contains(type)) + continue; + + if (!loader.IsContentType(type)) + continue; + + // If it has no empty ctor then skip it instead of figuring out what args it needs. + var ctor = type.GetConstructor(Type.EmptyTypes); + + if (ctor == null) + continue; + + // Don't inject because the control themselves have to do it. + activator.CreateInstance(type, oneOff: true, inject: false); + } + }); + + await pair.CleanReturnAsync(); + } +} From 83ec96745563e129020adc71942500ba911352ce Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:40:14 +1000 Subject: [PATCH 088/223] Predict EmitSoundOnUIOpen (#31464) * Predict EmitSoundOnUIOpen BUI prediction led to this moment. * unforky --- .../Sound/Components/EmitSoundOnUIOpenComponent.cs | 12 ------------ Content.Server/Sound/EmitSoundSystem.cs | 6 ------ .../Sound/Components/EmitSoundOnUIOpenComponent.cs | 11 +++++++++++ Content.Shared/Sound/SharedEmitSoundSystem.cs | 8 +++++++- 4 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 Content.Server/Sound/Components/EmitSoundOnUIOpenComponent.cs create mode 100644 Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs diff --git a/Content.Server/Sound/Components/EmitSoundOnUIOpenComponent.cs b/Content.Server/Sound/Components/EmitSoundOnUIOpenComponent.cs deleted file mode 100644 index 44e83b0e794..00000000000 --- a/Content.Server/Sound/Components/EmitSoundOnUIOpenComponent.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Content.Shared.Sound.Components; - -namespace Content.Server.Sound.Components -{ - /// - /// Simple sound emitter that emits sound on AfterActivatableUIOpenEvent - /// - [RegisterComponent] - public sealed partial class EmitSoundOnUIOpenComponent : BaseEmitSoundComponent - { - } -} diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs index fc10d951e76..9d7e8496c3c 100644 --- a/Content.Server/Sound/EmitSoundSystem.cs +++ b/Content.Server/Sound/EmitSoundSystem.cs @@ -39,15 +39,9 @@ public override void Initialize() base.Initialize(); SubscribeLocalEvent(HandleEmitSoundOnTrigger); - SubscribeLocalEvent(HandleEmitSoundOnUIOpen); SubscribeLocalEvent(HandleSpamEmitSoundMapInit); } - private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args) - { - TryEmitSound(uid, component, args.User, false); - } - private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent component, TriggerEvent args) { TryEmitSound(uid, component, args.User, false); diff --git a/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs new file mode 100644 index 00000000000..a979a6ec50e --- /dev/null +++ b/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Sound.Components; + +/// +/// Simple sound emitter that emits sound on AfterActivatableUIOpenEvent +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class EmitSoundOnUIOpenComponent : BaseEmitSoundComponent +{ +} diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs index efc18abaa06..8733edf485d 100644 --- a/Content.Shared/Sound/SharedEmitSoundSystem.cs +++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs @@ -1,6 +1,5 @@ using Content.Shared.Audio; using Content.Shared.Hands; -using Content.Shared.Hands.Components; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Maps; @@ -8,6 +7,7 @@ using Content.Shared.Popups; using Content.Shared.Sound.Components; using Content.Shared.Throwing; +using Content.Shared.UserInterface; using Content.Shared.Whitelist; using JetBrains.Annotations; using Robust.Shared.Audio; @@ -48,12 +48,18 @@ public override void Initialize() SubscribeLocalEvent(OnEmitSoundOnPickup); SubscribeLocalEvent(OnEmitSoundOnDrop); SubscribeLocalEvent(OnEmitSoundOnInteractUsing); + SubscribeLocalEvent(HandleEmitSoundOnUIOpen); SubscribeLocalEvent(OnEmitSoundOnCollide); SubscribeLocalEvent(OnMobState); } + private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args) + { + TryEmitSound(uid, component, args.User); + } + private void OnMobState(Entity entity, ref MobStateChangedEvent args) { // Disable this component rather than removing it because it can be brought back to life. From 569b08162cf0d08e439ebb78eb1b122862f93692 Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Mon, 26 Aug 2024 02:09:48 -0700 Subject: [PATCH 089/223] Bots now make sound when they speak (#31471) fixes 31454 --- Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 9ba0fdd8736..eae5114883c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -103,6 +103,7 @@ - Robotics - type: Speech speechVerb: Robotic + speechSounds: Pai #couldn't decide if this should be borg or pai sounds so I flipped a coin. - type: TypingIndicator proto: robot - type: ZombieImmune From 93829ec753aa4f21116e5f6693d0aa3d9820f8f8 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 26 Aug 2024 09:10:57 +0000 Subject: [PATCH 090/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 747f148443d..dae9b617ecc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: robertGN - changes: - - message: Syndicate communications consoles can no longer recall the emergency - shuttle. - type: Fix - id: 6714 - time: '2024-06-12T13:32:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28803 - author: deltanedas changes: - message: Fixed opening the PDA UI sometimes breaking. @@ -3866,3 +3858,10 @@ id: 7213 time: '2024-08-26T02:46:16.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30668 +- author: Moomoobeef + changes: + - message: Silicons like medbots, janibots, and honkbots now make sound when speaking. + type: Fix + id: 7214 + time: '2024-08-26T09:09:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31471 From 982a172ad65a88818ebdbf3e6528d7e1145c9a67 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Mon, 26 Aug 2024 15:02:57 +0300 Subject: [PATCH 091/223] Change the science radio channel color (#31319) * Change the science radio channel color * This one looks better --- Resources/Prototypes/radio_channels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index 1c69bbe7e66..9cb8bf4daad 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -39,7 +39,7 @@ name: chat-radio-science keycode: 'n' frequency: 1351 - color: "#b05efa" + color: "#cd7ccd" - type: radioChannel id: Security From 84caaec67400a196362c684ac2dff3d93b93b9b0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 26 Aug 2024 12:04:03 +0000 Subject: [PATCH 092/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index dae9b617ecc..c0db504d066 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed opening the PDA UI sometimes breaking. - type: Fix - id: 6715 - time: '2024-06-12T18:10:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28896 - author: notafet changes: - message: The singularity is now safe to operate up to PA level 3. @@ -3865,3 +3858,10 @@ id: 7214 time: '2024-08-26T09:09:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31471 +- author: Winkarst-cpu + changes: + - message: The color of the science radio channel was changed. + type: Tweak + id: 7215 + time: '2024-08-26T12:02:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31319 From 2d85b4e7e9d5d37f4ebd3c4ffd249dc6381efad6 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Mon, 26 Aug 2024 15:15:33 +0300 Subject: [PATCH 093/223] Move OnGhostAttempt to GhostSystem (#31445) * Move OnGhostAttempt to GhostSystem * Remove unused dependencies and sort them --- .../Bed/Cryostorage/CryostorageSystem.cs | 14 +- Content.Server/Body/Systems/BodySystem.cs | 6 +- Content.Server/Chat/SuicideSystem.cs | 12 +- .../Clothing/Systems/CursedMaskSystem.cs | 6 +- .../GameTicking/GameTicker.GamePreset.cs | 118 +---------------- Content.Server/Ghost/GhostCommand.cs | 3 +- Content.Server/Ghost/GhostSystem.cs | 121 +++++++++++++++++- .../Materials/MaterialReclaimerSystem.cs | 22 ++-- Content.Server/Mind/MindSystem.cs | 4 +- Content.Server/Morgue/CrematoriumSystem.cs | 8 +- 10 files changed, 156 insertions(+), 158 deletions(-) diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs index 1369fa20f11..dd89ba2f72e 100644 --- a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs +++ b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs @@ -1,17 +1,14 @@ -using System.Globalization; -using System.Linq; using Content.Server.Chat.Managers; +using Content.Server.Chat.Systems; using Content.Server.GameTicking; +using Content.Server.Ghost; using Content.Server.Hands.Systems; using Content.Server.Inventory; using Content.Server.Popups; -using Content.Server.Chat.Systems; using Content.Server.Station.Components; using Content.Server.Station.Systems; using Content.Server.StationRecords; using Content.Server.StationRecords.Systems; -using Content.Shared.StationRecords; -using Content.Shared.UserInterface; using Content.Shared.Access.Systems; using Content.Shared.Bed.Cryostorage; using Content.Shared.Chat; @@ -19,6 +16,8 @@ using Content.Shared.Database; using Content.Shared.Hands.Components; using Content.Shared.Mind.Components; +using Content.Shared.StationRecords; +using Content.Shared.UserInterface; using Robust.Server.Audio; using Robust.Server.Containers; using Robust.Server.GameObjects; @@ -27,6 +26,7 @@ using Robust.Shared.Enums; using Robust.Shared.Network; using Robust.Shared.Player; +using System.Globalization; namespace Content.Server.Bed.Cryostorage; @@ -40,7 +40,7 @@ public sealed class CryostorageSystem : SharedCryostorageSystem [Dependency] private readonly ChatSystem _chatSystem = default!; [Dependency] private readonly ClimbSystem _climb = default!; [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly GhostSystem _ghostSystem = default!; [Dependency] private readonly HandsSystem _hands = default!; [Dependency] private readonly ServerInventorySystem _inventory = default!; [Dependency] private readonly PopupSystem _popup = default!; @@ -210,7 +210,7 @@ public void HandleEnterCryostorage(Entity ent, Ne if (userId != null && Mind.TryGetMind(userId.Value, out var mind) && HasComp(mind.Value.Comp.CurrentEntity)) { - _gameTicker.OnGhostAttempt(mind.Value, false); + _ghostSystem.OnGhostAttempt(mind.Value, false); } } diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs index bd5edb0ea50..4279f3ed2b8 100644 --- a/Content.Server/Body/Systems/BodySystem.cs +++ b/Content.Server/Body/Systems/BodySystem.cs @@ -1,5 +1,5 @@ using Content.Server.Body.Components; -using Content.Server.GameTicking; +using Content.Server.Ghost; using Content.Server.Humanoid; using Content.Shared.Body.Components; using Content.Shared.Body.Part; @@ -17,7 +17,7 @@ namespace Content.Server.Body.Systems; public sealed class BodySystem : SharedBodySystem { - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private readonly GhostSystem _ghostSystem = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!; [Dependency] private readonly MobStateSystem _mobState = default!; @@ -43,7 +43,7 @@ private void OnRelayMoveInput(Entity ent, ref MoveInputEvent args if (_mobState.IsDead(ent) && _mindSystem.TryGetMind(ent, out var mindId, out var mind)) { mind.TimeOfDeath ??= _gameTiming.RealTime; - _ticker.OnGhostAttempt(mindId, canReturnGlobal: true, mind: mind); + _ghostSystem.OnGhostAttempt(mindId, canReturnGlobal: true, mind: mind); } } diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs index 884292b0fa7..69d87472fb2 100644 --- a/Content.Server/Chat/SuicideSystem.cs +++ b/Content.Server/Chat/SuicideSystem.cs @@ -1,18 +1,18 @@ -using Content.Server.GameTicking; +using Content.Server.Ghost; +using Content.Shared.Administration.Logs; +using Content.Shared.Chat; using Content.Shared.Damage; using Content.Shared.Database; using Content.Shared.Hands.Components; using Content.Shared.Interaction.Events; using Content.Shared.Item; using Content.Shared.Mind; +using Content.Shared.Mind.Components; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.Popups; using Content.Shared.Tag; using Robust.Shared.Player; -using Content.Shared.Administration.Logs; -using Content.Shared.Chat; -using Content.Shared.Mind.Components; namespace Content.Server.Chat; @@ -23,7 +23,7 @@ public sealed class SuicideSystem : EntitySystem [Dependency] private readonly TagSystem _tagSystem = default!; [Dependency] private readonly MobStateSystem _mobState = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly GhostSystem _ghostSystem = default!; [Dependency] private readonly SharedSuicideSystem _suicide = default!; public override void Initialize() @@ -82,7 +82,7 @@ private void OnSuicideGhost(Entity victim, ref SuicideGh if (_tagSystem.HasTag(victim, "CannotSuicide")) args.CanReturnToBody = true; - if (_gameTicker.OnGhostAttempt(victim.Comp.Mind.Value, args.CanReturnToBody, mind: mindComponent)) + if (_ghostSystem.OnGhostAttempt(victim.Comp.Mind.Value, args.CanReturnToBody, mind: mindComponent)) args.Handled = true; } diff --git a/Content.Server/Clothing/Systems/CursedMaskSystem.cs b/Content.Server/Clothing/Systems/CursedMaskSystem.cs index 2045ff5ccd6..825e85e2c60 100644 --- a/Content.Server/Clothing/Systems/CursedMaskSystem.cs +++ b/Content.Server/Clothing/Systems/CursedMaskSystem.cs @@ -1,5 +1,5 @@ using Content.Server.Administration.Logs; -using Content.Server.GameTicking; +using Content.Server.Ghost; using Content.Server.Mind; using Content.Server.NPC; using Content.Server.NPC.HTN; @@ -21,7 +21,7 @@ namespace Content.Server.Clothing.Systems; public sealed class CursedMaskSystem : SharedCursedMaskSystem { [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private readonly GhostSystem _ghostSystem = default!; [Dependency] private readonly HTNSystem _htn = default!; [Dependency] private readonly MindSystem _mind = default!; [Dependency] private readonly NPCSystem _npc = default!; @@ -39,7 +39,7 @@ protected override void TryTakeover(Entity ent, EntityUid w if (TryComp(wearer, out var actor) && actor.PlayerSession.GetMind() is { } mind) { var session = actor.PlayerSession; - if (!_ticker.OnGhostAttempt(mind, false)) + if (!_ghostSystem.OnGhostAttempt(mind, false)) return; ent.Comp.StolenMind = mind; diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs index 5a2b375dd68..5642e84f908 100644 --- a/Content.Server/GameTicking/GameTicker.GamePreset.cs +++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs @@ -1,27 +1,16 @@ -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Threading.Tasks; using Content.Server.GameTicking.Presets; using Content.Server.Maps; using Content.Shared.CCVar; -using Content.Shared.Damage; -using Content.Shared.Damage.Prototypes; -using Content.Shared.Database; -using Content.Shared.FixedPoint; -using Content.Shared.Ghost; -using Content.Shared.Mind; -using Content.Shared.Mobs; -using Content.Shared.Mobs.Components; -using Content.Shared.Mobs.Systems; using JetBrains.Annotations; using Robust.Shared.Player; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Threading.Tasks; namespace Content.Server.GameTicking { public sealed partial class GameTicker { - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - public const float PresetFailedCooldownIncrease = 30f; /// @@ -198,94 +187,6 @@ public void StartGamePresetRules() } } - public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaCommand = false, MindComponent? mind = null) - { - if (!Resolve(mindId, ref mind)) - return false; - - var playerEntity = mind.CurrentEntity; - - if (playerEntity != null && viaCommand) - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} is attempting to ghost via command"); - - var handleEv = new GhostAttemptHandleEvent(mind, canReturnGlobal); - RaiseLocalEvent(handleEv); - - // Something else has handled the ghost attempt for us! We return its result. - if (handleEv.Handled) - return handleEv.Result; - - if (mind.PreventGhosting) - { - if (mind.Session != null) // Logging is suppressed to prevent spam from ghost attempts caused by movement attempts - { - _chatManager.DispatchServerMessage(mind.Session, Loc.GetString("comp-mind-ghosting-prevented"), - true); - } - - return false; - } - - if (TryComp(playerEntity, out var comp) && !comp.CanGhostInteract) - return false; - - if (mind.VisitingEntity != default) - { - _mind.UnVisit(mindId, mind: mind); - } - - var position = Exists(playerEntity) - ? Transform(playerEntity.Value).Coordinates - : GetObserverSpawnPoint(); - - if (position == default) - return false; - - // Ok, so, this is the master place for the logic for if ghosting is "too cheaty" to allow returning. - // There's no reason at this time to move it to any other place, especially given that the 'side effects required' situations would also have to be moved. - // + If CharacterDeadPhysically applies, we're physically dead. Therefore, ghosting OK, and we can return (this is critical for gibbing) - // Note that we could theoretically be ICly dead and still physically alive and vice versa. - // (For example, a zombie could be dead ICly, but may retain memories and is definitely physically active) - // + If we're in a mob that is critical, and we're supposed to be able to return if possible, - // we're succumbing - the mob is killed. Therefore, character is dead. Ghosting OK. - // (If the mob survives, that's a bug. Ghosting is kept regardless.) - var canReturn = canReturnGlobal && _mind.IsCharacterDeadPhysically(mind); - - if (_configurationManager.GetCVar(CCVars.GhostKillCrit) && - canReturnGlobal && - TryComp(playerEntity, out MobStateComponent? mobState)) - { - if (_mobState.IsCritical(playerEntity.Value, mobState)) - { - canReturn = true; - - //todo: what if they dont breathe lol - //cry deeply - - FixedPoint2 dealtDamage = 200; - if (TryComp(playerEntity, out var damageable) - && TryComp(playerEntity, out var thresholds)) - { - var playerDeadThreshold = _mobThresholdSystem.GetThresholdForState(playerEntity.Value, MobState.Dead, thresholds); - dealtDamage = playerDeadThreshold - damageable.TotalDamage; - } - - DamageSpecifier damage = new(_prototypeManager.Index("Asphyxiation"), dealtDamage); - - _damageable.TryChangeDamage(playerEntity, damage, true); - } - } - - var ghost = _ghost.SpawnGhost((mindId, mind), position, canReturn); - if (ghost == null) - return false; - - if (playerEntity != null) - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}"); - - return true; - } - private void IncrementRoundNumber() { var playerIds = _playerGameStatuses.Keys.Select(player => player.UserId).ToArray(); @@ -304,17 +205,4 @@ private void IncrementRoundNumber() RoundId = task.GetAwaiter().GetResult(); } } - - public sealed class GhostAttemptHandleEvent : HandledEntityEventArgs - { - public MindComponent Mind { get; } - public bool CanReturnGlobal { get; } - public bool Result { get; set; } - - public GhostAttemptHandleEvent(MindComponent mind, bool canReturnGlobal) - { - Mind = mind; - CanReturnGlobal = canReturnGlobal; - } - } } diff --git a/Content.Server/Ghost/GhostCommand.cs b/Content.Server/Ghost/GhostCommand.cs index b553d64201a..a2f361d29db 100644 --- a/Content.Server/Ghost/GhostCommand.cs +++ b/Content.Server/Ghost/GhostCommand.cs @@ -1,4 +1,3 @@ -using Content.Server.GameTicking; using Content.Server.Popups; using Content.Shared.Administration; using Content.Shared.Mind; @@ -41,7 +40,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args) mind = _entities.GetComponent(mindId); } - if (!_entities.System().OnGhostAttempt(mindId, true, true, mind)) + if (!_entities.System().OnGhostAttempt(mindId, true, true, mind)) { shell.WriteLine(Loc.GetString("ghost-command-denied")); } diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index b68c279b3e5..b0452143297 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -1,17 +1,23 @@ -using System.Linq; -using System.Numerics; +using Content.Server.Administration.Logs; +using Content.Server.Chat.Managers; using Content.Server.GameTicking; using Content.Server.Ghost.Components; using Content.Server.Mind; using Content.Server.Roles.Jobs; using Content.Server.Warps; using Content.Shared.Actions; +using Content.Shared.CCVar; +using Content.Shared.Damage; +using Content.Shared.Damage.Prototypes; +using Content.Shared.Database; using Content.Shared.Examine; using Content.Shared.Eye; +using Content.Shared.FixedPoint; using Content.Shared.Follower; using Content.Shared.Ghost; using Content.Shared.Mind; using Content.Shared.Mind.Components; +using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.Movement.Events; @@ -19,11 +25,15 @@ using Content.Shared.Storage.Components; using Robust.Server.GameObjects; using Robust.Server.Player; +using Robust.Shared.Configuration; using Robust.Shared.Map; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Systems; using Robust.Shared.Player; +using Robust.Shared.Prototypes; using Robust.Shared.Timing; +using System.Linq; +using System.Numerics; namespace Content.Server.Ghost { @@ -44,6 +54,14 @@ public sealed class GhostSystem : SharedGhostSystem [Dependency] private readonly TransformSystem _transformSystem = default!; [Dependency] private readonly VisibilitySystem _visibilitySystem = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private readonly IChatManager _chatManager = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly DamageableSystem _damageable = default!; private EntityQuery _ghostQuery; private EntityQuery _physicsQuery; @@ -144,7 +162,7 @@ private void OnRelayMoveInput(EntityUid uid, GhostOnMoveComponent component, ref if (component.MustBeDead && (_mobState.IsAlive(uid) || _mobState.IsCritical(uid))) return; - _ticker.OnGhostAttempt(mindId, component.CanReturn, mind: mind); + OnGhostAttempt(mindId, component.CanReturn, mind: mind); } private void OnGhostStartup(EntityUid uid, GhostComponent component, ComponentStartup args) @@ -473,5 +491,102 @@ private bool IsValidSpawnPosition(EntityCoordinates? spawnPosition) Log.Debug($"Spawned ghost \"{ToPrettyString(ghost)}\" for {mind.Comp.CharacterName}."); return ghost; } + + public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaCommand = false, MindComponent? mind = null) + { + if (!Resolve(mindId, ref mind)) + return false; + + var playerEntity = mind.CurrentEntity; + + if (playerEntity != null && viaCommand) + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} is attempting to ghost via command"); + + var handleEv = new GhostAttemptHandleEvent(mind, canReturnGlobal); + RaiseLocalEvent(handleEv); + + // Something else has handled the ghost attempt for us! We return its result. + if (handleEv.Handled) + return handleEv.Result; + + if (mind.PreventGhosting) + { + if (mind.Session != null) // Logging is suppressed to prevent spam from ghost attempts caused by movement attempts + { + _chatManager.DispatchServerMessage(mind.Session, Loc.GetString("comp-mind-ghosting-prevented"), + true); + } + + return false; + } + + if (TryComp(playerEntity, out var comp) && !comp.CanGhostInteract) + return false; + + if (mind.VisitingEntity != default) + { + _mind.UnVisit(mindId, mind: mind); + } + + var position = Exists(playerEntity) + ? Transform(playerEntity.Value).Coordinates + : _gameTicker.GetObserverSpawnPoint(); + + if (position == default) + return false; + + // Ok, so, this is the master place for the logic for if ghosting is "too cheaty" to allow returning. + // There's no reason at this time to move it to any other place, especially given that the 'side effects required' situations would also have to be moved. + // + If CharacterDeadPhysically applies, we're physically dead. Therefore, ghosting OK, and we can return (this is critical for gibbing) + // Note that we could theoretically be ICly dead and still physically alive and vice versa. + // (For example, a zombie could be dead ICly, but may retain memories and is definitely physically active) + // + If we're in a mob that is critical, and we're supposed to be able to return if possible, + // we're succumbing - the mob is killed. Therefore, character is dead. Ghosting OK. + // (If the mob survives, that's a bug. Ghosting is kept regardless.) + var canReturn = canReturnGlobal && _mind.IsCharacterDeadPhysically(mind); + + if (_configurationManager.GetCVar(CCVars.GhostKillCrit) && + canReturnGlobal && + TryComp(playerEntity, out MobStateComponent? mobState)) + { + if (_mobState.IsCritical(playerEntity.Value, mobState)) + { + canReturn = true; + + //todo: what if they dont breathe lol + //cry deeply + + FixedPoint2 dealtDamage = 200; + + if (TryComp(playerEntity, out var damageable) + && TryComp(playerEntity, out var thresholds)) + { + var playerDeadThreshold = _mobThresholdSystem.GetThresholdForState(playerEntity.Value, MobState.Dead, thresholds); + dealtDamage = playerDeadThreshold - damageable.TotalDamage; + } + + DamageSpecifier damage = new(_prototypeManager.Index("Asphyxiation"), dealtDamage); + + _damageable.TryChangeDamage(playerEntity, damage, true); + } + } + + var ghost = SpawnGhost((mindId, mind), position, canReturn); + + if (ghost == null) + return false; + + if (playerEntity != null) + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}"); + + return true; + } + } + + public sealed class GhostAttemptHandleEvent(MindComponent mind, bool canReturnGlobal) : HandledEntityEventArgs + { + public MindComponent Mind { get; } = mind; + public bool CanReturnGlobal { get; } = canReturnGlobal; + public bool Result { get; set; } } } diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs index b02212844b0..f6abcad7bc2 100644 --- a/Content.Server/Materials/MaterialReclaimerSystem.cs +++ b/Content.Server/Materials/MaterialReclaimerSystem.cs @@ -1,31 +1,29 @@ -using Content.Server.Chemistry.Containers.EntitySystems; +using Content.Server.Administration.Logs; using Content.Server.Fluids.EntitySystems; -using Content.Server.GameTicking; +using Content.Server.Ghost; using Content.Server.Popups; -using Content.Server.Power.Components; +using Content.Server.Repairable; using Content.Server.Stack; using Content.Server.Wires; using Content.Shared.Body.Systems; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Database; +using Content.Shared.Destructible; +using Content.Shared.Emag.Components; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Materials; using Content.Shared.Mind; using Content.Shared.Nutrition.EntitySystems; +using Content.Shared.Power; using Robust.Server.GameObjects; using Robust.Shared.Player; +using Robust.Shared.Prototypes; using Robust.Shared.Utility; using System.Linq; -using Content.Server.Administration.Logs; -using Content.Server.Repairable; -using Content.Shared.Database; -using Content.Shared.Destructible; -using Content.Shared.Emag.Components; -using Content.Shared.Power; -using Robust.Shared.Prototypes; namespace Content.Server.Materials; @@ -34,7 +32,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem { [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private readonly GhostSystem _ghostSystem = default!; [Dependency] private readonly MaterialStorageSystem _materialStorage = default!; [Dependency] private readonly OpenableSystem _openable = default!; [Dependency] private readonly PopupSystem _popup = default!; @@ -99,7 +97,7 @@ private void OnSuicideByEnvironment(Entity entity, r if (TryComp(victim, out ActorComponent? actor) && _mind.TryGetMind(actor.PlayerSession, out var mindId, out var mind)) { - _ticker.OnGhostAttempt(mindId, false, mind: mind); + _ghostSystem.OnGhostAttempt(mindId, false, mind: mind); if (mind.OwnedEntity is { Valid: true } suicider) { _popup.PopupEntity(Loc.GetString("recycler-component-suicide-message"), suicider); diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs index 4271d76b445..c3e29cc3635 100644 --- a/Content.Server/Mind/MindSystem.cs +++ b/Content.Server/Mind/MindSystem.cs @@ -1,4 +1,3 @@ -using System.Diagnostics.CodeAnalysis; using Content.Server.Administration.Logs; using Content.Server.GameTicking; using Content.Server.Ghost; @@ -13,6 +12,7 @@ using Robust.Shared.Network; using Robust.Shared.Player; using Robust.Shared.Utility; +using System.Diagnostics.CodeAnalysis; namespace Content.Server.Mind; @@ -194,7 +194,7 @@ public override void TransferTo(EntityUid mindId, EntityUid? entity, bool ghostC component = EnsureComp(entity.Value); if (component.HasMind) - _gameTicker.OnGhostAttempt(component.Mind.Value, false); + _ghosts.OnGhostAttempt(component.Mind.Value, false); if (TryComp(entity.Value, out var actor)) { diff --git a/Content.Server/Morgue/CrematoriumSystem.cs b/Content.Server/Morgue/CrematoriumSystem.cs index f6859b610af..656457dc985 100644 --- a/Content.Server/Morgue/CrematoriumSystem.cs +++ b/Content.Server/Morgue/CrematoriumSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.GameTicking; +using Content.Server.Ghost; using Content.Server.Morgue.Components; using Content.Server.Storage.Components; using Content.Server.Storage.EntitySystems; @@ -13,8 +13,6 @@ using Content.Shared.Storage; using Content.Shared.Storage.Components; using Content.Shared.Verbs; -using Robust.Server.GameObjects; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; using Robust.Shared.Player; @@ -25,7 +23,7 @@ public sealed class CrematoriumSystem : EntitySystem { [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private readonly GhostSystem _ghostSystem = default!; [Dependency] private readonly EntityStorageSystem _entityStorage = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly StandingStateSystem _standing = default!; @@ -154,7 +152,7 @@ private void OnSuicideByEnvironment(EntityUid uid, CrematoriumComponent componen var victim = args.Victim; if (TryComp(victim, out ActorComponent? actor) && _minds.TryGetMind(victim, out var mindId, out var mind)) { - _ticker.OnGhostAttempt(mindId, false, mind: mind); + _ghostSystem.OnGhostAttempt(mindId, false, mind: mind); if (mind.OwnedEntity is { Valid: true } entity) { From 082deb9405ef9bb9c6d1a3df72c51a88fc843fd8 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 26 Aug 2024 15:00:52 +0200 Subject: [PATCH 094/223] Fix energy sword visuals (#31478) --- Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index e364809b501..0b0719e77f8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -22,6 +22,7 @@ - type: ItemToggleHot - type: ItemToggleSize activatedSize: Huge + - type: ItemTogglePointLight - type: ItemToggleMeleeWeapon activatedSoundOnHit: path: /Audio/Weapons/eblade1.ogg From 6c66e8fe1fcbc33062e443a0b407a90e23b6c374 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 26 Aug 2024 13:01:59 +0000 Subject: [PATCH 095/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c0db504d066..9325649c182 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: notafet - changes: - - message: The singularity is now safe to operate up to PA level 3. - type: Fix - id: 6716 - time: '2024-06-12T22:56:07.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28906 - author: stalengd changes: - message: Players can now correctly toggle internals on pets. @@ -3865,3 +3858,10 @@ id: 7215 time: '2024-08-26T12:02:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31319 +- author: slarticodefast + changes: + - message: Fixed energy sword visuals. + type: Fix + id: 7216 + time: '2024-08-26T13:00:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31478 From c6d291968f71c5dcbbd37875c4bd0fffb38e0a4f Mon Sep 17 00:00:00 2001 From: Mervill Date: Mon, 26 Aug 2024 08:48:37 -0700 Subject: [PATCH 096/223] Replace obsolete code in shuttle systems. (#31408) * Format DockingSystem.Shuttle * arrivals system * docking system * shuttle console system * emergency shuttle system * shuttle system * thruster system * Fix compile error --------- Co-authored-by: Pieter-Jan Briers --- .../Shuttles/Systems/ArrivalsSystem.cs | 14 +- .../Shuttles/Systems/DockingSystem.Shuttle.cs | 567 +++++++++--------- .../Shuttles/Systems/DockingSystem.cs | 3 +- .../Systems/EmergencyShuttleSystem.Console.cs | 2 +- .../Systems/EmergencyShuttleSystem.cs | 15 +- .../Systems/ShuttleConsoleSystem.FTL.cs | 2 +- .../Shuttles/Systems/ShuttleConsoleSystem.cs | 6 +- .../Systems/ShuttleSystem.FasterThanLight.cs | 31 +- .../Systems/ShuttleSystem.GridFill.cs | 2 +- .../Shuttles/Systems/ShuttleSystem.Impact.cs | 4 +- .../Shuttles/Systems/ShuttleSystem.cs | 1 - .../Shuttles/Systems/ThrusterSystem.cs | 24 +- 12 files changed, 336 insertions(+), 335 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index 0cbbc46a4fd..40a2778b937 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -45,10 +45,10 @@ public sealed class ArrivalsSystem : EntitySystem [Dependency] private readonly IConfigurationManager _cfgManager = default!; [Dependency] private readonly IConsoleHost _console = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IPrototypeManager _protoManager = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IChatManager _chat = default!; + [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly BiomeSystem _biomes = default!; [Dependency] private readonly GameTicker _ticker = default!; [Dependency] private readonly MapLoaderSystem _loader = default!; @@ -496,9 +496,7 @@ private void OnRoundStarting(RoundStartingEvent ev) private void SetupArrivalsStation() { - var mapId = _mapManager.CreateMap(); - var mapUid = _mapManager.GetMapEntityId(mapId); - _mapManager.AddUninitializedMap(mapId); + var mapUid = _mapSystem.CreateMap(out var mapId, false); if (!_loader.TryLoad(mapId, _cfgManager.GetCVar(CCVars.ArrivalsMap), out var uids)) { @@ -524,7 +522,7 @@ private void SetupArrivalsStation() AddComp(mapUid, restricted); } - _mapManager.DoMapInitialize(mapId); + _mapSystem.InitializeMap(mapId); // Handle roundstart stations. var query = AllEntityQuery(); @@ -582,10 +580,10 @@ private void SetupShuttle(EntityUid uid, StationArrivalsComponent component) return; // Spawn arrivals on a dummy map then dock it to the source. - var dummyMap = _mapManager.CreateMap(); + var dummpMapEntity = _mapSystem.CreateMap(out var dummyMapId); if (TryGetArrivals(out var arrivals) && - _loader.TryLoad(dummyMap, component.ShuttlePath.ToString(), out var shuttleUids)) + _loader.TryLoad(dummyMapId, component.ShuttlePath.ToString(), out var shuttleUids)) { component.Shuttle = shuttleUids[0]; var shuttleComp = Comp(component.Shuttle); @@ -597,7 +595,7 @@ private void SetupShuttle(EntityUid uid, StationArrivalsComponent component) } // Don't start the arrivals shuttle immediately docked so power has a time to stabilise? - var timer = AddComp(_mapManager.GetMapEntityId(dummyMap)); + var timer = AddComp(dummpMapEntity); timer.Lifetime = 15f; } } diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs index 1a95ef9cb22..597d74dcc7a 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs @@ -18,143 +18,143 @@ public sealed partial class DockingSystem private const int DockRoundingDigits = 2; public Angle GetAngle(EntityUid uid, TransformComponent xform, EntityUid targetUid, TransformComponent targetXform, EntityQuery xformQuery) - { - var (shuttlePos, shuttleRot) = _transform.GetWorldPositionRotation(xform); - var (targetPos, targetRot) = _transform.GetWorldPositionRotation(targetXform); - - var shuttleCOM = Robust.Shared.Physics.Transform.Mul(new Transform(shuttlePos, shuttleRot), - _physicsQuery.GetComponent(uid).LocalCenter); - var targetCOM = Robust.Shared.Physics.Transform.Mul(new Transform(targetPos, targetRot), - _physicsQuery.GetComponent(targetUid).LocalCenter); - - var mapDiff = shuttleCOM - targetCOM; - var angle = mapDiff.ToWorldAngle(); - angle -= targetRot; - return angle; - } - - /// - /// Checks if 2 docks can be connected by moving the shuttle directly onto docks. - /// - private bool CanDock( - DockingComponent shuttleDock, - TransformComponent shuttleDockXform, - DockingComponent gridDock, - TransformComponent gridDockXform, - Box2 shuttleAABB, - Angle targetGridRotation, - FixturesComponent shuttleFixtures, - MapGridComponent grid, - bool isMap, - out Matrix3x2 matty, - out Box2 shuttleDockedAABB, - out Angle gridRotation) - { - shuttleDockedAABB = Box2.UnitCentered; - gridRotation = Angle.Zero; - matty = Matrix3x2.Identity; - - if (shuttleDock.Docked || - gridDock.Docked || - !shuttleDockXform.Anchored || - !gridDockXform.Anchored) - { - return false; - } - - // First, get the station dock's position relative to the shuttle, this is where we rotate it around - var stationDockPos = shuttleDockXform.LocalPosition + - shuttleDockXform.LocalRotation.RotateVec(new Vector2(0f, -1f)); - - // Need to invert the grid's angle. - var shuttleDockAngle = shuttleDockXform.LocalRotation; - var gridDockAngle = gridDockXform.LocalRotation.Opposite(); - var offsetAngle = gridDockAngle - shuttleDockAngle; - - var stationDockMatrix = Matrix3Helpers.CreateInverseTransform(stationDockPos, shuttleDockAngle); - var gridXformMatrix = Matrix3Helpers.CreateTransform(gridDockXform.LocalPosition, gridDockAngle); - matty = Matrix3x2.Multiply(stationDockMatrix, gridXformMatrix); - - if (!ValidSpawn(grid, matty, offsetAngle, shuttleFixtures, isMap)) - return false; - - shuttleDockedAABB = matty.TransformBox(shuttleAABB); - gridRotation = (targetGridRotation + offsetAngle).Reduced(); - return true; - } - - /// - /// Gets docking config between 2 specific docks. - /// - public DockingConfig? GetDockingConfig( - EntityUid shuttleUid, - EntityUid targetGrid, - EntityUid shuttleDockUid, - DockingComponent shuttleDock, - EntityUid gridDockUid, - DockingComponent gridDock) - { - var shuttleDocks = new List>(1) + { + var (shuttlePos, shuttleRot) = _transform.GetWorldPositionRotation(xform); + var (targetPos, targetRot) = _transform.GetWorldPositionRotation(targetXform); + + var shuttleCOM = Robust.Shared.Physics.Transform.Mul(new Transform(shuttlePos, shuttleRot), + _physicsQuery.GetComponent(uid).LocalCenter); + var targetCOM = Robust.Shared.Physics.Transform.Mul(new Transform(targetPos, targetRot), + _physicsQuery.GetComponent(targetUid).LocalCenter); + + var mapDiff = shuttleCOM - targetCOM; + var angle = mapDiff.ToWorldAngle(); + angle -= targetRot; + return angle; + } + + /// + /// Checks if 2 docks can be connected by moving the shuttle directly onto docks. + /// + private bool CanDock( + DockingComponent shuttleDock, + TransformComponent shuttleDockXform, + DockingComponent gridDock, + TransformComponent gridDockXform, + Box2 shuttleAABB, + Angle targetGridRotation, + FixturesComponent shuttleFixtures, + Entity gridEntity, + bool isMap, + out Matrix3x2 matty, + out Box2 shuttleDockedAABB, + out Angle gridRotation) + { + shuttleDockedAABB = Box2.UnitCentered; + gridRotation = Angle.Zero; + matty = Matrix3x2.Identity; + + if (shuttleDock.Docked || + gridDock.Docked || + !shuttleDockXform.Anchored || + !gridDockXform.Anchored) + { + return false; + } + + // First, get the station dock's position relative to the shuttle, this is where we rotate it around + var stationDockPos = shuttleDockXform.LocalPosition + + shuttleDockXform.LocalRotation.RotateVec(new Vector2(0f, -1f)); + + // Need to invert the grid's angle. + var shuttleDockAngle = shuttleDockXform.LocalRotation; + var gridDockAngle = gridDockXform.LocalRotation.Opposite(); + var offsetAngle = gridDockAngle - shuttleDockAngle; + + var stationDockMatrix = Matrix3Helpers.CreateInverseTransform(stationDockPos, shuttleDockAngle); + var gridXformMatrix = Matrix3Helpers.CreateTransform(gridDockXform.LocalPosition, gridDockAngle); + matty = Matrix3x2.Multiply(stationDockMatrix, gridXformMatrix); + + if (!ValidSpawn(gridEntity, matty, offsetAngle, shuttleFixtures, isMap)) + return false; + + shuttleDockedAABB = matty.TransformBox(shuttleAABB); + gridRotation = (targetGridRotation + offsetAngle).Reduced(); + return true; + } + + /// + /// Gets docking config between 2 specific docks. + /// + public DockingConfig? GetDockingConfig( + EntityUid shuttleUid, + EntityUid targetGrid, + EntityUid shuttleDockUid, + DockingComponent shuttleDock, + EntityUid gridDockUid, + DockingComponent gridDock) + { + var shuttleDocks = new List>(1) { (shuttleDockUid, shuttleDock) }; - var gridDocks = new List>(1) + var gridDocks = new List>(1) { (gridDockUid, gridDock) }; - return GetDockingConfigPrivate(shuttleUid, targetGrid, shuttleDocks, gridDocks); - } - - /// - /// Tries to get a valid docking configuration for the shuttle to the target grid. - /// - /// Priority docking tag to prefer, e.g. for emergency shuttle - public DockingConfig? GetDockingConfig(EntityUid shuttleUid, EntityUid targetGrid, string? priorityTag = null) - { - var gridDocks = GetDocks(targetGrid); - var shuttleDocks = GetDocks(shuttleUid); - - return GetDockingConfigPrivate(shuttleUid, targetGrid, shuttleDocks, gridDocks, priorityTag); - } - - /// - /// Tries to get a docking config at the specified coordinates and angle. - /// - public DockingConfig? GetDockingConfigAt(EntityUid shuttleUid, - EntityUid targetGrid, - EntityCoordinates coordinates, - Angle angle) - { - var gridDocks = GetDocks(targetGrid); - var shuttleDocks = GetDocks(shuttleUid); - - var configs = GetDockingConfigs(shuttleUid, targetGrid, shuttleDocks, gridDocks); - - foreach (var config in configs) - { - if (config.Coordinates.Equals(coordinates) && config.Angle.EqualsApprox(angle, 0.15)) - { - return config; - } - } - - return null; - } - - /// - /// Gets all docking configs between the 2 grids. - /// - private List GetDockingConfigs( - EntityUid shuttleUid, - EntityUid targetGrid, - List> shuttleDocks, - List> gridDocks) - { - var validDockConfigs = new List(); - - if (gridDocks.Count <= 0) + return GetDockingConfigPrivate(shuttleUid, targetGrid, shuttleDocks, gridDocks); + } + + /// + /// Tries to get a valid docking configuration for the shuttle to the target grid. + /// + /// Priority docking tag to prefer, e.g. for emergency shuttle + public DockingConfig? GetDockingConfig(EntityUid shuttleUid, EntityUid targetGrid, string? priorityTag = null) + { + var gridDocks = GetDocks(targetGrid); + var shuttleDocks = GetDocks(shuttleUid); + + return GetDockingConfigPrivate(shuttleUid, targetGrid, shuttleDocks, gridDocks, priorityTag); + } + + /// + /// Tries to get a docking config at the specified coordinates and angle. + /// + public DockingConfig? GetDockingConfigAt(EntityUid shuttleUid, + EntityUid targetGrid, + EntityCoordinates coordinates, + Angle angle) + { + var gridDocks = GetDocks(targetGrid); + var shuttleDocks = GetDocks(shuttleUid); + + var configs = GetDockingConfigs(shuttleUid, targetGrid, shuttleDocks, gridDocks); + + foreach (var config in configs) + { + if (config.Coordinates.Equals(coordinates) && config.Angle.EqualsApprox(angle, 0.15)) + { + return config; + } + } + + return null; + } + + /// + /// Gets all docking configs between the 2 grids. + /// + private List GetDockingConfigs( + EntityUid shuttleUid, + EntityUid targetGrid, + List> shuttleDocks, + List> gridDocks) + { + var validDockConfigs = new List(); + + if (gridDocks.Count <= 0) return validDockConfigs; var targetGridGrid = _gridQuery.GetComponent(targetGrid); @@ -168,117 +168,118 @@ private List GetDockingConfigs( var grids = new List>(); if (shuttleDocks.Count > 0) { - // We'll try all combinations of shuttle docks and see which one is most suitable - foreach (var (dockUid, shuttleDock) in shuttleDocks) - { - var shuttleDockXform = _xformQuery.GetComponent(dockUid); - - foreach (var (gridDockUid, gridDock) in gridDocks) - { - var gridXform = _xformQuery.GetComponent(gridDockUid); - - if (!CanDock( - shuttleDock, shuttleDockXform, - gridDock, gridXform, - shuttleAABB, - targetGridAngle, - shuttleFixturesComp, - targetGridGrid, - isMap, - out var matty, - out var dockedAABB, - out var targetAngle)) - { - continue; - } - - // Can't just use the AABB as we want to get bounds as tight as possible. - var gridPosition = new EntityCoordinates(targetGrid, Vector2.Transform(Vector2.Zero, matty)); - var spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, gridPosition.ToMapPos(EntityManager, _transform)); - - // TODO: use tight bounds - var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetAngle, spawnPosition.Position); - - // Check if there's no intersecting grids (AKA oh god it's docking at cargo). - grids.Clear(); - _mapManager.FindGridsIntersecting(targetGridXform.MapID, dockedBounds, ref grids, includeMap: false); - if (grids.Any(o => o.Owner != targetGrid && o.Owner != targetGridXform.MapUid)) - { - continue; - } - - // Alright well the spawn is valid now to check how many we can connect - // Get the matrix for each shuttle dock and test it against the grid docks to see - // if the connected position / direction matches. - - var dockedPorts = new List<(EntityUid DockAUid, EntityUid DockBUid, DockingComponent DockA, DockingComponent DockB)>() + // We'll try all combinations of shuttle docks and see which one is most suitable + foreach (var (dockUid, shuttleDock) in shuttleDocks) + { + var shuttleDockXform = _xformQuery.GetComponent(dockUid); + + foreach (var (gridDockUid, gridDock) in gridDocks) + { + var gridXform = _xformQuery.GetComponent(gridDockUid); + + if (!CanDock( + shuttleDock, shuttleDockXform, + gridDock, gridXform, + shuttleAABB, + targetGridAngle, + shuttleFixturesComp, + (targetGrid, targetGridGrid), + isMap, + out var matty, + out var dockedAABB, + out var targetAngle)) + { + continue; + } + + // Can't just use the AABB as we want to get bounds as tight as possible. + var gridPosition = new EntityCoordinates(targetGrid, Vector2.Transform(Vector2.Zero, matty)); + var spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, _transform.ToMapCoordinates(gridPosition).Position); + + // TODO: use tight bounds + var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetAngle, spawnPosition.Position); + + // Check if there's no intersecting grids (AKA oh god it's docking at cargo). + grids.Clear(); + _mapManager.FindGridsIntersecting(targetGridXform.MapID, dockedBounds, ref grids, includeMap: false); + if (grids.Any(o => o.Owner != targetGrid && o.Owner != targetGridXform.MapUid)) + { + continue; + } + + // Alright well the spawn is valid now to check how many we can connect + // Get the matrix for each shuttle dock and test it against the grid docks to see + // if the connected position / direction matches. + + var dockedPorts = new List<(EntityUid DockAUid, EntityUid DockBUid, DockingComponent DockA, DockingComponent DockB)>() { (dockUid, gridDockUid, shuttleDock, gridDock), }; - dockedAABB = dockedAABB.Rounded(DockRoundingDigits); - - foreach (var (otherUid, other) in shuttleDocks) - { - if (other == shuttleDock) - continue; - - foreach (var (otherGridUid, otherGrid) in gridDocks) - { - if (otherGrid == gridDock) - continue; - - if (!CanDock( - other, - _xformQuery.GetComponent(otherUid), - otherGrid, - _xformQuery.GetComponent(otherGridUid), - shuttleAABB, - targetGridAngle, - shuttleFixturesComp, targetGridGrid, - isMap, - out _, - out var otherdockedAABB, - out var otherTargetAngle)) - { - continue; - } - - otherdockedAABB = otherdockedAABB.Rounded(DockRoundingDigits); - - // Different setup. - if (!targetAngle.Equals(otherTargetAngle) || - !dockedAABB.Equals(otherdockedAABB)) - { - continue; - } - - dockedPorts.Add((otherUid, otherGridUid, other, otherGrid)); - } - } - - validDockConfigs.Add(new DockingConfig() - { - Docks = dockedPorts, - Coordinates = gridPosition, - Area = dockedAABB, - Angle = targetAngle, - }); - } - } + dockedAABB = dockedAABB.Rounded(DockRoundingDigits); + + foreach (var (otherUid, other) in shuttleDocks) + { + if (other == shuttleDock) + continue; + + foreach (var (otherGridUid, otherGrid) in gridDocks) + { + if (otherGrid == gridDock) + continue; + + if (!CanDock( + other, + _xformQuery.GetComponent(otherUid), + otherGrid, + _xformQuery.GetComponent(otherGridUid), + shuttleAABB, + targetGridAngle, + shuttleFixturesComp, + (targetGrid, targetGridGrid), + isMap, + out _, + out var otherdockedAABB, + out var otherTargetAngle)) + { + continue; + } + + otherdockedAABB = otherdockedAABB.Rounded(DockRoundingDigits); + + // Different setup. + if (!targetAngle.Equals(otherTargetAngle) || + !dockedAABB.Equals(otherdockedAABB)) + { + continue; + } + + dockedPorts.Add((otherUid, otherGridUid, other, otherGrid)); + } + } + + validDockConfigs.Add(new DockingConfig() + { + Docks = dockedPorts, + Coordinates = gridPosition, + Area = dockedAABB, + Angle = targetAngle, + }); + } + } } return validDockConfigs; - } + } - private DockingConfig? GetDockingConfigPrivate( - EntityUid shuttleUid, - EntityUid targetGrid, - List> shuttleDocks, - List> gridDocks, - string? priorityTag = null) - { - var validDockConfigs = GetDockingConfigs(shuttleUid, targetGrid, shuttleDocks, gridDocks); + private DockingConfig? GetDockingConfigPrivate( + EntityUid shuttleUid, + EntityUid targetGrid, + List> shuttleDocks, + List> gridDocks, + string? priorityTag = null) + { + var validDockConfigs = GetDockingConfigs(shuttleUid, targetGrid, shuttleDocks, gridDocks); if (validDockConfigs.Count <= 0) return null; @@ -300,56 +301,56 @@ private List GetDockingConfigs( return location; } - /// - /// Checks whether the shuttle can warp to the specified position. - /// - private bool ValidSpawn(MapGridComponent grid, Matrix3x2 matty, Angle angle, FixturesComponent shuttleFixturesComp, bool isMap) - { - var transform = new Transform(Vector2.Transform(Vector2.Zero, matty), angle); + /// + /// Checks whether the shuttle can warp to the specified position. + /// + private bool ValidSpawn(Entity gridEntity, Matrix3x2 matty, Angle angle, FixturesComponent shuttleFixturesComp, bool isMap) + { + var transform = new Transform(Vector2.Transform(Vector2.Zero, matty), angle); - // Because some docking bounds are tight af need to check each chunk individually - foreach (var fix in shuttleFixturesComp.Fixtures.Values) - { - var polyShape = (PolygonShape) fix.Shape; - var aabb = polyShape.ComputeAABB(transform, 0); - aabb = aabb.Enlarged(-0.01f); - - // If it's a map check no hard collidable anchored entities overlap - if (isMap) - { - foreach (var tile in grid.GetLocalTilesIntersecting(aabb)) - { - var anchoredEnumerator = grid.GetAnchoredEntitiesEnumerator(tile.GridIndices); - - while (anchoredEnumerator.MoveNext(out var anc)) - { - if (!_physicsQuery.TryGetComponent(anc, out var physics) || - !physics.CanCollide || - !physics.Hard) - { - continue; - } - - return false; - } - } - } - // If it's not a map check it doesn't overlap the grid. - else - { - if (grid.GetLocalTilesIntersecting(aabb).Any()) - return false; - } - } - - return true; - } - - public List> GetDocks(EntityUid uid) - { - _dockingSet.Clear(); - _lookup.GetChildEntities(uid, _dockingSet); - - return _dockingSet.ToList(); - } + // Because some docking bounds are tight af need to check each chunk individually + foreach (var fix in shuttleFixturesComp.Fixtures.Values) + { + var polyShape = (PolygonShape)fix.Shape; + var aabb = polyShape.ComputeAABB(transform, 0); + aabb = aabb.Enlarged(-0.01f); + + // If it's a map check no hard collidable anchored entities overlap + if (isMap) + { + foreach (var tile in _mapSystem.GetLocalTilesIntersecting(gridEntity.Owner, gridEntity.Comp, aabb)) + { + var anchoredEnumerator = _mapSystem.GetAnchoredEntitiesEnumerator(gridEntity.Owner, gridEntity.Comp, tile.GridIndices); + + while (anchoredEnumerator.MoveNext(out var anc)) + { + if (!_physicsQuery.TryGetComponent(anc, out var physics) || + !physics.CanCollide || + !physics.Hard) + { + continue; + } + + return false; + } + } + } + // If it's not a map check it doesn't overlap the grid. + else + { + if (_mapSystem.GetLocalTilesIntersecting(gridEntity.Owner, gridEntity.Comp, aabb).Any()) + return false; + } + } + + return true; + } + + public List> GetDocks(EntityUid uid) + { + _dockingSet.Clear(); + _lookup.GetChildEntities(uid, _dockingSet); + + return _dockingSet.ToList(); + } } diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs index f46c3980e58..fcdd6c0c1ae 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.cs @@ -23,6 +23,7 @@ namespace Content.Server.Shuttles.Systems public sealed partial class DockingSystem : SharedDockingSystem { [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly DoorSystem _doorSystem = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly PathfindingSystem _pathfinding = default!; @@ -262,7 +263,7 @@ public void Dock(Entity dockA, Entity dockB) joint.LocalAnchorA = anchorA; joint.LocalAnchorB = anchorB; - joint.ReferenceAngle = (float) (_transform.GetWorldRotation(gridBXform) - _transform.GetWorldRotation(gridAXform)); + joint.ReferenceAngle = (float)(_transform.GetWorldRotation(gridBXform) - _transform.GetWorldRotation(gridAXform)); joint.CollideConnected = true; joint.Stiffness = stiffness; joint.Damping = damping; diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs index 887ee11c63d..ede0b687fcc 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs @@ -220,7 +220,7 @@ private void UpdateEmergencyConsole(float frameTime) ShuttlesLeft = true; _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-left", ("transitTime", $"{TransitTime:0}"))); - Timer.Spawn((int) (TransitTime * 1000) + _bufferTime.Milliseconds, () => _roundEnd.EndRound(), _roundEndCancelToken?.Token ?? default); + Timer.Spawn((int)(TransitTime * 1000) + _bufferTime.Milliseconds, () => _roundEnd.EndRound(), _roundEndCancelToken?.Token ?? default); } // All the others. diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs index 45397ede088..1f3b4a749bc 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs @@ -50,8 +50,8 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem [Dependency] private readonly IAdminManager _admin = default!; [Dependency] private readonly IConfigurationManager _configManager = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly AccessReaderSystem _reader = default!; [Dependency] private readonly ChatSystem _chatSystem = default!; [Dependency] private readonly CommunicationsConsoleSystem _commsConsole = default!; @@ -212,7 +212,7 @@ private void OnEmergencyFTL(EntityUid uid, EmergencyShuttleComponent component, { [ShuttleTimerMasks.ShuttleMap] = uid, [ShuttleTimerMasks.SourceMap] = args.FromMapUid, - [ShuttleTimerMasks.DestMap] = args.TargetCoordinates.GetMapUid(_entityManager), + [ShuttleTimerMasks.DestMap] = _transformSystem.GetMap(args.TargetCoordinates), [ShuttleTimerMasks.ShuttleTime] = ftlTime, [ShuttleTimerMasks.SourceTime] = ftlTime, [ShuttleTimerMasks.DestTime] = ftlTime @@ -289,7 +289,7 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo { var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery); var direction = ContentLocalizationManager.FormatDirection(angle.GetDir()); - var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform))); + var location = FormattedMessage.RemoveMarkupPermissive(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform))); _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-docked", ("time", $"{_consoleAccumulator:0}"), ("direction", direction), ("location", location)), playDefaultSound: false); } @@ -320,7 +320,7 @@ public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleCo { var angle = _dock.GetAngle(stationShuttle.EmergencyShuttle.Value, xform, targetGrid.Value, targetXform, xformQuery); var direction = ContentLocalizationManager.FormatDirection(angle.GetDir()); - var location = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform))); + var location = FormattedMessage.RemoveMarkupPermissive(_navMap.GetNearestBeaconString((stationShuttle.EmergencyShuttle.Value, xform))); _chatSystem.DispatchStationAnnouncement(stationUid, Loc.GetString("emergency-shuttle-nearby", ("time", $"{_consoleAccumulator:0}"), ("direction", direction), ("location", location)), playDefaultSound: false); } @@ -401,7 +401,7 @@ private void SetupEmergencyShuttle() private void AddCentcomm(EntityUid station, StationCentcommComponent component) { - DebugTools.Assert(LifeStage(station)>= EntityLifeStage.MapInitialized); + DebugTools.Assert(LifeStage(station) >= EntityLifeStage.MapInitialized); if (component.MapEntity != null || component.Entity != null) { Log.Warning("Attempted to re-add an existing centcomm map."); @@ -434,12 +434,11 @@ private void AddCentcomm(EntityUid station, StationCentcommComponent component) return; } - var mapId = _mapManager.CreateMap(); + var map = _mapSystem.CreateMap(out var mapId); var grid = _map.LoadGrid(mapId, component.Map.ToString(), new MapLoadOptions() { LoadMap = false, }); - var map = _mapManager.GetMapEntityId(mapId); if (!Exists(map)) { @@ -492,7 +491,7 @@ private void AddEmergencyShuttle(Entity ent, ref Shuttle private void OnPositionFTLMessage(Entity entity, ref ShuttleConsoleFTLPositionMessage args) { - var mapUid = _mapManager.GetMapEntityId(args.Coordinates.MapId); + var mapUid = _mapSystem.GetMap(args.Coordinates.MapId); // If it's beacons only block all position messages. if (!Exists(mapUid) || _shuttle.IsBeaconMap(mapUid)) diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs index 81a2b29beb4..f02ea945d05 100644 --- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs @@ -26,7 +26,7 @@ namespace Content.Server.Shuttles.Systems; public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem { - [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly ActionBlockerSystem _blocker = default!; [Dependency] private readonly AlertsSystem _alertsSystem = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; @@ -129,7 +129,7 @@ public void RefreshShuttleConsoles() while (query.MoveNext(out var uid, out _)) { - UpdateState(uid,ref dockState); + UpdateState(uid, ref dockState); } } @@ -138,7 +138,7 @@ public void RefreshShuttleConsoles() /// private void OnConsoleUIClose(EntityUid uid, ShuttleConsoleComponent component, BoundUIClosedEvent args) { - if ((ShuttleConsoleUiKey) args.UiKey != ShuttleConsoleUiKey.Key) + if ((ShuttleConsoleUiKey)args.UiKey != ShuttleConsoleUiKey.Key) { return; } diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index afe7a7b6db6..274437aa404 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -134,13 +134,12 @@ private EntityUid EnsureFTLMap() return uid; } - var mapId = _mapManager.CreateMap(); - var mapUid = _mapManager.GetMapEntityId(mapId); + var mapUid = _mapSystem.CreateMap(out var mapId); var ftlMap = AddComp(mapUid); _metadata.SetEntityName(mapUid, "FTL"); Log.Debug($"Setup hyperspace map at {mapUid}"); - DebugTools.Assert(!_mapManager.IsMapPaused(mapId)); + DebugTools.Assert(!_mapSystem.IsPaused(mapId)); var parallax = EnsureComp(mapUid); parallax.Parallax = ftlMap.Parallax; @@ -188,7 +187,7 @@ public void SetFTLWhitelist(Entity entity, EntityWhite /// public bool TryAddFTLDestination(MapId mapId, bool enabled, [NotNullWhen(true)] out FTLDestinationComponent? component) { - var mapUid = _mapManager.GetMapEntityId(mapId); + var mapUid = _mapSystem.GetMapOrInvalid(mapId); component = null; if (!Exists(mapUid)) @@ -281,8 +280,8 @@ public void FTLToCoordinates( _console.RefreshShuttleConsoles(shuttleUid); - var mapId = coordinates.GetMapId(EntityManager); - var mapUid = _mapManager.GetMapEntityId(mapId); + var mapId = _transform.GetMapId(coordinates); + var mapUid = _mapSystem.GetMap(mapId); var ev = new FTLRequestEvent(mapUid); RaiseLocalEvent(shuttleUid, ref ev, true); } @@ -388,7 +387,7 @@ private void UpdateFTLStarting(Entity entity) if (fromMapUid != null && TryComp(comp.StartupStream, out AudioComponent? startupAudio)) { var clippedAudio = _audio.PlayStatic(_startupSound, Filter.Broadcast(), - new EntityCoordinates(fromMapUid.Value, _maps.GetGridPosition(entity.Owner)), true, startupAudio.Params); + new EntityCoordinates(fromMapUid.Value, _mapSystem.GetGridPosition(entity.Owner)), true, startupAudio.Params); _audio.SetPlaybackPosition(clippedAudio, entity.Comp1.StartupTime); clippedAudio.Value.Component.Flags |= AudioFlags.NoOcclusion; @@ -477,7 +476,7 @@ private void UpdateFTLArriving(Entity entity) var map = maps.Min(o => o.GetHashCode()); mapId = new MapId(map); - TryFTLProximity(uid, _mapManager.GetMapEntityId(mapId)); + TryFTLProximity(uid, _mapSystem.GetMap(mapId)); } // Docking FTL else if (HasComp(target.EntityId) && @@ -502,7 +501,7 @@ private void UpdateFTLArriving(Entity entity) else { // TODO: This should now use tryftlproximity - mapId = target.GetMapId(EntityManager); + mapId = _transform.GetMapId(target); _transform.SetCoordinates(uid, xform, target, rotation: entity.Comp1.TargetAngle); } @@ -540,7 +539,7 @@ private void UpdateFTLArriving(Entity entity) _mapManager.SetMapPaused(mapId, false); Smimsh(uid, xform: xform); - var ftlEvent = new FTLCompletedEvent(uid, _mapManager.GetMapEntityId(mapId)); + var ftlEvent = new FTLCompletedEvent(uid, _mapSystem.GetMap(mapId)); RaiseLocalEvent(uid, ref ftlEvent, true); } @@ -616,7 +615,7 @@ private void DoTheDinosaur(TransformComponent xform) // If the guy we knocked down is on a spaced tile, throw them too if (grid != null) - TossIfSpaced(grid, shuttleBody, child); + TossIfSpaced((xform.GridUid.Value, grid, shuttleBody), child); } } } @@ -637,13 +636,15 @@ private void KnockOverKids(TransformComponent xform, ref ValueList to /// /// Throws people who are standing on a spaced tile, tries to throw them towards a neighbouring space tile /// - private void TossIfSpaced(MapGridComponent shuttleGrid, PhysicsComponent shuttleBody, EntityUid tossed) + private void TossIfSpaced(Entity shuttleEntity, EntityUid tossed) { - if (!_xformQuery.TryGetComponent(tossed, out var childXform) ) + var shuttleGrid = shuttleEntity.Comp1; + var shuttleBody = shuttleEntity.Comp2; + if (!_xformQuery.TryGetComponent(tossed, out var childXform)) return; // only toss if its on lattice/space - var tile = shuttleGrid.GetTileRef(childXform.Coordinates); + var tile = _mapSystem.GetTileRef(shuttleEntity, shuttleGrid, childXform.Coordinates); if (!tile.IsSpace(_tileDefManager)) return; @@ -689,7 +690,7 @@ public void FTLDock(Entity shuttle, DockingConfig config) { // Set position var mapCoordinates = _transform.ToMapCoordinates(config.Coordinates); - var mapUid = _mapManager.GetMapEntityId(mapCoordinates.MapId); + var mapUid = _mapSystem.GetMap(mapCoordinates.MapId); _transform.SetCoordinates(shuttle.Owner, shuttle.Comp, new EntityCoordinates(mapUid, mapCoordinates.Position), rotation: config.Angle); // Connect everything diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs index 4760e92e212..5ad94699bed 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs @@ -110,7 +110,7 @@ private bool TryDungeonSpawn(Entity targetGrid, DungeonSpawnG spawnCoords = spawnCoords.Offset(_random.NextVector2(distancePadding + group.MinimumDistance, distancePadding + group.MaximumDistance)); } - _maps.CreateMap(out var mapId); + _mapSystem.CreateMap(out var mapId); var spawnedGrid = _mapManager.CreateGridEntity(mapId); diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs index 8a8d2d883d0..436b2484073 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs @@ -39,8 +39,8 @@ private void OnShuttleCollide(EntityUid uid, ShuttleComponent component, ref Sta var otherXform = Transform(args.OtherEntity); - var ourPoint = Vector2.Transform(args.WorldPoint, ourXform.InvWorldMatrix); - var otherPoint = Vector2.Transform(args.WorldPoint, otherXform.InvWorldMatrix); + var ourPoint = Vector2.Transform(args.WorldPoint, _transform.GetInvWorldMatrix(ourXform)); + var otherPoint = Vector2.Transform(args.WorldPoint, _transform.GetInvWorldMatrix(otherXform)); var ourVelocity = _physics.GetLinearVelocity(uid, ourPoint, ourBody, ourXform); var otherVelocity = _physics.GetLinearVelocity(args.OtherEntity, otherPoint, otherBody, otherXform); diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs index 6ae4aff2f4a..054c42f934a 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs @@ -49,7 +49,6 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem [Dependency] private readonly MetaDataSystem _metadata = default!; [Dependency] private readonly PvsOverrideSystem _pvs = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly ShuttleConsoleSystem _console = default!; diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs index af780df44af..f5e8f7823e7 100644 --- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs +++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs @@ -27,6 +27,7 @@ public sealed class ThrusterSystem : EntitySystem { [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; + [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly AmbientSoundSystem _ambient = default!; [Dependency] private readonly FixtureSystem _fixtureSystem = default!; [Dependency] private readonly DamageableSystem _damageable = default!; @@ -109,7 +110,7 @@ private void OnShuttleTileChange(EntityUid uid, ShuttleComponent component, ref continue; var checkPos = tilePos + new Vector2i(x, y); - var enumerator = grid.GetAnchoredEntitiesEnumerator(checkPos); + var enumerator = _mapSystem.GetAnchoredEntitiesEnumerator(uid, grid, checkPos); while (enumerator.MoveNext(out var ent)) { @@ -120,7 +121,7 @@ private void OnShuttleTileChange(EntityUid uid, ShuttleComponent component, ref var xform = xformQuery.GetComponent(ent.Value); var direction = xform.LocalRotation.ToWorldVec(); - if (new Vector2i((int) direction.X, (int) direction.Y) != new Vector2i(x, y)) + if (new Vector2i((int)direction.X, (int)direction.Y) != new Vector2i(x, y)) continue; DisableThruster(ent.Value, thruster, xform.GridUid); @@ -183,8 +184,8 @@ private void OnRotate(EntityUid uid, ThrusterComponent component, ref MoveEvent return; } - var oldDirection = (int) args.OldRotation.GetCardinalDir() / 2; - var direction = (int) args.NewRotation.GetCardinalDir() / 2; + var oldDirection = (int)args.OldRotation.GetCardinalDir() / 2; + var direction = (int)args.NewRotation.GetCardinalDir() / 2; var oldShuttleComponent = shuttleComponent; if (args.ParentChanged) @@ -282,7 +283,7 @@ public void EnableThruster(EntityUid uid, ThrusterComponent component, Transform switch (component.Type) { case ThrusterType.Linear: - var direction = (int) xform.LocalRotation.GetCardinalDir() / 2; + var direction = (int)xform.LocalRotation.GetCardinalDir() / 2; shuttleComponent.LinearThrust[direction] += component.Thrust; DebugTools.Assert(!shuttleComponent.LinearThrusters[direction].Contains(uid)); @@ -294,7 +295,7 @@ public void EnableThruster(EntityUid uid, ThrusterComponent component, Transform { var shape = new PolygonShape(); shape.Set(component.BurnPoly); - _fixtureSystem.TryCreateFixture(uid, shape, BurnFixture, hard: false, collisionLayer: (int) CollisionGroup.FullTileMask, body: physicsComponent); + _fixtureSystem.TryCreateFixture(uid, shape, BurnFixture, hard: false, collisionLayer: (int)CollisionGroup.FullTileMask, body: physicsComponent); } break; @@ -334,7 +335,7 @@ private void RefreshCenter(EntityUid uid, ShuttleComponent shuttle) foreach (var dir in new[] { Direction.South, Direction.East, Direction.North, Direction.West }) { - var index = (int) dir / 2; + var index = (int)dir / 2; var pop = shuttle.LinearThrusters[index]; var totalThrust = 0f; @@ -380,7 +381,7 @@ public void DisableThruster(EntityUid uid, ThrusterComponent component, EntityUi { case ThrusterType.Linear: angle ??= xform.LocalRotation; - var direction = (int) angle.Value.GetCardinalDir() / 2; + var direction = (int)angle.Value.GetCardinalDir() / 2; shuttleComponent.LinearThrust[direction] -= component.Thrust; DebugTools.Assert(shuttleComponent.LinearThrusters[direction].Contains(uid)); @@ -426,7 +427,7 @@ public bool CanEnable(EntityUid uid, ThrusterComponent component) var xform = Transform(uid); - if (!xform.Anchored ||!this.IsPowered(uid, EntityManager)) + if (!xform.Anchored || !this.IsPowered(uid, EntityManager)) { return false; } @@ -443,7 +444,8 @@ private bool NozzleExposed(TransformComponent xform) return true; var (x, y) = xform.LocalPosition + xform.LocalRotation.Opposite().ToWorldVec(); - var tile = Comp(xform.GridUid.Value).GetTileRef(new Vector2i((int) Math.Floor(x), (int) Math.Floor(y))); + var mapGrid = Comp(xform.GridUid.Value); + var tile = _mapSystem.GetTileRef(xform.GridUid.Value, mapGrid, new Vector2i((int)Math.Floor(x), (int)Math.Floor(y))); return tile.Tile.IsSpace(); } @@ -582,6 +584,6 @@ public void SetAngularThrust(ShuttleComponent component, bool on) private int GetFlagIndex(DirectionFlag flag) { - return (int) Math.Log2((int) flag); + return (int)Math.Log2((int)flag); } } From 4dc750abc9671693ce930a000c633187cd05e997 Mon Sep 17 00:00:00 2001 From: QueerNB <176353696+QueerNB@users.noreply.github.com> Date: Mon, 26 Aug 2024 15:24:22 -0700 Subject: [PATCH 097/223] Replaces small fans on most shuttles with directional fans. (#31495) --- .../ShuttleEvent/disaster_evacpod.yml | 2 +- .../Maps/Shuttles/ShuttleEvent/honki.yml | 2 +- .../Maps/Shuttles/ShuttleEvent/lost_cargo.yml | 62 +- .../Maps/Shuttles/ShuttleEvent/striker.yml | 65 +- .../Shuttles/ShuttleEvent/syndie_evacpod.yml | 2650 ++++++++++++----- .../ShuttleEvent/traveling_china_cuisine.yml | 23 +- Resources/Maps/Shuttles/arrivals.yml | 60 +- Resources/Maps/Shuttles/briggle.yml | 18 +- Resources/Maps/Shuttles/cargo.yml | 68 +- Resources/Maps/Shuttles/cargo_core.yml | 62 +- Resources/Maps/Shuttles/cargo_fland.yml | 66 +- Resources/Maps/Shuttles/dart.yml | 176 +- Resources/Maps/Shuttles/emergency.yml | 46 +- Resources/Maps/Shuttles/emergency_box.yml | 30 +- Resources/Maps/Shuttles/emergency_cluster.yml | 21 +- Resources/Maps/Shuttles/emergency_courser.yml | 26 +- Resources/Maps/Shuttles/emergency_delta.yml | 48 +- Resources/Maps/Shuttles/emergency_lox.yml | 42 +- Resources/Maps/Shuttles/emergency_meta.yml | 31 +- Resources/Maps/Shuttles/emergency_omega.yml | 26 +- Resources/Maps/Shuttles/emergency_raven.yml | 386 +-- Resources/Maps/Shuttles/emergency_rod.yml | 105 +- Resources/Maps/Shuttles/emergency_wode.yml | 52 +- Resources/Maps/Shuttles/escape_pod_small.yml | 2 +- Resources/Maps/Shuttles/mining.yml | 30 +- Resources/Maps/Shuttles/pirate.yml | 82 +- Resources/Maps/Shuttles/trading_outpost.yml | 162 +- Resources/Maps/Shuttles/wizard.yml | 71 +- 28 files changed, 2347 insertions(+), 2067 deletions(-) diff --git a/Resources/Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml b/Resources/Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml index be1ca4ffdee..6649a01ce84 100644 --- a/Resources/Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml +++ b/Resources/Maps/Shuttles/ShuttleEvent/disaster_evacpod.yml @@ -117,7 +117,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-0.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 4 components: diff --git a/Resources/Maps/Shuttles/ShuttleEvent/honki.yml b/Resources/Maps/Shuttles/ShuttleEvent/honki.yml index 28e4dab5154..bd792c425be 100644 --- a/Resources/Maps/Shuttles/ShuttleEvent/honki.yml +++ b/Resources/Maps/Shuttles/ShuttleEvent/honki.yml @@ -267,7 +267,7 @@ entities: - type: Transform pos: 1.5,-3.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 6 components: diff --git a/Resources/Maps/Shuttles/ShuttleEvent/lost_cargo.yml b/Resources/Maps/Shuttles/ShuttleEvent/lost_cargo.yml index 148577363fb..413cdfb4480 100644 --- a/Resources/Maps/Shuttles/ShuttleEvent/lost_cargo.yml +++ b/Resources/Maps/Shuttles/ShuttleEvent/lost_cargo.yml @@ -242,27 +242,31 @@ entities: - type: Transform pos: -0.5,6.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 8 components: - type: Transform - pos: -5.5,1.5 + rot: 1.5707963267948966 rad + pos: 0.5,3.5 parent: 1 - uid: 9 components: - type: Transform - pos: -5.5,3.5 + rot: 1.5707963267948966 rad + pos: 0.5,1.5 parent: 1 - uid: 10 components: - type: Transform - pos: 0.5,3.5 + rot: -1.5707963267948966 rad + pos: -5.5,1.5 parent: 1 - uid: 11 components: - type: Transform - pos: 0.5,1.5 + rot: -1.5707963267948966 rad + pos: -5.5,3.5 parent: 1 - proto: BlastDoor entities: @@ -271,33 +275,21 @@ entities: - type: Transform pos: 0.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 135 - uid: 13 components: - type: Transform pos: -5.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 134 - uid: 14 components: - type: Transform pos: 0.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 136 - uid: 15 components: - type: Transform pos: -5.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 133 - proto: BoxMRE entities: - uid: 93 @@ -650,108 +642,72 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 151 - uid: 82 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 151 - uid: 83 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 151 - uid: 84 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 149 - uid: 85 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 149 - uid: 86 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 149 - uid: 87 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 150 - uid: 88 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 152 - uid: 89 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 152 - uid: 90 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 152 - uid: 91 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 150 - uid: 92 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 150 - proto: CrateFilledSpawner entities: - uid: 95 diff --git a/Resources/Maps/Shuttles/ShuttleEvent/striker.yml b/Resources/Maps/Shuttles/ShuttleEvent/striker.yml index 88b113d7fdb..ce518370f8e 100644 --- a/Resources/Maps/Shuttles/ShuttleEvent/striker.yml +++ b/Resources/Maps/Shuttles/ShuttleEvent/striker.yml @@ -198,8 +198,6 @@ entities: - type: Transform pos: -0.5,-8.5 parent: 325 - - type: AtmosDevice - joinedGrid: 325 - proto: AirlockExternalShuttleSyndicateLocked entities: - uid: 142 @@ -232,11 +230,12 @@ entities: currentReceiving: 15106.935 currentSupply: 15107 supplyRampPosition: 0.064453125 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 6 components: - type: Transform + rot: 1.5707963267948966 rad pos: -3.5,-1.5 parent: 325 - proto: Bed @@ -267,9 +266,6 @@ entities: occludes: True ents: - 331 - - type: DeviceLinkSink - links: - - 205 - uid: 191 components: - type: Transform @@ -282,9 +278,6 @@ entities: occludes: True ents: - 332 - - type: DeviceLinkSink - links: - - 205 - uid: 192 components: - type: Transform @@ -297,9 +290,6 @@ entities: occludes: True ents: - 333 - - type: DeviceLinkSink - links: - - 205 - uid: 193 components: - type: Transform @@ -312,9 +302,6 @@ entities: occludes: True ents: - 334 - - type: DeviceLinkSink - links: - - 205 - uid: 196 components: - type: Transform @@ -327,9 +314,6 @@ entities: occludes: True ents: - 337 - - type: DeviceLinkSink - links: - - 205 - uid: 198 components: - type: Transform @@ -342,9 +326,6 @@ entities: occludes: True ents: - 339 - - type: DeviceLinkSink - links: - - 205 - uid: 199 components: - type: Transform @@ -357,9 +338,6 @@ entities: occludes: True ents: - 340 - - type: DeviceLinkSink - links: - - 205 - uid: 200 components: - type: Transform @@ -372,9 +350,6 @@ entities: occludes: True ents: - 341 - - type: DeviceLinkSink - links: - - 205 - uid: 201 components: - type: Transform @@ -387,9 +362,6 @@ entities: occludes: True ents: - 342 - - type: DeviceLinkSink - links: - - 205 - uid: 202 components: - type: Transform @@ -402,9 +374,6 @@ entities: occludes: True ents: - 343 - - type: DeviceLinkSink - links: - - 205 - proto: BoxMRE entities: - uid: 320 @@ -825,6 +794,10 @@ entities: occludes: True ents: - 245 + disk_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: CyberPen entities: - uid: 77 @@ -1041,8 +1014,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-8.5 parent: 325 - - type: AtmosDevice - joinedGrid: 325 - proto: GasVentPump entities: - uid: 218 @@ -1054,8 +1025,6 @@ entities: address: Vnt-5f41a0ae transmitFrequency: 1621 receiveFrequency: 1621 - - type: AtmosDevice - joinedGrid: 325 - uid: 219 components: - type: Transform @@ -1066,8 +1035,6 @@ entities: address: Vnt-129c27d2 transmitFrequency: 1621 receiveFrequency: 1621 - - type: AtmosDevice - joinedGrid: 325 - uid: 220 components: - type: Transform @@ -1078,8 +1045,6 @@ entities: address: Vnt-11c4609d transmitFrequency: 1621 receiveFrequency: 1621 - - type: AtmosDevice - joinedGrid: 325 - uid: 221 components: - type: Transform @@ -1090,8 +1055,6 @@ entities: address: Vnt-6859729f transmitFrequency: 1621 receiveFrequency: 1621 - - type: AtmosDevice - joinedGrid: 325 - uid: 222 components: - type: Transform @@ -1102,8 +1065,6 @@ entities: address: Vnt-19d24c7f transmitFrequency: 1621 receiveFrequency: 1621 - - type: AtmosDevice - joinedGrid: 325 - proto: GeneratorBasic15kW entities: - uid: 41 @@ -1457,6 +1418,13 @@ entities: - type: Transform pos: 1.561105,-2.5567772 parent: 325 +- proto: OxygenTankFilled + entities: + - uid: 167 + components: + - type: Transform + pos: 1.60798,-0.3062118 + parent: 325 - proto: PinpointerNuclear entities: - uid: 162 @@ -2379,11 +2347,4 @@ entities: occludes: True ents: - 346 -- proto: YellowOxygenTankFilled - entities: - - uid: 167 - components: - - type: Transform - pos: 1.60798,-0.3062118 - parent: 325 ... diff --git a/Resources/Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml b/Resources/Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml index d90fadba238..04eae18342f 100644 --- a/Resources/Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml +++ b/Resources/Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml @@ -5,37 +5,49 @@ tilemap: 0: Space 29: FloorDark 84: FloorShuttleRed - 101: FloorSteelOffset 104: FloorTechMaint + 105: FloorTechMaint2 + 118: FloorWood 120: Lattice 121: Plating entities: - proto: "" entities: - - uid: 1 + - uid: 6 + components: + - type: MetaData + name: Map Entity + - type: Transform + - type: Map + mapPaused: True + - type: PhysicsMap + - type: GridTree + - type: MovedGrids + - type: Broadphase + - type: OccluderTree + - uid: 325 components: - type: MetaData - desc: Evacuation pod - name: Evacuation pod - type: Transform - parent: invalid + pos: 0.5638949,0.47865233 + parent: 6 - type: MapGrid chunks: -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAZQAAAAAAZQAAAAAA - version: 6 - -1,0: - ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAZQAAAAAAZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAZQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAAAdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAADdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAHQAAAAABHQAAAAABHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAAB version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,0: ind: 0,0 - tiles: ZQAAAAAAZQAAAAAAZQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAZQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: VAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -47,9 +59,7 @@ entities: - type: Fixtures fixtures: {} - type: OccluderTree - - type: SpreaderGrid - type: Shuttle - - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg @@ -58,104 +68,119 @@ entities: version: 2 nodes: - node: - color: '#A91409FF' - id: StandClearGreyscale + color: '#FFFFFFFF' + id: BrickTileDarkCornerNe + decals: + 11: 1,-1 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkCornerNw + decals: + 5: -3,-1 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkCornerSe + decals: + 4: 1,-3 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkCornerSw + decals: + 3: -3,-3 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkLineS + decals: + 0: -1,-3 + 1: -2,-3 + 2: 0,-3 + - node: + color: '#7F1C1FFF' + id: BrickTileWhiteCornerNe + decals: + 13: 1,-1 + - node: + color: '#7F1C1FFF' + id: BrickTileWhiteCornerNw + decals: + 12: -3,-1 + - node: + color: '#7F1C1FFF' + id: BrickTileWhiteCornerSe + decals: + 9: 1,-3 + - node: + color: '#7F1C1FFF' + id: BrickTileWhiteCornerSw decals: - 18: 0,-1 + 10: -3,-3 - node: - color: '#A91409FF' - id: WarnCornerSmallGreyscaleNE + color: '#7F1C1FFF' + id: BrickTileWhiteLineS decals: - 15: -2,0 + 6: -2,-3 + 7: -1,-3 + 8: 0,-3 - node: - color: '#A91409FF' - id: WarnCornerSmallGreyscaleNW + color: '#FFFFFFFF' + id: Delivery decals: - 14: 2,0 + 23: 2,-2 + 24: -4,-2 - node: - color: '#A91409FF' - id: WarnEndGreyscaleN + color: '#FFFFFFFF' + id: WarnLineE decals: - 9: -2,1 - 10: 2,1 + 14: 1,-2 - node: - color: '#A91409FF' - id: WarnLineGreyscaleE + color: '#FFFFFFFF' + id: WarnLineS decals: - 0: 2,0 - 8: 2,-1 - 17: 5,0 + 16: -3,-2 - node: - color: '#A91409FF' - id: WarnLineGreyscaleN + color: '#FFFFFFFF' + id: WarnLineW decals: - 11: -1,0 - 12: 0,0 - 13: 1,0 + 15: -1,-1 - node: - color: '#A91409FF' - id: WarnLineGreyscaleS + color: '#FFFFFFFF' + id: WoodTrimThinLineN decals: - 1: 1,-1 - 2: 0,-1 - 3: -1,-1 - 4: -2,-1 - 5: 2,-1 + 17: -1,-5 + 18: 0,-5 + 19: -2,-5 - node: - color: '#A91409FF' - id: WarnLineGreyscaleW + color: '#FFFFFFFF' + id: WoodTrimThinLineS decals: - 6: -2,-1 - 7: -2,0 - 16: -5,0 + 20: -2,-6 + 21: -1,-6 + 22: 0,-6 - type: GridAtmosphere version: 2 data: tiles: - -2,-1: - 0: 18432 - -2,0: - 1: 12 - 0: 64 -1,-1: - 0: 601 - 1: 51200 - -1,0: - 1: 2255 - 0: 16896 + 0: 65535 0,-1: - 0: 2115 - 1: 29440 - -2,1: + 0: 65535 + -2,-1: + 0: 52424 + -1,-3: + 0: 65280 + -1,-2: + 0: 65535 + 0,-3: + 0: 30464 + 0,-2: + 0: 30583 + -2,0: 0: 8 - -1,1: - 0: 4096 + -1,0: + 0: 3839 0,0: - 1: 895 - 0: 18432 - 1,-1: - 0: 16913 - 1,0: - 1: 7 - 0: 64 - 1,1: - 0: 4098 + 0: 895 uniqueMixes: - - volume: 2500 - immutable: True - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 temperature: 293.15 moles: @@ -173,1016 +198,2165 @@ entities: - 0 chunkSize: 4 - type: GasTileOverlay - - type: NavMap - type: RadiationGridResistance -- proto: AirlockShuttleSyndicate + - type: GravityShake + shakeTimes: 10 + - type: SpreaderGrid + - type: GridPathfinding +- proto: AirCanister entities: - - uid: 2 + - uid: 91 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,0.5 - parent: 1 - - uid: 3 + pos: -0.5,-8.5 + parent: 325 +- proto: AirlockExternalShuttleSyndicateLocked + entities: + - uid: 142 components: - type: Transform rot: -1.5707963267948966 rad - pos: -5.5,0.5 - parent: 1 -- proto: AirlockSyndicate + pos: -4.5,-1.5 + parent: 325 +- proto: AirlockSyndicateLocked entities: - - uid: 4 + - uid: 20 components: - type: Transform - pos: 3.5,0.5 - parent: 1 - - uid: 5 + pos: -0.5,-3.5 + parent: 325 + - uid: 88 components: - type: Transform - pos: -2.5,0.5 - parent: 1 + pos: -0.5,-6.5 + parent: 325 - proto: APCBasic entities: - - uid: 6 + - uid: 107 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,1.5 - parent: 1 -- proto: AtmosDeviceFanTiny + pos: 0.5,-6.5 + parent: 325 + - type: PowerNetworkBattery + loadingNetworkDemand: 15107 + currentReceiving: 15106.935 + currentSupply: 15107 + supplyRampPosition: 0.064453125 +- proto: AtmosDeviceFanDirectional entities: - - uid: 7 + - uid: 168 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,0.5 - parent: 1 - - uid: 8 + rot: 1.5707963267948966 rad + pos: -3.5,-1.5 + parent: 325 +- proto: Bed + entities: + - uid: 76 components: - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,0.5 - parent: 1 -- proto: BannerSyndicate + pos: 0.5,-5.5 + parent: 325 +- proto: BedsheetSyndie entities: - - uid: 9 + - uid: 164 components: - type: Transform - pos: 1.5,1.5 - parent: 1 -- proto: CableApcExtension + pos: 0.5,-5.5 + parent: 325 +- proto: BlastDoorOpen entities: - - uid: 10 + - uid: 190 components: - type: Transform - pos: -2.5,1.5 - parent: 1 - - uid: 11 + pos: 1.5,-5.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 331 + - uid: 191 components: - type: Transform - pos: -2.5,0.5 - parent: 1 - - uid: 12 + pos: 1.5,-4.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 332 + - uid: 192 components: - type: Transform - pos: -3.5,0.5 - parent: 1 - - uid: 13 + pos: -2.5,-5.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 333 + - uid: 193 components: - type: Transform - pos: -4.5,0.5 - parent: 1 - - uid: 14 + pos: -2.5,-4.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 334 + - uid: 196 components: - type: Transform - pos: -5.5,0.5 - parent: 1 - - uid: 15 + pos: 3.5,-1.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 337 + - uid: 198 components: - type: Transform - pos: -1.5,0.5 - parent: 1 - - uid: 16 + pos: -1.5,1.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 339 + - uid: 199 components: - type: Transform - pos: -0.5,0.5 - parent: 1 - - uid: 17 + pos: -1.5,2.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 340 + - uid: 200 components: - type: Transform - pos: 0.5,0.5 - parent: 1 - - uid: 18 + pos: -0.5,2.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 341 + - uid: 201 components: - type: Transform - pos: 1.5,0.5 - parent: 1 - - uid: 19 + pos: 0.5,2.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 342 + - uid: 202 components: - type: Transform - pos: 2.5,0.5 - parent: 1 - - uid: 20 + pos: 0.5,1.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 343 +- proto: BoxMRE + entities: + - uid: 320 components: - type: Transform - pos: 3.5,0.5 - parent: 1 - - uid: 21 + pos: 0.70504504,-7.29326 + parent: 325 +- proto: CableApcExtension + entities: + - uid: 120 components: - type: Transform - pos: 4.5,0.5 - parent: 1 - - uid: 22 + pos: 0.5,-6.5 + parent: 325 + - uid: 121 components: - type: Transform - pos: 5.5,0.5 - parent: 1 - - uid: 23 + pos: -0.5,-6.5 + parent: 325 + - uid: 122 components: - type: Transform - pos: 0.5,-0.5 - parent: 1 - - uid: 24 + pos: -0.5,-7.5 + parent: 325 + - uid: 123 components: - type: Transform - pos: 0.5,-1.5 - parent: 1 - - uid: 25 + pos: -0.5,-8.5 + parent: 325 + - uid: 124 components: - type: Transform - pos: 0.5,-2.5 - parent: 1 - - uid: 26 + pos: -1.5,-8.5 + parent: 325 + - uid: 125 components: - type: Transform - pos: -0.5,-2.5 - parent: 1 - - uid: 27 + pos: 0.5,-8.5 + parent: 325 + - uid: 126 components: - type: Transform - pos: 1.5,-2.5 - parent: 1 - - uid: 28 + pos: 1.5,-8.5 + parent: 325 + - uid: 127 components: - type: Transform - pos: -0.5,-1.5 - parent: 1 - - uid: 29 + pos: -2.5,-8.5 + parent: 325 + - uid: 128 components: - type: Transform - pos: -1.5,-1.5 - parent: 1 - - uid: 30 + pos: -3.5,-8.5 + parent: 325 + - uid: 129 components: - type: Transform - pos: 1.5,-1.5 - parent: 1 - - uid: 31 + pos: -3.5,-7.5 + parent: 325 + - uid: 130 components: - type: Transform - pos: 2.5,-1.5 - parent: 1 - - uid: 32 + pos: 2.5,-8.5 + parent: 325 + - uid: 131 components: - type: Transform - pos: 0.5,1.5 - parent: 1 -- proto: CableHV - entities: - - uid: 33 + pos: 2.5,-7.5 + parent: 325 + - uid: 132 components: - type: Transform - pos: -2.5,-0.5 - parent: 1 - - uid: 34 + pos: -0.5,-5.5 + parent: 325 + - uid: 133 components: - type: Transform - pos: -1.5,-0.5 - parent: 1 - - uid: 35 + pos: -0.5,-4.5 + parent: 325 + - uid: 134 components: - type: Transform - pos: -0.5,-0.5 - parent: 1 - - uid: 36 + pos: -0.5,-3.5 + parent: 325 + - uid: 135 components: - type: Transform - pos: 0.5,-0.5 - parent: 1 - - uid: 37 + pos: -0.5,-2.5 + parent: 325 + - uid: 136 components: - type: Transform - pos: 1.5,-0.5 - parent: 1 - - uid: 38 + pos: -0.5,-1.5 + parent: 325 + - uid: 137 components: - type: Transform - pos: 2.5,-0.5 - parent: 1 - - uid: 39 + pos: -0.5,-0.5 + parent: 325 + - uid: 138 components: - type: Transform - pos: 3.5,-0.5 - parent: 1 - - uid: 40 + pos: -0.5,0.5 + parent: 325 + - uid: 139 components: - type: Transform - pos: 3.5,-0.5 - parent: 1 - - uid: 41 + pos: -0.5,1.5 + parent: 325 + - uid: 140 components: - type: Transform - pos: 3.5,0.5 - parent: 1 - - uid: 42 + pos: -0.5,2.5 + parent: 325 + - uid: 141 components: - type: Transform - pos: 3.5,1.5 - parent: 1 -- proto: CableMV - entities: - - uid: 43 + pos: -1.5,1.5 + parent: 325 + - uid: 143 components: - type: Transform - pos: 3.5,1.5 - parent: 1 - - uid: 44 + pos: 0.5,1.5 + parent: 325 + - uid: 145 components: - type: Transform - pos: 2.5,1.5 - parent: 1 - - uid: 45 + pos: -1.5,-1.5 + parent: 325 + - uid: 146 components: - type: Transform - pos: 1.5,1.5 - parent: 1 - - uid: 46 + pos: -2.5,-1.5 + parent: 325 + - uid: 147 components: - type: Transform - pos: 0.5,1.5 - parent: 1 - - uid: 47 + pos: -3.5,-1.5 + parent: 325 + - uid: 148 components: - type: Transform - pos: -0.5,1.5 - parent: 1 - - uid: 48 - components: + pos: -4.5,-1.5 + parent: 325 + - uid: 149 + components: - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 49 + pos: 0.5,-1.5 + parent: 325 + - uid: 150 components: - type: Transform - pos: -2.5,1.5 - parent: 1 -- proto: ChairPilotSeat - entities: - - uid: 50 + pos: 1.5,-1.5 + parent: 325 + - uid: 151 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,1.5 - parent: 1 - - uid: 51 + pos: 2.5,-1.5 + parent: 325 + - uid: 152 components: - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 52 + pos: 3.5,-1.5 + parent: 325 + - uid: 153 components: - type: Transform - pos: 2.5,1.5 - parent: 1 -- proto: ClosetWallEmergencyFilledRandom - entities: - - uid: 53 + pos: 0.5,-4.5 + parent: 325 + - uid: 154 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-0.5 - parent: 1 -- proto: ClosetWallFireFilledRandom - entities: - - uid: 54 + pos: 1.5,-4.5 + parent: 325 + - uid: 155 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-0.5 - parent: 1 -- proto: ClothingHeadPyjamaSyndicateRed - entities: - - uid: 98 + pos: 1.5,-5.5 + parent: 325 + - uid: 156 components: - type: Transform - parent: 92 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingNeckScarfStripedSyndieRed - entities: - - uid: 101 + pos: -1.5,-4.5 + parent: 325 + - uid: 157 components: - type: Transform - parent: 92 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 102 + pos: -2.5,-4.5 + parent: 325 + - uid: 158 components: - type: Transform - parent: 92 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ComputerShuttleSyndie + pos: -2.5,-5.5 + parent: 325 +- proto: CableHV entities: - - uid: 55 + - uid: 111 components: - type: Transform - pos: 0.5,2.5 - parent: 1 -- proto: CrateSyndicate - entities: - - uid: 92 + pos: 1.5,-7.5 + parent: 325 + - uid: 112 components: - type: Transform - pos: 1.5,-0.5 - parent: 1 - - 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: - - 102 - - 101 - - 100 - - 99 - - 98 - - 97 - - 96 - - 95 - - 94 - - 93 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: CyberPen + pos: 0.5,-7.5 + parent: 325 + - uid: 113 + components: + - type: Transform + pos: -0.5,-7.5 + parent: 325 + - uid: 114 + components: + - type: Transform + pos: -1.5,-7.5 + parent: 325 + - uid: 115 + components: + - type: Transform + pos: -2.5,-7.5 + parent: 325 + - uid: 116 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 325 +- proto: CableHVStack1 entities: - - uid: 93 + - uid: 235 components: - type: Transform - parent: 92 + parent: 41 + - type: Stack + count: 10 - type: Physics canCollide: False - - type: InsideEntityStorage -- proto: FaxMachineSyndie - entities: - - uid: 162 + - uid: 239 components: - type: Transform - pos: -0.5,1.5 - parent: 1 -- proto: GeneratorWallmountAPU + parent: 56 + - type: Stack + count: 10 + - type: Physics + canCollide: False +- proto: CableMV entities: - - uid: 56 + - uid: 117 components: - type: Transform - pos: 3.5,-0.5 - parent: 1 -- proto: GeneratorWallmountBasic - entities: - - uid: 57 + pos: -1.5,-6.5 + parent: 325 + - uid: 118 components: - type: Transform - pos: -2.5,-0.5 - parent: 1 -- proto: Grille - entities: - - uid: 58 + pos: -0.5,-6.5 + parent: 325 + - uid: 119 components: - type: Transform - pos: 2.5,2.5 - parent: 1 - - uid: 59 + pos: 0.5,-6.5 + parent: 325 +- proto: CapacitorStockPart + entities: + - uid: 233 components: - type: Transform - pos: 0.5,3.5 - parent: 1 - - uid: 60 + parent: 41 + - type: Physics + canCollide: False + - uid: 234 components: - type: Transform - pos: -1.5,2.5 - parent: 1 - - uid: 61 + parent: 41 + - type: Physics + canCollide: False + - uid: 237 components: - type: Transform - pos: -0.5,3.5 - parent: 1 - - uid: 62 + parent: 56 + - type: Physics + canCollide: False + - uid: 238 components: - type: Transform - pos: 1.5,3.5 - parent: 1 -- proto: GrilleDiagonal - entities: - - uid: 63 + parent: 56 + - type: Physics + canCollide: False + - uid: 241 components: - type: Transform - pos: -2.5,2.5 - parent: 1 - - uid: 64 + parent: 58 + - type: Physics + canCollide: False + - uid: 242 components: - type: Transform - pos: -1.5,3.5 - parent: 1 - - uid: 65 + parent: 58 + - type: Physics + canCollide: False + - uid: 243 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - - uid: 66 + parent: 58 + - type: Physics + canCollide: False + - uid: 254 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,2.5 - parent: 1 - - uid: 67 + parent: 95 + - type: Physics + canCollide: False + - uid: 261 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,2.5 - parent: 1 - - uid: 68 + parent: 96 + - type: Physics + canCollide: False + - uid: 268 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,2.5 - parent: 1 -- proto: Gyroscope - entities: - - uid: 69 + parent: 97 + - type: Physics + canCollide: False + - uid: 275 components: - type: Transform - pos: 0.5,-1.5 - parent: 1 -- proto: Paper - entities: - - uid: 95 + parent: 98 + - type: Physics + canCollide: False + - uid: 282 components: - type: Transform - parent: 92 + parent: 99 - type: Physics canCollide: False - - type: InsideEntityStorage - - uid: 97 + - uid: 289 components: - type: Transform - parent: 92 + parent: 100 - type: Physics canCollide: False - - type: InsideEntityStorage - - uid: 99 + - uid: 296 components: - type: Transform - parent: 92 + parent: 101 - type: Physics canCollide: False - - type: InsideEntityStorage - - uid: 100 + - uid: 303 components: - type: Transform - parent: 92 + parent: 102 - type: Physics canCollide: False - - type: InsideEntityStorage -- proto: PlasmaWindowDiagonal +- proto: Carpet entities: - - uid: 70 + - uid: 74 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,2.5 - parent: 1 - - uid: 71 + pos: -0.5,-4.5 + parent: 325 + - uid: 89 components: - type: Transform - pos: -1.5,3.5 - parent: 1 - - uid: 72 + pos: -0.5,-5.5 + parent: 325 +- proto: Catwalk + entities: + - uid: 159 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,2.5 - parent: 1 - - uid: 73 + pos: -1.5,-7.5 + parent: 325 + - uid: 160 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,2.5 - parent: 1 - - uid: 74 + pos: -0.5,-7.5 + parent: 325 + - uid: 161 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - - uid: 75 + pos: 0.5,-7.5 + parent: 325 +- proto: ChairOfficeDark + entities: + - uid: 93 components: - type: Transform - pos: -2.5,2.5 - parent: 1 -- proto: Poweredlight + rot: -1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 325 +- proto: ChairPilotSeat entities: - - uid: 76 + - uid: 78 components: - type: Transform rot: 3.141592653589793 rad - pos: 0.5,-1.5 - parent: 1 -- proto: PoweredSmallLight + pos: -0.5,0.5 + parent: 325 +- proto: ComputerIFFSyndicate + entities: + - uid: 40 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,0.5 + parent: 325 +- proto: ComputerShuttleSyndie + entities: + - uid: 64 + components: + - type: Transform + pos: -0.5,1.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 245 + disk_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null +- proto: CyberPen entities: - uid: 77 components: - type: Transform - pos: -4.5,0.5 - parent: 1 - - uid: 78 + pos: -1.1813428,-5.15565 + parent: 325 +- proto: DoorElectronics + entities: + - uid: 331 components: - type: Transform - pos: 5.5,0.5 - parent: 1 - - uid: 79 + parent: 190 + - type: Physics + canCollide: False + - uid: 332 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,1.5 - parent: 1 - - uid: 80 + parent: 191 + - type: Physics + canCollide: False + - uid: 333 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,1.5 - parent: 1 -- proto: RandomPosterContraband - entities: - - uid: 81 + parent: 192 + - type: Physics + canCollide: False + - uid: 334 components: - type: Transform - pos: -3.5,1.5 - parent: 1 - - uid: 82 + parent: 193 + - type: Physics + canCollide: False + - uid: 337 components: - type: Transform - pos: 4.5,1.5 - parent: 1 -- proto: ReinforcedPlasmaWindow - entities: - - uid: 83 + parent: 196 + - type: Physics + canCollide: False + - uid: 339 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,3.5 - parent: 1 - - uid: 84 + parent: 198 + - type: Physics + canCollide: False + - uid: 340 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,3.5 - parent: 1 - - uid: 85 + parent: 199 + - type: Physics + canCollide: False + - uid: 341 components: - type: Transform - pos: 2.5,2.5 - parent: 1 - - uid: 86 + parent: 200 + - type: Physics + canCollide: False + - uid: 342 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,3.5 - parent: 1 - - uid: 87 + parent: 201 + - type: Physics + canCollide: False + - uid: 343 components: - type: Transform - pos: -1.5,2.5 - parent: 1 -- proto: RubberStampSyndicate - entities: - - uid: 94 + parent: 202 + - type: Physics + canCollide: False + - uid: 346 components: - type: Transform - parent: 92 + parent: 206 - type: Physics canCollide: False - - type: InsideEntityStorage -- proto: SubstationWallBasic +- proto: DresserFilled entities: - - uid: 88 + - uid: 85 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 325 +- proto: DrinkNukieCan + entities: + - uid: 144 + components: + - type: Transform + pos: -2.6964839,-2.109029 + parent: 325 +- proto: FaxMachineSyndie + entities: + - uid: 46 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 325 + - type: FaxMachine + name: Striker +- proto: filingCabinetRandom + entities: + - uid: 75 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 325 +- proto: Firelock + entities: + - uid: 224 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 350 + - type: DeviceNetwork + address: 44a24659 + receiveFrequency: 1621 + - uid: 225 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 351 + - type: DeviceNetwork + address: 6fdb75cf + receiveFrequency: 1621 +- proto: FirelockElectronics + entities: + - uid: 350 + components: + - type: Transform + parent: 224 + - type: Physics + canCollide: False + - uid: 351 + components: + - type: Transform + parent: 225 + - type: Physics + canCollide: False +- proto: FoodBoxDonut + entities: + - uid: 87 + components: + - type: Transform + pos: -2.470145,-2.3953476 + parent: 325 +- proto: GasPipeFourway + entities: + - uid: 216 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 325 +- proto: GasPipeStraight + entities: + - uid: 211 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-6.5 + parent: 325 + - uid: 213 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 325 + - uid: 214 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 325 + - uid: 215 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 325 + - uid: 217 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-0.5 + parent: 325 +- proto: GasPipeTJunction + entities: + - uid: 210 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 325 + - uid: 212 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-5.5 + parent: 325 +- proto: GasPort + entities: + - uid: 59 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-8.5 + parent: 325 +- proto: GasVentPump + entities: + - uid: 218 + components: + - type: Transform + pos: -0.5,0.5 + parent: 325 + - type: DeviceNetwork + address: Vnt-5f41a0ae + transmitFrequency: 1621 + receiveFrequency: 1621 + - uid: 219 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 325 + - type: DeviceNetwork + address: Vnt-129c27d2 + transmitFrequency: 1621 + receiveFrequency: 1621 + - uid: 220 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-1.5 + parent: 325 + - type: DeviceNetwork + address: Vnt-11c4609d + transmitFrequency: 1621 + receiveFrequency: 1621 + - uid: 221 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-5.5 + parent: 325 + - type: DeviceNetwork + address: Vnt-6859729f + transmitFrequency: 1621 + receiveFrequency: 1621 + - uid: 222 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-7.5 + parent: 325 + - type: DeviceNetwork + address: Vnt-19d24c7f + transmitFrequency: 1621 + receiveFrequency: 1621 +- proto: GeneratorBasic15kW + entities: + - uid: 41 + components: + - type: Transform + pos: -2.5,-7.5 + parent: 325 + - type: PowerSupplier + supplyRampPosition: 7552.5303 + - type: ContainerContainer + containers: + machine_board: !type:Container + ents: + - 232 + machine_parts: !type:Container + ents: + - 233 + - 234 + - 235 + - uid: 56 + components: + - type: Transform + pos: 1.5,-7.5 + parent: 325 + - type: PowerSupplier + supplyRampPosition: 7552.5303 + - type: ContainerContainer + containers: + machine_board: !type:Container + ents: + - 236 + machine_parts: !type:Container + ents: + - 237 + - 238 + - 239 +- proto: GravityGeneratorMini + entities: + - uid: 57 + components: + - type: Transform + pos: -1.5,-8.5 + parent: 325 +- proto: Grille + entities: + - uid: 1 + components: + - type: Transform + pos: -0.5,2.5 + parent: 325 + - uid: 2 + components: + - type: Transform + pos: -1.5,2.5 + parent: 325 + - uid: 3 + components: + - type: Transform + pos: -1.5,1.5 + parent: 325 + - uid: 4 + components: + - type: Transform + pos: 0.5,2.5 + parent: 325 + - uid: 5 + components: + - type: Transform + pos: 0.5,1.5 + parent: 325 + - uid: 21 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 325 + - uid: 50 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-5.5 + parent: 325 + - uid: 51 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-4.5 + parent: 325 + - uid: 52 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-5.5 + parent: 325 + - uid: 53 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-4.5 + parent: 325 +- proto: Gyroscope + entities: + - uid: 58 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-8.5 + parent: 325 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: + - 240 + machine_parts: !type:Container + showEnts: False + occludes: True + ents: + - 241 + - 242 + - 243 + - 244 +- proto: GyroscopeMachineCircuitboard + entities: + - uid: 240 + components: + - type: Transform + parent: 58 + - type: Physics + canCollide: False +- proto: MedkitCombatFilled + entities: + - uid: 19 + components: + - type: Transform + pos: 1.48298,-0.3211529 + parent: 325 +- proto: MicroManipulatorStockPart + entities: + - uid: 250 + components: + - type: Transform + parent: 95 + - type: Physics + canCollide: False + - uid: 251 + components: + - type: Transform + parent: 95 + - type: Physics + canCollide: False + - uid: 252 + components: + - type: Transform + parent: 95 + - type: Physics + canCollide: False + - uid: 253 + components: + - type: Transform + parent: 95 + - type: Physics + canCollide: False + - uid: 257 + components: + - type: Transform + parent: 96 + - type: Physics + canCollide: False + - uid: 258 + components: + - type: Transform + parent: 96 + - type: Physics + canCollide: False + - uid: 259 + components: + - type: Transform + parent: 96 + - type: Physics + canCollide: False + - uid: 260 + components: + - type: Transform + parent: 96 + - type: Physics + canCollide: False + - uid: 264 + components: + - type: Transform + parent: 97 + - type: Physics + canCollide: False + - uid: 265 + components: + - type: Transform + parent: 97 + - type: Physics + canCollide: False + - uid: 266 + components: + - type: Transform + parent: 97 + - type: Physics + canCollide: False + - uid: 267 + components: + - type: Transform + parent: 97 + - type: Physics + canCollide: False + - uid: 271 + components: + - type: Transform + parent: 98 + - type: Physics + canCollide: False + - uid: 272 + components: + - type: Transform + parent: 98 + - type: Physics + canCollide: False + - uid: 273 + components: + - type: Transform + parent: 98 + - type: Physics + canCollide: False + - uid: 274 + components: + - type: Transform + parent: 98 + - type: Physics + canCollide: False + - uid: 278 + components: + - type: Transform + parent: 99 + - type: Physics + canCollide: False + - uid: 279 + components: + - type: Transform + parent: 99 + - type: Physics + canCollide: False + - uid: 280 + components: + - type: Transform + parent: 99 + - type: Physics + canCollide: False + - uid: 281 + components: + - type: Transform + parent: 99 + - type: Physics + canCollide: False + - uid: 285 + components: + - type: Transform + parent: 100 + - type: Physics + canCollide: False + - uid: 286 + components: + - type: Transform + parent: 100 + - type: Physics + canCollide: False + - uid: 287 + components: + - type: Transform + parent: 100 + - type: Physics + canCollide: False + - uid: 288 + components: + - type: Transform + parent: 100 + - type: Physics + canCollide: False + - uid: 292 + components: + - type: Transform + parent: 101 + - type: Physics + canCollide: False + - uid: 293 + components: + - type: Transform + parent: 101 + - type: Physics + canCollide: False + - uid: 294 + components: + - type: Transform + parent: 101 + - type: Physics + canCollide: False + - uid: 295 + components: + - type: Transform + parent: 101 + - type: Physics + canCollide: False + - uid: 299 + components: + - type: Transform + parent: 102 + - type: Physics + canCollide: False + - uid: 300 + components: + - type: Transform + parent: 102 + - type: Physics + canCollide: False + - uid: 301 + components: + - type: Transform + parent: 102 + - type: Physics + canCollide: False + - uid: 302 + components: + - type: Transform + parent: 102 + - type: Physics + canCollide: False +- proto: Mirror + entities: + - uid: 321 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-3.5 + parent: 325 +- proto: NitrogenTankFilled + entities: + - uid: 105 + components: + - type: Transform + pos: 1.373605,-0.2749618 + parent: 325 +- proto: NukeCodePaper + entities: + - uid: 323 + components: + - type: Transform + pos: 1.561105,-2.5567772 + parent: 325 +- proto: OxygenTankFilled + entities: + - uid: 167 + components: + - type: Transform + pos: 1.60798,-0.3062118 + parent: 325 +- proto: PinpointerNuclear + entities: + - uid: 162 + components: + - type: Transform + pos: 1.3790641,-2.3161128 + parent: 325 + - type: Physics + canCollide: False +- proto: PlasmaReinforcedWindowDirectional + entities: + - uid: 104 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 325 + - uid: 109 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-0.5 + parent: 325 +- proto: PlushieNuke + entities: + - uid: 47 + components: + - type: Transform + pos: 0.5061571,-5.233775 + parent: 325 +- proto: PortableGeneratorSuperPacmanMachineCircuitboard + entities: + - uid: 232 + components: + - type: Transform + parent: 41 + - type: Physics + canCollide: False + - uid: 236 + components: + - type: Transform + parent: 56 + - type: Physics + canCollide: False +- proto: PosterContrabandC20r + entities: + - uid: 24 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 325 +- proto: PosterContrabandEnergySwords + entities: + - uid: 227 + components: + - type: Transform + pos: -2.5,-6.5 + parent: 325 +- proto: PosterContrabandNuclearDeviceInformational + entities: + - uid: 228 + components: + - type: Transform + pos: -2.5,0.5 + parent: 325 +- proto: PosterContrabandSyndicateRecruitment + entities: + - uid: 229 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 325 +- proto: Poweredlight + entities: + - uid: 94 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,0.5 + parent: 325 + - uid: 110 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-2.5 + parent: 325 +- proto: PoweredlightLED + entities: + - uid: 182 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-5.5 + parent: 325 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 183 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-5.5 + parent: 325 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 184 + components: + - type: Transform + pos: -1.5,-7.5 + parent: 325 + - type: ApcPowerReceiver + powerLoad: 0 +- proto: PoweredSmallLight + entities: + - uid: 204 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-5.5 + parent: 325 + - type: ApcPowerReceiver + powerLoad: 0 +- proto: Rack + entities: + - uid: 83 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 325 + - uid: 84 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 325 +- proto: ReinforcedPlasmaWindow + entities: + - uid: 14 + components: + - type: Transform + pos: -1.5,1.5 + parent: 325 + - uid: 15 + components: + - type: Transform + pos: -1.5,2.5 + parent: 325 + - uid: 16 + components: + - type: Transform + pos: -0.5,2.5 + parent: 325 + - uid: 17 + components: + - type: Transform + pos: 0.5,2.5 + parent: 325 + - uid: 18 + components: + - type: Transform + pos: 0.5,1.5 + parent: 325 + - uid: 26 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 325 + - uid: 42 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 325 + - uid: 70 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 325 + - uid: 71 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 325 + - uid: 72 + components: + - type: Transform + pos: -2.5,-5.5 + parent: 325 +- proto: RemoteSignaller + entities: + - uid: 176 + components: + - type: Transform + pos: 1.3427892,-2.379079 + parent: 325 + - type: Physics + canCollide: False +- proto: SheetGlass1 + entities: + - uid: 244 + components: + - type: Transform + parent: 58 + - type: Stack + count: 2 + - type: Physics + canCollide: False +- proto: SheetSteel1 + entities: + - uid: 255 + components: + - type: Transform + parent: 95 + - type: Stack + count: 5 + - type: Physics + canCollide: False + - uid: 262 + components: + - type: Transform + parent: 96 + - type: Stack + count: 5 + - type: Physics + canCollide: False + - uid: 269 + components: + - type: Transform + parent: 97 + - type: Stack + count: 5 + - type: Physics + canCollide: False + - uid: 276 + components: + - type: Transform + parent: 98 + - type: Stack + count: 5 + - type: Physics + canCollide: False + - uid: 283 + components: + - type: Transform + parent: 99 + - type: Stack + count: 5 + - type: Physics + canCollide: False + - uid: 290 + components: + - type: Transform + parent: 100 + - type: Stack + count: 5 + - type: Physics + canCollide: False + - uid: 297 + components: + - type: Transform + parent: 101 + - type: Stack + count: 5 + - type: Physics + canCollide: False + - uid: 304 + components: + - type: Transform + parent: 102 + - type: Stack + count: 5 + - type: Physics + canCollide: False +- proto: SignalButton + entities: + - uid: 205 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-3.5 + parent: 325 + - type: DeviceLinkSource + linkedPorts: + 193: + - Pressed: Toggle + 192: + - Pressed: Toggle + 190: + - Pressed: Toggle + 191: + - Pressed: Toggle + 196: + - Pressed: Toggle + 202: + - Pressed: Toggle + 201: + - Pressed: Toggle + 200: + - Pressed: Toggle + 199: + - Pressed: Toggle + 198: + - Pressed: Toggle +- proto: SignSpace + entities: + - uid: 230 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 325 +- proto: SoapSyndie + entities: + - uid: 90 + components: + - type: Transform + pos: 0.5436061,-7.5129323 + parent: 325 +- proto: SpawnPointNukies + entities: + - uid: 322 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 325 +- proto: StealthBox + entities: + - uid: 106 + components: + - type: Transform + pos: 0.49860507,-2.4513345 + parent: 325 + - type: Stealth + enabled: False + - type: EntityStorage + open: True +- proto: SubstationWallBasic + entities: + - uid: 103 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 325 + - type: PowerNetworkBattery + loadingNetworkDemand: 15106.935 + currentReceiving: 15105.06 + currentSupply: 15106.935 + supplyRampPosition: 1.875 +- proto: SuitStorageSyndie + entities: + - uid: 67 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 325 +- proto: SyndicateCommsComputerCircuitboard + entities: + - uid: 246 + components: + - type: Transform + parent: 65 + - type: Physics + canCollide: False +- proto: SyndicateComputerComms + entities: + - uid: 65 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,0.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 246 +- proto: SyndicateIDCard + entities: + - uid: 324 + components: + - type: Transform + pos: 1.57673,-2.3849022 + parent: 325 +- proto: SyndicateShuttleConsoleCircuitboard + entities: + - uid: 245 + components: + - type: Transform + parent: 64 + - type: Physics + canCollide: False +- proto: Table + entities: + - uid: 165 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 325 +- proto: TableWood + entities: + - uid: 45 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 325 +- proto: Thruster + entities: + - uid: 95 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-9.5 + parent: 325 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: + - 249 + machine_parts: !type:Container + showEnts: False + occludes: True + ents: + - 250 + - 251 + - 252 + - 253 + - 254 + - 255 + - uid: 96 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-9.5 + parent: 325 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: + - 256 + machine_parts: !type:Container + showEnts: False + occludes: True + ents: + - 257 + - 258 + - 259 + - 260 + - 261 + - 262 + - uid: 97 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-4.5 + parent: 325 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: + - 263 + machine_parts: !type:Container + showEnts: False + occludes: True + ents: + - 264 + - 265 + - 266 + - 267 + - 268 + - 269 + - uid: 98 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-5.5 + parent: 325 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: + - 270 + machine_parts: !type:Container + showEnts: False + occludes: True + ents: + - 271 + - 272 + - 273 + - 274 + - 275 + - 276 + - uid: 99 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-4.5 + parent: 325 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: + - 277 + machine_parts: !type:Container + showEnts: False + occludes: True + ents: + - 278 + - 279 + - 280 + - 281 + - 282 + - 283 + - uid: 100 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-5.5 + parent: 325 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: + - 284 + machine_parts: !type:Container + showEnts: False + occludes: True + ents: + - 285 + - 286 + - 287 + - 288 + - 289 + - 290 + - uid: 101 + components: + - type: Transform + pos: -3.5,1.5 + parent: 325 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: + - 291 + machine_parts: !type:Container + showEnts: False + occludes: True + ents: + - 292 + - 293 + - 294 + - 295 + - 296 + - 297 + - uid: 102 components: - type: Transform - pos: 3.5,1.5 - parent: 1 -- proto: SyndieDisasterVictimSpawner + pos: 2.5,1.5 + parent: 325 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: + - 298 + machine_parts: !type:Container + showEnts: False + occludes: True + ents: + - 299 + - 300 + - 301 + - 302 + - 303 + - 304 +- proto: ThrusterMachineCircuitboard entities: - - uid: 89 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 90 + - uid: 249 components: - type: Transform - pos: 0.5,1.5 - parent: 1 - - uid: 91 + parent: 95 + - type: Physics + canCollide: False + - uid: 256 components: - type: Transform - pos: 2.5,1.5 - parent: 1 -- proto: TableGlass - entities: - - uid: 163 + parent: 96 + - type: Physics + canCollide: False + - uid: 263 components: - type: Transform - pos: -0.5,1.5 - parent: 1 -- proto: Thruster - entities: - - uid: 103 + parent: 97 + - type: Physics + canCollide: False + - uid: 270 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-3.5 - parent: 1 - - uid: 104 + parent: 98 + - type: Physics + canCollide: False + - uid: 277 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-3.5 - parent: 1 - - uid: 105 + parent: 99 + - type: Physics + canCollide: False + - uid: 284 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-3.5 - parent: 1 - - uid: 106 + parent: 100 + - type: Physics + canCollide: False + - uid: 291 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-1.5 - parent: 1 - - uid: 107 + parent: 101 + - type: Physics + canCollide: False + - uid: 298 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-1.5 - parent: 1 + parent: 102 + - type: Physics + canCollide: False - proto: ToolboxSyndicateFilled entities: - - uid: 96 + - uid: 177 components: - type: Transform - parent: 92 + pos: 1.5699697,-0.44908836 + parent: 325 - type: Physics canCollide: False - - type: InsideEntityStorage -- proto: VendingMachineTankDispenserEVA +- proto: ToyFigurineNukie entities: - - uid: 108 + - uid: 10 components: - type: Transform - pos: -0.5,-0.5 - parent: 1 + pos: -2.3371089,-2.140279 + parent: 325 +- proto: VendingMachineSyndieDrobe + entities: + - uid: 163 + components: + - type: Transform + pos: -2.5,-0.5 + parent: 325 - proto: WallPlastitanium entities: - - uid: 109 + - uid: 7 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-0.5 - parent: 1 - - uid: 110 + pos: -2.5,0.5 + parent: 325 + - uid: 8 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,1.5 - parent: 1 - - uid: 111 + pos: -3.5,0.5 + parent: 325 + - uid: 9 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,5.5 - parent: 1 - - uid: 112 + pos: -3.5,-0.5 + parent: 325 + - uid: 11 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,6.5 - parent: 1 - - uid: 113 + pos: 1.5,0.5 + parent: 325 + - uid: 12 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,3.5 - parent: 1 - - uid: 114 + pos: 2.5,0.5 + parent: 325 + - uid: 13 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-0.5 - parent: 1 - - uid: 115 + pos: -4.5,-0.5 + parent: 325 + - uid: 22 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,2.5 - parent: 1 - - uid: 116 + pos: 3.5,-0.5 + parent: 325 + - uid: 25 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,2.5 - parent: 1 - - uid: 117 + pos: 3.5,-2.5 + parent: 325 + - uid: 27 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,1.5 - parent: 1 - - uid: 118 + pos: -3.5,-2.5 + parent: 325 + - uid: 28 components: - type: Transform rot: -1.5707963267948966 rad - pos: -3.5,-0.5 - parent: 1 - - uid: 119 + pos: -3.5,-6.5 + parent: 325 + - uid: 29 components: - type: Transform rot: -1.5707963267948966 rad - pos: -4.5,3.5 - parent: 1 - - uid: 120 + pos: 2.5,-6.5 + parent: 325 + - uid: 30 components: - type: Transform rot: -1.5707963267948966 rad - pos: -4.5,-0.5 - parent: 1 - - uid: 121 + pos: -2.5,-6.5 + parent: 325 + - uid: 31 components: - type: Transform rot: -1.5707963267948966 rad - pos: -3.5,3.5 - parent: 1 - - uid: 122 + pos: -3.5,-8.5 + parent: 325 + - uid: 32 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,1.5 - parent: 1 - - uid: 123 + pos: -2.5,-8.5 + parent: 325 + - uid: 33 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,4.5 - parent: 1 - - uid: 124 + pos: 1.5,-6.5 + parent: 325 + - uid: 34 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,1.5 - parent: 1 - - uid: 125 + pos: 1.5,-3.5 + parent: 325 + - uid: 35 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,-1.5 - parent: 1 - - uid: 126 + pos: -2.5,-9.5 + parent: 325 + - uid: 36 components: - type: Transform rot: -1.5707963267948966 rad - pos: -2.5,1.5 - parent: 1 - - uid: 127 + pos: 1.5,-8.5 + parent: 325 + - uid: 37 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,5.5 - parent: 1 - - uid: 128 + pos: 1.5,-9.5 + parent: 325 + - uid: 38 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,2.5 - parent: 1 - - uid: 129 + pos: -4.5,-2.5 + parent: 325 + - uid: 39 components: - type: Transform rot: -1.5707963267948966 rad - pos: -3.5,-1.5 - parent: 1 - - uid: 130 + pos: 2.5,-3.5 + parent: 325 + - uid: 44 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,3.5 - parent: 1 - - uid: 131 + pos: 2.5,-8.5 + parent: 325 + - uid: 48 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,4.5 - parent: 1 - - uid: 132 + pos: 2.5,-7.5 + parent: 325 + - uid: 49 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,6.5 - parent: 1 - - uid: 133 + pos: -3.5,-7.5 + parent: 325 + - uid: 54 components: - type: Transform rot: -1.5707963267948966 rad - pos: -4.5,2.5 - parent: 1 - - uid: 134 + pos: -2.5,-3.5 + parent: 325 + - uid: 55 components: - type: Transform rot: -1.5707963267948966 rad - pos: 3.5,1.5 - parent: 1 - - uid: 135 + pos: -3.5,-3.5 + parent: 325 + - uid: 60 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-1.5 - parent: 1 - - uid: 136 + rot: 3.141592653589793 rad + pos: -1.5,-6.5 + parent: 325 + - uid: 61 components: - type: Transform - pos: -0.5,-2.5 - parent: 1 - - uid: 137 + rot: 3.141592653589793 rad + pos: 0.5,-6.5 + parent: 325 + - uid: 62 components: - type: Transform - pos: 0.5,-2.5 - parent: 1 - - uid: 138 + rot: 3.141592653589793 rad + pos: -1.5,-3.5 + parent: 325 + - uid: 63 components: - type: Transform - pos: 1.5,-2.5 - parent: 1 - - uid: 139 + rot: 3.141592653589793 rad + pos: 0.5,-3.5 + parent: 325 + - uid: 66 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-1.5 - parent: 1 - - uid: 140 + pos: 0.5,-9.5 + parent: 325 + - uid: 69 components: - type: Transform - pos: 3.5,-0.5 - parent: 1 - - uid: 141 + pos: -2.5,1.5 + parent: 325 + - uid: 73 components: - type: Transform - pos: -2.5,-0.5 - parent: 1 - - uid: 142 + pos: 1.5,1.5 + parent: 325 + - uid: 80 components: - type: Transform - pos: -3.5,-2.5 - parent: 1 - - uid: 143 + pos: 2.5,-2.5 + parent: 325 + - uid: 81 components: - type: Transform - pos: 4.5,-2.5 - parent: 1 -- proto: WallPlastitaniumDiagonal - entities: - - uid: 144 + pos: 2.5,-0.5 + parent: 325 + - uid: 92 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,1.5 - parent: 1 - - uid: 145 + pos: -1.5,-9.5 + parent: 325 + - uid: 108 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-0.5 - parent: 1 - - uid: 146 + pos: -0.5,-9.5 + parent: 325 +- proto: WallPlastitaniumDiagonal + entities: + - uid: 23 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-1.5 - parent: 1 - - uid: 147 + pos: -4.5,0.5 + parent: 325 + - uid: 43 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,4.5 - parent: 1 - - uid: 148 - components: - - type: Transform - pos: -3.5,7.5 - parent: 1 - - uid: 149 - components: - - type: Transform - pos: -4.5,4.5 - parent: 1 - - uid: 150 + pos: 3.5,0.5 + parent: 325 + - uid: 68 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,7.5 - parent: 1 - - uid: 151 - components: - - type: Transform - pos: -5.5,1.5 - parent: 1 - - uid: 152 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,-0.5 - parent: 1 - - uid: 153 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-1.5 - parent: 1 - - uid: 154 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-2.5 - parent: 1 - - uid: 155 + pos: 1.5,2.5 + parent: 325 + - uid: 79 components: - type: Transform rot: 1.5707963267948966 rad - pos: -1.5,-2.5 - parent: 1 - - uid: 156 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-0.5 - parent: 1 - - uid: 157 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 1 - - uid: 158 + pos: -4.5,-3.5 + parent: 325 + - uid: 82 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-1.5 - parent: 1 - - uid: 159 + rot: 3.141592653589793 rad + pos: 3.5,-3.5 + parent: 325 + - uid: 86 components: - type: Transform - pos: 1.5,-1.5 - parent: 1 - - uid: 160 + pos: -2.5,2.5 + parent: 325 +- proto: WindoorSecure + entities: + - uid: 166 components: - type: Transform rot: 1.5707963267948966 rad - pos: -3.5,-3.5 - parent: 1 - - uid: 161 + pos: -3.5,-1.5 + parent: 325 + - uid: 206 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.5,-3.5 - parent: 1 + pos: -0.5,-0.5 + parent: 325 + - type: ContainerContainer + containers: + board: !type:Container + showEnts: False + occludes: True + ents: + - 346 ... diff --git a/Resources/Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml b/Resources/Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml index 7b6812c493b..eab45209108 100644 --- a/Resources/Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml +++ b/Resources/Maps/Shuttles/ShuttleEvent/traveling_china_cuisine.yml @@ -169,16 +169,18 @@ entities: - type: Transform pos: 2.5,-1.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 5 components: - type: Transform + rot: -1.5707963267948966 rad pos: -3.5,-4.5 parent: 1 - uid: 6 components: - type: Transform + rot: -1.5707963267948966 rad pos: -3.5,-0.5 parent: 1 - proto: BarSignMaidCafe @@ -196,9 +198,6 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 161 - proto: Bucket entities: - uid: 9 @@ -1017,7 +1016,7 @@ entities: - uid: 115 components: - type: Transform - pos: -2.4682944,-0.4437158 + pos: -2.4622643,-0.46992433 parent: 1 - proto: GeneratorWallmountAPU entities: @@ -1349,33 +1348,21 @@ entities: - type: Transform pos: -0.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 160 - uid: 150 components: - type: Transform pos: -0.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 160 - uid: 151 components: - type: Transform pos: -0.5,-5.5 parent: 1 - - type: DeviceLinkSink - links: - - 160 - uid: 152 components: - type: Transform pos: -3.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 160 - proto: ShuttleWindow entities: - uid: 153 @@ -1459,7 +1446,7 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-6.5 parent: 1 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 164 components: diff --git a/Resources/Maps/Shuttles/arrivals.yml b/Resources/Maps/Shuttles/arrivals.yml index 2fe16cd3038..b4609e1b0ae 100644 --- a/Resources/Maps/Shuttles/arrivals.yml +++ b/Resources/Maps/Shuttles/arrivals.yml @@ -199,8 +199,6 @@ entities: - type: Transform pos: -1.5,7.5 parent: 292 - - type: AtmosDevice - joinedGrid: 292 - proto: AirlockCommandGlassLocked entities: - uid: 278 @@ -218,24 +216,48 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,-2.5 parent: 292 + - type: Door + secondsUntilStateChange: -336.60016 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - uid: 178 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,4.5 parent: 292 + - type: Door + secondsUntilStateChange: -338.3335 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - uid: 179 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,4.5 parent: 292 + - type: Door + secondsUntilStateChange: -332.80017 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - uid: 180 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-2.5 parent: 292 + - type: Door + secondsUntilStateChange: -334.70016 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - proto: APCBasic entities: - uid: 116 @@ -256,26 +278,30 @@ entities: - type: Transform pos: 3.5,3.5 parent: 292 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 164 components: - type: Transform - pos: 3.5,-2.5 + rot: -1.5707963267948966 rad + pos: -4.5,4.5 parent: 292 - uid: 165 components: - type: Transform + rot: 1.5707963267948966 rad pos: 3.5,4.5 parent: 292 - uid: 166 components: - type: Transform - pos: -4.5,4.5 + rot: 1.5707963267948966 rad + pos: 3.5,-2.5 parent: 292 - uid: 167 components: - type: Transform + rot: -1.5707963267948966 rad pos: -4.5,-2.5 parent: 292 - proto: BlockGameArcade @@ -997,6 +1023,22 @@ entities: - type: Transform pos: 2.5,5.5 parent: 292 + - type: GroupExamine + group: + - hoverMessage: "" + contextText: verb-examine-group-other + icon: /Textures/Interface/examine-star.png + components: + - Armor + - ClothingSpeedModifier + entries: + - message: >- + It provides the following protection: + + - [color=orange]Explosion[/color] damage [color=white]to contents[/color] reduced by [color=lightblue]10%[/color]. + priority: 0 + component: Armor + title: null - proto: ClothingMaskBreath entities: - uid: 272 @@ -1049,8 +1091,6 @@ entities: - type: Transform pos: -0.5,7.5 parent: 292 - - type: AtmosDevice - joinedGrid: 292 - proto: GasPipeBend entities: - uid: 182 @@ -1221,8 +1261,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,7.5 parent: 292 - - type: AtmosDevice - joinedGrid: 292 - proto: GasVentPump entities: - uid: 212 @@ -1230,16 +1268,12 @@ entities: - type: Transform pos: -0.5,-2.5 parent: 292 - - type: AtmosDevice - joinedGrid: 292 - uid: 213 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,4.5 parent: 292 - - type: AtmosDevice - joinedGrid: 292 - proto: GeneratorBasic15kW entities: - uid: 114 diff --git a/Resources/Maps/Shuttles/briggle.yml b/Resources/Maps/Shuttles/briggle.yml index 4778896e025..0a7646393a2 100644 --- a/Resources/Maps/Shuttles/briggle.yml +++ b/Resources/Maps/Shuttles/briggle.yml @@ -143,12 +143,12 @@ entities: - type: Transform pos: 0.5,-10.5 parent: 1 - - type: Door - secondsUntilStateChange: -81.781815 - state: Opening - type: DeviceLinkSource lastSignals: DoorStatus: True + - type: Door + secondsUntilStateChange: -347.64847 + state: Opening - proto: AirlockSecurityGlassLocked entities: - uid: 73 @@ -170,9 +170,9 @@ entities: - type: Transform pos: -0.5,-7.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 83 + - uid: 57 components: - type: Transform pos: 0.5,-10.5 @@ -829,6 +829,14 @@ entities: Glip Glorp, NanoTrasen Motorpool Division +- proto: PlushieRouny + entities: + - uid: 83 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.53599805,-6.526394 + parent: 1 - proto: PortableGeneratorPacman entities: - uid: 41 diff --git a/Resources/Maps/Shuttles/cargo.yml b/Resources/Maps/Shuttles/cargo.yml index d8f3976e815..dab78a01026 100644 --- a/Resources/Maps/Shuttles/cargo.yml +++ b/Resources/Maps/Shuttles/cargo.yml @@ -166,8 +166,6 @@ entities: - type: Transform pos: -3.5,-1.5 parent: 173 - - type: AtmosDevice - joinedGrid: 173 - proto: AirlockGlassShuttle entities: - uid: 45 @@ -201,27 +199,31 @@ entities: - type: Transform pos: -0.5,6.5 parent: 173 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 168 components: - type: Transform - pos: -5.5,1.5 + rot: -1.5707963267948966 rad + pos: -5.5,3.5 parent: 173 - uid: 169 components: - type: Transform - pos: -5.5,3.5 + rot: 1.5707963267948966 rad + pos: 0.5,3.5 parent: 173 - uid: 170 components: - type: Transform - pos: 0.5,3.5 + rot: 1.5707963267948966 rad + pos: 0.5,1.5 parent: 173 - uid: 171 components: - type: Transform - pos: 0.5,1.5 + rot: -1.5707963267948966 rad + pos: -5.5,1.5 parent: 173 - proto: BlastDoor entities: @@ -230,33 +232,21 @@ entities: - type: Transform pos: 0.5,4.5 parent: 173 - - type: DeviceLinkSink - links: - - 57 - uid: 3 components: - type: Transform pos: -5.5,0.5 parent: 173 - - type: DeviceLinkSink - links: - - 55 - uid: 54 components: - type: Transform pos: 0.5,0.5 parent: 173 - - type: DeviceLinkSink - links: - - 58 - uid: 56 components: - type: Transform pos: -5.5,4.5 parent: 173 - - type: DeviceLinkSink - links: - - 2 - proto: CableApcExtension entities: - uid: 100 @@ -606,108 +596,72 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,4.5 parent: 173 - - type: DeviceLinkSink - links: - - 36 - uid: 39 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,4.5 parent: 173 - - type: DeviceLinkSink - links: - - 36 - uid: 40 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,4.5 parent: 173 - - type: DeviceLinkSink - links: - - 36 - uid: 41 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,0.5 parent: 173 - - type: DeviceLinkSink - links: - - 34 - uid: 42 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,0.5 parent: 173 - - type: DeviceLinkSink - links: - - 34 - uid: 43 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,0.5 parent: 173 - - type: DeviceLinkSink - links: - - 34 - uid: 46 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,0.5 parent: 173 - - type: DeviceLinkSink - links: - - 35 - uid: 47 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,4.5 parent: 173 - - type: DeviceLinkSink - links: - - 37 - uid: 48 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,4.5 parent: 173 - - type: DeviceLinkSink - links: - - 37 - uid: 49 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,4.5 parent: 173 - - type: DeviceLinkSink - links: - - 37 - uid: 51 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,0.5 parent: 173 - - type: DeviceLinkSink - links: - - 35 - uid: 167 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,0.5 parent: 173 - - type: DeviceLinkSink - links: - - 35 - proto: GasPipeBend entities: - uid: 134 @@ -744,8 +698,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,-1.5 parent: 173 - - type: AtmosDevice - joinedGrid: 173 - proto: GasVentPump entities: - uid: 138 @@ -753,8 +705,6 @@ entities: - type: Transform pos: -2.5,2.5 parent: 173 - - type: AtmosDevice - joinedGrid: 173 - proto: GeneratorBasic15kW entities: - uid: 83 diff --git a/Resources/Maps/Shuttles/cargo_core.yml b/Resources/Maps/Shuttles/cargo_core.yml index 0c495835b9a..dcbd4a972c6 100644 --- a/Resources/Maps/Shuttles/cargo_core.yml +++ b/Resources/Maps/Shuttles/cargo_core.yml @@ -169,8 +169,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: AirCanister entities: - uid: 147 @@ -181,8 +179,6 @@ entities: parent: 2 - type: Physics bodyType: Static - - type: AtmosDevice - joinedGrid: 2 - proto: AirlockGlassShuttle entities: - uid: 131 @@ -205,22 +201,26 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-7.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 139 + - uid: 29 components: - type: Transform - pos: -0.5,-2.5 + rot: -1.5707963267948966 rad + pos: -0.5,-4.5 parent: 2 - - uid: 140 + - uid: 141 components: - type: Transform - pos: -0.5,-1.5 + rot: -1.5707963267948966 rad + pos: -0.5,-2.5 parent: 2 - - uid: 141 +- proto: AtmosDeviceFanTiny + entities: + - uid: 140 components: - type: Transform - pos: -0.5,-4.5 + pos: -0.5,-1.5 parent: 2 - uid: 142 components: @@ -234,17 +234,11 @@ entities: - type: Transform pos: -0.5,-5.5 parent: 2 - - type: DeviceLinkSink - links: - - 137 - uid: 136 components: - type: Transform pos: -0.5,-1.5 parent: 2 - - type: DeviceLinkSink - links: - - 138 - proto: CableApcExtension entities: - uid: 104 @@ -588,36 +582,24 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-5.5 parent: 2 - - type: DeviceLinkSink - links: - - 152 - uid: 75 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-5.5 parent: 2 - - type: DeviceLinkSink - links: - - 152 - uid: 76 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-1.5 parent: 2 - - type: DeviceLinkSink - links: - - 151 - uid: 77 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-1.5 parent: 2 - - type: DeviceLinkSink - links: - - 151 - proto: GasPassiveVent entities: - uid: 143 @@ -625,8 +607,6 @@ entities: - type: Transform pos: -0.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPipeBend entities: - uid: 148 @@ -651,8 +631,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPressurePump entities: - uid: 150 @@ -661,8 +639,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasVentPump entities: - uid: 95 @@ -671,8 +647,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasVentScrubber entities: - uid: 144 @@ -681,8 +655,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GeneratorBasic15kW entities: - uid: 96 @@ -838,12 +810,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-3.5 parent: 2 - - uid: 29 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-4.5 - parent: 2 - uid: 30 components: - type: Transform @@ -856,6 +822,12 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-3.5 parent: 2 + - uid: 139 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-4.5 + parent: 2 - proto: SignalButton entities: - uid: 137 diff --git a/Resources/Maps/Shuttles/cargo_fland.yml b/Resources/Maps/Shuttles/cargo_fland.yml index e91e228e5cf..7a48231abbd 100644 --- a/Resources/Maps/Shuttles/cargo_fland.yml +++ b/Resources/Maps/Shuttles/cargo_fland.yml @@ -183,8 +183,6 @@ entities: - type: Transform pos: 4.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: Lock locked: True - proto: AirlockGlassShuttle @@ -196,7 +194,7 @@ entities: pos: 0.5,0.5 parent: 1 - type: Door - secondsUntilStateChange: -4823.494 + secondsUntilStateChange: -4923.5425 state: Opening - uid: 51 components: @@ -205,7 +203,7 @@ entities: pos: 0.5,2.5 parent: 1 - type: Door - secondsUntilStateChange: -4822.5273 + secondsUntilStateChange: -4922.5757 state: Opening - uid: 52 components: @@ -214,7 +212,7 @@ entities: pos: 6.5,2.5 parent: 1 - type: Door - secondsUntilStateChange: -4821.5938 + secondsUntilStateChange: -4921.642 state: Opening - uid: 53 components: @@ -223,7 +221,7 @@ entities: pos: 6.5,0.5 parent: 1 - type: Door - secondsUntilStateChange: -4836.5938 + secondsUntilStateChange: -4936.642 state: Opening - proto: APCBasic entities: @@ -233,27 +231,31 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-3.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 158 components: - type: Transform - pos: 0.5,0.5 + rot: 1.5707963267948966 rad + pos: 6.5,2.5 parent: 1 - uid: 159 components: - type: Transform - pos: 0.5,2.5 + rot: 1.5707963267948966 rad + pos: 6.5,0.5 parent: 1 - uid: 160 components: - type: Transform - pos: 6.5,2.5 + rot: -1.5707963267948966 rad + pos: 0.5,0.5 parent: 1 - uid: 161 components: - type: Transform - pos: 6.5,0.5 + rot: -1.5707963267948966 rad + pos: 0.5,2.5 parent: 1 - proto: BlastDoor entities: @@ -262,33 +264,21 @@ entities: - type: Transform pos: 0.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 145 - uid: 90 components: - type: Transform pos: 0.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 145 - uid: 99 components: - type: Transform pos: 6.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 43 - uid: 100 components: - type: Transform pos: 6.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 43 - proto: CableApcExtension entities: - uid: 124 @@ -610,72 +600,48 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 88 - uid: 92 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 88 - uid: 93 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 87 - uid: 94 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 87 - uid: 95 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 87 - uid: 96 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 87 - uid: 97 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 88 - uid: 98 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 88 - proto: DisposalPipe entities: - uid: 83 @@ -777,8 +743,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasVentPump entities: - uid: 115 @@ -787,16 +751,12 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 168 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GeneratorBasic15kW entities: - uid: 106 diff --git a/Resources/Maps/Shuttles/dart.yml b/Resources/Maps/Shuttles/dart.yml index c44dfe890df..a3c552b84ab 100644 --- a/Resources/Maps/Shuttles/dart.yml +++ b/Resources/Maps/Shuttles/dart.yml @@ -838,22 +838,16 @@ entities: - type: Transform pos: 2.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 127 components: - type: Transform pos: 2.5,1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 128 components: - type: Transform pos: 2.5,0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: AirlockAtmosphericsLocked entities: - uid: 419 @@ -933,12 +927,6 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-1.5 parent: 1 - - uid: 414 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-0.5 - parent: 1 - uid: 415 components: - type: Transform @@ -957,6 +945,12 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-2.5 parent: 1 + - uid: 813 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-0.5 + parent: 1 - proto: AirlockGlass entities: - uid: 73 @@ -1008,37 +1002,43 @@ entities: rot: 3.141592653589793 rad pos: -1.5,4.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 808 + - uid: 414 components: - type: Transform - pos: -9.5,-0.5 + rot: -1.5707963267948966 rad + pos: -9.5,-2.5 parent: 1 - - uid: 809 + - uid: 808 components: - type: Transform + rot: -1.5707963267948966 rad pos: -9.5,-1.5 parent: 1 - - uid: 810 + - uid: 809 components: - type: Transform - pos: -9.5,-2.5 + rot: -1.5707963267948966 rad + pos: -9.5,-0.5 parent: 1 - - uid: 811 + - uid: 810 components: - type: Transform - pos: 8.5,-0.5 + rot: 1.5707963267948966 rad + pos: 8.5,-2.5 parent: 1 - - uid: 812 + - uid: 811 components: - type: Transform + rot: 1.5707963267948966 rad pos: 8.5,-1.5 parent: 1 - - uid: 813 + - uid: 812 components: - type: Transform - pos: 8.5,-2.5 + rot: 1.5707963267948966 rad + pos: 8.5,-0.5 parent: 1 - proto: AtmosFixNitrogenMarker entities: @@ -1099,89 +1099,56 @@ entities: - type: Transform pos: -5.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 111 - uid: 807 components: - type: Transform pos: -5.5,-14.5 parent: 1 - - type: DeviceLinkSink - links: - - 111 - uid: 816 components: - type: Transform pos: -5.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 111 - uid: 817 components: - type: Transform pos: -0.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 823 - uid: 818 components: - type: Transform pos: 0.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 823 - uid: 819 components: - type: Transform pos: 4.5,-14.5 parent: 1 - - type: DeviceLinkSink - links: - - 822 - uid: 820 components: - type: Transform pos: 4.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 769 - uid: 821 components: - type: Transform pos: -1.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 823 - uid: 824 components: - type: Transform pos: 4.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 769 - uid: 825 components: - type: Transform pos: 4.5,-13.5 parent: 1 - - type: DeviceLinkSink - links: - - 822 - uid: 826 components: - type: Transform pos: -5.5,-13.5 parent: 1 - - type: DeviceLinkSink - links: - - 111 - proto: BoozeDispenser entities: - uid: 444 @@ -2700,13 +2667,6 @@ entities: - type: Transform pos: -3.882896,-2.509187 parent: 1 -- proto: chem_master - entities: - - uid: 891 - components: - - type: Transform - pos: -3.5,-4.5 - parent: 1 - proto: ChemDispenser entities: - uid: 783 @@ -2721,6 +2681,13 @@ entities: - type: Transform pos: -4.5,-5.5 parent: 1 +- proto: ChemMaster + entities: + - uid: 891 + components: + - type: Transform + pos: -3.5,-4.5 + parent: 1 - proto: CloningPod entities: - uid: 926 @@ -2728,9 +2695,6 @@ entities: - type: Transform pos: -4.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 927 - proto: ClosetFireFilled entities: - uid: 194 @@ -3208,8 +3172,6 @@ entities: - type: Transform pos: -8.5,-23.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasMinerOxygen entities: - uid: 734 @@ -3217,8 +3179,6 @@ entities: - type: Transform pos: -8.5,-21.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasMixerFlipped entities: - uid: 264 @@ -3229,8 +3189,6 @@ entities: - type: GasMixer inletTwoConcentration: 0.22000003 inletOneConcentration: 0.78 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent @@ -3241,24 +3199,18 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-21.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 259 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-23.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 407 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-19.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeBend @@ -3904,11 +3856,15 @@ entities: - uid: 289 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 0.5,-5.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 291 components: - type: Transform @@ -3989,8 +3945,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 146 @@ -3999,8 +3953,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 151 @@ -4009,8 +3961,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 360 @@ -4019,8 +3969,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 367 @@ -4029,8 +3977,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 368 @@ -4039,8 +3985,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GasPressurePump @@ -4053,8 +3997,6 @@ entities: parent: 1 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 326 @@ -4062,8 +4004,6 @@ entities: - type: Transform pos: 4.5,-0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GasVentPump @@ -4074,8 +4014,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-19.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 282 @@ -4084,8 +4022,6 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,-19.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 283 @@ -4094,8 +4030,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-16.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 311 @@ -4104,8 +4038,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 312 @@ -4114,8 +4046,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 313 @@ -4124,8 +4054,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 314 @@ -4134,8 +4062,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 315 @@ -4144,8 +4070,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 316 @@ -4154,8 +4078,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 317 @@ -4164,8 +4086,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 318 @@ -4174,8 +4094,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 319 @@ -4184,8 +4102,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -4196,8 +4112,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 387 @@ -4205,8 +4119,6 @@ entities: - type: Transform pos: 3.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 405 @@ -4215,8 +4127,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 406 @@ -4225,8 +4135,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - uid: 411 @@ -4234,8 +4142,6 @@ entities: - type: Transform pos: -4.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GeneratorBasic15kW @@ -4583,9 +4489,6 @@ entities: - type: Transform pos: -4.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 927 - proto: MegaSprayBottle entities: - uid: 903 @@ -5303,7 +5206,7 @@ entities: - type: Transform pos: -1.5,-7.5 parent: 1 -- proto: SignChemistry1 +- proto: SignChem entities: - uid: 893 components: @@ -5377,7 +5280,7 @@ entities: - type: Transform pos: 2.4920845,-8.564493 parent: 1 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 785 components: @@ -5391,13 +5294,6 @@ entities: - type: Transform pos: 3.5,-9.5 parent: 1 -- proto: SpawnMobDrone - entities: - - uid: 987 - components: - - type: Transform - pos: 2.5,-18.5 - parent: 1 - proto: SpawnMobMedibot entities: - uid: 986 diff --git a/Resources/Maps/Shuttles/emergency.yml b/Resources/Maps/Shuttles/emergency.yml index d2b09201b2e..e285d4a5ae7 100644 --- a/Resources/Maps/Shuttles/emergency.yml +++ b/Resources/Maps/Shuttles/emergency.yml @@ -202,8 +202,6 @@ entities: - type: Transform pos: -1.5,-3.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - proto: AirlockCommandGlassLocked entities: - uid: 353 @@ -292,47 +290,55 @@ entities: - type: Transform pos: -3.5,0.5 parent: 410 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 395 components: - type: Transform - pos: -7.5,5.5 + rot: -1.5707963267948966 rad + pos: -7.5,7.5 parent: 410 - uid: 396 components: - type: Transform - pos: -7.5,7.5 + rot: -1.5707963267948966 rad + pos: -7.5,-0.5 parent: 410 - uid: 397 components: - type: Transform - pos: 2.5,7.5 + rot: -1.5707963267948966 rad + pos: -7.5,5.5 parent: 410 - uid: 398 components: - type: Transform - pos: 2.5,5.5 + rot: -1.5707963267948966 rad + pos: -7.5,-2.5 parent: 410 - uid: 399 components: - type: Transform - pos: 2.5,-0.5 + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 parent: 410 - uid: 400 components: - type: Transform - pos: 2.5,-2.5 + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 parent: 410 - uid: 401 components: - type: Transform - pos: -7.5,-2.5 + rot: 1.5707963267948966 rad + pos: 2.5,5.5 parent: 410 - uid: 402 components: - type: Transform - pos: -7.5,-0.5 + rot: 1.5707963267948966 rad + pos: 2.5,7.5 parent: 410 - proto: BedsheetMedical entities: @@ -1251,8 +1257,6 @@ entities: - type: Transform pos: -1.5,-2.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - proto: GasPassiveVent entities: - uid: 270 @@ -1261,8 +1265,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-1.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - proto: GasPipeBend entities: - uid: 291 @@ -1459,8 +1461,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-3.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - proto: GasVentPump entities: - uid: 242 @@ -1469,45 +1469,33 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-1.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - uid: 243 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-1.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - uid: 244 components: - type: Transform pos: 0.5,6.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - uid: 245 components: - type: Transform pos: -5.5,6.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - uid: 246 components: - type: Transform pos: -2.5,12.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - uid: 247 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,6.5 parent: 410 - - type: AtmosDevice - joinedGrid: 410 - proto: GeneratorBasic15kW entities: - uid: 239 diff --git a/Resources/Maps/Shuttles/emergency_box.yml b/Resources/Maps/Shuttles/emergency_box.yml index 3aa6a3f7ea4..49d082c9952 100644 --- a/Resources/Maps/Shuttles/emergency_box.yml +++ b/Resources/Maps/Shuttles/emergency_box.yml @@ -26,7 +26,7 @@ entities: name: NT Evac Box - type: Transform pos: 0.06253052,0.58707 - parent: 484 + parent: invalid - type: MapGrid chunks: 0,0: @@ -492,18 +492,6 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: NavMap - - uid: 484 - components: - - type: MetaData - name: Map Entity - - type: Transform - - type: Map - mapPaused: True - - type: PhysicsMap - - type: GridTree - - type: MovedGrids - - type: Broadphase - - type: OccluderTree - proto: AirCanister entities: - uid: 526 @@ -612,26 +600,30 @@ entities: rot: 3.141592653589793 rad pos: 15.5,-4.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: + - uid: 484 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,1.5 + parent: 1 - uid: 580 components: - type: Transform + rot: -1.5707963267948966 rad pos: 0.5,9.5 parent: 1 - uid: 581 components: - type: Transform + rot: -1.5707963267948966 rad pos: 0.5,7.5 parent: 1 - uid: 582 components: - type: Transform - pos: 0.5,1.5 - parent: 1 - - uid: 583 - components: - - type: Transform + rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 1 - proto: BookHowToSurvive diff --git a/Resources/Maps/Shuttles/emergency_cluster.yml b/Resources/Maps/Shuttles/emergency_cluster.yml index 3cc14505fee..82f178aaca6 100644 --- a/Resources/Maps/Shuttles/emergency_cluster.yml +++ b/Resources/Maps/Shuttles/emergency_cluster.yml @@ -553,38 +553,43 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-18.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 472 components: - type: Transform - pos: 2.5,-7.5 + rot: 1.5707963267948966 rad + pos: 16.5,-7.5 parent: 2 - uid: 473 components: - type: Transform - pos: 2.5,-9.5 + rot: 1.5707963267948966 rad + pos: 16.5,-9.5 parent: 2 - uid: 475 components: - type: Transform - pos: 16.5,-9.5 + rot: -1.5707963267948966 rad + pos: 2.5,-7.5 parent: 2 - uid: 476 components: - type: Transform + rot: 1.5707963267948966 rad pos: 16.5,-15.5 parent: 2 - uid: 477 components: - type: Transform - pos: 16.5,-17.5 + rot: -1.5707963267948966 rad + pos: 2.5,-9.5 parent: 2 - - uid: 586 + - uid: 503 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-7.5 + rot: 1.5707963267948966 rad + pos: 16.5,-17.5 parent: 2 - proto: Bed entities: diff --git a/Resources/Maps/Shuttles/emergency_courser.yml b/Resources/Maps/Shuttles/emergency_courser.yml index f9ff40b8fa7..426fe055b47 100644 --- a/Resources/Maps/Shuttles/emergency_courser.yml +++ b/Resources/Maps/Shuttles/emergency_courser.yml @@ -598,55 +598,55 @@ entities: - type: Transform pos: 0.5,10.5 parent: 656 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 621 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,4.5 + rot: 1.5707963267948966 rad + pos: 6.5,2.5 parent: 656 - uid: 622 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,2.5 + rot: 1.5707963267948966 rad + pos: 6.5,4.5 parent: 656 - uid: 623 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-5.5 + rot: 1.5707963267948966 rad + pos: 6.5,-3.5 parent: 656 - uid: 624 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-3.5 + rot: 1.5707963267948966 rad + pos: 6.5,-5.5 parent: 656 - uid: 625 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,-3.5 + pos: -6.5,-5.5 parent: 656 - uid: 626 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,-5.5 + pos: -6.5,-3.5 parent: 656 - uid: 627 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,2.5 + pos: -6.5,2.5 parent: 656 - uid: 628 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,4.5 + pos: -6.5,4.5 parent: 656 - proto: Bed entities: diff --git a/Resources/Maps/Shuttles/emergency_delta.yml b/Resources/Maps/Shuttles/emergency_delta.yml index 20419b28721..0c092e23631 100644 --- a/Resources/Maps/Shuttles/emergency_delta.yml +++ b/Resources/Maps/Shuttles/emergency_delta.yml @@ -24,7 +24,7 @@ entities: name: NT Evac Delta - type: Transform pos: -0.5625,0.671875 - parent: 761 + parent: invalid - type: MapGrid chunks: 0,0: @@ -395,18 +395,6 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - uid: 761 - components: - - type: MetaData - name: Map Entity - - type: Transform - - type: Map - mapPaused: True - - type: PhysicsMap - - type: GridTree - - type: MovedGrids - - type: Broadphase - - type: OccluderTree - proto: AirCanister entities: - uid: 326 @@ -610,43 +598,45 @@ entities: - type: Transform pos: -4.5,-17.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 583 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-0.5 + rot: 1.5707963267948966 rad + pos: 2.5,-8.5 parent: 1 - - uid: 658 + - uid: 696 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-19.5 + rot: 1.5707963267948966 rad + pos: 2.5,-10.5 parent: 1 - - uid: 659 + - uid: 761 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-20.5 + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 parent: 1 - - uid: 696 + - uid: 763 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-2.5 + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 parent: 1 - - uid: 763 +- proto: AtmosDeviceFanTiny + entities: + - uid: 658 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-8.5 + pos: -5.5,-19.5 parent: 1 - - uid: 764 + - uid: 659 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-10.5 + pos: -5.5,-20.5 parent: 1 - proto: BorgCharger entities: diff --git a/Resources/Maps/Shuttles/emergency_lox.yml b/Resources/Maps/Shuttles/emergency_lox.yml index 0856b97c382..64455757de8 100644 --- a/Resources/Maps/Shuttles/emergency_lox.yml +++ b/Resources/Maps/Shuttles/emergency_lox.yml @@ -850,47 +850,55 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,9.5 parent: 670 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 640 + - uid: 231 components: - type: Transform - pos: -7.5,-2.5 + rot: -1.5707963267948966 rad + pos: -7.5,-0.5 parent: 670 - - uid: 641 + - uid: 232 components: - type: Transform - pos: -7.5,-0.5 + rot: -1.5707963267948966 rad + pos: -7.5,-2.5 parent: 670 - - uid: 642 + - uid: 234 components: - type: Transform - pos: 2.5,-2.5 + rot: -1.5707963267948966 rad + pos: -7.5,7.5 parent: 670 - - uid: 643 + - uid: 240 components: - type: Transform - pos: 2.5,-0.5 + rot: -1.5707963267948966 rad + pos: -7.5,5.5 parent: 670 - - uid: 644 + - uid: 241 components: - type: Transform - pos: 2.5,5.5 + rot: 1.5707963267948966 rad + pos: 2.5,7.5 parent: 670 - - uid: 645 + - uid: 242 components: - type: Transform - pos: 2.5,7.5 + rot: 1.5707963267948966 rad + pos: 2.5,5.5 parent: 670 - - uid: 646 + - uid: 264 components: - type: Transform - pos: -7.5,7.5 + rot: 1.5707963267948966 rad + pos: 2.5,-0.5 parent: 670 - - uid: 647 + - uid: 270 components: - type: Transform - pos: -7.5,5.5 + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 parent: 670 - proto: BedsheetMedical entities: diff --git a/Resources/Maps/Shuttles/emergency_meta.yml b/Resources/Maps/Shuttles/emergency_meta.yml index 091fe6a1f83..ba75195df9e 100644 --- a/Resources/Maps/Shuttles/emergency_meta.yml +++ b/Resources/Maps/Shuttles/emergency_meta.yml @@ -669,45 +669,46 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,-3.5 parent: 1 - - type: Apc - lastExternalState: Low - lastChargeState: Full - type: PowerNetworkBattery loadingNetworkDemand: 18077 currentReceiving: 18076.947 currentSupply: 18077 supplyRampPosition: 0.052734375 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 928 + - uid: 4 components: - type: Transform - pos: 14.5,1.5 + pos: -2.5,-11.5 parent: 1 - - uid: 929 + - uid: 33 components: - type: Transform - pos: 12.5,1.5 + rot: 3.141592653589793 rad + pos: 4.5,1.5 parent: 1 - - uid: 930 + - uid: 42 components: - type: Transform + rot: 3.141592653589793 rad pos: 6.5,1.5 parent: 1 - - uid: 931 + - uid: 43 components: - type: Transform - pos: 4.5,1.5 + pos: -1.5,-11.5 parent: 1 - - uid: 932 + - uid: 51 components: - type: Transform - pos: -1.5,-11.5 + rot: 3.141592653589793 rad + pos: 12.5,1.5 parent: 1 - - uid: 933 + - uid: 54 components: - type: Transform - pos: -2.5,-11.5 + rot: 3.141592653589793 rad + pos: 14.5,1.5 parent: 1 - proto: BedsheetMedical entities: diff --git a/Resources/Maps/Shuttles/emergency_omega.yml b/Resources/Maps/Shuttles/emergency_omega.yml index ad9c8379da5..f22e61ce167 100644 --- a/Resources/Maps/Shuttles/emergency_omega.yml +++ b/Resources/Maps/Shuttles/emergency_omega.yml @@ -808,47 +808,55 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,8.5 parent: 603 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 73 components: - type: Transform - pos: 5.5,3.5 + rot: 1.5707963267948966 rad + pos: 5.5,9.5 parent: 603 - uid: 77 components: - type: Transform - pos: -10.5,9.5 + rot: 1.5707963267948966 rad + pos: 5.5,3.5 parent: 603 - uid: 81 components: - type: Transform - pos: -10.5,1.5 + rot: 1.5707963267948966 rad + pos: 5.5,1.5 parent: 603 - uid: 93 components: - type: Transform - pos: -10.5,11.5 + rot: 1.5707963267948966 rad + pos: 5.5,11.5 parent: 603 - uid: 96 components: - type: Transform - pos: 5.5,1.5 + rot: -1.5707963267948966 rad + pos: -10.5,1.5 parent: 603 - uid: 108 components: - type: Transform - pos: 5.5,11.5 + rot: -1.5707963267948966 rad + pos: -10.5,3.5 parent: 603 - uid: 142 components: - type: Transform - pos: -10.5,3.5 + rot: -1.5707963267948966 rad + pos: -10.5,9.5 parent: 603 - uid: 237 components: - type: Transform - pos: 5.5,9.5 + rot: -1.5707963267948966 rad + pos: -10.5,11.5 parent: 603 - proto: Bed entities: diff --git a/Resources/Maps/Shuttles/emergency_raven.yml b/Resources/Maps/Shuttles/emergency_raven.yml index b7989a49cb3..0d7948c2349 100644 --- a/Resources/Maps/Shuttles/emergency_raven.yml +++ b/Resources/Maps/Shuttles/emergency_raven.yml @@ -1536,47 +1536,55 @@ entities: - type: Transform pos: 16.5,-21.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: + - uid: 2058 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 - uid: 2443 components: - type: Transform - pos: 0.5,-4.5 + rot: -1.5707963267948966 rad + pos: 0.5,5.5 parent: 1 - uid: 2444 components: - type: Transform - pos: 0.5,-2.5 + rot: -1.5707963267948966 rad + pos: 0.5,-4.5 parent: 1 - uid: 2445 components: - type: Transform - pos: 0.5,3.5 + rot: -1.5707963267948966 rad + pos: 0.5,-2.5 parent: 1 - uid: 2446 components: - type: Transform - pos: 0.5,5.5 + rot: 1.5707963267948966 rad + pos: 22.5,-4.5 parent: 1 - uid: 2447 components: - type: Transform - pos: 22.5,5.5 + rot: 1.5707963267948966 rad + pos: 22.5,-2.5 parent: 1 - uid: 2448 components: - type: Transform + rot: 1.5707963267948966 rad pos: 22.5,3.5 parent: 1 - uid: 2449 components: - type: Transform - pos: 22.5,-2.5 - parent: 1 - - uid: 2450 - components: - - type: Transform - pos: 22.5,-4.5 + rot: 1.5707963267948966 rad + pos: 22.5,5.5 parent: 1 - proto: AtmosFixNitrogenMarker entities: @@ -1677,439 +1685,266 @@ entities: - type: Transform pos: 4.5,10.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2232 components: - type: Transform pos: 4.5,11.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2233 components: - type: Transform pos: 4.5,12.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2234 components: - type: Transform pos: 7.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2235 components: - type: Transform pos: 8.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2236 components: - type: Transform pos: 9.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2237 components: - type: Transform pos: 13.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2238 components: - type: Transform pos: 14.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2239 components: - type: Transform pos: 15.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2240 components: - type: Transform pos: 18.5,12.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2241 components: - type: Transform pos: 18.5,11.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2242 components: - type: Transform pos: 18.5,10.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2243 components: - type: Transform pos: 13.5,18.5 parent: 1 - - type: DeviceLinkSink - links: - - 2274 - uid: 2244 components: - type: Transform pos: 14.5,18.5 parent: 1 - - type: DeviceLinkSink - links: - - 2274 - uid: 2245 components: - type: Transform pos: 9.5,18.5 parent: 1 - - type: DeviceLinkSink - links: - - 2274 - uid: 2246 components: - type: Transform pos: 8.5,18.5 parent: 1 - - type: DeviceLinkSink - links: - - 2274 - uid: 2247 components: - type: Transform pos: 7.5,22.5 parent: 1 - - type: DeviceLinkSink - links: - - 2274 - uid: 2248 components: - type: Transform pos: 15.5,22.5 parent: 1 - - type: DeviceLinkSink - links: - - 2274 - uid: 2249 components: - type: Transform pos: 19.5,24.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2250 components: - type: Transform pos: 19.5,25.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2251 components: - type: Transform pos: 19.5,26.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2252 components: - type: Transform pos: 18.5,26.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2253 components: - type: Transform pos: 18.5,27.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2254 components: - type: Transform pos: 17.5,27.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2255 components: - type: Transform pos: 16.5,27.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2256 components: - type: Transform pos: 16.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2257 components: - type: Transform pos: 15.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2258 components: - type: Transform pos: 14.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2259 components: - type: Transform pos: 13.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2260 components: - type: Transform pos: 12.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2261 components: - type: Transform pos: 11.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2262 components: - type: Transform pos: 10.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2263 components: - type: Transform pos: 9.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2264 components: - type: Transform pos: 8.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2265 components: - type: Transform pos: 7.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2266 components: - type: Transform pos: 6.5,28.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2267 components: - type: Transform pos: 6.5,27.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2268 components: - type: Transform pos: 5.5,27.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2269 components: - type: Transform pos: 4.5,27.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2270 components: - type: Transform pos: 4.5,26.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2271 components: - type: Transform pos: 3.5,26.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2272 components: - type: Transform pos: 3.5,25.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2273 components: - type: Transform pos: 3.5,24.5 parent: 1 - - type: DeviceLinkSink - links: - - 2275 - uid: 2283 components: - type: Transform pos: 12.5,-6.5 parent: 1 - - type: DeviceLinkSink - links: - - 2288 - uid: 2284 components: - type: Transform pos: 12.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2288 - uid: 2285 components: - type: Transform pos: 15.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2288 - uid: 2286 components: - type: Transform pos: 16.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2288 - uid: 2287 components: - type: Transform pos: 17.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2288 - uid: 2290 components: - type: Transform pos: 10.5,22.5 parent: 1 - - type: DeviceLinkSink - links: - - 2274 - uid: 2291 components: - type: Transform pos: 11.5,22.5 parent: 1 - - type: DeviceLinkSink - links: - - 2274 - uid: 2292 components: - type: Transform pos: 12.5,22.5 parent: 1 - - type: DeviceLinkSink - links: - - 2274 - uid: 2451 components: - type: Transform pos: 4.5,9.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - uid: 2452 components: - type: Transform pos: 18.5,9.5 parent: 1 - - type: DeviceLinkSink - links: - - 2276 - - 2277 - proto: BoozeDispenser entities: - uid: 2127 @@ -6694,19 +6529,19 @@ entities: rot: 3.141592653589793 rad pos: 16.5,23.5 parent: 1 -- proto: chem_master +- proto: ChemDispenser entities: - - uid: 1904 + - uid: 1905 components: - type: Transform - pos: 11.5,-4.5 + pos: 10.5,-4.5 parent: 1 -- proto: ChemDispenser +- proto: ChemMaster entities: - - uid: 1905 + - uid: 1904 components: - type: Transform - pos: 10.5,-4.5 + pos: 11.5,-4.5 parent: 1 - proto: CigarGoldCase entities: @@ -8107,8 +7942,6 @@ entities: - type: Transform pos: 8.5,-26.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasMinerOxygen entities: - uid: 1323 @@ -8116,8 +7949,6 @@ entities: - type: Transform pos: 14.5,-26.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasMixer entities: - uid: 1324 @@ -8129,8 +7960,6 @@ entities: - type: GasMixer inletTwoConcentration: 0.22000003 inletOneConcentration: 0.78 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent @@ -8141,16 +7970,12 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-27.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 1376 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,-27.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasPipeBend entities: - uid: 1380 @@ -10449,8 +10274,6 @@ entities: rot: 3.141592653589793 rad pos: 9.5,-24.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1498 @@ -10458,8 +10281,6 @@ entities: - type: Transform pos: 10.5,-21.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1499 @@ -10468,8 +10289,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-23.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1500 @@ -10478,8 +10297,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-20.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1501 @@ -10488,8 +10305,6 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,-23.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1502 @@ -10497,8 +10312,6 @@ entities: - type: Transform pos: 14.5,-20.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1503 @@ -10507,8 +10320,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-23.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1504 @@ -10517,8 +10328,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-20.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1505 @@ -10527,8 +10336,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,-25.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1506 @@ -10536,8 +10343,6 @@ entities: - type: Transform pos: 18.5,-15.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1507 @@ -10546,8 +10351,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-17.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1508 @@ -10556,8 +10359,6 @@ entities: rot: 3.141592653589793 rad pos: 9.5,-17.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1509 @@ -10565,8 +10366,6 @@ entities: - type: Transform pos: 4.5,-15.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1510 @@ -10575,8 +10374,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1511 @@ -10585,8 +10382,6 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,-14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1512 @@ -10595,8 +10390,6 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1513 @@ -10605,8 +10398,6 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,-6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1514 @@ -10615,8 +10406,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1515 @@ -10625,8 +10414,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1516 @@ -10634,8 +10421,6 @@ entities: - type: Transform pos: 6.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1517 @@ -10644,8 +10429,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1518 @@ -10654,8 +10437,6 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1519 @@ -10664,8 +10445,6 @@ entities: rot: 3.141592653589793 rad pos: 9.5,-12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1520 @@ -10674,8 +10453,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1521 @@ -10684,8 +10461,6 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,-13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1522 @@ -10694,8 +10469,6 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1523 @@ -10703,8 +10476,6 @@ entities: - type: Transform pos: 11.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1524 @@ -10712,8 +10483,6 @@ entities: - type: Transform pos: 10.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1525 @@ -10722,8 +10491,6 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1526 @@ -10732,8 +10499,6 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,-7.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1589 @@ -10742,8 +10507,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1590 @@ -10752,8 +10515,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1591 @@ -10761,8 +10522,6 @@ entities: - type: Transform pos: 6.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1592 @@ -10770,8 +10529,6 @@ entities: - type: Transform pos: 11.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1593 @@ -10779,8 +10536,6 @@ entities: - type: Transform pos: 16.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1594 @@ -10789,8 +10544,6 @@ entities: rot: 3.141592653589793 rad pos: 6.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1595 @@ -10799,8 +10552,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1596 @@ -10809,8 +10560,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1597 @@ -10819,8 +10568,6 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1598 @@ -10829,8 +10576,6 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1599 @@ -10839,8 +10584,6 @@ entities: rot: 1.5707963267948966 rad pos: 10.5,5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1600 @@ -10848,8 +10591,6 @@ entities: - type: Transform pos: 11.5,8.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1638 @@ -10858,8 +10599,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1639 @@ -10868,8 +10607,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1640 @@ -10878,8 +10615,6 @@ entities: rot: 3.141592653589793 rad pos: 8.5,12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1641 @@ -10888,8 +10623,6 @@ entities: rot: 3.141592653589793 rad pos: 9.5,9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1642 @@ -10898,8 +10631,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1644 @@ -10908,8 +10639,6 @@ entities: rot: 3.141592653589793 rad pos: 14.5,12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1645 @@ -10918,8 +10647,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1646 @@ -10928,8 +10655,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1691 @@ -10938,8 +10663,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,15.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1692 @@ -10948,8 +10671,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,7.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1693 @@ -10958,8 +10679,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1694 @@ -10968,8 +10687,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,16.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1695 @@ -10978,8 +10695,6 @@ entities: rot: 3.141592653589793 rad pos: 8.5,16.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1696 @@ -10988,8 +10703,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,16.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1697 @@ -10998,8 +10711,6 @@ entities: rot: 3.141592653589793 rad pos: 14.5,16.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1698 @@ -11008,8 +10719,6 @@ entities: rot: 3.141592653589793 rad pos: 18.5,16.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1699 @@ -11018,8 +10727,6 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,15.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1700 @@ -11028,8 +10735,6 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,7.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1701 @@ -11038,8 +10743,6 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1738 @@ -11048,8 +10751,6 @@ entities: rot: 3.141592653589793 rad pos: 8.5,20.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1739 @@ -11058,8 +10759,6 @@ entities: rot: 3.141592653589793 rad pos: 14.5,20.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1741 @@ -11067,8 +10766,6 @@ entities: - type: Transform pos: 8.5,26.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1742 @@ -11076,8 +10773,6 @@ entities: - type: Transform pos: 11.5,26.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1743 @@ -11085,8 +10780,6 @@ entities: - type: Transform pos: 14.5,26.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1744 @@ -11095,8 +10788,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,24.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1745 @@ -11105,8 +10796,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,20.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1746 @@ -11115,8 +10804,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,23.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1747 @@ -11125,8 +10812,6 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,20.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2293 @@ -11135,8 +10820,6 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,24.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GeneratorBasic15kW @@ -12897,41 +12580,26 @@ entities: - type: Transform pos: 9.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2289 - uid: 2279 components: - type: Transform pos: 10.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2289 - uid: 2280 components: - type: Transform pos: 11.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2289 - uid: 2281 components: - type: Transform pos: 12.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2289 - uid: 2282 components: - type: Transform pos: 13.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2289 - proto: ShuttleWindow entities: - uid: 2 @@ -13772,7 +13440,7 @@ entities: - type: Transform pos: 8.5,-21.5 parent: 1 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 2128 components: diff --git a/Resources/Maps/Shuttles/emergency_rod.yml b/Resources/Maps/Shuttles/emergency_rod.yml index 4235e1d57f0..cc9623712d3 100644 --- a/Resources/Maps/Shuttles/emergency_rod.yml +++ b/Resources/Maps/Shuttles/emergency_rod.yml @@ -771,8 +771,6 @@ entities: - type: Transform pos: 0.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: AirlockCommandLocked entities: - uid: 179 @@ -886,47 +884,55 @@ entities: - type: Transform pos: -4.5,17.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 395 + - uid: 236 components: - type: Transform - pos: -7.5,3.5 + rot: 1.5707963267948966 rad + pos: 4.5,3.5 parent: 2 - - uid: 396 + - uid: 237 components: - type: Transform - pos: -7.5,1.5 + rot: 1.5707963267948966 rad + pos: 4.5,-6.5 parent: 2 - - uid: 397 + - uid: 238 components: - type: Transform - pos: 4.5,3.5 + rot: 1.5707963267948966 rad + pos: 4.5,-4.5 parent: 2 - - uid: 398 + - uid: 239 components: - type: Transform + rot: 1.5707963267948966 rad pos: 4.5,1.5 parent: 2 - - uid: 399 + - uid: 240 components: - type: Transform - pos: 4.5,-4.5 + rot: -1.5707963267948966 rad + pos: -7.5,-6.5 parent: 2 - - uid: 400 + - uid: 241 components: - type: Transform - pos: 4.5,-6.5 + rot: -1.5707963267948966 rad + pos: -7.5,-4.5 parent: 2 - - uid: 401 + - uid: 242 components: - type: Transform - pos: -7.5,-6.5 + rot: -1.5707963267948966 rad + pos: -7.5,1.5 parent: 2 - - uid: 402 + - uid: 243 components: - type: Transform - pos: -7.5,-4.5 + rot: -1.5707963267948966 rad + pos: -7.5,3.5 parent: 2 - proto: BedsheetMedical entities: @@ -947,105 +953,66 @@ entities: - type: Transform pos: -6.5,20.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 706 components: - type: Transform pos: -6.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 707 components: - type: Transform pos: -5.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 708 components: - type: Transform pos: -4.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 709 components: - type: Transform pos: -3.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 710 components: - type: Transform pos: -2.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 711 components: - type: Transform pos: -1.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 712 components: - type: Transform pos: -0.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 713 components: - type: Transform pos: 0.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 714 components: - type: Transform pos: 1.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 715 components: - type: Transform pos: 3.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 716 components: - type: Transform pos: 2.5,21.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - uid: 717 components: - type: Transform pos: 3.5,20.5 parent: 2 - - type: DeviceLinkSink - links: - - 718 - proto: BoozeDispenser entities: - uid: 451 @@ -2466,8 +2433,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPassiveVent entities: - uid: 325 @@ -2476,8 +2441,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPipeBend entities: - uid: 317 @@ -2910,8 +2873,6 @@ entities: - type: Transform pos: 0.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasVentPump entities: - uid: 413 @@ -2920,60 +2881,44 @@ entities: rot: 3.141592653589793 rad pos: 3.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 414 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 415 components: - type: Transform pos: 3.5,4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 416 components: - type: Transform pos: -6.5,4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 417 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,11.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 418 components: - type: Transform rot: 1.5707963267948966 rad pos: -6.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 419 components: - type: Transform pos: 3.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 420 components: - type: Transform pos: -6.5,19.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GeneratorBasic15kW entities: - uid: 344 @@ -3947,7 +3892,7 @@ entities: - type: Transform pos: -0.5,-10.5 parent: 2 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 450 components: diff --git a/Resources/Maps/Shuttles/emergency_wode.yml b/Resources/Maps/Shuttles/emergency_wode.yml index 7dcd4a60eb6..96c75d012a3 100644 --- a/Resources/Maps/Shuttles/emergency_wode.yml +++ b/Resources/Maps/Shuttles/emergency_wode.yml @@ -18,26 +18,13 @@ tilemap: entities: - proto: "" entities: - - uid: 1 - components: - - type: MetaData - name: Map Entity - - type: Transform - - type: Map - mapPaused: True - - type: PhysicsMap - - type: GridTree - - type: MovedGrids - - type: Broadphase - - type: OccluderTree - - type: LoadedMap - uid: 2 components: - type: MetaData name: NT Evac Wode - type: Transform pos: -0.70836353,-1.958334 - parent: 1 + parent: invalid - type: MapGrid chunks: 0,0: @@ -669,55 +656,55 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,17.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: + - uid: 1 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,11.5 + parent: 2 - uid: 215 components: - type: Transform rot: -1.5707963267948966 rad - pos: -7.5,19.5 + pos: -7.5,9.5 parent: 2 - uid: 216 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,17.5 + pos: -7.5,17.5 parent: 2 - uid: 295 components: - type: Transform rot: -1.5707963267948966 rad - pos: -7.5,9.5 + pos: -7.5,19.5 parent: 2 - uid: 296 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,9.5 + rot: 1.5707963267948966 rad + pos: 5.5,19.5 parent: 2 - uid: 342 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,19.5 + rot: 1.5707963267948966 rad + pos: 5.5,17.5 parent: 2 - uid: 374 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,17.5 + rot: 1.5707963267948966 rad + pos: 5.5,11.5 parent: 2 - uid: 385 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,11.5 - parent: 2 - - uid: 386 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,11.5 + rot: 1.5707963267948966 rad + pos: 5.5,9.5 parent: 2 - proto: BedsheetMedical entities: @@ -2271,7 +2258,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,18.5 parent: 2 - - type: DeviceNetwork - uid: 175 components: - type: Transform diff --git a/Resources/Maps/Shuttles/escape_pod_small.yml b/Resources/Maps/Shuttles/escape_pod_small.yml index d0670f39917..4746f0d2978 100644 --- a/Resources/Maps/Shuttles/escape_pod_small.yml +++ b/Resources/Maps/Shuttles/escape_pod_small.yml @@ -121,7 +121,7 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,0.5 parent: 29 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 9 components: diff --git a/Resources/Maps/Shuttles/mining.yml b/Resources/Maps/Shuttles/mining.yml index f8a4f040b9c..b72d361f77d 100644 --- a/Resources/Maps/Shuttles/mining.yml +++ b/Resources/Maps/Shuttles/mining.yml @@ -564,23 +564,38 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,3.5 parent: 181 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 128 components: - type: Transform + rot: -1.5707963267948966 rad pos: -5.5,-3.5 parent: 181 - uid: 129 components: - type: Transform + rot: -1.5707963267948966 rad pos: -5.5,-2.5 parent: 181 - uid: 130 components: - type: Transform + rot: -1.5707963267948966 rad pos: -5.5,-1.5 parent: 181 + - uid: 131 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,2.5 + parent: 181 + - uid: 133 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,1.5 + parent: 181 - proto: BlastDoorExterior1 entities: - uid: 37 @@ -588,25 +603,16 @@ entities: - type: Transform pos: -5.5,-2.5 parent: 181 - - type: DeviceLinkSink - links: - - 100 - uid: 47 components: - type: Transform pos: -5.5,-3.5 parent: 181 - - type: DeviceLinkSink - links: - - 100 - uid: 69 components: - type: Transform pos: -5.5,-1.5 parent: 181 - - type: DeviceLinkSink - links: - - 100 - proto: BorgModuleMining entities: - uid: 94 @@ -911,8 +917,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-4.5 parent: 181 - - type: AtmosDevice - joinedGrid: 181 - proto: GasVentPump entities: - uid: 26 @@ -921,8 +925,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-4.5 parent: 181 - - type: AtmosDevice - joinedGrid: 181 - proto: GeneratorBasic entities: - uid: 40 diff --git a/Resources/Maps/Shuttles/pirate.yml b/Resources/Maps/Shuttles/pirate.yml index 8d2912dbda8..b0b3929054e 100644 --- a/Resources/Maps/Shuttles/pirate.yml +++ b/Resources/Maps/Shuttles/pirate.yml @@ -578,23 +578,25 @@ entities: - type: Transform pos: -0.67882204,3.741016 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 27 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,15.5 + rot: -1.5707963267948966 rad + pos: -11.5,2.5 parent: 1 - uid: 28 components: - type: Transform - pos: -11.5,2.5 + rot: 1.5707963267948966 rad + pos: 8.5,2.5 parent: 1 - uid: 772 components: - type: Transform - pos: 8.5,2.5 + rot: 3.141592653589793 rad + pos: 3.5,15.5 parent: 1 - proto: Bed entities: @@ -2255,8 +2257,6 @@ entities: - type: GasMixer inletTwoConcentration: 0.22000003 inletOneConcentration: 0.78 - - type: AtmosDevice - joinedGrid: 1 - proto: GasPassiveVent entities: - uid: 329 @@ -2265,40 +2265,30 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 330 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 331 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-7.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 332 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-7.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 333 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasPipeBend entities: - uid: 334 @@ -2725,16 +2715,12 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 406 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasPressurePump entities: - uid: 407 @@ -2743,24 +2729,18 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 408 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 409 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasVentPump entities: - uid: 410 @@ -2768,94 +2748,70 @@ entities: - type: Transform pos: 2.5,7.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 411 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 412 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,7.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 413 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 414 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 415 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 416 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 417 components: - type: Transform pos: -2.5,9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 418 components: - type: Transform pos: 3.5,9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 419 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,8.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 420 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 421 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasVentScrubber entities: - uid: 422 @@ -2863,31 +2819,23 @@ entities: - type: Transform pos: 2.5,-4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 423 components: - type: Transform pos: -6.5,-0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 424 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 425 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GeneratorBasic15kW entities: - uid: 426 @@ -3156,8 +3104,6 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: OxygenCanister entities: - uid: 470 @@ -3165,36 +3111,26 @@ entities: - type: Transform pos: 1.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 471 components: - type: Transform pos: -10.5,1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 472 components: - type: Transform pos: -9.5,6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 473 components: - type: Transform pos: -4.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 474 components: - type: Transform pos: 7.5,1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: PaperBin5 entities: - uid: 475 @@ -3691,7 +3627,7 @@ entities: - type: Transform pos: -3.5,-1.5 parent: 1 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 549 components: @@ -3797,8 +3733,6 @@ entities: - type: Transform pos: 4.5,-3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: SubstationBasic entities: - uid: 564 diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml index f040d58253d..1f61d0725da 100644 --- a/Resources/Maps/Shuttles/trading_outpost.yml +++ b/Resources/Maps/Shuttles/trading_outpost.yml @@ -399,8 +399,6 @@ entities: - 402 - 790 - 789 - - type: AtmosDevice - joinedGrid: 2 - uid: 803 components: - type: Transform @@ -416,8 +414,6 @@ entities: - 411 - 789 - 790 - - type: AtmosDevice - joinedGrid: 2 - uid: 805 components: - type: Transform @@ -433,8 +429,6 @@ entities: - 408 - 783 - 782 - - type: AtmosDevice - joinedGrid: 2 - uid: 806 components: - type: Transform @@ -450,8 +444,6 @@ entities: - 409 - 783 - 782 - - type: AtmosDevice - joinedGrid: 2 - proto: AirCanister entities: - uid: 387 @@ -462,8 +454,6 @@ entities: parent: 2 - type: Physics bodyType: Static - - type: AtmosDevice - joinedGrid: 2 - proto: AirlockCargo entities: - uid: 1 @@ -516,17 +506,17 @@ entities: parent: 2 - proto: AirlockExternalGlassShuttleLocked entities: - - uid: 313 + - uid: 20 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-3.5 + rot: 1.5707963267948966 rad + pos: 13.5,-5.5 parent: 2 - - uid: 560 + - uid: 313 components: - type: Transform rot: -1.5707963267948966 rad - pos: -2.5,-5.5 + pos: -2.5,-3.5 parent: 2 - uid: 562 components: @@ -534,11 +524,11 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,-3.5 parent: 2 - - uid: 563 + - uid: 950 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-5.5 + rot: -1.5707963267948966 rad + pos: -2.5,-5.5 parent: 2 - proto: AirSensor entities: @@ -591,46 +581,54 @@ entities: - type: Transform pos: 2.5,-14.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 947 + - uid: 560 components: - type: Transform - pos: 13.5,-5.5 + rot: 1.5707963267948966 rad + pos: 13.5,-6.5 parent: 2 - - uid: 948 + - uid: 563 components: - type: Transform + rot: 1.5707963267948966 rad pos: 13.5,-3.5 parent: 2 - - uid: 949 + - uid: 947 components: - type: Transform + rot: 1.5707963267948966 rad pos: 13.5,-2.5 parent: 2 - - uid: 950 + - uid: 948 components: - type: Transform - pos: 13.5,-6.5 + rot: 1.5707963267948966 rad + pos: 13.5,-5.5 parent: 2 - - uid: 951 + - uid: 949 components: - type: Transform + rot: -1.5707963267948966 rad pos: -2.5,-6.5 parent: 2 - - uid: 952 + - uid: 951 components: - type: Transform + rot: -1.5707963267948966 rad pos: -2.5,-5.5 parent: 2 - - uid: 953 + - uid: 952 components: - type: Transform + rot: -1.5707963267948966 rad pos: -2.5,-3.5 parent: 2 - - uid: 954 + - uid: 953 components: - type: Transform + rot: -1.5707963267948966 rad pos: -2.5,-2.5 parent: 2 - proto: BoxFolderClipboard @@ -2745,144 +2743,96 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-2.5 parent: 2 - - type: DeviceLinkSink - links: - - 365 - uid: 82 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-6.5 parent: 2 - - type: DeviceLinkSink - links: - - 366 - uid: 108 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-2.5 parent: 2 - - type: DeviceLinkSink - links: - - 393 - uid: 110 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-2.5 parent: 2 - - type: DeviceLinkSink - links: - - 365 - uid: 329 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-6.5 parent: 2 - - type: DeviceLinkSink - links: - - 366 - uid: 330 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-6.5 parent: 2 - - type: DeviceLinkSink - links: - - 404 - uid: 331 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-6.5 parent: 2 - - type: DeviceLinkSink - links: - - 404 - uid: 335 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-6.5 parent: 2 - - type: DeviceLinkSink - links: - - 404 - uid: 337 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-2.5 parent: 2 - - type: DeviceLinkSink - links: - - 393 - uid: 338 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-6.5 parent: 2 - - type: DeviceLinkSink - links: - - 366 - uid: 339 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-2.5 parent: 2 - - type: DeviceLinkSink - links: - - 365 - uid: 340 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-2.5 parent: 2 - - type: DeviceLinkSink - links: - - 393 - uid: 359 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-2.5 parent: 2 - - type: DeviceLinkSink - links: - - 393 - uid: 362 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-6.5 parent: 2 - - type: DeviceLinkSink - links: - - 404 - uid: 363 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-2.5 parent: 2 - - type: DeviceLinkSink - links: - - 365 - uid: 364 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-6.5 parent: 2 - - type: DeviceLinkSink - links: - - 366 - proto: ExtinguisherCabinetFilled entities: - uid: 360 @@ -2941,8 +2891,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPassiveVent entities: - uid: 397 @@ -2951,16 +2899,12 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 414 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPipeBend entities: - uid: 316 @@ -3534,9 +3478,13 @@ entities: - uid: 511 components: - type: Transform + anchored: False rot: -1.5707963267948966 rad pos: 0.5,5.5 parent: 2 + - type: Physics + canCollide: True + bodyType: Dynamic - uid: 513 components: - type: Transform @@ -3648,8 +3596,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasVentPump entities: - uid: 398 @@ -3658,46 +3604,34 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 400 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 401 components: - type: Transform pos: 2.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 402 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 403 components: - type: Transform pos: 8.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 412 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasVentScrubber entities: - uid: 399 @@ -3706,46 +3640,34 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 408 components: - type: Transform pos: 1.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 409 components: - type: Transform pos: 9.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 410 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 411 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 413 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GeneratorRTG entities: - uid: 367 @@ -4329,8 +4251,6 @@ entities: - type: Transform pos: 5.5,-17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: LiquidOxygenCanister entities: - uid: 384 @@ -4338,8 +4258,6 @@ entities: - type: Transform pos: 4.5,-17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: Paper entities: - uid: 775 @@ -4909,49 +4827,31 @@ entities: - type: Transform pos: 1.5,3.5 parent: 2 - - type: DeviceLinkSink - links: - - 807 - uid: 809 components: - type: Transform pos: 2.5,3.5 parent: 2 - - type: DeviceLinkSink - links: - - 807 - uid: 810 components: - type: Transform pos: 3.5,3.5 parent: 2 - - type: DeviceLinkSink - links: - - 807 - uid: 811 components: - type: Transform pos: 7.5,3.5 parent: 2 - - type: DeviceLinkSink - links: - - 807 - uid: 812 components: - type: Transform pos: 8.5,3.5 parent: 2 - - type: DeviceLinkSink - links: - - 807 - uid: 813 components: - type: Transform pos: 9.5,3.5 parent: 2 - - type: DeviceLinkSink - links: - - 807 - proto: SignalButton entities: - uid: 807 diff --git a/Resources/Maps/Shuttles/wizard.yml b/Resources/Maps/Shuttles/wizard.yml index a46944361d3..7bdb8ca83d8 100644 --- a/Resources/Maps/Shuttles/wizard.yml +++ b/Resources/Maps/Shuttles/wizard.yml @@ -343,7 +343,6 @@ entities: 74: -9,-3 75: -9,-1 76: 8,-1 - 77: 8,-3 - node: color: '#FFFFFFFF' id: WarnLineN @@ -604,7 +603,7 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,5.5 parent: 768 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 338 components: @@ -615,20 +614,20 @@ entities: - uid: 339 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-2.5 + rot: -1.5707963267948966 rad + pos: -10.5,-2.5 parent: 768 - uid: 340 components: - type: Transform rot: 1.5707963267948966 rad - pos: -10.5,-0.5 + pos: 9.5,-2.5 parent: 768 - uid: 341 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-2.5 + rot: -1.5707963267948966 rad + pos: -10.5,-0.5 parent: 768 - proto: AtmosFixNitrogenMarker entities: @@ -668,13 +667,6 @@ entities: - type: Transform pos: -1.5,-11.5 parent: 768 -- proto: BookFishing - entities: - - uid: 587 - components: - - type: Transform - pos: 3.5160534,-11.342207 - parent: 768 - proto: BookRandom entities: - uid: 217 @@ -687,6 +679,13 @@ entities: - type: Transform pos: -7.700435,2.7283878 parent: 768 +- proto: BookRandomStory + entities: + - uid: 587 + components: + - type: Transform + pos: 3.5160534,-11.342207 + parent: 768 - proto: BooksBag entities: - uid: 219 @@ -2188,8 +2187,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-13.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - proto: GasMinerOxygen entities: - uid: 248 @@ -2198,8 +2195,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-14.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - proto: GasMixerFlipped entities: - uid: 250 @@ -2211,8 +2206,6 @@ entities: - type: GasMixer inletTwoConcentration: 0.22000003 inletOneConcentration: 0.78 - - type: AtmosDevice - joinedGrid: 768 - proto: GasPassiveVent entities: - uid: 251 @@ -2221,16 +2214,12 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-13.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 252 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-14.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - proto: GasPipeBend entities: - uid: 253 @@ -2619,8 +2608,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-13.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - proto: GasVentPump entities: - uid: 261 @@ -2629,109 +2616,81 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-9.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 264 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-14.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 292 components: - type: Transform pos: 5.5,-6.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 293 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-10.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 294 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-10.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 303 components: - type: Transform pos: -0.5,-3.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 327 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,0.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 328 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,4.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 329 components: - type: Transform pos: -0.5,8.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 330 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,3.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 331 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,4.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 332 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,-0.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 333 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,-2.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - uid: 362 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-6.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - proto: GeneratorBasic15kW entities: - uid: 358 @@ -3079,8 +3038,6 @@ entities: - type: Transform pos: -9.5,0.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - proto: OxygenCanister entities: - uid: 602 @@ -3088,8 +3045,6 @@ entities: - type: Transform pos: -8.5,0.5 parent: 768 - - type: AtmosDevice - joinedGrid: 768 - proto: Paper entities: - uid: 622 From f65f57ef92663fc296a4e855eee53dc46365cb5c Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 26 Aug 2024 22:25:29 +0000 Subject: [PATCH 098/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9325649c182..66080a8b2ee 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: stalengd - changes: - - message: Players can now correctly toggle internals on pets. - type: Fix - id: 6717 - time: '2024-06-13T02:17:07.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28904 - author: Cojoke-dot changes: - message: Tranquilizer Shotguns shells now have a unique sprite @@ -3865,3 +3858,10 @@ id: 7216 time: '2024-08-26T13:00:52.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31478 +- author: CuteBoi + changes: + - message: Replaced small fans on most shuttles with directional fans. + type: Fix + id: 7217 + time: '2024-08-26T22:24:22.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31495 From e85c25a7468b4daea7a5f1deb85900a9151651cf Mon Sep 17 00:00:00 2001 From: Mervill Date: Mon, 26 Aug 2024 15:29:44 -0700 Subject: [PATCH 099/223] Replace obsolete functions in NPC systems (#31448) --- Content.Server/NPC/Systems/NPCJukeSystem.cs | 7 ++++--- .../NPC/Systems/NPCSteeringSystem.Context.cs | 12 ++++++------ .../NPC/Systems/NPCSteeringSystem.Obstacles.cs | 2 +- Content.Server/NPC/Systems/NPCSteeringSystem.cs | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Content.Server/NPC/Systems/NPCJukeSystem.cs b/Content.Server/NPC/Systems/NPCJukeSystem.cs index 94a30feb0cb..1b2f4f53578 100644 --- a/Content.Server/NPC/Systems/NPCJukeSystem.cs +++ b/Content.Server/NPC/Systems/NPCJukeSystem.cs @@ -20,6 +20,7 @@ public sealed class NPCJukeSystem : EntitySystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly MeleeWeaponSystem _melee = default!; + [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; private EntityQuery _npcMeleeQuery; @@ -59,7 +60,7 @@ private void OnJukeSteering(EntityUid uid, NPCJukeComponent component, ref NPCSt return; } - var currentTile = grid.CoordinatesToTile(args.Transform.Coordinates); + var currentTile = _mapSystem.CoordinatesToTile(args.Transform.GridUid.Value, grid, args.Transform.Coordinates); if (component.TargetTile == null) { @@ -72,7 +73,7 @@ private void OnJukeSteering(EntityUid uid, NPCJukeComponent component, ref NPCSt for (var i = 0; i < 8; i++) { var index = (startIndex + i) % 8; - var neighbor = ((Direction) index).ToIntVec() + currentTile; + var neighbor = ((Direction)index).ToIntVec() + currentTile; var valid = true; // TODO: Probably make this a helper on engine maybe @@ -116,7 +117,7 @@ private void OnJukeSteering(EntityUid uid, NPCJukeComponent component, ref NPCSt return; } - var targetCoords = grid.GridTileToWorld(component.TargetTile.Value); + var targetCoords = _mapSystem.GridTileToWorld(args.Transform.GridUid.Value, grid, component.TargetTile.Value); var targetDir = (targetCoords.Position - args.WorldPosition); targetDir = args.OffsetRotation.RotateVec(targetDir); const float weight = 1f; diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs index e0bcb97a112..fa43b3e7524 100644 --- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs +++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs @@ -22,7 +22,7 @@ private void ApplySeek(Span interest, Vector2 direction, float weight) if (weight == 0f || direction == Vector2.Zero) return; - var directionAngle = (float) direction.ToAngle().Theta; + var directionAngle = (float)direction.ToAngle().Theta; for (var i = 0; i < InterestDirections; i++) { @@ -166,8 +166,8 @@ private bool TrySeek( } // Check if mapids match. - var targetMap = targetCoordinates.ToMap(EntityManager, _transform); - var ourMap = ourCoordinates.ToMap(EntityManager, _transform); + var targetMap = _transform.ToMapCoordinates(targetCoordinates); + var ourMap = _transform.ToMapCoordinates(ourCoordinates); if (targetMap.MapId != ourMap.MapId) { @@ -258,7 +258,7 @@ private bool TrySeek( return false; } - targetMap = targetCoordinates.ToMap(EntityManager, _transform); + targetMap = _transform.ToMapCoordinates(targetCoordinates); // Can't make it again. if (ourMap.MapId != targetMap.MapId) @@ -429,7 +429,7 @@ public void PrunePath(EntityUid uid, MapCoordinates mapCoordinates, Vector2 dire if (TryComp(uid, out var physics)) { - mask = (CollisionGroup) physics.CollisionMask; + mask = (CollisionGroup)physics.CollisionMask; } for (var i = 0; i < nodes.Count; i++) @@ -439,7 +439,7 @@ public void PrunePath(EntityUid uid, MapCoordinates mapCoordinates, Vector2 dire if (!node.Data.IsFreeSpace) break; - var nodeMap = node.Coordinates.ToMap(EntityManager, _transform); + var nodeMap = _transform.ToMapCoordinates(node.Coordinates); // If any nodes are 'behind us' relative to the target we'll prune them. // This isn't perfect but should fix most cases of stutter stepping. diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs index 3bc4eae9e49..a31c7850f38 100644 --- a/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs +++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs @@ -207,7 +207,7 @@ private void GetObstacleEntities(PathPoly poly, int mask, int layer, List Date: Mon, 26 Aug 2024 16:06:54 -0700 Subject: [PATCH 100/223] Make guidebook remember where you left off (#31375) * Guidebook tracks last read entry * Persistent guidebook fixes * Persistent guidebook requested changes * Update Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs --------- Co-authored-by: Pieter-Jan Briers --- .../Guidebook/Controls/GuidebookWindow.xaml.cs | 4 ++++ .../Systems/Guidebook/GuidebookUIController.cs | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs index 469b0ed2224..de06d85bb04 100644 --- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs @@ -23,6 +23,8 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler private readonly ISawmill _sawmill; + public ProtoId LastEntry; + public GuidebookWindow() { RobustXamlLoader.Load(this); @@ -90,6 +92,8 @@ private void ShowGuide(GuideEntry entry) _sawmill.Error($"Failed to parse contents of guide document {entry.Id}."); } + + LastEntry = entry.Id; } public void UpdateGuides( diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs index 03ea47827f6..702b0a52ac4 100644 --- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs +++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs @@ -30,6 +30,7 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered UIManager.GetActiveUIWidgetOrNull()?.GuidebookButton; + private ProtoId? _lastEntry; public void OnStateEntered(LobbyState state) { @@ -142,7 +143,10 @@ private void OnWindowClosed() GuidebookButton.Pressed = false; if (_guideWindow != null) + { _guideWindow.ReturnContainer.Visible = false; + _lastEntry = _guideWindow.LastEntry; + } } private void OnWindowOpen() @@ -176,8 +180,6 @@ public void OpenGuidebook( if (GuidebookButton != null) GuidebookButton.SetClickPressed(!_guideWindow.IsOpen); - selected ??= _configuration.GetCVar(CCVars.DefaultGuide); - if (guides == null) { guides = _prototypeManager.EnumeratePrototypes() @@ -193,6 +195,17 @@ public void OpenGuidebook( } } + if (selected == null) + { + if (_lastEntry is { } lastEntry && guides.ContainsKey(lastEntry)) + { + selected = _lastEntry; + } + else + { + selected = _configuration.GetCVar(CCVars.DefaultGuide); + } + } _guideWindow.UpdateGuides(guides, rootEntries, forceRoot, selected); // Expand up to depth-2. From 7789b07bde4e19ffa149513dbca89012020b615a Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 26 Aug 2024 23:08:00 +0000 Subject: [PATCH 101/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 66080a8b2ee..0e19f60dcc7 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Cojoke-dot - changes: - - message: Tranquilizer Shotguns shells now have a unique sprite - type: Tweak - - message: You now print boxes of Tranquilizer Boxes rather than a single shell - type: Tweak - id: 6718 - time: '2024-06-13T02:17:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28903 - author: Plykiya changes: - message: Gauze continues to heal even when you stop someone's bleeding. @@ -3865,3 +3856,10 @@ id: 7217 time: '2024-08-26T22:24:22.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31495 +- author: 12rabbits + changes: + - message: The guidebook now remembers where you left off when re-opened. + type: Tweak + id: 7218 + time: '2024-08-26T23:06:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31375 From 76223e8e14e35506e479fa38f20bb449e7d29279 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Tue, 27 Aug 2024 03:18:10 +0300 Subject: [PATCH 102/223] Remove double-iteration from the mime wall code (#31420) * Remove double-iteration from the mime wall code * Update * Update --- Content.Server/Abilities/Mime/MimePowersSystem.cs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs index 85230faab0f..20889f293c3 100644 --- a/Content.Server/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs @@ -5,7 +5,6 @@ using Content.Shared.Alert; using Content.Shared.Coordinates.Helpers; using Content.Shared.Maps; -using Content.Shared.Mobs.Components; using Content.Shared.Physics; using Robust.Shared.Containers; using Robust.Shared.Map; @@ -19,7 +18,6 @@ public sealed class MimePowersSystem : EntitySystem [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; [Dependency] private readonly TurfSystem _turf = default!; [Dependency] private readonly IMapManager _mapMan = default!; [Dependency] private readonly SharedContainerSystem _container = default!; @@ -80,22 +78,13 @@ private void OnInvisibleWall(EntityUid uid, MimePowersComponent component, Invis if (tile == null) return; - // Check there are no walls there - if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable)) + // Check if the tile is blocked by a wall or mob, and don't create the wall if so + if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable | CollisionGroup.Opaque)) { _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-failed"), uid, uid); return; } - // Check there are no mobs there - foreach (var entity in _lookupSystem.GetLocalEntitiesIntersecting(tile.Value, 0f)) - { - if (HasComp(entity) && entity != uid) - { - _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-failed"), uid, uid); - return; - } - } _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-popup", ("mime", uid)), uid); // Make sure we set the invisible wall to despawn properly Spawn(component.WallPrototype, _turf.GetTileCenter(tile.Value)); From e345aa333365a8f508a7c521bb693c19fd931053 Mon Sep 17 00:00:00 2001 From: Dimastra <65184747+Dimastra@users.noreply.github.com> Date: Tue, 27 Aug 2024 03:30:42 +0300 Subject: [PATCH 103/223] fix method OnEntityEnter in DamageContactsSystem (#31494) fix Co-authored-by: Dimastra --- Content.Shared/Damage/Systems/DamageContactsSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Damage/Systems/DamageContactsSystem.cs b/Content.Shared/Damage/Systems/DamageContactsSystem.cs index b08ef77fed5..3cc73a87c59 100644 --- a/Content.Shared/Damage/Systems/DamageContactsSystem.cs +++ b/Content.Shared/Damage/Systems/DamageContactsSystem.cs @@ -65,7 +65,7 @@ private void OnEntityEnter(EntityUid uid, DamageContactsComponent component, ref if (HasComp(otherUid)) return; - if (_whitelistSystem.IsWhitelistFail(component.IgnoreWhitelist, otherUid)) + if (_whitelistSystem.IsWhitelistPass(component.IgnoreWhitelist, otherUid)) return; var damagedByContact = EnsureComp(otherUid); From 43ae1354c277130e420fdbfd3051199e4e6800b8 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 00:31:48 +0000 Subject: [PATCH 104/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0e19f60dcc7..6cbe32faea5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Gauze continues to heal even when you stop someone's bleeding. - type: Fix - id: 6719 - time: '2024-06-13T02:19:10.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28844 - author: Doomsdrayk changes: - message: Fixed guns appearing to cycle their bolt when wielded. @@ -3863,3 +3856,10 @@ id: 7218 time: '2024-08-26T23:06:54.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31375 +- author: Dimastra + changes: + - message: Fixed meat kudzu not dealing damage. + type: Fix + id: 7219 + time: '2024-08-27T00:30:42.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31494 From e30090567da2678f056ec0c34fd0ba9201689ed9 Mon Sep 17 00:00:00 2001 From: JIPDawg <51352440+JIPDawg@users.noreply.github.com> Date: Mon, 26 Aug 2024 19:48:04 -0500 Subject: [PATCH 105/223] Make Gas Miners indestructable, anchorable, and pullable. (#31370) * Make miner indestructable, and pullable. * Miners can't be unanchored. Only anchored. --------- Co-authored-by: JIPDawg --- .../Structures/Piping/Atmospherics/miners.yml | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index 64dd38accb4..71e171fc50d 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml @@ -11,19 +11,20 @@ - type: Physics canCollide: false - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: .4 + density: 190 + mask: + - MachineMask - type: Transform anchored: true - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] + - type: Anchorable + flags: + - Anchorable + - type: Pullable - type: Sprite sprite: Structures/Piping/Atmospherics/miners.rsi state: miner From 54bfaa1fec0f4d02d9f9fb0dea56c9546b380c7b Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 00:49:10 +0000 Subject: [PATCH 106/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 6cbe32faea5..e2753cf7dc5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Doomsdrayk - changes: - - message: Fixed guns appearing to cycle their bolt when wielded. - type: Fix - id: 6720 - time: '2024-06-13T06:30:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28756 - author: Doomsdrayk changes: - message: The Drozd and C-20r do not unwield on use again. @@ -3863,3 +3856,10 @@ id: 7219 time: '2024-08-27T00:30:42.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31494 +- author: JIPDawg + changes: + - message: Gas miners are now indestructible, can be pulled and only anchored. + type: Tweak + id: 7220 + time: '2024-08-27T00:48:04.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31370 From 2f4e2977412b0112b7435994344bd1e3e508f5ce Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 27 Aug 2024 01:32:19 -0600 Subject: [PATCH 107/223] bagel update (#31502) --- Resources/Maps/bagel.yml | 73 ++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 0e8cf62a272..c4e69cf20e8 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -24,6 +24,7 @@ tilemap: 3: FloorGrayConcrete 2: FloorGrayConcreteMono 56: FloorGreenCircuit + 6: FloorHull 59: FloorHullReinforced 60: FloorHydro 63: FloorLaundry @@ -342,7 +343,7 @@ entities: version: 6 -5,1: ind: -5,1 - tiles: AAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -5,0: ind: -5,0 @@ -402,7 +403,7 @@ entities: version: 6 -6,1: ind: -6,1 - tiles: HwAAAAACHwAAAAABHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAHwAAAAAAHwAAAAADHwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAHwAAAAAAHwAAAAACHwAAAAADfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAfgAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: HwAAAAACHwAAAAABHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAHwAAAAAAHwAAAAADHwAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAfgAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -7,1: ind: -7,1 @@ -4060,6 +4061,7 @@ entities: 2814: 44,-15 2837: 48,-19 3484: 44,-25 + 3982: 40,-19 - node: color: '#79150096' id: QuarterTileOverlayGreyscale @@ -4385,6 +4387,7 @@ entities: 2813: 44,-9 2838: 47,-18 3476: 44,-17 + 3983: 33,-19 - node: color: '#79150096' id: QuarterTileOverlayGreyscale180 @@ -8109,7 +8112,7 @@ entities: 1: 39312 -12,8: 5: 12 - 7: 3072 + 6: 3072 -11,5: 0: 63351 -11,6: @@ -8118,7 +8121,7 @@ entities: -11,8: 5: 1 1: 17476 - 7: 256 + 6: 256 -11,7: 1: 17484 -10,5: @@ -8216,10 +8219,10 @@ entities: 0: 255 1: 57344 -8,11: - 6: 816 + 7: 816 1: 34952 -9,11: - 6: 2176 + 7: 2176 1: 8738 -8,12: 1: 34959 @@ -8239,7 +8242,7 @@ entities: -6,11: 0: 4095 -6,12: - 6: 61166 + 7: 61166 -5,9: 0: 65535 -5,10: @@ -8247,7 +8250,7 @@ entities: -5,11: 0: 36863 -5,12: - 6: 30515 + 7: 30515 0: 12 -4,9: 0: 65535 @@ -8257,7 +8260,7 @@ entities: 0: 4095 -4,12: 0: 1 - 6: 65518 + 7: 65518 -4,13: 1: 61680 -5,13: @@ -8271,7 +8274,7 @@ entities: -5,15: 1: 17487 -3,12: - 6: 13107 + 7: 13107 1: 34944 -3,13: 1: 47792 @@ -8337,7 +8340,7 @@ entities: 1: 61713 -12,9: 0: 16 - 6: 3084 + 7: 3084 -13,9: 1: 39305 -13,10: @@ -8347,18 +8350,18 @@ entities: 0: 12544 -12,10: 4: 12 - 6: 3072 + 7: 3072 -12,11: - 6: 12 + 7: 12 -11,9: - 6: 257 + 7: 257 1: 17476 -11,10: 4: 1 - 6: 256 + 7: 256 1: 17476 -11,11: - 6: 1 + 7: 1 1: 17476 -11,12: 1: 17487 @@ -8412,7 +8415,7 @@ entities: 1: 15 -13,12: 1: 34952 - 7: 48 + 6: 48 5: 12288 -12,13: 1: 61455 @@ -8446,11 +8449,11 @@ entities: 1: 62671 -7,14: 1: 244 - 6: 57344 + 7: 57344 0: 1024 -7,15: 1: 61440 - 6: 238 + 7: 238 0: 1024 -7,16: 1: 65524 @@ -8509,7 +8512,7 @@ entities: -14,12: 0: 1 1: 8738 - 7: 128 + 6: 128 5: 32768 -17,12: 0: 52232 @@ -9050,7 +9053,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9065,7 +9068,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -130984,6 +130987,13 @@ entities: - type: Transform pos: 4.5,-7.5 parent: 60 +- proto: SurveillanceCameraRouterConstructed + entities: + - uid: 18878 + components: + - type: Transform + pos: -106.5,26.5 + parent: 60 - proto: SurveillanceCameraRouterEngineering entities: - uid: 11746 @@ -131019,6 +131029,13 @@ entities: - type: Transform pos: -22.5,2.5 parent: 60 +- proto: SurveillanceCameraRouterService + entities: + - uid: 18645 + components: + - type: Transform + pos: -49.5,7.5 + parent: 60 - proto: SurveillanceCameraRouterSupply entities: - uid: 6038 @@ -131720,7 +131737,7 @@ entities: - uid: 21760 components: - type: Transform - pos: -49.5,7.5 + pos: -116.5,26.5 parent: 60 - proto: SurveillanceCameraWirelessRouterEntertainment entities: @@ -134244,16 +134261,6 @@ entities: showEnts: False occludes: True ents: [] - - uid: 18645 - components: - - type: Transform - pos: -106.5,26.5 - parent: 60 - - uid: 18878 - components: - - type: Transform - pos: -116.5,26.5 - parent: 60 - uid: 18890 components: - type: Transform From 55771cab745bf45e4756ded41382ef990b84d505 Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Tue, 27 Aug 2024 11:20:12 +0100 Subject: [PATCH 108/223] Minor fixes to character profile editor save/reset buttons (#31505) Merge SetDirty() with preview reload People were forgetting to SetDirty() when changing a property; move SetDirty() into preview reloading, since if the preview is being reloaded, some property has definitely changed anyway. Co-authored-by: Eoin Mcloughlin --- .../Lobby/UI/HumanoidProfileEditor.xaml.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index c5f2f311d9b..e81f72ba670 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -718,6 +718,9 @@ private void ReloadPreview() PreviewDummy = _controller.LoadProfileEntity(Profile, JobOverride, ShowClothes.Pressed); SpriteView.SetEntity(PreviewDummy); _entManager.System().SetEntityName(PreviewDummy, Profile.Name); + + // Check and set the dirty flag to enable the save/reset buttons as appropriate. + SetDirty(); } /// @@ -778,6 +781,9 @@ private void ReloadProfilePreview() return; _entManager.System().LoadProfile(PreviewDummy, Profile); + + // Check and set the dirty flag to enable the save/reset buttons as appropriate. + SetDirty(); } private void OnSpeciesInfoButtonPressed(BaseButton.ButtonEventArgs args) @@ -1014,7 +1020,6 @@ private void OpenLoadout(JobPrototype? jobProto, RoleLoadout roleLoadout, RoleLo roleLoadout.AddLoadout(loadoutGroup, loadoutProto, _prototypeManager); _loadoutWindow.RefreshLoadouts(roleLoadout, session, collection); Profile = Profile?.WithLoadout(roleLoadout); - SetDirty(); ReloadPreview(); }; @@ -1023,7 +1028,6 @@ private void OpenLoadout(JobPrototype? jobProto, RoleLoadout roleLoadout, RoleLo roleLoadout.RemoveLoadout(loadoutGroup, loadoutProto, _prototypeManager); _loadoutWindow.RefreshLoadouts(roleLoadout, session, collection); Profile = Profile?.WithLoadout(roleLoadout); - SetDirty(); ReloadPreview(); }; @@ -1033,7 +1037,6 @@ private void OpenLoadout(JobPrototype? jobProto, RoleLoadout roleLoadout, RoleLo _loadoutWindow.OnClose += () => { JobOverride = null; - SetDirty(); ReloadPreview(); }; @@ -1058,7 +1061,6 @@ private void OnMarkingChange(MarkingSet markings) return; Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithMarkings(markings.GetForwardEnumerator().ToList())); - SetDirty(); ReloadProfilePreview(); } @@ -1126,7 +1128,6 @@ private void OnSkinColorOnValueChanged() } } - SetDirty(); ReloadProfilePreview(); } @@ -1157,7 +1158,6 @@ private void SetAge(int newAge) { Profile = Profile?.WithAge(newAge); ReloadPreview(); - SetDirty(); } private void SetSex(Sex newSex) @@ -1180,14 +1180,12 @@ private void SetSex(Sex newSex) UpdateGenderControls(); Markings.SetSex(newSex); ReloadPreview(); - SetDirty(); } private void SetGender(Gender newGender) { Profile = Profile?.WithGender(newGender); ReloadPreview(); - SetDirty(); } private void SetSpecies(string newSpecies) @@ -1201,7 +1199,6 @@ private void SetSpecies(string newSpecies) RefreshLoadouts(); UpdateSexControls(); // update sex for new species UpdateSpeciesGuidebookIcon(); - SetDirty(); ReloadPreview(); } From af65af836a319e5481929a3a6ef19ca719a5c0eb Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Tue, 27 Aug 2024 07:28:26 -0400 Subject: [PATCH 109/223] Centcom & FTLDestination cleanup (#30226) * centcomm name and ftlcomp * networking microopstimization * go sleep. * map names and arrivals --- Content.Server/Shuttles/Systems/ArrivalsSystem.cs | 2 ++ .../Shuttles/Systems/EmergencyShuttleSystem.cs | 4 +++- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 10 +++++++++- Resources/Locale/en-US/shuttles/emergency.ftl | 4 ++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index 40a2778b937..e921590e390 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -52,6 +52,7 @@ public sealed class ArrivalsSystem : EntitySystem [Dependency] private readonly BiomeSystem _biomes = default!; [Dependency] private readonly GameTicker _ticker = default!; [Dependency] private readonly MapLoaderSystem _loader = default!; + [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly ShuttleSystem _shuttles = default!; @@ -497,6 +498,7 @@ private void OnRoundStarting(RoundStartingEvent ev) private void SetupArrivalsStation() { var mapUid = _mapSystem.CreateMap(out var mapId, false); + _metaData.SetEntityName(mapUid, Loc.GetString("map-name-terminal")); if (!_loader.TryLoad(mapId, _cfgManager.GetCVar(CCVars.ArrivalsMap), out var uids)) { diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs index 1f3b4a749bc..52b327ee010 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs @@ -61,6 +61,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem [Dependency] private readonly IdCardSystem _idSystem = default!; [Dependency] private readonly NavMapSystem _navMap = default!; [Dependency] private readonly MapLoaderSystem _map = default!; + [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly RoundEndSystem _roundEnd = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; @@ -464,8 +465,9 @@ private void AddCentcomm(EntityUid station, StationCentcommComponent component) } component.MapEntity = map; + _metaData.SetEntityName(map, Loc.GetString("map-name-centcomm")); component.Entity = grid; - _shuttle.TryAddFTLDestination(mapId, false, out _); + _shuttle.TryAddFTLDestination(mapId, true, out _); Log.Info($"Created centcomm grid {ToPrettyString(grid)} on map {ToPrettyString(map)} for station {ToPrettyString(station)}"); } diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 274437aa404..e6704457450 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -186,6 +186,11 @@ public void SetFTLWhitelist(Entity entity, EntityWhite /// Adds the target map as available for FTL. /// public bool TryAddFTLDestination(MapId mapId, bool enabled, [NotNullWhen(true)] out FTLDestinationComponent? component) + { + return TryAddFTLDestination(mapId, enabled, true, false, out component); + } + + public bool TryAddFTLDestination(MapId mapId, bool enabled, bool requireDisk, bool beaconsOnly, [NotNullWhen(true)] out FTLDestinationComponent? component) { var mapUid = _mapSystem.GetMapOrInvalid(mapId); component = null; @@ -195,10 +200,13 @@ public bool TryAddFTLDestination(MapId mapId, bool enabled, [NotNullWhen(true)] component = EnsureComp(mapUid); - if (component.Enabled == enabled) + if (component.Enabled == enabled && component.RequireCoordinateDisk == requireDisk && component.BeaconsOnly == beaconsOnly) return true; component.Enabled = enabled; + component.RequireCoordinateDisk = requireDisk; + component.BeaconsOnly = beaconsOnly; + _console.RefreshShuttleConsoles(); Dirty(mapUid, component); return true; diff --git a/Resources/Locale/en-US/shuttles/emergency.ftl b/Resources/Locale/en-US/shuttles/emergency.ftl index b4dcaa3e674..be3f0962fa7 100644 --- a/Resources/Locale/en-US/shuttles/emergency.ftl +++ b/Resources/Locale/en-US/shuttles/emergency.ftl @@ -33,3 +33,7 @@ emergency-shuttle-ui-authorize = AUTHORIZE emergency-shuttle-ui-repeal = REPEAL emergency-shuttle-ui-authorizations = Authorizations emergency-shuttle-ui-remaining = Remaining: {$remaining} + +# Map Misc. +map-name-centcomm = Central Command +map-name-terminal = Arrivals Terminal \ No newline at end of file From 517aace38d5fd372e7efc324139209081ff3aa73 Mon Sep 17 00:00:00 2001 From: Saphire Lattice Date: Tue, 27 Aug 2024 17:32:53 +0600 Subject: [PATCH 110/223] Fix swapped around Safety Moth poster graphics (#31507) --- .../Entities/Structures/Wallmounts/Signs/posters.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index f1db2b71f1b..93124b377d5 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -999,9 +999,9 @@ - type: entity parent: PosterBase - id: PosterLegitSafetyMothHardhat - name: "Safety Moth - Hardhats" - description: "This informational poster uses Safety Moth™ to tell the viewer to wear hardhats in cautious areas. \"It's like a lamp for your head!\"" + id: PosterLegitSafetyMothPiping + name: "Safety Moth - Piping" + description: "This informational poster uses Safety Moth™ to tell atmospheric technicians correct types of piping to be used. \"Pipes, not Pumps! Proper pipe placement prevents poor performance!\"" components: - type: Sprite state: poster45_legit @@ -1017,9 +1017,9 @@ - type: entity parent: PosterBase - id: PosterLegitSafetyMothPiping - name: "Safety Moth - Piping" - description: "This informational poster uses Safety Moth™ to tell atmospheric technicians correct types of piping to be used. \"Pipes, not Pumps! Proper pipe placement prevents poor performance!\"" + id: PosterLegitSafetyMothHardhat + name: "Safety Moth - Hardhats" + description: "This informational poster uses Safety Moth™ to tell the viewer to wear hardhats in cautious areas. \"It's like a lamp for your head!\"" components: - type: Sprite state: poster47_legit From 292eccc7493f3f658c144dffb8c821a19b6fe976 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 11:34:01 +0000 Subject: [PATCH 111/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e2753cf7dc5..3779841d1a0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Doomsdrayk - changes: - - message: The Drozd and C-20r do not unwield on use again. - type: Fix - id: 6721 - time: '2024-06-13T18:10:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28728 - author: EmoGarbage404 changes: - message: Fixed constructed items rotating strangely. @@ -3863,3 +3856,11 @@ id: 7220 time: '2024-08-27T00:48:04.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31370 +- author: SaphireLattice + changes: + - message: Safety Moth poster graphics for hardhats and pipes are no longer swapped + around + type: Fix + id: 7221 + time: '2024-08-27T11:32:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31507 From ef18b3144dcc4908dc0ba06b6695c35323443b2e Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Tue, 27 Aug 2024 14:37:20 +0300 Subject: [PATCH 112/223] Mark explosives as a contraband (#31508) --- .../Objects/Weapons/Guns/Ammunition/explosives.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 04d405e8815..42bd054ac71 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -3,7 +3,7 @@ - type: entity id: CartridgeRocket name: PG-7VL grenade - parent: BaseItem + parent: [BaseItem, BaseMajorContraband] description: A 1.5 warhead designed for the RPG-7 launcher. Has tubular shape. components: - type: Tag @@ -23,7 +23,7 @@ - type: entity id: CartridgeRocketSlow name: PG-7VL grenade "Snail-Rocket" - parent: BaseItem + parent: [BaseItem, BaseMajorContraband] description: A 1.5 warhead designed for the RPG-7 launcher. It's unusually slow. components: - type: Tag @@ -45,7 +45,7 @@ - type: entity id: BaseGrenade name: base grenade - parent: BaseItem + parent: [BaseItem, BaseMajorContraband] abstract: true components: - type: Tag @@ -122,7 +122,7 @@ - type: SpentAmmoVisuals state: frag suffix: false - + - type: entity id: GrenadeEMP name: EMP grenade @@ -145,7 +145,7 @@ - type: entity id: BaseCannonBall name: base cannon ball - parent: BaseItem + parent: [BaseItem, BaseMajorContraband] abstract: true components: - type: Tag @@ -154,7 +154,7 @@ - type: Item size: Small - type: Sprite - + - type: entity id: CannonBall name: cannonball From e689892919e8a280ecf05316c4fb8dfffa89ae7b Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 11:38:27 +0000 Subject: [PATCH 113/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3779841d1a0..a209a03743d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Fixed constructed items rotating strangely. - type: Fix - id: 6722 - time: '2024-06-13T18:21:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28427 - author: lzk228 changes: - message: Added order quantity to cargo invoice label. @@ -3864,3 +3857,10 @@ id: 7221 time: '2024-08-27T11:32:53.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31507 +- author: Winkarst-cpu + changes: + - message: Explosive ammunition is now marked as a contraband. + type: Fix + id: 7222 + time: '2024-08-27T11:37:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31508 From e9cc93c8898030fea916df17e7a47dae7ea7ba1c Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Tue, 27 Aug 2024 16:01:09 +0300 Subject: [PATCH 114/223] Mark the syndicate raid helmet as a Syndicate contraband (#31512) --- Resources/Prototypes/Entities/Clothing/Head/helmets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 47fb4ad451f..a6663b31ec8 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -358,7 +358,7 @@ sprite: Clothing/Head/Helmets/ert_janitor.rsi - type: entity - parent: [ ClothingHeadHelmetBasic, BaseSyndicateContraband ] + parent: [ BaseSyndicateContraband, ClothingHeadHelmetBasic ] id: ClothingHeadHelmetRaid name: syndicate raid helmet description: An armored helmet for use with the syndicate raid suit. Very stylish. From c8d30a95bec144582cd48987056ba0b08d53411c Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 13:02:15 +0000 Subject: [PATCH 115/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a209a03743d..969ab2a3531 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Added order quantity to cargo invoice label. - type: Tweak - id: 6723 - time: '2024-06-13T18:36:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28821 - author: osjarw changes: - message: Added context menu action for scanning artifacts. @@ -3864,3 +3857,10 @@ id: 7222 time: '2024-08-27T11:37:20.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31508 +- author: Winkarst-cpu + changes: + - message: Now the syndicate raid helmet is marked as a Syndicate contraband. + type: Fix + id: 7223 + time: '2024-08-27T13:01:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31512 From 28d6e6da949c45289ab3f838349158d66647377a Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Tue, 27 Aug 2024 14:10:01 +0100 Subject: [PATCH 116/223] Add title to multitool door-access-configuration window (#31504) Fixes #29923. Co-authored-by: Eoin Mcloughlin --- .../Doors/Electronics/DoorElectronicsConfigurationMenu.xaml | 3 ++- Resources/Locale/en-US/access/ui/door-electronics-window.ftl | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/access/ui/door-electronics-window.ftl diff --git a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml index 4cd59f38b23..e832b4ee9f8 100644 --- a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml +++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml @@ -1,6 +1,7 @@ + xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" + Title="{Loc door-electronics-configuration-title}"> diff --git a/Resources/Locale/en-US/access/ui/door-electronics-window.ftl b/Resources/Locale/en-US/access/ui/door-electronics-window.ftl new file mode 100644 index 00000000000..6a7b1c95c26 --- /dev/null +++ b/Resources/Locale/en-US/access/ui/door-electronics-window.ftl @@ -0,0 +1 @@ +door-electronics-configuration-title = Configure Access From 4f3c2474af2872cc210a3d554c8bb1b717f72970 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Tue, 27 Aug 2024 16:19:38 +0300 Subject: [PATCH 117/223] Restrict the explorer gas mask to cargo (#31514) --- Resources/Prototypes/Entities/Clothing/Masks/masks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 7d270b8ee7a..1a213a7768c 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -102,7 +102,7 @@ - type: IngestionBlocker - type: entity - parent: ClothingMaskGas + parent: [ClothingMaskGas, BaseCargoContraband] id: ClothingMaskGasExplorer name: explorer gas mask description: A military-grade gas mask that can be connected to an air supply. From 7a4fc39b9fa906f1025673741eda29694d62c0a6 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 13:20:44 +0000 Subject: [PATCH 118/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 969ab2a3531..4d7bdf0bd32 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: osjarw - changes: - - message: Added context menu action for scanning artifacts. - type: Add - id: 6724 - time: '2024-06-14T02:01:32.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26873 - author: Cojoke-dot changes: - message: Lasers now pass over things unless clicked like projectiles @@ -3864,3 +3857,10 @@ id: 7223 time: '2024-08-27T13:01:09.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31512 +- author: Winkarst-cpu + changes: + - message: The explorer gas mask is now restricted to the cargo. + type: Fix + id: 7224 + time: '2024-08-27T13:19:38.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31514 From 3492ca185b0af1f8ab4ce80481724578e903aba2 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:46:53 +0200 Subject: [PATCH 119/223] Fix stray pixel in officer beersky barsign (#31517) --- .../Wallmounts/barsign.rsi/officerbeersky.png | Bin 1129 -> 3160 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png index ede821777a00d129b30d11661de241017ddffaa1..823bf998c980dd19211ba2d040a8b7f06f1f3220 100644 GIT binary patch literal 3160 zcmZXXXIN9o8po3e1Q86V7;=ys><7lO2$Ahz(yjy@-D5wNNTU>o$-oz#PSP16#kG2L^0!Z zR|vI%;Q1qJvg%6tPP-5hMDn@tBCgRdF7aLg(bFyOvV+A>yT(D``bW;Q$Y#0J{L+v- zzy96sZsTb`z*zgVAT{ik6?CWn(@Fx-c9y$lk40#kd*>hI(o zD`Z-2Kh$1>O@O!fSzZEGaO(vXw>op%mnHU0>6Wm#>vd9~BsfrRcymeB)aRBh&_m^T z(caRK9T7tSosMgET2BubMDSWNSZ93qbGgK`rlI!6*Ii7UW}jNWr>yl@gyNj5*cp-c zB7yO9o=xZ*R?5k*u7RFSqkxDdl{beM!kwjb<22fF;OY%T5!l=rWs@#@`6R*#M3SGI zW;TKzK)^}|qAcal&RjO=ry?Xg8wk4OMRz;F;^RX;b19W)^P>9h*467cSMvE+D)KOh z?9tsq&pu0`6-w?L3DAnrbejs??4AICV6RV&CTz!X)7@L?t&IyWuLiFN9Qw=*l{(U= zpmNF0ou#|mFkbipn&4pgTA0mn0Xlwix~oRw=~wrJ#E8jC+Hx0>{1{tPf?sYM@J)hS zTOno!g?DM|b@}Kwc1=qPSZ`P4TX9od8}O-kpT;gb*}AX1eJr560VKRdGb(XC1~_Mskefgt zWPeZ*lo=kYUGCN6KQa88vE!H+h#nfrHhvMF=X>O5AD+txV)6UdM|GI(^PQb&p zm~`{*>6%8BVnpK?TA6%k7^7*l8Gebl7G6rtrSp>|YrN7)?pVgZXc26wA{2>jDS`D6fVVJBH z#;|CY^GKV5PPTejj`v&$FVT7n@|VdnZ5D<1b5HWiN~E{&(w@st9z8%Ve7!bnu?Abm&Awi~g2PujBz{3eu{6=9cr#SDNgH5qye z6(f05I3aj-+j22w@`cUvYJS7w(v82o#e+l43D?Tr?~951=^mU`QYx>VzdX~)>;?Cs z#L0DlCY-2`fyE$(GU57+9=@%u?IEk#u`$rvo!TNtBtD?#hv#Nt4bdD_9FP zVQxw|mrx#VC9A$ipqYP|& z<)IICv%4-{;va6BwHZdTSOe_{dwb7$gO*Ic*`iV(sui2ld1&Z}J!nk5X3$0lH(b`F zZGzHgZ$3L}-+Q3vE7L*@IR#wS9kuhBdbPwUytcJ$QdioxK3~bMMA2J9aBBfGOOqXH z#xY-t9Qhv}N2l)NxNuJZ-@iUzD0ox&LENq9rHUJpv>qek*@X9a;!lqj{4^0Dz6YzC z6--CpBqQSi>N3&bDN~VP~!UfHcO$*_7W$FC@9kL}&UbPaC&hu&+j^3#()Gn3|CHHwMOQ7ZQ z;{5>3?p~XQ$uhq7IzV0|yX(}F`0k0iv2>?K?u;jw0lI;5^xMEW*_}S#XRL-a_}81? zpH=)&EBc`xcS7^y$L2eGRBDVwdwcVO!q0l`NDN;HM@ymECzq8sBS92^8Q_1CyE%{t z?hCpk0dzx%ia=A zwwG!3CO4h%>n^ia;}?9sVKO15aIg%HxdN~5NW-73(=CO@(QInHJ(_>B9{xTqTO4c z&XASc0XkkjCTrF-j{=cmS+H6H3%V@?dM${R*?HDL%G42i$8zw*MdVx>EQ^d-{+ z!HNk9=HS5>jLdI5V}xr=+nKTHM@Ay8XT=dzH}{b05ZW7?=cZ_rCMduZtQn$?^ zBieuBnvhcJI6Jr6ogneEUVLLEiwhPG56YrI~b0&rQQ* zVHFo2rym@Sntl?Q_wN+rTJTH+>ofD2L{$W%qyvA{F*VcNLz>bk{U%%>ElxWe6k6FM zE-kGA4Eo))oqw&q0dT%X@+;&F#78>@;~p=<4mS6Z4j~R1|EpfZ8NKD)GTu#e0t)!a6sRk zur8W#n(p>xZ;*-{z@!>^R}C2o1Y9yXfgPi;+{DoDHwnN4AJ=RA*};d7riS}DI3Q3~ zZBCxm`q`&aBtLq$&Md%FKVj=!dJ##Kyri_Wg3+`jyI#;v4PX0luIG!IGsYvI5kkY# zLePu{R(O7Kdz#fkI3BOGVJCO~YbOe*-wK6x<;xwJHFE)>~KsIi5PPcH&9YoSf0Ff#I17GukU^jl|MaxFTQJkSpyRk ztv$|d-A#Nrg-B8E+xtnO>Yx=);d4ltl_P=}r+l<4vQXfQcU?5(@lo^4cv+YwlF3J$ zLm&ri()|TrIL;IpQ7^r#h(^%n8ra6sUB~U7?%v^&=3JJmr zkGst2Lxonm5w0jbWUk-~4w>`VXyXl_2w0%%sUTG$hO1qUkpqds1x{bo(09`tG1 z5L!LdsC89ake52<)Aw6;tM8pGdzzyC8B|NsBL zu=DC&pkM15OM?7@862M7NMm4NHt=+D45_&FHkvp5mVwCHrOFb#&1-k9EuO!LKZR*i z*BYZarNvGE{@>sHWU23I#w>3?|AKwdvxBR4ykDw+QhQ%@QY1%Jqx{aV;QYVG-W>xTThdEbx7|NCLNb4Jg(ntBV7=bp>I*Wdkqc!BsgtG#goEs4#! zO!sen?C-aFTlRa!-Iw#`&Fgi0ez4MDrcYgKy+vKSpkDKXPp`V-SrP>}cD-sy+!wk( zPP*6kL3D5SH1^xKxwkK2y!>Ym+potj9$l@H)#&{nA-BMOuAA7Z?9v4`b`k|L>{9Ng zkCcP2ud$zfR*CzxRl@ChGm~vuN8FdKd;j?L4{^35;W8Pi%2DkrC;$JNpKolXuq(q^ zTl(THpSj;^Yjpo>G6zZov0dSnYux>E$F#o;7Y&xkIov(*Ec@qqS;o8uPVP{LkAf#2 zWdHO(>zJC5$LGboIVxqrFY$obO>9?~&#Yzq$#Anq_J8H31G2BLD=@8bk+T! zG*_=D&y52nJA0fsyW6})My5vLN$EtsDJRZLGR`}?EZHmX+qe1lk1Kvoyx=6L)6d_n z5%qvuXB+ z7l$~O2;1|pddIQP1p556@_{QKR8P*77Wkv?$EtH-jbK97FBSdvt3bK#;(&dkGmRE7 z9ng?1V4muA`7_&;by3Wp)}Fb-yn->}SUzdz3rVM=UdPdLCF@aB0z<{u@t7r|cq z>@xN3Q{u(mJ81rKVoQ)*{?{ybUWlmgeQM z$u~MIuxt3m@QQf_KZtRF`8vDLweO{WrPsfI{mVS={`Ift95myhAO+SH>&s0rCzC0uV!CrvGLy_|Nc8{=i>| iWoTT8BW%?EFemTQ$cs53@(q}u7(8A5T-G@yGywov`~j{2 From 8ffae8d313fe7b651db4fd5e0855773463b1d92f Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Tue, 27 Aug 2024 15:43:47 +0100 Subject: [PATCH 120/223] Scale text in admin player overlay (#31503) * Scale text in admin player overlay Fixes #30040 * Feedback from PR - get UI scale through root window --------- Co-authored-by: Eoin Mcloughlin --- .../Administration/AdminNameOverlay.cs | 20 +++++++++++-------- .../Systems/AdminSystem.Overlay.cs | 5 ++++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs index 6a1881a2276..e2db7a8d6b4 100644 --- a/Content.Client/Administration/AdminNameOverlay.cs +++ b/Content.Client/Administration/AdminNameOverlay.cs @@ -2,10 +2,10 @@ using Content.Client.Administration.Systems; using Robust.Client.Graphics; using Robust.Client.ResourceManagement; +using Robust.Client.UserInterface; +using Robust.Shared; using Robust.Shared.Enums; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Maths; +using Robust.Shared.Configuration; namespace Content.Client.Administration; @@ -15,14 +15,16 @@ internal sealed class AdminNameOverlay : Overlay private readonly IEntityManager _entityManager; private readonly IEyeManager _eyeManager; private readonly EntityLookupSystem _entityLookup; + private readonly IUserInterfaceManager _userInterfaceManager; private readonly Font _font; - public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, EntityLookupSystem entityLookup) + public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, EntityLookupSystem entityLookup, IUserInterfaceManager userInterfaceManager) { _system = system; _entityManager = entityManager; _eyeManager = eyeManager; _entityLookup = entityLookup; + _userInterfaceManager = userInterfaceManager; ZIndex = 200; _font = new VectorFont(resourceCache.GetResource("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10); } @@ -57,16 +59,18 @@ protected override void Draw(in OverlayDrawArgs args) continue; } - var lineoffset = new Vector2(0f, 11f); + var uiScale = _userInterfaceManager.RootControl.UIScale; + var lineoffset = new Vector2(0f, 11f) * uiScale; var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center + new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec( aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f); if (playerInfo.Antag) { - args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", Color.OrangeRed); + args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", uiScale, Color.OrangeRed); +; } - args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, playerInfo.Connected ? Color.Yellow : Color.White); - args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, playerInfo.Connected ? Color.Aquamarine : Color.White); + args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, uiScale, playerInfo.Connected ? Color.Yellow : Color.White); + args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, uiScale, playerInfo.Connected ? Color.Aquamarine : Color.White); } } } diff --git a/Content.Client/Administration/Systems/AdminSystem.Overlay.cs b/Content.Client/Administration/Systems/AdminSystem.Overlay.cs index 3502faf9e8e..ba6ce40ca0b 100644 --- a/Content.Client/Administration/Systems/AdminSystem.Overlay.cs +++ b/Content.Client/Administration/Systems/AdminSystem.Overlay.cs @@ -1,6 +1,8 @@ using Content.Client.Administration.Managers; using Robust.Client.Graphics; using Robust.Client.ResourceManagement; +using Robust.Client.UserInterface; +using Robust.Shared.Configuration; namespace Content.Client.Administration.Systems { @@ -11,6 +13,7 @@ public sealed partial class AdminSystem [Dependency] private readonly IClientAdminManager _adminManager = default!; [Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly EntityLookupSystem _entityLookup = default!; + [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; private AdminNameOverlay _adminNameOverlay = default!; @@ -19,7 +22,7 @@ public sealed partial class AdminSystem private void InitializeOverlay() { - _adminNameOverlay = new AdminNameOverlay(this, EntityManager, _eyeManager, _resourceCache, _entityLookup); + _adminNameOverlay = new AdminNameOverlay(this, EntityManager, _eyeManager, _resourceCache, _entityLookup, _userInterfaceManager); _adminManager.AdminStatusUpdated += OnAdminStatusUpdated; } From 250628f8051b08f1e6b8673d182fa7b6b12eaf91 Mon Sep 17 00:00:00 2001 From: Thomas <87614336+Aeshus@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:57:36 -0500 Subject: [PATCH 121/223] New Health Analyzer UI (#30834) * WIP: first prototype * Change text slightly * Allow names to wrap * Add label for the scan mode * Remove ugly text * Readd bleeding message * Update code * Allow for the Health Analyzer UI to grow vertically --- .../UI/HealthAnalyzerBoundUserInterface.cs | 1 + .../UI/HealthAnalyzerWindow.xaml | 70 +++++--- .../UI/HealthAnalyzerWindow.xaml.cs | 168 +++++++++--------- .../components/health-analyzer-component.ftl | 28 +-- 4 files changed, 149 insertions(+), 118 deletions(-) diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs index 38760f4aa3c..baea03c8923 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs @@ -17,6 +17,7 @@ public HealthAnalyzerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owne protected override void Open() { base.Open(); + _window = this.CreateWindow(); _window.Title = EntMan.GetComponent(Owner).EntityName; diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml index 401f9768629..97968c4b990 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml @@ -1,48 +1,64 @@ - + MaxHeight="525" + MinWidth="300"> diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index fcf6d4551fd..9b96f5d3fe9 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -1,12 +1,20 @@ using System.Linq; using System.Numerics; +using Content.Client.Message; using Content.Shared.Atmos; using Content.Client.UserInterface.Controls; +using Content.Shared.Alert; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; +using Content.Shared.Humanoid; +using Content.Shared.Humanoid.Prototypes; using Content.Shared.IdentityManagement; +using Content.Shared.Inventory; using Content.Shared.MedicalScanner; +using Content.Shared.Mobs; +using Content.Shared.Mobs.Components; +using Content.Shared.Mobs.Systems; using Content.Shared.Nutrition.Components; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.XAML; @@ -28,9 +36,6 @@ public sealed partial class HealthAnalyzerWindow : FancyWindow private readonly IPrototypeManager _prototypes; private readonly IResourceCache _cache; - private const int AnalyzerHeight = 430; - private const int AnalyzerWidth = 300; - public HealthAnalyzerWindow() { RobustXamlLoader.Load(this); @@ -44,8 +49,6 @@ public HealthAnalyzerWindow() public void Populate(HealthAnalyzerScannedUserMessage msg) { - GroupsContainer.RemoveAllChildren(); - var target = _entityManager.GetEntity(msg.TargetEntity); if (target == null @@ -57,82 +60,96 @@ public void Populate(HealthAnalyzerScannedUserMessage msg) NoPatientDataText.Visible = false; - string entityName = Loc.GetString("health-analyzer-window-entity-unknown-text"); - if (_entityManager.HasComponent(target.Value)) - { - entityName = Identity.Name(target.Value, _entityManager); - } + // Scan Mode - if (msg.ScanMode.HasValue) - { - ScanModePanel.Visible = true; - ScanModeText.Text = Loc.GetString(msg.ScanMode.Value ? "health-analyzer-window-scan-mode-active" : "health-analyzer-window-scan-mode-inactive"); - ScanModeText.FontColorOverride = msg.ScanMode.Value ? Color.Green : Color.Red; - } - else - { - ScanModePanel.Visible = false; - } + ScanModeLabel.Text = msg.ScanMode.HasValue + ? msg.ScanMode.Value + ? Loc.GetString("health-analyzer-window-scan-mode-active") + : Loc.GetString("health-analyzer-window-scan-mode-inactive") + : Loc.GetString("health-analyzer-window-entity-unknown-text"); + + ScanModeLabel.FontColorOverride = msg.ScanMode.HasValue && msg.ScanMode.Value ? Color.Green : Color.Red; + + // Patient Information + + SpriteView.SetEntity(target.Value); + + var name = new FormattedMessage(); + name.PushColor(Color.White); + name.AddText(_entityManager.HasComponent(target.Value) + ? Identity.Name(target.Value, _entityManager) + : Loc.GetString("health-analyzer-window-entity-unknown-text")); + NameLabel.SetMessage(name); + + SpeciesLabel.Text = + _entityManager.TryGetComponent(target.Value, + out var humanoidAppearanceComponent) + ? Loc.GetString(_prototypes.Index(humanoidAppearanceComponent.Species).Name) + : Loc.GetString("health-analyzer-window-entity-unknown-species-text"); + + // Basic Diagnostic + + TemperatureLabel.Text = !float.IsNaN(msg.Temperature) + ? $"{msg.Temperature - Atmospherics.T0C:F1} °C ({msg.Temperature:F1} K)" + : Loc.GetString("health-analyzer-window-entity-unknown-value-text"); + + BloodLabel.Text = !float.IsNaN(msg.BloodLevel) + ? $"{msg.BloodLevel * 100:F1} %" + : Loc.GetString("health-analyzer-window-entity-unknown-value-text"); - PatientName.Text = Loc.GetString( - "health-analyzer-window-entity-health-text", - ("entityName", entityName) - ); + StatusLabel.Text = + _entityManager.TryGetComponent(target.Value, out var mobStateComponent) + ? GetStatus(mobStateComponent.CurrentState) + : Loc.GetString("health-analyzer-window-entity-unknown-text"); - Temperature.Text = Loc.GetString("health-analyzer-window-entity-temperature-text", - ("temperature", float.IsNaN(msg.Temperature) ? "N/A" : $"{msg.Temperature - Atmospherics.T0C:F1} °C ({msg.Temperature:F1} K)") - ); + // Total Damage - BloodLevel.Text = Loc.GetString("health-analyzer-window-entity-blood-level-text", - ("bloodLevel", float.IsNaN(msg.BloodLevel) ? "N/A" : $"{msg.BloodLevel * 100:F1} %") - ); + DamageLabel.Text = damageable.TotalDamage.ToString(); + + // Alerts + + AlertsDivider.Visible = msg.Bleeding == true; + AlertsContainer.Visible = msg.Bleeding == true; if (msg.Bleeding == true) { - Bleeding.Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"); - Bleeding.FontColorOverride = Color.Red; - } - else - { - Bleeding.Text = string.Empty; // Clear the text + AlertsContainer.DisposeAllChildren(); + AlertsContainer.AddChild(new Label + { + Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"), + FontColorOverride = Color.Red, + }); } - patientDamageAmount.Text = Loc.GetString( - "health-analyzer-window-entity-damage-total-text", - ("amount", damageable.TotalDamage) - ); + // Damage Groups var damageSortedGroups = - damageable.DamagePerGroup.OrderBy(damage => damage.Value) + damageable.DamagePerGroup.OrderByDescending(damage => damage.Value) .ToDictionary(x => x.Key, x => x.Value); + IReadOnlyDictionary damagePerType = damageable.Damage.DamageDict; DrawDiagnosticGroups(damageSortedGroups, damagePerType); + } - if (_entityManager.TryGetComponent(target, out HungerComponent? hunger) - && hunger.StarvationDamage != null - && hunger.CurrentThreshold <= HungerThreshold.Starving) + private static string GetStatus(MobState mobState) + { + return mobState switch { - var box = new Control { Margin = new Thickness(0, 0, 0, 15) }; - - box.AddChild(CreateDiagnosticGroupTitle( - Loc.GetString("health-analyzer-window-malnutrition"), - "malnutrition")); - - GroupsContainer.AddChild(box); - } - - SetHeight = AnalyzerHeight; - SetWidth = AnalyzerWidth; + MobState.Alive => Loc.GetString("health-analyzer-window-entity-alive-text"), + MobState.Critical => Loc.GetString("health-analyzer-window-entity-critical-text"), + MobState.Dead => Loc.GetString("health-analyzer-window-entity-dead-text"), + _ => Loc.GetString("health-analyzer-window-entity-unknown-text"), + }; } private void DrawDiagnosticGroups( - Dictionary groups, IReadOnlyDictionary damageDict) + Dictionary groups, + IReadOnlyDictionary damageDict) { - HashSet shownTypes = new(); + GroupsContainer.RemoveAllChildren(); - // Show the total damage and type breakdown for each damage group. - foreach (var (damageGroupId, damageAmount) in groups.Reverse()) + foreach (var (damageGroupId, damageAmount) in groups) { if (damageAmount == 0) continue; @@ -145,7 +162,6 @@ private void DrawDiagnosticGroups( var groupContainer = new BoxContainer { - Margin = new Thickness(0, 0, 0, 15), Align = BoxContainer.AlignMode.Begin, Orientation = BoxContainer.LayoutOrientation.Vertical, }; @@ -159,23 +175,16 @@ private void DrawDiagnosticGroups( foreach (var type in group.DamageTypes) { - if (damageDict.TryGetValue(type, out var typeAmount) && typeAmount > 0) - { - // If damage types are allowed to belong to more than one damage group, - // they may appear twice here. Mark them as duplicate. - if (shownTypes.Contains(type)) - continue; - - shownTypes.Add(type); - - var damageString = Loc.GetString( - "health-analyzer-window-damage-type-text", - ("damageType", _prototypes.Index(type).LocalizedName), - ("amount", typeAmount) - ); - - groupContainer.AddChild(CreateDiagnosticItemLabel(damageString.Insert(0, "- "))); - } + if (!damageDict.TryGetValue(type, out var typeAmount) || typeAmount <= 0) + continue; + + var damageString = Loc.GetString( + "health-analyzer-window-damage-type-text", + ("damageType", _prototypes.Index(type).LocalizedName), + ("amount", typeAmount) + ); + + groupContainer.AddChild(CreateDiagnosticItemLabel(damageString.Insert(0, " · "))); } } } @@ -198,7 +207,6 @@ private static Label CreateDiagnosticItemLabel(string text) { return new Label { - Margin = new Thickness(2, 2), Text = text, }; } @@ -207,13 +215,13 @@ private BoxContainer CreateDiagnosticGroupTitle(string text, string id) { var rootContainer = new BoxContainer { + Margin = new Thickness(0, 6, 0, 0), VerticalAlignment = VAlignment.Bottom, - Orientation = BoxContainer.LayoutOrientation.Horizontal + Orientation = BoxContainer.LayoutOrientation.Horizontal, }; rootContainer.AddChild(new TextureRect { - Margin = new Thickness(0, 3), SetSize = new Vector2(30, 30), Texture = GetTexture(id.ToLower()) }); diff --git a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl index 121e50b923e..fe1f92e9140 100644 --- a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl +++ b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl @@ -1,18 +1,24 @@ health-analyzer-window-no-patient-data-text = No patient data. -health-analyzer-window-entity-unknown-text = unknown -health-analyzer-window-entity-health-text = {$entityName}'s health: -health-analyzer-window-entity-temperature-text = Temperature: {$temperature} -health-analyzer-window-entity-blood-level-text = Blood Level: {$bloodLevel} -health-analyzer-window-entity-bleeding-text = Patient is bleeding! -health-analyzer-window-entity-damage-total-text = Total Damage: {$amount} +health-analyzer-window-entity-unknown-text = Unknown +health-analyzer-window-entity-unknown-species-text = Non-Humanoid +health-analyzer-window-entity-unknown-value-text = N/A + +health-analyzer-window-entity-alive-text = Alive +health-analyzer-window-entity-dead-text = Dead +health-analyzer-window-entity-critical-text = Critical + +health-analyzer-window-entity-temperature-text = Temperature: +health-analyzer-window-entity-blood-level-text = Blood Level: +health-analyzer-window-entity-status-text = Status: +health-analyzer-window-entity-damage-total-text = Total Damage: + health-analyzer-window-damage-group-text = {$damageGroup}: {$amount} health-analyzer-window-damage-type-text = {$damageType}: {$amount} -health-analyzer-window-damage-type-duplicate-text = {$damageType}: {$amount} (duplicate) -health-analyzer-window-scan-mode-text = Scan Mode: -health-analyzer-window-scan-mode-active = ACTIVE -health-analyzer-window-scan-mode-inactive = INACTIVE +health-analyzer-window-entity-bleeding-text = Patient is bleeding! -health-analyzer-window-malnutrition = Severely malnourished +health-analyzer-window-scan-mode-text = Scan Mode: +health-analyzer-window-scan-mode-active = Active +health-analyzer-window-scan-mode-inactive = Inactive health-analyzer-popup-scan-target = {CAPITALIZE(THE($user))} is trying to scan you! From 4b91f1f50b72c3f1a2084ae5b0f3fb2ee2396abc Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 14:58:42 +0000 Subject: [PATCH 122/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4d7bdf0bd32..5754613da78 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Cojoke-dot - changes: - - message: Lasers now pass over things unless clicked like projectiles - type: Tweak - id: 6725 - time: '2024-06-14T02:04:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28768 - author: Boaz1111 changes: - message: The PKA can now mine rocks in one hit again. @@ -3864,3 +3857,11 @@ id: 7224 time: '2024-08-27T13:19:38.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31514 +- author: Aeshus + changes: + - message: The Health Analyzer now displays the patient's picture, species, and + current status. + type: Add + id: 7225 + time: '2024-08-27T14:57:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30834 From d304123ef7ddc96afe96a30c5991f2876992a09c Mon Sep 17 00:00:00 2001 From: Thomas <87614336+Aeshus@users.noreply.github.com> Date: Tue, 27 Aug 2024 10:02:21 -0500 Subject: [PATCH 123/223] Disable Arrivals message for Cryosleep (#30888) * Disable arrivals message for cryosleep late arrivals * Provide silent to PlayerSpawnCompleteEvent * Fix typo * Move message to event and into arrivals system --- .../GameTicking/GameTicker.Spawning.cs | 23 +++++-------------- .../Shuttles/Systems/ArrivalsSystem.cs | 16 +++++++++++++ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 5e2ef0c02c0..3ca62e561d7 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -4,6 +4,7 @@ using Content.Server.Administration.Managers; using Content.Server.GameTicking.Events; using Content.Server.Ghost; +using Content.Server.Shuttles.Components; using Content.Server.Spawners.Components; using Content.Server.Speech.Components; using Content.Server.Station.Components; @@ -274,28 +275,13 @@ private void SpawnPlayer(ICommonSession player, Loc.GetString("job-greet-station-name", ("stationName", metaData.EntityName))); } - // Arrivals is unable to do this during spawning as no actor is attached yet. - // We also want this message last. - if (!silent && lateJoin && _arrivals.Enabled) - { - var arrival = _arrivals.NextShuttleArrival(); - if (arrival == null) - { - _chatManager.DispatchServerMessage(player, Loc.GetString("latejoin-arrivals-direction")); - } - else - { - _chatManager.DispatchServerMessage(player, - Loc.GetString("latejoin-arrivals-direction-time", ("time", $"{arrival:mm\\:ss}"))); - } - } - // We raise this event directed to the mob, but also broadcast it so game rules can do something now. PlayersJoinedRoundNormally++; var aev = new PlayerSpawnCompleteEvent(mob, player, jobId, lateJoin, + silent, PlayersJoinedRoundNormally, station, character); @@ -314,7 +300,7 @@ public void Respawn(ICommonSession player) } /// - /// Makes a player join into the game and spawn on a staiton. + /// Makes a player join into the game and spawn on a station. /// /// The player joining /// The station they're spawning on @@ -494,6 +480,7 @@ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs public ICommonSession Player { get; } public string? JobId { get; } public bool LateJoin { get; } + public bool Silent { get; } public EntityUid Station { get; } public HumanoidCharacterProfile Profile { get; } @@ -504,6 +491,7 @@ public PlayerSpawnCompleteEvent(EntityUid mob, ICommonSession player, string? jobId, bool lateJoin, + bool silent, int joinOrder, EntityUid station, HumanoidCharacterProfile profile) @@ -512,6 +500,7 @@ public PlayerSpawnCompleteEvent(EntityUid mob, Player = player; JobId = jobId; LateJoin = lateJoin; + Silent = silent; Station = station; Profile = profile; JoinOrder = joinOrder; diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index e921590e390..0b86383faa8 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -104,6 +104,8 @@ public override void Initialize() SubscribeLocalEvent(OnArrivalsFTL); SubscribeLocalEvent(OnArrivalsDocked); + SubscribeLocalEvent(SendDirections); + _pendingQuery = GetEntityQuery(); _blacklistQuery = GetEntityQuery(); _mobQuery = GetEntityQuery(); @@ -378,6 +380,20 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev) EnsureComp(ev.SpawnResult.Value); } + private void SendDirections(PlayerSpawnCompleteEvent ev) + { + if (!Enabled || !ev.LateJoin || ev.Silent || !_pendingQuery.HasComp(ev.Mob)) + return; + + var arrival = NextShuttleArrival(); + + var message = arrival is not null + ? Loc.GetString("latejoin-arrivals-direction-time", ("time", $"{arrival:mm\\:ss}")) + : Loc.GetString("latejoin-arrivals-direction"); + + _chat.DispatchServerMessage(ev.Player, message); + } + private bool TryTeleportToMapSpawn(EntityUid player, EntityUid stationId, TransformComponent? transform = null) { if (!Resolve(player, ref transform)) From bf7653eb7a3cee2cc1ba85c466fc3ddb97bc5a17 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 15:03:27 +0000 Subject: [PATCH 124/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5754613da78..7df53e2a849 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Boaz1111 - changes: - - message: The PKA can now mine rocks in one hit again. - type: Tweak - id: 6726 - time: '2024-06-14T02:40:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27476 - author: KyuPolaris changes: - message: Chickens now make a clucking sound when they speak. @@ -3865,3 +3858,10 @@ id: 7225 time: '2024-08-27T14:57:36.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30834 +- author: Aeshus + changes: + - message: Cryosleep no longer gives arrival shuttle directions. + type: Fix + id: 7226 + time: '2024-08-27T15:02:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30888 From e59b9c5714d0c272c51b48438fce1322e584ddcc Mon Sep 17 00:00:00 2001 From: stellar-novas Date: Tue, 27 Aug 2024 11:04:12 -0400 Subject: [PATCH 125/223] Remove glibc from devshell (#28842) --- shell.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/shell.nix b/shell.nix index da363feda9c..9a1b0ca4290 100644 --- a/shell.nix +++ b/shell.nix @@ -12,7 +12,6 @@ let SDL2 libGL openal - glibc freetype fluidsynth soundfont-fluid From f92ef41538cc97098cc71048072bcc9a21dbaa0b Mon Sep 17 00:00:00 2001 From: Simon <63975668+Simyon264@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:01:17 +0200 Subject: [PATCH 126/223] Automated whitelists (#23985) * Beginnings of making the breadmemes jobs easier * stuff * stuff pt. 2 * Stuff pt.3 * Stuff I forgot last time * Basic whitelist Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist * Remove always deny condition in favor of just breaking if playtime check fails * Change default whitelist Default whitelist is now the "legacy" whitelist. * localization * Admin check * minor spelling change * Fix build * Whitelist message * Fix vars not being datafield and spelling mistakes * Minor spelling mistake * Change config for salamander * Reviews and stuff * Add summaries * Fix whitelists * Forgot to add a datafield * Fixing stuff I guess * Reuse admin remarks to reduce load when connecting. * Update log messages to be verbose instead of debug * Reviews * whoops * Explain a bit more how whitelist checking works * Apply CE's review * Append Membership to Blacklist and Whitelist conditions * Fix review comments * Uncapitalize playerConnectionWhitelist, add to ignored client prototypes * Make note count field work * Fix cvar for thingy --------- Co-authored-by: Pieter-Jan Briers --- Content.Client/Entry/EntryPoint.cs | 1 + .../20240112194620_Blacklist.Designer.cs | 1769 +++++++++++++++++ .../Postgres/20240112194620_Blacklist.cs | 33 + .../PostgresServerDbContextModelSnapshot.cs | 14 + .../20240112194612_Blacklist.Designer.cs | 1701 ++++++++++++++++ .../Sqlite/20240112194612_Blacklist.cs | 33 + .../SqliteServerDbContextModelSnapshot.cs | 13 + Content.Server.Database/Model.cs | 10 + .../Connection/ConnectionManager.Whitelist.cs | 221 ++ .../Connection/ConnectionManager.cs | 47 +- .../Connection/Whitelist/BlacklistCommands.cs | 117 ++ .../Conditions/ConditionAlwaysMatch.cs | 12 + .../ConditionManualBlacklistMembership.cs | 12 + .../ConditionManualWhitelistMembership.cs | 12 + .../Conditions/ConditionNotesDateRange.cs | 34 + .../Conditions/ConditionNotesPlaytimeRange.cs | 30 + .../Conditions/ConditionPlayerCount.cs | 16 + .../Whitelist/Conditions/ConditionPlaytime.cs | 15 + .../Whitelist/WhitelistCondition.cs | 41 + .../Whitelist/WhitelistPrototype.cs | 42 + Content.Server/Database/ServerDbBase.cs | 23 + Content.Server/Database/ServerDbManager.cs | 28 + Content.Server/Entry/EntryPoint.cs | 1 + Content.Shared/CCVar/CCVars.cs | 20 +- .../ConfigPresets/WizardsDen/salamander.toml | 5 +- .../Locale/en-US/connection-messages.ftl | 38 +- Resources/Prototypes/whitelists.yml | 7 + Resources/Prototypes/wizardsDenWhitelists.yml | 39 + 28 files changed, 4288 insertions(+), 46 deletions(-) create mode 100644 Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs create mode 100644 Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs create mode 100644 Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs create mode 100644 Content.Server/Connection/ConnectionManager.Whitelist.cs create mode 100644 Content.Server/Connection/Whitelist/BlacklistCommands.cs create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs create mode 100644 Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs create mode 100644 Content.Server/Connection/Whitelist/WhitelistCondition.cs create mode 100644 Content.Server/Connection/Whitelist/WhitelistPrototype.cs create mode 100644 Resources/Prototypes/whitelists.yml create mode 100644 Resources/Prototypes/wizardsDenWhitelists.yml diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 6caefb9a7e9..c4c18f154a3 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -108,6 +108,7 @@ public override void Init() _prototypeManager.RegisterIgnore("lobbyBackground"); _prototypeManager.RegisterIgnore("gamePreset"); _prototypeManager.RegisterIgnore("noiseChannel"); + _prototypeManager.RegisterIgnore("playerConnectionWhitelist"); _prototypeManager.RegisterIgnore("spaceBiome"); _prototypeManager.RegisterIgnore("worldgenConfig"); _prototypeManager.RegisterIgnore("gameRule"); diff --git a/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs new file mode 100644 index 00000000000..61aa1a8c73e --- /dev/null +++ b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.Designer.cs @@ -0,0 +1,1769 @@ +// +using System; +using System.Net; +using System.Text.Json; +using Content.Server.Database; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace Content.Server.Database.Migrations.Postgres +{ + [DbContext(typeof(PostgresServerDbContext))] + [Migration("20240112194620_Blacklist")] + partial class Blacklist + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.4") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Content.Server.Database.Admin", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.Property("AdminRankId") + .HasColumnType("integer") + .HasColumnName("admin_rank_id"); + + b.Property("Title") + .HasColumnType("text") + .HasColumnName("title"); + + b.HasKey("UserId") + .HasName("PK_admin"); + + b.HasIndex("AdminRankId") + .HasDatabaseName("IX_admin_admin_rank_id"); + + b.ToTable("admin", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminFlag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("admin_flag_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AdminId") + .HasColumnType("uuid") + .HasColumnName("admin_id"); + + b.Property("Flag") + .IsRequired() + .HasColumnType("text") + .HasColumnName("flag"); + + b.Property("Negative") + .HasColumnType("boolean") + .HasColumnName("negative"); + + b.HasKey("Id") + .HasName("PK_admin_flag"); + + b.HasIndex("AdminId") + .HasDatabaseName("IX_admin_flag_admin_id"); + + b.HasIndex("Flag", "AdminId") + .IsUnique(); + + b.ToTable("admin_flag", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLog", b => + { + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("Id") + .HasColumnType("integer") + .HasColumnName("admin_log_id"); + + b.Property("Date") + .HasColumnType("timestamp with time zone") + .HasColumnName("date"); + + b.Property("Impact") + .HasColumnType("smallint") + .HasColumnName("impact"); + + b.Property("Json") + .IsRequired() + .HasColumnType("jsonb") + .HasColumnName("json"); + + b.Property("Message") + .IsRequired() + .HasColumnType("text") + .HasColumnName("message"); + + b.Property("Type") + .HasColumnType("integer") + .HasColumnName("type"); + + b.HasKey("RoundId", "Id") + .HasName("PK_admin_log"); + + b.HasIndex("Date"); + + b.HasIndex("Message") + .HasAnnotation("Npgsql:TsVectorConfig", "english"); + + NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN"); + + b.HasIndex("Type") + .HasDatabaseName("IX_admin_log_type"); + + b.ToTable("admin_log", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b => + { + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("LogId") + .HasColumnType("integer") + .HasColumnName("log_id"); + + b.Property("PlayerUserId") + .HasColumnType("uuid") + .HasColumnName("player_user_id"); + + b.HasKey("RoundId", "LogId", "PlayerUserId") + .HasName("PK_admin_log_player"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_admin_log_player_player_user_id"); + + b.ToTable("admin_log_player", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("admin_messages_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("CreatedById") + .HasColumnType("uuid") + .HasColumnName("created_by_id"); + + b.Property("Deleted") + .HasColumnType("boolean") + .HasColumnName("deleted"); + + b.Property("DeletedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("deleted_at"); + + b.Property("DeletedById") + .HasColumnType("uuid") + .HasColumnName("deleted_by_id"); + + b.Property("ExpirationTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiration_time"); + + b.Property("LastEditedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("uuid") + .HasColumnName("last_edited_by_id"); + + b.Property("Message") + .IsRequired() + .HasMaxLength(4096) + .HasColumnType("character varying(4096)") + .HasColumnName("message"); + + b.Property("PlayerUserId") + .HasColumnType("uuid") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("interval") + .HasColumnName("playtime_at_note"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("Seen") + .HasColumnType("boolean") + .HasColumnName("seen"); + + b.HasKey("Id") + .HasName("PK_admin_messages"); + + b.HasIndex("CreatedById"); + + b.HasIndex("DeletedById"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_admin_messages_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_admin_messages_round_id"); + + b.ToTable("admin_messages", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminNote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("admin_notes_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("CreatedById") + .HasColumnType("uuid") + .HasColumnName("created_by_id"); + + b.Property("Deleted") + .HasColumnType("boolean") + .HasColumnName("deleted"); + + b.Property("DeletedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("deleted_at"); + + b.Property("DeletedById") + .HasColumnType("uuid") + .HasColumnName("deleted_by_id"); + + b.Property("ExpirationTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiration_time"); + + b.Property("LastEditedAt") + .IsRequired() + .HasColumnType("timestamp with time zone") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("uuid") + .HasColumnName("last_edited_by_id"); + + b.Property("Message") + .IsRequired() + .HasMaxLength(4096) + .HasColumnType("character varying(4096)") + .HasColumnName("message"); + + b.Property("PlayerUserId") + .HasColumnType("uuid") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("interval") + .HasColumnName("playtime_at_note"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("Secret") + .HasColumnType("boolean") + .HasColumnName("secret"); + + b.Property("Severity") + .HasColumnType("integer") + .HasColumnName("severity"); + + b.HasKey("Id") + .HasName("PK_admin_notes"); + + b.HasIndex("CreatedById"); + + b.HasIndex("DeletedById"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_admin_notes_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_admin_notes_round_id"); + + b.ToTable("admin_notes", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminRank", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("admin_rank_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("PK_admin_rank"); + + b.ToTable("admin_rank", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("admin_rank_flag_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AdminRankId") + .HasColumnType("integer") + .HasColumnName("admin_rank_id"); + + b.Property("Flag") + .IsRequired() + .HasColumnType("text") + .HasColumnName("flag"); + + b.HasKey("Id") + .HasName("PK_admin_rank_flag"); + + b.HasIndex("AdminRankId"); + + b.HasIndex("Flag", "AdminRankId") + .IsUnique(); + + b.ToTable("admin_rank_flag", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("admin_watchlists_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_at"); + + b.Property("CreatedById") + .HasColumnType("uuid") + .HasColumnName("created_by_id"); + + b.Property("Deleted") + .HasColumnType("boolean") + .HasColumnName("deleted"); + + b.Property("DeletedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("deleted_at"); + + b.Property("DeletedById") + .HasColumnType("uuid") + .HasColumnName("deleted_by_id"); + + b.Property("ExpirationTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiration_time"); + + b.Property("LastEditedAt") + .IsRequired() + .HasColumnType("timestamp with time zone") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("uuid") + .HasColumnName("last_edited_by_id"); + + b.Property("Message") + .IsRequired() + .HasMaxLength(4096) + .HasColumnType("character varying(4096)") + .HasColumnName("message"); + + b.Property("PlayerUserId") + .HasColumnType("uuid") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("interval") + .HasColumnName("playtime_at_note"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.HasKey("Id") + .HasName("PK_admin_watchlists"); + + b.HasIndex("CreatedById"); + + b.HasIndex("DeletedById"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_admin_watchlists_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_admin_watchlists_round_id"); + + b.ToTable("admin_watchlists", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Antag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("antag_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AntagName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("antag_name"); + + b.Property("ProfileId") + .HasColumnType("integer") + .HasColumnName("profile_id"); + + b.HasKey("Id") + .HasName("PK_antag"); + + b.HasIndex("ProfileId", "AntagName") + .IsUnique(); + + b.ToTable("antag", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AssignedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("assigned_user_id_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.Property("UserName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("user_name"); + + b.HasKey("Id") + .HasName("PK_assigned_user_id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.HasIndex("UserName") + .IsUnique(); + + b.ToTable("assigned_user_id", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Blacklist", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("UserId") + .HasName("PK_blacklist"); + + b.ToTable("blacklist", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.ConnectionLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("connection_log_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasColumnType("inet") + .HasColumnName("address"); + + b.Property("Denied") + .HasColumnType("smallint") + .HasColumnName("denied"); + + b.Property("HWId") + .HasColumnType("bytea") + .HasColumnName("hwid"); + + b.Property("ServerId") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasDefaultValue(0) + .HasColumnName("server_id"); + + b.Property("Time") + .HasColumnType("timestamp with time zone") + .HasColumnName("time"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.Property("UserName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("user_name"); + + b.HasKey("Id") + .HasName("PK_connection_log"); + + b.HasIndex("ServerId") + .HasDatabaseName("IX_connection_log_server_id"); + + b.HasIndex("UserId"); + + b.ToTable("connection_log", null, t => + { + t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address"); + }); + }); + + modelBuilder.Entity("Content.Server.Database.Job", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("job_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("JobName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("job_name"); + + b.Property("Priority") + .HasColumnType("integer") + .HasColumnName("priority"); + + b.Property("ProfileId") + .HasColumnType("integer") + .HasColumnName("profile_id"); + + b.HasKey("Id") + .HasName("PK_job"); + + b.HasIndex("ProfileId"); + + b.HasIndex("ProfileId", "JobName") + .IsUnique(); + + b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority") + .IsUnique() + .HasFilter("priority = 3"); + + b.ToTable("job", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.PlayTime", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("play_time_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("PlayerId") + .HasColumnType("uuid") + .HasColumnName("player_id"); + + b.Property("TimeSpent") + .HasColumnType("interval") + .HasColumnName("time_spent"); + + b.Property("Tracker") + .IsRequired() + .HasColumnType("text") + .HasColumnName("tracker"); + + b.HasKey("Id") + .HasName("PK_play_time"); + + b.HasIndex("PlayerId", "Tracker") + .IsUnique(); + + b.ToTable("play_time", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Player", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("player_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("FirstSeenTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("first_seen_time"); + + b.Property("LastReadRules") + .HasColumnType("timestamp with time zone") + .HasColumnName("last_read_rules"); + + b.Property("LastSeenAddress") + .IsRequired() + .HasColumnType("inet") + .HasColumnName("last_seen_address"); + + b.Property("LastSeenHWId") + .HasColumnType("bytea") + .HasColumnName("last_seen_hwid"); + + b.Property("LastSeenTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("last_seen_time"); + + b.Property("LastSeenUserName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("last_seen_user_name"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("PK_player"); + + b.HasAlternateKey("UserId") + .HasName("ak_player_user_id"); + + b.HasIndex("LastSeenUserName"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("player", null, t => + { + t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address"); + }); + }); + + modelBuilder.Entity("Content.Server.Database.Preference", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("preference_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AdminOOCColor") + .IsRequired() + .HasColumnType("text") + .HasColumnName("admin_ooc_color"); + + b.Property("SelectedCharacterSlot") + .HasColumnType("integer") + .HasColumnName("selected_character_slot"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("PK_preference"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("preference", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Profile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("profile_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Age") + .HasColumnType("integer") + .HasColumnName("age"); + + b.Property("Backpack") + .IsRequired() + .HasColumnType("text") + .HasColumnName("backpack"); + + b.Property("CharacterName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("char_name"); + + b.Property("Clothing") + .IsRequired() + .HasColumnType("text") + .HasColumnName("clothing"); + + b.Property("EyeColor") + .IsRequired() + .HasColumnType("text") + .HasColumnName("eye_color"); + + b.Property("FacialHairColor") + .IsRequired() + .HasColumnType("text") + .HasColumnName("facial_hair_color"); + + b.Property("FacialHairName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("facial_hair_name"); + + b.Property("FlavorText") + .IsRequired() + .HasColumnType("text") + .HasColumnName("flavor_text"); + + b.Property("Gender") + .IsRequired() + .HasColumnType("text") + .HasColumnName("gender"); + + b.Property("HairColor") + .IsRequired() + .HasColumnType("text") + .HasColumnName("hair_color"); + + b.Property("HairName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("hair_name"); + + b.Property("Markings") + .HasColumnType("jsonb") + .HasColumnName("markings"); + + b.Property("PreferenceId") + .HasColumnType("integer") + .HasColumnName("preference_id"); + + b.Property("PreferenceUnavailable") + .HasColumnType("integer") + .HasColumnName("pref_unavailable"); + + b.Property("Sex") + .IsRequired() + .HasColumnType("text") + .HasColumnName("sex"); + + b.Property("SkinColor") + .IsRequired() + .HasColumnType("text") + .HasColumnName("skin_color"); + + b.Property("Slot") + .HasColumnType("integer") + .HasColumnName("slot"); + + b.Property("Species") + .IsRequired() + .HasColumnType("text") + .HasColumnName("species"); + + b.HasKey("Id") + .HasName("PK_profile"); + + b.HasIndex("PreferenceId") + .HasDatabaseName("IX_profile_preference_id"); + + b.HasIndex("Slot", "PreferenceId") + .IsUnique(); + + b.ToTable("profile", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Round", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("round_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ServerId") + .HasColumnType("integer") + .HasColumnName("server_id"); + + b.Property("StartDate") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)) + .HasColumnName("start_date"); + + b.HasKey("Id") + .HasName("PK_round"); + + b.HasIndex("ServerId") + .HasDatabaseName("IX_round_server_id"); + + b.HasIndex("StartDate"); + + b.ToTable("round", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("server_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Name") + .IsRequired() + .HasColumnType("text") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("PK_server"); + + b.ToTable("server", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBan", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("server_ban_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property?>("Address") + .HasColumnType("inet") + .HasColumnName("address"); + + b.Property("AutoDelete") + .HasColumnType("boolean") + .HasColumnName("auto_delete"); + + b.Property("BanTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("ban_time"); + + b.Property("BanningAdmin") + .HasColumnType("uuid") + .HasColumnName("banning_admin"); + + b.Property("ExemptFlags") + .HasColumnType("integer") + .HasColumnName("exempt_flags"); + + b.Property("ExpirationTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiration_time"); + + b.Property("HWId") + .HasColumnType("bytea") + .HasColumnName("hwid"); + + b.Property("Hidden") + .HasColumnType("boolean") + .HasColumnName("hidden"); + + b.Property("LastEditedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("uuid") + .HasColumnName("last_edited_by_id"); + + b.Property("PlayerUserId") + .HasColumnType("uuid") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("interval") + .HasColumnName("playtime_at_note"); + + b.Property("Reason") + .IsRequired() + .HasColumnType("text") + .HasColumnName("reason"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("Severity") + .HasColumnType("integer") + .HasColumnName("severity"); + + b.HasKey("Id") + .HasName("PK_server_ban"); + + b.HasIndex("Address"); + + b.HasIndex("BanningAdmin"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_server_ban_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_server_ban_round_id"); + + b.ToTable("server_ban", null, t => + { + t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address"); + + t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL"); + }); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.Property("Flags") + .HasColumnType("integer") + .HasColumnName("flags"); + + b.HasKey("UserId") + .HasName("PK_server_ban_exemption"); + + b.ToTable("server_ban_exemption", null, t => + { + t.HasCheckConstraint("FlagsNotZero", "flags != 0"); + }); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBanHit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("server_ban_hit_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("BanId") + .HasColumnType("integer") + .HasColumnName("ban_id"); + + b.Property("ConnectionId") + .HasColumnType("integer") + .HasColumnName("connection_id"); + + b.HasKey("Id") + .HasName("PK_server_ban_hit"); + + b.HasIndex("BanId") + .HasDatabaseName("IX_server_ban_hit_ban_id"); + + b.HasIndex("ConnectionId") + .HasDatabaseName("IX_server_ban_hit_connection_id"); + + b.ToTable("server_ban_hit", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("server_role_ban_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property?>("Address") + .HasColumnType("inet") + .HasColumnName("address"); + + b.Property("BanTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("ban_time"); + + b.Property("BanningAdmin") + .HasColumnType("uuid") + .HasColumnName("banning_admin"); + + b.Property("ExpirationTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiration_time"); + + b.Property("HWId") + .HasColumnType("bytea") + .HasColumnName("hwid"); + + b.Property("Hidden") + .HasColumnType("boolean") + .HasColumnName("hidden"); + + b.Property("LastEditedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("uuid") + .HasColumnName("last_edited_by_id"); + + b.Property("PlayerUserId") + .HasColumnType("uuid") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("interval") + .HasColumnName("playtime_at_note"); + + b.Property("Reason") + .IsRequired() + .HasColumnType("text") + .HasColumnName("reason"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("role_id"); + + b.Property("RoundId") + .HasColumnType("integer") + .HasColumnName("round_id"); + + b.Property("Severity") + .HasColumnType("integer") + .HasColumnName("severity"); + + b.HasKey("Id") + .HasName("PK_server_role_ban"); + + b.HasIndex("Address"); + + b.HasIndex("BanningAdmin"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_server_role_ban_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_server_role_ban_round_id"); + + b.ToTable("server_role_ban", null, t => + { + t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address"); + + t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL"); + }); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("role_unban_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("BanId") + .HasColumnType("integer") + .HasColumnName("ban_id"); + + b.Property("UnbanTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("unban_time"); + + b.Property("UnbanningAdmin") + .HasColumnType("uuid") + .HasColumnName("unbanning_admin"); + + b.HasKey("Id") + .HasName("PK_server_role_unban"); + + b.HasIndex("BanId") + .IsUnique(); + + b.ToTable("server_role_unban", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.ServerUnban", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("unban_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("BanId") + .HasColumnType("integer") + .HasColumnName("ban_id"); + + b.Property("UnbanTime") + .HasColumnType("timestamp with time zone") + .HasColumnName("unban_time"); + + b.Property("UnbanningAdmin") + .HasColumnType("uuid") + .HasColumnName("unbanning_admin"); + + b.HasKey("Id") + .HasName("PK_server_unban"); + + b.HasIndex("BanId") + .IsUnique(); + + b.ToTable("server_unban", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Trait", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("trait_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ProfileId") + .HasColumnType("integer") + .HasColumnName("profile_id"); + + b.Property("TraitName") + .IsRequired() + .HasColumnType("text") + .HasColumnName("trait_name"); + + b.HasKey("Id") + .HasName("PK_trait"); + + b.HasIndex("ProfileId", "TraitName") + .IsUnique(); + + b.ToTable("trait", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("uploaded_resource_log_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Data") + .IsRequired() + .HasColumnType("bytea") + .HasColumnName("data"); + + b.Property("Date") + .HasColumnType("timestamp with time zone") + .HasColumnName("date"); + + b.Property("Path") + .IsRequired() + .HasColumnType("text") + .HasColumnName("path"); + + b.Property("UserId") + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("PK_uploaded_resource_log"); + + b.ToTable("uploaded_resource_log", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Whitelist", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("UserId") + .HasName("PK_whitelist"); + + b.ToTable("whitelist", (string)null); + }); + + modelBuilder.Entity("PlayerRound", b => + { + b.Property("PlayersId") + .HasColumnType("integer") + .HasColumnName("players_id"); + + b.Property("RoundsId") + .HasColumnType("integer") + .HasColumnName("rounds_id"); + + b.HasKey("PlayersId", "RoundsId") + .HasName("PK_player_round"); + + b.HasIndex("RoundsId") + .HasDatabaseName("IX_player_round_rounds_id"); + + b.ToTable("player_round", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Admin", b => + { + b.HasOne("Content.Server.Database.AdminRank", "AdminRank") + .WithMany("Admins") + .HasForeignKey("AdminRankId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_admin_rank_admin_rank_id"); + + b.Navigation("AdminRank"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminFlag", b => + { + b.HasOne("Content.Server.Database.Admin", "Admin") + .WithMany("Flags") + .HasForeignKey("AdminId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_flag_admin_admin_id"); + + b.Navigation("Admin"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLog", b => + { + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany("AdminLogs") + .HasForeignKey("RoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_log_round_round_id"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b => + { + b.HasOne("Content.Server.Database.Player", "Player") + .WithMany("AdminLogs") + .HasForeignKey("PlayerUserId") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_log_player_player_player_user_id"); + + b.HasOne("Content.Server.Database.AdminLog", "Log") + .WithMany("Players") + .HasForeignKey("RoundId", "LogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id"); + + b.Navigation("Log"); + + b.Navigation("Player"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminMessage", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminMessagesCreated") + .HasForeignKey("CreatedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_messages_player_created_by_id"); + + b.HasOne("Content.Server.Database.Player", "DeletedBy") + .WithMany("AdminMessagesDeleted") + .HasForeignKey("DeletedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_messages_player_deleted_by_id"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminMessagesLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_messages_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Player", "Player") + .WithMany("AdminMessagesReceived") + .HasForeignKey("PlayerUserId") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("FK_admin_messages_player_player_user_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_admin_messages_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("DeletedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Player"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminNote", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminNotesCreated") + .HasForeignKey("CreatedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_notes_player_created_by_id"); + + b.HasOne("Content.Server.Database.Player", "DeletedBy") + .WithMany("AdminNotesDeleted") + .HasForeignKey("DeletedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_notes_player_deleted_by_id"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminNotesLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_notes_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Player", "Player") + .WithMany("AdminNotesReceived") + .HasForeignKey("PlayerUserId") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("FK_admin_notes_player_player_user_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_admin_notes_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("DeletedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Player"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b => + { + b.HasOne("Content.Server.Database.AdminRank", "Rank") + .WithMany("Flags") + .HasForeignKey("AdminRankId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id"); + + b.Navigation("Rank"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminWatchlistsCreated") + .HasForeignKey("CreatedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_watchlists_player_created_by_id"); + + b.HasOne("Content.Server.Database.Player", "DeletedBy") + .WithMany("AdminWatchlistsDeleted") + .HasForeignKey("DeletedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_watchlists_player_deleted_by_id"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminWatchlistsLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Player", "Player") + .WithMany("AdminWatchlistsReceived") + .HasForeignKey("PlayerUserId") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("FK_admin_watchlists_player_player_user_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_admin_watchlists_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("DeletedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Player"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.Antag", b => + { + b.HasOne("Content.Server.Database.Profile", "Profile") + .WithMany("Antags") + .HasForeignKey("ProfileId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_antag_profile_profile_id"); + + b.Navigation("Profile"); + }); + + modelBuilder.Entity("Content.Server.Database.ConnectionLog", b => + { + b.HasOne("Content.Server.Database.Server", "Server") + .WithMany("ConnectionLogs") + .HasForeignKey("ServerId") + .OnDelete(DeleteBehavior.SetNull) + .IsRequired() + .HasConstraintName("FK_connection_log_server_server_id"); + + b.Navigation("Server"); + }); + + modelBuilder.Entity("Content.Server.Database.Job", b => + { + b.HasOne("Content.Server.Database.Profile", "Profile") + .WithMany("Jobs") + .HasForeignKey("ProfileId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_job_profile_profile_id"); + + b.Navigation("Profile"); + }); + + modelBuilder.Entity("Content.Server.Database.Profile", b => + { + b.HasOne("Content.Server.Database.Preference", "Preference") + .WithMany("Profiles") + .HasForeignKey("PreferenceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_profile_preference_preference_id"); + + b.Navigation("Preference"); + }); + + modelBuilder.Entity("Content.Server.Database.Round", b => + { + b.HasOne("Content.Server.Database.Server", "Server") + .WithMany("Rounds") + .HasForeignKey("ServerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_round_server_server_id"); + + b.Navigation("Server"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBan", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminServerBansCreated") + .HasForeignKey("BanningAdmin") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_server_ban_player_banning_admin"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminServerBansLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_server_ban_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_server_ban_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBanHit", b => + { + b.HasOne("Content.Server.Database.ServerBan", "Ban") + .WithMany("BanHits") + .HasForeignKey("BanId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_server_ban_hit_server_ban_ban_id"); + + b.HasOne("Content.Server.Database.ConnectionLog", "Connection") + .WithMany("BanHits") + .HasForeignKey("ConnectionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_server_ban_hit_connection_log_connection_id"); + + b.Navigation("Ban"); + + b.Navigation("Connection"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminServerRoleBansCreated") + .HasForeignKey("BanningAdmin") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_server_role_ban_player_banning_admin"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminServerRoleBansLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_server_role_ban_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_server_role_ban_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b => + { + b.HasOne("Content.Server.Database.ServerRoleBan", "Ban") + .WithOne("Unban") + .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id"); + + b.Navigation("Ban"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerUnban", b => + { + b.HasOne("Content.Server.Database.ServerBan", "Ban") + .WithOne("Unban") + .HasForeignKey("Content.Server.Database.ServerUnban", "BanId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_server_unban_server_ban_ban_id"); + + b.Navigation("Ban"); + }); + + modelBuilder.Entity("Content.Server.Database.Trait", b => + { + b.HasOne("Content.Server.Database.Profile", "Profile") + .WithMany("Traits") + .HasForeignKey("ProfileId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_trait_profile_profile_id"); + + b.Navigation("Profile"); + }); + + modelBuilder.Entity("PlayerRound", b => + { + b.HasOne("Content.Server.Database.Player", null) + .WithMany() + .HasForeignKey("PlayersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_player_round_player_players_id"); + + b.HasOne("Content.Server.Database.Round", null) + .WithMany() + .HasForeignKey("RoundsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_player_round_round_rounds_id"); + }); + + modelBuilder.Entity("Content.Server.Database.Admin", b => + { + b.Navigation("Flags"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLog", b => + { + b.Navigation("Players"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminRank", b => + { + b.Navigation("Admins"); + + b.Navigation("Flags"); + }); + + modelBuilder.Entity("Content.Server.Database.ConnectionLog", b => + { + b.Navigation("BanHits"); + }); + + modelBuilder.Entity("Content.Server.Database.Player", b => + { + b.Navigation("AdminLogs"); + + b.Navigation("AdminMessagesCreated"); + + b.Navigation("AdminMessagesDeleted"); + + b.Navigation("AdminMessagesLastEdited"); + + b.Navigation("AdminMessagesReceived"); + + b.Navigation("AdminNotesCreated"); + + b.Navigation("AdminNotesDeleted"); + + b.Navigation("AdminNotesLastEdited"); + + b.Navigation("AdminNotesReceived"); + + b.Navigation("AdminServerBansCreated"); + + b.Navigation("AdminServerBansLastEdited"); + + b.Navigation("AdminServerRoleBansCreated"); + + b.Navigation("AdminServerRoleBansLastEdited"); + + b.Navigation("AdminWatchlistsCreated"); + + b.Navigation("AdminWatchlistsDeleted"); + + b.Navigation("AdminWatchlistsLastEdited"); + + b.Navigation("AdminWatchlistsReceived"); + }); + + modelBuilder.Entity("Content.Server.Database.Preference", b => + { + b.Navigation("Profiles"); + }); + + modelBuilder.Entity("Content.Server.Database.Profile", b => + { + b.Navigation("Antags"); + + b.Navigation("Jobs"); + + b.Navigation("Traits"); + }); + + modelBuilder.Entity("Content.Server.Database.Round", b => + { + b.Navigation("AdminLogs"); + }); + + modelBuilder.Entity("Content.Server.Database.Server", b => + { + b.Navigation("ConnectionLogs"); + + b.Navigation("Rounds"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBan", b => + { + b.Navigation("BanHits"); + + b.Navigation("Unban"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b => + { + b.Navigation("Unban"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs new file mode 100644 index 00000000000..a6a34626ed4 --- /dev/null +++ b/Content.Server.Database/Migrations/Postgres/20240112194620_Blacklist.cs @@ -0,0 +1,33 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Content.Server.Database.Migrations.Postgres +{ + /// + public partial class Blacklist : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "blacklist", + columns: table => new + { + user_id = table.Column(type: "uuid", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_blacklist", x => x.user_id); + }); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "blacklist"); + } + } +} diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs index cb9fdde4d5f..1f64f6e51a5 100644 --- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs @@ -512,6 +512,20 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("assigned_user_id", (string)null); }); + modelBuilder.Entity("Content.Server.Database.Blacklist", + b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("uuid") + .HasColumnName("user_id"); + + b.HasKey("UserId") + .HasName("PK_blacklist"); + + b.ToTable("blacklist", (string) null); + }); + modelBuilder.Entity("Content.Server.Database.BanTemplate", b => { b.Property("Id") diff --git a/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs new file mode 100644 index 00000000000..049901bc7d4 --- /dev/null +++ b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.Designer.cs @@ -0,0 +1,1701 @@ +// +using System; +using Content.Server.Database; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace Content.Server.Database.Migrations.Sqlite +{ + [DbContext(typeof(SqliteServerDbContext))] + [Migration("20240112194612_Blacklist")] + partial class Blacklist + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "7.0.4"); + + modelBuilder.Entity("Content.Server.Database.Admin", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.Property("AdminRankId") + .HasColumnType("INTEGER") + .HasColumnName("admin_rank_id"); + + b.Property("Title") + .HasColumnType("TEXT") + .HasColumnName("title"); + + b.HasKey("UserId") + .HasName("PK_admin"); + + b.HasIndex("AdminRankId") + .HasDatabaseName("IX_admin_admin_rank_id"); + + b.ToTable("admin", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminFlag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("admin_flag_id"); + + b.Property("AdminId") + .HasColumnType("TEXT") + .HasColumnName("admin_id"); + + b.Property("Flag") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("flag"); + + b.Property("Negative") + .HasColumnType("INTEGER") + .HasColumnName("negative"); + + b.HasKey("Id") + .HasName("PK_admin_flag"); + + b.HasIndex("AdminId") + .HasDatabaseName("IX_admin_flag_admin_id"); + + b.HasIndex("Flag", "AdminId") + .IsUnique(); + + b.ToTable("admin_flag", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLog", b => + { + b.Property("RoundId") + .HasColumnType("INTEGER") + .HasColumnName("round_id"); + + b.Property("Id") + .HasColumnType("INTEGER") + .HasColumnName("admin_log_id"); + + b.Property("Date") + .HasColumnType("TEXT") + .HasColumnName("date"); + + b.Property("Impact") + .HasColumnType("INTEGER") + .HasColumnName("impact"); + + b.Property("Json") + .IsRequired() + .HasColumnType("jsonb") + .HasColumnName("json"); + + b.Property("Message") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("message"); + + b.Property("Type") + .HasColumnType("INTEGER") + .HasColumnName("type"); + + b.HasKey("RoundId", "Id") + .HasName("PK_admin_log"); + + b.HasIndex("Date"); + + b.HasIndex("Type") + .HasDatabaseName("IX_admin_log_type"); + + b.ToTable("admin_log", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b => + { + b.Property("RoundId") + .HasColumnType("INTEGER") + .HasColumnName("round_id"); + + b.Property("LogId") + .HasColumnType("INTEGER") + .HasColumnName("log_id"); + + b.Property("PlayerUserId") + .HasColumnType("TEXT") + .HasColumnName("player_user_id"); + + b.HasKey("RoundId", "LogId", "PlayerUserId") + .HasName("PK_admin_log_player"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_admin_log_player_player_user_id"); + + b.ToTable("admin_log_player", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("admin_messages_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("CreatedById") + .HasColumnType("TEXT") + .HasColumnName("created_by_id"); + + b.Property("Deleted") + .HasColumnType("INTEGER") + .HasColumnName("deleted"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("DeletedById") + .HasColumnType("TEXT") + .HasColumnName("deleted_by_id"); + + b.Property("ExpirationTime") + .HasColumnType("TEXT") + .HasColumnName("expiration_time"); + + b.Property("LastEditedAt") + .HasColumnType("TEXT") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("TEXT") + .HasColumnName("last_edited_by_id"); + + b.Property("Message") + .IsRequired() + .HasMaxLength(4096) + .HasColumnType("TEXT") + .HasColumnName("message"); + + b.Property("PlayerUserId") + .HasColumnType("TEXT") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("TEXT") + .HasColumnName("playtime_at_note"); + + b.Property("RoundId") + .HasColumnType("INTEGER") + .HasColumnName("round_id"); + + b.Property("Seen") + .HasColumnType("INTEGER") + .HasColumnName("seen"); + + b.HasKey("Id") + .HasName("PK_admin_messages"); + + b.HasIndex("CreatedById"); + + b.HasIndex("DeletedById"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_admin_messages_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_admin_messages_round_id"); + + b.ToTable("admin_messages", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminNote", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("admin_notes_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("CreatedById") + .HasColumnType("TEXT") + .HasColumnName("created_by_id"); + + b.Property("Deleted") + .HasColumnType("INTEGER") + .HasColumnName("deleted"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("DeletedById") + .HasColumnType("TEXT") + .HasColumnName("deleted_by_id"); + + b.Property("ExpirationTime") + .HasColumnType("TEXT") + .HasColumnName("expiration_time"); + + b.Property("LastEditedAt") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("TEXT") + .HasColumnName("last_edited_by_id"); + + b.Property("Message") + .IsRequired() + .HasMaxLength(4096) + .HasColumnType("TEXT") + .HasColumnName("message"); + + b.Property("PlayerUserId") + .HasColumnType("TEXT") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("TEXT") + .HasColumnName("playtime_at_note"); + + b.Property("RoundId") + .HasColumnType("INTEGER") + .HasColumnName("round_id"); + + b.Property("Secret") + .HasColumnType("INTEGER") + .HasColumnName("secret"); + + b.Property("Severity") + .HasColumnType("INTEGER") + .HasColumnName("severity"); + + b.HasKey("Id") + .HasName("PK_admin_notes"); + + b.HasIndex("CreatedById"); + + b.HasIndex("DeletedById"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_admin_notes_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_admin_notes_round_id"); + + b.ToTable("admin_notes", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminRank", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("admin_rank_id"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("PK_admin_rank"); + + b.ToTable("admin_rank", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("admin_rank_flag_id"); + + b.Property("AdminRankId") + .HasColumnType("INTEGER") + .HasColumnName("admin_rank_id"); + + b.Property("Flag") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("flag"); + + b.HasKey("Id") + .HasName("PK_admin_rank_flag"); + + b.HasIndex("AdminRankId"); + + b.HasIndex("Flag", "AdminRankId") + .IsUnique(); + + b.ToTable("admin_rank_flag", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("admin_watchlists_id"); + + b.Property("CreatedAt") + .HasColumnType("TEXT") + .HasColumnName("created_at"); + + b.Property("CreatedById") + .HasColumnType("TEXT") + .HasColumnName("created_by_id"); + + b.Property("Deleted") + .HasColumnType("INTEGER") + .HasColumnName("deleted"); + + b.Property("DeletedAt") + .HasColumnType("TEXT") + .HasColumnName("deleted_at"); + + b.Property("DeletedById") + .HasColumnType("TEXT") + .HasColumnName("deleted_by_id"); + + b.Property("ExpirationTime") + .HasColumnType("TEXT") + .HasColumnName("expiration_time"); + + b.Property("LastEditedAt") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("TEXT") + .HasColumnName("last_edited_by_id"); + + b.Property("Message") + .IsRequired() + .HasMaxLength(4096) + .HasColumnType("TEXT") + .HasColumnName("message"); + + b.Property("PlayerUserId") + .HasColumnType("TEXT") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("TEXT") + .HasColumnName("playtime_at_note"); + + b.Property("RoundId") + .HasColumnType("INTEGER") + .HasColumnName("round_id"); + + b.HasKey("Id") + .HasName("PK_admin_watchlists"); + + b.HasIndex("CreatedById"); + + b.HasIndex("DeletedById"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_admin_watchlists_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_admin_watchlists_round_id"); + + b.ToTable("admin_watchlists", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Antag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("antag_id"); + + b.Property("AntagName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("antag_name"); + + b.Property("ProfileId") + .HasColumnType("INTEGER") + .HasColumnName("profile_id"); + + b.HasKey("Id") + .HasName("PK_antag"); + + b.HasIndex("ProfileId", "AntagName") + .IsUnique(); + + b.ToTable("antag", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.AssignedUserId", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("assigned_user_id_id"); + + b.Property("UserId") + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.Property("UserName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("user_name"); + + b.HasKey("Id") + .HasName("PK_assigned_user_id"); + + b.HasIndex("UserId") + .IsUnique(); + + b.HasIndex("UserName") + .IsUnique(); + + b.ToTable("assigned_user_id", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Blacklist", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.HasKey("UserId") + .HasName("PK_blacklist"); + + b.ToTable("blacklist", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.ConnectionLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("connection_log_id"); + + b.Property("Address") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("address"); + + b.Property("Denied") + .HasColumnType("INTEGER") + .HasColumnName("denied"); + + b.Property("HWId") + .HasColumnType("BLOB") + .HasColumnName("hwid"); + + b.Property("ServerId") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0) + .HasColumnName("server_id"); + + b.Property("Time") + .HasColumnType("TEXT") + .HasColumnName("time"); + + b.Property("UserId") + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.Property("UserName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("user_name"); + + b.HasKey("Id") + .HasName("PK_connection_log"); + + b.HasIndex("ServerId") + .HasDatabaseName("IX_connection_log_server_id"); + + b.HasIndex("UserId"); + + b.ToTable("connection_log", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Job", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("job_id"); + + b.Property("JobName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("job_name"); + + b.Property("Priority") + .HasColumnType("INTEGER") + .HasColumnName("priority"); + + b.Property("ProfileId") + .HasColumnType("INTEGER") + .HasColumnName("profile_id"); + + b.HasKey("Id") + .HasName("PK_job"); + + b.HasIndex("ProfileId"); + + b.HasIndex("ProfileId", "JobName") + .IsUnique(); + + b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority") + .IsUnique() + .HasFilter("priority = 3"); + + b.ToTable("job", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.PlayTime", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("play_time_id"); + + b.Property("PlayerId") + .HasColumnType("TEXT") + .HasColumnName("player_id"); + + b.Property("TimeSpent") + .HasColumnType("TEXT") + .HasColumnName("time_spent"); + + b.Property("Tracker") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("tracker"); + + b.HasKey("Id") + .HasName("PK_play_time"); + + b.HasIndex("PlayerId", "Tracker") + .IsUnique(); + + b.ToTable("play_time", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Player", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("player_id"); + + b.Property("FirstSeenTime") + .HasColumnType("TEXT") + .HasColumnName("first_seen_time"); + + b.Property("LastReadRules") + .HasColumnType("TEXT") + .HasColumnName("last_read_rules"); + + b.Property("LastSeenAddress") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("last_seen_address"); + + b.Property("LastSeenHWId") + .HasColumnType("BLOB") + .HasColumnName("last_seen_hwid"); + + b.Property("LastSeenTime") + .HasColumnType("TEXT") + .HasColumnName("last_seen_time"); + + b.Property("LastSeenUserName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("last_seen_user_name"); + + b.Property("UserId") + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("PK_player"); + + b.HasAlternateKey("UserId") + .HasName("ak_player_user_id"); + + b.HasIndex("LastSeenUserName"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("player", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Preference", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("preference_id"); + + b.Property("AdminOOCColor") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("admin_ooc_color"); + + b.Property("SelectedCharacterSlot") + .HasColumnType("INTEGER") + .HasColumnName("selected_character_slot"); + + b.Property("UserId") + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("PK_preference"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("preference", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Profile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("profile_id"); + + b.Property("Age") + .HasColumnType("INTEGER") + .HasColumnName("age"); + + b.Property("Backpack") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("backpack"); + + b.Property("CharacterName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("char_name"); + + b.Property("Clothing") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("clothing"); + + b.Property("EyeColor") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("eye_color"); + + b.Property("FacialHairColor") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("facial_hair_color"); + + b.Property("FacialHairName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("facial_hair_name"); + + b.Property("FlavorText") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("flavor_text"); + + b.Property("Gender") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("gender"); + + b.Property("HairColor") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("hair_color"); + + b.Property("HairName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("hair_name"); + + b.Property("Markings") + .HasColumnType("jsonb") + .HasColumnName("markings"); + + b.Property("PreferenceId") + .HasColumnType("INTEGER") + .HasColumnName("preference_id"); + + b.Property("PreferenceUnavailable") + .HasColumnType("INTEGER") + .HasColumnName("pref_unavailable"); + + b.Property("Sex") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("sex"); + + b.Property("SkinColor") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("skin_color"); + + b.Property("Slot") + .HasColumnType("INTEGER") + .HasColumnName("slot"); + + b.Property("Species") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("species"); + + b.HasKey("Id") + .HasName("PK_profile"); + + b.HasIndex("PreferenceId") + .HasDatabaseName("IX_profile_preference_id"); + + b.HasIndex("Slot", "PreferenceId") + .IsUnique(); + + b.ToTable("profile", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Round", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("round_id"); + + b.Property("ServerId") + .HasColumnType("INTEGER") + .HasColumnName("server_id"); + + b.Property("StartDate") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)) + .HasColumnName("start_date"); + + b.HasKey("Id") + .HasName("PK_round"); + + b.HasIndex("ServerId") + .HasDatabaseName("IX_round_server_id"); + + b.HasIndex("StartDate"); + + b.ToTable("round", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Server", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("server_id"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("name"); + + b.HasKey("Id") + .HasName("PK_server"); + + b.ToTable("server", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBan", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("server_ban_id"); + + b.Property("Address") + .HasColumnType("TEXT") + .HasColumnName("address"); + + b.Property("AutoDelete") + .HasColumnType("INTEGER") + .HasColumnName("auto_delete"); + + b.Property("BanTime") + .HasColumnType("TEXT") + .HasColumnName("ban_time"); + + b.Property("BanningAdmin") + .HasColumnType("TEXT") + .HasColumnName("banning_admin"); + + b.Property("ExemptFlags") + .HasColumnType("INTEGER") + .HasColumnName("exempt_flags"); + + b.Property("ExpirationTime") + .HasColumnType("TEXT") + .HasColumnName("expiration_time"); + + b.Property("HWId") + .HasColumnType("BLOB") + .HasColumnName("hwid"); + + b.Property("Hidden") + .HasColumnType("INTEGER") + .HasColumnName("hidden"); + + b.Property("LastEditedAt") + .HasColumnType("TEXT") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("TEXT") + .HasColumnName("last_edited_by_id"); + + b.Property("PlayerUserId") + .HasColumnType("TEXT") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("TEXT") + .HasColumnName("playtime_at_note"); + + b.Property("Reason") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("reason"); + + b.Property("RoundId") + .HasColumnType("INTEGER") + .HasColumnName("round_id"); + + b.Property("Severity") + .HasColumnType("INTEGER") + .HasColumnName("severity"); + + b.HasKey("Id") + .HasName("PK_server_ban"); + + b.HasIndex("Address"); + + b.HasIndex("BanningAdmin"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_server_ban_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_server_ban_round_id"); + + b.ToTable("server_ban", null, t => + { + t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL"); + }); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.Property("Flags") + .HasColumnType("INTEGER") + .HasColumnName("flags"); + + b.HasKey("UserId") + .HasName("PK_server_ban_exemption"); + + b.ToTable("server_ban_exemption", null, t => + { + t.HasCheckConstraint("FlagsNotZero", "flags != 0"); + }); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBanHit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("server_ban_hit_id"); + + b.Property("BanId") + .HasColumnType("INTEGER") + .HasColumnName("ban_id"); + + b.Property("ConnectionId") + .HasColumnType("INTEGER") + .HasColumnName("connection_id"); + + b.HasKey("Id") + .HasName("PK_server_ban_hit"); + + b.HasIndex("BanId") + .HasDatabaseName("IX_server_ban_hit_ban_id"); + + b.HasIndex("ConnectionId") + .HasDatabaseName("IX_server_ban_hit_connection_id"); + + b.ToTable("server_ban_hit", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("server_role_ban_id"); + + b.Property("Address") + .HasColumnType("TEXT") + .HasColumnName("address"); + + b.Property("BanTime") + .HasColumnType("TEXT") + .HasColumnName("ban_time"); + + b.Property("BanningAdmin") + .HasColumnType("TEXT") + .HasColumnName("banning_admin"); + + b.Property("ExpirationTime") + .HasColumnType("TEXT") + .HasColumnName("expiration_time"); + + b.Property("HWId") + .HasColumnType("BLOB") + .HasColumnName("hwid"); + + b.Property("Hidden") + .HasColumnType("INTEGER") + .HasColumnName("hidden"); + + b.Property("LastEditedAt") + .HasColumnType("TEXT") + .HasColumnName("last_edited_at"); + + b.Property("LastEditedById") + .HasColumnType("TEXT") + .HasColumnName("last_edited_by_id"); + + b.Property("PlayerUserId") + .HasColumnType("TEXT") + .HasColumnName("player_user_id"); + + b.Property("PlaytimeAtNote") + .HasColumnType("TEXT") + .HasColumnName("playtime_at_note"); + + b.Property("Reason") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("reason"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("role_id"); + + b.Property("RoundId") + .HasColumnType("INTEGER") + .HasColumnName("round_id"); + + b.Property("Severity") + .HasColumnType("INTEGER") + .HasColumnName("severity"); + + b.HasKey("Id") + .HasName("PK_server_role_ban"); + + b.HasIndex("Address"); + + b.HasIndex("BanningAdmin"); + + b.HasIndex("LastEditedById"); + + b.HasIndex("PlayerUserId") + .HasDatabaseName("IX_server_role_ban_player_user_id"); + + b.HasIndex("RoundId") + .HasDatabaseName("IX_server_role_ban_round_id"); + + b.ToTable("server_role_ban", null, t => + { + t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL"); + }); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("role_unban_id"); + + b.Property("BanId") + .HasColumnType("INTEGER") + .HasColumnName("ban_id"); + + b.Property("UnbanTime") + .HasColumnType("TEXT") + .HasColumnName("unban_time"); + + b.Property("UnbanningAdmin") + .HasColumnType("TEXT") + .HasColumnName("unbanning_admin"); + + b.HasKey("Id") + .HasName("PK_server_role_unban"); + + b.HasIndex("BanId") + .IsUnique(); + + b.ToTable("server_role_unban", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.ServerUnban", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("unban_id"); + + b.Property("BanId") + .HasColumnType("INTEGER") + .HasColumnName("ban_id"); + + b.Property("UnbanTime") + .HasColumnType("TEXT") + .HasColumnName("unban_time"); + + b.Property("UnbanningAdmin") + .HasColumnType("TEXT") + .HasColumnName("unbanning_admin"); + + b.HasKey("Id") + .HasName("PK_server_unban"); + + b.HasIndex("BanId") + .IsUnique(); + + b.ToTable("server_unban", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Trait", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("trait_id"); + + b.Property("ProfileId") + .HasColumnType("INTEGER") + .HasColumnName("profile_id"); + + b.Property("TraitName") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("trait_name"); + + b.HasKey("Id") + .HasName("PK_trait"); + + b.HasIndex("ProfileId", "TraitName") + .IsUnique(); + + b.ToTable("trait", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasColumnName("uploaded_resource_log_id"); + + b.Property("Data") + .IsRequired() + .HasColumnType("BLOB") + .HasColumnName("data"); + + b.Property("Date") + .HasColumnType("TEXT") + .HasColumnName("date"); + + b.Property("Path") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("path"); + + b.Property("UserId") + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.HasKey("Id") + .HasName("PK_uploaded_resource_log"); + + b.ToTable("uploaded_resource_log", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Whitelist", b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.HasKey("UserId") + .HasName("PK_whitelist"); + + b.ToTable("whitelist", (string)null); + }); + + modelBuilder.Entity("PlayerRound", b => + { + b.Property("PlayersId") + .HasColumnType("INTEGER") + .HasColumnName("players_id"); + + b.Property("RoundsId") + .HasColumnType("INTEGER") + .HasColumnName("rounds_id"); + + b.HasKey("PlayersId", "RoundsId") + .HasName("PK_player_round"); + + b.HasIndex("RoundsId") + .HasDatabaseName("IX_player_round_rounds_id"); + + b.ToTable("player_round", (string)null); + }); + + modelBuilder.Entity("Content.Server.Database.Admin", b => + { + b.HasOne("Content.Server.Database.AdminRank", "AdminRank") + .WithMany("Admins") + .HasForeignKey("AdminRankId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_admin_rank_admin_rank_id"); + + b.Navigation("AdminRank"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminFlag", b => + { + b.HasOne("Content.Server.Database.Admin", "Admin") + .WithMany("Flags") + .HasForeignKey("AdminId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_flag_admin_admin_id"); + + b.Navigation("Admin"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLog", b => + { + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany("AdminLogs") + .HasForeignKey("RoundId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_log_round_round_id"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b => + { + b.HasOne("Content.Server.Database.Player", "Player") + .WithMany("AdminLogs") + .HasForeignKey("PlayerUserId") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_log_player_player_player_user_id"); + + b.HasOne("Content.Server.Database.AdminLog", "Log") + .WithMany("Players") + .HasForeignKey("RoundId", "LogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id"); + + b.Navigation("Log"); + + b.Navigation("Player"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminMessage", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminMessagesCreated") + .HasForeignKey("CreatedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_messages_player_created_by_id"); + + b.HasOne("Content.Server.Database.Player", "DeletedBy") + .WithMany("AdminMessagesDeleted") + .HasForeignKey("DeletedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_messages_player_deleted_by_id"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminMessagesLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_messages_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Player", "Player") + .WithMany("AdminMessagesReceived") + .HasForeignKey("PlayerUserId") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("FK_admin_messages_player_player_user_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_admin_messages_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("DeletedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Player"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminNote", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminNotesCreated") + .HasForeignKey("CreatedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_notes_player_created_by_id"); + + b.HasOne("Content.Server.Database.Player", "DeletedBy") + .WithMany("AdminNotesDeleted") + .HasForeignKey("DeletedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_notes_player_deleted_by_id"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminNotesLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_notes_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Player", "Player") + .WithMany("AdminNotesReceived") + .HasForeignKey("PlayerUserId") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("FK_admin_notes_player_player_user_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_admin_notes_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("DeletedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Player"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b => + { + b.HasOne("Content.Server.Database.AdminRank", "Rank") + .WithMany("Flags") + .HasForeignKey("AdminRankId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id"); + + b.Navigation("Rank"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminWatchlistsCreated") + .HasForeignKey("CreatedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_watchlists_player_created_by_id"); + + b.HasOne("Content.Server.Database.Player", "DeletedBy") + .WithMany("AdminWatchlistsDeleted") + .HasForeignKey("DeletedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_watchlists_player_deleted_by_id"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminWatchlistsLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Player", "Player") + .WithMany("AdminWatchlistsReceived") + .HasForeignKey("PlayerUserId") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("FK_admin_watchlists_player_player_user_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_admin_watchlists_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("DeletedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Player"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.Antag", b => + { + b.HasOne("Content.Server.Database.Profile", "Profile") + .WithMany("Antags") + .HasForeignKey("ProfileId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_antag_profile_profile_id"); + + b.Navigation("Profile"); + }); + + modelBuilder.Entity("Content.Server.Database.ConnectionLog", b => + { + b.HasOne("Content.Server.Database.Server", "Server") + .WithMany("ConnectionLogs") + .HasForeignKey("ServerId") + .OnDelete(DeleteBehavior.SetNull) + .IsRequired() + .HasConstraintName("FK_connection_log_server_server_id"); + + b.Navigation("Server"); + }); + + modelBuilder.Entity("Content.Server.Database.Job", b => + { + b.HasOne("Content.Server.Database.Profile", "Profile") + .WithMany("Jobs") + .HasForeignKey("ProfileId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_job_profile_profile_id"); + + b.Navigation("Profile"); + }); + + modelBuilder.Entity("Content.Server.Database.Profile", b => + { + b.HasOne("Content.Server.Database.Preference", "Preference") + .WithMany("Profiles") + .HasForeignKey("PreferenceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_profile_preference_preference_id"); + + b.Navigation("Preference"); + }); + + modelBuilder.Entity("Content.Server.Database.Round", b => + { + b.HasOne("Content.Server.Database.Server", "Server") + .WithMany("Rounds") + .HasForeignKey("ServerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_round_server_server_id"); + + b.Navigation("Server"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBan", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminServerBansCreated") + .HasForeignKey("BanningAdmin") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_server_ban_player_banning_admin"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminServerBansLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_server_ban_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_server_ban_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBanHit", b => + { + b.HasOne("Content.Server.Database.ServerBan", "Ban") + .WithMany("BanHits") + .HasForeignKey("BanId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_server_ban_hit_server_ban_ban_id"); + + b.HasOne("Content.Server.Database.ConnectionLog", "Connection") + .WithMany("BanHits") + .HasForeignKey("ConnectionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_server_ban_hit_connection_log_connection_id"); + + b.Navigation("Ban"); + + b.Navigation("Connection"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b => + { + b.HasOne("Content.Server.Database.Player", "CreatedBy") + .WithMany("AdminServerRoleBansCreated") + .HasForeignKey("BanningAdmin") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_server_role_ban_player_banning_admin"); + + b.HasOne("Content.Server.Database.Player", "LastEditedBy") + .WithMany("AdminServerRoleBansLastEdited") + .HasForeignKey("LastEditedById") + .HasPrincipalKey("UserId") + .OnDelete(DeleteBehavior.SetNull) + .HasConstraintName("FK_server_role_ban_player_last_edited_by_id"); + + b.HasOne("Content.Server.Database.Round", "Round") + .WithMany() + .HasForeignKey("RoundId") + .HasConstraintName("FK_server_role_ban_round_round_id"); + + b.Navigation("CreatedBy"); + + b.Navigation("LastEditedBy"); + + b.Navigation("Round"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b => + { + b.HasOne("Content.Server.Database.ServerRoleBan", "Ban") + .WithOne("Unban") + .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id"); + + b.Navigation("Ban"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerUnban", b => + { + b.HasOne("Content.Server.Database.ServerBan", "Ban") + .WithOne("Unban") + .HasForeignKey("Content.Server.Database.ServerUnban", "BanId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_server_unban_server_ban_ban_id"); + + b.Navigation("Ban"); + }); + + modelBuilder.Entity("Content.Server.Database.Trait", b => + { + b.HasOne("Content.Server.Database.Profile", "Profile") + .WithMany("Traits") + .HasForeignKey("ProfileId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_trait_profile_profile_id"); + + b.Navigation("Profile"); + }); + + modelBuilder.Entity("PlayerRound", b => + { + b.HasOne("Content.Server.Database.Player", null) + .WithMany() + .HasForeignKey("PlayersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_player_round_player_players_id"); + + b.HasOne("Content.Server.Database.Round", null) + .WithMany() + .HasForeignKey("RoundsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("FK_player_round_round_rounds_id"); + }); + + modelBuilder.Entity("Content.Server.Database.Admin", b => + { + b.Navigation("Flags"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminLog", b => + { + b.Navigation("Players"); + }); + + modelBuilder.Entity("Content.Server.Database.AdminRank", b => + { + b.Navigation("Admins"); + + b.Navigation("Flags"); + }); + + modelBuilder.Entity("Content.Server.Database.ConnectionLog", b => + { + b.Navigation("BanHits"); + }); + + modelBuilder.Entity("Content.Server.Database.Player", b => + { + b.Navigation("AdminLogs"); + + b.Navigation("AdminMessagesCreated"); + + b.Navigation("AdminMessagesDeleted"); + + b.Navigation("AdminMessagesLastEdited"); + + b.Navigation("AdminMessagesReceived"); + + b.Navigation("AdminNotesCreated"); + + b.Navigation("AdminNotesDeleted"); + + b.Navigation("AdminNotesLastEdited"); + + b.Navigation("AdminNotesReceived"); + + b.Navigation("AdminServerBansCreated"); + + b.Navigation("AdminServerBansLastEdited"); + + b.Navigation("AdminServerRoleBansCreated"); + + b.Navigation("AdminServerRoleBansLastEdited"); + + b.Navigation("AdminWatchlistsCreated"); + + b.Navigation("AdminWatchlistsDeleted"); + + b.Navigation("AdminWatchlistsLastEdited"); + + b.Navigation("AdminWatchlistsReceived"); + }); + + modelBuilder.Entity("Content.Server.Database.Preference", b => + { + b.Navigation("Profiles"); + }); + + modelBuilder.Entity("Content.Server.Database.Profile", b => + { + b.Navigation("Antags"); + + b.Navigation("Jobs"); + + b.Navigation("Traits"); + }); + + modelBuilder.Entity("Content.Server.Database.Round", b => + { + b.Navigation("AdminLogs"); + }); + + modelBuilder.Entity("Content.Server.Database.Server", b => + { + b.Navigation("ConnectionLogs"); + + b.Navigation("Rounds"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerBan", b => + { + b.Navigation("BanHits"); + + b.Navigation("Unban"); + }); + + modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b => + { + b.Navigation("Unban"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs new file mode 100644 index 00000000000..4988a3c336c --- /dev/null +++ b/Content.Server.Database/Migrations/Sqlite/20240112194612_Blacklist.cs @@ -0,0 +1,33 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Content.Server.Database.Migrations.Sqlite +{ + /// + public partial class Blacklist : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "blacklist", + columns: table => new + { + user_id = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_blacklist", x => x.user_id); + }); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "blacklist"); + } + } +} diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs index efc66821911..02d44163027 100644 --- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs @@ -483,6 +483,19 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("assigned_user_id", (string)null); }); + modelBuilder.Entity("Content.Server.Database.Blacklist", + b => + { + b.Property("UserId") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("user_id"); + + b.HasKey("UserId") + .HasName("PK_blacklist"); + + b.ToTable("blacklist", (string) null); + }); modelBuilder.Entity("Content.Server.Database.BanTemplate", b => { b.Property("Id") diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs index ea63c41fc25..00b3cfea032 100644 --- a/Content.Server.Database/Model.cs +++ b/Content.Server.Database/Model.cs @@ -28,6 +28,7 @@ protected ServerDbContext(DbContextOptions options) : base(options) public DbSet AdminLog { get; set; } = null!; public DbSet AdminLogPlayer { get; set; } = null!; public DbSet Whitelist { get; set; } = null!; + public DbSet Blacklist { get; set; } = null!; public DbSet Ban { get; set; } = default!; public DbSet Unban { get; set; } = default!; public DbSet BanExemption { get; set; } = default!; @@ -551,6 +552,15 @@ public class Whitelist [Required, Key] public Guid UserId { get; set; } } + /// + /// List of users who are on the "blacklist". This is a list that may be used by Whitelist implementations to deny access to certain users. + /// + [Table("blacklist")] + public class Blacklist + { + [Required, Key] public Guid UserId { get; set; } + } + public class Admin { [Key] public Guid UserId { get; set; } diff --git a/Content.Server/Connection/ConnectionManager.Whitelist.cs b/Content.Server/Connection/ConnectionManager.Whitelist.cs new file mode 100644 index 00000000000..212c87e17a6 --- /dev/null +++ b/Content.Server/Connection/ConnectionManager.Whitelist.cs @@ -0,0 +1,221 @@ +using System.Linq; +using System.Threading.Tasks; +using Content.Server.Connection.Whitelist; +using Content.Server.Connection.Whitelist.Conditions; +using Content.Server.Database; +using Content.Shared.CCVar; +using Content.Shared.Database; +using Content.Shared.Players.PlayTimeTracking; +using Robust.Shared.Network; + +namespace Content.Server.Connection; + +/// +/// Handles whitelist conditions for incoming connections. +/// +public sealed partial class ConnectionManager +{ + private PlayerConnectionWhitelistPrototype[]? _whitelists; + + public void PostInit() + { + _cfg.OnValueChanged(CCVars.WhitelistPrototypeList, UpdateWhitelists, true); + } + + private void UpdateWhitelists(string s) + { + var list = new List(); + foreach (var id in s.Split(',')) + { + if (_prototypeManager.TryIndex(id, out PlayerConnectionWhitelistPrototype? prototype)) + { + list.Add(prototype); + } + else + { + _sawmill.Fatal($"Whitelist prototype {id} does not exist. Denying all connections."); + _whitelists = null; // Invalidate the list, causes deny on all connections. + return; + } + } + + _whitelists = list.ToArray(); + } + + private bool IsValid(PlayerConnectionWhitelistPrototype whitelist, int playerCount) + { + return playerCount >= whitelist.MinimumPlayers && playerCount <= whitelist.MaximumPlayers; + } + + public async Task<(bool isWhitelisted, string? denyMessage)> IsWhitelisted(PlayerConnectionWhitelistPrototype whitelist, NetUserData data, ISawmill sawmill) + { + var cacheRemarks = await _db.GetAllAdminRemarks(data.UserId); + var cachePlaytime = await _db.GetPlayTimes(data.UserId); + + foreach (var condition in whitelist.Conditions) + { + bool matched; + string denyMessage; + switch (condition) + { + case ConditionAlwaysMatch: + matched = true; + denyMessage = Loc.GetString("whitelist-always-deny"); + break; + case ConditionManualWhitelistMembership: + matched = await CheckConditionManualWhitelist(data); + denyMessage = Loc.GetString("whitelist-manual"); + break; + case ConditionManualBlacklistMembership: + matched = await CheckConditionManualBlacklist(data); + denyMessage = Loc.GetString("whitelist-blacklisted"); + break; + case ConditionNotesDateRange conditionNotes: + matched = CheckConditionNotesDateRange(conditionNotes, cacheRemarks); + denyMessage = Loc.GetString("whitelist-notes"); + break; + case ConditionPlayerCount conditionPlayerCount: + matched = CheckConditionPlayerCount(conditionPlayerCount); + denyMessage = Loc.GetString("whitelist-player-count"); + break; + case ConditionPlaytime conditionPlaytime: + matched = CheckConditionPlaytime(conditionPlaytime, cachePlaytime); + denyMessage = Loc.GetString("whitelist-playtime", ("minutes", conditionPlaytime.MinimumPlaytime)); + break; + case ConditionNotesPlaytimeRange conditionNotesPlaytimeRange: + matched = CheckConditionNotesPlaytimeRange(conditionNotesPlaytimeRange, cacheRemarks, cachePlaytime); + denyMessage = Loc.GetString("whitelist-notes"); + break; + default: + throw new NotImplementedException($"Whitelist condition {condition.GetType().Name} not implemented"); + } + + sawmill.Verbose($"User {data.UserName} whitelist condition {condition.GetType().Name} result: {matched}"); + sawmill.Verbose($"Action: {condition.Action.ToString()}"); + switch (condition.Action) + { + case ConditionAction.Allow: + if (matched) + { + sawmill.Verbose($"User {data.UserName} passed whitelist condition {condition.GetType().Name} and it's a breaking condition"); + return (true, denyMessage); + } + break; + case ConditionAction.Deny: + if (matched) + { + sawmill.Verbose($"User {data.UserName} failed whitelist condition {condition.GetType().Name}"); + return (false, denyMessage); + } + break; + default: + sawmill.Verbose($"User {data.UserName} failed whitelist condition {condition.GetType().Name} but it's not a breaking condition"); + break; + } + } + sawmill.Verbose($"User {data.UserName} passed all whitelist conditions"); + return (true, null); + } + + #region Condition Checking + + private async Task CheckConditionManualWhitelist(NetUserData data) + { + return !(await _db.GetWhitelistStatusAsync(data.UserId)); + } + + private async Task CheckConditionManualBlacklist(NetUserData data) + { + return await _db.GetBlacklistStatusAsync(data.UserId); + } + + private bool CheckConditionNotesDateRange(ConditionNotesDateRange conditionNotes, List remarks) + { + var range = DateTime.UtcNow.AddDays(-conditionNotes.Range); + + return CheckRemarks(remarks, + conditionNotes.IncludeExpired, + conditionNotes.IncludeSecret, + conditionNotes.MinimumSeverity, + conditionNotes.MinimumNotes, + adminRemarksRecord => adminRemarksRecord.CreatedAt > range); + } + + private bool CheckConditionPlayerCount(ConditionPlayerCount conditionPlayerCount) + { + var count = _plyMgr.PlayerCount; + return count >= conditionPlayerCount.MinimumPlayers && count <= conditionPlayerCount.MaximumPlayers; + } + + private bool CheckConditionPlaytime(ConditionPlaytime conditionPlaytime, List playtime) + { + var tracker = playtime.Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall); + if (tracker is null) + { + return false; + } + + return tracker.TimeSpent.TotalMinutes >= conditionPlaytime.MinimumPlaytime; + } + + private bool CheckConditionNotesPlaytimeRange( + ConditionNotesPlaytimeRange conditionNotesPlaytimeRange, + List remarks, + List playtime) + { + var overallTracker = playtime.Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall); + if (overallTracker is null) + { + return false; + } + + return CheckRemarks(remarks, + conditionNotesPlaytimeRange.IncludeExpired, + conditionNotesPlaytimeRange.IncludeSecret, + conditionNotesPlaytimeRange.MinimumSeverity, + conditionNotesPlaytimeRange.MinimumNotes, + adminRemarksRecord => adminRemarksRecord.PlaytimeAtNote >= overallTracker.TimeSpent - TimeSpan.FromMinutes(conditionNotesPlaytimeRange.Range)); + } + + private bool CheckRemarks(List remarks, bool includeExpired, bool includeSecret, NoteSeverity minimumSeverity, int MinimumNotes, Func additionalCheck) + { + var utcNow = DateTime.UtcNow; + + var notes = remarks.Count(r => r is AdminNoteRecord note && note.Severity >= minimumSeverity && (includeSecret || !note.Secret) && (includeExpired || note.ExpirationTime == null || note.ExpirationTime > utcNow)); + if (notes < MinimumNotes) + { + return false; + } + + foreach (var adminRemarksRecord in remarks) + { + // If we're not including expired notes, skip them + if (!includeExpired && (adminRemarksRecord.ExpirationTime == null || adminRemarksRecord.ExpirationTime <= utcNow)) + continue; + + // In order to get the severity of the remark, we need to see if it's an AdminNoteRecord. + if (adminRemarksRecord is not AdminNoteRecord adminNoteRecord) + continue; + + // We want to filter out secret notes if we're not including them. + if (!includeSecret && adminNoteRecord.Secret) + continue; + + // At this point, we need to remove the note if it's not within the severity range. + if (adminNoteRecord.Severity < minimumSeverity) + continue; + + // Perform the additional check specific to each method + if (!additionalCheck(adminRemarksRecord)) + continue; + + // If we've made it this far, we have a match + return true; + } + + // No matches + return false; + } + + #endregion +} diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index d39dd7990ea..987c8d06b01 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -1,5 +1,9 @@ using System.Collections.Immutable; using System.Linq; +using System.Text.Json.Nodes; +using System.Threading.Tasks; +using Content.Server.Connection.Whitelist; +using Content.Server.Connection.Whitelist.Conditions; using System.Runtime.InteropServices; using System.Text.Json.Nodes; using System.Threading.Tasks; @@ -14,6 +18,7 @@ using Robust.Shared.Configuration; using Robust.Shared.Enums; using Robust.Shared.Network; +using Robust.Shared.Prototypes; using Robust.Shared.Player; using Robust.Shared.Timing; @@ -26,6 +31,7 @@ namespace Content.Server.Connection public interface IConnectionManager { void Initialize(); + void PostInit(); /// /// Temporarily allow a user to bypass regular connection requirements. @@ -43,7 +49,7 @@ public interface IConnectionManager /// /// Handles various duties like guest username assignment, bans, connection logs, etc... /// - public sealed class ConnectionManager : IConnectionManager + public sealed partial class ConnectionManager : IConnectionManager { [Dependency] private readonly IServerDbManager _dbManager = default!; [Dependency] private readonly IPlayerManager _plyMgr = default!; @@ -52,12 +58,14 @@ public sealed class ConnectionManager : IConnectionManager [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly ILocalizationManager _loc = default!; [Dependency] private readonly ServerDbEntryManager _serverDbEntry = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly IChatManager _chatManager = default!; - private readonly Dictionary _temporaryBypasses = []; private ISawmill _sawmill = default!; + private readonly Dictionary _temporaryBypasses = []; + public void Initialize() { @@ -268,20 +276,33 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame return (ConnectionDenyReason.Full, Loc.GetString("soft-player-cap-full"), null); } - if (_cfg.GetCVar(CCVars.WhitelistEnabled)) + // Checks for whitelist IF it's enabled AND the user isn't an admin. Admins are always allowed. + if (_cfg.GetCVar(CCVars.WhitelistEnabled) && adminData is null) { - var min = _cfg.GetCVar(CCVars.WhitelistMinPlayers); - var max = _cfg.GetCVar(CCVars.WhitelistMaxPlayers); - var playerCountValid = _plyMgr.PlayerCount >= min && _plyMgr.PlayerCount < max; + if (_whitelists is null) + { + _sawmill.Error("Whitelist enabled but no whitelists loaded."); + // Misconfigured, deny everyone. + return (ConnectionDenyReason.Whitelist, Loc.GetString("whitelist-misconfigured"), null); + } - if (playerCountValid && await _db.GetWhitelistStatusAsync(userId) == false - && adminData is null) + foreach (var whitelist in _whitelists) { - var msg = Loc.GetString(_cfg.GetCVar(CCVars.WhitelistReason)); - // was the whitelist playercount changed? - if (min > 0 || max < int.MaxValue) - msg += "\n" + Loc.GetString("whitelist-playercount-invalid", ("min", min), ("max", max)); - return (ConnectionDenyReason.Whitelist, msg, null); + if (!IsValid(whitelist, _plyMgr.PlayerCount)) + { + // Not valid for current player count. + continue; + } + + var whitelistStatus = await IsWhitelisted(whitelist, e.UserData, _sawmill); + if (!whitelistStatus.isWhitelisted) + { + // Not whitelisted. + return (ConnectionDenyReason.Whitelist, Loc.GetString("whitelist-fail-prefix", ("msg", whitelistStatus.denyMessage!)), null); + } + + // Whitelisted, don't check any more. + break; } } diff --git a/Content.Server/Connection/Whitelist/BlacklistCommands.cs b/Content.Server/Connection/Whitelist/BlacklistCommands.cs new file mode 100644 index 00000000000..e79fb7ee22e --- /dev/null +++ b/Content.Server/Connection/Whitelist/BlacklistCommands.cs @@ -0,0 +1,117 @@ +using Content.Server.Administration; +using Content.Server.Database; +using Content.Shared.Administration; +using Robust.Shared.Console; + +namespace Content.Server.Connection.Whitelist; + +[AdminCommand(AdminFlags.Ban)] +public sealed class AddBlacklistCommand : LocalizedCommands +{ + [Dependency] private readonly IPlayerLocator _playerLocator = default!; + [Dependency] private readonly IServerDbManager _db = default!; + + public override string Command => "blacklistadd"; + + public override async void Execute(IConsoleShell shell, string argStr, string[] args) + { + if (args.Length == 0) + { + shell.WriteError(Loc.GetString("shell-need-minimum-one-argument")); + shell.WriteLine(Help); + return; + } + + if (args.Length > 1) + { + shell.WriteError(Loc.GetString("shell-need-exactly-one-argument")); + shell.WriteLine(Help); + return; + } + + var name = args[0]; + var data = await _playerLocator.LookupIdByNameAsync(name); + + if (data == null) + { + shell.WriteError(Loc.GetString("cmd-blacklistadd-not-found", ("username", args[0]))); + return; + } + var guid = data.UserId; + var isBlacklisted = await _db.GetBlacklistStatusAsync(guid); + if (isBlacklisted) + { + shell.WriteLine(Loc.GetString("cmd-blacklistadd-existing", ("username", data.Username))); + return; + } + + await _db.AddToBlacklistAsync(guid); + shell.WriteLine(Loc.GetString("cmd-blacklistadd-added", ("username", data.Username))); + } + + public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + if (args.Length == 1) + { + return CompletionResult.FromHint(Loc.GetString("cmd-blacklistadd-arg-player")); + } + + return CompletionResult.Empty; + } +} + +[AdminCommand(AdminFlags.Ban)] +public sealed class RemoveBlacklistCommand : LocalizedCommands +{ + [Dependency] private readonly IPlayerLocator _playerLocator = default!; + [Dependency] private readonly IServerDbManager _db = default!; + + public override string Command => "blacklistremove"; + + public override async void Execute(IConsoleShell shell, string argStr, string[] args) + { + if (args.Length == 0) + { + shell.WriteError(Loc.GetString("shell-need-minimum-one-argument")); + shell.WriteLine(Help); + return; + } + + if (args.Length > 1) + { + shell.WriteError(Loc.GetString("shell-need-exactly-one-argument")); + shell.WriteLine(Help); + return; + } + + var name = args[0]; + var data = await _playerLocator.LookupIdByNameAsync(name); + + if (data == null) + { + shell.WriteError(Loc.GetString("cmd-blacklistremove-not-found", ("username", args[0]))); + return; + } + + var guid = data.UserId; + var isBlacklisted = await _db.GetBlacklistStatusAsync(guid); + if (!isBlacklisted) + { + shell.WriteLine(Loc.GetString("cmd-blacklistremove-existing", ("username", data.Username))); + return; + } + + await _db.RemoveFromBlacklistAsync(guid); + shell.WriteLine(Loc.GetString("cmd-blacklistremove-removed", ("username", data.Username))); + } + + public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + if (args.Length == 1) + { + return CompletionResult.FromHint(Loc.GetString("cmd-blacklistremove-arg-player")); + } + + return CompletionResult.Empty; + } +} diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs new file mode 100644 index 00000000000..9fe5db40120 --- /dev/null +++ b/Content.Server/Connection/Whitelist/Conditions/ConditionAlwaysMatch.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; +using Robust.Shared.Network; + +namespace Content.Server.Connection.Whitelist.Conditions; + +/// +/// Condition that always matches +/// +public sealed partial class ConditionAlwaysMatch : WhitelistCondition +{ + +} diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs new file mode 100644 index 00000000000..9d67129e71f --- /dev/null +++ b/Content.Server/Connection/Whitelist/Conditions/ConditionManualBlacklistMembership.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; +using Content.Server.Database; +using Robust.Shared.Network; + +namespace Content.Server.Connection.Whitelist.Conditions; + +/// +/// Condition that matches if the player is in the manual blacklist. +/// +public sealed partial class ConditionManualBlacklistMembership : WhitelistCondition +{ +} diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs new file mode 100644 index 00000000000..a31835f9c2f --- /dev/null +++ b/Content.Server/Connection/Whitelist/Conditions/ConditionManualWhitelistMembership.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; +using Content.Server.Database; +using Robust.Shared.Network; + +namespace Content.Server.Connection.Whitelist.Conditions; + +/// +/// Condition that matches if the player is in the manual whitelist. +/// +public sealed partial class ConditionManualWhitelistMembership : WhitelistCondition +{ +} diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs new file mode 100644 index 00000000000..1e34bc63734 --- /dev/null +++ b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesDateRange.cs @@ -0,0 +1,34 @@ +using System.Linq; +using System.Threading.Tasks; +using Content.Server.Database; +using Content.Shared.Database; +using Robust.Shared.Network; + +namespace Content.Server.Connection.Whitelist.Conditions; + +/// +/// Condition that matches if the player has notes within a certain date range. +/// +public sealed partial class ConditionNotesDateRange : WhitelistCondition +{ + [DataField] + public bool IncludeExpired = false; + + [DataField] + public NoteSeverity MinimumSeverity = NoteSeverity.Minor; + + /// + /// The minimum number of notes required. + /// + [DataField] + public int MinimumNotes = 1; + + /// + /// Range in days to check for notes. + /// + [DataField] + public int Range = int.MaxValue; + + [DataField] + public bool IncludeSecret = false; +} diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs new file mode 100644 index 00000000000..d2d22a8cd0d --- /dev/null +++ b/Content.Server/Connection/Whitelist/Conditions/ConditionNotesPlaytimeRange.cs @@ -0,0 +1,30 @@ +using Content.Shared.Database; + +namespace Content.Server.Connection.Whitelist.Conditions; + +/// +/// Condition that matches if the player has notes within a certain playtime range. +/// +public sealed partial class ConditionNotesPlaytimeRange : WhitelistCondition +{ + [DataField] + public bool IncludeExpired = false; + + [DataField] + public NoteSeverity MinimumSeverity = NoteSeverity.Minor; + + /// + /// The minimum number of notes required. + /// + [DataField] + public int MinimumNotes = 1; + + /// + /// The range in minutes to check for notes. + /// + [DataField] + public int Range = int.MaxValue; + + [DataField] + public bool IncludeSecret = false; +} diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs new file mode 100644 index 00000000000..432ad32c4ac --- /dev/null +++ b/Content.Server/Connection/Whitelist/Conditions/ConditionPlayerCount.cs @@ -0,0 +1,16 @@ +using System.Threading.Tasks; +using Robust.Server.Player; +using Robust.Shared.Network; + +namespace Content.Server.Connection.Whitelist.Conditions; + +/// +/// Condition that matches if the player count is within a certain range. +/// +public sealed partial class ConditionPlayerCount : WhitelistCondition +{ + [DataField] + public int MinimumPlayers = 0; + [DataField] + public int MaximumPlayers = int.MaxValue; +} diff --git a/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs b/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs new file mode 100644 index 00000000000..7b45181e120 --- /dev/null +++ b/Content.Server/Connection/Whitelist/Conditions/ConditionPlaytime.cs @@ -0,0 +1,15 @@ +using System.Threading.Tasks; +using Content.Server.Database; +using Content.Shared.Players.PlayTimeTracking; +using Robust.Shared.Network; + +namespace Content.Server.Connection.Whitelist.Conditions; + +/// +/// Condition that matches if the player has played for a certain amount of time. +/// +public sealed partial class ConditionPlaytime : WhitelistCondition +{ + [DataField] + public int MinimumPlaytime = 0; // In minutes +} diff --git a/Content.Server/Connection/Whitelist/WhitelistCondition.cs b/Content.Server/Connection/Whitelist/WhitelistCondition.cs new file mode 100644 index 00000000000..b68fd529968 --- /dev/null +++ b/Content.Server/Connection/Whitelist/WhitelistCondition.cs @@ -0,0 +1,41 @@ +using System.Text.Json.Serialization; +using System.Threading.Tasks; +using JetBrains.Annotations; +using Robust.Shared.Network; + +namespace Content.Server.Connection.Whitelist; + +/// +/// This class is used to determine if a player should be allowed to join the server. +/// It is used in +/// +[ImplicitDataDefinitionForInheritors] +[MeansImplicitUse] +public abstract partial class WhitelistCondition +{ + /// + /// What action should be taken if this condition is met? + /// Defaults to . + /// + [DataField] + public ConditionAction Action { get; set; } = ConditionAction.Next; +} + +/// +/// Determines what action should be taken if a condition is met. +/// +public enum ConditionAction +{ + /// + /// The player is allowed to join, and the next conditions will be skipped. + /// + Allow, + /// + /// The player is denied to join, and the next conditions will be skipped. + /// + Deny, + /// + /// The next condition should be checked. + /// + Next +} diff --git a/Content.Server/Connection/Whitelist/WhitelistPrototype.cs b/Content.Server/Connection/Whitelist/WhitelistPrototype.cs new file mode 100644 index 00000000000..2b8b9babbc0 --- /dev/null +++ b/Content.Server/Connection/Whitelist/WhitelistPrototype.cs @@ -0,0 +1,42 @@ +using System.Threading.Tasks; +using Robust.Shared.Network; +using Robust.Shared.Prototypes; + +namespace Content.Server.Connection.Whitelist; + +/// +/// Used by the to determine if a player should be allowed to join the server. +/// Used in the whitelist.prototype_list CVar. +/// +/// Whitelists are used to determine if a player is allowed to connect. +/// You define a PlayerConnectionWhitelist with a list of conditions. +/// Every condition has a type and a along with other parameters depending on the type. +/// Action must either be Allow, Deny or Next. +/// Allow means the player is instantly allowed to connect if the condition is met. +/// Deny means the player is instantly denied to connect if the condition is met. +/// Next means the next condition in the list is checked. +/// If the condition doesn't match, the next condition is checked. +/// +[Prototype("playerConnectionWhitelist")] +public sealed class PlayerConnectionWhitelistPrototype : IPrototype +{ + [IdDataField] + public string ID { get; } = default!; + + /// + /// Minimum number of players required for this whitelist to be active. + /// If there are less players than this, the whitelist will be ignored and the next one in the list will be used. + /// + [DataField] + public int MinimumPlayers { get; } = 0; + + /// + /// Maximum number of players allowed for this whitelist to be active. + /// If there are more players than this, the whitelist will be ignored and the next one in the list will be used. + /// + [DataField] + public int MaximumPlayers { get; } = int.MaxValue; + + [DataField] + public WhitelistCondition[] Conditions { get; } = default!; +} diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index 72e3c50daf6..2b6ce41e191 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -1066,6 +1066,29 @@ public async Task SetLastReadRules(NetUserId player, DateTimeOffset date) await db.DbContext.SaveChangesAsync(); } + public async Task GetBlacklistStatusAsync(NetUserId player) + { + await using var db = await GetDb(); + + return await db.DbContext.Blacklist.AnyAsync(w => w.UserId == player); + } + + public async Task AddToBlacklistAsync(NetUserId player) + { + await using var db = await GetDb(); + + db.DbContext.Blacklist.Add(new Blacklist() { UserId = player }); + await db.DbContext.SaveChangesAsync(); + } + + public async Task RemoveFromBlacklistAsync(NetUserId player) + { + await using var db = await GetDb(); + var entry = await db.DbContext.Blacklist.SingleAsync(w => w.UserId == player); + db.DbContext.Blacklist.Remove(entry); + await db.DbContext.SaveChangesAsync(); + } + #endregion #region Uploaded Resources Logs diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs index 8b6ac5fed6b..216b1ec1596 100644 --- a/Content.Server/Database/ServerDbManager.cs +++ b/Content.Server/Database/ServerDbManager.cs @@ -244,6 +244,16 @@ Task AddConnectionLogAsync( #endregion + #region Blacklist + + Task GetBlacklistStatusAsync(NetUserId player); + + Task AddToBlacklistAsync(NetUserId player); + + Task RemoveFromBlacklistAsync(NetUserId player); + + #endregion + #region Uploaded Resources Logs Task AddUploadedResourceLogAsync(NetUserId user, DateTimeOffset date, string path, byte[] data); @@ -740,6 +750,24 @@ public Task RemoveFromWhitelistAsync(NetUserId player) return RunDbCommand(() => _db.RemoveFromWhitelistAsync(player)); } + public Task GetBlacklistStatusAsync(NetUserId player) + { + DbReadOpsMetric.Inc(); + return RunDbCommand(() => _db.GetBlacklistStatusAsync(player)); + } + + public Task AddToBlacklistAsync(NetUserId player) + { + DbWriteOpsMetric.Inc(); + return RunDbCommand(() => _db.AddToBlacklistAsync(player)); + } + + public Task RemoveFromBlacklistAsync(NetUserId player) + { + DbWriteOpsMetric.Inc(); + return RunDbCommand(() => _db.RemoveFromBlacklistAsync(player)); + } + public Task AddUploadedResourceLogAsync(NetUserId user, DateTimeOffset date, string path, byte[] data) { DbWriteOpsMetric.Inc(); diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs index 3a9d07126e5..76d1b0dedae 100644 --- a/Content.Server/Entry/EntryPoint.cs +++ b/Content.Server/Entry/EntryPoint.cs @@ -145,6 +145,7 @@ public override void PostInit() IoCManager.Resolve().Initialize(); IoCManager.Resolve().GetEntitySystem().PostInitialize(); IoCManager.Resolve().Initialize(); + IoCManager.Resolve().PostInit(); } } diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index c3307c53fb6..4d1ba39a3eb 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1326,24 +1326,12 @@ public static readonly CVarDef /// public static readonly CVarDef WhitelistEnabled = CVarDef.Create("whitelist.enabled", false, CVar.SERVERONLY); - - /// - /// The loc string to display as a disconnect reason when someone is not whitelisted. - /// - public static readonly CVarDef WhitelistReason = - CVarDef.Create("whitelist.reason", "whitelist-not-whitelisted", CVar.SERVERONLY); - - /// - /// If the playercount is below this number, the whitelist will not apply. - /// - public static readonly CVarDef WhitelistMinPlayers = - CVarDef.Create("whitelist.min_players", 0, CVar.SERVERONLY); - /// - /// If the playercount is above this number, the whitelist will not apply. + /// Specifies the whitelist prototypes to be used by the server. This should be a comma-separated list of prototypes. + /// If a whitelists conditions to be active fail (for example player count), the next whitelist will be used instead. If no whitelist is valid, the player will be allowed to connect. /// - public static readonly CVarDef WhitelistMaxPlayers = - CVarDef.Create("whitelist.max_players", int.MaxValue, CVar.SERVERONLY); + public static readonly CVarDef WhitelistPrototypeList = + CVarDef.Create("whitelist.prototype_list", "basicWhitelist", CVar.SERVERONLY); /* * VOTE diff --git a/Resources/ConfigPresets/WizardsDen/salamander.toml b/Resources/ConfigPresets/WizardsDen/salamander.toml index 632dcae7161..43ba4d8d045 100644 --- a/Resources/ConfigPresets/WizardsDen/salamander.toml +++ b/Resources/ConfigPresets/WizardsDen/salamander.toml @@ -1,7 +1,7 @@ # Configuration preset used on Wizard's Den Salamander [game] -desc = "Official English Space Station 14 servers. Medium roleplay ruleset. You must be whitelisted through Discord to play if there are more than 15 online players." +desc = "Official English Space Station 14 servers. Medium roleplay ruleset. you must be whitelisted by playing on other Wizard's Den servers if there are more than 15 online players." hostname = "[EN] Wizard's Den Salamander [US West RP]" soft_max_players = 130 @@ -10,8 +10,7 @@ rules_file = "MRPRuleset" [whitelist] enabled = true -reason = "whitelist-not-whitelisted-rp" -min_players = 15 +prototype_list = "salamanderMrpWhitelist" [shuttle] emergency_early_launch_allowed = true diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl index 309e8fc2f83..c8f29cdf848 100644 --- a/Resources/Locale/en-US/connection-messages.ftl +++ b/Resources/Locale/en-US/connection-messages.ftl @@ -1,16 +1,4 @@ -whitelist-not-whitelisted = You are not whitelisted. - -# proper handling for having a min/max or not -whitelist-playercount-invalid = {$min -> - [0] The whitelist for this server only applies below {$max} players. - *[other] The whitelist for this server only applies above {$min} {$max -> - [2147483647] -> players, so you may be able to join later. - *[other] -> players and below {$max} players, so you may be able to join later. - } -} -whitelist-not-whitelisted-rp = You are not whitelisted. To become whitelisted, visit our Discord (which can be found at https://spacestation14.io) and check the #rp-whitelist channel. - -cmd-whitelistadd-desc = Adds the player with the given username to the server whitelist. +cmd-whitelistadd-desc = Adds the player with the given username to the server whitelist. cmd-whitelistadd-help = Usage: whitelistadd cmd-whitelistadd-existing = {$username} is already on the whitelist! cmd-whitelistadd-added = {$username} added to the whitelist @@ -40,8 +28,30 @@ panic-bunker-account-denied-reason = This server is in panic bunker mode, often panic-bunker-account-reason-account = Your Space Station 14 account is too new. It must be older than {$minutes} minutes panic-bunker-account-reason-overall = Your overall playtime on the server must be greater than {$minutes} $minutes +whitelist-playtime = You do not have enough playtime to join this server. You need at least {$minutes} minutes of playtime to join this server. +whitelist-player-count = This server is currently not accepting players. Please try again later. +whitelist-notes = You currently have too many admin notes to join this server. You can check your notes by typing /adminremarks in chat. +whitelist-manual = You are not whitelisted on this server. +whitelist-blacklisted = You are blacklisted from this server. +whitelist-always-deny = You are not allowed to join this server. +whitelist-fail-prefix = Not whitelisted: {$msg} +whitelist-misconfigured = The server is misconfigured and is not accepting players. Please contact the server owner and try again later. + +cmd-blacklistadd-desc = Adds the player with the given username to the server blacklist. +cmd-blacklistadd-help = Usage: blacklistadd +cmd-blacklistadd-existing = {$username} is already on the blacklist! +cmd-blacklistadd-added = {$username} added to the blacklist +cmd-blacklistadd-not-found = Unable to find '{$username}' +cmd-blacklistadd-arg-player = [player] + +cmd-blacklistremove-desc = Removes the player with the given username from the server blacklist. +cmd-blacklistremove-help = Usage: blacklistremove +cmd-blacklistremove-existing = {$username} is not on the blacklist! +cmd-blacklistremove-removed = {$username} removed from the blacklist +cmd-blacklistremove-not-found = Unable to find '{$username}' +cmd-blacklistremove-arg-player = [player] + baby-jail-account-denied = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun! baby-jail-account-denied-reason = This server is a newbie server, intended for new players and those who want to help them. New connections by accounts that are too old or are not on a whitelist are not accepted. Check out some other servers and see everything Space Station 14 has to offer. Have fun! Reason: "{$reason}" baby-jail-account-reason-account = Your Space Station 14 account is too old. It must be younger than {$minutes} minutes baby-jail-account-reason-overall = Your overall playtime on the server must be younger than {$minutes} $minutes - diff --git a/Resources/Prototypes/whitelists.yml b/Resources/Prototypes/whitelists.yml new file mode 100644 index 00000000000..8a99aa30eab --- /dev/null +++ b/Resources/Prototypes/whitelists.yml @@ -0,0 +1,7 @@ +- type: playerConnectionWhitelist + id: basicWhitelist # Basic whitelist using only the ManualWhitelist condition + conditions: + - !type:ConditionManualWhitelistMembership + action: Allow # Allow connection if matched + - !type:ConditionAlwaysMatch # Condition that always matches + action: Deny # Deny connection if matched diff --git a/Resources/Prototypes/wizardsDenWhitelists.yml b/Resources/Prototypes/wizardsDenWhitelists.yml new file mode 100644 index 00000000000..c21d01e5a89 --- /dev/null +++ b/Resources/Prototypes/wizardsDenWhitelists.yml @@ -0,0 +1,39 @@ +# This is the whitelist used for Wizard's Den Salamander + +- type: playerConnectionWhitelist + id: salamanderMrpWhitelist + conditions: + - !type:ConditionManualBlacklistMembership # Deny blacklisted (MRP ban) + action: Deny + - !type:ConditionNotesPlaytimeRange # Deny for high severity notes in the last 30 days + includeExpired: false + minimumSeverity: 3 # High + minimumNotes: 1 + range: 30 # 30 days + action: Deny + includeSecret: false + - !type:ConditionNotesPlaytimeRange # Deny for >=2 medium severity notes in the last 14 days + includeExpired: false + minimumSeverity: 2 # Medium + minimumNotes: 1 + range: 14 # 14 Days + action: Deny + includeSecret: false + - !type:ConditionNotesPlaytimeRange # Deny for >=3 low severity notes in the last 14 days + includeExpired: false + minimumSeverity: 1 # Low + minimumNotes: 3 + range: 14 # 14 Days + action: Deny + includeSecret: false + - !type:ConditionManualWhitelistMembership # Allow whitelisted players + action: Allow + - !type:ConditionPlayerCount # Allow when <= 15 players are online + minimumPlayers: 0 + maximumPlayers: 15 + action: Allow + #- !type:ConditionPlaytime + # minimumPlaytime: 1200 # 20 hours to be whitelisted + # action: Deny + - !type:ConditionAlwaysMatch + action: Deny From 3adb4bc7a805b9dff4fa57a44465f8d3d6fdf13d Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:49:17 +0300 Subject: [PATCH 127/223] Make nukie plushie a non-contraband item (#31516) Make nukie plushies a non-contraband item --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 7dfc6ce8663..6ac158630f9 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -215,7 +215,7 @@ shader: unshaded - type: entity - parent: [ BasePlushie, BaseSyndicateContraband ] + parent: BasePlushie id: PlushieNuke name: nukie plushie description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. From 9b8ed01ea06667e3c0da807a6e3a3ab5e5f58e0d Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 16:50:23 +0000 Subject: [PATCH 128/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7df53e2a849..3416becbe08 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: KyuPolaris - changes: - - message: Chickens now make a clucking sound when they speak. - type: Add - id: 6727 - time: '2024-06-14T02:43:02.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28948 - author: Killerqu00 changes: - message: Time between uncuff attempts is now 30 seconds instead of 6. @@ -3865,3 +3858,10 @@ id: 7226 time: '2024-08-27T15:02:21.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30888 +- author: Winkarst-cpu + changes: + - message: Nukie plushie is now not a contraband item. + type: Fix + id: 7227 + time: '2024-08-27T16:49:17.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31516 From 2aea194065e9f73ba7a8f9a0280d42a0e0ad627d Mon Sep 17 00:00:00 2001 From: saintmuntzer <47153094+saintmuntzer@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:51:28 -0500 Subject: [PATCH 129/223] fix uncapitalized "S" in Salvage Specialist (#31529) "Salvage specialist" to "Salvage Specialist"; all is right with the world --- Resources/Locale/en-US/job/job-names.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 33e501cb690..a5ff9fffebc 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -32,7 +32,7 @@ job-name-chaplain = Chaplain job-name-botanist = Botanist job-name-bartender = Bartender job-name-passenger = Passenger -job-name-salvagespec = Salvage specialist +job-name-salvagespec = Salvage Specialist job-name-qm = Quartermaster job-name-cargotech = Cargo Technician job-name-chef = Chef From ef634a1d5a40469d918fcbe11dba1b23fa951ce2 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:54:48 +0300 Subject: [PATCH 130/223] Make AKMS security restricted (#31519) --- .../Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 64280542dba..e34433cb56a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -53,7 +53,7 @@ - type: entity name: AKMS - parent: [BaseWeaponRifle, BaseMajorContraband] + parent: [BaseWeaponRifle, BaseRestrictedContraband] id: WeaponRifleAk description: An iconic weapon of war. Uses .30 rifle ammo. components: From 6c1027b7a6fe2b1305383dec0756600f42742b79 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 27 Aug 2024 16:55:54 +0000 Subject: [PATCH 131/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3416becbe08..65f093d4370 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Killerqu00 - changes: - - message: Time between uncuff attempts is now 30 seconds instead of 6. - type: Tweak - id: 6728 - time: '2024-06-14T06:19:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28095 - author: Moomoobeef changes: - message: Fax machines can now be purchased at cargo, for when you need more paper @@ -3865,3 +3858,10 @@ id: 7227 time: '2024-08-27T16:49:17.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31516 +- author: Winkarst-cpu + changes: + - message: Now AKMS is restricted to the security department. + type: Fix + id: 7228 + time: '2024-08-27T16:54:48.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31519 From 46fe7bc3ec2d8364d035096c2080b3a0c57d9f7e Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:38:36 -0600 Subject: [PATCH 132/223] bagel update (#31535) --- Resources/Maps/bagel.yml | 3853 ++++++++++++++++++++------------------ 1 file changed, 2056 insertions(+), 1797 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index c4e69cf20e8..5fb6961da3b 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -75,99 +75,99 @@ entities: chunks: 0,-1: ind: 0,-1 - tiles: XQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAABbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATQAAAAABHwAAAAADHwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABHwAAAAADHwAAAAABHwAAAAABTwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAACfgAAAAAATwAAAAAAEQAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAA + tiles: XQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATQAAAAABHwAAAAACHwAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAADTwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAABfgAAAAAATwAAAAAAEQAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAB version: 6 -1,-1: ind: -1,-1 - tiles: XQAAAAADXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACZAAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAABXQAAAAACZAAAAAAAXQAAAAACZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAZAAAAAAAXQAAAAABZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAZAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAdAAAAAADdAAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAdAAAAAADcwAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAABfgAAAAAAHwAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADMwAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAHwAAAAABXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAADMwAAAAAAegAAAAAAegAAAAADegAAAAABfgAAAAAAHwAAAAACXQAAAAABXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAACJAAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAHwAAAAADXQAAAAAAXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACfgAAAAAAegAAAAAAegAAAAABegAAAAADfgAAAAAAHwAAAAADTQAAAAADTQAAAAABfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAHwAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAC + tiles: XQAAAAACXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABZAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAACZAAAAAAAXQAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAABXQAAAAACXQAAAAADZAAAAAAAXQAAAAADZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADZAAAAAAAXQAAAAABXQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAdAAAAAAAdAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAdAAAAAADcwAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAADfgAAAAAAHwAAAAADXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACMwAAAAAAegAAAAAAegAAAAAAegAAAAACfgAAAAAAHwAAAAADXQAAAAACXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAADMwAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAHwAAAAADXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAJAAAAAAAegAAAAACegAAAAADegAAAAAAfgAAAAAAHwAAAAADXQAAAAAAXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAegAAAAACegAAAAADegAAAAADfgAAAAAAHwAAAAACTQAAAAAATQAAAAABfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAAA version: 6 0,0: ind: 0,0 - tiles: HwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAALwAAAAADLwAAAAACLwAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAALwAAAAAADAAAAAAADAAAAAADDAAAAAADLwAAAAABfgAAAAAAXQAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAALwAAAAAADAAAAAAADAAAAAABDAAAAAAADAAAAAACDAAAAAABLwAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAALwAAAAABDAAAAAABDAAAAAABDAAAAAAADAAAAAACDAAAAAACLwAAAAADXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAALwAAAAACHwAAAAADDAAAAAADDAAAAAABDAAAAAADHwAAAAABLwAAAAAAXQAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAALwAAAAABLwAAAAABTgAAAAACLwAAAAABLwAAAAADfgAAAAAATQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAAC + tiles: HwAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAALwAAAAABLwAAAAACLwAAAAABfQAAAAAAfgAAAAAAXQAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAALwAAAAABDAAAAAADDAAAAAAADAAAAAADLwAAAAABfgAAAAAAXQAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAALwAAAAADDAAAAAADDAAAAAADDAAAAAACDAAAAAADDAAAAAADLwAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAALwAAAAACDAAAAAACDAAAAAABDAAAAAACDAAAAAAADAAAAAACLwAAAAABXQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAALwAAAAABHwAAAAAADAAAAAAADAAAAAAADAAAAAABHwAAAAAALwAAAAADXQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAALwAAAAADLwAAAAABTgAAAAABLwAAAAAALwAAAAAAfgAAAAAATQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAACTQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAATQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABTQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAA version: 6 -1,0: ind: -1,0 - tiles: XQAAAAADXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAADXQAAAAABXQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACXQAAAAAAXQAAAAABHwAAAAAAbQAAAAAAbQAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABXQAAAAABXQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAOAAAAAAAOAAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAATQAAAAADTQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAATQAAAAABTQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAABHwAAAAABHwAAAAADfgAAAAAAegAAAAACegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAACHwAAAAABHwAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACHwAAAAABHwAAAAADfgAAAAAAegAAAAACegAAAAABegAAAAABegAAAAADegAAAAADfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAACegAAAAACfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAACegAAAAAAegAAAAABegAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAXQAAAAAD + tiles: XQAAAAAAXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAABXQAAAAAAXQAAAAABfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAXQAAAAABXQAAAAAAHwAAAAADbQAAAAAAbQAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAADfgAAAAAAbQAAAAAAbQAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAOAAAAAAAOAAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAATQAAAAADTQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACTQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAACXQAAAAAATQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABTQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAADTQAAAAADTQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABHwAAAAACHwAAAAADfgAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADHwAAAAABHwAAAAABfgAAAAAAegAAAAACegAAAAACegAAAAADegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABHwAAAAACHwAAAAACfgAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAADegAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAACegAAAAABegAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAegAAAAACegAAAAAAegAAAAADegAAAAABegAAAAABegAAAAADegAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAXQAAAAAD version: 6 0,-2: ind: 0,-2 - tiles: XQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAABegAAAAACegAAAAADegAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABfgAAAAAAfgAAAAAAHwAAAAADXQAAAAABXQAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAADgAAAAABegAAAAACegAAAAADegAAAAAAegAAAAABegAAAAADXQAAAAADXQAAAAADfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAABfgAAAAAADgAAAAACegAAAAADegAAAAABegAAAAABegAAAAABegAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAADgAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAADDgAAAAAAXQAAAAACXQAAAAACfgAAAAAATQAAAAAATQAAAAAATQAAAAABTQAAAAAATQAAAAADTQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAATQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAABTQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAACTQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAADbQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAC + tiles: XQAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADegAAAAACegAAAAADegAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAACXQAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADHwAAAAAAHwAAAAADfgAAAAAADgAAAAACegAAAAADegAAAAABegAAAAACegAAAAADegAAAAACXQAAAAADXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAAAfgAAAAAADgAAAAABegAAAAABegAAAAAAegAAAAACegAAAAADegAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAADgAAAAADDgAAAAAADgAAAAABDgAAAAAADgAAAAACDgAAAAABXQAAAAABXQAAAAAAfgAAAAAATQAAAAACTQAAAAABTQAAAAADTQAAAAADTQAAAAABTQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAATQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAAATQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABTQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAA version: 6 -1,-2: ind: -1,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAXQAAAAACbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAABTQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAATQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACTQAAAAACXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAALgAAAAAAfgAAAAAAAgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAALgAAAAAAfgAAAAAAAwAAAAADfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAALgAAAAAAfgAAAAAAAwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTQAAAAABTQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAAwAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAC + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAADfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABTQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAACTQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABTQAAAAABXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAALgAAAAAAfgAAAAAAAgAAAAABfgAAAAAAHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAAwAAAAADfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAALgAAAAAAfgAAAAAAAwAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATQAAAAAATQAAAAACfgAAAAAAbQAAAAAAfgAAAAAAAwAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAC version: 6 0,-3: ind: 0,-3 - tiles: XQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAADXQAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAQAAAAAAAQAAAAAAAHwAAAAADXQAAAAABXQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAegAAAAAAegAAAAAAegAAAAABfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAACfgAAAAAAegAAAAACegAAAAAAegAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAABHwAAAAADfgAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAegAAAAADegAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAA + tiles: XQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABXQAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAADfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAQAAAAAAAQAAAAAAAHwAAAAAAXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAegAAAAADegAAAAAAegAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAegAAAAADegAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAA version: 6 -1,-3: ind: -1,-3 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAbQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAABQAAAAADXQAAAAACXQAAAAACZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAABQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAbQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAABQAAAAACXQAAAAADXQAAAAABZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAABQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAA version: 6 1,-2: ind: 1,-2 - tiles: egAAAAABegAAAAADegAAAAABegAAAAACegAAAAACegAAAAADfgAAAAAABAAAAAADBAAAAAAABAAAAAAABAAAAAAAfgAAAAAAHwAAAAAAXQAAAAADXQAAAAADXQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAABAAAAAACBAAAAAABBAAAAAABBAAAAAACfgAAAAAAHwAAAAABXQAAAAABXQAAAAABXQAAAAACegAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAABegAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABXQAAAAAAXQAAAAAAXQAAAAACegAAAAAAegAAAAABegAAAAADegAAAAABegAAAAADegAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAHwAAAAACXQAAAAAAXQAAAAABXQAAAAADegAAAAACegAAAAAAegAAAAABegAAAAABegAAAAACegAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAHwAAAAADXQAAAAADXQAAAAAAXQAAAAACDgAAAAACDgAAAAACDgAAAAADDgAAAAABDgAAAAAADgAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAABDgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAPAAAAAAAXQAAAAABXQAAAAACTQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAAATQAAAAABXQAAAAACTQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADTQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAADgAAAAABDgAAAAACDgAAAAABDgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAHwAAAAADDgAAAAADDgAAAAADDgAAAAACDgAAAAADDgAAAAABegAAAAAAegAAAAACegAAAAADfgAAAAAAcAAAAAADcAAAAAADfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAADgAAAAACDgAAAAAADgAAAAABDgAAAAAADgAAAAABegAAAAADegAAAAADegAAAAACfgAAAAAAcAAAAAADcAAAAAADcAAAAAAAXQAAAAABXQAAAAABHwAAAAABHwAAAAABDgAAAAABDgAAAAAADgAAAAADDgAAAAADDgAAAAAAegAAAAABegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABHwAAAAAAHwAAAAADDgAAAAABDgAAAAACDgAAAAAADgAAAAADDgAAAAADegAAAAADegAAAAAAegAAAAAAfgAAAAAAcAAAAAADcAAAAAAAcAAAAAABXQAAAAADXQAAAAADfgAAAAAAHwAAAAACDgAAAAAADgAAAAACDgAAAAADDgAAAAADDgAAAAAAegAAAAACegAAAAAAegAAAAACfgAAAAAAcAAAAAAAcAAAAAABfgAAAAAA + tiles: egAAAAADegAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAACfgAAAAAABAAAAAACBAAAAAACBAAAAAACBAAAAAABfgAAAAAAHwAAAAADXQAAAAADXQAAAAACXQAAAAABegAAAAADegAAAAACegAAAAADegAAAAAAegAAAAACegAAAAACfgAAAAAABAAAAAAABAAAAAABBAAAAAABBAAAAAACfgAAAAAAHwAAAAACXQAAAAADXQAAAAAAXQAAAAACegAAAAAAegAAAAADegAAAAAAegAAAAABegAAAAAAegAAAAACfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADXQAAAAABXQAAAAAAXQAAAAADegAAAAACegAAAAABegAAAAADegAAAAAAegAAAAABegAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAHwAAAAACXQAAAAACXQAAAAACXQAAAAACegAAAAABegAAAAACegAAAAAAegAAAAACegAAAAACegAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAHwAAAAADXQAAAAADXQAAAAACXQAAAAADDgAAAAADDgAAAAACDgAAAAADDgAAAAADDgAAAAADDgAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABDgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAPAAAAAAAXQAAAAADXQAAAAADTQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAATQAAAAACXQAAAAACTQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAACTQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAAATQAAAAAATQAAAAADfgAAAAAAfgAAAAAADgAAAAABDgAAAAACDgAAAAADDgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAHwAAAAAADgAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAACegAAAAABegAAAAACegAAAAACfgAAAAAAcAAAAAAAcAAAAAACfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAABDgAAAAADDgAAAAAADgAAAAACDgAAAAACDgAAAAABegAAAAACegAAAAABegAAAAABfgAAAAAAcAAAAAAAcAAAAAADcAAAAAADXQAAAAACXQAAAAADHwAAAAABHwAAAAADDgAAAAABDgAAAAAADgAAAAACDgAAAAADDgAAAAABegAAAAACegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADHwAAAAADHwAAAAADDgAAAAABDgAAAAADDgAAAAAADgAAAAADDgAAAAACegAAAAACegAAAAAAegAAAAACfgAAAAAAcAAAAAAAcAAAAAABcAAAAAAAXQAAAAABXQAAAAACfgAAAAAAHwAAAAABDgAAAAAADgAAAAABDgAAAAAADgAAAAABDgAAAAABegAAAAABegAAAAABegAAAAAAfgAAAAAAcAAAAAACcAAAAAACfgAAAAAA version: 6 1,-1: ind: 1,-1 - tiles: XQAAAAABXQAAAAADfgAAAAAAHwAAAAACDgAAAAADDgAAAAAADgAAAAACDgAAAAAADgAAAAABegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAGwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAegAAAAAAegAAAAACcAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAHwAAAAABGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAHwAAAAAAfgAAAAAAegAAAAADegAAAAABHwAAAAADXQAAAAAAXQAAAAACfgAAAAAAHwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAHwAAAAADGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAADbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAATQAAAAAATQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABEQAAAAAAHwAAAAADHwAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: XQAAAAABXQAAAAACfgAAAAAAHwAAAAAADgAAAAABDgAAAAAADgAAAAAADgAAAAABDgAAAAACegAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAGwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAegAAAAACegAAAAADcAAAAAACXQAAAAADXQAAAAAAfgAAAAAAHwAAAAADGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAHwAAAAABfgAAAAAAegAAAAADegAAAAABHwAAAAACXQAAAAADXQAAAAAAfgAAAAAAHwAAAAACGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAHwAAAAACfgAAAAAAegAAAAABegAAAAACfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAHwAAAAADGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAATQAAAAADTQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACEQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 1,0: ind: 1,0 - tiles: XQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAXQAAAAAAEQAAAAAAHwAAAAABOAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAOAAAAAAAEQAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAABEQAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAfgAAAAAAHwAAAAABQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAATQAAAAACTQAAAAACfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAATQAAAAABTQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAdAAAAAADdAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADcAAAAAAAdAAAAAAAdAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAdAAAAAAAdAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAdAAAAAADVgAAAAADfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: XQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAXQAAAAACEQAAAAAAHwAAAAACOAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAOAAAAAAAEQAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACEQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAAAAAAAAAfgAAAAAAHwAAAAABQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAATQAAAAADTQAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACTQAAAAABTQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAdAAAAAACdAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACcAAAAAAAdAAAAAABdAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABXQAAAAABfgAAAAAAdAAAAAACdAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAdAAAAAABVgAAAAABfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -2,-2: ind: -2,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAABegAAAAAAfAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACTQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABTQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAACTQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAADHwAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADHwAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAATQAAAAAAHwAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAXQAAAAAD + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWwAAAAADfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAACfAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADTQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACTQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAADTQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACHwAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACHwAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADHwAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABHwAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAATQAAAAAAHwAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAXQAAAAAA version: 6 -2,-1: ind: -2,-1 - tiles: fgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADHwAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABHwAAAAADHwAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAABfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAcAAAAAABcAAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAcAAAAAAAcAAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABHwAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADHwAAAAAAXQAAAAABXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAHwAAAAADHwAAAAACfgAAAAAATQAAAAAAfgAAAAAAHwAAAAACXQAAAAACXQAAAAACfgAAAAAAHwAAAAACfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTQAAAAAATQAAAAABXQAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAABXQAAAAAB + tiles: fgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAADHwAAAAADHwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAHwAAAAADHwAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAcAAAAAABcAAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADcAAAAAAAcAAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADHwAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAADHwAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAACfgAAAAAATQAAAAACfgAAAAAAHwAAAAADXQAAAAADXQAAAAADfgAAAAAAHwAAAAACfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTQAAAAAATQAAAAABXQAAAAACTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAXQAAAAADXQAAAAAA version: 6 -2,0: ind: -2,0 - tiles: TQAAAAACTQAAAAADXQAAAAADTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADegAAAAABegAAAAACegAAAAACegAAAAAAfgAAAAAAXQAAAAADXQAAAAABTQAAAAACTQAAAAAAXQAAAAACTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAegAAAAADegAAAAADegAAAAADegAAAAABfgAAAAAAXQAAAAACXQAAAAAAHwAAAAAAHwAAAAABXQAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAACHwAAAAACHwAAAAADHwAAAAADHwAAAAABfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABHwAAAAACHwAAAAACbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAABXQAAAAADHwAAAAAAfgAAAAAAHwAAAAADegAAAAADegAAAAADegAAAAAAegAAAAAAegAAAAACHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADEQAAAAAAHwAAAAACfgAAAAAAHwAAAAABegAAAAACegAAAAAAegAAAAAAegAAAAADegAAAAADHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABEQAAAAAAXQAAAAADfgAAAAAAHwAAAAABegAAAAADegAAAAAAegAAAAABegAAAAAAegAAAAABHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACEQAAAAAAHwAAAAACfgAAAAAAHwAAAAABegAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADHwAAAAABfgAAAAAAHwAAAAACegAAAAACegAAAAAAegAAAAACegAAAAABegAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAXQAAAAAC + tiles: TQAAAAAATQAAAAACXQAAAAADTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAegAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAXQAAAAADXQAAAAAATQAAAAACTQAAAAADXQAAAAABTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAAAfgAAAAAAXQAAAAADXQAAAAACHwAAAAAAHwAAAAADXQAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAXQAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABHwAAAAAAHwAAAAACbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACTQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAATQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAATQAAAAAAXQAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADXQAAAAAAHwAAAAADfgAAAAAAHwAAAAABegAAAAACegAAAAAAegAAAAADegAAAAACegAAAAABHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADEQAAAAAAHwAAAAABfgAAAAAAHwAAAAACegAAAAABegAAAAABegAAAAADegAAAAACegAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADEQAAAAAAXQAAAAADfgAAAAAAHwAAAAABegAAAAAAegAAAAACegAAAAACegAAAAADegAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADEQAAAAAAHwAAAAACfgAAAAAAHwAAAAAAegAAAAACegAAAAADegAAAAAAegAAAAADegAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAHwAAAAABfgAAAAAAHwAAAAADegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAACHwAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAC version: 6 1,-3: ind: 1,-3 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAABAAAAAADBAAAAAACBAAAAAAABAAAAAABBAAAAAADfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAABAAAAAADBAAAAAADBAAAAAAABAAAAAAABAAAAAADfgAAAAAADAAAAAADDAAAAAACfgAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAABegAAAAABegAAAAAAHwAAAAABBAAAAAACBAAAAAABBAAAAAABBAAAAAADBAAAAAADHwAAAAABDAAAAAADDAAAAAADfgAAAAAAegAAAAAAegAAAAACegAAAAADegAAAAADegAAAAACegAAAAADfgAAAAAABAAAAAABBAAAAAACBAAAAAAABAAAAAAABAAAAAACfgAAAAAADAAAAAADDAAAAAABfgAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAABegAAAAAAegAAAAAAfgAAAAAABAAAAAACBAAAAAADBAAAAAAABAAAAAADfgAAAAAAfgAAAAAADAAAAAACDAAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAACegAAAAABegAAAAADfgAAAAAABAAAAAABBAAAAAADBAAAAAACBAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAACegAAAAADegAAAAABegAAAAAAegAAAAAAegAAAAABegAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAABfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAABXQAAAAAB + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAACfgAAAAAABAAAAAACBAAAAAABBAAAAAACBAAAAAADBAAAAAACfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAAAfgAAAAAABAAAAAABBAAAAAAABAAAAAACBAAAAAAABAAAAAABfgAAAAAADAAAAAACDAAAAAADfgAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAABegAAAAACegAAAAADHwAAAAADBAAAAAAABAAAAAABBAAAAAAABAAAAAADBAAAAAACHwAAAAADDAAAAAAADAAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAABegAAAAACegAAAAADegAAAAABfgAAAAAABAAAAAABBAAAAAABBAAAAAADBAAAAAADBAAAAAABfgAAAAAADAAAAAACDAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAABAAAAAACBAAAAAACBAAAAAADBAAAAAACfgAAAAAAfgAAAAAADAAAAAACDAAAAAADfgAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAABAAAAAABBAAAAAADBAAAAAACBAAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAABegAAAAAAegAAAAADegAAAAABegAAAAADegAAAAAAegAAAAABfgAAAAAABAAAAAABBAAAAAABBAAAAAAABAAAAAACfgAAAAAAHwAAAAACXQAAAAACXQAAAAAAXQAAAAAD version: 6 -3,0: ind: -3,0 - tiles: HwAAAAADHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAeQAAAAAAeQAAAAADfgAAAAAATQAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAATQAAAAABTQAAAAADTQAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAATQAAAAABTQAAAAAATQAAAAADHwAAAAABHwAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAATQAAAAABTQAAAAAATQAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACfgAAAAAATQAAAAACTQAAAAACTQAAAAACHwAAAAABHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAXQAAAAABXQAAAAACXQAAAAADHwAAAAACTQAAAAACTQAAAAACTQAAAAABMgAAAAADMgAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAATQAAAAADTQAAAAABTQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACegAAAAADegAAAAAAfgAAAAAAegAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACTQAAAAAAXQAAAAACXQAAAAAAXQAAAAACfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACegAAAAABegAAAAACHwAAAAADegAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAACTQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABegAAAAAAegAAAAAAfgAAAAAAegAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACTQAAAAABXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAAAcAAAAAAAcAAAAAAAcAAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAKAAAAAABHwAAAAADHwAAAAADHwAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAAAcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAXQAAAAABEQAAAAAAXQAAAAADKAAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAACcAAAAAACcAAAAAACcAAAAAACcAAAAAACcAAAAAABcAAAAAADcAAAAAACHwAAAAAAXQAAAAAAEQAAAAAAEQAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAADfgAAAAAAcAAAAAADcAAAAAAAcAAAAAAAcAAAAAADcAAAAAACcAAAAAADcAAAAAABfgAAAAAAXQAAAAABEQAAAAAAXQAAAAAAaAAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAB + tiles: HwAAAAACHwAAAAADHwAAAAABHwAAAAADfgAAAAAAeQAAAAAAeQAAAAAAfgAAAAAATQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAATQAAAAACTQAAAAADTQAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAATQAAAAADTQAAAAADTQAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAATQAAAAAATQAAAAAATQAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAATQAAAAACTQAAAAADTQAAAAADHwAAAAACHwAAAAADfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAADHwAAAAABTQAAAAABTQAAAAAATQAAAAADMgAAAAABMgAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAADHwAAAAAAfgAAAAAATQAAAAABTQAAAAACTQAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACegAAAAACegAAAAADfgAAAAAAegAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABTQAAAAACXQAAAAADXQAAAAABXQAAAAADfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABegAAAAAAegAAAAAAHwAAAAADegAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAAATQAAAAACXQAAAAABXQAAAAACXQAAAAABfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABegAAAAADegAAAAAAfgAAAAAAegAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABTQAAAAACXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAACcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAKAAAAAADHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAACcAAAAAADcAAAAAABcAAAAAADfgAAAAAAXQAAAAAAEQAAAAAAXQAAAAABKAAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAACcAAAAAABcAAAAAACcAAAAAAAcAAAAAACcAAAAAADcAAAAAAAcAAAAAABHwAAAAABXQAAAAAAEQAAAAAAEQAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAcAAAAAAAcAAAAAADcAAAAAABcAAAAAABcAAAAAAAcAAAAAADcAAAAAAAfgAAAAAAXQAAAAADEQAAAAAAXQAAAAABaAAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAD version: 6 -3,-2: ind: -3,-2 - tiles: ZAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAADHwAAAAADKAAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAACKAAAAAACXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAADKAAAAAACXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAABegAAAAADegAAAAAAegAAAAACegAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAADegAAAAADegAAAAACegAAAAACfgAAAAAATQAAAAADTQAAAAABTQAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAAAegAAAAACegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAAAegAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAA + tiles: ZAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAKAAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABKAAAAAADXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABKAAAAAADXQAAAAACXQAAAAACXQAAAAADfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACegAAAAADegAAAAAAegAAAAACegAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAADegAAAAABegAAAAACegAAAAADegAAAAAAfgAAAAAATQAAAAABTQAAAAADTQAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAAAegAAAAADegAAAAADegAAAAABegAAAAABegAAAAAAegAAAAAAegAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAA version: 6 -3,-1: ind: -3,-1 - tiles: fgAAAAAAfAAAAAADfAAAAAAAegAAAAADegAAAAADegAAAAADfAAAAAAAfAAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAHwAAAAADHwAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAHwAAAAAAHwAAAAABXQAAAAABHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABfgAAAAAAHwAAAAAAHwAAAAADXQAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAADHwAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAATQAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAACHwAAAAABKAAAAAAAKAAAAAADHwAAAAADTQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAATQAAAAABTQAAAAABTQAAAAAC + tiles: fgAAAAAAfAAAAAAAfAAAAAAAegAAAAABegAAAAABegAAAAABfAAAAAABfAAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAHwAAAAABHwAAAAACXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADXQAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAHwAAAAACHwAAAAACXQAAAAABHwAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAADXQAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAABHwAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAATQAAAAABXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAKAAAAAAAKAAAAAACHwAAAAADTQAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAATQAAAAACTQAAAAADTQAAAAAB version: 6 2,-3: ind: 2,-3 - tiles: fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAABAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAABTQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAATQAAAAAATQAAAAAATQAAAAADfgAAAAAAcAAAAAABcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABeQAAAAABcAAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAcAAAAAADeQAAAAAAcAAAAAACcAAAAAABcAAAAAAA + tiles: fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAABegAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAACTQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAATQAAAAAATQAAAAAATQAAAAABfgAAAAAAcAAAAAAAcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACeQAAAAADcAAAAAABfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAcAAAAAACeQAAAAABcAAAAAADcAAAAAACcAAAAAAC version: 6 2,-2: ind: 2,-2 - tiles: XQAAAAAAXQAAAAADXQAAAAABHwAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAADHwAAAAACcAAAAAABcAAAAAACeQAAAAAAcAAAAAAAcAAAAAADcAAAAAAAXQAAAAABXQAAAAABXQAAAAACHwAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAcAAAAAABeQAAAAAAcAAAAAACcAAAAAACcAAAAAAAXQAAAAAAXQAAAAACXQAAAAAAHwAAAAAAXQAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAAAcAAAAAADcAAAAAACeQAAAAADcAAAAAAAcAAAAAADdQAAAAADXQAAAAACXQAAAAACXQAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAcAAAAAACeQAAAAABcAAAAAADcAAAAAADdQAAAAADXQAAAAACXQAAAAADXQAAAAADHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAACcAAAAAACcAAAAAACeQAAAAABcAAAAAAAcAAAAAABdQAAAAADHwAAAAABHwAAAAADHwAAAAADHwAAAAACfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAcAAAAAAAcAAAAAABcAAAAAACcAAAAAACcAAAAAABPAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACfgAAAAAAcAAAAAAAcAAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAADcAAAAAABcAAAAAABfgAAAAAAcAAAAAABcAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAABcAAAAAADcAAAAAABeQAAAAAAeQAAAAABeQAAAAADcAAAAAABcAAAAAAAcAAAAAACeQAAAAAAcAAAAAAAfgAAAAAAKAAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAcAAAAAABcAAAAAACcAAAAAADcAAAAAADcAAAAAACfgAAAAAAcAAAAAACeQAAAAAAcAAAAAADfgAAAAAAHwAAAAABfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAADcAAAAAADcAAAAAACHwAAAAACcAAAAAABcAAAAAABcAAAAAADcAAAAAACcAAAAAABcAAAAAADcAAAAAADcAAAAAACcAAAAAABcAAAAAABfgAAAAAAcAAAAAABeQAAAAADcAAAAAADfgAAAAAAXQAAAAACcAAAAAABeQAAAAABeQAAAAABeQAAAAADeQAAAAACeQAAAAAAeQAAAAACeQAAAAADeQAAAAACcAAAAAAAfgAAAAAAcAAAAAABeQAAAAADcAAAAAABfgAAAAAAfgAAAAAAcAAAAAADeQAAAAADcAAAAAAAcAAAAAABcAAAAAACcAAAAAABcAAAAAABcAAAAAACeQAAAAACeQAAAAABcAAAAAADcAAAAAAAeQAAAAADcAAAAAADcAAAAAAAcAAAAAADcAAAAAABeQAAAAABeQAAAAABeQAAAAACeQAAAAACeQAAAAADeQAAAAAAeQAAAAADeQAAAAAAcAAAAAABfgAAAAAAcAAAAAABeQAAAAABcAAAAAAAcAAAAAACcAAAAAADcAAAAAACcAAAAAABcAAAAAACcAAAAAADcAAAAAABcAAAAAAAcAAAAAACcAAAAAABcAAAAAACcAAAAAADfgAAAAAAcAAAAAACcAAAAAADcAAAAAADcAAAAAAAcAAAAAAA + tiles: XQAAAAACXQAAAAAAXQAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAAHwAAAAADcAAAAAACcAAAAAAAeQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAXQAAAAAAXQAAAAACXQAAAAACHwAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAcAAAAAABeQAAAAABcAAAAAAAcAAAAAACcAAAAAABXQAAAAADXQAAAAABXQAAAAABHwAAAAABXQAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAABcAAAAAABcAAAAAAAeQAAAAABcAAAAAACcAAAAAACdQAAAAACXQAAAAAAXQAAAAAAXQAAAAACHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAcAAAAAADeQAAAAAAcAAAAAADcAAAAAAAdQAAAAABXQAAAAADXQAAAAAAXQAAAAADHwAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAcAAAAAABcAAAAAADeQAAAAADcAAAAAACcAAAAAAAdQAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAADHwAAAAACfgAAAAAAcAAAAAACcAAAAAAAcAAAAAAAcAAAAAABcAAAAAACPAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAcAAAAAAAcAAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAcAAAAAADcAAAAAABcAAAAAADcAAAAAAAcAAAAAACfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADcAAAAAACcAAAAAADeQAAAAACeQAAAAADeQAAAAACcAAAAAABcAAAAAAAcAAAAAAAeQAAAAACcAAAAAADfgAAAAAAKAAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAcAAAAAADcAAAAAACcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAADeQAAAAABcAAAAAACfgAAAAAAHwAAAAADfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAAAcAAAAAADcAAAAAABHwAAAAADcAAAAAADcAAAAAADcAAAAAADcAAAAAADcAAAAAABcAAAAAABcAAAAAADcAAAAAADcAAAAAABcAAAAAACfgAAAAAAcAAAAAACeQAAAAADcAAAAAADfgAAAAAAXQAAAAACcAAAAAACeQAAAAACeQAAAAACeQAAAAACeQAAAAACeQAAAAABeQAAAAADeQAAAAACeQAAAAACcAAAAAACfgAAAAAAcAAAAAABeQAAAAAAcAAAAAADfgAAAAAAfgAAAAAAcAAAAAACeQAAAAADcAAAAAAAcAAAAAADcAAAAAABcAAAAAABcAAAAAACcAAAAAACeQAAAAABeQAAAAABcAAAAAABcAAAAAADeQAAAAADcAAAAAAAcAAAAAADcAAAAAABcAAAAAAAeQAAAAACeQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAADeQAAAAAAeQAAAAAAcAAAAAABfgAAAAAAcAAAAAACeQAAAAADcAAAAAACcAAAAAACcAAAAAADcAAAAAABcAAAAAACcAAAAAACcAAAAAACcAAAAAABcAAAAAABcAAAAAACcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAcAAAAAACcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAA version: 6 3,-3: ind: 3,-3 - tiles: fgAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAACegAAAAADfgAAAAAAegAAAAABfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAegAAAAABegAAAAADfgAAAAAAegAAAAACegAAAAABegAAAAABQAAAAAAAegAAAAABegAAAAAAegAAAAABZAAAAAAAZAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAegAAAAABegAAAAABfgAAAAAAegAAAAACegAAAAADfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAADZAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAegAAAAABegAAAAADegAAAAABegAAAAADegAAAAADfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAACZAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACZAAAAAAAfgAAAAAAXQAAAAADZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAZAAAAAAAZAAAAAAAXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAXQAAAAACZAAAAAAAZAAAAAAAXQAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAZAAAAAAAXQAAAAABZAAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAcAAAAAACcAAAAAABcAAAAAABcAAAAAACcAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAA + tiles: fgAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAACfgAAAAAAegAAAAADfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAegAAAAABegAAAAABfgAAAAAAegAAAAABegAAAAAAegAAAAAAQAAAAAAAegAAAAAAegAAAAAAegAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAegAAAAACegAAAAACfgAAAAAAegAAAAACegAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAegAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAegAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAADZAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAABZAAAAAAAfgAAAAAAXQAAAAACZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADZAAAAAAAZAAAAAAAXQAAAAACfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAXQAAAAACZAAAAAAAZAAAAAAAXQAAAAABZAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAZAAAAAAAXQAAAAABZAAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAcAAAAAACcAAAAAADcAAAAAAAcAAAAAAAcAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAA version: 6 3,-2: ind: 3,-2 - tiles: cAAAAAADcAAAAAADcAAAAAADeQAAAAAAcAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAcAAAAAAAcAAAAAACcAAAAAADeQAAAAABcAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfQAAAAAAdQAAAAABdQAAAAADcAAAAAAAeQAAAAAAcAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfQAAAAAAdQAAAAACdQAAAAACcAAAAAAAeQAAAAAAcAAAAAADfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAdQAAAAAAdQAAAAAAcAAAAAABeQAAAAADcAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAcAAAAAACcAAAAAACcAAAAAACeQAAAAACcAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAcAAAAAADcAAAAAACcAAAAAABcAAAAAADcAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAKAAAAAADKAAAAAABKAAAAAABKAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAKAAAAAACKAAAAAADKAAAAAACKAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAXQAAAAAATQAAAAAAXQAAAAADXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAcAAAAAADcAAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAACcAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAADcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAA + tiles: cAAAAAACcAAAAAABcAAAAAACeQAAAAACcAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAcAAAAAADcAAAAAABcAAAAAACeQAAAAADcAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAdQAAAAADdQAAAAAAcAAAAAACeQAAAAAAcAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAfQAAAAAAdQAAAAADdQAAAAABcAAAAAABeQAAAAADcAAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAdQAAAAAAdQAAAAABcAAAAAACeQAAAAABcAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAcAAAAAADcAAAAAACcAAAAAADeQAAAAACcAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAABcAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAKAAAAAACKAAAAAADKAAAAAADKAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAKAAAAAAAKAAAAAADKAAAAAADKAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAKAAAAAABKAAAAAABKAAAAAAAKAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAXQAAAAADTQAAAAAAXQAAAAABXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAACcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAACcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAA version: 6 2,-1: ind: 2,-1 - tiles: fgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAeQAAAAAAeQAAAAABeQAAAAAAcAAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAAAcAAAAAADcAAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAADfgAAAAAAcAAAAAABcAAAAAAAcAAAAAACfgAAAAAAXQAAAAADcAAAAAAAcAAAAAABcAAAAAADcAAAAAAAcAAAAAADfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAACHwAAAAAAcAAAAAACeQAAAAAAcAAAAAACfgAAAAAAXQAAAAAAcAAAAAADcAAAAAAAcAAAAAACcAAAAAABcAAAAAADfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAADfgAAAAAAcAAAAAAAeQAAAAABcAAAAAABfgAAAAAAXQAAAAACfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAeQAAAAABcAAAAAADfgAAAAAAXQAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAcAAAAAABeQAAAAAAcAAAAAACfgAAAAAAcAAAAAADHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADcAAAAAABeQAAAAAAcAAAAAAAcAAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAcAAAAAADcAAAAAABcAAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbQAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAA + tiles: fgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAeQAAAAADeQAAAAABeQAAAAAAcAAAAAACfgAAAAAAcAAAAAAAcAAAAAACcAAAAAACcAAAAAACcAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAcAAAAAADcAAAAAADcAAAAAADfgAAAAAAXQAAAAABcAAAAAAAcAAAAAADcAAAAAABcAAAAAABcAAAAAABfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAACHwAAAAABcAAAAAACeQAAAAACcAAAAAACfgAAAAAAXQAAAAACcAAAAAACcAAAAAABcAAAAAAAcAAAAAAAcAAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAAAfgAAAAAAcAAAAAADeQAAAAADcAAAAAACfgAAAAAAXQAAAAACfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABeQAAAAACcAAAAAACfgAAAAAAXQAAAAABHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAcAAAAAADeQAAAAADcAAAAAAAfgAAAAAAcAAAAAADHwAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADcAAAAAADeQAAAAAAcAAAAAABcAAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbQAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAD version: 6 3,-1: ind: 3,-1 - tiles: cAAAAAADfgAAAAAAcAAAAAADAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAcAAAAAACcAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAABcAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAACcAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAcAAAAAABcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAABcAAAAAABXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAAAcAAAAAACXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: cAAAAAADfgAAAAAAcAAAAAACAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAcAAAAAADcAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAAAcAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAACcAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAACcAAAAAAAXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAAAcAAAAAABXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-4: ind: 1,-4 @@ -195,11 +195,11 @@ entities: version: 6 -4,-1: ind: -4,-1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbgAAAAACbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbgAAAAABfgAAAAAAbgAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAABLwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAABfgAAAAAAHwAAAAAALwAAAAACfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAABLwAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAADfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAACfgAAAAAAHwAAAAABLwAAAAAB + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbgAAAAAAbgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbgAAAAADfgAAAAAAbgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAHwAAAAACLwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAACLwAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAHwAAAAACLwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAACfgAAAAAAHwAAAAACLwAAAAAC version: 6 -4,-2: ind: -4,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAA version: 6 -6,-1: ind: -6,-1 @@ -211,7 +211,7 @@ entities: version: 6 -4,0: ind: -4,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAABcAAAAAABfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAACLwAAAAABHwAAAAADLwAAAAABHwAAAAADLwAAAAAAHwAAAAADLwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADTQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACfgAAAAAAOAAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAABcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAOAAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADcAAAAAADcAAAAAABfgAAAAAAOAAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAKAAAAAABHwAAAAABfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADKAAAAAACKAAAAAABKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAACcAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAADLwAAAAAAHwAAAAABLwAAAAABHwAAAAADLwAAAAACHwAAAAABLwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADTQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAOAAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAABcAAAAAACfgAAAAAAOAAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAABcAAAAAABfgAAAAAAOAAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAADHwAAAAADKAAAAAADHwAAAAACfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAbQAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAKAAAAAADKAAAAAADKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAACHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAA version: 6 -4,-3: ind: -4,-3 @@ -219,15 +219,15 @@ entities: version: 6 0,-4: ind: 0,-4 - tiles: XQAAAAACXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAVgAAAAADVAAAAAADVAAAAAAAVAAAAAACVAAAAAABVAAAAAAAVAAAAAACVAAAAAACVgAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWQAAAAACWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAADWQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAABbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAA + tiles: XQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAVgAAAAAAVAAAAAAAVAAAAAACVAAAAAAAVAAAAAAAVAAAAAABVAAAAAABVAAAAAAAVgAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWQAAAAACWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAA version: 6 -1,-4: ind: -1,-4 - tiles: fQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABfgAAAAAAJAAAAAABHwAAAAADHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAADegAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAC + tiles: fQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAJAAAAAABHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAegAAAAACegAAAAABegAAAAABegAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAegAAAAADegAAAAAAegAAAAABegAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAAD version: 6 -2,-4: ind: -2,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAA version: 6 -1,-6: ind: -1,-6 @@ -235,23 +235,23 @@ entities: version: 6 0,-5: ind: 0,-5 - tiles: fgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAWQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWQAAAAADVAAAAAADWQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAWQAAAAACVAAAAAAAWQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAVAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWQAAAAACWQAAAAACWQAAAAACVAAAAAAAWQAAAAACWQAAAAABWQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAVgAAAAAAVAAAAAADVAAAAAADVAAAAAACVAAAAAAAVAAAAAABVAAAAAACVAAAAAACVgAAAAADDAAAAAADDAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWQAAAAADVAAAAAABWQAAAAABfgAAAAAAWQAAAAACVAAAAAAAWQAAAAABfgAAAAAADAAAAAAADAAAAAAAXQAAAAABXQAAAAABXQAAAAADBwAAAAAAfgAAAAAAfgAAAAAAWQAAAAACVAAAAAADWQAAAAABMQAAAAAAWQAAAAAAVAAAAAABWQAAAAABfgAAAAAADAAAAAACDAAAAAADXQAAAAACXQAAAAADXQAAAAAABwAAAAAAfgAAAAAAfgAAAAAAWQAAAAAAVAAAAAADWQAAAAADMQAAAAAAWQAAAAAAVAAAAAACWQAAAAABfgAAAAAADAAAAAACDAAAAAAAXQAAAAABXQAAAAADXQAAAAAABwAAAAAAfgAAAAAAfgAAAAAAWQAAAAAAVAAAAAACWQAAAAAAMQAAAAAAWQAAAAAAVAAAAAADWQAAAAADfgAAAAAADAAAAAABDAAAAAACXQAAAAADXQAAAAADXQAAAAAABwAAAAAAfgAAAAAAfgAAAAAAWQAAAAAAVAAAAAADWQAAAAADMQAAAAAAWQAAAAAAVAAAAAACWQAAAAACfgAAAAAADAAAAAACDAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWQAAAAACVAAAAAADWQAAAAAAfgAAAAAAWQAAAAAAVAAAAAACWQAAAAACfgAAAAAA + tiles: fgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAWQAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWQAAAAAAVAAAAAADWQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAWQAAAAAAVAAAAAACWQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAVAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWQAAAAADWQAAAAACWQAAAAADVAAAAAACWQAAAAABWQAAAAACWQAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAVgAAAAABVAAAAAAAVAAAAAADVAAAAAABVAAAAAAAVAAAAAACVAAAAAABVAAAAAABVgAAAAAADAAAAAABDAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWQAAAAADVAAAAAADWQAAAAACfgAAAAAAWQAAAAAAVAAAAAADWQAAAAAAfgAAAAAADAAAAAAADAAAAAACXQAAAAACXQAAAAAAXQAAAAABBwAAAAAAfgAAAAAAfgAAAAAAWQAAAAABVAAAAAAAWQAAAAABMQAAAAAAWQAAAAABVAAAAAACWQAAAAACfgAAAAAADAAAAAADDAAAAAABXQAAAAACXQAAAAACXQAAAAADBwAAAAAAfgAAAAAAfgAAAAAAWQAAAAAAVAAAAAAAWQAAAAACMQAAAAAAWQAAAAADVAAAAAACWQAAAAACfgAAAAAADAAAAAADDAAAAAADXQAAAAACXQAAAAAAXQAAAAADBwAAAAAAfgAAAAAAfgAAAAAAWQAAAAACVAAAAAAAWQAAAAADMQAAAAAAWQAAAAAAVAAAAAABWQAAAAABfgAAAAAADAAAAAABDAAAAAADXQAAAAACXQAAAAACXQAAAAABBwAAAAAAfgAAAAAAfgAAAAAAWQAAAAAAVAAAAAACWQAAAAAAMQAAAAAAWQAAAAACVAAAAAACWQAAAAABfgAAAAAADAAAAAAADAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWQAAAAABVAAAAAAAWQAAAAAAfgAAAAAAWQAAAAACVAAAAAABWQAAAAACfgAAAAAA version: 6 -3,-3: ind: -3,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAADfgAAAAAAfgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -1,1: ind: -1,1 - tiles: XQAAAAACXQAAAAAAXQAAAAABegAAAAACegAAAAABegAAAAABegAAAAAAegAAAAADegAAAAADegAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAABegAAAAACegAAAAACegAAAAABegAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAegAAAAABegAAAAADegAAAAACegAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAADegAAAAACegAAAAACegAAAAABegAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAegAAAAACegAAAAAAegAAAAADegAAAAACHwAAAAABHwAAAAABHwAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAegAAAAADegAAAAABegAAAAABegAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADTQAAAAAATQAAAAABfgAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACTgAAAAADXQAAAAAAbQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACHwAAAAABHwAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAADXQAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAACHwAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAA + tiles: XQAAAAAAXQAAAAABXQAAAAADegAAAAACegAAAAABegAAAAADegAAAAACegAAAAACegAAAAABegAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAegAAAAABegAAAAAAegAAAAACegAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAegAAAAACegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAADegAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAegAAAAADegAAAAAAegAAAAADegAAAAABHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAADfgAAAAAAegAAAAACegAAAAADegAAAAABegAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABTQAAAAACTQAAAAACfgAAAAAAegAAAAADegAAAAAAegAAAAACegAAAAABHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAACTgAAAAAAXQAAAAACbQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAHwAAAAACHwAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADHwAAAAABHwAAAAABHwAAAAACHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAACXQAAAAAB version: 6 3,0: ind: 3,0 - tiles: XQAAAAABXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAADXQAAAAACXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,1: ind: 0,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAegAAAAADegAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAAegAAAAADegAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAACegAAAAAAegAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATQAAAAACXQAAAAACXQAAAAACXQAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACHwAAAAAAHwAAAAADHwAAAAACXQAAAAABHwAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAATQAAAAABXQAAAAAAXQAAAAACHwAAAAACfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADHwAAAAABfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAegAAAAAAegAAAAABfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAegAAAAADegAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABHwAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAegAAAAABegAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATQAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAHwAAAAACHwAAAAADHwAAAAABXQAAAAACHwAAAAACHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAATQAAAAADXQAAAAACXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACHwAAAAABfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAA version: 6 0,-6: ind: 0,-6 @@ -259,15 +259,15 @@ entities: version: 6 -1,-5: ind: -1,-5 - tiles: fQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACDAAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAMXQAAAAACXQAAAAABXQAAAAAADAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAFXQAAAAABXQAAAAABXQAAAAACDAAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAAXQAAAAACXQAAAAABXQAAAAACDAAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAAXQAAAAABXQAAAAAAXQAAAAADDAAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABDAAAAAAD + tiles: fQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAADAAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAAXQAAAAADXQAAAAAAXQAAAAAADAAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAEXQAAAAACXQAAAAACXQAAAAAADAAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAAXQAAAAABXQAAAAACXQAAAAADDAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAABwAAAAAAXQAAAAADXQAAAAADXQAAAAACDAAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACDAAAAAAC version: 6 1,1: ind: 1,1 - tiles: XQAAAAACXQAAAAABfgAAAAAATQAAAAABTQAAAAADfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAATQAAAAACTQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABTQAAAAADTQAAAAADfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAABXQAAAAACfgAAAAAATQAAAAADTQAAAAABfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAATQAAAAACTQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABTQAAAAACTQAAAAABfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,1: ind: 2,1 - tiles: fgAAAAAAfgAAAAAAJgAAAAABJgAAAAAAJgAAAAAAJgAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAegAAAAAAegAAAAAAegAAAAAAXQAAAAABXQAAAAACbAAAAAAAfgAAAAAAJgAAAAABLwAAAAABLwAAAAADLwAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAJgAAAAACLwAAAAABLwAAAAADLwAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADTQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAAATQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACTQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAJgAAAAADJgAAAAAAJgAAAAAAJgAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAegAAAAACegAAAAACegAAAAABXQAAAAAAXQAAAAADbAAAAAAAfgAAAAAAJgAAAAADLwAAAAACLwAAAAACLwAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAJgAAAAABLwAAAAABLwAAAAACLwAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAABTQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACTQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACTQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 4,-2: ind: 4,-2 @@ -283,27 +283,27 @@ entities: version: 6 2,0: ind: 2,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAegAAAAADegAAAAAAegAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAegAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAegAAAAABegAAAAACegAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABXQAAAAABXQAAAAABXQAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAACfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACfgAAAAAAegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAA version: 6 3,1: ind: 3,1 - tiles: XQAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAAAXQAAAAACaAAAAAACXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAADAAAAAAADAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAADXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACaAAAAAABXQAAAAAAaAAAAAAAXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAADDAAAAAABDAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -3,1: ind: -3,1 - tiles: aAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAABbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAPwAAAAAAPwAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAegAAAAAAegAAAAAAegAAAAABHwAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAPwAAAAAAPwAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAegAAAAADegAAAAACegAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAPwAAAAAAPwAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAPwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABegAAAAACegAAAAADegAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABTgAAAAABXQAAAAABTgAAAAACXQAAAAABTgAAAAABXQAAAAACTgAAAAADXQAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAA + tiles: aAAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAACbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAPwAAAAAAPwAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAegAAAAABegAAAAABegAAAAAAHwAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAPwAAAAAAPwAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAegAAAAAAegAAAAACegAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAPwAAAAAAPwAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAPwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAegAAAAAAegAAAAADegAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAATgAAAAABXQAAAAACTgAAAAACXQAAAAACTgAAAAABXQAAAAACTgAAAAADXQAAAAABegAAAAABegAAAAABegAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAA version: 6 -4,1: ind: -4,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACegAAAAABegAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAADfgAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABZAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAXQAAAAAATgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAZAAAAAAAXQAAAAAAfgAAAAAAXQAAAAABegAAAAABegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADegAAAAACegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABfgAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADZAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAXQAAAAACTgAAAAADfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAZAAAAAAAXQAAAAADfgAAAAAAXQAAAAACegAAAAACegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAA version: 6 -2,1: ind: -2,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAegAAAAABegAAAAAAegAAAAABegAAAAAAegAAAAAAHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAbQAAAAAAHwAAAAADegAAAAADegAAAAABegAAAAADegAAAAABegAAAAADHwAAAAADHwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAADbQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAACegAAAAADHwAAAAABfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAACXQAAAAAALgAAAAAALgAAAAAAfgAAAAAAHwAAAAADegAAAAABegAAAAACegAAAAACegAAAAACegAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAHwAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAADegAAAAABHwAAAAACHwAAAAABIwAAAAAAHwAAAAADIwAAAAAAfgAAAAAAXQAAAAADLgAAAAAALgAAAAAAfgAAAAAAHwAAAAADegAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAABHwAAAAAAfgAAAAAAIwAAAAADHwAAAAACIwAAAAACfgAAAAAAXQAAAAABLgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAATgAAAAACXQAAAAABTgAAAAADXQAAAAABTgAAAAAAXQAAAAACTgAAAAABXQAAAAACTgAAAAACXQAAAAADTgAAAAABXQAAAAACTgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAABfgAAAAAATQAAAAAATQAAAAABTQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADegAAAAABegAAAAACegAAAAADegAAAAADegAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAbQAAAAAAHwAAAAABegAAAAABegAAAAAAegAAAAADegAAAAACegAAAAACHwAAAAACHwAAAAABQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABbQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABegAAAAACegAAAAADegAAAAADegAAAAAAegAAAAAAHwAAAAABfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAHwAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAABegAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXQAAAAAALgAAAAAALgAAAAAAfgAAAAAAHwAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAADHwAAAAABHwAAAAACIwAAAAAAHwAAAAAAIwAAAAACfgAAAAAAXQAAAAADLgAAAAAALgAAAAAAfgAAAAAAHwAAAAACegAAAAABegAAAAABegAAAAADegAAAAADegAAAAADHwAAAAAAfgAAAAAAIwAAAAAAHwAAAAACIwAAAAAAfgAAAAAAXQAAAAABLgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACTgAAAAAAXQAAAAABTgAAAAACXQAAAAAATgAAAAAAXQAAAAADTgAAAAADXQAAAAAATgAAAAADXQAAAAAATgAAAAABXQAAAAACTgAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAACfgAAAAAATQAAAAABTQAAAAAATQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -2,2: ind: -2,2 - tiles: fgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAATwAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAATwAAAAAAHwAAAAACTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAACfgAAAAAAHwAAAAADHwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAACfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUQAAAAAA + tiles: fgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAATwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAATwAAAAAAHwAAAAACTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAADfgAAAAAAHwAAAAADHwAAAAADTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAACfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUQAAAAAA version: 6 -1,3: ind: -1,3 @@ -311,7 +311,7 @@ entities: version: 6 -1,2: ind: -1,2 - tiles: XQAAAAABXQAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAADbAAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAAAbAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABbAAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXQAAAAAAbAAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXQAAAAAAXQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: XQAAAAABXQAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAACbAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAADbAAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABbAAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXQAAAAADbAAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXQAAAAADXQAAAAADbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -3,2: ind: -3,2 @@ -331,23 +331,23 @@ entities: version: 6 0,2: ind: 0,2 - tiles: bAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAXQAAAAACXQAAAAABbQAAAAAAbQAAAAAAbQAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA + tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAXQAAAAADXQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACbQAAAAAAbQAAAAAAbQAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA version: 6 -4,2: ind: -4,2 - tiles: AAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAA version: 6 -4,3: ind: -4,3 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAXQAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAXQAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAXQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAXQAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAXQAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAXQAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -5,1: ind: -5,1 - tiles: AAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAADHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAHwAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -5,0: ind: -5,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 2,-5: ind: 2,-5 @@ -403,11 +403,11 @@ entities: version: 6 -6,1: ind: -6,1 - tiles: HwAAAAACHwAAAAABHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAHwAAAAAAHwAAAAADHwAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAfgAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: HwAAAAAAHwAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAHwAAAAAAHwAAAAADHwAAAAADBgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHwAAAAACHwAAAAACHwAAAAABfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAfgAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -7,1: ind: -7,1 - tiles: QAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAIwAAAAAAIwAAAAACIwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAIwAAAAAAOAAAAAAAOAAAAAAAIwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAOAAAAAAAIwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAADfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAfgAAAAAAOAAAAAAAIwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAADIwAAAAABIwAAAAABIwAAAAACIwAAAAADOAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAOAAAAAAAIwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAIwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAABIwAAAAADIwAAAAAAIwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: QAAAAAAAQAAAAAAAQAAAAAAAHwAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAABHwAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAACHwAAAAABQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAACQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAABfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAIwAAAAADIwAAAAADIwAAAAABHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAIwAAAAAAOAAAAAAAOAAAAAAAIwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAOAAAAAAAIwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAfgAAAAAAOAAAAAAAIwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAADIwAAAAACIwAAAAABIwAAAAAAIwAAAAACOAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAABfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAOAAAAAAAIwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAOAAAAAAAOAAAAAAAOAAAAAAAIwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAACIwAAAAABIwAAAAADIwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -6,0: ind: -6,0 @@ -415,23 +415,23 @@ entities: version: 6 -7,0: ind: -7,0 - tiles: fQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAACHwAAAAADfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAABHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACHwAAAAABHwAAAAADEQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADEQAAAAAAHwAAAAABEQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAADJAAAAAAAHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACEQAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACEQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAA + tiles: fQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAABHwAAAAACfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAABHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAHwAAAAACHwAAAAAAEQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAEQAAAAAAHwAAAAABEQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHwAAAAADJAAAAAAAHwAAAAACHwAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAEQAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADEQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -8,0: ind: -8,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfQAAAAAAAAAAAAAAfgAAAAAAEQAAAAAAHwAAAAADHwAAAAACAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACJAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAEQAAAAAAHwAAAAAAHwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfQAAAAAAAAAAAAAAfgAAAAAAEQAAAAAAHwAAAAABHwAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfQAAAAAAAAAAAAAAfgAAAAAAEQAAAAAAHwAAAAACEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAABAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAADfQAAAAAAfQAAAAAAfgAAAAAAEQAAAAAAHwAAAAADEQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAEQAAAAAAHwAAAAADHwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAB version: 6 -8,1: ind: -8,1 - tiles: AAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAACQAAAAAAAQAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADQAAAAAAAQAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAHwAAAAACHwAAAAABHwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACIwAAAAADIwAAAAACIwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACIwAAAAACOAAAAAAAOAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACIwAAAAADOAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADIwAAAAADOAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfgAAAAAAfgAAAAAAOAAAAAAAIwAAAAABIwAAAAABIwAAAAAAIwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABIwAAAAAAOAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABIwAAAAADOAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADIwAAAAADIwAAAAABIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAB + tiles: AAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAHwAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAABQAAAAAAAQAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAABQAAAAAAAQAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADQAAAAAAAQAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACIwAAAAACIwAAAAACIwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABIwAAAAABOAAAAAAAOAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACIwAAAAAAOAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADIwAAAAACOAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAOAAAAAAAIwAAAAAAIwAAAAADIwAAAAADIwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABIwAAAAABOAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADIwAAAAACOAAAAAAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABIwAAAAAAIwAAAAADIwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAA version: 6 -8,2: ind: -8,2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAACHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHwAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -7,2: ind: -7,2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAHwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAHwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAADHwAAAAACfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -7,-1: ind: -7,-1 @@ -443,7 +443,7 @@ entities: version: 6 -5,3: ind: -5,3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -5,2: ind: -5,2 @@ -502,7 +502,6 @@ entities: 394: -4,15 395: -4,16 558: 49,-1 - 701: 41,6 1042: -3,-64 1043: -3,-71 3044: -19,29 @@ -519,6 +518,9 @@ entities: 3690: -39,-8 3736: 8,43 3737: 8,51 + 4104: 54,9 + 4129: 41,7 + 4130: 43,5 - node: color: '#FFFFFFFF' id: Arrows @@ -532,7 +534,6 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 557: 49,3 748: -62,40 1044: 3,-71 1045: 3,-64 @@ -542,6 +543,8 @@ entities: 3691: -40,-4 3734: -8,51 3735: -8,43 + 4105: 54,7 + 4131: 45,5 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -706,6 +709,7 @@ entities: decals: 3688: 51,-24 3689: 47,-21 + 4132: 41,5 - node: color: '#52B4E996' id: BotGreyscale @@ -714,6 +718,11 @@ entities: 3294: -14,39 3671: 49,-9 3672: 48,-9 + - node: + color: '#FFFFFFFF' + id: BotGreyscale + decals: + 4186: 43,3 - node: color: '#DE3A3AFF' id: BotLeft @@ -2414,7 +2423,6 @@ entities: 1785: -23,26 1951: -41,-5 2548: 41,-35 - 2900: 42,6 2901: -18,26 3037: 0,30 3048: 23,3 @@ -2423,30 +2431,15 @@ entities: 3303: -17,47 3304: -18,48 3305: -16,48 - 3381: 17,-21 - 3382: 16,-21 - 3383: 15,-21 3384: 1,-27 3385: 0,-27 3386: -1,-27 3387: -1,-22 3388: 0,-22 3389: 1,-22 - 3398: -13,-25 - 3399: -13,-24 - 3400: -13,-23 - 3401: -19,7 - 3402: -19,8 - 3403: -19,9 - 3404: -13,7 - 3405: -13,8 - 3406: -13,9 3425: 18,7 3426: 18,8 3427: 18,9 - 3428: 14,7 - 3429: 14,8 - 3430: 14,9 3431: 18,23 3432: 18,24 3433: 18,25 @@ -2468,6 +2461,17 @@ entities: 3548: -4,-56 3549: -4,-55 3550: -4,-54 + 3989: 15,10 + 3990: 16,10 + 3991: 17,10 + 3992: -16,10 + 3993: -17,10 + 3994: -15,10 + 4141: 40,5 + 4142: 53,5 + 4143: 54,5 + 4144: 53,3 + 4145: 54,3 - node: color: '#52B4E996' id: DeliveryGreyscale @@ -2485,6 +2489,16 @@ entities: id: DeliveryGreyscale decals: 1237: -56,1 + - node: + color: '#FFFFFFFF' + id: DeliveryGreyscale + decals: + 4180: 48,5 + 4181: 49,5 + 4182: 49,3 + 4183: 48,3 + 4184: 44,3 + 4185: 45,3 - node: cleanable: True color: '#FFFFFFFF' @@ -2721,7 +2735,6 @@ entities: 578: 51,0 579: 50,0 580: 49,-1 - 581: 49,3 831: -5,-25 832: -4,-25 1628: -39,9 @@ -2746,7 +2759,6 @@ entities: 2764: -59,26 2765: -60,26 2894: 45,9 - 3101: 48,4 3279: -59,20 3280: -59,22 3281: -59,22 @@ -2824,9 +2836,6 @@ entities: 70: -45,9 71: -44,9 72: -45,8 - 73: -20,8 - 76: -12,8 - 77: -13,9 79: -7,9 81: 17,12 82: 16,13 @@ -2839,15 +2848,12 @@ entities: 93: 15,-17 94: 13,-17 95: 17,-9 - 96: 17,-4 - 97: 17,5 98: -37,0 100: -17,-1 101: -17,-2 102: -15,-12 103: -1,-24 104: 0,-28 - 105: 16,-21 106: 19,-30 135: -47,-33 136: -45,-35 @@ -2862,11 +2868,6 @@ entities: 372: 15,-12 373: 15,-11 374: 16,-9 - 375: 17,-2 - 376: 17,0 - 377: 17,1 - 378: 16,2 - 379: 16,-5 409: -26,31 410: -27,30 411: -23,31 @@ -2894,13 +2895,8 @@ entities: 587: 49,-2 588: 51,1 589: 50,1 - 590: 51,2 591: 48,2 592: 47,0 - 593: 44,4 - 594: 49,4 - 595: 43,5 - 596: 43,6 597: 55,12 598: 54,11 599: 53,11 @@ -2908,9 +2904,6 @@ entities: 601: 55,9 602: 49,14 603: 50,13 - 604: 41,6 - 605: 41,5 - 606: 40,5 607: 37,4 608: 36,5 675: -22,25 @@ -3067,22 +3060,14 @@ entities: 2896: 46,8 2897: 44,10 2898: 45,12 - 3105: 45,3 - 3106: 46,3 - 3107: 43,3 - 3108: 42,3 3109: 46,-1 3110: 46,1 3111: 47,2 3112: 48,1 - 3113: 51,4 - 3114: 48,3 3115: 46,2 3116: 40,2 3128: 49,6 3129: 48,7 - 3130: 53,6 - 3131: 45,5 3132: 41,8 3133: 40,9 3134: 39,8 @@ -3156,8 +3141,6 @@ entities: decals: 57: 11,-28 66: 35,-12 - 74: -19,8 - 75: -13,8 78: -7,10 80: 17,13 87: 12,11 @@ -3173,10 +3156,8 @@ entities: 458: -58,21 459: -59,25 582: 50,2 - 583: 50,4 584: 49,0 690: -16,6 - 692: -14,7 833: -3,-25 834: -6,-25 1212: 6,-22 @@ -3205,9 +3186,6 @@ entities: 2700: -64,-10 2701: -62,-9 2702: -60,-12 - 3102: 49,4 - 3103: 44,3 - 3104: 40,3 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -3275,59 +3253,10 @@ entities: 711: 9.393604,3.3875775 968: -0.26651984,-69.93338 3269: 29.924822,-37.81262 - - node: - color: '#00000026' - id: FullTileOverlayGreyscale - decals: - 3601: 15,-7 - 3602: 16,-7 - 3603: 17,-7 - 3604: 17,-6 - 3605: 16,-6 - 3606: 15,-6 - node: color: '#0000004A' id: FullTileOverlayGreyscale decals: - 3607: 17,-5 - 3608: 17,-6 - 3609: 17,-7 - 3610: 16,-7 - 3611: 15,-7 - 3612: 15,-6 - 3613: 16,-6 - 3614: 16,-5 - 3615: 15,-5 - 3616: 15,-4 - 3617: 16,-4 - 3618: 17,-4 - 3619: 17,-3 - 3620: 16,-3 - 3621: 15,-3 - 3622: 15,-2 - 3623: 17,-2 - 3624: 16,-2 - 3625: 16,-1 - 3626: 17,-1 - 3627: 15,-1 - 3628: 15,0 - 3629: 15,1 - 3630: 15,2 - 3631: 15,3 - 3632: 15,4 - 3633: 16,4 - 3634: 17,4 - 3635: 17,3 - 3636: 16,3 - 3637: 16,2 - 3638: 17,2 - 3639: 17,1 - 3640: 16,1 - 3641: 16,0 - 3642: 17,0 - 3643: 17,5 - 3644: 16,5 - 3645: 15,5 3646: 17,-8 3647: 16,-8 3648: 15,-8 @@ -3367,9 +3296,6 @@ entities: id: FullTileOverlayGreyscale decals: 528: 48,15 - 535: 42,6 - 536: 42,5 - 547: 44,4 548: 47,8 549: 47,7 3049: 37,3 @@ -3381,8 +3307,10 @@ entities: 3055: 38,2 3056: 37,2 3057: 36,2 - 3117: 49,5 - 3118: 48,5 + 4176: 48,3 + 4177: 49,3 + 4178: 49,5 + 4179: 48,5 - node: color: '#D0BF4AA7' id: FullTileOverlayGreyscale @@ -3667,9 +3595,8 @@ entities: color: '#A4610696' id: HalfTileOverlayGreyscale180 decals: - 541: 44,5 - 542: 45,5 554: 47,12 + 4138: 40,5 - node: color: '#D381C93E' id: HalfTileOverlayGreyscale180 @@ -3752,8 +3679,6 @@ entities: color: '#A4610696' id: HalfTileOverlayGreyscale270 decals: - 538: 43,6 - 539: 43,7 540: 43,8 550: 48,7 551: 48,8 @@ -3776,10 +3701,6 @@ entities: id: HalfTileOverlayGreyscale270 decals: 163: -39,-24 - 174: 15,-2 - 175: 15,-1 - 176: 15,0 - 177: 15,-4 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -3849,8 +3770,6 @@ entities: color: '#A4610696' id: HalfTileOverlayGreyscale90 decals: - 529: 41,5 - 530: 41,6 531: 41,7 532: 41,8 533: 41,9 @@ -3858,6 +3777,7 @@ entities: 544: 46,6 545: 46,7 546: 46,8 + 4107: 41,6 - node: color: '#D381C996' id: HalfTileOverlayGreyscale90 @@ -3903,6 +3823,12 @@ entities: 3929: 41,-29 3930: 41,-30 3931: 41,-31 + - node: + angle: 3.141592653589793 rad + color: '#9FED5896' + id: LoadingArea + decals: + 4150: 58,3 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -3915,7 +3841,7 @@ entities: id: LoadingArea decals: 556: 54,11 - 700: 43,6 + 4128: 43,7 - node: color: '#FFFFFFFF' id: LoadingArea @@ -4087,6 +4013,22 @@ entities: 2670: 30,26 2671: 31,26 2848: 19,26 + - node: + color: '#8D1C9996' + id: QuarterTileOverlayGreyscale + decals: + 4161: 51,2 + 4162: 50,2 + 4163: 49,2 + 4164: 48,2 + 4165: 47,2 + 4166: 46,2 + 4167: 45,2 + 4168: 44,2 + 4169: 43,2 + 4170: 42,2 + 4171: 41,2 + 4172: 40,2 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale @@ -4101,19 +4043,6 @@ entities: 3058: 37,1 3059: 37,0 3060: 37,-1 - 3075: 51,4 - 3076: 50,4 - 3077: 49,4 - 3078: 48,4 - 3079: 48,3 - 3080: 47,3 - 3081: 46,3 - 3082: 45,3 - 3083: 44,3 - 3084: 43,3 - 3085: 42,3 - 3086: 41,3 - 3087: 40,3 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale @@ -4137,9 +4066,6 @@ entities: color: '#D4D4D428' id: QuarterTileOverlayGreyscale decals: - 178: 15,-5 - 179: 15,-6 - 180: 15,-7 365: 15,-13 366: 15,-12 367: 15,-11 @@ -4182,7 +4108,6 @@ entities: 1400: -9,9 1401: -10,9 1402: -11,9 - 1403: -12,9 1429: -31,25 1430: -29,25 1431: -30,25 @@ -4211,19 +4136,16 @@ entities: 2060: -39,-21 2061: -39,-22 2062: -39,-23 - 2099: -12,-23 2308: -28,9 2309: -29,9 2310: -30,9 2311: -17,5 2312: -17,4 2313: -17,3 - 2314: -18,9 2317: -17,9 2567: 15,12 2568: 15,11 2569: 15,9 - 2571: 15,-22 2572: 15,-23 2575: -17,-23 2600: 15,23 @@ -4254,6 +4176,18 @@ entities: 3597: -17,-54 3598: -18,-54 3599: -19,-54 + 4060: 15,4 + 4061: 15,4 + 4062: 15,3 + 4063: 15,3 + 4064: 15,2 + 4065: 15,2 + 4066: 15,1 + 4067: 15,1 + 4068: 15,0 + 4069: 15,0 + 4094: 15,-2 + 4095: 15,-2 - node: color: '#D4D4D437' id: QuarterTileOverlayGreyscale @@ -4423,6 +4357,14 @@ entities: 648: 41,14 649: 41,15 650: 41,16 + 4113: 39,5 + 4114: 43,5 + 4115: 44,5 + 4116: 45,5 + 4122: 56,6 + 4123: 55,6 + 4124: 54,6 + 4140: 54,5 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 @@ -4449,11 +4391,9 @@ entities: 1503: -15,5 1504: -15,6 1505: -15,7 - 1506: -14,7 1507: 10,7 1508: 9,7 1509: 8,7 - 1603: -12,7 1604: -11,7 1605: -10,7 1606: -9,7 @@ -4491,6 +4431,18 @@ entities: 3570: 21,-25 3571: 20,-25 3572: 19,-25 + 4080: 17,-3 + 4081: 17,-3 + 4082: 17,-4 + 4083: 17,-4 + 4084: 17,-5 + 4085: 17,-5 + 4086: 17,-6 + 4087: 17,-6 + 4088: 17,-7 + 4089: 17,-7 + 4090: 17,-1 + 4091: 17,-1 - node: color: '#D4D4D437' id: QuarterTileOverlayGreyscale180 @@ -4611,12 +4563,10 @@ entities: 645: 36,4 3120: 49,6 3121: 50,6 - 3122: 54,6 3123: 51,6 - 3124: 52,6 - 3125: 53,6 - 3126: 55,6 - 3127: 56,6 + 4117: 52,6 + 4127: 53,6 + 4139: 53,5 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 @@ -4637,9 +4587,6 @@ entities: color: '#D4D4D428' id: QuarterTileOverlayGreyscale270 decals: - 181: 15,2 - 182: 15,3 - 183: 15,4 1095: -5,-56 1096: -6,-56 1097: -7,-56 @@ -4676,7 +4623,6 @@ entities: 1414: -44,23 1415: -44,24 1416: -44,25 - 1437: -20,7 1438: -21,7 1439: -22,7 1440: -23,7 @@ -4693,7 +4639,6 @@ entities: 1458: -32,-25 1459: -31,-25 1510: 12,7 - 1511: 13,7 1617: 1,9 1618: 2,9 1619: 3,9 @@ -4720,9 +4665,7 @@ entities: 2093: -17,-25 2094: -16,-25 2095: -15,-25 - 2096: -14,-25 2318: -17,7 - 2319: -18,7 2559: 15,14 2560: 15,15 2561: 15,16 @@ -4742,6 +4685,18 @@ entities: 2651: -2,-78 2652: -2,-77 2653: -2,-76 + 4050: 15,-3 + 4051: 15,-3 + 4052: 15,-4 + 4053: 15,-4 + 4054: 15,-5 + 4055: 15,-5 + 4056: 15,-6 + 4057: 15,-6 + 4058: 15,-7 + 4059: 15,-7 + 4092: 15,-1 + 4093: 15,-1 - node: color: '#D4D4D437' id: QuarterTileOverlayGreyscale270 @@ -4762,11 +4717,6 @@ entities: decals: 696: -18,-1 697: -18,0 - - node: - color: '#DF81C96C' - id: QuarterTileOverlayGreyscale270 - decals: - 3100: 48,4 - node: color: '#EFB3414A' id: QuarterTileOverlayGreyscale270 @@ -4870,6 +4820,18 @@ entities: 629: 31,9 630: 30,9 631: 29,9 + 4152: 51,2 + 4153: 50,2 + 4154: 49,2 + 4155: 48,2 + 4156: 47,2 + 4157: 46,2 + 4158: 45,2 + 4159: 44,2 + 4160: 43,2 + 4173: 42,2 + 4174: 41,2 + 4175: 40,2 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale90 @@ -4895,8 +4857,6 @@ entities: 1376: -4,-23 1377: -5,-23 1378: -6,-23 - 1381: -13,-23 - 1382: -14,-23 1383: 5,10 1384: 6,10 1385: 7,10 @@ -4907,7 +4867,6 @@ entities: 1390: 10,9 1391: 11,9 1392: 12,9 - 1393: 13,9 1417: -44,25 1418: -43,25 1419: -42,25 @@ -4961,19 +4920,16 @@ entities: 2075: -37,-21 2076: -37,-20 2077: -37,-19 - 2303: -20,9 2304: -21,9 2305: -22,9 2306: -23,9 2307: -24,9 - 2315: -14,9 2316: -15,9 2555: 17,14 2556: 17,13 2557: 17,12 2558: 17,11 2570: 17,9 - 2573: 17,-22 2574: 17,-23 2577: -18,-23 2578: -15,-23 @@ -5002,6 +4958,18 @@ entities: 2643: 1,-39 2644: 1,-40 2645: 1,-41 + 4070: 17,4 + 4071: 17,4 + 4072: 17,3 + 4073: 17,3 + 4074: 17,2 + 4075: 17,2 + 4076: 17,1 + 4077: 17,1 + 4078: 17,0 + 4079: 17,0 + 4096: 17,-2 + 4097: 17,-2 - node: color: '#D4D4D437' id: QuarterTileOverlayGreyscale90 @@ -5069,22 +5037,6 @@ entities: 1635: -8,-15 1636: -8,-14 1637: -8,-13 - - node: - color: '#DF81C96C' - id: QuarterTileOverlayGreyscale90 - decals: - 3088: 40,3 - 3089: 41,3 - 3090: 42,3 - 3091: 43,3 - 3092: 44,3 - 3093: 45,3 - 3094: 46,3 - 3095: 47,3 - 3096: 48,4 - 3097: 49,4 - 3098: 50,4 - 3099: 51,4 - node: color: '#EFB34160' id: QuarterTileOverlayGreyscale90 @@ -5265,7 +5217,7 @@ entities: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale180 decals: - 543: 46,5 + 4111: 41,5 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale180 @@ -5295,11 +5247,6 @@ entities: decals: 2805: 43,-35 3901: 29,-33 - - node: - color: '#A4610696' - id: ThreeQuarterTileOverlayGreyscale270 - decals: - 537: 43,5 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale270 @@ -5536,10 +5483,8 @@ entities: 1748: -37,-18 1752: -37,5 1757: -15,6 - 1758: -15,10 1759: -15,22 1763: 17,6 - 1764: 17,10 1765: 41,12 1773: 17,22 1774: 17,26 @@ -5564,6 +5509,7 @@ entities: 3390: 1,-13 3753: -33,20 3893: -15,3 + 4099: 17,-22 - node: color: '#52B4E996' id: WarnLineGreyscaleE @@ -5605,18 +5551,6 @@ entities: 2264: 6,19 2344: 3,-6 3234: 17,18 - 3395: -14,-25 - 3396: -14,-24 - 3397: -14,-23 - 3413: -14,7 - 3414: -14,8 - 3415: -14,9 - 3416: -20,7 - 3417: -20,8 - 3418: -20,9 - 3419: 13,7 - 3420: 13,8 - 3421: 13,9 3539: -5,-56 3540: -5,-55 3541: -5,-54 @@ -5661,9 +5595,6 @@ entities: 3375: 1,-28 3376: 0,-28 3377: -1,-28 - 3378: 15,-22 - 3379: 16,-22 - 3380: 17,-22 3518: 1,-54 3519: 0,-54 3520: -1,-54 @@ -5673,6 +5604,8 @@ entities: 3524: 1,-76 3525: 0,-76 3526: -1,-76 + 4148: 53,2 + 4149: 54,2 - node: color: '#334E6DC8' id: WarnLineGreyscaleS @@ -5717,9 +5650,6 @@ entities: 2136: -12,27 2263: 5,17 3032: 23,7 - 3366: 17,-20 - 3367: 16,-20 - 3368: 15,-20 3369: 1,-21 3370: 0,-21 3371: -1,-21 @@ -5739,6 +5669,12 @@ entities: 3516: 0,-43 3517: -1,-43 3940: 39,-33 + 3986: 15,11 + 3987: 16,11 + 3988: 17,11 + 3995: -17,11 + 3996: -16,11 + 3997: -15,11 - node: color: '#52B4E996' id: WarnLineGreyscaleW @@ -5782,15 +5718,6 @@ entities: 2137: -13,28 2343: 5,-6 2512: 19,18 - 3392: -12,-25 - 3393: -12,-24 - 3394: -12,-23 - 3407: -12,7 - 3408: -12,8 - 3409: -12,9 - 3410: -18,7 - 3411: -18,8 - 3412: -18,9 3422: 19,7 3423: 19,8 3424: 19,9 @@ -5847,6 +5774,10 @@ entities: 3745: -6,31 3961: -56,6 3962: -55,6 + 3985: 14,7 + 3998: -14,7 + 4100: -14,-25 + 4103: -18,7 - node: color: '#DE3A3A96' id: WarnLineS @@ -5875,9 +5806,7 @@ entities: 1747: -39,-18 1751: -39,5 1755: -17,6 - 1756: -17,10 1760: -17,22 - 1761: 15,10 1762: 15,6 1766: 39,12 1771: 15,22 @@ -5899,6 +5828,7 @@ entities: 3391: -1,-13 3752: -31,20 3780: 40,-36 + 4098: 15,-22 - node: color: '#DE3A3A96' id: WarnLineW @@ -5949,7 +5879,6 @@ entities: 3038: 0,29 3039: 1,29 3040: -1,29 - 3160: 43,3 3316: -16,51 3317: -15,51 3318: -14,51 @@ -5978,6 +5907,12 @@ entities: 3877: -113,30 3878: -112,30 3879: -111,30 + 3984: 14,9 + 3999: -14,9 + 4101: -14,-23 + 4102: -18,9 + 4137: 58,3 + 4187: 57,3 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -6021,8 +5956,6 @@ entities: decals: 559: 51,0 560: 51,1 - 561: 51,2 - 562: 51,3 563: 51,-1 564: 51,-2 - node: @@ -7300,7 +7233,7 @@ entities: 9,-1: 0: 63279 9,0: - 0: 10111 + 0: 26495 10,-3: 0: 49080 10,-2: @@ -7308,7 +7241,7 @@ entities: 10,-1: 0: 65295 10,0: - 0: 65535 + 0: 36863 11,-3: 0: 49083 11,-2: @@ -7316,7 +7249,7 @@ entities: 11,-1: 0: 65311 11,0: - 0: 65535 + 0: 16383 12,-3: 0: 30579 12,-2: @@ -7324,7 +7257,7 @@ entities: 12,-1: 0: 65295 12,0: - 0: 65535 + 0: 16383 13,-3: 0: 46076 13,-2: @@ -7332,7 +7265,7 @@ entities: 13,-1: 0: 26119 13,0: - 0: 28431 + 0: 26223 14,-3: 0: 4113 1: 17476 @@ -7343,8 +7276,8 @@ entities: 1: 273 0: 4096 14,0: - 1: 273 - 0: 4096 + 1: 3857 + 0: 24576 15,-2: 1: 248 16,-4: @@ -7854,11 +7787,11 @@ entities: 0,7: 0: 29047 12,1: - 0: 65343 + 0: 65339 12,2: 0: 61439 11,1: - 0: 63347 + 0: 63287 11,2: 0: 6015 12,3: @@ -7868,17 +7801,15 @@ entities: 12,4: 0: 8191 13,1: - 0: 65286 + 0: 65383 13,2: 0: 65535 13,3: 0: 61439 14,1: - 1: 65 - 0: 4352 + 0: 30470 14,2: - 0: 20753 - 1: 128 + 0: 20855 14,3: 0: 24351 0,8: @@ -8081,7 +8012,7 @@ entities: 9,2: 0: 65535 10,1: - 0: 48115 + 0: 49083 10,2: 0: 15359 13,5: @@ -8112,7 +8043,7 @@ entities: 1: 39312 -12,8: 5: 12 - 6: 3072 + 7: 3072 -11,5: 0: 63351 -11,6: @@ -8121,7 +8052,7 @@ entities: -11,8: 5: 1 1: 17476 - 6: 256 + 7: 256 -11,7: 1: 17484 -10,5: @@ -8219,10 +8150,10 @@ entities: 0: 255 1: 57344 -8,11: - 7: 816 + 6: 816 1: 34952 -9,11: - 7: 2176 + 6: 2176 1: 8738 -8,12: 1: 34959 @@ -8242,7 +8173,7 @@ entities: -6,11: 0: 4095 -6,12: - 7: 61166 + 6: 61166 -5,9: 0: 65535 -5,10: @@ -8250,7 +8181,7 @@ entities: -5,11: 0: 36863 -5,12: - 7: 30515 + 6: 30515 0: 12 -4,9: 0: 65535 @@ -8260,7 +8191,7 @@ entities: 0: 4095 -4,12: 0: 1 - 7: 65518 + 6: 65518 -4,13: 1: 61680 -5,13: @@ -8274,7 +8205,7 @@ entities: -5,15: 1: 17487 -3,12: - 7: 13107 + 6: 13107 1: 34944 -3,13: 1: 47792 @@ -8340,7 +8271,7 @@ entities: 1: 61713 -12,9: 0: 16 - 7: 3084 + 6: 3084 -13,9: 1: 39305 -13,10: @@ -8350,18 +8281,18 @@ entities: 0: 12544 -12,10: 4: 12 - 7: 3072 + 6: 3072 -12,11: - 7: 12 + 6: 12 -11,9: - 7: 257 + 6: 257 1: 17476 -11,10: 4: 1 - 7: 256 + 6: 256 1: 17476 -11,11: - 7: 1 + 6: 1 1: 17476 -11,12: 1: 17487 @@ -8415,7 +8346,7 @@ entities: 1: 15 -13,12: 1: 34952 - 6: 48 + 7: 48 5: 12288 -12,13: 1: 61455 @@ -8449,11 +8380,11 @@ entities: 1: 62671 -7,14: 1: 244 - 7: 57344 + 6: 57344 0: 1024 -7,15: 1: 61440 - 7: 238 + 6: 238 0: 1024 -7,16: 1: 65524 @@ -8512,7 +8443,7 @@ entities: -14,12: 0: 1 1: 8738 - 6: 128 + 7: 128 5: 32768 -17,12: 0: 52232 @@ -9053,7 +8984,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -9068,7 +8999,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9387,8 +9318,8 @@ entities: id: docking43669 localAnchorB: -47.5,-40 localAnchorA: 0.5,0 - damping: 1560.1505 - stiffness: 14003.88 + damping: 1560.1724 + stiffness: 14004.076 - proto: AcousticGuitarInstrument entities: - uid: 2133 @@ -9408,6 +9339,14 @@ entities: - type: Transform pos: 31.477634,-79.4623 parent: 60 +- proto: ActionToggleInternals + entities: + - uid: 13159 + components: + - type: Transform + parent: 19510 + - type: InstantAction + container: 19510 - proto: AirAlarm entities: - uid: 249 @@ -9582,18 +9521,6 @@ entities: - 9428 - 9631 - 9472 - - uid: 12192 - components: - - type: Transform - pos: 47.5,4.5 - parent: 60 - - type: DeviceList - devices: - - 18915 - - 18906 - - 18910 - - 21548 - - 9282 - uid: 12512 components: - type: Transform @@ -9741,14 +9668,8 @@ entities: - 672 - 671 - 21495 - - 3996 - - 4001 - - 585 - 928 - 904 - - 19834 - - 19835 - - 19836 - uid: 21499 components: - type: Transform @@ -9760,17 +9681,11 @@ entities: - 4791 - 7472 - 21502 - - 6125 - - 6127 - - 6126 - 675 - 674 - 673 - 1455 - 1456 - - 19839 - - 19838 - - 19837 - uid: 21504 components: - type: Transform @@ -9782,9 +9697,6 @@ entities: - 112 - 81 - 63 - - 3996 - - 4001 - - 585 - 121 - 836 - 158 @@ -9839,14 +9751,8 @@ entities: parent: 60 - type: DeviceList devices: - - 6625 - - 6542 - - 6103 - 21513 - 21512 - - 5742 - - 5743 - - 5744 - 5745 - 14325 - 5738 @@ -9931,9 +9837,6 @@ entities: parent: 60 - type: DeviceList devices: - - 5889 - - 5651 - - 5649 - 8611 - 8612 - 8613 @@ -9970,9 +9873,6 @@ entities: parent: 60 - type: DeviceList devices: - - 6127 - - 6126 - - 6125 - 21559 - 12591 - 12592 @@ -9981,9 +9881,6 @@ entities: - 4369 - 1198 - 4546 - - 19839 - - 19838 - - 19837 - uid: 21561 components: - type: Transform @@ -10257,9 +10154,6 @@ entities: - 7721 - 1017 - 21633 - - 5988 - - 6367 - - 6626 - 7686 - 1996 - 719 @@ -10283,9 +10177,6 @@ entities: parent: 60 - type: DeviceList devices: - - 13968 - - 13969 - - 13970 - 21643 - 13981 - 13980 @@ -10525,6 +10416,16 @@ entities: - 24361 - 24358 - 9016 + - uid: 24792 + components: + - type: Transform + pos: 47.5,3.5 + parent: 60 + - type: DeviceList + devices: + - 19529 + - 18884 + - 18906 - proto: AirAlarmElectronics entities: - uid: 13488 @@ -10546,7 +10447,7 @@ entities: parent: 60 - proto: AirAlarmVox entities: - - uid: 930 + - uid: 398 components: - type: Transform rot: 3.141592653589793 rad @@ -10554,10 +10455,10 @@ entities: parent: 60 - type: DeviceList devices: - - 24661 - - 24665 - - 24657 - - 24659 + - 18678 + - 17545 + - 13640 + - 1911 - proto: AirCanister entities: - uid: 1679 @@ -10891,13 +10792,6 @@ entities: - type: Transform pos: 47.5,7.5 parent: 60 - - uid: 9283 - components: - - type: MetaData - name: Cargo - - type: Transform - pos: 42.5,5.5 - parent: 60 - uid: 10679 components: - type: Transform @@ -10909,12 +10803,10 @@ entities: - type: Transform pos: 49.5,5.5 parent: 60 - - uid: 11864 + - uid: 12889 components: - - type: MetaData - name: Salvage Bay - type: Transform - pos: 44.5,4.5 + pos: 42.5,6.5 parent: 60 - uid: 13108 components: @@ -11457,24 +11349,6 @@ entities: linkedPorts: 12706: - DoorStatus: DoorBolt - - uid: 9242 - components: - - type: Transform - pos: 55.5,2.5 - parent: 60 - - type: DeviceLinkSource - linkedPorts: - 12018: - - DoorStatus: DoorBolt - - uid: 12018 - components: - - type: Transform - pos: 52.5,2.5 - parent: 60 - - type: DeviceLinkSource - linkedPorts: - 9242: - - DoorStatus: DoorBolt - uid: 12706 components: - type: Transform @@ -12078,36 +11952,16 @@ entities: - type: Transform pos: 18.5,7.5 parent: 60 - - uid: 859 - components: - - type: Transform - pos: -12.5,-22.5 - parent: 60 - - uid: 1280 - components: - - type: Transform - pos: -18.5,7.5 - parent: 60 - uid: 2596 components: - type: Transform pos: 16.5,-25.5 parent: 60 - - uid: 2646 - components: - - type: Transform - pos: 15.5,-20.5 - parent: 60 - uid: 2768 components: - type: Transform pos: 36.5,-23.5 parent: 60 - - uid: 3736 - components: - - type: Transform - pos: -12.5,9.5 - parent: 60 - uid: 3987 components: - type: Transform @@ -12123,11 +11977,6 @@ entities: - type: Transform pos: 1.5,-43.5 parent: 60 - - uid: 3999 - components: - - type: Transform - pos: -12.5,-24.5 - parent: 60 - uid: 5001 components: - type: Transform @@ -12183,41 +12032,11 @@ entities: - type: Transform pos: 4.5,-54.5 parent: 60 - - uid: 5365 - components: - - type: Transform - pos: 14.5,7.5 - parent: 60 - uid: 5401 components: - type: Transform pos: 11.5,6.5 parent: 60 - - uid: 5740 - components: - - type: Transform - pos: 14.5,8.5 - parent: 60 - - uid: 5741 - components: - - type: Transform - pos: 14.5,9.5 - parent: 60 - - uid: 5759 - components: - - type: Transform - pos: -18.5,8.5 - parent: 60 - - uid: 5760 - components: - - type: Transform - pos: -12.5,7.5 - parent: 60 - - uid: 5798 - components: - - type: Transform - pos: -18.5,9.5 - parent: 60 - uid: 6266 components: - type: MetaData @@ -12245,10 +12064,15 @@ entities: - type: Transform pos: 0.5,-74.5 parent: 60 - - uid: 6830 + - uid: 6625 components: - type: Transform - pos: -12.5,8.5 + pos: -16.5,10.5 + parent: 60 + - uid: 6977 + components: + - type: Transform + pos: -15.5,10.5 parent: 60 - uid: 7076 components: @@ -12262,20 +12086,25 @@ entities: - type: Transform pos: 44.5,-46.5 parent: 60 - - uid: 9054 + - uid: 8047 components: - type: Transform - pos: -12.5,-23.5 + pos: -14.5,10.5 parent: 60 - - uid: 9058 + - uid: 9239 components: - type: Transform - pos: 17.5,-20.5 + pos: 15.5,10.5 parent: 60 - - uid: 9059 + - uid: 9240 components: - type: Transform - pos: 16.5,-20.5 + pos: 16.5,10.5 + parent: 60 + - uid: 9243 + components: + - type: Transform + pos: 17.5,10.5 parent: 60 - uid: 10656 components: @@ -13058,6 +12887,11 @@ entities: parent: 60 - proto: AirlockSalvageGlassLocked entities: + - uid: 5499 + components: + - type: Transform + pos: 48.5,3.5 + parent: 60 - uid: 13143 components: - type: Transform @@ -13068,15 +12902,17 @@ entities: - type: Transform pos: 39.5,0.5 parent: 60 -- proto: AirlockSalvageLocked - entities: - - uid: 13142 + - uid: 13363 components: - - type: MetaData - name: Salvage Locker Room - type: Transform + rot: 3.141592653589793 rad pos: 37.5,3.5 parent: 60 + - uid: 18902 + components: + - type: Transform + pos: 49.5,3.5 + parent: 60 - proto: AirlockScienceGlassLocked entities: - uid: 5771 @@ -13414,6 +13250,9 @@ entities: - type: Transform pos: 41.5,1.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 24792 - uid: 21485 components: - type: Transform @@ -13444,6 +13283,9 @@ entities: - type: Transform pos: -6.5,-23.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21497 - uid: 21501 components: - type: Transform @@ -13454,11 +13296,17 @@ entities: - type: Transform pos: 10.5,-23.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21498 - uid: 21505 components: - type: Transform pos: -21.5,-23.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 21508 components: - type: Transform @@ -13474,11 +13322,17 @@ entities: - type: Transform pos: 11.5,8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 - uid: 21513 components: - type: Transform pos: -9.5,8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 - uid: 21530 components: - type: Transform @@ -13499,26 +13353,30 @@ entities: - type: Transform pos: 27.5,8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21539 - uid: 21544 components: - type: Transform pos: 38.5,8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21543 - uid: 21547 components: - type: Transform pos: 40.5,15.5 parent: 60 - - uid: 21548 - components: - - type: Transform - pos: 47.5,1.5 - parent: 60 - uid: 21551 components: - type: Transform pos: 16.5,16.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21553 - uid: 21556 components: - type: Transform @@ -13529,6 +13387,9 @@ entities: - type: Transform pos: 16.5,-13.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21558 - uid: 21562 components: - type: Transform @@ -13624,6 +13485,9 @@ entities: - type: Transform pos: -27.5,8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21635 - uid: 21638 components: - type: Transform @@ -13644,6 +13508,9 @@ entities: - type: Transform pos: -15.5,15.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 23767 - uid: 21646 components: - type: Transform @@ -13767,14 +13634,16 @@ entities: - type: Transform pos: 49.5,-22.5 parent: 60 - - uid: 24659 +- proto: AirSensorVox + entities: + - uid: 18678 components: - type: Transform pos: 12.5,-13.5 parent: 60 - type: DeviceNetwork deviceLists: - - 930 + - 398 - proto: AltarSpawner entities: - uid: 14509 @@ -13885,6 +13754,21 @@ entities: - type: Transform pos: -60.5,-16.5 parent: 60 + - uid: 3420 + components: + - type: MetaData + name: Cargo Reception APC + - type: Transform + rot: 3.141592653589793 rad + pos: 46.5,5.5 + parent: 60 + - uid: 3775 + components: + - type: MetaData + name: Salvage Bay APC + - type: Transform + pos: 46.5,3.5 + parent: 60 - uid: 3826 components: - type: MetaData @@ -14108,13 +13992,6 @@ entities: - type: Transform pos: 21.5,5.5 parent: 60 - - uid: 11158 - components: - - type: MetaData - name: Salvage Bay APC - - type: Transform - pos: 46.5,4.5 - parent: 60 - uid: 11255 components: - type: MetaData @@ -15101,10 +14978,10 @@ entities: parent: 60 - proto: Autolathe entities: - - uid: 5288 + - uid: 5223 components: - type: Transform - pos: 46.5,5.5 + pos: 46.5,6.5 parent: 60 - uid: 9513 components: @@ -15791,41 +15668,11 @@ entities: - type: Transform pos: -16.5,-43.5 parent: 60 - - uid: 11697 - components: - - type: Transform - pos: 55.5,-0.5 - parent: 60 - - uid: 11830 - components: - - type: Transform - pos: 55.5,3.5 - parent: 60 - uid: 12598 components: - type: Transform pos: -55.5,0.5 parent: 60 - - uid: 13175 - components: - - type: Transform - pos: 59.5,15.5 - parent: 60 - - uid: 13176 - components: - - type: Transform - pos: 57.5,15.5 - parent: 60 - - uid: 13177 - components: - - type: Transform - pos: 57.5,11.5 - parent: 60 - - uid: 13178 - components: - - type: Transform - pos: 59.5,11.5 - parent: 60 - uid: 13901 components: - type: Transform @@ -15876,6 +15723,31 @@ entities: - type: Transform pos: -13.5,52.5 parent: 60 + - uid: 19033 + components: + - type: Transform + pos: 55.5,4.5 + parent: 60 + - uid: 19835 + components: + - type: Transform + pos: 57.5,5.5 + parent: 60 + - uid: 19836 + components: + - type: Transform + pos: 58.5,5.5 + parent: 60 + - uid: 24784 + components: + - type: Transform + pos: 52.5,-0.5 + parent: 60 + - uid: 24785 + components: + - type: Transform + pos: 55.5,-0.5 + parent: 60 - proto: BlastDoorBridgeOpen entities: - uid: 21763 @@ -16385,11 +16257,6 @@ entities: parent: 60 - proto: BoxFolderRed entities: - - uid: 1911 - components: - - type: Transform - pos: -20.313402,-16.57666 - parent: 60 - uid: 4236 components: - type: Transform @@ -16698,6 +16565,12 @@ entities: - type: Transform pos: -48.5,15.5 parent: 60 + - uid: 19838 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 55.5,5.5 + parent: 60 - proto: ButtonFrameCautionSecurity entities: - uid: 5659 @@ -16705,6 +16578,35 @@ entities: - type: Transform pos: -52.5,15.5 parent: 60 +- proto: ButtonFrameExit + entities: + - uid: 9059 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,-21.5 + parent: 60 + - uid: 9176 + components: + - type: Transform + pos: -20.5,-14.5 + parent: 60 +- proto: ButtonFrameGrey + entities: + - uid: 19839 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 56.5,5.5 + parent: 60 +- proto: ButtonFrameJanitor + entities: + - uid: 21482 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,5.5 + parent: 60 - proto: CableApcExtension entities: - uid: 23 @@ -17067,6 +16969,11 @@ entities: - type: Transform pos: -60.5,-16.5 parent: 60 + - uid: 2646 + components: + - type: Transform + pos: 53.5,4.5 + parent: 60 - uid: 2731 components: - type: Transform @@ -17227,6 +17134,11 @@ entities: - type: Transform pos: -25.5,28.5 parent: 60 + - uid: 3736 + components: + - type: Transform + pos: 46.5,5.5 + parent: 60 - uid: 3747 components: - type: Transform @@ -17242,6 +17154,16 @@ entities: - type: Transform pos: -18.5,-37.5 parent: 60 + - uid: 3996 + components: + - type: Transform + pos: 46.5,6.5 + parent: 60 + - uid: 3999 + components: + - type: Transform + pos: 45.5,6.5 + parent: 60 - uid: 4017 components: - type: Transform @@ -17717,6 +17639,11 @@ entities: - type: Transform pos: -23.5,47.5 parent: 60 + - uid: 5651 + components: + - type: Transform + pos: 58.5,5.5 + parent: 60 - uid: 5665 components: - type: Transform @@ -17732,6 +17659,26 @@ entities: - type: Transform pos: -20.5,-54.5 parent: 60 + - uid: 5744 + components: + - type: Transform + pos: 54.5,4.5 + parent: 60 + - uid: 5759 + components: + - type: Transform + pos: 53.5,6.5 + parent: 60 + - uid: 5760 + components: + - type: Transform + pos: 53.5,5.5 + parent: 60 + - uid: 5798 + components: + - type: Transform + pos: 55.5,4.5 + parent: 60 - uid: 5838 components: - type: Transform @@ -24707,6 +24654,16 @@ entities: - type: Transform pos: 51.5,15.5 parent: 60 + - uid: 13271 + components: + - type: Transform + pos: 58.5,4.5 + parent: 60 + - uid: 13272 + components: + - type: Transform + pos: 58.5,9.5 + parent: 60 - uid: 13293 components: - type: Transform @@ -24822,21 +24779,11 @@ entities: - type: Transform pos: 49.5,8.5 parent: 60 - - uid: 13320 - components: - - type: Transform - pos: 48.5,8.5 - parent: 60 - uid: 13321 components: - type: Transform pos: 17.5,20.5 parent: 60 - - uid: 13322 - components: - - type: Transform - pos: 47.5,8.5 - parent: 60 - uid: 13323 components: - type: Transform @@ -24887,20 +24834,10 @@ entities: - type: Transform pos: 44.5,14.5 parent: 60 - - uid: 13333 - components: - - type: Transform - pos: 45.5,13.5 - parent: 60 - - uid: 13334 - components: - - type: Transform - pos: 46.5,13.5 - parent: 60 - uid: 13335 components: - type: Transform - pos: 47.5,13.5 + pos: 40.5,7.5 parent: 60 - uid: 13336 components: @@ -25025,23 +24962,13 @@ entities: - uid: 13360 components: - type: Transform - pos: 44.5,5.5 - parent: 60 - - uid: 13361 - components: - - type: Transform - pos: 43.5,5.5 + pos: 40.5,6.5 parent: 60 - uid: 13362 components: - type: Transform pos: 46.5,3.5 parent: 60 - - uid: 13363 - components: - - type: Transform - pos: 46.5,4.5 - parent: 60 - uid: 13364 components: - type: Transform @@ -25132,45 +25059,15 @@ entities: - type: Transform pos: 53.5,-3.5 parent: 60 - - uid: 13382 - components: - - type: Transform - pos: 47.5,3.5 - parent: 60 - - uid: 13383 - components: - - type: Transform - pos: 48.5,3.5 - parent: 60 - - uid: 13384 - components: - - type: Transform - pos: 49.5,3.5 - parent: 60 - uid: 13385 components: - type: Transform - pos: 50.5,3.5 - parent: 60 - - uid: 13386 - components: - - type: Transform - pos: 51.5,3.5 + pos: 58.5,8.5 parent: 60 - uid: 13387 components: - type: Transform - pos: 52.5,3.5 - parent: 60 - - uid: 13388 - components: - - type: Transform - pos: 53.5,3.5 - parent: 60 - - uid: 13389 - components: - - type: Transform - pos: 54.5,3.5 + pos: 57.5,4.5 parent: 60 - uid: 13390 components: @@ -25507,6 +25404,11 @@ entities: - type: Transform pos: 37.5,2.5 parent: 60 + - uid: 13491 + components: + - type: Transform + pos: 58.5,6.5 + parent: 60 - uid: 13523 components: - type: Transform @@ -25527,6 +25429,11 @@ entities: - type: Transform pos: -0.5,-35.5 parent: 60 + - uid: 13529 + components: + - type: Transform + pos: 56.5,4.5 + parent: 60 - uid: 13552 components: - type: Transform @@ -29052,6 +28959,21 @@ entities: - type: Transform pos: 21.5,4.5 parent: 60 + - uid: 18881 + components: + - type: Transform + pos: 57.5,7.5 + parent: 60 + - uid: 18882 + components: + - type: Transform + pos: 58.5,7.5 + parent: 60 + - uid: 18885 + components: + - type: Transform + pos: 56.5,7.5 + parent: 60 - uid: 19268 components: - type: Transform @@ -29557,11 +29479,21 @@ entities: - type: Transform pos: 40.5,21.5 parent: 60 + - uid: 19415 + components: + - type: Transform + pos: 54.5,1.5 + parent: 60 - uid: 19420 components: - type: Transform pos: -6.5,-53.5 parent: 60 + - uid: 19421 + components: + - type: Transform + pos: 54.5,2.5 + parent: 60 - uid: 19523 components: - type: Transform @@ -42747,6 +42679,11 @@ entities: - type: Transform pos: -4.5,-55.5 parent: 60 + - uid: 5339 + components: + - type: Transform + pos: 46.5,2.5 + parent: 60 - uid: 5423 components: - type: Transform @@ -44607,11 +44544,6 @@ entities: - type: Transform pos: 46.5,4.5 parent: 60 - - uid: 11153 - components: - - type: Transform - pos: 45.5,3.5 - parent: 60 - uid: 11155 components: - type: Transform @@ -49372,6 +49304,16 @@ entities: - type: Transform pos: -12.5,-11.5 parent: 60 + - uid: 585 + components: + - type: Transform + pos: 55.5,4.5 + parent: 60 + - uid: 930 + components: + - type: Transform + pos: 54.5,4.5 + parent: 60 - uid: 1357 components: - type: Transform @@ -49402,6 +49344,11 @@ entities: - type: Transform pos: -77.5,-12.5 parent: 60 + - uid: 1988 + components: + - type: Transform + pos: 49.5,4.5 + parent: 60 - uid: 2077 components: - type: Transform @@ -52161,6 +52108,56 @@ entities: - type: Transform pos: 54.5,-11.5 parent: 60 + - uid: 13320 + components: + - type: Transform + pos: 47.5,4.5 + parent: 60 + - uid: 13322 + components: + - type: Transform + pos: 45.5,4.5 + parent: 60 + - uid: 13382 + components: + - type: Transform + pos: 44.5,4.5 + parent: 60 + - uid: 13495 + components: + - type: Transform + pos: 50.5,4.5 + parent: 60 + - uid: 13510 + components: + - type: Transform + pos: 51.5,4.5 + parent: 60 + - uid: 13514 + components: + - type: Transform + pos: 52.5,4.5 + parent: 60 + - uid: 13519 + components: + - type: Transform + pos: 48.5,4.5 + parent: 60 + - uid: 13520 + components: + - type: Transform + pos: 46.5,4.5 + parent: 60 + - uid: 13526 + components: + - type: Transform + pos: 43.5,4.5 + parent: 60 + - uid: 13562 + components: + - type: Transform + pos: 53.5,4.5 + parent: 60 - uid: 13574 components: - type: Transform @@ -52986,6 +52983,31 @@ entities: - type: Transform pos: 55.5,-23.5 parent: 60 + - uid: 19000 + components: + - type: Transform + pos: 56.5,4.5 + parent: 60 + - uid: 19001 + components: + - type: Transform + pos: 41.5,4.5 + parent: 60 + - uid: 19015 + components: + - type: Transform + pos: 57.5,4.5 + parent: 60 + - uid: 19030 + components: + - type: Transform + pos: 42.5,4.5 + parent: 60 + - uid: 19031 + components: + - type: Transform + pos: 40.5,4.5 + parent: 60 - uid: 19703 components: - type: Transform @@ -55120,12 +55142,6 @@ entities: - type: Transform pos: 2.5,-75.5 parent: 60 - - uid: 5338 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 50.5,6.5 - parent: 60 - uid: 5664 components: - type: Transform @@ -55136,12 +55152,6 @@ entities: - type: Transform pos: -11.5,-55.5 parent: 60 - - uid: 5968 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 52.5,6.5 - parent: 60 - uid: 6322 components: - type: Transform @@ -56036,6 +56046,12 @@ entities: - type: Transform pos: -19.5,-16.5 parent: 60 + - uid: 1905 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.514114,2.6323514 + parent: 60 - uid: 2590 components: - type: Transform @@ -56098,11 +56114,6 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,-14.5 parent: 60 - - uid: 6156 - components: - - type: Transform - pos: 45.5,6.5 - parent: 60 - uid: 6628 components: - type: Transform @@ -56229,12 +56240,6 @@ entities: - type: Transform pos: -54.34717,7.772402 parent: 60 - - uid: 13659 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 40.575027,3.6337824 - parent: 60 - uid: 14191 components: - type: Transform @@ -57350,29 +57355,6 @@ entities: - 0 - 0 - 0 - - uid: 13213 - components: - - type: Transform - pos: 54.5,4.5 - parent: 60 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.6495836 - - 6.2055764 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 17783 components: - type: Transform @@ -58883,6 +58865,11 @@ entities: parent: 60 - proto: ClothingBeltUtilityFilled entities: + - uid: 5284 + components: + - type: Transform + pos: 48.535072,9.453945 + parent: 60 - uid: 6317 components: - type: Transform @@ -58898,11 +58885,6 @@ entities: - type: Transform pos: -56.46993,8.505579 parent: 60 - - uid: 13495 - components: - - type: Transform - pos: 46.478703,6.560299 - parent: 60 - uid: 16083 components: - type: Transform @@ -59187,13 +59169,6 @@ entities: - type: Transform pos: -109.534744,13.592387 parent: 60 -- proto: ClothingHeadHatCargosoftFlipped - entities: - - uid: 13491 - components: - - type: Transform - pos: 56.67338,6.366034 - parent: 60 - proto: ClothingHeadHatChef entities: - uid: 5789 @@ -59637,10 +59612,10 @@ entities: parent: 60 - proto: ClothingMaskGasExplorer entities: - - uid: 19031 + - uid: 5741 components: - type: Transform - pos: 46.643196,3.6000824 + pos: 45.61692,-1.5182955 parent: 60 - proto: ClothingMaskNeckGaiter entities: @@ -60655,15 +60630,14 @@ entities: parent: 7536 - proto: ComputerCargoBounty entities: - - uid: 5334 + - uid: 18900 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 43.5,7.5 + pos: 50.5,14.5 parent: 60 - proto: ComputerCargoOrders entities: - - uid: 13084 + - uid: 18899 components: - type: Transform pos: 43.5,10.5 @@ -60740,12 +60714,6 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,1.5 parent: 60 - - uid: 1988 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-15.5 - parent: 60 - uid: 2024 components: - type: Transform @@ -60757,6 +60725,12 @@ entities: - type: Transform pos: -25.5,-13.5 parent: 60 + - uid: 13383 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-16.5 + parent: 60 - uid: 18561 components: - type: Transform @@ -60860,11 +60834,11 @@ entities: parent: 60 - proto: ComputerRadar entities: - - uid: 21482 + - uid: 19022 components: - type: Transform rot: -1.5707963267948966 rad - pos: 51.5,1.5 + pos: 51.5,2.5 parent: 60 - proto: ComputerResearchAndDevelopment entities: @@ -60906,10 +60880,11 @@ entities: parent: 60 - proto: ComputerSalvageExpedition entities: - - uid: 9452 + - uid: 5288 components: - type: Transform - pos: 47.5,1.5 + rot: -1.5707963267948966 rad + pos: 42.5,-0.5 parent: 60 - proto: ComputerShuttleCargo entities: @@ -60920,10 +60895,11 @@ entities: parent: 60 - proto: ComputerShuttleSalvage entities: - - uid: 3212 + - uid: 19021 components: - type: Transform - pos: 48.5,1.5 + rot: -1.5707963267948966 rad + pos: 42.5,0.5 parent: 60 - proto: ComputerSolarControl entities: @@ -60989,12 +60965,6 @@ entities: parent: 60 - proto: ComputerSurveillanceCameraMonitor entities: - - uid: 1905 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-16.5 - parent: 60 - uid: 1980 components: - type: Transform @@ -61093,6 +61063,11 @@ entities: parent: 60 - proto: ConveyorBelt entities: + - uid: 397 + components: + - type: Transform + pos: 58.5,7.5 + parent: 60 - uid: 3860 components: - type: Transform @@ -61117,17 +61092,16 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,-43.5 parent: 60 - - uid: 5284 + - uid: 5221 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 52.5,3.5 + rot: 3.141592653589793 rad + pos: 57.5,5.5 parent: 60 - - uid: 5285 + - uid: 5338 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 51.5,3.5 + pos: 58.5,8.5 parent: 60 - uid: 5489 components: @@ -61135,6 +61109,30 @@ entities: rot: -1.5707963267948966 rad pos: 51.5,-0.5 parent: 60 + - uid: 5740 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,4.5 + parent: 60 + - uid: 5742 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,4.5 + parent: 60 + - uid: 6127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,7.5 + parent: 60 + - uid: 6145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 56.5,4.5 + parent: 60 - uid: 6730 components: - type: Transform @@ -61171,31 +61169,64 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,-0.5 parent: 60 + - uid: 8773 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 53.5,4.5 + parent: 60 - uid: 9238 + components: + - type: Transform + pos: 58.5,4.5 + parent: 60 + - uid: 9242 components: - type: Transform rot: -1.5707963267948966 rad - pos: 55.5,3.5 + pos: 55.5,4.5 parent: 60 - - uid: 11722 + - uid: 9282 components: - type: Transform rot: -1.5707963267948966 rad - pos: 50.5,3.5 + pos: 48.5,4.5 parent: 60 - - type: Construction - edge: 0 - - uid: 11757 + - uid: 9452 components: - type: Transform rot: -1.5707963267948966 rad - pos: 53.5,3.5 + pos: 57.5,4.5 parent: 60 - - uid: 11881 + - uid: 11697 components: - type: Transform rot: -1.5707963267948966 rad - pos: 54.5,3.5 + pos: 40.5,4.5 + parent: 60 + - uid: 11816 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.5,4.5 + parent: 60 + - uid: 11864 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,4.5 + parent: 60 + - uid: 12018 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.5,4.5 + parent: 60 + - uid: 12019 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,4.5 parent: 60 - uid: 12283 components: @@ -61215,11 +61246,41 @@ entities: rot: -1.5707963267948966 rad pos: 56.5,-0.5 parent: 60 - - uid: 12889 + - uid: 12882 components: - type: Transform rot: -1.5707963267948966 rad - pos: 56.5,3.5 + pos: 44.5,4.5 + parent: 60 + - uid: 13083 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,4.5 + parent: 60 + - uid: 13084 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,4.5 + parent: 60 + - uid: 13114 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,4.5 + parent: 60 + - uid: 13136 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,4.5 + parent: 60 + - uid: 13142 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 56.5,7.5 parent: 60 - uid: 13162 components: @@ -61281,6 +61342,28 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,11.5 parent: 60 + - uid: 13175 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 57.5,6.5 + parent: 60 + - uid: 13176 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,9.5 + parent: 60 + - uid: 13177 + components: + - type: Transform + pos: 58.5,6.5 + parent: 60 + - uid: 13178 + components: + - type: Transform + pos: 58.5,5.5 + parent: 60 - uid: 13221 components: - type: Transform @@ -61293,6 +61376,48 @@ entities: rot: -1.5707963267948966 rad pos: 53.5,15.5 parent: 60 + - uid: 13384 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,9.5 + parent: 60 + - uid: 13389 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 57.5,7.5 + parent: 60 + - uid: 13602 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,9.5 + parent: 60 + - uid: 18873 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,9.5 + parent: 60 + - uid: 18895 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 54.5,4.5 + parent: 60 + - uid: 19831 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 42.5,2.5 + parent: 60 + - uid: 23657 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 41.5,2.5 + parent: 60 - proto: CowToolboxFilled entities: - uid: 7795 @@ -62013,6 +62138,13 @@ entities: - type: Transform pos: -55.463676,29.423212 parent: 60 +- proto: CrowbarOrange + entities: + - uid: 13968 + components: + - type: Transform + pos: -34.48921,11.540227 + parent: 60 - proto: CrowbarRed entities: - uid: 6041 @@ -62025,11 +62157,6 @@ entities: - type: Transform pos: -51.45357,-3.5214972 parent: 60 - - uid: 9525 - components: - - type: Transform - pos: -32.46437,15.522025 - parent: 60 - uid: 16089 components: - type: Transform @@ -62043,7 +62170,7 @@ entities: - uid: 19034 components: - type: Transform - pos: 55.584682,10.512694 + pos: 55.53048,8.566126 parent: 60 - uid: 21238 components: @@ -62891,6 +63018,18 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-0.5 parent: 60 + - uid: 5889 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 40.5,6.5 + parent: 60 + - uid: 6125 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 44.5,6.5 + parent: 60 - uid: 6572 components: - type: Transform @@ -63054,12 +63193,6 @@ entities: - type: Transform pos: 40.5,8.5 parent: 60 - - uid: 18968 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 40.5,5.5 - parent: 60 - uid: 18972 components: - type: Transform @@ -63089,12 +63222,6 @@ entities: rot: 1.5707963267948966 rad pos: 44.5,7.5 parent: 60 - - uid: 18997 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 44.5,5.5 - parent: 60 - uid: 19449 components: - type: Transform @@ -65256,6 +65383,12 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,13.5 parent: 60 + - uid: 5988 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 43.5,6.5 + parent: 60 - uid: 6013 components: - type: Transform @@ -65357,6 +65490,12 @@ entities: rot: 3.141592653589793 rad pos: -37.5,-6.5 parent: 60 + - uid: 6103 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 41.5,6.5 + parent: 60 - uid: 6123 components: - type: Transform @@ -65845,6 +65984,12 @@ entities: - type: Transform pos: -55.5,6.5 parent: 60 + - uid: 11881 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 42.5,6.5 + parent: 60 - uid: 12003 components: - type: Transform @@ -66557,42 +66702,12 @@ entities: rot: 3.141592653589793 rad pos: 45.5,9.5 parent: 60 - - uid: 18998 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 43.5,5.5 - parent: 60 - - uid: 18999 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 42.5,5.5 - parent: 60 - - uid: 19000 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,5.5 - parent: 60 - - uid: 19001 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 40.5,6.5 - parent: 60 - uid: 19002 components: - type: Transform rot: 3.141592653589793 rad pos: 40.5,7.5 parent: 60 - - uid: 19003 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 44.5,6.5 - parent: 60 - uid: 19064 components: - type: Transform @@ -67535,8 +67650,16 @@ entities: - uid: 19510 components: - type: Transform - pos: 55.63736,8.6202135 + pos: 56.09298,8.675501 parent: 60 + - type: GasTank + toggleActionEntity: 13159 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13159 - proto: DresserCaptainFilled entities: - uid: 6419 @@ -67668,11 +67791,6 @@ entities: - type: Transform pos: -34.349934,-0.4142528 parent: 60 - - uid: 5339 - components: - - type: Transform - pos: 51.5,6.5 - parent: 60 - uid: 16127 components: - type: Transform @@ -68142,14 +68260,6 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight - - uid: 21386 - components: - - type: Transform - pos: 47.5,3.5 - parent: 60 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 21387 components: - type: Transform @@ -68976,16 +69086,13 @@ entities: parent: 60 - type: DeviceList devices: - - 670 - - 672 - 671 + - 672 + - 670 - 21495 - - 3996 - - 4001 - - 585 - - 19834 - - 19835 - - 19836 + - 6147 + - 6173 + - 6156 - uid: 21498 components: - type: Transform @@ -68993,19 +69100,16 @@ entities: parent: 60 - type: DeviceList devices: + - 673 + - 674 + - 675 + - 21502 - 5204 - 4791 - 7472 - - 21502 - - 6125 - - 6127 - - 6126 - - 675 - - 674 - - 673 - - 19839 - - 19838 - - 19837 + - 9184 + - 9237 + - 6626 - uid: 21503 components: - type: Transform @@ -69013,22 +69117,22 @@ entities: parent: 60 - type: DeviceList devices: - - 21505 - - 112 - - 81 - - 63 - - 3996 - - 4001 - - 585 - - 121 - - 836 - - 158 - - 11338 - - 11339 - 11340 - - 15846 + - 11339 + - 11338 + - 158 + - 836 + - 121 + - 63 + - 81 + - 112 - 2585 + - 15846 - 17493 + - 21505 + - 6147 + - 6173 + - 6156 - uid: 21506 components: - type: Transform @@ -69050,14 +69154,16 @@ entities: parent: 60 - type: DeviceList devices: - - 6625 + - 6367 + - 6174 - 6542 - - 6103 - - 21513 - 21512 - - 5742 - - 5743 - - 5744 + - 21513 + - 9283 + - 9465 + - 9488 + - 4127 + - 13243 - uid: 21529 components: - type: Transform @@ -69088,13 +69194,13 @@ entities: parent: 60 - type: DeviceList devices: - - 13151 - - 13152 + - 12329 + - 11698 + - 11969 - 13153 + - 13152 + - 13151 - 21541 - - 11969 - - 11698 - - 12329 - uid: 21543 components: - type: Transform @@ -69103,14 +69209,15 @@ entities: parent: 60 - type: DeviceList devices: - - 13106 - - 13107 + - 24791 - 13148 - 13149 - 13150 - - 13151 - - 13152 + - 13107 + - 13106 - 13153 + - 13152 + - 13151 - 21544 - uid: 21545 components: @@ -69138,13 +69245,13 @@ entities: parent: 60 - type: DeviceList devices: - - 5889 - - 5651 - - 5649 + - 21551 - 8611 - 8612 - 8613 - - 21551 + - 1280 + - 1698 + - 1858 - uid: 21555 components: - type: Transform @@ -69167,16 +69274,13 @@ entities: parent: 60 - type: DeviceList devices: - - 6127 - - 6126 - - 6125 - - 21559 - - 4369 - - 1198 - 4546 - - 19839 - - 19838 - - 19837 + - 1198 + - 4369 + - 21559 + - 9184 + - 9237 + - 6626 - uid: 21560 components: - type: Transform @@ -69325,13 +69429,13 @@ entities: parent: 60 - type: DeviceList devices: - - 780 - - 7721 - 1017 + - 7721 + - 780 - 21633 - - 5988 - - 6367 - - 6626 + - 9058 + - 6830 + - 6560 - uid: 21637 components: - type: Transform @@ -69342,9 +69446,6 @@ entities: devices: - 21638 - 21639 - - 5988 - - 6367 - - 6626 - uid: 21641 components: - type: Transform @@ -69352,9 +69453,6 @@ entities: parent: 60 - type: DeviceList devices: - - 13968 - - 13969 - - 13970 - 21643 - 13981 - 13980 @@ -69378,11 +69476,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,13.5 parent: 60 - - type: DeviceList - devices: - - 6625 - - 6542 - - 6103 - uid: 21650 components: - type: Transform @@ -69508,6 +69601,15 @@ entities: rot: 1.5707963267948966 rad pos: -17.5,14.5 parent: 60 + - type: DeviceList + devices: + - 8986 + - 8521 + - 9054 + - 23764 + - 23765 + - 23766 + - 21643 - uid: 24148 components: - type: Transform @@ -69557,28 +69659,43 @@ entities: - type: Transform pos: -18.5,-21.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 81 components: - type: Transform pos: -19.5,-21.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 112 components: - type: Transform pos: -20.5,-21.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 121 components: - type: Transform rot: 1.5707963267948966 rad pos: -17.5,-20.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 158 components: - type: Transform rot: 1.5707963267948966 rad pos: -17.5,-18.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 458 components: - type: Transform @@ -69594,18 +69711,39 @@ entities: - type: Transform pos: -0.5,-20.5 parent: 60 - - uid: 585 + - uid: 836 components: - type: Transform rot: 1.5707963267948966 rad - pos: -13.5,-22.5 + pos: -17.5,-19.5 parent: 60 - - uid: 836 + - type: DeviceNetwork + deviceLists: + - 21503 + - uid: 1280 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-19.5 + pos: 17.5,11.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21553 + - uid: 1698 + components: + - type: Transform + pos: 16.5,11.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21553 + - uid: 1858 + components: + - type: Transform + pos: 15.5,11.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21553 - uid: 2455 components: - type: Transform @@ -69633,18 +69771,6 @@ entities: - type: Transform pos: 1.5,-42.5 parent: 60 - - uid: 3996 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-24.5 - parent: 60 - - uid: 4001 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-23.5 - parent: 60 - uid: 4009 components: - type: Transform @@ -69749,75 +69875,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-54.5 parent: 60 - - uid: 5742 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,7.5 - parent: 60 - - uid: 5743 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,8.5 - parent: 60 - - uid: 5744 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,9.5 - parent: 60 - - uid: 5988 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,7.5 - parent: 60 - - uid: 6103 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,9.5 - parent: 60 - - uid: 6125 - components: - - type: Transform - pos: 15.5,-19.5 - parent: 60 - - uid: 6126 - components: - - type: Transform - pos: 16.5,-19.5 - parent: 60 - - uid: 6127 - components: - - type: Transform - pos: 17.5,-19.5 - parent: 60 - - uid: 6367 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,8.5 - parent: 60 - - uid: 6542 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,8.5 - parent: 60 - - uid: 6625 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,7.5 - parent: 60 - - uid: 6626 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,9.5 - parent: 60 - uid: 8408 components: - type: Transform @@ -69836,6 +69893,30 @@ entities: rot: 3.141592653589793 rad pos: -11.5,-52.5 parent: 60 + - uid: 8521 + components: + - type: Transform + pos: -15.5,11.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 23767 + - uid: 8986 + components: + - type: Transform + pos: -16.5,11.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 23767 + - uid: 9054 + components: + - type: Transform + pos: -14.5,11.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 23767 - uid: 9095 components: - type: Transform @@ -69872,18 +69953,27 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21539 - uid: 11969 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,7.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21539 - uid: 12329 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,9.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21539 - uid: 19045 components: - type: Transform @@ -69902,78 +69992,6 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,24.5 parent: 60 - - uid: 19828 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,7.5 - parent: 60 - - uid: 19829 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,8.5 - parent: 60 - - uid: 19830 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,9.5 - parent: 60 - - uid: 19831 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,7.5 - parent: 60 - - uid: 19832 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,8.5 - parent: 60 - - uid: 19833 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,9.5 - parent: 60 - - uid: 19834 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-24.5 - parent: 60 - - uid: 19835 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-23.5 - parent: 60 - - uid: 19836 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-22.5 - parent: 60 - - uid: 19837 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-21.5 - parent: 60 - - uid: 19838 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-21.5 - parent: 60 - - uid: 19839 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,-21.5 - parent: 60 - uid: 19840 components: - type: Transform @@ -70105,41 +70123,65 @@ entities: - type: Transform pos: -1.5,-24.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21497 - uid: 671 components: - type: Transform pos: -1.5,-22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21497 - uid: 672 components: - type: Transform pos: -1.5,-23.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21497 - uid: 673 components: - type: Transform pos: 2.5,-22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21498 - uid: 674 components: - type: Transform pos: 2.5,-23.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21498 - uid: 675 components: - type: Transform pos: 2.5,-24.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21498 - uid: 780 components: - type: Transform pos: -35.5,7.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21635 - uid: 1017 components: - type: Transform pos: -35.5,9.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21635 - uid: 1191 components: - type: Transform @@ -70150,6 +70192,9 @@ entities: - type: Transform pos: 16.5,-8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21558 - uid: 1559 components: - type: Transform @@ -70185,6 +70230,9 @@ entities: - type: Transform pos: -26.5,-22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 2680 components: - type: Transform @@ -70270,6 +70318,9 @@ entities: - type: Transform pos: 4.5,12.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 - uid: 4330 components: - type: Transform @@ -70280,6 +70331,9 @@ entities: - type: Transform pos: 15.5,-8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21558 - uid: 4492 components: - type: Transform @@ -70305,21 +70359,25 @@ entities: - type: Transform pos: 17.5,-8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21558 - uid: 4791 components: - type: Transform pos: 18.5,-23.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21498 - uid: 5204 components: - type: Transform pos: 18.5,-24.5 parent: 60 - - uid: 5221 - components: - - type: Transform - pos: 40.5,4.5 - parent: 60 + - type: DeviceNetwork + deviceLists: + - 21498 - uid: 5466 components: - type: Transform @@ -70364,26 +70422,11 @@ entities: - type: Transform pos: -39.5,-0.5 parent: 60 - - uid: 5649 - components: - - type: Transform - pos: 15.5,10.5 - parent: 60 - - uid: 5651 - components: - - type: Transform - pos: 16.5,10.5 - parent: 60 - uid: 5684 components: - type: Transform pos: 44.5,-38.5 parent: 60 - - uid: 5889 - components: - - type: Transform - pos: 17.5,10.5 - parent: 60 - uid: 5900 components: - type: Transform @@ -70414,6 +70457,49 @@ entities: - type: Transform pos: 15.5,6.5 parent: 60 + - uid: 6147 + components: + - type: Transform + pos: -13.5,-22.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21497 + - 21503 + - uid: 6156 + components: + - type: Transform + pos: -13.5,-24.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21497 + - 21503 + - uid: 6173 + components: + - type: Transform + pos: -13.5,-23.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21497 + - 21503 + - uid: 6174 + components: + - type: Transform + pos: 14.5,8.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 + - uid: 6367 + components: + - type: Transform + pos: 14.5,9.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 - uid: 6489 components: - type: Transform @@ -70424,6 +70510,22 @@ entities: - type: Transform pos: 20.5,-21.5 parent: 60 + - uid: 6542 + components: + - type: Transform + pos: 14.5,7.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 + - uid: 6560 + components: + - type: Transform + pos: -17.5,7.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21635 - uid: 6561 components: - type: Transform @@ -70434,6 +70536,15 @@ entities: - type: Transform pos: -40.5,23.5 parent: 60 + - uid: 6626 + components: + - type: Transform + pos: 15.5,-21.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21558 + - 21498 - uid: 6661 components: - type: Transform @@ -70457,6 +70568,14 @@ entities: - type: Transform pos: -40.5,24.5 parent: 60 + - uid: 6830 + components: + - type: Transform + pos: -17.5,8.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21635 - uid: 6854 components: - type: Transform @@ -70490,6 +70609,9 @@ entities: - type: Transform pos: 18.5,-22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21498 - uid: 7591 components: - type: Transform @@ -70520,6 +70642,9 @@ entities: - type: Transform pos: -35.5,8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21635 - uid: 8168 components: - type: Transform @@ -70538,16 +70663,25 @@ entities: - type: Transform pos: 17.5,22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21553 - uid: 8612 components: - type: Transform pos: 16.5,22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21553 - uid: 8613 components: - type: Transform pos: 15.5,22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21553 - uid: 8774 components: - type: Transform @@ -70573,11 +70707,40 @@ entities: - type: Transform pos: 44.5,-15.5 parent: 60 - - uid: 9282 + - uid: 9058 components: - type: Transform - pos: 45.5,4.5 + pos: -17.5,9.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21635 + - uid: 9184 + components: + - type: Transform + pos: 17.5,-21.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21558 + - 21498 + - uid: 9237 + components: + - type: Transform + pos: 16.5,-21.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21558 + - 21498 + - uid: 9283 + components: + - type: Transform + pos: -13.5,9.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 - uid: 9409 components: - type: Transform @@ -70593,11 +70756,27 @@ entities: - type: Transform pos: -51.5,1.5 parent: 60 + - uid: 9465 + components: + - type: Transform + pos: -13.5,8.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 - uid: 9468 components: - type: Transform pos: -39.5,0.5 parent: 60 + - uid: 9488 + components: + - type: Transform + pos: -13.5,7.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 - uid: 9526 components: - type: Transform @@ -70628,16 +70807,25 @@ entities: - type: Transform pos: -16.5,-17.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 11339 components: - type: Transform pos: -15.5,-17.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 11340 components: - type: Transform pos: -14.5,-17.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 11520 components: - type: Transform @@ -70681,51 +70869,76 @@ entities: - type: Transform pos: 42.5,8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21543 - uid: 13107 components: - type: Transform pos: 42.5,9.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21543 - uid: 13148 components: - type: Transform pos: 41.5,12.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21543 - uid: 13149 components: - type: Transform pos: 40.5,12.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21543 - uid: 13150 components: - type: Transform pos: 39.5,12.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21543 - uid: 13151 components: - type: Transform pos: 35.5,7.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21539 + - 21543 - uid: 13152 components: - type: Transform pos: 35.5,8.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21539 + - 21543 - uid: 13153 components: - type: Transform pos: 35.5,9.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21539 + - 21543 - uid: 13243 components: - type: Transform pos: 3.5,12.5 parent: 60 - - uid: 13623 - components: - - type: Transform - pos: 41.5,4.5 - parent: 60 + - type: DeviceNetwork + deviceLists: + - 21514 - uid: 13961 components: - type: Transform @@ -70746,21 +70959,6 @@ entities: - type: Transform pos: -15.5,6.5 parent: 60 - - uid: 13968 - components: - - type: Transform - pos: -14.5,10.5 - parent: 60 - - uid: 13969 - components: - - type: Transform - pos: -15.5,10.5 - parent: 60 - - uid: 13970 - components: - - type: Transform - pos: -16.5,10.5 - parent: 60 - uid: 13979 components: - type: Transform @@ -70781,6 +70979,9 @@ entities: - type: Transform pos: -26.5,-23.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 16007 components: - type: Transform @@ -70811,6 +71012,9 @@ entities: - type: Transform pos: -26.5,-24.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 21503 - uid: 18462 components: - type: Transform @@ -70936,16 +71140,33 @@ entities: - type: Transform pos: -16.5,22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 23767 - uid: 23765 components: - type: Transform pos: -15.5,22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 23767 - uid: 23766 components: - type: Transform pos: -14.5,22.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 23767 + - uid: 24791 + components: + - type: Transform + pos: 38.5,3.5 + parent: 60 + - type: DeviceNetwork + deviceLists: + - 21543 - proto: Fireplace entities: - uid: 1532 @@ -70965,15 +71186,15 @@ entities: parent: 60 - proto: Flare entities: - - uid: 19032 + - uid: 9525 components: - type: Transform - pos: 47.167614,3.6723566 + pos: 43.64817,-0.44017056 parent: 60 - - uid: 19033 + - uid: 10579 components: - type: Transform - pos: 47.042614,3.7192316 + pos: 43.55442,-0.36204556 parent: 60 - proto: Flash entities: @@ -73548,14 +73769,22 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 11739 + - uid: 11841 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 48.5,2.5 + parent: 60 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12192 components: - type: Transform rot: 1.5707963267948966 rad - pos: 40.5,3.5 + pos: 41.5,2.5 parent: 60 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 12629 components: - type: Transform @@ -73564,6 +73793,14 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12635 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12823 components: - type: Transform @@ -73603,6 +73840,14 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 13334 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,0.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 13515 components: - type: Transform @@ -74780,13 +75025,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 17545 - components: - - type: Transform - pos: 41.5,7.5 - parent: 60 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 17863 components: - type: Transform @@ -79973,6 +80211,13 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 4001 + components: + - type: Transform + pos: 48.5,4.5 + parent: 60 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 4008 components: - type: Transform @@ -81479,6 +81724,13 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 5904 + components: + - type: Transform + pos: 48.5,5.5 + parent: 60 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 5910 components: - type: Transform @@ -81606,6 +81858,13 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 5968 + components: + - type: Transform + pos: 48.5,3.5 + parent: 60 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 5969 components: - type: Transform @@ -83604,6 +83863,54 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 11132 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11158 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 43.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11739 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 44.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11757 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 47.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11814 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11830 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 48.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12221 components: - type: Transform @@ -83611,6 +83918,14 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 12284 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 42.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12522 components: - type: Transform @@ -83624,6 +83939,21 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12607 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 41.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12620 + components: + - type: Transform + pos: 49.5,3.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12627 components: - type: Transform @@ -83893,8 +84223,7 @@ entities: - uid: 13511 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 43.5,3.5 + pos: 49.5,2.5 parent: 60 - type: AtmosPipeColor color: '#0335FCFF' @@ -83914,14 +84243,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13514 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 42.5,2.5 - parent: 60 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13518 components: - type: Transform @@ -83930,36 +84251,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13519 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 42.5,3.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 13520 - components: - - type: Transform - pos: 40.5,2.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 13526 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,3.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 13529 - components: - - type: Transform - pos: 40.5,1.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 13539 components: - type: Transform @@ -88879,14 +89170,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 18552 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 48.5,7.5 - parent: 60 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 18585 components: - type: Transform @@ -89122,151 +89405,19 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 18870 - components: - - type: Transform - pos: 41.5,3.5 - parent: 60 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18871 - components: - - type: Transform - pos: 41.5,4.5 - parent: 60 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 18872 components: - type: Transform - pos: 41.5,5.5 - parent: 60 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18873 - components: - - type: Transform - pos: 41.5,6.5 + pos: 48.5,6.5 parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 18881 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 44.5,3.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18882 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 45.5,3.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18883 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 46.5,3.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18884 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 47.5,3.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18885 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 48.5,3.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 18892 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,-1.5 parent: 60 - - uid: 18896 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 50.5,0.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18897 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 51.5,0.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18898 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 52.5,0.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18899 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,0.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18900 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 50.5,2.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18901 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 51.5,2.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18902 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 52.5,2.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18903 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,2.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18908 - components: - - type: Transform - pos: 49.5,1.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 18911 components: - type: Transform @@ -93140,6 +93291,21 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 11153 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,7.5 + parent: 60 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11722 + components: + - type: Transform + pos: 42.5,2.5 + parent: 60 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 12196 components: - type: Transform @@ -93170,6 +93336,21 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12744 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 49.5,1.5 + parent: 60 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13113 + components: + - type: Transform + pos: 48.5,7.5 + parent: 60 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 13245 components: - type: Transform @@ -93208,14 +93389,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13469 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 49.5,3.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 13504 components: - type: Transform @@ -93223,14 +93396,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13510 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 41.5,2.5 - parent: 60 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13534 components: - type: Transform @@ -94170,22 +94335,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 18894 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 49.5,2.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18895 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,0.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 18922 components: - type: Transform @@ -96384,28 +96533,15 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 18904 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 54.5,0.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18905 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 54.5,2.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 18906 components: - type: Transform rot: 1.5707963267948966 rad pos: 48.5,0.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 24792 - type: AtmosPipeColor color: '#0335FCFF' - uid: 18937 @@ -96600,7 +96736,9 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 24657 +- proto: GasVentPumpVox + entities: + - uid: 17545 components: - type: Transform rot: 1.5707963267948966 rad @@ -96608,7 +96746,7 @@ entities: parent: 60 - type: DeviceNetwork deviceLists: - - 930 + - 398 - proto: GasVentScrubber entities: - uid: 61 @@ -97789,12 +97927,15 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 18910 + - uid: 18884 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 48.5,2.5 + rot: 3.141592653589793 rad + pos: 42.5,1.5 parent: 60 + - type: DeviceNetwork + deviceLists: + - 24792 - type: AtmosPipeColor color: '#FF1212FF' - uid: 18915 @@ -97955,24 +98096,26 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 24661 +- proto: GasVentScrubberVox + entities: + - uid: 1911 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-12.5 + rot: 3.141592653589793 rad + pos: 12.5,-10.5 parent: 60 - type: DeviceNetwork deviceLists: - - 930 - - uid: 24665 + - 398 + - uid: 13640 components: - type: Transform - rot: 3.141592653589793 rad - pos: 12.5,-10.5 + rot: -1.5707963267948966 rad + pos: 10.5,-12.5 parent: 60 - type: DeviceNetwork deviceLists: - - 930 + - 398 - proto: GasVolumePump entities: - uid: 14850 @@ -98273,16 +98416,6 @@ entities: - type: Transform pos: 2.5,-19.5 parent: 60 - - uid: 397 - components: - - type: Transform - pos: 57.5,9.5 - parent: 60 - - uid: 398 - components: - - type: Transform - pos: 57.5,7.5 - parent: 60 - uid: 464 components: - type: Transform @@ -99777,11 +99910,6 @@ entities: - type: Transform pos: -40.5,21.5 parent: 60 - - uid: 5862 - components: - - type: Transform - pos: 42.5,7.5 - parent: 60 - uid: 5871 components: - type: Transform @@ -101186,11 +101314,6 @@ entities: - type: Transform pos: 55.5,29.5 parent: 60 - - uid: 11841 - components: - - type: Transform - pos: 55.5,4.5 - parent: 60 - uid: 11856 components: - type: Transform @@ -101401,11 +101524,6 @@ entities: - type: Transform pos: 39.5,-78.5 parent: 60 - - uid: 12620 - components: - - type: Transform - pos: 52.5,4.5 - parent: 60 - uid: 12647 components: - type: Transform @@ -103177,6 +103295,21 @@ entities: - type: Transform pos: -39.5,4.5 parent: 60 + - uid: 19005 + components: + - type: Transform + pos: 59.5,7.5 + parent: 60 + - uid: 19010 + components: + - type: Transform + pos: 59.5,9.5 + parent: 60 + - uid: 19025 + components: + - type: Transform + pos: 42.5,5.5 + parent: 60 - uid: 19067 components: - type: Transform @@ -103322,6 +103455,11 @@ entities: - type: Transform pos: 55.5,19.5 parent: 60 + - uid: 19422 + components: + - type: Transform + pos: 55.5,1.5 + parent: 60 - uid: 19425 components: - type: Transform @@ -103352,6 +103490,11 @@ entities: - type: Transform pos: 57.5,26.5 parent: 60 + - uid: 19512 + components: + - type: Transform + pos: 52.5,1.5 + parent: 60 - uid: 19528 components: - type: Transform @@ -103462,6 +103605,16 @@ entities: - type: Transform pos: 20.5,-3.5 parent: 60 + - uid: 19828 + components: + - type: Transform + pos: 41.5,3.5 + parent: 60 + - uid: 19829 + components: + - type: Transform + pos: 40.5,3.5 + parent: 60 - uid: 20099 components: - type: Transform @@ -107160,6 +107313,12 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-24.5 parent: 60 + - uid: 21175 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,5.5 + parent: 60 - uid: 24333 components: - type: Transform @@ -107187,12 +107346,6 @@ entities: - type: Transform pos: 2.5,11.5 parent: 60 - - uid: 24355 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,7.5 - parent: 60 - proto: JetpackBlueFilled entities: - uid: 4705 @@ -107523,6 +107676,20 @@ entities: - type: Transform pos: -5.6705914,-28.301483 parent: 60 +- proto: LockableButtonMedical + entities: + - uid: 859 + components: + - type: MetaData + name: Medical Exit Button + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,-21.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 8532: + - Pressed: Open - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 15401 @@ -108255,6 +108422,11 @@ entities: - type: Transform pos: -30.5,2.5 parent: 60 + - uid: 3072 + components: + - type: Transform + pos: -18.5,-15.5 + parent: 60 - uid: 5661 components: - type: Transform @@ -109540,27 +109712,12 @@ entities: parent: 60 - proto: OreBox entities: - - uid: 23728 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 43.5,1.5 - parent: 60 -- proto: OreProcessor - entities: - - uid: 13113 + - uid: 24786 components: - type: Transform - pos: 45.5,4.5 + rot: 1.5707963267948966 rad + pos: 48.5,-1.5 parent: 60 - - type: MaterialStorage - materialWhiteList: - - Steel - - Glass - - Plasma - - Uranium - - Gold - - Silver - proto: OxygenCanister entities: - uid: 2757 @@ -110213,6 +110370,11 @@ entities: - type: Transform pos: 7.513824,-45.76617 parent: 60 + - uid: 13970 + components: + - type: Transform + pos: 43.55442,0.5910795 + parent: 60 - uid: 15198 components: - type: Transform @@ -110223,35 +110385,20 @@ entities: - type: Transform pos: -30.398247,32.48968 parent: 60 - - uid: 17032 + - uid: 16993 components: - type: Transform - pos: -1.9970434,29.559788 + pos: 43.55442,0.5910795 parent: 60 - - uid: 17033 + - uid: 17032 components: - type: Transform pos: -1.9970434,29.559788 parent: 60 - - uid: 19022 - components: - - type: Transform - pos: 56.400715,6.556079 - parent: 60 - - uid: 19023 - components: - - type: Transform - pos: 56.338215,6.524829 - parent: 60 - - uid: 19024 - components: - - type: Transform - pos: 47.482098,3.6148071 - parent: 60 - - uid: 19025 + - uid: 17033 components: - type: Transform - pos: 47.482098,3.6148071 + pos: -1.9970434,29.559788 parent: 60 - uid: 20015 components: @@ -110268,6 +110415,16 @@ entities: - type: Transform pos: 68.478806,-13.493814 parent: 60 + - uid: 24781 + components: + - type: Transform + pos: 56.59298,10.581751 + parent: 60 + - uid: 24782 + components: + - type: Transform + pos: 56.59298,10.581751 + parent: 60 - proto: PartRodMetal10 entities: - uid: 19451 @@ -110383,16 +110540,6 @@ entities: parent: 60 - proto: Pickaxe entities: - - uid: 8521 - components: - - type: Transform - pos: 36.597534,2.49432 - parent: 60 - - uid: 10579 - components: - - type: Transform - pos: 36.441284,2.541195 - parent: 60 - uid: 19522 components: - type: Transform @@ -110500,20 +110647,20 @@ entities: - type: Transform pos: -17.5,-43.5 parent: 60 - - uid: 7038 + - uid: 5365 components: - type: Transform - pos: -40.5,-4.5 + pos: 47.5,4.5 parent: 60 - - uid: 9184 + - uid: 6126 components: - type: Transform - pos: 42.5,6.5 + pos: 42.5,7.5 parent: 60 - - uid: 11814 + - uid: 7038 components: - type: Transform - pos: 52.5,3.5 + pos: -40.5,-4.5 parent: 60 - uid: 12401 components: @@ -110545,6 +110692,36 @@ entities: - type: Transform pos: 59.5,11.5 parent: 60 + - uid: 18883 + components: + - type: Transform + pos: 57.5,5.5 + parent: 60 + - uid: 18898 + components: + - type: Transform + pos: 50.5,4.5 + parent: 60 + - uid: 18908 + components: + - type: Transform + pos: 58.5,5.5 + parent: 60 + - uid: 18910 + components: + - type: Transform + pos: 56.5,4.5 + parent: 60 + - uid: 19016 + components: + - type: Transform + pos: 42.5,4.5 + parent: 60 + - uid: 24783 + components: + - type: Transform + pos: 55.5,-0.5 + parent: 60 - proto: PlasticFlapsAirtightOpaque entities: - uid: 13984 @@ -111522,13 +111699,6 @@ entities: - type: Transform pos: -14.5,31.5 parent: 60 -- proto: PosterLegitSafetyReport - entities: - - uid: 1698 - components: - - type: Transform - pos: -17.5,-16.5 - parent: 60 - proto: PosterLegitScience entities: - uid: 9456 @@ -113914,21 +114084,18 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 18678 + - uid: 18887 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 40.5,2.5 + pos: 21.5,2.5 parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 18887 + - uid: 18896 components: - type: Transform - pos: 21.5,2.5 + pos: 42.5,2.5 parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 19142 components: - type: Transform @@ -113944,14 +114111,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 19405 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 46.5,5.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 19406 components: - type: Transform @@ -113983,21 +114142,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 19414 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 55.5,6.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 19415 - components: - - type: Transform - pos: 50.5,4.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 19431 components: - type: Transform @@ -114049,6 +114193,23 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 + - uid: 19830 + components: + - type: Transform + pos: 50.5,2.5 + parent: 60 + - uid: 19832 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 55.5,6.5 + parent: 60 + - uid: 19834 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.5,5.5 + parent: 60 - uid: 19879 components: - type: Transform @@ -114515,14 +114676,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 8773 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 56.5,1.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 20978 components: - type: Transform @@ -115404,20 +115557,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 19421 - components: - - type: Transform - pos: 53.5,4.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 19422 - components: - - type: Transform - pos: 53.5,0.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 19423 components: - type: Transform @@ -115462,6 +115601,12 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 + - uid: 19833 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 58.5,8.5 + parent: 60 - uid: 19923 components: - type: Transform @@ -115567,6 +115712,12 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 + - uid: 21548 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 54.5,3.5 + parent: 60 - uid: 21738 components: - type: Transform @@ -115685,6 +115836,12 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 + - uid: 24355 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,3.5 + parent: 60 - uid: 24546 components: - type: Transform @@ -115856,11 +116013,6 @@ entities: - type: Transform pos: 5.5,-38.5 parent: 60 - - uid: 5223 - components: - - type: Transform - pos: 46.5,6.5 - parent: 60 - uid: 5279 components: - type: Transform @@ -115926,11 +116078,6 @@ entities: - type: Transform pos: -19.5,-37.5 parent: 60 - - uid: 8047 - components: - - type: Transform - pos: 36.5,2.5 - parent: 60 - uid: 8950 components: - type: Transform @@ -117201,11 +117348,6 @@ entities: - type: Transform pos: -43.5,-13.5 parent: 60 - - uid: 19512 - components: - - type: Transform - pos: 50.5,14.5 - parent: 60 - uid: 19513 components: - type: Transform @@ -117311,11 +117453,6 @@ entities: - type: Transform pos: 17.5,0.5 parent: 60 - - uid: 23657 - components: - - type: Transform - pos: 56.5,1.5 - parent: 60 - proto: RandomVending entities: - uid: 10380 @@ -117431,11 +117568,11 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-43.5 parent: 60 - - uid: 24766 + - uid: 18894 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 51.5,4.5 + rot: 1.5707963267948966 rad + pos: 40.5,2.5 parent: 60 - proto: ReinforcedGirder entities: @@ -118491,12 +118628,6 @@ entities: - type: Transform pos: -59.5,-25.5 parent: 60 - - uid: 3420 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,4.5 - parent: 60 - uid: 3439 components: - type: Transform @@ -119020,11 +119151,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-69.5 parent: 60 - - uid: 5222 - components: - - type: Transform - pos: 42.5,7.5 - parent: 60 - uid: 5238 components: - type: Transform @@ -119309,16 +119435,6 @@ entities: - type: Transform pos: -3.5,-69.5 parent: 60 - - uid: 6173 - components: - - type: Transform - pos: 57.5,9.5 - parent: 60 - - uid: 6174 - components: - - type: Transform - pos: 57.5,7.5 - parent: 60 - uid: 6183 components: - type: Transform @@ -120068,11 +120184,6 @@ entities: - type: Transform pos: -64.5,-6.5 parent: 60 - - uid: 9237 - components: - - type: Transform - pos: 52.5,4.5 - parent: 60 - uid: 9311 components: - type: Transform @@ -121347,6 +121458,33 @@ entities: - type: Transform pos: 39.5,-15.5 parent: 60 + - uid: 18901 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,1.5 + parent: 60 + - uid: 18905 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,1.5 + parent: 60 + - uid: 19026 + components: + - type: Transform + pos: 40.5,3.5 + parent: 60 + - uid: 19029 + components: + - type: Transform + pos: 41.5,3.5 + parent: 60 + - uid: 19032 + components: + - type: Transform + pos: 42.5,5.5 + parent: 60 - uid: 19063 components: - type: Transform @@ -121636,6 +121774,16 @@ entities: - type: Transform pos: -62.5,-3.5 parent: 60 + - uid: 24659 + components: + - type: Transform + pos: 59.5,9.5 + parent: 60 + - uid: 24661 + components: + - type: Transform + pos: 59.5,7.5 + parent: 60 - uid: 24667 components: - type: Transform @@ -121784,11 +121932,11 @@ entities: parent: 60 - proto: SalvageMagnet entities: - - uid: 19030 + - uid: 18897 components: - type: Transform rot: 1.5707963267948966 rad - pos: 49.5,1.5 + pos: 49.5,0.5 parent: 60 - proto: Saw entities: @@ -122011,25 +122159,25 @@ entities: - type: Transform pos: -2.9657934,29.544163 parent: 60 - - uid: 19026 + - uid: 19145 components: - type: Transform - pos: 54.553997,6.509204 + pos: 21.565151,21.553753 parent: 60 - - uid: 19027 + - uid: 23109 components: - type: Transform - pos: 54.600872,6.493579 + pos: -120.48613,15.522119 parent: 60 - - uid: 19145 + - uid: 24766 components: - type: Transform - pos: 21.565151,21.553753 + pos: 56.171104,10.550501 parent: 60 - - uid: 23109 + - uid: 24767 components: - type: Transform - pos: -120.48613,15.522119 + pos: 56.171104,10.550501 parent: 60 - proto: SheetPaper entities: @@ -122129,15 +122277,15 @@ entities: - type: Transform pos: -2.4501684,29.544163 parent: 60 - - uid: 19016 + - uid: 24729 components: - type: Transform - pos: 55.775715,6.509204 + pos: 55.733604,10.534876 parent: 60 - - uid: 19021 + - uid: 24730 components: - type: Transform - pos: 55.775715,6.524829 + pos: 55.733604,10.534876 parent: 60 - proto: SheetPlastic entities: @@ -122230,20 +122378,20 @@ entities: - type: Transform pos: -3.5282934,29.543653 parent: 60 - - uid: 19010 + - uid: 18903 components: - type: Transform - pos: 55.159428,6.477954 + pos: 55.43673,10.519251 parent: 60 - - uid: 19015 + - uid: 23110 components: - type: Transform - pos: 55.159428,6.493579 + pos: -120.32988,15.381494 parent: 60 - - uid: 23110 + - uid: 24665 components: - type: Transform - pos: -120.32988,15.381494 + pos: 55.43673,10.519251 parent: 60 - proto: SheetUranium entities: @@ -122259,11 +122407,6 @@ entities: - type: Transform pos: 45.481277,-1.4287177 parent: 60 - - uid: 19029 - components: - - type: Transform - pos: 56.39086,10.557282 - parent: 60 - proto: ShuttersNormal entities: - uid: 914 @@ -123194,17 +123337,6 @@ entities: - Pressed: Toggle 16973: - Pressed: Toggle - - uid: 17876 - components: - - type: Transform - pos: 58.5,13.5 - parent: 60 - - type: DeviceLinkSource - linkedPorts: - 13175: - - Pressed: Toggle - 13178: - - Pressed: Toggle - uid: 18438 components: - type: Transform @@ -123218,35 +123350,6 @@ entities: - Pressed: Toggle 18517: - Pressed: Toggle - - uid: 18802 - components: - - type: Transform - pos: 57.5,10.5 - parent: 60 - - type: DeviceLinkSource - linkedPorts: - 13177: - - Pressed: Toggle - 13176: - - Pressed: Toggle - - uid: 19107 - components: - - type: Transform - pos: 55.5,4.5 - parent: 60 - - type: DeviceLinkSource - linkedPorts: - 11830: - - Pressed: Toggle - - uid: 19108 - components: - - type: Transform - pos: 55.5,-1.5 - parent: 60 - - type: DeviceLinkSource - linkedPorts: - 11697: - - Pressed: Toggle - proto: SignalButtonDirectional entities: - uid: 1240 @@ -123756,6 +123859,18 @@ entities: - Pressed: Toggle 18706: - Pressed: Toggle + - uid: 21386 + components: + - type: MetaData + name: Janitor Signal Button + - type: Transform + rot: -1.5707963267948966 rad + pos: 46.5,5.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 21175: + - Pressed: Toggle - uid: 21611 components: - type: MetaData @@ -123816,29 +123931,57 @@ entities: linkedPorts: 24350: - Pressed: Toggle - - uid: 24354 + - uid: 24365 components: - type: MetaData - name: Janitorial Service Button + name: Janitorial Service Light - type: Transform - rot: 3.141592653589793 rad - pos: 43.5,4.5 + rot: -1.5707963267948966 rad + pos: 46.5,-24.5 parent: 60 - type: DeviceLinkSource linkedPorts: - 24355: + 24337: - Pressed: Toggle - - uid: 24365 + - uid: 24787 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,1.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 24784: + - Pressed: Toggle + - uid: 24788 components: - - type: MetaData - name: Janitorial Service Light - type: Transform rot: -1.5707963267948966 rad - pos: 46.5,-24.5 + pos: 52.5,1.5 parent: 60 - type: DeviceLinkSource linkedPorts: - 24337: + 24784: + - Pressed: Toggle + - uid: 24789 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,1.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 24785: + - Pressed: Toggle + - uid: 24790 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,1.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 24785: - Pressed: Toggle - proto: SignalButtonWindows entities: @@ -123862,6 +124005,94 @@ entities: 24352: - On: On - Off: Off + - uid: 18802 + components: + - type: MetaData + desc: Push this once to align it with the directional arrows + name: IN/OUT Switch + - type: Transform + rot: 3.141592653589793 rad + pos: 56.5,5.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 13602: + - On: Reverse + - Off: Forward + 13176: + - On: Reverse + - Off: Forward + 13384: + - On: Reverse + - Off: Forward + 18873: + - On: Reverse + - Off: Forward + 5338: + - On: Reverse + - Off: Forward + 6127: + - On: Reverse + - Off: Forward + 13142: + - On: Reverse + - Off: Forward + 13389: + - On: Reverse + - Off: Forward + 13175: + - On: Reverse + - Off: Forward + 5221: + - On: Reverse + - Off: Forward + 9238: + - On: Reverse + - Off: Forward + 13178: + - Off: Forward + - On: Reverse + 13177: + - On: Reverse + - Off: Forward + 397: + - On: Reverse + - Off: Forward + - uid: 18997 + components: + - type: MetaData + name: Front Door Switch + - type: Transform + pos: -20.5,-14.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 144: + - On: Open + - Off: Close + 307: + - On: Open + - Off: Close + - uid: 19837 + components: + - type: MetaData + desc: Required to be open for conveyor function + name: Blast Door Switch + - type: Transform + rot: 3.141592653589793 rad + pos: 55.5,5.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 19033: + - On: Open + - Off: Close + 19835: + - On: Open + - Off: Close + 19836: + - On: Open + - Off: Close - uid: 21187 components: - type: Transform @@ -125209,12 +125440,6 @@ entities: parent: 60 - proto: SignSalvage entities: - - uid: 13640 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 42.5,4.5 - parent: 60 - uid: 13759 components: - type: Transform @@ -128810,18 +129035,6 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,-7.5 parent: 60 - - uid: 13562 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,-14.5 - parent: 60 - - uid: 16993 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,-15.5 - parent: 60 - proto: Stool entities: - uid: 42 @@ -131638,37 +131851,46 @@ entities: - SurveillanceCameraSupply nameSet: True id: Salvage Bay - - uid: 21175 + - uid: 24278 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 56.5,1.5 + pos: 49.5,16.5 parent: 60 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSupply nameSet: True - id: Salvage Exterior - - uid: 24278 + id: Cargo Break Room + - uid: 24279 components: - type: Transform - pos: 49.5,16.5 + pos: 38.5,-1.5 parent: 60 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSupply nameSet: True - id: Cargo Break Room - - uid: 24279 + id: Salv Locker Room + - uid: 24354 components: - type: Transform - pos: 38.5,-1.5 + rot: 3.141592653589793 rad + pos: 47.5,2.5 + parent: 60 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + - uid: 24657 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 56.5,1.5 parent: 60 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSupply nameSet: True - id: Salv Locker Room + id: Salvage Ext - uid: 24723 components: - type: Transform @@ -131711,27 +131933,6 @@ entities: - SurveillanceCameraSupply nameSet: True id: Cargo Dock 2 - - uid: 24729 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 54.5,0.5 - parent: 60 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraSupply - nameSet: True - id: Salvage Airlock 2 - - uid: 24730 - components: - - type: Transform - pos: 54.5,2.5 - parent: 60 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraSupply - nameSet: True - id: Salvage Airlock 1 - proto: SurveillanceCameraWirelessRouterConstructed entities: - uid: 21760 @@ -131864,11 +132065,6 @@ entities: - type: Transform pos: 9.5,-51.5 parent: 60 - - uid: 1858 - components: - - type: Transform - pos: -20.5,-16.5 - parent: 60 - uid: 2076 components: - type: Transform @@ -132082,11 +132278,6 @@ entities: - type: Transform pos: -26.5,-13.5 parent: 60 - - uid: 6145 - components: - - type: Transform - pos: 51.5,6.5 - parent: 60 - uid: 6313 components: - type: Transform @@ -132250,11 +132441,6 @@ entities: - type: Transform pos: 40.5,-10.5 parent: 60 - - uid: 9176 - components: - - type: Transform - pos: 40.5,4.5 - parent: 60 - uid: 9440 components: - type: Transform @@ -132265,17 +132451,6 @@ entities: - type: Transform pos: -34.5,15.5 parent: 60 - - uid: 9465 - components: - - type: Transform - pos: -32.5,15.5 - parent: 60 - - uid: 9488 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 53.5,6.5 - parent: 60 - uid: 9491 components: - type: Transform @@ -132403,11 +132578,6 @@ entities: - type: Transform pos: 44.5,13.5 parent: 60 - - uid: 13114 - components: - - type: Transform - pos: 41.5,4.5 - parent: 60 - uid: 13146 components: - type: Transform @@ -132443,16 +132613,6 @@ entities: - type: Transform pos: 24.5,-0.5 parent: 60 - - uid: 13271 - components: - - type: Transform - pos: 46.5,3.5 - parent: 60 - - uid: 13272 - components: - - type: Transform - pos: 47.5,3.5 - parent: 60 - uid: 13498 components: - type: Transform @@ -132463,6 +132623,12 @@ entities: - type: Transform pos: -12.5,-13.5 parent: 60 + - uid: 13623 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -18.5,-16.5 + parent: 60 - uid: 13688 components: - type: Transform @@ -132684,20 +132850,10 @@ entities: - type: Transform pos: -8.5,32.5 parent: 60 - - uid: 19005 - components: - - type: Transform - pos: 55.5,6.5 - parent: 60 - - uid: 19006 - components: - - type: Transform - pos: 56.5,6.5 - parent: 60 - - uid: 19007 + - uid: 18968 components: - type: Transform - pos: 54.5,6.5 + pos: 38.5,3.5 parent: 60 - uid: 19011 components: @@ -134811,13 +134967,6 @@ entities: - type: Transform pos: 9.6670475,13.731877 parent: 60 -- proto: ToyGygax - entities: - - uid: 5904 - components: - - type: Transform - pos: -32.487022,15.578259 - parent: 60 - proto: ToyMouse entities: - uid: 14221 @@ -135014,38 +135163,82 @@ entities: - Middle: Close - Right: Open - Left: Open - - uid: 12607 + - uid: 11821 components: - type: Transform - pos: 50.5,2.5 + pos: 44.5,5.5 parent: 60 - type: DeviceLinkSource linkedPorts: - 11722: + 11697: - Left: Forward - Right: Reverse - Middle: Off - 5285: + 12019: - Left: Forward - Right: Reverse - Middle: Off - 5284: + 13083: - Left: Forward - Right: Reverse - Middle: Off - 11757: + 11864: - Left: Forward - Right: Reverse - Middle: Off - 11881: + 12882: - Left: Forward - Right: Reverse - Middle: Off - 9238: + 12018: + - Left: Forward + - Right: Reverse + - Middle: Off + 5742: + - Left: Forward + - Right: Reverse + - Middle: Off + 13136: + - Left: Forward + - Right: Reverse + - Middle: Off + 9282: - Left: Forward - Right: Reverse - Middle: Off - 12889: + 5740: + - Left: Forward + - Right: Reverse + - Middle: Off + 11816: + - Left: Forward + - Right: Reverse + - Middle: Off + 13114: + - Left: Forward + - Right: Reverse + - Middle: Off + 13084: + - Left: Forward + - Right: Reverse + - Middle: Off + 8773: + - Left: Forward + - Right: Reverse + - Middle: Off + 18895: + - Left: Forward + - Right: Reverse + - Middle: Off + 9242: + - Left: Forward + - Right: Reverse + - Middle: Off + 6145: + - Left: Forward + - Right: Reverse + - Middle: Off + 9452: - Left: Forward - Right: Reverse - Middle: Off @@ -135113,25 +135306,33 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - - uid: 24108 + - uid: 23728 components: - type: Transform - pos: -12.5,-42.5 + pos: 40.5,1.5 parent: 60 - type: DeviceLinkSource linkedPorts: - 4073: + 23657: - Left: Forward - Right: Reverse - Middle: Off - - uid: 24767 + 19831: + - Left: Forward + - Right: Reverse + - Middle: Off + 18894: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 24108 components: - type: Transform - pos: 50.5,4.5 + pos: -12.5,-42.5 parent: 60 - type: DeviceLinkSource linkedPorts: - 24766: + 4073: - Left: Forward - Right: Reverse - Middle: Off @@ -135520,24 +135721,24 @@ entities: parent: 60 - proto: VendingMachineRoboDrobe entities: - - uid: 12819 + - uid: 5862 components: - type: Transform - pos: -37.5,14.5 + pos: -36.5,14.5 parent: 60 - proto: VendingMachineRobotics entities: - - uid: 3775 + - uid: 18871 components: - type: Transform - pos: -36.5,14.5 + pos: -32.5,15.5 parent: 60 - proto: VendingMachineSalvage entities: - - uid: 13136 + - uid: 13386 components: - type: Transform - pos: 38.5,2.5 + pos: 38.5,-1.5 parent: 60 - proto: VendingMachineSciDrobe entities: @@ -135694,6 +135895,11 @@ entities: - type: Transform pos: -25.5,-28.5 parent: 60 + - uid: 5743 + components: + - type: Transform + pos: -18.5,-14.5 + parent: 60 - uid: 7582 components: - type: Transform @@ -137823,6 +138029,12 @@ entities: - type: Transform pos: 53.5,-19.5 parent: 60 + - uid: 3212 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,2.5 + parent: 60 - uid: 3218 components: - type: Transform @@ -139260,6 +139472,16 @@ entities: - type: Transform pos: 3.5,-78.5 parent: 60 + - uid: 5222 + components: + - type: Transform + pos: 59.5,8.5 + parent: 60 + - uid: 5225 + components: + - type: Transform + pos: 56.5,3.5 + parent: 60 - uid: 5248 components: - type: Transform @@ -139375,6 +139597,11 @@ entities: - type: Transform pos: 21.5,14.5 parent: 60 + - uid: 5285 + components: + - type: Transform + pos: 55.5,3.5 + parent: 60 - uid: 5287 components: - type: Transform @@ -139405,6 +139632,11 @@ entities: - type: Transform pos: -26.5,-34.5 parent: 60 + - uid: 5334 + components: + - type: Transform + pos: 52.5,3.5 + parent: 60 - uid: 5341 components: - type: Transform @@ -139458,11 +139690,6 @@ entities: rot: -1.5707963267948966 rad pos: 53.5,-2.5 parent: 60 - - uid: 5499 - components: - - type: Transform - pos: 56.5,5.5 - parent: 60 - uid: 5500 components: - type: Transform @@ -139649,6 +139876,12 @@ entities: - type: Transform pos: -18.5,10.5 parent: 60 + - uid: 5649 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 59.5,10.5 + parent: 60 - uid: 5652 components: - type: Transform @@ -140222,11 +140455,6 @@ entities: - type: Transform pos: -1.5,-74.5 parent: 60 - - uid: 6977 - components: - - type: Transform - pos: 57.5,5.5 - parent: 60 - uid: 6993 components: - type: Transform @@ -141094,11 +141322,6 @@ entities: rot: 3.141592653589793 rad pos: 25.5,5.5 parent: 60 - - uid: 9243 - components: - - type: Transform - pos: 53.5,5.5 - parent: 60 - uid: 9312 components: - type: Transform @@ -141480,16 +141703,6 @@ entities: - type: Transform pos: 18.5,17.5 parent: 60 - - uid: 11816 - components: - - type: Transform - pos: 53.5,1.5 - parent: 60 - - uid: 11821 - components: - - type: Transform - pos: 54.5,1.5 - parent: 60 - uid: 11827 components: - type: Transform @@ -141526,11 +141739,6 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,11.5 parent: 60 - - uid: 11870 - components: - - type: Transform - pos: 52.5,5.5 - parent: 60 - uid: 11961 components: - type: Transform @@ -141566,11 +141774,6 @@ entities: - type: Transform pos: 57.5,19.5 parent: 60 - - uid: 12019 - components: - - type: Transform - pos: 52.5,1.5 - parent: 60 - uid: 12053 components: - type: Transform @@ -141581,11 +141784,6 @@ entities: - type: Transform pos: 8.5,-33.5 parent: 60 - - uid: 12284 - components: - - type: Transform - pos: 57.5,8.5 - parent: 60 - uid: 12399 components: - type: Transform @@ -141636,11 +141834,6 @@ entities: - type: Transform pos: 18.5,-0.5 parent: 60 - - uid: 12635 - components: - - type: Transform - pos: 57.5,6.5 - parent: 60 - uid: 12637 components: - type: Transform @@ -141672,11 +141865,6 @@ entities: rot: -1.5707963267948966 rad pos: 55.5,-3.5 parent: 60 - - uid: 12704 - components: - - type: Transform - pos: 54.5,5.5 - parent: 60 - uid: 12709 components: - type: Transform @@ -141693,11 +141881,6 @@ entities: - type: Transform pos: 18.5,5.5 parent: 60 - - uid: 12744 - components: - - type: Transform - pos: 55.5,5.5 - parent: 60 - uid: 12754 components: - type: Transform @@ -141778,12 +141961,6 @@ entities: - type: Transform pos: 45.5,31.5 parent: 60 - - uid: 12882 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,1.5 - parent: 60 - uid: 12886 components: - type: Transform @@ -141919,12 +142096,6 @@ entities: - type: Transform pos: 46.5,15.5 parent: 60 - - uid: 13159 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 59.5,10.5 - parent: 60 - uid: 13160 components: - type: Transform @@ -141942,6 +142113,11 @@ entities: - type: Transform pos: 46.5,17.5 parent: 60 + - uid: 13213 + components: + - type: Transform + pos: 55.5,5.5 + parent: 60 - uid: 13224 components: - type: Transform @@ -141972,6 +142148,16 @@ entities: - type: Transform pos: 8.5,-34.5 parent: 60 + - uid: 13333 + components: + - type: Transform + pos: 56.5,5.5 + parent: 60 + - uid: 13469 + components: + - type: Transform + pos: 59.5,3.5 + parent: 60 - uid: 13614 components: - type: Transform @@ -141987,6 +142173,11 @@ entities: - type: Transform pos: -9.5,-19.5 parent: 60 + - uid: 13659 + components: + - type: Transform + pos: 59.5,4.5 + parent: 60 - uid: 13672 components: - type: Transform @@ -143987,6 +144178,11 @@ entities: - type: Transform pos: -33.5,21.5 parent: 60 + - uid: 17876 + components: + - type: Transform + pos: 59.5,5.5 + parent: 60 - uid: 17906 components: - type: Transform @@ -144452,6 +144648,11 @@ entities: - type: Transform pos: -34.5,6.5 parent: 60 + - uid: 18552 + components: + - type: Transform + pos: 59.5,6.5 + parent: 60 - uid: 18677 components: - type: Transform @@ -144472,6 +144673,17 @@ entities: - type: Transform pos: -12.5,0.5 parent: 60 + - uid: 18904 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,2.5 + parent: 60 + - uid: 19003 + components: + - type: Transform + pos: 52.5,5.5 + parent: 60 - uid: 19053 components: - type: Transform @@ -148025,6 +148237,11 @@ entities: - type: Transform pos: -3.5,-43.5 parent: 60 + - uid: 5145 + components: + - type: Transform + pos: 46.5,5.5 + parent: 60 - uid: 5146 components: - type: Transform @@ -148726,11 +148943,6 @@ entities: - type: Transform pos: 36.5,-2.5 parent: 60 - - uid: 8986 - components: - - type: Transform - pos: 46.5,4.5 - parent: 60 - uid: 9013 components: - type: Transform @@ -148776,16 +148988,6 @@ entities: - type: Transform pos: 40.5,-2.5 parent: 60 - - uid: 9239 - components: - - type: Transform - pos: 47.5,4.5 - parent: 60 - - uid: 9240 - components: - - type: Transform - pos: 42.5,4.5 - parent: 60 - uid: 9326 components: - type: Transform @@ -148911,11 +149113,6 @@ entities: - type: Transform pos: 11.5,-50.5 parent: 60 - - uid: 11132 - components: - - type: Transform - pos: 43.5,4.5 - parent: 60 - uid: 11149 components: - type: Transform @@ -149241,6 +149438,11 @@ entities: - type: Transform pos: -65.5,46.5 parent: 60 + - uid: 12704 + components: + - type: Transform + pos: 47.5,3.5 + parent: 60 - uid: 12708 components: - type: Transform @@ -149261,6 +149463,11 @@ entities: - type: Transform pos: 32.5,10.5 parent: 60 + - uid: 12819 + components: + - type: Transform + pos: 46.5,3.5 + parent: 60 - uid: 12859 components: - type: Transform @@ -149326,11 +149533,6 @@ entities: - type: Transform pos: 0.5,16.5 parent: 60 - - uid: 13083 - components: - - type: Transform - pos: 38.5,3.5 - parent: 60 - uid: 13085 components: - type: Transform @@ -149346,6 +149548,16 @@ entities: - type: Transform pos: 52.5,15.5 parent: 60 + - uid: 13262 + components: + - type: Transform + pos: 51.5,3.5 + parent: 60 + - uid: 13388 + components: + - type: Transform + pos: 50.5,3.5 + parent: 60 - uid: 13479 components: - type: Transform @@ -149797,6 +150009,11 @@ entities: - type: Transform pos: -11.5,-20.5 parent: 60 + - uid: 18999 + components: + - type: Transform + pos: 42.5,3.5 + parent: 60 - uid: 19197 components: - type: Transform @@ -150598,13 +150815,6 @@ entities: parent: 60 - type: Physics canCollide: False - - uid: 5145 - components: - - type: Transform - pos: -20.5,-14.5 - parent: 60 - - type: Physics - canCollide: False - uid: 7225 components: - type: Transform @@ -151132,11 +151342,6 @@ entities: - type: Transform pos: -32.5,-15.5 parent: 60 - - uid: 3072 - components: - - type: Transform - pos: -20.5,-16.5 - parent: 60 - uid: 9536 components: - type: Transform @@ -151154,6 +151359,11 @@ entities: parent: 60 - type: Physics canCollide: False + - uid: 18998 + components: + - type: Transform + pos: -18.5,-16.5 + parent: 60 - proto: WeaponLaserCarbine entities: - uid: 16447 @@ -151515,22 +151725,11 @@ entities: parent: 60 - proto: WindoorCargoLocked entities: - - uid: 5225 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 45.5,4.5 - parent: 60 - - uid: 6147 + - uid: 11870 components: - type: Transform rot: -1.5707963267948966 rad - pos: 43.5,6.5 - parent: 60 - - uid: 13262 - components: - - type: Transform - pos: 45.5,4.5 + pos: 43.5,7.5 parent: 60 - proto: WindoorHydroponicsLocked entities: @@ -151664,6 +151863,30 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,9.5 parent: 60 + - uid: 19107 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,7.5 + parent: 60 + - uid: 19108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,9.5 + parent: 60 + - uid: 19405 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,5.5 + parent: 60 + - uid: 19414 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,5.5 + parent: 60 - proto: WindoorSecureChapelLocked entities: - uid: 14513 @@ -151795,15 +152018,33 @@ entities: parent: 60 - proto: WindoorSecureSalvageLocked entities: - - uid: 6560 + - uid: 13361 components: - type: Transform - pos: 40.5,4.5 + rot: 3.141592653589793 rad + pos: 38.5,3.5 parent: 60 - - uid: 13602 + - uid: 19006 components: - type: Transform - pos: 41.5,4.5 + pos: 53.5,3.5 + parent: 60 + - uid: 19007 + components: + - type: Transform + pos: 54.5,3.5 + parent: 60 + - uid: 19023 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 44.5,3.5 + parent: 60 + - uid: 19024 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 45.5,3.5 parent: 60 - proto: WindoorSecureScienceLocked entities: @@ -153004,6 +153245,12 @@ entities: - type: Transform pos: -4.5,17.5 parent: 60 + - uid: 13969 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,8.5 + parent: 60 - uid: 14114 components: - type: Transform @@ -153136,6 +153383,18 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-6.5 parent: 60 + - uid: 18870 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,6.5 + parent: 60 + - uid: 19027 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,3.5 + parent: 60 - uid: 19907 components: - type: Transform @@ -156175,7 +156434,7 @@ entities: - uid: 19035 components: - type: Transform - pos: 55.490932,10.622069 + pos: 55.421104,8.597376 parent: 60 - uid: 21239 components: From 3a4affd4384f504495962659aa39f43c7eef3ac1 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 09:59:09 +1000 Subject: [PATCH 133/223] Update submodule to 231.1.0 (#31536) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index f2ee9a43f94..ec3a74d2686 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit f2ee9a43f94288be4662861e6e591da10234c0c7 +Subproject commit ec3a74d26868f9640ac06170bdf1c2557d19a063 From afd0618a601b74a41adf798870ae886e4d9808a3 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:57:12 +1000 Subject: [PATCH 134/223] Station AI (#30944) * Station AI overlay * implement * Bunch of ports * Fix a heap of bugs and basic scouting * helldivers * Shuffle interactions a bit * navmap stuff * Revert "navmap stuff" This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062. * AI wires implemented * Fix examines * Optimise the overlay significantly * Back to old static * BUI radial working * lots of work * Saving work * thanks fork * alright * pc * AI upload console * AI upload * stuff * Fix copy-paste shitcode * AI actions * navmap work * Fixes * first impressions * a * reh * Revert "navmap work" This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e. # Conflicts: # Content.Client/Silicons/StationAi/StationAiOverlay.cs * OD * radar * weh * Fix examines * scoop mine eyes * fixes * reh * Optimise * Final round of optimisations * Fixes * fixes --- Content.Client/Chat/UI/EmotesMenu.xaml.cs | 13 +- .../Lobby/UI/Loadouts/LoadoutWindow.xaml | 20 +- .../Lobby/UI/Loadouts/LoadoutWindow.xaml.cs | 43 +- .../Laws/SiliconLawEditUi/SiliconLawEui.cs | 2 +- .../StationAi/StationAiBoundUserInterface.cs | 28 ++ .../Silicons/StationAi/StationAiMenu.xaml | 13 + .../Silicons/StationAi/StationAiMenu.xaml.cs | 128 ++++++ .../Silicons/StationAi/StationAiOverlay.cs | 23 +- .../StationAi/StationAiSystem.Airlock.cs | 30 ++ .../StationAi/StationAiSystem.Light.cs | 32 ++ .../Silicons/StationAi/StationAiSystem.cs | 6 +- Content.Client/Verbs/VerbSystem.cs | 5 +- .../Administration/Systems/AdminVerbSystem.cs | 1 + .../CommunicationsConsoleSystem.cs | 4 - Content.Server/Database/ServerDbBase.cs | 4 +- .../DeviceNetworkRequiresPowerSystem.cs | 1 - .../Light/EntitySystems/LitOnPoweredSystem.cs | 1 - .../Light/EntitySystems/PoweredLightSystem.cs | 1 - Content.Server/Mind/MindSystem.cs | 4 +- .../Power/EntitySystems/ChargerSystem.cs | 5 +- .../Power/EntitySystems/PowerNetSystem.cs | 1 - .../Power/Generation/Teg/TegSystem.cs | 1 - .../Power/Generator/GasPowerReceiverSystem.cs | 1 - .../DungeonJob/DungeonJob.DunGenExterior.cs | 3 +- .../Silicons/Laws/SiliconLawSystem.cs | 35 +- .../StationAi/AiInteractWireAction.cs | 37 ++ .../Silicons/StationAi/AiVisionWireAction.cs | 40 ++ .../Silicons/StationAi/StationAiSystem.cs | 76 ++++ .../Sound/SpamEmitSoundRequirePowerSystem.cs | 1 - .../Station/Systems/StationSpawningSystem.cs | 40 +- .../Melee/EnergySword/EnergySwordSystem.cs | 2 +- .../ArtifactElectricityTriggerSystem.cs | 2 +- .../ActionBlocker/ActionBlockerSystem.cs | 15 + .../Climbing/Systems/ClimbSystem.cs | 38 +- .../Configurable/ConfigurationComponent.cs | 3 +- Content.Shared/Doors/AirlockWireStatus.cs | 2 +- Content.Shared/Examine/ExamineSystemShared.cs | 33 +- .../Hands/EntitySystems/SharedHandsSystem.cs | 13 + .../Interaction/SharedInteractionSystem.cs | 64 ++- .../LightOnCollideColliderComponent.cs | 13 + .../Components/LightOnCollideComponent.cs | 11 + .../Light/EntitySystems/LightCollideSystem.cs | 82 ++++ .../EntitySystems/SlimPoweredLightSystem.cs | 1 - Content.Shared/Mind/SharedMindSystem.cs | 4 + .../NPC/SharedPathfindingSystem.Line.cs | 6 +- Content.Shared/NPC/SharedPathfindingSystem.cs | 29 +- .../Loadouts/RoleLoadoutPrototype.cs | 10 +- .../Components/SiliconLawBoundComponent.cs | 15 +- .../Components/SiliconLawUpdaterComponent.cs | 17 + .../Laws/SharedSiliconLawSystem.Updater.cs | 17 + .../Silicons/Laws/SharedSiliconLawSystem.cs | 3 +- .../SharedStationAiSystem.Airlock.cs | 25 ++ .../StationAi/SharedStationAiSystem.Held.cs | 187 ++++++++ .../StationAi/SharedStationAiSystem.Light.cs | 28 ++ .../StationAi/SharedStationAiSystem.cs | 412 ++++++++++++++++++ .../StationAi/StationAiCoreComponent.cs | 32 ++ .../StationAi/StationAiHeldComponent.cs | 9 + .../StationAi/StationAiHolderComponent.cs | 16 + .../StationAi/StationAiVisionComponent.cs | 5 +- .../StationAi/StationAiVisionSystem.cs | 131 ++---- .../StationAi/StationAiWhitelistComponent.cs | 13 + .../Station/SharedStationSpawningSystem.cs | 26 +- .../UserInterface/ActivatableUIComponent.cs | 8 +- .../UserInterface/ActivatableUISystem.cs | 25 +- Content.Shared/Verbs/SharedVerbSystem.cs | 17 +- Content.Shared/Verbs/VerbEvents.cs | 8 +- Content.Shared/Wires/SharedWiresSystem.cs | 20 +- .../Audio/Effects/Footsteps/attributions.yml | 2 +- .../Audio/Effects/Footsteps/borgwalk2.ogg | Bin 20233 -> 9052 bytes .../administration/ui/silicon-law-ui.ftl | 2 + .../Locale/en-US/job/department-desc.ftl | 1 + Resources/Locale/en-US/job/department.ftl | 1 + .../Locale/en-US/job/job-description.ftl | 1 + Resources/Locale/en-US/job/job-names.ftl | 2 + .../Locale/en-US/preferences/loadouts.ftl | 4 + .../Locale/en-US/silicons/station-ai.ftl | 14 + Resources/Maps/Test/dev_map.yml | 7 + Resources/Prototypes/Datasets/Names/ai.yml | 2 +- .../Mobs/Cyborgs/base_borg_chassis.yml | 3 + .../Entities/Mobs/Cyborgs/borg_chassis.yml | 2 +- .../Entities/Mobs/NPCs/miscellaneous.yml | 5 +- .../Entities/Mobs/NPCs/revenant.yml | 26 +- .../Entities/Mobs/NPCs/simplemob.yml | 1 + .../Entities/Mobs/Player/observer.yml | 53 ++- .../Entities/Mobs/Player/silicon.yml | 303 +++++++++++++ .../Prototypes/Entities/Mobs/Species/base.yml | 1 + Resources/Prototypes/Entities/Mobs/base.yml | 9 +- .../Fun/Instruments/base_instruments.yml | 2 +- .../Entities/Objects/Misc/paper.yml | 4 +- .../Objects/Specific/Robotics/mmi.yml | 2 +- .../Objects/Tools/access_configurator.yml | 2 +- .../Doors/Airlocks/base_structureairlocks.yml | 3 + .../Machines/Computers/computers.yml | 44 ++ .../Structures/Machines/Medical/cryo_pod.yml | 2 +- .../Entities/Structures/Power/apc.yml | 1 + .../Structures/Wallmounts/intercom.yml | 1 + .../Wallmounts/surveillance_camera.yml | 24 + .../Entities/Structures/Wallmounts/timer.yml | 1 + .../Prototypes/Loadouts/role_loadouts.yml | 5 + .../Prototypes/Roles/Jobs/Science/borg.yml | 17 +- .../Prototypes/Roles/Jobs/departments.yml | 10 +- .../Prototypes/Roles/play_time_trackers.yml | 3 + Resources/Prototypes/StatusIcon/job.yml | 8 + Resources/Prototypes/Wires/layouts.yml | 4 +- Resources/Prototypes/tags.yml | 4 + .../Actions/actions_ai.rsi/ai_core.png | Bin 0 -> 269 bytes .../Actions/actions_ai.rsi/camera_light.png | Bin 0 -> 309 bytes .../Actions/actions_ai.rsi/crew_monitor.png | Bin 0 -> 295 bytes .../Actions/actions_ai.rsi/manifest.png | Bin 0 -> 245 bytes .../Actions/actions_ai.rsi/meta.json | 26 ++ .../Actions/actions_ai.rsi/state_laws.png | Bin 0 -> 241 bytes .../Misc/job_icons.rsi/StationAi.png | Bin 0 -> 204 bytes .../Interface/Misc/job_icons.rsi/meta.json | 5 +- .../Textures/Interface/noise.rsi/meta.json | 58 +++ .../Textures/Interface/noise.rsi/noise.png | Bin 0 -> 45602 bytes .../Silicon/output.rsi/ai-banned-unshaded.png | Bin 0 -> 820 bytes .../Mobs/Silicon/output.rsi/ai-banned.png | Bin 0 -> 1589 bytes .../output.rsi/ai-banned_dead-unshaded.png | Bin 0 -> 109 bytes .../Silicon/output.rsi/ai-banned_dead.png | Bin 0 -> 463 bytes .../Silicon/output.rsi/ai-empty-unshaded.png | Bin 0 -> 109 bytes .../Mobs/Silicon/output.rsi/ai-empty.png | Bin 0 -> 451 bytes .../output.rsi/ai-holo-old-unshaded.png | Bin 0 -> 2483 bytes .../Mobs/Silicon/output.rsi/ai-holo-old.png | Bin 0 -> 7280 bytes .../Mobs/Silicon/output.rsi/ai-unshaded.png | Bin 0 -> 6255 bytes .../Textures/Mobs/Silicon/output.rsi/ai.png | Bin 0 -> 6761 bytes .../Silicon/output.rsi/ai_dead-unshaded.png | Bin 0 -> 453 bytes .../Mobs/Silicon/output.rsi/ai_dead.png | Bin 0 -> 453 bytes .../Silicon/output.rsi/default-unshaded.png | Bin 0 -> 2005 bytes .../Mobs/Silicon/output.rsi/default.png | Bin 0 -> 2005 bytes .../output.rsi/floating_face-unshaded.png | Bin 0 -> 721 bytes .../Mobs/Silicon/output.rsi/floating_face.png | Bin 0 -> 721 bytes .../Silicon/output.rsi/horror-unshaded.png | Bin 0 -> 1777 bytes .../Mobs/Silicon/output.rsi/horror.png | Bin 0 -> 1404 bytes .../Mobs/Silicon/output.rsi/meta.json | 1 + .../output.rsi/xeno_queen-unshaded.png | Bin 0 -> 2484 bytes .../Mobs/Silicon/output.rsi/xeno_queen.png | Bin 0 -> 2484 bytes .../Mobs/Silicon/station_ai.rsi/ai.png | Bin 0 -> 9757 bytes .../Mobs/Silicon/station_ai.rsi/ai_dead.png | Bin 0 -> 4405 bytes .../Mobs/Silicon/station_ai.rsi/ai_empty.png | Bin 0 -> 4405 bytes .../Mobs/Silicon/station_ai.rsi/base.png | Bin 0 -> 4421 bytes .../Mobs/Silicon/station_ai.rsi/default.png | Bin 0 -> 2082 bytes .../Mobs/Silicon/station_ai.rsi/meta.json | 52 +++ .../Objects/Devices/ai_card.rsi/base.png | Bin 0 -> 4432 bytes .../Objects/Devices/ai_card.rsi/empty.png | Bin 0 -> 4292 bytes .../Objects/Devices/ai_card.rsi/full.png | Bin 0 -> 5121 bytes .../Devices/ai_card.rsi/inhand-left.png | Bin 0 -> 306 bytes .../Devices/ai_card.rsi/inhand-right.png | Bin 0 -> 316 bytes .../Objects/Devices/ai_card.rsi/meta.json | 58 +++ .../output.rsi/aicard-full-unshaded.png | Bin 0 -> 777 bytes .../Devices/output.rsi/aicard-full.png | Bin 0 -> 1746 bytes .../Devices/output.rsi/aicard-unshaded.png | Bin 0 -> 138 bytes .../Objects/Devices/output.rsi/aicard.png | Bin 0 -> 414 bytes .../Objects/Devices/output.rsi/meta.json | 1 + 153 files changed, 2379 insertions(+), 339 deletions(-) create mode 100644 Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs create mode 100644 Content.Client/Silicons/StationAi/StationAiMenu.xaml create mode 100644 Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs create mode 100644 Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs create mode 100644 Content.Client/Silicons/StationAi/StationAiSystem.Light.cs create mode 100644 Content.Server/Silicons/StationAi/AiInteractWireAction.cs create mode 100644 Content.Server/Silicons/StationAi/AiVisionWireAction.cs create mode 100644 Content.Server/Silicons/StationAi/StationAiSystem.cs create mode 100644 Content.Shared/Light/Components/LightOnCollideColliderComponent.cs create mode 100644 Content.Shared/Light/Components/LightOnCollideComponent.cs create mode 100644 Content.Shared/Light/EntitySystems/LightCollideSystem.cs rename Content.Server/NPC/Pathfinding/PathfindingSystem.Line.cs => Content.Shared/NPC/SharedPathfindingSystem.Line.cs (92%) create mode 100644 Content.Shared/Silicons/Laws/Components/SiliconLawUpdaterComponent.cs create mode 100644 Content.Shared/Silicons/Laws/SharedSiliconLawSystem.Updater.cs create mode 100644 Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs create mode 100644 Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs create mode 100644 Content.Shared/Silicons/StationAi/SharedStationAiSystem.Light.cs create mode 100644 Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs create mode 100644 Content.Shared/Silicons/StationAi/StationAiCoreComponent.cs create mode 100644 Content.Shared/Silicons/StationAi/StationAiHeldComponent.cs create mode 100644 Content.Shared/Silicons/StationAi/StationAiHolderComponent.cs create mode 100644 Content.Shared/Silicons/StationAi/StationAiWhitelistComponent.cs create mode 100644 Resources/Locale/en-US/silicons/station-ai.ftl create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/ai_core.png create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/camera_light.png create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/crew_monitor.png create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/manifest.png create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json create mode 100644 Resources/Textures/Interface/Actions/actions_ai.rsi/state_laws.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/StationAi.png create mode 100644 Resources/Textures/Interface/noise.rsi/meta.json create mode 100644 Resources/Textures/Interface/noise.rsi/noise.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-empty-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-empty.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai_dead-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai_dead.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/default-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/default.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/floating_face-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/floating_face.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/horror-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/horror.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen-unshaded.png create mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/ai.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_dead.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_empty.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/base.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/default.png create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/base.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/empty.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/full.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Devices/ai_card.rsi/meta.json create mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard-full-unshaded.png create mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard-full.png create mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard-unshaded.png create mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard.png create mode 100644 Resources/Textures/Objects/Devices/output.rsi/meta.json diff --git a/Content.Client/Chat/UI/EmotesMenu.xaml.cs b/Content.Client/Chat/UI/EmotesMenu.xaml.cs index 33407553438..f3b7837f21a 100644 --- a/Content.Client/Chat/UI/EmotesMenu.xaml.cs +++ b/Content.Client/Chat/UI/EmotesMenu.xaml.cs @@ -19,9 +19,6 @@ public sealed partial class EmotesMenu : RadialMenu [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly ISharedPlayerManager _playerManager = default!; - private readonly SpriteSystem _spriteSystem; - private readonly EntityWhitelistSystem _whitelistSystem; - public event Action>? OnPlayEmote; public EmotesMenu() @@ -29,8 +26,8 @@ public EmotesMenu() IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - _spriteSystem = _entManager.System(); - _whitelistSystem = _entManager.System(); + var spriteSystem = _entManager.System(); + var whitelistSystem = _entManager.System(); var main = FindControl("Main"); @@ -40,8 +37,8 @@ public EmotesMenu() var player = _playerManager.LocalSession?.AttachedEntity; if (emote.Category == EmoteCategory.Invalid || emote.ChatTriggers.Count == 0 || - !(player.HasValue && _whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) || - _whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value)) + !(player.HasValue && whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) || + whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value)) continue; if (!emote.Available && @@ -63,7 +60,7 @@ public EmotesMenu() { VerticalAlignment = VAlignment.Center, HorizontalAlignment = HAlignment.Center, - Texture = _spriteSystem.Frame0(emote.Icon), + Texture = spriteSystem.Frame0(emote.Icon), TextureScale = new Vector2(2f, 2f), }; diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml index afa783c7aa9..87d11005be8 100644 --- a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml +++ b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml @@ -1,10 +1,24 @@ + MinSize="800 128"> + + + VerticalExpand="True" + HorizontalExpand="True"> + diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs index d029eb1223d..aab2a56ff68 100644 --- a/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs +++ b/Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs @@ -1,3 +1,4 @@ +using System.Numerics; using Content.Client.UserInterface.Controls; using Content.Shared.Preferences; using Content.Shared.Preferences.Loadouts; @@ -5,6 +6,7 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.Player; using Robust.Shared.Prototypes; +using Robust.Shared.Random; namespace Content.Client.Lobby.UI.Loadouts; @@ -24,27 +26,36 @@ public LoadoutWindow(HumanoidCharacterProfile profile, RoleLoadout loadout, Role Profile = profile; var protoManager = collection.Resolve(); - foreach (var group in proto.Groups) + // Hide if no groups + if (proto.Groups.Count == 0) { - if (!protoManager.TryIndex(group, out var groupProto)) - continue; + LoadoutGroupsContainer.Visible = false; + SetSize = Vector2.Zero; + } + else + { + foreach (var group in proto.Groups) + { + if (!protoManager.TryIndex(group, out var groupProto)) + continue; - if (groupProto.Hidden) - continue; + if (groupProto.Hidden) + continue; - var container = new LoadoutGroupContainer(profile, loadout, protoManager.Index(group), session, collection); - LoadoutGroupsContainer.AddTab(container, Loc.GetString(groupProto.Name)); - _groups.Add(container); + var container = new LoadoutGroupContainer(profile, loadout, protoManager.Index(group), session, collection); + LoadoutGroupsContainer.AddTab(container, Loc.GetString(groupProto.Name)); + _groups.Add(container); - container.OnLoadoutPressed += args => - { - OnLoadoutPressed?.Invoke(group, args); - }; + container.OnLoadoutPressed += args => + { + OnLoadoutPressed?.Invoke(group, args); + }; - container.OnLoadoutUnpressed += args => - { - OnLoadoutUnpressed?.Invoke(group, args); - }; + container.OnLoadoutUnpressed += args => + { + OnLoadoutUnpressed?.Invoke(group, args); + }; + } } } diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs index a4d59d1f315..03c74032f73 100644 --- a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs +++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs @@ -6,7 +6,7 @@ namespace Content.Client.Silicons.Laws.SiliconLawEditUi; public sealed class SiliconLawEui : BaseEui { - public readonly EntityManager _entityManager = default!; + private readonly EntityManager _entityManager; private SiliconLawUi _siliconLawUi; private EntityUid _target; diff --git a/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs b/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs new file mode 100644 index 00000000000..68318305a0c --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiBoundUserInterface.cs @@ -0,0 +1,28 @@ +using Content.Shared.Silicons.StationAi; +using Robust.Client.UserInterface; + +namespace Content.Client.Silicons.StationAi; + +public sealed class StationAiBoundUserInterface : BoundUserInterface +{ + private StationAiMenu? _menu; + + public StationAiBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) + { + } + + protected override void Open() + { + base.Open(); + _menu = this.CreateWindow(); + _menu.Track(Owner); + + _menu.OnAiRadial += args => + { + SendPredictedMessage(new StationAiRadialMessage() + { + Event = args, + }); + }; + } +} diff --git a/Content.Client/Silicons/StationAi/StationAiMenu.xaml b/Content.Client/Silicons/StationAi/StationAiMenu.xaml new file mode 100644 index 00000000000..d56fc832898 --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiMenu.xaml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs b/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs new file mode 100644 index 00000000000..24a802a60fe --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiMenu.xaml.cs @@ -0,0 +1,128 @@ +using System.Numerics; +using Content.Client.UserInterface.Controls; +using Content.Shared.Silicons.StationAi; +using Robust.Client.AutoGenerated; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Timing; + +namespace Content.Client.Silicons.StationAi; + +[GenerateTypedNameReferences] +public sealed partial class StationAiMenu : RadialMenu +{ + [Dependency] private readonly IClyde _clyde = default!; + [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IEyeManager _eyeManager = default!; + + public event Action? OnAiRadial; + + private EntityUid _tracked; + + public StationAiMenu() + { + IoCManager.InjectDependencies(this); + RobustXamlLoader.Load(this); + } + + public void Track(EntityUid owner) + { + _tracked = owner; + + if (!_entManager.EntityExists(_tracked)) + { + Close(); + return; + } + + BuildButtons(); + UpdatePosition(); + } + + private void BuildButtons() + { + var ev = new GetStationAiRadialEvent(); + _entManager.EventBus.RaiseLocalEvent(_tracked, ref ev); + + var main = FindControl("Main"); + main.DisposeAllChildren(); + var sprites = _entManager.System(); + + foreach (var action in ev.Actions) + { + // TODO: This radial boilerplate is quite annoying + var button = new StationAiMenuButton(action.Event) + { + StyleClasses = { "RadialMenuButton" }, + SetSize = new Vector2(64f, 64f), + ToolTip = action.Tooltip != null ? Loc.GetString(action.Tooltip) : null, + }; + + if (action.Sprite != null) + { + var texture = sprites.Frame0(action.Sprite); + var scale = Vector2.One; + + if (texture.Width <= 32) + { + scale *= 2; + } + + var tex = new TextureRect + { + VerticalAlignment = VAlignment.Center, + HorizontalAlignment = HAlignment.Center, + Texture = texture, + TextureScale = scale, + }; + + button.AddChild(tex); + } + + button.OnPressed += args => + { + OnAiRadial?.Invoke(action.Event); + Close(); + }; + main.AddChild(button); + } + } + + protected override void FrameUpdate(FrameEventArgs args) + { + base.FrameUpdate(args); + UpdatePosition(); + } + + private void UpdatePosition() + { + if (!_entManager.TryGetComponent(_tracked, out TransformComponent? xform)) + { + Close(); + return; + } + + if (!xform.Coordinates.IsValid(_entManager)) + { + Close(); + return; + } + + var coords = _entManager.System().GetSpriteScreenCoordinates((_tracked, null, xform)); + + if (!coords.IsValid) + { + Close(); + return; + } + + OpenScreenAt(coords.Position, _clyde); + } +} + +public sealed class StationAiMenuButton(BaseStationAiAction action) : RadialMenuTextureButton +{ + public BaseStationAiAction Action = action; +} diff --git a/Content.Client/Silicons/StationAi/StationAiOverlay.cs b/Content.Client/Silicons/StationAi/StationAiOverlay.cs index efa1b8dbeff..15a8a3a63fe 100644 --- a/Content.Client/Silicons/StationAi/StationAiOverlay.cs +++ b/Content.Client/Silicons/StationAi/StationAiOverlay.cs @@ -4,7 +4,9 @@ using Robust.Client.Player; using Robust.Shared.Enums; using Robust.Shared.Map.Components; +using Robust.Shared.Physics; using Robust.Shared.Prototypes; +using Robust.Shared.Timing; namespace Content.Client.Silicons.StationAi; @@ -12,6 +14,7 @@ public sealed class StationAiOverlay : Overlay { [Dependency] private readonly IClyde _clyde = default!; [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IPlayerManager _player = default!; [Dependency] private readonly IPrototypeManager _proto = default!; @@ -22,6 +25,9 @@ public sealed class StationAiOverlay : Overlay private IRenderTexture? _staticTexture; private IRenderTexture? _stencilTexture; + private float _updateRate = 1f / 30f; + private float _accumulator; + public StationAiOverlay() { IoCManager.InjectDependencies(this); @@ -47,19 +53,22 @@ protected override void Draw(in OverlayDrawArgs args) _entManager.TryGetComponent(playerEnt, out TransformComponent? playerXform); var gridUid = playerXform?.GridUid ?? EntityUid.Invalid; _entManager.TryGetComponent(gridUid, out MapGridComponent? grid); + _entManager.TryGetComponent(gridUid, out BroadphaseComponent? broadphase); var invMatrix = args.Viewport.GetWorldToLocalMatrix(); + _accumulator -= (float) _timing.FrameTime.TotalSeconds; - if (grid != null) + if (grid != null && broadphase != null) { - // TODO: Pass in attached entity's grid. - // TODO: Credit OD on the moved to code - // TODO: Call the moved-to code here. - - _visibleTiles.Clear(); var lookups = _entManager.System(); var xforms = _entManager.System(); - _entManager.System().GetView((gridUid, grid), worldBounds, _visibleTiles); + + if (_accumulator <= 0f) + { + _accumulator = MathF.Max(0f, _accumulator + _updateRate); + _visibleTiles.Clear(); + _entManager.System().GetView((gridUid, broadphase, grid), worldBounds, _visibleTiles); + } var gridMatrix = xforms.GetWorldMatrix(gridUid); var matty = Matrix3x2.Multiply(gridMatrix, invMatrix); diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs b/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs new file mode 100644 index 00000000000..bf6b65a9697 --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiSystem.Airlock.cs @@ -0,0 +1,30 @@ +using Content.Shared.Doors.Components; +using Content.Shared.Silicons.StationAi; +using Robust.Shared.Utility; + +namespace Content.Client.Silicons.StationAi; + +public sealed partial class StationAiSystem +{ + private void InitializeAirlock() + { + SubscribeLocalEvent(OnDoorBoltGetRadial); + } + + private void OnDoorBoltGetRadial(Entity ent, ref GetStationAiRadialEvent args) + { + args.Actions.Add(new StationAiRadial() + { + Sprite = ent.Comp.BoltsDown ? + new SpriteSpecifier.Rsi( + new ResPath("/Textures/Structures/Doors/Airlocks/Standard/basic.rsi"), "open") : + new SpriteSpecifier.Rsi( + new ResPath("/Textures/Structures/Doors/Airlocks/Standard/basic.rsi"), "closed"), + Tooltip = ent.Comp.BoltsDown ? Loc.GetString("bolt-open") : Loc.GetString("bolt-close"), + Event = new StationAiBoltEvent() + { + Bolted = !ent.Comp.BoltsDown, + } + }); + } +} diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs b/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs new file mode 100644 index 00000000000..cf2f6136207 --- /dev/null +++ b/Content.Client/Silicons/StationAi/StationAiSystem.Light.cs @@ -0,0 +1,32 @@ +using Content.Shared.Item.ItemToggle.Components; +using Content.Shared.Light.Components; +using Content.Shared.Silicons.StationAi; +using Robust.Shared.Utility; + +namespace Content.Client.Silicons.StationAi; + +public sealed partial class StationAiSystem +{ + // Used for surveillance camera lights + + private void InitializePowerToggle() + { + SubscribeLocalEvent(OnLightGetRadial); + } + + private void OnLightGetRadial(Entity ent, ref GetStationAiRadialEvent args) + { + if (!TryComp(ent.Owner, out ItemToggleComponent? toggle)) + return; + + args.Actions.Add(new StationAiRadial() + { + Tooltip = Loc.GetString("toggle-light"), + Sprite = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/light.svg.192dpi.png")), + Event = new StationAiLightEvent() + { + Enabled = !toggle.Activated + } + }); + } +} diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.cs b/Content.Client/Silicons/StationAi/StationAiSystem.cs index 2ed06175252..ab9ace3c1d5 100644 --- a/Content.Client/Silicons/StationAi/StationAiSystem.cs +++ b/Content.Client/Silicons/StationAi/StationAiSystem.cs @@ -5,7 +5,7 @@ namespace Content.Client.Silicons.StationAi; -public sealed partial class StationAiSystem : EntitySystem +public sealed partial class StationAiSystem : SharedStationAiSystem { [Dependency] private readonly IOverlayManager _overlayMgr = default!; [Dependency] private readonly IPlayerManager _player = default!; @@ -15,8 +15,8 @@ public sealed partial class StationAiSystem : EntitySystem public override void Initialize() { base.Initialize(); - // InitializeAirlock(); - // InitializePowerToggle(); + InitializeAirlock(); + InitializePowerToggle(); SubscribeLocalEvent(OnAiAttached); SubscribeLocalEvent(OnAiDetached); diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index c3e03528a79..e28f48d6a50 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -78,6 +78,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true // Get entities List entities; + var examineFlags = LookupFlags.All & ~LookupFlags.Sensors; // Do we have to do FoV checks? if ((visibility & MenuVisibility.NoFov) == 0) @@ -88,7 +89,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true TryComp(player.Value, out ExaminerComponent? examiner); entities = new(); - foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize)) + foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize, flags: examineFlags)) { if (_examine.CanExamine(player.Value, targetPos, Predicate, ent, examiner)) entities.Add(ent); @@ -96,7 +97,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true } else { - entities = _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize).ToList(); + entities = _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize, flags: examineFlags).ToList(); } if (entities.Count == 0) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index 6123bba8dee..308a679846c 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -36,6 +36,7 @@ using System.Linq; using System.Numerics; using Content.Server.Silicons.Laws; +using Content.Shared.Silicons.Laws; using Content.Shared.Silicons.Laws.Components; using Robust.Server.Player; using Robust.Shared.Physics.Components; diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index e616949d7a1..3884c1cc439 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -183,10 +183,6 @@ private static bool CanAnnounce(CommunicationsConsoleComponent comp) private bool CanUse(EntityUid user, EntityUid console) { - // This shouldn't technically be possible because of BUI but don't trust client. - if (!_interaction.InRangeUnobstructed(console, user)) - return false; - if (TryComp(console, out var accessReaderComponent) && !HasComp(console)) { return _accessReaderSystem.IsAllowed(user, console, accessReaderComponent); diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index 2b6ce41e191..3c59c36f77e 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -220,7 +220,9 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile) foreach (var role in profile.Loadouts) { - var loadout = new RoleLoadout(role.RoleName); + var loadout = new RoleLoadout(role.RoleName) + { + }; foreach (var group in role.Groups) { diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs index f47a5df8ac4..6e7bd255c5d 100644 --- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkRequiresPowerSystem.cs @@ -1,7 +1,6 @@ using Content.Server.DeviceNetwork.Components; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; -using Content.Shared.Power.EntitySystems; namespace Content.Server.DeviceNetwork.Systems; diff --git a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs index 3c5f7eaecb2..5c66d65b573 100644 --- a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs +++ b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs @@ -2,7 +2,6 @@ using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Power; -using Content.Shared.Power.Components; namespace Content.Server.Light.EntitySystems { diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index 6e1363dee2a..3bd788bcf43 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -26,7 +26,6 @@ using Content.Shared.Damage.Systems; using Content.Shared.Damage.Components; using Content.Shared.Power; -using Content.Shared.Power.Components; namespace Content.Server.Light.EntitySystems { diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs index c3e29cc3635..2447d886411 100644 --- a/Content.Server/Mind/MindSystem.cs +++ b/Content.Server/Mind/MindSystem.cs @@ -341,13 +341,13 @@ public override void SetUserId(EntityUid mindId, NetUserId? userId, MindComponen } } - public void ControlMob(EntityUid user, EntityUid target) + public override void ControlMob(EntityUid user, EntityUid target) { if (TryComp(user, out ActorComponent? actor)) ControlMob(actor.PlayerSession.UserId, target); } - public void ControlMob(NetUserId user, EntityUid target) + public override void ControlMob(NetUserId user, EntityUid target) { var (mindId, mind) = GetOrCreateMind(user); diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index df7bd2a54f7..40b998a95d0 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -8,7 +8,6 @@ using JetBrains.Annotations; using Robust.Shared.Containers; using System.Diagnostics.CodeAnalysis; -using Content.Shared.Power.Components; using Content.Shared.Storage.Components; using Robust.Server.Containers; using Content.Shared.Whitelist; @@ -64,7 +63,7 @@ private void OnChargerExamine(EntityUid uid, ChargerComponent component, Examine } else { - // add how much each item is charged it + // add how much each item is charged it foreach (var contained in container.ContainedEntities) { if (!TryComp(contained, out var battery)) @@ -232,7 +231,7 @@ private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component) return CellChargerStatus.Charging; } - + private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerComponent component, float frameTime) { if (!TryComp(uid, out ApcPowerReceiverComponent? receiverComponent)) diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs index 9ce48141396..a7098649cef 100644 --- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs @@ -5,7 +5,6 @@ using Content.Server.Power.Pow3r; using Content.Shared.CCVar; using Content.Shared.Power; -using Content.Shared.Power.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Configuration; diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs index edf0693954c..9fb7d5ff1f6 100644 --- a/Content.Server/Power/Generation/Teg/TegSystem.cs +++ b/Content.Server/Power/Generation/Teg/TegSystem.cs @@ -11,7 +11,6 @@ using Content.Shared.DeviceNetwork; using Content.Shared.Examine; using Content.Shared.Power; -using Content.Shared.Power.Components; using Content.Shared.Power.Generation.Teg; using Content.Shared.Rounding; using Robust.Server.GameObjects; diff --git a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs index 5a1bd31a15c..e3979a65192 100644 --- a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs +++ b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs @@ -6,7 +6,6 @@ using Content.Server.Power.Components; using Content.Shared.Atmos; using Content.Shared.Power; -using Content.Shared.Power.Components; namespace Content.Server.Power.Generator; diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenExterior.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenExterior.cs index acffd057fad..bb2c1cbbbfc 100644 --- a/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenExterior.cs +++ b/Content.Server/Procedural/DungeonJob/DungeonJob.DunGenExterior.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Content.Server.NPC.Pathfinding; using Content.Shared.Maps; +using Content.Shared.NPC; using Content.Shared.Procedural; using Content.Shared.Procedural.DungeonGenerators; using Robust.Shared.Collections; @@ -29,7 +30,7 @@ private async Task> GenerateExteriorDungen(Vector2i position, Exte var pathfinder = _entManager.System(); // Gridcast - pathfinder.GridCast(startTile, position, tile => + SharedPathfindingSystem.GridCast(startTile, position, tile => { if (!_maps.TryGetTileRef(_gridUid, _grid, tile, out var tileRef) || tileRef.Tile.IsSpace(_tileDefManager)) diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs index 0c0f68c23f3..6b7df52a6eb 100644 --- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs +++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs @@ -5,12 +5,10 @@ using Content.Server.Radio.Components; using Content.Server.Roles; using Content.Server.Station.Systems; -using Content.Shared.Actions; using Content.Shared.Administration; using Content.Shared.Chat; using Content.Shared.Emag.Components; using Content.Shared.Emag.Systems; -using Content.Shared.Examine; using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Roles; @@ -19,10 +17,10 @@ using Content.Shared.Stunnable; using Content.Shared.Wires; using Robust.Server.GameObjects; +using Robust.Shared.Containers; using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Toolshed; -using Robust.Shared.Utility; namespace Content.Server.Silicons.Laws; @@ -32,11 +30,9 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem [Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly StationSystem _station = default!; [Dependency] private readonly UserInterfaceSystem _userInterface = default!; [Dependency] private readonly SharedStunSystem _stunSystem = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly SharedRoleSystem _roles = default!; /// @@ -44,7 +40,6 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnComponentShutdown); SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnMindAdded); SubscribeLocalEvent(OnToggleLawsScreen); @@ -58,15 +53,8 @@ public override void Initialize() SubscribeLocalEvent(OnEmagMindRemoved); } - private void OnComponentShutdown(EntityUid uid, SiliconLawBoundComponent component, ComponentShutdown args) - { - if (component.ViewLawsActionEntity != null) - _actions.RemoveAction(uid, component.ViewLawsActionEntity); - } - private void OnMapInit(EntityUid uid, SiliconLawBoundComponent component, MapInitEvent args) { - _actions.AddAction(uid, ref component.ViewLawsActionEntity, component.ViewLawsAction); GetLaws(uid, component); } @@ -92,7 +80,7 @@ private void OnToggleLawsScreen(EntityUid uid, SiliconLawBoundComponent componen private void OnBoundUIOpened(EntityUid uid, SiliconLawBoundComponent component, BoundUIOpenedEvent args) { - _entityManager.TryGetComponent(uid, out var intrinsicRadio); + TryComp(uid, out IntrinsicRadioTransmitterComponent? intrinsicRadio); var radioChannels = intrinsicRadio?.Channels; var state = new SiliconLawBuiState(GetLaws(uid).Laws, radioChannels); @@ -264,9 +252,9 @@ public void NotifyLawsChanged(EntityUid uid) /// /// Extract all the laws from a lawset's prototype ids. /// - public SiliconLawset GetLawset(string lawset) + public SiliconLawset GetLawset(ProtoId lawset) { - var proto = _prototype.Index(lawset); + var proto = _prototype.Index(lawset); var laws = new SiliconLawset() { Laws = new List(proto.Laws.Count) @@ -294,6 +282,21 @@ public void SetLaws(List newLaws, EntityUid target) component.Lawset.Laws = newLaws; NotifyLawsChanged(target); } + + protected override void OnUpdaterInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + // TODO: Prediction dump this + if (!TryComp(args.Entity, out SiliconLawProviderComponent? provider)) + return; + + var lawset = GetLawset(provider.Laws).Laws; + var query = EntityManager.CompRegistryQueryEnumerator(ent.Comp.Components); + + while (query.MoveNext(out var update)) + { + SetLaws(lawset, update); + } + } } [ToolshedCommand, AdminCommand(AdminFlags.Admin)] diff --git a/Content.Server/Silicons/StationAi/AiInteractWireAction.cs b/Content.Server/Silicons/StationAi/AiInteractWireAction.cs new file mode 100644 index 00000000000..c92c825b32b --- /dev/null +++ b/Content.Server/Silicons/StationAi/AiInteractWireAction.cs @@ -0,0 +1,37 @@ +using Content.Server.Wires; +using Content.Shared.Doors; +using Content.Shared.Silicons.StationAi; +using Content.Shared.Wires; + +namespace Content.Server.Silicons.StationAi; + +/// +/// Controls whether an AI can interact with the target entity. +/// +public sealed partial class AiInteractWireAction : ComponentWireAction +{ + public override string Name { get; set; } = "wire-name-ai-act-light"; + public override Color Color { get; set; } = Color.DeepSkyBlue; + public override object StatusKey => AirlockWireStatus.AiControlIndicator; + + public override StatusLightState? GetLightState(Wire wire, StationAiWhitelistComponent component) + { + return component.Enabled ? StatusLightState.On : StatusLightState.Off; + } + + public override bool Cut(EntityUid user, Wire wire, StationAiWhitelistComponent component) + { + return EntityManager.System() + .SetWhitelistEnabled((component.Owner, component), false, announce: true); + } + + public override bool Mend(EntityUid user, Wire wire, StationAiWhitelistComponent component) + { + return EntityManager.System() + .SetWhitelistEnabled((component.Owner, component), true); + } + + public override void Pulse(EntityUid user, Wire wire, StationAiWhitelistComponent component) + { + } +} diff --git a/Content.Server/Silicons/StationAi/AiVisionWireAction.cs b/Content.Server/Silicons/StationAi/AiVisionWireAction.cs new file mode 100644 index 00000000000..3523f4d38f0 --- /dev/null +++ b/Content.Server/Silicons/StationAi/AiVisionWireAction.cs @@ -0,0 +1,40 @@ +using Content.Server.Wires; +using Content.Shared.Doors; +using Content.Shared.Silicons.StationAi; +using Content.Shared.StationAi; +using Content.Shared.Wires; + +namespace Content.Server.Silicons.StationAi; + +/// +/// Handles StationAiVision functionality for the attached entity. +/// +public sealed partial class AiVisionWireAction : ComponentWireAction +{ + public override string Name { get; set; } = "wire-name-ai-vision-light"; + public override Color Color { get; set; } = Color.DeepSkyBlue; + public override object StatusKey => AirlockWireStatus.AiControlIndicator; + + public override StatusLightState? GetLightState(Wire wire, StationAiVisionComponent component) + { + return component.Enabled ? StatusLightState.On : StatusLightState.Off; + } + + public override bool Cut(EntityUid user, Wire wire, StationAiVisionComponent component) + { + return EntityManager.System() + .SetVisionEnabled((component.Owner, component), false, announce: true); + } + + public override bool Mend(EntityUid user, Wire wire, StationAiVisionComponent component) + { + return EntityManager.System() + .SetVisionEnabled((component.Owner, component), true); + } + + public override void Pulse(EntityUid user, Wire wire, StationAiVisionComponent component) + { + // TODO: This should turn it off for a bit + // Need timer cleanup first out of scope. + } +} diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs new file mode 100644 index 00000000000..846497387d2 --- /dev/null +++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs @@ -0,0 +1,76 @@ +using System.Linq; +using Content.Server.Chat.Managers; +using Content.Server.Chat.Systems; +using Content.Shared.Chat; +using Content.Shared.Silicons.StationAi; +using Content.Shared.StationAi; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Map.Components; +using Robust.Shared.Player; + +namespace Content.Server.Silicons.StationAi; + +public sealed class StationAiSystem : SharedStationAiSystem +{ + [Dependency] private readonly IChatManager _chats = default!; + [Dependency] private readonly EntityLookupSystem _lookup = default!; + + private readonly HashSet> _ais = new(); + + public override bool SetVisionEnabled(Entity entity, bool enabled, bool announce = false) + { + if (!base.SetVisionEnabled(entity, enabled, announce)) + return false; + + if (announce) + { + AnnounceSnip(entity.Owner); + } + + return true; + } + + public override bool SetWhitelistEnabled(Entity entity, bool enabled, bool announce = false) + { + if (!base.SetWhitelistEnabled(entity, enabled, announce)) + return false; + + if (announce) + { + AnnounceSnip(entity.Owner); + } + + return true; + } + + private void AnnounceSnip(EntityUid entity) + { + var xform = Transform(entity); + + if (!TryComp(xform.GridUid, out MapGridComponent? grid)) + return; + + _ais.Clear(); + _lookup.GetChildEntities(xform.GridUid.Value, _ais); + var filter = Filter.Empty(); + + foreach (var ai in _ais) + { + // TODO: Filter API? + if (TryComp(ai.Owner, out ActorComponent? actorComp)) + { + filter.AddPlayer(actorComp.PlayerSession); + } + } + + // TEST + // filter = Filter.Broadcast(); + + // No easy way to do chat notif embeds atm. + var tile = Maps.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates); + var msg = Loc.GetString("ai-wire-snipped", ("coords", tile)); + + _chats.ChatMessageToMany(ChatChannel.Notifications, msg, msg, entity, false, true, filter.Recipients.Select(o => o.Channel)); + // Apparently there's no sound for this. + } +} diff --git a/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs index d2c2a8a1ca7..1ad1bb6c0a1 100644 --- a/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs +++ b/Content.Server/Sound/SpamEmitSoundRequirePowerSystem.cs @@ -1,7 +1,6 @@ using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Power; -using Content.Shared.Power.Components; using Content.Shared.Sound; using Content.Shared.Sound.Components; diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index e960a2bbbe2..fcbc3aa52f6 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -17,6 +17,7 @@ using Content.Shared.PDA; using Content.Shared.Preferences; using Content.Shared.Preferences.Loadouts; +using Content.Shared.Preferences.Loadouts.Effects; using Content.Shared.Random; using Content.Shared.Random.Helpers; using Content.Shared.Roles; @@ -150,6 +151,22 @@ public EntityUid SpawnPlayerMob( EntityUid? entity = null) { _prototypeManager.TryIndex(job?.Prototype ?? string.Empty, out var prototype); + RoleLoadout? loadout = null; + + // Need to get the loadout up-front to handle names if we use an entity spawn override. + var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID); + + if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto)) + { + profile?.Loadouts.TryGetValue(jobLoadout, out loadout); + + // Set to default if not present + if (loadout == null) + { + loadout = new RoleLoadout(jobLoadout); + loadout.SetDefault(profile, _actors.GetSession(entity), _prototypeManager); + } + } // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff. if (prototype?.JobEntity != null) @@ -157,6 +174,13 @@ public EntityUid SpawnPlayerMob( DebugTools.Assert(entity is null); var jobEntity = EntityManager.SpawnEntity(prototype.JobEntity, coordinates); MakeSentientCommand.MakeSentient(jobEntity, EntityManager); + + // Make sure custom names get handled, what is gameticker control flow whoopy. + if (loadout != null) + { + EquipRoleName(jobEntity, loadout, roleProto!); + } + DoJobSpecials(job, jobEntity); _identity.QueueIdentityUpdate(jobEntity); return jobEntity; @@ -188,21 +212,9 @@ public EntityUid SpawnPlayerMob( profile = HumanoidCharacterProfile.RandomWithSpecies(speciesId); } - var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID); - - if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto)) + if (loadout != null) { - RoleLoadout? loadout = null; - profile?.Loadouts.TryGetValue(jobLoadout, out loadout); - - // Set to default if not present - if (loadout == null) - { - loadout = new RoleLoadout(jobLoadout); - loadout.SetDefault(profile, _actors.GetSession(entity), _prototypeManager); - } - - EquipRoleLoadout(entity.Value, loadout, roleProto); + EquipRoleLoadout(entity.Value, loadout, roleProto!); } if (prototype?.StartingGear != null) diff --git a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs index 5970e163196..c9be87c6231 100644 --- a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs +++ b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs @@ -38,7 +38,7 @@ private void OnInteractUsing(EntityUid uid, EnergySwordComponent comp, InteractU if (args.Handled) return; - if (!_toolSystem.HasQuality(args.Used, "Pulsing")) + if (!_toolSystem.HasQuality(args.Used, SharedToolSystem.PulseQuality)) return; args.Handled = true; diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs index 019e09bbbbc..9d2fd58980f 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactElectricityTriggerSystem.cs @@ -44,7 +44,7 @@ private void OnInteractUsing(EntityUid uid, ArtifactElectricityTriggerComponent if (args.Handled) return; - if (!_toolSystem.HasQuality(args.Used, "Pulsing")) + if (!_toolSystem.HasQuality(args.Used, SharedToolSystem.PulseQuality)) return; args.Handled = _artifactSystem.TryActivateArtifact(uid, args.User); diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index afa1e19eade..8a4b5baffd3 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -2,6 +2,7 @@ using Content.Shared.Emoting; using Content.Shared.Hands; using Content.Shared.Interaction; +using Content.Shared.Interaction.Components; using Content.Shared.Interaction.Events; using Content.Shared.Item; using Content.Shared.Movement.Components; @@ -22,9 +23,14 @@ public sealed class ActionBlockerSystem : EntitySystem { [Dependency] private readonly SharedContainerSystem _container = default!; + private EntityQuery _complexInteractionQuery; + public override void Initialize() { base.Initialize(); + + _complexInteractionQuery = GetEntityQuery(); + SubscribeLocalEvent(OnMoverStartup); } @@ -53,6 +59,15 @@ public bool UpdateCanMove(EntityUid uid, InputMoverComponent? component = null) return !ev.Cancelled; } + /// + /// Checks if a given entity is able to do specific complex interactions. + /// This is used to gate manipulation to general humanoids. If a mouse shouldn't be able to do something, then it's complex. + /// + public bool CanComplexInteract(EntityUid user) + { + return _complexInteractionQuery.HasComp(user); + } + /// /// Raises an event directed at both the user and the target entity to check whether a user is capable of /// interacting with this entity. diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs index 9b77d039f46..da194706f8f 100644 --- a/Content.Shared/Climbing/Systems/ClimbSystem.cs +++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs @@ -358,34 +358,26 @@ private void OnClimbEndCollide(EntityUid uid, ClimbingComponent component, ref E return; } - if (args.OurFixture.Contacts.Count > 1) + foreach (var contact in args.OurFixture.Contacts.Values) { - foreach (var contact in args.OurFixture.Contacts.Values) + if (!contact.IsTouching) + continue; + + var otherEnt = contact.OtherEnt(uid); + var (otherFixtureId, otherFixture) = contact.OtherFixture(uid); + + // TODO: Remove this on engine. + if (args.OtherEntity == otherEnt && args.OtherFixtureId == otherFixtureId) + continue; + + if (otherFixture is { Hard: true } && + _climbableQuery.HasComp(otherEnt)) { - if (!contact.IsTouching) - continue; - - var otherEnt = contact.EntityA; - var otherFixture = contact.FixtureA; - var otherFixtureId = contact.FixtureAId; - if (uid == contact.EntityA) - { - otherEnt = contact.EntityB; - otherFixture = contact.FixtureB; - otherFixtureId = contact.FixtureBId; - } - - if (args.OtherEntity == otherEnt && args.OtherFixtureId == otherFixtureId) - continue; - - if (otherFixture is { Hard: true } && - _climbableQuery.HasComp(otherEnt)) - { - return; - } + return; } } + // TODO: Is this even needed anymore? foreach (var otherFixture in args.OurFixture.Contacts.Keys) { // If it's the other fixture then ignore em diff --git a/Content.Shared/Configurable/ConfigurationComponent.cs b/Content.Shared/Configurable/ConfigurationComponent.cs index 63a0dfe95a5..621871af3ce 100644 --- a/Content.Shared/Configurable/ConfigurationComponent.cs +++ b/Content.Shared/Configurable/ConfigurationComponent.cs @@ -1,5 +1,6 @@ using System.Text.RegularExpressions; using Content.Shared.Tools; +using Content.Shared.Tools.Systems; using Robust.Shared.GameStates; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; @@ -13,7 +14,7 @@ public sealed partial class ConfigurationComponent : Component public Dictionary Config = new(); [DataField("qualityNeeded", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string QualityNeeded = "Pulsing"; + public string QualityNeeded = SharedToolSystem.PulseQuality; [DataField("validation")] public Regex Validation = new("^[a-zA-Z0-9 ]*$", RegexOptions.Compiled); diff --git a/Content.Shared/Doors/AirlockWireStatus.cs b/Content.Shared/Doors/AirlockWireStatus.cs index a50ee2c88e9..d3fa15ed1b6 100644 --- a/Content.Shared/Doors/AirlockWireStatus.cs +++ b/Content.Shared/Doors/AirlockWireStatus.cs @@ -8,7 +8,7 @@ public enum AirlockWireStatus PowerIndicator, BoltIndicator, BoltLightIndicator, - AIControlIndicator, + AiControlIndicator, TimingIndicator, SafetyIndicator, } diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index f0406c53989..3d83886f2d3 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -117,12 +117,25 @@ public virtual bool CanExamine(EntityUid examiner, MapCoordinates target, Ignore if (EntityManager.GetComponent(examiner).MapID != target.MapId) return false; - return InRangeUnOccluded( - _transform.GetMapCoordinates(examiner), - target, - GetExaminerRange(examiner), - predicate: predicate, - ignoreInsideBlocker: true); + // Do target InRangeUnoccluded which has different checks. + if (examined != null) + { + return InRangeUnOccluded( + examiner, + examined.Value, + GetExaminerRange(examiner), + predicate: predicate, + ignoreInsideBlocker: true); + } + else + { + return InRangeUnOccluded( + examiner, + target, + GetExaminerRange(examiner), + predicate: predicate, + ignoreInsideBlocker: true); + } } /// @@ -214,6 +227,14 @@ public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates othe public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { + var ev = new InRangeOverrideEvent(origin, other); + RaiseLocalEvent(origin, ref ev); + + if (ev.Handled) + { + return ev.InRange; + } + var originPos = _transform.GetMapCoordinates(origin); var otherPos = _transform.GetMapCoordinates(other); diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs index 1fe66cd3cb8..84beabf9ac8 100644 --- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs +++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs @@ -161,6 +161,19 @@ public bool TryGetActiveItem(Entity entity, [NotNullWhen(true)] return item != null; } + /// + /// Gets active hand item if relevant otherwise gets the entity itself. + /// + public EntityUid GetActiveItemOrSelf(Entity entity) + { + if (!TryGetActiveItem(entity, out var item)) + { + return entity.Owner; + } + + return item.Value; + } + public Hand? GetActiveHand(Entity entity) { if (!Resolve(entity, ref entity.Comp)) diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index e8cc831e495..8539b9d282b 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -17,6 +17,7 @@ using Content.Shared.Movement.Pulling.Systems; using Content.Shared.Physics; using Content.Shared.Popups; +using Content.Shared.Silicons.StationAi; using Content.Shared.Storage; using Content.Shared.Tag; using Content.Shared.Timing; @@ -74,7 +75,6 @@ public abstract partial class SharedInteractionSystem : EntitySystem private EntityQuery _wallMountQuery; private EntityQuery _delayQuery; private EntityQuery _uiQuery; - private EntityQuery _complexInteractionQuery; private const CollisionGroup InRangeUnobstructedMask = CollisionGroup.Impassable | CollisionGroup.InteractImpassable; @@ -97,7 +97,6 @@ public override void Initialize() _wallMountQuery = GetEntityQuery(); _delayQuery = GetEntityQuery(); _uiQuery = GetEntityQuery(); - _complexInteractionQuery = GetEntityQuery(); SubscribeLocalEvent(HandleUserInterfaceRangeCheck); SubscribeLocalEvent(OnBoundInterfaceInteractAttempt); @@ -165,7 +164,7 @@ private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev return; } - if (uiComp.RequireHands && !_handsQuery.HasComp(ev.Actor)) + if (uiComp.RequiresComplex && !_actionBlockerSystem.CanComplexInteract(ev.Actor)) ev.Cancel(); } @@ -440,7 +439,7 @@ public void UserInteraction( public void InteractHand(EntityUid user, EntityUid target) { - var complexInteractions = SupportsComplexInteractions(user); + var complexInteractions = _actionBlockerSystem.CanComplexInteract(user); if (!complexInteractions) { InteractionActivate(user, @@ -630,6 +629,14 @@ public bool InRangeUnobstructed( if (!Resolve(other, ref other.Comp)) return false; + var ev = new InRangeOverrideEvent(origin, other); + RaiseLocalEvent(origin, ref ev); + + if (ev.Handled) + { + return ev.InRange; + } + return InRangeUnobstructed(origin, other, other.Comp.Coordinates, @@ -1128,7 +1135,7 @@ public bool AltInteract(EntityUid user, EntityUid target) // Get list of alt-interact verbs var verbs = _verbSystem.GetLocalVerbs(target, user, typeof(AlternativeVerb)); - if (!verbs.Any()) + if (verbs.Count == 0) return false; _verbSystem.ExecuteVerb(verbs.First(), user, target); @@ -1182,6 +1189,13 @@ public bool InRangeAndAccessible( /// public bool IsAccessible(Entity user, Entity target) { + var ev = new AccessibleOverrideEvent(user, target); + + RaiseLocalEvent(user, ref ev); + + if (ev.Handled) + return ev.Accessible; + if (_containerSystem.IsInSameOrParentContainer(user, target, out _, out var container)) return true; @@ -1324,13 +1338,10 @@ public bool TryGetUsedEntity(EntityUid user, [NotNullWhen(true)] out EntityUid? return ev.Handled; } - /// - /// Checks if a given entity is able to do specific complex interactions. - /// This is used to gate manipulation to general humanoids. If a mouse shouldn't be able to do something, then it's complex. - /// + [Obsolete("Use ActionBlockerSystem")] public bool SupportsComplexInteractions(EntityUid user) { - return _complexInteractionQuery.HasComp(user); + return _actionBlockerSystem.CanComplexInteract(user); } } @@ -1369,17 +1380,38 @@ public record struct GetUsedEntityEvent() }; /// - /// Raised directed by-ref on an item and a user to determine if interactions can occur. + /// Raised directed by-ref on an item to determine if hand interactions should go through. + /// Defaults to allowing hand interactions to go through. Cancel to force the item to be attacked instead. /// /// Whether the hand interaction should be cancelled. [ByRefEvent] - public record struct AttemptUseInteractEvent(EntityUid User, EntityUid Used, bool Cancelled = false); + public record struct CombatModeShouldHandInteractEvent(bool Cancelled = false); /// - /// Raised directed by-ref on an item to determine if hand interactions should go through. - /// Defaults to allowing hand interactions to go through. Cancel to force the item to be attacked instead. + /// Override event raised directed on the user to say the target is accessible. /// - /// Whether the hand interaction should be cancelled. + /// + /// [ByRefEvent] - public record struct CombatModeShouldHandInteractEvent(bool Cancelled = false); + public record struct AccessibleOverrideEvent(EntityUid User, EntityUid Target) + { + public readonly EntityUid User = User; + public readonly EntityUid Target = Target; + + public bool Handled; + public bool Accessible = false; + } + + /// + /// Override event raised directed on a user to check InRangeUnoccluded AND InRangeUnobstructed to the target if you require custom logic. + /// + [ByRefEvent] + public record struct InRangeOverrideEvent(EntityUid User, EntityUid Target) + { + public readonly EntityUid User = User; + public readonly EntityUid Target = Target; + + public bool Handled; + public bool InRange = false; + } } diff --git a/Content.Shared/Light/Components/LightOnCollideColliderComponent.cs b/Content.Shared/Light/Components/LightOnCollideColliderComponent.cs new file mode 100644 index 00000000000..39be05a1480 --- /dev/null +++ b/Content.Shared/Light/Components/LightOnCollideColliderComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Light.Components; + +/// +/// Can activate when collided with. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class LightOnCollideColliderComponent : Component +{ + [DataField] + public string FixtureId = "lightTrigger"; +} diff --git a/Content.Shared/Light/Components/LightOnCollideComponent.cs b/Content.Shared/Light/Components/LightOnCollideComponent.cs new file mode 100644 index 00000000000..c3b4bd73965 --- /dev/null +++ b/Content.Shared/Light/Components/LightOnCollideComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Light.Components; + +/// +/// Enables / disables pointlight whenever entities are contacting with it +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class LightOnCollideComponent : Component +{ +} diff --git a/Content.Shared/Light/EntitySystems/LightCollideSystem.cs b/Content.Shared/Light/EntitySystems/LightCollideSystem.cs new file mode 100644 index 00000000000..f09ae6824ea --- /dev/null +++ b/Content.Shared/Light/EntitySystems/LightCollideSystem.cs @@ -0,0 +1,82 @@ +using Content.Shared.Light.Components; +using Robust.Shared.Physics.Events; +using Robust.Shared.Physics.Systems; + +namespace Content.Shared.Light.EntitySystems; + +public sealed class LightCollideSystem : EntitySystem +{ + [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly SlimPoweredLightSystem _lights = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnPreventCollide); + SubscribeLocalEvent(OnStart); + SubscribeLocalEvent(OnEnd); + + SubscribeLocalEvent(OnCollideShutdown); + } + + private void OnCollideShutdown(Entity ent, ref ComponentShutdown args) + { + // TODO: Check this on the event. + if (TerminatingOrDeleted(ent.Owner)) + return; + + // Regenerate contacts for everything we were colliding with. + var contacts = _physics.GetContacts(ent.Owner); + + while (contacts.MoveNext(out var contact)) + { + if (!contact.IsTouching) + continue; + + var other = contact.OtherEnt(ent.Owner); + + if (HasComp(other)) + { + _physics.RegenerateContacts(other); + } + } + } + + // You may be wondering what de fok this is doing here. + // At the moment there's no easy way to do collision whitelists based on components. + private void OnPreventCollide(Entity ent, ref PreventCollideEvent args) + { + if (!HasComp(args.OtherEntity)) + { + args.Cancelled = true; + } + } + + private void OnEnd(Entity ent, ref EndCollideEvent args) + { + if (args.OurFixtureId != ent.Comp.FixtureId) + return; + + if (!HasComp(args.OtherEntity)) + return; + + // TODO: Engine bug IsTouching box2d yay. + var contacts = _physics.GetTouchingContacts(args.OtherEntity) - 1; + + if (contacts > 0) + return; + + _lights.SetEnabled(args.OtherEntity, false); + } + + private void OnStart(Entity ent, ref StartCollideEvent args) + { + if (args.OurFixtureId != ent.Comp.FixtureId) + return; + + if (!HasComp(args.OtherEntity)) + return; + + _lights.SetEnabled(args.OtherEntity, true); + } +} diff --git a/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs index 6d984ed19a3..4cf9b25dadc 100644 --- a/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs +++ b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs @@ -1,6 +1,5 @@ using Content.Shared.Light.Components; using Content.Shared.Power; -using Content.Shared.Power.Components; using Content.Shared.Power.EntitySystems; namespace Content.Shared.Light.EntitySystems; diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs index 24b47b64120..c8e1c1a4b3a 100644 --- a/Content.Shared/Mind/SharedMindSystem.cs +++ b/Content.Shared/Mind/SharedMindSystem.cs @@ -315,6 +315,10 @@ public virtual void TransferTo(EntityUid mindId, EntityUid? entity, bool ghostCh { } + public virtual void ControlMob(EntityUid user, EntityUid target) {} + + public virtual void ControlMob(NetUserId user, EntityUid target) {} + /// /// Tries to create and add an objective from its prototype id. /// diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Line.cs b/Content.Shared/NPC/SharedPathfindingSystem.Line.cs similarity index 92% rename from Content.Server/NPC/Pathfinding/PathfindingSystem.Line.cs rename to Content.Shared/NPC/SharedPathfindingSystem.Line.cs index 479d5ad77f6..500ed157436 100644 --- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Line.cs +++ b/Content.Shared/NPC/SharedPathfindingSystem.Line.cs @@ -1,8 +1,8 @@ -namespace Content.Server.NPC.Pathfinding; +namespace Content.Shared.NPC; -public sealed partial class PathfindingSystem +public abstract partial class SharedPathfindingSystem { - public void GridCast(Vector2i start, Vector2i end, Vector2iCallback callback) + public static void GridCast(Vector2i start, Vector2i end, Vector2iCallback callback) { // https://gist.github.com/Pyr3z/46884d67641094d6cf353358566db566 // declare all locals at the top so it's obvious how big the footprint is diff --git a/Content.Shared/NPC/SharedPathfindingSystem.cs b/Content.Shared/NPC/SharedPathfindingSystem.cs index 8831acc1ddb..0be5f697556 100644 --- a/Content.Shared/NPC/SharedPathfindingSystem.cs +++ b/Content.Shared/NPC/SharedPathfindingSystem.cs @@ -2,7 +2,7 @@ namespace Content.Shared.NPC; -public abstract class SharedPathfindingSystem : EntitySystem +public abstract partial class SharedPathfindingSystem : EntitySystem { /// /// This is equivalent to agent radii for navmeshes. In our case it's preferable that things are cleanly @@ -37,4 +37,31 @@ public static float OctileDistance(Vector2i start, Vector2i end) var ab = Vector2.Abs(diff); return ab.X + ab.Y + (1.41f - 2) * Math.Min(ab.X, ab.Y); } + + public static IEnumerable GetTileOutline(Vector2i center, float radius) + { + // https://www.redblobgames.com/grids/circle-drawing/ + var vecCircle = center + Vector2.One / 2f; + + for (var r = 0; r <= Math.Floor(radius * MathF.Sqrt(0.5f)); r++) + { + var d = MathF.Floor(MathF.Sqrt(radius * radius - r * r)); + + yield return new Vector2(vecCircle.X - d, vecCircle.Y + r).Floored(); + + yield return new Vector2(vecCircle.X + d, vecCircle.Y + r).Floored(); + + yield return new Vector2(vecCircle.X - d, vecCircle.Y - r).Floored(); + + yield return new Vector2(vecCircle.X + d, vecCircle.Y - r).Floored(); + + yield return new Vector2(vecCircle.X + r, vecCircle.Y - d).Floored(); + + yield return new Vector2(vecCircle.X + r, vecCircle.Y + d).Floored(); + + yield return new Vector2(vecCircle.X - r, vecCircle.Y - d).Floored(); + + yield return new Vector2(vecCircle.X - r, vecCircle.Y + d).Floored(); + } + } } diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadoutPrototype.cs b/Content.Shared/Preferences/Loadouts/RoleLoadoutPrototype.cs index 36619ab1046..7a29bad6678 100644 --- a/Content.Shared/Preferences/Loadouts/RoleLoadoutPrototype.cs +++ b/Content.Shared/Preferences/Loadouts/RoleLoadoutPrototype.cs @@ -1,3 +1,4 @@ +using Content.Shared.Dataset; using Robust.Shared.Prototypes; namespace Content.Shared.Preferences.Loadouts; @@ -15,10 +16,17 @@ public sealed partial class RoleLoadoutPrototype : IPrototype [IdDataField] public string ID { get; } = string.Empty; + /// + /// Should we use a random name for this loadout? + /// + [DataField] + public ProtoId? NameDataset; + + // Not required so people can set their names. /// /// Groups that comprise this role loadout. /// - [DataField(required: true)] + [DataField] public List> Groups = new(); /// diff --git a/Content.Shared/Silicons/Laws/Components/SiliconLawBoundComponent.cs b/Content.Shared/Silicons/Laws/Components/SiliconLawBoundComponent.cs index 824d057b3ea..0fb9c5920fa 100644 --- a/Content.Shared/Silicons/Laws/Components/SiliconLawBoundComponent.cs +++ b/Content.Shared/Silicons/Laws/Components/SiliconLawBoundComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Actions; +using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; @@ -7,21 +8,9 @@ namespace Content.Shared.Silicons.Laws.Components; /// /// This is used for entities which are bound to silicon laws and can view them. /// -[RegisterComponent, Access(typeof(SharedSiliconLawSystem))] +[RegisterComponent, NetworkedComponent, Access(typeof(SharedSiliconLawSystem))] public sealed partial class SiliconLawBoundComponent : Component { - /// - /// The sidebar action that toggles the laws screen. - /// - [DataField] - public EntProtoId ViewLawsAction = "ActionViewLaws"; - - /// - /// The action for toggling laws. Stored here so we can remove it later. - /// - [DataField] - public EntityUid? ViewLawsActionEntity; - /// /// The last entity that provided laws to this entity. /// diff --git a/Content.Shared/Silicons/Laws/Components/SiliconLawUpdaterComponent.cs b/Content.Shared/Silicons/Laws/Components/SiliconLawUpdaterComponent.cs new file mode 100644 index 00000000000..e28bf883d91 --- /dev/null +++ b/Content.Shared/Silicons/Laws/Components/SiliconLawUpdaterComponent.cs @@ -0,0 +1,17 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Silicons.Laws.Components; + +/// +/// Whenever an entity is inserted with silicon laws it will update the relevant entity's laws. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class SiliconLawUpdaterComponent : Component +{ + /// + /// Entities to update + /// + [DataField(required: true)] + public ComponentRegistry Components; +} diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.Updater.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.Updater.cs new file mode 100644 index 00000000000..9fbef58a842 --- /dev/null +++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.Updater.cs @@ -0,0 +1,17 @@ +using Content.Shared.Silicons.Laws.Components; +using Robust.Shared.Containers; + +namespace Content.Shared.Silicons.Laws; + +public abstract partial class SharedSiliconLawSystem +{ + private void InitializeUpdater() + { + SubscribeLocalEvent(OnUpdaterInsert); + } + + protected virtual void OnUpdaterInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + // TODO: Prediction + } +} diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs index c0619e6e43d..a30e7c8980f 100644 --- a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs +++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs @@ -8,13 +8,14 @@ namespace Content.Shared.Silicons.Laws; /// /// This handles getting and displaying the laws for silicons. /// -public abstract class SharedSiliconLawSystem : EntitySystem +public abstract partial class SharedSiliconLawSystem : EntitySystem { [Dependency] private readonly SharedPopupSystem _popup = default!; /// public override void Initialize() { + InitializeUpdater(); SubscribeLocalEvent(OnGotEmagged); SubscribeLocalEvent(OnAttemptEmag); } diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs new file mode 100644 index 00000000000..ff6fc1ece07 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs @@ -0,0 +1,25 @@ +using Content.Shared.Doors.Components; +using Robust.Shared.Serialization; + +namespace Content.Shared.Silicons.StationAi; + +public abstract partial class SharedStationAiSystem +{ + // Handles airlock radial + + private void InitializeAirlock() + { + SubscribeLocalEvent(OnAirlockBolt); + } + + private void OnAirlockBolt(EntityUid ent, DoorBoltComponent component, StationAiBoltEvent args) + { + _doors.SetBoltsDown((ent, component), args.Bolted, args.User, predicted: true); + } +} + +[Serializable, NetSerializable] +public sealed class StationAiBoltEvent : BaseStationAiAction +{ + public bool Bolted; +} diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs new file mode 100644 index 00000000000..a6c57f59400 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs @@ -0,0 +1,187 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Actions.Events; +using Content.Shared.Interaction.Events; +using Content.Shared.Verbs; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Silicons.StationAi; + +public abstract partial class SharedStationAiSystem +{ + /* + * Added when an entity is inserted into a StationAiCore. + */ + + private void InitializeHeld() + { + SubscribeLocalEvent(OnRadialMessage); + SubscribeLocalEvent(OnMessageAttempt); + SubscribeLocalEvent>(OnTargetVerbs); + + SubscribeLocalEvent(OnHeldInteraction); + SubscribeLocalEvent(OnHeldRelay); + SubscribeLocalEvent(OnCoreJump); + } + + private void OnCoreJump(Entity ent, ref JumpToCoreEvent args) + { + if (!TryGetCore(ent.Owner, out var core) || core.Comp?.RemoteEntity == null) + return; + + _xforms.DropNextTo(core.Comp.RemoteEntity.Value, core.Owner) ; + } + + /// + /// Tries to get the entity held in the AI core. + /// + private bool TryGetHeld(Entity entity, out EntityUid held) + { + held = EntityUid.Invalid; + + if (!Resolve(entity.Owner, ref entity.Comp)) + return false; + + if (!_containers.TryGetContainer(entity.Owner, StationAiCoreComponent.Container, out var container) || + container.ContainedEntities.Count == 0) + return false; + + held = container.ContainedEntities[0]; + return true; + } + + private bool TryGetCore(EntityUid ent, out Entity core) + { + if (!_containers.TryGetContainingContainer(ent, out var container) || + container.ID != StationAiCoreComponent.Container || + !TryComp(container.Owner, out StationAiCoreComponent? coreComp) || + coreComp.RemoteEntity == null) + { + core = (EntityUid.Invalid, null); + return false; + } + + core = (container.Owner, coreComp); + return true; + } + + private void OnHeldRelay(Entity ent, ref AttemptRelayActionComponentChangeEvent args) + { + if (!TryGetCore(ent.Owner, out var core)) + return; + + args.Target = core.Comp?.RemoteEntity; + } + + private void OnRadialMessage(StationAiRadialMessage ev) + { + if (!TryGetEntity(ev.Entity, out var target)) + return; + + ev.Event.User = ev.Actor; + RaiseLocalEvent(target.Value, (object) ev.Event); + } + + private void OnMessageAttempt(BoundUserInterfaceMessageAttempt ev) + { + if (ev.Actor == ev.Target) + return; + + if (TryComp(ev.Actor, out StationAiHeldComponent? aiComp) && + (!ValidateAi((ev.Actor, aiComp)) || + !HasComp(ev.Target))) + { + ev.Cancel(); + } + } + + private void OnHeldInteraction(Entity ent, ref InteractionAttemptEvent args) + { + // Cancel if it's not us or something with a whitelist. + args.Cancelled = ent.Owner != args.Target && + args.Target != null && + (!TryComp(args.Target, out StationAiWhitelistComponent? whitelist) || !whitelist.Enabled); + } + + private void OnTargetVerbs(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanComplexInteract || + !ent.Comp.Enabled || + !HasComp(args.User) || + !HasComp(args.Target)) + { + return; + } + + var user = args.User; + var target = args.Target; + + var isOpen = _uiSystem.IsUiOpen(target, AiUi.Key, user); + + args.Verbs.Add(new AlternativeVerb() + { + Text = isOpen ? Loc.GetString("ai-close") : Loc.GetString("ai-open"), + Act = () => + { + if (isOpen) + { + _uiSystem.CloseUi(ent.Owner, AiUi.Key, user); + } + else + { + _uiSystem.OpenUi(ent.Owner, AiUi.Key, user); + } + } + }); + } +} + +/// +/// Raised from client to server as a BUI message wrapping the event to perform. +/// Also handles AI action validation. +/// +[Serializable, NetSerializable] +public sealed class StationAiRadialMessage : BoundUserInterfaceMessage +{ + public BaseStationAiAction Event = default!; +} + +// Do nothing on server just here for shared move along. +/// +/// Raised on client to get the relevant data for radial actions. +/// +public sealed class StationAiRadial : BaseStationAiAction +{ + public SpriteSpecifier? Sprite; + + public string? Tooltip; + + public BaseStationAiAction Event = default!; +} + +/// +/// Abstract parent for radial actions events. +/// When a client requests a radial action this will get sent. +/// +[Serializable, NetSerializable] +public abstract class BaseStationAiAction +{ + [field:NonSerialized] + public EntityUid User { get; set; } +} + +// No idea if there's a better way to do this. +/// +/// Grab actions possible for an AI on the target entity. +/// +[ByRefEvent] +public record struct GetStationAiRadialEvent() +{ + public List Actions = new(); +} + +[Serializable, NetSerializable] +public enum AiUi : byte +{ + Key, +} diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Light.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Light.cs new file mode 100644 index 00000000000..bc2e3665f58 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Light.cs @@ -0,0 +1,28 @@ +using Content.Shared.Light.Components; +using Robust.Shared.Serialization; + +namespace Content.Shared.Silicons.StationAi; + +public abstract partial class SharedStationAiSystem +{ + // Handles light toggling. + + private void InitializeLight() + { + SubscribeLocalEvent(OnLight); + } + + private void OnLight(EntityUid ent, ItemTogglePointLightComponent component, StationAiLightEvent args) + { + if (args.Enabled) + _toggles.TryActivate(ent, user: args.User); + else + _toggles.TryDeactivate(ent, user: args.User); + } +} + +[Serializable, NetSerializable] +public sealed class StationAiLightEvent : BaseStationAiAction +{ + public bool Enabled; +} diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs new file mode 100644 index 00000000000..348b0b04657 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs @@ -0,0 +1,412 @@ +using Content.Shared.ActionBlocker; +using Content.Shared.Actions; +using Content.Shared.Administration.Managers; +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Database; +using Content.Shared.Doors.Systems; +using Content.Shared.Interaction; +using Content.Shared.Item.ItemToggle; +using Content.Shared.Mind; +using Content.Shared.Movement.Components; +using Content.Shared.Movement.Systems; +using Content.Shared.Power; +using Content.Shared.StationAi; +using Content.Shared.Verbs; +using Robust.Shared.Containers; +using Robust.Shared.Map.Components; +using Robust.Shared.Network; +using Robust.Shared.Physics; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Timing; + +namespace Content.Shared.Silicons.StationAi; + +public abstract partial class SharedStationAiSystem : EntitySystem +{ + [Dependency] private readonly ISharedAdminManager _admin = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly ItemSlotsSystem _slots = default!; + [Dependency] private readonly ItemToggleSystem _toggles = default!; + [Dependency] private readonly ActionBlockerSystem _blocker = default!; + [Dependency] private readonly MetaDataSystem _metadata = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedContainerSystem _containers = default!; + [Dependency] private readonly SharedDoorSystem _doors = default!; + [Dependency] private readonly SharedEyeSystem _eye = default!; + [Dependency] protected readonly SharedMapSystem Maps = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly SharedMoverController _mover = default!; + [Dependency] private readonly SharedTransformSystem _xforms = default!; + [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private readonly StationAiVisionSystem _vision = default!; + + // StationAiHeld is added to anything inside of an AI core. + // StationAiHolder indicates it can hold an AI positronic brain (e.g. holocard / core). + // StationAiCore holds functionality related to the core itself. + // StationAiWhitelist is a general whitelist to stop it being able to interact with anything + // StationAiOverlay handles the static overlay. It also handles interaction blocking on client and server + // for anything under it. + + private EntityQuery _broadphaseQuery; + private EntityQuery _gridQuery; + + [ValidatePrototypeId] + private static readonly EntProtoId DefaultAi = "StationAiBrain"; + + public override void Initialize() + { + base.Initialize(); + + _broadphaseQuery = GetEntityQuery(); + _gridQuery = GetEntityQuery(); + + InitializeAirlock(); + InitializeHeld(); + InitializeLight(); + + SubscribeLocalEvent(OnAiBuiCheck); + + SubscribeLocalEvent(OnAiAccessible); + SubscribeLocalEvent(OnAiInRange); + SubscribeLocalEvent(OnAiMenu); + + SubscribeLocalEvent(OnHolderInit); + SubscribeLocalEvent(OnHolderRemove); + SubscribeLocalEvent(OnHolderInteract); + SubscribeLocalEvent(OnHolderMapInit); + SubscribeLocalEvent(OnHolderConInsert); + SubscribeLocalEvent(OnHolderConRemove); + + SubscribeLocalEvent(OnAiInsert); + SubscribeLocalEvent(OnAiRemove); + SubscribeLocalEvent(OnAiMapInit); + SubscribeLocalEvent(OnAiShutdown); + SubscribeLocalEvent(OnCorePower); + SubscribeLocalEvent>(OnCoreVerbs); + } + + private void OnCoreVerbs(Entity ent, ref GetVerbsEvent args) + { + if (!_admin.IsAdmin(args.User) || + TryGetHeld((ent.Owner, ent.Comp), out _)) + { + return; + } + + var user = args.User; + + args.Verbs.Add(new Verb() + { + Text = Loc.GetString("station-ai-takeover"), + Category = VerbCategory.Debug, + Act = () => + { + var brain = SpawnInContainerOrDrop(DefaultAi, ent.Owner, StationAiCoreComponent.Container); + _mind.ControlMob(user, brain); + }, + Impact = LogImpact.High, + }); + } + + private void OnAiAccessible(Entity ent, ref AccessibleOverrideEvent args) + { + args.Handled = true; + + // Hopefully AI never needs storage + if (_containers.TryGetContainingContainer(args.Target, out var targetContainer)) + { + return; + } + + if (!_containers.IsInSameOrTransparentContainer(args.User, args.Target, otherContainer: targetContainer)) + { + return; + } + + args.Accessible = true; + } + + private void OnAiMenu(Entity ent, ref MenuVisibilityEvent args) + { + args.Visibility &= ~MenuVisibility.NoFov; + } + + private void OnAiBuiCheck(Entity ent, ref BoundUserInterfaceCheckRangeEvent args) + { + args.Result = BoundUserInterfaceRangeResult.Fail; + + // Similar to the inrange check but more optimised so server doesn't die. + var targetXform = Transform(args.Target); + + // No cross-grid + if (targetXform.GridUid != args.Actor.Comp.GridUid) + { + return; + } + + if (!_broadphaseQuery.TryComp(targetXform.GridUid, out var broadphase) || !_gridQuery.TryComp(targetXform.GridUid, out var grid)) + { + return; + } + + var targetTile = Maps.LocalToTile(targetXform.GridUid.Value, grid, targetXform.Coordinates); + + lock (_vision) + { + if (_vision.IsAccessible((targetXform.GridUid.Value, broadphase, grid), targetTile, fastPath: true)) + { + args.Result = BoundUserInterfaceRangeResult.Pass; + } + } + } + + private void OnAiInRange(Entity ent, ref InRangeOverrideEvent args) + { + args.Handled = true; + var targetXform = Transform(args.Target); + + // No cross-grid + if (targetXform.GridUid != Transform(args.User).GridUid) + { + return; + } + + // Validate it's in camera range yes this is expensive. + // Yes it needs optimising + if (!_broadphaseQuery.TryComp(targetXform.GridUid, out var broadphase) || !_gridQuery.TryComp(targetXform.GridUid, out var grid)) + { + return; + } + + var targetTile = Maps.LocalToTile(targetXform.GridUid.Value, grid, targetXform.Coordinates); + + args.InRange = _vision.IsAccessible((targetXform.GridUid.Value, broadphase, grid), targetTile); + } + + private void OnHolderInteract(Entity ent, ref AfterInteractEvent args) + { + if (!TryComp(args.Target, out StationAiHolderComponent? targetHolder)) + return; + + // Try to insert our thing into them + if (_slots.CanEject(ent.Owner, args.User, ent.Comp.Slot)) + { + if (!_slots.TryInsert(args.Target.Value, targetHolder.Slot, ent.Comp.Slot.Item!.Value, args.User, excludeUserAudio: true)) + { + return; + } + + args.Handled = true; + return; + } + + // Otherwise try to take from them + if (_slots.CanEject(args.Target.Value, args.User, targetHolder.Slot)) + { + if (!_slots.TryInsert(ent.Owner, ent.Comp.Slot, targetHolder.Slot.Item!.Value, args.User, excludeUserAudio: true)) + { + return; + } + + args.Handled = true; + } + } + + private void OnHolderInit(Entity ent, ref ComponentInit args) + { + _slots.AddItemSlot(ent.Owner, StationAiHolderComponent.Container, ent.Comp.Slot); + } + + private void OnHolderRemove(Entity ent, ref ComponentRemove args) + { + _slots.RemoveItemSlot(ent.Owner, ent.Comp.Slot); + } + + private void OnHolderConInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + UpdateAppearance((ent.Owner, ent.Comp)); + } + + private void OnHolderConRemove(Entity ent, ref EntRemovedFromContainerMessage args) + { + UpdateAppearance((ent.Owner, ent.Comp)); + } + + private void OnHolderMapInit(Entity ent, ref MapInitEvent args) + { + UpdateAppearance(ent.Owner); + } + + private void OnAiShutdown(Entity ent, ref ComponentShutdown args) + { + // TODO: Tryqueuedel + if (_net.IsClient) + return; + + QueueDel(ent.Comp.RemoteEntity); + ent.Comp.RemoteEntity = null; + } + + private void OnCorePower(Entity ent, ref PowerChangedEvent args) + { + // TODO: I think in 13 they just straightup die so maybe implement that + if (args.Powered) + { + if (!SetupEye(ent)) + return; + + AttachEye(ent); + } + else + { + ClearEye(ent); + } + } + + private void OnAiMapInit(Entity ent, ref MapInitEvent args) + { + SetupEye(ent); + AttachEye(ent); + } + + private bool SetupEye(Entity ent) + { + if (ent.Comp.RemoteEntity != null) + return false; + + if (ent.Comp.RemoteEntityProto != null) + { + ent.Comp.RemoteEntity = SpawnAtPosition(ent.Comp.RemoteEntityProto, Transform(ent.Owner).Coordinates); + Dirty(ent); + } + + return true; + } + + private void ClearEye(Entity ent) + { + QueueDel(ent.Comp.RemoteEntity); + ent.Comp.RemoteEntity = null; + } + + private void AttachEye(Entity ent) + { + if (ent.Comp.RemoteEntity == null) + return; + + if (!_containers.TryGetContainer(ent.Owner, StationAiHolderComponent.Container, out var container) || + container.ContainedEntities.Count != 1) + { + return; + } + + // Attach them to the portable eye that can move around. + var user = container.ContainedEntities[0]; + + if (TryComp(user, out EyeComponent? eyeComp)) + { + _eye.SetTarget(user, ent.Comp.RemoteEntity.Value, eyeComp); + } + + _mover.SetRelay(user, ent.Comp.RemoteEntity.Value); + } + + private void OnAiInsert(Entity ent, ref EntInsertedIntoContainerMessage args) + { + if (_timing.ApplyingState) + return; + + // Just so text and the likes works properly + _metadata.SetEntityName(ent.Owner, MetaData(args.Entity).EntityName); + + AttachEye(ent); + } + + private void OnAiRemove(Entity ent, ref EntRemovedFromContainerMessage args) + { + if (_timing.ApplyingState) + return; + + // Reset name to whatever + _metadata.SetEntityName(ent.Owner, Prototype(ent.Owner)?.Name ?? string.Empty); + + // Remove eye relay + RemCompDeferred(args.Entity); + + if (TryComp(args.Entity, out EyeComponent? eyeComp)) + { + _eye.SetTarget(args.Entity, null, eyeComp); + } + } + + private void UpdateAppearance(Entity entity) + { + if (!Resolve(entity.Owner, ref entity.Comp, false)) + return; + + if (!_containers.TryGetContainer(entity.Owner, StationAiHolderComponent.Container, out var container) || + container.Count == 0) + { + _appearance.SetData(entity.Owner, StationAiVisualState.Key, StationAiState.Empty); + return; + } + + _appearance.SetData(entity.Owner, StationAiVisualState.Key, StationAiState.Occupied); + } + + public virtual bool SetVisionEnabled(Entity entity, bool enabled, bool announce = false) + { + if (entity.Comp.Enabled == enabled) + return false; + + entity.Comp.Enabled = enabled; + Dirty(entity); + + return true; + } + + public virtual bool SetWhitelistEnabled(Entity entity, bool value, bool announce = false) + { + if (entity.Comp.Enabled == value) + return false; + + entity.Comp.Enabled = value; + Dirty(entity); + + return true; + } + + /// + /// BUI validation for ai interactions. + /// + private bool ValidateAi(Entity entity) + { + if (!Resolve(entity.Owner, ref entity.Comp, false)) + { + return false; + } + + return _blocker.CanComplexInteract(entity.Owner); + } +} + +public sealed partial class JumpToCoreEvent : InstantActionEvent +{ + +} + +[Serializable, NetSerializable] +public enum StationAiVisualState : byte +{ + Key, +} + +[Serializable, NetSerializable] +public enum StationAiState : byte +{ + Empty, + Occupied, + Dead, +} diff --git a/Content.Shared/Silicons/StationAi/StationAiCoreComponent.cs b/Content.Shared/Silicons/StationAi/StationAiCoreComponent.cs new file mode 100644 index 00000000000..b7a8b4cd5fa --- /dev/null +++ b/Content.Shared/Silicons/StationAi/StationAiCoreComponent.cs @@ -0,0 +1,32 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Silicons.StationAi; + +/// +/// Indicates this entity can interact with station equipment and is a "Station AI". +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class StationAiCoreComponent : Component +{ + /* + * I couldn't think of any other reason you'd want to split these out. + */ + + /// + /// Can it move its camera around and interact remotely with things. + /// + [DataField, AutoNetworkedField] + public bool Remote = true; + + /// + /// The invisible eye entity being used to look around. + /// + [DataField, AutoNetworkedField] + public EntityUid? RemoteEntity; + + [DataField(readOnly: true)] + public EntProtoId? RemoteEntityProto = "StationAiHolo"; + + public const string Container = "station_ai_mind_slot"; +} diff --git a/Content.Shared/Silicons/StationAi/StationAiHeldComponent.cs b/Content.Shared/Silicons/StationAi/StationAiHeldComponent.cs new file mode 100644 index 00000000000..6dab1ee491a --- /dev/null +++ b/Content.Shared/Silicons/StationAi/StationAiHeldComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Silicons.StationAi; + +/// +/// Indicates this entity is currently held inside of a station AI core. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class StationAiHeldComponent : Component; diff --git a/Content.Shared/Silicons/StationAi/StationAiHolderComponent.cs b/Content.Shared/Silicons/StationAi/StationAiHolderComponent.cs new file mode 100644 index 00000000000..221845d493d --- /dev/null +++ b/Content.Shared/Silicons/StationAi/StationAiHolderComponent.cs @@ -0,0 +1,16 @@ +using Content.Shared.Containers.ItemSlots; +using Robust.Shared.GameStates; + +namespace Content.Shared.Silicons.StationAi; + +/// +/// Allows moving a contained entity to and from this component. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class StationAiHolderComponent : Component +{ + public const string Container = StationAiCoreComponent.Container; + + [DataField] + public ItemSlot Slot = new(); +} diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs b/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs index 94aef8ad366..f047fe41e4d 100644 --- a/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs +++ b/Content.Shared/Silicons/StationAi/StationAiVisionComponent.cs @@ -1,8 +1,9 @@ +using Content.Shared.Silicons.StationAi; using Robust.Shared.GameStates; -namespace Content.Shared.Silicons.StationAi; +namespace Content.Shared.StationAi; -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]//, Access(typeof(SharedStationAiSystem))] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStationAiSystem))] public sealed partial class StationAiVisionComponent : Component { [DataField, AutoNetworkedField] diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs index c144f330e11..bdc62a6bb37 100644 --- a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs +++ b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs @@ -1,4 +1,6 @@ +using Content.Shared.StationAi; using Robust.Shared.Map.Components; +using Robust.Shared.Physics; using Robust.Shared.Threading; using Robust.Shared.Utility; @@ -24,6 +26,8 @@ public sealed class StationAiVisionSystem : EntitySystem private readonly HashSet> _seeds = new(); private readonly HashSet _viewportTiles = new(); + private EntityQuery _occluderQuery; + // Dummy set private readonly HashSet _singleTiles = new(); @@ -36,15 +40,12 @@ public sealed class StationAiVisionSystem : EntitySystem /// private bool FastPath; - /// - /// Have we found the target tile if we're only checking for a single one. - /// - private bool TargetFound; - public override void Initialize() { base.Initialize(); + _occluderQuery = GetEntityQuery(); + _seedJob = new() { System = this, @@ -61,16 +62,16 @@ public override void Initialize() /// /// Returns whether a tile is accessible based on vision. /// - public bool IsAccessible(Entity grid, Vector2i tile, float expansionSize = 8.5f, bool fastPath = false) + public bool IsAccessible(Entity grid, Vector2i tile, float expansionSize = 8.5f, bool fastPath = false) { _viewportTiles.Clear(); _opaque.Clear(); _seeds.Clear(); _viewportTiles.Add(tile); - var localBounds = _lookup.GetLocalBounds(tile, grid.Comp.TileSize); + var localBounds = _lookup.GetLocalBounds(tile, grid.Comp2.TileSize); var expandedBounds = localBounds.Enlarged(expansionSize); - _seedJob.Grid = grid; + _seedJob.Grid = (grid.Owner, grid.Comp2); _seedJob.ExpandedBounds = expandedBounds; _parallel.ProcessNow(_seedJob); _job.Data.Clear(); @@ -110,21 +111,19 @@ public bool IsAccessible(Entity grid, Vector2i tile, float exp _job.BoundaryTiles.Add(new HashSet()); } - _job.TargetTile = tile; - TargetFound = false; _singleTiles.Clear(); - _job.Grid = grid; + _job.Grid = (grid.Owner, grid.Comp2); _job.VisibleTiles = _singleTiles; _parallel.ProcessNow(_job, _job.Data.Count); - return TargetFound; + return _job.VisibleTiles.Contains(tile); } - private bool IsOccluded(Entity grid, Vector2i tile) + private bool IsOccluded(Entity grid, Vector2i tile) { - var tileBounds = _lookup.GetLocalBounds(tile, grid.Comp.TileSize).Enlarged(-0.05f); + var tileBounds = _lookup.GetLocalBounds(tile, grid.Comp2.TileSize).Enlarged(-0.05f); _occluders.Clear(); - _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileBounds, _occluders, LookupFlags.Static); + _lookup.GetLocalEntitiesIntersecting((grid.Owner, grid.Comp1), tileBounds, _occluders, query: _occluderQuery, flags: LookupFlags.Static | LookupFlags.Approximate); var anyOccluders = false; foreach (var occluder in _occluders) @@ -143,17 +142,18 @@ private bool IsOccluded(Entity grid, Vector2i tile) /// Gets a byond-equivalent for tiles in the specified worldAABB. /// /// How much to expand the bounds before to find vision intersecting it. Makes this the largest vision size + 1 tile. - public void GetView(Entity grid, Box2Rotated worldBounds, HashSet visibleTiles, float expansionSize = 8.5f) + public void GetView(Entity grid, Box2Rotated worldBounds, HashSet visibleTiles, float expansionSize = 8.5f) { _viewportTiles.Clear(); _opaque.Clear(); _seeds.Clear(); - var expandedBounds = worldBounds.Enlarged(expansionSize); // TODO: Would be nice to be able to run this while running the other stuff. - _seedJob.Grid = grid; - var localAABB = _xforms.GetInvWorldMatrix(grid).TransformBox(expandedBounds); - _seedJob.ExpandedBounds = localAABB; + _seedJob.Grid = (grid.Owner, grid.Comp2); + var invMatrix = _xforms.GetInvWorldMatrix(grid); + var localAabb = invMatrix.TransformBox(worldBounds); + var enlargedLocalAabb = invMatrix.TransformBox(worldBounds.Enlarged(expansionSize)); + _seedJob.ExpandedBounds = enlargedLocalAabb; _parallel.ProcessNow(_seedJob); _job.Data.Clear(); FastPath = false; @@ -170,7 +170,7 @@ public void GetView(Entity grid, Box2Rotated worldBounds, Hash return; // Get viewport tiles - var tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, localAABB, ignoreEmpty: false); + var tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, localAabb, ignoreEmpty: false); while (tileEnumerator.MoveNext(out var tileRef)) { @@ -182,9 +182,8 @@ public void GetView(Entity grid, Box2Rotated worldBounds, Hash _viewportTiles.Add(tileRef.GridIndices); } - tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, localAABB, ignoreEmpty: false); + tileEnumerator = _maps.GetLocalTilesEnumerator(grid, grid, enlargedLocalAabb, ignoreEmpty: false); - // Get all other relevant tiles. while (tileEnumerator.MoveNext(out var tileRef)) { if (_viewportTiles.Contains(tileRef.GridIndices)) @@ -206,9 +205,7 @@ public void GetView(Entity grid, Box2Rotated worldBounds, Hash _job.BoundaryTiles.Add(new HashSet()); } - _job.TargetTile = null; - TargetFound = false; - _job.Grid = grid; + _job.Grid = (grid.Owner, grid.Comp2); _job.VisibleTiles = visibleTiles; _parallel.ProcessNow(_job, _job.Data.Count); } @@ -250,6 +247,7 @@ private bool CheckNeighborsVis( return false; } + /// /// Checks whether this tile fits the definition of a "corner" /// private bool IsCorner( @@ -287,7 +285,7 @@ private record struct SeedJob() : IRobustJob public void Execute() { - System._lookup.GetLocalEntitiesIntersecting(Grid.Owner, ExpandedBounds, System._seeds); + System._lookup.GetLocalEntitiesIntersecting(Grid.Owner, ExpandedBounds, System._seeds, flags: LookupFlags.All | LookupFlags.Approximate); } } @@ -302,9 +300,6 @@ private record struct ViewJob() : IParallelRobustJob public Entity Grid; public List> Data = new(); - // If we're doing range-checks might be able to early out - public Vector2i? TargetTile; - public HashSet VisibleTiles; public readonly List> Vis1 = new(); @@ -315,18 +310,6 @@ private record struct ViewJob() : IParallelRobustJob public void Execute(int index) { - // If we're looking for a single tile then early-out if someone else has found it. - if (TargetTile != null) - { - lock (System) - { - if (System.TargetFound) - { - return; - } - } - } - var seed = Data[index]; var seedXform = EntManager.GetComponent(seed); @@ -338,30 +321,11 @@ public void Execute(int index) Grid.Comp, new Circle(System._xforms.GetWorldPosition(seedXform), seed.Comp.Range), ignoreEmpty: false); - // Try to find the target tile. - if (TargetTile != null) + lock (VisibleTiles) { foreach (var tile in squircles) { - if (tile.GridIndices == TargetTile) - { - lock (System) - { - System.TargetFound = true; - } - - return; - } - } - } - else - { - lock (VisibleTiles) - { - foreach (var tile in squircles) - { - VisibleTiles.Add(tile.GridIndices); - } + VisibleTiles.Add(tile.GridIndices); } } @@ -480,40 +444,21 @@ public void Execute(int index) vis1[tile] = -1; } - if (TargetTile != null) - { - if (vis1.TryGetValue(TargetTile.Value, out var tileVis)) - { - DebugTools.Assert(seedTiles.Contains(TargetTile.Value)); - - if (tileVis != 0) - { - lock (System) - { - System.TargetFound = true; - return; - } - } - } - } - else + // vis2 is what we care about for LOS. + foreach (var tile in seedTiles) { - // vis2 is what we care about for LOS. - foreach (var tile in seedTiles) - { - // If not in viewport don't care. - if (!System._viewportTiles.Contains(tile)) - continue; + // If not in viewport don't care. + if (!System._viewportTiles.Contains(tile)) + continue; - var tileVis = vis1.GetValueOrDefault(tile, 0); + var tileVis = vis1.GetValueOrDefault(tile, 0); - if (tileVis != 0) + if (tileVis != 0) + { + // No idea if it's better to do this inside or out. + lock (VisibleTiles) { - // No idea if it's better to do this inside or out. - lock (VisibleTiles) - { - VisibleTiles.Add(tile); - } + VisibleTiles.Add(tile); } } } diff --git a/Content.Shared/Silicons/StationAi/StationAiWhitelistComponent.cs b/Content.Shared/Silicons/StationAi/StationAiWhitelistComponent.cs new file mode 100644 index 00000000000..51d8793be06 --- /dev/null +++ b/Content.Shared/Silicons/StationAi/StationAiWhitelistComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Silicons.StationAi; + +/// +/// Indicates an entity that has can interact with this. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStationAiSystem))] +public sealed partial class StationAiWhitelistComponent : Component +{ + [DataField, AutoNetworkedField] + public bool Enabled = true; +} diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs index fb8b64454c5..0584b10562a 100644 --- a/Content.Shared/Station/SharedStationSpawningSystem.cs +++ b/Content.Shared/Station/SharedStationSpawningSystem.cs @@ -8,14 +8,18 @@ using Content.Shared.Storage.EntitySystems; using Robust.Shared.Collections; using Robust.Shared.Prototypes; +using Robust.Shared.Random; +using Robust.Shared.Utility; namespace Content.Shared.Station; public abstract class SharedStationSpawningSystem : EntitySystem { [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; + [Dependency] private readonly IRobustRandom _random = default!; [Dependency] protected readonly InventorySystem InventorySystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; + [Dependency] private readonly MetaDataSystem _metadata = default!; [Dependency] private readonly SharedStorageSystem _storage = default!; [Dependency] private readonly SharedTransformSystem _xformSystem = default!; @@ -34,7 +38,7 @@ public override void Initialize() } /// - /// Equips the given starting gears from a `RoleLoadout` onto an entity. + /// Equips the data from a `RoleLoadout` onto an entity. /// public void EquipRoleLoadout(EntityUid entity, RoleLoadout loadout, RoleLoadoutPrototype roleProto) { @@ -52,6 +56,26 @@ public void EquipRoleLoadout(EntityUid entity, RoleLoadout loadout, RoleLoadoutP EquipStartingGear(entity, loadoutProto, raiseEvent: false); } } + + EquipRoleName(entity, loadout, roleProto); + } + + /// + /// Applies the role's name as applicable to the entity. + /// + public void EquipRoleName(EntityUid entity, RoleLoadout loadout, RoleLoadoutPrototype roleProto) + { + string? name = null; + + if (string.IsNullOrEmpty(name) && PrototypeManager.TryIndex(roleProto.NameDataset, out var nameData)) + { + name = _random.Pick(nameData.Values); + } + + if (!string.IsNullOrEmpty(name)) + { + _metadata.SetEntityName(entity, name); + } } public void EquipStartingGear(EntityUid entity, LoadoutPrototype loadout, bool raiseEvent = true) diff --git a/Content.Shared/UserInterface/ActivatableUIComponent.cs b/Content.Shared/UserInterface/ActivatableUIComponent.cs index 93f05acac05..0e124070fc7 100644 --- a/Content.Shared/UserInterface/ActivatableUIComponent.cs +++ b/Content.Shared/UserInterface/ActivatableUIComponent.cs @@ -12,7 +12,7 @@ public sealed partial class ActivatableUIComponent : Component /// /// Whether the item must be held in one of the user's hands to work. - /// This is ignored unless is true. + /// This is ignored unless is true. /// [ViewVariables(VVAccess.ReadWrite)] [DataField] @@ -29,15 +29,15 @@ public sealed partial class ActivatableUIComponent : Component public LocId VerbText = "ui-verb-toggle-open"; /// - /// Whether you need a hand to operate this UI. The hand does not need to be free, you just need to have one. + /// Whether you need to be able to do complex interactions to operate this UI. /// /// /// This should probably be true for most machines & computers, but there will still be UIs that represent a - /// more generic interaction / configuration that might not require hands. + /// more generic interaction / configuration that might not require complex. /// [ViewVariables(VVAccess.ReadWrite)] [DataField] - public bool RequireHands = true; + public bool RequiresComplex = true; /// /// Entities that are required to open this UI. diff --git a/Content.Shared/UserInterface/ActivatableUISystem.cs b/Content.Shared/UserInterface/ActivatableUISystem.cs index b1006b2a742..7eb195c0b19 100644 --- a/Content.Shared/UserInterface/ActivatableUISystem.cs +++ b/Content.Shared/UserInterface/ActivatableUISystem.cs @@ -101,7 +101,7 @@ private bool ShouldAddVerb(EntityUid uid, ActivatableUIComponent component, G if (_whitelistSystem.IsWhitelistFail(component.RequiredItems, args.Using ?? default)) return false; - if (component.RequireHands) + if (component.RequiresComplex) { if (args.Hands == null) return false; @@ -191,19 +191,22 @@ private bool InteractUI(EntityUid user, EntityUid uiEntity, ActivatableUICompone if (!_blockerSystem.CanInteract(user, uiEntity) && (!HasComp(user) || aui.BlockSpectators)) return false; - if (aui.RequireHands) + if (aui.RequiresComplex) + { + if (!_blockerSystem.CanComplexInteract(user)) + return false; + } + + if (aui.InHandsOnly) { if (!TryComp(user, out HandsComponent? hands)) return false; - if (aui.InHandsOnly) - { - if (!_hands.IsHolding(user, uiEntity, out var hand, hands)) - return false; + if (!_hands.IsHolding(user, uiEntity, out var hand, hands)) + return false; - if (aui.RequireActiveHand && hands.ActiveHand != hand) - return false; - } + if (aui.RequireActiveHand && hands.ActiveHand != hand) + return false; } if (aui.AdminOnly && !_adminManager.IsAdmin(user)) @@ -274,13 +277,13 @@ public void CloseAll(EntityUid uid, ActivatableUIComponent? aui = null) private void OnHandDeselected(Entity ent, ref HandDeselectedEvent args) { - if (ent.Comp.RequireHands && ent.Comp.InHandsOnly && ent.Comp.RequireActiveHand) + if (ent.Comp.InHandsOnly && ent.Comp.RequireActiveHand) CloseAll(ent, ent); } private void OnHandUnequipped(Entity ent, ref GotUnequippedHandEvent args) { - if (ent.Comp.RequireHands && ent.Comp.InHandsOnly) + if (ent.Comp.InHandsOnly) CloseAll(ent, ent); } } diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs index db17599d87f..37840dcbb54 100644 --- a/Content.Shared/Verbs/SharedVerbSystem.cs +++ b/Content.Shared/Verbs/SharedVerbSystem.cs @@ -78,6 +78,7 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, out var hands); @@ -85,7 +86,7 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } @@ -94,35 +95,35 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(@using.Value, verbEvent, true); // directed at used, not at target verbs.UnionWith(verbEvent.Verbs); } if (types.Contains(typeof(InnateVerb))) { - var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(user, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } if (types.Contains(typeof(AlternativeVerb))) { - var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } if (types.Contains(typeof(ActivationVerb))) { - var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } if (types.Contains(typeof(ExamineVerb))) { - var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } @@ -130,7 +131,7 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, target, @using, hands, canInteract, canAccess, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent, true); verbs.UnionWith(verbEvent.Verbs); } @@ -138,7 +139,7 @@ public SortedSet GetLocalVerbs(EntityUid target, EntityUid user, List(user, target, @using, hands, canInteract, access, extraCategories); + var verbEvent = new GetVerbsEvent(user, target, @using, hands, canInteract: canInteract, canComplexInteract: canComplexInteract, canAccess: canAccess, extraCategories); RaiseLocalEvent(target, verbEvent); verbs.UnionWith(verbEvent.Verbs); } diff --git a/Content.Shared/Verbs/VerbEvents.cs b/Content.Shared/Verbs/VerbEvents.cs index 6b3fd327c99..6bca97925bf 100644 --- a/Content.Shared/Verbs/VerbEvents.cs +++ b/Content.Shared/Verbs/VerbEvents.cs @@ -113,6 +113,11 @@ public sealed class GetVerbsEvent : EntityEventArgs where TVerb : Verb /// public readonly bool CanInteract; + /// + /// Cached version of CanComplexInteract + /// + public readonly bool CanComplexInteract; + /// /// The User's hand component. /// @@ -130,13 +135,14 @@ public sealed class GetVerbsEvent : EntityEventArgs where TVerb : Verb /// public readonly EntityUid? Using; - public GetVerbsEvent(EntityUid user, EntityUid target, EntityUid? @using, HandsComponent? hands, bool canInteract, bool canAccess, List extraCategories) + public GetVerbsEvent(EntityUid user, EntityUid target, EntityUid? @using, HandsComponent? hands, bool canInteract, bool canComplexInteract, bool canAccess, List extraCategories) { User = user; Target = target; Using = @using; Hands = hands; CanAccess = canAccess; + CanComplexInteract = canComplexInteract; CanInteract = canInteract; ExtraCategories = extraCategories; } diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs index 7032293eaf6..c4f860e165c 100644 --- a/Content.Shared/Wires/SharedWiresSystem.cs +++ b/Content.Shared/Wires/SharedWiresSystem.cs @@ -130,11 +130,20 @@ public bool CanTogglePanel(Entity ent, EntityUid? user) return !attempt.Cancelled; } - public bool IsPanelOpen(Entity entity) + public bool IsPanelOpen(Entity entity, EntityUid? tool = null) { if (!Resolve(entity, ref entity.Comp, false)) return true; + if (tool != null) + { + var ev = new PanelOverrideEvent(); + RaiseLocalEvent(tool.Value, ref ev); + + if (ev.Allowed) + return true; + } + // Listen, i don't know what the fuck this component does. it's stapled on shit for airlocks // but it looks like an almost direct duplication of WiresPanelComponent except with a shittier API. if (TryComp(entity, out var wiresPanelSecurity) && @@ -161,3 +170,12 @@ private void OnActivatableUIPanelChanged(EntityUid uid, ActivatableUIRequiresPan _activatableUI.CloseAll(uid); } } + +/// +/// Raised directed on a tool to try and override panel visibility. +/// +[ByRefEvent] +public record struct PanelOverrideEvent() +{ + public bool Allowed = true; +} diff --git a/Resources/Audio/Effects/Footsteps/attributions.yml b/Resources/Audio/Effects/Footsteps/attributions.yml index 91c3ce260d4..7a56beec38c 100644 --- a/Resources/Audio/Effects/Footsteps/attributions.yml +++ b/Resources/Audio/Effects/Footsteps/attributions.yml @@ -76,5 +76,5 @@ - borgwalk1.ogg - borgwalk2.ogg license: "CC-BY-SA-4.0" - copyright: "Taken from IENBA freesound.org and modified by https://github.com/MilenVolf" + copyright: "Taken from IENBA freesound.org and modified by https://github.com/MilenVolf. borgwalk2 clipped my metalgearsloth." source: "https://freesound.org/people/IENBA/sounds/697379/" diff --git a/Resources/Audio/Effects/Footsteps/borgwalk2.ogg b/Resources/Audio/Effects/Footsteps/borgwalk2.ogg index 96c2c1617f47556ab8143e378469e314b37e6c64..57685ff173de25a873c363fe72d645db56b91201 100644 GIT binary patch delta 7656 zcmZ8_1yoeu*Y+J4I;2D5Hl6%?vR}mw?g?9U`HC zfk6ruA`0kx!T-0u|NGvx?q2)s=bXLw+4nhn&YGlR*s3mQ?Cx#`kO2RAj(Pto*OMpi z!gyh~ZU#Dg2A!HLC5{>KOarz=m96U`(9!=*p}>lq{c>qrd3Ej|4` zB#i^z5k8*I*KY=9MvB0YO*N5ZpnwKBXDmZn0xiChjjq);W(jdz6=bNXXAEQdjI5sv9bQXRAipa3C3Q#PBy3R7nR z0B2e>H8Kv1o<^=`pvPrCaHCNwRfT5LDwI62<1*w$F$_pNx7jpuggbUp<3nN0tcC~x zAo^g?t0^Myq607p18@8VXR_rDScD9ib!J#xmza%~a^$Dv6->=B6U>+ebIb~x5vE

tI+h&vK10ZN4+|t}o0nFWE2)?XD|q5f-^2ujP!apy48fhAicVJ1qLz z<^9K(5zCn`Ma)vWf@v_u6ys`Tjx&;4E4B!mrMR_&@HGy|GibE55CXwYi>^)`A+JR|3p~Bbs|f`n1VRm=-Iq{bXH&jO zC?||JyA$dkjyE^d*8A*0Xni%IS)4!+uWf#KL=fL;uO@WWjW;(wsIT2=|3ot=zSHGT zsIRYW{&RRG5UjQ#(RYraCGtAK}badE!9XmL=YGS#1H0i^)fy&l1OD3K+dKjUO%xu-Vt|skJ_*seVopP^ z2FGNkU(*Kp!sFNsP%`Z-HhwaT+|UXflZ`%-$YSOzK`am;A|O{|r_s-Xe8|H>uJU8D zP^h|`Ec9ey_Nl9wG?YHFJqu+BrG-L)O>t;zADP8Mw2uOm7vw7omjrRqx$ZQ&Xj2ZD1w~(9woXyO&N)NAvd}5e5*we+%3Lo9 zC_vwDTVD?HQ8<{les~(hpl#7QD82LhbpYs#Bn8wXsa#8EGjf2_)2oq)p4Rtd2%JK5v~a|)I=gNlNyvlZPO}9jr4XLYKvZJ*x;GLDZ9@V8fzq?%OKy}j45OyA zq5`y`(@aD_4Tzi*&k-}rfn&MBz>nvEJ`JAb22@^-AbL$v&KuJjBFI=1lqfQe0i`d5 zhgvB$Hvo|M%wjFMp^X0a6GvKSTA6r6u(_-#W2_-cxF!m!XB>k}q~r1riLJ5Wt{GSr!8cJa+CBK%=%0kPV3sJ_WF7Y5)-R2LQ@OQ3k+JrM()N}>wkYZ-X@2Kr$n z0r+45T=T57(C6nvLzOQ*B?q523L?=dCHP{Yn*X)MW}MoIo2?}zCV$r7zgo<+toKf>kqvAU) z*x6)0Xf60x#Y2=NJ?*^$n}QYN{66w)1EeM%qbMMf761aCd+i_>M-jt?vAG7Z8G#JW zl8oqNm8(szdYr=?3s@OEiy7K`v(P!k)VSydN@nmO_Bu)=GkPxYVcV@q=(d8O1f&`G zlFxRCi;*hIQf2Q5(g@+9Ku{=S;`0cEOq&88}A=%V$ym@lf!f zj|}h)saGws)L8qTkefeWB21)M@R+zyb1V98+WN=Il6sbT7b&a>QHUor+-^DMyx38i z<=whR%Czk0XLEN2z)R}4=ENd0XQ_x9=gs%MlBeABRVx@f)pU&~rJrOmlD4CI5OC{z zz#4NQrs#LvIP#~L)_v(kaYIkZ@4vn_m&(d<4w$hHrrLSD*O-0*yl=^CFpjSx50mIV z5s;!DY=^(%4+-aIThO z!~llmJ>9j^e+@^)xU=`Zkk58T)#f90B%<#oJvEIb+0I{8!#2KP_cm{_=Nn?tt4~Xx zC|;1(KXGAuF#s~!!=rq)?0jEfuFa!|ahq9Fkv_f)n9AW|?N4*s`aPknSDvg_b6l@f zQFdCL;42fVT_P*i2)XZJ+9KWobeFwUl-CR%*2WbA_KCszLoF_DA1d+w$K38r9BmZF z1F%MGjf$O}EDkMJ9uxY(Bl!GL1jw_hnZyPgk z3W|AJ9Lu`J`s-Rb$m@GiHTLvwEya5Fh`K-H&1KQIy+y-h8cHjLq#p;R6 z8+3x2DY@k=hD+?1r@C39!|?ALMm(M4RR0#-`;cJhdNO}Osl&U@bYo7X3|^Nj7S7aj z|4Zg57$-FhpYSV{Oh?A+?uzlp%t+U$dL_LzdI_eo$_vNnNR3I^NGBy2UK)s#D{8L{ z<*F<1yf{t%R$vk?jkwHe|EW}OiG3@D#X&B8Sc|`L%VqcJ06e3iC4}wYhK3(4dl#N( z-0Sd(kInb_%G$ZI8^$n;JQUr_X&$&(`#W!byDMJIKm1D!|3}%|NffWEJkYRsMD{ z8+h9ZH|NWh;IHDMn#^4aF4r>ZTOK$(FC#vGztTv?53^~?mwtq%0eVJK(uCUMMzdKC zRkLwx#k8Z5%za*|ez)|!i`shFSR%s7y&K9RpY+@tk3Wyjr_r%8pV7MPR4ve4J0uU{ z@!bV}LP1Of9ho;5rnq0g7+hXXD@ksz1i`-zgzAnwF@CY9l1I@-3b=Wd51lVJq!u!`wK+MOPrG<+)2QMG@KnHlCM1v@tz`Q$bX zzF(kdo>YjfP+on>ckYWa#qPHnJ#B$SYciqz_*{#LIX}jX#4Gbc>ObbSWN8z>-mRR! zuz{yuPuBDJp0r25d>mvrMmKBSXRUo+q~0Idwt7u|Uv1-6cT|d-+%qOBHWH9v_lYnO z>g6i9x$``RQs}cU5nUG{)S||q_oTU;pXI=k7k2$+V!O$hVnxb3+X(`# zQcI;2OgNwPFb;3g6zNM$QaA1VV{V<)BhyyD-6ElAJRn=jN?L^huSQtLaLw@Dj6O!= zKPi1B4uY31eoUePmMyKsl3YQuIBzwv^i*ekCO_>!m1VCm|N61_i-P$)6aJi>qhUP2 z@(v8Q;WcmOL49qoI-3+hZcsmhzPGtaw~#5Hm#dm^Zc&Bm!_QQPugu(-szif+ALY&W z6KlD03tf{2%4UI4kNp9$*AHyW67p-3vpN`idBxXrogPO^FxgJ!QZ0af7L?t8#*MwA zl>%q4)($NDtmimcJwE2(Kvy%)Yp;%9=qsOm^SGH{u0cb3#OgQ)6p!rdR;E&^!qTOH ziYeNW^9OHPJxq+2M~i**DlLD`9i(;Yu11;~{0`?E<7xUd-hcmQl1-g}qe);n))OLjokvZ7R zM0!=C_OUvQe-4lOWq(B_E=Gnw^3fHgO91a9mTN9Eq^(^1m(`GOKmv0;0Nizk19m=I ztVP^p!-4h>wzTD`cQq7#Uy(XUNzj>d8xha|gf-z8n|{Lko}|R-JZf64f6#+AyDKJq zNL6O5Z(IND=OZeW4*w+Ex4sm2obwvRg<0Z4fU9zTdxSTs(=AuQX1CbZwVD z2NN?AQ)FC?0$AKyrL&|2qnfQOy0X6Hdvm`jZ6fJO7)rx`pjyt38$1W}CD=K)5OGGw z7cP{^rfGhH+0ykL&xua&O5}?3Z69 z>4=68ZU4YTwQcr4=URKUE;T4li;|>POME&0(P2NNvL$P=a4Oy}ZO%?0ecQI=csox{ zg3$lG@xyY1kbHPY>vrP#7K&gM+$9MUfoFkxPoIbRJl;?3HCBr9k2tu?MuXdszluW) z-t1UbN9LwXUZw!M$R;W~GTL*?*ZccSytNzwO<#F3srwkTUt2wbmHMcv(VAVrYY0qtq zn!Gk9sEP_UmMJ)i@e1ue`RCd4`n|596yl`==B1xw-+knp#6q{aINo!<&<6tp;620g zAEPeXE^L{JDasPdA{Idge%yWWY}?I+cBZ@+4{VwM0Qx}I?>Q*88vSqo67IuX{p=~! z$j;ta`fC6z6X{MiG|gx4OxOsCKK#~mByT)I@%4l4_NIp86OTwe5@zbsFUk1puG*UK z8HYWdTrMoFh+QRRbzjaG?jCZJsEz{%MF-DqS05I?-U#|(7*vm|p;%MxjA6AR<@|o_ z=0%Iv32!?Y3G~w$De2#4dFKy@E-!2P3isT`NbWk-fT=OC$hwzUx#0!2Cg$aJy#TF5 zAzN1`+BA0R?}=geHoW~9oQQDeGR7s>#}BTYBya~%dId?Q275p)Tizb0sB1uE7r(Mc zbNEF&)0RpKxce5y7VNw8GpU3+tGwmsa%%53UEm90<5<<+i;7~N`MX!Bi9&4Xs8m?u zGs$<2pi5zzSf+t=#Kv~6WR!>(MT7zp$@N?G_xau zb|#y0pKlg|M5~kCmz772KL~yvGY4y90!QhZ8at~;k6R?Y`F_V0-R<%LMG`ym&ViCL5e>F+H@mA>gR?_?! z27I7=PfRB5$v0k#rTnmmnxdKCJGDv|>gUHq!h31d9jh*;uB^`n5zd`+QhFL2H$>o7aixjBZS`@vs=?FfV^)zLZ_mlQb=Wqcb;2sqj?LFSob0ZmiI}+ix9B@gSo=$hy$PqLwZMG0 zbDv=@3dp7`4hsZ=YBLX#rp{ZE&IZd6P0sV^xGLXIt>UXTpPH)F>|S$Vcz26EYwew;ZCCJmoV~r^!3mNl{-HgQO<@@|Nbl;5fBL{bPV;JR9rI4}DB&Bj z?v1dM8KU%`?A|qiPmNx!JhabY$auiH{8=;Yq}10j4Kh&ub*h$~4~(fnPKs0Y5?#-T zp)O8Qzn|{#_PICj%=%P3plh7EBF_9lyzN^GxLL5D%f~wzLoAL*g` zFTm<7dISUI9pEO!lyp`^DNS$DW|x4ijp+>klMBs3L;AB{W`D3cSbd0cQNjE$ms8|D zZ@`mv^GhPF81ieSrrqe>9$`?2+wp`zgPQ`x?BVaywT`+4N)MXU)eAG#Fy(X^ zHt_Vv%at!1OqTP>4I7g+IczvVqm{6^U&qQ$MbrPRib+exQ(iRC>$|Y`@Mgz7sKd=; zaI&Ny+!!TF!e2)VB)=h17Rv*mMgVIH))!3USKGZ+f5*$}!y#k1+5>4`R!@q`17-y* zpN{*6N%4%A)>5o)KgiGQRV3K0brZW?{z}U!Er2Ae(a+k!Le}AVBmD!=G=FDjxcfKV zUFUSAM0%H3N2{gPJB_2qR~C-9#-&9IZlU78j{)uf{~sHqka}(yMgt!mCq9F^yZ*dleBz0KLYna(`0b#f_;YtH zjY^H?3JsjCG)&vI!IOt(k&}UXQL~)q=#z){c3^||i^(pqQ~xh+@GRT`%so6t8us<=Vqi*7?8qRVc%-g$q9A^`5x{>Nm6PHS-f01{2gqj-z}vF zY&B_R8SpGxyNz?f7K7GKQq7e@ie(>)RabShON1WUgY>1YahB@XZrYUgUupZ}Q9;oG zJS!KDQpDkLm6Kanoz!!N+$9Wbq{D#U3Bd}k>-5Wembi>7Dgh+Dz5S$`zyqGy;pv>_ zW)NG-5iU<>S4Y9xvbqzbB~dOXigsE3BF`Su*%7Ju9DeWFJKMsH$a4NI@fH_*CDMCW zwK_|#Vav*U(-|r&P)U1502nqAU(rHvjW~>< zfj7osIR>Pd50hI)()lH}BPpak2`tfW>o6iSck#~%Ah2CetkH@hwOv2R^b%D%&awR} zPyU*+Z204!L%K&_l6g`-Mc7m7?9!T9?M;y>AFj_Txyx|wl>VR>z9S|YNIoky-VZWL z9jmifH<4Xw6YP-%ZnAFije9C_DK)CUul|&k#XUVv`Q(Sl=2OukgJI9l?sLX>Jsse< zCw|6x2RfZR?yg&GA_fW6*oq}qR;h2h!Dhqpk8=j>>}j*H_jxn(SX>;OtklD~1S!&v zXJtlp=}T7Mf8GLKC8W$%`7&GG4O{@VbP~93s=ZCHbfm4N@G>;Q=jc{a+R#VrkV*A+ zI-Y=T)+ZDD7XZ2@sI-bSB2v;wr+|Pof(R@P((Tf9QBt}amRdR_7NkX5x|Rm%Sh|+p zx9IQt>hu15^T+I*IcLt9IW>1@?wyhTmVOIRHZxNL-3I-?3Xwfc$t|i|&UT-TEFd?y zTR!#wNH_}a{B8WW^>^gI&i~c7Fuwzc)L(=`=>KOKyYr6|GloFZ!rq)s`Lo$`YYU@~ zc2V9;x0uWGeeMD4?btMa1ku^?V1g!%-vW$0C_PToCv9^cutf3j&wEKmasrI-ynaqt zP?U}~bJUAALp(usC8m7wHH0iSE0%=h$Gf2S82%DLoNXjVq2gW7--dExllld5-ly>$ z6vw9XkLALqiHlTiBf)^(&;4R0WJzNqRo}rtARiDGfT3Px zOdyC|;7FiaNa7nQz(5DVlVhZV5y;755L|07KlRH#pv!q8CtKhfsmch0smNI}!AR8P zSe*$}AHpyQ3nuszZ8_GCU{35Lh$`1wj-M(RgNPSkfMG^pWyVIUTETJ<7=+^>AiMEA zR#nxaAa)eYNC(GY=;9DyE6!Ym5zb#;B{`!;mQ2+MaPeR1IXBX85VEWgB{?jbxPEaa z%m~b6O!{wF4U03va)!aOFu01GJRJ-n!BhfA7%3FM$>d})tiZAb@KJC{37kX-o5>$D zEdW*(4-V#p5gRkY{z`{oq{FLkq*r}VwYV8#S<-=#UVvGm6=yZVGK{l>!njWW_Qcqd zsbdrz%34ifT+HM0ckRTOX~8iF)((tP{!WV(GeV)HolNd8D~xmmIIILtrY473p`}7W zJ3wOG3x|_HFhg#Hz)3K?I!UZpK_G*lw?NN-`f;h4cgcaCKLmj=2JJ|Fjm^|f;@9yU zM&e7r)Sd_-cmX4U;7N2~T5{btEhb7oq8rl?$T2ZJ1%XulfItKWzPW9SApd~kyC8|% zAQHb=qh5iv=NL2iMFOg!0&5h0s;a>Rs==IVslF<5a&f8(oU1o|mIbPEoE?Ar3QR(8 z`Uo(r;h{Hu1QJY4a0F(oBSstyHX(=^i;;;@IT*taLkEK)jF5ln=wPGZ5E?&KIaxYb zyio`zriG!41&46Pe*jeF3NVBr%8`HNItBP54A_P-WK>7tbFh;|y+_)E`Fi1E?8<@V%8^l_wag00;CE&*?_g8~t z{v?=QY#8@D&Q;9pNa0~Pk6T0H}X^aUZZqkbc z_5%=z#2y5~=E%f(LRLWpdUp>5!oe&Q3lmF!{YXxh>Ba$WyyC{KZtVO&&1P;2&s=b2D=*P6YTb)~Xl&KhWx}945f5N_f^{F_DY_L;CN5o^$hqd?+Wr3;vQF z(lp4VVZP-f3b=qX4fwapjmg9z0apJ9_ul9{RA80j2Av8~!Z`Mq zJD@i{VJ}i1hu(d9vm$Ja1w#%0I(DR7cI;n$#(gA%rTP-xxGE<5(7`Y+&05_nz{C`X znK-L65eCFKUvW7mEm;-7iH*Z3F{vt;wSx?@jZp;H3b=7ROp2Sp&>)f}nQmw>%hJJ& z!yx+LYd7o1v`T98ZrC7nAiE+rY~ZV@9+*WZ3iE^B&`t2S$_;BRnA`td^$Z9k&4gJ3 z-v0~}_b&kd+36J~nE$%K4frWk0KkOTKa51z{|)0ecoVaK5h@Z)Fw79Fzec9?Y*?M?!StNveYX+yc|Wfd5$ibum@B2mk2)B7j(;n`!#JDTXe+Z1EztaCAR3)(K{!he>B+Rt_Auy8uYu#`Gfd>DYlrWCiD34Tw z>I>~dQh+`Kv%%d4Enqgd|A;ML{>Ok8lSKZ<>c46H{|o{c{{NpcK>0m5SU=Yvkeg}B z3NlmRvi*%aVoZ>=CK`u}Ghjj&Y?b&`MPfZCXIRdO>JtdUBydgy8KjQ~H6xE_KmIIHDs3d%h0`kt_cs_<~6)4?#hg9V--*b^QLB z#VGh+c>iBP-EkKLqUQ&J?rOG__6`?@E#@j6WZ~b24ictB(IlvH#yl2}7*z?0GYI@> z@B7ThAGq1Fx-dIf5JoAGaDrHb(RS?zIRVS^wOE?3sa2`+-8kY(U@O*7U5pHz)lazm zo>WbNH!#`SsHogAlvB2#Jzj3@ImUawf=T<2s2sGAB-L*K`*kBl9tx@PC*X{Noklk1;l0F zW3n)&JO`a(Qr}0PAam1IenDZ;Hxh59-^nQ`si=PVKc7f_e0(sJ00{I3^W)?5@1gSz zIR^M&xuJYSHCjNTfJVESo1xL)&}d#XS^|w0Mx&W9bxh@j zS!+$_qvHc#TL^SEoTJQcH!P}iyC9%r_Rz1GSJ19$zWKMEx5wJ_u0q-@sonMJZ~19^ zm*?q;eZ76I5J--4ylSDMjpe98lb-9=%dp7?`1r{ZsDK~KEcv5s_Epw5V6w_@WMQxX zvKsR&&(!O}Xr=pi4ZDcP&>6zZi1pmkGm~4Hc#TJod+=R0{|C^|-A$hzjhC$N)n6D| zalW6W(f>X%i$0#Okn%u=mE;pOU0)-Gj)is(uW~JeJl53S>d%7hbRtyvrWOa9l9p&G zPby-htRA`k(wMOIES}KL0X{uvh@o75r!l)Zn2i#CHE(ExyXA~d`&R#Sqq2ND67_4J zXXcNURWNTOq*(HVgE#|=E9F;-wjqw(4hgw4%V9CG_A5oHNU@@JS+&vh1D$>G3bNw; ztAm{^^lou80<9+`8JL2P#x3cq#7itJgMC{x6_tK!){C@#%_rX*Z7t9JPl~|?`C=mYP z2N{8=HvF~f>#G4t)R z_hjXK3JqePGnV>ufd@gkpoR_lwO5w>d4^}&LYI5d?6B%xe2Vdrdhgk|?Wd)O?GBqM z`j)a)tJM6{KOE%6-d4utJrFZw2M_Y`nmo#y(onBY7vo;)pq*WzXw`nk2M$hJBPZpw zYV!APuC41LoS>hD4-#OaDRw2=shE6MogjR&xs8gLZA+pU=%NxGxjy)g6e@#4oWEbH zdRBQeuUrU9*Izd5EF=2*-U~9HXj-BlF#T5glmKx19?ZBSFaP)o-Pb)5VGg*&Bj1Z1 zKc{h+gc>ir%Uk9HOf85%=`R8~I0;TsEdr}N3Vrj$YD@sEYbJPpAYR>dx%6bX|iod@@zQpw0!>8E}OV-0^cjS9s(;lV=Ck8kmY1sGt_ z9Mgw9bK4nTW>FBKR~bsB}i(LqqHpx$|BiZ zSq!nXA~l5X=-b4$ymy*T`fk`@+=WPSt4;~ru1CLfsLw(+@P`~Q&`b{f= z0!4@YGZKfK?|c1Yc(0ihf6B^(=ya3FD+Mgh zz%X5ay%Sk4H|!a3O%gjl;-L-o8XTEh6@)rT={N71==1oVg%vhYR;Jko_GxMfxn6ol zDC_Z|*hVYd7!K?Z+oc!IUd?u*pClK?J&()#%!D1NYhV8geXDX857ZQZWHZJ6k|AOt zo7%kj>`uDg+ogS+js0}{WUH%T03b2&cmd&1l($G^gJ=(ISv;oQexYiPXrFvC^hD@E zG`+KX-IM{>Ms9M8`9-8aqwrzBq`TOfnhRY$nOc6DMOP@v`?V*uu*nbd{T~77x{acT z5rt#t!<8?DUD@qfU+}&%T8Qwf6^K)iQ&82LR66HIYHX0TackQgk6PQv76R>`!`zzq z3!UpsXWsz3TNZUfUqgNr;ul|inziOvMD@_eGa^k3Nd>v8$>ksT#zmKw9yv_(;{V>a zCagR+J#D(UzWhGTeD!msmD=p(!`RFb7*tzQ*e7oLaHOqBn6$`#V&w7D0IGK;dgzwgxrdQsAzq8ml_Ex=)rE$ z^_9zhv*d{;>D;Bxep54#wg(x`D1EgdjZ1-C>wfRkT~i*S{reTb91Zb7((+8lJsp6c8Hea$s&Sai z^wO1S(Ug1F`y)O4>a%WD@#ePi`D2+vLX_v^4C5@dQx=KLbD@ z-O(Inoa30MpfM!Qlbm2h zTKSEUm%7ky>F?^DzTD}1A=?k|dB15Z#_(#|QsdOT45Mq{pYt=GN*R=>L6{tFM-qm+ z$;TC8b}6!wsAJ`A^Sr|zL*qk^eVmJ+1xk6HoQv-`c@700&1>sn7yXnKOks7R;cL0y z3RZ!7?geoj4xC-)>IdTI`ekOvVynr$jyM#bqp;pN&8F)SbL492%JSeh>x*0>?fy*Q zm@4CBIV9gvKdyJFah#WPG=6A}6-HJ0pje#IMtwM(9A|CeC>im~SIQjk5v2M8L3JNR zb*Aw4i%)<83&$4?A*9!G>5mw+t^e2)nzSXrI&?af{DOJe=>XAuP~Ku}WR<89r*{@_)LUr&i9J)I79Ha{N8B+KhTrKm3?A2V7Nm z;kzb>hpo|ef;7$cO(@Q%I&BMfMu8Zh5}#~82>|h{Sxls_L-Hw=1{S6|Hti}3(Rct3 zMBa2xwZo3|AQk6xVFXHAUWv9lm}8fBMv(AI2UR?un$MM${NrVE@{VV_rh$4$a`(ix-FnNIzrz{-+4=E&NpQiWN;dH^YKws%rU9ZyM-FGvC~ADKMWtnxH>FMi$1(EirU$<$fZ4?V4q zh`w5+scQtZT&NzoMMqam)=6vE_wnK$dPpnq9Uhlm+crIt6d}y1 z_%F-&-+hm2k&)->pRiphDxHSEX zXOK%i*%Dc*a`0kS$(T1@dSVHu$!q3=TWLI+a zqtNIT^_tq^}OezveCEsru8H> zg<$HkE0YfIq=i+@zU8-owt|q*kHVtHp@SxUra($#sgrCSkNV%R#{QnrHqO%fYfNT# zDh^?mxn{XZX)WTptR;hZneOLNQ#yVqSjP0Jp4Y5A|vp0ML>r>rM>f$#ja7uSk`)u~X6(DtAx>FWiG z!M>~IO?fX0Uj1|`J}1rKI_JjQt@f=|9rd{;WZ@RP(p9Yeet`vRy<*m5jjgU;s$53q zpLRrX>>e3DkjtCP1iooq=~>lAA6n!=ONx1Z4gM z5H%NeAQaYT=3G(*T706-1Hzh>%#RrTIlb-9KMA5}C~*#?cAn)*&zpbXQ>G0pA8B>y z;Xb#QABIwu;<`*mP~K^ROv7XhDmi9-Zk0yLAlx{GIytNu*1I zXzd&dQP&|dE$kU?Ovt+Kou&F@h~~N$#weOlz!T3;ig*nLei1C*OI}&fFwPXEk*KDd z)$J=&&(}O*3*SimqZ=5ucZ4!4p*^sZZ6=JnU#FnraP(?8@!Dl|t}%veSGSPW`J9h3 zZMr9_*@B`oZxYR7Vs6(6d)ce*{Ifi`v^vaMbz9DF8&@gnyk%heZh?3DsaI)REgMU~ z8ReUG0WTXGU^n5moCqcNBHyZ$Lw#Y2sz~#r-EF9Wlzq9~@fn56DlWpPTVbdD+?aCi zz5nzTQ$4ek(|a2R{BbIntZ~@8oCbYSZDl?W(k8F#vDv;UJJuCg-iaJ}MnpU@b5G8# zMy91`Vh1!)rL^sbnEj}I@p3<{b#Yq!6&$Py(CxrM0Qgcx(+v7|`r?B*9r~}_Tm}l& z)Y6cl(PDoOU0h8uM=%L!bl68QSYJoula;x5pb&RY9mm6TgMD=kuy0Kb7D*4C>~Ymg z25?hvgc$Lf?xbndlfw(AP;N^hRlyW#c=8DR)lSG^)W6k1v!3pSKIPdxaZE4d58@ORo#5AyEJ{Ce7_uxKK1U4Dx`2d z?T;b9PYbhT!Y6s%MRqfQ_NL-U&pX`Fb=A*EpZQMw*S;ZlVQb0xK*VUyQOU#O=| zs+A`U17E5Js2Ml*scVHqouw#$cH7=%FHwunovF#=b7Y4y4-st+0|>~|yDI}TAE9P{ zR{4??D|>4V_s!7Ro2kI?-Kz?uG|KxL=^gkse@~z%AD1Ii_cJytihbo>O#)DF92Gf}BnY@^$wU zO6J&ueS5U?D)LefC=i-nmYj2G>+hB=CDZ)V#ll4=SihSNTQMfT*FtLV9E;nj{i;m7 zn)E?ASWFBDT>AlNcWORTG?{B8=c7rM3IbKtF42!J&ZBouZ~vAj_hVvlJLZ%KE`Sp1CG@@di&2}dPk!&YeQ9p{qJbJM;amVSFlA=?#c1xO!zEc0j(ule z?5W^;zNSh8@QS(TU$5 z-*anynP6`)p?% z5bij^u9{FP-C>TCJ0dy|h^VX5-G12V=Bgp%q}DT;Rj$r{Y!$jJzH~+2H!L`fqRn*b zAfcq~?ATLVD?DsK!AW_CBe?xLBuI}4#|Dr><$S(?eI&`)qYTT#=n(Cmj5iJ7%tZ~Z z4-cn&{^aAD;(Yo;j|$IWfc_jX@&w!H?QVgGbsj6yOzHdvHPAoeqqCZuP>3**UVKDFHlD!m2StBA==ejj~xWW%qP%)|Lm09&g*U{Hol_Q9W!w zoc;XWuO?hb|fLkm5`wAzvLISwFRUZ=R_Qtdu#-q7}g}wzsb(>bz`w-)`A%{~8wx zGVekt-amCaqfD-l-wGpRNMkB;>3zJW3c0h%dGA|hEOBMDfzDlNJP^Vksj$|6r;6`& z9_FgQ;c_Asa=jpI0zbk64Td%-!DNJf>$BJY5WYU5FfY7Z>rafE*XvY7VWIG5%07Dm zvO*fACr}0(wIc1ZfQ=@zDziEvhWS}m)#~tSs__A@HGOzORfwft>WFdLRCpaS-b@~= z<8gHa^1=h<*wh@%#9U3AEck+TWU<8hU2HD)HGiw0kw3 zS^b%RI_Hri14TT2rC-(AmNmXKB()TH#|tO@9ot6e5$;u63n#6vbu<&9pr+dKo~~Y9 zP>?s?X?<{|9dGPlWI$LOg%GEBP-yej=Dcp)Am6vvreOFii-iO0OYL|`i({tv*P=D4 zCdt9}DbPKg`5l6`FFlZ@u~W8P+`6aD+{#l#@yb6o_OH~uCkMxG36Ouc?#m(oNQJMm z!$*iVtDD-t@QaGR>z;HmoNzNg{LQlT+tBas7L{x0966$-fV?6c?DQY?q%w<2W-}jJq^N%|oPUEb6mH z*iV9gOh4Im2?)~tRP@5wzjDt6V6UI4F>O`G9xm-h-Q89~q-JqS$DDr9K+T^TbbkaPV{8&-$LrOYLr{Y9nfty0;K6(Bxa_SyDNG zrdl1@C+dVeJu9X zqY;Am0j*ZgZ>jt!IrkT3K-|ep)U6GxKi|KwnVPhStt2jY&*UA|7+;nXFlwNI3PW6i znU(tx*mqq!8)9@#voJ5_{XYrjct*Hkp^&?x(s@1wzw%I;{*UhQwg>_Pv{ixfo=;1 zFn?I?3H|2c^L9Z5v;F_12K{tq8+Z0DqME*Lan_p=(T~Y#ghso)7fanpq(F|apVD652J|3zbNjVg-gI=8jg3t}>>GgMXYKApctVYZ7v(s3T zWj()v=4Weqit&I@53#(4Q_i-du)+kp<6v(XxhX`fOgIu&QczP5na*i!XCFVY+kyHy zZ;RDs25N-P*$sr$>5QjTcRK8!IJ!ZY9q>Muto1E^-^`b7%Clxqv9&a|DWbvFjt*R{ zQ%IK{NwHY>i)S5S=Q$B8#yRk@*Y!%bYkZPG6j-;@rwaU(g&!|D9MUy#{k5I{pcU7g8Ezrbq0%Pir@`n(Qfe#*tlq8?TvuToLz zod!mv?=df*tCm#xm6&N-*$z?dFa5=MsK$VF_*jjk!E7<#PC(T;F6Z)CSAhSU_qBul zmsjDy9!FcVOj`Q;40{d6yn9a|kH-C3lX}m>&miQ$anM0Hd*AMGQNRj#`s3=DGwO|~ zE}Y0R9M+FgN0&HyrP->r*GB9rH#cWvF-;20BQ;lo6dJ1Z5S_cmh0QWC`;u3>WkyAS z+ZAu%p{>{qf_cnK$NEsKes^+W{59IG>B9wO_`He9_|wVfn+r|&Weo@JP5OvuaVmTT z588nXRVN28ZSrYbUgIch(S{>$4>OxNEcTD4ccU%6>`D$|i60PxPW+3cO>u8cB_ths zU>ws&4CG^;^4jaSBKcHQbsdqxd2?-%qf*PEw6T65J9Vo zI3p~z=Pk*#6^D$%i!728PNorlZHSj62CrzKU=)S3W8#LDuD+4A@eb4}stCUm=vn*a zxYg@q*8JDRK)QfS`J==x!{AgYTHl;I@~ zUWBCm)>2S2I?V*dC|$G@PHYr#3b2s6kM$J?q!LK_*9<-4;#*%&{`nTE!{Yt1GLDUJ z!)VhwuKqel7QLC#uVzADp;I>t93-Iczn2g>Tx@DsWgO=sGfhapFd8y9UQvX;OoeuC zOnj%h&entu;QG^1R;+k+uneWB&Dj|w{$MNdQQsa6ELALRowB#c2~`cAW$Z`i`?|0_jYh}hoGCSoz<6p2VwUBkFf@G62iCF z<)!%8jd`DVHS=_y-9g;9{}J)zU~j!oMhXD#hG)jb1p zYqCo~a%nnaqA3P&UDOo)?0L-8GhlldWkGb^aBizxaqg8v#}r|PZmGI<^biXifi;^t zS8fItWo=eyfQ3a3w^zIX5x5!D^3WXUY-lts4D>9FNNB7cFU;>b&yTxG6AqaH$JfaJh-uTFHx$(%~Ac zRyftkXXL;N+#TTQJ4QZ8YddjuUw=_98@N;sSu&7(1%^i76zOwF(r<`y z<(fL38!g?{;{B4>r9dshLG{VI0)crWX*TgVd74*Q1}ovR4-}A4bCQlz_OelIbJ4V> zW3kp#H?P`(SiE3;Z6s6ei`S85S1UQrBlCl+Xrq#ke>Q;MdG6|eE>Q7llcgJ|1kLP# z`PWzMJ&;DP-d2EQtm8Q-XC>?C^;jjE#Utc;e*ng5BC@sVWhqDIw7Rsrg*H@&LaB9) z3Z3}BO`1;i%oK)myB6g-sq#S4u>}g6TX@+He9U)GE>82szFIci+1C0o@uaVBw_rD; zkTMvrJ&$erQ&YtML`hC-fMb(`H=4I71rlh#}8Hv4FO zm$=ov#gU7{jiaMFZTyDfi>s6|@1~qj;3h#fD+GWv-K3;enrU{YBJMFiW>}SNpQFt+ zAedn(f*sm&w%0yBy}z_C)UtXm>Iu`u<2gyF9l8GM;755M)Vo2Cv@%4x$ZmccKF}3K zuE%$t=mk&v_e7Xpt)M#b6VBXGr^91jXOOe8^!QC{ZHUv#!y+~GV9*L`D*th$3Zj?$VOmJ1nn zVaFD6?OLGu>W@3HkEMLQUf((Lv8cGgg9lNqcY4h zKXHmq0k4|O*gB1NVyV)Fc@AeZk*CfRxVIXT^symUY)Y6G`vu;A2N5^#`~I(BUZ??e z#wyX1SfbHMXf!t(&4NaYpwWV8v_Du&6AX^sAaXhRD5TFM5wZ$m#;2l=$8+0gW~vgS ze&tmw$gw>M+o`Pvpp@$yCpIVJEhM$oZIn?048FHxaLlTK7@3)HTSFe!S}W47*PL_i zZ{OWBEdh|--srQ*>xHtIdGE+=YRPTNXSaX8xhEJvPQyGGX0-4q{=b{;182&Si=v@f zs}XfRO6VN%2Y8;W+E)MUv8{V}|CMpVr{0j&)#Jn3;cHjVebdm>WJ>dT3lz7PwkJV$ zewaH@P`16(AvCb-(&vObqF$q91{ob$aO(|*QqQK(uP7&kHriGm8EU-_jeYg0+6#}4 zMas^Sz+c=vjIMggS4`pA(o|{SP|Sg)?eM#p zD40|+e>EcHTV9cDa9T%D)jR%?Y7r0IK9XG^a}oh*aPunNz=L5u3h2B#5h~Njwn-oi zUW@O<$9JA_nNqN(rXg0d(R!xSKlyv;YA}^cZ-V*o7(G~kmbPYk%<%@eWw>CP$W<#l zbLn>L=iDsFjWRRt$rYaEUW|@8pvkh;lY{qq|Dl%kYCzUwa7-)zgru7V>tYq_^~YGC zQ@oaoQ+M)Z;uMST=Cb7%s3F!0dL^ArEwb@SHGghXz;a&TXnwv%?bK;fV?p6sjxvvT ztA-hsn!f3iEzNM3K~913DP4A83ZO=*4AJBK1ZR0uVoHz&_ZGSw=wr;kd_s-AKbLb6 z(U`|G-!{Yc6p<~~UvmH^ckih+j~W3Gf+L^Cz*pA!?OV#QVWc`4~JR2as?v58% zM2Z_U8T|QtRy9}WmuaPEr^7t8ud;FVgEhPTUR7e-@s<_%yB>7b@kH-`f&O=r?sjMnQ*;GFtpv&JE^J$iuGu>2Ii`;X){B~{% znHE-NvlW*GIO{G$!5WC_@fu)wvX`9};vcAJ%EqqhgO0# zTFZXtiQlONwd;ksd6bHMONVh*e#Nd!B9rdxlvGT1U*%m~d}uZ5=wSt5d&wb&Vavu; zqPCysECVd>Vtf6f>X=s*5Bfgxnm_ePR-{ZQ6bwQ`67YGejHoH*!i zZuLbY?Vk)A8Upc^ka)!C7R!t4?CZEE6fB6yaSqPKfpfX=EH?X0h zJhgGV+`6!7s*8_hy%Pm9Lo~4&;As`SHYTp|-L$he#QmL@?2vUwO4vu$EoP6|Wh#fn zBBvskTA2hOa+yr~{r%gs^s|*MqE}hknfqU_Hpy&a=9-rmE@$GwE}mSUJGtTca-9gh z{*XiAC++i5iqjT#YIe>irlofyRKtRIYqp>Ai)i!)D{a+h8If{x#jniuc~>&G>Jbw{ znlwmBk2FFe>jgB3gm& zD$csN+i||QSk+>z4sU>}keQz4*eU3^?P++N!?_d9Jx%uA!s(}8H-iT~pXxTAmCxOc z?!3>V6cx7f{oBSma{j>Xyaj=zuL&+obMH%V5>{1k7CtCK-S*RY-*uorPqz~fm;J?T z5=glNNaku-tQ_p`%n1CHJm~2FA1UdX&PA0=pKVg%&L0@17j+5c-_mS;yRI`+<@up0 z!0O$&8TX$DcxVtP;PwgfaZ(TF`=J=+oJ0eaAd6lq!PJ~+%iDJNL*~||mC^$y0+%Ee z{bXz6?lT3Qyz(3(`4{eM%H6PqV4@~v?p1ncATV^vvk2W)_+CxvVFA?T18U2$uy3(X z-i2CVx8a?w;z!3Q%JImc_bpYde%qk0DraLuk#=k1=V0EQQ3R(#S~H3EcoV0|kQY4h zy1smFWVD}&(~j10DK`oJ;4=&BIQ{rsJse&AJYaZ7&$OK-M3l~DJCWz7ce5Av>c<}m zK&2bQIMcAaclFaRkMF)T>iF{tyCm>-Trgz|(}BRyIKok6bO6oXV(?(~$$OuN2G0iP zPv}OA6TJ}AR8u>#Y`lI5y8DqOJo=&;#lP5bVP`hfRxpt^|QtVOYDi1 zfo-p&H2#-XugEo8(Fzj12aW6%hV|HaV_5|@&U4-hN;s`p8++`jn_PB)ihb>e}LQl%2@f?bth)l!y^+N2f5p) z6O<0g-uxsT{xz~5+OV)Ah;m94YjCQblbbYENR%756*_u%^poBPOWsz+$Y(^{p5X!Rg+zYcHr^Ye<(ABrf;spqhs&k7r z+3-kjiC7LBUz_LA>anTMz_~4s)0751Mwrb5EJMkeO+%)AYX@ep7EO?0lbq$2dgG6m z^>JYu_-!(f{mb#=#FRDNv} z3zCX_P_=)NCNYqnKSj+N{X=e#3iH3<4?f7iG30Q@^tkR~*Cc%Oa%Dr;F}W68g*nI< z-Pv_U9lufYUZR6DjZJ8aiBUk@jkaB6F3p%K4*J#4>bixt1p%0j8nm;LmGUx2vKvOT zddbz8TlFLE+|kfs=A(d^3{t!}IqJ*o@k2Fnk*K#{JC=rP^{Hf2uLt?G1Gl~7PKLcm z@p3l`+K{tx!u`B+1AW&H!LiB3e?>ePL<^AfdCfDuh{tZZb*X(92&-6VXc1XUa ztg~tIF6FJZQG3}XZ-=&@(bO= zxGC2ZmxZG7K2p9SBn|ykp80J{h>kD18%p`12cEN^+rCR9HmOt3H@>GtMr4Hk zmJ7VQZ8n~V=Tu;_O!DVp+k(WAY)ikEbCErIv;NN6my2YaX%S;PyRu>i0U8>ZDVLdt z_R{SK)9j;x{MDB2o8V1NWt=#49(_=UP#f82h36h2GAU`C!yd>OVi|9zpNmGDuV{ln zpygTm6}eZ(V?p5;#y^zV@2Zh;9VgJ8Zt`CBj_3xZyBbG#rjGe@Jn(CF8Hzct}PqaXRtEP(B` z-;~)0U6)=64ut6PP2wkP%~uH9c#X|9&yeV^9G3Z_s;AgdFC%v2FVwQe>0OKJb|o(Z z#vl3}leH4$r{ZR6FDd1Uk8^AVYL`^>*ZyF^Q@(c`wq5Qu2h9GauOWb>-v`}Zp1tp~ zq}pt-see>G=pwjHHF2EaUGmB9sx_}43a!;DJv=YSL zfgekmUX@=dIO|Q10odm~jh(tMJ$ylL(qhUf#eGL*ZLwOeDpHhd2j0O3Ym%^qk?Mp( z-Ga?)3$3aF_o@1{Gy&?Nu`a zd;4U48Oyt1$Tw%)lWMSRUoKsr+IuBd$j(*11{z(<0=%5?wrV!a+>A}Bni>{}*j=2x zf_!tayL6ytXP5}XW>&V1NS;64QP0B8*k67ITxWTLKiiqN(#?y`4Ugt9!mUz^6I-5A z_pg!SQ-dYY@=@ezw5Qv(4yVMD5eTB$tX~$?Y0b%r_LPlu{#l8sRIQcVhbkMF)Gi)F zgM@!dJ`>hoCDXCdOtM0liAy2q0c)WymMc#ie!OvUsG8b{k2fyg$c{Q<`1e)O6AiL9)h24wl0Hr;>@5M~vYrY(-NirQq+w2RpN}(&uYr3q zb;``a-0y^Rv$ADJt1qF$2V>_QbyXbd5}AH?@3`X6s?EBZyDoTod#eTBN$~j2k|2}% zC!I6Fw6&B!A`^2^Vbzgm_6_5Ikn00r?v|J^qtT`4z53SFRhqHMz^jqRIFuxgq^Q6Q z4!)JF*29?(GaKnRrMp94RxDoY)+wj)0UqSZdDp8&uZe7}zXrKqHJ;>*8(20g4yyV}t4isJm@!coko{(5FhUEFrDns@Q7L~xl?rpSMYPfuKt?#=xu02$~S z`zq!!55F8`ZB0y(*N>6q)b_Az(b3u7wKK1X^d2EHav zm$=y$HZ0|TDZ4TQu`(%FwgP@OQ1mDk@u(ASG{uG*1Gds)q>^NZdL^v;S>BTxN3~^w z_~%&nJFJ?67&(j)-UT|y4qs9ryX$hkQEK=tGMF*GI3b{j_HbT6fG&IG#7v(^wW6e_^pXh<86NrHpgJV#<^` zck5X=h^t?cn600so=Y}f12`9S8shYmyqgoeS%-c#*)TmhIBK2OJU~%J-eE6yt2k#pUT5hQvKjiPQ{YJ@S{wi(onEZvyVOm<-}T}HLpwc zuz%_~_Dd3r=Tzb6wtTk%68gYM0;D)X32U6}bc@Wn|Xbo7f2)rJ( zidnkIMY^XV)LxgBye@av&lAxs-Of?5G6;fs&WLWB!|S!Lre?`R0g)%?ZgQ1LGvKOF z$-uZFCv=J>*&|pPQ1x3J8}$e%M$*;INY-!>e<=Q@`5J67UQnZew@bq)>SAb);<{EMXoX<~YR@3w14V~y2s z%7HG7$t_c%yEMnQxl257o3AyyYWMrRPvU;`b3cy`WVKmqSaw{&aeA#GPdfEL3+GF0^*ISb@M{dbNgvvIM9t~E6)y8U*uVdeF zeqww5>Ax2)|JVNe!&pOqTmL?_kWXR4ultqpY5LC}XyD!+^w@lEx=+&srk-U44~9JF z`!3fU%AGOWsx>AWInBL4M{V?NV76u%{r1p)v=0X5yRUms=>4IiW2yGCw-i{#=LI53 z0I1S`zn%&JzJ^QK<;xPxCpi6FUnbzZ?hNWgA1x+Ue&{bNz;H@`c3=`AAwzoD?!lgm z^LGv;TCi2)5Yo+3sM3KrZJma>YMwVs`%a>}&ZL$R_0n2yO#9EzU75AZdyK*~4ca(H zF4b;~nilP#&UN^@_c5=Q)D|9JuiAEn1h0ehA8}lg(73LNm=%PtTkE!^t<>jmBo{oMB~)k(RP8dW^}T zcY?$wJU1LRTh^#c%qv%ivo?8q$Y4d3lg*yZd~BpERN9|pQ&HCK(dX;Z_L2R9SrEU9 zW>EpY2t)vuW=hQ7ZhjAlu>9#vD!dZam`6?sooxyz^VP)bA@jY!!xrjZLFq8?G_5!9xKD%=EH8WZi**k z#WePGFzz;N_z4wnni#wG^>|FHr9W3wW&86THwUH^G#WkjvPScuJ+*IinOA*{=8W<-$AZ zoCP1zd3kHsE_1p(nHKV7_MtMoxkoG2zcs#NDvbgV$W`ex-qmcv||5CeFRR@ABWc4;l!h>N#A=;cjWE zeO2_AzhhLKTP)YWr;EAuFF0wRygB{y_}PcD)w-U7>xQP9&^dd*yYH|6t+qA=LB>OW zsgGn$&h}DgC)KD<(;uMx7JdBpGqIOm4I}8AhwVw2`#zUTvvQB_1uBoHqwzbTu{^=j zuT$^$IA2@MjlwsaaUT=4px{UA{=||W+pk*lcVhIBd%hYfxhY}C7moYg{Tni$hd++e zM;Q6~F})KU9H*va3-@8;)Ww5g||2tckeQFb?D}9UxF#9f}eN@gB@B+pd0{{R3u6f^!9eX^#6E&>=xxag+%5n?< z0N8SDjStsd_z7}JF0tO9JJETc0MLEfaB9=!lHAgAGcLN_Tep#_`v>iBna**8>L*7#kY{c?^7#3{tub z-qRQi5*Tc&7@X@FGA}c%5MZe1t2(6v(#BX4#;SV2^%)?u2R}u zZ7%U<23zRFn_IIYqoS^@61^;-b;-&3azMzEwzjr~D?EI8xs?|v>GJxzMr29UMH}2{ zd>CZVu=>Od-oTB*@1l2nU#KO($P(Jf;k1IwXL*7#kY{dH?_aXW)}$ zkkVx^NMLZTXRxhe2wKXJd6}V}k70$t^CE96pd!YSAirP+hi5m^fSf&^E{-7@6O$7Z zcqCXSHZTM@1aPuUIk;q!LV&{wR!)s37ANP+LCy;qbRIkki<{Q8NNMrjJvyS1u2rtq zKD<7ztUkOE3al%bRG7jiO0fxLdN;2=F=r!>M$ooX(i{hvBHzxvd`bJ#G^LdVg@xYd zqnZquRYa$?7O6!QkoY=d#Wzp$PyH C>tw$G literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Actions/actions_ai.rsi/crew_monitor.png b/Resources/Textures/Interface/Actions/actions_ai.rsi/crew_monitor.png new file mode 100644 index 0000000000000000000000000000000000000000..78fad17a76c58ceb3ff7bdc60107aaf01f477511 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5u*8>L*7#kY{c?^7#3{tub z^?VEl2@ER)7@X@Fin!ewG6EP%!x`!s%+eT);%<0z0EYlhP7Ws4mY#_XN*)JTIW?R@TH4yAq-QTZ7`mfv`t-IPJGLGS zoiT0tbav_4TNOj5OlxmnvUKaxr3$N0ym;}#qir>ZYq(%n8rv>iiFXG|R&Lz5bmPZW zM^9*_`4xVQYg%*Y%8efeU0mVf@*&1Pz5I*Y+E??>(p}cxn>#VIVoO=c7dywW!YdM? otQW*gj6bwlxw#~|s46lrY*UY|zO-x71(07oUHx3vIVCg!0LmC=oB#j- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Actions/actions_ai.rsi/manifest.png b/Resources/Textures/Interface/Actions/actions_ai.rsi/manifest.png new file mode 100644 index 0000000000000000000000000000000000000000..08514aa90829c59d8d3995ba7f1a5f0ad5c24bd2 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvtpJ}8*8>L*7#kY{c?^7#3{tub z1_=xaoDB7R49@io?Ys;H+zcxO7)&x4Y^x@eT{8nJV=M{s3ubV5b|VeQsq}Pl4AGdF zoS?uX!8);lA;2MklaqsqwWVibgObMqR!)r|U)PL`jEKrgtqDyl3f{hWkul$LGm}Sa z1FMf9)4>4IP|*ynu=Ou?R&Lw1NOn8d0?Fd@VL9s?Rv*}~boZ`r=jPsiYF)6}p}3v< m(8~}WekUyhB`#$xPDX~VR|VGL*7#kY{c?^7#3{tub z1_=!Hd<@R@47ODaD+Ih}3GV|+F_r}R1v5B2yO9RuG zc;9e29;_CzYIva3R9#VYJBwe{?Sk|FgNL6h9?Q9HwOhe5OHofKuv^$8MSH{1ed?$D zD;RuRdtb!u}jolMn|I`RMAi9i1D j9cS27zTB`Paq4Ot3*m6NwGaI|K(6+5^>bP0l+XkKP^uEd4~`UkiU=&WgIWMue|ZFBN9!-0c9%NRUe{an^LB{Ts5`?Wy_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index fff9f78288c..7b09250bd98 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip", "size": { "x": 8, @@ -177,6 +177,9 @@ [1.0,1.0] ] }, + { + "name": "StationAi" + }, { "name": "Syndicate" }, diff --git a/Resources/Textures/Interface/noise.rsi/meta.json b/Resources/Textures/Interface/noise.rsi/meta.json new file mode 100644 index 00000000000..068ecab968e --- /dev/null +++ b/Resources/Textures/Interface/noise.rsi/meta.json @@ -0,0 +1,58 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/4b4e9dff1d7d891cfb75d25ca5bf5172d1c02be6/icons/hud/screen_gen.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "noise", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Interface/noise.rsi/noise.png b/Resources/Textures/Interface/noise.rsi/noise.png new file mode 100644 index 0000000000000000000000000000000000000000..ba74952b409b6d3673c9949e6a81c0a84ecd472c GIT binary patch literal 45602 zcmW(+1z3~s7hS*@FdAi}k?zq5NDD}p0us_8-5}wJ(J3tgLlHzkx}b`g9J@?%6-9>9_DiaY<6951JqGu|Ky7%Yy`(qgjxxatz<{)r?!go_K z@&o{gyZ<|YY23s#06^vBGetRlzYpubj_XC|#<7Pv1y(=%DSn>a-@38tPCx6MC9`Jh zoJYGyt^>~kTJ28xFA2ZTNbG*_T>3@x+`#mCljxhvzi;mXmS=r$Hf8P*ky7hSy%}x) zHrzj~(c00TH}ukx1Z^qw#=CfZa(|cd!TR6st2^q!s<LO>FQi>liz|Fh_;(O*Uf6vf#bXS`-es&T5qp@xGx^(`UYNfG0@BWTOsKsa&Zeg zjFkCjA$4~-%240*YY*GBc>2v9&23^)w@Df)-tD(3x%8MXU~X_^^zGgCQsS=3ro`HR z!HFLwCrT|ICiuqbeBVOK1}-9_&lf5w};ql~s8!5Y^*r(Uh#qZId# z6gl=%J35Kf|9wDFoax=aO_^SH>BDIEQY$*g=KHtO_e!5t+BI%UZ9ewh(1OU^9wrt! z(Vt-OhL8R=uMoLr-ZY-ombaAD|M$8zE`!E_K+Ru4`?sTSZ;#jh*vVX9Trb^8(_i)} zC*Vmf1J`(6{RjWFZ4!$wqx{QnO?PxNsQK>$#S*#tbyGza z-(EK?Z19QQf9qRylYjfZZ8W{&Sb@TY)X%R5B$qBn#DWjP7}QMz|E)3P<^9M~`Q-op0n}fv{;Ld(1P}_UoXu)GV-uF`(8zJ z&s4Q$TaU9ly(X79bvAC>MuYZ+ZtoMAc)#koAL0Q0Pr!8!<;Mg1TmSuFhvDo}77M4} zd~*gG$IyJje108-3HNwfSu;ETK0_&$gnPTwaPpb|$y+e}nx~Fn*P|MtoNe_rfkgiy z@xy2>DWIHRtK_hQrcmxZ91;mlmO<6=^TC}Ixo)&)6_Iq2k_#)gZ6|3KbSqHh%z+o| z`4k`PZdR$cVAtZt3=LpU*4a`z zqeU+eJ^W z zo`-nu32Z$V2GH!BUfx5a**!Vd#QOHPg~>@o96WM!)cc#K#wDn&F8M*$E;oOHy2mjc z?U*V3T=l^8+k&&|yc;JaoZfr7V0VFMT_K1S0@rAk#M8xEwl&u7N$4MrIMq>Yd62Ux z7WW?t^}tJ>y^{QVO%j7m<>UGD*N}cItvE#Dx6y$43VsIW?ySCT_|Ay!xB4Zjk3y$G zJKVAn8S%RlB#UWDEe?bg9rLM9K$a*lBm4DB!4&^+BAx}k{mgCZKoy=^aC7~)?GEPw z6IjNInK>^R4^6?r+_d@R@8b}hf4h!*oQQSb*5e#}_zn42XfNRMzxrTp!bIxIR4~R5 z;0j!cMrB3Yc;F#JqtS!Ho3IQ*W_y!RsUT+gXeKCbI=kwj+if$>RXmn?G*J z&B1B2^X}<4Z-se?NwNy{#D-}Lb$2z>7JOgXHZvt~{Z4n+nCTCr@Ph?^he#i1jj9`6 z-VPYF9^ENJcouqkY#OBi=PKhk$`uQxyM_08whrN$Wj$l_OKZ8`UODMSR$OlUOctaO zpTqcaBYSo-C1%=Jq(jno$>-f#;QIED*jlk7-vsi2nE!aS>5vCV@m=&H8^x*2P|1#E zXH>;?%8*F?tPZiD1$}4+M!X%+%N10JzTbvVn^y2D%)Kp?-AmtaZrs!TEesg4;EO`x zpqB2Mlj^iZpI$qS=02&09l5#xxk+Ckjq6B*vQBIvTc6683+5yGFRg#_EAqS zLlob_nR5VWc;?9DUvlXN1~L$1(4pI^ZJbkSD3boZko`@_>WeEH^^221#rNJ!7D?BZ z7zANRjuhT>%44Qn_bkWu zpNBFxWxvDYZ*TBV{<-j5 zl%iXzBmk|x&Xc;lLYgNHW;rV&yqUDK5pl71E8A033lP*~f`rA~^nW{~ zJpkJ?!Eb)7Wwf4rcJGy3bdRw2iWQzD61yshha8?*XqUT0sPE6uT*S_V@Xj(hM)aBc z^MuQ7_Qfij7`{`A5&$M~V+jC1GXYjrX6){8EQ1fWxCz}&wF}kAp=I;B% zVU@3AW)Ogm7#>8Q056-51$~69-|TJA{T{KVMlm88amaIU_p8V#2f4R|m6*hrne>go zAggtp(8uscUG8MLcAP(b`Me!IRdG^ZEc5~ZUB|NnH#Wnh09IybP{Bo~+VXjej}8l@ z*A`0`AL7TbMlY+E+X`Y}M3P(40IcAt#0w^pk43i5+BW-RO9jL~nUA%y+bz)qGIt5G zKsAm1$jrh%^d(n1T>l3}1i6DysIE*HC=kV`P(WvMG>t$ybFxu=Wi-V3>_U&5fSSXY zK8E!@6@3arX+&E0F)r7+=d~e_jX;^wH{UoydM6S;D_MvvpBtCr@Nfm)3pW889&2r= z?MFo-M*z`3>X93FG0K6d1ITPIu3snQoH78k|DPtD^J7Y_YUEP2v@T_k1WJYAzg;LA zwhYLk*s!loh+&@M2B!cyl_Nd>wz^`XpIiIn-j^v2bI;*8ZPghelbY|Tf2$1>c?vuc z^)SMA$Gi)2cR0JBXp-NEdG-qM!GuF;_y$?zEUg@+rU3D>L46zA8%~^JB@#DUJ@M2* z-n^)!$|x5XM0N1u+x3=iRVWkk(Gc%Yio+UbjanAuB$rvtj9?i+k(A0H%c|t3<^&U) z-;yrC`S)3(zn|n6_`BD|y~H{$KA(NhH&vzqqcH9&d~-A_ucm};@Pn?iHY*B#M9|~( z@5me-)o;RcLnNm z8mk*(6x65>(2W=srfhg`U_W$^J)Y*|qXu_^L#eZW_i|IRBjg4eDu@70PqUAHm$EW1 z+uQ#k_Gd#Z3}f%iU-ZgwJs4x#O^G!mDn)3nfrnt)@ZpwbtMx|#D{p0Om)l?QnKB?G zNO*FUNm)UC(G~=oeX@_OS*~nfA5EC4Kg;8z53d*6cNk)1 zv8idt)xUb4Su(t%BMn~p+~1XE!5wK99^Cl^r>3rewnMN*x8}$6Rx0!$zR+Z*|)5>);tcK;qNG_R+Dv3Vp^S3(R_fhWtB~_zdtv zv#-dIdN!)P)}80&65d6`&gAceF;2R=-&4=W_W6w1JR*Uzz4QLyJqsrlts2x8i{P^C zlKJ5A4mZurhxl6p5d?-K)LrPcAoQ z#<5@Qlx&!E5JG=3HA?FJFex0qu|{*^@o9lJgk}qnD#~eKEBls1-UyO9uURY)+9P|@ zV1R(6%~LX4y&fRd1w4Xq<4gntL^V4KwE|Zuih$A12*VX~3w)B;@f)A^w}8 ze>R2A@i{{x$aadx+I{)5xSfg;Y&8Zm;R`zyU`h`_U6Q^^r+FXVMSONe6%HC{n2DDe zmo-FYfnW}2d6JN9qhFwF<-g2MW6q3s15&N>(Gu!82{V~gP?Bb+**ld%?nd6#K2D5N zUw)B|PP;0jv*~=VlGb8*^4riHoIF+yLx9EjOp)J14JmyfESx$-9qA_70hF(kdRF}) z4kDqJ8>r&29{>H##h$PM@<;uP+7JtKwwX7yK*NoTMlsa8w^VFEp7vsf65W@2`#W|f zu*s+W?ePd8u=)XBRbXyRbL&#Y>!I4CpNaT3K$85C;(oGJXi>A|H8B;jF|fKf zN1`30R-Pk?u0R3-a>p(2F

C#QG$rIhO1Z#GGxnid#41WV+O~Aj`4G402HC=z9E#bHk0h$$EkIBd6UayrYL6U?st*^;jKwq_9K1r$4vrVxeNhk;H(z+rp%M$6ui8dv{5hTE4iu;EUCK0*ZfH zel~)rxr^@2c0(Vvp!H?5J#CkKaMmLb*q0GUlu;H&8OKUSsw6VD`K0ne4>uu-BW;ND zRg=GI5IOchAIobUFNH$kF|#veUBindwo5yZsBuDVbBh})@)U-H-t`^9+_g0G&;)<8 zW6I_<0ZJIY7AlL+&%_%nakTsTQpsR95j6`~5GS8K1rztH1teErQx~L^+|m5}5^Er< z9!Dcb-FHl?LK{r9VDS-ghj4Ld2L1aq&X>c=BR}I;Su^6PocW#`tJzAirt`?rawAvo z@k4~uk#4yUl>FKudZ>3N(Z68rTlz;Np34; zaFME){Pc<@pVJWGqBz0l2jQI(8Ld&$CS}0aPFz;os}Avc8K%vr7Y3{dM+()uG$ zP&%$HbJ5itpeSgQl*_~*%L&Fy>O^Ez`2iQh$B$rfxD823o9KAXT;0>3H#W`ha-=O> z73CmOdDs4eZT`PI)t#BOtf2H+A57c%d4Tpx#MXdm0;60Sd_av#$n8w~OgdJzPxZdf z3;{8fPm|;A9Y3LCVwOnKwK>7E5hWpPs`s$Y@&XYsy*TBcin#J>+qz6?KAo>})gMdk z=@QSms;fdR-{eKBHHxB})MH3_M8{PgHkz`irrXcOPJXz&q+*qIOV5TaZ()v%fCMX2ZpPlWEZ}^P#v>fo*_0zZswO|BE&-KWZKS1)cQQLhy!f@QmyK`)NEg9DTrejMSQUnLZMrn<5$z}j0s z&m6DvaL~75q>C8&qUuo-*TdS4mK&EZNzUfglFnss!&0d<4OXuk&)q)UnP4jYZXMf4 z6GD*jFeam{{VcrWC5MKMiO;T{SHni}st})Qhvgs2AF9ggEc+YZY0O0{x_M-k;Ts?))UucOed=#JNSlA(41j)}TY7W*k zcXMDkb9;6yFq@7PdJ(f8KZ*8F!()WBz)&IYo?{+_B2^)K0p2MO4t_+}2?~QH1^f?# z+WF%*#YBb80HOd+$F8Q@y04Vg+KODE=@x=)Wa*dL=xd9~%=n{tW0*a@ z>B8_Ys^BfxHH_iVg{;(&8~WwI#EStP_K>4M!v+n`d9{^PNWm51KY6@AKboQ1F~5i= zVb-S5BE`_#!vbC#MoFPh*2y72@?{Ze(sau==XJuFnk;yJZr|6&k3V8nt_t}uVlMd< z(SR%RGayTtJQSs<8JAYs2Sr3SJd$9{_$`clDxM3pi~!N(vXc~aNFrsOQ54H;;5QDr z*d@ap`mLS|;#vQG+nCxJxcU=5rgH76CsA}G=!AFtWiOU-(@Q_k8LB^G`|K2N=}nCR z$bN=~zAQpM=`G93th7di)o_<;*0Ow$O|B(>pu+jg?{f;I#!zdz8xRXXKWnA>#-Z2T z7sc^@+~aiBC?BN;MF9aizYJ?P8U%{f?%GX{G z)St6Tv`mAu!z^3hTH^LRkoQw}c5>vKsb_!tFdG~GhS=W-jCb4UHt8j2;^taUMF3Ov z_an-0o!Kz#QZwwP@g(x_Q9_kRMHX>CYq_aWnZrBvu^Gcxl%a;(DP)>p3}uX9-w9*A zIsmR@hd^gCbVXlwx0VhEndB=0$+~M19pMwxsDXON zOxh$Cn&f{hru6&iHhJAiPUH+pmN=a92nm;P?Nn1r3@J{D9OK97G1u^6LIi~}J%iFe zZHl++3qR!hEW?@4o4~8U!B)KXlhr#?et{igMK&W@E~^Sh*w33EFnw@i-#Y|XOTFOSpq1wq2Nj#-qV3bU}o zQZd2|GmUB_ol*T``-SHv39S{{5l6-(xB?n76R`2eGt~yJV zI~^UZ`MXF0?lVUAQ8f3p6Yf6%jy3>=TN}NAPAVf8QOb9Gllvd zLO`X018@5Mn7->KUCHiyy{c)Cg&!vs`E2I}3z41|mq*V)DwAVNyk7^0i+ic0!%za? zHbR}G=Y%vNc}|L4w=P<}p*iy_Jt7q@)BI^qizfoPSjF=rBgkPJ+!dwKe|uh)nxJud z7=_iLJ+e?!X8ce8Jl(%_B&h>4HasDW^{|Ulc$c51zhMq}qkn#K6+rib5nBXppLjtL zl$rzx$rvZYAeDZi@_d#Fi*+FK!My5SUd?G91+`@ALIXR@d8q#5 zCX$Q(S;MDunR!&nikKhmv*wF;2Xcw=tbI$f$_?ReThY>R2<$-IX5%EiZAbQ(nS>=SF6qOVwoFY^lPljw6TI8uL#7EX^(V`G z`OXOh$_j46kx_Vz!&lh(aklPBd!;1}!%M;ubEsigCByGeD)c>oXF(>pclR=j^tEFe z6lzRJhtjqS5&GE4@f_BSrCf=mRk0k#U8R92??_VO(<5Xhx zk_10Q;a;@{S(fkPop%dbi)qwi2Y=or&HNx)1H(p9|M-1e{Z;c{UE>5UN?Th`M$j&A z?uAp!4!0X`MYgLly)KdS7<~3f8mAyv^gJbR^Q5T9F$Wc*p(c_p1qf#O7{nXq(?NRa zDAUEJyeBk!Rw`Xm;%&e;3VLFSv}M7(+Gj6%ab2fqdI?3DA@Jot5lSovnZI}EH^CWX z=W!Qz^OQsB-aaWLWr%4)Wu?7&*o45@=Aptq0VkD^=8uJHqm@tvuuh9woUtQZcTU!A zD4^Ppps%H*yp~~SYLO374ACW$NbBKN`LrW0$El_MCQ!DNyDksZt@kGb!=axS93Z<8Vmki8?Xcz{yO*pml0M z+NW0ern3l|-pg-en%89Lt&sdE#^vFgVZr05s6_f>DYka_laESVovM)i03NL+>kz4I z-+XRC*H-X04<#{a_%A`b(C(`Cax(m}4I!$7$xI2H((sAR#^Q8P4Pyze@vITJG7|X( zYxVTSppC@~RsCQZBa=ArMfT^DQf;WXaW?;l@!%CQAF^JLJ;R#XlXm5U`SvITG$RI3 z6HlHt*C{$ggbCjawjxzp7gFNs2153>o0*nbjlUT+k;PTw|7AOwkY3IJxQX12C-bD1 z?=3vWSo%c(hD^(z#-s@p+9B|bQdn&t5F>+ObN}yz68ch$J(Rv8dm(6PP8GAUa>T~Bhhk_iG*()i9vJ~} zDHiar7&z#Akb0zDu5=7O3SJ5_@#L}SgcH}%=6VSOo%-G-6M)6f+tW}@u!U@ zEtAjfdH}W8D4?1ZBc$`VK`NFAW{m=VqHZV#S8y~ub!jFf(N33VPg9O6yIW?X5EUc( zCk1B`dA8t&9%A#E;+_T6y$iMAqi($b`)cDNc8Zd zUS4%43pt~fx#0D|txJ!wGGhXCai6SZt_}X^tw9c0O~jh z7aa}hBL%yn8p3nrMKeQ{t)!N0-1y*>O79*V2&pc0%zw0CBZ3xDVwA3a`6D+@25++Q zKQD|l0ja@;1om{%qfnAQz{6uQ`Z{FAxPR$dtF0Fh*Lc9mp0S54H$n)n+*w{|k4^7|{7_sZj1^hMqh1HH&w+f2Ie;WhwDd*jDH$zR`D2@GJv ztpRTSJj)(3Zm)&Rbt#!&+-p>}z8^c~b?@+yOn6EWmy>C6FnTm=C*(>exY*JHE#aR~ z#oh{jbSTn!^dnT599&A8Gb89r9#?0r{a6-C7?#HZXjrT3Rkaey7omh(>t&~+fQh#yNw;wurA6dAJWL9 z_~+}V@D-p-+w%;=awA2eVKo4dZOHSB`ngB;NeTa7r_A| ze%+-k(;Gn*8E0SF)2Bpb9k+4X)2&=fILXbWI+;*_VDGy6tlm}h>y*ut#LiQMw(+XE zDDO|V@#s1Loh*Qye?+1FaRKYn#AH-a2vXre{c$Q>FE88IBFdV-Rmt|=IglsX1Knn3 z(koKKlJVqxPL>*#cD*&$IVeAA6?8_W84=X$DZ{^f0UdTem00JL=p6T*pHl_h=;Zkf z5s6pv&Au`z)^TBj^98mreUP74vlKxsBN8G=$s`RPJs3MMw#v8M*EY!w} z<;bJ)N@JUJD9!(4^8UU7Hs;?4VcM%&8(fQZ!EDaVfqPS;p@OYQrF_QGdi92&!d#0A z!|c^cBBSUv(^bz>WgkOrhSZK(AcLEf+Ka3H&q4_ac(Ab@ryx}-rB8`o+OKN+Z&p3x zieW*rX7cQUKQtj-j0jz@-kWu%e)25*o|l??{`nE&zY=5RK;of4h=Vc!EAd-T-y&#D zpwHjGLMD)#WfWk93D?f zM0)|vOB8KbYO)Rxj@(8)T{~FqIHje*J0TWE@O>-&&zP>6`T(3oT8PisN^Cc%ZuOq$Y- z42C`*5(4m9VYo52sH=gd!vUCCW3uhF%)*i#E62YC(nC z{7z31Di)K|tY`g==f1Ckf=S7b6q;d{WOp?BB6!PUC>kf7(gV3^oNNmi9Y%!;w+7K_ z#g2?62EoPPjw0M#d<8tR-fx$7k%ZF`37X@w1B_0k3S_YUIS|b^ z99y%R;?5|3#Nz1z)Q8|K&tsz`=tv!qqDrv1^db$tKkA3Y;*R;CTM2h~l!0a3te*xG-x*(dfH9|=hskcX{_P@b< zkCvw|kuWUiVjjVHvD6axUI)Zw4j?rbA!QeHmK7XMY67U+v-3D9)w-vRzIV0%_1y8? zbO5MwDDGbp#?+Spthp0t5Ve?L1NkF!4KgV>@mc#O?VuE2sKx5UI$C&p&gwl7Uq-jI zX#jMh6M1=3O3w(~->R+nAHec>EHc%t@g-ju5(#^OJ$I-gQYzoTs|7|t=B4koUye<` zKO5;~l6q0twa0iQgKI@#K1Md`k;BEOBsve#hiUY+XX$*QP}^#Tr0H<+74iTcY*zha z3mX87v1#Xuk`gd)XUhKRhzB9C9Zr<5L<>ty_4rVbAx)Pb^btd~AQ@as;y65bDl3cm zWaj%-a`za{%(Dn*o;Cp(TZoAsH@@s&|+ zU>xhl1w5qg7waxPuE-hQ-|U2owdV>+HmC2D|3+dm7D@7-bdnVmf2)ch3ZD5JX@9^s&IBy~t;KULCH+jv=Ob;jzQMjN}_fx-ATr+ohT@d@VgM zp^J7{9Lf*!Xog06zT%rwXH%XVj$87dmNP1j1Tmx zLRC%nq*<}V%{Lw+D({B@Cl)Q0)SrgS=o!CCFxHbJRs6WQ-U=Q{DgYT3)#X% z-tsAa4DYlv>nA&7`pR5kVI>F8z@`2QK%9pOU|#8M9@rul(qFch@L99gpb1uU6Q7yN zkl()}u>WFK5T;apdal5;tKigVhB*>bIx`0D4&iKgcfxJS8MvanJyTLg--o0cVB9v$ z3ueD}xd3Ccg)GlM(V?OofG@-+$^7`3RI+z!39qATjWH0+MhAk`S7mIW<_hg<`8uNH z&+5(y4lXj!djV6oqtN@-*Xs?z(WkcN+}qdL9#4Lf(S5V+y!o9!=^Ci>*cuAx9Lgp8 zp~t56dT8=60hQQak>SB%&=3jjzC7AMk)uxNtb7K9mC|z`T7Iv)4UYPpnfN?4cLGzG zHCSW`Ac%?X9;f@beiU>qEcqr00R2#Ffm%i8n9uQ=;@;Yd7aipX-2%*U;>5*zaJE$279>>0pCyNge#N8k z{z(1wi-KwUtGt)5_dr|#c7^;1J5HLgZT{&LcprBPxY0`Nt)r`hWw`zhbxQ9tuQI-0 zTp_~3#^vUQlrTg)2GkRks%alSF~l$S*<(7<6#70CP0>jVn-3|Sh- zN}Y9Z-stVQX~`a#8V?04!%(x;uAS zJ13`JIgKiC+NhUF=PQ-SguIhN=$rj&kTcnP>n>p{oIc?bG4j*(zwpm_UpbETqzOMf zFjoViURgo&Fo7gV;S2eO!~cAe$TD^VgkqfK?P!}rQ}ZMmJx9S`0;M5%F$t?~_>uFE zdeQ!c6-qSJVtw-FG^Me%)GF7*ON{bM)0;aq<{+5cf>{W@%|J71;2gWz;~&278s ze3VJ~@B$%$)#Z1U^KT(3c`}M+yqc@z2pTn?ubSC*0DPvG5JVMa3krCJXTpK}+@*g$ z(9@&&IA|Fq`Aq%{ZB^FV)&IN4$%XD3^>#pJkC&7<6*@Xl8M(@>`m&stOz5@WV6rLv zS!75dIJ@DA5=)I?UgNXbPMB;b0ABwI`*S$l`NkaNq){=DeuE*kfJN||*!v5G=;+2g zavHT76OGwoD8%4+r&Wt3uhK7XBJi^|IUagD^=rX|bC<{wE3d6CQ%hdf*As$OFZ91i4cQWvvXB zBj2O6dYUa?lGs;7SUqu?%AI4gFkHWqq8cUrDj(9uT1>4;X8F7mh@GCLz)3nHt@N(0 z1B{ee{+U(m@;nT884ELwXL$K)GNE+Qf1`6Jytjhj(9%ryQ0Bn1U%qwm%fw^x;DKk{ zDIqpBJLI`4^&+0}tcZ8O#w)l)k07~o_hKI#^E>GROqE@Wc%p!i+c`61IEF9Jz~JxT zQCPU2M%+IAMiNOQp-4rUQ!XjaRsp4dBHO^g@@32CduEZx|=LM5u zyB|vQZG4FXRuryssLY=p7NRR!zUTiA?*x}Qr^fd5Bn@+p}vyA9N0S-6I03w|Cr;nfT zP;=7+7N@G=1VYgL_=rBFbVvFo)yyHw096E8u&Nkz4Kjr%+p?CyzO51OJmHJ)tIA72 zweZv0B-=!S?0f1*LHwF?cZ)x(0oYZKJU1oNkSI6&_r2g;=@~p!I$ge>OB{n$~1e0r+d4{KXps2tGloLOB*B?p1R5S)Aqu&%Afaq8Ncox^NrNP=kub% zYAS;+ZXz1L&Bs@pMwa@62($oCO9#9`VD1E??&#S#)Mt)L2f~zab7?9cd;Q|)f7CHb zf9XDTQUGz$4n-ZMZJb4ADa~4(dW}{??F~SJ0Kz$BBx$T5f-!={`mG+{Z*bCdY5)WX z_&vXCK2v3IrPb$*FVc6C)gWG{5j_9VWMCzTnxr(5(W@5sxlCVkTD(nB0Ru4pBf4mB z7TmdL6gSqV5P&R5`g{?*`!_Pv3YAdesZ*FNYT<|(Ab+@AXN+fDYmtSwWxbgG)5lAx z7sw^_5KM0c^Y#)1u_CE+czf7y*|kBF=1gfv@OOgQ*38gv^)@qxx;J!ot3qJKWxFvG zp@*;2zk6#LPLS07Zv4+$XXQ<6ui||N)>Jihy>{}Y!?M_W2qv*zU~!!pHxbC>)&Xi@ zD^QH?z;<0zx(vI13D9YY!`eYV(YB7&dVV-b^aV})W|aEG$MY=lBtMt8jlt6QvG6Wu zTS;fafuj)$uj1o)?Gg&umkS)5FryCVG+nh#1Lcfi4gnoi_PIUPIme4E>9M``IRO-W z!SheB1CsUnEhZv94wgzZFZFwwz1_IMyo5g%^@6rghBn1iC}WX%_h>TNh-JwEn}4Yh zY3gV9(zWNJAi|0+h&;DuxSClGjy?c{rBF0NYbCredRG9vEt+y|9)AF>hk1eX1iv?w zh1dMJK1s6$8x-ezpKC*jFZh`fZ{MvVWg>c6X7kq+tzW}X#tQqli{K4uCq}G3-+}MI z;Z-WXlVTFY$56u$C1>qB1hFiudm_jI_)R1c4^l&1RJ<xx;2^$ZDuXdyhbl>_ncYa6^(vfNWTYq>@El1Uj z!BiHMb>@#=e6%Vpb@t(D^`_#&y&ZAxwck%{^iDPJ@kLEj)7^tbhf@)kDv)d-P+Lbp7Ls6q@q6Pyq*K+E z+R2^=POHPmeH1I@<)EizmRYfJA2g3aSOHDY*qb~FbeS+|(-zzZs2Pu=J~S=i|EC?( zox3;gBs+Wk3eCln{*+u4Q#YbA1f8T_oUmIOoZx6;?cg1D6X9@D5XEp9*ndvRREtD2 z;WLr$f|Ys*;BDY9Cg^ADvPRB=+xF!0c+&Z((Kvo;_AliXI#{{7uX9`J0@}jb+D_mn zm6F=ycn>!?B^^fLKop$GXq~fXzFnQYneaR@v!+}dwa_0?5AZN6y1`>5{I|Gz&6H03 z`Un@3!7oC(?tw}?wF*zzi+X}D2b-}2oMSg8-V~s8ZscchX*)z3IvqK_RbU7emwhqJU zdY1!&*yRby9pgBdQ}d_8pm#G|e)3(7D!8WNLT#VefZ}yuOdK ztoudbO2|8B2awRe8wgYivacV6OWrI*V+8mC8cBl<{Y$JwC(4qNY7|{ouj!*Vr({Z>@zWLj zq+cz&CzW%JL&^jMs=?V>c5dbAp0yaa^FcaljMhh_(0!G`uZR6mXhjg?x1m=dg7`zh3SVwQg6l zx4UMVcN$@~w+rKP=8ady>;vCvPP!F`0n=A|>Y8JHfGKXMe9Nl||G0M9i7E9apV;$Z zOo}pvo%1P)V;c>xv)FGa}O2G`5jui935!-UzU~nH} z4Sqqu`!CvlyLZ3J$qWnnX^8Bf5S8f5gssIOD168@qb||Zobz{7`N9S3y2Du zt2CZ1)ChprdR=y+YE4?mr;aDkacS5Es0d2M2rmbQiC{-Z9>mZgJxss+2G7^`@i78eI5Z z^ctrV%{E7mP+e04e05wRrwJ(LqrL^h91dciLwoFQU8eQSei}Y4Rm~qDAMxUNVF66f zqABt<;djOIQqkjYgRBOGu}0-PPIehpKi@=k^u6y4@O_{=Zf67bxc(}@03H-7Z6P?g zezlb>2G(U#j08e2;Z&|hh2=cduDVyACHD;eQlm(YVBq}#eug(A9B}ev`D;5Ps3D{n zXnk$a=-1B1xL+a0cc$d^C%fe5J;Xw^p;KH6nh$jbq);(Rm2$hBhDnLQQ4ZWjqtBNnEWvtvEXst&Y3!8 zt62XZ6SmMjrKY5*^Q}*5euK87co6;}O$Sof!&e#)sG#F^6%u6BF3{)nHH(^rc@{q( zHSf24y@qGQm578n3Gg5iWNUh04=~<0P(=n?Y}&U$abkSPH-!ZDk2Uwiy`#njFZ$PK)zM^7r^3|LYp7ErdAIdV5|YtAwKmngXtpd_P3H9N!ajc@}Q zD2MvK7C^&2Gd)QOfDh&b6y592zNm@MNW2BV^nPcB5XvhdX|JRi>n*tbD+@ezWN19( z$t16s_ga1Z_9T6Yq*6G*AYGZ+c=H!A2I2z$(v^xtgG@8^dwY5W5}fcewC1Mm%(-PT zDq-^RKL9d-UyuiX%qs@zeA-JThAS*RHY}a7UH0o^zz>YSmX@cc1h>-H>hg03y9W$o z<&7^ngEzmP;vrvFmy?wBIgN6;F_AbC8OlF}MLoG;6KY?TOYLz(=!2ho(!g@aK%gEb zngLuX>;ljx>ho0cMBol9gJ3czSB(Yb4sd>Pa&}1g3`bg`^GvGfZ~c9{|4Z23ar)Qf za^EI33nh|~snp}U^bEjB?>&Wf0jJTuTQmfJ_t76=L8Q;Ex((A z_9O`m#B6F-Xg?9Iz_}`{enE2L;$(^5!66vk(A)EOqBo4Q>F1BYX82uOl3E|7h7>NG zcfIoD=(WGpPgMi-3qKnWp4vV*KM_?3a(RqXCp68(ZkB(_&kM3Lp-OPXIU)=Qds!z#*MpF`NNb1EiAmU!5@b0^v5CEOPbYGvL%g+nORN{ z&Xh-b-W%xktKcHgFpOr zRNsMW%VH{y{z{R4r-ksFN7}j3<8a@;PuJi4ez{_Q;w0PE;>w16oDoP`g%{M9S?SF4Rq=C01Nab~)Xi#F)@WTf-v(lQEWhDI1&|JVO#;abKoFe0}~|^ z&@|I+;)RnM_5|kF9{2n|)IW_;1w)l)WsOW|N;)-5)i*&Y4XGRD$6r&2$c-Mznv>Jn z7YkrFrem1Uf;*kdhQvQSj8P#(l@AYm7gSv7Hys)j1s-8VWuNoQSv(jhgwrbz&6uk< zp}=GJU8V!ixaw0XS)pJGZybUxLk6&g-JfrPL8JsVf$ztQKT%|7A3oSW(1cHmGj1He zM~Cv|BRq6o#1X+@h0#wf&}WD5oRy5UCblV_n5%B!yUypn=IOppb&vz>%uEZ48VAXA zhq@z^NnS#BT@8jN7tLM_ea24&fJy*Gv~M@XbU}qL#4WG~;o}mX<^_~lfMs(Y>S=*# z8$St&I)nA7G9gWkX@9Pbde z^ZQr0yF6KLhtL%yX}}TOY?vK#=JK=lD8Q8b^L1SQ{Y1WD0r1uJd*k$prr={XMD_uR z!dHW(a3t!hlQ|p18sX^iK1|X7{|x_&%dIR)Q*BJvY2HH*Wq%|W);-#~iIoDMPy;w1 z*|Nk@%`xy+x|g{&EYy+x(3*NES2kKG^oeAoHv+TEs9mF(*N&QCQI`BVJxAaS;4mTw zI8{Z3qE&O+s-?+Uti~7sRI2cUW9Y!nFN4p&0Z*0zIu^!}5&r4E0EkjwCWuK(R%hX{ zR@SOka?!;S0(%Tw-W53G(TwIMUF9$;e z10Cf@;eK3|Rp(Lo5P>lV$lP0B{OK1BFM!&h3umj;w~jPHd=k>irYqqj6re_!Js&Ke z{l}lPooVQW%bB1AkAm!g!&+?s;OS7LPIt433k7SgW7ap;4p_2O&GS6!gV-`5 z?*~#YBlur0KzbdBr!F4~i{ts7bs|~5<8Vxrp&>V)t}Ju`{-BvHdN5;W2JcFde8Hx$ z7+K1>cur2dafg1sqey%8k@#jzdL?qqcko`!gmdPUttp`Es+B`pO6Q(dl+{prK2-Jk zilZbZ&V*zv@(Nv#;AVgWiQ1uL@CsvkXo=_w%gEZ!0$$Ck23@y#vxf0j0V}@7<95gb z7Tofq4s9&|ZB;{cJwdWOm+9no-qxw{83B8sImCl!|JFA7w4V`9>euJ7*z>g|2 zi#fMQ%Vm{eiagM4>q|Sg2dj1~?!!JlV?7^#RqpZJRR;_ zmiOMF6M&L`b8~kAsKn^tj{zctAIPPyFn(a`X~-Sk+&v8h13U7HG4AsG?x1bPy|<2C-j5$D%Er+Fw3@kam{E&D+lh*}hn0G_9zRN+=m?N$QL|aUc2z)CTT5kM^OaJCBcV#b zf{@^6(l{#9f(gpl>z1iKSJohMw))Lqo{=$j8oz%ZC$JqLwMe!+Ri5~p0F@UP0_T4B zoXH?;`oGXu=tDG=ls`%G_iDh+{*1(QYoQt1L#NPmM6{gQx-jkT1Dv%cGj4)^x0}BW zosWs6t)hDxzj@q16k6u)r{P7YGZ73OK4-z#)Ev4n6(gS3?V$e=^%j0nynnd&EW0eV zz|u>DAl(v@E+B}Ml(3|9cO$4vN`p#@q?B}rgmgDjOCu#xf`owjEZ^UG&iN1Snb*uG z-`91sOfvVWKHnr7XQbeC4L2bJW!t{{&rttdq z=ur+<@8WScF(|Iw?;oN8lUU<+>IvbbK0+#(s1H71I%NIZ^KWk=qSp@f@Kz8Qo{aNS zt++R{<4G~*VO3hysnoKQT*#SK9#k$YPqvSBK4&^BfNX!J#cr9`dP6&mJdD3KXB>$7 zW87Ra&d)03YCni>I9d)!&+smGe{*5|VM*ja9pK$9ehLA|yTLb5F?3H5@Mv8{ahZ~a z1?K-93@*uFeb;g>_IJZ4jJ(godK6B}mk=(r%fRK|Q;vNEhrX{GE-yJ{QZNn<0wI=X zCbCN4>}v$_I-olFI-EgRT)xI%8Tqq$aHUHnmoloeI^E+@p!b~JAFj%+G0JY0CdvOJ z&I_c_=Xd7ifH1(uxDa(m0Wzz8bhYw#!Yz`{$&cyKq3N_44H9^{qYB(-_qaNW^vWPf zm`)XAif2tZ{JonBRQsBedr{CU0i?Y7$1#knv$jTRbfO* zGGXd=2%12GKQ=dJTE$)dAsq-KzR4u%WC>%PirtXFiKmsisBVUC*|#RQ@i4&!U6s!p z{(?Fglmk(}Rhc#Q=maZpLsiijc6M(1-eC|?Fb#(m2hv_*dqehXu14E|Fj!x%a8uT3 zZnMjENz#CH7m_70ku|0vmew;hAE$5@_xe}RBT?G{*t1vR?_m=Ns1~glZPcskRNprb zPAul3LH|k2RJ#5rG3!_!ZoRFvaMP;tqfxXHJiqK8rO0nd>34rkV$DD1>!idXumVuv z>QBnTEYIL{w%3hb~RQ6P*p=u^R0{E0AB4nO{X>My$Ll0YEl0|Mfy zO-lRwgR@Z`?#R{pE0-}gHj0iJTiB;nj5bHvr9ouJE-{z%`zjk^m7sI+RNQ?zK3I|5vpS6yA&SN&HrrXxsz zkyDhG-hjR?nP^`jG)1$CtL|qs!-LYDc91TkOMf@J+#HjK1T}$>%lj%b z3O&HceCa+Rx=u1fo&H!NW?{y7E_w80@*?$LfEQ_{8LiJz1w1fq^4FJ|A~nmc^AOxQ zJUA=Af#qX{s(#^}(n0(-A4``uoMQ`I=Y5?wU#j2UFBQsVlO3`KYP()k9IyN>V(rSI zX0I2V-I;%A^^_#cg`+x5{$n+}-=jp&;VxKLj=v2^>$Q@0`~5{0>J|bkA>3RMEgUEg zQ*2(i^`TY%9%Z2@0xGn?ozu~EH6Bi6g?_+cK$C013>)eYChglO$ET71MUBYCQFiX9 z-SVps`lu!otq0_3Ty#`0m;24FXolM-t}q?+iSKPt!708`42gx;ew7ZBkc3SBALKJp>aJ9RQAYmaL2b zK@}}nw%UU=+A!KfDV9S6@H+)KaD9Pg4ia{_i{9%Rd@L9(juyGnC&NK>PeNUeBFQ5r znhGY$S6jns0tGAor)+{zT1tP!`v)|ogA6t!f1ZDgu31c{QQoxILD%-AJxe%0O_z zPaOF@CgfJZP?0?F(2@BPbbxZ%IdFk22QDCzwL%W&n<@bEGCR^ZouZDhp{3fs$$u

vl0gv6N8x+z5N%Q37{ z+yaV&_(F~T$gZ-zQbC-E85d!0H-E6Lnm0y!&d=R;0 za~lM5BO9E5|ABiwsd|87-7e^XI@5iP{LtG6Ea7cC64c&LyAzlT*?!7|h9ki6_dR@& z6)8C1R-lhA&oM=$CcG**Gp+R!3)1$TW`xrV0`%yl`t@b0{vrc+oiHJl*vDyCtj2e3 zA(RnI+!WC6SXv>%8LlwCugOBjN0d$=?{zIN_>jRf@K_&6LDPJqvd`2SV3z?GoVdr5 zOxK$+4`4LsZy+qT`vU6#JhDwXRFr(Zdgiu=80q#PdLXluo>QInGg#A85Nf{k3Dqz? ziT{<$7`&L2$405?fHV?ESBo{B@L}aP)ueOZ$z#s*>c`@oxfMBkERtccM4<9#@IFDI zr<+=6^OI0<3K_=Csj`p36F~-F$23`gvYxN$fU=43R6?9}i6w>g`$8sFvBC$4r>dJF zveFobB&+MRO)u2X9F3Wv&9+8rYY6?OFP#Rrxo>rhsfp{Bwe^{6Tmr<~UZgC?&lMg~ z__d9;(S*BUUpSHe`niT)9XJZBiJ@XkO(0=G>8+b^b<}^M)U}$W8&e50NcvE^V}Z^< z_C!&x{~cR#CIQ*Q@~WD5xI1%TRbfi8)ua3Z7BG2o_uAK8c>7AfDHCw%u#%X&K3Arp z4?W8Ep>E1ddrvvR51}G-3W?Nc;RekauP@`$$yh9wSukQbus{pV{foPG(A?%F-h%LoVZ&_dk8?XAO6Dk`=NFRUy`oI;s(m1NJro ze!g5IMGA*P>-)gFPh;PJ6nCV@mU{2_gve|285HtE!+%h`ug3YdEB0Z^a1V52wzO()o@N!@WJxD|p z!yu-O3^IEn0YA=*oorHF4R`o45|#M6^BBABOUDCnd`{q3;W_As>T%Y;qU6;Sj=3-{ zGKw6rjZqV$?aU#)zPm1L-Yf}GCK_CkztQbVu8c1+dUf&c=}YVhjo4j8Yc$eiB)L&VTMfjnVybqc zpHs`LYyJ~}eAWNv;X}9os!XdryH_<^TMv&JL~3JEFT&q2tXkBGoLYz7VmfEk!0bjzF0Txxdy&+J9Zi7=DxI- zX0+&y_j7YlU8uV4H3cHR2`n;cATNPxsn=G! zWI`aJWPJQg?9L;L#`0L|$s8VcbXEZ5{56Z47Ht||d>w1Lmt|S+8>@a<;=7v2x*XaCWld*OS85CSb{7`VsWHLbAAP8UVU)Ou0a|fM$L!7qyE8-6 z@)pkk>Ro9oe1hH7>%mX^8fssY6M$W+NHRLp2@o~(VIOh+ZSAdqAcid>J6K>0(QTe$ zgks(LOX`CfpSetwySAA0^_$E6`Nogj4vk;mxBFE&mRR`nMRoH8S^eS2-?kpejBRQ<@KfM4cYJ5H9dS7B}l6keC#MQ zH}c037DFk5-&TctEb+%wKbOrA-wd{5%s>#q3V0bfy|LU{nN{G54bQ6r(byv+S#_g3 z>)g>b1EH2xbYQ?NHw;wnPlxhPBsuJTZ_+N+lOdDa;5~G&Zkp#o<^!X>#Ce8-elS2Ih{7t$Xsu}-LNomi0bRfv}N(LK@6ic zl?sE@=exw5XKg)%eRH}$OJQY1paS}5_LLT2a$bFsCyH>5I(XI3&{YI5-{j^>e@X~K zn3a8G3+rUlt_ogzPQ}>`c`oexV^dmv*ezCoEypGJJ-Ml+>p@=-qOvw3j0L9h1@R>~ zXE50oO$N2Kg7nE{20cp8e4rPtP0Q~=P13NT;~!REP?E8;Tb|Vl+93BOTzF0q2T_td zjJF2?7VL(g2Oobij(_AoIGD$-oVSTYP}V=Z!-!oXwn?PDAAbW;+6UKskXXNBj?ot9 z$oEJ8h-F^$e8uSr;!uhzN~S@_5e&&htqQ3=vQFBt{Jysb3kZE=5mnXcU*Kio{r-4n z&?`ySft0t?{ph7pVjuXI=Y1dFRx@5$ebk#qh;cyJV@c>UjebAA+~-^WxC7u zDoE_SuWZRYAP83k)^!B%ev#!IyVqgy+vL7@hi9`O9}x;YJ4Jxz@2?PG?2C+jbRPom zs2q!Lr8YiMsK=gC)n5uy%=76Gdgmg0$jZQQMWR$@c5k_>RTECjr z2^1;cMpcGuplD^gxsS+Yh|g|MEmpshYB?a-CaiM?SvCw~vJp-?DrU*sG{61xYq z&#rKV7VXL~uR7Sd8O<@DIXoIxz5UXAS+qfv5NCc0*8_3ZW8jw4k3+Q9GWYJF5)^#& zLX+eHI@tZJgBzLOaj8{VDS)RrrO{&$%Y@AmCB{B*#XpSGkDkkL8 z4b`&53vrRG$AYJVt9y@)wrRk|3r(3SY%RL!XV9t&L z8z&Y1j2-a@X-O+j`T>>G^Uw}|PQKoc9^-pO?#}#bO7g);I^=X0rAG)Q{ZiQ)lcEoz zYve3KU@`DlgB9WyVgId^-}W3+e_j-}6%esO&WNOMR%w;n?T~*t{+SsQ%2+QD?f6%$ zB*$dFu+^FRv-d;GEQ_=Q?RX2|VAd76H?++UAz`x`jU*ov6-WB%2$ak?Hj-KPne!rtD_VTO*-P<}7Xp3Na+0wGQtp!Q=%4Xr`Z6BwK5yn6vkoA4 zbzlq8Px|ChN$L}uIK?phj`}z`CbLUtDVo=uRggvM33&Qq^ZWY?)u$xAZlxg}Nd+(7}sUq3+_E^i#Y4uGY@k!7W>UdwKL zjK0Sdm|aA@*XEaAuid6MBF11|q2EQz-|)8SLZ=M>|4qXmLzv=--stEHAdEVuBQ}g#V6{j z%Dp59QL?cMi2l{vW9KjWYBU2zVCm*KWD|QF@RG2H0r8|Wses%$>JxW+{gnW4C_>G( zs_tK&ZC5P?Mw;-=x@@OUaMz8(r8?)Izvgd@+N##}V7}$Zv!(l!YD^BnhziQuXuM=L zJ{~Mc?n+KDAcF5zk}6ZCK$UujBn$k_p0w~==hvAY?a*ic*uu=Z3AJEptzmXu0IxE4 z1EXW0U%biY3HKB##t&DI70fpEl4V+xCd8qSdj5<6$T&i>5B0WU7MK=pzjHdYYVb;T zS($@lYFD#K$T!R8MSY;5HDwrzv0T;{dET%^CRSI!>Jon>{V@=&9Z!T5_Mni-RNZ&$ z!}#{=6k$qDHw<4k8J}UM-fQYO;(XRlA{bR?Ko?MNc;!}m`|59Fnjrv^)mQEoQ z7r&>!Rua7`sDwG)POqR75qN-A8>2+=q=`}gD+!IPkQ+eSZ)R$K#eND)e~b5CmxGty zp(;E@5diFdptAatbm%A4L*t&Wkmx~Fr6<0s6nv3#97k2P8;YpaEflWl)hjqLg1xqp z`WuQ}`?$^4I1H0prnnOhP!%sfF!v2|Q6c&7;*H8tdpH~sw zJvmA3d!|@-oH>1pIt!(RcS4kuwuV*jS{UKYmcQ|TAo$MbFuJT6cUXi=Ro2(6QUshwq-eJ#C?gh_afQuR^4z}^)Y!} z>bKH&f~*{w9rI5S5i$^51?bGi{%u^IEpCI}aPDo&M$a7TtGwlg+Y8$8WHSZg1q;6y zuM2)XIZO!p@{;Y&YGbimDK@U4@*<*Q3R*FrrqQ(;FonePEK9d^a#pQjFM{N=6sCI} zmcLy*`^C44!=ZFNe`?(MU_DFs@7n7cvlqxo<2D<(T4qr{sK27%l9s98C)aoA=vmf= za7_9}X!^H_wShP~ono%JKc{~7s1;x;IraM7vjVAfJrT+33>ti+Kzpy-vHP#&8SWqhksywe| z_w-Iax61-Y%4`%+q~rqWG0L#{Sk+NkjZnig{_xeiPADXIAkSM>kY?o~Y%!%x^9h*i z%sq4Jb&?SW^d5nlH(d;ErMD(&f`b1Qej+1H{2&)(F+iVA_Z*^f#yl-_AG+ePK7^Av zJ9jM8r?L69dQl)({a*b+Rh}qJWfB@E0Q{7p1xeZfpT$q0SiiqXwMxpj$iz`D=ng@6 z@>bpA{k+PT7fkm==9tXD)yE{^T(=v;4K?sX^-_u?w9W8BhRP&-jYgA857e7i!NEtz zXUUZQS|B!r6%-<$JTxTrXB-Hl+}aFY#JsAYLIL#eyv4aXEyx+kJ+*mg+&X$)e8Z$V zPjyhq6Bvdr3No}^eW=}pUj^bF*x3pPn*XFc{vi;nnEukM7okMoQ(j=*`+iT)mvdLx z62?J&*yIgN(ujah&L3^M(1x^I1xmq507xE=0*eJ#$8r{-$QD&1QS(qIn6x`pD*usk zy!`EkT!{^xttPH8W+{c&|3uP(G%d}j@&|R6y*Di6F2O^F!tOpe<>C)T0tkie!ztr~ zc>`rIn-%%U_m>rAV3QYSrfq`5q)LPVLZ1VZy03w|bE<|YC42?=hJ1)~9<0ZvO%>k@SZ~vm}jn>yWc4@~A-9 z>J2Zy$vuZJo+ib`?e?UpxAh@u6FpT~LU%M+jrY|=xHw|IVu|nQi`-!g^v19o^cz-l$%^KW zHOX_AK*qKY_C54w#p0-up#urk5Vm#!wp!ul}bbu}gGz zPB?X1LQXg?f^;!iWj9$3$d9!}1`|=>m{>&&C>Qt8bCU+|e%z_%bbD-&xxr~`ho6}; zXGSpoi(LA`1*@r;2L25Vu9@{U8BQ^cD zQPY4{Nbg(08hiJ_;sCyPfil3v9d;|gjBIj(*PN{p+I5>sMS%re*yDk}t}OW;<=k`r zDfnqW8a?f;-7c_Zb4wonOCQF2daGT23cK^BdirPgfq$^!o3=)syT3MZ;-w$feEfi1 zRLN^N=?JIGbE=C9XNn2NZOz?&l#fO|gt;>0JwV`l{jlq=@W#-F!`V5e5-g3+d}|c` zcvot@&ecwtr#?<5ZR)yX6)OJcI4Iz0&9raM(L7m%iYuDEhl_bNC)GfdY0VJf?`FNP zC-x`T&W5$=zd{kh;_jou(;&VKLqUqC|1SlOo5In8FB`*YUpA&g(C#5mKS01p@ja}J zY%PX>yK61gGWg3(8iXiv&qh?PTYT#{j>;N>;4e7VL}D1i?7oKIZT2uzl0{`0bdI?c z+k@o{R)z0E4G{@;iTd}_`lQf(9l?;% zwz04(9y4y$aHz8Jm9Z3B>(TKt#rSxubfb%j`B4$t_@qMj4R{QO9eX>|bX0mmK(|CV zyvdoQ!y_TKPUEV8?Gox~J zo~VvjfS&+#BD`#rYl4^w;YQSZHQONT{N>mMKd4?(WH4>g@qXHN`pp}snhDY!)uv$sF=Ro+J2k!%%mCIv1`CZ`KX|7rZ zHI@sD^k`CiP8ySAw_xy6A~a zoG0+5akw;LafcNkw0h)S!)EOoMF3vL=2hz0XeyzXcv{Wx%XG+W>Id^bKE`LfY`U9G z8zib}UuqJlF0AJE!<81S1jg+ZpZIoyE~z!`N!)lIEv^jYX!88fxPu@_Yt~o^zvje0 z;H3oc_Z3-?V?XNtNyDl$XWtD}t{0dVa z80G2pm&6i3fyCP2oOZhDqy-0QOHN~=`Xr6!v`UI48E_DPCUir;e%mnkOXjQF2-7uc zAzd5D=!Pc)LFOWs&_!bRG`5Dx2j|@%GoJA)>sKR;)NQp?P?T0BUsAR2)yxm}{)qgB zl3H{B1O#KraF0rjGYMMo4JFrBug#V53)-B^_y2+6h3u=kOu<^M&bSRlaHi;~ubuWr z*$M*0e|yt69M&c-ZY{i^11;X<4_ELKg`0eRBR&x+4&?w)#W6J>IdZFHQ*g0$A#|TuJ4WqqUY@-b8gwpaf8a4%%HJ{=+3%~8*Mb9&?6-zC|MUjklHr87 zw$+T#?J)$%VBGN!gk-#0CA0q)4DX#{Y#z7dz8xyfpsHnB@6)=Y&7KXC-CAy; zB;4f9U@EiVZjiWEqdp-kC~b#KrAVqNNIB~7voEPMiEM~hYyuBrjmn--TQ76aUmb*# zRoo64L9?@Flq*$23Y}F*c2WCU$ppZexI}7L_-KuZWl+a-PY9n+Fvf*I!?|2O%tlL< zrQj419GqWDK+mMqDp;hBukpcw*8(KyJI5@rkQQuCtE-HjSsn%_mHLU%$6#G_(m7e- zi9(dfnMdkPnijtB6#1rfC)j*N6$!o5V{aO^;Zhv#yTV51_i}ol*KoAb7e1nHpR==x zwxcDJ^ovNSb2vJ>>tz<{JfmU9pB(?#^tJ?>65w1{&xj)^ditU4b7L6TBPF5@^>#v8 zT&cn=2$$W2+!jvi*~v3jzf%}Tn_pEGE@jDYz%4lLbiZ#}UbV1Hv%;yIATd&MPA#d~ zAVT@)A*c5rwtchD9mdD@NebG1vWHu7O}yQ+U_x%xm*C3o63n-~*K%CO^E%t5VrL4IW89WnumRkrLwRK&)IL!@ z!|H}~U@%A*^R^|Z_^#-7q|A=I*ae|=vWnaRzYJ_9eV3-Uz_XtqS1~k7=wU4nH zh7Y07L>$Z#)`C{VrPo*#o$uBG$n1Og2W;N!!6HJMEloyt-Mq=dZ7vik$j0+7WnF0nU64 zn;I;VOL(p65d#tB5*ye-M9HcOUwjUk{Syb3MrK|WOYAiW(UOzc4OGU3@P`Ungc1)g5)+%bxZc}T{hZU}1cvQH@;VsvCUEzYwFVSvyNCE>j1FRLJt|C~Ha1%2LtXpR-k@>hc zKfHpbQn3zDx3jK-DlkzLb8wE|rVdYpgQdDs(iE+XFe3FUx`wh4(XOOIS@sdoQttW_ zR?+JF>zAivG(=TEoAYKlW6IDakQDuefP2=gKNxIp#2ISJMP~*7;JZtq3@-u2q%k0{ zBN3zG#44%CXbbmTj`d%09pO$W%Ebn}`}&&}burg|4?-smm`JWI(R3QiSyCRw2U1jG8C0x}%nMK=mCZT5vDGbs{VDcy#X7|(RL*9QY8P@)p)H^<9 z%)UP!N?4F6#xoF-5%NDj>d4BpQXEKf27Qtw^7tgTcMqT+xD&P1a)l8oUeT=gdgCUD zahmwV2bp|n4`^paaUZPS=Ar$Gp(hfaGjtn$v-@CYUXkHa$Nc-`#^98+_Y+liKafBS zo_5NZP%*T`mO~iy1cXodx|xgS*qh{Zi^Q0bd$h=GJw!f5T|1ZfqZaAJd0`*aa-QNc z*0f5N`cyU?9JXV$t)3X$Q2UxZr*x*UqgHM&{02>RdEH9*vEKXWFQ;#1cqwtlX19s#>asZ>idwT0M=2Srkp|u7qK#ZAGvkup z^Te87m&4rqU=iXYrCtHFCGdlScn|Oen1sE+ba4_{LgMhbs3UG9*UW%v+f-@TYH-uk zvoH)9J0dNY^4y+Y!p#2Zd6*MKu5X@TfbwB;>}xHfPNPdplPT{n*K--Oft?{SZvZjc zL<%qz1yyc_nLI%FgWWDb;FLZjENsUkKz}}`vIDJcd>2Y&DatP=;Kx(M+YZj_pS@Nd@bdIJWZaNXnPD_EkH{3 z5@8@U_M&{y)*2R%1d7$wDyjEIc@Dq3M8uYC!RJX7K~$9!SE$^u zNo$JiOliADZy;cI??Hqm|F4mdmSXGD%69tJ{G{NqZP_8G8k5q4+ompj0#(s8YEFj2 z`O;L`tBve$>xb|=h#gPT#=T8FGyVB_b-tG1&Nw+A8b|4{LG%t#pQqE02*1?i*dxlBF!gsoTg>O2HM|$`h*P4j z*F=Gl*k%E}%-s{)kz>$CIfqlJe1$1yLOWrBa3hIsSrK@2E?c) zo(=a9c@7&%B(OaiV>NccFG|F`@niM>vzeu#V{wU!5J?IRze)SO(sHV=+SdaHYUK!h z5P2sVPX#sRJD&{+&|B}X1t`DE1#6ibK5MOpptZCX!|q{9T`VvE>o9H*G{_(M9|VJO zq-O0V=bOKA^mOt+u1_SsXO*Ps?An*wG9?5n&E?K6{qa;%Kp=XHm$#2Y1qxOlO>tyS zowrRoW6vA`K$faoWQ0duF|o3AWo@*i~RcI0H-wswZu(OM$|$=~lcDzj`ThBBvAh+utzqUqOZW!SdCDqHm+ zv$9d8i(4XmuHWN7ARPam=$bCmabth2iR%ix)i*-J`sczQ;ZUt);*liRp!EROr@EIL zuUwo+I^4#8a!~RHC5m<0BEa`gQIr$5m(KOeH8q%`T08f{I~&+lGoL846Kn4+dYZkd-OATG< zTEAz>@4>&&;D>Fq(5B=q!xaz$KS~%^fm%a*sd*x*K%{Dgrqo1%Qb${WG%P)te)uvz zx2LI{O*Cgu$;T9WfMmJ(eqW(tDyRAGTw81TFQ<+kea~;O952~88aS@iaa&av)(=%y zU$n}Z*WM6u@}pSEWs7Q{)25236=7sT($PLQCyp_1J0~#ra^Y`qv0Zq9Ug)$55V&%j z%(-k5GrX;|EEA_hOw~eqfAEo9a#!jmHJ3wm=VL>pw;#S1(=(X|q3Cd{<|FP1xo7Y` zfBJ;tu8BBqRDa+%yo>q0p0PLxOSNdO2v7z?w~}`1v>x@Q_oj65_;}7;<;BN?*;zt_ zxY&}Y>*@>JPCf7|=Uf}Km;X^NT}Cm;@b)fBaik^^YtdF$Cy7_AhW5tn(p;D*e`?UB zMiVlJvui-lvex<_E|PZxm8XP*TO)%d6D?$1pS>FH^LDxI;B?nuxfgTdR>K-P_t(L- zW9A+gevn76IY1$ODW?MZai%i;#E$CVoH1}g5G!8l@KrVb(Ho-pWrB2h(NCLl!hxTp zY#J!k?5)=N87(h8zag^Wa~_py*-{oAFGi)gvO{!>kJ)HOt?IMu%VP?d1H`NO^$*Y{ zC+tC4ii^P&euT$&!uh%g|G`S zO)?j^--qZZ?4he@F}dK@UbX4(W3w={ixAJcRrJPq+GqiJ2%EZa!MJe6MAwmRShb39 z-cB|6xc(sxMI^2CqgZ{csv z@U$w~Y?lFhPE&yBn9hF$z-=Dx<;-er%bqwl8!UZ}4<@zKHkZ1t62Ss-2)l6t4OniF% zN3Q+ri&B=QfEJ83+VakLZW?amiW}Rj0=#B*h-POq`mkH+o;hWs;u`vkp~j)ky9d@& zCl2aN(@!01_MUIx8AuNV#oJg+zMv-4Yp6PV5}C&znmYa(0j8wTLnd>8b3nb~QtDP2 zC$6~W?;Ue=ndtDGrMj2=w4uZ-W$|AjMseobWlle7jrh7JV3lh$T=+Axi%*rchc@cE zv|Dt|LN;4)QUastxeyY;z*(o;zKa%2M~xky*!=zP18eVX+7@^nXj`+1`7U&2i2XC( zZ-?xc?g2vjEk`iR8O%_^>2+z`6d02xOoUDI_l1CXb&JqeX z{wgzRxKVT=+M9O2<3#bWnwWTzR|kY$9qQ~81XI9jjwLzH6uKmOE7j)kbg-ERtLm1a zSGj!AVNx$jxY?Cs^U)HjD$i>FYMAxL^mTBy;aQuewng=?(5cIRKVGogJuMOr+Ugtx zC<4Y$x%@w^%%<2gFVr(Egug*E+4Icz&}rZC#E3~$b4!E<)l+@bcWhl&zuJ9Gh2%>b zZR=I;i{TRvI#jr~Wj(s*ors6~>jey>{HAnA5#~;=d{@mVI%k@0;K5zd!gfa!wBbuJ zbi=*aHMBf9D4rYqch8nCb_o}mIxc1p{U0LUD^tUprAt`5rga^h8eye~1HY-SDEyqJ zp{Fh7f;qFeEHaUn;}@SY>pF3Eeu`XShlRUgl_Y-nPp{F;Rro0LvL``L!THb1tNU#? z`xSa-M=?15L*_Zg{16r6q^-Zi(JM=rz@`5ohB&n+#`I>)%^5m>xW9{E5i!7u@p|U*m$f(hxBV zG!(3FLT;8QU>bvONVl4U8vo{zbL zcf{&RggTb3iNoC=Z0o%`!=*^+hbr4P4xR-Lyx&B zaVC{n*eKQn#|4>0m=2%J&e)3hPlcI~jbqcxrOjihPt`N^WQL!V4nxMpY3Ddnhj$cX z1*0bj(gpP$6J|v&(1r#4SVlaO$ZAcvCYEr0j(e?ttfQ~QUuXheI1W%xYqDC?$~@w1 zBe~(nlrY8p3$9fqL;>#gw2D(f2lgIM{|ZuIy_SMiDH_UxLr%AF)zb|+MD0bM*hp9p zz8~q#(`Yt$RkWk6P~!l~va>i%G8$vb_?|#{SG>RW+{)(@s^-0V?!?;vSTB0)@~P!mcg;x;TUL;}-=1QKHKf|C=U7NJH;1|bU6 z0u|uk)xf6^@Y7bfMapNn%_nb3`~nXJqVuA&zYxXmc!H{!je?VuPB1NSJbRz%yk*BS zqaR)HAk6@7GWc%lC3N~TYuBuDhbk)h^@T)(WwJ>muxrBKc%WWB1o~{p2bIC>(>_(6 zU{=+AZ@>`DKJZTLtMBZ>AFj87;)BWosKpdhtH#f5}gDEK@e1 zdPR&t?@J%J-#bPZ{}V`g_X$_3LjEUOe2;#3qvh=5V?LUgNvR8x&GYF)Vd~P)1z9mk zs47by7kh2Sn4Ukmmy~sU>N8Zo*7ttHr+E~B>HBNm-&B*d!p3|YKRJGJV0KUPv!Rkn z(-LLq?rDd@tg4|mhR7ZqW?xOT;ddb9+zd?vEs_3ln754vOdJkUq6K{=LDF{f=zi@(t0kfko&|lQkk* zraGnFT&%__+}f|?`Ld@QA#O*R{0tY*Z-JJAN(}U-FZu@uRFS>8R3)q>IipkKl=h&B3Kc7Jd`ez-yKZ;b5`6N-rl4ireMm&de*|BRqwKshg@X zRE1xF6w#aow#U4&#%Sjp>A2Q?d@Yso?@#yuJ}3#2r#bVkQ&iP`mg#31UdBRXU&v0I zo-OWIQ9^g}zSA7f3B+!n3QP3%<%B3Bo#L=RNR*{-A1Eex6jiIQx_9sG+8xVZLqTQaQpC_37f|J)3YXjqDp(^L!H-pVMEpL9`8^B@ca1`lvV_fKr8gJ+`>K7$J zi_|vL7G#J{$U=st9)D8JJP7*C66=8Tfez!a(ahTZgqB=u5oX#>6uG>(io-%Uzezb- z1cZ%KO;Rg-1>;No98pH6E2t^W%+ z{)k2K=WMIi{aU!L5j|uis~7ElsugK!C}6eTJ`mn|Mm5mHTK$4$_Vo{J{2)=uokSoz zxkmd4BAQuUl%_%8kTy{viv|sW**hakxnuS|uR;wv3>lE6!SY2`^!w&QC@69N!z3&g z-b(dnKUh?7IipyEDW6EN1cm*08l+aX~o(B%em^ zhhVuqrp2d8jgK?cr7mz1o8{!jRsG|Iog0#0#gE?Q@U#)Y#t+ejr-=gz1#KhDAo?J4 z4p@6~Y{ctEU?dK+rCXj>Qq!D0koCLkkdd3x-1CJ)~j7ytm(z)PCZb|IQ{)mlSCET0^<^ zDervil(n#qy^7E>-Ge!2X2#Xy=VM`@0SD-!YHi}KdY%|Binqp8_{|5#MqrDcx3dy2 z+j3)Jfe#g1n4o>Bk|ozqb`dc%VKl2$_%amtKwLyn_8`Zy(kGOd5Xq3Qu7w$Qw9VEg zSN3)hEWZQzR+WR0KL2KWRB--teHr&otnYOD^JV-U(YC`0^m4ewf@{3UoiDfDk;X4% z{0Rqf-M?OwO(YWvwQ5M;@yTD0Xw3*G*QK7(_zqWP;Px5zFZ={ykjM23|1Fy)>7iTZ zaNI=8h?-!3LiKzxDIWCOy?`a%S-rP>SCmR0(qwO08#j(D?ec5xL*0Q!@$@7lki zCU*j%`})6V`IIV}#ckram<&%>>ua$?o6-07cI}mjl9*VdyTcmxY@c_mR5~k1$c8t> zURmvlzxR67%SyR-@*A$plE;SXVgXTr91+`d?(gV3veA}O|G)*WsnoO}f9a>=`9&j* z<%Q8Py$%wu-m#8QWmDm!5Xh0DQqhlrJJj{lj~-RY4R@{L<&+eY32oaGl*#v6Cr{XG zr?&f(06SS?zjbHjjX_n*j#sS55La^^wDUinn8H5?MY}z{nh)n5)$E)*Nc>KGcl7vm zjVJDY8Y6)Rs7c&q%lbvNfYX7jM~t0&Fl4j?dWqfjU-Myi=4(szzbdmxg$txdoeOOk zVe+R{t*cC$F%FILP71*+RmRhc)q;hbYpS<6xQ!MeP(U0U4TmhYJ9Wqq9UHl>wIH9x zvGR?Cp9H8IpGQOqc3966Kq3jk-VQ98TOjk7kgE4LV9xU^ri4e1icc~E@SAl}uv_aF z1Ot(Uv;c|kiR^(`Vuyrm@-7!m9*^x?(%iBSD0G+m2ZQxl@B=-;ChJU&|{>38hA9sl~9|dw15C^NdS39?UbyLZm z#=~zGGma3Jp%7v0nhu83uh*fd4Wsre4tGEk!67*xK`MK&9BUMe%WI_Vr(6on<*tzL z4-=y@(8E!`I@2-0eG*^ze46?I?>w#gV^|QLy)aqnory6K%L5Uqq&JpMf_}D@A1~eq zvVcQ%W!X=7LLW9)ReiB(Q5QPtv@td+kyjolK2roGdcGy#P|_-wRF7gnBo4;ZAC~En3Gj4x|c|;G`_@8@P6$BjITy zv&GgLCYVXrk9!++9?OBrRs!xG4+MES99FZ*Z2k@rXYx2PlZ^7QaI8GVLig(eAaXFEP0Gdp4 z&yM#TX}$a3HtZ&rzD_nIK(}IxZg;Sd)B$@H(gkiB9aNGz|^00;w z%ZuJoVJu2ou?ncOsWjxQA{jrGa_XW=WXVDD@0>{)Ko*m>A(Zm>{b1kBZD9^MWOzyi z_DO9Nx;;1;JrGLL`45|u{w(r(@<~c9IrpY%TW(2KGpDT$E$?P;+-7^t$`x=!In}ll zs??5sgtUD}c{=_d?)L%LRXbkTZ}kyt+A>#P8((ji;foYc0O)Y5mY=gjl5b-kKgIDnn+tU=%YbWvO_i4MpbO zKL{3hF@(K4m)Zt2+~kd4cL8g%vuY9lKu`KmS$nW$=5qzMxm3?kT!KX6r<0nnsIwIO z1eEkl3&Vcg@m+i7l?#wg>nrN*SXv4YG=^k!h5#hQ);QI=?QQYy;Z-zqu|n_Rdy&KE zgF0G;1|6nF%b^9uSqT?)weM!n`cLaV4$`^AGs=W^;k;`gTDhrGU&0+)#Tvgn983#< z74q}pAobZBh6X4@bgJpf5JZ;9x`O1~a$`Zcp;5?MjaOfe&4lG$&-HFL9ubMGt4q*ORauy7tM^oE({fCInFldX#twY@wF16*d16{b6xJphV$RkjQ0i)0q~OB7fYXKT8Xc<)+cn z7G3KmPttt`q?_Zni3gZ|8N{jm{vfw;J8WT=jULE*=MG2n@ulGcNU*- zVSP7r&aqSR45Zdwm!@bnbO-D!YJgan(AUa#xv@`z;`?b^;d%j4Db3z*sl8V~7tTr% z^6zX^JU=cI<6(znN@=ZUb?ux`_;{e1Qo!%cFe1Grj`jzg_8&Vp#%rCE((YP--VuFC zO2+IQ(rre+0ENliU#t6y_|}l{*=95=yz`8p(>)ge(_8YdRW7OA`@u)dJBmX`A&|F2 zM-ygVH5k`BIbK%c3&P9Ml~aAjXEAcy{)nP;19DhI6 zv9MTFICMzVof}PjIw{lPn5lNJ7zIA9V{c(|Y2{dRumaoSpcuR94hMBCyg1_A)d(8$ zL~2o=8+l+skA^);Iiv0_5AWO@M5kjGo!+Xxj|+srt?@p1-auhO#5je8#UlE`t#-!o z!OiH&oJ1;G9qM4Z38z5XEZh1sFs;9<>yse^F_*RD_8dwNQ00!N8YYM7d!qa!5h|Jj z*xcA_f0CiXgOLxN#rlOLmUASkeLQJ-2R31DaN)Q)7>|}u1vRV7vjzf*3$Zn`Zwerp zoFC>tdjD7pduw4P%tf8b?=i-rM{(tn;wOykXQA(@8v^72U7hjV5$MROhI{6E7<;s;;o{!i4^|)n@I9)0H(=7Ywrpy63=i`FN6Z(;LhC)i& zehNkl)?v@s%x%L<)z<}!T^##~xi4XzlWpeg6}^5xAFl8Bn|>RdZ76mta4Mq%;4Qg3 z1QSsi6~BP6m$O9!vYA)>vJ6&(-z)de5k)m8fyOqFF(e20wEVS4S_4<`@O3UUBe z3+m6gl^EPuuT(evc{$rL6kgOML)rsFgz+uR`C5gNs`dPUYhyJBs#Cbpmr-bM%PU$f zLi6Bjfd`5XAOyfN$B2!B(K4ds-f@*m6>$SD@5^P;cJEi(FhE=9t7CDhCHM1c(ibQC z^ECnR;?Sv=O4V0aG5zXj8mq=Pm%B~Y=KyZfMF8OiW`ue@E!W?~Z2YBD{FFPJn;V=YT>30meFCTNxMM$RzJ7*So1@bnSY9lz!;LuTa|FY3ZzM zQ*!fLU=N(0?9f+$G`{FC@2+XyBkLTD~HIla&-=lEjrTrmqU$Qf{%+%n%%V3&^`dO#uo&K)#$wSUWRv@O!#|Q$Fp=p$l;EvIDCzifBk#BLboR5qIzF z$B*tywm7Qv7r(-QW#t~ZwRM+SUPREqkMS|7dLRccK<{#29h)`v*?_K*d?sa_1qW_% z(XTT}br0J6oHmv9?{v_I-a0=er6`)R*{RgZk99}ri%V0z9XW<<7z9s&yt_S%vB+XU z{`P-&I7hZ^J8C0+ua7kFqKY!8oOpy)lx{*ffMbuyEZ-!$ckkO7R8tk0|G@_VH2HE> ztd^ZUcjSQFm&1DUISNp;ZtKyC-5-c)YQ{HWWpF#8LDkWN=393|s9Jc)lk?pTbUzx` zc7<$aLBjvmt4)uF-fo-N^|x6*u8Q7pNV9{_%L%44_?w1w=&2DEe7O^!nh%g3usS!; zum`b>CiYg&pMEEeTBv?Ra`6c`=oT+ZW3RowQeB^YbH!3NDpj~`^ZS6b(G0yv)KehU zJH2th_Y*G4B?x##g2o-S24}A@?5B^qmNQH-30$l9oA$h16q*;|foLW9@NRID55Jr* z;pt&$fzU4Dja~^hXT%+~v`_XhKfUB)Bw0&u04gLXS+H?ded6eT`XKGB>^nIjQX0@9 zFjgmryQfMr*xkEYh>mwI$`4CZk~q z26a9~j~fDUu7F4!ic#|sTT8aw$`r1STK?I6O8Uo?CO=bg&|7FEeZtgAP}kn<0KP?0 zhkJGg0WKK6kNUIMM4=X9?-7;6xBnTp`XG?HIFM75HhHLr2ajl*NI7XFaxy~WNl#iq zpQ=)Lz4<^@!Pa!79Q<4cQp&0*$!Fn*{@rkD>HwV&Ib#-=y8#SqX?ig!%=*9O-sZ$mY z7JhAXL8nuEyR5pTf1iHdJBzcKzT0+}J_2c>F!D(X_2JoXF*)xyERWl2hBBN5A7EpomC7YIuWmKw(@<&Z%7 z_AG_xc`u(#ec8G?j|(TWg~Ld!d1+wMk$&vd(aUz*8y&Da+-N|F+gQmlD(4b6d_Wlc z<|dwk=T7YB(55_l)IX~En|a)~*Lli@kJvCODSX;wsmyqf>dvr_2?PVDvRbJY%)K`A zD+SlP-K1P8f?aRC@krUY7!b%O9{nL>STc`)YA4|odr!CG(PgY+T;i9nW~kO7tFHn{ zlTT>}MYfYAB&1eqMye_}?Y+oU4|CTMk6AVSR6J~v0Vo9%pZ?Q2^XOg>Kdvl4tnlXs5PHyb@ zoR$s12)%00lk^%4SUR8LQ~7!T4<|gBnZ@IaNTl{jsKfC08jwe3VnI@d`CDSN_LKB} zfYYz|Np$T-=IZm?G{@8I>j9GLWS}5E4=E};IL`bM(AF5OydGag`#uC{fPY2X9$5eG zxaXN|S5C_#>>5k-jla&m(V zJv4yDiYwI=V)rc2)R)E_;8{2|mD)NKYiq~sa-b{l8Q$x|ierQG7$JsEsN=q}H?4t{qI^*XT-}bugkSk85L-*o; zHY4m~|7?Svd7w_fmw8!TvL)L^Rk6}r_B%OB`-+j3Ac@{;>6<{w#8Xph?dRB+Eq&u` zh<{;fhg5)D?syYL=C7jDqy2C&nC}HFW}j!*wE!Fp<`3#!eozT;S97(141laPKOW2^ zeXoa@bcD4hnbmy}+IR;2h+5tY&K&g4yd}3sx_e>tFCgtnyO1U6>9r*ZQ^QW(xh@iz zJ7T52wr#r1WZ0IB%^Y@PG3`A)A1(ofTT(gbR;W(?l2q`#yP;@Pof*PSY#MGmimL}CJ71|-_$NRuNt!ptlS;}_CY1+@4xVK|kbPi5MF#FBIs2(X1!DfR zJCmSiZf4IC7m$K-@cDnBXO@3A!`RMRTA3tdi*(U_@3Q-S@v{VaIv zjMro@VWgQBo-QvO^`pT1EULxu6?(Us#|wL*wjgH+6)P5h}k0uTgC4{W+9a%GBJYu&soUU3S=WboEn)h^D=eRsaWpQHi^v>9U+)z#8u|V{QYu zA15pFGk>`lOsPJ4Zxhn;C(EtA$@o0)g-eawt>|? zpHSuY8=iZ&-WU|4;)1`QTtW)e(s`BiQt_MqoL>z*-6NIZb|#y?Rb5$~D@{Kxle_DE z0P2!(KgTo-ad8aovU=WTtMjtWN0N91?#9)b;o`T#yNyC1V= zO1Dv}KoRFHJ96{e)aq=NRZYgp?THGATiR0GH->?yg2K6E?$?dVYzF&zM88#wVfIOP z_Kl9e@HOCT9Vw3-cm#($`EJ%U57FNg_ULH@AZm;#nUsqB8HnJ;hQtaBC6K7S!@CEm zYbRAd_Z1WH!oHm5*^v^p8X}Kg91Pcf%2Rz z3O9km0U#&<7ddV0TWcEsK!w*1YozcV1DV!45qSTBHB_ zI+VJ|)*4E!_Jd1{W4U0@pZvBYxo+kp3`LZj|6)hG7_t>RPIpaeSjO)Ls!}i&4G{H| z`RvRX$W!q1tG|5%-JykC*H!6r>B&Uy(i?F=qkt(cC)W(8GG(=8`Xfbh0pwq!mEE(Y zqD=>skNoXHld^dQYW?f+HUk5b8=W@;jRrn*aUh>h)sT zC4h>1-#Fl>+fNQ}GE?gNRu}JDmuyH#H2kKI)W5>+JnwEBsG&ss>n40ABWn*TBc;oenbS{xQ8j*Z zCx4nTUCfx?THiXIs@ktNzADGPBxpk$nG{WMhDIFx%j-&g`_6lDbkkacmIIfrVE@DG zaz4(a(=_+o^$^MqOf8eW%1S*)=4={8xM~5|ue$o~iE| zE2^}2>?%?q{lTzqBTFH>u!q${9Wd?0I9ng%iQz_24X@()(m%SVV-mr%(_n*2 z@XiadFO{>D8XjHmd_OcW999HQoZc0%plxpoO1S>Clrk@mvA-wMkrUspi_oUx50Fm7hG?u&&NuxOE|Vo z5>u8(*m*p?{Tsz?#D14lD&LSBdi6sn@ryjq0m+kngJHGlk_1pURK4`1YW!P^>HNo& zwGf@(4W1u!!buyXPo06V7(Shfj%myO{bU3_G(RJWEQNTlNf zxWh?G!Z7KylivoY&!zTrrTk`cw_>kUih-e0u$V2U zrxgM{#wJj0`=b}S+>CO$)($C3E^q{hVcwsH_KMM`F<({rgDlu!_1HUPl zGXJ{^nCR92Nayh`5_hgkC8ok~!Jd2sUf zi;Qr|we;d$6mVL~s$ewcbJAV=3!-)PXqn@S(mpWQH}9ja0*p51wI=zS-sds=It~~A zwqYFms!j(rE-E*zj={X?U((AouZjS?2ZUSJH&*&}`D; z7m?y0N+_Yb_F!Zsvl&W#G5Lw|uFKHa#a-vWH{QCD+HU~62dDW~R3(*cH;25zY$%u% ze-G#**?7p{PVfmg)AWZfSityd$irAytgNxTI#>js96(FvANSdUc7XAAc*nZYC0aJJ z@HbZ!Tp6-rA`f%b2TYhTRF6J<;vHWV{#QF~y)4SW-ixFfgT9~VKq+v=i;U8GH2#B~ zn!JNbbye-1iC$o*mZ@JKSW8MhPM`ZW+tJU1>{$`qIy`>0~MpGA9z7BhURFm#GAyTKQU-PYmVm-i5EI9Zo#$G{cskt`4NBmTLxQZ}^j00J4_tavFJGm7Amq=SQvuqXQ zQs(GGHpauS2W^xs0m>{@#q^Ms69RTQ2fhU=h4Sk zo(TL%H0{fi%c7!1dtAmEu#PDt5UP^3BFAZbr3HgKYd{-7wH!gU6jIa<92E7OhjkJ* zn>l_!X{2eZUIo5S-fYzqOJ^q1FV z_dMq5T=sYz)W7BwFZ@IX>pm!F#I{_=Jp=+R#0$V2FylH~*u&kwrGGX*wAl>7|IUnS zqyKgbWS-raG_Lr9$eMd4mPZg4gyZO-2i=bI*{}c9HwD!0U;mrvoyhb)nJHVg%lQ^u zU?kuTK;#9XtE!MA)P@guC`{9mE^tNHIfd zsO>TF5t@Y@+1b*E7d^P}qjFvizu*UWFNG(}gu~DDh>ezzEdzlaYwLf4@KU-a1Ra79 zWu(25s)N%FQ9gKfPtSK&q2panAz-C(fX=N#+4#I|bPfGA<-G36afN4|i(x#ynbbmf zy+Qts_8-a)ly8ZH?cJq!xkSq_WxL6!VF5cmBE?i|NL=CGrwvxk)_ohcQsFP6?fZ{} zI;=Yc3sR26lpF!MPT~c^~tPA_1UKALc#4)k3g?2_=+0Cc~tB zg4Um)KB_D^qA|?0WODzR-IJ%zz=$xnvPMGA6%qmJmAhSc8DkS+VG|EDQO9qeXXS*`2bdkmGf7s*p6wb)`A&bGGw_+6V-r(7A~#WL3n!-@1Qa zAOXMJX%3n6jxuj-+Fd*ir+LX$sZ9eCH7hn!g)*A1?$Pk0xd1@bH|1&01L9O(v)ofy z1)9Pzma5}dQ)%uRUuP>k;&e`dNh}>7N~f$8i)_S(tM=_ht{n9d|3iTK0-Fh!L5bSE zh{3Z_S+xJf+LxI<1MO_9rC`BL%QF}y|2^sq6Lz^rh50RL1woPlnlNYGx9pDbKC)D0 zS7|T@oHX+T4$-+gthMCNjtv}-Ws)fKhmR2Qg`=sSBM8dV`bhbuzJZ& zYhqE;$9Setp=J&41a60`=B$+j9$4z1+0_`HBS&>3Iwc0rr=kTr@1=`!vGZm<-X`$S5q?z%e1>9Y$f;F90JKImhKkiAVfy~ zsF1^(4gO(3DXm*IQF@&fbmb{aFarK(ZQLb>%A1J~r~)Jfr6e=LJ^U$k_{&B_e~zzb z2P_oq1|Ky{#bxu0R>oFMOU>}p7CfHx|HY$5P8v;XmE)!mJ0^6D@TT4?xj+~Vla-u1 z&Ahcp((F5iq>T7dQNz?JlhcvoSAh-zD;fWdz43o>!*mO~0k5K z=yA|JZ!hFFsYyFfdd1ET^cNRIB80ai5N7qD5d0(|O8Rl-6P)LxNtJcT-O zKNEj=FZj{9v_JJcSriq)9(=uC_YgJao6W%+1rlnaKwMPcaC%d=P+t+UFQ|J(@LMY& z$s~r;<)acBi%SQqPklwW9=WPj$E^YloKNfc^TwtG!`OpL$F2o+I_D<2r|Ga3>A>Cz z9Te}izyr^f9DR>22ldwbk)!o>yT9A+KOiBXTS(Uf;VAO=$^>}_9sw?M^#U33@0m_F z{e9(c-lJWT!#m(b0bd@%jJ-Gss!c;XZ4P^X(Ck??&N415jh-%y&jSjiL%QN z&Un~I{O$o_YJ{%_XvTatK>*@!W>1>^cLfAUjR;yAA~?1H#g1OMwyqZyxWgcC6Xw&21Ji zPF<7nHO)v%D`;w|Da8DSU6~S~wDD9OXOQ%EwEqe#Gc!$GUdV5?0*qZ^0$)S1W%E?`?nAWNqE%Vqy`E3Ws#Dr0g9L#B3T@RnX*z)5)G!JJ zK?!{A&7)tr*_MTiTr3PeHypgp*}heM3Q02;XDbfa;`z8)I%_X#8la5jN{RRX#*s>M@XPg#VhN8S!p#1)1;f z9BLV$(QhHT%PW05nCM}PTTIzpKp*#yVeS5fq52xpDQoSxhZ&1D%QW1!VrU-I#Vc5~ zIt8{lTapH92n9INm1}f*XUeA6$axof;=FgCtqbNQ$XNa4OJ4AD+--GLUYyI&qc|VU znbxo%4c38GM<8EKnIP2g$x@-`*436F}pTI{K## zf{e`1mHv&vwZZ&b!yEo!OV1pdFAE;|O!j^%4Hc2qRYJ~1iuJOs>>~E`=ykPQr#9Nn z#?W;n@ai|>8DUJ*YT!7PM+AsXPnUddM$m4^NYu12CkM!hS6$T(94#jb)g(S^c(%@N z;ZUTLYqy7lA%5cw0LR4?*44C}nL$oW1AQc@J%?E@x z#-6mv8%Smbgq9!K!LeLU2hBjZ%LNR2YM7KwLxMrq9k9IfpqmHfX;*A&vw63& zDydUt|Di#5bkD<=M_N5W_gxLc>Vs{p8aN+A#Uc24yG&t==1}5?9uDhL?J&XvAon^{ zc{F@@;>PeA+)aC8O-9@_cG)4O|HZo2(@KNfj26{Op9-62&y=r1b$DAs&i}k;8JRNJ z(Uv!KsQc4S)ger@Y0nq^e^lbfGj%IMs{Kd0g{C8bJ`)!0=`L4-i^W z62IX1+MGYr>~D`(Z;9Hw&8zLjm|(U&_avI93)wsTd5QUpIu|AY}7Xn)`J;CDh=K#jCf=AlgqA(J&_qox6m zXj4xWGqf;B$(sBgy+1#&n{X+QV8w-Vjc-B4<0*(^z0p)In4 zf{M?GlZS9u6rR(Z`a$nDVlZp5c zL8r3a%e>s22CtLD-G0Btpm+UK6pM{Kt$E^qo(R@KMV1|ubh}vljNjzZ+-VXM2%?%+ z08g)q(S25lW-K#)b-pW;u|k=Yw>wwF1{p%xSpqqVfMim%0L(i_igURZM5h35-n_O; z8zMdVrjiM7|L$m;qy3*;9AMvG185=4n>J+Tj%Yj@?n{k)n0-AH?|$Ap<|)ly5qBG! z9^&gPoG@N{zfNkncP*#{GNFse4e2SNNfJL}Tim$V0^{dhI3|aNTlgEvw^5hCzk6SNqE7drMT1TL%1;?F9*76vQ-SwxX=M};h}Z^; z3y=_8IXEk#DIz1D!lSTBu!Nbk6+Mp|f3W&(z{{tN_9dwoHyosw?%oikWJkG!F_nO{ zKrf>4Pfojxg}+L|>SEB1SFbcb>w3>^2&7AiP8G~)*7;vuyte4xQ%Q!A-Jg14|W7swl_A<;g{%Q86Jm*d5=}-1r z>U<-Q+g@V5_UbKlDiSyyp#1+>q1q347QU)ZL=$165b%s0J8g0dmWRDG@-8V}F44~3 zvwrP_(WyG7&m1geQ)wwZ0XE~MOS z9UlFmcYbFM1uY~p^!20Y@j3APHqLM38$VAl)~^@khke9i{dXwbJyuy}BCE#sDIKaT zOfBgQ&SVP=8N}2fRSNNUtjS?5))bXC8nGSEW&uTp#Hx#C9O)9(tr(Kr`A;gV3d5Ce4n1&J23=QJ$R|Wh6k9Zm^{G|?T6=B8v)|INn5W{L^my4wRegNoS|F`c_ZEx?uUc5j5#vON zdTDfeqDY(v%7#%lTZ9BFPWvOTbo%$l>N+I&c|v1Wu}h>s*@F$~@X0=o_*HZLZK2|d zNg=xFoB+_`^@DdC6lMrz?x^OMlk3(@|G`5YQ{nVZy{V9#jD-mUX}03Xw|1mG6BiM= zIPJQf+DF96^FK=u&90FfRLB{ROC9u7T31mA$3Hy$6zLa6+9SO7VC(ABH6M9xGTjmi zpw=6$2y>PMYPeocD&k!Hx z32J{Dc)_jSzxi4AJfhm9)cpl{Oi@y#qolX9wd(|7(uiFX8`n?D?v_LX|A-&lK~XFE z5$4=sk=r?Xj>okOytAvi3*4uMsQ`2~u&>Z8Qi3^YyjD1Zhx^V+dmp@JlnFxB zzWw?`Qk)00sRZ8oI#o@#%8^HN_dc3uo$ZmK9FD41Xn?k}^)X`KfWZvNpF)cKwQxgkFz9jsh zJ=_bB2uNj(uacCEDKxHxbYziB@L^gnit=wV0z=opKBer26Pc=3P{`%b$GZ2PSHeaa zOsRAN`O_w+%X;Zv^mh(`9=5A|%U_3xq93l5FLSc~`uQ58uj!Bteb&-_e06)d=0q=8 z0YMBRVWO~zK8ePtp=+{>^X)884N2hv`qK@3-Q~!{+x@fua-!++CjEYVdF7#PS>Grl z?J|G0g(_L_iFU412qFYI)V%+Uts~HDaBd{i6L)=#MTq3ZIm99`DL^(%xn`xk0=cl)vqOkH{PcxgmuKrQ&apfFPK5) z)wZ3iM^#!7N@01<#^+|bFQ)MxpkTJuQf}$oYZh^G^RCenc9q>?LLgb^ z(--BCC|5?fOw;pANejTwtri#>4!VQ}9v=fXw54MuVaHhhGhe-6e(ubo8w^kaq~E5| zwt&t5w)WEE9<%y`T2px8nnk&xD*@9w*a_8zC0?hu<5bKISnTyxH-~)tEQhL$W0Q-m z(Nk5JnHb-2?-KyFO+vNT6ML@lP)@b4WR^Ud@SfmzTs*IRnP1^elxM?#u%OswdU&Y3 zuCE%deZ3uvCk{+)0Lv^v3wB0@f8-Dssd>!bjj%V3yd>1i5;79|a)2wAA(QRI4E) F{}(0Gc*g($ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..9b72b39492803a112ab679408d6b450bf93c7b8f GIT binary patch literal 820 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuFE&VEXOp;uumf=k1-qzS#yMtO3hj z?YdE37a3`<g@l?#vLz$=4}0wIjgNuMt)|?&Yw$< zUrDaJ#?oW;`|VSE({*?LT*~i}`#js8d0F4}3Gqcaw$J3}HGCGIRX;!dTk!R^=%3!@ zz1rsWXPc{9XVri{QE5ZJG0(;?q|nOKdwIgb@P+`*79AyI^_;Xo-V&}S#(?W z&+PYKb|3rt?N34U@_$mF=1chd|GasN>EjH!zO{KUF}2ZQ+XGzYV7)|7`=x9{k%7z5L$RxFV{bITDwWr1juYTMs-nr!+xX&5s69Ko%uxW#kPe?ve}r_ z$>f@@Uz(zl#*&7_U=)+lxXc*Mb-%HHw5NaeocH~`&-0%1d!FZgF6Ye)@ZYYBS%pC$ z5V}6z9)a-rr+VvX!&tzMwm~3Javu-3-N!CXU2;hnjmLTsao?~CUyYxYOUb7r_v$?P*-mR2M8?W~xG1P%F>)*BIq8|DUn3lZmjLrb&Ny@l++n?^T5#cgkZEZv=#aAMLVtUE&Xh#fP4L|1@FHSfrg(Y}0RdpFsU6uQ`!C%}-31{R z+SFhPMb9b}hbR;hiL~7FOjcwJrBs-m(r~~lh&9CN{9&tTF*xgdyhK3`ot1)xK1eKDL)=|t7UjKLM{;kW#vU3 zf}{7`vix8ycwi@|D|WV;XRS9O1=-OddUeF_kFlqKkKFSLXXg>Im>Lj^t06qF(tzW2 zM3L7rlSd?c<~!}xQnv7BQ69GlYSb+J7J6SdBbzO)U2^AW=cB%1$$Kb7qqr0`D&e#D zJYx35b}v19qhv%f4r`;uvq70$Mun51cfU3BN5pW0+T*go3FIh4KbOm_Aez%_z54F(%G8R29No^_UwSZzhjxnDew~=hdY|*O7xa zGgJE=x0)5L2y(@Py}~e44p#Zy(9qCy@IttRKiz}YY7g)_Uk9Ckh8wkh5}*u~=;j*P zye73RVYz>1*$G6|=KhW5AHrVX_l50jwV!9xFb@xG-PwwhyZ|lSb)29E~e!nJ#&#LMuNLKBJ?>lCJ(?**+`BYjSPE?xH_jRtp{>ng5hFXQre7C?iF*~R|q#FNX6I&zB4961Y35ZGj?SIIR{Lmb8D*VS5wet|_RzR$z)fpHcdTG1*X> z0}_=lSa!brp21l+XJwkymoawx32au5_Mn6Ww0PKBv6fetBRH=ub0^ z=w9C^xIb9|*&0J+b-n`s14$O@EM7hA<=`EO(T0;d1D8R_A>$38*IxkGvW$0=oC8d< z_qa0QwCq*AeVJOJr?yk5IE{arHqkS}k#ZN4nWek6_lngM32Ff1AP1f>-@FgdCEA~9chwyGO{JGsMUUF>o^DD(S_DpY#5sB z;xpB1RZrc0G2hje4u=z zyxruRk+(S(m4|jY1hFzO{KwWG{aq$u9P+1W%%14E}~O zW6R^6l+s|u+5uQ~0Ac`8N|C@1hXbhjvAy{^9<7W*NqTt6vLtWQift>T%_R#!j_yA+fs{^kTn(qQ|KA*iiVf*c}sQEDfM0l@WoMO9U!m!ysct;`lI{>CTGq!CD z0Jz<5kW!*33IP4lu(nTRf59Y4oXyVo@9_VsIlfU!86kw>oEyfNVT>6(_6UnzwqMS< z5keTHlxw5p&!)f{G@AlT>NhD6f*%2ob+IhVMS*iF%d)o$Q1Z7Fz?K4A3anbIPk|Wt z*&Urur$wR9WO=qGNXd685DNZ`Ma7?-1D5{%KJ7Cke-r>8@K5><%^%eSU)AhT0s z0LrpB72gG*(K_hC#FUMK?*cG9sR=DA{&qM@S@Zi3x&w%1QN~tqHsk;R002ovPDHLk FV1n-x%*g-% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..6539176b8487d93162dd7df57f3528eca69df99d GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQYM}*jv*Cu-k#gY$)F&>e4zZr zd?oMbXfClu<*^DALKqns?4_)qs(8P9w>UlTK08oH1G~>>eKw}0-xuEo@)$f_{an^L HB{Ts5#}6My literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty.png new file mode 100644 index 0000000000000000000000000000000000000000..eda1f4bfb568d5b1ea19f15f24d9242cb27defa7 GIT binary patch literal 451 zcmV;!0X+VRP)zo)Bxs`n(q@(*L5!lA_@v~{l2pP0^bTDtPsK~ zrL2_FN+~U#-v^e6{PmLJ`c+DKmTP0?!)mQ95e)_qDu~wrh{$TKeH$mgHwSb@M7Ufo zbB{$+Y<>p7zRryI`yBxAcszRWt|#9K%=vG>-}^c@tVRR;|@rAP2txj?U+EQ0SN(&+Q3v z^1TI8!N*u!{J}XO^zeJP&y@UL0%E}5={q&Qw5Oyi))G002ovPDHLkV1j~s%9a2C literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..63616e70b52120b670f04f00c276c707f979efe9 GIT binary patch literal 2483 zcmZXVdpy(oAICqAjA*~DI;r@vJ$6JY@yigJxlD3RB*!h1<&r45&h;m$PNy8kT$d!Q zM5l>J8>7^eVOPq8GK9F5GI84C9MaY^aLhZGClv>CqYCXVgPvB&DT z-a`D=rW5C7GMwD zn%$SR_-)D4vIxDdDFpow0cV&ry`v`ZV~3{pN*qCdXp2#a*^b3pTrqtW32@1>>foO|%(TV}LRFEC%R4 zV|t8xd0N#eQ}-%oGSB(9ry4xIU6mLrOcu0IyT_^9k*Lsca}5l@T|y+BX=8en)EO4# z3oQ*INRzhmo+1$fYw4)ZpCj;5#MB@n!)CJ<9R-}sBthSaf%5a`jfxxz-41&Tmy%W2 zT82vL(egT3LB}kdA4s|9d-Pr{X+P-b)a)#Vcty?79=t(-@M{4*6+K=*e7t( z-?$~5UU?j&JTd)hf)!%4ZE2KRN0<}4Pddm~`yqSyu$|G;LLLg7e$_y!N)Cwm7jUW< znt!(xFjq7}zKjb205_?qSnqJp>Ha1u*5=b(SR83zQOn|Og3{IHXDK-ggLQi*`R*0% zN?nsHo{@5t)9U3(kL-_0iiI)u$%w<*Uy~}ifl#~oF`@)7bTJ`LTq`ZZlHYa{i)9Ty z1i3%L_zdq?uiWGu-viA%`m8D#3|=AE+Oc)m1}QS-A33iJ$OZP?QZ^r&nA8bO8<`%n z?Q=m&{qOF?l3kuk(*M&E&VqsyVw8KjihUK7Cw?{8!2o*`JP6Do*B)o9niDV)TB1z z!}ebg&Pzgp7+LRQ<-90F!=+K)d1126eNEN;m^o_)SIK^x`buq$qPWYQqmlrn&bm}haRY&m0S2Iv@T*>J zSc~w_qo;P2aNBGKs(X(`va;{!-QiNN6w)C20ZmK~G1F`D0#@qwk?n2*x>@G&PbaUk zEBaw(KC!;6lHLY5IrZ5FFi3+?jbLW2F`~G)%?^8ivdo6=4f~uEYKb;QeAzS!a_8EC|I2Qq>qQ}KSsE==$&*=^?oCJRo9p7Y7r7sN>a03+ zS9hZrmw!C1{qOyaKT@FyM@Ax*6UenURA8i^?->lEd6$WC8>q&MD|c`+Q4rm`ne^!W zbIYQP>gC*aX@E^L4a5Bg(ZgkTZyj!!jN!ltjwtX99~{$ox6g?+DV}uG+ms7zDgt@> z{h8fmhw~Y+;lUVV@e!%oIDrK zkm>@zt8>=2y-jg|-G!s4EXMdtv^KA3ryb3Z_kw2Nd>xUWC7LpfuXUOAwNr6?{C@cQ zUD4~}d2yzb`uf;XTC75P%v_URCJL)y6%3};U@fc70ibVy-TuGb)N&PD(PZfONH}A; zqY>8N)p<}74Z^(r1b>qHB2<~|!h)_^h-AgEl0#}MEb-q5kU!u0!@a(=r~A&0H>WG} z46|V6q;*IvDX}!(A`}1NtcjXqS@4ti6_Yb|=DHauz`!a1T@62Qa?!K+aB}HFe04SjxUFbP$GcIXt-USkDnSs2T ziYIP_TE&H3M>;RmAdtnmVPUS6sdp`cl)AOZD%g!tukQA&gI`?UrU1~JI2Ec9v4Q z`7Uh{%xtmF0EtaX3^pn6*c+fV6zGHS-Uqvxgc}>>RmPhl6Dh3mT>QSbhSoK$IkVhb z7ki^WN5_75ECTkXZz|2oh{2&(nj`?jf;M9S4Ho+hFUIVb^6?&;Fg+wwzkI}ov5je= zVXg*T$3bco)D_s%I(2~~Ow4kvWAGDQnoFm&wCm{*qnqLeOo9z~?0w{L)Q5*I4(I;F zTJn6iz9U>OIjkI%R~G)c=`+v@z)BY$kfVp`&P94n3tI%l_^OJ#@%P0>tGw6TVR{lb zWe6L;U|ck9T^A6TN8ma>S&oRfH&IqpU7XMAg?-#9*920R@XIX;umf@d;|4RE)4atk zK}G2dMfJ{d$$U<`GRO)u&?_F_;AY+UO|tFuNv3{J!AW zas?<}q*6QLBEQc2=jd{BcgMO_S+ROD510zZxNHZD%+RSGwE$0-a{n)v8{Qr?sDAf9ZBdry##_brh(i#x^{k1J6$HV+CJYkW z1pYbt+S2yK$w6Zrh&Kelh3 zI~C$qTMkE6MS4+I z&PBOaJ&a#y9lw*SaOMl5QTE`^l;eH`t#~s;>ExRNBD-|FRSnj%=aEoJ;l2jX;OdoO z!UW^mK2sT@cTkZiWNt1W8Rig7u=1r^TE^01@c9z@JjlJcZhCpTY&p0v=cyE=08hPq zM5ghQE0kFxvv9E&!<}2m6(V(!A+3L zm{?w%(r3%A5Z+Ktb&|dwml4|Fy9*NL-7gPEhE6FMdW z)-}{5I3N1!;+s?}j(I_$@4`~7g7?KNjeWl8wFN?4f7e?(Ulx8amQJ*1(+e+x0?`DY zk>+c=9V^{NJho!JMK-wM5+7#<#YxIsQuz|?%BDDzm*-izw#B;#riUI6=d7_hvSs~^ z2OgaQSH>^VYJ)s)ZHBL0+8(nfsl_8#x*3I4#E5yO!cH#ONTxZ8(T>E(o$ljb#_k?+)|FP zO}cOg)9WIGjI<$uceCOhL7>v828arS(e1z0RZrNrMwuiU6vfV!uKwlfl$I_IX|D+i6`hZEBTRmr zSb}#<8M1i~!k|DRJI%XW>gI7*UD*pJIfm$(ttZR-?XKl^3EF>zH+H9b>tm-9y^SuV zc{XD(bzKc@G4v#3PiZFRwtdX74a%jPG7$0E^@9Dq`On>WH*7b>aoH;Yyy=-K?2yQV z)wk+=uN`&2sOJyIhkK*#VzKE(@)%59K1WtPduuxMdi^^ch55zX;QKkuc4%k}s^Hje zA1=TRzlx?qC%$_cXGzdTYaxT>NYLWlJQSrO<1$@V;%hYpjL~j80~eT=1>trv3IJW& zt5fG$dqdzMzb%GL{+z%|vnadtV=c<{hlKG~Gqd3*-)mv0m&{KeE;MW>Hb5hhnBapV z-;tSkwqbgBA+fgWCiW+DY5N-~ec`NLWA)rwUQ(t>Cl8c4CazchWkJ;WeOWfThe)Vh zQB�*G;w$U9N z=0@eiTZ@JNB$R3^L`q)lBz#4=lyZ;q&lQl|Gh5WUh5L>{4-?^b{q;pdntAJLW4iAG zBk~yV)wKrl@DPtSI|qM3JfID`?O(VQihLyW0_}4Ao}Y1UWBEXYp`F3_;SXC;LQ#p= zy@QVZ{mBT;FC)1}o=ReMfU(wOyXL9F>iL<;RNdSfKHc^UIvMlEIA_H;Q$qKc_$^j> zkH4!uq2U75&Hoh`1$RNRAT_-6Bfm!H zUzHTgPGGmrPb3T9oiL=9psZj~9w*}I1|hl%qE>X|Uirtd!Jj?c^|sB94@>egbhi&2 znJh|Zb6IV6;kl^ZRFMAgCDX+EF!7zMuV~K~q|+Hd)|&BXnWmrTPRBo0Oqd$uIOc1{ z7tVDi#gdR4>Lb^T_a#Ax-j|>v?mii)YxR+IbJ*R~v?6i3zP{~?xB=nL zYuuYxz0sEMcOb=+3!T%ED?87kr6SyAX*hBV!u^<(2}4%dj2 ziRFs5hf;m`zZe>YMygH#&k4wnnRob$;ew@;+jw~bx=`81A&16qN>s?ESsRY2~>s16NFhVkYzh7l{zN-|fj{x3(4gTNH_ z(CmUuJd_@tTgUPo3;5}6kj)wyr~_5PZ<&Bv2?#oaUCtzqG?un^f7yCL*Y=)3W+~~) zxcUaN>AerpZW7;Qt$w!y@Y=(gfa_=Hjn`#A14wJzkU|lkT|#)fQ(q^>;@P@mrftGz zhdNI`eui~sw#TNqoa4%KO2D1Y5sU{Vx;!3q_T>!WANe_0?It1kjBk6iXeUeUE|WLg z$gdr^|EFIF_^I@82)9nxiNOTdFzc2JU0pd7{< z0iH|CbHUT79qe8zRH02(!|r3MJni;lS>*(AUx2`_D{I=@&dBz*b z^VZQllo)V7q#ae0)4uMWuO!JSAL6`r-GKEWqmdB~_xEFuVt!dUZ8$Haw?H+EC={)h z3wn%$^R-{8h(`8to-G|L@onTAeYg15wnJYL*|Em)?Gufgucv@llfTN&=I=EZX8#a; z>a_+eo^tTO;zSR-@$513X*Y*fG_7y~%1e+6!fpVRa2Biwp_<+FKy=)lG8fw)+4Bi( zqE`GHrM#J!OG+uf%2rDK*=zN_sjw~%*_~9342Jc|i&!qBD2H{P|8;1cPDjz4xC$a0 zYvD)ui?0eoi*iRwi(icZX^8hf!MMERvnc@}S1CpdP$w2U##rwdT}!vmt+)cs|EZE* z2-@)GgSGO;j@q&v9YZX4=C=1ZAtA3dk)BQf_}3clvXXMq%p^>nD5P3>su3ZV_vH-G zo82p}C(hUJjRGC9l8g>TlPdT9(=0<|+o64A-#IotakdbUEQY!`Nc!-!kBwqRN59YR zDehB=2Vg(P%7v5q`3!+t)uv`ILDTkz+{1zsLmh1b zQoZ}xR~vdb@$e}Ng|m?s9F8M&st5&7{C`{YZ%)->+XY-64_)x0g!<~;{VDqNw6;Jt z6vkKx=y_)@SwODkmN8O2-a2v2kMfQxM1MA2s`!~O^p5uxh`|IJtGj1rKSLGkqg=F_ z2*gFd6)+Kd9qHGPJy<{n?Gbk5d*`Q-v;`DOZ77!bfu!)bg>Q+xW(Zi4Ka!QmZI4F? zF-5YJME8Wwg#3^fzK+#;@FOWoCmj7Bh2sx@FPOg?AP?CMO5(?H#Q7nyMmK7#H4GL zYz#|GK@o1sYF3qd+r^osQ#pbPWAP4JW}~%;vcbghUOH1hpo+H!Br$zY8@&#n;uM>m|55Ews3;j1V! z$?ONEVojD^$d?G-OI0WXpb`pu35d4iw2mi@aWc2A7xz%Geq`DeNGW|s;KumyCEsjLelBuL-EW_V!JEgT!De zinkT6|3Q?6n+v$Ihn*N@vSqmYl0W-rehodV3uIx->sdPU@wu3{Mi zY3Z=R$WFNOkQy2Fn24ew@KgQa7gw`^7P_N=RRtWH)NLV6f3KxytBPVP8mqkUmqvE9 zQ>dMsQthHvq=kMV=i6?`g&Qx`b#iDs6T7nHV=6;)PFz}$wd}?}&ywHxp*s6;H#jMf|4a4Uq0Yt$6S4bvfloW#WW&0&a{XRNwUP4V)cU-#z|9tRcWqT!U%nGx_rwwyqC7Z z-@1_*yh%>AGg<~$>*F-_O1Aep1Q>$A+B3*mTKxV^8XB=ujsJE~0SCZv0sQRNE;kLiCp82t`5>@z(6S znHx}Q*hJq5F`%+UVh@+G)`)YJ`nzBi^r#J8=%uXbsK{xYX>=GRD0IhP9&i&X@l9!YV!; zmx8WUE*eDW+wJTPDG62-K&%sWTqfLeoxWX-_mRVBk_xy%2)yd!_-+5k6 zgml7o0jj#~k}_c);$KL%xLuINZj=G9PYU8p;X-@oYpLS-lUqcVIHC2pozNrfgR8pz z;)km-TF}YGJR%T7Ywd-)m5sXdgm)japQ3X*S>P~%tDyzIOMwaB7krZ<4l(in997?Q zdb(cBm6Nb39_dY;me5xlj$Td46rF#kK~;V-*PjTuDYZ5XK?^EF0AoYptr3^pJhh}h z09URXeNV6ep@LAx_|FV|MPUeeGdudn;mbcyGC~@0U7}fk7(zou1-jV?yguZ0dWb?O zNAz#Wd)yeB1`DcBk%UAwhCk&dE^UmaieM$U8p6Q78B9dCmlx^}OnZL(76w&u1^y|H z`>h-vyH)Db{T+16u3kYAJU=GrP)O|QKc>f6de zAfj3Msx{>wOR$2p0P6Ued!9r;u#J_Y{7KVB&cVU+>m(u>%sGYOwBrxYfIH&$W19Uc z=O%PuY753FAi8>CCThfkPnsRb)#^$4)&k+VpE^AP&uhQsIH{8LF*qi2?!h=(kHTbL7ExB}VX%bSw|1Zbx?-`6@4u$&E&GbWaP@kl*r?7Jy? z&Yp+YZY9GKX}|Ke=i7WTljY3w<&2TWdfc|@hBe$Vaw(qz=re1+Y2nRO_TJ&|$M!F> zKu0ZbUZh?5xwbwSFskFcbMeF5jhAsi8#zcqNyT}2k>)>5)nK!H#w#iNEz**wM;(6d z;MPy}CL11k6ucTYLH>!;{Z)rMDQ-Dq!5{D;5``I}Wb{*c!wWO4yzQ*U$40i)Z0Odc zr~JZ}K|2W;>Td@*{TJ6hNC~=iB%{JR&F?eXe;oJ_t|Y_buPk%Hdzak+_5y!#Qf|<} zNv53Rru1N!6{D4YVUx=WigwJ4O9l?OelcEe7_5MlEOFHY>o^ZGD7T`ND7@BL5fYBt zCkt=+y6MuQRu!VcuXWz-hAaDS8$#T8E6CPP28p~+iswxp(v`?d2Md0rI11tSB}%njZJ`OtEoi0zxN01})fBQcC1AJc8zZw(|cs`+LGF5D8h3^DL|%jZK< zMuZ~nay#{y!|$LPhhbbHA`0%ii!302S+ z22IkZv+FtyX@H<+2SdQSgIp}lI$BY{ zY3t7-en{f0wFi+@GS`4V=fjdK+{^*c9{6!BiIcq+R(eB2FRP5-A1;;HR5yOfep53p zCs|hH;zaD}IxnclxYAimX8hVt(no@~3C$BL$7ZI6n8x%AmLFd$7+%pZI6 z1+rPVZ-XRWc;FPfla5nrf{lOxYJhWX=y=7&d`7f+k!gNSVL{RF4*~~R4I(OA&#!}Y zUUC==)KNZ2-lo6wTb<3~qa+ul}(){k2YB(IFwjsIZ3 zb$CnGkG&wjpyQq}gY4(4tZojQ0ZcMI`#0o2f)He7y(x}h2HOQTtGWfis->?)koUL4 z&gOrT7pw-=A1M&-s{cB}Dpu|Z5-~`x_%FETOlLREiGv)X-MzKk4rTf6{~|?nm@Hh?t&<_+x6ApQ; zRR4vi-u#G3v;A=MH23uk*vpOa5tU6g0um7({6p+VkPohR5(zgVi>`f%*p*hLV!(|qt#!2+Dd?Lih5lYj}D({kr3 z%vM);&w;;~cJ6q5RstZ!fN>p9p?le9a)17#F2n_C9&jwWTjq7(9-`FgRU8?uCjM_? zCz^&%f`N9dNh!Hh2clt@!qQPSlgSXqaeO)_>m#z`lf6aC7qK!xCTg;a8=C*}m?^sjQ^C8vl`upZxCQU!+pBd!r4 zXlM<+2LiX3#?*vtcyt+o_4Ca@XJCF!{p1`?o4EhaIK_)|gh(*}9<2?M z7tQp+8q!}y9BGP<5DF3a8WH=W?>6V%{d3BMhdgPJ!n=MvvNQ5XZ1JtGJjaZhom@|D zqF#a|XeGRor>-oYL5RYa;?JSAS|H#}hND`0Ufcs9EfX7pF`{19%Z<%3hWP{H1NG*d z5cG`Te#YlXx4P<*96sH(-477}s{hIr7Q30cIVVm?HACfg|mKp z*{PP+D@yEc_TlwI-JA1%fV>dg6$4+nECO2BUtihxd6WYN|l=piEtC+ADdIW%SSQ7twVL}tiqyEU7gijpjRM2`Xe}8S2k<~XSIZx+x*&TP{E(FUKe%NZ!s_Bi zqP(XT1SMm*=hVkP8LJ(wHk}@|D`bXkd(92Z&m*3b(vpOLk!SCEKWx=j?hbXr7}g;s z+7MXgA!*uM0C8b6cP-mqEhdah=$B%GExAjp@~JRO^QDa$qSZ*c9AP*3B@sG%+T5t% IluN|_0b@DVZ2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..f3ba4b591abcf9615ea0cee2d2ef3a5d1e7c42a8 GIT binary patch literal 6255 zcmZ8`cRXC(_V=05J0XZ*)F4C;5u!ahF^DG;y_e__j6QmA5r!KwBoRqOiQY%=QJ?5! z1VOZ6L>=Zm-g|%dEq~0OGy8nj+H0@RRI6~&(Wd5s7uIM-|_r|iwn6z^;qibw@p796?N_v@ro_~?k?&l$2)#`-jBwT( zAkMv3Iq&9=;1SaOJ~YX_3=6UO{OFRT z*y|F%WnsM3ALnAotvs8@s(nu$f(ZSC@6xLfhzL3N7g+yNvQ8yM%ONq7!PwOwuC+pT zlTHQQX?uEPGV2DxwzbsCdZdt>Yte}+7~aK?Vis)pg3*p-JQ6Tln-6M2>G$?ggqlVw zf?uQ2zhJgBy9f%O-e+B}aJDl|J6@Bai@wQmF1^zC9BS=KXMgd<%BGB~ZfYJSq`yKr zPu(ljFgodV#kwV)ljvZZFPjmKLl3dUGcakgNA9r1`F# ztS`Jv%vxgKL8P&;?Lc;K_-6^-9K6X@CUl2>W7lUeUU+xxUJ09e{~8UUD4_X~rJWWF z^=AtynH)7Z%IdL%kBx>Tce4sq8{yrh)v%6Bx#)% zEZ5VZ?xNyvl+`NkgxQPG!GiFVblN4(%NxgBt}V9juDc3g>nKHW0U(5br?l|(A4Eg;`anxqDKwmA5Qn;1!OR8W0A;nLmzVre7 zcJh;HiQelx;WWuVqv6O|$;+dxry?z9>$3DBX zCpfY!C(+n8JK0GT${1+$-|K4(8_ToFC1QOETlNnisN^G{69s=&$&h{*8?S%Sk~1?+ z#!@y*io6i?UF6!{V?dqlFMlQXu+H2dr1Qc_5wC6ZNP+ep(SjPMtapxn%0MAFq;756 zM|j(8Y7~EBH4keM#&9yJ`W!9}ZD6|Vo;}1OhX@Shw1vmyV-blDOJoe*Hz8S2?0nSW7%KKK^21j?A?$p_m&NU%cE^2!;UC%#I zxhE$h_9Nx$yv41mT~FR~W~fizxCI5Gyr4%NJgC!p26Enw5BvrHC;@C<+7Q6#RGx-h zJN@~y*z~dizoeU-52&*vs&TiT$Cx+dC-QjXY3}-YO)myr($GrV8Md}}!B-V}=%npF zDojU3{eC>I%OfS;9>mh_+1U3DCFR5BxE6sGKMFsfmFnjpV_dxj^w{8?9@?1>`P|P@q({jxt$K#r)f;^9rD~|+wvCT?;AtiqKv*=zvqdFj`W1M{j(1S$HZgn{Xu2$Il=H-)MHqBlG)L?`xTU( zzP)vW_-c-EH9WU)$xU$c*#JyVr%CCJX5nvmKak)KbfM+9?ECczd#%OnT;%Nat3}Rx zxBl5)jQMbU)YTx!@UClS3tZnS0ApgQho@;?i+wa(0e^qp{m;IzgeV#FXSER-cO$bp z5`QPfu~5Qje~>d>t`XhfkY3UEJ_lpddlF?vEd3X(s|o7n=!L(ZCJQ0TUW{*cXuf!xd_z^K z5wj&<(L2;r!5^5-)JPV4Xl+r?wdPd(1QT?(qBiSA=MA++X0^_!VNrysG|`&{_Se~S ze(;X{0o{y&kCayBJg)Yl(>u4fh5*C689|HPNA6K_I=a@6z zwR~Z@TjAwe z`h$y~7$q3%eLEe}7do$koFFV6!FkT4K7#yxQupm!@HUgJiL+eWQ$I93jFxG|?9Abn z`~|a467u-RkEB*-xqL5n<)^7VOx7r<*i&gGBCu4Ij*6PNWcq9q!a5%}Jm^B(B?0MJ z=Nx)pAVMqsCfN8;d4O7#8f0l1wGUyzzaJ24woFdeyCUVcSBeX3BBEBfJUY1cfZt_u z2J|QuiAm|zcRV6FYOUY3L|?K)fx=JsDUXH-ciliK4DWIpzlRbrKO}!^t%N!HLV6p` z%`r4useZIis&_7gsJIowrcLbyX>Q4=hYn;%KzDzy1((w4@_lf#ELR0`bEE*u!^l== z?X3buF7_4$ZsnTuHr4`-hTV*Z3#A6n|XD zI-3V2wNHg2cw?8u_ufwgio${eZ5YMn{xyF26KY9pA&+0Wqy~I8b}D=>@EjcQN^#9O zWvetwTuzu$&PALBfyp>V%FhNWZx0bBCUZrL4ZrDlCM4SCQ^wBd*>VhExur; z)I?U|!0m73w=(uN!M@fdSiQ7%l6Kf_VHqw!K^+R{vYaK}A7>e>wk8-Si7^3{N1F`J zRgZ7AhN(_PKbn=)=6>m;E`aR+)PiS5KasNIc>Qa>PTAnO=C3%I?amKKyr+`9#~5Tx z@a-{qDTyqyHeE>TWfvD2@FfD$DS|?WSchhK7t3-A^hlp<#N4REIdaI0=F$0Guw>#^ zake~4d4bjzX7Q&_zsOk&bud#_@?lj>Lbg4I9LE>gVp2tSi_F6kx`hP<7MSRpNZ3zG z&WC3ux-O?D9q#`1fB{(BUZHw*1jkuFOemO_-cnc^unH(d#u6*&m*1Mp!hKT!PCi zk0p9lSan$0YKG>^Qp=!-7Z2$P3~$zwD6ni$m~V`%|My;b-lEw?X0|K zm+f#yh$Z9sAu6CHGQ-EVYxnPajSeJ+yE8~k>)&y7&1Sp;oK-uMYvDAE2O*uxZ&clg zr0Pt#(gff$1&E!o-zDz|sy9HId;Dc6`n26Jmtk82pIBdMZ^i9i99l?ge(~Zyq{ic4 zh~=R-l-Jt&*KMp4%P?Ui7-E+mA^Zn-u(vmbg#!0*rVCm;kgxydzwaT&B;;QYJv#2Z z?j6IOJ=AJxDP?KIJdIrl?OV6H;y8-I%J8gA*6`NvalvZAQsTNyV<0MF>QR+L*JAqi z7}UW)|2zWSBf1IhQ1$Omq{&N$d>>?*EoqJ}*;!dr6(Lf-$L07A4?SY7D0~3<1NSMU z6-hP&Y(tVm?zs!aY{q8fQ>{MRTSd7ZRhyM{`@u14dj+k}1cABNO5r+RRiLuMn3%7SZ_)V2nhOHmW%&NwDrD7%cnaeZF%p)MJBd zBVm92NiXb_C_DnL;n;|j*2fIkJzT8%x_a5aCthAclp-U@&O;;c>Da81x7nBMt8iGC zfF|;4$#aS;p_kWH-OdrJPl>?gPgrC)jnSO4wJ!K$8`iP&YaF~-%_dZkD(Bi6wN5G5 z{*M$N@@k`cXB0RWBBht+72vZE8L*?5OqL_0x7}b2!h5iG7=eF`y09j!1vG>(s{;KF zc~$pceU{80!8a4&n;w;@d1C;}b&e3cAUUayAgzC`9WwM^GuEnn1b0@lj~K8Lp!PH< z5Kj>ICVjRfqIv131*T-if&w1)vMCk^0H8TvQ07>?y%K9_Z!UT4^h%Z_b*-=RIsV;S zf&(8pZu?P0=efiK-O0uS2CNqgPcN}U)Z6wPW@Zm!+?0y*!aJ+d?)WyKy1cixKg30b z;3xh+TXTF$4l);m@H(vBhQQx{#{NF$zdL9WFo^o$jfxTRgzbqEKwqlerOiZQPPC17 zpaNHxJElUxw!ywk>}L`kRq)(?x}-lUF&vmrGUyp)4fvbNlznGsC+Xnx^>&J};LU5j zadE-1?jEkf<`PzK*PoH$AcrpkMSHb{qC$I=ZBY2A#jJ9ZdC|HPPGY`-pAmi6W`s{Tk)m+*~(?%pg}10-SgBzJo%qWn71n~b#DY1UxD-YY* zna<3we)C4CTM{g6|LT;y)aH*Tp0bb+DWFFeJ6;DJgK+9ooKcBriT)F_f4>grB~5fn3N6R_Kug3_e$4(#-#i`pRKmCm zfrRpScs8%o_Vuh*z46}W%aWT+mp7zntNa-~FYKFN#Lev(`ht3dKYH~H^M)(5wudow zAhs_lIWOLX*^zxOGd%WbEVph=O1&x1CnThf?=Z?2!iRrd7EwAJ^Z&NH*jzNZ89J>3 z41|JNSiO29;*3A|B2$RFX!)Htck%MZKc~4&U06Jg94Q&0Mw9D3j#V@EUHe>8atVCQ zT_62KuSFPM!YIHlk1H96cuQU&dY^%3JEt*Zl~HrUT%Z55ym)(Uj+SZO zOlZf)_PEL~EqdP$1gy~SSkWPY~01bM`Ns>K7 zmPmQ~_H9?taPEQ=4&}=ehf}_Gi%Uq%Vik^TIKggAA%r)@U&Y?jm^TdKw_a=u<|gc0 z9=Wn1ysc>0PW$s;1J@y-FHG?g!wFHoKPbk2_wn)Gy2iYldQ}SN;hiD2wU;A!wxD$r z?DMB$tU^rKffgD~8~Yt~gtGOTC#t03@=O7iR7 z8@L2kvuB((-5ZeHca=N6bFp396=X3Qo)=gk$iNAOsg|OE9QT@ zqw*rX6|uX?c+T#S6nBn(ka@h(J#DoABH>~sUFGNw5wKsBo|QR1$`&uNs?tB80RX{M zGTHKy2>(}&&x@K7ZqEurJ)q{n^gq2yC{?v*~t!H0cYyix+2 z5>^E%1=32N8rT1q$t1(>B12jD{kMDoP_=Nq-)bXAq}cnz|FZ$mT)b(cwlI`awH&HukLPdBI1Hqd=B zd!g@3)x2h-Now>omt{z`6m1yz&HAf2!!Hs=JLO8|Z$e9*N&Z1E*gQdl3P_*IJtUCz zGeKxds%$ViqEo+DjIAG2-!hHPcbO_I_n`Pa7*Ke6g3iPbbL3#Yu$YG_fkBF&pw^63 zyaFW$z@PCg8M^=*=^mOktIujjaI zI$u`%xx!UXhxCl`zgbHvBHkZ}1$KFVeUg!vmso065iGlxnVH!?JWP563RT{QAuU1} z?#?0(#GLl2Uv2y1ve;D1^}k;(BP}+-VjQ7o2Nvgg0T{yyA(!>BLG^GH+yQ5pMF+;d zmnf2PX}H;ujM1W_Yp1vIVr{@=`Z$erOK#un>pxWGey3aXZ9iYN8S;s-!M#H}1XcFT zdxpGD{hKIf7eK+$Q;N!|>GrH->9vKdCZA99=Sm$aAKJ*rOVRu6AR`1-C81-Ejsl*D zu~y8Hfn$|`K`re88KM-I{qxZ>l=^ktr{1D)`oBp}WDE=L#}Y~QxTn5&LYfKS9|?f2 MrlCf;x^2||0(0FdR{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai.png new file mode 100644 index 0000000000000000000000000000000000000000..3c81e3a751ec86844a1fb383a91185e12b041561 GIT binary patch literal 6761 zcmZ{JcUTj_*X|~S5~_$)fuJA(3r!J_-lPhMiXhUYNtND7B3-2^D7^?MARq|R1SQlc zReBSoL!^afNC@Oxf8V{|z0Y%>`$zWdOwP{CIdk^Rd)|F!Vx+^u$j1l(0E?ckmMJJP z|9%W~;I&=Ft_J}4r1Z4Z?*?UWT7{b2)%kW}tL_*_M|;yr&S0w`ADhTz`jA$=)ap@p z$vd8z=e6dd4e{x+(w^`(*GJkZ%d(sYU0RN*34^Jkr~AyV-A!(aW^;0|IPG|T;jy`- zleXYRI^JhhK2&+XJYsKasB?c&Oy!@EY#k!$eKDeCEB7RP(|4seLp>hrHcw+)1O!P_ zfc(NjO-`Q*vlr|rf70=H?ZW|dA~G`Kmqu7+)7c6+Pr_CLp{(7Q37ev>-Y`D1`9@Oc z^-oau&;`=qzs|L=xad9KMvJ)r3fI}mQde86r;^1dkgy^?AS`-dk>(|rbA0+vWf-Fl zMed;Il&o;y1xno)KFUbQ$hnrLVPhsWb8{ZQ8#xAXv61N`&Vzn`4br|I4Zb!OhqB8oDMdY$&_Zb{5#%87b-D(U&esFJ9 z!J;7tm7JyAB+^cL#ZfkTar)XZx}c(h#jNa}pUrn;8HBA&4KcA=Skxq&^ea$&nLa%} zi?`DO<);g5%tRU`fpcV%t`??4YbJZSV&(~F&!-PmbLFpothVRt$S|H2?%ZYqZsf2& zs2F=!m&a6Lwq7{Cj;}Q;*4%Djuud2)P)QcZu|YlYz-lkq$?D@nzzK z3Lv-F&noM3pL)a-{%wKHV2#vDoH%;fViA#Xr_*U}-#(1~Rq%^8O%q!;?ViSz{mE+X zw86bXM3q2OTq>!gVKzF(&2TgABA}10ICj*;*P|Acj>*3zIyQK0T@ib%cAMO7+`xW_ zvX8Itj1v^R28*gyj@#oeJ<*Tp)3;T8N+qu-Nw`}@pu>Fy^AMHvKp3hyH!$yPlG+4g zk@Je?_q?1m^V8HtspS z{ZP&2yV|EQAtE3VsH|345uJFZp%6G1C5m;eeQu~`!BllUrWRjgpZYHE43{aU=mGE% zPT*Ai%YO#(VRe#dGoTk`-D6F&(P-VHv}(j&~w)vr=~G{N)NokWMY)L5T#O!%U0@~JOKL*}8qhPqYJ=`w zYv(~F$wG=a4oN#96t6<#k!i^X?GqaXvcUy|t!#2+0@&}~YnZx(NQ48JSh*)JLXMiQ zuh0Mi9=*lH?`w1OebeApYI`{}i?p2PP&3)t30!Mx9dSjppkna|!lurERsJ>|hjAHN z-$#T{CV{LpIcXoSqTSDFP4$W?08e!|`;P1`?ByknCg!TAR@fSFp+$MA# zxxIMt6ZMWA6hXw}4a4b&bxwo!@3SF4u2r0f0~l(!trzyU9hshbRt6gu_<+2Jc_ir+>@z>R0mMI$=JFlw%%r+|}yFM>E$ zMEh@}@fS`s5Ygcu=iDJt9O|Z`Y7@a6{f9X<>E63FjM+8mj?OgC;OyTFO5t-(a}zt= zL&jw0B7%Gt!>&08P*p2;?FPH_Q+ILdW1?WxP2~AqIfGMtIdRqX#GlS!cyr5A6Jw%$ z2%B~xzF?|iNQ~FH=Xj-JnLcpirk8`#dD9hPc^N^l^?u;PMK@{m$z?w7~YSUMLcXxusAtnGu_r6a1Ls$HtuH zb4vbcupnQ~S`~>tH3JjFXi=V`lqPXurW=u^7B$(N;A4P3{PvabiE3<}@+HRp+SF|5ZODZt(ED&kbG9%Tu z(tIx5xN(CH5^yVf)Rp!dJs_?616vLglI_BHRHn_p_NQy!y*}+goVAlt^=N#WhX1va zr^v~F7|v8~rb5*O=8EzrytY=!31y$Y21!;|vwXiOR%Ew16DcP5+U~e(w0X*C0qzV# z)YZ3NG(;o8oRVoEBUL2eMe&@UF9_*0mNLt3dz?N#(qSCf zb#X`7HsF!GkK=$p(?{M5$7x<2`*6QIWV|;hPgl!GiKh33$uNnzpF~qspQ}bTQ~*HH z6}kMl8ti${MDG4U)u;Ncef#YR0lo1($3vqR@b7T zSFZ#YS@Drh)&F$Y44w#)niw2}e6`*lbNpde_Ii~^x~-B`)dRBSAJ{Z1t^Q}0q2-9= z0y!1(q2a7BGNa(S{Mx0u*{?sM8IBA5>D=lgA;td|DlOL zE7!lgWZxxqVl=yvS9!gqTm?(~jov;zN{QQg4KsHs(RrxOfn~_%q{czsA{=-{0#Y)Rt-2F!5;&bzh*r5P2uWOJol5I73DHF- zEf>P5Y}0uUs84clp7dv)1Alrl>>KbiSe*YY8|ehU{)&`muQ_4grgb7qY?x?ILPr0L zec)&P=zf0*9$|bqI);>=zV?j!eZLcK-AR#4s)s4~QZhfD!|VQq@yU(Pr@XxDTu!5J z**96?*ph$p+bxpldAx!o`U;B-a(d@XIYzjR=NLh z_ywx7qZWh{C1Ev}t+0}Z$MqN72wyV9VOI;Tfrw@@Okh4w#UhgVO3Po4&m%4BB*!B_ zWN&w0ZSvkq?m>$E8ZSRB5Y%W3VL3w0!$SmXY#~GY<-A@ic@p%2BwUZWM>zD=j{kMV zKQV6#YO{|bRBXr#rXkil>a@y9y1}f&$g586zsG}rKh4Cj^avak2NKDJ?^@#%RVCF{ z@5{>X4qgDTFOwwR?v?R{1fh%Z*AL`R~z6^Y<#dSXlU-`o3t80u{@mI|-FIR?`b@$~nEMxEeYLgvO6(vqF%>i8Yo1W0SAtq-j( z6BLDqdagJeLCuGis7! zkOHkY;KgUOMFCsNa9&PNP{#f~bT2Q#v0veDayD`eSbG#aj%@jS&Yh2Ab^5Qhp|{pb z6vCGB8!{%B8~Sk^`ct%ERbrUFgnkiWoGl`7B|cSi=WR%LX=+}mRao5iyKDTtaYJ)2 zQk*6OLH6XWvrN?*B5APpR@xNR>cbv2dOssrKEHqkS=--Ef0ICb-wGYv- zx3p904KxxF#t0*vh3SD}GZ83W(YGCPdEk1n))-tiLGu(x=^D|@^M zZ{cr{1u&q=A#qMD|9Yo2+kMkGzo6}Sn5kLf?ne9@S7;6ccNHxcrFgvf9LFa~|JYYxoc)>i#^TsZDj3T}eF; zuswnny+KSh(zm|!jsssLP{@DwWeX4ZFk~2dg7M`LQe>QqI4q|6<52FT%6k(gnYR?5 zKBY?2p4G2`0MTd)Q{vaX(+SAcypMiogqEI&sV3e#i)Lzn&p!pvBHV?6ut7@VGXfoA z!P_!)8^Dgu?$YJ2c=7K3zNWiNqc+I(DXqF(rFA$_2VxvcUKlhFkSS*M7W?hoHpN2c z@UiD@4pwMp`1?Z~VO!?SxnOV6guNHi*q1kPg}@E=kso24vq{Jet*-~O7u`?VQIws8 zdxwjj*CEPQSVc?X;v{D`Wmr+iU+5awoDr;a8DUJiH-@yu?xw_t+GWP%Rt{XX4b|hV zM&%`xhyC5Q3MC446Emt*2C!T_SpxnMhpQLF1Rk>Ac2i`!jXZQfIPt`jH9q8~&5n%Kz=hvw~ z>Q@9^KJU2)?=Bc_$W&8A_I~&_W=hgdLWOE0bhZ!`!#BAPSDSvQTC=*YbCmZiR?e{- zE&GtJ#0JDIFde{`gf0Rds^Q(04{OA(_3QD}9zaG`>PJT#0&bVg<(8{p%HBjL@hVRh zQWn4F*q9-(xX#3L8bM{~Z&Q?NGVsxdC1p>3*NhrgOVY{K{L25IJ~o6mJ@N8)R+_KM zh0WRsyAD{8g2Msi7sQy5l(tCZ3WtH`;Qh7~(1gRU+6Z-U*w+LRYLEiz$)Ha1D7_ag ziur^z`#wpilnqS7&B!&HpcIve4Ji{3Y7n?Wa7^$SHL#&(6%K&Ufc4P5^Wz~jK$Y7< z)cRCv2-fR(ahXdCtmU!2#TF7dMzJldl(PW(mQbKJTRq(&B-!gURA`JodH2*wXbD$Y zoB79ngZa2;8;d(B@xpof%J~gshPGt_>@8dE<1gK!x_$dc5WxjRWq}GtZe95MU&zSc zr2Cc#tmQs?7-WEubpH+ln{~jxR_FcU2v=6ZHrGdHUs2uIYrUr++0B=I+B5x7?m;l{iFXRiX=hyQJqU5CO*&$%+Txy^rTjlC4n z%$xh>_DAf-WKH-@Lrh@1vlc?l5mh^^QouF`p}6`afg1<3Wd0H?X7jq!(pzgA>O2+BUt(!0oF;wq<4BaP&z0wO{pu2l6LXRZ?qyH|{kkn<4Va$Et$~Nk2T( z+aZ$*9JbdV8KFr7tQvcRgM-hCIM?z1Z4NAaA17Z*#cvN{=l?@7Ww#9EwC1=J(}G30 zM&msT2_Sl!C6 zNChdUEiG=ZStlKkWO{-#Qh2!aXqCnYxpG~lbby!JSA@6I)1saFJ<8Rt4lrctTc16q>Ks;jQanZ)Ll<8P$h=ELY)RMpksVm-E*Na5cg|c-AY|$5 zYt8Gf^zknsD=@+*HZgShQp)_C;P2s?Fx-&~g<(FD$3eh-1iSi-{bD ze_?CS*qAfARHuzzXmrREKd`pmN?IZXg4ygt0LC<*)@1Xaho zw3V%QShKgQH4pMz!MB23T^Uy-t)GvKoVj~%3<`jCYA_LgTGY+qs;Z)7(m%&o3EsNTJ2~l zb3wcA?C5Jsc=#n3x(c(hBDh$Ir#8s>{G)#CLge{8t~C5Q0PIry(iNX@{VS0JXD>(H z8k+YRr@1!uU`_X_BIBtDH|U5_ljcDFg64tJ(aE~Pv!8C0ZW!fpw~WtJW1_4cWM zC^!57I?&apuirLuPSG%AX(`NA7jU|8Vdvu$o39w&+k8JV=a{d?E+iAfgWht8>;3qQ z5L!xNg{$eC%50PWj#lDBm1H*s3)zHzDbyqm9|gd+e8o|uz7!JW{*4>9Bh~g+Ly?jt zp8oPDfn8|p2+%zsk8`uT!f8tRCPHn38M=|%_z(OX1pOE*ZQ5nhQeKLc+n&4oE~7sB z26wwO1RxMrJfx{zVKHd?Z!oF{=x*x z>zFFgm z>-CMGkbWHq7)`h}8ip)&yWtDjJ0EJz37yV)1!Iq1=CGuMrk&;x+GvI=^jq}GlPqXK zQBCQHV)(t>3v0N#DG27Q>Gr>mOt!`gXw7<;>U8}kC+DS<+Z`2|9 zA&1%_({MXGKX1~9?g!o8UN}#fPM7d`M->n#{%euTK@xCpb)di-f=|pZF0vZbI`uyl{;?um#zbtDcx(tf_9pU%`w7HRbPjJ~^B}}o%jFb5uTEfJ|HCwzy>A{; z+tV@cQxNBUtypKY73F0TjUt+*ZjtFt9znUfWQ3unFCv8(Z+l*h6#Y(r$=Z?zWKS-? zuXudJ8vtAFgsg6Gv?T5MbIlDJcjo?MW^N%HprSfS%4}l#OID((OG`bsPMrMS?Mz+x z9LQD>mIq(oW8SAPshM;P95hNGnRQT;f3Wby{6CDy(q2|~6>8Dd+5@>0bv1%*dfJY* zy)s}*`2hkWG8gSqE?{7tt>;Fg079ZQu0LRqAJXbrSn}A2s|E_Te2TmmW7uu3ZVByv za#6D{G)s$m^0KYw7rZ6Yg=iiQc;c0Z95Yj%HeD*7d3ThZl*D03DDCv()y@j8}VOueM}ty literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..96e953660f8eaecc60da577108813a81695c3102 GIT binary patch literal 453 zcmV;$0XqJPP)1ujNNuMuM7Rv8xB%yAu8^IjQjE&J&&^HKE1RzCYSt8Bzuyyvp*eU%VHlF8X=z|gO#mf?&>h*`d(qhbd~qCabbGmc zJb$uRRN~{lWMvs}Ou{IN%qF2%CSepsItfP)0Tdz7rMUue9P7HT-F0qrthxf4b^H?l z{}9CSrj~Hk<8%Ghu|8e&6#PkEQ8k}}DL|U01VM0RV!whQxco)b48d=fyGx^ozykDg z_`ZK-YPU{2$8pLK_`Xk;t&GF7Y*m|RcMfa~kbCagHedpN=H4CugzI*fLDdZ0-n`c|PdIq-Ef=QyE(0Z%&gW8I#X9TE>0xyqkY{00000NkvXXu0mjfY`w_) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead.png new file mode 100644 index 0000000000000000000000000000000000000000..96e953660f8eaecc60da577108813a81695c3102 GIT binary patch literal 453 zcmV;$0XqJPP)1ujNNuMuM7Rv8xB%yAu8^IjQjE&J&&^HKE1RzCYSt8Bzuyyvp*eU%VHlF8X=z|gO#mf?&>h*`d(qhbd~qCabbGmc zJb$uRRN~{lWMvs}Ou{IN%qF2%CSepsItfP)0Tdz7rMUue9P7HT-F0qrthxf4b^H?l z{}9CSrj~Hk<8%Ghu|8e&6#PkEQ8k}}DL|U01VM0RV!whQxco)b48d=fyGx^ozykDg z_`ZK-YPU{2$8pLK_`Xk;t&GF7Y*m|RcMfa~kbCagHedpN=H4CugzI*fLDdZ0-n`c|PdIq-Ef=QyE(0Z%&gW8I#X9TE>0xyqkY{00000NkvXXu0mjfY`w_) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/default-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/default-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..f14b4ef0fa6b3eecdf2106102180f93fc8b3f4c2 GIT binary patch literal 2005 zcmV;`2P*i9P)s{73%tM!h~dZ&mgD%Ga(jfy*W$`C{<%a^N(Mpxm#QYNCh{=>DJQtV7 zqVco^0C}$rRhAG|h!tpt3EzqVz+Ee#{60lRFa*rr2RqW2!pmQ=1w`X%YiFN|t8*#_ zc1Z|^$l`+`U|^Sot8*%L_Nh$BS|b`yTOaII;ZszMCV>uoIhOTq_WU)UjDKcK*@(Llf{P>LYR@rc}61V z)E$N{L+DME;~%+B=06z$KD)B)xaYGg%QzV!*M}$g_$zXOq07L)4h^G8LXyyd3)gZ0 z$dQhXCdqw6mpNBi24DURgjX|(RkYWZN43c_cXE~ z=TlUKmGv%=(BZhJQvQZ=LiF|+&9`84*-1n^AoGL z#{>+~r5CYl=OXgD$rcigr>z8t5@z9Cy#1cu9;qV!vM%t;w9I}-<7unE+s~pfjR&Ji zpugMi@H_i+)gbX_i-X^%sEAE3BO{Tqj0D7{m*G=XA^x%oXl^c&)3K8gFh3ifAm?@= z?ax&UX&dnJ%a()x+>u7d3pjVA(ZQeh$`$jMRltER6RSQGK1F3?UtI#4w&#$M$nmR7 z#ru7VidCP916^i`+4!;N%>`KhtT6u3BpFZWyLmA(+`-y=>vWikO1O~U5X0GKwhs%hE4HWLo1-X%J`4&BW52~02&K25(zX6Lgcaas!gToH&4kI4pi<9>V&qV#C!d{n%%vG7%R?xChe^go z_{&;AsYz5>!tEOxZqsv{du;TKDAvxk>N643Omul=jL+oI4?m_>48R8#^?CTY{|&~p zqHo!W?Bi~t%S)nrUe_=^(CVSCLC1N)t$_F5C{47{c&!l(tzT@HS4J=-HXpYFE?mpu zPB!ZpyOYhb)VLlf#V-osP0_8w)ZNmqw$XSwa4TSM@EOxkFx%+?xoSJ*LjybmMaizgra3b4K51zBRlQx^xZ`_W@ptHUFQIz77| zJ$Cd5*k!0s5VR3RRGA5r(1Bl9H%QcLh+kKqu$|zki-U-$vO^|bR8_X36S=fE_FI61?puX73ZSOZ*NYQfV2-_d==lHAI?1a$My zCu9NMc2b54hQJyT4hBe}LS#N3Ob@hrDBoxjtR6sR;suuietOUjprCDlS-{mf6>Bpz zH{nxAx7s=ju*p~{xZl`27oS>@{f*EJ6UoJ8oIc=3LMKfMAHF`11zEy(@3y&O2_OHF zwOS1mKRswiWPc;V3h?>O9QL&|LX{=NrkC;OCr$2t2EFYjG=uaE0LA7g3YM9<0Q=mu zVGAGyQ_V2pZ8y2UL_$H3_6($uBRPQrB=kn)b$5%TG0i|Lz}|jF0x(mk70N(zak<%gsm_qQ!#e1`n)@Ak7=eLb>4>RQow+RB7fbeKej@tGWxjTgeHupJLq473_%UH=O# z$kMthvFoWYQ0%|}z*5nAE}qKJYM3k)2gEI~>MgN)^#!=aEv$e$*{q{EYAY~%pTwVP z`U8Z%0u)nsiTT$v38L^RD)PF9hbvO~n>RsKE|8k7N`Ey$wK51RU~P?lD^ZOsRR=+8 ziuFcb*J|Q=!uCS~kGGJ7w6Of(#M>TMKZj@kvaGzW;rdbwP)LC8WU~;hjteUw@N5Zz nZA*@^dRPMGaAbW|v?u)wE5X)16nVyP00000NkvXXu0mjfe%i)b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/default.png b/Resources/Textures/Mobs/Silicon/output.rsi/default.png new file mode 100644 index 0000000000000000000000000000000000000000..f14b4ef0fa6b3eecdf2106102180f93fc8b3f4c2 GIT binary patch literal 2005 zcmV;`2P*i9P)s{73%tM!h~dZ&mgD%Ga(jfy*W$`C{<%a^N(Mpxm#QYNCh{=>DJQtV7 zqVco^0C}$rRhAG|h!tpt3EzqVz+Ee#{60lRFa*rr2RqW2!pmQ=1w`X%YiFN|t8*#_ zc1Z|^$l`+`U|^Sot8*%L_Nh$BS|b`yTOaII;ZszMCV>uoIhOTq_WU)UjDKcK*@(Llf{P>LYR@rc}61V z)E$N{L+DME;~%+B=06z$KD)B)xaYGg%QzV!*M}$g_$zXOq07L)4h^G8LXyyd3)gZ0 z$dQhXCdqw6mpNBi24DURgjX|(RkYWZN43c_cXE~ z=TlUKmGv%=(BZhJQvQZ=LiF|+&9`84*-1n^AoGL z#{>+~r5CYl=OXgD$rcigr>z8t5@z9Cy#1cu9;qV!vM%t;w9I}-<7unE+s~pfjR&Ji zpugMi@H_i+)gbX_i-X^%sEAE3BO{Tqj0D7{m*G=XA^x%oXl^c&)3K8gFh3ifAm?@= z?ax&UX&dnJ%a()x+>u7d3pjVA(ZQeh$`$jMRltER6RSQGK1F3?UtI#4w&#$M$nmR7 z#ru7VidCP916^i`+4!;N%>`KhtT6u3BpFZWyLmA(+`-y=>vWikO1O~U5X0GKwhs%hE4HWLo1-X%J`4&BW52~02&K25(zX6Lgcaas!gToH&4kI4pi<9>V&qV#C!d{n%%vG7%R?xChe^go z_{&;AsYz5>!tEOxZqsv{du;TKDAvxk>N643Omul=jL+oI4?m_>48R8#^?CTY{|&~p zqHo!W?Bi~t%S)nrUe_=^(CVSCLC1N)t$_F5C{47{c&!l(tzT@HS4J=-HXpYFE?mpu zPB!ZpyOYhb)VLlf#V-osP0_8w)ZNmqw$XSwa4TSM@EOxkFx%+?xoSJ*LjybmMaizgra3b4K51zBRlQx^xZ`_W@ptHUFQIz77| zJ$Cd5*k!0s5VR3RRGA5r(1Bl9H%QcLh+kKqu$|zki-U-$vO^|bR8_X36S=fE_FI61?puX73ZSOZ*NYQfV2-_d==lHAI?1a$My zCu9NMc2b54hQJyT4hBe}LS#N3Ob@hrDBoxjtR6sR;suuietOUjprCDlS-{mf6>Bpz zH{nxAx7s=ju*p~{xZl`27oS>@{f*EJ6UoJ8oIc=3LMKfMAHF`11zEy(@3y&O2_OHF zwOS1mKRswiWPc;V3h?>O9QL&|LX{=NrkC;OCr$2t2EFYjG=uaE0LA7g3YM9<0Q=mu zVGAGyQ_V2pZ8y2UL_$H3_6($uBRPQrB=kn)b$5%TG0i|Lz}|jF0x(mk70N(zak<%gsm_qQ!#e1`n)@Ak7=eLb>4>RQow+RB7fbeKej@tGWxjTgeHupJLq473_%UH=O# z$kMthvFoWYQ0%|}z*5nAE}qKJYM3k)2gEI~>MgN)^#!=aEv$e$*{q{EYAY~%pTwVP z`U8Z%0u)nsiTT$v38L^RD)PF9hbvO~n>RsKE|8k7N`Ey$wK51RU~P?lD^ZOsRR=+8 ziuFcb*J|Q=!uCS~kGGJ7w6Of(#M>TMKZj@kvaGzW;rdbwP)LC8WU~;hjteUw@N5Zz nZA*@^dRPMGaAbW|v?u)wE5X)16nVyP00000NkvXXu0mjfe%i)b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/floating_face-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/floating_face-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..05de742794341c5e5489daa52bef423933d51512 GIT binary patch literal 721 zcmV;?0xtcDP)lu~bT`J!B6mjtAY%u7W$0>~vFnzti%~?7m^f-pJFgDiZR$yBQ*xePv+@gsW zr+2ly4Rq>DXTaQ|2>|#w^V*ILTph5lryft)*9Vekfi>AD2dm%V)ge`=3jjEFFbn`# zt<2-io%2|&%%hku0r+*`IOER#*8R<*Ti-K1Q-!*)9%hL};=Q&&F<*jpIxj4ls8!2w zp4JOXt!)F{`kq^$RxQJfHr~C~d)Rp*Th~3&oj^3vV1g zo%&L#namoZ|7Z`shr3+y$?*{!?!SN!(=RcU8FRIDnx8TKuHs8Eq*GsdaChI<1OV*l z-sg%xyZ-=}Zr^alzOJkT0PdZP_*Mz((pM^lrRwnC7_+m!m%=*ql}h11_hK<$!p5f+ z?AhN9l{&pybm%LskaHEDKgr?9xyyFj`&UnK@yaj&|5v|V^Z@{|bWV&e3o*JZL~Jl4 zVuKkGzctZ_rE^+;G5M|E)GWo)IWctY`d{(MM-QDQ{s8&|=ntSjfc^kq_300g9R&RW z^as!%5cv1`p!EUJA7BrH{s8&|g8x1rv_2t(kgd*7uk1Mlu~bT`J!B6mjtAY%u7W$0>~vFnzti%~?7m^f-pJFgDiZR$yBQ*xePv+@gsW zr+2ly4Rq>DXTaQ|2>|#w^V*ILTph5lryft)*9Vekfi>AD2dm%V)ge`=3jjEFFbn`# zt<2-io%2|&%%hku0r+*`IOER#*8R<*Ti-K1Q-!*)9%hL};=Q&&F<*jpIxj4ls8!2w zp4JOXt!)F{`kq^$RxQJfHr~C~d)Rp*Th~3&oj^3vV1g zo%&L#namoZ|7Z`shr3+y$?*{!?!SN!(=RcU8FRIDnx8TKuHs8Eq*GsdaChI<1OV*l z-sg%xyZ-=}Zr^alzOJkT0PdZP_*Mz((pM^lrRwnC7_+m!m%=*ql}h11_hK<$!p5f+ z?AhN9l{&pybm%LskaHEDKgr?9xyyFj`&UnK@yaj&|5v|V^Z@{|bWV&e3o*JZL~Jl4 zVuKkGzctZ_rE^+;G5M|E)GWo)IWctY`d{(MM-QDQ{s8&|=ntSjfc^kq_300g9R&RW z^as!%5cv1`p!EUJA7BrH{s8&|g8x1rv_2t(kgd*7uk1MzW4S0TzA@8jEkm* zo(2d6(nPzWycG4$pP{Cz$Zd|7IUtZK3ynJI6PGV~4xE8`=yn1Lr@7t>yyQT1PU|>z zAobEdGnAUm;3C$yz{+IxY(VI(dot%71_g zp1duln7_0Fyo)3O-x;={eZtnB>9LE)4n7I(i*PPKS`*KD>QS=8mbOzSTQTi<$1QdV zU@xVCLFtUScO+4w1w6@nyWRE1@f|Ee9SCNJb1w<9FT9Ek1S=ye62~bP4#U=nL$X+z zYlermDBRLZe19&%`)7M?t7of9w$_@JYs#5SdHP4NMW{0dKkw5xUXM_mI>$Kf z?|`Y-$zIxdyLXASe)!GcEO~Q8_2F>vn{SB zZ%+u^4Ye3@Ct92;`|w0R*wFm<^3zh$I-RR|{JMBy1xv({L{~&3Vno#Tv@%|F^4$lz zlqFbja1K?>Vjaxy$klcGvifDQGax8h1~n`oM($I*pc^&n2WmlwSvFQj?%PooIc3&b z1|4Y6+hdCJAA4dIrSkdT)WMjVWq8tkI$1iiyV5J2DMIQs(W#7_TwttA%l&lWk)5eZ3giPKiWQ;{FEGy4Ovw~YWFQ?ryOxX z{6p#M*nHgB+641Ad@}J%uWGUHH7R~QS-T}MiMM_l*%)@e zxh#s3nX#$1=+}9J*Qm!shrcb(5Eb=R=#WmjCubZ^GCAx0vem_=#_%-xM+)V7~S%?Sd)3`~v-O zDgf7)-I!V#UdJlh5D1>rd#@vt$u;I$N;l?QVxnFeryvKrN6af0J@E4?z4sXJYdZ!R=$&0;UgN(77k1{(Wbm= z9O@-q>c0~Pz-BOg-BOjD8M=DwANwO8K*hjcVbT-3|611dA0|8tCgvDkmV18kPpMhc zI#s&SydjI@m{(Ag+iNiCuLTvsv@X5|$gcF^A6e%aWjQ5k3=9^kP>>p!lHL6an|~7U zl~e16x^|l2p6#x`xEjg+50Zxwlu;q<3}8ZG^*s@FuF%7%m{}`pm%%Np=&7^(u$Yl! znoINDSy}$xCu@`u6y?-!)kF>3BYSosO~PO4G_Jqc{l7rmV>=to6g~vb0#;)omc)B_ zb$*Z1TO5g8{e5b-(-CwcU;hYY*Y20n4na$&?g^MHiEY@5t)(w$v_ z@il}oLgxIfcH0unOuDP-2M=yTPvJ_c56RH8%sJCr x`nAeQgj#8{L5ZW1os&KkQ{U=i>h9Up} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/horror.png b/Resources/Textures/Mobs/Silicon/output.rsi/horror.png new file mode 100644 index 0000000000000000000000000000000000000000..0a807c0c2354086be2730017fb4e4a7eb95afdd4 GIT binary patch literal 1404 zcmai!e>l?#9LK-y80+ka9x^|+GHuC2$u(+>{AxWyQPEag57H$jg}M8NSy$w)iI6qX zg}VH_{8)>=l>8>)a7N9{!WMF?r@QO^>Hhe9KF{;|y=yYE-er1zx_SNA68W1Rq?=|*;U4Pf%5yoPX-Fw>TN|2@_oBkM7)H?M2yPU+bf zG7%R>3{9hURO7Fv*!1bma7m9=SdHv^18c9xY8O3yrr&n(?)pr#wsrWc0hnZu5XS=Q z#s0~ci0ZW`7j%AW#!JrI%kdo&K1_G0Fi*Se1lO_F?SfV9 zg;Wv^@{fo?F)FCx4d6`CC?SB7*Fs8MQAyh?%60-n4C$ zGjIFy8awCEm9+~YrjmqGnwpK5Z2alGLKfVdj}x9KyZ=t(Xfc43z4U_dVt*!2kM@Xq zCbxHi&3_PxzIp&aG!WXYz--x<%@TJp2$M+Ybolrdnq)mqB5Enia!V9P z2^HIkMpu;ROc^uxSh>mYRaURg6iU~)-1l-W3)i#eNb3?VP&_m;0h3g-_Qm{I+N3-) zn|Y_Q?@vRap)e5LwRd-Q@Yz9BcWrerS#ix+=?!)+Ju`2toA9n1z*~A>D+~_%-PGJ7 zNK6^^Li@NkcqOLzshpTvQhsg__f5jLC^wJ-;v|8)qR5vzWWmP^;!DNFe9Lc!_d@4W zNsI)W1Yd5UHGf-wi_%&l%~oz#=Eu{Do${S^^}C_8jxMHLI=ii%mblcT$W~U3(8OV) zDrQHFaVjY-D8L94niY@G&*w0VY~KB#JPd0q(n!Z{x@CBi$jz&;Orl!p;wDOnJYL0Y zR5aAl)UNtGn41kz+Z{0Xd3q?`!I3sD8UtUAw~L3yONdl3N$_6uUm+t>iQ%ok(G;w( z^xlyh*3kIs@n$^d_(V7YlcVpFfhA`Y>OSAF4qK_HL11%qHngeiQZN&pm}H(UTRR&1 zEMN>5xPWz_v3t5ARL}Kkj;n^F@PR8!8LQUNL({kKrhh8*q~~t)mXE070kEm$l*!r@ z#*16@tvdR@sXpF@oPnKW*J#5LufYgdyXF5z_)ka*0k0>tp~2UT{ga6w>4$-isMmO+ zbq%Su`D8hH)yWUe?@@`3ONZ4ETvJS$#|P@LHDaM`AbQiPwmA}N&)09tCn7b~UlkyG L__&wvq9^|aHQlu+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/meta.json b/Resources/Textures/Mobs/Silicon/output.rsi/meta.json new file mode 100644 index 00000000000..a40ed37c604 --- /dev/null +++ b/Resources/Textures/Mobs/Silicon/output.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2a19963297f91efb452dbb5c1d4eb28a14776b0a/icons/mob/silicon/ai.dmi", "states": [{"name": "ai", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai-banned", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned-unshaded", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned_dead", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-banned_dead-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-holo-old", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-holo-old-unshaded", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-unshaded", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai_dead", "directions": 1, "delays": [[1.0]]}, {"name": "ai_dead-unshaded", "directions": 1, "delays": [[1.0]]}, {"name": "default", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "default-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "horror", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "horror-unshaded", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "xeno_queen", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "xeno_queen-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea194039f4fee0b41d8c2f4b5f602592936f88f GIT binary patch literal 2484 zcmV;l2}|~gP)1 zO=ufQ7XGv-7+Kf|LFb^xt(!5yIN-S$k8dV+F!pIM9&)n>pEK+sdlDg-J&X?_ISxad z(+(Csjxi%=d>W0>WepC(7~j-Ef{nlt3AWZm(0i!7(yQuU{dr*agP?SGb$#_-z3O`P z-ZSujj#wv+bNdyCUvDjEV_x_AF|ga>kK8!7UvVbqEahIgXv6E?Ae1mD{=Y>fUzip| zPj}k)52|f)y1y`Oxn`y$s<&46CMY2fjLlyVKEd|LMp zoRgHWod=$*q0N6iAoARP#reJFIQfR-Og#7g{k`Tm{hocDe|GPK^VN@nkN?i@edvnc zcdhV_XibqRe*X(Fly2biT?*;325v4>c(DQ;p4duT{rye__T#S&i?W}$Gv#VYH)g$?w52zc#!}v4TKyBFFwj2IP z10)ly#uG4GO)N}XxSIg7i5pa!LwMg5>yMrT{dI_RB>+(Ne}1o1DG3f@m{fa~X=$_eXqEM>K{>w#M{v%!zz7s@R0<@+9U}EI6G83GfuS@Pw4Dc*%#YZ+uz-7Y6iRh~4WL@80}$Te z>bQ-As)Z#}6$D>|^BWZRHfzJ8uk=_0^IvGV@BpwlV@Rc!i*{Qn9`11v0+#^I{?(PZ zULCh_d}d&M%8;|YI3uo)&kU@Ni&?+A5>|0|VqRYcg9+>|Izc0Vn4y>|Iz=IkZ%wI7N{xV0GM9PF}Cy*5$K8iT-a$K}0)C zzFRH=WhST}4}V4OHbcVtl!4kXqzPuOf#Wm(_qy2; z_?`}^o*j9j6C;A><}%f3_Y$GI0PlQjIU8FY7iLW}UnteFx!bl9{k>kd!?uOB`CqKG z4@Qq42sd2k=kEm}(l%I)CzKgTCV}HK@f|omGmuQS+mh+_6S^?m`U<7GvK)y2v|=C% zLKSd7TgUp8p=>)t=>}%+i9yZYt79nLP{`M(4BXGw<-JHF(LmM{#qR!jkD0P#+8V2jmZMUjYdJ28CJxb+GgBZj3Jj(!Q5( zzO|f<(R)j#jfs)ZVKfRRMm|g7d0)gsOG5uPRO1QkJiHs@;|@cl8R2{DQF9bOe4SFx z0}Im@{_%&HWu2UFWnu1VP+Q#^$pXtoaSo{swtX2T(o5jFAUpxRe0XlN$F^c7p(q4G_FC!g@QudIi@D3)2=hcST-~5}|-Q+Cs5G0DY?k=mb3ct`|@MZNUqr zI?g}c!R5OYe)_ikjiB)=wKsssx(IU;4LJ#**5+ldMVjo-Q~*V-^|A5E0fa)f^T3N0 z(Ux`x&zKv5CnojuGZB)4Zc_<-_Wj1h1^04<6btYpIRA7<1~a@&i>gKV4BVz8M3rHB zoR9>h5c|Z)XWt3(JPuQ63J~!;-NT~-q-s2Y*Kb9=K-64ZKR|r1-_}u$CvbdbxN?ZO zFWWT`Y@LCAz|CdKH<(HJ!Joc`Vga`Sn(fTBh(+?;B**=%*dl`>MV<;EGn)iZE_!Qk z$+WR|VJWo&W+zhg0M*)r15|~YkR>ZvTmt~N6%$-bK+ntRFHx-!(6)m0DWl`!q+VdQ znzAZ|&psa;&<^AlN_F2HrEf^g&%?X9Ov%(U9Ykme@apkFfjEeh#&B9Od;_LI-m0Pi z`f8q54A0rG#uGC1RgEW5E{a$jFQFe)P*m^x>5i~Kz7;Q-wvxsN+E#E{F>urzb&bzu z0hE{w+RmP=LDmfLT7efUa1EfJsKyi0k)gT-a)$I{F~`<&Hs+V4l?vbm30}zUR~%aB zRHVd9)&RKb2>K1m{c}#bM{xkN)%3N(#TmmDHCA>3Q4i={a?UF;$)DC|o15bxKy`p# z_sZ;gamH|k>bP&P#I`F%0Z|i^g!4~#luB{{GCw~E>^!_HJ<@W~#^VPf9%v@qR>#xq zK}lM<1fnJ;33Pb6E$7Dz#Lc5rluP7in4l!BYqq@BkN!dAN9XT<5z9uH*6o}Hi0hzg z$-h(y8YhR|#^nh{5x}b^z%OSv2zYUNjk_-uB0)GjvGHs}1 zO=ufQ7XGv-7+Kf|LFb^xt(!5yIN-S$k8dV+F!pIM9&)n>pEK+sdlDg-J&X?_ISxad z(+(Csjxi%=d>W0>WepC(7~j-Ef{nlt3AWZm(0i!7(yQuU{dr*agP?SGb$#_-z3O`P z-ZSujj#wv+bNdyCUvDjEV_x_AF|ga>kK8!7UvVbqEahIgXv6E?Ae1mD{=Y>fUzip| zPj}k)52|f)y1y`Oxn`y$s<&46CMY2fjLlyVKEd|LMp zoRgHWod=$*q0N6iAoARP#reJFIQfR-Og#7g{k`Tm{hocDe|GPK^VN@nkN?i@edvnc zcdhV_XibqRe*X(Fly2biT?*;325v4>c(DQ;p4duT{rye__T#S&i?W}$Gv#VYH)g$?w52zc#!}v4TKyBFFwj2IP z10)ly#uG4GO)N}XxSIg7i5pa!LwMg5>yMrT{dI_RB>+(Ne}1o1DG3f@m{fa~X=$_eXqEM>K{>w#M{v%!zz7s@R0<@+9U}EI6G83GfuS@Pw4Dc*%#YZ+uz-7Y6iRh~4WL@80}$Te z>bQ-As)Z#}6$D>|^BWZRHfzJ8uk=_0^IvGV@BpwlV@Rc!i*{Qn9`11v0+#^I{?(PZ zULCh_d}d&M%8;|YI3uo)&kU@Ni&?+A5>|0|VqRYcg9+>|Izc0Vn4y>|Iz=IkZ%wI7N{xV0GM9PF}Cy*5$K8iT-a$K}0)C zzFRH=WhST}4}V4OHbcVtl!4kXqzPuOf#Wm(_qy2; z_?`}^o*j9j6C;A><}%f3_Y$GI0PlQjIU8FY7iLW}UnteFx!bl9{k>kd!?uOB`CqKG z4@Qq42sd2k=kEm}(l%I)CzKgTCV}HK@f|omGmuQS+mh+_6S^?m`U<7GvK)y2v|=C% zLKSd7TgUp8p=>)t=>}%+i9yZYt79nLP{`M(4BXGw<-JHF(LmM{#qR!jkD0P#+8V2jmZMUjYdJ28CJxb+GgBZj3Jj(!Q5( zzO|f<(R)j#jfs)ZVKfRRMm|g7d0)gsOG5uPRO1QkJiHs@;|@cl8R2{DQF9bOe4SFx z0}Im@{_%&HWu2UFWnu1VP+Q#^$pXtoaSo{swtX2T(o5jFAUpxRe0XlN$F^c7p(q4G_FC!g@QudIi@D3)2=hcST-~5}|-Q+Cs5G0DY?k=mb3ct`|@MZNUqr zI?g}c!R5OYe)_ikjiB)=wKsssx(IU;4LJ#**5+ldMVjo-Q~*V-^|A5E0fa)f^T3N0 z(Ux`x&zKv5CnojuGZB)4Zc_<-_Wj1h1^04<6btYpIRA7<1~a@&i>gKV4BVz8M3rHB zoR9>h5c|Z)XWt3(JPuQ63J~!;-NT~-q-s2Y*Kb9=K-64ZKR|r1-_}u$CvbdbxN?ZO zFWWT`Y@LCAz|CdKH<(HJ!Joc`Vga`Sn(fTBh(+?;B**=%*dl`>MV<;EGn)iZE_!Qk z$+WR|VJWo&W+zhg0M*)r15|~YkR>ZvTmt~N6%$-bK+ntRFHx-!(6)m0DWl`!q+VdQ znzAZ|&psa;&<^AlN_F2HrEf^g&%?X9Ov%(U9Ykme@apkFfjEeh#&B9Od;_LI-m0Pi z`f8q54A0rG#uGC1RgEW5E{a$jFQFe)P*m^x>5i~Kz7;Q-wvxsN+E#E{F>urzb&bzu z0hE{w+RmP=LDmfLT7efUa1EfJsKyi0k)gT-a)$I{F~`<&Hs+V4l?vbm30}zUR~%aB zRHVd9)&RKb2>K1m{c}#bM{xkN)%3N(#TmmDHCA>3Q4i={a?UF;$)DC|o15bxKy`p# z_sZ;gamH|k>bP&P#I`F%0Z|i^g!4~#luB{{GCw~E>^!_HJ<@W~#^VPf9%v@qR>#xq zK}lM<1fnJ;33Pb6E$7Dz#Lc5rluP7in4l!BYqq@BkN!dAN9XT<5z9uH*6o}Hi0hzg z$-h(y8YhR|#^nh{5x}b^z%OSv2zYUNjk_-uB0)GjvGHs}pn_{f6~|N`c;p7dw2@!_t98SHP|$_tIcTEkxnQf zm^CtC@QF+sec|EM317pk!1~X^AN0kM)}iUKm!>olKYZmoIen{2V7>Hk-pTqdh%mJ| zAERFPgk0U5F{U}XG>xee{CY!4DQ-LLw)gqS#+a(_ngxb^3@_yFS#I5gG3(xm$R06w|M}{Ym%GQ8?%E57srjHCEa&eaj7Rt4)FO_u z-rZgtyw2w{Ore%tXIdo6@H7SYXcUc3wcxmB#ipWs^Iq-4`g4l0R&6zefWdc7Un>rE zE-9@~eK%QxQ3ddOB>cFgS*fZ};q)VI{kHn^Q^NIA^$^-CF&nWng{}Cs2o^>KaV*w& zx&EZ>tDagnTHGg?aV79a@mGomR8=$zAL2QoUX*Mu9%}!bu z-^$@Z5gAwV%d1|md29jLr_UyikBl5XiZot((^NtAplat@PWLctwWMdm6^3U5VAOd# zfzfqI|D2p1-W7qt;%#vVUsrc9>;OPP+1DLo=ZqslZE+4xZi@U171jJuC#)jBnWR2S z-(4N&=%nNCi8Jv(Z))f7Y$uE5S5{(B@Rb7rTyaDU)YsL;jUeZ%$bWz<2j1^DBl)2R zB1C6J{!99XP<6Z~4l03=K%n57zE0j^{7MW^1y8KKoUw-19}wV^BEKV%=q`su`uO-D ze8drWPX{DgR#p~?5<`lK!9fW)!Ox9|@rAn)1ok0*VQAn8cAie|L?^r(bRQFAi}xZb z^7DiJ&_C^Sb=TMb3*L?J2MZt{NMDRQ5{*D1U0spCYY>Q<-XO>y2K`43f+@I2k;XUz z-pkVtr|FGzBMSTufwlWf-`&g8w%>Cwo!<=s)&Ii%hxDIwKM)3`^!4R5@OEDN=ILrE^6!r?hsE1D zVdV~PQTEbktQ1Ndj29l5h-0Od5`o#$lu-C8TZbBqV-=(sd&cF>ZFaeJBtd z;RNDH*`uXorO;wifa3Tr2)h4*yDfbMj1#W>)Q z?rshT9s7jKsT%4k@{1u*f43OAV2Jjh0=Nd8+^~2b!rxt{POdl;B4(dYw6vJGlmtpb zQe0MCRucW2{zaT80gT0cR5S`9{)>`*$H;-x0jb68M=A(#01M7WPTdoSA>utv@puw^mliy>k(Fhm>(iV~BML&?aYB}~P{LvHd4H z0dG(A!Fb|S9Y7vIuD}32;0k*B4_68QQ{KlBx9G{u^cd$Ui2F+}|<&oUH=# z|KLO6K;XA62Gsl225w#8PKf+#EBu46{Y~e8@$U~m{4b6GLjOC+f5q>=bp1=$f5pIm zCH!x6{Y%$>#lU|h{BLyqf1``x?_vt)2A+U?z*0$uy15@LvuJJgv^9Xe{m;XyC-Gnl zy}Qn30st^V_P-QBO4?Ddk&dXVuSxg)5DPOPSw?rM9RN65bTw2>ef#FF1R1hxzuh}? zBZA43lJQiI=RkbH)1%=!i!mJhiRy68v*?s398ZrbTx|0|=R~S>6=mrHud^xzjJO1E zr`)-%Wp$QW@Tb+ch%-MA?bd|Ebl+q5hw(!>3s2USFGOcvbFlaEcKBLARl1y;(wCn8 zV`tvQC#ZUO{>Q=-3K|CX(}oXKZcx(j(j}to27+9~wFNtmvteAV(;I7qQZKB{$65qB zezBN*ACkZpi+9OWpURBNp5CkqmDUvORPRrIqCHNhA=vq@+(1gcQv3X7EWI#Fsyiy2 z{62)8$m>Zyz7TNzi)-fs+xQ4UqY$o#?r3s?zxU-1XY!`OVVKTd{BaH$7Q%ex3g|A8q4uIzs;L-VZLUEalD3se$Yl8P*+~ zA%$AOWUIs$5qx}Yh?anb-#HS)u=frnOeK_FRRl#*!g@2S3ng((|MXerVD`&G?FB8L zt#P6TTr3-O=67pUc4gNcIZPEcdC`|msm>kqF%z7<@o4>&HbvEyPv#@)A~Q>Bhj3A} zn-um%7p#n~9%XQrM~TPPKHx1n1^8u}=E1lIa8AOi_l{wh4cc+K7yw zHgMY?^hYsR>x~@x7d$6G*-A!4#2J3sDYZQKF%e{~KaFZ}r zWLwC8o%Ls9Kh3q0u_q;*?6bWct?ToABZ&kF7~hMf^1SW1X0D+e-XUM*myeE0S37H3 z>7tRt{q@uKJ1Ls1*j=5+p<2ovYx5N(zxPe^%c)@jBZRNU=UsSfa*Y7MG{}oyJ#g%~ z|F>ml&lgL#$c>p>&-5y9^JH=%aQyEFmqOEJ&Afc9m7-6=-k)Vus1W-qf)A%x8*K1q z|Ki<~Mja=|FtRofe{1F_536pcvP^o_uvLTJF&g)42F;}b7N3Wy$es7?SBA=Nk(zc% zU`$n*l-GHbCESMkv~uO)#G;&Azr=qVevm4S`WD;tbP8#&X0Ii-v0J zGqeoJxX}}+4N!*QM0{{`p=C#NFE%V=%GJbLJ~0xc(> z%IxNaq2R7H#^beA`qZ(?iwlqaH)tr{M3p}k9VET^#O%1^f+QX%eB-LOV!eM1Z?+@n zOgSKE{WR(Glh7sqSKw%OJQeQ&9EDbwgKsUpa6CPHrzD<_e96W9ZZ~8V z*jQc86pq$_Bfi8_}vgLkK)t`fHKs&V=x!>GVsTAqR2Y{gif zI%R7a=9xVD7!xHQ-s;z%mtZ1jfrzV=o~8*iM(guh&q{+HEj|zTxGolM`Vhh6_*OPN zexWK{U?RhIbX?V+M|h9jqnG>W6W(I~C>Mhry+H2zxlkacP%X^1gEB0ELvHB$+E9J@ zl9&$5=D^v#vhI2U14O*gu*8nq^^%8`538SJ&t(!_~GOSH?GWx z!WT{yiq9q$mGah{>t-KtLXl~i|sc;@0Ps%X8h*!Ec`W=sumynQBZel4hHUbh+q7het?y-Qdf-ajMRfHTWbssv9($943 zJF}%q_{7Hnq+uxUJQXFGB*goQoxO!}JR({sCN*QEH$lm2ND3a@PFuouifI`lBM_uT z9UN)cGrMDXISWQI9lGVH5_G@4V&#X&%KacZz&F?ZWYv0ARy?P+!#A}@8WsV7_Tmp) zce8-XqvMl8P>x}&M5dFka9?+k^@kZfGsNQ`c6>b9KYl)8SMx44<>j>0vI`}K>-}kP{JdQ<34?5ebk=Xm?OIu^Jol4c~2(FCvdu$ zExNG)_qMt>y7_#bYJLDIDv0jPtHl8#@igg!@5-S4b&`F-;^HZtB^+0qO7k~+5tF=t zdB0{%U_zX@PB`{wgD};(+S^HN=lN47m)K)h5^SuYGO<2Z!yiaAPS2%>pp!)&-D0H< zYirvhuiJFHo~?6nhi=eWd{Sbi2;L)--PJB@z+2h)IwdJQmmmQbr|^?&Z7>%3`-(E7 zLIsa0$_gv%yTrIDcs9QuXCl|E5$6{h3s-?2gSfAR_#K{&8*sA(`F0#cGuYg^&i&=6#;SY@q(GWpqZmMWE-v1M-5ehkf+lK- zeC#Ktb{ZI3hNL!L9OvMo-=KF}Zt-}a`$UVPWb|{Wxs6xg-3vnxm48~_!uvvW>+Y)v zXCHX*7!5H0O{hSUO~ZZCR{qvK6;XJ>cxX3h9;L^mZG}2y#GM^VrrM#RD0BIMw@+0dfdUFn6kRDlWGvq#TRj8uI`?jzBNd2&8N{cAmlT952-IfjaJdpK zZt->OS@6WAY5}_4+8CY;#Of82;jT`7livM9o(Cq8(e)8q6!fu7Al%a)YZmZi-S)a1 zH9JiEZr9aO-s|vvXF~7kiJb{>)X($}C(w~I`zCLtF67tcRP)q43$h3`Tb~_or>QJj z1txL25eCU}Y~yz~e6?XUSIE?A5cfxkFUls+O!_bTAHK_<^T+PV()H5dmnSJj){^Z8 zX-~W$!?Nl1Z!Vp`PZ|p3BTp{`&m{-^tTR#iKDVygPBXHx{p=|W+9YqmYUAA@l05qP zaU}#gEPG^evEv@4&$2*Fi$w=L@++d_Q3`1ZGK&oJ_JDPB#y2h=|KutE?MIgQ4a7_+v8<4R z;N({;wQ5&48vNh3%W`9AZyWHv62v&C^ITY5EE#WYH$cVd)rF9$v&cYv#<5JzOqPc~ zAzheLT%jVr>brj?k{Za#7FN`eql}B2>5b7Sk>;$4K<;r}K?U=UU-+SXwezP*&efvkq&Ly4 zr+wAw1{*D>L#P#bS-_hwCwpyA2#Rv@Aro+|jFY?EI9C-tO~H#3$_^&G3+l9sTY3v) z8}dl=Rj3)bI>&?FZUZIcDUs*HvFZ<0s)JG^SLHncK=b9%Rsx@hPRTnx`Iiy4$}7M?n%@wN#;zr3;$U@)cqpFE;cTg|U^LRn?M z){cF2c21$#!?e{$`uPyeesvxGmT3!HG0f)vX>7HI+@Ora| z?q&YW9rHk(!dqanD|sl%vZQF4^GMN`kIQ9;XyIn(!U>~3#qQ(PxwwLx%Uc2GBmmGO z=e=KX_!LG=)Mgx+6)ktU_7w@7*`Da>Q?+0i;z=5Il)zjqK;oOuqXXp690$Myu%kpu zL9^!Oe9hBubOo6MddwHq+ZuX^#Xko|*Vjqa};%?+2+QFjFna*X=m81OTn_%ii zgBkb@Edgg05$VPCWpJ|qXF0ve_4t-*=@j9qB;+s`nk`xh&DMQk^`3kX=jv7k z(t6@S1V-XMP|;ea$0EHv+L3<$MD%yVR#_We?XbeHsBM}AUyn_AI`IH3 zsSK(eify}oQn{}ePpw&gOD|V*f7u_0EFt6=GOpyA+Pih0;#DwXEaR{Kcq<_Dxltws z7=#6nlbX}Z*WFew&Ba~0Xm|)XEqeNqpO1e}CzxHqd^+NqIiE)lfVuX~i-{?&f~93f zm-h==VEx~f((}rh5`_3OT}lsih$8Cr?L?REMEGtF<@8s2-jy=&#!>_ zaz2NjU<2jmbJwnymqT8WjNY-@IP-^(v^97$p>JHQa&KmQ1{RL@RMN_O=08x&EVY&A zRctT$F`-p27N%dh@2nnpcp6cXT~P9F^3;cW++bz+QhtLXSojI9h(S$@7x&K#k&>EFh*Z*wQ)Z>r^Dp&TS(dC| zW_@n<9_x?C$(P~Rp(3FU}n|`>^9Gi3Z0iQ*xL)~J%n<*8HYj2q4 zX8ZEB*D?q(S8V*MoTnwTZG&XLxPJK9f)`8C@cEczOBv2Q6`0>@9d$);JLW;Qx;KW+ zIXUtU-!jg3bfrt-9Lu$@&!1n(EwAn+?s@^Eao{@|Pj0~Z!GCVk4yFL$J4 ztkm0lC`8a6YoxC-k^Fm!$6Xb#nw`Y=f60vEBNw-tUck~#?%j(GEj+R98+B8HbE%yF zRxQ{Hz8HvXr?qjWVKs{)c=d3D|4VbFwvU<2p}>4|#&VN6%*P@TUtn^P!76YLUa{o& zm1WNJw6cT*)&<-v$392tdmU}oyl*_Od)6A38t_|Trp2?zs@%-H9%P_855DLHbT!Xw J>Jkle`KuUq)W3#)#J@YbINTAxH zJ#B?6gPux{+Np@rdR7lbN9jX;0f_p&`fZ5m6zWGkK^UWd@hG{Lk_3i z%vu$~%|4yA0SMbW7u9%vw7j4zXl|#3Ga7K3b!gX0`!etv+22vuB7M_9gUT#|MveD8mOr!E**cSdUs`NQ}$)yKH{yS;dQa0`pT+?{zAu{ z1NkM6ReimkFU+1XA37VBRVmIHc)U5KDsoo!!|$%HneV>lm(uW&u{mD&ejT%G0K?vX zDdOd&bCMF*z16v+J5#f1>6v4$)mOWEK5Gj)cQ@hw^}*b`vHq(?tG3+OklLQCZewq3 zzrRuY!NR!i>)lVyTvGF3)6IjY?c1xuLex^4&iTGO#&qCfr!%m5bN$@KPrV-TLc{8q zn+HECt7u+k!6;L)RTjk0_sYx{G4$3);GcZug=_m=y1nn z!8Zx|f3&vTnS(Zk78SM1%4YrZbH5Gma;IvdPc6<}6kc&(I@}nIav}Hje|WTIXw|TQ zet+-3=Jof_jzn^Xj`XzozjO4bmm7Pp&FYXjk1rAKT>uKNlm!KrZ^$GlyH!lmb`vA^ zSRJ791Oj!U$3apn84fZr#jH&uy4}_xf>>H3dQoOT4Gt}{g3Ty*GP&hhMyh-zrJ_ZN z2|~4p0035oBO#B~VsjB5jmV2jfOlSuh#;>Cw^Ad@H)KOvyOV)%F)l{oR1aG!5hVyA zwUagzIl8nF2r$x!R&bnyKoGavEp|)Ac4skysZ=Til^_xc3@l(*nT;bou+6oAhwx$O z7#HPa9UN=7K|CgDvX^igkqGFa(fF(mgJBHb<{DuE@PT+p2ZD)F#A-z*dbqgMQUEd% z(64&9jG#}E9L8lYaZ*fbDP!XnOoX7RF@Hyi)8b8srVz%$Sb?bv%!*B#GF@-T9`oQS zC}yn=uNNSDk|oEQ$H|%$8?W)EGcge0K88EVdNg;hF|aZi2%ViO;ltDGG$MX}g0@pE zP554ACX~i$9L5+-3FA0M!YYO`!%~%kHeoV_Qm&FrfYRGs9BHE%9twbqS%9O&FVM6fQF(;j?|GH13*y;PM}Hx!;KOtfl3Lf zJRU;{bb`H|X3b^)%bIT=NbOtn4AuqaFY}6gJ(bI>@{N2$3+rtr2=cZCK~laHTx2Oj zd*cLHJ{7fsv=uX8{}?IQQ91i7#h}0_lUae2FpioeFm6IASf!FNu*8Jn6it~-l)^{S z7`n@D=G>%{NiGIF0JC45hS0D*?WE8jrg0OD> z^4l68HV+5`IlUn@a4;w=)PLcRb@7jY=$c-aY|QVvl?VO>fS$zHE`HYWuBG>bnz%Zf z_V7SK>|n_G^za$$x9!@R{C8z=F#7SP=dJ`NrKeL(9#tE0sQG#Xd*}JgSE}-~b8AC? zO40>h*ykU#feV|nB+u`xYTx6v2V-hGDq6Pn<`7>;71q|j@hCB9_tS~e>YVEHHIFT7~^4UeT^|8zQ)@Nlr|MQoZcHTSJcmBKko+nz& W51pTEd9e|sD$u89>Gr2AU-w^7I7~1A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_empty.png b/Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..40e8ac5216186918389147a014046b6e454f32cf GIT binary patch literal 4405 zcmeHKdr%X19$!Ft1VK5USD9lCZKsaiWb-1)nxH^}`^IITEGJ<9%Zbx?G?}BA&mBlJ*6mi^nA45Zxf!=&UBb*|09{r z?tXvY@8|dZe!h>%Z?`FRRfOOn0fHbAh7?^Iyrb}185#_K3(9lr;qBCRb0(KYdQg|! zX=Q8xws1zyIAAl@Fk=|aRwJoJ8cY59(4Ro>_~42K+_-3SlPFkE=4P?Nj4->Z#r zv8JdB(A~2|Uo2<7JoDtN?@!DG*AdWlY4soI1s|u`Dr3K_`a!lSK9FqAKW#`ET6eyF zSLNK4ww>-d_mcm9@z06au6+khX*HcqN8&b|-E=;(HSzMZ|EzqQioO3LIC^!k>P@$rk0A*E}~7k-RCHuz0g|DS^E-#^yY zgM1Tjc(>{3^(g#EL{?UlB7gP={|h1W$=TLFh!KsMvh3Wr+SgeXI6g&7JXZgeGq942ME8>DYfHB;NSQfgYb zB3_{J5)i-+I1=^RZ4Q?3YK1;r0zUI%u@LpCa9g#)Orr@+a=HO37s*99ruQ;=QenIR z)wpRZk)}%?fq-vXVGhT+2(j4X@rXP!k<*fcd#QYKt9A?(j}INaIxJko@l{x`aB3S z;?U1pux8k&;xxcIbKMls=K%*7I}w7W#_V0WZksP0ni2yWutQZA?kbtIa#J}XG}Bu$R7j*~UXH-5zz&O}F``55jb?a|nM%23N_By>(Hmv_&g(+c_h3ED|9 zG~s`YQ^dvLB#ud_I2w~%ta40cky$YcP*OQf(Q%|gG6BlqU^&u30Uip1ix`NbRw#hQ zf-5i;4MvR`DzVBWYL&%Gt0zFLaWk+gN!vuPcqke|sb~_A3JS-pKu$q# zXe9)-0E|+}r8J-~z~nm`=t{W&^Ryk?mXH2`3Uv2CYyk!p9{h8_8Lr z0qg!5igLIDM`IIQ7vN$=eRN)GVOeR;2D?J6=EUZNyRf3CTekb_E5HK7_ zEy-6Z1n^nFXow^?AUUVo>~z|+Lf$Eqw;WqG!iJ(rj?|GHfS|ZkPT(p+A~#EA1Rh67 z@nsU6z$fTCX~vrWOWJ(QwDZg0=z^0_JT?kP_~M7oZ}=I>!*93)gr44HO8idKHBHx)7?_gsbahSBH6;e7 zq&!_+zZzYF@xv5wz<)p$3U4B-q$eaMy2$cW&12jxTap{UQGOEBkL9L!9JEXHS@?%6n8)cSJ9*N0kbIY1vehssaslVG{)jlh~|Y?V@gW&6`$U09j+|yTHmFoWvPP^pG0p-AeuiYF?AoH zd!Ik8eywDYY_V){)bFGAzg<7j7rlBzR6}*+>vtOG;(y$^@Uw!1#HZTX%8LukYpd!Q z*{$nr%y%}h+O?B+p|y##qAkn{+qf%cH1b=my|w~`0h4GGj& z(RvCuD%4VsVoSx-dU{qwK&2j4upD!>cBYT350KGTv>sEWR;=23zYPdD?aU1`*Z)Xn zv%BBN=llD9zTfX}^4ny|Opg>jCPEM-(qzm6qOwxAxNP9NtQKQJ33k zV+#Swm$(25e5?&YeCOWWvuz6Z`P|!{->V2S3J*8y>;ep z(3YrYrc}+snr0}BuRn8oiXr{+T1#-W#aO+_qYgSW?R?i;FKxP;uG8nSQbg;nTs&#@99>Oy7j3w+A#*2pzGY>@HT&5fYUhsW z^+cmD@Inis3ja*qaI>QMvA$=MC6q1j2i2ayfuM7i#WSkro$f)9fc0!@s>PI=`XC*c zMD41|-y7SL=6u+;yWH?i;D69dTi+qio|?7!ujPh=mUE)NliTy|lsy?~DzB*T&2 z%zSz2BS{O(wx6i$$k0_T{pbU3Wp{h$zgt7k3?>fsUCkPNGH|81Xxp_7hWC@Tt?aeh zp-rj#;}>-FbxaRlvh{Z5^+W%1)>cG?Yvl}M{jMW6zv0Uh?vTc+ccv|x{->GG)vt`b ze&}RLMPu&XhA(tKgs&^H&pYj@sozM4g~i9Fq(y@4Ww9yy(#ki@=77o zz}>&A6V0r;9CCl%#qOF{_nK4-W(OX7vG6V(arJCajpzJNiOv02!g|*PA2{6Hb`H6c zXnL=uY2Xq3U}Roii?Ss8$c2CnZ}VMS=X5Q~nm=Rhko?Z>IXEAF^T5&LO}C2fAk4e_ zzJ9#7H)gifdh1wcYv7LKKfb*C^NZ1KO82QHqJ43&?TT60UODCrl6Kl96ywYX5}(}# z`wl_03w-9>!a*5MjASE;!jTDzjWikv}U|flVr+k=$ixVJ*G4z0= z-K>jeoeosMr1G5}UMChqJ^EmMc9+>a3h&@XSb%&;eUwW|NN}m$E*ILSToc9E?gl6f)gpwv2iR6cn&_ zm){GL{g5Tk+Q!IwXl;VVpU(J&K=)DHhpZpu?l*>3W;3aG(jH-XCcRE9#3vai%`&9_ zktXDXMy|lI1YD)T6toOrltQ7wlyZeiM&;u)0hn=6CI`n;4jKqh5M07SoO}RmvIK^~ z7(!vg6iWD{W;7}cC<#JN6F9_Ej)Pd_W?@%Sh2vKxKrs+XmY|W-G?9SOv__68Y(S1_ zY&IN|Gd7^1RS7grQGO_fCexg5I|a+h+NlB{bvX+B3W0Dk*<#X(WfFW$Vkx9}8+3p( zz&aSGmm5=Mvv!chQv#oaN+wTG;4-zEP-+NVJ!bSgaC5L11yll;$Q6E#P#6-X1F5Bi zPK5w|In0Jkbpwiby0e|mLY-Jx6e@U*s?Bhq7>cL#6b~RME>n=Wnj{q2G8w5i-u<^3lt5%4Zjw${$WB<|5%U|J)8nZ6^~RL zVhyY4<&>iU!2M&SVIRoZUuXuUOhr%(&0qwsOn?O` zoHpJ|xj}LPDm`K5-d|&PQnBuQqd9Qg_dQ8gvP*GV~ z9s18Lz2B4b!m8Rr|4e+6>s*?*B9i`Sbz;0Bsj(;H^2SeZ9NGKmo}zoVt5w&j*sqrj l#-W){-B;C?e%n|x5D@<8PR|RS=$9~g#AL|SA4pkN_Fq{hNX`HN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/default.png b/Resources/Textures/Mobs/Silicon/station_ai.rsi/default.png new file mode 100644 index 0000000000000000000000000000000000000000..d52aceaf5b13f21bb46feabc481fb2d1e7fb0026 GIT binary patch literal 2082 zcmV+-2;KLIP)Tc-8*xCD(aUsw|DN{`DVU3=gi!hQ%?VJ{4ap^FSmY?qf;-HIoBu=Ah)^z zAT9iVx|kM&8bh5MeG6U-O=a z2+ow?z(6KVlrm`9@At%Yc1hC=8tq-_JU7I>F4SVc*SBR58mLHE zqrYsnyy6}r(2m==Fs*?3YlZj?3#~wmE0Lki?^ytlFIi*I!8W49n~CnkgbUmx*?{I$ zjCP+kXkV-KUKk>v-VG}ZDfpMyL>ol>A;CS@BswVWw>23uHjyH~Cjpq8Ob}U}2k~4G zn$|taWf|TJSOkZk?9ST*&?5!_BH(`aX)zGux#P}oJKbYj0E>aq z`Sb$OCocvk0`ng@FFLoFq?PUYe3bUSTJZ+S8;Di;+u zS!G{!_tTaIar)?6>k5Dz@9jKch${t#x6cx-OCr!&F1T$~r4+q~Eb&{#y(|}P+f<*H z?zpMmTisI%0QJxOX2_8r5Tn~TuUB+3Ni%0zoyO>Ip|})d5fyidLQM%W>z~1*8bnPscVs zBHwxa>`-oHqZpbj`Nq;EgQ8=mGsmM-on(o?7SL&n<9=slW6TqONdeAvBxu9aCUM2J zskjq`IS5)&I8N(bisN^12fygNT0(6)-g&Ab_{?8;J$TL{)l_!FDXEEH96#5 zhCsBtZ6f;OUPfg5y#d$n{32FGG-F0CkN?B1l~Q;f0Nle09DcDb@ycIPfYtL&x?gKj zZH3|Z*#2Wgvl{w^`f(W#_8*H&zXvcvePdbiJ8?5czOnqNKFaltiF%)q{IEVucWn0H zgFB!cfe-fsSyQ@hATD4e5N%>k=Ye-$f$zno`X8*0Pt3_=HEO?210Tl%UWag?G{BEGlTR0bKe6fY{~$csY0~QEm<&K5zas8imd2<(^Y`EQ>3lK% zv>08iJl(SZ+Hpmc*OEGaNed`e39RD!J4mFCaAy}}$TXnhq$0`L{`H!MtQ)%Cy~j9j{r zowQuX1(gL@(J)SCfAR7lmcCI#S%B|;O4xJmgbyxGChdht_%R@8ex)5DT!)5=Kj-o= zcZ9;=_q-#7?Jz8XvBoYIgsQ8Pbn+KNt`dV50rjD70Q^{twYws|TndYFen*Ahvjt#^ zb2d4~^Pkm^4^zEue%C|V9Cm-%wRhz|!>+K`4Uj^35@0Gd!#)cLoBx5E27`t_0saL! z0(t^WcaA_|Zh(&*0e=Y+#h!&NLcsjN$ABD%;(9px&Rz`1^N;(rx<7SBR}4w=R&jq2z%~KHZMQG-G=CL zglrL7jRdvYjgh;w_lGEKTo4?!nc4Dx2mu`BHfg|D3~>MNKA8y5QW#(n+)Ggers?<=xRtP% z;u(Dl^t~k(RbIek++_NzLt6kolP{Jm5fwODy6~t@1->jmp2;IQsbHHb3dnRgVfMGi zV&n(D1i(i~R9PWYwE-C`y3iH?XYx1x?5BSM&=z;TfC_vEK{myx!C9iz?Qal#1wpa+ zv=<>Y&MwW~XUamI4teVfpT*qyX$gWdC!lILuPh2nV2-?1-#BUGFWo9+qc@+RasU7T M07*qoM6N<$g4CVXe*gdg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json new file mode 100644 index 00000000000..a3da52233dd --- /dev/null +++ b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2a19963297f91efb452dbb5c1d4eb28a14776b0a/icons/mob/silicon/ai.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ai", + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.1 + ] + ] + }, + { + "name": "ai_dead" + }, + { + "name": "ai_empty", + "delays": [ + [ + 0.7, + 0.7 + ] + ] + }, + { + "name": "default", + "directions": 4 + }, + { + "name": "base" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/base.png b/Resources/Textures/Objects/Devices/ai_card.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..244183c078c3d580cda31d0431ced9150a7cf7c9 GIT binary patch literal 4432 zcmeHKdr%X19$$12&o1Gq!oMKz-D(7_8{4~yO6+) z8pPgtR!=;9jcu{E_-Ko?w#*HsqoUxz**PD0^`>XVO3|VRC)2ZMTfB0=4ezk_YavbVi1Qt58|_5Zu};9R*?@>4$wh z=VD74Sgi0dFcV;15ES^k$9^NK4U2sIC?>J$Kw?}6oBvjV_}FQFqkh1eDs#V9_5SI? z%X|X77b&~yI$332v$G{aUX}Xu^rdU<&(#&)zZ2cLx?i95HhSwpnQ?B<{ii>v-P4_4 z@a|UYcmFt$ySe?%H?Lku+O=}m!HiaIpDI>+?T+z$%eklGkI#MaT3Pw*vmdTJb2{tm zEeDG!+UMF|9PHS0{-&&KRpa;3niTilO^(9Ov!;RMU;J|E`s;>j`8o&+t7gq+yVYzS z%Liof>ZU!W>^6JMOKbCwW-d?chkI&{5T731Vc5Ss_FM+LqUnCoS6ykvT{ZR126^M0 zh%K@2%u`%yA)4h|KcBz-gX-EhUfvrh%qw2-MfJx+h6k^;ZF&@z@zEuR0EeA8#L)TH zQ}zu{$=;1b`W+jb$LcPjcW-}q=AXB}82a^2cg3wCA!@~v+OX6;hI3*Y(hb+$Y!WXG zwJ&&KUrdkCv#dIP@#fx^{;v|g+|f4c^3J$#`;8m76*N3N^;t*5Z%(vp+H*5MNiIxo zZt!*YG+ckB;l?vt$P@J^dz*7~e~8&%vnm{+wYlcRSZ7m7{lU(zimtY_yWePf|M=(U zWl0^g;_Zv@&4X#*n11zvG0|U}VJ#ZG@Tat;!B)i;_S1hqI_2@_K*Ji}(XSuxO2Hmk zE8jVuxjQ(R;@f!hTCeGIJ|b>Y*Ag?oIBlO@A$#C{Xv-|>jg5Oz`0~1`S5A2WY!;7PMD^Z4E(j9tBBrPDT;%_(0!5 zkTEUbBdHQbgq@6=^_q|eADu;DmNp^lbT-W9Gc(0(b|uf`SLQgV$`T5vk+f8~F+czS z4Hgh}!YZY1rhGquXay61FhmAb#BJwP& zMj^nP2`LsuAE8wG{eFdCqu_YAQibEV5>qSHY7|(YLWNf(1E^O>k|0JfEQ~<$tWRV) zFDzk_POeNeAqddJWAS->HrqJ7R~Tgh@SzNlKBY>5DLo$LWDh~iEC(Q?0sWwd-~dyq z%wq(ujHj5)a>gqrO@^SUaerSKUm8k>rj$%6;{m1uSXDJ;$tPZl5c@}gfSvol?35o_#E=)sfQ*bBhR2lTB76gYnDT+c} zIHlF-7_G+1=t595MXcg@4++Z2dPp~;^m*MOg+w@!Znv5cwE~-v*h@*#1suQ(uwI(; z3lk~_>tXUmQsPskS8Mbbj_Y-}TBXPF38NPnUI4u)p{g*2MjO&dg&{yXfLc=OQ~(f? zgKP*h&yXU=J2Kp=(+UOv`wtyJqN`76a2Vp6Rat8(s2= zk156r{sH;Hr_w7gHx7W$tZ?V*EDJO&{a!zPycS5F@MW(TAZT8@bcXF)F)slKBSfn$ zGomkYe&oWW+SN}4f#|W-lI|#Iql)6@Bqd^be_1?mW!P}1vC&muC-bd$yb2vrnx5Tm z>vYkBEB|wOurDkp>%E%NijA}0UV=djujRKYcFW$g$24sVy65y{yy z?Bi$Xg@=otJodf2p!`ts(KWN5?^{;$v*FxhmU~N5XJ^lmJw2;ZUenyMaJU^0eij|P z*GAz3=HT+&XW7WP#qn`bRac|q g&)vN>7n8?<1IlWm!V?ox>i`dsH8aQ3m{GL#zrOQGZU6uP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/empty.png b/Resources/Textures/Objects/Devices/ai_card.rsi/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..7e61f368de294ae506cdab73e818f0f594bb260c GIT binary patch literal 4292 zcmeHKeQ?v}8CR0!%Ui-=X$Wa^6QboSlVw?oE$b`-u?_LHPTj=Kpkqs9Np@5s%ScM> zWI!`$3Zq?tru1mLcC3R!*TBXKy_8S_Bs~~y(=7!$$_O;1(C)(EC~dl#mc6p`dF$OS zck6$#PnPt2{GR9ez0dQW-(PymmSh?74G;unxl5hp;0}XpVMZGG{rQu1d%^9kM&DAc zoQ=R?MGlCy0<1NJ1z3oR0SJnID0$Cib;94fHJDRy6x%RkJ^9M1EP72={qJ{NotfRC zSswf9^HoQrCikMZ{Rd8O%$7cEYiIL5Y00d+@txqwukO9;X6YZ-cU5J6@bH-*uKagK z*Zb$^&zadC^uIa#q5A6Bw3Ca?v-2-W^G=nQQq!JJW)3$WIIDbp?BJz4a;K;5d4-;H ztg34Ih2F|Tn@rbA)^;QLDJR+tJ?Blqr}~;n=?h|;GOg-F2UE~wwcoYu-O%M#4hTwG zCpsKnx5F`95Gdo@-E!tUO&r@yVN=*gUCHZM*?c=7>9L9T!QiXGcd^fdHz z7GM67=zr?Z52nmIo}BNUX_)F#|uh|PCEhX;i>u$OWYpsh=)!= zP?W-PFF^J7Y$CvY1b3YEaP4tpVCC`9PMNFI({no+M2}DNGAHtM z{IQ7SDJy3qP|7N>C`oc0$^sEeP$t4^4Fqu9VjctK4yhU&;shNEfEz`C!*f=%%|?(Y zVJ#w2lC%0ziX#Y==XeWiu@qT(KRX8EenkXb$<~g|N{8YB6i1N(jud#12o*p{fiQ!- zC_l>bCacBb=ZS!oi$n1oy;xQx7A&VIu|WX~hk|j1PB^{D>t+zM(KIUY*0NdvIDi=t zL%bYOM^!#i5-K!S=M%S@2`g^GNdhNHTM<5LR4FJb=tUhBHyH^suF)5U2IT;1S-n#M zKwJ*0p&g3AYO>;!OlY({65w!;l6whj`lhp(OYBH0wiK6i$A5PI`Gi}BTaT9GC zV=wb!py7X6>*E946N_Fdsvv$tT$Grp3Snj9E%90_#)k=p<6}XyT%rV(trz%so&YPM z;%eAXPyqYKP{R((#cyba0B^=AB0!;5oW(&i1Z*h9lSL@c2Pna6v9UHb(N81jsvOWF ztRgH50v-WZph4qY!E=X}YTo#4A~k}(4uCS$M4_XU5ePO^ET-=m!`0fc|Kh_QHyE?U z0KbF`Y+Ya{#74HlA-+Ja-{xm%9lp&FFgzJ#Li|qBHA&Zm7?_apWOq%{H6aEjWIWkj z|2Mh}qlYOW1pWadknc>o9DgqFrsh>KHm1~!0 z_MJYK_72f#zcVE-cB{$A zT&!7@oSNfZ_=^j<5OiqD^%n+{IzBec-QJXJus;ZGf8)FDdn%ue&1i1~p&_@c%(=Iu HdhLGz@YfZx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/full.png b/Resources/Textures/Objects/Devices/ai_card.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..59131c8c0aafc5f647d4409168265f23cc05e667 GIT binary patch literal 5121 zcmeHKdsGu=79WfS$|+{urRZXj7_n8^ydNYfAt)fmZ6E>_aG^NK3^0XcLS`_5|8sKYb-&;J z-FtuE{l1g=n>sYa)y2aFf*@Dr@}O{V&jsf$XGd^7zX=%uw+k7O(PTJmVi=5g0+xa@ z$aDkBK+RYJ1ew3rsjFww<~iFUf>)>m!s>1r6JGb+V=LMCS%vqTw@*zgbw1u~S#n}V z!HR8PZ%VFrXgs*pb$9;Db6#6FV{Y`K9h}s!wyw#aUh#N+&w$Tdg(D%@Px2R=!g`v6 z-X7${FMCqhUogAf@a6qw=L9ob&Yu1*wr=f{bFJrIMcMbuD!T73v=yh-^cUot@=q$a zK<@v(p4-3I+i~UDmA`kn-S{DYv-hDtywcIO!~L%7`s&qAZ>(opAjn}I78s~j1_nMY z2$ZoS>l69%8nxT{u!z0Ei#>Z7?S)^+uJ7F_DO&7ay%h5)yT9gPlOn09a8J3!rSv7I z9QQ*r*!8Dmsg(*PFDVS>-KQmhl%NJ!-T8Pg3S*8pGd078fGh_xTTD&A3i^G z)mFE5qJ7ai5AW=bQ#}vobZxAe*6`tMYmZ-QesoFy(Hj>_-rav*aDHX*cMIbemX{b> z+e@x)FZtn(9C-hp!yV=N z%|ks;n%$>(EdR?fKTp%L2y#uz7#N0t;#-V+| zALsUo4XG_xI^;KvPP4O`76cl-6%DtJwY`|Q<3*H!t&d$huRF|0Po>HV|F z`mdVht)4wQf2cB@vJ5*MCXJQ2>$e+0->tWT1kj-TUo3XWgroRir&xj<*!h@EL zQ-C))Gl?V(G7iUNGOi`7D575$SpoHna4^e2QX>BM2q5M$ABB zxSm0A!Wuk{lrx!Nobfb2ok69Vpw|=QDgZq=X4t^tvAGnN)lkf@?8EW`E>z zH5v)Zm$HN!u7oAjYPBp0A{4R2La~(3LnT}dESW^5)DtAE*P;{^AZKHMM=R!vd0L); zB|^0*pwPf94aya=_)-y9lOW)VG;qQsiZCMvx)M&AoE1fd04k9{tU)9i4NHg$wJf1X zs9{Mpd|wui%a=$r0$-_AD6&%_TG=w(sDr_DVmdex;c)~@NdI4GYWXny#wL9^Mu7O~cGK9Jia=Ax-o{>2F#BR+Fzm}h z25ZMkAmFtqV$TzBjSXp&V0|JA_K)#~eQL*kr5Qw^nS@dv%n}L&LeLCSlqE$FJ_`|O zBz&>fH$mg8oytz&38V=&qDvBijzBBWpmwbo3&*Ew(Nw%C38m%%NX7ykJ4rGoXS`Sr zwPQT3){pZGJ^bu|Nm~r?8?%9}3+#lPiLG#4FKW~I4Uh48_zfcf>K8$tOWzlAy^!m< z6nHN1i|%?M*K;ZGT;Lbo^?#Gg<=Mv+st5moOyEJ(e+~(PMycPfGy66J z%gcu4F$4t7I8U7pTYYBC0Y)cMsS0+w>r8i^CEhl)5QiXIi85$Or1|>?H+Z3Qmbf|I zOx;p2e@~d!+v~l8f2rOr2=F>l=sxJ5m+awN+Aj7CztKoczppwP^WfUGP0i+6$9jjo z-J+RiMn3u@eSY~_|KJKGL$6+dP|_21uY95oNezGlnd5BtyFF|=&f zk>I1|1B$shb^a&PvNBVLtXY>wkAI`O)Oo#e=k-SHQ9w(X<*m5WDfMB#6}>(!WrHnE z7j5w#qe-bzPu`3v@)gDC-@!*hwvQ64x*uMzT%B{tR@vbtjLAFrPkQsfy27gXtkS~^ z%3b~{D)Gv>wqowkIY+BrDM}2%<6?C%n5tLP%(>IsVMt0E8mUbU2dWW_> zR&l(tQ<3q~r}hWm4eWZbH_`8~ zq8{(rvZ{ONz51@V2P0S)tg|||?C#?Heb?~r=+i~`y~^ymBchmt9-QjI;MC#R$~zWI zva0A^>&MqZFlUcI)t2rtw?5mD zLta-i{day<*||5Z1GL(J=pQZ$SfTYpAAz2Rr^b8W6gj1g$ap`Uiw zX*}FH!arV-Yq7r9MKfIOr~Sgm9)C*C6Of0#(Rmb8BPd{;&AGvvIRe#pITh2-#tfH@ zK#R8K96Zy#IzKx%;to#wWr~k9?2gKLBYtFiPO0m6*2kGo+V4EDi5pxV@p8V*+i+{) z-YP}7hiwHWT09z>{neiu_PuIa6zBhSMXatNr~Jt^E7e*qYWWqmSKXZS@>06bDuc3}tX=Q0dY&dH)5Zi_1>{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/ai_card.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2d3863145b951a7743066a59157c1cc7e562a50d GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FST zi(^Q|oVT|QavnAiaJeXd!mxBHL-@lzyJI3eW&X_#`)JO=0C5^IGT8Tx_t4~ zX@6Nl{8v5ulh<%-62mLgwUz6yO>>#Rwqw3njO^a1`qCRp_ZvjpV=T? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/ai_card.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1704b9c3c112fc423e9466328df5e2bac1f15c87 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G3n zi(^Q|oVT|&@*Xk}alP2>ax#YJfu_-<Qq+r@Tz=cdWe;su{G zbQCijv1E88!%)cAV8QM%hgsnqqky@H!qP3Z{1Ny;?i_Y=X7}c^aI?Gd2{7O|KF>S%~kcJoh@js0_;4V~` bf53TkzSA$a-26*GpEG#6`njxgN@xNATZDFx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/ai_card.rsi/meta.json b/Resources/Textures/Objects/Devices/ai_card.rsi/meta.json new file mode 100644 index 00000000000..8b8135fa16e --- /dev/null +++ b/Resources/Textures/Objects/Devices/ai_card.rsi/meta.json @@ -0,0 +1,58 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/1feffb747a33434a9d28450fc52ade75253aeba5/icons/obj/aicards.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "empty", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "full", + "delays": [ + [ + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4, + 0.4 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/output.rsi/aicard-full-unshaded.png b/Resources/Textures/Objects/Devices/output.rsi/aicard-full-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..51a309d579ec0babdbdb117920c416e178e37599 GIT binary patch literal 777 zcmYk2dq`6O6vk(g4nv2%j4Ul*DZWTh!`IbqxvA+wd?bbTPz;7!*mS1LYZ6o-Dnw>Z z(HLfA?UK5N6W@~9%!x>ZyWQy@dElJGIh^zH<9l^8i{b8e-i<^e zxu-Gd*+lOmvX1OR)P@K5y-B2F^J(;yoT_$2BQH}YpFTdH)*O*dJ-am_gbWdr`zBktjW<{^8itBWe&P~yV146sa(nyVDz9T|4mJ2v5$fSYW`#yhmH9wv*!?&zGcvg*%qut)xX9S z>t1$sLdZ9NC58Es!%wye(tNxDhSH3bNFM~7SL#Ta~aGBsJb0AQ^lC|r2;F9 z7;S4q*z(Spzw4apJ>1FJu^s_Q7JjzzB;xf?+LrNEBRJr^y$Tz)xUG;7_-@6`%UDwA zn4maCCz%G|(Os)V%1s1SR))T(rdBp=C!=>@mfVVBMyN)kN9%!jFO#4q##qEr`+=%; z`VREOb#{TJN_TjLdMvWNX7U{VX-%F9`q!WzZfjC#DA%fi4y)3nr6fVa;U_TX|K{QP lKXoFrat0r{5DgqqcUW9ur=%6PVI|Wsr(MsYi>Y_({{hD)pQQi* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/output.rsi/aicard-full.png b/Resources/Textures/Objects/Devices/output.rsi/aicard-full.png new file mode 100644 index 0000000000000000000000000000000000000000..03908b5284f4fd89c2ea79adc1227a271591a21b GIT binary patch literal 1746 zcmcJOeKb^Q7{JGOqpjhvO$n3Hu9UJzM`epE5lT&47D0*#GvP^WOJ8?|I+zJkRg>z2|pq z_n&8OV~)XK<^=}$?$phfb%Qa-RQLZmX5V5A#NcVjTENK)iLb@X3&mK}`X9XiY- z+=sX9ddB!IH+P|(;_j{>^D9Os+k%;k@CCWKLdGWUy5TFUuVwi%PiLg|nh1E8c2~8) zQZDTSM;^dTt4SPci*y);akQa`Mm`=_&z=Uu#M< zm%$o%(y#R^)u?5UX>|>_Y|;0tcJi|#FY1>HnZKjV2>pOGO_?-pj<+h!BNDXk*)6H? z5!`7Y6_jTW)ScR3U-70#92|SR3Z-Rg6?xUKy_jA1d&cR>Y12tGKq(MX=?32xJ`(>C z(c0o7!%-ip1%IltQcWkKCG50u#BI6k1M3-UO>x+%xMjD-upyzM<8Esy{8(uf z{;^b@4iA!Dx_PZ(Wn(!&5Pj0vwm8Fu>)VP}oSGzwh<$kC(dZXu6j5M7e+QySSGIY{ zHhNG7q9hFzUhJx)Uf*bUv!@yv^zjZ(72k;ORd89+`hX9w`+ z;Td1Bc{B&uj)qv>%upLQT2tEg3MkZvJfr8;M?7mGO<}r^km_#W$vNzKlvgWb0`grHl)vBjV?XN5Y_l~^CDVq*ht{-PD!io+8}4Wm*S1$HyoERj;FIsaJaJFm zY?%S1vZY#+P%XMOY4P|M?NB9K`C)hrU%ipFsZHCA=(U{v{O2N!=^T~VtR3nl0ZY)U zbd|xF(_|0s9B>_?dusv_Rh*BTq`XI^&r@}yano@59v8ohgvYm1{m|G*R>y~-BqSc~ zpL7%t^{8UfwCksg%7)8pVBvEnOd4Xzx@00a4^9?7BfY%gFlnI@`}*?J*5D5|A;)rV zD{WY=Zx!bq?yoQg=dsq2cJ|vnZrgCU`^%M zm$$A$j)enC`qz~s6LLF0Gz4MP8^tT{ z%F2`a<`O4*Zre9N@nrf`T<7mlRRy3=*S7egUBYn{kACL_)Frm6fw(G3ZXG_3jn;a6 zDIS_TlFcN;mPjsTrj$L~+Ln9#Q+x$>IM7Y3@7|2uqG$TtVDfyXUT03J9)?y_qL=s+ zgcVLvtdDR7!cg75T93Aa10TZW$IQg}To^(<;S)#$2TBMQvphaOIAazW+!j!#3jn&a z&vC*VHluS8MtU!4tvz#4Qkm*$=hDV#-|vBhL#ZzL-ay`38ZVf@n7*W%chZIYc$F>O;bH2m8MN0{tu|2u*vQx z#nPMPJau9TvY?^#sptg47j(kIx&k-7FR#(^>+Jj4E5PJSnw0-rw*2V-rnqD=YWB3V UyS=uT6R77J=(pXMjv*Cu-d=FzZ7>jFJ=nyn zvQXUf#{s8@n>goMn*W_`4pf|dD@}gh@juJ2|5aVObN_z-pW@6{7){ae)~DY-p1Xj+HA|+@=plM{%My0) zwSCu9*GrFHe&I(SSDz;Ayp+mxd+8Umj`uJ8OK>>Y3bKK%$(@S-T#Y-0@Ywq#$= z;m;oV{Cvvi(-Tm=RPqZp9|qW6ftXbM+1j%olg~E5djP@)crQTb1`IOb`PDVV>;Xaz zVDi%$P^%Za0SYyM$xmy*oZpAy2N}TNr#B!ru?7%P1IR1XfJ_Yl)BrW$+74@UVnV&j0`b07*qo IM6N<$f`|IS_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/output.rsi/meta.json b/Resources/Textures/Objects/Devices/output.rsi/meta.json new file mode 100644 index 00000000000..500ecb8e3e7 --- /dev/null +++ b/Resources/Textures/Objects/Devices/output.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/1feffb747a33434a9d28450fc52ade75253aeba5/icons/obj/aicards.dmi", "states": [{"name": "aicard", "directions": 1, "delays": [[0.4, 0.4]]}, {"name": "aicard-full", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-full-unshaded", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-unshaded", "directions": 1, "delays": [[0.4, 0.4]]}]} \ No newline at end of file From 14b3e0ce246e6d168eb2343b032c37af0cc43938 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:49:00 -0600 Subject: [PATCH 135/223] Bagel station ai (#31537) * real * AI * proto fix --- Resources/Maps/bagel.yml | 101 ++++++++++++++-------------- Resources/Prototypes/Maps/bagel.yml | 1 + 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 5fb6961da3b..092af8278aa 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -8043,7 +8043,7 @@ entities: 1: 39312 -12,8: 5: 12 - 7: 3072 + 6: 3072 -11,5: 0: 63351 -11,6: @@ -8052,7 +8052,7 @@ entities: -11,8: 5: 1 1: 17476 - 7: 256 + 6: 256 -11,7: 1: 17484 -10,5: @@ -8150,10 +8150,10 @@ entities: 0: 255 1: 57344 -8,11: - 6: 816 + 7: 816 1: 34952 -9,11: - 6: 2176 + 7: 2176 1: 8738 -8,12: 1: 34959 @@ -8173,7 +8173,7 @@ entities: -6,11: 0: 4095 -6,12: - 6: 61166 + 7: 61166 -5,9: 0: 65535 -5,10: @@ -8181,7 +8181,7 @@ entities: -5,11: 0: 36863 -5,12: - 6: 30515 + 7: 30515 0: 12 -4,9: 0: 65535 @@ -8191,7 +8191,7 @@ entities: 0: 4095 -4,12: 0: 1 - 6: 65518 + 7: 65518 -4,13: 1: 61680 -5,13: @@ -8205,7 +8205,7 @@ entities: -5,15: 1: 17487 -3,12: - 6: 13107 + 7: 13107 1: 34944 -3,13: 1: 47792 @@ -8271,7 +8271,7 @@ entities: 1: 61713 -12,9: 0: 16 - 6: 3084 + 7: 3084 -13,9: 1: 39305 -13,10: @@ -8281,18 +8281,18 @@ entities: 0: 12544 -12,10: 4: 12 - 6: 3072 + 7: 3072 -12,11: - 6: 12 + 7: 12 -11,9: - 6: 257 + 7: 257 1: 17476 -11,10: 4: 1 - 6: 256 + 7: 256 1: 17476 -11,11: - 6: 1 + 7: 1 1: 17476 -11,12: 1: 17487 @@ -8346,7 +8346,7 @@ entities: 1: 15 -13,12: 1: 34952 - 7: 48 + 6: 48 5: 12288 -12,13: 1: 61455 @@ -8380,11 +8380,11 @@ entities: 1: 62671 -7,14: 1: 244 - 6: 57344 + 7: 57344 0: 1024 -7,15: 1: 61440 - 6: 238 + 7: 238 0: 1024 -7,16: 1: 65524 @@ -8443,7 +8443,7 @@ entities: -14,12: 0: 1 1: 8738 - 7: 128 + 6: 128 5: 32768 -17,12: 0: 52232 @@ -8984,7 +8984,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -8999,7 +8999,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -15120,18 +15120,6 @@ entities: - type: Transform pos: 12.5,-25.5 parent: 60 -- proto: BaseComputer - entities: - - uid: 7413 - components: - - type: Transform - pos: -113.5,11.5 - parent: 60 - - uid: 8146 - components: - - type: Transform - pos: -109.5,11.5 - parent: 60 - proto: BaseGasCondenser entities: - uid: 400 @@ -110729,6 +110717,13 @@ entities: - type: Transform pos: -10.5,26.5 parent: 60 +- proto: PlayerStationAi + entities: + - uid: 8146 + components: + - type: Transform + pos: -111.5,25.5 + parent: 60 - proto: PlushieAtmosian entities: - uid: 5031 @@ -128959,6 +128954,20 @@ entities: - type: Transform pos: 40.5,-20.5 parent: 60 +- proto: StationAiUploadComputer + entities: + - uid: 7413 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -113.5,11.5 + parent: 60 + - uid: 7444 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -109.5,11.5 + parent: 60 - proto: StationMap entities: - uid: 7693 @@ -151927,16 +151936,6 @@ entities: parent: 60 - proto: WindoorSecureCommandLocked entities: - - uid: 7443 - components: - - type: Transform - pos: -109.5,11.5 - parent: 60 - - uid: 7456 - components: - - type: Transform - pos: -113.5,11.5 - parent: 60 - uid: 18105 components: - type: Transform @@ -152980,11 +152979,11 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-68.5 parent: 60 - - uid: 7444 + - uid: 7443 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -110.5,11.5 + rot: 3.141592653589793 rad + pos: -113.5,10.5 parent: 60 - uid: 7448 components: @@ -152998,6 +152997,12 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-67.5 parent: 60 + - uid: 7456 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -109.5,10.5 + parent: 60 - uid: 7469 components: - type: Transform @@ -153056,12 +153061,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,-10.5 parent: 60 - - uid: 8152 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -112.5,11.5 - parent: 60 - uid: 8159 components: - type: Transform diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 44d699b4817..3e9f75ca819 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -19,6 +19,7 @@ availableJobs: #service Captain: [ 1, 1 ] + StationAi: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 2 ] From 99a41a12ab05ccb477ebe54f7d265666dc607be1 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:42:06 +1000 Subject: [PATCH 136/223] Fix PostMapInit tests not considering job containerspawns (#31538) * Fix PostMapInit tests nto considering job containerspawns * fix --- Content.IntegrationTests/Tests/PostMapInitTest.cs | 8 ++++++++ .../Spawners/Components/ContainerSpawnPointComponent.cs | 4 +++- Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index d1172375b0f..5771e0f06c0 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -17,6 +17,7 @@ using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; using Content.Shared.Station.Components; +using FastAccessors; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; @@ -251,6 +252,13 @@ await server.WaitPost(() => .Select(x => x.Job!.Value); jobs.ExceptWith(spawnPoints); + + spawnPoints = entManager.EntityQuery() + .Where(x => x.SpawnType == SpawnPointType.Job) + .Select(x => x.Job!.Value); + + jobs.ExceptWith(spawnPoints); + Assert.That(jobs, Is.Empty, $"There is no spawnpoints for {string.Join(", ", jobs)} on {mapProto}."); } diff --git a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs b/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs index 5c8e3c4186b..210904b5671 100644 --- a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs +++ b/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs @@ -1,4 +1,6 @@ using Content.Server.Spawners.EntitySystems; +using Content.Shared.Roles; +using Robust.Shared.Prototypes; namespace Content.Server.Spawners.Components; @@ -20,7 +22,7 @@ public sealed partial class ContainerSpawnPointComponent : Component, ISpawnPoin /// An optional job specifier ///

[DataField, ViewVariables(VVAccess.ReadWrite)] - public string? Job; + public ProtoId? Job; /// /// The type of spawn point diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 686f575e8bb..23b2a318ebb 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -232,6 +232,7 @@ suffix: Job spawn components: - type: ContainerSpawnPoint + spawnType: Job containerId: station_ai_mind_slot job: StationAi - type: Sprite From 5261f01f2559790e0dd3871cf6b8b7cb1ae7d1db Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:47:12 +1000 Subject: [PATCH 137/223] AI whitelist fix (#31542) --- Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs index 348b0b04657..17c592879c8 100644 --- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs @@ -135,6 +135,9 @@ private void OnAiMenu(Entity ent, ref MenuVisibilityE private void OnAiBuiCheck(Entity ent, ref BoundUserInterfaceCheckRangeEvent args) { + if (!HasComp(args.Actor)) + return; + args.Result = BoundUserInterfaceRangeResult.Fail; // Similar to the inrange check but more optimised so server doesn't die. From 842b242c08257273409a9aed3a41f7724eff72c7 Mon Sep 17 00:00:00 2001 From: Spessmann <156740760+Spessmann@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:56:38 -0700 Subject: [PATCH 138/223] cog update (#31540) updooted cog --- Resources/Maps/cog.yml | 7357 +++++++++++++++++++++++----------------- 1 file changed, 4171 insertions(+), 3186 deletions(-) diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml index 53aac9f5b7a..cf9c5df727b 100644 --- a/Resources/Maps/cog.yml +++ b/Resources/Maps/cog.yml @@ -17,6 +17,7 @@ tilemap: 22: FloorDarkMono 9: FloorDirt 4: FloorFreezer + 30: FloorGlass 28: FloorGold 10: FloorGrassJungle 6: FloorGrayConcrete @@ -71,19 +72,19 @@ entities: chunks: 0,0: ind: 0,0 - tiles: EgAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAACwAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAABgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: EgAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAEgAAAAAAEgAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,0: ind: -1,0 - tiles: YAAAAAABYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAIAAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAIAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: YAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAIAAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAgQAAAAAAIAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: YAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAOQAAAAAAOQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAABIAAAAAAAIAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAA + tiles: YAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAOQAAAAAAOQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAACYAAAAAABIAAAAAAAIAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAACYAAAAAACgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: OQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAOQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAA + tiles: OQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAOQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,-2: ind: -1,-2 @@ -107,7 +108,7 @@ entities: version: 6 -3,0: ind: -3,0 - tiles: AAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -3,-1: ind: -3,-1 @@ -119,7 +120,7 @@ entities: version: 6 -1,-3: ind: -1,-3 - tiles: cwAAAAAAcwAAAAABcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAABcwAAAAACcwAAAAABgQAAAAAAcwAAAAACcwAAAAADcwAAAAACcwAAAAAAcwAAAAADcwAAAAACcwAAAAAAcwAAAAACcwAAAAADcwAAAAABcwAAAAABcwAAAAACcwAAAAABcwAAAAACgQAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAACcwAAAAAAcwAAAAAAcwAAAAACgQAAAAAAcwAAAAADcwAAAAADcwAAAAABcwAAAAABcwAAAAABcwAAAAADcwAAAAACcwAAAAAAcwAAAAAAcwAAAAACcwAAAAABcwAAAAADcwAAAAABcwAAAAACcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAABcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAACcwAAAAAAcwAAAAAAcwAAAAADcwAAAAACcwAAAAACcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAAAcwAAAAADcwAAAAAAcwAAAAADcwAAAAABcwAAAAAAcwAAAAABcwAAAAACcwAAAAADcwAAAAADcwAAAAACcwAAAAADcwAAAAADcwAAAAACcwAAAAADcwAAAAABcwAAAAABcwAAAAACcwAAAAABcwAAAAACcwAAAAACcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAABcwAAAAADcwAAAAADcwAAAAACcwAAAAADcwAAAAACcwAAAAADcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAADgQAAAAAAcwAAAAACcwAAAAADcwAAAAACcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAcwAAAAADgQAAAAAAcwAAAAADcwAAAAABcwAAAAAAcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAABcwAAAAADcwAAAAAAgQAAAAAAcwAAAAACcwAAAAABcwAAAAACcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAgQAAAAAAcwAAAAAAcwAAAAACcwAAAAABcwAAAAABcwAAAAADcwAAAAAAcwAAAAACcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAAAcwAAAAABcwAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAABcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAAAcwAAAAADcwAAAAADcwAAAAADcwAAAAADcwAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAAAcwAAAAABgQAAAAAAcwAAAAAAcwAAAAADcwAAAAADcwAAAAACcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAADcwAAAAADcwAAAAABcwAAAAADcwAAAAAB + tiles: cwAAAAAAcwAAAAABcwAAAAAAcwAAAAAAcwAAAAAAHgAAAAAAcwAAAAAAHgAAAAAAcwAAAAABcwAAAAACcwAAAAABgQAAAAAAcwAAAAACcwAAAAADcwAAAAACcwAAAAAAcwAAAAADcwAAAAACcwAAAAAAcwAAAAACcwAAAAADcwAAAAABcwAAAAABcwAAAAACcwAAAAABcwAAAAACgQAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAACcwAAAAAAcwAAAAAAcwAAAAACgQAAAAAAcwAAAAADcwAAAAADcwAAAAABcwAAAAAAcwAAAAABcwAAAAADcwAAAAACcwAAAAAAcwAAAAAAcwAAAAACcwAAAAABcwAAAAADcwAAAAABcwAAAAACcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAABcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAACcwAAAAAAcwAAAAAAcwAAAAADcwAAAAACcwAAAAACcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAAAcwAAAAADcwAAAAAAcwAAAAADcwAAAAABcwAAAAAAcwAAAAABcwAAAAACcwAAAAADcwAAAAADcwAAAAACcwAAAAADcwAAAAADcwAAAAACcwAAAAADcwAAAAABcwAAAAABcwAAAAACcwAAAAABcwAAAAACcwAAAAACcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAABcwAAAAADcwAAAAADcwAAAAACcwAAAAADcwAAAAACcwAAAAADcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAADgQAAAAAAcwAAAAACcwAAAAADcwAAAAACcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAcwAAAAADgQAAAAAAcwAAAAADcwAAAAABcwAAAAAAcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAABcwAAAAADcwAAAAAAgQAAAAAAcwAAAAACcwAAAAABcwAAAAACcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAgQAAAAAAcwAAAAAAcwAAAAACcwAAAAABcwAAAAABcwAAAAADcwAAAAAAcwAAAAACcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAAAcwAAAAABcwAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAABcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAAAcwAAAAADcwAAAAADcwAAAAADcwAAAAADcwAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAAAcwAAAAABgQAAAAAAcwAAAAAAcwAAAAADcwAAAAADcwAAAAACcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAADcwAAAAADcwAAAAABcwAAAAADcwAAAAAB version: 6 -2,-3: ind: -2,-3 @@ -151,15 +152,15 @@ entities: version: 6 -1,-4: ind: -1,-4 - tiles: AAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABcwAAAAABcwAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABcwAAAAAAcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAcwAAAAAAcwAAAAAAcwAAAAAASgAAAAAASgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcwAAAAABcwAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAASgAAAAAADAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAASgAAAAAASgAAAAAADAAAAAACSgAAAAAADAAAAAABSgAAAAAADAAAAAAAgQAAAAAAAAAAAAAAcwAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAACgQAAAAAADAAAAAACSgAAAAAADAAAAAAADAAAAAACDAAAAAAASgAAAAAASgAAAAAAgQAAAAAAAAAAAAAAcwAAAAACcwAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAADAAAAAAASgAAAAAAgQAAAAAAAAAAAAAAcwAAAAACgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADgQAAAAAASgAAAAAADAAAAAADSgAAAAAASgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAADcwAAAAACcwAAAAADgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAAAcwAAAAABcwAAAAABcwAAAAACcwAAAAAAcwAAAAADgQAAAAAAcwAAAAADcwAAAAAAcwAAAAABcwAAAAAAcwAAAAACgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAADcwAAAAACcwAAAAADcwAAAAABgQAAAAAAcwAAAAAAcwAAAAABcwAAAAAAcwAAAAABcwAAAAABgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAABgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAABcwAAAAABcwAAAAABgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAAAcwAAAAABcwAAAAACcwAAAAABcwAAAAADcwAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAABcwAAAAABcwAAAAAAcwAAAAAAcwAAAAADcwAAAAABcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: AAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABcwAAAAABcwAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABcwAAAAAAcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAcwAAAAAAcwAAAAAAcwAAAAAASgAAAAAASgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcwAAAAABcwAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAASgAAAAAADAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAASgAAAAAASgAAAAAADAAAAAACSgAAAAAADAAAAAABSgAAAAAADAAAAAAAgQAAAAAAAAAAAAAAcwAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAACgQAAAAAADAAAAAACSgAAAAAADAAAAAAADAAAAAACDAAAAAAASgAAAAAASgAAAAAAgQAAAAAAAAAAAAAAcwAAAAACcwAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAADgQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAADAAAAAAASgAAAAAAgQAAAAAAAAAAAAAAcwAAAAACgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADgQAAAAAASgAAAAAADAAAAAADSgAAAAAASgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAADcwAAAAACcwAAAAADgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAAAcwAAAAABcwAAAAABcwAAAAACcwAAAAAAcwAAAAADgQAAAAAAcwAAAAADcwAAAAAAcwAAAAABcwAAAAAAcwAAAAACgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAADcwAAAAACcwAAAAADcwAAAAABgQAAAAAAcwAAAAAAcwAAAAABcwAAAAAAcwAAAAABcwAAAAABgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAHgAAAAAAcwAAAAAAHgAAAAAAcwAAAAACcwAAAAAAcwAAAAABgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAABcwAAAAABcwAAAAABgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADHgAAAAAAcwAAAAAAHgAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAAAcwAAAAABcwAAAAACcwAAAAABcwAAAAADcwAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAABHgAAAAAAcwAAAAAAHgAAAAAAcwAAAAADcwAAAAABcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 0,-4: ind: 0,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAcwAAAAADcwAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAcwAAAAAAcwAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAcwAAAAABcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAcwAAAAACcwAAAAAAcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAcwAAAAADcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAcwAAAAADcwAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAcwAAAAAAcwAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAcwAAAAABcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAcwAAAAACcwAAAAAAcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAcwAAAAADcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAAAAAAAAA version: 6 0,-3: ind: 0,-3 - tiles: cwAAAAABcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAcwAAAAAAcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAcwAAAAABcwAAAAAAcwAAAAABIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAcwAAAAABcwAAAAABgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAcwAAAAADcwAAAAABgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAcwAAAAADcwAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAcwAAAAABgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAABcwAAAAACIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAABcwAAAAADcwAAAAACgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAADcwAAAAADcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACcwAAAAABcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABgAAAAABCAAAAAAACQAAAAADgQAAAAAASgAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAACQAAAAACCAAAAAADgQAAAAAASgAAAAAAgQAAAAAAYAAAAAABcwAAAAADcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACQAAAAABCAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACcwAAAAAAcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAABAAAAAAABAAAAAAABAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAA + tiles: cwAAAAABcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAcwAAAAAAcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAcwAAAAABcwAAAAAAcwAAAAABIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAcwAAAAABcwAAAAABgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAcwAAAAADcwAAAAABgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAcwAAAAADcwAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAcwAAAAABgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAABcwAAAAACIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAABcwAAAAADcwAAAAACgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAADcwAAAAADcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACcwAAAAABcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABgAAAAABCAAAAAAACQAAAAADgQAAAAAASgAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAACQAAAAACCAAAAAADgQAAAAAASgAAAAAAgQAAAAAAYAAAAAABcwAAAAADcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACQAAAAABCAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACcwAAAAAAcwAAAAACgQAAAAAAgQAAAAAAgQAAAAAABAAAAAAABAAAAAAABAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAA version: 6 1,-2: ind: 1,-2 @@ -171,7 +172,7 @@ entities: version: 6 1,0: ind: 1,0 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAADQAAAAACgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAADYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 2,-1: ind: 2,-1 @@ -207,7 +208,7 @@ entities: version: 6 3,-4: ind: 3,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,-4: ind: 4,-4 @@ -215,7 +216,7 @@ entities: version: 6 3,-2: ind: 3,-2 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAYAAAAAADYAAAAAABgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAADgQAAAAAAYAAAAAABgQAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAABgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAYAAAAAADYAAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAACCwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAACYAAAAAACCwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAYAAAAAADYAAAAAABgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAACgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAADYAAAAAAAYAAAAAABgQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAIAAAAAAAHgAAAAAAHgAAAAAAIAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACgQAAAAAAIAAAAAAAHgAAAAAAHgAAAAAAIAAAAAAAYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAACIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAYAAAAAADYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAA version: 6 3,-1: ind: 3,-1 @@ -223,7 +224,7 @@ entities: version: 6 4,-2: ind: 4,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,-3: ind: 4,-3 @@ -259,7 +260,7 @@ entities: version: 6 -1,1: ind: -1,1 - tiles: YAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAcAAAAAAADQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAcAAAAAAAYAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAYAAAAAABcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAADAAAAAACDAAAAAACDAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAYAAAAAABcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAAADAAAAAACDAAAAAABDAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAADDAAAAAABCAAAAAABCAAAAAACCAAAAAABYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADCAAAAAADCAAAAAABCAAAAAABCAAAAAABCAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAAACAAAAAACCAAAAAACCAAAAAACCAAAAAACCAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAAACAAAAAAACAAAAAABCAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACDAAAAAADDAAAAAACDAAAAAAADAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAADDAAAAAADDAAAAAAA + tiles: YAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAcAAAAAAADQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAADAAAAAACDAAAAAACDAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAAADAAAAAACDAAAAAABDAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAADDAAAAAABCAAAAAABCAAAAAACCAAAAAABYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADCAAAAAADCAAAAAABCAAAAAABCAAAAAABCAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAAACAAAAAACCAAAAAACCAAAAAACCAAAAAACCAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAAACAAAAAAACAAAAAABCAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACDAAAAAADDAAAAAACDAAAAAAADAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAADDAAAAAADDAAAAAAA version: 6 -4,1: ind: -4,1 @@ -351,7 +352,7 @@ entities: version: 6 1,4: ind: 1,4 - tiles: YAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAACEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAAABwAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAADBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: YAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAABYAAAAAACEgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAAABwAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAADBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA version: 6 4,4: ind: 4,4 @@ -359,19 +360,19 @@ entities: version: 6 0,4: ind: 0,4 - tiles: gQAAAAAAgQAAAAAAgQAAAAAACwAAAAAADQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABBwAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAYAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAABwAAAAAAYAAAAAACBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAYAAAAAACgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAACwAAAAAADQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABBwAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAYAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAABwAAAAAAYAAAAAACBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,4: ind: -1,4 - tiles: YAAAAAADYAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAADQAAAAAADQAAAAAADQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAADQAAAAAAcAAAAAAADQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAACIAAAAAADIAAAAAABIAAAAAACIAAAAAACIAAAAAACIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAADIAAAAAADIAAAAAAAIAAAAAADIAAAAAADIAAAAAADIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAABIAAAAAABgQAAAAAAIAAAAAAAIAAAAAADIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAADIAAAAAACIAAAAAAAIAAAAAADIAAAAAABIAAAAAABIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAADIAAAAAACIAAAAAADIAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: YAAAAAADYAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAADQAAAAAADQAAAAAADQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAADQAAAAAAcAAAAAAADQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,5: ind: 0,5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,5: ind: 1,5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -4,2: ind: -4,2 @@ -465,6 +466,8 @@ entities: id: Arrows decals: 2955: 64,44 + 6205: 7,-43 + 6206: 4,-43 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -707,7 +710,6 @@ entities: 4343: -46,-50 4344: -46,-47 4345: -35,-38 - 4394: 18,7 4494: 17,0 4495: 17,-13 4496: 25,-13 @@ -721,7 +723,6 @@ entities: 4528: -40,25 4529: -39,25 4530: -38,25 - 4531: -14,1 4532: -14,3 4533: -14,-20 4534: 1,-26 @@ -753,6 +754,11 @@ entities: 5786: 31,-2 5798: 0,-4 5799: -2,-4 + 6198: 3,-46 + 6200: 3,-40 + 6233: 11,-4 + 6258: 58,-27 + 6337: -11,2 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -762,6 +768,7 @@ entities: 2957: 50,59 2958: 48,65 2959: 50,65 + 6207: 18,7 - node: color: '#FFFFFFFF' id: Box @@ -774,10 +781,6 @@ entities: 1306: 61,-31 1307: 61,-30 1308: 61,-29 - 1309: 60,-27 - 1310: 61,-19 - 1311: 62,-19 - 1312: 63,-19 2088: -31,9 - node: angle: 3.141592653589793 rad @@ -820,21 +823,41 @@ entities: id: BrickTileDarkCornerNe decals: 2086: -30,10 + 6287: 62,-25 + 6302: -7,74 + 6303: -8,75 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: 2085: -32,10 + 6290: 61,-25 + 6291: -12,75 + 6304: -13,74 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: 2087: -30,8 + 6288: 62,-26 + 6292: -7,71 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: 2084: -32,8 + 6289: 61,-26 + 6306: -13,71 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkInnerNe + decals: + 6310: -8,74 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkInnerNw + decals: + 6305: -12,74 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE @@ -847,16 +870,32 @@ entities: 5564: -46,71 5582: -46,72 5583: -46,67 + 6300: -7,72 + 6301: -7,73 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkLineN + decals: + 6307: -11,75 + 6308: -10,75 + 6309: -9,75 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: 4722: 23,48 + 6293: -8,71 + 6294: -9,71 + 6295: -10,71 + 6296: -11,71 + 6297: -12,71 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: 4246: 27,53 + 6298: -13,72 + 6299: -13,73 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe @@ -879,6 +918,7 @@ entities: 4055: 74,42 4056: 76,43 4057: 77,45 + 6314: -31,27 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw @@ -887,11 +927,14 @@ entities: 4059: 68,42 4073: 72,52 4074: 73,51 + 6313: -37,27 - node: color: '#FFFFFFFF' id: BrickTileSteelEndN decals: 4078: 66,45 + 6311: -37,28 + 6312: -31,28 - node: color: '#FFFFFFFF' id: BrickTileSteelEndS @@ -902,6 +945,7 @@ entities: id: BrickTileSteelInnerNe decals: 2527: 1,35 + 6325: -37,27 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerNw @@ -909,6 +953,7 @@ entities: 2524: 8,35 4040: 73,45 4077: 74,46 + 6326: -31,27 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerSe @@ -951,6 +996,11 @@ entities: 4087: 59,58 4088: 58,58 4089: 57,58 + 6320: -32,27 + 6321: -33,27 + 6322: -34,27 + 6323: -35,27 + 6324: -36,27 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS @@ -971,6 +1021,11 @@ entities: 4054: 75,43 4091: 58,52 4092: 57,52 + 6315: -36,27 + 6316: -35,27 + 6317: -34,27 + 6318: -33,27 + 6319: -32,27 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW @@ -981,6 +1036,22 @@ entities: 2506: 8,39 4060: 66,44 4071: 66,53 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteEndN + decals: + 6356: -11,-48 + 6357: -9,-48 + 6368: -11,-50 + 6369: -9,-50 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteEndS + decals: + 6354: -11,-51 + 6355: -9,-51 + 6366: -11,-49 + 6367: -9,-49 - node: color: '#FFFFFFFF' id: BushAThree @@ -1157,10 +1228,7 @@ entities: 1269: 52,-23 1270: 54,-23 1273: 62,-15 - 1274: 56,-20 - 1275: 56,-19 1276: 54,-37 - 1277: 54,-20 1355: 19,3 1781: 33,35 1782: 33,36 @@ -1193,9 +1261,10 @@ entities: 4519: -7,43 5380: -33,68 5381: -38,68 - 5400: 51,-22 5749: -4,-16 5750: 2,-16 + 6401: -47,2 + 6402: -47,1 - node: cleanable: True color: '#FFFFFFFF' @@ -1204,7 +1273,6 @@ entities: 960: 11,-34 1458: -9,-25 1459: -8,-23 - 1509: 15,7 1686: 51,12 1687: 51,10 1689: 43,7 @@ -1234,6 +1302,10 @@ entities: 1845: 44,63 5269: -28,-15 5472: -7,0 + 6147: 4,-44 + 6148: 8,-46 + 6151: 8,-41 + 6153: 4,-46 - node: color: '#FFFFFFFF' id: DirtHeavy @@ -1288,18 +1360,12 @@ entities: 1450: -7,-23 1460: -10,-24 1461: -10,-23 - 1465: 15,2 1466: 16,3 1467: 15,3 1468: 15,4 1469: 16,4 1470: 16,5 1471: 15,5 - 1472: 15,6 - 1473: 16,6 - 1474: 16,7 - 1475: 15,7 - 1480: 20,4 1481: 19,5 1482: 22,5 1483: 21,2 @@ -1483,8 +1549,6 @@ entities: 4194: 57,-32 4195: 59,-32 4196: 58,-29 - 4197: 60,-28 - 4198: 57,-28 4199: 52,-29 4200: 51,-26 4201: 52,-39 @@ -1521,7 +1585,6 @@ entities: 4278: 9,-2 4279: 8,1 4280: 8,1 - 4281: 22,4 4282: 19,5 4283: 25,5 4284: 28,3 @@ -1593,7 +1656,6 @@ entities: 4447: -13,-62 4448: -14,-60 4449: -12,-53 - 4451: -12,-48 4453: -7,-52 4457: 0,-48 4458: -3,-47 @@ -1618,7 +1680,6 @@ entities: 4477: 2,-35 4478: 3,-33 4479: 1,-33 - 4480: 5,-41 4481: 4,-46 4483: -12,-56 4484: 8,-33 @@ -1648,13 +1709,10 @@ entities: 4894: -3,-53 4895: -1,-50 4896: 0,-51 - 4897: -8,-52 4898: -10,-52 4899: -8,-50 - 4902: -9,-47 4903: -12,-50 4904: -12,-47 - 4905: -11,-52 4906: -15,-31 4907: -17,-30 4908: -13,-28 @@ -1668,11 +1726,9 @@ entities: 4917: 13,-9 4918: 11,-7 4919: 12,-7 - 4920: 11,-5 4921: 8,-4 4922: 8,-2 4923: 10,-2 - 4924: 11,-4 4925: 9,-4 4926: 11,0 4927: 8,3 @@ -2002,6 +2058,24 @@ entities: 6034: 38,11 6035: 36,11 6036: 37,10 + 6138: 3,-45 + 6140: 4,-41 + 6141: 3,-40 + 6142: 6,-40 + 6143: 8,-41 + 6146: 8,-46 + 6403: -31,-39 + 6404: -30,-38 + 6405: -34,-45 + 6406: -30,-44 + 6407: -23,-47 + 6408: -27,-51 + 6409: -21,-52 + 6410: -8,-53 + 6411: -13,-49 + 6412: -7,-51 + 6413: -7,-48 + 6414: -8,-47 - node: cleanable: True color: '#FFFFFFFF' @@ -2093,7 +2167,6 @@ entities: 3016: -18,25 3017: -19,28 3018: -24,27 - 3019: -27,29 3020: -31,27 3021: -33,26 3022: -38,27 @@ -2155,10 +2228,6 @@ entities: 3083: -4,68 3084: -3,69 3085: -9,68 - 3086: -8,72 - 3087: -8,74 - 3088: -10,71 - 3089: -12,73 3090: 2,69 3091: -1,66 3092: 5,68 @@ -2478,9 +2547,6 @@ entities: 3415: 30,2 3417: 25,3 3418: 21,2 - 3419: 20,4 - 3420: 22,3 - 3421: 16,2 3422: 9,0 3423: 9,-2 3424: 9,-3 @@ -2547,14 +2613,9 @@ entities: 3489: 54,-12 3492: 62,-16 3493: 63,-15 - 3495: 62,-22 - 3496: 61,-23 - 3497: 58,-20 3498: 57,-21 - 3499: 59,-25 3500: 59,-30 3501: 57,-31 - 3502: 60,-29 3503: 60,-30 3504: 56,-36 3505: 57,-36 @@ -2682,7 +2743,6 @@ entities: 3630: -4,-37 3631: -5,-34 3632: 4,-42 - 3633: 5,-44 3634: -1,-43 3635: -2,-46 3636: -4,-43 @@ -2703,7 +2763,6 @@ entities: 3651: -18,-62 3652: -17,-61 3653: -7,-53 - 3654: -10,-53 3655: -7,-50 3657: -12,-52 3660: -17,-50 @@ -2822,7 +2881,6 @@ entities: 3779: -42,-20 3780: -43,-21 3781: -27,-11 - 3782: -28,-10 3783: -27,-9 3784: -27,-8 3785: -27,-6 @@ -3002,6 +3060,20 @@ entities: 5189: -38,-49 5267: -28,-16 5268: -28,-15 + 6415: -10,-48 + 6416: -10,-49 + 6417: -10,-51 + 6418: -10,-50 + 6419: -1,-44 + 6420: 6,-46 + 6421: 7,-43 + 6422: 5,-43 + 6423: 7,-41 + 6424: 0,-40 + 6425: 3,-35 + 6426: 1,-34 + 6427: 3,-33 + 6428: 2,-34 - node: cleanable: True color: '#FFFFFFFF' @@ -3016,8 +3088,6 @@ entities: 1457: -7,-24 1476: 14,5 1477: 14,4 - 1478: 13,4 - 1479: 13,5 1642: 41,24 1643: 41,25 1644: 40,23 @@ -3150,18 +3220,6 @@ entities: 4999: -14,-53 5000: -14,-52 5001: -13,-52 - 5002: -13,-51 - 5003: -14,-51 - 5004: -14,-50 - 5005: -13,-50 - 5006: -9,-51 - 5007: -9,-50 - 5008: -9,-49 - 5009: -9,-48 - 5010: -10,-51 - 5011: -10,-50 - 5012: -10,-49 - 5013: -10,-48 - node: color: '#0000003F' id: FullTileOverlayGreyscale @@ -3255,6 +3313,8 @@ entities: 2976: -17,-41 2977: -16,-41 5763: 35,-5 + 6196: 6,-39 + 6197: 3,-39 - node: color: '#52B4E9FF' id: FullTileOverlayGreyscale @@ -3331,9 +3391,6 @@ entities: 1152: 53,-23 1153: 52,-23 1154: 49,-23 - 1176: 61,-19 - 1177: 62,-19 - 1178: 63,-19 1335: 48,-21 5765: 33,-5 - node: @@ -3379,14 +3436,6 @@ entities: color: '#DE3A3A96' id: FullTileOverlayGreyscale decals: - 524: -13,-49 - 525: -12,-49 - 526: -11,-53 - 527: -10,-53 - 528: -9,-53 - 529: -11,-46 - 530: -10,-46 - 531: -9,-46 568: -6,-49 569: -6,-48 2772: 20,57 @@ -3429,6 +3478,8 @@ entities: 1361: 13,-25 2825: 45,46 5767: 35,-8 + 6216: 17,4 + 6217: 17,5 - node: color: '#FFFFFFFF' id: Grassa4 @@ -3467,6 +3518,7 @@ entities: 4084: 69.453026,53.082813 4085: 72.24678,52.499477 4086: 71.920395,53.749477 + 6340: -11.384821,20.822517 - node: color: '#FFFFFFFF' id: Grassd2 @@ -3490,6 +3542,8 @@ entities: 6044: 0.95249677,30.984898 6045: -3.5628335,30.935976 6046: -3.489414,24.993238 + 6338: -12.118657,19.028696 + 6339: -12.828032,20.153912 - node: color: '#FFFFFFFF' id: Grassd3 @@ -3500,6 +3554,7 @@ entities: 3997: 73.47744,52.398594 3998: 74.45184,44.579674 3999: 71.75756,43.38838 + 6346: -12.371423,21.042667 - node: color: '#FFFFFFFF' id: Grasse1 @@ -3530,6 +3585,8 @@ entities: 4026: 59.915527,57.05167 4027: 55.46993,56.871117 4028: 55.462982,53.107086 + 6342: -11.392975,19.721764 + 6347: -10.373758,20.936668 - node: color: '#FFFFFFFF' id: Grasse3 @@ -3544,6 +3601,14 @@ entities: 4015: 73.14992,51.7334 4016: 74.73748,45.363224 4017: 70.72331,43.30718 + 6341: -10.390066,19.151001 + - node: + color: '#FFFFFFFF' + id: GrayConcreteTrimLineE + decals: + 6343: -10,19 + 6344: -10,20 + 6345: -10,21 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale @@ -3637,6 +3702,8 @@ entities: 4511: -22,-28 4856: -3,-52 4859: 0,-52 + 6161: 4,-39 + 6162: 5,-39 - node: color: '#79150096' id: HalfTileOverlayGreyscale @@ -3651,10 +3718,8 @@ entities: color: '#8D1C9996' id: HalfTileOverlayGreyscale decals: - 1103: 59,-28 1204: 57,-40 1205: 55,-40 - 1348: 57,-28 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale @@ -3694,7 +3759,6 @@ entities: color: '#A4610696' id: HalfTileOverlayGreyscale decals: - 1127: 58,-28 1131: 48,-27 1132: 51,-25 1133: 52,-25 @@ -3719,9 +3783,14 @@ entities: 5337: 56,-11 5338: 57,-11 5339: 58,-11 - 5342: 58,-19 - 5343: 59,-19 - 5344: 60,-19 + 6241: 57,-19 + 6242: 56,-19 + 6243: 55,-19 + 6259: 58,-19 + 6260: 60,-19 + 6261: 61,-19 + 6262: 62,-19 + 6275: 62,-24 - node: color: '#D381C996' id: HalfTileOverlayGreyscale @@ -3802,9 +3871,8 @@ entities: 5935: -23,29 5936: -24,29 5937: -25,29 - 5938: -27,29 - 5939: -28,29 - 5940: -29,29 + 6328: -12,2 + 6329: -13,2 - node: color: '#D4D4D496' id: HalfTileOverlayGreyscale @@ -3848,7 +3916,6 @@ entities: 2363: -41,59 2778: 22,59 4220: -31,31 - 4984: -13,-50 5363: -43,53 5364: -44,53 5365: -46,52 @@ -3865,6 +3932,16 @@ entities: 5584: -39,60 5592: -36,60 5593: -35,60 + 6371: -10,-46 + 6372: -9,-46 + 6373: -8,-46 + 6375: -10,-52 + 6376: -9,-52 + 6431: -13,-50 + 6455: -23,29 + 6456: -24,29 + 6457: -28,29 + 6458: -29,29 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale @@ -3894,7 +3971,6 @@ entities: 801: 27,-16 837: 35,-3 858: 26,-21 - 869: 21,4 1364: 32,-14 1365: 33,-14 1393: -24,-3 @@ -3943,6 +4019,10 @@ entities: 5059: 5,-26 5276: 31,-26 5277: 30,-26 + 6208: 13,5 + 6209: 14,5 + 6210: 15,5 + 6231: 21,4 - node: color: '#FA750096' id: HalfTileOverlayGreyscale @@ -3973,6 +4053,12 @@ entities: 5952: -44,27 5953: -43,27 5954: -42,27 + 6444: -30,25 + 6445: -29,25 + 6447: -24,26 + 6448: -23,26 + 6449: -21,26 + 6450: -20,26 - node: color: '#43990996' id: HalfTileOverlayGreyscale180 @@ -4097,16 +4183,10 @@ entities: 1139: 50,-30 1140: 49,-30 1141: 48,-30 - 1156: 50,-22 1158: 52,-22 1159: 53,-22 1179: 56,-25 1180: 57,-25 - 1181: 58,-25 - 1182: 59,-25 - 1183: 60,-25 - 1184: 61,-25 - 1185: 62,-25 1202: 57,-41 1315: 76,-33 1316: 77,-33 @@ -4121,6 +4201,13 @@ entities: 5326: 49,-15 5329: 50,-18 5501: 55,-17 + 6248: 54,-22 + 6251: 55,-22 + 6265: 60,-22 + 6266: 59,-22 + 6267: 61,-22 + 6268: 62,-22 + 6281: 62,-27 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 @@ -4218,10 +4305,13 @@ entities: 5942: -23,26 5943: -24,26 5944: -25,26 - 5946: -28,25 5947: -29,25 5948: -30,25 5965: 38,-7 + 6332: -14,1 + 6333: -13,1 + 6334: -12,1 + 6335: -11,1 - node: color: '#D4D4D496' id: HalfTileOverlayGreyscale180 @@ -4269,6 +4359,11 @@ entities: 5517: -29,63 5518: -28,63 5519: -27,63 + 6382: -10,-47 + 6383: -9,-47 + 6388: -10,-53 + 6389: -9,-53 + 6390: -8,-53 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale180 @@ -4334,6 +4429,9 @@ entities: 6038: 30,45 6040: 33,45 6041: 34,45 + 6213: 15,4 + 6214: 14,4 + 6222: 23,3 - node: color: '#FA750096' id: HalfTileOverlayGreyscale180 @@ -4363,6 +4461,9 @@ entities: 5609: -50,27 5610: -50,30 5732: 0,-7 + 6462: -12,23 + 6463: -12,24 + 6464: -12,25 - node: color: '#3EB38896' id: HalfTileOverlayGreyscale270 @@ -4416,6 +4517,10 @@ entities: 4381: -2,-34 4382: -2,-33 4726: -18,-30 + 6164: 3,-45 + 6165: 3,-44 + 6166: 3,-42 + 6167: 3,-41 - node: color: '#8BC9DAFF' id: HalfTileOverlayGreyscale270 @@ -4472,8 +4577,9 @@ entities: 5322: 52,-18 5323: 52,-16 5341: 49,-21 - 5351: 56,-21 5354: 54,-15 + 6247: 56,-24 + 6252: 56,-23 - node: color: '#D381C996' id: HalfTileOverlayGreyscale270 @@ -4539,6 +4645,12 @@ entities: 5927: 48,59 5961: 33,-7 5962: 33,-6 + 6432: -17,-16 + 6433: -17,-15 + 6434: -17,-14 + 6435: -17,-13 + 6436: -17,-12 + 6437: -17,-11 - node: color: '#D4D4D496' id: HalfTileOverlayGreyscale270 @@ -4581,15 +4693,15 @@ entities: 4364: 1,-35 4365: 1,-34 4366: 1,-33 - 4887: -8,-47 - 4888: -8,-48 - 4889: -8,-49 - 4890: -8,-51 - 4891: -8,-52 - 4986: -14,-51 4987: -14,-52 5385: -45,56 5556: -28,59 + 6377: -8,-51 + 6378: -8,-50 + 6379: -8,-49 + 6380: -8,-48 + 6395: -13,-48 + 6430: -14,-51 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale270 @@ -4641,6 +4753,9 @@ entities: 5790: 29,-2 5791: 29,-1 5792: 29,0 + 6218: 18,4 + 6219: 18,5 + 6220: 18,6 - node: color: '#FA750096' id: HalfTileOverlayGreyscale270 @@ -4659,6 +4774,9 @@ entities: 4694: -32,22 5733: -2,-7 5748: -11,-7 + 6465: -10,23 + 6466: -10,24 + 6467: -10,25 - node: color: '#3EB38896' id: HalfTileOverlayGreyscale90 @@ -4711,15 +4829,13 @@ entities: 2463: -7,65 2477: -10,50 2478: -10,51 - 4384: 6,-46 - 4385: 6,-45 - 4386: 6,-44 - 4387: 6,-43 - 4388: 6,-42 - 4389: 6,-41 - 4390: 6,-40 - 4391: 6,-39 5617: -58,30 + 6154: 8,-46 + 6155: 8,-45 + 6156: 8,-44 + 6157: 8,-42 + 6158: 8,-41 + 6159: 8,-40 - node: color: '#79150096' id: HalfTileOverlayGreyscale90 @@ -4787,19 +4903,18 @@ entities: 1342: 63,-15 1343: 63,-14 4602: 56,-48 - 5285: 54,-19 - 5287: 54,-21 5313: 48,-18 5314: 48,-17 5315: 48,-16 5334: 58,-15 - 5345: 63,-24 - 5346: 63,-23 - 5347: 63,-22 - 5348: 63,-21 - 5349: 63,-20 5352: 53,-17 5353: 53,-15 + 6235: 58,-24 + 6236: 58,-23 + 6270: 63,-21 + 6271: 63,-20 + 6278: 63,-26 + 6279: 63,-25 - node: color: '#D381C996' id: HalfTileOverlayGreyscale90 @@ -4853,14 +4968,10 @@ entities: 1922: -15,-7 1924: -15,-5 1925: -15,-4 - 1926: -15,-3 1927: -15,-2 1928: -15,-1 1929: -15,0 - 1931: -15,2 - 1932: -15,3 5800: -15,-6 - 5801: -15,1 5802: -15,15 5803: -15,16 5804: -15,17 @@ -4898,6 +5009,13 @@ entities: 5904: 35,36 5905: 35,37 5963: 39,-6 + 6331: -15,-3 + 6438: -15,-16 + 6439: -15,-15 + 6440: -15,-14 + 6441: -15,-13 + 6442: -15,-12 + 6443: -15,-11 - node: color: '#D4D4D496' id: HalfTileOverlayGreyscale90 @@ -4936,8 +5054,6 @@ entities: 4221: -30,30 4224: -36,29 4225: -36,30 - 4996: -9,-49 - 4997: -9,-50 5375: -39,51 5376: -39,55 5386: -43,56 @@ -4947,6 +5063,7 @@ entities: 5557: -26,59 5558: -26,60 5616: -58,26 + 6396: -12,-48 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale90 @@ -4968,7 +5085,6 @@ entities: 842: 33,1 854: 27,-23 855: 27,-22 - 866: 22,3 867: 22,2 1397: -20,-4 1398: -20,-5 @@ -4987,7 +5103,6 @@ entities: 4952: 13,-9 4953: 13,-8 4954: 13,-7 - 4959: 13,4 4960: 13,3 4961: 13,2 5619: -50,30 @@ -4996,6 +5111,14 @@ entities: 5795: 31,-3 5796: 31,-4 5797: 31,-5 + 6230: 22,3 + 6471: -27,-3 + 6472: -27,-5 + 6473: -27,-6 + 6474: -27,-8 + 6475: -27,-9 + 6476: -27,-10 + 6477: -27,-11 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' @@ -5189,6 +5312,7 @@ entities: id: QuarterTileOverlayGreyscale decals: 1107: 55,-36 + 6257: 57,-28 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale @@ -5270,12 +5394,14 @@ entities: 4230: -27,34 4231: -26,34 4232: -25,34 - 5241: -11,-47 5377: -45,52 5533: -30,66 5534: -30,67 5535: -30,68 5536: -30,69 + 6392: -8,-52 + 6454: -19,29 + 6461: -27,29 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale @@ -5288,6 +5414,15 @@ entities: 2840: 44,49 4980: 12,-7 4981: 13,-7 + 6478: -28,-11 + 6479: -28,-10 + 6480: -28,-9 + 6481: -28,-8 + 6482: -28,-7 + 6483: -28,-6 + 6484: -28,-5 + 6485: -28,-4 + 6486: -28,-3 - node: color: '#FA750096' id: QuarterTileOverlayGreyscale @@ -5312,6 +5447,7 @@ entities: 4680: -33,25 4681: -32,25 5735: -2,-6 + 6452: -25,26 - node: color: '#3EB38896' id: QuarterTileOverlayGreyscale180 @@ -5435,6 +5571,8 @@ entities: id: QuarterTileOverlayGreyscale180 decals: 1123: 57,-33 + 6272: 58,-22 + 6282: 61,-27 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale180 @@ -5459,6 +5597,7 @@ entities: 5924: 50,44 5959: 34,-8 5960: 36,-7 + 6336: -15,1 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale180 @@ -5498,7 +5637,6 @@ entities: decals: 2308: -37,35 2310: -33,38 - 5243: -9,-52 5388: -43,57 - node: color: '#EFB34196' @@ -5510,8 +5648,6 @@ entities: 1368: 31,-12 1369: 31,-13 1389: -21,-7 - 4970: 11,-5 - 4971: 11,-4 4972: 11,-3 4973: 11,-2 4974: 11,-1 @@ -5523,6 +5659,8 @@ entities: 5768: 31,-10 5769: 31,-9 5770: 31,-7 + 6215: 13,4 + 6234: 11,-5 - node: color: '#FA750096' id: QuarterTileOverlayGreyscale180 @@ -5542,6 +5680,11 @@ entities: decals: 5613: -50,28 5736: 0,-6 + 6451: -19,26 + 6453: -28,25 + 6468: -12,27 + 6469: -11,27 + 6470: -10,27 - node: color: '#3EB38896' id: QuarterTileOverlayGreyscale270 @@ -5609,6 +5752,7 @@ entities: id: QuarterTileOverlayGreyscale270 decals: 1201: 55,-41 + 6253: 56,-22 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 @@ -5680,9 +5824,8 @@ entities: 2337: -18,38 2348: -37,52 2352: -37,57 - 5240: -9,-51 - 5242: -11,-52 5387: -45,57 + 6391: -8,-47 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale270 @@ -5794,11 +5937,6 @@ entities: id: QuarterTileOverlayGreyscale90 decals: 1550: 46,17 - - node: - color: '#8D1C9996' - id: QuarterTileOverlayGreyscale90 - decals: - 1109: 60,-29 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale90 @@ -5811,6 +5949,7 @@ entities: decals: 1146: 50,-25 5356: 53,-18 + 6286: 61,-24 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale90 @@ -5826,7 +5965,7 @@ entities: 5853: -7,45 5874: 4,45 5889: 24,29 - 5941: -30,29 + 6330: -14,2 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale90 @@ -5874,11 +6013,12 @@ entities: 1018: 13,-41 1048: 16,-40 2339: -34,41 - 5244: -9,-47 5537: -27,69 5538: -27,68 5539: -27,67 5540: -27,66 + 6459: -30,29 + 6460: -25,29 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 @@ -6074,6 +6214,7 @@ entities: 5291: 46,-14 5292: 50,-12 5330: 49,-16 + 6256: 57,-27 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale @@ -6087,7 +6228,6 @@ entities: id: ThreeQuarterTileOverlayGreyscale decals: 492: -13,-46 - 498: -8,-46 2268: -40,42 2334: -18,45 2335: -19,41 @@ -6096,8 +6236,10 @@ entities: 2374: -45,53 2774: 21,59 4360: 2,-33 - 4983: -14,-50 5360: -41,56 + 6384: -11,-52 + 6385: -11,-46 + 6429: -14,-50 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale @@ -6109,10 +6251,10 @@ entities: 795: 24,-15 835: 36,-2 850: 25,-21 - 860: 20,4 1388: -25,-3 2827: 44,53 2828: 43,49 + 6228: 20,4 - node: color: '#FA750096' id: ThreeQuarterTileOverlayGreyscale @@ -6165,12 +6307,13 @@ entities: id: ThreeQuarterTileOverlayGreyscale180 decals: 1124: 61,-31 - 1160: 54,-22 1198: 59,-41 4604: 56,-50 5331: 51,-18 5335: 58,-17 - 5350: 63,-25 + 6239: 58,-25 + 6264: 63,-22 + 6280: 63,-27 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale180 @@ -6191,16 +6334,15 @@ entities: id: ThreeQuarterTileOverlayGreyscale180 decals: 494: -12,-53 - 495: -12,-48 496: -7,-53 2307: -37,34 2323: -21,38 2775: 23,56 4361: 3,-34 - 4988: -9,-51 5373: -39,50 5383: -43,55 5546: -26,63 + 6393: -12,-49 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale180 @@ -6214,6 +6356,7 @@ entities: 1386: -20,-7 2830: 48,47 6039: 35,45 + 6211: 16,4 - node: color: '#FA750096' id: ThreeQuarterTileOverlayGreyscale180 @@ -6277,8 +6420,6 @@ entities: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale270 decals: - 497: -8,-53 - 503: -13,-48 2262: -40,34 2336: -19,38 2354: -30,58 @@ -6287,6 +6428,9 @@ entities: 4982: -14,-53 5372: -41,50 5384: -45,55 + 6386: -11,-53 + 6387: -11,-47 + 6394: -13,-49 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale270 @@ -6301,6 +6445,7 @@ entities: 2826: 43,47 4963: 7,0 6037: 29,45 + 6221: 18,3 - node: color: '#FA750096' id: ThreeQuarterTileOverlayGreyscale270 @@ -6363,10 +6508,12 @@ entities: id: ThreeQuarterTileOverlayGreyscale90 decals: 1125: 61,-29 - 1126: 60,-28 1144: 54,-25 1145: 50,-24 5333: 51,-16 + 6244: 54,-18 + 6269: 63,-19 + 6273: 63,-24 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale90 @@ -6385,7 +6532,6 @@ entities: 2777: 23,59 4219: -30,31 4363: 3,-33 - 4989: -9,-48 5358: -39,56 5541: -26,65 5559: -26,61 @@ -6401,10 +6547,10 @@ entities: 798: 28,-16 836: 34,-2 851: 27,-21 - 861: 22,4 1387: -20,-3 2829: 48,53 - 4962: 13,5 + 6212: 16,5 + 6229: 22,4 - node: color: '#FA750096' id: ThreeQuarterTileOverlayGreyscale90 @@ -6481,7 +6627,6 @@ entities: id: WarnCornerNE decals: 923: 36,1 - 1217: 62,-21 2688: 22,66 2697: 12,84 2698: 25,84 @@ -6491,7 +6636,6 @@ entities: id: WarnCornerNW decals: 922: 34,1 - 1218: 58,-21 1429: -37,-10 2687: 21,66 2700: 10,82 @@ -6515,7 +6659,6 @@ entities: 22: -41,-44 23: -47,-28 917: 36,-1 - 1219: 62,-23 2686: 22,65 2693: 12,72 2694: 25,72 @@ -6525,7 +6668,6 @@ entities: id: WarnCornerSW decals: 916: 34,-1 - 1220: 58,-23 2689: 21,65 2690: 23,73 2691: 24,72 @@ -6615,7 +6757,6 @@ entities: 896: 10,-15 897: 10,-14 920: 36,0 - 1227: 62,-22 1259: 57,-38 2069: -15,5 2070: -15,6 @@ -6698,16 +6839,12 @@ entities: 906: 8,-15 918: 35,-1 973: -1,-14 - 1221: 59,-23 - 1222: 60,-23 - 1223: 61,-23 1244: 59,-15 1252: 56,-25 1280: 77,-30 1281: 78,-30 1282: 79,-30 1283: 80,-30 - 1513: 16,2 1707: 48,19 1708: 49,19 1709: 50,19 @@ -6721,12 +6858,6 @@ entities: 5522: -29,66 5523: -28,66 5524: -27,66 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: WarnLineN - decals: - 1512: 15,2 - node: zIndex: 2 color: '#FFFFFFFF' @@ -6757,21 +6888,7 @@ entities: 893: 22,-15 903: 9,-17 904: 9,-16 - 912: 18,4 - 913: 18,5 - 914: 18,6 - 915: 18,7 921: 34,0 - 1228: 58,-22 - 1406: -28,-11 - 1407: -28,-10 - 1408: -28,-9 - 1409: -28,-8 - 1410: -28,-7 - 1411: -28,-6 - 1412: -28,-5 - 1413: -28,-4 - 1414: -28,-3 1431: -37,-11 1715: 36,17 2060: -13,5 @@ -6864,9 +6981,6 @@ entities: 901: 14,-17 919: 35,1 974: -1,-14 - 1224: 59,-21 - 1225: 60,-21 - 1226: 61,-21 1249: 59,-15 1415: -30,-10 1416: -31,-10 @@ -6875,8 +6989,6 @@ entities: 1419: -34,-10 1420: -35,-10 1421: -36,-10 - 1514: 15,0 - 1515: 16,0 2222: -31,49 2223: -30,49 2375: -37,62 @@ -6886,13 +6998,6 @@ entities: 2759: 57,61 3933: 24,3 3934: 25,3 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: WarnLineW - decals: - 1510: 15,7 - 1511: 16,7 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe @@ -7091,21 +7196,22 @@ entities: 0: 48000 1: 8 3,1: - 0: 35071 + 0: 33023 3,2: 2: 16368 - 0: 32776 + 0: 32768 3,3: 0: 65464 3,4: 0: 65535 3,-1: 1: 34952 + 0: 7 4,0: 1: 71 0: 53520 4,1: - 0: 57343 + 0: 56831 4,2: 0: 1 2: 53232 @@ -7114,10 +7220,9 @@ entities: 1: 26112 2: 12 -4,0: - 0: 30579 + 0: 32755 -4,-1: 0: 13107 - 2: 34944 -5,0: 0: 52701 -4,1: @@ -7133,21 +7238,20 @@ entities: -5,3: 0: 51677 -4,4: - 0: 13311 - 2: 32768 + 0: 46079 + -3,0: + 0: 3064 -3,1: 0: 65527 -3,2: 0: 65535 -3,3: 0: 2047 - -3,4: - 0: 255 - 2: 28672 -3,-1: + 2: 4096 0: 50274 - -3,0: - 0: 2184 + -3,4: + 0: 28927 -2,0: 0: 13090 -2,2: @@ -7236,7 +7340,7 @@ entities: 0: 13107 1: 34952 3,-2: - 0: 51 + 0: 8243 1: 34952 3,-5: 0: 63247 @@ -7460,6 +7564,8 @@ entities: -5,4: 0: 52479 2: 4096 + -12,0: + 0: 4080 -12,3: 2: 7952 -13,3: @@ -7467,12 +7573,10 @@ entities: -12,4: 2: 49 0: 136 - -12,1: - 2: 14 -12,-1: 2: 57344 - -12,0: - 0: 2176 + -12,1: + 2: 14 -11,0: 0: 12272 -11,-1: @@ -7794,16 +7898,15 @@ entities: 2: 15 0: 49152 1,-12: - 0: 30478 + 0: 65294 2,-14: 2: 19 0: 4096 2,-13: - 0: 4113 - 2: 17476 + 0: 21521 + 2: 4 2,-12: - 0: 4369 - 2: 1092 + 0: 21831 3,-14: 0: 14096 3,-13: @@ -7811,13 +7914,13 @@ entities: 3,-12: 0: 14131 1,-11: - 0: 30591 + 0: 65535 1,-10: - 0: 61559 + 0: 61567 2,-11: - 0: 7509 + 0: 21877 2,-10: - 0: 16375 + 0: 16325 3,-11: 0: 13111 3,-10: @@ -7941,7 +8044,7 @@ entities: 2: 53247 7,1: 0: 19 - 2: 64648 + 2: 65224 7,2: 2: 287 0: 19456 @@ -8154,6 +8257,7 @@ entities: 0: 63259 13,-13: 0: 34816 + 2: 4 14,-12: 0: 4369 14,-11: @@ -8164,6 +8268,7 @@ entities: 0: 62463 14,-13: 0: 65280 + 2: 1 14,-8: 0: 65535 15,-9: @@ -8182,11 +8287,11 @@ entities: 13,-15: 2: 4095 13,-14: - 2: 4095 + 2: 20479 14,-15: 2: 4095 14,-14: - 2: 1911 + 2: 6007 15,-15: 2: 4095 16,-15: @@ -8198,30 +8303,27 @@ entities: 13,-7: 0: 30583 13,-6: - 0: 32631 + 0: 65399 13,-5: - 0: 62327 + 0: 63487 13,-4: 0: 4095 14,-7: - 0: 62815 + 0: 30071 14,-6: - 0: 65535 + 0: 65407 14,-5: - 0: 29439 + 0: 28799 14,-4: 0: 2039 15,-7: - 0: 61457 - 2: 72 + 0: 65521 15,-6: - 0: 65535 + 0: 65295 15,-5: 0: 61695 15,-4: 0: 65535 - 16,-7: - 2: 1543 13,-3: 0: 4335 2: 57344 @@ -8480,7 +8582,7 @@ entities: -5,8: 0: 60669 -4,5: - 0: 29491 + 0: 29627 -4,6: 0: 61777 -4,7: @@ -8489,7 +8591,7 @@ entities: 0: 13107 2: 34952 -3,5: - 0: 28672 + 0: 28799 -3,6: 0: 62071 -3,7: @@ -9164,11 +9266,11 @@ entities: 2: 61936 7,17: 0: 11 - 2: 64640 + 2: 61312 8,18: 2: 255 7,18: - 2: 252 + 2: 8942 9,16: 0: 4368 9,17: @@ -9202,22 +9304,33 @@ entities: 0: 30579 6,20: 0: 14199 + 7,19: + 2: 17479 + 7,20: + 2: 29764 0,17: 0: 2039 -1,17: 0: 3327 1,17: 0: 1911 + 1,18: + 2: 51336 + 1,19: + 2: 17476 + 1,20: + 2: 50244 2,17: 0: 34823 - 2: 8704 + 2: 8960 2,18: - 2: 8738 + 2: 12834 0: 34952 2,19: 0: 52424 2,20: 0: 36044 + 2: 4096 3,18: 0: 4369 3,19: @@ -9235,19 +9348,27 @@ entities: -3,17: 0: 62718 -3,18: - 0: 65471 + 0: 65535 -2,17: 0: 12542 -2,18: 0: 4915 + 1,21: + 2: 34952 2,21: - 2: 52770 + 2: 65058 0: 8 2,22: - 2: 1092 + 2: 3311 3,21: 0: 1 2: 768 + 3,22: + 2: 61696 + 4,22: + 2: 61440 + 5,22: + 2: 61440 5,20: 0: 32768 6,21: @@ -9256,7 +9377,11 @@ entities: 5,21: 2: 2048 6,22: - 2: 1092 + 2: 6126 + 7,21: + 2: 12834 + 7,22: + 2: 1 -16,10: 2: 65280 -17,10: @@ -9865,7 +9990,6 @@ entities: devices: - 3634 - 3635 - - 3556 - 3555 - 3584 - 4087 @@ -9998,6 +10122,39 @@ entities: - 5255 - 10027 - 5305 + - uid: 6833 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,-30.5 + parent: 12 + - type: DeviceList + devices: + - 26161 + - 1553 + - 7458 + - 7616 + - 7615 + - 7618 + - 7617 + - 8916 + - 8597 + - 8540 + - uid: 8504 + components: + - type: Transform + pos: 61.5,-17.5 + parent: 12 + - type: DeviceList + devices: + - 1553 + - 25548 + - 4203 + - 8515 + - 6744 + - 2909 + - 346 + - 8673 - uid: 8910 components: - type: Transform @@ -10009,29 +10166,6 @@ entities: - 5128 - 26457 - 27003 - - uid: 8913 - components: - - type: Transform - pos: 57.5,-26.5 - parent: 12 - - type: DeviceList - devices: - - 8535 - - 8536 - - 8541 - - 8542 - - 8597 - - 8543 - - 8544 - - 8916 - - 8921 - - 8922 - - 7616 - - 7615 - - 7458 - - 8859 - - 7618 - - 7617 - uid: 8914 components: - type: Transform @@ -10048,6 +10182,23 @@ entities: - 7461 - 26319 - 26314 + - uid: 8971 + components: + - type: Transform + pos: -9.5,-44.5 + parent: 12 + - type: DeviceList + devices: + - 2828 + - 10538 + - 26118 + - 7519 + - 11462 + - 4002 + - 2613 + - 4004 + - 4005 + - 4006 - uid: 9972 components: - type: Transform @@ -10088,6 +10239,7 @@ entities: - 9983 - 9982 - 3997 + - 6753 - uid: 9975 components: - type: Transform @@ -10097,7 +10249,6 @@ entities: - type: DeviceList devices: - 3519 - - 3702 - 3725 - 3620 - 9979 @@ -10115,8 +10266,6 @@ entities: - 2759 - 3533 - 2762 - - 3710 - - 2758 - 3584 - uid: 10017 components: @@ -10929,21 +11078,6 @@ entities: - 993 - 994 - 2095 - - uid: 28347 - components: - - type: Transform - pos: -7.5,-44.5 - parent: 12 - - type: DeviceList - devices: - - 2758 - - 3710 - - 28348 - - 2613 - - 4004 - - 4005 - - 4006 - - 4002 - uid: 28354 components: - type: Transform @@ -10969,8 +11103,6 @@ entities: - 4008 - 4010 - 4011 - - 3627 - - 3702 - 9980 - uid: 28359 components: @@ -11068,19 +11200,6 @@ entities: - 9116 - 9117 - 7456 - - uid: 28370 - components: - - type: Transform - pos: 60.5,-17.5 - parent: 12 - - type: DeviceList - devices: - - 8673 - - 8714 - - 8917 - - 8859 - - 7457 - - 7787 - uid: 28371 components: - type: Transform @@ -11096,7 +11215,6 @@ entities: - 8695 - 8698 - 7775 - - 7787 - 7785 - uid: 28373 components: @@ -11105,18 +11223,23 @@ entities: parent: 12 - type: DeviceList devices: - - 8678 - - 8677 - - 28374 - - 7457 - 9117 - 9116 - 9115 + - 7775 - 7456 - 8460 - - 27065 + - 2294 + - 8919 + - 8678 + - 8677 + - 6744 + - 8515 + - 4203 - 7785 + - 27065 - 27102 + - 25548 - uid: 28376 components: - type: Transform @@ -11142,6 +11265,8 @@ entities: - 4744 - 9994 - 4738 + - 9666 + - 2779 - uid: 28378 components: - type: Transform @@ -11149,11 +11274,12 @@ entities: parent: 12 - type: DeviceList devices: - - 9556 + - 7787 - 6766 - - 9996 - - 9999 + - 9666 + - 4949 - 23891 + - 2779 - uid: 28381 components: - type: Transform @@ -11181,6 +11307,24 @@ entities: - 13305 - 13168 - 28384 + - uid: 28502 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-45.5 + parent: 12 + - type: DeviceList + devices: + - 4018 + - 4017 + - 25372 + - 3992 + - 3993 + - 28504 + - 3555 + - 4087 + - 6755 + - 6754 - uid: 29270 components: - type: Transform @@ -11280,6 +11424,11 @@ entities: - type: Transform pos: -51.5,-37.5 parent: 12 + - uid: 2831 + components: + - type: Transform + pos: 63.5,-18.5 + parent: 12 - uid: 7167 components: - type: Transform @@ -11295,11 +11444,6 @@ entities: bodyType: Static - type: Lock locked: True - - uid: 7788 - components: - - type: Transform - pos: 56.5,-18.5 - parent: 12 - uid: 8863 components: - type: Transform @@ -11555,35 +11699,31 @@ entities: parent: 12 - proto: AirlockCargoGlassLocked entities: - - uid: 65 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 57.5,-17.5 - parent: 12 - uid: 7466 components: - type: Transform rot: -1.5707963267948966 rad pos: 49.5,-22.5 parent: 12 - - uid: 7467 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-21.5 - parent: 12 - uid: 7761 components: - type: Transform pos: 59.5,-14.5 parent: 12 - - uid: 7784 +- proto: AirlockCargoLocked + entities: + - uid: 454 components: - type: Transform rot: 3.141592653589793 rad pos: 52.5,-11.5 parent: 12 + - uid: 26170 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 59.5,-23.5 + parent: 12 - proto: AirlockChapelLocked entities: - uid: 13309 @@ -11741,6 +11881,16 @@ entities: rot: 3.141592653589793 rad pos: 23.5,-24.5 parent: 12 + - uid: 9127 + components: + - type: Transform + pos: 17.5,4.5 + parent: 12 + - uid: 26162 + components: + - type: Transform + pos: 17.5,5.5 + parent: 12 - proto: AirlockEngineeringLocked entities: - uid: 1016 @@ -12048,38 +12198,46 @@ entities: linkedPorts: 1085: - DoorStatus: DoorBolt - - uid: 5117 + - uid: 3524 components: - type: Transform - pos: 5.5,-3.5 + pos: 15.5,3.5 parent: 12 - type: DeviceLinkSink - invokeCounter: 1 + invokeCounter: 2 - type: DeviceLinkSource linkedPorts: - 28528: + 9176: - DoorStatus: DoorBolt - - uid: 5314 + 3628: + - DoorStatus: DoorBolt + - uid: 3627 components: - type: Transform rot: -1.5707963267948966 rad - pos: 16.5,1.5 + pos: 16.5,3.5 parent: 12 - type: DeviceLinkSink - invokeCounter: 6 + invokeCounter: 2 - type: DeviceLinkSource linkedPorts: - 9705: - - DoorStatus: DoorBolt - 9666: - - DoorStatus: DoorBolt - 9447: + 9176: - DoorStatus: DoorBolt - 9609: + 3628: - DoorStatus: DoorBolt - 26260: + - uid: 3628 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,1.5 + parent: 12 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 3524: - DoorStatus: DoorBolt - 26410: + 3627: - DoorStatus: DoorBolt - uid: 6350 components: @@ -12105,49 +12263,32 @@ entities: linkedPorts: 6350: - DoorStatus: DoorBolt - - uid: 9176 + - uid: 7889 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,1.5 + pos: 12.5,-3.5 parent: 12 - type: DeviceLinkSink - invokeCounter: 6 + invokeCounter: 1 - type: DeviceLinkSource linkedPorts: - 9705: - - DoorStatus: DoorBolt - 9666: - - DoorStatus: DoorBolt - 9609: + 10165: - DoorStatus: DoorBolt - 9447: - - DoorStatus: DoorBolt - 26260: - - DoorStatus: DoorBolt - 26410: - - DoorStatus: DoorBolt - - uid: 9447 + - uid: 9176 components: - type: Transform rot: -1.5707963267948966 rad - pos: 15.5,8.5 + pos: 15.5,1.5 parent: 12 - type: DeviceLinkSink - invokeCounter: 6 + invokeCounter: 8 - type: DeviceLinkSource linkedPorts: - 9705: - - DoorStatus: DoorBolt - 9666: - - DoorStatus: DoorBolt - 5314: + 3627: - DoorStatus: DoorBolt - 9176: - - DoorStatus: DoorBolt - 26260: + 9609: - DoorStatus: DoorBolt - 26410: + 3524: - DoorStatus: DoorBolt - uid: 9609 components: @@ -12156,65 +12297,36 @@ entities: pos: 16.5,8.5 parent: 12 - type: DeviceLinkSink - invokeCounter: 6 + invokeCounter: 7 - type: DeviceLinkSource linkedPorts: - 9666: - - DoorStatus: DoorBolt - 9705: - - DoorStatus: DoorBolt - 5314: + 10657: - DoorStatus: DoorBolt 9176: - DoorStatus: DoorBolt - 26260: - - DoorStatus: DoorBolt - 26410: - - DoorStatus: DoorBolt - - uid: 9666 + - uid: 10165 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,6.5 + pos: 14.5,-3.5 parent: 12 - type: DeviceLinkSink - invokeCounter: 6 + invokeCounter: 1 - type: DeviceLinkSource linkedPorts: - 9609: + 7889: - DoorStatus: DoorBolt - 9447: - - DoorStatus: DoorBolt - 5314: - - DoorStatus: DoorBolt - 9176: - - DoorStatus: DoorBolt - 26260: - - DoorStatus: DoorBolt - 26410: - - DoorStatus: DoorBolt - - uid: 9705 + - uid: 10657 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,5.5 + rot: 3.141592653589793 rad + pos: 16.5,6.5 parent: 12 - type: DeviceLinkSink - invokeCounter: 6 + invokeCounter: 1 - type: DeviceLinkSource linkedPorts: - 5314: - - DoorStatus: DoorBolt - 9176: - - DoorStatus: DoorBolt - 9447: - - DoorStatus: DoorBolt 9609: - DoorStatus: DoorBolt - 26260: - - DoorStatus: DoorBolt - 26410: - - DoorStatus: DoorBolt - uid: 11322 components: - type: Transform @@ -12273,59 +12385,6 @@ entities: linkedPorts: 19019: - DoorStatus: DoorBolt - - uid: 26260 - components: - - type: Transform - pos: 14.5,4.5 - parent: 12 - - type: DeviceLinkSink - invokeCounter: 6 - - type: DeviceLinkSource - linkedPorts: - 9176: - - DoorStatus: DoorBolt - 5314: - - DoorStatus: DoorBolt - 9705: - - DoorStatus: DoorBolt - 9666: - - DoorStatus: DoorBolt - 9609: - - DoorStatus: DoorBolt - 9447: - - DoorStatus: DoorBolt - - uid: 26410 - components: - - type: Transform - pos: 14.5,5.5 - parent: 12 - - type: DeviceLinkSink - invokeCounter: 6 - - type: DeviceLinkSource - linkedPorts: - 9176: - - DoorStatus: DoorBolt - 5314: - - DoorStatus: DoorBolt - 9705: - - DoorStatus: DoorBolt - 9666: - - DoorStatus: DoorBolt - 9609: - - DoorStatus: DoorBolt - 9447: - - DoorStatus: DoorBolt - - uid: 28528 - components: - - type: Transform - pos: 5.5,-5.5 - parent: 12 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 5117: - - DoorStatus: DoorBolt - proto: AirlockExternalGlass entities: - uid: 288 @@ -12391,11 +12450,6 @@ entities: - type: Transform pos: 32.5,-41.5 parent: 12 - - uid: 6754 - components: - - type: Transform - pos: 11.5,-41.5 - parent: 12 - uid: 10296 components: - type: Transform @@ -12458,6 +12512,18 @@ entities: rot: -1.5707963267948966 rad pos: -52.5,59.5 parent: 12 + - uid: 28520 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -45.5,1.5 + parent: 12 + - uid: 28528 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -45.5,2.5 + parent: 12 - proto: AirlockExternalGlassAtmosphericsLocked entities: - uid: 4390 @@ -12885,12 +12951,6 @@ entities: - type: Transform pos: -42.5,13.5 parent: 12 - - uid: 10284 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -42.5,5.5 - parent: 12 - uid: 10285 components: - type: Transform @@ -12914,14 +12974,56 @@ entities: rot: -1.5707963267948966 rad pos: -57.5,60.5 parent: 12 + - uid: 26130 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,1.5 + parent: 12 - uid: 26256 components: - type: Transform rot: 1.5707963267948966 rad pos: 60.5,-48.5 parent: 12 + - uid: 28506 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,2.5 + parent: 12 + - uid: 28532 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -42.5,5.5 + parent: 12 - proto: AirlockExternalLocked entities: + - uid: 530 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-5.5 + parent: 12 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 925: + - DoorStatus: DoorBolt + - uid: 925 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-3.5 + parent: 12 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 530: + - DoorStatus: DoorBolt - uid: 19847 components: - type: Transform @@ -13513,6 +13615,12 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,16.5 parent: 12 + - uid: 10654 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,1.5 + parent: 12 - uid: 10698 components: - type: Transform @@ -13695,6 +13803,11 @@ entities: - type: Transform pos: -12.5,-7.5 parent: 12 + - uid: 21968 + components: + - type: Transform + pos: -8.5,20.5 + parent: 12 - uid: 21999 components: - type: Transform @@ -14122,11 +14235,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-39.5 parent: 12 - - uid: 3087 - components: - - type: Transform - pos: 7.5,-43.5 - parent: 12 - uid: 3098 components: - type: Transform @@ -14137,6 +14245,12 @@ entities: - type: Transform pos: 2.5,-45.5 parent: 12 + - uid: 22118 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-42.5 + parent: 12 - proto: AirlockMedicalScienceGlassLocked entities: - uid: 830 @@ -14255,16 +14369,22 @@ entities: parent: 12 - proto: AirlockSalvageLocked entities: - - uid: 8042 + - uid: 2830 components: - type: Transform - pos: 58.5,-26.5 + rot: 1.5707963267948966 rad + pos: 60.5,-27.5 parent: 12 - uid: 8043 components: - type: Transform pos: 55.5,-28.5 parent: 12 + - uid: 10629 + components: + - type: Transform + pos: 58.5,-25.5 + parent: 12 - proto: AirlockScienceGlassLocked entities: - uid: 641 @@ -14492,11 +14612,14 @@ entities: - DoorStatus: DoorBolt - proto: AirSensor entities: - - uid: 454 + - uid: 346 components: - type: Transform - pos: 49.5,-16.5 + pos: 60.5,-20.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 8504 - uid: 2094 components: - type: Transform @@ -14580,6 +14703,15 @@ entities: deviceLists: - 9972 - 2089 + - uid: 2294 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,-19.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28373 - uid: 2609 components: - type: Transform @@ -14596,6 +14728,15 @@ entities: - type: DeviceNetwork deviceLists: - 2611 + - uid: 2828 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-51.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8971 - uid: 4003 components: - type: Transform @@ -14613,6 +14754,16 @@ entities: - type: DeviceNetwork deviceLists: - 2545 + - 28502 + - uid: 4949 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,5.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28378 - uid: 7350 components: - type: Transform @@ -14646,22 +14797,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 8913 - - uid: 8917 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 60.5,-21.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28370 - - uid: 8918 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 50.5,-19.5 - parent: 12 + - 6833 - uid: 8919 components: - type: Transform @@ -14671,6 +14807,7 @@ entities: - type: DeviceNetwork deviceLists: - 28371 + - 28373 - uid: 8920 components: - type: Transform @@ -14683,18 +14820,12 @@ entities: rot: 1.5707963267948966 rad pos: 79.5,-31.5 parent: 12 - - type: DeviceNetwork - deviceLists: - - 8913 - uid: 8922 components: - type: Transform rot: 1.5707963267948966 rad pos: 55.5,-43.5 parent: 12 - - type: DeviceNetwork - deviceLists: - - 8913 - uid: 8923 components: - type: Transform @@ -14827,30 +14958,6 @@ entities: deviceLists: - 3224 - 447 - - uid: 9996 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,4.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28378 - - uid: 9998 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,4.5 - parent: 12 - - uid: 9999 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 26.5,3.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28378 - uid: 10000 components: - type: Transform @@ -15587,14 +15694,6 @@ entities: - type: DeviceNetwork deviceLists: - 377 - - uid: 28348 - components: - - type: Transform - pos: -9.5,-49.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28347 - uid: 28355 components: - type: Transform @@ -15657,14 +15756,6 @@ entities: - type: DeviceNetwork deviceLists: - 28371 - - uid: 28374 - components: - - type: Transform - pos: 52.5,-20.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28373 - uid: 28379 components: - type: Transform @@ -15780,11 +15871,6 @@ entities: actions: !type:Container ents: - 6214 - - uid: 8902 - components: - - type: Transform - pos: 56.471523,-20.573103 - parent: 12 - uid: 10376 components: - type: Transform @@ -15795,11 +15881,6 @@ entities: - type: Transform pos: -20.5,-7.5 parent: 12 - - uid: 21077 - components: - - type: Transform - pos: -45.521164,44.47354 - parent: 12 - uid: 21519 components: - type: Transform @@ -15996,11 +16077,10 @@ entities: rot: -1.5707963267948966 rad pos: -32.5,-5.5 parent: 12 - - uid: 6889 + - uid: 6749 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,-39.5 + pos: 13.5,-36.5 parent: 12 - uid: 7472 components: @@ -16013,11 +16093,6 @@ entities: rot: 1.5707963267948966 rad pos: 52.5,-10.5 parent: 12 - - uid: 7900 - components: - - type: Transform - pos: 59.5,-26.5 - parent: 12 - uid: 7901 components: - type: Transform @@ -16034,6 +16109,11 @@ entities: - type: Transform pos: 79.5,-33.5 parent: 12 + - uid: 9141 + components: + - type: Transform + pos: 59.5,-27.5 + parent: 12 - uid: 9541 components: - type: Transform @@ -16305,6 +16385,12 @@ entities: - type: Transform pos: 60.5,46.5 parent: 12 + - uid: 25100 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 64.5,-23.5 + parent: 12 - uid: 25108 components: - type: Transform @@ -16352,13 +16438,6 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,49.5 parent: 12 -- proto: AppraisalTool - entities: - - uid: 8876 - components: - - type: Transform - pos: 60.400223,-24.37177 - parent: 12 - proto: ArrivalsShuttleTimer entities: - uid: 16552 @@ -16465,6 +16544,12 @@ entities: rot: 1.5707963267948966 rad pos: 14.5,-51.5 parent: 12 + - uid: 1355 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,1.5 + parent: 12 - uid: 1818 components: - type: Transform @@ -16650,6 +16735,12 @@ entities: rot: 3.141592653589793 rad pos: -18.5,74.5 parent: 12 + - uid: 28519 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,2.5 + parent: 12 - proto: AtmosFixBlockerMarker entities: - uid: 93 @@ -17660,10 +17751,10 @@ entities: - type: Transform pos: -44.5,-30.5 parent: 12 - - uid: 8887 + - uid: 2832 components: - type: Transform - pos: 54.5,-19.5 + pos: 58.5,-18.5 parent: 12 - uid: 25377 components: @@ -18179,11 +18270,6 @@ entities: rot: -1.5707963267948966 rad pos: -46.5,55.5 parent: 12 - - uid: 5037 - components: - - type: Transform - pos: -13.5,-51.5 - parent: 12 - uid: 5384 components: - type: Transform @@ -18202,26 +18288,33 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,-39.5 parent: 12 - - uid: 13873 + - uid: 10540 components: - type: Transform - pos: 26.5,37.5 + rot: -1.5707963267948966 rad + pos: -10.5,-49.5 parent: 12 - - uid: 21668 + - uid: 10664 components: - type: Transform - pos: -8.5,-50.5 + rot: -1.5707963267948966 rad + pos: -8.5,-48.5 parent: 12 - - uid: 26412 + - uid: 13873 components: - type: Transform - pos: -8.5,-49.5 + pos: 26.5,37.5 parent: 12 - - uid: 27259 + - uid: 16776 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-49.5 + rot: -1.5707963267948966 rad + pos: -10.5,-47.5 + parent: 12 + - uid: 21668 + components: + - type: Transform + pos: -8.5,-50.5 parent: 12 - proto: BedsheetMime entities: @@ -18714,7 +18807,7 @@ entities: - uid: 22318 components: - type: Transform - pos: 34.946262,45.383537 + pos: 34.78795,45.317623 parent: 12 - proto: Bloodpack entities: @@ -18773,6 +18866,11 @@ entities: - type: Transform pos: -36.428226,37.282276 parent: 12 + - uid: 28500 + components: + - type: Transform + pos: -12.564983,-51.34612 + parent: 12 - proto: BookBase entities: - uid: 13338 @@ -19112,7 +19210,7 @@ entities: - uid: 3118 components: - type: Transform - pos: 6.483349,-40.432316 + pos: 6.641307,-38.30299 parent: 12 - uid: 13268 components: @@ -19193,11 +19291,6 @@ entities: - type: Transform pos: 53.408695,-23.391977 parent: 12 - - uid: 8893 - components: - - type: Transform - pos: 62.61215,-24.40641 - parent: 12 - uid: 13317 components: - type: Transform @@ -19317,12 +19410,13 @@ entities: - uid: 2792 components: - type: Transform - pos: -11.395875,-60.640625 + rot: -12.566370614359172 rad + pos: -11.358311,-60.675922 parent: 12 - uid: 3119 components: - type: Transform - pos: 6.553528,-40.28328 + pos: 6.266307,-38.261322 parent: 12 - proto: BoxLethalshot entities: @@ -19408,7 +19502,8 @@ entities: - uid: 2790 components: - type: Transform - pos: -11.724,-60.328125 + rot: -12.566370614359172 rad + pos: -11.788866,-60.21296 parent: 12 - proto: BoxSyringe entities: @@ -19672,6 +19767,18 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,8.5 parent: 12 + - uid: 16846 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 57.5,-38.5 + parent: 12 + - uid: 16847 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-14.5 + parent: 12 - uid: 23448 components: - type: Transform @@ -19695,6 +19802,17 @@ entities: rot: 3.141592653589793 rad pos: -41.5,57.5 parent: 12 + - uid: 28554 + components: + - type: Transform + pos: -10.5,-36.5 + parent: 12 + - uid: 28555 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 45.5,-19.5 + parent: 12 - proto: CableApcExtension entities: - uid: 14 @@ -19722,6 +19840,11 @@ entities: - type: Transform pos: -9.5,-2.5 parent: 12 + - uid: 65 + components: + - type: Transform + pos: 64.5,-23.5 + parent: 12 - uid: 66 components: - type: Transform @@ -21262,6 +21385,11 @@ entities: - type: Transform pos: 22.5,4.5 parent: 12 + - uid: 3017 + components: + - type: Transform + pos: 10.5,-38.5 + parent: 12 - uid: 3019 components: - type: Transform @@ -21272,11 +21400,51 @@ entities: - type: Transform pos: 23.5,2.5 parent: 12 + - uid: 3034 + components: + - type: Transform + pos: 10.5,-40.5 + parent: 12 + - uid: 3089 + components: + - type: Transform + pos: 16.5,6.5 + parent: 12 + - uid: 3102 + components: + - type: Transform + pos: 10.5,-47.5 + parent: 12 + - uid: 3103 + components: + - type: Transform + pos: 10.5,-41.5 + parent: 12 + - uid: 3107 + components: + - type: Transform + pos: 59.5,-19.5 + parent: 12 + - uid: 3108 + components: + - type: Transform + pos: 54.5,-21.5 + parent: 12 - uid: 3127 components: - type: Transform pos: 66.5,2.5 parent: 12 + - uid: 3157 + components: + - type: Transform + pos: 37.5,18.5 + parent: 12 + - uid: 3159 + components: + - type: Transform + pos: 9.5,-47.5 + parent: 12 - uid: 3196 components: - type: Transform @@ -22272,11 +22440,41 @@ entities: - type: Transform pos: 0.5,-34.5 parent: 12 + - uid: 3488 + components: + - type: Transform + pos: 9.5,-37.5 + parent: 12 + - uid: 3690 + components: + - type: Transform + pos: 16.5,8.5 + parent: 12 + - uid: 3691 + components: + - type: Transform + pos: 16.5,7.5 + parent: 12 - uid: 3892 components: - type: Transform pos: 51.5,12.5 parent: 12 + - uid: 3901 + components: + - type: Transform + pos: 10.5,-39.5 + parent: 12 + - uid: 4000 + components: + - type: Transform + pos: 10.5,-43.5 + parent: 12 + - uid: 4019 + components: + - type: Transform + pos: 10.5,-46.5 + parent: 12 - uid: 4119 components: - type: Transform @@ -22337,51 +22535,6 @@ entities: - type: Transform pos: 8.5,-37.5 parent: 12 - - uid: 4195 - components: - - type: Transform - pos: 8.5,-38.5 - parent: 12 - - uid: 4196 - components: - - type: Transform - pos: 8.5,-39.5 - parent: 12 - - uid: 4197 - components: - - type: Transform - pos: 8.5,-40.5 - parent: 12 - - uid: 4198 - components: - - type: Transform - pos: 8.5,-41.5 - parent: 12 - - uid: 4199 - components: - - type: Transform - pos: 8.5,-42.5 - parent: 12 - - uid: 4200 - components: - - type: Transform - pos: 8.5,-43.5 - parent: 12 - - uid: 4201 - components: - - type: Transform - pos: 8.5,-44.5 - parent: 12 - - uid: 4202 - components: - - type: Transform - pos: 8.5,-45.5 - parent: 12 - - uid: 4203 - components: - - type: Transform - pos: 8.5,-46.5 - parent: 12 - uid: 4204 components: - type: Transform @@ -22412,6 +22565,11 @@ entities: - type: Transform pos: 8.5,-32.5 parent: 12 + - uid: 4257 + components: + - type: Transform + pos: 10.5,-44.5 + parent: 12 - uid: 4319 components: - type: Transform @@ -22657,6 +22815,11 @@ entities: - type: Transform pos: 1.5,-27.5 parent: 12 + - uid: 4721 + components: + - type: Transform + pos: 10.5,-37.5 + parent: 12 - uid: 4730 components: - type: Transform @@ -23152,6 +23315,11 @@ entities: - type: Transform pos: 15.5,-12.5 parent: 12 + - uid: 5721 + components: + - type: Transform + pos: 13.5,-36.5 + parent: 12 - uid: 5722 components: - type: Transform @@ -23677,11 +23845,6 @@ entities: - type: Transform pos: 14.5,5.5 parent: 12 - - uid: 5836 - components: - - type: Transform - pos: 15.5,6.5 - parent: 12 - uid: 5837 components: - type: Transform @@ -23907,15 +24070,20 @@ entities: - type: Transform pos: 54.5,-5.5 parent: 12 - - uid: 6904 + - uid: 6838 components: - type: Transform - pos: 11.5,-39.5 + pos: 7.5,-44.5 parent: 12 - - uid: 6905 + - uid: 6839 components: - type: Transform - pos: 12.5,-39.5 + pos: 10.5,-42.5 + parent: 12 + - uid: 6895 + components: + - type: Transform + pos: 7.5,-45.5 parent: 12 - uid: 6906 components: @@ -24372,11 +24540,6 @@ entities: - type: Transform pos: 41.5,-16.5 parent: 12 - - uid: 8070 - components: - - type: Transform - pos: 59.5,-26.5 - parent: 12 - uid: 8071 components: - type: Transform @@ -25197,11 +25360,6 @@ entities: - type: Transform pos: 53.5,-22.5 parent: 12 - - uid: 8241 - components: - - type: Transform - pos: 54.5,-21.5 - parent: 12 - uid: 8242 components: - type: Transform @@ -25232,11 +25390,6 @@ entities: - type: Transform pos: 58.5,-19.5 parent: 12 - - uid: 8248 - components: - - type: Transform - pos: 59.5,-19.5 - parent: 12 - uid: 8249 components: - type: Transform @@ -25262,11 +25415,6 @@ entities: - type: Transform pos: 62.5,-21.5 parent: 12 - - uid: 8254 - components: - - type: Transform - pos: 62.5,-22.5 - parent: 12 - uid: 8255 components: - type: Transform @@ -25287,11 +25435,6 @@ entities: - type: Transform pos: 59.5,-23.5 parent: 12 - - uid: 8259 - components: - - type: Transform - pos: 58.5,-23.5 - parent: 12 - uid: 8260 components: - type: Transform @@ -25717,6 +25860,11 @@ entities: - type: Transform pos: 37.5,11.5 parent: 12 + - uid: 8672 + components: + - type: Transform + pos: -8.5,20.5 + parent: 12 - uid: 8773 components: - type: Transform @@ -25797,6 +25945,11 @@ entities: - type: Transform pos: 8.5,13.5 parent: 12 + - uid: 8917 + components: + - type: Transform + pos: 7.5,-42.5 + parent: 12 - uid: 8932 components: - type: Transform @@ -25807,6 +25960,11 @@ entities: - type: Transform pos: 48.5,-29.5 parent: 12 + - uid: 8967 + components: + - type: Transform + pos: 10.5,-45.5 + parent: 12 - uid: 8995 components: - type: Transform @@ -26482,26 +26640,6 @@ entities: - type: Transform pos: -8.5,-40.5 parent: 12 - - uid: 9990 - components: - - type: Transform - pos: 10.5,-43.5 - parent: 12 - - uid: 9991 - components: - - type: Transform - pos: 10.5,-42.5 - parent: 12 - - uid: 9992 - components: - - type: Transform - pos: 10.5,-41.5 - parent: 12 - - uid: 9993 - components: - - type: Transform - pos: 11.5,-41.5 - parent: 12 - uid: 10025 components: - type: Transform @@ -26557,6 +26695,11 @@ entities: - type: Transform pos: -37.5,-0.5 parent: 12 + - uid: 10348 + components: + - type: Transform + pos: 7.5,-41.5 + parent: 12 - uid: 10349 components: - type: Transform @@ -27182,16 +27325,6 @@ entities: - type: Transform pos: 38.5,19.5 parent: 12 - - uid: 12190 - components: - - type: Transform - pos: 37.5,19.5 - parent: 12 - - uid: 12191 - components: - - type: Transform - pos: 36.5,19.5 - parent: 12 - uid: 12192 components: - type: Transform @@ -28377,6 +28510,11 @@ entities: - type: Transform pos: 21.5,38.5 parent: 12 + - uid: 13713 + components: + - type: Transform + pos: 63.5,-23.5 + parent: 12 - uid: 13877 components: - type: Transform @@ -34972,6 +35110,11 @@ entities: - type: Transform pos: -27.5,61.5 parent: 12 + - uid: 23661 + components: + - type: Transform + pos: 7.5,-43.5 + parent: 12 - uid: 23888 components: - type: Transform @@ -36782,6 +36925,26 @@ entities: - type: Transform pos: 50.5,-0.5 parent: 12 + - uid: 26097 + components: + - type: Transform + pos: -7.5,20.5 + parent: 12 + - uid: 26134 + components: + - type: Transform + pos: 36.5,18.5 + parent: 12 + - uid: 26146 + components: + - type: Transform + pos: 7.5,-40.5 + parent: 12 + - uid: 26147 + components: + - type: Transform + pos: 7.5,-39.5 + parent: 12 - uid: 26212 components: - type: Transform @@ -38547,11 +38710,6 @@ entities: - type: Transform pos: 41.5,0.5 parent: 12 - - uid: 29307 - components: - - type: Transform - pos: -10.5,3.5 - parent: 12 - uid: 29313 components: - type: Transform @@ -39147,6 +39305,26 @@ entities: - type: Transform pos: 10.5,15.5 parent: 12 + - uid: 896 + components: + - type: Transform + pos: 15.5,0.5 + parent: 12 + - uid: 920 + components: + - type: Transform + pos: 17.5,4.5 + parent: 12 + - uid: 923 + components: + - type: Transform + pos: 11.5,-2.5 + parent: 12 + - uid: 924 + components: + - type: Transform + pos: 16.5,4.5 + parent: 12 - uid: 1041 components: - type: Transform @@ -39417,6 +39595,11 @@ entities: - type: Transform pos: 15.5,10.5 parent: 12 + - uid: 2781 + components: + - type: Transform + pos: 19.5,4.5 + parent: 12 - uid: 2887 components: - type: Transform @@ -39477,51 +39660,6 @@ entities: - type: Transform pos: 8.5,-47.5 parent: 12 - - uid: 3157 - components: - - type: Transform - pos: 8.5,-46.5 - parent: 12 - - uid: 3158 - components: - - type: Transform - pos: 8.5,-45.5 - parent: 12 - - uid: 3159 - components: - - type: Transform - pos: 8.5,-44.5 - parent: 12 - - uid: 3160 - components: - - type: Transform - pos: 8.5,-43.5 - parent: 12 - - uid: 3161 - components: - - type: Transform - pos: 8.5,-42.5 - parent: 12 - - uid: 3162 - components: - - type: Transform - pos: 8.5,-41.5 - parent: 12 - - uid: 3163 - components: - - type: Transform - pos: 8.5,-40.5 - parent: 12 - - uid: 3164 - components: - - type: Transform - pos: 8.5,-39.5 - parent: 12 - - uid: 3165 - components: - - type: Transform - pos: 8.5,-38.5 - parent: 12 - uid: 3166 components: - type: Transform @@ -39662,6 +39800,36 @@ entities: - type: Transform pos: -9.5,-28.5 parent: 12 + - uid: 3556 + components: + - type: Transform + pos: 12.5,4.5 + parent: 12 + - uid: 3586 + components: + - type: Transform + pos: 11.5,3.5 + parent: 12 + - uid: 3630 + components: + - type: Transform + pos: 11.5,-1.5 + parent: 12 + - uid: 3631 + components: + - type: Transform + pos: 16.5,6.5 + parent: 12 + - uid: 3632 + components: + - type: Transform + pos: 16.5,5.5 + parent: 12 + - uid: 3824 + components: + - type: Transform + pos: 26.5,-4.5 + parent: 12 - uid: 3978 components: - type: Transform @@ -39672,6 +39840,11 @@ entities: - type: Transform pos: 15.5,-27.5 parent: 12 + - uid: 4046 + components: + - type: Transform + pos: 11.5,1.5 + parent: 12 - uid: 4058 components: - type: Transform @@ -39702,6 +39875,16 @@ entities: - type: Transform pos: -10.5,-27.5 parent: 12 + - uid: 4199 + components: + - type: Transform + pos: 10.5,-47.5 + parent: 12 + - uid: 4254 + components: + - type: Transform + pos: 9.5,-47.5 + parent: 12 - uid: 4305 components: - type: Transform @@ -41272,11 +41455,26 @@ entities: - type: Transform pos: 1.5,18.5 parent: 12 + - uid: 6748 + components: + - type: Transform + pos: 14.5,4.5 + parent: 12 - uid: 6768 components: - type: Transform pos: -48.5,25.5 parent: 12 + - uid: 6855 + components: + - type: Transform + pos: 21.5,4.5 + parent: 12 + - uid: 7262 + components: + - type: Transform + pos: 11.5,4.5 + parent: 12 - uid: 7301 components: - type: Transform @@ -41307,6 +41505,16 @@ entities: - type: Transform pos: 61.5,-5.5 parent: 12 + - uid: 7562 + components: + - type: Transform + pos: 20.5,4.5 + parent: 12 + - uid: 7580 + components: + - type: Transform + pos: 13.5,4.5 + parent: 12 - uid: 7724 components: - type: Transform @@ -41642,16 +41850,46 @@ entities: - type: Transform pos: 21.5,-27.5 parent: 12 + - uid: 8042 + components: + - type: Transform + pos: 10.5,-37.5 + parent: 12 + - uid: 8259 + components: + - type: Transform + pos: 10.5,-42.5 + parent: 12 + - uid: 8494 + components: + - type: Transform + pos: 10.5,-39.5 + parent: 12 + - uid: 8853 + components: + - type: Transform + pos: 10.5,-45.5 + parent: 12 - uid: 8860 components: - type: Transform pos: 10.5,16.5 parent: 12 + - uid: 8918 + components: + - type: Transform + pos: 15.5,2.5 + parent: 12 - uid: 8937 components: - type: Transform pos: 73.5,-5.5 parent: 12 + - uid: 8957 + components: + - type: Transform + pos: 10.5,-46.5 + parent: 12 - uid: 9000 components: - type: Transform @@ -41847,75 +42085,15 @@ entities: - type: Transform pos: -11.5,-31.5 parent: 12 - - uid: 9125 - components: - - type: Transform - pos: 16.5,0.5 - parent: 12 - - uid: 9138 - components: - - type: Transform - pos: 16.5,5.5 - parent: 12 - - uid: 9141 - components: - - type: Transform - pos: 16.5,6.5 - parent: 12 - - uid: 9335 - components: - - type: Transform - pos: 18.5,4.5 - parent: 12 - - uid: 9440 - components: - - type: Transform - pos: 16.5,1.5 - parent: 12 - - uid: 9441 - components: - - type: Transform - pos: 16.5,2.5 - parent: 12 - - uid: 9442 - components: - - type: Transform - pos: 16.5,3.5 - parent: 12 - - uid: 9443 - components: - - type: Transform - pos: 16.5,4.5 - parent: 12 - - uid: 9446 - components: - - type: Transform - pos: 17.5,4.5 - parent: 12 - - uid: 9448 - components: - - type: Transform - pos: 18.5,5.5 - parent: 12 - uid: 9449 components: - type: Transform - pos: 19.5,5.5 - parent: 12 - - uid: 9450 - components: - - type: Transform - pos: 20.5,5.5 + pos: 16.5,-4.5 parent: 12 - uid: 9451 components: - type: Transform - pos: 21.5,5.5 - parent: 12 - - uid: 9452 - components: - - type: Transform - pos: 22.5,5.5 + pos: 18.5,4.5 parent: 12 - uid: 9453 components: @@ -41987,26 +42165,21 @@ entities: - type: Transform pos: 30.5,8.5 parent: 12 - - uid: 9647 - components: - - type: Transform - pos: 16.5,7.5 - parent: 12 - - uid: 9648 - components: - - type: Transform - pos: 16.5,8.5 - parent: 12 - uid: 9649 components: - type: Transform - pos: 16.5,9.5 + pos: 9.5,-37.5 parent: 12 - uid: 9650 components: - type: Transform pos: 16.5,10.5 parent: 12 + - uid: 9657 + components: + - type: Transform + pos: 10.5,-38.5 + parent: 12 - uid: 9671 components: - type: Transform @@ -42057,6 +42230,16 @@ entities: - type: Transform pos: 18.5,-14.5 parent: 12 + - uid: 9816 + components: + - type: Transform + pos: 10.5,-43.5 + parent: 12 + - uid: 9859 + components: + - type: Transform + pos: 10.5,-40.5 + parent: 12 - uid: 9860 components: - type: Transform @@ -42065,17 +42248,17 @@ entities: - uid: 9861 components: - type: Transform - pos: 26.5,-4.5 + pos: 10.5,-41.5 parent: 12 - uid: 9862 components: - type: Transform pos: 16.5,-8.5 parent: 12 - - uid: 9863 + - uid: 10284 components: - type: Transform - pos: 16.5,-4.5 + pos: 11.5,-0.5 parent: 12 - uid: 10305 components: @@ -46147,6 +46330,11 @@ entities: - type: Transform pos: 76.5,2.5 parent: 12 + - uid: 21077 + components: + - type: Transform + pos: 10.5,-44.5 + parent: 12 - uid: 21859 components: - type: Transform @@ -46252,6 +46440,11 @@ entities: - type: Transform pos: 31.5,-7.5 parent: 12 + - uid: 22078 + components: + - type: Transform + pos: 15.5,1.5 + parent: 12 - uid: 22712 components: - type: Transform @@ -47067,6 +47260,56 @@ entities: - type: Transform pos: -56.5,21.5 parent: 12 + - uid: 26131 + components: + - type: Transform + pos: 11.5,0.5 + parent: 12 + - uid: 26132 + components: + - type: Transform + pos: 11.5,2.5 + parent: 12 + - uid: 26153 + components: + - type: Transform + pos: 15.5,3.5 + parent: 12 + - uid: 26154 + components: + - type: Transform + pos: 15.5,4.5 + parent: 12 + - uid: 26155 + components: + - type: Transform + pos: 11.5,-3.5 + parent: 12 + - uid: 26156 + components: + - type: Transform + pos: 11.5,-4.5 + parent: 12 + - uid: 26157 + components: + - type: Transform + pos: 11.5,-5.5 + parent: 12 + - uid: 26158 + components: + - type: Transform + pos: 16.5,7.5 + parent: 12 + - uid: 26159 + components: + - type: Transform + pos: 16.5,9.5 + parent: 12 + - uid: 26160 + components: + - type: Transform + pos: 16.5,8.5 + parent: 12 - uid: 26465 components: - type: Transform @@ -50111,6 +50354,11 @@ entities: - type: Transform pos: 0.5,-41.5 parent: 12 + - uid: 2829 + components: + - type: Transform + pos: 9.5,-47.5 + parent: 12 - uid: 2837 components: - type: Transform @@ -50166,6 +50414,36 @@ entities: - type: Transform pos: -18.5,-30.5 parent: 12 + - uid: 3160 + components: + - type: Transform + pos: 13.5,-36.5 + parent: 12 + - uid: 3161 + components: + - type: Transform + pos: 11.5,-37.5 + parent: 12 + - uid: 3162 + components: + - type: Transform + pos: 10.5,-37.5 + parent: 12 + - uid: 3163 + components: + - type: Transform + pos: 10.5,-38.5 + parent: 12 + - uid: 3164 + components: + - type: Transform + pos: 10.5,-41.5 + parent: 12 + - uid: 3165 + components: + - type: Transform + pos: 10.5,-43.5 + parent: 12 - uid: 3199 components: - type: Transform @@ -50496,6 +50774,11 @@ entities: - type: Transform pos: -18.5,-27.5 parent: 12 + - uid: 3485 + components: + - type: Transform + pos: 10.5,-45.5 + parent: 12 - uid: 3486 components: - type: Transform @@ -50521,6 +50804,11 @@ entities: - type: Transform pos: -1.5,-1.5 parent: 12 + - uid: 4258 + components: + - type: Transform + pos: 60.5,-24.5 + parent: 12 - uid: 4323 components: - type: Transform @@ -51226,6 +51514,16 @@ entities: - type: Transform pos: -54.5,46.5 parent: 12 + - uid: 5836 + components: + - type: Transform + pos: 13.5,-37.5 + parent: 12 + - uid: 5848 + components: + - type: Transform + pos: 12.5,-37.5 + parent: 12 - uid: 5885 components: - type: Transform @@ -51276,6 +51574,11 @@ entities: - type: Transform pos: -32.5,-5.5 parent: 12 + - uid: 5981 + components: + - type: Transform + pos: 10.5,-40.5 + parent: 12 - uid: 6012 components: - type: Transform @@ -51381,6 +51684,21 @@ entities: - type: Transform pos: -60.5,31.5 parent: 12 + - uid: 6158 + components: + - type: Transform + pos: 10.5,-44.5 + parent: 12 + - uid: 6159 + components: + - type: Transform + pos: 10.5,-46.5 + parent: 12 + - uid: 6160 + components: + - type: Transform + pos: 10.5,-47.5 + parent: 12 - uid: 6184 components: - type: Transform @@ -51406,6 +51724,11 @@ entities: - type: Transform pos: 32.5,16.5 parent: 12 + - uid: 6756 + components: + - type: Transform + pos: 63.5,-23.5 + parent: 12 - uid: 6891 components: - type: Transform @@ -51416,61 +51739,16 @@ entities: - type: Transform pos: 8.5,-47.5 parent: 12 - - uid: 6893 - components: - - type: Transform - pos: 8.5,-46.5 - parent: 12 - - uid: 6894 - components: - - type: Transform - pos: 8.5,-45.5 - parent: 12 - - uid: 6895 - components: - - type: Transform - pos: 8.5,-44.5 - parent: 12 - uid: 6896 components: - type: Transform - pos: 8.5,-43.5 - parent: 12 - - uid: 6897 - components: - - type: Transform - pos: 8.5,-42.5 - parent: 12 - - uid: 6898 - components: - - type: Transform - pos: 8.5,-41.5 - parent: 12 - - uid: 6899 - components: - - type: Transform - pos: 8.5,-40.5 - parent: 12 - - uid: 6900 - components: - - type: Transform - pos: 8.5,-39.5 - parent: 12 - - uid: 6901 - components: - - type: Transform - pos: 9.5,-39.5 + pos: 10.5,-42.5 parent: 12 - uid: 6902 components: - type: Transform pos: 10.5,-39.5 parent: 12 - - uid: 6903 - components: - - type: Transform - pos: 11.5,-39.5 - parent: 12 - uid: 7276 components: - type: Transform @@ -51741,11 +52019,6 @@ entities: - type: Transform pos: 59.5,-27.5 parent: 12 - - uid: 7889 - components: - - type: Transform - pos: 59.5,-26.5 - parent: 12 - uid: 7890 components: - type: Transform @@ -52201,6 +52474,11 @@ entities: - type: Transform pos: 24.5,1.5 parent: 12 + - uid: 9444 + components: + - type: Transform + pos: 61.5,-23.5 + parent: 12 - uid: 9455 components: - type: Transform @@ -52796,6 +53074,11 @@ entities: - type: Transform pos: -2.5,-14.5 parent: 12 + - uid: 10550 + components: + - type: Transform + pos: 64.5,-23.5 + parent: 12 - uid: 10606 components: - type: Transform @@ -57296,6 +57579,26 @@ entities: - type: Transform pos: -6.5,32.5 parent: 12 + - uid: 21705 + components: + - type: Transform + pos: 60.5,-27.5 + parent: 12 + - uid: 21851 + components: + - type: Transform + pos: 60.5,-26.5 + parent: 12 + - uid: 21852 + components: + - type: Transform + pos: 60.5,-25.5 + parent: 12 + - uid: 21853 + components: + - type: Transform + pos: 60.5,-23.5 + parent: 12 - uid: 21901 components: - type: Transform @@ -58171,6 +58474,11 @@ entities: - type: Transform pos: 10.5,-8.5 parent: 12 + - uid: 25099 + components: + - type: Transform + pos: 62.5,-23.5 + parent: 12 - uid: 25104 components: - type: Transform @@ -60588,12 +60896,6 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,-44.5 parent: 12 - - uid: 9444 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,4.5 - parent: 12 - uid: 14271 components: - type: Transform @@ -60976,6 +61278,12 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-34.5 parent: 12 + - uid: 4047 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,28.5 + parent: 12 - uid: 4726 components: - type: Transform @@ -61165,11 +61473,6 @@ entities: - type: Transform pos: 21.5,27.5 parent: 12 - - uid: 13734 - components: - - type: Transform - pos: 21.5,28.5 - parent: 12 - uid: 13735 components: - type: Transform @@ -61190,11 +61493,6 @@ entities: - type: Transform pos: 22.5,27.5 parent: 12 - - uid: 13739 - components: - - type: Transform - pos: 22.5,28.5 - parent: 12 - uid: 13740 components: - type: Transform @@ -61253,6 +61551,12 @@ entities: rot: 1.5707963267948966 rad pos: 21.5,36.5 parent: 12 + - uid: 16545 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,28.5 + parent: 12 - uid: 16688 components: - type: Transform @@ -63481,6 +63785,11 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,9.5 parent: 12 + - uid: 2912 + components: + - type: Transform + pos: 10.5,-38.5 + parent: 12 - uid: 2961 components: - type: Transform @@ -63493,12 +63802,30 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,9.5 parent: 12 + - uid: 3086 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-48.5 + parent: 12 - uid: 3917 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,10.5 parent: 12 + - uid: 4093 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-47.5 + parent: 12 + - uid: 4102 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-47.5 + parent: 12 - uid: 4248 components: - type: Transform @@ -63529,66 +63856,6 @@ entities: - type: Transform pos: 6.5,-48.5 parent: 12 - - uid: 4254 - components: - - type: Transform - pos: 7.5,-48.5 - parent: 12 - - uid: 4255 - components: - - type: Transform - pos: 7.5,-47.5 - parent: 12 - - uid: 4256 - components: - - type: Transform - pos: 8.5,-47.5 - parent: 12 - - uid: 4257 - components: - - type: Transform - pos: 8.5,-46.5 - parent: 12 - - uid: 4258 - components: - - type: Transform - pos: 8.5,-45.5 - parent: 12 - - uid: 4259 - components: - - type: Transform - pos: 8.5,-44.5 - parent: 12 - - uid: 4260 - components: - - type: Transform - pos: 8.5,-43.5 - parent: 12 - - uid: 4261 - components: - - type: Transform - pos: 8.5,-42.5 - parent: 12 - - uid: 4262 - components: - - type: Transform - pos: 8.5,-41.5 - parent: 12 - - uid: 4263 - components: - - type: Transform - pos: 8.5,-40.5 - parent: 12 - - uid: 4264 - components: - - type: Transform - pos: 8.5,-39.5 - parent: 12 - - uid: 4265 - components: - - type: Transform - pos: 8.5,-38.5 - parent: 12 - uid: 4266 components: - type: Transform @@ -64644,6 +64911,18 @@ entities: rot: -1.5707963267948966 rad pos: 82.5,-34.5 parent: 12 + - uid: 7900 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-47.5 + parent: 12 + - uid: 8254 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-37.5 + parent: 12 - uid: 8452 components: - type: Transform @@ -64656,6 +64935,18 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-12.5 parent: 12 + - uid: 8490 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-37.5 + parent: 12 + - uid: 8491 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-39.5 + parent: 12 - uid: 8746 components: - type: Transform @@ -64758,6 +65049,18 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,-18.5 parent: 12 + - uid: 8854 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-42.5 + parent: 12 + - uid: 8855 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-43.5 + parent: 12 - uid: 9066 components: - type: Transform @@ -64805,6 +65108,12 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,10.5 parent: 12 + - uid: 9648 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-47.5 + parent: 12 - uid: 9742 components: - type: Transform @@ -66017,11 +66326,35 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,10.5 parent: 12 + - uid: 19864 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-45.5 + parent: 12 + - uid: 19867 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-44.5 + parent: 12 + - uid: 19868 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-40.5 + parent: 12 - uid: 20107 components: - type: Transform pos: -22.5,59.5 parent: 12 + - uid: 20540 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-46.5 + parent: 12 - uid: 21425 components: - type: Transform @@ -66319,6 +66652,12 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,-8.5 parent: 12 + - uid: 22076 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-41.5 + parent: 12 - uid: 22170 components: - type: Transform @@ -68827,7 +69166,7 @@ entities: - uid: 22319 components: - type: Transform - pos: 35.647026,45.447662 + pos: 35.456554,45.333942 parent: 12 - proto: CentrifugeMachineCircuitboard entities: @@ -68910,11 +69249,11 @@ entities: rot: 1.5707963267948966 rad pos: -17.5,-56.5 parent: 12 - - uid: 4091 + - uid: 4264 components: - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-52.5 + rot: 1.5707963267948966 rad + pos: 62.5,-26.5 parent: 12 - uid: 4409 components: @@ -69226,12 +69565,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,19.5 parent: 12 - - uid: 16545 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -43.5,1.5 - parent: 12 - uid: 16764 components: - type: Transform @@ -69586,29 +69919,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,55.5 parent: 12 - - uid: 21853 - components: - - type: Transform - pos: -9.5,72.5 - parent: 12 - - uid: 21854 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,73.5 - parent: 12 - - uid: 21855 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,74.5 - parent: 12 - - uid: 21856 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,73.5 - parent: 12 - uid: 22171 components: - type: Transform @@ -70898,11 +71208,6 @@ entities: - type: Transform pos: -13.5,-19.5 parent: 12 - - uid: 4773 - components: - - type: Transform - pos: 58.5,-18.5 - parent: 12 - uid: 5997 components: - type: Transform @@ -71093,6 +71398,16 @@ entities: - type: Transform pos: 9.5,-7.5 parent: 12 + - uid: 28533 + components: + - type: Transform + pos: 15.5,7.5 + parent: 12 + - uid: 28534 + components: + - type: Transform + pos: 13.5,-4.5 + parent: 12 - uid: 29230 components: - type: Transform @@ -71205,11 +71520,6 @@ entities: - type: Transform pos: 35.5,-12.5 parent: 12 - - uid: 9085 - components: - - type: Transform - pos: 63.5,-24.5 - parent: 12 - uid: 9212 components: - type: Transform @@ -71742,41 +72052,6 @@ entities: - type: Transform pos: -24.5,31.5 parent: 12 - - uid: 23661 - components: - - type: Transform - pos: 47.5,53.5 - parent: 12 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 5347 - - 17547 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 24275 components: - type: Transform @@ -71913,11 +72188,6 @@ entities: - type: Transform pos: 41.46889,-7.536155 parent: 12 - - uid: 8900 - components: - - type: Transform - pos: 56.502773,-20.635603 - parent: 12 - proto: ClothingEyesBlindfold entities: - uid: 2995 @@ -72073,6 +72343,11 @@ entities: - type: Transform pos: 39.49916,53.57387 parent: 12 + - uid: 28501 + components: + - type: Transform + pos: -12.498269,-45.67308 + parent: 12 - proto: ClothingHandsGlovesLeather entities: - uid: 24125 @@ -72129,6 +72404,12 @@ entities: parent: 12 - proto: ClothingHeadHatWelding entities: + - uid: 6745 + components: + - type: Transform + rot: -37.69911184307754 rad + pos: 12.07476,-19.325361 + parent: 12 - uid: 10390 components: - type: Transform @@ -72144,6 +72425,21 @@ entities: - type: Transform pos: 44.680992,51.002113 parent: 12 +- proto: ClothingHeadHatWeldingMaskFlame + entities: + - uid: 26165 + components: + - type: Transform + rot: -37.69911184307754 rad + pos: -45.593422,44.51472 + parent: 12 +- proto: ClothingHeadHatWeldingMaskFlameBlue + entities: + - uid: 6202 + components: + - type: Transform + pos: -0.54897594,7.582822 + parent: 12 - proto: ClothingHeadHatWeldingMaskPainted entities: - uid: 4244 @@ -72186,11 +72482,6 @@ entities: canCollide: False - proto: ClothingHeadHelmetFire entities: - - uid: 21075 - components: - - type: Transform - pos: -45.59652,44.609135 - parent: 12 - uid: 21513 components: - type: Transform @@ -72265,11 +72556,6 @@ entities: - type: Transform pos: 30.493746,24.522993 parent: 12 - - uid: 21078 - components: - - type: Transform - pos: -45.38552,44.518738 - parent: 12 - uid: 21508 components: - type: Transform @@ -72301,6 +72587,11 @@ entities: parent: 12 - proto: ClothingMaskSterile entities: + - uid: 8888 + components: + - type: Transform + pos: -12.50767,-45.32497 + parent: 12 - uid: 13276 components: - type: Transform @@ -72495,6 +72786,18 @@ entities: - type: Transform pos: 37.5,37.5 parent: 12 +- proto: ClothingOuterHospitalGown + entities: + - uid: 2825 + components: + - type: Transform + pos: -5.6882257,-52.29372 + parent: 12 + - uid: 28462 + components: + - type: Transform + pos: -5.4173927,-52.61664 + parent: 12 - proto: ClothingOuterRobesJudge entities: - uid: 26217 @@ -72521,16 +72824,6 @@ entities: - type: Transform pos: -17.489033,-61.546875 parent: 12 - - uid: 6755 - components: - - type: Transform - pos: 10.51523,-42.6058 - parent: 12 - - uid: 8899 - components: - - type: Transform - pos: 56.67465,-20.557478 - parent: 12 - uid: 10386 components: - type: Transform @@ -72548,11 +72841,6 @@ entities: parent: 12 - proto: ClothingOuterSuitFire entities: - - uid: 21074 - components: - - type: Transform - pos: -45.400593,44.684464 - parent: 12 - uid: 21514 components: - type: Transform @@ -72591,13 +72879,6 @@ entities: - type: Transform pos: -10.5,7.5 parent: 12 -- proto: ClothingShoesBootsSalvage - entities: - - uid: 8904 - components: - - type: Transform - pos: 60.60398,-24.572508 - parent: 12 - proto: ClothingShoesFlippers entities: - uid: 22477 @@ -73008,6 +73289,24 @@ entities: - type: Transform pos: -23.5,-55.5 parent: 12 + - uid: 4153 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,72.5 + parent: 12 + - uid: 4163 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,73.5 + parent: 12 + - uid: 9441 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,73.5 + parent: 12 - uid: 12236 components: - type: Transform @@ -73142,6 +73441,24 @@ entities: rot: 3.141592653589793 rad pos: 44.5,43.5 parent: 12 + - uid: 25595 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,74.5 + parent: 12 + - uid: 27255 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,72.5 + parent: 12 + - uid: 27260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,74.5 + parent: 12 - proto: ComputerAnalysisConsole entities: - uid: 4892 @@ -73198,17 +73515,16 @@ entities: parent: 12 - proto: ComputerCargoBounty entities: - - uid: 8469 + - uid: 437 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 52.5,-22.5 + pos: 56.5,-18.5 parent: 12 - - uid: 11273 + - uid: 8469 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 54.5,-18.5 + rot: 1.5707963267948966 rad + pos: 52.5,-22.5 parent: 12 - proto: ComputerCargoOrders entities: @@ -74159,11 +74475,11 @@ entities: rot: -1.5707963267948966 rad pos: 75.5,-37.5 parent: 12 - - uid: 11462 + - uid: 9556 components: - type: Transform - rot: 3.141592653589793 rad - pos: 75.5,-38.5 + rot: 1.5707963267948966 rad + pos: 38.5,14.5 parent: 12 - uid: 11497 components: @@ -74171,12 +74487,6 @@ entities: rot: 3.141592653589793 rad pos: 39.5,16.5 parent: 12 - - uid: 11498 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,14.5 - parent: 12 - uid: 11499 components: - type: Transform @@ -74364,12 +74674,6 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,6.5 parent: 12 - - uid: 12642 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 77.5,-38.5 - parent: 12 - uid: 22295 components: - type: Transform @@ -74382,6 +74686,50 @@ entities: rot: 3.141592653589793 rad pos: 39.5,15.5 parent: 12 +- proto: ConveyorBeltAssembly + entities: + - uid: 6163 + components: + - type: Transform + parent: 6162 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 6164 + components: + - type: Transform + parent: 6162 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 6165 + components: + - type: Transform + parent: 6162 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 6166 + components: + - type: Transform + parent: 6162 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 6200 + components: + - type: Transform + parent: 6162 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 6201 + components: + - type: Transform + parent: 6162 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: CrateAirlockKit entities: - uid: 1042 @@ -74535,20 +74883,15 @@ entities: parent: 12 - proto: CrateEmptySpawner entities: - - uid: 2036 - components: - - type: Transform - pos: -12.5,-21.5 - parent: 12 - - uid: 8854 + - uid: 436 components: - type: Transform - pos: 59.5,-21.5 + pos: 56.5,-15.5 parent: 12 - - uid: 8855 + - uid: 2036 components: - type: Transform - pos: 62.5,-22.5 + pos: -12.5,-21.5 parent: 12 - uid: 8979 components: @@ -74565,6 +74908,60 @@ entities: - type: Transform pos: 44.5,-11.5 parent: 12 + - uid: 13734 + components: + - type: Transform + pos: 61.5,-18.5 + parent: 12 + - uid: 26169 + components: + - type: Transform + pos: 60.5,-21.5 + parent: 12 +- proto: CrateEngineering + entities: + - uid: 6162 + components: + - type: MetaData + desc: A large crate containing 6 conveyor belts. + name: conveyor belt crate + - type: Transform + pos: 62.5,-21.5 + parent: 12 + - 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: + - 6163 + - 6164 + - 6165 + - 6166 + - 6200 + - 6201 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: CrateEngineeringAMEJar entities: - uid: 21863 @@ -74626,25 +75023,20 @@ entities: parent: 12 - proto: CrateFilledSpawner entities: - - uid: 4241 + - uid: 6205 components: - type: Transform - pos: 10.5,-39.5 + pos: 62.5,-18.5 parent: 12 - uid: 7333 components: - type: Transform pos: 39.5,-18.5 parent: 12 - - uid: 8852 - components: - - type: Transform - pos: 58.5,-22.5 - parent: 12 - - uid: 8853 + - uid: 8858 components: - type: Transform - pos: 61.5,-20.5 + pos: 63.5,-21.5 parent: 12 - uid: 8934 components: @@ -74676,6 +75068,11 @@ entities: - type: Transform pos: 28.5,68.5 parent: 12 + - uid: 26168 + components: + - type: Transform + pos: 63.5,-20.5 + parent: 12 - proto: CrateFoodDinnerware entities: - uid: 9269 @@ -74690,16 +75087,34 @@ entities: - type: Transform pos: -45.5,-49.5 parent: 12 - - uid: 3111 + - uid: 4699 components: - type: Transform - pos: 6.5,-38.5 + pos: -3.5,-53.5 parent: 12 - - uid: 4699 + - uid: 8955 components: - type: Transform - pos: -3.5,-53.5 + pos: 4.5,-38.5 parent: 12 + - 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 - uid: 15403 components: - type: Transform @@ -74985,11 +75400,6 @@ entities: - type: Transform pos: 8.5,-48.5 parent: 12 - - uid: 8858 - components: - - type: Transform - pos: 59.5,-22.5 - parent: 12 - uid: 8936 components: - type: Transform @@ -75049,18 +75459,16 @@ entities: parent: 12 - proto: CrewMonitoringServer entities: - - uid: 7277 + - uid: 4262 components: - type: Transform pos: -0.5,-15.5 parent: 12 + - type: SingletonDeviceNetServer + active: False + available: False - proto: Crowbar entities: - - uid: 8903 - components: - - type: Transform - pos: 59.42465,-24.463133 - parent: 12 - uid: 9248 components: - type: Transform @@ -75403,13 +75811,6 @@ entities: - type: Transform pos: -51.5,20.5 parent: 12 -- proto: DefaultStationBeaconCargoBay - entities: - - uid: 8971 - components: - - type: Transform - pos: 60.5,-22.5 - parent: 12 - proto: DefaultStationBeaconCargoReception entities: - uid: 8513 @@ -75609,10 +76010,10 @@ entities: parent: 12 - proto: DefaultStationBeaconMorgue entities: - - uid: 3121 + - uid: 7582 components: - type: Transform - pos: 4.5,-42.5 + pos: 5.5,-42.5 parent: 12 - proto: DefaultStationBeaconPermaBrig entities: @@ -75782,6 +76183,11 @@ entities: parent: 12 - proto: Defibrillator entities: + - uid: 9125 + components: + - type: Transform + pos: -9.576399,-48.502357 + parent: 12 - uid: 13827 components: - type: Transform @@ -75923,12 +76329,6 @@ entities: - type: Transform pos: -10.5,-47.5 parent: 12 - - uid: 3847 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-52.5 - parent: 12 - uid: 3848 components: - type: Transform @@ -75971,23 +76371,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-42.5 parent: 12 - - uid: 3896 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-39.5 - parent: 12 - - uid: 3897 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-42.5 - parent: 12 - - uid: 3898 - components: - - type: Transform - pos: 4.5,-39.5 - parent: 12 - uid: 3909 components: - type: Transform @@ -76018,16 +76401,10 @@ entities: pos: -16.5,-27.5 parent: 12 - uid: 4136 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-48.5 - parent: 12 - - uid: 4137 components: - type: Transform rot: -1.5707963267948966 rad - pos: 8.5,-48.5 + pos: 10.5,-47.5 parent: 12 - uid: 4138 components: @@ -76041,12 +76418,24 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,-47.5 parent: 12 + - uid: 4456 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-51.5 + parent: 12 - uid: 4674 components: - type: Transform rot: -1.5707963267948966 rad pos: 43.5,38.5 parent: 12 + - uid: 4718 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-47.5 + parent: 12 - uid: 5055 components: - type: Transform @@ -76064,11 +76453,16 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-17.5 parent: 12 - - uid: 6833 + - uid: 6161 components: - type: Transform rot: 1.5707963267948966 rad - pos: 8.5,-38.5 + pos: 10.5,-38.5 + parent: 12 + - uid: 6271 + components: + - type: Transform + pos: -7.5,-51.5 parent: 12 - uid: 6864 components: @@ -76138,16 +76532,16 @@ entities: - type: Transform pos: 6.5,-8.5 parent: 12 - - uid: 8953 + - uid: 8903 components: - type: Transform - pos: 49.5,-17.5 + rot: -1.5707963267948966 rad + pos: 3.5,-42.5 parent: 12 - - uid: 8956 + - uid: 8953 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 59.5,-21.5 + pos: 49.5,-17.5 parent: 12 - uid: 9053 components: @@ -76419,6 +76813,11 @@ entities: rot: 3.141592653589793 rad pos: 42.5,38.5 parent: 12 + - uid: 12919 + components: + - type: Transform + pos: 56.5,-21.5 + parent: 12 - uid: 13010 components: - type: Transform @@ -77543,11 +77942,6 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,8.5 parent: 12 - - uid: 530 - components: - - type: Transform - pos: 10.5,-50.5 - parent: 12 - uid: 637 components: - type: Transform @@ -77941,12 +78335,6 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-11.5 parent: 12 - - uid: 2254 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,6.5 - parent: 12 - uid: 2538 components: - type: Transform @@ -77965,17 +78353,16 @@ entities: rot: 1.5707963267948966 rad pos: 52.5,45.5 parent: 12 - - uid: 3622 + - uid: 3121 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 26.5,10.5 + pos: 10.5,-40.5 parent: 12 - - uid: 3824 + - uid: 3622 components: - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-51.5 + rot: -1.5707963267948966 rad + pos: 26.5,10.5 parent: 12 - uid: 3825 components: @@ -78251,24 +78638,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-43.5 parent: 12 - - uid: 3899 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-41.5 - parent: 12 - - uid: 3900 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-40.5 - parent: 12 - - uid: 3901 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-42.5 - parent: 12 - uid: 3902 components: - type: Transform @@ -78438,6 +78807,12 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-49.5 parent: 12 + - uid: 4265 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-39.5 + parent: 12 - uid: 4398 components: - type: Transform @@ -78456,12 +78831,24 @@ entities: rot: 1.5707963267948966 rad pos: 44.5,45.5 parent: 12 + - uid: 4462 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-41.5 + parent: 12 - uid: 4532 components: - type: Transform rot: 1.5707963267948966 rad pos: 45.5,45.5 parent: 12 + - uid: 4571 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-47.5 + parent: 12 - uid: 4584 components: - type: Transform @@ -78557,12 +78944,24 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,-27.5 parent: 12 + - uid: 4964 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-51.5 + parent: 12 - uid: 5041 components: - type: Transform rot: 1.5707963267948966 rad pos: 51.5,45.5 parent: 12 + - uid: 5051 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-40.5 + parent: 12 - uid: 5240 components: - type: Transform @@ -78586,85 +78985,16 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-15.5 parent: 12 - - uid: 6066 - components: - - type: Transform - pos: 10.5,-51.5 - parent: 12 - - uid: 6743 - components: - - type: Transform - pos: 10.5,-49.5 - parent: 12 - - uid: 6744 - components: - - type: Transform - pos: 10.5,-48.5 - parent: 12 - - uid: 6745 - components: - - type: Transform - pos: 10.5,-47.5 - parent: 12 - - uid: 6746 - components: - - type: Transform - pos: 10.5,-46.5 - parent: 12 - - uid: 6747 - components: - - type: Transform - pos: 10.5,-45.5 - parent: 12 - - uid: 6748 - components: - - type: Transform - pos: 10.5,-44.5 - parent: 12 - - uid: 6834 - components: - - type: Transform - pos: 8.5,-47.5 - parent: 12 - - uid: 6835 - components: - - type: Transform - pos: 8.5,-46.5 - parent: 12 - - uid: 6836 - components: - - type: Transform - pos: 8.5,-45.5 - parent: 12 - - uid: 6837 - components: - - type: Transform - pos: 8.5,-44.5 - parent: 12 - - uid: 6838 - components: - - type: Transform - pos: 8.5,-43.5 - parent: 12 - - uid: 6839 - components: - - type: Transform - pos: 8.5,-42.5 - parent: 12 - - uid: 6840 - components: - - type: Transform - pos: 8.5,-41.5 - parent: 12 - - uid: 6841 + - uid: 5551 components: - type: Transform - pos: 8.5,-40.5 + pos: 7.5,-48.5 parent: 12 - - uid: 6842 + - uid: 6206 components: - type: Transform - pos: 8.5,-39.5 + rot: -1.5707963267948966 rad + pos: -8.5,-51.5 parent: 12 - uid: 6843 components: @@ -78690,18 +79020,6 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-31.5 parent: 12 - - uid: 6854 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-38.5 - parent: 12 - - uid: 6855 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,-38.5 - parent: 12 - uid: 6856 components: - type: Transform @@ -78804,6 +79122,12 @@ entities: rot: 3.141592653589793 rad pos: 21.5,-28.5 parent: 12 + - uid: 7086 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,6.5 + parent: 12 - uid: 7353 components: - type: Transform @@ -79238,24 +79562,6 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,-17.5 parent: 12 - - uid: 8957 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 58.5,-21.5 - parent: 12 - - uid: 8958 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 57.5,-21.5 - parent: 12 - - uid: 8959 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 56.5,-21.5 - parent: 12 - uid: 8960 components: - type: Transform @@ -79292,18 +79598,6 @@ entities: rot: -1.5707963267948966 rad pos: 50.5,-21.5 parent: 12 - - uid: 8966 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 59.5,-20.5 - parent: 12 - - uid: 8967 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 59.5,-19.5 - parent: 12 - uid: 9047 components: - type: Transform @@ -79701,6 +79995,11 @@ entities: rot: 1.5707963267948966 rad pos: 21.5,-17.5 parent: 12 + - uid: 9647 + components: + - type: Transform + pos: 10.5,-39.5 + parent: 12 - uid: 9774 components: - type: Transform @@ -83904,6 +84203,42 @@ entities: - type: Transform pos: -38.5,-42.5 parent: 12 + - uid: 26135 + components: + - type: Transform + pos: 10.5,-41.5 + parent: 12 + - uid: 26136 + components: + - type: Transform + pos: 10.5,-42.5 + parent: 12 + - uid: 26137 + components: + - type: Transform + pos: 10.5,-43.5 + parent: 12 + - uid: 26140 + components: + - type: Transform + pos: 10.5,-44.5 + parent: 12 + - uid: 26141 + components: + - type: Transform + pos: 10.5,-45.5 + parent: 12 + - uid: 26142 + components: + - type: Transform + pos: 10.5,-46.5 + parent: 12 + - uid: 26143 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-47.5 + parent: 12 - uid: 26725 components: - type: Transform @@ -85190,12 +85525,6 @@ entities: - type: Transform pos: -22.5,-53.5 parent: 12 - - uid: 3823 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-52.5 - parent: 12 - uid: 3869 components: - type: Transform @@ -85219,6 +85548,12 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-52.5 parent: 12 + - uid: 4150 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-52.5 + parent: 12 - uid: 4675 components: - type: Transform @@ -85241,11 +85576,6 @@ entities: - type: Transform pos: -0.5,-32.5 parent: 12 - - uid: 6749 - components: - - type: Transform - pos: 10.5,-43.5 - parent: 12 - uid: 6847 components: - type: Transform @@ -85304,11 +85634,6 @@ entities: rot: 1.5707963267948966 rad pos: 46.5,-17.5 parent: 12 - - uid: 8955 - components: - - type: Transform - pos: 59.5,-18.5 - parent: 12 - uid: 9111 components: - type: Transform @@ -85321,6 +85646,12 @@ entities: rot: 3.141592653589793 rad pos: 54.5,-29.5 parent: 12 + - uid: 9446 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 56.5,-22.5 + parent: 12 - uid: 9633 components: - type: Transform @@ -85689,11 +86020,6 @@ entities: - type: Transform pos: 3.5,-38.5 parent: 12 - - uid: 3114 - components: - - type: Transform - pos: -9.5,-52.5 - parent: 12 - uid: 3818 components: - type: Transform @@ -85734,15 +86060,15 @@ entities: - type: Transform pos: -23.5,52.5 parent: 12 - - uid: 6738 + - uid: 6203 components: - type: Transform - pos: -26.5,-2.5 + pos: 56.5,-22.5 parent: 12 - - uid: 6750 + - uid: 6738 components: - type: Transform - pos: 10.5,-43.5 + pos: -26.5,-2.5 parent: 12 - uid: 6862 components: @@ -85769,11 +86095,6 @@ entities: - type: Transform pos: 46.5,-17.5 parent: 12 - - uid: 8954 - components: - - type: Transform - pos: 59.5,-18.5 - parent: 12 - uid: 9110 components: - type: Transform @@ -85801,6 +86122,11 @@ entities: - type: Transform pos: 37.5,19.5 parent: 12 + - uid: 12190 + components: + - type: Transform + pos: -7.5,-52.5 + parent: 12 - uid: 12307 components: - type: Transform @@ -86374,15 +86700,16 @@ entities: - type: Transform pos: -33.242794,-23.30681 parent: 12 - - uid: 8908 + - uid: 4724 components: - type: Transform - pos: 55.42292,-33.810978 + pos: 63.518173,-26.590563 parent: 12 - - uid: 8909 + - uid: 8908 components: - type: Transform - pos: 55.59492,-34.045353 + rot: -37.69911184307754 rad + pos: 55.649223,-33.80984 parent: 12 - uid: 8911 components: @@ -86637,6 +86964,23 @@ entities: - 27130 - proto: EmergencyLight entities: + - uid: 345 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-47.5 + parent: 12 + - uid: 899 + components: + - type: Transform + pos: 14.5,5.5 + parent: 12 + - uid: 3900 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-45.5 + parent: 12 - uid: 3915 components: - type: Transform @@ -86661,6 +87005,12 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-2.5 parent: 12 + - uid: 8887 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-49.5 + parent: 12 - uid: 10510 components: - type: Transform @@ -86817,23 +87167,11 @@ entities: - type: Transform pos: -21.5,-49.5 parent: 12 - - uid: 10538 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-52.5 - parent: 12 - uid: 10539 components: - type: Transform pos: -13.5,-58.5 parent: 12 - - uid: 10540 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-42.5 - parent: 12 - uid: 10542 components: - type: Transform @@ -86872,12 +87210,6 @@ entities: - type: Transform pos: 20.5,6.5 parent: 12 - - uid: 10550 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,6.5 - parent: 12 - uid: 10551 components: - type: Transform @@ -87563,6 +87895,11 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,-26.5 parent: 12 + - uid: 21076 + components: + - type: Transform + pos: 11.5,-41.5 + parent: 12 - uid: 21306 components: - type: Transform @@ -87714,11 +88051,6 @@ entities: - type: Transform pos: 30.5,-36.5 parent: 12 - - uid: 26032 - components: - - type: Transform - pos: 13.5,-36.5 - parent: 12 - uid: 26033 components: - type: Transform @@ -87807,6 +88139,14 @@ entities: - type: FaxMachine name: Science destinationAddress: Science + - uid: 4202 + components: + - type: Transform + pos: 51.5,-21.5 + parent: 12 + - type: FaxMachine + name: Cargo + destinationAddress: Cargo - uid: 5859 components: - type: Transform @@ -87863,14 +88203,6 @@ entities: - type: FaxMachine name: Court destinationAddress: Court - - uid: 26274 - components: - - type: Transform - pos: 56.5,-23.5 - parent: 12 - - type: FaxMachine - name: Cargo - destinationAddress: Cargo - uid: 26276 components: - type: Transform @@ -88301,11 +88633,6 @@ entities: - type: Transform pos: -12.553061,9.684446 parent: 12 - - uid: 21076 - components: - - type: Transform - pos: -45.249878,44.533806 - parent: 12 - uid: 21511 components: - type: Transform @@ -88337,6 +88664,61 @@ entities: - type: DeviceNetwork deviceLists: - 23910 + - uid: 4203 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,-20.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28373 + - 8504 + - uid: 6744 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,-18.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28373 + - 8504 + - uid: 6753 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-60.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 9974 + - uid: 6754 + components: + - type: Transform + pos: -20.5,-40.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28502 + - uid: 6755 + components: + - type: Transform + pos: -22.5,-40.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28502 + - uid: 8515 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,-19.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28373 + - 8504 - uid: 9077 components: - type: Transform @@ -88460,6 +88842,16 @@ entities: - type: DeviceNetwork deviceLists: - 24184 + - uid: 25548 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,-21.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28373 + - 8504 - uid: 26931 components: - type: Transform @@ -88580,6 +88972,15 @@ entities: - type: DeviceNetwork deviceLists: - 28343 + - uid: 1553 + components: + - type: Transform + pos: 58.5,-25.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 6833 + - 8504 - uid: 2073 components: - type: Transform @@ -88701,7 +89102,16 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 28347 + - 8971 + - uid: 2779 + components: + - type: Transform + pos: 17.5,5.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28378 + - 28377 - uid: 2824 components: - type: Transform @@ -88711,6 +89121,20 @@ entities: deviceLists: - 23937 - 2852 + - uid: 2909 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-23.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8504 + - uid: 3896 + components: + - type: Transform + pos: 9.5,-42.5 + parent: 12 - uid: 3954 components: - type: Transform @@ -88745,11 +89169,15 @@ entities: - type: DeviceNetwork deviceLists: - 25448 + - 28502 - uid: 3993 components: - type: Transform pos: -24.5,-46.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 28502 - uid: 3994 components: - type: Transform @@ -88792,11 +89220,6 @@ entities: - type: Transform pos: -7.5,-59.5 parent: 12 - - uid: 4000 - components: - - type: Transform - pos: -10.5,-60.5 - parent: 12 - uid: 4001 components: - type: Transform @@ -88809,7 +89232,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 28347 + - 8971 - uid: 4004 components: - type: Transform @@ -88817,7 +89240,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 28347 + - 8971 - uid: 4005 components: - type: Transform @@ -88825,7 +89248,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 28347 + - 8971 - uid: 4006 components: - type: Transform @@ -88833,8 +89256,8 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 28347 - 28354 + - 8971 - uid: 4007 components: - type: Transform @@ -88904,21 +89327,17 @@ entities: - type: Transform pos: -18.5,-42.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 28502 - uid: 4018 components: - type: Transform pos: -18.5,-41.5 parent: 12 - - uid: 4019 - components: - - type: Transform - pos: -22.5,-40.5 - parent: 12 - - uid: 4020 - components: - - type: Transform - pos: -20.5,-40.5 - parent: 12 + - type: DeviceNetwork + deviceLists: + - 28502 - uid: 4155 components: - type: Transform @@ -89148,16 +89567,6 @@ entities: deviceLists: - 28367 - 28373 - - uid: 7457 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-21.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28370 - - 28373 - uid: 7458 components: - type: Transform @@ -89168,7 +89577,7 @@ entities: deviceLists: - 23929 - 28367 - - 8913 + - 6833 - uid: 7459 components: - type: Transform @@ -89234,7 +89643,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 8913 + - 6833 - uid: 7616 components: - type: Transform @@ -89243,7 +89652,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 8913 + - 6833 - uid: 7617 components: - type: Transform @@ -89252,7 +89661,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 8913 + - 6833 - uid: 7618 components: - type: Transform @@ -89261,7 +89670,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 8913 + - 6833 - uid: 7775 components: - type: Transform @@ -89271,6 +89680,7 @@ entities: - type: DeviceNetwork deviceLists: - 28371 + - 28373 - uid: 7785 components: - type: Transform @@ -89281,16 +89691,6 @@ entities: deviceLists: - 28371 - 28373 - - uid: 7787 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 57.5,-17.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28370 - - 28371 - uid: 8460 components: - type: Transform @@ -89307,15 +89707,6 @@ entities: - type: DeviceNetwork deviceLists: - 20784 - - uid: 8859 - components: - - type: Transform - pos: 58.5,-26.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 8913 - - 28370 - uid: 9114 components: - type: Transform @@ -89585,6 +89976,15 @@ entities: - type: DeviceNetwork deviceLists: - 29782 + - uid: 9666 + components: + - type: Transform + pos: 17.5,4.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28378 + - 28377 - uid: 9994 components: - type: Transform @@ -91462,6 +91862,7 @@ entities: - type: DeviceNetwork deviceLists: - 25448 + - 28502 - uid: 25373 components: - type: Transform @@ -91480,6 +91881,15 @@ entities: - type: DeviceNetwork deviceLists: - 23791 + - uid: 26161 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,-27.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 6833 - uid: 26235 components: - type: Transform @@ -91643,11 +92053,6 @@ entities: parent: 12 - proto: FlashlightLantern entities: - - uid: 8901 - components: - - type: Transform - pos: 56.315273,-20.369978 - parent: 12 - uid: 8997 components: - type: Transform @@ -91815,6 +92220,13 @@ entities: parent: 12 - type: Fixtures fixtures: {} + - uid: 7589 + components: + - type: Transform + pos: 5.5,-39.5 + parent: 12 + - type: Fixtures + fixtures: {} - uid: 12264 components: - type: Transform @@ -92151,6 +92563,18 @@ entities: - type: Transform pos: 57.653427,58.37039 parent: 12 +- proto: FoodBanana + entities: + - uid: 4201 + components: + - type: Transform + pos: -9.655863,20.270027 + parent: 12 + - uid: 9998 + components: + - type: Transform + pos: -11.85737,19.691113 + parent: 12 - proto: FoodBowlBig entities: - uid: 15073 @@ -92190,13 +92614,16 @@ entities: - type: Transform pos: 54.4793,29.485868 parent: 12 -- proto: FoodBoxDonut +- proto: FoodBoxDonkpocketStonk entities: - - uid: 16777 + - uid: 6757 components: - type: Transform - pos: -44.455486,2.5366576 + rot: -37.69911184307754 rad + pos: 63.531303,-26.01895 parent: 12 +- proto: FoodBoxDonut + entities: - uid: 21413 components: - type: Transform @@ -92235,6 +92662,13 @@ entities: - type: Transform pos: 3.7616825,57.618866 parent: 12 +- proto: FoodBurgerMothRoach + entities: + - uid: 28505 + components: + - type: Transform + pos: 10.45153,-49.457336 + parent: 12 - proto: FoodCartCold entities: - uid: 23558 @@ -93033,14 +93467,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 1364 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,4.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 2183 components: - type: Transform @@ -93189,13 +93615,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 3586 - components: - - type: Transform - pos: -10.5,-47.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 3617 components: - type: Transform @@ -93211,21 +93630,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3628 - components: - - type: Transform - pos: 5.5,-42.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 3629 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-43.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 3645 components: - type: Transform @@ -93273,13 +93677,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 3690 - components: - - type: Transform - pos: 6.5,-39.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 3712 components: - type: Transform @@ -93287,14 +93684,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 3713 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-50.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 3720 components: - type: Transform @@ -93358,6 +93747,54 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 4143 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-48.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 4144 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-49.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 4145 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-47.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 4146 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-48.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 4147 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-49.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 4255 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-21.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 4694 components: - type: Transform @@ -93513,25 +93950,40 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 7034 + - uid: 6842 components: - type: Transform - pos: 30.5,-38.5 + rot: -1.5707963267948966 rad + pos: 3.5,-50.5 parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 7062 + - uid: 6900 components: - type: Transform - pos: 50.5,-25.5 + rot: -1.5707963267948966 rad + pos: 57.5,-24.5 parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 7086 + - uid: 6905 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,-38.5 + pos: 62.5,-21.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 7034 + components: + - type: Transform + pos: 30.5,-38.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 7062 + components: + - type: Transform + pos: 50.5,-25.5 parent: 12 - type: AtmosPipeColor color: '#0055CCFF' @@ -93597,6 +94049,13 @@ entities: - type: Transform pos: -46.5,-19.5 parent: 12 + - uid: 7579 + components: + - type: Transform + pos: -7.5,-47.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 8531 components: - type: Transform @@ -93698,14 +94157,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 8672 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 59.5,-24.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 8711 components: - type: Transform @@ -93753,28 +94204,21 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 9435 - components: - - type: Transform - pos: 20.5,6.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 9439 + - uid: 9492 components: - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,4.5 + pos: 30.5,2.5 parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 9492 + - uid: 9509 components: - type: Transform - pos: 30.5,2.5 + rot: -1.5707963267948966 rad + pos: 10.5,-47.5 parent: 12 - type: AtmosPipeColor - color: '#990000FF' + color: '#0055CCFF' - uid: 9526 components: - type: Transform @@ -93854,6 +94298,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#00FFFFFF' + - uid: 9863 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-38.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 10022 components: - type: Transform @@ -95703,13 +96155,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 5218 - components: - - type: Transform - pos: 15.5,5.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 5297 components: - type: Transform @@ -95921,6 +96366,14 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,-21.5 parent: 12 + - uid: 901 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,4.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 909 components: - type: Transform @@ -97224,6 +97677,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2254 + components: + - type: Transform + pos: 57.5,-23.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2257 components: - type: Transform @@ -97276,6 +97736,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#00FFFFFF' + - uid: 2758 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,4.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 2806 components: - type: Transform @@ -97298,6 +97766,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 2816 + components: + - type: Transform + pos: 57.5,-22.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 2885 components: - type: Transform @@ -97547,13 +98022,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3524 - components: - - type: Transform - pos: -10.5,-49.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 3525 components: - type: Transform @@ -98073,30 +98541,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3630 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-43.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 3631 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-43.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 3632 + - uid: 3629 components: - type: Transform rot: 1.5707963267948966 rad - pos: 8.5,-43.5 + pos: 18.5,4.5 parent: 12 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' - uid: 3637 components: - type: Transform @@ -98950,6 +99402,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 3955 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-42.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 4074 components: - type: Transform @@ -98958,6 +99418,46 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 4137 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-48.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 4141 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-49.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 4148 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-42.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 4149 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-47.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 4261 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,-21.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 4737 components: - type: Transform @@ -99583,14 +100083,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 4949 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,6.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 4966 components: - type: Transform @@ -100204,14 +100696,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 5371 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,4.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 5399 components: - type: Transform @@ -100440,6 +100924,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 6066 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-42.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 6279 components: - type: Transform @@ -100450,6 +100942,46 @@ entities: - type: Transform pos: 67.5,5.5 parent: 12 + - uid: 6854 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,-23.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 6897 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-43.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 6899 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,4.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 6901 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-21.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 6904 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,-21.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 6985 components: - type: Transform @@ -101434,6 +101966,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 7457 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-52.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 7474 components: - type: Transform @@ -101466,6 +102006,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 7508 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-39.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7511 components: - type: Transform @@ -101474,6 +102022,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 7563 + components: + - type: Transform + pos: 16.5,6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7566 components: - type: Transform @@ -101482,6 +102037,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 7588 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-23.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7745 components: - type: Transform @@ -101490,6 +102053,37 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 7784 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-46.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 8241 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-45.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 8492 + components: + - type: Transform + pos: 10.5,-40.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 8493 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-50.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 8518 components: - type: Transform @@ -102086,14 +102680,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 8622 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 57.5,-24.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 8623 components: - type: Transform @@ -102353,34 +102939,11 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 8668 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 58.5,-24.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8669 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 58.5,-23.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8670 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 58.5,-24.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 8671 components: - type: Transform - pos: 59.5,-23.5 + rot: 1.5707963267948966 rad + pos: -14.5,19.5 parent: 12 - type: AtmosPipeColor color: '#0055CCFF' @@ -102557,6 +103120,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 8714 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,21.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 8739 components: - type: Transform @@ -102580,6 +103151,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8795 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,21.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 8800 components: - type: Transform @@ -102608,11 +103187,40 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 9127 + - uid: 8889 components: - type: Transform rot: -1.5707963267948966 rad - pos: 18.5,6.5 + pos: -8.5,-47.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 8899 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-47.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 8909 + components: + - type: Transform + pos: 7.5,-43.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 8954 + components: + - type: Transform + pos: 7.5,-44.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 8966 + components: + - type: Transform + pos: 58.5,-24.5 parent: 12 - type: AtmosPipeColor color: '#990000FF' @@ -102814,14 +103422,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#00FFFFFF' - - uid: 9509 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,5.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 9517 components: - type: Transform @@ -102909,6 +103509,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 9685 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-44.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 9686 components: - type: Transform @@ -103014,6 +103622,44 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 9705 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-47.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 9754 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-46.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 9815 + components: + - type: Transform + pos: 10.5,-41.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 9831 + components: + - type: Transform + pos: 10.5,-39.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 9857 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-38.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 9864 components: - type: Transform @@ -103029,13 +103675,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 9958 - components: - - type: Transform - pos: -12.5,-50.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 9959 components: - type: Transform @@ -103057,6 +103696,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 9999 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,19.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 10007 components: - type: Transform @@ -103461,6 +104108,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 10105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,21.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 10192 components: - type: Transform @@ -103492,6 +104147,22 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 10371 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 62.5,-22.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 10402 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 61.5,-21.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 10693 components: - type: Transform @@ -103500,6 +104171,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 10727 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-48.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 10891 components: - type: Transform @@ -106604,14 +107283,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 16581 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -16.5,21.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 16582 components: - type: Transform @@ -106716,13 +107387,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 16597 - components: - - type: Transform - pos: -15.5,19.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 16598 components: - type: Transform @@ -108970,6 +109634,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 19544 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-42.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 19545 components: - type: Transform @@ -110328,6 +111000,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 20341 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-42.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 20907 components: - type: Transform @@ -115699,14 +116379,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 27293 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-50.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 27294 components: - type: Transform @@ -117230,14 +117902,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2816 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-52.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2878 components: - type: Transform @@ -117331,13 +117995,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3553 - components: - - type: Transform - pos: -21.5,-46.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 3554 components: - type: Transform @@ -117409,14 +118066,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3626 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-42.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 3633 components: - type: Transform @@ -117448,13 +118097,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 3691 - components: - - type: Transform - pos: 5.5,-39.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 3696 components: - type: Transform @@ -117463,14 +118105,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 3709 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-46.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 3711 components: - type: Transform @@ -117651,13 +118285,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 5042 - components: - - type: Transform - pos: 19.5,6.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 5144 components: - type: Transform @@ -117751,6 +118378,67 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 6837 + components: + - type: Transform + pos: -10.5,-47.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 6840 + components: + - type: Transform + pos: 6.5,-39.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 6841 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-50.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 6889 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,4.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 6893 + components: + - type: Transform + pos: 15.5,5.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 6894 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-49.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 6898 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,4.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 6903 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,-23.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 6990 components: - type: Transform @@ -117855,6 +118543,22 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-1.5 parent: 12 + - uid: 7277 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-50.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 7299 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,21.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7315 components: - type: Transform @@ -117863,6 +118567,30 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 7374 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,19.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 7444 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-50.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 7467 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,-46.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 7747 components: - type: Transform @@ -117886,6 +118614,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8505 + components: + - type: Transform + pos: 12.5,-38.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 8517 components: - type: Transform @@ -118080,6 +118815,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 8904 + components: + - type: Transform + pos: 7.5,-42.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 9462 components: - type: Transform @@ -118110,6 +118852,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 9958 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-42.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 10033 components: - type: Transform @@ -118451,14 +119201,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 12919 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,6.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 13270 components: - type: Transform @@ -120299,6 +121041,8 @@ entities: color: '#990000FF' - uid: 26776 components: + - type: MetaData + name: gas pump to TEG - type: Transform pos: 61.5,-4.5 parent: 12 @@ -120325,6 +121069,8 @@ entities: color: '#0055CCFF' - uid: 27146 components: + - type: MetaData + name: gas pump to waste - type: Transform pos: 62.5,-4.5 parent: 12 @@ -120615,18 +121361,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 2758 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-52.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 9984 - - 28347 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 2759 components: - type: Transform @@ -120659,13 +121393,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3017 - components: - - type: Transform - pos: 15.5,6.5 - parent: 12 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 3519 components: - type: Transform @@ -120688,17 +121415,6 @@ entities: - 9984 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3556 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,-47.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 2545 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 3619 components: - type: Transform @@ -120721,16 +121437,6 @@ entities: - 28359 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3627 - components: - - type: Transform - pos: 4.5,-41.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28358 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 3635 components: - type: Transform @@ -120884,6 +121590,14 @@ entities: - type: Transform pos: 1.5,-0.5 parent: 12 + - uid: 7507 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-45.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 8535 components: - type: Transform @@ -120891,7 +121605,6 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 8913 - 28367 - type: AtmosPipeColor color: '#0055CCFF' @@ -120901,9 +121614,6 @@ entities: rot: 3.141592653589793 rad pos: 55.5,-40.5 parent: 12 - - type: DeviceNetwork - deviceLists: - - 8913 - type: AtmosPipeColor color: '#0055CCFF' - uid: 8543 @@ -120911,9 +121621,6 @@ entities: - type: Transform pos: 77.5,-31.5 parent: 12 - - type: DeviceNetwork - deviceLists: - - 8913 - type: AtmosPipeColor color: '#0055CCFF' - uid: 8597 @@ -120924,7 +121631,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 8913 + - 6833 - type: AtmosPipeColor color: '#0055CCFF' - uid: 8678 @@ -120959,16 +121666,6 @@ entities: - 28371 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 8714 - components: - - type: Transform - pos: 59.5,-22.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28370 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 9479 components: - type: Transform @@ -121026,6 +121723,14 @@ entities: - 2614 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 10106 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,19.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 10191 components: - type: Transform @@ -121034,6 +121739,25 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 10412 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 62.5,-23.5 + parent: 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 11462 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-49.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8971 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 12049 components: - type: Transform @@ -121943,6 +122667,17 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 26118 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-49.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8971 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 26312 components: - type: Transform @@ -122162,6 +122897,16 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 28504 + components: + - type: Transform + pos: -21.5,-45.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28502 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 28937 components: - type: Transform @@ -122434,6 +123179,7 @@ entities: - type: DeviceNetwork deviceLists: - 2545 + - 28502 - type: AtmosPipeColor color: '#990000FF' - uid: 3584 @@ -122459,29 +123205,6 @@ entities: - 2545 - type: AtmosPipeColor color: '#990000FF' - - uid: 3702 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-40.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 9975 - - 28358 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 3710 - components: - - type: Transform - pos: -10.5,-45.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 9984 - - 28347 - - type: AtmosPipeColor - color: '#990000FF' - uid: 3725 components: - type: Transform @@ -122632,6 +123355,27 @@ entities: - type: Transform pos: -2.5,-0.5 parent: 12 + - uid: 7519 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-50.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8971 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 7787 + components: + - type: Transform + pos: 19.5,5.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 28378 + - type: AtmosPipeColor + color: '#990000FF' - uid: 8536 components: - type: Transform @@ -122640,7 +123384,6 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 8913 - 28367 - type: AtmosPipeColor color: '#990000FF' @@ -122661,6 +123404,9 @@ entities: rot: 3.141592653589793 rad pos: 58.5,-32.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 6833 - type: AtmosPipeColor color: '#990000FF' - uid: 8541 @@ -122669,9 +123415,6 @@ entities: rot: 3.141592653589793 rad pos: 56.5,-40.5 parent: 12 - - type: DeviceNetwork - deviceLists: - - 8913 - type: AtmosPipeColor color: '#990000FF' - uid: 8544 @@ -122679,9 +123422,6 @@ entities: - type: Transform pos: 80.5,-31.5 parent: 12 - - type: DeviceNetwork - deviceLists: - - 8913 - type: AtmosPipeColor color: '#990000FF' - uid: 8673 @@ -122692,7 +123432,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 28370 + - 8504 - type: AtmosPipeColor color: '#990000FF' - uid: 8677 @@ -122735,17 +123475,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 9556 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,5.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 28378 - - type: AtmosPipeColor - color: '#990000FF' - uid: 10006 components: - type: Transform @@ -122778,6 +123507,25 @@ entities: - 449 - type: AtmosPipeColor color: '#990000FF' + - uid: 10538 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-50.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8971 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 11273 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-39.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 12730 components: - type: Transform @@ -123554,6 +124302,14 @@ entities: - 28365 - type: AtmosPipeColor color: '#990000FF' + - uid: 26164 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 61.5,-23.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 26311 components: - type: Transform @@ -123659,6 +124415,14 @@ entities: - 26938 - type: AtmosPipeColor color: '#990000FF' + - uid: 27249 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,21.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 27284 components: - type: Transform @@ -124331,11 +125095,6 @@ entities: rot: 3.141592653589793 rad pos: -30.5,-1.5 parent: 12 - - uid: 398 - components: - - type: Transform - pos: -33.5,-4.5 - parent: 12 - uid: 401 components: - type: Transform @@ -124735,21 +125494,11 @@ entities: rot: 3.141592653589793 rad pos: -45.5,-38.5 parent: 12 - - uid: 896 - components: - - type: Transform - pos: -34.5,-4.5 - parent: 12 - uid: 897 components: - type: Transform pos: -35.5,-6.5 parent: 12 - - uid: 920 - components: - - type: Transform - pos: -33.5,-7.5 - parent: 12 - uid: 942 components: - type: Transform @@ -124900,11 +125649,6 @@ entities: - type: Transform pos: 13.5,1.5 parent: 12 - - uid: 1355 - components: - - type: Transform - pos: 12.5,-3.5 - parent: 12 - uid: 1356 components: - type: Transform @@ -125636,6 +126380,11 @@ entities: - type: Transform pos: 2.5,-44.5 parent: 12 + - uid: 3106 + components: + - type: Transform + pos: 61.5,-22.5 + parent: 12 - uid: 3126 components: - type: Transform @@ -125727,27 +126476,21 @@ entities: - type: Transform pos: 9.5,-51.5 parent: 12 - - uid: 4148 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-41.5 - parent: 12 - - uid: 4163 + - uid: 4230 components: - type: Transform - pos: 11.5,-43.5 + rot: 1.5707963267948966 rad + pos: 57.5,-46.5 parent: 12 - - uid: 4164 + - uid: 4259 components: - type: Transform - pos: 11.5,-44.5 + pos: 7.5,74.5 parent: 12 - - uid: 4230 + - uid: 4263 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 57.5,-46.5 + pos: 7.5,73.5 parent: 12 - uid: 4413 components: @@ -126000,6 +126743,24 @@ entities: - type: Transform pos: -4.5,-34.5 parent: 12 + - uid: 5314 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-54.5 + parent: 12 + - uid: 5371 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-53.5 + parent: 12 + - uid: 5372 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-52.5 + parent: 12 - uid: 5374 components: - type: Transform @@ -126030,6 +126791,12 @@ entities: - type: Transform pos: 44.5,3.5 parent: 12 + - uid: 5430 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-51.5 + parent: 12 - uid: 5437 components: - type: Transform @@ -126379,51 +127146,6 @@ entities: - type: Transform pos: 13.5,-54.5 parent: 12 - - uid: 6158 - components: - - type: Transform - pos: 11.5,-53.5 - parent: 12 - - uid: 6159 - components: - - type: Transform - pos: 11.5,-52.5 - parent: 12 - - uid: 6160 - components: - - type: Transform - pos: 11.5,-51.5 - parent: 12 - - uid: 6161 - components: - - type: Transform - pos: 11.5,-50.5 - parent: 12 - - uid: 6162 - components: - - type: Transform - pos: 11.5,-49.5 - parent: 12 - - uid: 6163 - components: - - type: Transform - pos: 11.5,-48.5 - parent: 12 - - uid: 6164 - components: - - type: Transform - pos: 11.5,-47.5 - parent: 12 - - uid: 6165 - components: - - type: Transform - pos: 11.5,-46.5 - parent: 12 - - uid: 6166 - components: - - type: Transform - pos: 11.5,-45.5 - parent: 12 - uid: 6167 components: - type: Transform @@ -126554,6 +127276,11 @@ entities: - type: Transform pos: 32.5,-43.5 parent: 12 + - uid: 6208 + components: + - type: Transform + pos: 7.5,75.5 + parent: 12 - uid: 6211 components: - type: Transform @@ -126576,12 +127303,6 @@ entities: - type: Transform pos: 13.5,6.5 parent: 12 - - uid: 6271 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-20.5 - parent: 12 - uid: 6284 components: - type: Transform @@ -126691,11 +127412,6 @@ entities: - type: Transform pos: 28.5,-2.5 parent: 12 - - uid: 6752 - components: - - type: Transform - pos: 10.5,-44.5 - parent: 12 - uid: 6798 components: - type: Transform @@ -126721,11 +127437,6 @@ entities: - type: Transform pos: -60.5,30.5 parent: 12 - - uid: 7262 - components: - - type: Transform - pos: 11.5,-54.5 - parent: 12 - uid: 7300 components: - type: Transform @@ -126887,18 +127598,6 @@ entities: rot: 1.5707963267948966 rad pos: 57.5,-50.5 parent: 12 - - uid: 7507 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-19.5 - parent: 12 - - uid: 7508 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-18.5 - parent: 12 - uid: 7513 components: - type: Transform @@ -126947,18 +127646,6 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,-10.5 parent: 12 - - uid: 7562 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 56.5,-17.5 - parent: 12 - - uid: 7563 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 58.5,-17.5 - parent: 12 - uid: 7567 components: - type: Transform @@ -126977,12 +127664,6 @@ entities: rot: 1.5707963267948966 rad pos: 63.5,-11.5 parent: 12 - - uid: 7588 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 60.5,-25.5 - parent: 12 - uid: 7610 components: - type: Transform @@ -127145,6 +127826,12 @@ entities: rot: 1.5707963267948966 rad pos: 64.5,-14.5 parent: 12 + - uid: 7789 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,-4.5 + parent: 12 - uid: 8028 components: - type: Transform @@ -127204,6 +127891,21 @@ entities: - type: Transform pos: 55.5,-24.5 parent: 12 + - uid: 8516 + components: + - type: Transform + pos: 7.5,72.5 + parent: 12 + - uid: 8622 + components: + - type: Transform + pos: -46.5,0.5 + parent: 12 + - uid: 8668 + components: + - type: Transform + pos: -47.5,0.5 + parent: 12 - uid: 8984 components: - type: Transform @@ -127225,6 +127927,11 @@ entities: - type: Transform pos: -1.5,1.5 parent: 12 + - uid: 9442 + components: + - type: Transform + pos: 59.5,-24.5 + parent: 12 - uid: 9504 components: - type: Transform @@ -127260,6 +127967,16 @@ entities: - type: Transform pos: -3.5,-34.5 parent: 12 + - uid: 9970 + components: + - type: Transform + pos: -46.5,3.5 + parent: 12 + - uid: 9971 + components: + - type: Transform + pos: -47.5,3.5 + parent: 12 - uid: 9997 components: - type: Transform @@ -127356,18 +128073,6 @@ entities: rot: 1.5707963267948966 rad pos: -45.5,0.5 parent: 12 - - uid: 10105 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -45.5,1.5 - parent: 12 - - uid: 10106 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -45.5,2.5 - parent: 12 - uid: 10107 components: - type: Transform @@ -127762,12 +128467,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,22.5 parent: 12 - - uid: 10653 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,3.5 - parent: 12 - uid: 10675 components: - type: Transform @@ -129981,6 +130680,18 @@ entities: - type: Transform pos: -59.5,23.5 parent: 12 + - uid: 16787 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,0.5 + parent: 12 + - uid: 16788 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,0.5 + parent: 12 - uid: 16801 components: - type: Transform @@ -130765,6 +131476,12 @@ entities: - type: Transform pos: -54.5,38.5 parent: 12 + - uid: 21074 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-48.5 + parent: 12 - uid: 21315 components: - type: Transform @@ -130855,16 +131572,6 @@ entities: - type: Transform pos: -3.5,-5.5 parent: 12 - - uid: 22021 - components: - - type: Transform - pos: -9.5,1.5 - parent: 12 - - uid: 22022 - components: - - type: Transform - pos: -10.5,0.5 - parent: 12 - uid: 22026 components: - type: Transform @@ -130889,20 +131596,15 @@ entities: rot: 1.5707963267948966 rad pos: -29.5,73.5 parent: 12 - - uid: 22050 + - uid: 22051 components: - type: Transform - pos: -9.5,0.5 + pos: -33.5,5.5 parent: 12 - uid: 22065 components: - type: Transform - pos: -11.5,-2.5 - parent: 12 - - uid: 22066 - components: - - type: Transform - pos: -11.5,-1.5 + pos: -33.5,13.5 parent: 12 - uid: 22067 components: @@ -130929,21 +131631,6 @@ entities: - type: Transform pos: -10.5,-13.5 parent: 12 - - uid: 22072 - components: - - type: Transform - pos: -10.5,-1.5 - parent: 12 - - uid: 22073 - components: - - type: Transform - pos: -10.5,-0.5 - parent: 12 - - uid: 22075 - components: - - type: Transform - pos: -9.5,2.5 - parent: 12 - uid: 22098 components: - type: Transform @@ -131127,15 +131814,15 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,73.5 parent: 12 - - uid: 25191 + - uid: 25103 components: - type: Transform - pos: 14.5,-9.5 + pos: 60.5,-22.5 parent: 12 - - uid: 25197 + - uid: 25191 components: - type: Transform - pos: 12.5,-2.5 + pos: 14.5,-9.5 parent: 12 - uid: 25331 components: @@ -131216,6 +131903,12 @@ entities: - type: Transform pos: 12.5,0.5 parent: 12 + - uid: 25535 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,-7.5 + parent: 12 - uid: 25537 components: - type: Transform @@ -131232,11 +131925,6 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,-30.5 parent: 12 - - uid: 25548 - components: - - type: Transform - pos: 12.5,-4.5 - parent: 12 - uid: 25550 components: - type: Transform @@ -131567,6 +132255,24 @@ entities: - type: Transform pos: -56.5,-15.5 parent: 12 + - uid: 26106 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,-17.5 + parent: 12 + - uid: 26107 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-17.5 + parent: 12 + - uid: 26108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,-17.5 + parent: 12 - uid: 26110 components: - type: Transform @@ -131577,6 +132283,107 @@ entities: - type: Transform pos: -40.5,57.5 parent: 12 + - uid: 26171 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-22.5 + parent: 12 + - uid: 26172 + components: + - type: Transform + pos: 7.5,83.5 + parent: 12 + - uid: 26175 + components: + - type: Transform + pos: 7.5,84.5 + parent: 12 + - uid: 26176 + components: + - type: Transform + pos: 7.5,85.5 + parent: 12 + - uid: 26177 + components: + - type: Transform + pos: 7.5,86.5 + parent: 12 + - uid: 26178 + components: + - type: Transform + pos: 8.5,87.5 + parent: 12 + - uid: 26179 + components: + - type: Transform + pos: 8.5,88.5 + parent: 12 + - uid: 26180 + components: + - type: Transform + pos: 9.5,88.5 + parent: 12 + - uid: 26181 + components: + - type: Transform + pos: 9.5,89.5 + parent: 12 + - uid: 26182 + components: + - type: Transform + pos: 10.5,89.5 + parent: 12 + - uid: 26183 + components: + - type: Transform + pos: 11.5,89.5 + parent: 12 + - uid: 26185 + components: + - type: Transform + pos: 12.5,90.5 + parent: 12 + - uid: 26186 + components: + - type: Transform + pos: 12.5,91.5 + parent: 12 + - uid: 26187 + components: + - type: Transform + pos: 14.5,91.5 + parent: 12 + - uid: 26190 + components: + - type: Transform + pos: 15.5,91.5 + parent: 12 + - uid: 26191 + components: + - type: Transform + pos: 16.5,91.5 + parent: 12 + - uid: 26192 + components: + - type: Transform + pos: 17.5,91.5 + parent: 12 + - uid: 26193 + components: + - type: Transform + pos: 18.5,91.5 + parent: 12 + - uid: 26194 + components: + - type: Transform + pos: 19.5,91.5 + parent: 12 + - uid: 26195 + components: + - type: Transform + pos: 20.5,91.5 + parent: 12 - uid: 26198 components: - type: Transform @@ -131589,6 +132396,11 @@ entities: rot: 1.5707963267948966 rad pos: -43.5,-54.5 parent: 12 + - uid: 26229 + components: + - type: Transform + pos: 21.5,91.5 + parent: 12 - uid: 26248 components: - type: Transform @@ -131607,6 +132419,16 @@ entities: rot: 1.5707963267948966 rad pos: 58.5,-47.5 parent: 12 + - uid: 26260 + components: + - type: Transform + pos: 22.5,91.5 + parent: 12 + - uid: 26274 + components: + - type: Transform + pos: 23.5,91.5 + parent: 12 - uid: 26291 components: - type: Transform @@ -131683,12 +132505,32 @@ entities: rot: 3.141592653589793 rad pos: 73.5,14.5 parent: 12 + - uid: 26409 + components: + - type: Transform + pos: 24.5,91.5 + parent: 12 + - uid: 26410 + components: + - type: Transform + pos: 13.5,91.5 + parent: 12 + - uid: 26412 + components: + - type: Transform + pos: 24.5,90.5 + parent: 12 - uid: 26413 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,67.5 parent: 12 + - uid: 26450 + components: + - type: Transform + pos: 25.5,89.5 + parent: 12 - uid: 26471 components: - type: Transform @@ -131809,6 +132651,11 @@ entities: - type: Transform pos: 74.5,3.5 parent: 12 + - uid: 26542 + components: + - type: Transform + pos: 26.5,89.5 + parent: 12 - uid: 26566 components: - type: Transform @@ -131849,6 +132696,11 @@ entities: - type: Transform pos: 68.5,14.5 parent: 12 + - uid: 26586 + components: + - type: Transform + pos: 27.5,89.5 + parent: 12 - uid: 26589 components: - type: Transform @@ -132077,12 +132929,37 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,-25.5 parent: 12 + - uid: 27094 + components: + - type: Transform + pos: 27.5,88.5 + parent: 12 + - uid: 27095 + components: + - type: Transform + pos: 28.5,88.5 + parent: 12 + - uid: 27096 + components: + - type: Transform + pos: 28.5,87.5 + parent: 12 + - uid: 27099 + components: + - type: Transform + pos: 29.5,86.5 + parent: 12 - uid: 27100 components: - type: Transform rot: 1.5707963267948966 rad pos: -53.5,54.5 parent: 12 + - uid: 27101 + components: + - type: Transform + pos: 29.5,85.5 + parent: 12 - uid: 27111 components: - type: Transform @@ -132107,6 +132984,11 @@ entities: rot: 3.141592653589793 rad pos: -26.5,75.5 parent: 12 + - uid: 27169 + components: + - type: Transform + pos: 29.5,84.5 + parent: 12 - uid: 27203 components: - type: Transform @@ -132123,6 +133005,41 @@ entities: - type: Transform pos: 11.5,12.5 parent: 12 + - uid: 27248 + components: + - type: Transform + pos: 29.5,76.5 + parent: 12 + - uid: 27262 + components: + - type: Transform + pos: 29.5,75.5 + parent: 12 + - uid: 27263 + components: + - type: Transform + pos: 29.5,74.5 + parent: 12 + - uid: 27264 + components: + - type: Transform + pos: 29.5,73.5 + parent: 12 + - uid: 27266 + components: + - type: Transform + pos: 29.5,72.5 + parent: 12 + - uid: 27267 + components: + - type: Transform + pos: 29.5,71.5 + parent: 12 + - uid: 27293 + components: + - type: Transform + pos: 29.5,70.5 + parent: 12 - uid: 27337 components: - type: Transform @@ -132197,6 +133114,16 @@ entities: - type: Transform pos: -32.5,-45.5 parent: 12 + - uid: 27734 + components: + - type: Transform + pos: 29.5,83.5 + parent: 12 + - uid: 27736 + components: + - type: Transform + pos: -11.5,0.5 + parent: 12 - uid: 27843 components: - type: Transform @@ -132220,6 +133147,31 @@ entities: rot: -1.5707963267948966 rad pos: -34.5,70.5 parent: 12 + - uid: 27915 + components: + - type: Transform + pos: 30.5,77.5 + parent: 12 + - uid: 27919 + components: + - type: Transform + pos: 30.5,78.5 + parent: 12 + - uid: 27920 + components: + - type: Transform + pos: 30.5,79.5 + parent: 12 + - uid: 27921 + components: + - type: Transform + pos: 30.5,80.5 + parent: 12 + - uid: 27922 + components: + - type: Transform + pos: 30.5,81.5 + parent: 12 - uid: 27926 components: - type: Transform @@ -132359,6 +133311,11 @@ entities: rot: 3.141592653589793 rad pos: 62.5,61.5 parent: 12 + - uid: 27996 + components: + - type: Transform + pos: 30.5,82.5 + parent: 12 - uid: 28157 components: - type: Transform @@ -132467,6 +133424,41 @@ entities: rot: 3.141592653589793 rad pos: 67.5,59.5 parent: 12 + - uid: 28347 + components: + - type: Transform + pos: 6.5,81.5 + parent: 12 + - uid: 28348 + components: + - type: Transform + pos: 6.5,80.5 + parent: 12 + - uid: 28370 + components: + - type: Transform + pos: 6.5,79.5 + parent: 12 + - uid: 28374 + components: + - type: Transform + pos: 6.5,78.5 + parent: 12 + - uid: 28421 + components: + - type: Transform + pos: 6.5,77.5 + parent: 12 + - uid: 28428 + components: + - type: Transform + pos: 6.5,76.5 + parent: 12 + - uid: 28434 + components: + - type: Transform + pos: 6.5,82.5 + parent: 12 - uid: 28435 components: - type: Transform @@ -132489,6 +133481,12 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-18.5 parent: 12 + - uid: 28551 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,-4.5 + parent: 12 - uid: 28789 components: - type: Transform @@ -132949,11 +133947,6 @@ entities: parent: 12 - proto: HandheldGPSBasic entities: - - uid: 6757 - components: - - type: Transform - pos: 10.530855,-42.6188 - parent: 12 - uid: 10408 components: - type: Transform @@ -132974,22 +133967,14 @@ entities: - uid: 2836 components: - type: Transform - pos: -12.499694,-48.579765 - parent: 12 - - uid: 2841 - components: - - type: Transform - pos: -12.387345,-48.23441 - parent: 12 - - uid: 2842 - components: - - type: Transform - pos: -7.465173,-50.539207 + rot: -12.566370614359172 rad + pos: -13.495506,-49.90341 parent: 12 - uid: 2843 components: - type: Transform - pos: -7.5693398,-50.01837 + rot: -18.84955592153876 rad + pos: -17.509005,-44.411045 parent: 12 - uid: 12709 components: @@ -133030,15 +134015,11 @@ entities: - type: Transform pos: 23.50414,-38.247326 parent: 12 - - uid: 8890 - components: - - type: Transform - pos: 50.70557,-21.266977 - parent: 12 - uid: 8891 components: - type: Transform - pos: 50.45557,-21.673227 + rot: -12.566370614359172 rad + pos: 46.623554,-16.373413 parent: 12 - uid: 13290 components: @@ -133442,7 +134423,7 @@ entities: - uid: 12053 components: - type: Transform - pos: 35.258915,45.758537 + pos: 35.53809,45.733753 parent: 12 - proto: InflatableDoor entities: @@ -133900,6 +134881,11 @@ entities: - type: Transform pos: 24.5,50.5 parent: 12 + - uid: 15795 + components: + - type: Transform + pos: 63.5,-25.5 + parent: 12 - uid: 21365 components: - type: Transform @@ -134326,6 +135312,11 @@ entities: - type: Transform pos: -10.5,-21.5 parent: 12 + - uid: 8881 + components: + - type: Transform + pos: -24.5,-7.5 + parent: 12 - uid: 9145 components: - type: Transform @@ -134355,7 +135346,7 @@ entities: parent: 12 - proto: LockerEngineerFilledHardsuit entities: - - uid: 3955 + - uid: 8859 components: - type: Transform pos: 11.5,-13.5 @@ -134484,25 +135475,20 @@ entities: parent: 12 - proto: LockerMedicineFilled entities: - - uid: 2825 - components: - - type: Transform - pos: -12.5,-45.5 - parent: 12 - uid: 2826 components: - type: Transform pos: -11.5,-45.5 parent: 12 - - uid: 2909 + - uid: 9600 components: - type: Transform - pos: -5.5,-47.5 + pos: 1.5,-46.5 parent: 12 - - uid: 9600 + - uid: 10661 components: - type: Transform - pos: 1.5,-46.5 + pos: -6.5,-52.5 parent: 12 - uid: 13797 components: @@ -134662,34 +135648,6 @@ entities: - type: Transform pos: 52.5,-36.5 parent: 12 - - uid: 8868 - components: - - type: Transform - pos: 81.5,-36.5 - parent: 12 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 75.31249 - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 10371 - components: - - type: Transform - pos: -24.5,-7.5 - parent: 12 - uid: 12625 components: - type: Transform @@ -134859,6 +135817,11 @@ entities: parent: 12 - proto: LockerWeldingSuppliesFilled entities: + - uid: 4195 + components: + - type: Transform + pos: 47.5,53.5 + parent: 12 - uid: 27154 components: - type: Transform @@ -135013,25 +135976,11 @@ entities: parent: 12 - proto: LootSpawnerMedicalMinor entities: - - uid: 2832 - components: - - type: Transform - pos: -7.5,-48.5 - parent: 12 - - uid: 4093 - components: - - type: Transform - pos: -5.5,-52.5 - parent: 12 - - uid: 9657 - components: - - type: Transform - pos: -7.5,-47.5 - parent: 12 - - uid: 9658 + - uid: 5037 components: - type: Transform - pos: -7.5,-49.5 + rot: -1.5707963267948966 rad + pos: -17.5,-43.5 parent: 12 - uid: 25752 components: @@ -135059,6 +136008,11 @@ entities: - type: Transform pos: -5.5,-51.5 parent: 12 + - uid: 28465 + components: + - type: Transform + pos: -9.5,-45.5 + parent: 12 - proto: MachineAnomalyGenerator entities: - uid: 824 @@ -135429,6 +136383,11 @@ entities: - type: Transform pos: -19.5,31.5 parent: 12 + - uid: 22077 + components: + - type: Transform + pos: 42.5,56.5 + parent: 12 - uid: 22529 components: - type: Transform @@ -135610,35 +136569,35 @@ entities: - type: Transform pos: -46.5,55.5 parent: 12 - - uid: 2951 + - uid: 2841 components: - type: Transform - pos: 3.5,-32.5 + pos: -10.5,-47.5 parent: 12 - - uid: 9604 + - uid: 2951 components: - type: Transform - pos: -8.5,-50.5 + pos: 3.5,-32.5 parent: 12 - - uid: 13867 + - uid: 9448 components: - type: Transform - pos: 26.5,37.5 + pos: -8.5,-48.5 parent: 12 - - uid: 25090 + - uid: 9604 components: - type: Transform - pos: -13.5,-51.5 + pos: -8.5,-50.5 parent: 12 - - uid: 25095 + - uid: 10659 components: - type: Transform - pos: -8.5,-49.5 + pos: -10.5,-49.5 parent: 12 - - uid: 27258 + - uid: 13867 components: - type: Transform - pos: -13.5,-49.5 + pos: 26.5,37.5 parent: 12 - proto: MedicalTechFab entities: @@ -135652,14 +136611,15 @@ entities: - uid: 2911 components: - type: Transform - pos: -8.6661415,-45.405422 + rot: -12.566370614359172 rad + pos: -8.500724,-45.470802 parent: 12 - proto: MedkitBruteFilled entities: - uid: 2913 components: - type: Transform - pos: -8.2598915,-45.655422 + pos: -9.430421,-50.332745 parent: 12 - uid: 9265 components: @@ -135673,22 +136633,23 @@ entities: parent: 12 - proto: MedkitBurnFilled entities: - - uid: 2912 + - uid: 26221 components: - type: Transform - pos: -12.471455,-49.467922 + pos: 1.6791401,-38.39652 parent: 12 - - uid: 26221 + - uid: 28503 components: - type: Transform - pos: 1.6791401,-38.39652 + pos: -15.479881,-51.465908 parent: 12 - proto: MedkitFilled entities: - uid: 2914 components: - type: Transform - pos: -8.351954,-48.543648 + rot: -12.566370614359172 rad + pos: -5.4368153,-52.002373 parent: 12 - uid: 9264 components: @@ -135698,7 +136659,8 @@ entities: - uid: 9266 components: - type: Transform - pos: 55.49561,-33.401295 + rot: -37.69911184307754 rad + pos: 55.502457,-33.19831 parent: 12 - uid: 9267 components: @@ -135762,7 +136724,8 @@ entities: - uid: 2915 components: - type: Transform - pos: -12.51628,-51.457504 + rot: -12.566370614359172 rad + pos: -13.448631,-50.46591 parent: 12 - uid: 5050 components: @@ -135784,7 +136747,8 @@ entities: - uid: 2917 components: - type: Transform - pos: -8.610506,-48.38458 + rot: -12.566370614359172 rad + pos: -10.572229,-45.419037 parent: 12 - uid: 23443 components: @@ -135813,7 +136777,7 @@ entities: - uid: 12035 components: - type: Transform - pos: 34.227154,45.685623 + pos: 34.209034,45.799026 parent: 12 - proto: Mirror entities: @@ -135892,86 +136856,112 @@ entities: parent: 12 - proto: Morgue entities: + - uid: 1364 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-40.5 + parent: 12 - uid: 1705 components: - type: Transform pos: -21.5,-27.5 parent: 12 - - uid: 3102 + - uid: 4260 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-44.5 + rot: -1.5707963267948966 rad + pos: 6.5,-40.5 parent: 12 - - uid: 3103 + - uid: 4570 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-43.5 + rot: -1.5707963267948966 rad + pos: 4.5,-41.5 parent: 12 - - uid: 3104 + - uid: 5042 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-40.5 + parent: 12 + - uid: 5709 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-43.5 + parent: 12 + - uid: 6747 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-41.5 + parent: 12 + - uid: 12394 components: - type: Transform rot: 1.5707963267948966 rad - pos: 3.5,-41.5 + pos: 37.5,31.5 parent: 12 - - uid: 3105 + - uid: 12395 components: - type: Transform rot: 1.5707963267948966 rad - pos: 3.5,-40.5 + pos: 37.5,30.5 parent: 12 - - uid: 3106 + - uid: 19216 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-45.5 + rot: 3.141592653589793 rad + pos: -48.5,54.5 parent: 12 - - uid: 3107 + - uid: 24437 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,-44.5 + pos: 8.5,-39.5 parent: 12 - - uid: 3108 + - uid: 24472 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,-42.5 + pos: 8.5,-45.5 parent: 12 - - uid: 3109 + - uid: 26144 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,-41.5 + pos: 8.5,-44.5 parent: 12 - - uid: 10348 + - uid: 26145 components: - type: Transform - pos: 5.5,-38.5 + rot: -1.5707963267948966 rad + pos: 8.5,-41.5 parent: 12 - - uid: 10402 + - uid: 26148 components: - type: Transform - pos: 4.5,-38.5 + rot: -1.5707963267948966 rad + pos: 8.5,-43.5 parent: 12 - - uid: 12394 + - uid: 26149 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,31.5 + rot: -1.5707963267948966 rad + pos: 4.5,-44.5 parent: 12 - - uid: 12395 + - uid: 26150 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,30.5 + rot: -1.5707963267948966 rad + pos: 6.5,-43.5 parent: 12 - - uid: 19216 + - uid: 26152 components: - type: Transform - rot: 3.141592653589793 rad - pos: -48.5,54.5 + rot: -1.5707963267948966 rad + pos: 6.5,-44.5 parent: 12 - proto: MouseTimedSpawner entities: @@ -136264,6 +137254,11 @@ entities: - type: Transform pos: -2.5,-51.5 parent: 12 + - uid: 9439 + components: + - type: Transform + pos: 5.5,-38.5 + parent: 12 - uid: 27268 components: - type: Transform @@ -136412,11 +137407,6 @@ entities: - type: Transform pos: 55.258656,-34.617867 parent: 12 - - uid: 6756 - components: - - type: Transform - pos: 10.468355,-42.51205 - parent: 12 - uid: 23717 components: - type: Transform @@ -136736,15 +137726,11 @@ entities: parent: 12 - proto: ParticleAcceleratorEndCapUnfinished entities: - - uid: 9815 + - uid: 8958 components: - type: Transform - anchored: False - rot: -1.5707963267948966 rad pos: 21.5,6.5 parent: 12 - - type: Physics - bodyType: Dynamic - proto: ParticleAcceleratorFuelChamberUnfinished entities: - uid: 4671 @@ -136754,15 +137740,11 @@ entities: parent: 12 - proto: ParticleAcceleratorPowerBox entities: - - uid: 9816 + - uid: 8959 components: - type: Transform - anchored: False - rot: -3.141592653589793 rad pos: 20.5,2.5 parent: 12 - - type: Physics - bodyType: Dynamic - proto: PartRodMetal entities: - uid: 5907 @@ -137349,11 +138331,6 @@ entities: - type: Transform pos: 42.5,-13.5 parent: 12 - - uid: 10201 - components: - - type: Transform - pos: 14.5,-20.5 - parent: 12 - uid: 10509 components: - type: Transform @@ -137379,6 +138356,11 @@ entities: - type: Transform pos: -19.5,73.5 parent: 12 + - uid: 26163 + components: + - type: Transform + pos: 15.5,-19.5 + parent: 12 - uid: 27835 components: - type: Transform @@ -137407,10 +138389,8 @@ entities: - uid: 5347 components: - type: Transform - parent: 23661 - - type: Physics - canCollide: False - - type: InsideEntityStorage + pos: 48.452156,51.136806 + parent: 12 - uid: 9232 components: - type: Transform @@ -137471,11 +138451,6 @@ entities: - type: Transform pos: -39.5,-30.5 parent: 12 - - uid: 4231 - components: - - type: Transform - pos: 9.5,-39.5 - parent: 12 - uid: 7161 components: - type: Transform @@ -138107,7 +139082,7 @@ entities: - uid: 23667 components: - type: Transform - pos: 48.65235,50.838295 + pos: 49.463097,47.95464 parent: 12 - proto: PowerCellRecharger entities: @@ -138280,14 +139255,19 @@ entities: - type: Transform pos: 64.5,45.5 parent: 12 - - uid: 27260 + - uid: 26119 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-45.5 + rot: -1.5707963267948966 rad + pos: -13.5,-49.5 parent: 12 - proto: PowerCellSmall entities: + - uid: 4196 + components: + - type: Transform + pos: -9.299171,-47.817444 + parent: 12 - uid: 4481 components: - type: Transform @@ -138578,29 +139558,23 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-47.5 parent: 12 - - uid: 3485 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-45.5 - parent: 12 - uid: 3487 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-53.5 parent: 12 - - uid: 3488 + - uid: 3489 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-51.5 + rot: -1.5707963267948966 rad + pos: -5.5,-48.5 parent: 12 - - uid: 3489 + - uid: 3553 components: - type: Transform rot: -1.5707963267948966 rad - pos: -5.5,-48.5 + pos: 27.5,-2.5 parent: 12 - uid: 3776 components: @@ -138695,12 +139669,6 @@ entities: - type: Transform pos: -11.5,-21.5 parent: 12 - - uid: 5430 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,-4.5 - parent: 12 - uid: 5539 components: - type: Transform @@ -138761,12 +139729,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,-8.5 parent: 12 - - uid: 5551 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-4.5 - parent: 12 - uid: 5552 components: - type: Transform @@ -138810,11 +139772,6 @@ entities: - type: Transform pos: 7.5,-25.5 parent: 12 - - uid: 5981 - components: - - type: Transform - pos: 10.5,-41.5 - parent: 12 - uid: 6235 components: - type: Transform @@ -139006,6 +139963,12 @@ entities: rot: 3.141592653589793 rad pos: -31.5,-0.5 parent: 12 + - uid: 6746 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-52.5 + parent: 12 - uid: 6808 components: - type: Transform @@ -139027,11 +139990,6 @@ entities: - type: Transform pos: 57.5,-39.5 parent: 12 - - uid: 8806 - components: - - type: Transform - pos: 59.5,-27.5 - parent: 12 - uid: 8807 components: - type: Transform @@ -139102,18 +140060,41 @@ entities: rot: 3.141592653589793 rad pos: 32.5,-15.5 parent: 12 + - uid: 9135 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-2.5 + parent: 12 - uid: 9299 components: - type: Transform rot: 1.5707963267948966 rad pos: -35.5,21.5 parent: 12 + - uid: 9307 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-0.5 + parent: 12 + - uid: 9309 + components: + - type: Transform + pos: -12.5,2.5 + parent: 12 - uid: 9323 components: - type: Transform rot: 1.5707963267948966 rad pos: -26.5,6.5 parent: 12 + - uid: 9335 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-6.5 + parent: 12 - uid: 9369 components: - type: Transform @@ -139242,30 +140223,6 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,1.5 parent: 12 - - uid: 9969 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,3.5 - parent: 12 - - uid: 9970 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-1.5 - parent: 12 - - uid: 9971 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,-3.5 - parent: 12 - - uid: 10249 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,-7.5 - parent: 12 - uid: 10250 components: - type: Transform @@ -139347,6 +140304,12 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,-33.5 parent: 12 + - uid: 11241 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-50.5 + parent: 12 - uid: 12016 components: - type: Transform @@ -139389,11 +140352,6 @@ entities: rot: 1.5707963267948966 rad pos: 37.5,29.5 parent: 12 - - uid: 12507 - components: - - type: Transform - pos: 5.5,-38.5 - parent: 12 - uid: 12715 components: - type: Transform @@ -139746,6 +140704,11 @@ entities: - type: Transform pos: -21.5,14.5 parent: 12 + - uid: 16581 + components: + - type: Transform + pos: 61.5,-28.5 + parent: 12 - uid: 16638 components: - type: Transform @@ -139911,18 +140874,6 @@ entities: rot: 3.141592653589793 rad pos: 44.5,47.5 parent: 12 - - uid: 16846 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 48.5,50.5 - parent: 12 - - uid: 16847 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 44.5,50.5 - parent: 12 - uid: 16848 components: - type: Transform @@ -140442,17 +141393,6 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,66.5 parent: 12 - - uid: 21851 - components: - - type: Transform - pos: -9.5,72.5 - parent: 12 - - uid: 21852 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,74.5 - parent: 12 - uid: 21919 components: - type: Transform @@ -140720,6 +141660,12 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-39.5 parent: 12 + - uid: 3626 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,2.5 + parent: 12 - uid: 4210 components: - type: Transform @@ -140846,6 +141792,12 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-15.5 parent: 12 + - uid: 6834 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 62.5,-26.5 + parent: 12 - uid: 7170 components: - type: Transform @@ -140944,12 +141896,6 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,-37.5 parent: 12 - - uid: 8846 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 56.5,-26.5 - parent: 12 - uid: 8847 components: - type: Transform @@ -140979,6 +141925,17 @@ entities: rot: -1.5707963267948966 rad pos: 49.5,-30.5 parent: 12 + - uid: 8956 + components: + - type: Transform + pos: 5.5,-38.5 + parent: 12 + - uid: 9085 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-45.5 + parent: 12 - uid: 9139 components: - type: Transform @@ -140990,6 +141947,12 @@ entities: rot: 1.5707963267948966 rad pos: 35.5,-38.5 parent: 12 + - uid: 9440 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,71.5 + parent: 12 - uid: 9548 components: - type: Transform @@ -141048,6 +142011,18 @@ entities: rot: 3.141592653589793 rad pos: -33.5,-10.5 parent: 12 + - uid: 10656 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-4.5 + parent: 12 + - uid: 10658 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,71.5 + parent: 12 - uid: 10886 components: - type: Transform @@ -141065,11 +142040,6 @@ entities: - type: Transform pos: 42.5,-10.5 parent: 12 - - uid: 11241 - components: - - type: Transform - pos: 54.5,-18.5 - parent: 12 - uid: 12005 components: - type: Transform @@ -141403,6 +142373,12 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,62.5 parent: 12 + - uid: 25090 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-41.5 + parent: 12 - uid: 25368 components: - type: Transform @@ -141426,6 +142402,11 @@ entities: rot: -1.5707963267948966 rad pos: -58.5,-24.5 parent: 12 + - uid: 26109 + components: + - type: Transform + pos: 57.5,-26.5 + parent: 12 - uid: 26253 components: - type: Transform @@ -141523,6 +142504,12 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,-14.5 parent: 12 + - uid: 27259 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,21.5 + parent: 12 - uid: 27852 components: - type: Transform @@ -141541,12 +142528,6 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,-13.5 parent: 12 - - uid: 28421 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 54.5,-16.5 - parent: 12 - uid: 28458 components: - type: Transform @@ -141625,15 +142606,15 @@ entities: - type: Transform pos: -23.5,-21.5 parent: 12 - - uid: 7312 + - uid: 4165 components: - type: Transform - pos: 18.5,-22.5 + pos: 57.5,-18.5 parent: 12 - - uid: 8888 + - uid: 7312 components: - type: Transform - pos: 51.5,-21.5 + pos: 18.5,-22.5 parent: 12 - proto: PuddleVomit entities: @@ -141752,6 +142733,11 @@ entities: - type: Transform pos: 31.5,-0.5 parent: 12 + - uid: 6204 + components: + - type: Transform + pos: 60.5,-18.5 + parent: 12 - uid: 7332 components: - type: Transform @@ -141768,10 +142754,10 @@ entities: rot: 1.5707963267948966 rad pos: 55.5,-49.5 parent: 12 - - uid: 8881 + - uid: 8868 components: - type: Transform - pos: 56.5,-20.5 + pos: -12.5,-45.5 parent: 12 - uid: 8905 components: @@ -142004,12 +142990,6 @@ entities: - type: Transform pos: 6.5,64.5 parent: 12 - - uid: 25091 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,-49.5 - parent: 12 - uid: 25096 components: - type: Transform @@ -142230,12 +143210,6 @@ entities: - type: Transform pos: 55.5,2.5 parent: 12 - - uid: 27261 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-48.5 - parent: 12 - uid: 27397 components: - type: Transform @@ -142266,25 +143240,25 @@ entities: parent: 12 - proto: RadiationCollectorFullTank entities: - - uid: 9856 + - uid: 3823 components: - type: Transform - pos: 16.5,-8.5 + pos: 16.5,-4.5 parent: 12 - - uid: 9857 + - uid: 9450 components: - type: Transform - pos: 16.5,-4.5 + pos: 26.5,-4.5 parent: 12 - - uid: 9858 + - uid: 9856 components: - type: Transform - pos: 26.5,-8.5 + pos: 16.5,-8.5 parent: 12 - - uid: 9859 + - uid: 9858 components: - type: Transform - pos: 26.5,-4.5 + pos: 26.5,-8.5 parent: 12 - uid: 27256 components: @@ -142321,7 +143295,8 @@ entities: - uid: 9807 components: - type: Transform - pos: 12.247255,-19.327513 + rot: -37.69911184307754 rad + pos: 12.784136,-19.248148 parent: 12 - uid: 10410 components: @@ -143021,11 +143996,21 @@ entities: - type: Transform pos: 29.5,13.5 parent: 12 + - uid: 4539 + components: + - type: Transform + pos: 42.5,-2.5 + parent: 12 - uid: 8831 components: - type: Transform pos: 40.5,-14.5 parent: 12 + - uid: 8902 + components: + - type: Transform + pos: 45.5,6.5 + parent: 12 - uid: 21401 components: - type: Transform @@ -143460,6 +144445,11 @@ entities: - type: Transform pos: 40.5,16.5 parent: 12 + - uid: 9452 + components: + - type: Transform + pos: 16.5,0.5 + parent: 12 - uid: 13968 components: - type: Transform @@ -143470,11 +144460,6 @@ entities: - type: Transform pos: 40.5,12.5 parent: 12 - - uid: 21705 - components: - - type: Transform - pos: 16.5,7.5 - parent: 12 - uid: 23706 components: - type: Transform @@ -143935,11 +144920,6 @@ entities: - type: Transform pos: 20.5,5.5 parent: 12 - - uid: 24437 - components: - - type: Transform - pos: 15.5,3.5 - parent: 12 - uid: 24439 components: - type: Transform @@ -144055,11 +145035,6 @@ entities: - type: Transform pos: 7.5,-52.5 parent: 12 - - uid: 24472 - components: - - type: Transform - pos: 8.5,-44.5 - parent: 12 - uid: 24473 components: - type: Transform @@ -144219,6 +145194,11 @@ entities: - type: Transform pos: 40.5,-26.5 parent: 12 + - uid: 16785 + components: + - type: Transform + pos: -10.5,2.5 + parent: 12 - uid: 16786 components: - type: Transform @@ -144363,17 +145343,17 @@ entities: parent: 12 - proto: Recycler entities: - - uid: 12076 + - uid: 4231 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,14.5 + rot: 1.5707963267948966 rad + pos: 76.5,-37.5 parent: 12 - - uid: 26092 + - uid: 4241 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 76.5,-38.5 + rot: -1.5707963267948966 rad + pos: 37.5,14.5 parent: 12 - proto: ReinforcedPlasmaWindow entities: @@ -145144,6 +146124,12 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-45.5 parent: 12 + - uid: 1172 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-54.5 + parent: 12 - uid: 1284 components: - type: Transform @@ -145567,20 +146553,16 @@ entities: - type: Transform pos: 9.5,-51.5 parent: 12 - - uid: 4149 - components: - - type: Transform - pos: 9.5,-41.5 - parent: 12 - - uid: 4165 + - uid: 4151 components: - type: Transform - pos: 11.5,-44.5 + pos: -47.5,3.5 parent: 12 - - uid: 4166 + - uid: 4154 components: - type: Transform - pos: 11.5,-43.5 + rot: 3.141592653589793 rad + pos: -13.5,0.5 parent: 12 - uid: 4399 components: @@ -145798,11 +146780,6 @@ entities: rot: -1.5707963267948966 rad pos: -45.5,-38.5 parent: 12 - - uid: 5313 - components: - - type: Transform - pos: 12.5,-2.5 - parent: 12 - uid: 5321 components: - type: Transform @@ -145844,11 +146821,6 @@ entities: rot: 3.141592653589793 rad pos: 25.5,-19.5 parent: 12 - - uid: 5848 - components: - - type: Transform - pos: 12.5,-3.5 - parent: 12 - uid: 5853 components: - type: Transform @@ -146063,51 +147035,6 @@ entities: - type: Transform pos: 26.5,-39.5 parent: 12 - - uid: 6200 - components: - - type: Transform - pos: 11.5,-53.5 - parent: 12 - - uid: 6201 - components: - - type: Transform - pos: 11.5,-52.5 - parent: 12 - - uid: 6202 - components: - - type: Transform - pos: 11.5,-51.5 - parent: 12 - - uid: 6203 - components: - - type: Transform - pos: 11.5,-50.5 - parent: 12 - - uid: 6204 - components: - - type: Transform - pos: 11.5,-49.5 - parent: 12 - - uid: 6205 - components: - - type: Transform - pos: 11.5,-48.5 - parent: 12 - - uid: 6206 - components: - - type: Transform - pos: 11.5,-47.5 - parent: 12 - - uid: 6207 - components: - - type: Transform - pos: 11.5,-46.5 - parent: 12 - - uid: 6208 - components: - - type: Transform - pos: 11.5,-45.5 - parent: 12 - uid: 6210 components: - type: Transform @@ -146397,10 +147324,11 @@ entities: - type: Transform pos: 52.5,5.5 parent: 12 - - uid: 6753 + - uid: 6743 components: - type: Transform - pos: 10.5,-44.5 + rot: -1.5707963267948966 rad + pos: 11.5,-52.5 parent: 12 - uid: 6762 components: @@ -146422,10 +147350,10 @@ entities: - type: Transform pos: 28.5,-25.5 parent: 12 - - uid: 7299 + - uid: 6835 components: - type: Transform - pos: 11.5,-54.5 + pos: -46.5,3.5 parent: 12 - uid: 7313 components: @@ -146523,12 +147451,6 @@ entities: rot: 1.5707963267948966 rad pos: 64.5,-20.5 parent: 12 - - uid: 7589 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 60.5,-25.5 - parent: 12 - uid: 7612 components: - type: Transform @@ -146704,11 +147626,23 @@ entities: - type: Transform pos: 62.5,-28.5 parent: 12 + - uid: 8070 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-53.5 + parent: 12 - uid: 8239 components: - type: Transform pos: 35.5,-21.5 parent: 12 + - uid: 8248 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-51.5 + parent: 12 - uid: 8427 components: - type: Transform @@ -146913,18 +147847,6 @@ entities: rot: 1.5707963267948966 rad pos: -45.5,0.5 parent: 12 - - uid: 10165 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -45.5,1.5 - parent: 12 - - uid: 10166 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -45.5,2.5 - parent: 12 - uid: 10167 components: - type: Transform @@ -147306,12 +148228,6 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,10.5 parent: 12 - - uid: 10654 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,3.5 - parent: 12 - uid: 10682 components: - type: Transform @@ -147864,6 +148780,11 @@ entities: - type: Transform pos: 46.5,15.5 parent: 12 + - uid: 12191 + components: + - type: Transform + pos: -47.5,0.5 + parent: 12 - uid: 12224 components: - type: Transform @@ -148138,6 +149059,11 @@ entities: rot: 3.141592653589793 rad pos: 74.5,56.5 parent: 12 + - uid: 12507 + components: + - type: Transform + pos: -46.5,0.5 + parent: 12 - uid: 12515 components: - type: Transform @@ -149522,16 +150448,6 @@ entities: - type: Transform pos: -4.5,-5.5 parent: 12 - - uid: 21897 - components: - - type: Transform - pos: -10.5,0.5 - parent: 12 - - uid: 21898 - components: - - type: Transform - pos: -9.5,0.5 - parent: 12 - uid: 21900 components: - type: Transform @@ -149557,16 +150473,6 @@ entities: - type: Transform pos: -54.5,37.5 parent: 12 - - uid: 21957 - components: - - type: Transform - pos: -9.5,1.5 - parent: 12 - - uid: 21958 - components: - - type: Transform - pos: -9.5,2.5 - parent: 12 - uid: 21964 components: - type: Transform @@ -149611,26 +150517,6 @@ entities: - type: Transform pos: -9.5,-13.5 parent: 12 - - uid: 22076 - components: - - type: Transform - pos: -10.5,-0.5 - parent: 12 - - uid: 22077 - components: - - type: Transform - pos: -10.5,-1.5 - parent: 12 - - uid: 22078 - components: - - type: Transform - pos: -11.5,-1.5 - parent: 12 - - uid: 22118 - components: - - type: Transform - pos: -11.5,-2.5 - parent: 12 - uid: 22144 components: - type: Transform @@ -149797,11 +150683,6 @@ entities: - type: Transform pos: 3.5,16.5 parent: 12 - - uid: 25535 - components: - - type: Transform - pos: 12.5,-4.5 - parent: 12 - uid: 25547 components: - type: Transform @@ -150148,6 +151029,11 @@ entities: - type: Transform pos: 4.5,20.5 parent: 12 + - uid: 27258 + components: + - type: Transform + pos: -11.5,0.5 + parent: 12 - uid: 27289 components: - type: Transform @@ -150271,6 +151157,12 @@ entities: rot: 1.5707963267948966 rad pos: -42.5,-54.5 parent: 12 + - uid: 28045 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,0.5 + parent: 12 - uid: 28172 components: - type: Transform @@ -150938,7 +151830,7 @@ entities: - uid: 3120 components: - type: Transform - pos: 6.49098,-40.65828 + pos: 6.4121404,-38.844658 parent: 12 - uid: 13829 components: @@ -151184,7 +152076,8 @@ entities: - uid: 7310 components: - type: Transform - pos: 18.52452,3.3088796 + rot: -6.283185307179586 rad + pos: 18.692007,3.512633 parent: 12 - uid: 9237 components: @@ -151235,7 +152128,8 @@ entities: - uid: 8495 components: - type: Transform - pos: 61.2684,-24.515785 + rot: -18.84955592153876 rad + pos: 50.779865,-21.446379 parent: 12 - uid: 16560 components: @@ -151306,7 +152200,8 @@ entities: - uid: 8895 components: - type: Transform - pos: 56.3631,-22.395088 + rot: -12.566370614359172 rad + pos: 50.35577,-21.519083 parent: 12 - proto: SheetRGlass entities: @@ -151340,7 +152235,8 @@ entities: - uid: 8898 components: - type: Transform - pos: 61.913654,-24.469494 + rot: -37.69911184307754 rad + pos: 50.40397,-21.229546 parent: 12 - uid: 9627 components: @@ -151370,10 +152266,8 @@ entities: - uid: 17547 components: - type: Transform - parent: 23661 - - type: Physics - canCollide: False - - type: InsideEntityStorage + pos: 33.336582,45.529766 + parent: 12 - uid: 24481 components: - type: Transform @@ -152926,14 +153820,6 @@ entities: rot: 1.5707963267948966 rad pos: 19.50873,-29.295479 parent: 12 -- proto: SignDisposalSpace - entities: - - uid: 15795 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,-42.5 - parent: 12 - proto: SignElectricalMed entities: - uid: 763 @@ -153021,12 +153907,6 @@ entities: rot: 1.5707963267948966 rad pos: 32.5,-2.5 parent: 12 - - uid: 18709 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-13.5 - parent: 12 - uid: 18712 components: - type: Transform @@ -153041,6 +153921,11 @@ entities: parent: 12 - proto: SignEngineering entities: + - uid: 3709 + components: + - type: Transform + pos: 15.5,8.5 + parent: 12 - uid: 21084 components: - type: Transform @@ -153243,11 +154128,27 @@ entities: parent: 12 - proto: SignRadiation entities: - - uid: 5051 + - uid: 6836 + components: + - type: Transform + pos: 12.5,-2.5 + parent: 12 + - uid: 10201 components: - type: Transform + rot: -1.5707963267948966 rad pos: 17.5,3.5 parent: 12 + - uid: 10249 + components: + - type: Transform + pos: 23.5,6.5 + parent: 12 + - uid: 26133 + components: + - type: Transform + pos: 21.5,-15.5 + parent: 12 - proto: SignRadiationMed entities: - uid: 6779 @@ -153630,11 +154531,6 @@ entities: - type: Transform pos: 50.5,-44.5 parent: 12 - - uid: 9445 - components: - - type: Transform - pos: 17.5,4.5 - parent: 12 - uid: 14279 components: - type: Transform @@ -155152,6 +156048,13 @@ entities: - type: Transform pos: 0.5,-46.5 parent: 12 +- proto: SpawnMobMonkey + entities: + - uid: 9990 + components: + - type: Transform + pos: -11.5,20.5 + parent: 12 - proto: SpawnMobMonkeyPunpun entities: - uid: 23510 @@ -155161,11 +156064,10 @@ entities: parent: 12 - proto: SpawnMobPossumMorty entities: - - uid: 4964 + - uid: 8913 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-42.5 + pos: 7.5,-39.5 parent: 12 - proto: SpawnMobRaccoonMorticia entities: @@ -155299,20 +156201,10 @@ entities: parent: 12 - proto: SpawnPointCargoTechnician entities: - - uid: 8507 - components: - - type: Transform - pos: 61.5,-19.5 - parent: 12 - - uid: 8508 - components: - - type: Transform - pos: 62.5,-19.5 - parent: 12 - - uid: 8509 + - uid: 4256 components: - type: Transform - pos: 63.5,-19.5 + pos: 61.5,-24.5 parent: 12 - uid: 8510 components: @@ -155329,6 +156221,16 @@ entities: - type: Transform pos: 49.5,-15.5 parent: 12 + - uid: 26092 + components: + - type: Transform + pos: 63.5,-24.5 + parent: 12 + - uid: 26166 + components: + - type: Transform + pos: 62.5,-24.5 + parent: 12 - proto: SpawnPointChaplain entities: - uid: 13086 @@ -155438,15 +156340,10 @@ entities: parent: 12 - proto: SpawnPointMedicalDoctor entities: - - uid: 4046 - components: - - type: Transform - pos: -9.5,-51.5 - parent: 12 - - uid: 4047 + - uid: 2838 components: - type: Transform - pos: -9.5,-48.5 + pos: -6.5,-51.5 parent: 12 - uid: 4048 components: @@ -156217,18 +157114,6 @@ entities: rot: -1.5707963267948966 rad pos: -46.5,-39.5 parent: 12 - - uid: 8515 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 56.5,-21.5 - parent: 12 - - uid: 8516 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 58.5,-25.5 - parent: 12 - proto: StairStageDark entities: - uid: 3142 @@ -156322,10 +157207,10 @@ entities: parent: 12 - proto: StasisBed entities: - - uid: 2293 + - uid: 8893 components: - type: Transform - pos: -8.5,-47.5 + pos: -13.5,-51.5 parent: 12 - proto: StationMap entities: @@ -156481,12 +157366,24 @@ entities: - type: Transform pos: 44.528526,-31.458952 parent: 12 + - uid: 9435 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.449959,2.68897 + parent: 12 - uid: 11438 components: - type: Transform rot: 1.5707963267948966 rad pos: 52.5,38.5 parent: 12 + - uid: 11498 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.550139,2.7052777 + parent: 12 - uid: 12652 components: - type: Transform @@ -156576,12 +157473,6 @@ entities: rot: -1.5707963267948966 rad pos: -24.527166,-0.38183045 parent: 12 - - uid: 16788 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.507796,2.708015 - parent: 12 - uid: 16852 components: - type: Transform @@ -157643,6 +158534,17 @@ entities: - SurveillanceCameraEngineering nameSet: True id: TEG + - uid: 21601 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-5.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Generator containment - uid: 21925 components: - type: Transform @@ -157687,17 +158589,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmos locker room - - uid: 21968 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,-3.5 - parent: 12 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Central containment - uid: 24215 components: - type: Transform @@ -157709,17 +158600,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Engineering entrance - - uid: 26229 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,6.5 - parent: 12 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Singularity/PA airlock - uid: 27314 components: - type: Transform @@ -157818,16 +158698,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Roller rink - - uid: 3034 - components: - - type: Transform - pos: -9.5,74.5 - parent: 12 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Observitory - uid: 3060 components: - type: Transform @@ -157914,6 +158784,17 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Hallway south B + - uid: 4164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,75.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Observitory - uid: 5232 components: - type: Transform @@ -157924,6 +158805,16 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Port meeting room + - uid: 6752 + components: + - type: Transform + pos: 49.5,55.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Hallway Northeast - uid: 9632 components: - type: Transform @@ -158180,16 +159071,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Court - - uid: 28428 - components: - - type: Transform - pos: 48.5,55.5 - parent: 12 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Hallway northeast B - proto: SurveillanceCameraMedical entities: - uid: 3960 @@ -158998,16 +159879,6 @@ entities: - SurveillanceCameraSupply nameSet: True id: Salvage locker room - - uid: 9831 - components: - - type: Transform - pos: 59.5,-24.5 - parent: 12 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraSupply - nameSet: True - id: Cargo locker room - uid: 9832 components: - type: Transform @@ -159041,6 +159912,16 @@ entities: - SurveillanceCameraSupply nameSet: True id: Cargo front + - uid: 12642 + components: + - type: Transform + pos: 61.5,-26.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo break room - proto: SurveillanceCameraWirelessRouterEntertainment entities: - uid: 21981 @@ -159092,6 +159973,11 @@ entities: parent: 12 - proto: Syringe entities: + - uid: 4198 + components: + - type: Transform + pos: -9.514343,-49.566467 + parent: 12 - uid: 12997 components: - type: Transform @@ -159272,11 +160158,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-11.5 parent: 12 - - uid: 2294 - components: - - type: Transform - pos: -6.5,-52.5 - parent: 12 - uid: 2472 components: - type: Transform @@ -159308,37 +160189,16 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-56.5 parent: 12 - - uid: 2828 - components: - - type: Transform - pos: -7.5,-50.5 - parent: 12 - - uid: 2829 - components: - - type: Transform - pos: -7.5,-47.5 - parent: 12 - - uid: 2830 - components: - - type: Transform - pos: -7.5,-48.5 - parent: 12 - - uid: 2831 + - uid: 2842 components: - type: Transform - pos: -7.5,-49.5 + pos: -13.5,-49.5 parent: 12 - uid: 2910 components: - type: Transform pos: -5.5,-48.5 parent: 12 - - uid: 3117 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-40.5 - parent: 12 - uid: 3799 components: - type: Transform @@ -159451,12 +160311,6 @@ entities: - type: Transform pos: 29.5,53.5 parent: 12 - - uid: 4718 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-45.5 - parent: 12 - uid: 5015 components: - type: Transform @@ -159627,6 +160481,11 @@ entities: - type: Transform pos: -24.5,29.5 parent: 12 + - uid: 8900 + components: + - type: Transform + pos: -13.5,-50.5 + parent: 12 - uid: 9524 components: - type: Transform @@ -159655,6 +160514,12 @@ entities: rot: 3.141592653589793 rad pos: 16.5,18.5 parent: 12 + - uid: 9992 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,2.5 + parent: 12 - uid: 10330 components: - type: Transform @@ -159729,6 +160594,11 @@ entities: rot: -1.5707963267948966 rad pos: 39.5,7.5 parent: 12 + - uid: 12076 + components: + - type: Transform + pos: -10.5,-45.5 + parent: 12 - uid: 12120 components: - type: Transform @@ -160091,11 +160961,6 @@ entities: - type: Transform pos: -12.5,13.5 parent: 12 - - uid: 16787 - components: - - type: Transform - pos: -13.5,2.5 - parent: 12 - uid: 17383 components: - type: Transform @@ -160692,23 +161557,12 @@ entities: - type: Transform pos: 9.5,68.5 parent: 12 - - uid: 25094 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,-48.5 - parent: 12 - uid: 25097 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-53.5 parent: 12 - - uid: 25100 - components: - - type: Transform - pos: -7.5,-52.5 - parent: 12 - uid: 25106 components: - type: Transform @@ -160856,6 +161710,11 @@ entities: rot: 1.5707963267948966 rad pos: -17.5,-44.5 parent: 12 + - uid: 26151 + components: + - type: Transform + pos: 6.5,-38.5 + parent: 12 - uid: 26454 components: - type: Transform @@ -160892,6 +161751,11 @@ entities: - type: Transform pos: 44.5,52.5 parent: 12 + - uid: 28499 + components: + - type: Transform + pos: -9.5,-45.5 + parent: 12 - uid: 29597 components: - type: Transform @@ -161116,16 +161980,6 @@ entities: - type: Transform pos: -44.5,17.5 parent: 12 - - uid: 16775 - components: - - type: Transform - pos: -44.5,2.5 - parent: 12 - - uid: 16776 - components: - - type: Transform - pos: -44.5,1.5 - parent: 12 - uid: 21437 components: - type: Transform @@ -161204,6 +162058,11 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,65.5 parent: 12 + - uid: 398 + components: + - type: Transform + pos: 63.5,-25.5 + parent: 12 - uid: 1071 components: - type: Transform @@ -161261,31 +162120,6 @@ entities: - type: Transform pos: 52.5,-30.5 parent: 12 - - uid: 8490 - components: - - type: Transform - pos: 56.5,-23.5 - parent: 12 - - uid: 8491 - components: - - type: Transform - pos: 56.5,-22.5 - parent: 12 - - uid: 8492 - components: - - type: Transform - pos: 59.5,-24.5 - parent: 12 - - uid: 8493 - components: - - type: Transform - pos: 60.5,-24.5 - parent: 12 - - uid: 8494 - components: - - type: Transform - pos: 61.5,-24.5 - parent: 12 - uid: 8843 components: - type: Transform @@ -161333,17 +162167,6 @@ entities: rot: 3.141592653589793 rad pos: 79.5,-38.5 parent: 12 - - uid: 8878 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 62.5,-24.5 - parent: 12 - - uid: 8889 - components: - - type: Transform - pos: 50.5,-21.5 - parent: 12 - uid: 8930 components: - type: Transform @@ -161415,6 +162238,18 @@ entities: - type: Transform pos: 37.5,-39.5 parent: 12 + - uid: 9445 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 51.5,-21.5 + parent: 12 + - uid: 9447 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-47.5 + parent: 12 - uid: 9580 components: - type: Transform @@ -161533,11 +162368,22 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,6.5 parent: 12 + - uid: 16390 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 50.5,-21.5 + parent: 12 - uid: 16568 components: - type: Transform pos: -11.5,23.5 parent: 12 + - uid: 16597 + components: + - type: Transform + pos: 63.5,-26.5 + parent: 12 - uid: 16793 components: - type: Transform @@ -161764,6 +162610,24 @@ entities: - type: Transform pos: -18.5,-19.5 parent: 12 + - uid: 26111 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-48.5 + parent: 12 + - uid: 26115 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-50.5 + parent: 12 + - uid: 26124 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-49.5 + parent: 12 - uid: 28260 components: - type: Transform @@ -161821,6 +162685,12 @@ entities: - type: Transform pos: -23.5,-58.5 parent: 12 + - uid: 4091 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,28.5 + parent: 12 - uid: 6789 components: - type: Transform @@ -162022,11 +162892,6 @@ entities: rot: 3.141592653589793 rad pos: 18.5,29.5 parent: 12 - - uid: 13713 - components: - - type: Transform - pos: 21.5,28.5 - parent: 12 - uid: 14159 components: - type: Transform @@ -162584,7 +163449,7 @@ entities: - uid: 23708 components: - type: Transform - pos: 33.80236,45.260162 + pos: 34.83687,45.725594 parent: 12 - proto: ThermomachineHeaterMachineCircuitBoard entities: @@ -162596,16 +163461,10 @@ entities: - uid: 23707 components: - type: Transform - pos: 33.333378,45.58308 + pos: 34.119343,45.374737 parent: 12 - proto: Thruster entities: - - uid: 925 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -30.5,-4.5 - parent: 12 - uid: 4727 components: - type: Transform @@ -162633,6 +163492,12 @@ entities: parent: 12 - type: Physics bodyType: Dynamic + - uid: 28549 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,-4.5 + parent: 12 - proto: TintedWindow entities: - uid: 2873 @@ -162803,7 +163668,8 @@ entities: - uid: 8880 components: - type: Transform - pos: 56.690273,-22.879938 + rot: -31.415926535897945 rad + pos: 60.635223,-18.674908 parent: 12 - uid: 9251 components: @@ -162813,7 +163679,7 @@ entities: - uid: 10396 components: - type: Transform - pos: -31.530018,-3.5000567 + pos: -31.441925,-8.488764 parent: 12 - uid: 16472 components: @@ -162899,7 +163765,8 @@ entities: - uid: 8875 components: - type: Transform - pos: 59.79965,-24.556883 + rot: -31.415926535897945 rad + pos: 60.526505,-18.45204 parent: 12 - uid: 9252 components: @@ -162936,6 +163803,11 @@ entities: - type: Transform pos: 6.466095,64.461784 parent: 12 + - uid: 27261 + components: + - type: Transform + pos: -12.50413,2.5674837 + parent: 12 - uid: 29211 components: - type: Transform @@ -162948,13 +163820,6 @@ entities: - type: Transform pos: -0.5152273,2.604617 parent: 12 -- proto: ToyAmongPequeno - entities: - - uid: 8799 - components: - - type: Transform - pos: 62.277676,-26.679922 - parent: 12 - proto: ToyFigurineAtmosTech entities: - uid: 20884 @@ -163208,6 +164073,11 @@ entities: rot: 1.5113994777937734E-10 rad pos: 46.501263,-40.49688 parent: 12 + - uid: 9991 + components: + - type: Transform + pos: -10.732155,21.411549 + parent: 12 - uid: 22690 components: - type: Transform @@ -163576,6 +164446,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 4231: + - Left: Reverse + - Right: Forward + - Middle: Off - uid: 8016 components: - type: Transform @@ -163655,6 +164529,10 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + 4231: + - Left: Reverse + - Right: Forward + - Middle: Off - uid: 11984 components: - type: Transform @@ -163738,11 +164616,11 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - 12076: - - Left: Forward - - Right: Reverse + 4241: + - Left: Reverse + - Right: Forward - Middle: Off - 11498: + 9556: - Left: Forward - Right: Reverse - Middle: Off @@ -163794,20 +164672,6 @@ entities: - type: Transform pos: 78.5,-38.5 parent: 12 - - type: DeviceLinkSource - linkedPorts: - 12642: - - Left: Forward - - Right: Reverse - - Middle: Off - 26092: - - Left: Forward - - Right: Reverse - - Middle: Off - 11462: - - Left: Forward - - Right: Reverse - - Middle: Off - uid: 12615 components: - type: Transform @@ -164001,10 +164865,10 @@ entities: parent: 12 - proto: VendingMachineCargoDrobe entities: - - uid: 5709 + - uid: 10660 components: - type: Transform - pos: 60.5,-18.5 + pos: 63.5,-23.5 parent: 12 - proto: VendingMachineCart entities: @@ -164233,11 +165097,6 @@ entities: - type: Transform pos: -17.5,-27.5 parent: 12 - - uid: 16785 - components: - - type: Transform - pos: -13.5,1.5 - parent: 12 - uid: 18877 components: - type: Transform @@ -164332,10 +165191,10 @@ entities: - type: Transform pos: -23.5,-38.5 parent: 12 - - uid: 2838 + - uid: 8876 components: - type: Transform - pos: -9.5,-45.5 + pos: -5.5,-47.5 parent: 12 - uid: 13799 components: @@ -164513,7 +165372,7 @@ entities: parent: 12 - proto: VendingMachineTankDispenserEngineering entities: - - uid: 9685 + - uid: 16777 components: - type: Transform pos: 10.5,-13.5 @@ -165482,18 +166341,6 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-17.5 parent: 12 - - uid: 345 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,0.5 - parent: 12 - - uid: 346 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,0.5 - parent: 12 - uid: 363 components: - type: Transform @@ -165619,18 +166466,6 @@ entities: rot: 3.141592653589793 rad pos: -35.5,0.5 parent: 12 - - uid: 436 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,1.5 - parent: 12 - - uid: 437 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,2.5 - parent: 12 - uid: 438 components: - type: Transform @@ -166385,12 +167220,6 @@ entities: - type: Transform pos: -54.5,-37.5 parent: 12 - - uid: 1172 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-18.5 - parent: 12 - uid: 1316 components: - type: Transform @@ -166949,112 +167778,103 @@ entities: - type: Transform pos: -49.5,-52.5 parent: 12 - - uid: 3778 - components: - - type: Transform - pos: -48.5,-52.5 - parent: 12 - - uid: 3941 + - uid: 3109 components: - type: Transform rot: -1.5707963267948966 rad - pos: 6.5,-2.5 + pos: 11.5,-44.5 parent: 12 - - uid: 3979 + - uid: 3111 components: - type: Transform - pos: 27.5,11.5 + rot: -1.5707963267948966 rad + pos: 11.5,-45.5 parent: 12 - - uid: 3982 + - uid: 3114 components: - type: Transform - pos: 29.5,10.5 + rot: -1.5707963267948966 rad + pos: 11.5,-46.5 parent: 12 - - uid: 3983 + - uid: 3117 components: - type: Transform - pos: 28.5,11.5 + rot: -1.5707963267948966 rad + pos: 11.5,-42.5 parent: 12 - - uid: 4013 + - uid: 3158 components: - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,11.5 + pos: -10.5,3.5 parent: 12 - - uid: 4055 + - uid: 3702 components: - type: Transform - rot: 3.141592653589793 rad - pos: 71.5,13.5 + pos: 17.5,6.5 parent: 12 - - uid: 4092 + - uid: 3710 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,-5.5 + pos: 15.5,6.5 parent: 12 - - uid: 4102 + - uid: 3713 components: - type: Transform - pos: 9.5,-49.5 + pos: 15.5,8.5 parent: 12 - - uid: 4103 + - uid: 3778 components: - type: Transform - pos: 9.5,-50.5 + pos: -48.5,-52.5 parent: 12 - - uid: 4105 + - uid: 3941 components: - type: Transform - pos: 7.5,-53.5 + rot: -1.5707963267948966 rad + pos: 6.5,-2.5 parent: 12 - - uid: 4141 + - uid: 3979 components: - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-48.5 + pos: 27.5,11.5 parent: 12 - - uid: 4143 + - uid: 3982 components: - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-46.5 + pos: 29.5,10.5 parent: 12 - - uid: 4144 + - uid: 3983 components: - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-45.5 + pos: 28.5,11.5 parent: 12 - - uid: 4145 + - uid: 4013 components: - type: Transform rot: 3.141592653589793 rad - pos: 9.5,-44.5 + pos: 16.5,11.5 parent: 12 - - uid: 4146 + - uid: 4055 components: - type: Transform rot: 3.141592653589793 rad - pos: 9.5,-43.5 + pos: 71.5,13.5 parent: 12 - - uid: 4147 + - uid: 4092 components: - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-42.5 + rot: 1.5707963267948966 rad + pos: 12.5,-5.5 parent: 12 - - uid: 4150 + - uid: 4103 components: - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-40.5 + pos: 9.5,-50.5 parent: 12 - - uid: 4151 + - uid: 4105 components: - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,-40.5 + pos: 7.5,-53.5 parent: 12 - uid: 4152 components: @@ -167062,18 +167882,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,-40.5 parent: 12 - - uid: 4153 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,-39.5 - parent: 12 - - uid: 4154 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,-42.5 - parent: 12 - uid: 4167 components: - type: Transform @@ -167291,16 +168099,6 @@ entities: - type: Transform pos: 14.5,-5.5 parent: 12 - - uid: 4570 - components: - - type: Transform - pos: 14.5,-4.5 - parent: 12 - - uid: 4571 - components: - - type: Transform - pos: 14.5,-3.5 - parent: 12 - uid: 4572 components: - type: Transform @@ -167468,6 +168266,12 @@ entities: - type: Transform pos: 6.5,-5.5 parent: 12 + - uid: 4773 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-48.5 + parent: 12 - uid: 4882 components: - type: Transform @@ -167686,6 +168490,12 @@ entities: - type: Transform pos: 6.5,-3.5 parent: 12 + - uid: 5117 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-47.5 + parent: 12 - uid: 5122 components: - type: Transform @@ -167785,6 +168595,12 @@ entities: rot: 3.141592653589793 rad pos: 62.5,5.5 parent: 12 + - uid: 5218 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-49.5 + parent: 12 - uid: 5246 components: - type: Transform @@ -167833,6 +168649,12 @@ entities: rot: 1.5707963267948966 rad pos: 34.5,-16.5 parent: 12 + - uid: 5313 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-50.5 + parent: 12 - uid: 5316 components: - type: Transform @@ -167979,12 +168801,6 @@ entities: rot: 1.5707963267948966 rad pos: 17.5,8.5 parent: 12 - - uid: 5721 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,6.5 - parent: 12 - uid: 5868 components: - type: Transform @@ -168093,6 +168909,12 @@ entities: - type: Transform pos: 28.5,-29.5 parent: 12 + - uid: 6207 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-41.5 + parent: 12 - uid: 6243 components: - type: Transform @@ -168611,30 +169433,6 @@ entities: rot: -1.5707963267948966 rad pos: 64.5,-25.5 parent: 12 - - uid: 7579 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 63.5,-25.5 - parent: 12 - - uid: 7580 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 62.5,-25.5 - parent: 12 - - uid: 7581 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 61.5,-25.5 - parent: 12 - - uid: 7582 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 61.5,-26.5 - parent: 12 - uid: 7583 components: - type: Transform @@ -168953,6 +169751,11 @@ entities: - type: Transform pos: 42.5,-9.5 parent: 12 + - uid: 8669 + components: + - type: Transform + pos: -11.5,-2.5 + parent: 12 - uid: 8709 components: - type: Transform @@ -168994,6 +169797,16 @@ entities: rot: 1.5707963267948966 rad pos: 84.5,-38.5 parent: 12 + - uid: 8799 + components: + - type: Transform + pos: -10.5,-1.5 + parent: 12 + - uid: 8806 + components: + - type: Transform + pos: -10.5,-0.5 + parent: 12 - uid: 8817 components: - type: Transform @@ -169004,6 +169817,22 @@ entities: - type: Transform pos: 44.5,-6.5 parent: 12 + - uid: 8820 + components: + - type: Transform + pos: -10.5,0.5 + parent: 12 + - uid: 8846 + components: + - type: Transform + pos: 12.5,-2.5 + parent: 12 + - uid: 8852 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,-4.5 + parent: 12 - uid: 8856 components: - type: Transform @@ -169036,6 +169865,12 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,0.5 parent: 12 + - uid: 9138 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-43.5 + parent: 12 - uid: 9142 components: - type: Transform @@ -169107,6 +169942,12 @@ entities: - type: Transform pos: -12.5,23.5 parent: 12 + - uid: 9443 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 64.5,-26.5 + parent: 12 - uid: 9502 components: - type: Transform @@ -169250,6 +170091,11 @@ entities: rot: 3.141592653589793 rad pos: -51.5,65.5 parent: 12 + - uid: 9658 + components: + - type: Transform + pos: 13.5,-2.5 + parent: 12 - uid: 9701 components: - type: Transform @@ -169321,6 +170167,11 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,3.5 parent: 12 + - uid: 9996 + components: + - type: Transform + pos: -11.5,-1.5 + parent: 12 - uid: 10040 components: - type: Transform @@ -169788,54 +170639,6 @@ entities: rot: 3.141592653589793 rad pos: 74.5,13.5 parent: 12 - - uid: 10656 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,18.5 - parent: 12 - - uid: 10657 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,18.5 - parent: 12 - - uid: 10658 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,18.5 - parent: 12 - - uid: 10659 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,18.5 - parent: 12 - - uid: 10660 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,18.5 - parent: 12 - - uid: 10661 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,18.5 - parent: 12 - - uid: 10662 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,19.5 - parent: 12 - - uid: 10664 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,20.5 - parent: 12 - uid: 10669 components: - type: Transform @@ -169925,12 +170728,6 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,24.5 parent: 12 - - uid: 10727 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,22.5 - parent: 12 - uid: 10729 components: - type: Transform @@ -172001,11 +172798,6 @@ entities: rot: 3.141592653589793 rad pos: 16.5,20.5 parent: 12 - - uid: 16390 - components: - - type: Transform - pos: -8.5,21.5 - parent: 12 - uid: 16420 components: - type: Transform @@ -173632,6 +174424,12 @@ entities: rot: 3.141592653589793 rad pos: 36.5,-8.5 parent: 12 + - uid: 21078 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-4.5 + parent: 12 - uid: 21527 components: - type: Transform @@ -174091,6 +174889,24 @@ entities: - type: Transform pos: -52.5,63.5 parent: 12 + - uid: 25091 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-17.5 + parent: 12 + - uid: 25094 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-18.5 + parent: 12 + - uid: 25095 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-18.5 + parent: 12 - uid: 25101 components: - type: Transform @@ -174340,12 +175156,6 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,-19.5 parent: 12 - - uid: 25595 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-19.5 - parent: 12 - uid: 25597 components: - type: Transform @@ -174377,16 +175187,6 @@ entities: - type: Transform pos: 32.5,5.5 parent: 12 - - uid: 25616 - components: - - type: Transform - pos: -33.5,5.5 - parent: 12 - - uid: 25618 - components: - - type: Transform - pos: -33.5,13.5 - parent: 12 - uid: 25835 components: - type: Transform @@ -174422,6 +175222,18 @@ entities: - type: Transform pos: -18.5,-31.5 parent: 12 + - uid: 26096 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 63.5,-27.5 + parent: 12 + - uid: 26167 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 64.5,-27.5 + parent: 12 - uid: 26197 components: - type: Transform @@ -175046,11 +175858,6 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,61.5 parent: 12 - - uid: 27922 - components: - - type: Transform - pos: 30.5,5.5 - parent: 12 - uid: 27924 components: - type: Transform @@ -175271,6 +176078,11 @@ entities: - type: Transform pos: 6.5,-4.5 parent: 12 + - uid: 28553 + components: + - type: Transform + pos: 11.5,-39.5 + parent: 12 - uid: 28741 components: - type: Transform @@ -175399,23 +176211,35 @@ entities: parent: 12 - proto: WallReinforcedDiagonal entities: - - uid: 4721 + - uid: 21621 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,5.5 + parent: 12 + - uid: 22066 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,6.5 + parent: 12 + - uid: 22072 components: - type: Transform rot: 1.5707963267948966 rad pos: 29.5,4.5 parent: 12 - - uid: 19544 + - uid: 22073 components: - type: Transform rot: 1.5707963267948966 rad - pos: 30.5,3.5 + pos: 28.5,5.5 parent: 12 - - uid: 25103 + - uid: 22075 components: - type: Transform rot: 1.5707963267948966 rad - pos: 28.5,5.5 + pos: 30.5,3.5 parent: 12 - proto: WallReinforcedRust entities: @@ -175511,6 +176335,12 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,9.5 parent: 12 + - uid: 10166 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-50.5 + parent: 12 - uid: 10279 components: - type: Transform @@ -175535,12 +176365,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-53.5 parent: 12 - - uid: 10629 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,-47.5 - parent: 12 - uid: 10644 components: - type: Transform @@ -175835,6 +176659,12 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,8.5 parent: 12 + - uid: 18709 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-49.5 + parent: 12 - uid: 19694 components: - type: Transform @@ -176513,11 +177343,6 @@ entities: rot: -1.5707963267948966 rad pos: -50.5,-36.5 parent: 12 - - uid: 901 - components: - - type: Transform - pos: -35.5,-4.5 - parent: 12 - uid: 905 components: - type: Transform @@ -176777,6 +177602,12 @@ entities: - type: Transform pos: -49.5,66.5 parent: 12 + - uid: 2293 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 59.5,-22.5 + parent: 12 - uid: 2363 components: - type: Transform @@ -177224,32 +178055,32 @@ entities: - uid: 3083 components: - type: Transform - pos: 7.5,-39.5 + rot: -1.5707963267948966 rad + pos: 9.5,-44.5 parent: 12 - uid: 3084 components: - type: Transform - pos: 7.5,-40.5 + rot: -1.5707963267948966 rad + pos: 9.5,-41.5 parent: 12 - uid: 3085 components: - type: Transform - pos: 7.5,-41.5 + rot: -1.5707963267948966 rad + pos: 9.5,-46.5 parent: 12 - - uid: 3086 + - uid: 3087 components: - type: Transform - pos: 7.5,-42.5 + rot: -1.5707963267948966 rad + pos: 9.5,-39.5 parent: 12 - uid: 3088 components: - type: Transform - pos: 7.5,-44.5 - parent: 12 - - uid: 3089 - components: - - type: Transform - pos: 7.5,-45.5 + rot: -1.5707963267948966 rad + pos: 9.5,-38.5 parent: 12 - uid: 3091 components: @@ -177284,6 +178115,17 @@ entities: - type: Transform pos: 2.5,-43.5 parent: 12 + - uid: 3104 + components: + - type: Transform + pos: 59.5,-27.5 + parent: 12 + - uid: 3105 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,-22.5 + parent: 12 - uid: 3122 components: - type: Transform @@ -177302,6 +178144,35 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-50.5 parent: 12 + - uid: 3847 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-38.5 + parent: 12 + - uid: 3897 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-46.5 + parent: 12 + - uid: 3898 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-45.5 + parent: 12 + - uid: 3899 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-40.5 + parent: 12 + - uid: 4020 + components: + - type: Transform + pos: 59.5,-26.5 + parent: 12 - uid: 4098 components: - type: Transform @@ -177326,6 +178197,11 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-36.5 parent: 12 + - uid: 4166 + components: + - type: Transform + pos: 63.5,-22.5 + parent: 12 - uid: 4171 components: - type: Transform @@ -177502,29 +178378,12 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-19.5 parent: 12 - - uid: 4456 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-18.5 - parent: 12 - - uid: 4462 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,-17.5 - parent: 12 - uid: 4520 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,-35.5 parent: 12 - - uid: 4539 - components: - - type: Transform - pos: 11.5,-18.5 - parent: 12 - uid: 4959 components: - type: Transform @@ -177879,6 +178738,11 @@ entities: rot: -1.5707963267948966 rad pos: 39.5,-31.5 parent: 12 + - uid: 6750 + components: + - type: Transform + pos: 59.5,-18.5 + parent: 12 - uid: 6760 components: - type: Transform @@ -178170,12 +179034,6 @@ entities: rot: -1.5707963267948966 rad pos: 55.5,-23.5 parent: 12 - - uid: 7374 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-22.5 - parent: 12 - uid: 7376 components: - type: Transform @@ -178284,24 +179142,12 @@ entities: rot: -1.5707963267948966 rad pos: 54.5,-12.5 parent: 12 - - uid: 7444 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 57.5,-26.5 - parent: 12 - uid: 7445 components: - type: Transform rot: -1.5707963267948966 rad pos: 57.5,-25.5 parent: 12 - - uid: 7519 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 59.5,-26.5 - parent: 12 - uid: 7541 components: - type: Transform @@ -178374,6 +179220,12 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,24.5 parent: 12 + - uid: 7788 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,-7.5 + parent: 12 - uid: 7822 components: - type: Transform @@ -178392,17 +179244,28 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-23.5 parent: 12 - - uid: 8819 + - uid: 8506 components: - type: Transform - pos: 45.5,-10.5 + rot: 3.141592653589793 rad + pos: 9.5,-43.5 parent: 12 - - uid: 8820 + - uid: 8509 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 1.5707963267948966 rad pos: 55.5,-17.5 parent: 12 + - uid: 8670 + components: + - type: Transform + pos: -9.5,2.5 + parent: 12 + - uid: 8819 + components: + - type: Transform + pos: 45.5,-10.5 + parent: 12 - uid: 8835 components: - type: Transform @@ -178510,6 +179373,11 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-34.5 parent: 12 + - uid: 9993 + components: + - type: Transform + pos: -9.5,0.5 + parent: 12 - uid: 10248 components: - type: Transform @@ -178646,11 +179514,6 @@ entities: - type: Transform pos: -52.5,-41.5 parent: 12 - - uid: 10412 - components: - - type: Transform - pos: -35.5,-7.5 - parent: 12 - uid: 10607 components: - type: Transform @@ -181188,6 +182051,12 @@ entities: - type: Transform pos: -55.5,-31.5 parent: 12 + - uid: 18605 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-19.5 + parent: 12 - uid: 18622 components: - type: Transform @@ -181871,15 +182740,16 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,64.5 parent: 12 - - uid: 21189 + - uid: 21075 components: - type: Transform - pos: -11.5,47.5 + rot: -1.5707963267948966 rad + pos: 9.5,-48.5 parent: 12 - - uid: 21621 + - uid: 21189 components: - type: Transform - pos: 54.5,-17.5 + pos: -11.5,47.5 parent: 12 - uid: 21790 components: @@ -181887,10 +182757,56 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,64.5 parent: 12 - - uid: 22051 + - uid: 21854 + components: + - type: Transform + pos: -8.5,19.5 + parent: 12 + - uid: 21855 components: - type: Transform - pos: -9.5,73.5 + pos: -8.5,21.5 + parent: 12 + - uid: 21856 + components: + - type: Transform + pos: -11.5,18.5 + parent: 12 + - uid: 21897 + components: + - type: Transform + pos: -10.5,18.5 + parent: 12 + - uid: 21898 + components: + - type: Transform + pos: -12.5,18.5 + parent: 12 + - uid: 21957 + components: + - type: Transform + pos: -13.5,18.5 + parent: 12 + - uid: 21958 + components: + - type: Transform + pos: -13.5,22.5 + parent: 12 + - uid: 22021 + components: + - type: Transform + pos: -9.5,18.5 + parent: 12 + - uid: 22022 + components: + - type: Transform + pos: -8.5,18.5 + parent: 12 + - uid: 22050 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-18.5 parent: 12 - uid: 22159 components: @@ -182156,6 +183072,17 @@ entities: rot: 3.141592653589793 rad pos: -46.5,62.5 parent: 12 + - uid: 26101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,-4.5 + parent: 12 + - uid: 26184 + components: + - type: Transform + pos: 29.5,87.5 + parent: 12 - uid: 26188 components: - type: Transform @@ -182190,11 +183117,21 @@ entities: rot: 3.141592653589793 rad pos: -43.5,61.5 parent: 12 + - uid: 26449 + components: + - type: Transform + pos: 11.5,90.5 + parent: 12 - uid: 26939 components: - type: Transform pos: -57.5,-31.5 parent: 12 + - uid: 27098 + components: + - type: Transform + pos: 25.5,90.5 + parent: 12 - uid: 27152 components: - type: Transform @@ -182227,12 +183164,22 @@ entities: - type: Transform pos: -0.5,23.5 parent: 12 + - uid: 27735 + components: + - type: Transform + pos: 7.5,87.5 + parent: 12 - uid: 27858 components: - type: Transform rot: 1.5707963267948966 rad pos: -51.5,-43.5 parent: 12 + - uid: 27914 + components: + - type: Transform + pos: 30.5,76.5 + parent: 12 - uid: 27925 components: - type: Transform @@ -182257,6 +183204,11 @@ entities: rot: 3.141592653589793 rad pos: 82.5,55.5 parent: 12 + - uid: 27997 + components: + - type: Transform + pos: 30.5,83.5 + parent: 12 - uid: 28168 components: - type: Transform @@ -182289,6 +183241,11 @@ entities: - type: Transform pos: -51.5,-12.5 parent: 12 + - uid: 28216 + components: + - type: Transform + pos: 6.5,75.5 + parent: 12 - uid: 28265 components: - type: Transform @@ -182306,6 +183263,11 @@ entities: rot: 3.141592653589793 rad pos: -55.5,-17.5 parent: 12 + - uid: 28429 + components: + - type: Transform + pos: 6.5,83.5 + parent: 12 - uid: 29208 components: - type: Transform @@ -182902,20 +183864,15 @@ entities: parent: 12 - proto: WardrobeCargoFilled entities: - - uid: 8504 - components: - - type: Transform - pos: 63.5,-18.5 - parent: 12 - - uid: 8505 + - uid: 25616 components: - type: Transform - pos: 62.5,-18.5 + pos: 61.5,-23.5 parent: 12 - - uid: 8506 + - uid: 25618 components: - type: Transform - pos: 61.5,-18.5 + pos: 62.5,-23.5 parent: 12 - proto: WardrobeChapelFilled entities: @@ -183018,10 +183975,10 @@ entities: parent: 12 - proto: WardrobeSalvageFilled entities: - - uid: 8795 + - uid: 9969 components: - type: Transform - pos: 60.5,-26.5 + pos: 57.5,-39.5 parent: 12 - proto: WardrobeScienceFilled entities: @@ -183156,6 +184113,11 @@ entities: - type: Transform pos: 42.5,44.5 parent: 12 + - uid: 26105 + components: + - type: Transform + pos: 61.5,-26.5 + parent: 12 - proto: WaterTankFull entities: - uid: 1766 @@ -183446,6 +184408,11 @@ entities: - type: InsideEntityStorage - proto: Welder entities: + - uid: 4197 + components: + - type: Transform + pos: -45.354244,44.583572 + parent: 12 - uid: 4245 components: - type: Transform @@ -183454,7 +184421,8 @@ entities: - uid: 8879 components: - type: Transform - pos: 56.587723,-22.55927 + rot: -31.415926535897945 rad + pos: 60.265587,-18.370502 parent: 12 - uid: 16476 components: @@ -183507,10 +184475,10 @@ entities: - type: Transform pos: 34.5,-17.5 parent: 12 - - uid: 7789 + - uid: 8878 components: - type: Transform - pos: 56.5,-19.5 + pos: 81.5,-36.5 parent: 12 - uid: 9086 components: @@ -183542,6 +184510,11 @@ entities: - type: Transform pos: -12.5,11.5 parent: 12 + - uid: 16775 + components: + - type: Transform + pos: -7.5,18.5 + parent: 12 - uid: 18272 components: - type: Transform @@ -183552,11 +184525,6 @@ entities: - type: Transform pos: -26.5,21.5 parent: 12 - - uid: 21601 - components: - - type: Transform - pos: -7.5,20.5 - parent: 12 - uid: 24224 components: - type: Transform @@ -183813,12 +184781,6 @@ entities: - type: Transform pos: 52.5,-23.5 parent: 12 - - uid: 27255 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-50.5 - parent: 12 - uid: 27269 components: - type: Transform @@ -184203,29 +185165,42 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,-39.5 parent: 12 - - uid: 2781 + - uid: 13794 components: - type: Transform - pos: -10.5,-60.5 + rot: 3.141592653589793 rad + pos: 30.5,40.5 parent: 12 - - uid: 2782 + - uid: 21667 components: - type: Transform rot: 3.141592653589793 rad - pos: -10.5,-60.5 + pos: -3.5,-44.5 parent: 12 - - uid: 13794 + - uid: 26099 components: - type: Transform rot: 3.141592653589793 rad - pos: 30.5,40.5 + pos: -10.5,-60.5 parent: 12 - - uid: 21667 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 26100: + - DoorStatus: DoorBolt + - uid: 26100 components: - type: Transform rot: 3.141592653589793 rad - pos: -3.5,-44.5 + pos: -10.5,-61.5 parent: 12 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 26099: + - DoorStatus: DoorBolt - uid: 27251 components: - type: Transform @@ -184447,11 +185422,6 @@ entities: - type: Transform pos: -35.5,-6.5 parent: 12 - - uid: 899 - components: - - type: Transform - pos: -34.5,-4.5 - parent: 12 - uid: 900 components: - type: Transform @@ -184462,16 +185432,6 @@ entities: - type: Transform pos: -35.5,-5.5 parent: 12 - - uid: 923 - components: - - type: Transform - pos: -33.5,-7.5 - parent: 12 - - uid: 924 - components: - - type: Transform - pos: -33.5,-4.5 - parent: 12 - uid: 2334 components: - type: Transform @@ -184620,6 +185580,18 @@ entities: rot: -1.5707963267948966 rad pos: 48.5,-25.5 parent: 12 + - uid: 8507 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-17.5 + parent: 12 + - uid: 8508 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,-17.5 + parent: 12 - uid: 9398 components: - type: Transform @@ -184825,6 +185797,11 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,28.5 parent: 12 + - uid: 13739 + components: + - type: Transform + pos: 60.5,-22.5 + parent: 12 - uid: 13994 components: - type: Transform @@ -185194,24 +186171,6 @@ entities: - type: Transform pos: -5.5,60.5 parent: 12 - - uid: 19864 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-20.5 - parent: 12 - - uid: 19867 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-19.5 - parent: 12 - - uid: 19868 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 56.5,-17.5 - parent: 12 - uid: 20148 components: - type: Transform @@ -185230,18 +186189,6 @@ entities: rot: -1.5707963267948966 rad pos: 55.5,-12.5 parent: 12 - - uid: 20341 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 58.5,-17.5 - parent: 12 - - uid: 20540 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-18.5 - parent: 12 - uid: 20542 components: - type: Transform @@ -185277,6 +186224,34 @@ entities: - type: Transform pos: 12.5,60.5 parent: 12 + - uid: 25197 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,-17.5 + parent: 12 + - uid: 26032 + components: + - type: Transform + pos: 61.5,-22.5 + parent: 12 + - uid: 26104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,-4.5 + parent: 12 + - uid: 26173 + components: + - type: Transform + pos: 59.5,-24.5 + parent: 12 + - uid: 26174 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-22.5 + parent: 12 - uid: 26242 components: - type: Transform @@ -185297,6 +186272,18 @@ entities: - type: Transform pos: -53.5,-15.5 parent: 12 + - uid: 28550 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,-4.5 + parent: 12 + - uid: 28552 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,-7.5 + parent: 12 - proto: WindowDirectional entities: - uid: 4186 @@ -185330,12 +186317,6 @@ entities: parent: 12 - proto: WindowFrostedDirectional entities: - - uid: 1553 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-49.5 - parent: 12 - uid: 4236 components: - type: Transform @@ -185360,12 +186341,6 @@ entities: rot: 3.141592653589793 rad pos: 9.5,-32.5 parent: 12 - - uid: 4724 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,-49.5 - parent: 12 - uid: 6784 components: - type: Transform @@ -185386,36 +186361,12 @@ entities: - type: Transform pos: -37.5,-21.5 parent: 12 - - uid: 9307 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-51.5 - parent: 12 - - uid: 9309 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,-51.5 - parent: 12 - - uid: 9754 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-48.5 - parent: 12 - uid: 15657 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,36.5 parent: 12 - - uid: 18605 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-50.5 - parent: 12 - uid: 19118 components: - type: Transform @@ -185592,66 +186543,12 @@ entities: rot: 3.141592653589793 rad pos: -6.5,53.5 parent: 12 - - uid: 25099 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-49.5 - parent: 12 - - uid: 26409 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-51.5 - parent: 12 - - uid: 27248 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-49.5 - parent: 12 - - uid: 27249 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-47.5 - parent: 12 - - uid: 27262 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-51.5 - parent: 12 - - uid: 27263 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-51.5 - parent: 12 - - uid: 27264 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-51.5 - parent: 12 - uid: 27265 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-53.5 parent: 12 - - uid: 27266 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-51.5 - parent: 12 - - uid: 27267 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-51.5 - parent: 12 - proto: WindowReinforcedDirectional entities: - uid: 54 @@ -185812,16 +186709,17 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,-61.5 parent: 12 - - uid: 2779 + - uid: 2780 components: - type: Transform + rot: 1.5707963267948966 rad pos: -11.5,-60.5 parent: 12 - - uid: 2780 + - uid: 2782 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-60.5 + rot: 3.141592653589793 rad + pos: -8.5,-49.5 parent: 12 - uid: 2960 components: @@ -185846,17 +186744,17 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-13.5 parent: 12 - - uid: 4971 + - uid: 4200 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -27.5,-44.5 + rot: 3.141592653589793 rad + pos: -9.5,-47.5 parent: 12 - - uid: 5372 + - uid: 4971 components: - type: Transform rot: -1.5707963267948966 rad - pos: 17.5,4.5 + pos: -27.5,-44.5 parent: 12 - uid: 5411 components: @@ -185946,17 +186844,28 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,-17.5 parent: 12 + - uid: 7581 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-61.5 + parent: 12 - uid: 8731 components: - type: Transform rot: -1.5707963267948966 rad pos: 52.5,-30.5 parent: 12 - - uid: 9135 + - uid: 8890 components: - type: Transform rot: 3.141592653589793 rad - pos: 17.5,4.5 + pos: -10.5,-49.5 + parent: 12 + - uid: 8901 + components: + - type: Transform + pos: -9.5,-50.5 parent: 12 - uid: 9659 components: @@ -185976,6 +186885,17 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-44.5 parent: 12 + - uid: 10653 + components: + - type: Transform + pos: -10.5,-50.5 + parent: 12 + - uid: 10662 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-49.5 + parent: 12 - uid: 12238 components: - type: Transform @@ -186425,6 +187345,71 @@ entities: rot: 3.141592653589793 rad pos: 53.5,54.5 parent: 12 + - uid: 26098 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-47.5 + parent: 12 + - uid: 26116 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-51.5 + parent: 12 + - uid: 26117 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-51.5 + parent: 12 + - uid: 26120 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-47.5 + parent: 12 + - uid: 26122 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-51.5 + parent: 12 + - uid: 26123 + components: + - type: Transform + pos: -8.5,-50.5 + parent: 12 + - uid: 26125 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-51.5 + parent: 12 + - uid: 26126 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-51.5 + parent: 12 + - uid: 26127 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-51.5 + parent: 12 + - uid: 26128 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-51.5 + parent: 12 + - uid: 26129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-51.5 + parent: 12 - uid: 26588 components: - type: Transform From b4a3408a7e768fb5663478a49da0a3729d616e43 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:21:00 +1000 Subject: [PATCH 139/223] AI radio fix (#31547) Love to see it --- .../Prototypes/Entities/Mobs/Player/silicon.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 23b2a318ebb..d9f41b67d72 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -17,8 +17,16 @@ - Service - Supply - type: ActiveRadio - receiveAllChannels: true - globalReceive: true + channels: + - Binary + - Common + - Command + - Engineering + - Medical + - Science + - Security + - Service + - Supply - type: IgnoreUIRange - type: StationAiHeld - type: StationAiOverlay From a06d9a512c563b285ec2ec1f7f6b7440e60b242e Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:21:52 +1000 Subject: [PATCH 140/223] Storage BUI bandaid (#31506) grug storageuicontroller --- Content.Client/Storage/StorageBoundUserInterface.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Client/Storage/StorageBoundUserInterface.cs b/Content.Client/Storage/StorageBoundUserInterface.cs index 899df30f7fc..b90977cbb4d 100644 --- a/Content.Client/Storage/StorageBoundUserInterface.cs +++ b/Content.Client/Storage/StorageBoundUserInterface.cs @@ -11,6 +11,8 @@ public sealed class StorageBoundUserInterface : BoundUserInterface private readonly StorageSystem _storage; + [Obsolete] public override bool DeferredClose => false; + public StorageBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { IoCManager.InjectDependencies(this); From 60385152b4956d05d904321df26d294771d2bcb0 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:18:17 +1000 Subject: [PATCH 141/223] Fix puddle context menu (#31555) --- Resources/Prototypes/Entities/Effects/puddle.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index 36f0faa1df1..e1dd567893d 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -126,6 +126,11 @@ bodyType: Static - type: Fixtures fixtures: + # Context / examine fixture + fix1: + shape: + !type:PhysShapeCircle + radius: 0.25 slipFixture: shape: !type:PhysShapeAabb From af79603d9d420bffe50d71babea05704f44bfcd9 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:45:15 +1000 Subject: [PATCH 142/223] Update AI holo sprite to camera (#31558) Update AI camera to 13 default Holo was a placeholder. This is better in the interim. --- .../Prototypes/Entities/Mobs/Player/silicon.yml | 6 +++--- .../Mobs/Silicon/station_ai.rsi/ai_camera.png | Bin 0 -> 476 bytes .../Mobs/Silicon/station_ai.rsi/meta.json | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_camera.png diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index d9f41b67d72..e843fbfc239 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -293,8 +293,8 @@ - Incorporeal - BaseMob id: StationAiHolo - name: Hologram - description: A projection of the AI. + name: AI eye + description: The AI's viewer. noSpawn: true suffix: DO NOT MAP components: @@ -305,7 +305,7 @@ - type: Sprite sprite: Mobs/Silicon/station_ai.rsi layers: - - state: default + - state: ai_camera shader: unshaded map: ["base"] diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_camera.png b/Resources/Textures/Mobs/Silicon/station_ai.rsi/ai_camera.png new file mode 100644 index 0000000000000000000000000000000000000000..fd5e2ece28d80cad2b76b157737effb1ebdf705f GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZnt_3_ z&(p;*q+-t78HV1>jsmUXktPWX3lh{LBBNxcHTCY@JJ;S(MCWKw#}DB*Z`N-Y)OpI~ zt$onX;)2oy4}s5o=`(wFInM0Vd}g}yX7sn(@|&%*#Sh!BX0_NSZFZjjdwgEpyQ!^h zC;x@sJ+X1>*WQ9{lHDiH&VMyKL2>81tevtCINzT*yM8yjmcNeb^}Ck4GB}i?W}Md- z-F>)jf6rXMzu#_!Y-$sCT#@f&WWA?0()xasn{0(`(9!3snGH6(r~O)-_E;k8<>#;4 zuUGt9$^7BEfAS_X)(2JcU;LhliTSIa4Q4%Hcz9WM|Lq0lVV?_)8RmSv=Us7$?epw5 z@*iprFv`G?(19&RO!tIU7*6*nOy`ADO&n~quEf?e*cOJI-%>k48yH;-p00i_>zopr E0M8f3tpET3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json index a3da52233dd..c8d174c57bf 100644 --- a/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json +++ b/Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json @@ -29,6 +29,15 @@ ] ] }, + { + "name": "ai_camera", + "delays": [ + [ + 1.0, + 1.0 + ] + ] + }, { "name": "ai_dead" }, From d1839edb7ad3643443cb87a50b2ea4e220a35e39 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:58:27 +1000 Subject: [PATCH 143/223] Add AI warp points (#31559) --- Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index e843fbfc239..8174f52a347 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -199,6 +199,7 @@ - AiHolder suffix: Empty components: + - type: WarpPoint - type: ContainerComp proto: AiHeld container: station_ai_mind_slot @@ -298,6 +299,8 @@ noSpawn: true suffix: DO NOT MAP components: + - type: WarpPoint + follow: true - type: Eye pvsScale: 1.5 - type: Visibility From 1f4c9b55e2ff882a96bfd24ca6c0296d2d21d811 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 05:59:34 +0000 Subject: [PATCH 144/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 65f093d4370..c0f0c788f03 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Moomoobeef - changes: - - message: Fax machines can now be purchased at cargo, for when you need more paper - pushing on your station! - type: Add - id: 6729 - time: '2024-06-14T06:24:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28968 - author: Zonespace27 changes: - message: Non-uplink PDAs can no longer have telecrystals inserted into them. @@ -3865,3 +3857,10 @@ id: 7228 time: '2024-08-27T16:54:48.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31519 +- author: metalgearsloth + changes: + - message: Added warp points for AI. + type: Add + id: 7229 + time: '2024-08-28T05:58:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31559 From 9149a449b1b79b3c5339ea18b7b14ff66cbb97bb Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:09:05 +1000 Subject: [PATCH 145/223] Fix AI being ejectable (#31561) --- Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 8174f52a347..e1348c7b389 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -116,6 +116,7 @@ - type: StationAiHolder slot: name: station-ai-mind-slot + locked: true whitelist: tags: - StationAi From 8321031a08110da12583a9eb0b02492375c06f51 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 07:10:11 +0000 Subject: [PATCH 146/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c0f0c788f03..2c1617d254a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Zonespace27 - changes: - - message: Non-uplink PDAs can no longer have telecrystals inserted into them. - type: Fix - id: 6730 - time: '2024-06-14T15:24:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28985 - author: Aquif changes: - message: '"Space Drugs" have been renamed to "Space Mirage"' @@ -3864,3 +3857,10 @@ id: 7229 time: '2024-08-28T05:58:27.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31559 +- author: metalgearsloth + changes: + - message: Fix AI being ejectable. + type: Fix + id: 7230 + time: '2024-08-28T07:09:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31561 From 678320f8762e5c8237a97e55bc736bdfb4dfa943 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:11:25 +1000 Subject: [PATCH 147/223] Fix whitelist (#31563) --- Content.Server/Connection/ConnectionManager.Whitelist.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Connection/ConnectionManager.Whitelist.cs b/Content.Server/Connection/ConnectionManager.Whitelist.cs index 212c87e17a6..c8a4cc37ca4 100644 --- a/Content.Server/Connection/ConnectionManager.Whitelist.cs +++ b/Content.Server/Connection/ConnectionManager.Whitelist.cs @@ -121,7 +121,7 @@ private bool IsValid(PlayerConnectionWhitelistPrototype whitelist, int playerCou private async Task CheckConditionManualWhitelist(NetUserData data) { - return !(await _db.GetWhitelistStatusAsync(data.UserId)); + return await _db.GetWhitelistStatusAsync(data.UserId); } private async Task CheckConditionManualBlacklist(NetUserData data) From d93fc73f3c3098fe5f3f053c7798b9d3921e102c Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 07:12:32 +0000 Subject: [PATCH 148/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2c1617d254a..ee840debe87 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Aquif - changes: - - message: '"Space Drugs" have been renamed to "Space Mirage"' - type: Tweak - - message: '"Stimulants" have been renamed to "Hyperzine"' - type: Tweak - id: 6731 - time: '2024-06-14T16:53:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28989 - author: PJB3005 changes: - message: Added pride month. @@ -3864,3 +3855,10 @@ id: 7230 time: '2024-08-28T07:09:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31561 +- author: metalgearsloth + changes: + - message: Fix whitelist + type: Fix + id: 7231 + time: '2024-08-28T07:11:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31563 From ed6649b7f3b5ab56176089d719dc7f81c0ef2f8a Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 28 Aug 2024 01:23:28 -0600 Subject: [PATCH 149/223] bagel update (#31562) * bagel update * ore processor cargo --- Resources/Maps/bagel.yml | 212 ++++++++++++++++++++++------ Resources/Prototypes/Maps/bagel.yml | 8 +- 2 files changed, 171 insertions(+), 49 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 092af8278aa..edd5216f2da 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -14104,6 +14104,12 @@ entities: - type: Transform pos: -24.5,62.5 parent: 60 + - uid: 21249 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -69.5,16.5 + parent: 60 - uid: 21604 components: - type: MetaData @@ -30507,21 +30513,6 @@ entities: - type: Transform pos: -58.5,16.5 parent: 60 - - uid: 21249 - components: - - type: Transform - pos: -58.5,17.5 - parent: 60 - - uid: 21250 - components: - - type: Transform - pos: -59.5,17.5 - parent: 60 - - uid: 21251 - components: - - type: Transform - pos: -60.5,17.5 - parent: 60 - uid: 21252 components: - type: Transform @@ -43102,6 +43093,11 @@ entities: - type: Transform pos: 1.5,-1.5 parent: 7536 + - uid: 8152 + components: + - type: Transform + pos: -91.5,17.5 + parent: 60 - uid: 8173 components: - type: Transform @@ -46217,6 +46213,11 @@ entities: - type: Transform pos: -2.5,-1.5 parent: 60 + - uid: 18495 + components: + - type: Transform + pos: -93.5,17.5 + parent: 60 - uid: 18521 components: - type: Transform @@ -46912,6 +46913,11 @@ entities: - type: Transform pos: -9.5,1.5 parent: 60 + - uid: 21251 + components: + - type: Transform + pos: -90.5,17.5 + parent: 60 - uid: 21430 components: - type: Transform @@ -47237,6 +47243,26 @@ entities: - type: Transform pos: -94.5,15.5 parent: 60 + - uid: 23092 + components: + - type: Transform + pos: -89.5,17.5 + parent: 60 + - uid: 23093 + components: + - type: Transform + pos: -88.5,17.5 + parent: 60 + - uid: 23094 + components: + - type: Transform + pos: -92.5,17.5 + parent: 60 + - uid: 23095 + components: + - type: Transform + pos: -87.5,17.5 + parent: 60 - uid: 23169 components: - type: Transform @@ -47907,6 +47933,101 @@ entities: - type: Transform pos: -111.5,22.5 parent: 60 + - uid: 24793 + components: + - type: Transform + pos: -86.5,17.5 + parent: 60 + - uid: 24794 + components: + - type: Transform + pos: -85.5,17.5 + parent: 60 + - uid: 24795 + components: + - type: Transform + pos: -84.5,17.5 + parent: 60 + - uid: 24796 + components: + - type: Transform + pos: -83.5,17.5 + parent: 60 + - uid: 24797 + components: + - type: Transform + pos: -82.5,17.5 + parent: 60 + - uid: 24798 + components: + - type: Transform + pos: -81.5,17.5 + parent: 60 + - uid: 24799 + components: + - type: Transform + pos: -80.5,17.5 + parent: 60 + - uid: 24800 + components: + - type: Transform + pos: -79.5,17.5 + parent: 60 + - uid: 24801 + components: + - type: Transform + pos: -77.5,17.5 + parent: 60 + - uid: 24802 + components: + - type: Transform + pos: -78.5,17.5 + parent: 60 + - uid: 24803 + components: + - type: Transform + pos: -76.5,17.5 + parent: 60 + - uid: 24804 + components: + - type: Transform + pos: -75.5,17.5 + parent: 60 + - uid: 24805 + components: + - type: Transform + pos: -74.5,17.5 + parent: 60 + - uid: 24806 + components: + - type: Transform + pos: -73.5,17.5 + parent: 60 + - uid: 24807 + components: + - type: Transform + pos: -72.5,17.5 + parent: 60 + - uid: 24808 + components: + - type: Transform + pos: -71.5,17.5 + parent: 60 + - uid: 24809 + components: + - type: Transform + pos: -70.5,17.5 + parent: 60 + - uid: 24810 + components: + - type: Transform + pos: -70.5,16.5 + parent: 60 + - uid: 24811 + components: + - type: Transform + pos: -69.5,16.5 + parent: 60 - proto: CableMVStack entities: - uid: 6601 @@ -62231,6 +62352,13 @@ entities: - type: Transform pos: 51.475224,-22.209888 parent: 60 +- proto: CurtainsWhiteOpen + entities: + - uid: 21250 + components: + - type: Transform + pos: -2.5,-11.5 + parent: 60 - proto: CyberPen entities: - uid: 10827 @@ -106800,11 +106928,6 @@ entities: - type: Transform pos: 20.5,14.5 parent: 60 - - uid: 18495 - components: - - type: Transform - pos: -2.5,-11.5 - parent: 60 - proto: HydroponicsToolMiniHoe entities: - uid: 6157 @@ -109706,6 +109829,13 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,-1.5 parent: 60 +- proto: OreProcessor + entities: + - uid: 19027 + components: + - type: Transform + pos: 43.5,3.5 + parent: 60 - proto: OxygenCanister entities: - uid: 2757 @@ -128360,6 +128490,16 @@ entities: - type: Transform pos: -31.5,13.5 parent: 60 + - uid: 24812 + components: + - type: Transform + pos: -114.5,30.5 + parent: 60 + - uid: 24813 + components: + - type: Transform + pos: -108.5,30.5 + parent: 60 - proto: SpawnPointBotanist entities: - uid: 2779 @@ -151448,26 +151588,6 @@ entities: - type: Transform pos: -108.5,15.5 parent: 60 - - uid: 23092 - components: - - type: Transform - pos: -107.5,21.5 - parent: 60 - - uid: 23093 - components: - - type: Transform - pos: -115.5,21.5 - parent: 60 - - uid: 23094 - components: - - type: Transform - pos: -115.5,30.5 - parent: 60 - - uid: 23095 - components: - - type: Transform - pos: -107.5,30.5 - parent: 60 - uid: 23160 components: - type: Transform @@ -151896,6 +152016,12 @@ entities: rot: 3.141592653589793 rad pos: 54.5,5.5 parent: 60 + - uid: 24814 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,3.5 + parent: 60 - proto: WindoorSecureChapelLocked entities: - uid: 14513 @@ -153388,12 +153514,6 @@ entities: rot: 1.5707963267948966 rad pos: 56.5,6.5 parent: 60 - - uid: 19027 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 43.5,3.5 - parent: 60 - uid: 19907 components: - type: Transform diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 3e9f75ca819..2f54c89b218 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -17,9 +17,9 @@ emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml - type: StationJobs availableJobs: - #service + #command Captain: [ 1, 1 ] - StationAi: [ 1, 1 ] + #service HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 2 ] @@ -43,7 +43,6 @@ ResearchDirector: [ 1, 1 ] Scientist: [ 5, 5 ] ResearchAssistant: [ 4, 4 ] - Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] @@ -61,3 +60,6 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Reporter: [ 2, 2 ] + #silicon + StationAi: [ 1, 1 ] + Borg: [ 4, 4 ] From 783621bc6c2f86c16bd37978aec3f907ed341665 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:39:36 +1000 Subject: [PATCH 150/223] Add some more stuff to AI whitelist (#31564) * Add some more stuff to AI whitelist * by the nine --- .../Prototypes/Entities/Structures/Doors/Shutter/shutters.yml | 1 + .../Structures/Doors/Windoors/base_structurewindoors.yml | 3 +++ .../Entities/Structures/Wallmounts/surveillance_camera.yml | 2 -- Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index dc2acb79273..955b9ba640d 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -7,6 +7,7 @@ placement: mode: SnapgridCenter components: + - type: StationAiWhitelist - type: Sprite sprite: Structures/Doors/Shutters/shutters.rsi drawdepth: BlastDoors diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 341d1c6761a..b7d0cf8cbb0 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -11,6 +11,7 @@ Brute: collection: GlassSmash - type: InteractionOutline + - type: StationAiWhitelist - type: Physics - type: Fixtures fixtures: @@ -130,6 +131,8 @@ layoutId: Airlock - type: UserInterface interfaces: + enum.AiUi.Key: + type: StationAiBoundUserInterface enum.WiresUiKey.Key: type: WiresBoundUserInterface - type: Appearance diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml index 3530fe196c0..e25c7df8d72 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml @@ -65,8 +65,6 @@ InUse: camera_in_use - type: UserInterface interfaces: - enum.AiUi.Key: - type: StationAiBoundUserInterface enum.SurveillanceCameraSetupUiKey.Camera: type: SurveillanceCameraSetupBoundUi enum.WiresUiKey.Key: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index 01e3757a2c7..19233ba69a5 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -7,6 +7,7 @@ snap: - Wallmount components: + - type: StationAiWhitelist - type: WallMount arc: 360 - type: Clickable @@ -49,6 +50,7 @@ snap: - Wallmount components: + - type: StationAiWhitelist - type: WallMount arc: 360 - type: Clickable @@ -146,6 +148,7 @@ placement: mode: SnapgridCenter components: + - type: StationAiWhitelist - type: Clickable - type: InteractionOutline - type: Sprite From a270afa362a730d8bdf47936226048c132138b49 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 07:40:42 +0000 Subject: [PATCH 151/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ee840debe87..ab4a6c920f5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: PJB3005 - changes: - - message: Added pride month. - type: Add - - message: Made the nuke gay. - type: Add - id: 6732 - time: '2024-06-14T17:22:01.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28992 - author: Aeshus changes: - message: Loadouts now display all requirements. @@ -3862,3 +3853,10 @@ id: 7231 time: '2024-08-28T07:11:25.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31563 +- author: metalgearsloth + changes: + - message: Add shutters, windoors, etc to AI interaction whitelist. + type: Tweak + id: 7232 + time: '2024-08-28T07:39:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31564 From c4b1e18cbd57e5b17d57f93d06836b8316a4e981 Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Wed, 28 Aug 2024 08:49:40 +0100 Subject: [PATCH 152/223] Meta - Med disposals and chem room extra pipe fix (#31467) Delete extra pipe & fix disposals junction --- Resources/Maps/meta.yml | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 6434c6ef774..f4cebe8b7e2 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -10826,7 +10826,7 @@ entities: pos: -42.5,29.5 parent: 5350 - type: Door - secondsUntilStateChange: -3920.309 + secondsUntilStateChange: -4222.55 state: Opening - type: DeviceLinkSink invokeCounter: 2 @@ -64754,11 +64754,6 @@ entities: - type: Transform pos: 34.5,21.5 parent: 5350 - - uid: 14242 - components: - - type: Transform - pos: -20.5,-29.5 - parent: 5350 - uid: 14366 components: - type: Transform @@ -69987,6 +69982,12 @@ entities: rot: 3.141592653589793 rad pos: -21.5,22.5 parent: 5350 + - uid: 14242 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-29.5 + parent: 5350 - uid: 14788 components: - type: Transform @@ -92423,17 +92424,6 @@ entities: parent: 5350 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 14671 - components: - - type: Transform - anchored: False - pos: -21.5,-28.5 - parent: 5350 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 14672 components: - type: Transform From 1a85de56a4b31cd9ff7bada09c8c6f4140699fad Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 28 Aug 2024 02:18:30 -0600 Subject: [PATCH 153/223] bagel hotfix (#31566) bagel update --- Resources/Maps/bagel.yml | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index edd5216f2da..b8666fdb3cd 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -31738,6 +31738,11 @@ entities: - type: Transform pos: -113.5,36.5 parent: 60 + - uid: 23088 + components: + - type: Transform + pos: -69.5,16.5 + parent: 60 - uid: 23403 components: - type: Transform @@ -151568,26 +151573,6 @@ entities: - type: Transform pos: -1.5,-2.5 parent: 7536 - - uid: 23088 - components: - - type: Transform - pos: -114.5,15.5 - parent: 60 - - uid: 23089 - components: - - type: Transform - pos: -114.5,19.5 - parent: 60 - - uid: 23090 - components: - - type: Transform - pos: -108.5,19.5 - parent: 60 - - uid: 23091 - components: - - type: Transform - pos: -108.5,15.5 - parent: 60 - uid: 23160 components: - type: Transform From a02bdd09e42ce212a82ce4e43a64732ef6f6b8e2 Mon Sep 17 00:00:00 2001 From: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Date: Wed, 28 Aug 2024 01:18:51 -0700 Subject: [PATCH 154/223] update AI job icon to 8x8 (#31565) icon and meta.json --- .../Interface/Misc/job_icons.rsi/StationAi.png | Bin 204 -> 170 bytes .../Interface/Misc/job_icons.rsi/meta.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/StationAi.png b/Resources/Textures/Interface/Misc/job_icons.rsi/StationAi.png index aba35c034b9f1508e953a030300987dcf1265f1e..86a208915ba94826c85758577d25d945e67f4021 100644 GIT binary patch delta 128 zcmV-`0Du3?0jdFzF?nQ3L_t&-m4%P74S+BZ125>O$Tlz5h^Sd26-%U{iC80I4wfNQ zc|{QjSC;*@^$tK|uDsyf7AG2W_1>F!tTO=nbpuox4S?^fd)<& z1@ERCeSLiiW*i5685nbxHTce`{wzO(d9fo`V#5Oc12S9(bk;O9GBSL~wmJEl;lM$l OZ492SelF{r5}E+Ktvd7o diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 7b09250bd98..1f76743a9d5 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets", "size": { "x": 8, From 2a28a055508189c72e93493cfa85db898e7d967d Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 08:19:59 +0000 Subject: [PATCH 155/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ab4a6c920f5..00ff359de18 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Aeshus - changes: - - message: Loadouts now display all requirements. - type: Fix - id: 6733 - time: '2024-06-14T20:32:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28994 - author: Vermidia changes: - message: allies callable by radio in the uplink now have unique icons @@ -3860,3 +3853,10 @@ id: 7232 time: '2024-08-28T07:39:36.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31564 +- author: lunarcomets + changes: + - message: updated AI job icon + type: Tweak + id: 7233 + time: '2024-08-28T08:18:51.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31565 From 4d4a10dae60c869657217056ad6262b43735460c Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:28:24 +0200 Subject: [PATCH 156/223] Update ClothingSpeedModifierSystem.cs (#29994) * TryGetContainerContainer * Math * Changed AddMarkup to AddMarkupOrThrow * Better math * engine version * engine version --- .../Clothing/ClothingSpeedModifierSystem.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs index 21afd4e591d..56758654ed8 100644 --- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs +++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs @@ -1,10 +1,8 @@ -using Content.Shared.Clothing.Components; using Content.Shared.Examine; using Content.Shared.Inventory; using Content.Shared.Item.ItemToggle; using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Movement.Systems; -using Content.Shared.PowerCell; using Content.Shared.Verbs; using Robust.Shared.Containers; using Robust.Shared.GameStates; @@ -73,22 +71,22 @@ private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent var msg = new FormattedMessage(); - if (walkModifierPercentage == sprintModifierPercentage) + if (MathHelper.CloseTo(walkModifierPercentage, sprintModifierPercentage, 0.5f)) { if (walkModifierPercentage < 0.0f) - msg.AddMarkup(Loc.GetString("clothing-speed-increase-equal-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)), ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-increase-equal-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)), ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); else - msg.AddMarkup(Loc.GetString("clothing-speed-decrease-equal-examine", ("walkSpeed", (int) walkModifierPercentage), ("runSpeed", (int) sprintModifierPercentage))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-decrease-equal-examine", ("walkSpeed", (int) walkModifierPercentage), ("runSpeed", (int) sprintModifierPercentage))); } else { if (sprintModifierPercentage < 0.0f) { - msg.AddMarkup(Loc.GetString("clothing-speed-increase-run-examine", ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-increase-run-examine", ("runSpeed", (int) MathF.Abs(sprintModifierPercentage)))); } else if (sprintModifierPercentage > 0.0f) { - msg.AddMarkup(Loc.GetString("clothing-speed-decrease-run-examine", ("runSpeed", (int) sprintModifierPercentage))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-decrease-run-examine", ("runSpeed", (int) sprintModifierPercentage))); } if (walkModifierPercentage != 0.0f && sprintModifierPercentage != 0.0f) { @@ -96,11 +94,11 @@ private void OnClothingVerbExamine(EntityUid uid, ClothingSpeedModifierComponent } if (walkModifierPercentage < 0.0f) { - msg.AddMarkup(Loc.GetString("clothing-speed-increase-walk-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-increase-walk-examine", ("walkSpeed", (int) MathF.Abs(walkModifierPercentage)))); } else if (walkModifierPercentage > 0.0f) { - msg.AddMarkup(Loc.GetString("clothing-speed-decrease-walk-examine", ("walkSpeed", (int) walkModifierPercentage))); + msg.AddMarkupOrThrow(Loc.GetString("clothing-speed-decrease-walk-examine", ("walkSpeed", (int) walkModifierPercentage))); } } From 512d27ca6b452ede774e3921d1baf09f59cc1a2d Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:43:30 +0200 Subject: [PATCH 157/223] Add black suspenders (#29055) * Black suspenders * fix * fix linter --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Catalog/Fills/Crates/service.yml | 3 +- .../Entities/Clothing/Belt/belts.yml | 18 +++++++++--- .../Markers/Spawners/Random/maintenance.yml | 3 +- .../Loadouts/Jobs/Civilian/mime.yml | 11 ++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 7 +++++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../Graphs/clothing/mime_hardsuit.yml | 2 +- .../Recipes/Crafting/Graphs/bots/mimebot.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/mime.yml | 1 - .../suspenders_black.rsi/equipped-BELT.png | Bin 0 -> 345 bytes .../Belt/suspenders_black.rsi/icon.png | Bin 0 -> 557 bytes .../Belt/suspenders_black.rsi/inhand-left.png | Bin 0 -> 425 bytes .../suspenders_black.rsi/inhand-right.png | Bin 0 -> 437 bytes .../Belt/suspenders_black.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-BELT.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 Resources/migration.yml | 3 ++ 21 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/meta.json rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/equipped-BELT.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/icon.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/inhand-left.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/inhand-right.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/meta.json (100%) diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index b7e8616da23..92c3bb9d61e 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -80,6 +80,7 @@ loadout-group-mime-mask = Mime mask loadout-group-mime-jumpsuit = Mime jumpsuit loadout-group-mime-backpack = Mime backpack loadout-group-mime-outerclothing = Mime outer clothing +loadout-group-mime-belt = Mime belt loadout-group-musician-jumpsuit = Musician jumpsuit loadout-group-musician-outerclothing = Musician outer clothing diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index d922056a8bf..6a109fbf8e4 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -91,7 +91,8 @@ - id: ClothingUniformJumpskirtOldDress - id: BikeHorn - id: ClownRecorder - - id: ClothingBeltSuspenders + - id: ClothingBeltSuspendersRed + - id: ClothingBeltSuspendersBlack - type: entity id: CrateServiceCustomSmokable diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 0613ec97269..41e89eef612 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -672,20 +672,30 @@ - type: entity parent: ClothingBeltBase - id: ClothingBeltSuspenders - name: suspenders + id: ClothingBeltSuspendersRed + name: red suspenders description: For holding your pants up. components: - type: Tag tags: - MimeBelt - type: Sprite - sprite: Clothing/Belt/suspenders.rsi + sprite: Clothing/Belt/suspenders_red.rsi state: icon - type: Clothing - sprite: Clothing/Belt/suspenders.rsi + sprite: Clothing/Belt/suspenders_red.rsi quickEquip: true +- type: entity + parent: ClothingBeltSuspendersRed + id: ClothingBeltSuspendersBlack + name: black suspenders + components: + - type: Sprite + sprite: Clothing/Belt/suspenders_black.rsi + - type: Clothing + sprite: Clothing/Belt/suspenders_black.rsi + - type: entity parent: ClothingBeltStorageBase id: ClothingBeltWand diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 58586f32168..8bd9d8ca30d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -39,7 +39,8 @@ - id: ClothingMaskRaven - id: ClothingMaskJackal - id: ClothingMaskBat - - id: ClothingBeltSuspenders + - id: ClothingBeltSuspendersRed + - id: ClothingBeltSuspendersBlack - id: ClothingEyesEyepatch - id: ClothingEyesGlasses - id: ClothingHandsGlovesLatex diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml index 0d137b488b8..f5c78f3c174 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml @@ -62,3 +62,14 @@ id: MimeWintercoat equipment: outerClothing: ClothingOuterWinterMime + +# Belt +- type: loadout + id: MimeSuspendersRed + equipment: + belt: ClothingBeltSuspendersRed + +- type: loadout + id: MimeSuspendersBlack + equipment: + belt: ClothingBeltSuspendersBlack diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index aab58d0ef4b..b2e9ca81cca 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -482,6 +482,13 @@ loadouts: - MimeWintercoat +- type: loadoutGroup + id: MimeBelt + name: loadout-group-mime-belt + loadouts: + - MimeSuspendersRed + - MimeSuspendersBlack + - type: loadoutGroup id: SurvivalMime name: loadout-group-survival-mime diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index b50e49fede7..21ee9aa311f 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -173,6 +173,7 @@ - MimeJumpsuit - MimeBackpack - MimeOuterClothing + - MimeBelt - Glasses - SurvivalMime - Trinkets diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml index 6d3826f701a..73d65b0394a 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml @@ -36,7 +36,7 @@ - tag: MimeBelt name: suspenders icon: - sprite: Clothing/Belt/suspenders.rsi + sprite: Clothing/Belt/suspenders_red.rsi state: icon doAfter: 1 - node: mimeHardsuit diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml index 4fc851a3476..27391898c7b 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml @@ -13,7 +13,7 @@ name: mime edition happy honk meal - tag: MimeBelt icon: - sprite: Clothing/Belt/suspenders.rsi + sprite: Clothing/Belt/suspenders_red.rsi state: icon name: suspenders doAfter: 2 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index bfdf92b5dd5..de8a900f8e9 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -21,7 +21,6 @@ - type: startingGear id: MimeGear equipment: - belt: ClothingBeltSuspenders gloves: ClothingHandsGlovesColorWhite shoes: ClothingShoesColorWhite pocket1: CrayonMime diff --git a/Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..f2ab9dc222a8cbd6378df172a3e173c684915627 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlM zPZ!6KinzD8F7h@jh_oiYy<1I`=hRc_{hnO)t!RZed%oAzrm`1s%(FD%+oxQWH*L%8 zVn37RDY}b4t8O(CV`LFZL|J;L!|k-$h%kHe|jAJm!4lYgZ)SGh?%OCY_V)T6?3H~@ zUJ583C>fE(j&BMS443`M207*__g0{~uyr1t+tC+=Nk*raOOGIu7Ku%%;f4sjr zouF&THI+^#=UzjQgBYVysW`{w)pfEC;v(b_lIuXVTHOk!1GeqcnY>-g{K5htgkwA& zCm0~&PV4o$w_GlhnE8BO=&@y zI-RD-SrWa*x=4tS*Y@?XYvjt5;OO`yUJnoT2@nh?T;xi*b@{%Zc{L@u v{u*Wk6u!Va3e0WAJL0jzlmbcz_U^zRLjeE=$0)9<00000NkvXXu0mjfSqAT{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c9e814f9e041f764145b3a73d1cde54883724c82 GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s7x zPZ!6KinzD8Y>Qe9c-j)xMQuw8*x%Ljykn64QZoA|*V&wjDQRCHpFID%D@pY&;N@L}(mu~&N?{?+9cb3aCt9TAyI98Z*d)v;>HQSGU=VH)} zQ{MFBdBy4Qz--Qjdwbff6oa-Ljo#<6ZhewB!TBY*y+=85yVJDUDyG04t;{i&r*!RGkKmkeP6{dyNZ?z}7WQSR_k zW|#LYE)Q&qmorsF8EkscbHjvTx5U$2*YinLdFKALPYr*4xVitp=g->0?dvw|F$%nz n&%5B0R&40oC$10JIcgXxjY=9H`*D8-hCPF)tDnm{r-UW|H22BR01_s7- zPZ!6KinzD8Hs&=Oh_oiE3tQ)W;M?;*`2*jEgXi2zwRU!`dUh*(hS=);%RLOw?UdhU zd_(bqfCB>~3ntN6ukv9-*4th0GG?i5$(3G~Y4rQv$sC#E$+x#{cwZfH{py*&Tbhoy zn@0HRKJyh_Kg)-~bJb*(>@36lGx@3JjE_t%8Le2Uxn7_sZ5^k<`Ok~r|DKig|J15G zr{;6zGrf428X1&)=hN>ychn9T@XY_uWcrTr)Y?BQw@;2?(%QEzb-|ufb2qaDIn?ws zFmWg}U?=L8Clp_J=sV3uYBSp&r3u>`HvhfLU{%!D`udT}Il(VCCxqL*XA787@nlJ~ zvZeclrCb6PFQ2jfINP*ey!vSVZbq;DjPEO!PQR1cpuOy=wTQ0m*``Yz>!vT@HOOmP zKR>ql&WhqsTqpe_ADeEu&im2LRFIXC Date: Wed, 28 Aug 2024 09:44:37 +0000 Subject: [PATCH 158/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 00ff359de18..50905610d48 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Vermidia - changes: - - message: allies callable by radio in the uplink now have unique icons - type: Tweak - id: 6734 - time: '2024-06-14T21:44:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28954 - author: K-Dynamic changes: - message: Added witch robes and witch hat to the AutoDrobe. @@ -3860,3 +3853,10 @@ id: 7233 time: '2024-08-28T08:18:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31565 +- author: lzk228 + changes: + - message: Added black suspenders for mime. + type: Add + id: 7234 + time: '2024-08-28T09:43:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29055 From d8dbfa92d7f32b05151e0dfefdcc17a07fb7a5b7 Mon Sep 17 00:00:00 2001 From: saintmuntzer <47153094+saintmuntzer@users.noreply.github.com> Date: Wed, 28 Aug 2024 06:27:08 -0500 Subject: [PATCH 159/223] recolor riot helmet (#31530) * recolor riot helmet resolves #31256 match riot helmet to default security helmet * further color tweaks for consistency; update meta.json Tweaked equipped sprites to more closely match the security helmet. --- .../light_riot.rsi/equipped-HELMET-vox.png | Bin 1033 -> 922 bytes .../Helmets/light_riot.rsi/equipped-HELMET.png | Bin 861 -> 778 bytes .../Head/Helmets/light_riot.rsi/icon.png | Bin 370 -> 374 bytes .../Helmets/light_riot.rsi/inhand-left.png | Bin 570 -> 510 bytes .../Helmets/light_riot.rsi/inhand-right.png | Bin 566 -> 488 bytes .../Head/Helmets/light_riot.rsi/meta.json | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png index 1f6b8adcebab1802edc5ea9f3fef09437b0131f7..4d192145eb5fb8dbd9cb8f81e6ec64d7b2194951 100644 GIT binary patch delta 879 zcmV-#1CacQ2$~0wBo78+OGiWiF#s_DF%fm8)R8_Ie>zD-K~#9!?V8U|(_k3Kzuo4> zva$k_2uzZ#p2l4hyhw5vsp-zgx#GzTTQS--%(5BQrENDtRY^l z-VW^0choxdF5eh{BuP*d1?hAeilRW0B=p|8Q`XL|sSf~>BpD`@-kZ^Powgz0?1Qu~ zLzX0rzjzs~TuKYGbI*$H?4YO*0G_6%vZMh(f6e8fC~D36r=9^mU)6#84)+muLOaV8 z$Ia_H)Lag-EE|`a%OS7pru0v3Kzj36wd4Wd8USz(4vL~yYgZRa$Ia_H4z#>+6_YcpKO6-}_oDUznZi`!W9k?6~F zFExSwOcMk_5ClOG1VIo4K@bE%{6kneL@aZl`S~kT%bEkTRyL2EBU;yCpc)%S_s3$Y8%L1Q_ z3`Y}*+5!|skv*MxQ#Q_2WF%T}RXGn;Eqof6N~O3n-21uCbF2AKiZ(sp4zM}(UN{VB)#}j z4^dLRM(;tPP|#mdVm;N1FQqS0;)=B)f=Ee->#xLQ5y?zbl7DT#r#9$C6iT$UhnUeZP{v_w+XHPw{b?)-de0zXz(s2uq;Vm+RV z0#sLT<9{TD|83Cf0OwT|6{0E-5CsJVWXsFTWE0V-n3$Tf7QrO}Z28v|AxoCFFsiN` z!xYBfGeIW&+kX~7O}+A?$Hd3sVKFv3Du#!Ks6_q1@z9_9*`NvcC`~9+YgIFv^ z?*e~uvFPpF{TU>q08W@l$7O(hR>{cBB5tgqG8RdK565|%-aY!->>-}tWU zrO3_A&FFuDeI=#wJ-$Lp+W59dTh&D*v`Y@XCx1%qhV$<;JEJPVl zLqmhe$;lB#MMYv^VL|>V#QXk!DhCD!U6G(R7=I+mPuA5@9Vnk`YilAL4m%dyQGnQl zz(Ixb%1RQz$dcTro12}bP0MseK=RlPE-5Xgy4UNaQUL*`Cnp^pjsR&1fS{BBg98Ip zZpIA(rkb+xy>dGt6f0nXmN6~ESW!!+)P z?tiYfp3Y9X4uwK#37~aEW;00sNX=ogm7i;9G6jIZk$|jfW0iaY4}2-V>H#>#kpOt% zKylzL+)Ebeeue6mWSxqTB6$#pFXb1|)3@4|w}Dp|xRYlJ}uUOgx>yy;H!CV~h52k*JBpe?P&E>lsEzN6~d1*L7*P+W;z#A`CkINZ8=BbJqa;puy{}nwrwoS;>OZlx^K%UOkbV^z;)f8?0MN9d=pOY(s2>?9L>q*}8 zJf_p>3$M-~lb=qf{bT{UlV@^jg3P?3BE19P=X$)Z>v*2W(cxjNWA^LuaZmf|%uLXy ze)PRMT>Y{Oz`aKgxp{xt^pC$RzA(4Tf8|J$zp`?R$IDNGSfAe&&G)Zf1HlfFcnWZ^ zUkd^{ZP%Yn74g!Xwj1>0V84bxJR_R}cK52<>4^=1uIuQ!PAQ+KJNdobhsZKM_uHzJ z&jR+@U!7vPE7>4>+;s_yx5JCtcgb+dqA^uH20IG&Sk(z`N QSO5S307*qoM6N<$g2C--761SM delta 838 zcmV-M1G)T)2HggbB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pH@<~KNRCr$Pn$K$!K@`Vldq`+hFoz)ZP$V8o>Mckk!9b8A8ocyU zy?7A+3Qy+dUm+g6*j^%7(?g0$iA1Bdhav_8O+zoS2NC)3eHLJFaZeOQQt)pX3TOT>?<#XVF3N`^M)c2{Dt{>ULV#+ zKm5EQfm8wzWPkMf4feiV=C+;BTlJ;XE$&x|7{6Yt@lpgY+HUlvw#?;dR9}c+Wy`l$ z(`J`I+ge+H___3&?R?n%b4-tp0Q6CYLLuI^(`+_*xwAV$e+*JPzySy<-TH##cAFc5 z-9I?63~k|)#ft<0O`Gv(na6Pa_1mB{0oeM-efnJvE9WHIB%Ga z?O)n>!Tl=va@5ceB!V`(I6MhPKm2Cb#K=8hz6N`}p4ssWzu*5)UV~mEod8$-#|iN2 zH{irF^$8#df*=TjAP9mW2!bF8V!CkkhxPFNyg>F|&Mo4O(2m=01f(B8@QFl%`FuVW z3nJ)ZgOv`*{f3gKxLn{ML5V>Uagl zh6c0*B6#5D8v$4M0zwcaRvq?nZ_m1-RtYqqC3Nj`af8%$5j)`A+#D;H%e*hSvci^b zrmXJ;o@Sq(>*bA4>xsBYyw}VoOIv05JeD05K7DrPKfb010qNS#tmYE+YT{E+YYWr9XB6 z009(vGT@bWsU^NcYZ)rofdt&xeIsez+9 zwbs2}Z7_@n7{-IzNaI&rAo?+N-hk-GbWmR?iUMU>)_Hvg03c1%iypm&W(-ro?=k0` z=8NTYzF1B<=T#)7B+fZC<7Qp={xtco8`$l)o^HJ6{O#j&W-^G$)c${(Z$aZ=JCDgb3FS0E2;BYt`kHQ%ceR30hg=*XBDk0X4owN->n140Q%j13X=gk`{NfI=vt46CE00UqE z3;=-kZ<2^emhDGTWYrEpM3RVN}bVi!1n_Awtt0f+ep(C0PueJ z$WOjrZP31M9p!XxZgUrWFOVunN*yTD7Ly;JC*gRp3<03m?}Bp<&N+JhE&yP>SmyEB zd}{e#AkP&C6j8SzOU~Bc<5`iPq|*n=YpB~qe^uj?@Uj4&9!BARd{dP6AOZl_b+x8k q9LL)IQwg9BT~-em00UqE>d+TcKzU0Wbc#1pWh%Bo78+OGiWiF#s_DF%fm8)R8_If1XK1K~#9!?b^R;!cY_j@Gl}H zc?GA|?Pj#ALP5-EDJ5H9q4p6>AEAz&yXac!(T5fKp)5fKp)QErC^RqZLIrD}bDFICs*@Qp@8|2D{9YMD@y8s2s7 zt>3w>f1T+NcGW8E0l2P>JOVO52VDlOYGmJVIHrv0BRq08A%iBX6#(;I=OT>b7k}nn%d;+hYH>SF2xl-aMIrJWm3tJOUBXzx58mAitk=@2pG&q+i3l4-hvpBLSD=`iRCKF?fE1QcWi#~!F zeF1#|7Z(|kIJrqMM8k@Ngcl%=hOkiin_C1-o1XU6#Q1-SX@7f3PS0(RUCuE?L_|bH zL_|bH(G>~>XS-N*>}4#7WlvpNaT9}ttJUg{Bv&^QhF`2Cr0p>lB)p!@+N)()mpp`^ zSV>TM07!V}@W{M&I!mRB^Wy%2`+HbHvFxd;ls(3R+a@SC4b*VDiz>C!l_w`nM}s6M5h@mh*||~mC9zXQn|28^LO`jU$03kz%SNG zx#X>>QK^8>@z}JR57_Ma>=FrYU>%!(d2G7BhZPhHM{R2VQ}}vMCKG%04JF*`^+fma zi!~e$)$%1GA|fIpA|fIpBBH+q{ez^Mrm;xc;Zflp8h`T$s?AZ4bS6LwvHe=^(tE2u z0F)#Ca=DynCO|4^hCn)xpxSFYK0R}j`RKo!(P$L9BP@lDYRx04Re-no-=r}^p!SAt zpIc~WyXse$wWKRRYaT)K8{qcwvHAXBAesq~TAU$hH5z#Ek>?TA-cUZDpTC7DGXYZg j(re8l5E>EvQ^tG&pm*WaI>phK00000NkvXXu0mjf_%!#g diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png index cd3dc7f55754487223ef403c19298ff7e27bb44c..42af25fec6ac880b5439f1508d913c6ab2b67034 100644 GIT binary patch delta 442 zcmV;r0Y(0{1n2{hBo78+OGiWiF#s_DF%fm8)R8_Ie~3v$K~#9!?b<<3!ax`W;5SW^ zp;vIF?8=g@HZd_}r^c8bL$81yLC)X?*dcL+JEONi4}b|xFq3W^SCWct!$4))>5P+`H#$UH)x9G!@D7r~q3IKQ-4!c!;aMPMIcYsm}ULVJp^anqa?E%n} z{-FCZet=R*WgB2xvncu-6dCQ&U%=b@R8+MAf6eCKU;C=pOhiOPL_|bHL_|bX2X)B| zl*VRe;J?;zObW1-87NwNXAQ8K8Sp#_*=V5U`+7A3vn|);X4{#8cGv*`D3$24-t{?~ z4z!sWI6ONo?Z~;N18imn(re%M?rwLw1F|v$&!bUy7nuR262x(g-u2aT?Xu=JI!87$ kAOovwPp5p}Pein}Zx=7P(D_|1<^TWy07*qoM6N<$f+z6KZ~y=R delta 541 zcmV+&0^pG%Sl8*RCr$P+P_c2Koke?gM|=B!{W$-tkpOe+>{vOjEjpS3;qL| zYV`kb7B(af{+MVmL}f)n(*MGc4qADat5Q7RY71@S_mdFrT7RzZara=kV*mgE00000 z00469nr7$od0TWNi}Dmr?$0^P2A0d^SWLpGSve=gy9*6iN~cB7jjqRS5~k%Wod6o3 z6?a|bMD6Exn{Djv^ZQZdHRptQccFo~%>qj#-M16N?&pWidM$&!bUM0kqt$?ehp^GM&nX|M4-UkEr zblYGL*Hvc%R)#No*wHzfD#Dn%m6(* zlgaRSqw#~FykACv!#XoSv1tO9bE~}ndVd$#UY~LWj0^M3z}ikRu%DdrEIJhs#+d=9 z0!k;R-?5Lj3g@Efi*g0X&I}m!y1s}r1N7`(zt5_d7o&Usf$+3qRCZyV85oakn&w>N f0Ra31j23+XunODMV*@>N00000NkvXXu0mjfe9iWv diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json index 292dc9c9939..3352f48a8a7 100644 --- a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.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/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14; colors tweaked by saintmuntzer", "size": { "x": 32, "y": 32 From 460e58734564b280b706ae3ad97022b9f775d0da Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 11:28:15 +0000 Subject: [PATCH 160/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 50905610d48..0c5e75c5bf9 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: K-Dynamic - changes: - - message: Added witch robes and witch hat to the AutoDrobe. - type: Add - id: 6735 - time: '2024-06-15T02:19:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28965 - author: Plykiya changes: - message: You can no longer insert duplicates of the same module into a cyborg. @@ -3860,3 +3853,10 @@ id: 7234 time: '2024-08-28T09:43:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29055 +- author: saintmuntzer + changes: + - message: Riot helmet now matches security helmet colors. + type: Fix + id: 7235 + time: '2024-08-28T11:27:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31530 From 91eb0c2e29f8f592f7de51b8ce4b3b5361602e62 Mon Sep 17 00:00:00 2001 From: coolboy911 <85909253+coolboy911@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:36:31 +0300 Subject: [PATCH 161/223] added wide-spectrum anomaly locator to anomaly cyborg module (#31427) added wide-spectrum anomaly locator to anomaly borg module --- .../Entities/Objects/Specific/Robotics/borg_modules.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index a49f08e28f1..062e261dc57 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -411,6 +411,7 @@ items: - AnomalyScanner - AnomalyLocatorUnpowered + - AnomalyLocatorWideUnpowered - RemoteSignaller - Multitool From 24e9dc688cddf6ac02aaac990f22fe59f6c34284 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 12:37:39 +0000 Subject: [PATCH 162/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0c5e75c5bf9..41f74afac54 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: You can no longer insert duplicates of the same module into a cyborg. - type: Tweak - id: 6736 - time: '2024-06-15T02:58:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28943 - author: Vermidia changes: - message: Nukie planet now has an improved Donk co. microwave, which cooks twice @@ -3860,3 +3853,10 @@ id: 7235 time: '2024-08-28T11:27:09.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31530 +- author: coolboy911 + changes: + - message: wide-spectrum anomaly locator is now included in cyborg's anomaly module + type: Add + id: 7236 + time: '2024-08-28T12:36:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31427 From 8d388974ad703ee0d864ca2f4589ae386a606af7 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:08:35 +0300 Subject: [PATCH 163/223] Add Robust.Xaml.csproj to the solution (#31573) --- SpaceStation14.sln | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/SpaceStation14.sln b/SpaceStation14.sln index bcd013b5981..0e00fe5b12f 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -133,6 +133,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roslyn", "Roslyn", "{7844DA RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props = RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Xaml", "RobustToolbox\Robust.Xaml\Robust.Xaml.csproj", "{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -444,6 +446,14 @@ Global {83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Release|Any CPU.Build.0 = Release|Any CPU {83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.ActiveCfg = Tools|Any CPU {83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.Build.0 = Tools|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.Build.0 = Release|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.ActiveCfg = Debug|Any CPU + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -476,6 +486,7 @@ Global {07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} {83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A} + {5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A} From 6808558df61f28930c31adfba028214e69fdaa7d Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:08:55 +0000 Subject: [PATCH 164/223] add construction for carp statue (#31261) * separate eyes and teeth * make it buildable and make fixture less abusable * norot --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Entities/Structures/Specific/xeno.yml | 48 +++++++++++++- .../Graphs/structures/decoration.yml | 59 ++++++++++++++++++ .../Recipes/Construction/structures.yml | 17 +++++ .../Specific/carp_statue.rsi/eyes.png | Bin 0 -> 200 bytes .../carp_statue.rsi/eyes_unshaded.png | Bin 0 -> 201 bytes .../Specific/carp_statue.rsi/icon.png | Bin 0 -> 819 bytes .../Specific/carp_statue.rsi/meta.json | 11 +++- .../Specific/carp_statue.rsi/statue.png | Bin 1204 -> 792 bytes .../carp_statue.rsi/teeth_unshaded.png | Bin 0 -> 178 bytes .../Specific/carp_statue.rsi/unshaded.png | Bin 633 -> 0 bytes 10 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png create mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/eyes_unshaded.png create mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png create mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/teeth_unshaded.png delete mode 100644 Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png diff --git a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml index 2f58e5caea9..17920565ef3 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml @@ -57,8 +57,54 @@ description: A statue of one of the brave carp that got us where we are today. Made with real teeth! components: - type: Sprite + noRot: true sprite: Structures/Specific/carp_statue.rsi layers: - state: statue - - state: unshaded + - state: eyes + - state: eyes_unshaded shader: unshaded + - state: teeth_unshaded + shader: unshaded + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.35,-0.35,0.35,0.35" + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - type: Construction + graph: CarpStatue + node: statue + +- type: entity + parent: CarpStatue + id: CarpStatueEmpty + suffix: Empty + description: A lump of precious metals, soon to be a brilliant carp statue. + components: + - type: Sprite + layers: + - state: statue + - type: Construction + node: empty + +- type: entity + parent: CarpStatue + id: CarpStatueEyes + suffix: Eyes + description: A statue of one of the brave carp that got us where we are today. This one needs a dentist... + components: + - type: Sprite + layers: + - state: statue + - state: eyes + - state: eyes_unshaded + shader: unshaded + - type: Construction + node: eyes diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml index 5c67d3936e4..4810a34e042 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml @@ -27,3 +27,62 @@ doAfter: 5 - tool: Welding doAfter: 5 + +- type: constructionGraph + id: CarpStatue + start: start + graph: + - node: start + edges: + - to: empty + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Silver + amount: 15 + doAfter: 7 + - node: empty + entity: CarpStatueEmpty + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: IngotSilver1 + amount: 15 + - !type:DeleteEntity {} + steps: + - tool: Welding + doAfter: 5 + - to: eyes + steps: + - material: Diamond + amount: 2 + doAfter: 2 + - node: eyes + entity: CarpStatueEyes + edges: + - to: empty + completed: + - !type:SpawnPrototype + prototype: MaterialDiamond1 + amount: 2 + steps: + - tool: Prying + doAfter: 2 + - to: statue + steps: + - material: SpaceCarpTooth + amount: 5 + doAfter: 3 + - node: statue + entity: CarpStatue + edges: + - to: eyes + completed: + - !type:SpawnPrototype + prototype: MaterialToothSpaceCarp1 + amount: 5 + steps: + - tool: Prying + doAfter: 5 diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index a273f667405..5278c1b45e0 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -1644,6 +1644,23 @@ conditions: - !type:TileNotBlocked +- type: construction + name: carp statue + id: CarpStatue + graph: CarpStatue + startNode: start + targetNode: statue + category: construction-category-structures + placementMode: SnapgridCenter + description: A statue of one of the brave carp that got us where we are today. Made with real teeth! + objectType: Structure + canBuildInImpassable: false + icon: + sprite: Structures/Specific/carp_statue.rsi + state: icon + conditions: + - !type:TileNotBlocked + - type: construction name: bananium clown statue id: BananiumClownStatue diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc6ffccf144b6814a40d96082a47ebb3293d77a GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6s+=e zaSVw#oSY!Rx;R0j@$_d&Nx!*PU-w&Gd}qJOqJv+EeWSCJlZVmd&Jg#UIdM(lHD_m; zZuw|yHh(d5ga668@cop-#z17DPl9QXmc|GKo q_obbc zy7fbD_Ibma!$(}ESZ#7*n123bsJk#j*MCl7wF_#z4LoY5je%Dg-{0GtykX=5Z`3N+wyW7K3|P_NcpCM8mdKI;Vst0OwvmPyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c5d6bd20e5a0b4075e8f81328c62c3fa2276cf38 GIT binary patch literal 819 zcmV-31I+x1P)7d(Z)duI>ioRz$L9X*r7v4gE&;T zMyKGW-AX}mwe2L?YB%jzH@m5WkSd4-YQZ=tR49_Prp^82?mpk|i#aR^Cb2h&eZ%GD zeZRYV-sidZ`vH#Z$o@5}R4Qz?IKe6}o`;u+DL=^j)P5gWEzbyFt9|@!KC%KhLk^P3 z6=0eMrlw0+DbHc5^gxVfvSai=!wRK`7#|;(dVR0lFY_+=t*aMB%sr1`H3m|m=Sr6z z%`*-TYfHpyYir?HKA#uf5(TDlsT%?hG18wrbF|&*~^8#XF*>DY}Pge zLte=GdKLApdIy+dp8vG*7VuipOvCN3UyvL*0lVG8hmH3bJ$s%S&cvuWBH|#RzVjXI z+io-pNRo`eZ6OxZplAkk!^ChR3D5VS=_Xp%K6G7!B+C)5go=i}<}Tt$!gXxAT5xO& zzH5O6K+EyS2hk{?>N+vi1w)CeO+cz{hcLUD~j+jEp~vpEO+vX8lz?mqE&#KV>=;Z?mbe3GpBV3acay+3W&!Ou&oyS zb{lOl@*V6uMwF0xnyf|#8 z(kY}fV`1L42$+^;RU5*|Gv|;xl@a+@s|#Y2;%A42r!S>L`2@wn7)z%{U=Ewm;;Bvn xzwSBhy2!ix1iWWqtKPul)%C%e;>i9x`vJu_XG113jP?Kk002ovPDHLkV1jg6g1rC$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json index 5c8d12c6c62..fb1ed6a3ef3 100644 --- a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json +++ b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json @@ -11,7 +11,16 @@ "name": "statue" }, { - "name": "unshaded" + "name": "icon" + }, + { + "name": "eyes" + }, + { + "name": "eyes_unshaded" + }, + { + "name": "teeth_unshaded" } ] } diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png index 203006754073fdbdcfecc65052a1e8b932839d2c..4dbbc1b6dbb7ec237f0e67d81bb2ffbd2c2c95d9 100644 GIT binary patch delta 751 zcmVo; zJz3+Ky}S43?d;wFC*x%N(NmVTdE_5t7b;eTRCfQ=*ZW@|yM z0*9G10oQ>LArles*k=M_R9XqWOy&cBeG2}fx5ja4r7yv|-8HCP0x7%LqRflY>-CB- zDIv)vkH3S9&p8#6)&tt&O%{$XMF&ywxfa1RYx)gz9FF~u-2Et(h$Y2CF98G<> zGzbswQ$c`9w3k?kf`7;e9`O)DurD)jUF(#tfl>rE2OFHBB+~Eu7;YT^lP}{RHr@b9 zpr!`4KYv1f?hL|7fcG2kFn{qf$?jsFww?5|jCNicVLy!3D4=ONvN%AcV!^N+*p7?Y zS{+H6z_MKgVjs3`LDO}G+t9GEH{L}Rb;MCfzW`Avkj4Ue27d%mLN-&QfN9&5sm&Q` zQf&emv-W@;6XBMPHw#?mIFh|HYMAyla_l@O>_YY0VvbTYvNIoSl6Ww8&k_0t|HW3d{_ zc7aX%URJ%X%YVlbj!9sLj^RAlU>H;%siLo;-1ic|an92&$QdxBOP7}}flD_-$8SjP zu5|J%?KT1BeB#M9mjn)pNNbwrbl!4jaO?KHW4-&A3-_`=EFZ$;Qq>WZe+#0hKEM;d*2re0;Z$cv}SPj z!XJy%H h`@dHdC*!{x-vHn!S>V|-Poe+-002ovPDHLkV1gw$Wy1gf delta 1167 zcmV;A1aSM92DAx~BYy#KX+uL$X=7sm04R}lk-ba9P!z>azo=-XgMuOs8LBw6APOQ* zT8A!0O08hkC3#I+AxXnaiWFDD#i8IJy7)EtALuH$DhPrih`71?wMdEgHH8*wUwFAc z&U@!_a{~C&Iy3CxJYbj(&!&>nYJN=$zaxYp1R-HgX12AE$$zBLb^ScTC+b5&^y+@E z+G9s_?A#6 z52Lq*DmXccD1VVRPHKg^s#G=7ReE$(MehIew6*CeuX`j3gkD|ua|{UY1NEBg{+_yS z{R{}a0M};AU#6U9ze%sPwAe8a-2pCdTAFeIT^g_D3l$U#O6Y!@abQ7%oRF!>;uQ(Z0# zCNMHGB6Yj2+$-|^;5RN`;J(npPNxTdo7atWo$12dW1l58eyHuD6f|ut@G`=@4j08A| z>=;#l74x&xWYzJkJWH&YYzyR>(R|Oxu%`sp)>j#!NMvQDirPl46PRq_|G4@FaGT*A z!_6` zZrg>Xe;a6;yU=wFk}QXK6Dk^Z8rz5=0mrteHDOyO+Kvg|1Ddu=+6#vPRo4lr&Il#J zHU(1kDBFGUW32bbLt#K5b8MS++wCCTsefhUf{o6&1()W8Qv-xdRut9|E%FO;S?>51 zHA2Pch0A~t+p+`1Lc7F>Ku-4%VpN!+BoK?me_@$Tv|BB-;FEUYX&T!goj9H(W;A9a zv{RtdxffM0%i=YceIjtwh{E?JC<@g_JER{HaqdNcX!JCl0-pnV^vL3oMPLaBk*?ml zUCjIEvsnt{^NlC=TqLlch|sF42IHF1N1x<7U9J7c4O^Id2c*n#>t&S&) hD+eozBl+*-JAip=Z~LZf8~^|S07*qo1w^hwV1gnBDtl}UpHU7zd0W4^?}W%Tv+ksb#A-0U-VA=)Lh59`f9yv-`WGuYEo~A3J3}cUVN{2 Xuit!ag_uPK&^`uFS3j3^P6azo=-XgMuOs8LBw6APOQ*T8A!0O08hkC3#I+AxXnaiWFDD#i8IJ zy7)EtALuH$DhPrih`71?wMdEgHH8*wUwFAc&U@!_a{~C&Iy3CxJYbj(&!&>nYJN=$ zzaxYp1R-HgX12AE$)wSB{XD`a>O(^G>VB`|>MN)=1AINiGtA-+F-?Q?mSYLtBOYWW zxj=kE9OpD3@vYDmkKY6rJ^m8RbJ<0}FM3MFHdfl0mAFAXK^!ym3Tw_Iz9gcWE6Y?z zXph217AYht3k4NyLWhF{Rg*I7?3--(mQW@Sqql`BI5~+n(O|ax^Ddp2)qE-X3JluoMyjCueG$;F%aDWE^k_z zasXWI0>jUi%;km@pzYT*;Nt@5&jSPZK<~PjRr4I@Pe5*)e$gFpcm#~o{piLYJI!b% z$6=v_00009a7bBm001r{001r{0eGc9b^rhXuSrBfR9M69kiiYZAPhwf>Jr(7F%ajh zkpZGy*?>E9aN^n_a$^Ks{j{j`7Nn+9B|ixne=NRjB0=~k?m8)bIdj3ri_vj3Jo73>we#Grr96jygdQ1VIo4K^Wly33XH! TQE4wl00000NkvXXu0mjf;&Bs} From 386733e99c714a73c7935bd41b451f1d5eca93e0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 13:10:02 +0000 Subject: [PATCH 165/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 41f74afac54..1f4e0c412af 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,15 +1,4 @@ Entries: -- author: Vermidia - changes: - - message: Nukie planet now has an improved Donk co. microwave, which cooks twice - as fast but is more likely to explode. It can't handle id cards without exploding. - type: Add - - message: Made microwave explosions destroy the machine board and spit out the - machine parts. - type: Tweak - id: 6737 - time: '2024-06-15T03:00:00.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28951 - author: robertGN changes: - message: Using a welder on vending machines now correctly repairs the vending @@ -3860,3 +3849,10 @@ id: 7236 time: '2024-08-28T12:36:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31427 +- author: deltanedas + changes: + - message: You can now build carp statues with luxury materials. + type: Add + id: 7237 + time: '2024-08-28T13:08:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31261 From f5a8be8ad3da20b2d7b88a898ed139dfdf677963 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:10:18 +0200 Subject: [PATCH 166/223] fix spelling error silicon jobs (#31581) Update department.ftl --- Resources/Locale/en-US/job/department.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index 2295a9ba9d3..51a0345bc69 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -5,5 +5,5 @@ department-Engineering = Engineering department-Medical = Medical department-Security = Security department-Science = Science -department-Silicon = Silicons +department-Silicon = Silicon department-Specific = Station specific From c2ccf2bc0f2e53b2d6edf3f2b8131a2b1a051b84 Mon Sep 17 00:00:00 2001 From: PopGamer46 Date: Wed, 28 Aug 2024 15:22:21 +0200 Subject: [PATCH 167/223] Fixes shuttles not being able to FTL onto/near station (#31569) fixes FTL --- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index e6704457450..8da7aaa641e 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -118,7 +118,7 @@ private void OnStationPostInit(ref StationPostInitEvent ev) continue; } - TryAddFTLDestination(gridXform.MapID, true, out _); + TryAddFTLDestination(gridXform.MapID, true, false, false, out _); } } From d088c8a015cedfef03f76910c6c8b9fa952fbc9a Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 13:23:28 +0000 Subject: [PATCH 168/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1f4e0c412af..85e38de7ed7 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: robertGN - changes: - - message: Using a welder on vending machines now correctly repairs the vending - machine. - type: Fix - id: 6738 - time: '2024-06-15T03:13:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28920 - author: Brandon-Huu changes: - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant @@ -3856,3 +3848,10 @@ id: 7237 time: '2024-08-28T13:08:55.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31261 +- author: PopGamer46 + changes: + - message: Fixed shuttles not being able to FTL onto the station + type: Fix + id: 7238 + time: '2024-08-28T13:22:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31569 From 0f2c42f7642636364039527b5933f08e8caf0d53 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:31:47 -0400 Subject: [PATCH 169/223] Fix defibs draining battery when turned off (#31593) --- Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index 2d06ed0f1dc..7b5ba23fe33 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -47,6 +47,7 @@ - type: GuideHelp guides: - Medical Doctor + - type: ToggleCellDraw - type: entity id: Defibrillator From daba76d4fe7403a8872c42d725c7e2cc541da9a0 Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:31:56 +0100 Subject: [PATCH 170/223] Bagel - LV cable wasn't connected (#31591) fixes a missing wire --- Resources/Maps/bagel.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index b8666fdb3cd..ea24bc48ee5 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -32183,6 +32183,11 @@ entities: - type: Transform pos: -54.5,16.5 parent: 60 + - uid: 24815 + components: + - type: Transform + pos: 0.5,-53.5 + parent: 60 - proto: CableApcStack entities: - uid: 9517 From f7f255a25907b91d67398b6548a02d46a7c95c55 Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:32:15 +0100 Subject: [PATCH 171/223] Marathon - Names a singular camera (#31590) Fixes unnamed camera --- Resources/Maps/marathon.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 80f9ba58b92..974e6e00ba2 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -11015,7 +11015,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -25025.113 + secondsUntilStateChange: -25052.139 state: Opening - type: DeviceLinkSource lastSignals: @@ -118879,6 +118879,11 @@ entities: rot: 3.141592653589793 rad pos: -17.5,-0.5 parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Sec Med Office - uid: 21283 components: - type: Transform From 693fc755395997146d8f9d4ad8e6eb065a211766 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 17:32:55 +0000 Subject: [PATCH 172/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 85e38de7ed7..c7899518ef2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Brandon-Huu - changes: - - message: Removed the six Handheld GPS devices from the syndicate deathrattle implant - box. - type: Remove - id: 6739 - time: '2024-06-15T03:23:42.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28999 - author: EmoGarbage404 changes: - message: Revamped meteors. Meteors now crash through several walls before exploding. @@ -3855,3 +3847,10 @@ id: 7238 time: '2024-08-28T13:22:21.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31569 +- author: themias + changes: + - message: Defibs batteries no longer drain when switched off + type: Fix + id: 7239 + time: '2024-08-28T17:31:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31593 From b2edae89d2c3e52abdd1479240ddd340b622a7df Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:35:57 +0100 Subject: [PATCH 173/223] Reach - Scientist added to map's prototype (#31567) Added scientist to map prototype --- Resources/Prototypes/Maps/reach.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Maps/reach.yml b/Resources/Prototypes/Maps/reach.yml index a0d6752c1fb..0824e317758 100644 --- a/Resources/Prototypes/Maps/reach.yml +++ b/Resources/Prototypes/Maps/reach.yml @@ -30,5 +30,6 @@ Musician: [ 1, 1 ] AtmosphericTechnician: [ 1, 1 ] StationEngineer: [ 1, 2 ] + Scientist: [ 1, 1 ] Passenger: [ -1, -1 ] From 98680ce0f262e83a488481ba664d23d72e9fefdd Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Aug 2024 21:12:09 +0200 Subject: [PATCH 174/223] Change my copyright (#31599) --- Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json | 2 +- .../Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json | 2 +- Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json | 2 +- .../Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json | 2 +- .../Clothing/Head/Welding/flame_welding_mask.rsi/meta.json | 2 +- .../Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json | 2 +- .../Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json | 2 +- .../Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json | 2 +- .../Objects/Specific/Library/Equipment/books_bag.rsi/meta.json | 2 +- .../Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json index 9171e1f8822..48b2471e0cc 100644 --- a/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by лазік#7305", + "copyright": "Made by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json index 36eed5db120..2b8717faa2f 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.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/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json index 5539c0fb7af..bd9fd6d24af 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/brown.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/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by лазік#7305. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi and modified by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by lzk228(discord 455630609641897984). equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi and modified by Flareguy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json index e5a67c14e41..e9b30b54371 100644 --- a/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/blue_flame_welding_mask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, icon by лазік#7305. equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", + "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json index 07d399a7b1e..b486fbbc86c 100644 --- a/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/flame_welding_mask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and up-equipped-HELMET modified by Flareguy, icon by лазік#7305. equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", + "copyright": "Taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and up-equipped-HELMET modified by Flareguy, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from vox welding helmet state", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json index 0f5f121242a..2a9b8dfba70 100644 --- a/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/paintedwelding.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/blob/2a0d963d5bf68bd8ddf6fba6f60479bec172b51d/icons/inventory/head/mob.dmi, icon by лазік#7305. equipped-HELMET-vox state modified by Flareguy from 'welding' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", + "copyright": "Taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/blob/2a0d963d5bf68bd8ddf6fba6f60479bec172b51d/icons/inventory/head/mob.dmi, icon by lzk228(discord 455630609641897984). equipped-HELMET-vox state modified by Flareguy from 'welding' state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json index 3ff460a2c7a..8936db03da7 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305", + "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json index 9b7af45aa71..519a0332d06 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.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/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhand sprites by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, inhand sprites by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json index e56c72ad43b..017d14881f3 100644 --- a/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Remade from plant bag by discord user \"Red Horse#9950\", inhand sprites by лазік#7305", + "copyright": "Remade from plant bag by discord user \"Red Horse#9950\", inhand sprites by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json index 8d6202dde40..39303046bb7 100644 --- a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Homegrown by @ninruB#7795, inhand sprites by лазік#7305", + "copyright": "Homegrown by @ninruB#7795, inhand sprites by lzk228(discord 455630609641897984)", "size": { "x": 32, "y": 32 From 6398f5bd49b34dfc569ffa17d6c573d6322316af Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Aug 2024 21:26:34 +0200 Subject: [PATCH 175/223] Remove random cyrillic letters (#31600) --- .../CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml | 2 +- Content.Server/Anomaly/AnomalySynchronizerSystem.cs | 4 ++-- Resources/Locale/en-US/paper/story-generation.ftl | 2 +- Resources/Locale/en-US/store/uplink-catalog.ftl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml index bd5879408ef..fd5a7bb1617 100644 --- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml +++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml @@ -26,7 +26,7 @@ Text="{Loc 'news-read-ui-next-text'}" ToolTip="{Loc 'news-read-ui-next-tooltip'}"/> - + ent, AnomalyComponent anomaly) + private void DisconnectFromAnomaly(Entity ent, AnomalyComponent anomaly) { if (ent.Comp.ConnectedAnomaly == null) return; diff --git a/Resources/Locale/en-US/paper/story-generation.ftl b/Resources/Locale/en-US/paper/story-generation.ftl index 98a9c9d0360..c9bead45ca2 100644 --- a/Resources/Locale/en-US/paper/story-generation.ftl +++ b/Resources/Locale/en-US/paper/story-generation.ftl @@ -109,7 +109,7 @@ story-gen-book-character-trait11 = poor story-gen-book-character-trait12 = popular story-gen-book-character-trait13 = absent-minded story-gen-book-character-trait14 = stern -story-gen-book-character-trait15 = сharismatic +story-gen-book-character-trait15 = charismatic story-gen-book-character-trait16 = stoic story-gen-book-character-trait17 = cute story-gen-book-character-trait18 = dwarven diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 27ecdc98f03..b84202a2910 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -438,7 +438,7 @@ uplink-barber-scissors-name = Barber Scissors uplink-barber-scissors-desc = A good tool to give your fellow agent a nice haircut, unless you want to give it to yourself. uplink-backpack-syndicate-name = Syndicate backpack -uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for holding various traitor goods +uplink-backpack-syndicate-desc = Lightweight explosion-proof a backpack for holding various traitor goods uplink-combat-bakery-name = Combat Bakery Kit -uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence. \ No newline at end of file +uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence. From af35c2b773f64e2aa9733dc51ae87a8a2add8247 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:51:22 -0600 Subject: [PATCH 176/223] escape pod tiny fan (#31601) * escape pod tiny fan * oop --- Resources/Maps/Shuttles/escape_pod_small.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Maps/Shuttles/escape_pod_small.yml b/Resources/Maps/Shuttles/escape_pod_small.yml index 4746f0d2978..d0670f39917 100644 --- a/Resources/Maps/Shuttles/escape_pod_small.yml +++ b/Resources/Maps/Shuttles/escape_pod_small.yml @@ -121,7 +121,7 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,0.5 parent: 29 -- proto: AtmosDeviceFanDirectional +- proto: AtmosDeviceFanTiny entities: - uid: 9 components: From bea72106b74c46db46f594466d8816fdd6071d80 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:05:04 -0400 Subject: [PATCH 177/223] Fix nuke disk erroneously being marked 'left behind' (#31602) Fix erroneous 'disk left behind' objective --- Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs index 5f49557bed8..57239ee8c15 100644 --- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs @@ -215,9 +215,10 @@ private void OnRoundEnd(Entity ent) var diskAtCentCom = false; var diskQuery = AllEntityQuery(); - while (diskQuery.MoveNext(out _, out var transform)) + while (diskQuery.MoveNext(out var diskUid, out _, out var transform)) { diskAtCentCom = transform.MapUid != null && centcomms.Contains(transform.MapUid.Value); + diskAtCentCom |= _emergency.IsTargetEscaping(diskUid); // TODO: The target station should be stored, and the nuke disk should store its original station. // This is fine for now, because we can assume a single station in base SS14. From a4d58a55d20bac34a59bb1bef9288a69ea247111 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 28 Aug 2024 20:06:12 +0000 Subject: [PATCH 178/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c7899518ef2..2e1abaf4178 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,17 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Revamped meteors. Meteors now crash through several walls before exploding. - They can still come in a weaker "space dust" form where they don't break through - structures. - type: Add - - message: Meteor and space dust events now occur on regular intervals during a - round rather than being tied to station events. Expect to see more of them during - a round. - type: Add - id: 6740 - time: '2024-06-15T03:38:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28974 - author: EmoGarbage404 changes: - message: Added Moon Boots! This science research item allows you to move like @@ -3854,3 +3841,11 @@ id: 7239 time: '2024-08-28T17:31:47.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31593 +- author: themias + changes: + - message: Fixed the nuke disk being marked 'left behind' when escaping with it + on the shuttle + type: Fix + id: 7240 + time: '2024-08-28T20:05:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31602 From 7454c77ae5ae8b190246ccd4537a42c13c684448 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 28 Aug 2024 14:14:23 -0600 Subject: [PATCH 179/223] bagel update (#31603) * bagel update * light switch to make audience area darker in theatre --- Resources/Maps/bagel.yml | 102 +++++++++++++++++++++++++++------------ 1 file changed, 71 insertions(+), 31 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index ea24bc48ee5..b5a6a2a7953 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -12126,11 +12126,6 @@ entities: - type: Transform pos: 1.5,-21.5 parent: 60 - - uid: 13738 - components: - - type: Transform - pos: 18.5,-18.5 - parent: 60 - uid: 13869 components: - type: Transform @@ -12180,11 +12175,6 @@ entities: - type: Transform pos: -26.5,22.5 parent: 60 - - uid: 16171 - components: - - type: Transform - pos: 18.5,-17.5 - parent: 60 - uid: 17568 components: - type: MetaData @@ -62362,6 +62352,28 @@ entities: - type: Transform pos: 51.475224,-22.209888 parent: 60 +- proto: CurtainsRedOpen + entities: + - uid: 23090 + components: + - type: Transform + pos: 20.5,-21.5 + parent: 60 + - uid: 23091 + components: + - type: Transform + pos: 21.5,-21.5 + parent: 60 + - uid: 24816 + components: + - type: Transform + pos: 22.5,-21.5 + parent: 60 + - uid: 24817 + components: + - type: Transform + pos: 23.5,-21.5 + parent: 60 - proto: CurtainsWhiteOpen entities: - uid: 21250 @@ -109124,6 +109136,11 @@ entities: - type: Transform pos: 47.487705,-12.25134 parent: 60 + - uid: 23089 + components: + - type: Transform + pos: 43.51102,-1.4624498 + parent: 60 - proto: MedkitBurnFilled entities: - uid: 5675 @@ -116408,34 +116425,32 @@ entities: - type: Transform pos: -57.5,29.5 parent: 60 -- proto: RadiationCollector +- proto: RadiationCollectorFullTank entities: - uid: 8211 components: - type: Transform - pos: 5.5,38.5 + pos: 4.5,38.5 parent: 60 - - uid: 16160 + - uid: 11527 components: - type: Transform - pos: 6.5,38.5 + pos: -4.5,38.5 parent: 60 - - uid: 16411 + - uid: 13738 components: - type: Transform pos: -3.5,38.5 parent: 60 - - uid: 17479 + - uid: 16160 components: - type: Transform - pos: 4.5,38.5 + pos: 6.5,38.5 parent: 60 -- proto: RadiationCollectorFullTank - entities: - - uid: 11527 + - uid: 16171 components: - type: Transform - pos: -4.5,38.5 + pos: 5.5,38.5 parent: 60 - uid: 16384 components: @@ -124251,6 +124266,21 @@ entities: 21755: - On: Open - Off: Close + - uid: 24818 + components: + - type: MetaData + name: light switch + - type: Transform + pos: 21.5,-14.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 1209: + - On: On + - Off: Off + 1210: + - On: On + - Off: Off - proto: SignAnomaly entities: - uid: 9496 @@ -134899,6 +134929,11 @@ entities: - type: Transform pos: -51.5,-19.5 parent: 60 + - uid: 7071 + components: + - type: Transform + pos: 18.5,-16.5 + parent: 60 - uid: 7077 components: - type: Transform @@ -134959,6 +134994,11 @@ entities: - type: Transform pos: -31.5,-4.5 parent: 60 + - uid: 16411 + components: + - type: Transform + pos: 18.5,-19.5 + parent: 60 - proto: TobaccoSeeds entities: - uid: 3263 @@ -152279,11 +152319,6 @@ entities: - type: Transform pos: 15.5,-25.5 parent: 60 - - uid: 2910 - components: - - type: Transform - pos: 18.5,-16.5 - parent: 60 - uid: 3347 components: - type: Transform @@ -152349,11 +152384,6 @@ entities: - type: Transform pos: 14.5,12.5 parent: 60 - - uid: 7071 - components: - - type: Transform - pos: 18.5,-19.5 - parent: 60 - uid: 7719 components: - type: Transform @@ -156484,6 +156514,11 @@ entities: parent: 60 - proto: WoodDoor entities: + - uid: 2910 + components: + - type: Transform + pos: 18.5,-18.5 + parent: 60 - uid: 3637 components: - type: Transform @@ -156508,6 +156543,11 @@ entities: - type: Transform pos: -18.5,19.5 parent: 60 + - uid: 17479 + components: + - type: Transform + pos: 18.5,-17.5 + parent: 60 - proto: Wrench entities: - uid: 1556 From 50791db750e884b678ff35b882ff1b4f949ae942 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:48:46 -0700 Subject: [PATCH 180/223] Add rings (Salvage loot real)! (#31372) * First commit * I'm silly * Another fix * How could I forget the descriptions! * Forgot * Made textures alligned properly * Removed the stuff! * Opps * Typo fixes --- .../Clothing/Hands/base_clothinghands.yml | 13 +++ .../Entities/Clothing/Hands/rings.yml | 104 ++++++++++++++++++ .../Spawners/Random/Salvage/tables_loot.yml | 8 ++ .../Markers/Spawners/Random/rings.yml | 21 ++++ .../Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/tags.yml | 3 + .../Clothing/Hands/Rings/basic.rsi/gem.png | Bin 0 -> 132 bytes .../Clothing/Hands/Rings/basic.rsi/meta.json | 17 +++ .../Clothing/Hands/Rings/basic.rsi/ring.png | Bin 0 -> 228 bytes 9 files changed, 167 insertions(+) create mode 100644 Resources/Prototypes/Entities/Clothing/Hands/rings.yml create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml create mode 100644 Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png create mode 100644 Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index c1a53ccf6e5..da0011e1cc2 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -48,3 +48,16 @@ - type: Fiber fiberMaterial: fibers-synthetic - type: FingerprintMask + +- type: entity + abstract: true + parent: BaseItem + id: RingBase + components: + - type: Clothing + slots: [ gloves, neck ] + - type: Item + size: Tiny + - type: Tag + tags: + - Ring diff --git a/Resources/Prototypes/Entities/Clothing/Hands/rings.yml b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml new file mode 100644 index 00000000000..e88ee81feec --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Hands/rings.yml @@ -0,0 +1,104 @@ +- type: entity + parent: RingBase + id: GoldRing + name: gold ring + description: A precious ring. + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + color: "#ffc833" + - type: StaticPrice + price: 300 + - type: Appearance + +- type: entity + parent: RingBase + id: SilverRing + name: silver ring + description: Looks slightly less valuable than a gold one. + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + - type: StaticPrice + price: 275 + - type: Appearance + +- type: entity + parent: RingBase + id: GoldRingDiamond + name: gold diamond ring + description: Made from ethically mined space diamonds. + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + color: "#ffc833" + - state: gem + color: "#c1ffff" + - type: StaticPrice + price: 1500 + - type: Appearance + +- type: entity + parent: RingBase + id: SilverRingDiamond + name: silver diamond ring + description: Made from ethically mined space diamonds. + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + - state: gem + color: "#c1ffff" + - type: StaticPrice + price: 1400 + - type: Appearance + +- type: entity + parent: RingBase + id: GoldRingGem + name: gold gem ring + description: Shiny and valuable! + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + color: "#ffc833" + - state: gem + map: [ "gemColor" ] + - type: StaticPrice + price: 2100 + - type: Appearance + - type: RandomSprite + getAllGroups: true + available: + - gemColor: + gem: Rainbow + +- type: entity + parent: RingBase + id: SilverRingGem + name: silver gem ring + description: Shiny and not quite as valuable! + components: + - type: Sprite + sprite: Clothing/Hands/Rings/basic.rsi + layers: + - state: ring + - state: gem + map: [ "gemColor" ] + - type: StaticPrice + price: 2000 + - type: Appearance + - type: RandomSprite + getAllGroups: true + available: + - gemColor: + gem: Rainbow diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 61b3d108171..1ee0f123ef6 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -114,6 +114,8 @@ range: 4, 7 - id: SpaceCash1000 - id: WristwatchGold + - !type:NestedSelector + tableId: RingTableCommon - type: entityTable id: SalvageTreasureRare @@ -145,6 +147,8 @@ weight: 14 - id: SpaceCash10000 weight: 1 + - !type:NestedSelector + tableId: RingTableRare - type: entityTable id: SalvageTreasureLegendary @@ -157,6 +161,10 @@ - id: TreasureCoinDiamond amount: !type:RangeNumberSelector range: 2, 5 + - !type:NestedSelector + tableId: RingTableRare + rolls: !type:RangeNumberSelector + range: 2, 3 # Equipment: Tools and things used by salvagers. Quote unquote "Gamer Loot" diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml new file mode 100644 index 00000000000..17f83b28a5e --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/rings.yml @@ -0,0 +1,21 @@ +- type: entityTable + id: RingTableCommon + table: !type:GroupSelector + children: + - id: SilverRing + weight: 0.55 + - id: GoldRing + weight: 0.45 + +- type: entityTable + id: RingTableRare + table: !type:GroupSelector + children: + - id: GoldRingDiamond + weight: 0.1 + - id: SilverRingDiamond + weight: 0.1 + - id: GoldRingGem + weight: 0.35 + - id: SilverRingGem + weight: 0.45 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 91ac7b049a4..ba20a7b0cdd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -200,6 +200,7 @@ - ClothingHeadHatWelding - WetFloorSign - ClothingHeadHatCone + - type: EmagLatheRecipes emagStaticRecipes: - BoxLethalshot diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index bece1fb479a..d823f93d9da 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1090,6 +1090,9 @@ - type: Tag id: RifleStock +- type: Tag + id: Ring + - type: Tag id: RipleyCentralControlModule diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/gem.png new file mode 100644 index 0000000000000000000000000000000000000000..fcfbce6b75410ea62dcf11bd3cb4d75e0683f5e3 GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzPfr)ekO=p;R}A@p63&5D|DCmS z&Xs1E?6+RHhcVQG>%BggLIVR+KKGh)H9@6!`m^}Y9jajb{;K$$R|69VND4?C5NDD; ax1K|B*Nju`KtmZkUHx3vIVChPFaQ8IYA5Re literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json new file mode 100644 index 00000000000..44edc26823f --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by Beck Thompson for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ring" + }, + { + "name": "gem" + } + ] + } diff --git a/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png b/Resources/Textures/Clothing/Hands/Rings/basic.rsi/ring.png new file mode 100644 index 0000000000000000000000000000000000000000..bb8bfac62efd0c1417d2cd6d129373579fe663e4 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJm7Xq+ArbCxrx|iFD+;)#^G}$- z+_87*jjGJ`LX+Z-`01?mb>m3s7UA0+@q|0+Yx=(Yv?IM@>vIe1nivHbK*+FhO3?qh zV_UB+icktXxAVA!`@g8y7ITZ2OqtbZuKQs2e)G!r<+lW!wqLuX!#S}r-t)$tdI^oC z1!v2@% Date: Wed, 28 Aug 2024 20:49:52 +0000 Subject: [PATCH 181/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2e1abaf4178..8e1b8796a09 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Added Moon Boots! This science research item allows you to move like - you're in zero-gravity. - type: Add - id: 6741 - time: '2024-06-15T03:43:24.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29009 - author: EmoGarbage404 changes: - message: Attempting to uncuff oneself while being pulled will now take twice as @@ -3849,3 +3841,11 @@ id: 7240 time: '2024-08-28T20:05:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31602 +- author: Beck Thompson + changes: + - message: Gold and silver ring, gold and silver diamond ring, gold and silver gem + ring. They all can be obtained in salvage loot pools. + type: Add + id: 7241 + time: '2024-08-28T20:48:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31372 From 604025ebe47eb1dd4fbaf4ab2308828b30004b2c Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:45:06 -0600 Subject: [PATCH 182/223] bagel update (#31605) --- Resources/Maps/bagel.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index b5a6a2a7953..c1a902173fc 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -5561,6 +5561,7 @@ entities: id: WarnLineGreyscaleN decals: 3475: 44,-9 + 4189: 33,-17 - node: color: '#D381C996' id: WarnLineGreyscaleN @@ -5613,6 +5614,11 @@ entities: 2336: 4,-1 2337: -4,-1 2338: 0,-1 + - node: + color: '#52B4E996' + id: WarnLineGreyscaleS + decals: + 4188: 33,-21 - node: color: '#9FED5896' id: WarnLineGreyscaleS @@ -28158,11 +28164,6 @@ entities: - type: Transform pos: -58.5,20.5 parent: 60 - - uid: 17403 - components: - - type: Transform - pos: -58.5,19.5 - parent: 60 - uid: 17404 components: - type: Transform From 26ba9918f340bcdddf91caae060b7f9bc8f3604c Mon Sep 17 00:00:00 2001 From: DieselMohawk Date: Wed, 28 Aug 2024 20:23:59 -0500 Subject: [PATCH 183/223] Sec Webbing Icon Resprite and Rename (#29599) * Sec Webbing Icon Resprite and Rename * Renamed To Security Carrier --- .../Prototypes/Entities/Clothing/Belt/belts.yml | 2 +- .../Clothing/Belt/securitywebbing.rsi/icon.png | Bin 231 -> 413 bytes .../Clothing/Belt/securitywebbing.rsi/meta.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 41e89eef612..2201504b269 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -612,7 +612,7 @@ - type: entity parent: ClothingBeltSecurity id: ClothingBeltSecurityWebbing - name: security webbing + name: security carrier description: Unique and versatile chest rig, can hold security gear. components: - type: Sprite diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png index f380c1fc758d56e61ac728d6c1d06cc4e62ce433..f671b9245aa215a0907551513b3f7b784cc0a1bc 100644 GIT binary patch delta 374 zcmV-+0g3+S0i6SoFn~CY_|7qv)NQm ztA&&i;owCp_qB-uA#9|KvSPc%0i=u&!q(1tV`5;NeDPTQV zws$)w9gIeh-vdzm;*0Kq-J-vlJjThVpp1)l;Lr$6J7BbHpL}0Q8DZJA(wI0(5W?oU z-#`CFv`N#fxaWCzp0}qhyT&F>wR38Zz;#^}$8q+&TCD(x&38UReEAJi->ThHr!j1ES}uyyC`-F#(C-p9s2rizM+ii-cq7j{Fm U&rahhUjP6A07*qoM6N<$g6%iHJ^%m! delta 191 zcmV;w06_np1LpydFn<7{Nkl=U}hN01SzGe tzH+U_HMg9O=Z~+vKW^%I#u#H(_XL!RQpYs=@%8`!002ovPDHLkV1i2`Q|bT! diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json index fead05bd2f2..b1ac557ad19 100644 --- a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/securitywebbing.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/c838ba21dae97db345e0113f99596decd1d66039 and modified by DieselMohawk for SS14", + "copyright": "Made by DieselMohawk for SS14", "size": { "x": 32, "y": 32 From d9b1369dae0b24d010f33f8fe05567b5f1cf0bd4 Mon Sep 17 00:00:00 2001 From: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Date: Thu, 29 Aug 2024 04:30:58 +0300 Subject: [PATCH 184/223] Cherry (#28962) * Add files via upload * Update produce.yml * Update produce.yml * Update seeds.yml * Update flavor-profiles.ftl * Update flavors.yml * Update meal_recipes.yml * Update food_produce.yml * Update meta.json * Update seeds.yml * Update botany.yml * Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json * Create meta.json * Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json * Create meta.json * Update produce.yml * Update produce.yml * Update produce.yml * Update food_produce.yml * Update food_produce.yml * Update produce.yml * Apply suggestions from code review Co-authored-by: Tayrtahn * Update seeds.yml * Update juice.yml * Update juice.ftl * Update seeds.ftl * Update seeds.yml * Update cargo_botany.yml * Update cargo_botany.yml * Update cargo_botany.yml * Update cargo_vending.yml * Update cargo_vending.yml * Update seeds.yml * Update seeds.yml * Update meta.json * Update produce.yml * Cherry Tree * Alphabetical order * Update food_produce.yml * Update food-sequence.ftl * Update food-sequence.ftl * Update produce.yml * Update produce.yml * Update food-sequence.ftl --------- Co-authored-by: Tayrtahn --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../nutrition/components/food-sequence.ftl | 3 +- .../reagents/meta/consumable/drink/juice.ftl | 3 + Resources/Locale/en-US/seeds/seeds.ftl | 2 + .../Prototypes/Catalog/Cargo/cargo_botany.yml | 2 +- .../Catalog/Fills/Crates/botany.yml | 1 + .../VendingMachines/Inventories/seeds.yml | 1 + .../Random/Food_Drinks/food_produce.yml | 3 + .../Objects/Consumable/Food/produce.yml | 72 ++++++++++++++++++ .../Objects/Specific/Hydroponics/seeds.yml | 10 +++ Resources/Prototypes/Flavors/flavors.yml | 5 ++ Resources/Prototypes/Hydroponics/seeds.yml | 26 +++++++ .../Reagents/Consumable/Drink/juice.yml | 9 +++ .../Recipes/Cooking/meal_recipes.yml | 18 ++--- .../Specific/Hydroponics/cherry.rsi/dead.png | Bin 0 -> 3331 bytes .../Hydroponics/cherry.rsi/harvest.png | Bin 0 -> 3494 bytes .../Specific/Hydroponics/cherry.rsi/meta.json | 44 +++++++++++ .../Specific/Hydroponics/cherry.rsi/pit.png | Bin 0 -> 2856 bytes .../Hydroponics/cherry.rsi/produce.png | Bin 0 -> 2998 bytes .../Specific/Hydroponics/cherry.rsi/seed.png | Bin 0 -> 3139 bytes .../Hydroponics/cherry.rsi/stage-1.png | Bin 0 -> 2932 bytes .../Hydroponics/cherry.rsi/stage-2.png | Bin 0 -> 2974 bytes .../Hydroponics/cherry.rsi/stage-3.png | Bin 0 -> 3052 bytes .../Hydroponics/cherry.rsi/stage-4.png | Bin 0 -> 3292 bytes .../Hydroponics/cherry.rsi/stage-5.png | Bin 0 -> 3412 bytes .../Hydroponics/cherry.rsi/stage-6.png | Bin 0 -> 3434 bytes 26 files changed, 189 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/pit.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-4.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-5.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 879bbb88127..eb6a43c1b44 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -123,6 +123,7 @@ flavor-complex-meatballs = like meatballs flavor-complex-nettles = like nettles flavor-complex-jungle = like jungle flavor-complex-vegetables = like vegetables +flavor-complex-cherry = like cherries # use it when there multiple types of veggies ## Complex foodstuffs (cooked foods, joke flavors, etc) diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl index 0da77b7bc76..672b0a0e7ad 100644 --- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -72,6 +72,7 @@ food-sequence-content-suppermatter = suppermatter food-sequence-content-capfruit = capfruit food-sequence-content-berries = berries food-sequence-content-spacemans-trumpet = spacemans trupmet +food-sequence-content-cherry = cherry # BURGERS @@ -117,4 +118,4 @@ food-sequence-taco-gen = taco with {$content} # SKEWER -food-sequence-skewer-gen = {$content} kebab \ No newline at end of file +food-sequence-skewer-gen = {$content} kebab diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl index daa54bc3b1b..b9fd54bc137 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/juice.ftl @@ -42,3 +42,6 @@ reagent-desc-juice-tomato = Tomatoes made into juice. What a waste of good tomat reagent-name-juice-watermelon = water melon juice reagent-desc-juice-watermelon = The delicious juice of a watermelon. + +reagent-name-juice-cherry = cherry juice +reagent-desc-juice-cherry = Tasty cherry juice, sweet and tangy. diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 72b88ea3c55..138d3c9914d 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -130,3 +130,5 @@ seeds-pyrotton-name = pyrotton seeds-pyrotton-display-name = pyrotton plant seeds-capfruit-name = capfruit seeds-capfruit-display-name = capfruit tree +seeds-cherry-name = cherry +seeds-cherry-display-name = cherry tree diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml index a6671ff0998..0a24240e7d0 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml @@ -34,7 +34,7 @@ sprite: Objects/Specific/Hydroponics/apple.rsi state: seed product: CrateHydroponicsSeeds - cost: 550 + cost: 600 category: cargoproduct-category-name-hydroponics group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index c0d8a422f27..85b635289e0 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -91,3 +91,4 @@ - id: GrapeSeeds - id: WatermelonSeeds - id: PeaSeeds + - id: CherrySeeds diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index d625d427430..bd0990050b3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -9,6 +9,7 @@ CarrotSeeds: 5 CabbageSeeds: 5 ChanterelleSeeds: 5 + CherrySeeds: 5 ChiliSeeds: 5 CocoaSeeds: 3 CornSeeds: 5 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index 0105c948c75..feee3cfbfd4 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -139,6 +139,9 @@ - id: FoodCocoaBeans amount: !type:RangeNumberSelector range: 1, 5 + - id: FoodCherry + amount: !type:RangeNumberSelector + range: 1, 5 #rare - !type:GroupSelector children: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 23c22e3befc..7a6f40fab67 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2573,3 +2573,75 @@ - CottonBoll - type: Extractable grindableSolutionName: food + +- type: entity + name: cherry + parent: FoodProduceBase + id: FoodCherry + description: Juicy red cherry with a pit inside. + components: + - type: FlavorProfile + flavors: + - cherry + - type: Food + trash: + - TrashCherryPit + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 3 + - type: Sprite + sprite: Objects/Specific/Hydroponics/cherry.rsi + - type: Produce + seedId: cherry + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceCherry + Quantity: 5 + - type: Tag + tags: + - Fruit + - type: FoodSequenceElement + sprite: + sprite: Objects/Specific/Hydroponics/cherry.rsi + state: produce + entries: + burger: + name: food-sequence-content-cherry + taco: + name: food-sequence-content-cherry + +- type: entity + name: cherry pit + parent: FoodInjectableBase + id: TrashCherryPit + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/cherry.rsi + state: pit + - type: Item + sprite: Objects/Specific/Hydroponics/cherry.rsi + heldPrefix: pit + - type: Tag + tags: + - Recyclable + - Trash + - type: SolutionContainerManager + solutions: + food: + maxVol: 1 + reagents: + - ReagentId: Toxin + Quantity: 1 + - type: Extractable + grindableSolutionName: food + - type: Seed + seedId: cherry + - type: SpaceGarbage + - type: BadFood diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index c9c372e2773..56692f13cdc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -672,3 +672,13 @@ components: - type: Seed seedId: fakeCapfruit + +- type: entity + parent: SeedBase + name: packet of cherry seeds + id: CherrySeeds + components: + - type: Seed + seedId: cherry + - type: Sprite + sprite: Objects/Specific/Hydroponics/cherry.rsi diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 44966e32a7b..f1d3e194ac5 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1108,3 +1108,8 @@ id: paintthinner flavorType: Complex description: flavor-complex-paint-thinner + +- type: flavor + id: cherry + flavorType: Complex + description: flavor-complex-cherry diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index bff2c019c18..7407a6b75fc 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1799,3 +1799,29 @@ Min: 4 Max: 8 PotencyDivisor: 30 + +- type: seed + id: cherry + name: seeds-cherry-name + noun: seeds-noun-seeds + displayName: seeds-cherry-display-name + plantRsi: Objects/Specific/Hydroponics/cherry.rsi + packetPrototype: CherrySeeds + productPrototypes: + - FoodCherry + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 5 + potency: 10 + idealLight: 6 + chemicals: + Nutriment: + Min: 1 + Max: 3 + PotencyDivisor: 30 + Vitamin: + Min: 1 + Max: 3 + PotencyDivisor: 40 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index b9baf395d35..ff07c341d89 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -161,3 +161,12 @@ metamorphicMaxFillLevels: 4 metamorphicFillBaseName: fill- metamorphicChangeColor: false + +- type: reagent + id: JuiceCherry + name: reagent-name-juice-cherry + parent: BaseJuice + desc: reagent-desc-juice-cherry + physicalDesc: reagent-physical-desc-sweet + flavor: cherry + color: "#84031a" diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index ce381256270..4c1080c135c 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -996,15 +996,15 @@ FoodBerries: 3 FoodPlateTin: 1 -#- type: microwaveMealRecipe -# id: RecipeCherryPie -# name: cherry pie recipe -# result: FoodPieCherry -# time: 15 -# solids: -# FoodDoughPie: 1 -# FoodCherry: 3 #cherries don't exist yet -# FoodPlateTin: 1 +- type: microwaveMealRecipe + id: RecipeCherryPie + name: cherry pie recipe + result: FoodPieCherry + time: 15 + solids: + FoodDoughPie: 1 + FoodCherry: 5 + FoodPlateTin: 1 - type: microwaveMealRecipe id: RecipeFrostyPie diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..d5667d27219d356dd872977bbc6bd1b83daf00b8 GIT binary patch literal 3331 zcmV+e4gB(nP)StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@KaetFKi?vug`@_hfexZWmP}bhgM$cda6Si} z8W5*C*1<{W>Y%HW2>k<+PQH+I2`JI6Q$+$+90DndX@yD$ABW4`<;>;fQXvR=;D+A| z&+~a+eob7=9-vszzzWu;kiuV-oSDS1lam3e?wN`OS+!xl_EO$G!x>N4 z&p4qTEgrA zfp5_Fd}}w}V4J82%XQPwv-DYt+T-OZ0D3F8l$VwA!MfTor4krj@3lmz7$G`(e@mP$ z(Cd--uk`Qof0aih^AxdMVV6Kgd1=+3ZZvSuXx*ppBs_ePm77H@387=FJBpqBKZirJ#3FuA7{kER_K0Pfcq9YVSuYou~`6DfCKo zjfdcp9jM(N&p5=0KuDnjbk|2G_#oSNy5|qZ)e0Im?FKy{;7-X>UY4AP)}ecS`{Qt9 zQMO_~My*FdzK>4a?=&(L;Kj|X0lNF9$=ByA_UqFQjeRIw3hty5VTdjuuRml-XPR8T zu>znA_jcj~07_??R#^*L%QJres@sNM4J7BW^(&~c59f3ZXovDwS&JTGBUA9BomD#1 z?A@}rpW)fXhj92U*j+r&`j^K5`fl%lY@aic9?pKtX8<#R8Njpw{s4y@wl_Jegiinf N002ovPDHLkV1fY6P^ka_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/harvest.png new file mode 100644 index 0000000000000000000000000000000000000000..16a55ee65fd323912735078d9fc52967762072df GIT binary patch literal 3494 zcmV;X4O#MuP)StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@Kaet?>2K~z|U?UpfUQ&AL#zblGq)0Rl+CcKixDF{Mw65Q0mA%$0m z+UHb)gC*b~b#oH8(xrsDm{`HQLJ)*@a1jTQj-6Zr4_s<}DC*OI(Bp7!)5N~KCbf{I zXSt7a&%OVD&VTQ@&xiW`o6%dgYVEcCqc-_d_ z*$H)K5mSpN-7OiDbOwwu9e}2$SrVdS1D(u+_X;XG4I{7f;z0MN2!Rms zOAcfaa=>LEf**f?9QaF)5CJKzMqJf;Ch(6LCZPBZ+-d+JFb@3E$+`!m;l;H8vNpbn zm`Z%!T6^?Mz*LO*vkriehr*g> zT=#%H_%jad0F%Hd6e>`;W#>wcRw)gHbS*>jA*>jP5E|ewIk+nU#SJK52U0*27>8mN z%2(KzB(fW%m2~~K#hN~db*Kb>$uZ=>T?t^z0!4P^7I;t9=a(Fn0U!(B8z^pA@DOMc zn`!bb@C0`;fCk2&a}1MEShtz(0(pD-)8Nhrs{OE5=H_ch$u>26qIek+C1?dL+qG$g zNN+-U3iyCt!`&7T{+y$?WK#*Y1IKmAo(Qyp+s;JcBh+sIS@35a+|^*8$S}sAaR9V} zY2Z$m7Tz}jP!bcs4op{}Hid$;1J4HH>q%{2T+hnjKNszSBr>~G1(($PFU%zCTAszRmIEo!f0ujNx zXe2YVe-JH+L>Z1v0)Xm;2kStO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@KaetStO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@Kaeti`Ec{{fG zR`5quUzfCvx)B0z9}Cn#__lkH}3H2?qr07*qoM6N<$f^rStO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@KaetsBp~g9LK^!5d$^Eli zpfkB_OcYVKfKg9%nHPBec!$rurCkuvaKPstOR|*og!Z||%DjL}$YthPZU78`0caXv d25?M*?LcXZU;qFB07*qoM6N<$f<&%DV1oSb@G$@Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..21053aed961e7007ded1ce66fb670e7126b3a8af GIT binary patch literal 2932 zcmV-)3ybuLP)StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@KaetVQ!PFfcH% zkgJiAkrBdJ$nc+mfq{`Bo`Hd!w#Cp50XTR!zz(R~0HNE-)K75~Jb6!S9Or=2(leOEimBOaMS^#4j6U7 efI9#H*>xSmMZJ}Q00000NkvXXu0mjfLSTY=hKQ*E literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-2.png new file mode 100644 index 0000000000000000000000000000000000000000..8073923cd65b3ba98fd8eaeb8b416a21fc2680f5 GIT binary patch literal 2974 zcmV;P3t{w$P)StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@Kaetk07*qoM6N<$g5JuLX#fBK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..09a351404e2545c8f36ec155f8df775dc8ecf989 GIT binary patch literal 3052 zcmVStO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@KaetJ+#uoqrv{+(ch*kXt06-L2wR+XDNX3<)gR=W_^}phSCID`L z51@dnOSD?UVhP!+KRN994%}U1t2MOF%Ax1E{~d@1=y(3Ta(a39`NbSU0LI-1`2O4k u&M)Y{J-U6|JFssZ-*1=z5StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@Kaetl&aXJAUJ2SljzbVgM-kqlbjCD zr;8E~1Q7zKbW*`hN^=N8_ZB*I=^|v(C9@F7qL`MHxP2YoC1+wV@0lxc$hW-v9`C;I z_r3SO@13YB{j^to&HfSqhHMv#$kPi>Q9xKrrfiN^Y&FmTXsnm-qEyTyB{V2Pn2Y@- zdjRVl0ALf9EfF$kP%u;B3Xp;F51<0Pb&BYwfuIOv%vOgvq;?NrV4@B14(W1EJpzPt zh<6A<0i|LC_>p(ufYM-fZ9Efg$N)6tO4Ih^wGtfMd-~Mf94IE zUq%>0{S)N)J&-kEjSZ$rTEJg>ZS?!@km2u!8x3r)WfK&tgt9i)F7c7XBcp<0KD5&KWC zXMlE_o_zkhJ!!z3HGSZr4qWY78UWy9PWf}2_^+n`gs%t9sZ{&G|FXXS6%POg00V%& a1N;M{UBgLLol#Q&0000StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@Kaet2?6ztY|&F!e$JL-h1<8-s^1LP*^h zOu2F@WI+a`2$|lkZK->Eft&k?giRn)PuZ3>BK@9^=jyLSpr9xxK#KGNgtuy_7a(DC zN_0lVrRVw5FavAxC<|z0N>B@;K` z)^+%C2>e#V;d|)&GsDYJy%1#@cm>FK0ynN{c1#U++}C0)=*%xf)jR<37~;r{1F#7u zCqdb1J7;D}u~H?J*P`vw9IsV0T14%)0AOd!OatxR7b#s|wy%f_eU94?E5+UU2;?W+ z+4{?v{3Bl;ft*DD>r6g5)qePGbzRl7U;*ykuD`c-41`VO{?oC(`wLQ?k z--TaCDtN%nJA^-zg?q}dGz~8sYyT_W5ZDmd5Li2bKk@KWkM1+12><{907*qoM6N<$ zf^)FZ?;rJ2p=Ia3l7%|x)p}w8;NfjiFa}14VI+ZiDff%WxdHf-E71Jaa*SQY+k4t| qovuXqKdkT9@&SMWfB}HM1NaO4ZsN5EByQ*c0000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/stage-6.png new file mode 100644 index 0000000000000000000000000000000000000000..5bd86228a2c7d68b080e4b06ee7a63f63fb41b74 GIT binary patch literal 3434 zcmV-w4VChVP)StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@Kaet5vmm=J$K6fqH48dVBRu%b>VV<#4ifu%$dh~i=ismE{^CltqVT2PkW^6dBS z-S_$Kd-p7=$~^7dT+xB^d5a>FIiHm^X^H}(o3mw9@=72gDcJb)A3i&x^!=scG1oKv zChX76z__U@(y^~(fQ=CraRtIR(5^XH;@Jo_&EljF%_T6tN!p^sHVr_<$12c=gI_?+ z*JE3kj^t(-W)q=Mg~l$H>VbnF+F~~Z0;scG?Q9(tCLkSA=?Lth975|J)L#LS zJ1qM1kv%V60D8axWdVrMG)7kZToDe_UI7xQ??89WK@Y)8V(Uv#Z$fv&eABf6h!HA~ zCC+IXFxou}*j6WD!Zb zqY;Pu+0AJ7%P2soL3h&vuRr(sK9G2-`&db$5%?r4+={_8Ax$w&01sZEmlgo4v4I8d zd6%eS8y8zNx27&uHRLFRS*1S7EzS1;St*0#?LyJJCcC~zH5 zGF9dA9nl{N49oEJeLmQ!uH&pgpT9!6WaCNgRKH~9l8wVsoWxF40#zlvAzChtgy1Yi8Njo&W#< M07*qoM6N<$g6|%8f&c&j literal 0 HcmV?d00001 From d0aafae4250dd3ede854f3adfc27e4857ba324ab Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 29 Aug 2024 01:32:05 +0000 Subject: [PATCH 185/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8e1b8796a09..b0a09f81743 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,15 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Attempting to uncuff oneself while being pulled will now take twice as - long. - type: Tweak - - message: Reduced cooldown after attempting to uncuff oneself back to previous - values. - type: Tweak - id: 6742 - time: '2024-06-15T04:01:22.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29008 - author: EmoGarbage404 changes: - message: Fixed bottles, when used inhand, not being drank from but instead repeatedly @@ -3849,3 +3838,12 @@ id: 7241 time: '2024-08-28T20:48:46.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31372 +- author: RumiTiger + changes: + - message: Cherry has been added to the game! + type: Add + - message: The recipe for cherry pie has been reintroduced to the game! + type: Add + id: 7242 + time: '2024-08-29T01:30:59.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28962 From ff5acf787757cd03fd7102c214f68e6535eab8f8 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Thu, 29 Aug 2024 03:58:16 +0200 Subject: [PATCH 186/223] Add Command Glasses (#30447) * Initial commit * Removed wanted and mindshield status display * Updated glasses visuals & contraband status * Added Command Hud * Changed name to administration glasses/hud --- .../Catalog/Fills/Lockers/heads.yml | 2 ++ .../Entities/Clothing/Eyes/glasses.yml | 23 +++++++++++++- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 14 +++++++- .../equipped-EYES-hamster.png | Bin 0 -> 199 bytes .../commandglasses.rsi/equipped-EYES.png | Bin 0 -> 182 bytes .../Eyes/Glasses/commandglasses.rsi/icon.png | Bin 0 -> 268 bytes .../commandglasses.rsi/inhand-left.png | Bin 0 -> 221 bytes .../commandglasses.rsi/inhand-right.png | Bin 0 -> 217 bytes .../Eyes/Glasses/commandglasses.rsi/meta.json | 30 ++++++++++++++++++ .../Eyes/Hud/command.rsi/equipped-EYES.png | Bin 0 -> 15718 bytes .../Clothing/Eyes/Hud/command.rsi/icon.png | Bin 0 -> 15138 bytes .../Eyes/Hud/command.rsi/inhand-left.png | Bin 0 -> 14912 bytes .../Eyes/Hud/command.rsi/inhand-right.png | Bin 0 -> 15327 bytes .../Clothing/Eyes/Hud/command.rsi/meta.json | 26 +++++++++++++++ 14 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-hamster.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/command.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 45935be0acb..f718eea1cc5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -49,6 +49,7 @@ - id: RubberStampCaptain - id: SpaceCash1000 - id: WeaponDisabler + - id: ClothingEyesGlassesCommand # No laser table + Laser table - type: entityTable @@ -131,6 +132,7 @@ - id: RubberStampDenied - id: RubberStampHop - id: WeaponDisabler + - id: ClothingEyesHudCommand - type: entity id: LockerHeadOfPersonnelFilled diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 44df034ee9d..368cefe9cb4 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -158,7 +158,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityCommandContraband] + parent: [ClothingEyesBase, ShowSecurityIcons, BaseRestrictedContraband] id: ClothingEyesGlassesSecurity name: security glasses description: Upgraded sunglasses that provide flash immunity and a security HUD. @@ -184,6 +184,27 @@ - type: IdentityBlocker coverage: EYES +- type: entity + parent: [ClothingEyesBase, BaseCommandContraband] + id: ClothingEyesGlassesCommand + name: administration glasses + description: Upgraded sunglasses that provide flash immunity and show ID card status. + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/commandglasses.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/commandglasses.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon + - type: IdentityBlocker + coverage: EYES + - type: ShowJobIcons + - type: entity parent: ClothingEyesBase id: ClothingEyesGlassesMercenary diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index e627cffc74e..9e881bf9c21 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -49,7 +49,7 @@ - HudMedical - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityCommandContraband] + parent: [ClothingEyesBase, ShowSecurityIcons, BaseRestrictedContraband] id: ClothingEyesHudSecurity name: security hud description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. @@ -62,6 +62,18 @@ tags: - HudSecurity +- type: entity + parent: [ClothingEyesBase, BaseCommandContraband] + id: ClothingEyesHudCommand + name: administration hud + description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status. + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/command.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/command.rsi + - type: ShowJobIcons + - type: entity parent: ClothingEyesBase id: ClothingEyesHudBeer diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..50a6975e4ca23a92c79e1f006f78db6b294dcd20 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|8a-VcLn`LH zy|t0^uz>(;Kz`you5dX$<5WIpvrkgb-54EnJd_Qd*$T`Nc)@+Oeil$mUS908Q)m9Z z(J}sBIy3u+veF`@MRD)_U5{KlfB5kGN5469Z=VM$1Az}NYn3;Ajcp8!T-zQ{`)tLU o{d2aMu38&d_iley4@g15Lk34j%_VvN*`|ZIp00i_>zopr0C|>4+W-In literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..63da1b6fe52bf13c99745eda5dd6eea300943346 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|3OrpLLn`LH zy|t0^u!De0;M9$m7iI;?GL=3tyEgHF8P}5sd^z`;o1ad)e?W(u;Z9g+^`yA%i|yY_ z{#EJE|L6WvrM8e6Xbcb>*uQes-tCS?%c)78&qol`;+02g&cbpQYW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ade2bdf6b6e9e49e866c2f1de3412d54c38411e4 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$2?seLn2z= zPSWN(Y#`urJSg&pj9U7MiB&Ce3xYBo^8*A@LRPYSEP14%kdrF3$F*-xzmRyj{N}WB zo7biZ5^aeR|NE@96jr{Bbh#vVbe8k^H%XJKs`oK4?0fs6GUkE_ugekLtqRUN-&bg>$_=0Ot6mwnTwC{Oa=!0`b&sdtl?J-N?Fn~AUD_xmYnt}bWyUY9#|=l9Bm&+lm~Wkqhk^*Zn&-^7_$qgH2D**}}U`}fal zQLaa7<^G<%C~)qd1jrZ$h6Z=3o!tf8^LKMp*M5ze-qCS+H%Gq;3qu2Q+}*`CH^UZ8 QZ~!UuboFyt=akR{0HzjLHvj+t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d7236d64292ba30baf68a3cca1585011604bdd72 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|CVRR#hE&XX zduuoEVFMmkhxZE@Ef}>cHO@bAwUG;!%$%gaIiuR0cw;$~(X|673_g>%Ev-A6P;>0$g3MuHXwbKG%1>CK{Ee;6(mDS@?!W7d41Uj;7JJy-oIFoz6-bGv LtDnm{r-UW|#*|Wc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi/meta.json new file mode 100644 index 00000000000..c84ee214073 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Glasses/commandglasses.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/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Ghagliiarghii", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "equipped-EYES-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..851e7b216d476c22192cc5fac3828e97d6508521 GIT binary patch literal 15718 zcmeI3U2GIp6vu}TO|2ndAW$H|WzocHr}MEpyWMfSEp%I2b!*d>bc+F*ow?hN?CvZ( z({|ejL-fHA@dFc;8beg#1H>SauV@V*5yYU@gw!;k6?s7@C=e0h1@G+V^mg~A3dU&e zB)hZc{_i>G&hOrPX7*t=wKT7sRl2B@qNrI-js8}6t~Ea;cf;?U>V`3Rx+mV)sZ-Rw zbIs2*>aDlSDC*IzYJ1QK2A&XQEm|olS_o7oqjA`qqP#W9xFoL!hAjlT)L6Cs*P%mp zo2pdXJA?omh}VH`wQ(Q;+6J22<$?9GN3qxVO1()D28aSfvL&ODm@X!(?WwpT{B1Tf zc3Y~8vA){A+)QW-23l-&S_0UFN*67&F1O9?spJH=+v%>b@hm4Wtb=i|H180dtmx!z znZxcYg}=NBB`mi38#3vjRc-G!jJU`!eSLkEeU3^k(Zz5ckB4D-hUaP6gVy_FhLogZ z`m%J8Y#cw(<%AkHR4ryR<4Pf|$Edd3%|y8)b6wGRE>TR+u!9ttq!eekN|q_)q{um+ zcuyjd8k!xISB-ExeJar8ZDSwH|l#Kf(+7v zo_c$K95Agw*Lo5%sPBcBvaHb68)`T|ITIq8O3|@{q*}zyRMKv#rI4N>FT7T4p@OL6hGH8!A;*5nU48&@PWa zhj<0hyx?SMk0iM0D#ax@g(_Zh@~#xbK)~ugDYRdcd(7RE39Z1;LKPPdy8xg$k5ok~ zZl^$dSeKJ_hXBim1Q&4go@{7~`=roMCRAAIq===DIr_hvqCl8QsTx%suFrnUx`nGZ zRm2*yLZ{o;-E&RLx_b*UtOmiu6mS0*?9Ri>PSOt!(wh^ZEf(?;OMa#B`*2EXz=(PmwfQh!y}ik z4%RF@-nMk+V4_($JLo-J(YtYfboOxIWcB#XU#{)h|9fcnilJSL?>`*gSFvsF7#KQz;_RjVHLG4Wxndz_~IP%)#G9ZJFm9$jqT$*Htje+Onu`yI{%NA zgYUOTYKAX-{Y-g>d-l~U$)Wl8T^W0P+qsj}oGo?C5&Q7bvh90)v$>ZRetB!j^|2Rr qezIW8J1=ck&3<+Vf~<>U}-^7@I@_H6j2e@`bD9F73qT?cP3x6H_2tC6<=;3 znK}2||2Z?ibI;AZ%oF*s-9v#50RX_z=ty=P9U1p~{VMcp&(B{*hc)KNUK@ZLZgIZ@ z;N=tR0Z4wU6(*g@+&z+FR6??9Ov6yUVxrjqq_)*fS($|nGYw}nJsrIC-q|3dsp;UJ zSdPz`!?2`{%v*3`eypI(&nihZxGfV%)g=_50v(yDSIW9A)zd*Qu7u9rVJ^scQ=Hj! zaJ!q3nat&xVZ(w0r=J)c!Q@t75hj>2{MHqR7={lM_Nb*Gr@-ZH-yA%HE}^3J1%u z0(HkmI-#e|EE$ermyA9s+wQ)JQB88WcJ7|nTdDL+Z96;nBLq#PJ(YH0&V<}Jw2i8z zz@7Wit!(Ud_l{QV6lYl^*VFgfVO{GZb3F~2w-g!`N}+p|hAk*NhE*_(a;CA$@-2kS z@UXY4m@RuWT{UX<))a?JI`!^EgIU>unJ^!YvV4LS;srsFcu|T9ck*G0=Y2sMGqD&s zL)D6NJz_*+QdIQE@Xf?yp#D*1M_y4B|6E@jRgsE@Rgs;HR*`2QXX-O4t~2PH*$$hrbYvl%oH(lk{P5^=sboh-6ZC>L2ljTTuso={k* zDhWAKObCgv>_N=s{PM2QSwpG1-O>!LqR^t4Oo&P(%tm6vPVxZqe%X_Oc1MZ~17;QP#XY z$&@V{x*eAewpy;eiM97ASL1cABrEQ2mQmb>fNF|cHrlzYwz4VHx(m26%8mFwdH)=> z64Xfz)d=Oy>L0{5icU?o;Px4`CRWnxji}3Ic=#0O?*3)%KPZGP@4vb-tgMf&t_;ie zr2nrBomH%qWPJvz8LqW}TLUYrT%(@LJFB(Vba!IP{X3FS7o!y=d)*_XxUR8I=EnR< zw;Rh#-)47QokFQc9i$)nv)4Pvth$NmHVIB*w81?;~mVzW3fmq z#o@!aBCpk9c`~b^o!55vlL*S>X>dnR;og2ipQ9;kl*;!Y=JjA>6g}plCrqyWh}qSi z?Op6zo^e zk@;X=iVFimHYqMLAIwW}VL-?x#YN_Wc_}Uo2-&2#$b2v_#f1SOn-mwB59Xz~Fd$@; z;v)0Gyc8D(gltk=WImXe;=+KCO^S=m2lG-~7!a~aagq68UWy9?LN+NbG9S!KabZBn zCdEbOgLx?~3<%jI;tF(L+JriKQ?rI%$$Wld=ymiuC!>sv=Kz@B48X#p09^SS9e)O( z$^-Dr6adn30B$p$d+5VmXzrQO?Dj(atBdE~8v1})cU}IYeXnf!^Zezqd1$p9_#?Xb z)9Hh|f8FqudGgJp7lPyEo41}#thvv;ap3(?E4{RK3Jk9QZt>8M)rmb|VcRN@7Xf&7 z-N#36dgs_+{*y&+YW-uE29{2h9u!{~FWi0Zw0_{3!-Jpw_WQfHn-65h4nHhEePndg z=H!Koi-Vt^x{$f!%JFqOzC1iTci^v=zCL*Cxfj1UdhCeCZ8~}4oAev6u_u?7#yZ;SL!I>RzYk?=fe;nNj7~MIRUEDGC$Unj5azOw9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a9f04628f9170a62318638fa4d7da1ed0933475d GIT binary patch literal 14912 zcmeI3eQXnD9LJw2Fq}+DAczE^DK7%9y}Q0{m$nSr!G?A&+Xx-X%e8&Boojnt@3wZ6 z#leD!icy&;F-SmBBM1g#K!*mRLJWiud_e;OizLn&WXk}>5YXq^u6@>ZJYe|qY0}zL| zcC+rV6V{8Rtr1w&T3+pIZSWQOweuZ$wiu5R1fe2mV!=R2=3{nkJTH%8wVBas;u597 zu3exO)Og$#8mAP28nfP_^RX7I##*H3%vP((TA(qooS9*bjFHtDjJ%2EO$JT!qjlt= z$QJR}@|CVd$#Uo~yS83Y!aT!7qfvd-sFxyj3|CZC#IOd&V9+6jPHqV)LQEHuXC#sg z=5ayU7ZJmXD1|g?UcoChDR!+^EtL8s?<*Ki6$;5oc8DSq6T%FqXPIm!zc1wpH$?*R zq4|9b48R}^DKheLS$*MpNs;7wX@rug?hy;4IdQvFwX=>l7|dE)R!W)?f+W(cPPw`z z44FzOOHC0UENMo!G9%mFD`IVWa)xA5dqx~PjEN)I)SiSbz7!HOWJCALJ0nm~q)4?S z1ssW0RxyZB<8;PXm1fQ|G31w`@?0B}X-Us_IvaEe3UnA)gGt90>Nra^$MLL{H*t@# z2A*ZHBnf3k4!7hNYg@A9;0(N}2+x5jGjpK*;};a+wzA+_ERWyE*GiF~pg6>!PzRZC zsLsZu8!=^SRq;+KAVtuypu=cmvNdC__)6o;Lb4)+e6Y;rKn;3P^z&XTv{=n7t26u2 zPocrY>IAFBtFu5aG@GHpTWApC5Z!LvJ}k9M@-?ZuC7IfPhp939u+&dRM0C;#0ZgNg z{!U9|Ni(cesVJlM*@CTGw0h%bSru#?+B(<~5aVZ3Scu3_-Ens9;Fe1rVyQDq^~85B zFZk5c%;8fv1oYdOA+70QrJPBd_%p%am49XdaQD|YyN+SEghM{5C%ONh?_XJdx7r7I`&9(7Iw zO>w=|z@iVsslQ1p-koW!xwRGV&a|eTOGBdKFeIyGG-EFH61Vhjd6E)nftSzVPDQ__>!k=0l;k`e1j8WU56{X37(WTF*4ETHEUCiS2)bdpmW z;VuX1JG#q>@pQBZPJar$LM9?9MMQ)PC@!1^F{ZeP zh;RYLh0`F$6c-T@E}*z@8pN35A|k>C6cAb+uv8#Q+)lwE7QY`$3A*VIrjRy zoh4JdJ{x;BZ}j%3-Yn3TT=ay$oz%5s*Z$8(J>7Y{H}6L7){alRUnvdbkGb5|u<^pV z9(`YTY>BI)r?B{V2N%Qc;kM?J*Z$18{{8x?)Auz#*S3Dni`8rYKG?Q( z{n{(fPblad2OKX)<;LZ2KhoW`$1k+QjoYnT4qg7@Oa0VU@08Yvvl97Uw>b-W8SKJH*iZD@_}de!{3=kw|_N$S8O(T z_5I%3GtPz;O9sHUqg|8w6yCeLWY>@DE);G)(X+EY-*ebl^YKqVuQ~shUhX`&SLD*o`H_{!{jW{%Zv{dKW&E+rRhOZ<H5tBmtJd|!p+M$RF&}GWLM^bG1EV2`{dDIO4WBf%Sy^! Jdls%<_a6eVQKtX^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0190c6a518bddfe0a5a71d82e326a8c57ed2fb2c GIT binary patch literal 15327 zcmeI3ZEO@p7{?b95Gqw8CH$TarR!f)9a)Lj9+Gx zyS-@td?%4=&v4e-9m{7jh)zmF)J2H|aLqNZ7=s0XK; zp9$2#?pYM&A5mOeaLC0~odlXj9Zm`>ozncAFws z+SjAGUcZBLd%e8(Ih&K^+zjhtTrBN$2|O$CPFwD> z2g~5EKvIqh4WXsEbkM4_w;M)6V3<@YfIvJ;vhCOJ#OEttat?F~L zB6*z<(50l3FceL-nYv;`>oh9ub~91o$~{*+QAnifId+gDlNJ*U=U|yqL9$ecNpvP- znW4!N17aW!R6~bxT*1Wplh8;2~=-}k21H^(;G^(I5{JfOwX8O2We%DFw>I_%PfWL3Uv{hAQR+a7PHHs>0DgBuMgN796yQl_2q5*;Jfc^Wy}k^@aM&6?N;;%Too2PFS)`dR@kG=m`vpgqGax7LCGu#AP1Nct;Jy#B6DHN=m{Jj z<*dFXeC!;lcA(-4Dl3)gHMWSZMU9l01dH3?nix;5XH`drq4EL7-2G$9e=rfcxcT0u zVSIITZ__YhPx}9+p}2~rc2R8ua*)X{;C#dQW-dFQBP%PvA&joXfcbYMz$%6-O3YLb z7hp!U6*Fi1H<{HK>&*1`I$3xzocWy#wYt&JW_+mCjfNH@SE-5-bmp=l&6X(hKQp_b zuY|96An0+sUG4ybHlq>sN*ctPLJHh@b#p)Q@VOY&Q8KW3tU!w+7nq$Y%Zpg12D7d3 zH4naFGKE*nQRP|K#qQ^i;uGCZRYZ#*f(y?F@e*7J5WGon;rSq5f(rqHHwi90 zAH+*=AwcjZ!G-68cnK~92;L;P@O%(2!G!?9n*4T@Fo^lS@F;&P~l0<6g-ky-aGqQc%0KF)ii`DYD)!0 zZQD*!!*}8R21RwU6m@e0MF|HeYNocYwQng!P1sr+THKf(`1umoac0qs(?hAZj&E;0 z+u(qXV^_7#aM~@F*U4LX<`8P*fej4`9E`Q_f^&ft;pU`es^l_8+NROan zA7%Sy-TAhmb#U-}#q{!r4iD@Y+8f+hPxT61u=SApUHXG#)32Vhefi$Py4BBfkMHa| pw{-vj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json new file mode 100644 index 00000000000..149220d0e46 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by SlamBamActionman", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From a268ede700a5ad8b258df1a5913c6074d4fa1d6c Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 29 Aug 2024 01:59:22 +0000 Subject: [PATCH 187/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b0a09f81743..3516a918a83 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Fixed bottles, when used inhand, not being drank from but instead repeatedly - opening and closing. - type: Fix - id: 6743 - time: '2024-06-15T05:20:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29010 - author: Flareguy changes: - message: Replaced RelayStation with a more fair ruin. @@ -3847,3 +3839,10 @@ id: 7242 time: '2024-08-29T01:30:59.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28962 +- author: SlamBamActionman, Graded + changes: + - message: Added administration glasses to Captain and HoP lockers! + type: Add + id: 7243 + time: '2024-08-29T01:58:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30447 From 6a52de86ffe76d1462744b74c97e01e5bb27109c Mon Sep 17 00:00:00 2001 From: Unisol <1929445+Unisol@users.noreply.github.com> Date: Wed, 28 Aug 2024 22:15:00 -0400 Subject: [PATCH 188/223] Added plastitanium walls and windows (#31178) * added plastitanium walls and windows * Changed crack sprite on diagonal window from square to diagonal --- .../Entities/Structures/Walls/walls.yml | 70 +++++++++ .../Structures/Windows/plastitanium.yml | 148 +++++++++++++++--- 2 files changed, 196 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 0e98b0a803f..f48a12de337 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -507,6 +507,76 @@ - type: Icon sprite: Structures/Walls/plastitanium_diagonal.rsi state: state0 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 2000 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalSlam + - trigger: + !type:DamageTrigger + damage: 1000 + behaviors: + - !type:ChangeConstructionNodeBehavior + node: girder + - !type:PlaySoundBehavior + sound: + collection: MetalSlam + - !type:DoActsBehavior + acts: ["Destruction"] + +- type: entity + id: WallPlastitaniumDiagonalIndestructible + name: plastitanium wall + suffix: diagonal, indestructible + description: Keeps the air in and the greytide out. + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: Transform + anchored: true + - type: Clickable + - type: Tag + tags: + - Wall + - type: Sprite + drawdepth: Walls + sprite: Structures/Walls/plastitanium_diagonal.rsi + state: state0 + - type: IconSmooth + mode: Diagonal + key: walls + base: state + - type: Icon + sprite: Structures/Walls/plastitanium_diagonal.rsi + state: state0 + - type: Physics + bodyType: Static + - type: Airtight + noAirWhenFullyAirBlocked: false + airBlockedDirection: + - South + - East + - type: Fixtures + fixtures: + fix1: + shape: + !type:PolygonShape + vertices: + - "-0.5,-0.5" + - "0.5,0.5" + - "0.5,-0.5" + mask: + - FullTileMask + layer: + - WallLayer - type: entity parent: BaseWall diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml index cb05f80cd12..2134cfe8927 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml @@ -1,19 +1,77 @@ - type: entity - id: PlastitaniumWindow + id: PlastitaniumWindowBase + parent: BaseStructure + abstract: true name: plastitanium window - parent: Window + description: Don't smudge up the glass down there. + placement: + mode: SnapgridCenter + snap: + - Window + components: + - type: RCDDeconstructable + deconstructable: false + - type: MeleeSound + soundGroups: + Brute: + collection: GlassSmack + - type: WallMount + arc: 360 # interact despite grilles + - type: Tag + tags: + - ForceFixRotations + - Window + - type: Physics + bodyType: Static + - type: ExaminableDamage + messages: WindowMessages + - type: InteractionPopup + interactSuccessString: comp-window-knock + messagePerceivedByOthers: comp-window-knock + interactSuccessSound: + path: /Audio/Effects/glass_knock.ogg + - type: Appearance + - type: StaticPrice + price: 100 + - type: BlockWeather + +- type: entity + id: PlastitaniumWindowSquareBase + abstract: true + name: plastitanium window + parent: PlastitaniumWindowBase components: - type: Sprite drawdepth: WallTops sprite: Structures/Windows/plastitanium_window.rsi - type: Icon sprite: Structures/Windows/plastitanium_window.rsi - - type: Repairable - fuelCost: 15 - doAfterDelay: 3 - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: RGlass + state: full + - type: IconSmooth + key: windows + base: ptwindow + - type: Airtight + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb {} + mask: + - FullTileMask + layer: + - GlassLayer + +- type: entity + id: PlastitaniumWindowIndestructible + name: plastitanium window + parent: PlastitaniumWindowSquareBase + suffix: indestructible + +- type: entity + id: PlastitaniumWindow + name: plastitanium window + parent: PlastitaniumWindowSquareBase + components: - type: Destructible thresholds: - trigger: @@ -39,38 +97,37 @@ max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: IconSmooth - base: ptwindow - - type: Appearance - type: DamageVisuals thresholds: [4, 8, 12] damageDivisor: 28 trackAllDamage: true damageOverlay: sprite: Structures/Windows/cracks.rsi - - type: StaticPrice - price: 100 + - type: Repairable + fuelCost: 15 + doAfterDelay: 3 + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: RGlass - type: entity - parent: ShuttleWindow - id: PlastitaniumWindowDiagonal + id: PlastitaniumWindowDiagonalBase + abstract: true + name: plastitanium window + parent: PlastitaniumWindowBase suffix: diagonal - placement: - mode: SnapgridCenter - snap: - - Window components: - type: Sprite drawdepth: WallTops sprite: Structures/Windows/plastitanium_window_diagonal.rsi state: state0 + - type: Icon + sprite: Structures/Windows/plastitanium_window_diagonal.rsi + state: state0 - type: IconSmooth mode: Diagonal key: windows base: state - - type: Icon - sprite: Structures/Windows/plastitanium_window_diagonal.rsi - state: state0 - type: Fixtures fixtures: fix1: @@ -89,6 +146,53 @@ airBlockedDirection: - South - East + +- type: entity + id: PlastitaniumWindowDiagonalIndestructible + name: plastitanium window + parent: PlastitaniumWindowDiagonalBase + suffix: diagonal, indestructible + +- type: entity + id: PlastitaniumWindowDiagonal + name: plastitanium window + parent: PlastitaniumWindowDiagonalBase + suffix: diagonal + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1000 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 500 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WindowShatter + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassReinforced: + min: 1 + max: 2 + PartRodMetal: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: DamageVisuals + thresholds: [4, 8, 12] + damageDivisor: 28 + trackAllDamage: true damageOverlay: sprite: Structures/Windows/cracks_diagonal.rsi + - type: Repairable + fuelCost: 15 + doAfterDelay: 3 + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: RGlass From b6391e11492912e4681348f23dfda94eeb50467d Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 29 Aug 2024 02:44:33 +0000 Subject: [PATCH 189/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3516a918a83..4ef2bc6bf5f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Flareguy - changes: - - message: Replaced RelayStation with a more fair ruin. - type: Remove - id: 6744 - time: '2024-06-15T06:02:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28971 - author: metalgearsloth changes: - message: Fix the character profile sometimes thinking there's changes to save @@ -3846,3 +3839,10 @@ id: 7243 time: '2024-08-29T01:58:16.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30447 +- author: osjarw + changes: + - message: Fix air alarms not checking sensor states upon power returning. + type: Fix + id: 7244 + time: '2024-08-29T02:43:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29857 From b3036ded0af09ae08ff13c065600a0512b16a82e Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Thu, 29 Aug 2024 06:04:43 +0300 Subject: [PATCH 190/223] Make railings render over tables (#31589) Make rails render over tables --- .../Entities/Structures/Walls/railing.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml index a23c559abab..ace34a8052d 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml @@ -5,7 +5,7 @@ description: Basic railing meant to protect idiots like you from falling. components: - type: Sprite - drawdepth: WallTops + drawdepth: SmallObjects sprite: Structures/Walls/railing.rsi state: side - type: Icon @@ -60,7 +60,7 @@ - type: RCDDeconstructable cost: 2 delay: 2 - fx: EffectRCDDeconstruct2 + fx: EffectRCDDeconstruct2 - type: entity parent: BaseStructure @@ -69,7 +69,7 @@ description: Basic railing meant to protect idiots like you from falling. components: - type: Sprite - drawdepth: WallTops + drawdepth: SmallObjects sprite: Structures/Walls/railing.rsi state: corner - type: Icon @@ -133,7 +133,7 @@ - type: RCDDeconstructable cost: 2 delay: 2 - fx: EffectRCDDeconstruct2 + fx: EffectRCDDeconstruct2 - type: entity parent: BaseStructure @@ -142,7 +142,7 @@ description: Basic railing meant to protect idiots like you from falling. components: - type: Sprite - drawdepth: WallTops + drawdepth: SmallObjects sprite: Structures/Walls/railing.rsi state: corner_small - type: Icon @@ -197,8 +197,8 @@ - type: RCDDeconstructable cost: 2 delay: 2 - fx: EffectRCDDeconstruct2 - + fx: EffectRCDDeconstruct2 + - type: entity parent: BaseStructure id: RailingRound @@ -206,7 +206,7 @@ description: Basic railing meant to protect idiots like you from falling. components: - type: Sprite - drawdepth: WallTops + drawdepth: SmallObjects sprite: Structures/Walls/railing.rsi state: round - type: Physics @@ -276,4 +276,4 @@ - type: RCDDeconstructable cost: 2 delay: 2 - fx: EffectRCDDeconstruct2 + fx: EffectRCDDeconstruct2 From df392c7281e82a97ba8dc1a63c359988068007d3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 29 Aug 2024 03:05:49 +0000 Subject: [PATCH 191/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4ef2bc6bf5f..db4cff6e6a0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - message: Fix the character profile sometimes thinking there's changes to save - even if the loadouts haven't changed. - type: Fix - id: 6745 - time: '2024-06-15T06:52:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28737 - author: EmoGarbage404 changes: - message: Fixed borgs and other non-humans getting deleted by salvage magnet wrecks @@ -3846,3 +3838,10 @@ id: 7244 time: '2024-08-29T02:43:27.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29857 +- author: Winkarst-cpu + changes: + - message: Now railings render over tables. + type: Tweak + id: 7245 + time: '2024-08-29T03:04:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31589 From d921684e16cb535ed4f34b59bb797e2c32c8352d Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:23:36 +1000 Subject: [PATCH 192/223] Update submodule to 232.0.0 (#31616) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index ec3a74d2686..f659b2b58c7 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit ec3a74d26868f9640ac06170bdf1c2557d19a063 +Subproject commit f659b2b58c7d0784f3582b93ba368a529558d3fd From 2fd57c2d4a00e94ef0b7b0e74b4559f98571c724 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 29 Aug 2024 03:24:42 +0000 Subject: [PATCH 193/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index db4cff6e6a0..b3ef8b210bf 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Fixed borgs and other non-humans getting deleted by salvage magnet wrecks - disappearing. - type: Fix - id: 6746 - time: '2024-06-15T13:19:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29006 - author: ShadowCommander changes: - message: Added a red light to firelocks when their warning lights are active. @@ -3845,3 +3837,10 @@ id: 7245 time: '2024-08-29T03:04:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31589 +- author: metalgearsloth + changes: + - message: Fix storage UI being buggy. + type: Fix + id: 7246 + time: '2024-08-29T03:23:37.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31616 From f0615ec3c8a4e305a21fa475a0a7fe1204972368 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 29 Aug 2024 15:27:47 +1000 Subject: [PATCH 194/223] Fixup playerspawn stuff (#31546) * Fixup playerspawn stuff - Also removed arrivals forcing, this should just turn containerspawnpoint off. * fix this one * test fix * really fix --- .../Tests/PostMapInitTest.cs | 8 ++-- .../Shuttles/Systems/ArrivalsSystem.cs | 12 ++---- .../ContainerSpawnPointSystem.cs | 6 +++ .../Station/Systems/StationSpawningSystem.cs | 42 ------------------- Content.Shared/CCVar/CCVars.cs | 6 --- .../Entities/Mobs/Player/silicon.yml | 1 - 6 files changed, 14 insertions(+), 61 deletions(-) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 5771e0f06c0..b08f774271c 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -248,14 +248,14 @@ await server.WaitPost(() => var jobs = new HashSet>(comp.SetupAvailableJobs.Keys); var spawnPoints = entManager.EntityQuery() - .Where(x => x.SpawnType == SpawnPointType.Job) - .Select(x => x.Job!.Value); + .Where(x => x.SpawnType == SpawnPointType.Job && x.Job != null) + .Select(x => x.Job.Value); jobs.ExceptWith(spawnPoints); spawnPoints = entManager.EntityQuery() - .Where(x => x.SpawnType == SpawnPointType.Job) - .Select(x => x.Job!.Value); + .Where(x => x.SpawnType is SpawnPointType.Job or SpawnPointType.Unset && x.Job != null) + .Select(x => x.Job.Value); jobs.ExceptWith(spawnPoints); diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index 0b86383faa8..9b94d6024e2 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -11,6 +11,7 @@ using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Events; using Content.Server.Spawners.Components; +using Content.Server.Spawners.EntitySystems; using Content.Server.Station.Components; using Content.Server.Station.Events; using Content.Server.Station.Systems; @@ -69,11 +70,6 @@ public sealed class ArrivalsSystem : EntitySystem /// public bool Enabled { get; private set; } - /// - /// Flags if all players must arrive via the Arrivals system, or if they can spawn in other ways. - /// - public bool Forced { get; private set; } - /// /// Flags if all players spawning at the departure terminal have godmode until they leave the terminal. /// @@ -95,6 +91,8 @@ public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(HandlePlayerSpawning, before: new []{ typeof(ContainerSpawnPointSystem), typeof(SpawnPointSystem)}); + SubscribeLocalEvent(OnStationPostInit); SubscribeLocalEvent(OnShuttleStartup); @@ -112,11 +110,9 @@ public override void Initialize() // Don't invoke immediately as it will get set in the natural course of things. Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles); - Forced = _cfgManager.GetCVar(CCVars.ForceArrivals); ArrivalsGodmode = _cfgManager.GetCVar(CCVars.GodmodeArrivals); _cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals); - _cfgManager.OnValueChanged(CCVars.ForceArrivals, b => Forced = b); _cfgManager.OnValueChanged(CCVars.GodmodeArrivals, b => ArrivalsGodmode = b); // Command so admins can set these for funsies @@ -339,7 +335,7 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev) return; // Only works on latejoin even if enabled. - if (!Enabled || !Forced && _ticker.RunLevel != GameRunLevel.InRound) + if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound) return; if (!HasComp(ev.Station)) diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs index e213f29d07b..ef0ece524c0 100644 --- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs +++ b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs @@ -15,6 +15,12 @@ public sealed class ContainerSpawnPointSystem : EntitySystem [Dependency] private readonly StationSystem _station = default!; [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(HandlePlayerSpawning, before: new []{ typeof(SpawnPointSystem) }); + } + public void HandlePlayerSpawning(PlayerSpawningEvent args) { if (args.SpawnResult != null) diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index fcbc3aa52f6..3090f158806 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -56,27 +56,11 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem private bool _randomizeCharacters; - private Dictionary> _spawnerCallbacks = new(); - /// public override void Initialize() { base.Initialize(); Subs.CVar(_configurationManager, CCVars.ICRandomCharacters, e => _randomizeCharacters = e, true); - - _spawnerCallbacks = new Dictionary>() - { - { SpawnPriorityPreference.Arrivals, _arrivalsSystem.HandlePlayerSpawning }, - { - SpawnPriorityPreference.Cryosleep, ev => - { - if (_arrivalsSystem.Forced) - _arrivalsSystem.HandlePlayerSpawning(ev); - else - _containerSpawnPointSystem.HandlePlayerSpawning(ev); - } - } - }; } /// @@ -98,33 +82,7 @@ public override void Initialize() var ev = new PlayerSpawningEvent(job, profile, station); - if (station != null && profile != null) - { - // Try to call the character's preferred spawner first. - if (_spawnerCallbacks.TryGetValue(profile.SpawnPriority, out var preferredSpawner)) - { - preferredSpawner(ev); - - foreach (var (key, remainingSpawner) in _spawnerCallbacks) - { - if (key == profile.SpawnPriority) - continue; - - remainingSpawner(ev); - } - } - else - { - // Call all of them in the typical order. - foreach (var typicalSpawner in _spawnerCallbacks.Values) - { - typicalSpawner(ev); - } - } - } - RaiseLocalEvent(ev); - DebugTools.Assert(ev.SpawnResult is { Valid: true } or null); return ev.SpawnResult; diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 4d1ba39a3eb..95fb7bd692c 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1478,12 +1478,6 @@ public static readonly CVarDef public static readonly CVarDef ArrivalsReturns = CVarDef.Create("shuttle.arrivals_returns", false, CVar.SERVERONLY); - /// - /// Should all players be forced to spawn at departures, even on roundstart, even if their loadout says they spawn in cryo? - /// - public static readonly CVarDef ForceArrivals = - CVarDef.Create("shuttle.force_arrivals", false, CVar.SERVERONLY); - /// /// Should all players who spawn at arrivals have godmode until they leave the map? /// diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index e1348c7b389..14255312825 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -242,7 +242,6 @@ suffix: Job spawn components: - type: ContainerSpawnPoint - spawnType: Job containerId: station_ai_mind_slot job: StationAi - type: Sprite From c6a8d877a0aaf686728d0fae65a9f819145aba74 Mon Sep 17 00:00:00 2001 From: MisterMecky Date: Thu, 29 Aug 2024 21:21:04 +0800 Subject: [PATCH 195/223] strange pill tweaks (#30524) * fix randomfill logic * Revert "fix randomfill logic" This reverts commit 7cd73c0e61cbe5eda58f9451d15e583b76b62640. * change strange pill weights * proposed balance changes --- .../Objects/Specific/Medical/randompill.yml | 173 ++++++++++-------- 1 file changed, 100 insertions(+), 73 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml index 33e21e7972e..cdff0cdbe4a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml @@ -1,51 +1,77 @@ - type: weightedRandomFillSolution id: RandomFillStrangePill fills: - - quantity: 20 - weight: 1 - reagents: - - Aluminium - - Carbon - - Chlorine - - Copper - - Fluorine - - Hydrogen - - Iodine - - Lithium - - Mercury - - Potassium - - Phosphorus - - Radium - - Silicon - - Sulfur - - Sodium - - quantity: 20 - weight: 2 - reagents: - - Omnizine - - quantity: 20 - weight: 3 - reagents: - - ChloralHydrate - - Desoxyephedrine - - Ephedrine - - Ipecac - - Mold - - MuteToxin - - Nocturine - - NorepinephricAcid - - Pax - - Tricordrazine - - SodiumPolyacrylate - - Fresium - - quantity: 20 - weight: 5 - reagents: - - SpaceDrugs - - quantity: 10 - weight: 5 - reagents: - - Amatoxin + # 5 groups for a total weight of 100 + # Very Good - weight: 15 + - quantity: 15 + weight: 5 + reagents: + - Stimulants + - quantity: 10 + weight: 5 + reagents: + - Ichor + - quantity: 5 + weight: 5 + reagents: + - Cognizine + # Good - weight: 25 + - quantity: 20 + weight: 25 + reagents: + - Desoxyephedrine + - Ephedrine + - Omnizine + - Tricordrazine + - Vitamin + # Neutral - weight: 20 + - quantity: 20 + weight: 17.5 + reagents: + - Ipecac + - SodiumPolyacrylate + - SpaceDrugs + - SpaceGlue + - Laughter + - JuiceThatMakesYouWeh + - Lipozine + - quantity: 5 + weight: 2.5 + reagents: + - Honk + # Bad - weight: 25 + - quantity: 20 + weight: 10.5 + reagents: + - MuteToxin + - Pax + - Fresium + - quantity: 10 + weight: 10.5 + reagents: + - Uranium + - Licoxide + - Razorium + - quantity: 5 + weight: 4 + reagents: + - Toxin + # Very Bad - weight: 15 + - quantity: 20 + weight: 2.5 + reagents: + - ChloralHydrate + - quantity: 10 + weight: 10 + reagents: + - Bleach + - CarpoToxin + - BuzzochloricBees + - Amatoxin + - quantity: 5 + weight: 2.5 + reagents: + - Lexorin - type: entity name: strange pill @@ -60,31 +86,32 @@ - type: RandomFillSolution solution: food weightedRandomId: RandomFillStrangePill - - type: Sprite - sprite: Objects/Specific/Chemistry/pills.rsi - layers: - - state: pill1 - map: [ "enum.DamageStateVisualLayers.Base" ] - - type: RandomSprite - available: - - enum.DamageStateVisualLayers.Base: - pill1: "" - pill2: "" - pill3: "" - pill4: "" - pill5: "" - pill6: "" - pill7: "" - pill8: "" - pill9: "" - pill10: "" - pill11: "" - pill12: "" - pill13: "" - pill14: "" - pill15: "" - pill16: "" - pill17: "" - pill18: "" - pill19: "" - pill20: "" +# RandomSprite does not work with pill component + # - type: Sprite + # sprite: Objects/Specific/Chemistry/pills.rsi + # layers: + # - state: pill1 + # map: [ "enum.DamageStateVisualLayers.Base" ] + # - type: RandomSprite + # available: + # - enum.DamageStateVisualLayers.Base: + # pill1: "" + # pill2: "" + # pill3: "" + # pill4: "" + # pill5: "" + # pill6: "" + # pill7: "" + # pill8: "" + # pill9: "" + # pill10: "" + # pill11: "" + # pill12: "" + # pill13: "" + # pill14: "" + # pill15: "" + # pill16: "" + # pill17: "" + # pill18: "" + # pill19: "" + # pill20: "" From 7a2892bc97c12b15b552e4ac404ba98ce2934c04 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 29 Aug 2024 13:22:14 +0000 Subject: [PATCH 196/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b3ef8b210bf..9e470b8f173 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: ShadowCommander - changes: - - message: Added a red light to firelocks when their warning lights are active. - type: Add - - message: Firelocks no longer require power to show warning lights. - type: Tweak - id: 6747 - time: '2024-06-15T15:17:16.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29024 - author: Ian321 changes: - message: Donk co. microwaves now have their own machine board. @@ -3844,3 +3835,11 @@ id: 7246 time: '2024-08-29T03:23:37.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31616 +- author: MisterMecky + changes: + - message: Changed strange pill possible reagents. They are no longer mostly composed + of amatoxin and space mirage. + type: Tweak + id: 7247 + time: '2024-08-29T13:21:06.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30524 From a799d4a785e5bc5b1f33f6eb6197ba3efbb579fb Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Thu, 29 Aug 2024 11:26:32 -0700 Subject: [PATCH 197/223] Fix openable visuals (#31484) First commit --- .../Entities/Objects/Consumable/Food/Containers/box.yml | 4 ++++ .../Objects/Consumable/Smokeables/Cigarettes/cartons.yml | 1 + .../Objects/Consumable/Smokeables/Cigarettes/packs.yml | 2 ++ .../Entities/Objects/Consumable/Smokeables/Cigars/case.yml | 1 + Resources/Prototypes/Entities/Objects/Misc/medalcase.yml | 1 + Resources/Prototypes/Entities/Objects/base_item.yml | 6 ++++-- 6 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 66189b1dd36..5281d4be294 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -16,6 +16,7 @@ state: box layers: - state: box + map: ["closeLayer"] - state: box-open map: ["openLayer"] visible: false @@ -79,6 +80,7 @@ state: box-closed layers: - state: box-closed + map: ["closeLayer"] - state: box-open map: ["openLayer"] visible: false @@ -283,6 +285,7 @@ state: box layers: - state: box + map: ["closeLayer"] - state: box-open map: ["openLayer"] visible: false @@ -476,6 +479,7 @@ state: box layers: - state: box + map: ["closeLayer"] - state: box-open map: ["openLayer"] - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml index 47b8de4f559..6dcb627652a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml @@ -8,6 +8,7 @@ sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi layers: - state: closed + map: ["closeLayer"] - state: open map: ["openLayer"] - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index 94add0ae2ca..1ea01e26ab3 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -7,6 +7,7 @@ - type: Sprite layers: - state: closed + map: ["closeLayer"] - state: open map: ["openLayer"] visible: false @@ -75,6 +76,7 @@ - type: Sprite layers: - state: closed + map: ["closeLayer"] - state: open map: ["openLayer"] visible: false diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml index 2cfc429f626..5e91d53847f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml @@ -8,6 +8,7 @@ sprite: Objects/Consumable/Smokeables/Cigars/case.rsi layers: - state: closed + map: ["closeLayer"] - state: open map: ["openLayer"] - state: cigar1 diff --git a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml index d0e732e229c..9304d09eb69 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml @@ -8,6 +8,7 @@ sprite: Objects/Storage/medalcase.rsi layers: - state: closed + map: ["closeLayer"] - state: open map: ["openLayer"] - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml index 39bb8c3a2aa..61837aa1eb9 100644 --- a/Resources/Prototypes/Entities/Objects/base_item.yml +++ b/Resources/Prototypes/Entities/Objects/base_item.yml @@ -66,12 +66,14 @@ - type: Appearance - type: GenericVisualizer visuals: - enum.SharedBagOpenVisuals.BagState: + enum.SharedBagOpenVisuals.BagState: # You don't have to use both of these if its not necessary. + closeLayer: + Open: { visible: false } + Closed: { visible: true } openLayer: Open: { visible: true } Closed: { visible: false } - # PowerCellSlot parents - type: entity id: PowerCellSlotSmallItem From 3bdd2e3a872834b48595d33629046f4866016e31 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 29 Aug 2024 19:36:29 +0000 Subject: [PATCH 198/223] reduce lathe recipe copy pasta (#31515) * add inheritance to lathe recipes and make result an override * add GetResult method to lathe system * make other parts of the code use GetResult * clean up the stock parts yml * remove unused apu boards from dynamic recipes * make inverse dictionary public so test doesnt have to copy paste * revert result override stuff --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Tests/MaterialArbitrageTest.cs | 9 ++---- Content.Shared/Lathe/SharedLatheSystem.cs | 14 ++++---- .../Prototypes/LatheRecipePrototype.cs | 12 ++++++- .../Entities/Structures/Machines/lathe.yml | 2 -- Resources/Prototypes/Recipes/Lathes/Parts.yml | 32 ++++++++++++------- 5 files changed, 41 insertions(+), 28 deletions(-) diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs index c48afd819be..ae094052205 100644 --- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs +++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs @@ -44,6 +44,7 @@ public async Task NoMaterialArbitrage() var pricing = entManager.System(); var stackSys = entManager.System(); var mapSystem = server.System(); + var latheSys = server.System(); var compFact = server.ResolveDependency(); Assert.That(mapSystem.IsInitialized(testMap.MapId)); @@ -53,12 +54,8 @@ public async Task NoMaterialArbitrage() var materialName = compFact.GetComponentName(typeof(MaterialComponent)); var destructibleName = compFact.GetComponentName(typeof(DestructibleComponent)); - // construct inverted lathe recipe dictionary - Dictionary> latheRecipes = new(); - foreach (var proto in protoManager.EnumeratePrototypes()) - { - latheRecipes.GetOrNew(proto.Result).Add(proto); - } + // get the inverted lathe recipe dictionary + var latheRecipes = latheSys.InverseRecipes; // Lets assume the possible lathe for resource multipliers: // TODO: each recipe can technically have its own cost multiplier associated with it, so this test needs redone to factor that in. diff --git a/Content.Shared/Lathe/SharedLatheSystem.cs b/Content.Shared/Lathe/SharedLatheSystem.cs index e240571f315..dd251ed18b3 100644 --- a/Content.Shared/Lathe/SharedLatheSystem.cs +++ b/Content.Shared/Lathe/SharedLatheSystem.cs @@ -19,7 +19,7 @@ public abstract class SharedLatheSystem : EntitySystem [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly SharedMaterialStorageSystem _materialStorage = default!; - private readonly Dictionary> _inverseRecipeDictionary = new(); + public readonly Dictionary> InverseRecipes = new(); public override void Initialize() { @@ -83,20 +83,20 @@ private void OnPrototypesReloaded(PrototypesReloadedEventArgs obj) private void BuildInverseRecipeDictionary() { - _inverseRecipeDictionary.Clear(); + InverseRecipes.Clear(); foreach (var latheRecipe in _proto.EnumeratePrototypes()) { - if (latheRecipe.Result == null) + if (latheRecipe.Result is not {} result) continue; - _inverseRecipeDictionary.GetOrNew(latheRecipe.Result).Add(latheRecipe); + InverseRecipes.GetOrNew(result).Add(latheRecipe); } } public bool TryGetRecipesFromEntity(string prototype, [NotNullWhen(true)] out List? recipes) { recipes = new(); - if (_inverseRecipeDictionary.TryGetValue(prototype, out var r)) + if (InverseRecipes.TryGetValue(prototype, out var r)) recipes.AddRange(r); return recipes.Count != 0; } @@ -111,7 +111,7 @@ public string GetRecipeName(LatheRecipePrototype proto) if (!string.IsNullOrWhiteSpace(proto.Name)) return Loc.GetString(proto.Name); - if (proto.Result is { } result) + if (proto.Result is {} result) { return _proto.Index(result).Name; } @@ -137,7 +137,7 @@ public string GetRecipeDescription(LatheRecipePrototype proto) if (!string.IsNullOrWhiteSpace(proto.Description)) return Loc.GetString(proto.Description); - if (proto.Result is { } result) + if (proto.Result is {} result) { return _proto.Index(result).Description; } diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs index 40c20df3437..0fabbd67166 100644 --- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs +++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs @@ -4,17 +4,27 @@ using Content.Shared.Materials; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array; using Robust.Shared.Utility; namespace Content.Shared.Research.Prototypes { [NetSerializable, Serializable, Prototype] - public sealed partial class LatheRecipePrototype : IPrototype + public sealed partial class LatheRecipePrototype : IPrototype, IInheritingPrototype { [ViewVariables] [IdDataField] public string ID { get; private set; } = default!; + /// + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + /// + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } + /// /// Name displayed in the lathe GUI. /// diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ba20a7b0cdd..c606e26f8f5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -495,8 +495,6 @@ - PortableGeneratorPacmanMachineCircuitboard - PortableGeneratorSuperPacmanMachineCircuitboard - PortableGeneratorJrPacmanMachineCircuitboard - - WallmountGeneratorElectronics - - WallmountGeneratorAPUElectronics - WallmountSubstationElectronics - PowerCageRechargerCircuitboard - EmitterCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/Parts.yml b/Resources/Prototypes/Recipes/Lathes/Parts.yml index 90cff2174d6..0202919cb9a 100644 --- a/Resources/Prototypes/Recipes/Lathes/Parts.yml +++ b/Resources/Prototypes/Recipes/Lathes/Parts.yml @@ -1,26 +1,34 @@ +# Non-stackable part that can have a use outside of machines - type: latheRecipe - id: CapacitorStockPart - result: CapacitorStockPart + abstract: true + id: BasePartRecipe category: Parts + completetime: 2 + materials: + Steel: 300 + Plastic: 200 + +# Stackable part with no function +- type: latheRecipe + abstract: true + parent: BasePartRecipe + id: BaseStockPartRecipe completetime: 1 materials: Steel: 50 Plastic: 50 - type: latheRecipe + parent: BaseStockPartRecipe + id: CapacitorStockPart + result: CapacitorStockPart + +- type: latheRecipe + parent: BaseStockPartRecipe id: MatterBinStockPart result: MatterBinStockPart - category: Parts - completetime: 1 - materials: - Steel: 50 - Plastic: 50 - type: latheRecipe + parent: BaseStockPartRecipe id: MicroManipulatorStockPart result: MicroManipulatorStockPart - category: Parts - completetime: 1 - materials: - Steel: 50 - Plastic: 50 From 46329a98ebd9aafdccc64ef4cd5a53e6f570c0c2 Mon Sep 17 00:00:00 2001 From: Spessmann <156740760+Spessmann@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:17:25 -0700 Subject: [PATCH 199/223] cog update (#31631) * cog update * woopsie, fixed that --- Resources/Maps/cog.yml | 463 +++++++++++++++++++----------- Resources/Prototypes/Maps/cog.yml | 4 +- 2 files changed, 297 insertions(+), 170 deletions(-) diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml index cf9c5df727b..8b19ce3fb8e 100644 --- a/Resources/Maps/cog.yml +++ b/Resources/Maps/cog.yml @@ -100,7 +100,7 @@ entities: version: 6 -2,-2: ind: -2,-2 - tiles: gQAAAAAAYAAAAAABYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAACcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAADcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAABcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAADcwAAAAABcwAAAAABcwAAAAACcwAAAAABcwAAAAABYAAAAAADYAAAAAACUQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAcwAAAAABcwAAAAADcwAAAAABcwAAAAABcwAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAABgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAADcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAB + tiles: gQAAAAAAYAAAAAABYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAcwAAAAAAcwAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAACgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACcwAAAAACcwAAAAACcwAAAAACcwAAAAADcwAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADcwAAAAABcwAAAAABcwAAAAACcwAAAAABcwAAAAABYAAAAAADYAAAAAACUQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcwAAAAABcwAAAAADcwAAAAABcwAAAAABcwAAAAACYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcwAAAAAAcwAAAAACcwAAAAAAcwAAAAADcwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAB version: 6 -2,0: ind: -2,0 @@ -116,7 +116,7 @@ entities: version: 6 -3,-2: ind: -3,-2 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAADgQAAAAAAcwAAAAACcwAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAABcwAAAAADcwAAAAAAcwAAAAABcwAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAABcwAAAAABcwAAAAACgQAAAAAAcwAAAAAAcwAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACcwAAAAACcwAAAAABcwAAAAACcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAACcwAAAAAAcwAAAAACcwAAAAACcwAAAAACgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAAAcwAAAAABcwAAAAACcwAAAAADcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABcwAAAAADcwAAAAAAcwAAAAACcwAAAAACgQAAAAAAIAAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAABIAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABgQAAAAAAIAAAAAAAIAAAAAABIAAAAAAAIAAAAAAAIAAAAAABIAAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAIAAAAAADIAAAAAADIAAAAAAAIAAAAAACIAAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAABIAAAAAADIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAIAAAAAADIAAAAAACIAAAAAABIAAAAAABIAAAAAAAgQAAAAAAYAAAAAADYAAAAAACgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAcwAAAAADcwAAAAAAcwAAAAACcwAAAAACcwAAAAADgQAAAAAAcwAAAAACcwAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcwAAAAAAcwAAAAAAcwAAAAADcwAAAAABcwAAAAADcwAAAAAAcwAAAAABcwAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAABcwAAAAABcwAAAAACgQAAAAAAcwAAAAAAcwAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACcwAAAAACcwAAAAABcwAAAAACcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAACcwAAAAAAcwAAAAACcwAAAAACcwAAAAACgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAAAcwAAAAABcwAAAAACcwAAAAADcwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAABcwAAAAADcwAAAAAAcwAAAAACcwAAAAACgQAAAAAAIAAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAABIAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAADYAAAAAADYAAAAAABgQAAAAAAIAAAAAAAIAAAAAABIAAAAAAAIAAAAAAAIAAAAAABIAAAAAADgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAIAAAAAADIAAAAAADIAAAAAAAIAAAAAACIAAAAAAAIAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAABIAAAAAADIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAIAAAAAADIAAAAAACIAAAAAABIAAAAAABIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAA version: 6 -1,-3: ind: -1,-3 @@ -348,7 +348,7 @@ entities: version: 6 2,4: ind: 2,4 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEAAAAAAEfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEAAAAAAEfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,4: ind: 1,4 @@ -9770,6 +9770,12 @@ entities: parent: 23717 - type: InstantAction container: 23717 + - uid: 19857 + components: + - type: Transform + parent: 9081 + - type: InstantAction + container: 9081 - uid: 27130 components: - type: Transform @@ -10320,12 +10326,10 @@ entities: parent: 12 - type: DeviceList devices: - - 9988 - 801 + - 9988 - 9987 - 800 - - 23933 - - 23934 - uid: 13076 components: - type: Transform @@ -16438,6 +16442,13 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,49.5 parent: 12 +- proto: AppleSeeds + entities: + - uid: 23539 + components: + - type: Transform + pos: 57.293247,57.90518 + parent: 12 - proto: ArrivalsShuttleTimer entities: - uid: 16552 @@ -19637,7 +19648,7 @@ entities: - uid: 25857 components: - type: Transform - pos: 57.5,57.5 + pos: 57.314083,57.13435 parent: 12 - proto: ButchCleaver entities: @@ -26905,6 +26916,11 @@ entities: - type: Transform pos: -52.5,61.5 parent: 12 + - uid: 11411 + components: + - type: Transform + pos: 41.5,9.5 + parent: 12 - uid: 11484 components: - type: Transform @@ -27015,11 +27031,6 @@ entities: - type: Transform pos: 40.5,8.5 parent: 12 - - uid: 12096 - components: - - type: Transform - pos: 39.5,8.5 - parent: 12 - uid: 12097 components: - type: Transform @@ -35110,6 +35121,16 @@ entities: - type: Transform pos: -27.5,61.5 parent: 12 + - uid: 23536 + components: + - type: Transform + pos: 30.5,19.5 + parent: 12 + - uid: 23537 + components: + - type: Transform + pos: 31.5,19.5 + parent: 12 - uid: 23661 components: - type: Transform @@ -38285,6 +38306,16 @@ entities: - type: Transform pos: 76.5,11.5 parent: 12 + - uid: 28556 + components: + - type: Transform + pos: 31.5,15.5 + parent: 12 + - uid: 28630 + components: + - type: Transform + pos: 32.5,19.5 + parent: 12 - uid: 28656 components: - type: Transform @@ -38550,6 +38581,11 @@ entities: - type: Transform pos: 5.5,-11.5 parent: 12 + - uid: 29093 + components: + - type: Transform + pos: 32.5,18.5 + parent: 12 - uid: 29124 components: - type: Transform @@ -71268,11 +71304,6 @@ entities: - type: Transform pos: 48.5,65.5 parent: 12 - - uid: 20257 - components: - - type: Transform - pos: 48.5,65.5 - parent: 12 - uid: 21079 components: - type: Transform @@ -72316,6 +72347,11 @@ entities: - type: Transform pos: 39.553215,-39.66256 parent: 12 + - uid: 23534 + components: + - type: Transform + pos: 29.5,19.5 + parent: 12 - uid: 23685 components: - type: Transform @@ -72393,7 +72429,7 @@ entities: - uid: 26218 components: - type: Transform - pos: -24.45467,34.820183 + pos: -24.520052,34.79124 parent: 12 - proto: ClothingHeadHatTophat entities: @@ -72573,6 +72609,11 @@ entities: - type: Transform pos: 55.691044,2.4305212 parent: 12 + - uid: 29095 + components: + - type: Transform + pos: 33.588707,-9.4461975 + parent: 12 - proto: ClothingMaskMuzzle entities: - uid: 2789 @@ -72803,7 +72844,7 @@ entities: - uid: 26217 components: - type: Transform - pos: -24.48592,34.466015 + pos: -24.514727,34.5396 parent: 12 - proto: ClothingOuterStraightjacket entities: @@ -75247,10 +75288,10 @@ entities: parent: 12 - proto: CrateNPCChicken entities: - - uid: 23514 + - uid: 23512 components: - type: Transform - pos: 60.5,53.5 + pos: 61.5,58.5 parent: 12 - proto: CrateRadiation entities: @@ -77924,11 +77965,6 @@ entities: - type: Transform pos: 37.5,-13.5 parent: 12 - - uid: 12317 - components: - - type: Transform - pos: 28.5,12.5 - parent: 12 - uid: 13004 components: - type: Transform @@ -85325,6 +85361,56 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,-0.5 parent: 12 + - uid: 29099 + components: + - type: Transform + pos: -9.5,-1.5 + parent: 12 + - uid: 29101 + components: + - type: Transform + pos: -10.5,-3.5 + parent: 12 + - uid: 29104 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-4.5 + parent: 12 + - uid: 29105 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-7.5 + parent: 12 + - uid: 29106 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-6.5 + parent: 12 + - uid: 29109 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-5.5 + parent: 12 + - uid: 29113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-8.5 + parent: 12 + - uid: 29160 + components: + - type: Transform + pos: -10.5,-9.5 + parent: 12 + - uid: 29161 + components: + - type: Transform + pos: -9.5,-11.5 + parent: 12 - uid: 29167 components: - type: Transform @@ -86428,8 +86514,16 @@ entities: - uid: 9081 components: - type: Transform - pos: 33.503143,-9.537357 + pos: 34.20329,-9.581614 parent: 12 + - type: GasTank + toggleActionEntity: 19857 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 19857 - uid: 16509 components: - type: Transform @@ -91787,7 +91881,6 @@ entities: deviceLists: - 23930 - 1699 - - 12032 - uid: 23934 components: - type: Transform @@ -91797,7 +91890,6 @@ entities: deviceLists: - 23930 - 1699 - - 12032 - uid: 23935 components: - type: Transform @@ -92556,12 +92648,12 @@ entities: - uid: 25859 components: - type: Transform - pos: 57.497177,57.99539 + pos: 57.657833,58.144764 parent: 12 - uid: 25860 components: - type: Transform - pos: 57.653427,58.37039 + pos: 57.376583,58.4156 parent: 12 - proto: FoodBanana entities: @@ -133487,6 +133579,11 @@ entities: rot: -1.5707963267948966 rad pos: -35.5,-4.5 parent: 12 + - uid: 28558 + components: + - type: Transform + pos: 30.5,19.5 + parent: 12 - uid: 28789 components: - type: Transform @@ -134222,25 +134319,29 @@ entities: - type: Transform pos: -1.5,29.5 parent: 12 - - uid: 23176 + - uid: 23523 components: - type: Transform - pos: 55.5,53.5 + rot: 1.5707963267948966 rad + pos: 61.5,52.5 parent: 12 - - uid: 29093 + - uid: 23524 components: - type: Transform - pos: 62.5,56.5 + rot: 1.5707963267948966 rad + pos: 55.5,52.5 parent: 12 - - uid: 29161 + - uid: 23528 components: - type: Transform - pos: 55.5,56.5 + rot: 1.5707963267948966 rad + pos: 55.5,57.5 parent: 12 - - uid: 29162 + - uid: 23529 components: - type: Transform - pos: 62.5,53.5 + rot: 1.5707963267948966 rad + pos: 62.5,57.5 parent: 12 - proto: HydroponicsToolClippers entities: @@ -134278,6 +134379,11 @@ entities: - type: Transform pos: -29.455309,52.314983 parent: 12 + - uid: 23538 + components: + - type: Transform + pos: 58.011997,58.63435 + parent: 12 - uid: 24099 components: - type: Transform @@ -143434,6 +143540,12 @@ entities: rot: 3.141592653589793 rad pos: 52.5,13.5 parent: 12 + - uid: 12096 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.5,58.5 + parent: 12 - uid: 12294 components: - type: Transform @@ -143515,166 +143627,114 @@ entities: rot: 3.141592653589793 rad pos: 14.5,51.5 parent: 12 - - uid: 23516 - components: - - type: Transform - pos: 62.5,54.5 - parent: 12 - - uid: 23517 - components: - - type: Transform - pos: 61.5,54.5 - parent: 12 - - uid: 23518 - components: - - type: Transform - pos: 60.5,54.5 - parent: 12 - - uid: 23519 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,53.5 - parent: 12 - uid: 23520 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,52.5 + rot: -1.5707963267948966 rad + pos: 60.5,52.5 parent: 12 - uid: 23521 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 57.5,52.5 + rot: 1.5707963267948966 rad + pos: 56.5,52.5 parent: 12 - uid: 23522 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 57.5,53.5 - parent: 12 - - uid: 23523 - components: - - type: Transform - pos: 56.5,54.5 - parent: 12 - - uid: 23524 - components: - - type: Transform - pos: 55.5,54.5 + rot: 3.141592653589793 rad + pos: 55.5,53.5 parent: 12 - uid: 23525 components: - type: Transform - pos: 54.5,54.5 + pos: 54.5,56.5 parent: 12 - uid: 23526 components: - type: Transform - rot: 3.141592653589793 rad - pos: 54.5,55.5 + pos: 55.5,56.5 parent: 12 - uid: 23527 components: - type: Transform - rot: 3.141592653589793 rad - pos: 55.5,55.5 + rot: 1.5707963267948966 rad + pos: 56.5,57.5 parent: 12 - - uid: 23528 + - uid: 23541 components: - type: Transform rot: 3.141592653589793 rad - pos: 56.5,55.5 + pos: 54.5,53.5 parent: 12 - - uid: 23529 + - uid: 23542 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 57.5,56.5 + rot: 1.5707963267948966 rad + pos: 56.5,58.5 parent: 12 - - uid: 23530 + - uid: 23544 components: - type: Transform rot: -1.5707963267948966 rad - pos: 57.5,57.5 + pos: 60.5,57.5 parent: 12 - - uid: 23531 + - uid: 24009 components: - type: Transform rot: -1.5707963267948966 rad - pos: 57.5,58.5 - parent: 12 - - uid: 23532 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,56.5 + pos: 10.5,5.5 parent: 12 - - uid: 23533 + - uid: 24491 components: - type: Transform rot: 1.5707963267948966 rad - pos: 59.5,57.5 + pos: 27.5,65.5 parent: 12 - - uid: 23534 + - uid: 24492 components: - type: Transform rot: 1.5707963267948966 rad - pos: 59.5,58.5 + pos: 27.5,68.5 parent: 12 - - uid: 23535 + - uid: 25089 components: - type: Transform - rot: 3.141592653589793 rad - pos: 60.5,55.5 + rot: -1.5707963267948966 rad + pos: 10.5,3.5 parent: 12 - - uid: 23536 + - uid: 28614 components: - type: Transform rot: 3.141592653589793 rad - pos: 61.5,55.5 + pos: 61.5,53.5 parent: 12 - - uid: 23537 + - uid: 28615 components: - type: Transform rot: 3.141592653589793 rad - pos: 62.5,55.5 + pos: 63.5,52.5 parent: 12 - - uid: 23538 + - uid: 28616 components: - type: Transform rot: 3.141592653589793 rad - pos: 63.5,55.5 - parent: 12 - - uid: 24009 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,5.5 - parent: 12 - - uid: 24012 - components: - - type: Transform - pos: 64.5,53.5 + pos: 64.5,52.5 parent: 12 - - uid: 24491 + - uid: 28618 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,65.5 + pos: 61.5,56.5 parent: 12 - - uid: 24492 + - uid: 28619 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,68.5 + pos: 62.5,56.5 parent: 12 - - uid: 25089 + - uid: 28620 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,3.5 + pos: 63.5,56.5 parent: 12 - uid: 29605 components: @@ -143731,48 +143791,48 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,51.5 parent: 12 - - uid: 23543 + - uid: 23514 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 63.5,53.5 + rot: 3.141592653589793 rad + pos: 60.5,53.5 parent: 12 -- proto: RailingCornerSmall - entities: - - uid: 4854 + - uid: 23516 components: - type: Transform rot: 1.5707963267948966 rad - pos: 11.5,-7.5 + pos: 62.5,53.5 parent: 12 - - uid: 23539 + - uid: 23517 components: - type: Transform - rot: 3.141592653589793 rad - pos: 59.5,54.5 + rot: 1.5707963267948966 rad + pos: 56.5,53.5 parent: 12 - - uid: 23540 + - uid: 23519 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 57.5,54.5 + rot: -1.5707963267948966 rad + pos: 60.5,56.5 parent: 12 - - uid: 23541 + - uid: 23540 components: - type: Transform - pos: 57.5,55.5 + pos: 56.5,56.5 parent: 12 - - uid: 23542 +- proto: RailingCornerSmall + entities: + - uid: 4854 components: - type: Transform rot: 1.5707963267948966 rad - pos: 63.5,54.5 + pos: 11.5,-7.5 parent: 12 - - uid: 23544 + - uid: 23518 components: - type: Transform rot: -1.5707963267948966 rad - pos: 59.5,55.5 + pos: 62.5,52.5 parent: 12 - uid: 24493 components: @@ -156010,10 +156070,11 @@ entities: parent: 12 - proto: SpawnMobGoat entities: - - uid: 23512 + - uid: 23176 components: - type: Transform - pos: 62.5,57.5 + rot: 1.5707963267948966 rad + pos: 61.5,52.5 parent: 12 - proto: SpawnMobLizard entities: @@ -156062,6 +156123,38 @@ entities: - type: Transform pos: 26.5,50.5 parent: 12 +- proto: SpawnMobMouse + entities: + - uid: 12317 + components: + - type: Transform + pos: 49.5,-33.5 + parent: 12 + - uid: 20257 + components: + - type: Transform + pos: 33.5,19.5 + parent: 12 + - uid: 23530 + components: + - type: Transform + pos: -19.5,49.5 + parent: 12 + - uid: 23533 + components: + - type: Transform + pos: 12.5,61.5 + parent: 12 + - uid: 24012 + components: + - type: Transform + pos: 6.5,-36.5 + parent: 12 + - uid: 28557 + components: + - type: Transform + pos: -44.5,-15.5 + parent: 12 - proto: SpawnMobPossumMorty entities: - uid: 8913 @@ -161911,6 +162004,13 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,44.5 parent: 12 +- proto: TableFancyBlue + entities: + - uid: 29094 + components: + - type: Transform + pos: 29.5,19.5 + parent: 12 - proto: TableGlass entities: - uid: 2524 @@ -163562,7 +163662,7 @@ entities: - uid: 12309 components: - type: Transform - pos: 28.536324,14.49559 + pos: 28.44084,14.530041 parent: 12 - proto: ToiletDirtyWater entities: @@ -163951,6 +164051,20 @@ entities: - type: Transform pos: 46.734783,18.325827 parent: 12 +- proto: ToyFigurineLawyer + entities: + - uid: 13018 + components: + - type: Transform + pos: -24.507706,34.6647 + parent: 12 +- proto: ToyFigurineLibrarian + entities: + - uid: 23531 + components: + - type: Transform + pos: 4.5918107,70.65668 + parent: 12 - proto: ToyFigurineMedicalDoctor entities: - uid: 2497 @@ -163965,6 +164079,13 @@ entities: - type: Transform pos: 4.221625,55.89063 parent: 12 +- proto: ToyFigurineMouse + entities: + - uid: 23532 + components: + - type: Transform + pos: 28.465582,12.573898 + parent: 12 - proto: ToyFigurineParamedic entities: - uid: 23413 @@ -163977,7 +164098,7 @@ entities: - uid: 20792 components: - type: Transform - pos: 45.559692,-8.416319 + pos: 48.020992,-11.095634 parent: 12 - proto: ToyFigurineSalvage entities: @@ -171386,11 +171507,6 @@ entities: - type: Transform pos: 30.5,15.5 parent: 12 - - uid: 11411 - components: - - type: Transform - pos: 31.5,15.5 - parent: 12 - uid: 11424 components: - type: Transform @@ -174366,12 +174482,6 @@ entities: rot: 1.5707963267948966 rad pos: 51.5,65.5 parent: 12 - - uid: 19857 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 47.5,67.5 - parent: 12 - uid: 20097 components: - type: Transform @@ -176083,6 +176193,11 @@ entities: - type: Transform pos: 11.5,-39.5 parent: 12 + - uid: 28613 + components: + - type: Transform + pos: 31.5,15.5 + parent: 12 - uid: 28741 components: - type: Transform @@ -184160,11 +184275,6 @@ entities: - type: Transform pos: -26.5,-10.5 parent: 12 - - uid: 13018 - components: - - type: Transform - pos: 29.5,19.5 - parent: 12 - uid: 16569 components: - type: Transform @@ -184220,6 +184330,11 @@ entities: - type: Transform pos: -50.5,-49.5 parent: 12 + - uid: 28559 + components: + - type: Transform + pos: 31.5,19.5 + parent: 12 - uid: 28652 components: - type: Transform @@ -184597,6 +184712,13 @@ entities: - type: Transform pos: 8.533746,65.62123 parent: 12 +- proto: WheatSeeds + entities: + - uid: 23543 + components: + - type: Transform + pos: 57.647415,57.40518 + parent: 12 - proto: Windoor entities: - uid: 2520 @@ -186224,6 +186346,11 @@ entities: - type: Transform pos: 12.5,60.5 parent: 12 + - uid: 23535 + components: + - type: Transform + pos: 30.5,19.5 + parent: 12 - uid: 25197 components: - type: Transform diff --git a/Resources/Prototypes/Maps/cog.yml b/Resources/Prototypes/Maps/cog.yml index efe283b3d91..48c29e14a85 100644 --- a/Resources/Prototypes/Maps/cog.yml +++ b/Resources/Prototypes/Maps/cog.yml @@ -2,8 +2,8 @@ id: Cog mapName: 'Cog' mapPath: /Maps/cog.yml - minPlayers: 35 - maxPlayers: 70 #big map + minPlayers: 40 + maxPlayers: 80 #big map stations: Cog: stationProto: StandardNanotrasenStation From 572392b5e3ab1a41bac3dd81bf76ca914e6ee891 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 30 Aug 2024 03:43:34 +0200 Subject: [PATCH 200/223] Fix energy shield visuals (#31619) fix energy shield visuals --- Resources/Prototypes/Entities/Objects/Shields/shields.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 929ebac6dd0..3bd4a89d532 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -416,6 +416,7 @@ radius: 1.5 energy: 2 color: blue + - type: ItemTogglePointLight - type: Reflect reflectProb: 0.95 reflects: From 3c28f83ea410b490225d4172654598edfa6e83ed Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 30 Aug 2024 01:44:42 +0000 Subject: [PATCH 201/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9e470b8f173..5395323b09e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Ian321 - changes: - - message: Donk co. microwaves now have their own machine board. - type: Fix - id: 6748 - time: '2024-06-15T15:44:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29037 - author: BombasterDS changes: - message: Added craftable mannequin that you can hang clothing on! @@ -3843,3 +3836,10 @@ id: 7247 time: '2024-08-29T13:21:06.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30524 +- author: slarticodefast + changes: + - message: Fixed energy shield visuals. + type: Fix + id: 7248 + time: '2024-08-30T01:43:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31619 From bdfc57c5ac0911ae7706676535ef7667df54a4d5 Mon Sep 17 00:00:00 2001 From: DieselMohawk Date: Thu, 29 Aug 2024 20:46:46 -0500 Subject: [PATCH 202/223] Added Armband Onto Back Sprite of Security Jumpsuit (#31635) * Fixed Minor Mistake * Fixed the NEW sprite and added Jumpskirt Fix --- .../security.rsi/equipped-INNERCLOTHING.png | Bin 995 -> 1035 bytes .../security.rsi/equipped-INNERCLOTHING.png | Bin 1038 -> 1077 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png index 360927b0ef11599f198e17bfcef7ed2ebe2c0077..81e2d3d44b122d49f34bde922f135bab9dc094c2 100644 GIT binary patch delta 1000 zcmVELV1Khw@AE6~HtUjNvinqA zw#u_L!@B3y4_ujb(k{B$sQ0xi=LsULKBE);Kou#a=KEaEQI;VD*_we=T*jQPJDzPz zN>@!-mlSigQNLE6A>^7i04!6ATrL+#|DIn3N~t+DIf-RT9p!Vnj!#dYxCXG=s5^#h zC$#H)JC-TM)PLk8D5Zh)eGN#LD##a$kY)Lr3970({>~7BZAl3nEDzg~f(#*^b(SfG zEX&9ji%6F$f!g&nfVrP8RbUwZ=A1nUP1CG(loa(%6?4h#%jtIy`X-`5HXYsal!`}E5Yf^?~3&42x%`uDvaRxdBH|GnxORI7N9 z_jn204$pg@2E6(6tL;jfAp~P%W3Enny~jhlcKkj7kG`h?t?Z4DqBt>uAw_{o2wu+5 zV}EcEny#Z#uOokQ0%*ZkY+m-pN6}bVK)GDT$E78d%Vi7?4_nv6!$WR;E(2DoRV-dy z002gG9e-zp;F+%D@zobNXf~mFHP9g|)hZTucOCld3IGp6==&~$jEzLXoQ}mX;R0gj^8$Yfqy_C5C{YUfj}S-2n2VObxARI2r+jE ziR1@RUUmpE!ydzN{U{1JlOeJ-1I&bOodySufnAw?DlUhLfjdLw!=rHkz}wG90AL+l z-b987i@~0l(RxC}8w1w}csKMA$s|ECNw73AWt{@E&fgUF&fAaU-EtND;4)x#b_Rul zj(?-0WAyh+j%W5Xm8fae>Le$D%YZ^b$E%+|uzQk6rBb#6nbY-9?uW&$XE!6vkvx|H z&%b`NgkD_y4lUX(?Al@D;NAt;>d)>w4Im75Eqg3s)*-IbVTRj$pVM_@BgzkQ({hU? zi~(F*ma3|*`)oWOhpMWWnVG@b+FGRB;9=I*mU(=93{BHetJPfVXqpzy(bz^JVJ=>s z&AFY=A2gehA5V2VhMvg}h$@Dj$`6PlhMvd|h%$zr$q$GshMvn0xGgaV1OkEJf8Z}; WqZ|B4!56~-0000)BfMBWz=2m}IwKp+s@O(Hy%eb1fQB+a6mtwy9*J5LaP^%?!>d+MktivFQgvb5z1L80D6IvzuYQp>fR zBnN6jR+9C#R->yuPe_+Gul_x^4vM1avokYzp(vL245j$|^oeZ%YpsUmb?t{QW; zS;X0QnUmx|-U6o2CT0Ha?eL@T`UbEGmrA9`%4yYdZFqRNt3Uhp+@6+K*f@6Mnm<3M zeoowXx>&oq!rqUXZBTaNZujxxcO0Jk91VE;_jk{gG=EPBCMPFtop!p9hhF2jJpdkk zM*}+9otnV$^fX3g87d)owXlG_kr8N=qS|QS=;Q>@_*QIQ{np|lDwPU8Eia=|sbFku z%s3t#9B}J%8L(QbVd?S`05DD|&I!RYO7Zym3GBDq(3}S7lhs-cOFKIjeRc$Z2R`&& z7eU5GB7dRJMWYzE+4osMbI~X^5{W?e|C`eHYybdE^m)Bs!qE3*0CWEgFkZJ#&I!R8 z5XxH+roQLZk_|c+jRLT`eRh5P+HL~?-dtP+{?AZY`rLs!xf{mBZ=1eAAP@)y0)apv z5C{Z0e@>TM4{dUGa;yKu-6#ak?E)7F<&uo zSBQLkGz9>7_vH`(jKt+lREV$`%!L`986w^oxZZ&GqYsfx5+suZ%hR()7M4x^rZ7+5 zoDR3ERd9pLfcg0p%4Lef!y<-;B+E5(nM&AnYV}i-z-2(WO!4~HPwbo=p<1mNfn+H4 z<$u0k%z9=s{G{Z$40!(SyCL-Q@{e!PpfGFuje~m^V5>hn?>7KHn6=EY_*sXzvcn9! z?>$2)3L(`8*=gCu;>Q54ElX8Z+kG}3k3&^eq*5uYudj!?4Q_31>BV9Znx>&%uiN&~ zG%cLe*hV6uFJ0&6?DF&b?RMztsi0#Rm^u1@uwodf`hYNE7>N3SFk={)`hc)v7`Xa? i+Y*C7AP@-t2mS%1s}GI0000@)LT3{wTx^mo2PrfrQK$*MrR6%bI^?^veUi`T zrqyq;tkd21^!y~hlLQzH27|$1Fc|(%QYwvWgt)~_1`Wr-PJgSF>Q^5(H9}lbE@m=b zeZz6QvZ{XM#-fw5=uWGZ>Q=8}gs#3|5dBCE8Ds8q$3exmy}CN3XgCgvnM_AL0PGPG zs}pL3xa+M}puSFNKpOzo7(=t!jHG|7UjxRNyI3gTh2&)bsMt0>6^o$;thZVn;W`N2 zI^T^o#;{l@fPXO-Nx!cHs+{Ba^c1;V4r`2cTq~E$9pCGeVvmr>#;UMK2FNYg-)^^2@7Ico|G6^$;aBC{8-M#z_0zpBp7Cp(;X0zJgWop_ z{hkhZ{o{M+OzNL~{od|&pDIb{_jEun>Xc%Bem=HP*U^syB?o*g6kz4^n3SzkF7?$>76sjxrm8#D`5 z9s+Vw;(s5D!^#2t2+al|URifYXw3matl>DopK@46I4opGi*ix(S$*?>ZisM`UrLgo zV%uKWi*OHnABl>#1O63^15|J5mx~XZxb>AL!LSrFuC(_i=o<_MgTY`h7z_r(KZDi+ zro1@$$hL>J2pWZbN?kyITV8oRKt2r7a2(HoxPNwoquK!c?!2(0n8|3_pu8;pe)b*! z;O*x_0Mepl0w+X-4MGbDu2QSopcDabvUjksK(Vkuv3h^e+Xa>lN&@kV%R9$_-paI+ z1D2LbI61L#czA?t_IAg$qVE93F!5^*vLB(eBzAIQ8j zzJEHUfMO&nMZm+aUp%45?oTD5VWYb!s{Ah?W?fMh!b$ED%bKz+I`fd$)>znhuh{m; zhJZlF0m=~&*7;GK5eU=NnTVAlV0L>OFL!qX^;1(*D6g)fR4M_Ro61J0+VJY=2$p5x z;^HE3{mIsrk_}2p%SL+4otw-CJS{>p?tcT4VaVqO{ZY_x9GvlMr6V%R#`>L*WakB8 zPSEMRHXG?Ncb`(X3AjzbP4YcJP$R_C->1~wNRMgRptUMlTcDQ$y8PimH#BDr2rF7c&{J zzTr4tnW{fbVh zjJcbgPFGz8K%Mh$n-uhKL^UuB!(Gnj@l5hE08}gsABx3*0RXVs>2!tbFobnJ3W|QD z12$|MpH5CNHGegQ2Zqsgtz0g5eXnzl8eYVp&qoUu}0mAzmwvEfn%fNNh zG`qfwaam(5mM9SVqEijW>FI#-ZQW0WZIQ3!O>*v#;OVy?=g3B?>1D}V7 zhh%+nDjd~j)TyvP>l-!;B@Y2PDe;fRQRM)Bgl2;=udF&Gl;!{-)^Hr)cRB2lG%93A zi*ix%zkee0fL@4jlV3`bpki5G*o$!YzmHH*cEG=ab^!GU{c`anh+CgD35KPZaizW2 zL0_ZMXfzs)Mx)Va{uz`OFy+O`hn6+6MbJSw;M@h&x8=#}0rFvphU0h!#I+kds13lc z&I>z=nT(PRB11SPtWpANS;3yP0*6%KR zyRfoBNg(dHymJhwtxS^~u(DD@t7YNn=os1T&8}-j-vNqI;@28xKZ3L*)@oUJ`qf6o zvT$$ywr7aEQIQ1lotC4o&N)DgL{bFY|MJ-rdgT5f35^=nMN#roK+L+LEQFKXC6+a1 zTYpsMA*HRcu<>58tg#INfrNrXi5h?yOo|$vO#HgcyT7{ zmB)2R%C9ZkL}94y@o{!OE*pkEACUA3k+`*EIUv!tli!|>OH*ma^iMd6%)EcG9U9Fw Z<|pA~5^X-JrI7#t002ovPDHLkV1lPe?Rx+K From 37b73542dbd3b85e30e7602327922729380fee38 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 30 Aug 2024 01:47:52 +0000 Subject: [PATCH 203/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5395323b09e..162054df594 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: BombasterDS - changes: - - message: Added craftable mannequin that you can hang clothing on! - type: Add - id: 6749 - time: '2024-06-15T17:50:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29004 - author: notafet changes: - message: The TEG must now be operated at higher temperatures to generate power. @@ -3843,3 +3836,10 @@ id: 7248 time: '2024-08-30T01:43:34.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31619 +- author: DieselMohawk + changes: + - message: Added Armband to back of Security Jumpsuit + type: Fix + id: 7249 + time: '2024-08-30T01:46:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31635 From 2adc49fd2e56cebaaebea2f351521206ff52a0c9 Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Fri, 30 Aug 2024 08:10:14 +0300 Subject: [PATCH 204/223] Update locale --- .../ss14-ru/prototypes/actions/types.ftl | 4 +- .../catalog/fills/boxes/emergency.ftl | 8 ++-- .../entities/clothing/belt/belts.ftl | 6 ++- .../entities/clothing/eyes/glasses.ftl | 2 + .../prototypes/entities/clothing/eyes/hud.ftl | 19 ++++++--- .../clothing/hands/base_clothinghands.ftl | 2 + .../entities/clothing/hands/rings.ftl | 12 ++++++ .../entities/markers/atmos_blocker.ftl | 3 ++ .../ss14-ru/prototypes/entities/mobs/base.ftl | 2 + .../entities/mobs/player/observer.ftl | 2 + .../entities/mobs/player/silicon.ftl | 31 ++++++++++++++ .../consumable/drinks/drinks_flasks.ftl | 2 +- .../objects/consumable/food/baked/bread.ftl | 4 ++ .../objects/consumable/food/baked/pizza.ftl | 4 ++ .../objects/consumable/food/ingredients.ftl | 4 ++ .../objects/consumable/food/produce.ftl | 4 ++ .../objects/specific/hydroponics/seeds.ftl | 2 + .../entities/objects/tools/blueprint.ftl | 8 ++++ .../objects/weapons/melee/baguette.ftl | 4 +- .../objects/weapons/throwable/croissant.ftl | 4 +- .../machines/computers/computers.ftl | 2 + .../entities/structures/machines/lathe.ftl | 2 +- .../structures/specific/atmospherics/vox.ftl | 15 +++++++ .../entities/structures/specific/xeno.ftl | 6 +++ .../structures/wallmounts/signs/posters.ftl | 8 ++-- .../entities/structures/walls/walls.ftl | 3 ++ .../structures/windows/plastitanium.ftl | 19 +++++++-- .../access/ui/door-electronics-window.ftl | 1 + .../administration/ui/silicon-law-ui.ftl | 1 + .../Locale/ru-RU/connection-messages.ftl | 32 ++++++++------ Resources/Locale/ru-RU/datasets/figurines.ftl | 3 ++ .../Locale/ru-RU/flavors/flavor-profiles.ftl | 1 + Resources/Locale/ru-RU/items/toggle.ftl | 2 + .../Locale/ru-RU/job/department-desc.ftl | 1 + Resources/Locale/ru-RU/job/department.ftl | 1 + .../Locale/ru-RU/job/job-description.ftl | 1 + Resources/Locale/ru-RU/job/job-names.ftl | 2 + .../components/health-analyzer-component.ftl | 9 ++-- .../nutrition/components/food-sequence.ftl | 8 ++-- .../Locale/ru-RU/paper/stamp-component.ftl | 1 + .../ru-RU/preferences/loadout-groups.ftl | 1 + .../Locale/ru-RU/preferences/loadouts.ftl | 3 ++ .../reagents/meta/consumable/drink/juice.ftl | 2 + .../ru-RU/research/components/blueprint.ftl | 2 + .../Locale/ru-RU/salvage/salvage-magnet.ftl | 2 + Resources/Locale/ru-RU/seeds/seeds.ftl | 2 + Resources/Locale/ru-RU/shuttles/emergency.ftl | 3 ++ .../Locale/ru-RU/silicons/station-ai.ftl | 11 +++++ .../entities/clothing/belt/belts.ftl | 6 ++- .../entities/clothing/eyes/glasses.ftl | 2 + .../prototypes/entities/clothing/eyes/hud.ftl | 2 + .../clothing/hands/base_clothinghands.ftl | 2 + .../entities/clothing/hands/rings.ftl | 12 ++++++ .../entities/markers/atmos_blocker.ftl | 3 ++ .../ss14-ru/prototypes/entities/mobs/base.ftl | 2 + .../entities/mobs/player/observer.ftl | 2 + .../entities/mobs/player/silicon.ftl | 31 ++++++++++++++ .../objects/consumable/food/baked/bread.ftl | 4 ++ .../objects/consumable/food/baked/pizza.ftl | 4 ++ .../objects/consumable/food/ingredients.ftl | 4 ++ .../objects/consumable/food/produce.ftl | 4 ++ .../entities/objects/materials/scrap.ftl | 42 +++++++++---------- .../entities/objects/misc/rubber_stamp.ftl | 2 + .../objects/specific/hydroponics/seeds.ftl | 2 + .../entities/objects/tools/blueprint.ftl | 8 ++++ .../machines/computers/computers.ftl | 2 + .../structures/specific/atmospherics/vox.ftl | 15 +++++++ .../entities/structures/specific/xeno.ftl | 6 +++ .../entities/structures/walls/walls.ftl | 3 ++ .../structures/windows/plastitanium.ftl | 13 ++++++ Resources/Locale/ru-RU/weather/weather.ftl | 3 ++ 71 files changed, 376 insertions(+), 69 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/rings.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl create mode 100644 Resources/Locale/ru-RU/access/ui/door-electronics-window.ftl create mode 100644 Resources/Locale/ru-RU/items/toggle.ftl create mode 100644 Resources/Locale/ru-RU/research/components/blueprint.ftl create mode 100644 Resources/Locale/ru-RU/silicons/station-ai.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl index 806b05ff349..99182d8b4df 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl @@ -6,8 +6,8 @@ ent-ActionTurnUndead = Turn Undead .desc = Succumb to your infection and become a zombie. ent-ActionToggleLight = Toggle Light .desc = Turn the light on and off. -ent-ActionOpenStorageImplant = Open Storage Implant - .desc = Opens the storage implant embedded under your skin +ent-ActionOpenStorageImplant = Toggle Storage Implant + .desc = Opens or closes the storage implant embedded under your skin ent-ActionActivateMicroBomb = Activate Microbomb .desc = Activates your internal microbomb, completely destroying you and your equipment ent-ActionActivateDeathAcidifier = Activate Death-Acidifier diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl index 50390cc63ef..b5c2b0407ee 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl @@ -28,11 +28,11 @@ ent-BoxHug = box of hugs ent-BoxHugNitrogen = { ent-BoxHug } .suffix = Emergency N2 .desc = { ent-BoxHug.desc } -ent-BoxMime = survival box - .desc = It's a box with basic internals inside. - .suffix = Emergency +ent-BoxMime = { ent-BoxSurvival } + .suffix = Mime, Emergency + .desc = { ent-BoxSurvival.desc } ent-BoxMimeNitrogen = { ent-BoxSurvivalNitrogen } - .suffix = Emergency N2 + .suffix = Mime, Emergency N2 .desc = { ent-BoxSurvivalNitrogen.desc } ent-BoxSurvivalSyndicate = extended-capacity survival box .desc = It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl index 890e2da94d0..0859c6a37ae 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl @@ -26,7 +26,7 @@ ent-ClothingBeltHolster = shoulder holster .desc = A holster to carry a handgun and ammo. WARNING: Badasses only. ent-ClothingBeltSyndieHolster = syndicate shoulder holster .desc = A deep shoulder holster capable of holding many types of ballistics. -ent-ClothingBeltSecurityWebbing = security webbing +ent-ClothingBeltSecurityWebbing = security carrier .desc = Unique and versatile chest rig, can hold security gear. ent-ClothingBeltMercWebbing = mercenary webbing .desc = Ideal for storing everything from ammo to weapons and combat essentials. @@ -36,7 +36,9 @@ ent-ClothingBeltMilitaryWebbing = chest rig .desc = A set of tactical webbing worn by Syndicate boarding parties. ent-ClothingBeltMilitaryWebbingMed = medical chest rig .desc = A set of tactical webbing worn by Gorlex Marauder medic operatives. -ent-ClothingBeltSuspenders = suspenders +ent-ClothingBeltSuspendersRed = red suspenders .desc = For holding your pants up. +ent-ClothingBeltSuspendersBlack = black suspenders + .desc = { ent-ClothingBeltSuspendersRed.desc } ent-ClothingBeltWand = wand belt .desc = A belt designed to hold various rods of power. A veritable fanny pack of exotic magic. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl index 374604b7c70..acc0ccdee6a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl @@ -20,6 +20,8 @@ ent-ClothingEyesGlassesSunglasses = sun glasses .desc = A pair of black sunglasses. ent-ClothingEyesGlassesSecurity = security glasses .desc = Upgraded sunglasses that provide flash immunity and a security HUD. +ent-ClothingEyesGlassesCommand = administration glasses + .desc = Upgraded sunglasses that provide flash immunity and show ID card status. ent-ClothingEyesGlassesMercenary = mercenary glasses .desc = Glasses made for combat, to protect the eyes from bright blinding flashes. ent-ClothingEyesGlassesThermal = optical thermal scanner diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl index c120ea1f171..222da61431c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl @@ -8,6 +8,8 @@ ent-ClothingEyesHudMedical = medical hud .desc = A heads-up display that scans the humanoids in view and provides accurate data about their health status. ent-ClothingEyesHudSecurity = security hud .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. +ent-ClothingEyesHudCommand = administration hud + .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status. ent-ClothingEyesHudBeer = beer goggles .desc = A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. ent-ClothingEyesHudFriedOnion = fried onion goggles @@ -28,22 +30,27 @@ ent-ClothingEyesHudSyndicate = syndicate visor .desc = The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination. ent-ClothingEyesHudSyndicateAgent = syndicate agent visor .desc = The Syndicate Agent's professional heads-up display, designed for quick diagnosis of their team's status. -ent-ClothingEyesGlassesHiddenSecurity = { ent-ClothingEyesGlassesSunglasses } +ent-ClothingEyesGlassesHiddenSecurity = { ent-['ClothingEyesGlassesSunglasses', 'ShowSecurityIcons'] } + .suffix = Syndicate - .desc = { ent-ClothingEyesGlassesSunglasses.desc } + .desc = { ent-['ClothingEyesGlassesSunglasses', 'ShowSecurityIcons'].desc } ent-ClothingEyesEyepatchHudMedical = medical hud eyepatch .desc = A heads-up display that scans the humanoids in view and provides accurate data about their health status. For true patriots. ent-ClothingEyesEyepatchHudMedicalFlipped = medical hud eyepatch - .desc = { ent-ClothingEyesEyepatchHudMedical.desc } + + .desc = { ent-['ClothingEyesEyepatchHudMedical', 'ClothingHeadEyeBaseFlipped'].desc } ent-ClothingEyesEyepatchHudSecurity = security hud eyepatch .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. For true patriots. ent-ClothingEyesEyepatchHudSecurityFlipped = security hud eyepatch - .desc = { ent-ClothingEyesEyepatchHudSecurity.desc } + + .desc = { ent-['ClothingEyesEyepatchHudSecurity', 'ClothingHeadEyeBaseFlipped'].desc } ent-ClothingEyesEyepatchHudBeer = beer hud eyepatch .desc = A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. For true patriots. ent-ClothingEyesEyepatchHudBeerFlipped = beer hud eyepatch - .desc = { ent-ClothingEyesEyepatchHudBeer.desc } + + .desc = { ent-['ClothingEyesEyepatchHudBeer', 'ClothingHeadEyeBaseFlipped'].desc } ent-ClothingEyesEyepatchHudDiag = diagnostic hud eyepatch .desc = A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. ent-ClothingEyesEyepatchHudDiagFlipped = diagnostic hud eyepatch - .desc = { ent-ClothingEyesEyepatchHudDiag.desc } + + .desc = { ent-['ClothingEyesEyepatchHudDiag', 'ClothingHeadEyeBaseFlipped'].desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl index 1b4b6767bb7..1f244bd2691 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl @@ -4,3 +4,5 @@ ent-ClothingHandsButcherable = { ent-ClothingHandsBase } .desc = { ent-ClothingHandsBase.desc } ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsButcherable } .desc = { ent-ClothingHandsButcherable.desc } +ent-RingBase = { ent-BaseItem } + .desc = { ent-BaseItem.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/rings.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/rings.ftl new file mode 100644 index 00000000000..63c705dbe55 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/hands/rings.ftl @@ -0,0 +1,12 @@ +ent-GoldRing = gold ring + .desc = A precious ring. +ent-SilverRing = silver ring + .desc = Looks slightly less valuable than a gold one. +ent-GoldRingDiamond = gold diamond ring + .desc = Made from ethically mined space diamonds. +ent-SilverRingDiamond = silver diamond ring + .desc = Made from ethically mined space diamonds. +ent-GoldRingGem = gold gem ring + .desc = Shiny and valuable! +ent-SilverRingGem = silver gem ring + .desc = Shiny and not quite as valuable! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl index 604617b3f6d..3a5f9e8def2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl @@ -10,3 +10,6 @@ ent-AtmosFixInstantPlasmaFireMarker = Atmos Fix Instant Plasmafire Marker .desc = INSTANT PLASMAFIRE ent-AtmosFixFreezerMarker = Atmos Fix Freezer Marker .desc = Change air temp to 235K, for freezer with a big of wiggle room to get set up. +ent-AtmosFixVoxMarker = { ent-AtmosFixNitrogenMarker } + .desc = Nitrogen @ 101 kPa, 20C + .suffix = Vox Atmosphere diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/base.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/base.ftl index e67e426f576..647e4cac106 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/base.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/base.ftl @@ -1,5 +1,7 @@ ent-BaseMob = { "" } .desc = { "" } +ent-MobPolymorphable = { "" } + .desc = { "" } ent-MobDamageable = { "" } .desc = { "" } ent-MobCombat = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/observer.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/observer.ftl index f42338dd12e..2f6750a1005 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/observer.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/observer.ftl @@ -1,3 +1,5 @@ +ent-Incorporeal = { "" } + .desc = Mobs without physical bodies ent-MobObserver = observer .desc = Boo! ent-ActionGhostBoo = Boo! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/silicon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/silicon.ftl index 984e922264b..a35f32e35bf 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/silicon.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/silicon.ftl @@ -1,3 +1,34 @@ +ent-AiHeld = { "" } + .desc = Components added / removed from an entity that gets inserted into an AI core. +ent-ActionJumpToCore = Jump to core + .desc = Sends your eye back to the core. +ent-ActionShowJobIcons = Show job icons + .desc = Shows job icons for crew members. +ent-ActionSurvCameraLights = Toggle camera lights + .desc = Enable surveillance camera lights near wherever you're viewing. +ent-AiHolder = { "" } + .desc = Handles AI interactions across holocards + AI cores +ent-AsimovCircuitBoard = circuit board (Crewsimov) + .desc = An electronics board containing the Crewsimov lawset. +ent-CorporateCircuitBoard = circuit board (Corporate) + .desc = An electronics board containing the Corporate lawset. +ent-NTDefaultCircuitBoard = circuit board (NT Default) + .desc = An electronics board containing the NT Default lawset. +ent-Intellicard = Intellicard + .desc = A storage device for AIs. + .suffix = Empty +ent-PlayerStationAiEmpty = AI Core + .desc = The latest in Artificial Intelligences. + .suffix = Empty +ent-PlayerStationAi = { ent-PlayerStationAiEmpty } + .suffix = Job spawn + .desc = { ent-PlayerStationAiEmpty.desc } +ent-StationAiBrain = { ent-PositronicBrain } + .suffix = DO NOT MAP + .desc = { ent-PositronicBrain.desc } +ent-StationAiHolo = AI eye + .desc = The AI's viewer. + .suffix = DO NOT MAP ent-PlayerBorgGeneric = { ent-BorgChassisGeneric } .suffix = Battery, Tools .desc = { ent-BorgChassisGeneric.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_flasks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_flasks.ftl index 1ea204681b4..7ca52fe2350 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_flasks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_flasks.ftl @@ -18,5 +18,5 @@ ent-DrinkLithiumFlask = lithium flask .desc = A flask with a Lithium Atom symbol on it. ent-DrinkVacuumFlask = vacuum flask .desc = Keeping your drinks at the perfect temperature since 1892. -ent-Pitcher = Metal Pitcher +ent-Pitcher = metal pitcher .desc = A stainless steel insulated pitcher. Everyone's best friend in the morning. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl index b6d1c44f61c..5657fd21ffa 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl @@ -10,6 +10,10 @@ ent-FoodBreadBanana = banana bread .desc = A heavenly and filling treat. ent-FoodBreadBananaSlice = banana bread slice .desc = A slice of delicious banana bread. +ent-FoodBreadCotton = cotton bread + .desc = Bread, but for moff. +ent-FoodBreadCottonSlice = cotton bread slice + .desc = A slice of (maybe) delicious cotton bread. ent-FoodBreadCorn = cornbread .desc = Some good down-home country-style, rootin'-tootin', revolver-shootin', dad-gum yeehaw cornbread. ent-FoodBreadCornSlice = cornbread slice diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl index 7adda7453e2..e39399a92e6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl @@ -44,3 +44,7 @@ ent-FoodPizzaUranium = spicy rock pizza .desc = Spicy pizza covered in peppers and uranium. ent-FoodPizzaUraniumSlice = slice of spicy rock pizza .desc = A glowing slice of spicy rock pizza. +ent-FoodPizzaCotton = cotton pizza + .desc = Flat fabric cotton dough with cotton topping. Incredible. +ent-FoodPizzaCottonSlice = slice of cotton pizza + .desc = A slice of cotton pizza. Cotton included. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl index 719a4ff8065..3fcd400cb8c 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl @@ -42,6 +42,8 @@ ent-FoodDoughTortillaSlice = tortilla dough slice .desc = A slice of tortilla dough. ent-FoodDoughTortillaFlat = flattened tortilla dough .desc = A flattened slice of tortilla dough, cook this to get a taco shell. +ent-FoodDoughCotton = cotton dough + .desc = A piece of fabric dough. ent-FoodDoughPastryBaseRaw = raw pastry base .desc = Must be cooked before use. ent-FoodDoughPastryBase = pastry base @@ -50,6 +52,8 @@ ent-FoodDoughPie = pie dough .desc = Cook it to get a pie. ent-FoodDoughFlat = flat dough .desc = A flattened dough. +ent-FoodDoughCottonFlat = flat cotton dough + .desc = A flattened cotton dough. ent-FoodDoughPizzaBaked = pizza bread .desc = Add ingredients to make a pizza. ent-FoodCakeBatter = cake batter diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl index 85bbc13a5c4..bb33fc22a0a 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl @@ -141,3 +141,7 @@ ent-CottonBol = cotton boll .desc = Moth people's favorite snack, and just as fluffy as them. ent-PyrottonBol = pyrotton boll .desc = This will probably set you on fire. +ent-FoodCherry = cherry + .desc = Juicy red cherry with a pit inside. +ent-TrashCherryPit = cherry pit + .desc = { ent-FoodInjectableBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl index 64dc622984c..69eea984a04 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl @@ -129,3 +129,5 @@ ent-RealCapfruitSeeds = packet of capfruit seeds ent-FakeCapfruitSeeds = { ent-RealCapfruitSeeds } .suffix = Fake .desc = { ent-RealCapfruitSeeds.desc } +ent-CherrySeeds = packet of cherry seeds + .desc = { ent-SeedBase.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl new file mode 100644 index 00000000000..e0c4b8eb279 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl @@ -0,0 +1,8 @@ +ent-BaseBlueprint = blueprint + .desc = A blueprint for some machine. It can be inserted into an autolathe. +ent-BlueprintFulton = fulton blueprint + .desc = A blueprint with a schematic of a fulton. It can be inserted into an autolathe. +ent-BlueprintSeismicCharge = seismic charge blueprint + .desc = A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe. +ent-BlueprintFlare = flare blueprint + .desc = A blueprint with a schematic of a flare. It can be inserted into an autolathe. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baguette.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baguette.ftl index bf244ac774c..47234fe284d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baguette.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/melee/baguette.ftl @@ -1,3 +1,3 @@ -ent-WeaponBaguette = baguette - .desc = Bon appétit! +ent-WeaponBaguette = { ent-FoodBreadBaguette } .suffix = Weapon + .desc = { ent-FoodBreadBaguette.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/croissant.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/croissant.ftl index f6e5ba0bf77..25bbd5b1849 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/croissant.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/croissant.ftl @@ -1,3 +1,3 @@ -ent-WeaponCroissant = croissant - .desc = Buttery, flaky goodness. +ent-WeaponCroissant = { ent-FoodBakedCroissant } .suffix = Weapon + .desc = { ent-FoodBakedCroissant.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl index d0564ea04dc..7974c5d9b00 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl @@ -66,3 +66,5 @@ ent-ComputerSensorMonitoring = sensor monitoring computer .suffix = TESTING, DO NOT MAP ent-ComputerRoboticsControl = robotics control console .desc = Used to remotely monitor, disable and destroy the station's cyborgs. +ent-StationAiUploadComputer = AI upload console + .desc = Used to update the laws of the station AI. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl index 7c925c82237..fda36043be7 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/lathe.ftl @@ -5,7 +5,7 @@ ent-BaseLatheLube = { ent-BaseLathe } ent-BaseHyperlathe = { "" } .desc = { "" } ent-Autolathe = autolathe - .desc = It produces basic items using metal and glass. + .desc = It produces basic items using metal and glass. Has the ability to process blueprints to print new recipes. ent-AutolatheHyperConvection = hyper convection autolathe .desc = A highly-experimental autolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively. ent-Protolathe = protolathe diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl new file mode 100644 index 00000000000..324b5e5958d --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl @@ -0,0 +1,15 @@ +ent-AirSensorVoxBase = { ent-AirSensorBase } + .suffix = Vox Atmosphere + .desc = { ent-AirSensorBase.desc } +ent-AirSensorVox = { ent-['AirSensorVoxBase', 'AirSensor'] } + + .desc = { ent-['AirSensorVoxBase', 'AirSensor'].desc } +ent-GasVentPumpVox = { ent-['AirSensorVoxBase', 'GasVentPump'] } + + .desc = { ent-['AirSensorVoxBase', 'GasVentPump'].desc } +ent-GasVentScrubberVox = { ent-['AirSensorVoxBase', 'GasVentScrubber'] } + + .desc = { ent-['AirSensorVoxBase', 'GasVentScrubber'].desc } +ent-AirAlarmVox = { ent-AirAlarm } + .suffix = Vox Atmosphere, auto mode disabled + .desc = { ent-AirAlarm.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl index 02df8743c89..5def4c94b30 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/xeno.ftl @@ -2,3 +2,9 @@ ent-XenoWardingTower = xeno warding tower .desc = { "" } ent-CarpStatue = carp statue .desc = A statue of one of the brave carp that got us where we are today. Made with real teeth! +ent-CarpStatueEmpty = { ent-CarpStatue } + .desc = A lump of precious metals, soon to be a brilliant carp statue. + .suffix = Empty +ent-CarpStatueEyes = { ent-CarpStatue } + .desc = A statue of one of the brave carp that got us where we are today. This one needs a dentist... + .suffix = Eyes diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl index 4f081db8453..16a420cdce6 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl @@ -212,12 +212,12 @@ ent-PosterLegitSafetyMothDelam = Safety Moth - Delamination Safety Precautions .desc = This informational poster uses Safety Moth™ to tell the viewer to hide in lockers when the Supermatter Crystal has delaminated, to prevent hallucinations. Evacuating might be a better strategy. ent-PosterLegitSafetyMothEpi = Safety Moth - Epinephrine .desc = This informational poster uses Safety Moth™ to inform the viewer to help injured/deceased crewmen with their epinephrine injectors. "Prevent organ rot with this one simple trick!" -ent-PosterLegitSafetyMothHardhat = Safety Moth - Hardhats - .desc = This informational poster uses Safety Moth™ to tell the viewer to wear hardhats in cautious areas. "It's like a lamp for your head!" -ent-PosterLegitSafetyMothMeth = Safety Moth - Methamphetamine - .desc = This informational poster uses Safety Moth™ to tell the viewer to seek CMO approval before cooking methamphetamine. "Stay close to the target temperature, and never go over!" ...You shouldn't ever be making this. ent-PosterLegitSafetyMothPiping = Safety Moth - Piping .desc = This informational poster uses Safety Moth™ to tell atmospheric technicians correct types of piping to be used. "Pipes, not Pumps! Proper pipe placement prevents poor performance!" +ent-PosterLegitSafetyMothMeth = Safety Moth - Methamphetamine + .desc = This informational poster uses Safety Moth™ to tell the viewer to seek CMO approval before cooking methamphetamine. "Stay close to the target temperature, and never go over!" ...You shouldn't ever be making this. +ent-PosterLegitSafetyMothHardhat = Safety Moth - Hardhats + .desc = This informational poster uses Safety Moth™ to tell the viewer to wear hardhats in cautious areas. "It's like a lamp for your head!" ent-PosterLegitVacation = Nanotrasen Corporate Perks: Vacation .desc = This informational poster provides information on some of the prizes available via the NT Corporate Perks program, including a two-week vacation for two on the resort world Idyllus. ent-PosterLegitPeriodicTable = Periodic Table of the Elements diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl index 445d36ad515..86fa382fe20 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/walls.ftl @@ -31,6 +31,9 @@ ent-WallPlastitanium = plastitanium wall ent-WallPlastitaniumDiagonal = plastitanium wall .suffix = diagonal .desc = { ent-WallShuttleDiagonal.desc } +ent-WallPlastitaniumDiagonalIndestructible = plastitanium wall + .desc = Keeps the air in and the greytide out. + .suffix = diagonal, indestructible ent-WallReinforced = reinforced wall .desc = { ent-BaseWall.desc } ent-WallReinforcedRust = reinforced wall diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl index 57216514981..fad8ba5d9fd 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl @@ -1,5 +1,18 @@ +ent-PlastitaniumWindowBase = plastitanium window + .desc = Don't smudge up the glass down there. +ent-PlastitaniumWindowSquareBase = plastitanium window + .desc = { ent-PlastitaniumWindowBase.desc } +ent-PlastitaniumWindowIndestructible = plastitanium window + .suffix = indestructible + .desc = { ent-PlastitaniumWindowSquareBase.desc } ent-PlastitaniumWindow = plastitanium window - .desc = { ent-Window.desc } -ent-PlastitaniumWindowDiagonal = { ent-ShuttleWindow } + .desc = { ent-PlastitaniumWindowSquareBase.desc } +ent-PlastitaniumWindowDiagonalBase = plastitanium window .suffix = diagonal - .desc = { ent-ShuttleWindow.desc } + .desc = { ent-PlastitaniumWindowBase.desc } +ent-PlastitaniumWindowDiagonalIndestructible = plastitanium window + .suffix = diagonal, indestructible + .desc = { ent-PlastitaniumWindowDiagonalBase.desc } +ent-PlastitaniumWindowDiagonal = plastitanium window + .suffix = diagonal + .desc = { ent-PlastitaniumWindowDiagonalBase.desc } diff --git a/Resources/Locale/ru-RU/access/ui/door-electronics-window.ftl b/Resources/Locale/ru-RU/access/ui/door-electronics-window.ftl new file mode 100644 index 00000000000..6a7b1c95c26 --- /dev/null +++ b/Resources/Locale/ru-RU/access/ui/door-electronics-window.ftl @@ -0,0 +1 @@ +door-electronics-configuration-title = Configure Access diff --git a/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl b/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl index 02b5555fee5..831bfad9e0f 100644 --- a/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl +++ b/Resources/Locale/ru-RU/administration/ui/silicon-law-ui.ftl @@ -8,3 +8,4 @@ silicon-law-ui-delete = Удалить silicon-law-ui-check-corrupted = Повреждённый закон silicon-law-ui-check-corrupted-tooltip = Если идентификатор закона будет установлен как «поврежденный», то символы будут перемешены. silicon-law-ui-placeholder = Введите здесь, чтобы изменить текст закона... +silicon-laws-updated = Updated laws diff --git a/Resources/Locale/ru-RU/connection-messages.ftl b/Resources/Locale/ru-RU/connection-messages.ftl index 0fac7f517fa..dd0fe58bc8c 100644 --- a/Resources/Locale/ru-RU/connection-messages.ftl +++ b/Resources/Locale/ru-RU/connection-messages.ftl @@ -1,15 +1,3 @@ -whitelist-not-whitelisted = Вас нет в вайтлисте. -# proper handling for having a min/max or not -whitelist-playercount-invalid = - { $min -> - [0] Вайтлист для этого сервера применяется только для числа игроков ниже { $max }. - *[other] - Вайтлист для этого сервера применяется только для числа игроков выше { $min } { $max -> - [2147483647] -> так что, возможно, вы сможете присоединиться позже. - *[other] -> и ниже { $max } игроков, так что, возможно, вы сможете присоединиться позже. - } - } -whitelist-not-whitelisted-rp = Вас нет в вайтлисте. Чтобы попасть в вайтлист, посетите наш Discord (ссылку можно найти по адресу https://discord.station14.ru). cmd-whitelistadd-desc = Добавить игрока в вайтлист сервера. cmd-whitelistadd-help = Использование: whitelistadd cmd-whitelistadd-existing = { $username } уже находится в вайтлисте! @@ -32,6 +20,26 @@ ban-banned-2 = Причина бана: "{ $reason }" ban-banned-3 = Попытки обойти этот бан, например, путём создания нового аккаунта, будут фиксироваться. soft-player-cap-full = Сервер заполнен! panic-bunker-account-denied = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже +whitelist-playtime = You do not have enough playtime to join this server. You need at least { $minutes } minutes of playtime to join this server. +whitelist-player-count = This server is currently not accepting players. Please try again later. +whitelist-notes = You currently have too many admin notes to join this server. You can check your notes by typing /adminremarks in chat. +whitelist-manual = You are not whitelisted on this server. +whitelist-blacklisted = You are blacklisted from this server. +whitelist-always-deny = You are not allowed to join this server. +whitelist-fail-prefix = Not whitelisted: { $msg } +whitelist-misconfigured = The server is misconfigured and is not accepting players. Please contact the server owner and try again later. +cmd-blacklistadd-desc = Adds the player with the given username to the server blacklist. +cmd-blacklistadd-help = Usage: blacklistadd +cmd-blacklistadd-existing = { $username } is already on the blacklist! +cmd-blacklistadd-added = { $username } added to the blacklist +cmd-blacklistadd-not-found = Unable to find '{ $username }' +cmd-blacklistadd-arg-player = [player] +cmd-blacklistremove-desc = Removes the player with the given username from the server blacklist. +cmd-blacklistremove-help = Usage: blacklistremove +cmd-blacklistremove-existing = { $username } is not on the blacklist! +cmd-blacklistremove-removed = { $username } removed from the blacklist +cmd-blacklistremove-not-found = Unable to find '{ $username }' +cmd-blacklistremove-arg-player = [player] panic-bunker-account-denied-reason = Этот сервер находится в режиме "Бункер", часто используемом в качестве меры предосторожности против рейдов. Новые подключения от аккаунтов, не соответствующих определённым требованиям, временно не принимаются. Повторите попытку позже Причина: "{ $reason }" panic-bunker-account-reason-account = Ваш аккаунт Space Station 14 слишком новый. Он должен быть старше { $minutes } минут panic-bunker-account-reason-overall = diff --git a/Resources/Locale/ru-RU/datasets/figurines.ftl b/Resources/Locale/ru-RU/datasets/figurines.ftl index f908c987397..43930e97eaa 100644 --- a/Resources/Locale/ru-RU/datasets/figurines.ftl +++ b/Resources/Locale/ru-RU/datasets/figurines.ftl @@ -21,6 +21,9 @@ figurines-mime-5 = ................ figurines-musician-1 = Never gonna give you up! figurines-musician-2 = Never gonna let you down! figurines-boxer-1 = Первое правило бойцовского клуба... +figurines-boxer-2 = We settle this in the ring, alright? +figurines-boxer-3 = I. AM. THE. CHAMPION!! +figurines-boxer-4 = Don't look at me, he was shot, not punched. figurines-captain-1 = Слава НТ! figurines-captain-2 = Как я получил эту должность? Да. figurines-captain-3 = Ядерный диск в безопасности. Где? Где-то. diff --git a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl index aa119eada1d..cda47d02a3a 100644 --- a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl @@ -126,6 +126,7 @@ flavor-complex-vegetables = как овощи ## Complex foodstuffs (cooked foods, joke flavors, etc) +flavor-complex-cherry = like cherries flavor-complex-pink = как розовый flavor-complex-curry = как карри flavor-complex-borsch-1 = как борщ diff --git a/Resources/Locale/ru-RU/items/toggle.ftl b/Resources/Locale/ru-RU/items/toggle.ftl new file mode 100644 index 00000000000..bcf5c161a6f --- /dev/null +++ b/Resources/Locale/ru-RU/items/toggle.ftl @@ -0,0 +1,2 @@ +item-toggle-activate = Activate +item-toggle-deactivate = Deactivate diff --git a/Resources/Locale/ru-RU/job/department-desc.ftl b/Resources/Locale/ru-RU/job/department-desc.ftl index 0632002c751..1c2df40c3f3 100644 --- a/Resources/Locale/ru-RU/job/department-desc.ftl +++ b/Resources/Locale/ru-RU/job/department-desc.ftl @@ -5,4 +5,5 @@ department-Engineering-description = Поддерживайте наличие department-Medical-description = Поддерживайте здоровье экипажа. department-Security-description = Поддерживайте порядок на станции. department-Science-description = Изучайте артефакты и аномалии, обеспечивайте членов экипажа новыми продвинутыми устройствами. +department-Silicon-description = Obey your laws and serve the crew. department-Specific-description = Должности, которые есть не на всех станциях. diff --git a/Resources/Locale/ru-RU/job/department.ftl b/Resources/Locale/ru-RU/job/department.ftl index 238822c978b..65620a033e3 100644 --- a/Resources/Locale/ru-RU/job/department.ftl +++ b/Resources/Locale/ru-RU/job/department.ftl @@ -5,4 +5,5 @@ department-Engineering = Инженерный отдел department-Medical = Медицинский отдел department-Security = Служба безопасности department-Science = Научный отдел +department-Silicon = Silicon department-Specific = На определённых станциях diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl index a2deba9868e..2217912a39e 100644 --- a/Resources/Locale/ru-RU/job/job-description.ftl +++ b/Resources/Locale/ru-RU/job/job-description.ftl @@ -43,6 +43,7 @@ job-description-salvagespec = Используйте магнит для при job-description-scientist = Исследуйте инопланетные артефакты, открывайте новые технологии, заменяйте оборудование станции новыми и усиленными его версиями, повышайте общую эффективность работы. job-description-security = Ловите преступников и врагов станции, следите за соблюдением закона и за тем, чтобы станция не погрузилась в беспорядки. job-description-serviceworker = Изучите основы барменского искусства, кулинарии, и выращивания растений. +job-description-station-ai = Follow your laws, serve the crew. job-description-visitor = Наслаждайтесь своим визитом на станцию. job-description-warden = Патрулируйте отдел безопасности, следите за тем, чтобы никто не воровал из оружейной, и чтобы все заключённые были оформлены и выпущены по окончании срока. job-description-zookeeper = Устройте весёлое шоу с милыми животными и космическими карпами, чтобы все члены экипажа могли ими полюбоваться. Эта должность доступна на станциях Gemini и Avrite. diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index e4e19116d93..a72a9b343d3 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -33,6 +33,7 @@ job-name-botanist = ботаник job-name-bartender = бармен job-name-passenger = пассажир job-name-salvagespec = утилизатор +job-name-station-ai = Station AI job-name-qm = квартирмейстер job-name-cargotech = грузчик job-name-chef = шеф-повар @@ -101,6 +102,7 @@ JobSecurityCadet = кадет СБ JobSecurityOfficer = офицер СБ JobServiceWorker = сервисный работник JobStationEngineer = инженер +JobStationAi = Station AI JobTechnicalAssistant = технический ассистент JobWarden = смотритель JobVisitor = посетитель diff --git a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl index 382693ee6eb..03d125d433c 100644 --- a/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl +++ b/Resources/Locale/ru-RU/medical/components/health-analyzer-component.ftl @@ -1,15 +1,18 @@ health-analyzer-window-no-patient-data-text = Нет данных о пациенте. health-analyzer-window-entity-unknown-text = неизвестно -health-analyzer-window-entity-health-text = Состояние { $entityName }: +health-analyzer-window-entity-unknown-species-text = Non-Humanoid +health-analyzer-window-entity-unknown-value-text = N/A +health-analyzer-window-entity-alive-text = Alive +health-analyzer-window-entity-dead-text = Dead +health-analyzer-window-entity-critical-text = Critical health-analyzer-window-entity-temperature-text = Температура: { $temperature } +health-analyzer-window-entity-status-text = Status: health-analyzer-window-entity-blood-level-text = Уровень крови: { $bloodLevel } health-analyzer-window-entity-bleeding-text = У пациента кровотечение! health-analyzer-window-entity-damage-total-text = Общие повреждения: { $amount } health-analyzer-window-damage-group-text = { $damageGroup }: { $amount } health-analyzer-window-damage-type-text = { $damageType }: { $amount } -health-analyzer-window-damage-type-duplicate-text = { $damageType }: { $amount } (повтор) health-analyzer-window-scan-mode-text = Режим сканирования: health-analyzer-window-scan-mode-active = АКТИВЕН health-analyzer-window-scan-mode-inactive = НЕАКТИВЕН -health-analyzer-window-malnutrition = Тяжёлое недоедание health-analyzer-popup-scan-target = { CAPITALIZE($user) } пытается просканировать вас! diff --git a/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl b/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl index 8f02ceb3b1b..189fd24ae14 100644 --- a/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/ru-RU/nutrition/components/food-sequence.ftl @@ -72,11 +72,11 @@ food-sequence-content-suppermatter = суперматерией food-sequence-content-capfruit = пистофруктом food-sequence-content-berries = ягодами food-sequence-content-spacemans-trumpet = космической трубкой +food-sequence-content-cherry = cherry # BURGERS -food-sequence-burger-gen = {$content}бургер - +food-sequence-burger-gen = { $content }бургер food-sequence-burger-content-raw-meat = сыро food-sequence-burger-content-meat = мясо food-sequence-burger-content-carp = карпо @@ -113,8 +113,8 @@ food-sequence-burger-content-spacemans-trumpet = космотруб # TACO -food-sequence-taco-gen = тако с {$content} +food-sequence-taco-gen = тако с { $content } # SKEWER -food-sequence-skewer-gen = шашлык с {$content} +food-sequence-skewer-gen = шашлык с { $content } diff --git a/Resources/Locale/ru-RU/paper/stamp-component.ftl b/Resources/Locale/ru-RU/paper/stamp-component.ftl index f6716499a63..509ccb2af7d 100644 --- a/Resources/Locale/ru-RU/paper/stamp-component.ftl +++ b/Resources/Locale/ru-RU/paper/stamp-component.ftl @@ -17,3 +17,4 @@ stamp-component-stamped-name-warden = Смотритель stamp-component-stamped-name-trader = Торговец stamp-component-stamped-name-syndicate = Синдикат stamp-component-stamped-name-ce = Старший инженер +stamp-component-stamped-name-greytide = Greytide diff --git a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl index 2090cb36cf8..8a2dfad262d 100644 --- a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl @@ -67,6 +67,7 @@ loadout-group-mime-mask = Мим, маска loadout-group-mime-jumpsuit = Мим, комбинезон loadout-group-mime-backpack = Мим, рюкзак loadout-group-mime-outerclothing = Мим, верхняя одежда +loadout-group-mime-belt = Mime belt loadout-group-musician-jumpsuit = Музыкант, комбинезон loadout-group-musician-outerclothing = Музыкант, верхняя одежда # Cargo diff --git a/Resources/Locale/ru-RU/preferences/loadouts.ftl b/Resources/Locale/ru-RU/preferences/loadouts.ftl index f1845514c75..04fe9d64e40 100644 --- a/Resources/Locale/ru-RU/preferences/loadouts.ftl +++ b/Resources/Locale/ru-RU/preferences/loadouts.ftl @@ -1,3 +1,6 @@ +# Name +loadout-name-edit-label = Custom name +loadout-name-edit-tooltip = 32 characters max. If no name is specified a random one may be chosen for you. # Restrictions loadout-restrictions = Ограничения loadouts-min-limit = Мин. кол-во: { $count } diff --git a/Resources/Locale/ru-RU/reagents/meta/consumable/drink/juice.ftl b/Resources/Locale/ru-RU/reagents/meta/consumable/drink/juice.ftl index 2128955ed8f..6dca2d4ac88 100644 --- a/Resources/Locale/ru-RU/reagents/meta/consumable/drink/juice.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/consumable/drink/juice.ftl @@ -28,3 +28,5 @@ reagent-name-juice-tomato = томатный сок reagent-desc-juice-tomato = Томаты превращённые в сок. Какая трата хороших помидоров, а? reagent-name-juice-watermelon = арбузный сок reagent-desc-juice-watermelon = Вкусный сок арбуза. +reagent-name-juice-cherry = cherry juice +reagent-desc-juice-cherry = Tasty cherry juice, sweet and tangy. diff --git a/Resources/Locale/ru-RU/research/components/blueprint.ftl b/Resources/Locale/ru-RU/research/components/blueprint.ftl new file mode 100644 index 00000000000..34c3a3c80e8 --- /dev/null +++ b/Resources/Locale/ru-RU/research/components/blueprint.ftl @@ -0,0 +1,2 @@ +blueprint-receiver-popup-insert = { CAPITALIZE(THE($user)) } inserted { THE($blueprint) } into { THE($receiver) }. +blueprint-receiver-popup-recipe-exists = The same blueprint was already inserted! diff --git a/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl b/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl index f680e834e79..1ab3db57a6d 100644 --- a/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl +++ b/Resources/Locale/ru-RU/salvage/salvage-magnet.ftl @@ -28,6 +28,8 @@ salvage-magnet-resources-count = [5] (Много) *[other] (Изобилие) } +# Debris +salvage-magnet-debris-ChunkDebris = Space Debris # Asteroids dungeon-config-proto-BlobAsteroid = Астероидный массив dungeon-config-proto-ClusterAsteroid = Астероидный кластер diff --git a/Resources/Locale/ru-RU/seeds/seeds.ftl b/Resources/Locale/ru-RU/seeds/seeds.ftl index 63daedf14a8..51fb3386131 100644 --- a/Resources/Locale/ru-RU/seeds/seeds.ftl +++ b/Resources/Locale/ru-RU/seeds/seeds.ftl @@ -128,3 +128,5 @@ seeds-pyrotton-name = пирохлопок seeds-pyrotton-display-name = куст пирохлопка seeds-capfruit-name = пистофрукт seeds-capfruit-display-name = пистофруктовое дерево +seeds-cherry-name = cherry +seeds-cherry-display-name = cherry tree diff --git a/Resources/Locale/ru-RU/shuttles/emergency.ftl b/Resources/Locale/ru-RU/shuttles/emergency.ftl index c1496071e13..a908207a47e 100644 --- a/Resources/Locale/ru-RU/shuttles/emergency.ftl +++ b/Resources/Locale/ru-RU/shuttles/emergency.ftl @@ -47,3 +47,6 @@ emergency-shuttle-ui-authorize = АВТОРИЗОВАТЬСЯ emergency-shuttle-ui-repeal = ПОВТОРИТЬ emergency-shuttle-ui-authorizations = Авторизации emergency-shuttle-ui-remaining = Осталось: { $remaining } +# Map Misc. +map-name-centcomm = Central Command +map-name-terminal = Arrivals Terminal diff --git a/Resources/Locale/ru-RU/silicons/station-ai.ftl b/Resources/Locale/ru-RU/silicons/station-ai.ftl new file mode 100644 index 00000000000..c49e7784b2b --- /dev/null +++ b/Resources/Locale/ru-RU/silicons/station-ai.ftl @@ -0,0 +1,11 @@ +# General +ai-wire-snipped = Wire has been cut at { $coords }. +wire-name-ai-vision-light = AIV +wire-name-ai-act-light = AIA +station-ai-takeover = AI takeover +# Radial actions +ai-open = Open actions +ai-close = Close actions +bolt-close = Close bolt +bolt-open = Open bolt +toggle-light = Toggle light diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl index 01e33e44c51..564a24784d0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/belt/belts.ftl @@ -36,7 +36,9 @@ ent-ClothingBeltMilitaryWebbing = армейская РПС .desc = Ременно-плечевая система тактических ремней, которую носят абордажные группы Синдиката. ent-ClothingBeltMilitaryWebbingMed = армейская РПС медика .desc = Ременно-плечевая система тактических ремней, которую носят оперативники-медики Мародёров Горлекса. -ent-ClothingBeltSuspenders = подтяжки - .desc = Для поддержания штанов. +ent-ClothingBeltSuspendersRed = red suspenders + .desc = For holding your pants up. +ent-ClothingBeltSuspendersBlack = black suspenders + .desc = { ent-ClothingBeltSuspendersRed.desc } ent-ClothingBeltWand = пояс для палочек .desc = Пояс, предназначенный для хранения различных волшебных палочек. Поясная сумка, полная экзотической магии. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl index e5cced36362..dbeb7aec2e3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl @@ -20,6 +20,8 @@ ent-ClothingEyesGlassesSunglasses = солнцезащитные очки .desc = Пара чёрных солнцезащитных очков. ent-ClothingEyesGlassesSecurity = очки охраны .desc = Модернизированные солнцезащитные очки с функцией защиты от вспышек и визором СБ. +ent-ClothingEyesGlassesCommand = administration glasses + .desc = Upgraded sunglasses that provide flash immunity and show ID card status. ent-ClothingEyesGlassesMercenary = очки наёмника .desc = Очки, созданные для ведения боя, для защиты глаз от ярких ослепляющих вспышек. ent-ClothingEyesGlassesThermal = оптический термальный сканер diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl index 8c1a8353601..c21769100b1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl @@ -8,6 +8,8 @@ ent-ClothingEyesHudMedical = медицинский визор .desc = Окуляр с индикатором на стекле, который сканирует гуманоидов в поле зрения и предоставляет точные данные о состоянии их здоровья. ent-ClothingEyesHudSecurity = визор охраны .desc = Окуляр с индикатором на стекле, который сканирует гуманоидов в поле зрения и предоставляет точные данные об их идентификационном статусе и записях в системе безопасности. +ent-ClothingEyesHudCommand = administration hud + .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status. ent-ClothingEyesHudBeer = пивные очки .desc = Пара солнцезащитных очков, оснащённых сканером реагентов, а также дающих понимание вязкости жидкости во время движения. ent-ClothingEyesHudFriedOnion = fried onion goggles diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl index 1b4b6767bb7..1f244bd2691 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/base_clothinghands.ftl @@ -4,3 +4,5 @@ ent-ClothingHandsButcherable = { ent-ClothingHandsBase } .desc = { ent-ClothingHandsBase.desc } ent-ClothingHandsGlovesSyntheticBase = { ent-ClothingHandsButcherable } .desc = { ent-ClothingHandsButcherable.desc } +ent-RingBase = { ent-BaseItem } + .desc = { ent-BaseItem.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl new file mode 100644 index 00000000000..63c705dbe55 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl @@ -0,0 +1,12 @@ +ent-GoldRing = gold ring + .desc = A precious ring. +ent-SilverRing = silver ring + .desc = Looks slightly less valuable than a gold one. +ent-GoldRingDiamond = gold diamond ring + .desc = Made from ethically mined space diamonds. +ent-SilverRingDiamond = silver diamond ring + .desc = Made from ethically mined space diamonds. +ent-GoldRingGem = gold gem ring + .desc = Shiny and valuable! +ent-SilverRingGem = silver gem ring + .desc = Shiny and not quite as valuable! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl index 604617b3f6d..3a5f9e8def2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/markers/atmos_blocker.ftl @@ -10,3 +10,6 @@ ent-AtmosFixInstantPlasmaFireMarker = Atmos Fix Instant Plasmafire Marker .desc = INSTANT PLASMAFIRE ent-AtmosFixFreezerMarker = Atmos Fix Freezer Marker .desc = Change air temp to 235K, for freezer with a big of wiggle room to get set up. +ent-AtmosFixVoxMarker = { ent-AtmosFixNitrogenMarker } + .desc = Nitrogen @ 101 kPa, 20C + .suffix = Vox Atmosphere diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/base.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/base.ftl index e67e426f576..647e4cac106 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/base.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/base.ftl @@ -1,5 +1,7 @@ ent-BaseMob = { "" } .desc = { "" } +ent-MobPolymorphable = { "" } + .desc = { "" } ent-MobDamageable = { "" } .desc = { "" } ent-MobCombat = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/observer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/observer.ftl index 96ba6227c90..68fd748a51b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/observer.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/observer.ftl @@ -1,3 +1,5 @@ +ent-Incorporeal = { "" } + .desc = Mobs without physical bodies ent-MobObserver = наблюдатель .desc = Буу! ent-ActionGhostBoo = Бу! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon.ftl index 6cfa1d4fa0b..5f6dc6869ec 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon.ftl @@ -1,3 +1,34 @@ +ent-AiHeld = { "" } + .desc = Components added / removed from an entity that gets inserted into an AI core. +ent-ActionJumpToCore = Jump to core + .desc = Sends your eye back to the core. +ent-ActionShowJobIcons = Show job icons + .desc = Shows job icons for crew members. +ent-ActionSurvCameraLights = Toggle camera lights + .desc = Enable surveillance camera lights near wherever you're viewing. +ent-AiHolder = { "" } + .desc = Handles AI interactions across holocards + AI cores +ent-AsimovCircuitBoard = circuit board (Crewsimov) + .desc = An electronics board containing the Crewsimov lawset. +ent-CorporateCircuitBoard = circuit board (Corporate) + .desc = An electronics board containing the Corporate lawset. +ent-NTDefaultCircuitBoard = circuit board (NT Default) + .desc = An electronics board containing the NT Default lawset. +ent-Intellicard = Intellicard + .desc = A storage device for AIs. + .suffix = Empty +ent-PlayerStationAiEmpty = AI Core + .desc = The latest in Artificial Intelligences. + .suffix = Empty +ent-PlayerStationAi = { ent-PlayerStationAiEmpty } + .suffix = Job spawn + .desc = { ent-PlayerStationAiEmpty.desc } +ent-StationAiBrain = { ent-PositronicBrain } + .suffix = DO NOT MAP + .desc = { ent-PositronicBrain.desc } +ent-StationAiHolo = AI eye + .desc = The AI's viewer. + .suffix = DO NOT MAP ent-PlayerBorgGeneric = { ent-BorgChassisGeneric } .desc = { ent-BorgChassisGeneric.desc } .suffix = Батарея, Инструменты diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl index 86654057ad9..b2907ce88f0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/bread.ftl @@ -10,6 +10,10 @@ ent-FoodBreadPlain = хлеб .desc = Обычный хлеб с Земли. ent-FoodBreadPlainSlice = ломтик хлеба .desc = Кусочек дома. +ent-FoodBreadCotton = cotton bread + .desc = Bread, but for moff. +ent-FoodBreadCottonSlice = cotton bread slice + .desc = A slice of (maybe) delicious cotton bread. ent-FoodBreadCorn = кукурузный хлеб .desc = Домашний кукурузный хлеб в стиле кантри, с привкусом стрельбы и ковбойского иии-ха. ent-FoodBreadCornSlice = ломтик кукурузного хлеба diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl index c1c5730ce45..6888b4a964b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/pizza.ftl @@ -44,3 +44,7 @@ ent-FoodPizzaUranium = острокаменная пицца .desc = Острая пицца с перчиками и ураном. ent-FoodPizzaUraniumSlice = ломтик острокаменной пиццы .desc = Светящийся кусочек острокаменной пиццы. +ent-FoodPizzaCotton = cotton pizza + .desc = Flat fabric cotton dough with cotton topping. Incredible. +ent-FoodPizzaCottonSlice = slice of cotton pizza + .desc = A slice of cotton pizza. Cotton included. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl index 0c8f33751f4..648ac94da95 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/ingredients.ftl @@ -42,6 +42,8 @@ ent-FoodDoughTortillaSlice = кусок теста тортильи .desc = Кусок теста тортильи. ent-FoodDoughTortillaFlat = плоское тесто тортильи .desc = Расплющенный кусок теста тортильи. Приготовьте его, чтобы получить лепёшку тако. +ent-FoodDoughCotton = cotton dough + .desc = A piece of fabric dough. ent-FoodDoughPastryBaseRaw = сырая основа для выпечки .desc = Перед использованием необходимо приготовить. ent-FoodDoughPastryBase = основа для выпечки @@ -50,6 +52,8 @@ ent-FoodDoughPie = тесто для пирога .desc = Приготовьте его, чтобы получить пирог. ent-FoodDoughFlat = плоское тесто .desc = Расплющенное тесто. +ent-FoodDoughCottonFlat = flat cotton dough + .desc = A flattened cotton dough. ent-FoodDoughPizzaBaked = основа для пиццы .desc = Добавьте ингредиенты для приготовления пиццы. ent-FoodCakeBatter = тесто для торта diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl index 738561c8d33..82593a784de 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl @@ -141,3 +141,7 @@ ent-CottonBol = хлопковый шарик .desc = Любимая закуска ниан, такая же пушистая, как и они. ent-PyrottonBol = пирохлопковый шарик .desc = Скорее всего, оно подожжёт вас. +ent-FoodCherry = cherry + .desc = Juicy red cherry with a pit inside. +ent-TrashCherryPit = cherry pit + .desc = { ent-FoodInjectableBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl index fc488443d51..af265af4b09 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/materials/scrap.ftl @@ -3,64 +3,64 @@ ent-BaseScrap = лом .suffix = Лом ent-ScrapSteel = взорванная куча стали .desc = Груда стали, сваренная вместе при экстремальной жаре. В целом она приличного размера, из неё можно получить достаточное количество листов. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapGlass = бракованные схемы .desc = Огромный комок различных схем, странным образом сплавленных вместе. Из него, вероятно, можно извлечь некоторые материалы. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapAirlock1 = дверь шлюза .desc = Раньше она задерживала воздух. Теперь, похоже, она вообще ничего не делает. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapAirlock2 = лампа шлюза .desc = Заслуживает уважения за то, что всё это время мигала красным. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapBucket = лопнувшее ведро .desc = Боже милостивый... - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapCamera = сломанная камера .desc = Возможно, она всё ещё наблюдает.. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapCanister1 = ручка канистры .desc = Помогает держать канистру. Теперь вам нужна лишь сама канистра. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapCanister2 = вентиль канистры .desc = Вентиль от канистры. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapCloset = дверь шкафчика .desc = Снесённая дверь из технического шкафа. Выглядит как хороший настенный декор. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapFaxMachine = факс .desc = Печальный результат слишком большого количества ASCII-артов, отправленных Центкому. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapFireExtinguisher = расколотый огнетушитель .desc = Большая трещина по центру заставляет беспокоиться за предыдущего пользователя. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapFirelock1 = дверь пожарного шлюза .desc = По крайней мере, вы всё ещё знаете, для чего она предназначена. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapFirelock2 = дверь пожарного шлюза .desc = О! Вот куда делась вторая половина! - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapFirelock3 = каркас пожарного шлюза .desc = { ent-BaseScrap.desc } - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapIntercom = обломок интеркома .desc = Хотелось бы, чтобы у него были хотя бы какие-то ключи шифрования. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapJetpack = расколотый джетпак .desc = Похоже, он больше не будет летать. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapMedkit = сломанная аптечка .desc = Надеюсь, она кому-то помогла. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapMopBucket = половина ведра для швабры .desc = Тайдеры умирают. Уборщики выживают. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapPAI = персональный ИИ .desc = Дружище! Ты ещё там? Алло? Дружище??? - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapPAIGold = позолочённый персональный ИИ .desc = Вау! Какая находка на миллион! Он мог бы стоить целое состояние... если бы он был в хорошем состоянии. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } ent-ScrapTube = разбитая пробирка с образцами .desc = Стеклянная трубка, содержащая какой-то редкий образец. Или, по крайней мере, раньше содержала. Сейчас там осталось совсем немного. - .suffix = {ent-BaseScrap.suffix} + .suffix = { ent-BaseScrap.suffix } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl index c24ef8e3893..47e7d353e8a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/rubber_stamp.ftl @@ -53,3 +53,5 @@ ent-RubberStampDenied = печать ОТКАЗАНО ent-RubberStampDetective = печать детектива .suffix = НЕ МАППИТЬ .desc = { ent-RubberStampBase.desc } +ent-RubberStampGreytide = greytide's rubber stamp + .desc = A rubber stamp for stamping important documents. The tide washes over you, just looking at it... diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl index ae42fef6dcf..897b0aae5fb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl @@ -129,3 +129,5 @@ ent-RealCapfruitSeeds = пакет семян (пистофрукт) ent-FakeCapfruitSeeds = { ent-RealCapfruitSeeds } .suffix = Боевой .desc = { ent-RealCapfruitSeeds.desc } +ent-CherrySeeds = packet of cherry seeds + .desc = { ent-SeedBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl new file mode 100644 index 00000000000..e0c4b8eb279 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl @@ -0,0 +1,8 @@ +ent-BaseBlueprint = blueprint + .desc = A blueprint for some machine. It can be inserted into an autolathe. +ent-BlueprintFulton = fulton blueprint + .desc = A blueprint with a schematic of a fulton. It can be inserted into an autolathe. +ent-BlueprintSeismicCharge = seismic charge blueprint + .desc = A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe. +ent-BlueprintFlare = flare blueprint + .desc = A blueprint with a schematic of a flare. It can be inserted into an autolathe. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl index 9f71099acc7..ba013e2eee4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl @@ -66,3 +66,5 @@ ent-ComputerSensorMonitoring = консоль мониторинга датчи .suffix = ТЕСТ, НЕ МАППИТЬ ent-ComputerRoboticsControl = консоль управления робототехникой .desc = Используется для дистанционного контроля, отключения и уничтожения киборгов станции. +ent-StationAiUploadComputer = AI upload console + .desc = Used to update the laws of the station AI. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl new file mode 100644 index 00000000000..324b5e5958d --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl @@ -0,0 +1,15 @@ +ent-AirSensorVoxBase = { ent-AirSensorBase } + .suffix = Vox Atmosphere + .desc = { ent-AirSensorBase.desc } +ent-AirSensorVox = { ent-['AirSensorVoxBase', 'AirSensor'] } + + .desc = { ent-['AirSensorVoxBase', 'AirSensor'].desc } +ent-GasVentPumpVox = { ent-['AirSensorVoxBase', 'GasVentPump'] } + + .desc = { ent-['AirSensorVoxBase', 'GasVentPump'].desc } +ent-GasVentScrubberVox = { ent-['AirSensorVoxBase', 'GasVentScrubber'] } + + .desc = { ent-['AirSensorVoxBase', 'GasVentScrubber'].desc } +ent-AirAlarmVox = { ent-AirAlarm } + .suffix = Vox Atmosphere, auto mode disabled + .desc = { ent-AirAlarm.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/xeno.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/xeno.ftl index 7b93cdeeb89..94d10c59a44 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/xeno.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/xeno.ftl @@ -2,3 +2,9 @@ ent-XenoWardingTower = охранная башня ксено .desc = { "" } ent-CarpStatue = статуя карпа .desc = Статуя одного из храбрых карпов, благодаря которому мы находимся там, где находимся. С настоящими зубами! +ent-CarpStatueEmpty = { ent-CarpStatue } + .desc = A lump of precious metals, soon to be a brilliant carp statue. + .suffix = Empty +ent-CarpStatueEyes = { ent-CarpStatue } + .desc = A statue of one of the brave carp that got us where we are today. This one needs a dentist... + .suffix = Eyes diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl index c2012213006..fa76593612e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl @@ -31,6 +31,9 @@ ent-WallPlastitanium = пластитановая стена ent-WallPlastitaniumDiagonal = пластитановая стена .suffix = Диагональ .desc = { ent-WallShuttleDiagonal.desc } +ent-WallPlastitaniumDiagonalIndestructible = plastitanium wall + .desc = Keeps the air in and the greytide out. + .suffix = diagonal, indestructible ent-WallReinforced = укреплённая стена .desc = { ent-BaseWall.desc } ent-WallReinforcedRust = укреплённая стена diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl index 54183faebe8..0def8b950ef 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/windows/plastitanium.ftl @@ -1,5 +1,18 @@ +ent-PlastitaniumWindowBase = plastitanium window + .desc = Don't smudge up the glass down there. +ent-PlastitaniumWindowSquareBase = plastitanium window + .desc = { ent-PlastitaniumWindowBase.desc } +ent-PlastitaniumWindowIndestructible = plastitanium window + .suffix = indestructible + .desc = { ent-PlastitaniumWindowSquareBase.desc } ent-PlastitaniumWindow = пластитановое стекло .desc = { ent-Window.desc } +ent-PlastitaniumWindowDiagonalBase = plastitanium window + .suffix = diagonal + .desc = { ent-PlastitaniumWindowBase.desc } +ent-PlastitaniumWindowDiagonalIndestructible = plastitanium window + .suffix = diagonal, indestructible + .desc = { ent-PlastitaniumWindowDiagonalBase.desc } ent-PlastitaniumWindowDiagonal = { ent-ShuttleWindow } .suffix = Дигональ .desc = { ent-ShuttleWindow.desc } diff --git a/Resources/Locale/ru-RU/weather/weather.ftl b/Resources/Locale/ru-RU/weather/weather.ftl index 78c79755d1b..e199ee14269 100644 --- a/Resources/Locale/ru-RU/weather/weather.ftl +++ b/Resources/Locale/ru-RU/weather/weather.ftl @@ -1,3 +1,6 @@ cmd-weather-desc = Устанавливает погоду для текущей карты. cmd-weather-help = weather cmd-weather-hint = Прототип погоды +cmd-weather-error-no-arguments = Not enough arguments! +cmd-weather-error-unknown-proto = Unknown Weather prototype! +cmd-weather-error-wrong-time = Time is in the wrong format! From dce0ce456919e4d4d0be22c6fbaa4528722a9437 Mon Sep 17 00:00:00 2001 From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Date: Fri, 30 Aug 2024 13:34:25 +0300 Subject: [PATCH 205/223] Add SpriteFadeComponent to potted plants (#31628) --- .../Prototypes/Entities/Structures/Furniture/potted_plants.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 2d35c94bf10..d1483327c60 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -5,6 +5,7 @@ description: A little bit of nature contained in a pot. abstract: true components: + - type: SpriteFade - type: Transform noRot: true - type: InteractionOutline From 46559197b044710c3fc6443f782ef537c85bfb46 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 30 Aug 2024 10:35:32 +0000 Subject: [PATCH 206/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 162054df594..2a12003ebfa 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: notafet - changes: - - message: The TEG must now be operated at higher temperatures to generate power. - type: Tweak - id: 6750 - time: '2024-06-15T21:05:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29050 - author: lzk228 changes: - message: Fixed ability for mime to not choose any mask. @@ -3843,3 +3836,10 @@ id: 7249 time: '2024-08-30T01:46:46.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31635 +- author: Winkarst-cpu + changes: + - message: Potted plants now fade their sprites, just like trees. + type: Tweak + id: 7250 + time: '2024-08-30T10:34:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31628 From 72832bf19dd509afb9069c1f1f92f80882a4373d Mon Sep 17 00:00:00 2001 From: AutoOtter Date: Fri, 30 Aug 2024 19:24:13 -0400 Subject: [PATCH 207/223] Meteor rock debuff (#31651) * Makes meteor swarms spawn meteorite walls with 1/10 health of an asteroid wall. * Changed MeteorRock prototype base - Rebased MeteorRock to AsteroidRock from Basewall - MeteorRock now only changes the Destructible damage value * Tried to fix comments --- .../Entities/Structures/Walls/meteor.yml | 219 ++++++++++++++++++ .../Prototypes/GameRules/meteorswarms.yml | 20 +- 2 files changed, 229 insertions(+), 10 deletions(-) create mode 100644 Resources/Prototypes/Entities/Structures/Walls/meteor.yml diff --git a/Resources/Prototypes/Entities/Structures/Walls/meteor.yml b/Resources/Prototypes/Entities/Structures/Walls/meteor.yml new file mode 100644 index 00000000000..6f310e3b742 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Walls/meteor.yml @@ -0,0 +1,219 @@ +# These define Meteor Walls separate from Asteroid walls so they have different properties +- type: entity + id: MeteorRock + parent: AsteroidRock + name: meteorite rock + description: What remains of a meteorite. + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 12 #This change makes meteorite walls easier to destroy for cleanup + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + +# Ore veins +- type: entity + id: MeteorRockCoal + parent: MeteorRock + description: An ore vein rich with coal. + suffix: Coal + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreCoal + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_coal + +- type: entity + id: MeteorRockGold + parent: MeteorRock + description: An ore vein rich with gold. + suffix: Gold + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreGold + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_gold + +- type: entity + id: MeteorRockDiamond + parent: MeteorRock + description: An ore vein rich with diamonds. + suffix: Diamond + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreDiamond + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_diamond + +- type: entity + id: MeteorRockPlasma + parent: MeteorRock + description: An ore vein rich with plasma. + suffix: Plasma + components: + - type: OreVein + oreChance: 1.0 + currentOre: OrePlasma + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_phoron + +- type: entity + id: MeteorRockQuartz + parent: MeteorRock + description: An ore vein rich with quartz. + suffix: Quartz + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreSpaceQuartz + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_quartz + +- type: entity + id: MeteorRockSilver + parent: MeteorRock + description: An ore vein rich with silver. + suffix: Silver + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreSilver + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_silver +# Tin name is a holdover from the asteroid.yml prototype. +- type: entity + id: MeteorRockTin + parent: MeteorRock + description: An ore vein rich with iron. + suffix: Iron + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreSteel + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_tin + +- type: entity + id: MeteorRockUranium + parent: MeteorRock + description: An ore vein rich with uranium. + suffix: Uranium + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreUranium + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_uranium + +- type: entity + id: MeteorRockBananium + parent: MeteorRock + description: An ore vein rich with bananium. + suffix: Bananium + components: + - type: OreVein + oreChance: 1.0 + currentOre: OreBananium + - type: Sprite + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west + - state: rock_bananium diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index 799b353eab5..6203ee35abf 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -38,16 +38,16 @@ - type: weightedRandomEntity id: MeteorSpawnAsteroidWallTable weights: - AsteroidRock: 10 - AsteroidRockCoal: 5 - AsteroidRockQuartz: 5 - AsteroidRockTin: 5 - AsteroidRockSilver: 2 - AsteroidRockGold: 2 - AsteroidRockPlasma: 2 - AsteroidRockDiamond: 2 - AsteroidRockUranium: 0.5 - AsteroidRockBananium: 0.5 + MeteorRock: 10 + MeteorRockCoal: 5 + MeteorRockQuartz: 5 + MeteorRockTin: 5 + MeteorRockSilver: 2 + MeteorRockGold: 2 + MeteorRockPlasma: 2 + MeteorRockDiamond: 2 + MeteorRockUranium: 0.5 + MeteorRockBananium: 0.5 # Event Schedulers From 9183c50d81a30c6bfdbe5cbbf8f5092a4002519c Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 30 Aug 2024 23:25:20 +0000 Subject: [PATCH 208/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2a12003ebfa..da8524f3b84 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Fixed ability for mime to not choose any mask. - type: Fix - id: 6751 - time: '2024-06-15T21:32:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29056 - author: FunTust changes: - message: Fixed hair disappearing when hats are tucked away in a pocket. @@ -3843,3 +3836,10 @@ id: 7250 time: '2024-08-30T10:34:25.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31628 +- author: AutoOtter + changes: + - message: Greatly reduced meteorite wall health for easier cleanup and repair. + type: Tweak + id: 7251 + time: '2024-08-30T23:24:13.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31651 From 849d3d9f5c43bcdc91b1f771a671a9abbe3f81e3 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 31 Aug 2024 12:35:30 +1000 Subject: [PATCH 209/223] Fix test threading (#31669) --- .../Tests/Actions/ActionPvsDetachTest.cs | 24 ++++++++++++------- .../Tests/Buckle/BuckleDragTest.cs | 6 ++++- Content.IntegrationTests/Tests/CargoTest.cs | 9 ++++--- .../Tests/Commands/SuicideCommandTests.cs | 6 ++--- .../Tests/Shuttle/DockTest.cs | 3 ++- 5 files changed, 32 insertions(+), 16 deletions(-) diff --git a/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs index 420a90a50bd..b07c352c81d 100644 --- a/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs +++ b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs @@ -32,11 +32,16 @@ public async Task TestActionDetach() // PVS-detach action entities // We do this by just giving them the ghost layer var visSys = server.System(); - var enumerator = server.Transform(ent).ChildEnumerator; - while (enumerator.MoveNext(out var child)) + + await server.WaitPost(() => { - visSys.AddLayer(child, (int) VisibilityFlags.Ghost); - } + var enumerator = server.Transform(ent).ChildEnumerator; + while (enumerator.MoveNext(out var child)) + { + visSys.AddLayer(child, (int)VisibilityFlags.Ghost); + } + }); + await pair.RunTicksSync(5); // Client's actions have left been detached / are out of view, but action comp state has not changed @@ -44,11 +49,14 @@ public async Task TestActionDetach() Assert.That(cSys.GetActions(cEnt).Count(), Is.EqualTo(initActions)); // Re-enter PVS view - enumerator = server.Transform(ent).ChildEnumerator; - while (enumerator.MoveNext(out var child)) + await server.WaitPost(() => { - visSys.RemoveLayer(child, (int) VisibilityFlags.Ghost); - } + var enumerator = server.Transform(ent).ChildEnumerator; + while (enumerator.MoveNext(out var child)) + { + visSys.RemoveLayer(child, (int) VisibilityFlags.Ghost); + } + }); await pair.RunTicksSync(5); Assert.That(sys.GetActions(ent).Count(), Is.EqualTo(initActions)); Assert.That(cSys.GetActions(cEnt).Count(), Is.EqualTo(initActions)); diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs index 82d5d3baa04..19e8aba1824 100644 --- a/Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs +++ b/Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs @@ -34,7 +34,11 @@ public async Task BucklePullTest() Assert.That(pullable.BeingPulled, Is.False); // Strap the human to the chair - Assert.That(Server.System().TryBuckle(sUrist, SPlayer, STarget.Value)); + await Server.WaitAssertion(() => + { + Assert.That(Server.System().TryBuckle(sUrist, SPlayer, STarget.Value)); + }); + await RunTicks(5); Assert.That(buckle.Buckled, Is.True); Assert.That(buckle.BuckledTo, Is.EqualTo(STarget)); diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs index 89018d9d17c..1b29e7ea7a9 100644 --- a/Content.IntegrationTests/Tests/CargoTest.cs +++ b/Content.IntegrationTests/Tests/CargoTest.cs @@ -257,9 +257,12 @@ public async Task StackPrice() var entManager = server.ResolveDependency(); var priceSystem = entManager.System(); - var ent = entManager.SpawnEntity("StackEnt", MapCoordinates.Nullspace); - var price = priceSystem.GetPrice(ent); - Assert.That(price, Is.EqualTo(100.0)); + await server.WaitAssertion(() => + { + var ent = entManager.SpawnEntity("StackEnt", MapCoordinates.Nullspace); + var price = priceSystem.GetPrice(ent); + Assert.That(price, Is.EqualTo(100.0)); + }); await pair.CleanReturnAsync(); } diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs index 540e86c650a..e1eef2be4a9 100644 --- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs +++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs @@ -143,10 +143,10 @@ await server.WaitPost(() => mobStateComp = entManager.GetComponent(player); mobThresholdsComp = entManager.GetComponent(player); damageableComp = entManager.GetComponent(player); - }); - if (protoMan.TryIndex("Slash", out var slashProto)) - damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5))); + if (protoMan.TryIndex("Slash", out var slashProto)) + damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5))); + }); // Check that running the suicide command kills the player // and properly ghosts them without them being able to return to their body diff --git a/Content.IntegrationTests/Tests/Shuttle/DockTest.cs b/Content.IntegrationTests/Tests/Shuttle/DockTest.cs index a1aa462a697..f6e99596e90 100644 --- a/Content.IntegrationTests/Tests/Shuttle/DockTest.cs +++ b/Content.IntegrationTests/Tests/Shuttle/DockTest.cs @@ -97,13 +97,14 @@ public async Task TestPlanetDock() var entManager = server.ResolveDependency(); var dockingSystem = entManager.System(); var mapSystem = entManager.System(); + MapGridComponent mapGrid = default!; - var mapGrid = entManager.AddComponent(map.MapUid); var shuttle = EntityUid.Invalid; // Spawn shuttle and affirm no valid docks. await server.WaitAssertion(() => { + mapGrid = entManager.AddComponent(map.MapUid); entManager.DeleteEntity(map.Grid); Assert.That(entManager.System().TryLoad(otherMap.MapId, "/Maps/Shuttles/emergency.yml", out var rootUids)); shuttle = rootUids[0]; From 9685abea2093821a7052721bee7bc1892f9a36dc Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sat, 31 Aug 2024 05:02:58 +0200 Subject: [PATCH 210/223] Fix revenant being blocked by walls (#31670) fix revenant being blocked by walls --- Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml index 19f43bf5509..cf964822f1f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml @@ -1,8 +1,8 @@ - type: entity id: MobRevenant parent: - - BaseMob - Incorporeal + - BaseMob name: revenant description: A spooky ghostie. components: From f5f777b924ddd6f98b200ac402299774879a009e Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 31 Aug 2024 03:04:05 +0000 Subject: [PATCH 211/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index da8524f3b84..ed7346e1da6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: FunTust - changes: - - message: Fixed hair disappearing when hats are tucked away in a pocket. - type: Fix - id: 6752 - time: '2024-06-15T21:42:13.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28949 - author: Cojoke-dot changes: - message: You can now find Jackboots in the security load-outs @@ -3843,3 +3836,10 @@ id: 7251 time: '2024-08-30T23:24:13.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31651 +- author: slarticodefast + changes: + - message: The revenant can now fly through walls again. + type: Fix + id: 7252 + time: '2024-08-31T03:02:58.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31670 From 8ca4337bd86a56fa85a051a6d45c0913e2ba6d46 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 31 Aug 2024 14:49:49 +1000 Subject: [PATCH 212/223] Update submodule to 233.0.0 (#31673) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index f659b2b58c7..c558a0327bc 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit f659b2b58c7d0784f3582b93ba368a529558d3fd +Subproject commit c558a0327bc8179e2618a4587e99c73cb3ae094c From 2d43bb6b3897d805b9f792c3d8aed85964f9174a Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sat, 31 Aug 2024 07:49:20 +0200 Subject: [PATCH 213/223] Fix broken tests directly mutating entities from wrong thread. (#31647) * Fix broken tests directly mutating entities from wrong thread. * fix build * gundam * stuff --------- Co-authored-by: metalgearsloth --- .../Tests/Actions/ActionPvsDetachTest.cs | 8 +++----- Content.IntegrationTests/Tests/CargoTest.cs | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs index b07c352c81d..45addff00bf 100644 --- a/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs +++ b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs @@ -32,16 +32,14 @@ public async Task TestActionDetach() // PVS-detach action entities // We do this by just giving them the ghost layer var visSys = server.System(); - - await server.WaitPost(() => + server.Post(() => { var enumerator = server.Transform(ent).ChildEnumerator; while (enumerator.MoveNext(out var child)) { - visSys.AddLayer(child, (int)VisibilityFlags.Ghost); + visSys.AddLayer(child, (int) VisibilityFlags.Ghost); } }); - await pair.RunTicksSync(5); // Client's actions have left been detached / are out of view, but action comp state has not changed @@ -49,7 +47,7 @@ await server.WaitPost(() => Assert.That(cSys.GetActions(cEnt).Count(), Is.EqualTo(initActions)); // Re-enter PVS view - await server.WaitPost(() => + server.Post(() => { var enumerator = server.Transform(ent).ChildEnumerator; while (enumerator.MoveNext(out var child)) diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs index 1b29e7ea7a9..37fd3a80f9a 100644 --- a/Content.IntegrationTests/Tests/CargoTest.cs +++ b/Content.IntegrationTests/Tests/CargoTest.cs @@ -253,12 +253,12 @@ public async Task StackPrice() { await using var pair = await PoolManager.GetServerClient(); var server = pair.Server; - var entManager = server.ResolveDependency(); - var priceSystem = entManager.System(); await server.WaitAssertion(() => { + var priceSystem = entManager.System(); + var ent = entManager.SpawnEntity("StackEnt", MapCoordinates.Nullspace); var price = priceSystem.GetPrice(ent); Assert.That(price, Is.EqualTo(100.0)); From 18f5a0dca88ca83a73adfb00066e287213bf0e7a Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 31 Aug 2024 18:24:12 +1000 Subject: [PATCH 214/223] Fix AI singulo shenanigans (#31556) * weh * Fix broken tests directly mutating entities from wrong thread. * fix build * gundam * weher * WHY --------- Co-authored-by: Pieter-Jan Briers --- .../EntitySystems/EventHorizonSystem.cs | 29 ++++++++++--------- .../EntitySystems/GravityWellSystem.cs | 24 +++++++++++---- Content.Shared/Physics/CollisionGroup.cs | 4 +++ .../Entities/Mobs/Player/narsie.yml | 8 ++--- .../Entities/Mobs/Player/observer.yml | 2 +- .../Entities/Mobs/Player/ratvar.yml | 8 ++--- .../Generation/Singularity/singularity.yml | 8 ++--- 7 files changed, 51 insertions(+), 32 deletions(-) diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs index 6e3d9e92516..3bf820535f0 100644 --- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs @@ -11,7 +11,9 @@ using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Map.Components; +using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Events; +using Robust.Shared.Physics.Systems; using Robust.Shared.Timing; namespace Content.Server.Singularity.EntitySystems; @@ -28,16 +30,20 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem [Dependency] private readonly IMapManager _mapMan = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SharedTransformSystem _xformSystem = default!; [Dependency] private readonly TagSystem _tagSystem = default!; #endregion Dependencies + private EntityQuery _physicsQuery; + public override void Initialize() { base.Initialize(); + _physicsQuery = GetEntityQuery(); + SubscribeLocalEvent(PreventConsume); - SubscribeLocalEvent(PreventConsume); SubscribeLocalEvent(PreventConsume); SubscribeLocalEvent(OnHorizonMapInit); SubscribeLocalEvent(OnStartCollide); @@ -159,24 +165,19 @@ public bool CanConsumeEntity(EntityUid hungry, EntityUid uid, EventHorizonCompon /// Attempts to consume all entities within a given distance of an entity; /// Excludes the center entity. /// - public void ConsumeEntitiesInRange(EntityUid uid, float range, TransformComponent? xform = null, EventHorizonComponent? eventHorizon = null) + public void ConsumeEntitiesInRange(EntityUid uid, float range, PhysicsComponent? body = null, EventHorizonComponent? eventHorizon = null) { - if (!Resolve(uid, ref xform, ref eventHorizon)) + if (!Resolve(uid, ref body, ref eventHorizon)) return; - var range2 = range * range; - var xformQuery = EntityManager.GetEntityQuery(); - var epicenter = _xformSystem.GetWorldPosition(xform, xformQuery); - foreach (var entity in _lookup.GetEntitiesInRange(_xformSystem.GetMapCoordinates(uid, xform), range, flags: LookupFlags.Uncontained)) + // TODO: Should be sundries + static-sundries but apparently this is load-bearing for SpawnAndDeleteAllEntitiesInTheSameSpot so go figure. + foreach (var entity in _lookup.GetEntitiesInRange(uid, range, flags: LookupFlags.Uncontained)) { if (entity == uid) continue; - if (!xformQuery.TryGetComponent(entity, out var entityXform)) - continue; - // GetEntitiesInRange gets everything in a _square_ centered on the given position, but we are a _circle_. If we don't have this check and the station is rotated it is possible for the singularity to reach _outside of the containment field_ and eat the emitters. - var displacement = _xformSystem.GetWorldPosition(entityXform, xformQuery) - epicenter; - if (displacement.LengthSquared() > range2) + // See TODO above + if (_physicsQuery.TryComp(entity, out var otherBody) && !_physics.IsHardCollidable((uid, null, body), (entity, null, otherBody))) continue; AttemptConsumeEntity(uid, entity, eventHorizon); @@ -318,11 +319,11 @@ public void ConsumeTilesInRange(EntityUid uid, float range, TransformComponent? ///
public void ConsumeEverythingInRange(EntityUid uid, float range, TransformComponent? xform = null, EventHorizonComponent? eventHorizon = null) { - if (!Resolve(uid, ref xform, ref eventHorizon)) + if (!Resolve(uid, ref eventHorizon)) return; if (eventHorizon.ConsumeEntities) - ConsumeEntitiesInRange(uid, range, xform, eventHorizon); + ConsumeEntitiesInRange(uid, range, null, eventHorizon); if (eventHorizon.ConsumeTiles) ConsumeTilesInRange(uid, range, xform, eventHorizon); } diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs index 8c884d023c4..7dcf3ef1ae5 100644 --- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs +++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Singularity.Components; using Content.Shared.Atmos.Components; using Content.Shared.Ghost; +using Content.Shared.Physics; using Content.Shared.Singularity.EntitySystems; using Robust.Shared.Map; using Robust.Shared.Map.Components; @@ -33,9 +34,18 @@ public sealed class GravityWellSystem : SharedGravityWellSystem ///
public const float MinGravPulseRange = 0.00001f; + private EntityQuery _wellQuery; + private EntityQuery _mapQuery; + private EntityQuery _gridQuery; + private EntityQuery _physicsQuery; + public override void Initialize() { base.Initialize(); + _wellQuery = GetEntityQuery(); + _mapQuery = GetEntityQuery(); + _gridQuery = GetEntityQuery(); + _physicsQuery = GetEntityQuery(); SubscribeLocalEvent(OnGravityWellStartup); var vvHandle = _vvManager.GetTypeHandler(); @@ -111,11 +121,15 @@ private void Update(EntityUid uid, TimeSpan frameTime, GravityWellComponent? gra /// The entity to check. private bool CanGravPulseAffect(EntityUid entity) { - return !( - EntityManager.HasComponent(entity) || - EntityManager.HasComponent(entity) || - EntityManager.HasComponent(entity) || - EntityManager.HasComponent(entity) + if (_physicsQuery.TryComp(entity, out var physics)) + { + if (physics.CollisionLayer == (int) CollisionGroup.GhostImpassable) + return false; + } + + return !(_gridQuery.HasComp(entity) || + _mapQuery.HasComp(entity) || + _wellQuery.HasComp(entity) ); } diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs index 9f8c5ad9bef..0a11f93dbc8 100644 --- a/Content.Shared/Physics/CollisionGroup.cs +++ b/Content.Shared/Physics/CollisionGroup.cs @@ -22,13 +22,17 @@ public enum CollisionGroup GhostImpassable = 1 << 5, // 32 Things impassible by ghosts/observers, ie blessed tiles or forcefields BulletImpassable = 1 << 6, // 64 Can be hit by bullets InteractImpassable = 1 << 7, // 128 Blocks interaction/InRangeUnobstructed + // Y dis door passable when all the others impassable / collision. DoorPassable = 1 << 8, // 256 Allows door to close over top, Like blast doors over conveyors for disposals rooms/cargo. MapGrid = MapGridHelpers.CollisionGroup, // Map grids, like shuttles. This is the actual grid itself, not the walls or other entities connected to the grid. // 32 possible groups + // Why dis exist AllMask = -1, + SingularityLayer = Opaque | Impassable | MidImpassable | HighImpassable | LowImpassable | BulletImpassable | InteractImpassable | DoorPassable, + // Humanoids, etc. MobMask = Impassable | HighImpassable | MidImpassable | LowImpassable, MobLayer = Opaque | BulletImpassable, diff --git a/Resources/Prototypes/Entities/Mobs/Player/narsie.yml b/Resources/Prototypes/Entities/Mobs/Player/narsie.yml index 7030572cf47..5d07409b5f8 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/narsie.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/narsie.yml @@ -52,18 +52,18 @@ restitution: 0.8 density: 99999 mask: - - AllMask + - SingularityLayer layer: - - AllMask + - SingularityLayer EventHorizonConsumer: shape: !type:PhysShapeCircle radius: 5 hard: false mask: - - AllMask + - SingularityLayer layer: - - AllMask + - SingularityLayer - type: Input context: "ghost" - type: MovementIgnoreGravity diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index 52994a72c65..5ceac9e773e 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -24,7 +24,7 @@ !type:PhysShapeCircle radius: 0.35 density: 15 - mask: + layer: - GhostImpassable - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml index 958c98f483e..530f5e10374 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml @@ -49,18 +49,18 @@ restitution: 0.8 density: 1 mask: - - AllMask + - SingularityLayer layer: - - AllMask + - SingularityLayer EventHorizonConsumer: shape: !type:PhysShapeCircle radius: 5 hard: false mask: - - AllMask + - SingularityLayer layer: - - AllMask + - SingularityLayer - type: Input context: "ghost" - type: MovementIgnoreGravity diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml index 25d219ab945..bf2c6cfcc0c 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml @@ -31,18 +31,18 @@ restitution: 0.8 density: 99999 mask: - - AllMask + - SingularityLayer layer: - - AllMask + - SingularityLayer EventHorizonConsumer: shape: !type:PhysShapeCircle radius: 0.35 hard: false mask: - - AllMask + - SingularityLayer layer: - - AllMask + - SingularityLayer - type: Singularity energy: 180 level: 1 From 2ae23bc71a0bb9d4a038c1fca161a540949fe601 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 31 Aug 2024 18:24:57 +1000 Subject: [PATCH 215/223] Update submodule to 233.0.1 (#31676) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index c558a0327bc..da56851846d 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit c558a0327bc8179e2618a4587e99c73cb3ae094c +Subproject commit da56851846d3fb33f7a77233fc3d505affd81ac1 From f22db1fa1b2d8177df92d791ea6efdb6b97568eb Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 31 Aug 2024 08:25:18 +0000 Subject: [PATCH 216/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ed7346e1da6..d65020af6d7 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Cojoke-dot - changes: - - message: You can now find Jackboots in the security load-outs - type: Add - - message: The Sec drobe no longer has a Cowboy hat or boots - type: Remove - id: 6753 - time: '2024-06-15T22:38:29.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29018 - author: Keer-Sar changes: - message: Fixed a spelling error in the cargo bounty for lungs. @@ -3843,3 +3834,10 @@ id: 7252 time: '2024-08-31T03:02:58.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31670 +- author: metalgearsloth + changes: + - message: Fix AI eye getting deleted by singulo. + type: Fix + id: 7253 + time: '2024-08-31T08:24:12.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31556 From 99db9ea39d3abfd896a081b6f58f142b8ef9fc25 Mon Sep 17 00:00:00 2001 From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Date: Sat, 31 Aug 2024 08:26:52 +0000 Subject: [PATCH 217/223] Fix suicide logs (#31661) Make suicide logs include the username, as well as the character(where possible) --- Content.Server/Chat/SuicideSystem.cs | 19 +++++++++++++++++-- Content.Server/Ghost/GhostSystem.cs | 6 +++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs index 69d87472fb2..4eda5323854 100644 --- a/Content.Server/Chat/SuicideSystem.cs +++ b/Content.Server/Chat/SuicideSystem.cs @@ -46,7 +46,15 @@ public bool Suicide(EntityUid victim) if (!TryComp(victim, out var mobState) || _mobState.IsDead(victim, mobState)) return false; + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} is attempting to suicide"); + + ICommonSession? session = null; + + if (TryComp(victim, out var actor)) + session = actor.PlayerSession; + var suicideGhostEvent = new SuicideGhostEvent(victim); + RaiseLocalEvent(victim, suicideGhostEvent); // Suicide is considered a fail if the user wasn't able to ghost @@ -54,11 +62,18 @@ public bool Suicide(EntityUid victim) if (!suicideGhostEvent.Handled || _tagSystem.HasTag(victim, "CannotSuicide")) return false; - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} is attempting to suicide"); var suicideEvent = new SuicideEvent(victim); RaiseLocalEvent(victim, suicideEvent); - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} suicided."); + // Since the player is already dead the log will not contain their username. + if (session != null) + { + _adminLogger.Add(LogType.Mind, $"{session:player} suicided."); + } + else + { + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} suicided."); + } return true; } diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index b0452143297..945b0ff998a 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -571,14 +571,14 @@ public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaComma } } + if (playerEntity != null) + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}"); + var ghost = SpawnGhost((mindId, mind), position, canReturn); if (ghost == null) return false; - if (playerEntity != null) - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}"); - return true; } } From 5ab065fc806e62135a2ce7682dc450777eae62d8 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 31 Aug 2024 08:27:58 +0000 Subject: [PATCH 218/223] Automatic changelog update --- Resources/Changelog/Admin.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index bd42b8ee7bd..47b42954723 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -499,5 +499,12 @@ Entries: id: 62 time: '2024-08-25T01:55:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31397 +- author: nikthechampiongr + changes: + - message: Suicide logs display username info again. + type: Fix + id: 63 + time: '2024-08-31T08:26:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31661 Name: Admin Order: 1 From 494024d2465dc65cef5d33c3ffbeb6f1d0a5b186 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sat, 31 Aug 2024 10:28:36 +0200 Subject: [PATCH 219/223] More ItemTogglePointLight fixes (#31655) more ItemTogglePointLight fixes --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 1 + .../Prototypes/Entities/Objects/Misc/arabianlamp.yml | 11 ++++++----- .../Prototypes/Entities/Objects/Tools/lighters.yml | 2 ++ .../Prototypes/Entities/Objects/Tools/welders.yml | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 6ac158630f9..0de4631b299 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1268,6 +1268,7 @@ right: - state: inhand-right-blade shader: unshaded + - type: ItemTogglePointLight - type: DisarmMalus malus: 0 - type: StaminaDamageOnHit diff --git a/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml index a15e30fbc72..791a0d09453 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml @@ -14,9 +14,9 @@ - type: EntityStorage capacity: 1 # Its smol. itemCanStoreMobs: false # just leaving this here explicitly since I know at some point someone will want to use this to hold a mob. This also prevents it from becoming His Grace. - # - type: StorageFill - # contents: - # - id: PuddleSparkle # Ha! Cute. Unfortunately it despawns before the container is likely to open. + # - type: StorageFill + # contents: + # - id: PuddleSparkle # Ha! Cute. Unfortunately it despawns before the container is likely to open. - type: ContainerContainer containers: entity_storage: !type:Container @@ -64,7 +64,7 @@ - type: Sprite sprite: Objects/Misc/arabianlamp.rsi layers: - - state: lamp + - state: lamp map: [ "enum.StorageVisualLayers.Base" ] - state: lamptop map: ["enum.StorageVisualLayers.Door"] @@ -130,10 +130,11 @@ netsync: false radius: 5 color: orange + - type: ItemTogglePointLight - type: StaticPrice price: 1500 - type: Prayable sentMessage: prayer-popup-notify-lamp-sent notificationPrefix: prayer-chat-notify-lamp verb: prayer-verbs-rub - verbImage: null \ No newline at end of file + verbImage: null diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml index d03cc725efe..c35d67e7eb4 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml @@ -87,6 +87,7 @@ netsync: false radius: 1.1 #smallest possible color: orange + - type: ItemTogglePointLight - type: entity name: cheap lighter @@ -205,6 +206,7 @@ netsync: false radius: 1.2 #slightly stronger than the other lighters color: orange + - type: ItemTogglePointLight - type: UseDelay - type: IgnitionSource ignited: false diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index cd188969b53..197dca00ff8 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -95,6 +95,7 @@ radius: 1.5 color: orange netsync: false + - type: ItemTogglePointLight - type: Appearance - type: RequiresEyeProtection - type: PhysicalComposition From 4435ccd29f326ef1ebb8df518c2f18623a46860d Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 31 Aug 2024 08:29:42 +0000 Subject: [PATCH 220/223] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index d65020af6d7..d0491e6c46c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Keer-Sar - changes: - - message: Fixed a spelling error in the cargo bounty for lungs. - type: Fix - id: 6754 - time: '2024-06-16T00:24:29.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29064 - author: Keer-Sar changes: - message: Non-humanoids' names are now capitalized when inserting materials into @@ -3841,3 +3834,11 @@ id: 7253 time: '2024-08-31T08:24:12.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31556 +- author: slarticodefast + changes: + - message: Fixed toggleable pointlights for the toy sword, lighters, welders and + arabian lamp. + type: Fix + id: 7254 + time: '2024-08-31T08:28:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31655 From 9a63144636f9ef272d955f1e131b17233c6ec5da Mon Sep 17 00:00:00 2001 From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Date: Sat, 31 Aug 2024 11:38:03 +0000 Subject: [PATCH 221/223] Allow for respawn and erase verb to be used on offline players. Also minor rewrite on respawn command and new erase command (#30433) * Localize respawn command, allow for it to use userids, and make it use [Dependency] attributes * Make respawn verb available for offline players * Make erase available for offline players A thousand admins rejoice * Reorder verbs in code * Add erase command * Fix localisation for erase command * Address reviews and add completion to respawn command * Complete reviews which I forgor --- Content.Server/Administration/BanPanelEui.cs | 5 +- .../Administration/Commands/EraseCommand.cs | 47 ++++++++++++++ .../Administration/Systems/AdminSystem.cs | 56 +++++++++-------- .../Administration/Systems/AdminVerbSystem.cs | 62 ++++++++++--------- Content.Server/Chat/Managers/ChatManager.cs | 8 +-- Content.Server/Chat/Managers/IChatManager.cs | 2 +- .../GameTicking/Commands/RespawnCommand.cs | 61 +++++++++++------- .../en-US/administration/commands/erase.ftl | 7 +++ .../en-US/administration/commands/respawn.ftl | 9 +++ 9 files changed, 172 insertions(+), 85 deletions(-) create mode 100644 Content.Server/Administration/Commands/EraseCommand.cs create mode 100644 Resources/Locale/en-US/administration/commands/erase.ftl create mode 100644 Resources/Locale/en-US/administration/commands/respawn.ftl diff --git a/Content.Server/Administration/BanPanelEui.cs b/Content.Server/Administration/BanPanelEui.cs index aa6bd8d4bfa..b3253f0d0cc 100644 --- a/Content.Server/Administration/BanPanelEui.cs +++ b/Content.Server/Administration/BanPanelEui.cs @@ -132,13 +132,12 @@ private async void BanPlayer(string? target, string? ipAddressString, bool useLa } if (erase && - targetUid != null && - _playerManager.TryGetSessionById(targetUid.Value, out var targetPlayer)) + targetUid != null) { try { if (_entities.TrySystem(out AdminSystem? adminSystem)) - adminSystem.Erase(targetPlayer); + adminSystem.Erase(targetUid.Value); } catch (Exception e) { diff --git a/Content.Server/Administration/Commands/EraseCommand.cs b/Content.Server/Administration/Commands/EraseCommand.cs new file mode 100644 index 00000000000..cb01d742a08 --- /dev/null +++ b/Content.Server/Administration/Commands/EraseCommand.cs @@ -0,0 +1,47 @@ +using System.Linq; +using Content.Server.Administration.Systems; +using Content.Shared.Administration; +using Robust.Server.Player; +using Robust.Shared.Console; + +namespace Content.Server.Administration.Commands; + +[AdminCommand(AdminFlags.Admin)] +public sealed class EraseCommand : LocalizedEntityCommands +{ + [Dependency] private readonly IPlayerLocator _locator = default!; + [Dependency] private readonly IPlayerManager _players = default!; + [Dependency] private readonly AdminSystem _admin = default!; + + public override string Command => "erase"; + + public override async void Execute(IConsoleShell shell, string argStr, string[] args) + { + if (args.Length != 1) + { + shell.WriteError(Loc.GetString("cmd-erase-invalid-args")); + shell.WriteLine(Help); + return; + } + + var located = await _locator.LookupIdByNameOrIdAsync(args[0]); + + if (located == null) + { + shell.WriteError(Loc.GetString("cmd-erase-player-not-found")); + return; + } + + _admin.Erase(located.UserId); + } + + public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + if (args.Length != 1) + return CompletionResult.Empty; + + var options = _players.Sessions.OrderBy(c => c.Name).Select(c => c.Name).ToArray(); + + return CompletionResult.FromHintOptions(options, Loc.GetString("cmd-erase-player-completion")); + } +} diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs index db22c41520d..99551c714c4 100644 --- a/Content.Server/Administration/Systems/AdminSystem.cs +++ b/Content.Server/Administration/Systems/AdminSystem.cs @@ -15,7 +15,9 @@ using Content.Shared.Hands.Components; using Content.Shared.IdentityManagement; using Content.Shared.Inventory; +using Content.Shared.Mind; using Content.Shared.PDA; +using Content.Shared.Players; using Content.Shared.Players.PlayTimeTracking; using Content.Shared.Popups; using Content.Shared.Roles; @@ -377,30 +379,32 @@ private void SendBabyJailStatusAll() } } - /// - /// Erases a player from the round. - /// This removes them and any trace of them from the round, deleting their - /// chat messages and showing a popup to other players. - /// Their items are dropped on the ground. - /// - public void Erase(ICommonSession player) - { - var entity = player.AttachedEntity; - _chat.DeleteMessagesBy(player); - - if (entity != null && !TerminatingOrDeleted(entity.Value)) + /// + /// Erases a player from the round. + /// This removes them and any trace of them from the round, deleting their + /// chat messages and showing a popup to other players. + /// Their items are dropped on the ground. + /// + public void Erase(NetUserId uid) { - if (TryComp(entity.Value, out TransformComponent? transform)) + _chat.DeleteMessagesBy(uid); + + if (!_minds.TryGetMind(uid, out var mindId, out var mind) || mind.OwnedEntity == null || TerminatingOrDeleted(mind.OwnedEntity.Value)) + return; + + var entity = mind.OwnedEntity.Value; + + if (TryComp(entity, out TransformComponent? transform)) { - var coordinates = _transform.GetMoverCoordinates(entity.Value, transform); - var name = Identity.Entity(entity.Value, EntityManager); + var coordinates = _transform.GetMoverCoordinates(entity, transform); + var name = Identity.Entity(entity, EntityManager); _popup.PopupCoordinates(Loc.GetString("admin-erase-popup", ("user", name)), coordinates, PopupType.LargeCaution); var filter = Filter.Pvs(coordinates, 1, EntityManager, _playerManager); var audioParams = new AudioParams().WithVolume(3); _audio.PlayStatic("/Audio/Effects/pop_high.ogg", filter, coordinates, true, audioParams); } - foreach (var item in _inventory.GetHandOrInventoryEntities(entity.Value)) + foreach (var item in _inventory.GetHandOrInventoryEntities(entity)) { if (TryComp(item, out PdaComponent? pda) && TryComp(pda.ContainedId, out StationRecordKeyStorageComponent? keyStorage) && @@ -424,29 +428,29 @@ keyStorage.Key is { } key && } } - if (_inventory.TryGetContainerSlotEnumerator(entity.Value, out var enumerator)) + if (_inventory.TryGetContainerSlotEnumerator(entity, out var enumerator)) { while (enumerator.NextItem(out var item, out var slot)) { - if (_inventory.TryUnequip(entity.Value, entity.Value, slot.Name, true, true)) + if (_inventory.TryUnequip(entity, entity, slot.Name, true, true)) _physics.ApplyAngularImpulse(item, ThrowingSystem.ThrowAngularImpulse); } } - if (TryComp(entity.Value, out HandsComponent? hands)) + if (TryComp(entity, out HandsComponent? hands)) { - foreach (var hand in _hands.EnumerateHands(entity.Value, hands)) + foreach (var hand in _hands.EnumerateHands(entity, hands)) { - _hands.TryDrop(entity.Value, hand, checkActionBlocker: false, doDropInteraction: false, handsComp: hands); + _hands.TryDrop(entity, hand, checkActionBlocker: false, doDropInteraction: false, handsComp: hands); } } - } - _minds.WipeMind(player); - QueueDel(entity); + _minds.WipeMind(mindId, mind); + QueueDel(entity); - _gameTicker.SpawnObserver(player); - } + if (_playerManager.TryGetSessionById(uid, out var session)) + _gameTicker.SpawnObserver(session); + } private void OnSessionPlayTimeUpdated(ICommonSession session) { diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index 308a679846c..5aa05ce28b7 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -34,11 +34,11 @@ using Robust.Shared.Toolshed; using Robust.Shared.Utility; using System.Linq; -using System.Numerics; using Content.Server.Silicons.Laws; using Content.Shared.Silicons.Laws; using Content.Shared.Silicons.Laws.Components; using Robust.Server.Player; +using Content.Shared.Mind; using Robust.Shared.Physics.Components; using static Content.Shared.Configurable.ConfigurationComponent; @@ -137,34 +137,6 @@ private void AddAdminVerbs(GetVerbsEvent args) prayerVerb.Impact = LogImpact.Low; args.Verbs.Add(prayerVerb); - // Erase - args.Verbs.Add(new Verb - { - Text = Loc.GetString("admin-verbs-erase"), - Message = Loc.GetString("admin-verbs-erase-description"), - Category = VerbCategory.Admin, - Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/delete_transparent.svg.192dpi.png")), - Act = () => - { - _adminSystem.Erase(targetActor.PlayerSession); - }, - Impact = LogImpact.Extreme, - ConfirmationPopup = true - }); - - // Respawn - args.Verbs.Add(new Verb() - { - Text = Loc.GetString("admin-player-actions-respawn"), - Category = VerbCategory.Admin, - Act = () => - { - _console.ExecuteCommand(player, $"respawn {targetActor.PlayerSession.Name}"); - }, - ConfirmationPopup = true, - // No logimpact as the command does it internally. - }); - // Spawn - Like respawn but on the spot. args.Verbs.Add(new Verb() { @@ -225,6 +197,38 @@ private void AddAdminVerbs(GetVerbsEvent args) }); } + if (_mindSystem.TryGetMind(args.Target, out _, out var mind) && mind.UserId != null) + { + // Erase + args.Verbs.Add(new Verb + { + Text = Loc.GetString("admin-verbs-erase"), + Message = Loc.GetString("admin-verbs-erase-description"), + Category = VerbCategory.Admin, + Icon = new SpriteSpecifier.Texture( + new("/Textures/Interface/VerbIcons/delete_transparent.svg.192dpi.png")), + Act = () => + { + _adminSystem.Erase(mind.UserId.Value); + }, + Impact = LogImpact.Extreme, + ConfirmationPopup = true + }); + + // Respawn + args.Verbs.Add(new Verb + { + Text = Loc.GetString("admin-player-actions-respawn"), + Category = VerbCategory.Admin, + Act = () => + { + _console.ExecuteCommand(player, $"respawn \"{mind.UserId}\""); + }, + ConfirmationPopup = true, + // No logimpact as the command does it internally. + }); + } + // Freeze var frozen = TryComp(args.Target, out var frozenComp); var frozenAndMuted = frozenComp?.Muted ?? false; diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 6fb7bbba8e8..02f718daef0 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -81,10 +81,10 @@ private void OnAdminOocEnabledChanged(bool val) DispatchServerAnnouncement(Loc.GetString(val ? "chat-manager-admin-ooc-chat-enabled-message" : "chat-manager-admin-ooc-chat-disabled-message")); } - public void DeleteMessagesBy(ICommonSession player) - { - if (!_players.TryGetValue(player.UserId, out var user)) - return; + public void DeleteMessagesBy(NetUserId uid) + { + if (!_players.TryGetValue(uid, out var user)) + return; var msg = new MsgDeleteChatMessagesBy { Key = user.Key, Entities = user.Entities }; _netManager.ServerSendToAll(msg); diff --git a/Content.Server/Chat/Managers/IChatManager.cs b/Content.Server/Chat/Managers/IChatManager.cs index 15d1288ee23..76fa91d8474 100644 --- a/Content.Server/Chat/Managers/IChatManager.cs +++ b/Content.Server/Chat/Managers/IChatManager.cs @@ -41,7 +41,7 @@ void ChatMessageToMany(ChatChannel channel, string message, string wrappedMessag bool MessageCharacterLimit(ICommonSession player, string message); - void DeleteMessagesBy(ICommonSession player); + void DeleteMessagesBy(NetUserId uid); [return: NotNullIfNotNull(nameof(author))] ChatUser? EnsurePlayer(NetUserId? author); diff --git a/Content.Server/GameTicking/Commands/RespawnCommand.cs b/Content.Server/GameTicking/Commands/RespawnCommand.cs index 4f101d0939a..f7ea11baf16 100644 --- a/Content.Server/GameTicking/Commands/RespawnCommand.cs +++ b/Content.Server/GameTicking/Commands/RespawnCommand.cs @@ -1,4 +1,6 @@ -using Content.Shared.Mind; +using System.Linq; +using Content.Server.Administration; +using Content.Server.Mind; using Content.Shared.Players; using Robust.Server.Player; using Robust.Shared.Console; @@ -6,57 +8,72 @@ namespace Content.Server.GameTicking.Commands { - sealed class RespawnCommand : IConsoleCommand + sealed class RespawnCommand : LocalizedEntityCommands { - public string Command => "respawn"; - public string Description => "Respawns a player, kicking them back to the lobby."; - public string Help => "respawn [player]"; + [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private readonly IPlayerLocator _locator = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly MindSystem _mind = default!; - public void Execute(IConsoleShell shell, string argStr, string[] args) + public override string Command => "respawn"; + + public override async void Execute(IConsoleShell shell, string argStr, string[] args) { var player = shell.Player; if (args.Length > 1) { - shell.WriteLine("Must provide <= 1 argument."); + shell.WriteError(Loc.GetString("cmd-respawn-invalid-args")); return; } - var playerMgr = IoCManager.Resolve(); - var sysMan = IoCManager.Resolve(); - var ticker = sysMan.GetEntitySystem(); - var mind = sysMan.GetEntitySystem(); - NetUserId userId; if (args.Length == 0) { if (player == null) { - shell.WriteLine("If not a player, an argument must be given."); + shell.WriteError(Loc.GetString("cmd-respawn-no-player")); return; } userId = player.UserId; } - else if (!playerMgr.TryGetUserId(args[0], out userId)) + else { - shell.WriteLine("Unknown player"); - return; + var located = await _locator.LookupIdByNameOrIdAsync(args[0]); + + if (located == null) + { + shell.WriteError(Loc.GetString("cmd-respawn-unknown-player")); + return; + } + + userId = located.UserId; } - if (!playerMgr.TryGetSessionById(userId, out var targetPlayer)) + if (!_player.TryGetSessionById(userId, out var targetPlayer)) { - if (!playerMgr.TryGetPlayerData(userId, out var data)) + if (!_player.TryGetPlayerData(userId, out var data)) { - shell.WriteLine("Unknown player"); + shell.WriteError(Loc.GetString("cmd-respawn-unknown-player")); return; } - mind.WipeMind(data.ContentData()?.Mind); - shell.WriteLine("Player is not currently online, but they will respawn if they come back online"); + _mind.WipeMind(data.ContentData()?.Mind); + shell.WriteError(Loc.GetString("cmd-respawn-player-not-online")); return; } - ticker.Respawn(targetPlayer); + _gameTicker.Respawn(targetPlayer); + } + + public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + if (args.Length != 1) + return CompletionResult.Empty; + + var options = _player.Sessions.OrderBy(c => c.Name).Select(c => c.Name).ToArray(); + + return CompletionResult.FromHintOptions(options, Loc.GetString("cmd-respawn-player-completion")); } } } diff --git a/Resources/Locale/en-US/administration/commands/erase.ftl b/Resources/Locale/en-US/administration/commands/erase.ftl new file mode 100644 index 00000000000..e9f995f03ee --- /dev/null +++ b/Resources/Locale/en-US/administration/commands/erase.ftl @@ -0,0 +1,7 @@ +# erase +cmd-erase-desc = Erase a player's entity if it exists and all their chat messages +cmd-erase-help = erase +cmd-erase-invalid-args = Invalid number of arguments +cmd-erase-player-not-found = Player not found + +cmd-erase-player-completion = diff --git a/Resources/Locale/en-US/administration/commands/respawn.ftl b/Resources/Locale/en-US/administration/commands/respawn.ftl new file mode 100644 index 00000000000..6aab854ee47 --- /dev/null +++ b/Resources/Locale/en-US/administration/commands/respawn.ftl @@ -0,0 +1,9 @@ +cmd-respawn-desc = Respawns a player, kicking them back to the lobby. +cmd-respawn-help = respawn [player or UserId] + +cmd-respawn-invalid-args = Must provide <= 1 argument. +cmd-respawn-no-player = If not a player, an argument must be given. +cmd-respawn-unknown-player = Unknown player +cmd-respawn-player-not-online = Player is not currently online, but they will respawn if they come back online + +cmd-respawn-player-completion = From 8dbaca33e6acc1d099ba344593be40ecc62e2797 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 31 Aug 2024 11:39:10 +0000 Subject: [PATCH 222/223] Automatic changelog update --- Resources/Changelog/Admin.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 47b42954723..0e670b5ff45 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -506,5 +506,18 @@ Entries: id: 63 time: '2024-08-31T08:26:52.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31661 +- author: nikthechampiongr + changes: + - message: Respawn verb is now available on players even after they have disconnected. + type: Fix + - message: Erase command is now available on players even after they have disconnected. + type: Fix + - message: You can now erase people with the erase command + type: Add + - message: Respawn command now also accepts user ids + type: Tweak + id: 64 + time: '2024-08-31T11:38:04.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30433 Name: Admin Order: 1 From fbb9301dcb0a93fbb1b79d70fec989a32b15671d Mon Sep 17 00:00:00 2001 From: Morb0 <14136326+Morb0@users.noreply.github.com> Date: Sat, 31 Aug 2024 15:32:10 +0300 Subject: [PATCH 223/223] Update locale --- .../ss14-ru/prototypes/body/parts/silicon.ftl | 8 ++--- .../prototypes/entities/clothing/eyes/hud.ftl | 17 ++++------- .../structures/specific/atmospherics/vox.ftl | 15 ++++------ .../entities/structures/walls/meteor.ftl | 29 +++++++++++++++++++ .../ru-RU/administration/commands/erase.ftl | 6 ++++ .../ru-RU/administration/commands/respawn.ftl | 7 +++++ .../structures/specific/atmospherics/vox.ftl | 15 ++++------ .../entities/structures/walls/meteor.ftl | 29 +++++++++++++++++++ 8 files changed, 93 insertions(+), 33 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/meteor.ftl create mode 100644 Resources/Locale/ru-RU/administration/commands/erase.ftl create mode 100644 Resources/Locale/ru-RU/administration/commands/respawn.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/meteor.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/silicon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/silicon.ftl index 51a756ee267..d992d96d497 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/silicon.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/body/parts/silicon.ftl @@ -1,12 +1,12 @@ ent-PartSilicon = { ent-BaseItem } .desc = { ent-BaseItem.desc } -ent-BaseBorgArmLeft = left cyborg arm +ent-BaseBorgArmLeft = cyborg left arm .desc = { ent-PartSilicon.desc } -ent-BaseBorgArmRight = right cyborg arm +ent-BaseBorgArmRight = cyborg right arm .desc = { ent-PartSilicon.desc } -ent-BaseBorgLegLeft = left cyborg leg +ent-BaseBorgLegLeft = cyborg left leg .desc = { ent-PartSilicon.desc } -ent-BaseBorgLegRight = right cyborg leg +ent-BaseBorgLegRight = cyborg right leg .desc = { ent-PartSilicon.desc } ent-BaseBorgHead = cyborg head .desc = { ent-PartSilicon.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl index 222da61431c..a357ac27a8b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl @@ -30,27 +30,22 @@ ent-ClothingEyesHudSyndicate = syndicate visor .desc = The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination. ent-ClothingEyesHudSyndicateAgent = syndicate agent visor .desc = The Syndicate Agent's professional heads-up display, designed for quick diagnosis of their team's status. -ent-ClothingEyesGlassesHiddenSecurity = { ent-['ClothingEyesGlassesSunglasses', 'ShowSecurityIcons'] } - +ent-ClothingEyesGlassesHiddenSecurity = { ent-ClothingEyesGlassesSunglasses } .suffix = Syndicate - .desc = { ent-['ClothingEyesGlassesSunglasses', 'ShowSecurityIcons'].desc } + .desc = { ent-ClothingEyesGlassesSunglasses.desc } ent-ClothingEyesEyepatchHudMedical = medical hud eyepatch .desc = A heads-up display that scans the humanoids in view and provides accurate data about their health status. For true patriots. ent-ClothingEyesEyepatchHudMedicalFlipped = medical hud eyepatch - - .desc = { ent-['ClothingEyesEyepatchHudMedical', 'ClothingHeadEyeBaseFlipped'].desc } + .desc = { ent-ClothingEyesEyepatchHudMedical.desc } ent-ClothingEyesEyepatchHudSecurity = security hud eyepatch .desc = A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. For true patriots. ent-ClothingEyesEyepatchHudSecurityFlipped = security hud eyepatch - - .desc = { ent-['ClothingEyesEyepatchHudSecurity', 'ClothingHeadEyeBaseFlipped'].desc } + .desc = { ent-ClothingEyesEyepatchHudSecurity.desc } ent-ClothingEyesEyepatchHudBeer = beer hud eyepatch .desc = A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. For true patriots. ent-ClothingEyesEyepatchHudBeerFlipped = beer hud eyepatch - - .desc = { ent-['ClothingEyesEyepatchHudBeer', 'ClothingHeadEyeBaseFlipped'].desc } + .desc = { ent-ClothingEyesEyepatchHudBeer.desc } ent-ClothingEyesEyepatchHudDiag = diagnostic hud eyepatch .desc = A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium. ent-ClothingEyesEyepatchHudDiagFlipped = diagnostic hud eyepatch - - .desc = { ent-['ClothingEyesEyepatchHudDiag', 'ClothingHeadEyeBaseFlipped'].desc } \ No newline at end of file + .desc = { ent-ClothingEyesEyepatchHudDiag.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl index 324b5e5958d..dd2afd1e32d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl @@ -1,15 +1,12 @@ ent-AirSensorVoxBase = { ent-AirSensorBase } .suffix = Vox Atmosphere .desc = { ent-AirSensorBase.desc } -ent-AirSensorVox = { ent-['AirSensorVoxBase', 'AirSensor'] } - - .desc = { ent-['AirSensorVoxBase', 'AirSensor'].desc } -ent-GasVentPumpVox = { ent-['AirSensorVoxBase', 'GasVentPump'] } - - .desc = { ent-['AirSensorVoxBase', 'GasVentPump'].desc } -ent-GasVentScrubberVox = { ent-['AirSensorVoxBase', 'GasVentScrubber'] } - - .desc = { ent-['AirSensorVoxBase', 'GasVentScrubber'].desc } +ent-AirSensorVox = { ent-AirSensor } + .desc = { ent-AirSensor.desc } +ent-GasVentPumpVox = { ent-GasVentPump } + .desc = { ent-GasVentPump.desc } +ent-GasVentScrubberVox = { ent-GasVentScrubber } + .desc = { ent-GasVentScrubber.desc } ent-AirAlarmVox = { ent-AirAlarm } .suffix = Vox Atmosphere, auto mode disabled .desc = { ent-AirAlarm.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/meteor.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/meteor.ftl new file mode 100644 index 00000000000..6fd6e29ca2b --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/walls/meteor.ftl @@ -0,0 +1,29 @@ +ent-MeteorRock = meteorite rock + .desc = What remains of a meteorite. +ent-MeteorRockCoal = { ent-MeteorRock } + .desc = An ore vein rich with coal. + .suffix = Coal +ent-MeteorRockGold = { ent-MeteorRock } + .desc = An ore vein rich with gold. + .suffix = Gold +ent-MeteorRockDiamond = { ent-MeteorRock } + .desc = An ore vein rich with diamonds. + .suffix = Diamond +ent-MeteorRockPlasma = { ent-MeteorRock } + .desc = An ore vein rich with plasma. + .suffix = Plasma +ent-MeteorRockQuartz = { ent-MeteorRock } + .desc = An ore vein rich with quartz. + .suffix = Quartz +ent-MeteorRockSilver = { ent-MeteorRock } + .desc = An ore vein rich with silver. + .suffix = Silver +ent-MeteorRockTin = { ent-MeteorRock } + .desc = An ore vein rich with iron. + .suffix = Iron +ent-MeteorRockUranium = { ent-MeteorRock } + .desc = An ore vein rich with uranium. + .suffix = Uranium +ent-MeteorRockBananium = { ent-MeteorRock } + .desc = An ore vein rich with bananium. + .suffix = Bananium diff --git a/Resources/Locale/ru-RU/administration/commands/erase.ftl b/Resources/Locale/ru-RU/administration/commands/erase.ftl new file mode 100644 index 00000000000..bbffdfc5d14 --- /dev/null +++ b/Resources/Locale/ru-RU/administration/commands/erase.ftl @@ -0,0 +1,6 @@ +# erase +cmd-erase-desc = Erase a player's entity if it exists and all their chat messages +cmd-erase-help = erase +cmd-erase-invalid-args = Invalid number of arguments +cmd-erase-player-not-found = Player not found +cmd-erase-player-completion = diff --git a/Resources/Locale/ru-RU/administration/commands/respawn.ftl b/Resources/Locale/ru-RU/administration/commands/respawn.ftl new file mode 100644 index 00000000000..53514c4cbd0 --- /dev/null +++ b/Resources/Locale/ru-RU/administration/commands/respawn.ftl @@ -0,0 +1,7 @@ +cmd-respawn-desc = Respawns a player, kicking them back to the lobby. +cmd-respawn-help = respawn [player or UserId] +cmd-respawn-invalid-args = Must provide <= 1 argument. +cmd-respawn-no-player = If not a player, an argument must be given. +cmd-respawn-unknown-player = Unknown player +cmd-respawn-player-not-online = Player is not currently online, but they will respawn if they come back online +cmd-respawn-player-completion = diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl index 324b5e5958d..dd2afd1e32d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/specific/atmospherics/vox.ftl @@ -1,15 +1,12 @@ ent-AirSensorVoxBase = { ent-AirSensorBase } .suffix = Vox Atmosphere .desc = { ent-AirSensorBase.desc } -ent-AirSensorVox = { ent-['AirSensorVoxBase', 'AirSensor'] } - - .desc = { ent-['AirSensorVoxBase', 'AirSensor'].desc } -ent-GasVentPumpVox = { ent-['AirSensorVoxBase', 'GasVentPump'] } - - .desc = { ent-['AirSensorVoxBase', 'GasVentPump'].desc } -ent-GasVentScrubberVox = { ent-['AirSensorVoxBase', 'GasVentScrubber'] } - - .desc = { ent-['AirSensorVoxBase', 'GasVentScrubber'].desc } +ent-AirSensorVox = { ent-AirSensor } + .desc = { ent-AirSensor.desc } +ent-GasVentPumpVox = { ent-GasVentPump } + .desc = { ent-GasVentPump.desc } +ent-GasVentScrubberVox = { ent-GasVentScrubber } + .desc = { ent-GasVentScrubber.desc } ent-AirAlarmVox = { ent-AirAlarm } .suffix = Vox Atmosphere, auto mode disabled .desc = { ent-AirAlarm.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/meteor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/meteor.ftl new file mode 100644 index 00000000000..6fd6e29ca2b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/meteor.ftl @@ -0,0 +1,29 @@ +ent-MeteorRock = meteorite rock + .desc = What remains of a meteorite. +ent-MeteorRockCoal = { ent-MeteorRock } + .desc = An ore vein rich with coal. + .suffix = Coal +ent-MeteorRockGold = { ent-MeteorRock } + .desc = An ore vein rich with gold. + .suffix = Gold +ent-MeteorRockDiamond = { ent-MeteorRock } + .desc = An ore vein rich with diamonds. + .suffix = Diamond +ent-MeteorRockPlasma = { ent-MeteorRock } + .desc = An ore vein rich with plasma. + .suffix = Plasma +ent-MeteorRockQuartz = { ent-MeteorRock } + .desc = An ore vein rich with quartz. + .suffix = Quartz +ent-MeteorRockSilver = { ent-MeteorRock } + .desc = An ore vein rich with silver. + .suffix = Silver +ent-MeteorRockTin = { ent-MeteorRock } + .desc = An ore vein rich with iron. + .suffix = Iron +ent-MeteorRockUranium = { ent-MeteorRock } + .desc = An ore vein rich with uranium. + .suffix = Uranium +ent-MeteorRockBananium = { ent-MeteorRock } + .desc = An ore vein rich with bananium. + .suffix = Bananium