From ab84295a64057d1823d6523d28eac207100ab61c Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Mon, 29 Apr 2024 15:50:35 -0400 Subject: [PATCH] 04/29/2024 - Removed Hardsuits (#1308) * 04/29/2024 - Removed Hardsuits Removed hardsuits from Black Market Ships. * 04/29/2024- Grey Pirate Chest Sneaking in a new color variant for pirate chests, thanks to Stagnation! * Fix Suit Storage * BAH AAAAAAAAAA * Ships * 04/29/2024 FIXED FUCKING FUCK * Update crates.yml * Update crates.yml * Update schooner.yml * Update menace.yml * Map --------- Co-authored-by: Dvir Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/POI/cove.yml | 269 +++++++------ .../_NF/Shuttles/BlackMarket/barnacle.yml | 56 +-- .../_NF/Shuttles/BlackMarket/bocakillo.yml | 334 ++++------------ .../Maps/_NF/Shuttles/BlackMarket/menace.yml | 126 ++---- .../_NF/Shuttles/BlackMarket/schooner.yml | 360 ++++++------------ .../Structures/Storage/Crates/crates.yml | 13 +- .../_NF/Shipyard/BlackMarket/menace.yml | 2 +- .../Crates/piratechestgrey.rsi/crate.png | Bin 0 -> 438 bytes .../Crates/piratechestgrey.rsi/crate_door.png | Bin 0 -> 527 bytes .../Crates/piratechestgrey.rsi/crate_icon.png | Bin 0 -> 619 bytes .../Crates/piratechestgrey.rsi/crate_open.png | Bin 0 -> 286 bytes .../Crates/piratechestgrey.rsi/meta.json | 40 ++ .../Crates/piratechestgrey.rsi/sparking.png | Bin 0 -> 206 bytes .../Crates/piratechestgrey.rsi/welded.png | Bin 0 -> 17749 bytes 14 files changed, 458 insertions(+), 742 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/sparking.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/welded.png diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml index 6835d3b66dc..b4adf4a0ad9 100644 --- a/Resources/Maps/_NF/POI/cove.yml +++ b/Resources/Maps/_NF/POI/cove.yml @@ -265,7 +265,7 @@ entities: color: '#951710FF' id: Caution decals: - 323: -13,27 + 322: -13,27 - node: color: '#A4610696' id: CheckerNWSE @@ -303,15 +303,15 @@ entities: 176: -5,3 184: -8,8 185: -2,10 - 327: -3,4 - 328: -7,4 - 333: -5,14 - 334: 6,13 - 337: -8,15 - 339: -6,15 - 340: -3,15 - 344: -1,14 - 345: 6,10 + 326: -3,4 + 327: -7,4 + 332: -5,14 + 333: 6,13 + 336: -8,15 + 338: -6,15 + 339: -3,15 + 343: -1,14 + 344: 6,10 - node: cleanable: True color: '#FFFFFFFF' @@ -323,9 +323,9 @@ entities: 193: -2,12 194: -3,12 195: -4,6 - 324: -1,9 - 325: -1,10 - 326: -4,4 + 323: -1,9 + 324: -1,10 + 325: -4,4 - node: cleanable: True color: '#FFFFFFFF' @@ -346,16 +346,16 @@ entities: 186: -3,10 189: -5,10 190: -4,10 - 335: 6,11 - 336: 7,12 - 341: -4,15 - 342: -3,14 - 343: 0,14 - 346: 7,10 - 347: 7,11 - 348: 6,11 - 349: 7,12 - 350: 6,12 + 334: 6,11 + 335: 7,12 + 340: -4,15 + 341: -3,14 + 342: 0,14 + 345: 7,10 + 346: 7,11 + 347: 6,11 + 348: 7,12 + 349: 6,12 - node: cleanable: True color: '#FFFFFFFF' @@ -367,11 +367,11 @@ entities: 174: -5,4 175: -5,3 188: -5,12 - 329: -7,3 - 330: -4,2 - 331: 0,12 - 332: -1,12 - 338: -7,15 + 328: -7,3 + 329: -4,2 + 330: 0,12 + 331: -1,12 + 337: -7,15 - node: color: '#FFFFFFFF' id: FlowersBROne @@ -442,7 +442,7 @@ entities: color: '#FFFFFFFF' id: StandClear decals: - 351: 10,22 + 350: 10,22 - node: color: '#A46106FF' id: WarnCornerNE @@ -733,7 +733,7 @@ entities: color: '#791500FF' id: space decals: - 354: 8,22 + 351: 8,22 - node: cleanable: True color: '#951710FF' @@ -777,8 +777,7 @@ entities: 0: 56785 1,2: 0: 52237 - 1: 256 - 2: 4096 + 1: 4352 1,3: 1: 1 0: 65484 @@ -788,12 +787,12 @@ entities: 0: 65535 2,0: 0: 8247 - 3: 128 + 2: 128 2,1: 0: 560 2,2: 0: 4131 - 4: 128 + 3: 128 2,3: 0: 65329 2,-1: @@ -801,7 +800,7 @@ entities: 2,4: 0: 4927 3,2: - 4: 3952 + 3: 3952 3,3: 0: 65280 3,-1: @@ -809,13 +808,13 @@ entities: 3,4: 0: 7 4,2: - 4: 768 + 3: 768 -4,3: 0: 65024 -4,4: 0: 61167 -4,2: - 4: 608 + 3: 608 -4,-1: 0: 34944 -3,3: @@ -825,7 +824,7 @@ entities: -3,4: 0: 65535 -3,0: - 3: 32 + 2: 32 0: 32908 -3,1: 0: 34952 @@ -848,27 +847,27 @@ entities: -1,4: 0: 65535 -3,-2: - 3: 8256 + 2: 8256 0: 34816 -2,-3: 0: 28672 -2,-2: 0: 65399 -1,-2: - 3: 16 + 2: 16 0: 61440 0,-2: 0: 61440 1,-2: 0: 65228 - 3: 16 + 2: 16 1,-3: 0: 49152 2,-3: 0: 4096 2,-2: 0: 13073 - 3: 32832 + 2: 32832 -4,5: 0: 61422 -4,6: @@ -906,85 +905,85 @@ entities: 1,5: 0: 65535 1,6: - 0: 61439 + 0: 53247 1,7: 0: 52428 2,5: - 0: 32625 + 0: 24401 2,6: 0: 13073 2,7: 0: 64977 3,5: - 4: 4368 - 3: 11808 + 3: 4368 + 2: 11808 3,7: 0: 32752 3,6: - 3: 2 - 4: 128 + 2: 2 + 3: 128 4,5: - 3: 20256 - 4: 3 + 2: 20256 + 3: 3 4,6: - 4: 28 + 3: 28 4,7: - 4: 2248 + 3: 2248 4,8: - 4: 780 + 3: 780 5,4: - 4: 1 - 3: 57344 + 3: 1 + 2: 57344 5,5: - 3: 53196 + 2: 53196 5,7: - 4: 4352 + 3: 4352 5,3: - 4: 4352 + 3: 4352 5,6: - 3: 236 + 2: 236 5,8: - 4: 1 + 3: 1 6,4: - 3: 4096 + 2: 4096 6,5: - 3: 4369 + 2: 4369 6,6: - 3: 17 + 2: 17 4,3: - 4: 2048 + 3: 2048 -5,3: - 4: 272 + 3: 272 -5,2: - 4: 8192 + 3: 8192 -5,4: - 4: 256 + 3: 256 -5,5: - 4: 256 + 3: 256 -5,6: - 4: 4096 + 3: 4096 -5,8: - 4: 2082 + 3: 2082 -3,8: - 4: 8192 + 3: 8192 -3,9: - 4: 2176 + 3: 2176 -2,9: 0: 2188 -1,9: 0: 2047 0,8: - 4: 49152 + 3: 49152 0,9: - 4: 12 + 3: 12 1,8: - 4: 28672 + 3: 28672 1,9: - 4: 1 + 3: 1 2,8: - 4: 3072 + 3: 3072 3,8: - 4: 3840 + 3: 3840 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -1016,21 +1015,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 235 - moles: - - 21.813705 - - 82.06108 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 immutable: True moles: @@ -5600,6 +5584,18 @@ entities: - type: Transform pos: -3.5,5.5 parent: 1 +- proto: DoubleEmergencyAirTankFilled + entities: + - uid: 2060 + components: + - type: Transform + pos: 10.402694,21.702908 + parent: 1 + - uid: 2061 + components: + - type: Transform + pos: 10.652694,21.650824 + parent: 1 - proto: Dresser entities: - uid: 1697 @@ -5925,7 +5921,7 @@ entities: pos: 7.5,28.5 parent: 1 - type: Door - secondsUntilStateChange: -1742.1683 + secondsUntilStateChange: -2234.199 state: Opening - proto: FenceWoodSmallCorner entities: @@ -6389,16 +6385,6 @@ entities: - type: Transform pos: 3.5,20.5 parent: 1 - - uid: 702 - components: - - type: Transform - pos: 6.5,26.5 - parent: 1 - - uid: 703 - components: - - type: Transform - pos: 6.5,25.5 - parent: 1 - uid: 706 components: - type: Transform @@ -8028,6 +8014,13 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,-4.5 parent: 1 +- proto: PinpointerUniversal + entities: + - uid: 2062 + components: + - type: Transform + pos: -0.5275769,-4.42351 + parent: 1 - proto: PirateFlag entities: - uid: 498 @@ -8342,11 +8335,11 @@ entities: - type: Transform pos: 10.5,23.5 parent: 1 - - uid: 1194 + - uid: 1641 components: - type: Transform rot: -1.5707963267948966 rad - pos: 8.5,21.5 + pos: 8.5,19.5 parent: 1 - uid: 1854 components: @@ -8434,6 +8427,12 @@ entities: - type: Transform pos: -1.5,13.5 parent: 1 + - uid: 2059 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,21.5 + parent: 1 - proto: Railing entities: - uid: 3 @@ -8901,11 +8900,6 @@ entities: - type: Transform pos: 6.5,17.5 parent: 1 - - uid: 1604 - components: - - type: Transform - pos: 8.5,24.5 - parent: 1 - uid: 1804 components: - type: Transform @@ -9536,18 +9530,42 @@ entities: - type: Transform pos: -8.5,11.5 parent: 1 -- proto: SuitStorageEVAPirate +- proto: SuitStorageWallmountEVAPirate entities: - - uid: 1193 + - uid: 1194 components: - type: Transform - pos: 10.5,21.5 + rot: -1.5707963267948966 rad + pos: 9.5,24.5 parent: 1 - - uid: 1641 + - type: Physics + canCollide: False + - uid: 1604 components: - type: Transform - pos: 10.5,23.5 + rot: -1.5707963267948966 rad + pos: 9.5,21.5 + parent: 1 + - type: Physics + canCollide: False + - uid: 2058 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,23.5 parent: 1 + - type: Physics + canCollide: False +- proto: SuitStorageWallmountPirateCap + entities: + - uid: 702 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,20.5 + parent: 1 + - type: Physics + canCollide: False - proto: SurveillanceCameraRouterSupply entities: - uid: 308 @@ -9995,6 +10013,13 @@ entities: - type: Transform pos: -5.323082,7.791107 parent: 1 +- proto: VendingMachineTankDispenserEVA + entities: + - uid: 1193 + components: + - type: Transform + pos: 10.5,23.5 + parent: 1 - proto: WallmountTelevisionFrame entities: - uid: 737 @@ -10735,6 +10760,11 @@ entities: - type: Transform pos: -13.5,11.5 parent: 1 + - uid: 703 + components: + - type: Transform + pos: 5.5,27.5 + parent: 1 - uid: 956 components: - type: Transform @@ -12725,6 +12755,13 @@ entities: parent: 1875 - type: Physics canCollide: False +- proto: WeaponGrapplingGun + entities: + - uid: 2063 + components: + - type: Transform + pos: 0.49590623,-4.4579954 + parent: 1 - proto: WeaponRackPistolBase entities: - uid: 1875 diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml index a72bb320f79..3a0a2c667eb 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml @@ -89,32 +89,27 @@ entities: version: 2 data: tiles: - -1,-1: - 0: 65535 - 0,-1: - 0: 4375 - 1: 26208 -2,-1: - 0: 61166 + 0: 28224 + -2,0: + 0: 14 + 1: 35840 -2,-2: 1: 51200 + -1,-1: + 0: 65520 -1,-2: 1: 1 - 0: 65534 + 0: 61120 + -1,0: + 0: 61059 0,-2: - 0: 30579 + 0: 13072 1: 4 + 0,-1: + 1: 26208 0,0: - 0: 30583 - 0,1: - 0: 7 - -2,0: - 0: 238 - 1: 35840 - -1,0: - 0: 65535 - -1,1: - 0: 15 + 0: 13104 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -132,7 +127,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -693,7 +688,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,1.5 parent: 201 -- proto: ComputerTabletopShuttle +- proto: ComputerTabletopShuttleAntag entities: - uid: 220 components: @@ -708,13 +703,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,2.5 parent: 201 -- proto: CratePirate - entities: - - uid: 226 - components: - - type: Transform - pos: -1.5,-2.5 - parent: 201 - proto: DefibrillatorCabinetFilled entities: - uid: 206 @@ -1482,20 +1470,6 @@ entities: - type: Transform pos: -1.5,-6.5 parent: 201 -- proto: SuitStorageEVAPirate - entities: - - uid: 67 - components: - - type: Transform - pos: -3.5,-2.5 - parent: 201 -- proto: SuitStoragePirateCap - entities: - - uid: 62 - components: - - type: Transform - pos: -0.5,3.5 - parent: 201 - proto: Table entities: - uid: 147 diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml index 1ee842eac32..edff0ed5272 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml @@ -65,105 +65,105 @@ entities: color: '#FFFFFFFF' id: Bot decals: - 60: -1,-2 - 61: 0,-2 - 62: 0,-3 - 63: -1,-3 + 0: -1,-2 + 1: 0,-2 + 2: 0,-3 + 3: -1,-3 - node: color: '#FFFFFFFF' id: BotGreyscale decals: - 64: 0,0 + 4: 0,0 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 103: -1,0 - 104: -3,1 - 105: -1,2 - 106: 2,1 - 107: 1,-1 - 108: 0,3 - 109: 0,8 - 110: 2,4 - 111: 2,2 - 112: 1,-4 - 113: 0,-4 - 114: -1,-4 - 115: 1,-4 - 116: 0,-4 - 117: -1,-4 - 118: -1,9 - 119: -1,10 - 120: -1,11 - 121: 0,11 - 122: 1,11 - 123: 1,10 - 124: 1,10 + 36: -1,0 + 37: -3,1 + 38: -1,2 + 39: 2,1 + 40: 1,-1 + 41: 0,3 + 42: 0,8 + 43: 2,4 + 44: 2,2 + 45: 1,-4 + 46: 0,-4 + 47: -1,-4 + 48: 1,-4 + 49: 0,-4 + 50: -1,-4 + 51: -1,9 + 52: -1,10 + 53: -1,11 + 54: 0,11 + 55: 1,11 + 56: 1,10 + 57: 1,10 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 77: -3,1 - 78: -2,0 - 79: -1,0 - 80: 0,0 - 81: 1,0 - 82: 2,0 - 83: 2,1 - 84: 0,-2 - 85: -1,-2 - 86: -1,-3 - 87: 0,-3 - 88: 2,2 - 89: 2,4 - 90: 2,3 - 91: 0,3 - 92: -3,2 - 93: -1,4 - 94: -1,5 - 95: -1,6 - 96: -1,7 - 97: -1,9 - 98: -1,10 - 99: -1,11 - 100: 0,11 - 101: 1,11 - 102: 1,10 - 125: 2,0 - 126: -2,0 - 127: 0,-2 - 128: -1,-3 - 129: -1,4 - 130: -1,5 - 131: -1,6 - 132: -1,7 - 133: -1,6 - 134: -1,6 - 135: -1,6 + 10: -3,1 + 11: -2,0 + 12: -1,0 + 13: 0,0 + 14: 1,0 + 15: 2,0 + 16: 2,1 + 17: 0,-2 + 18: -1,-2 + 19: -1,-3 + 20: 0,-3 + 21: 2,2 + 22: 2,4 + 23: 2,3 + 24: 0,3 + 25: -3,2 + 26: -1,4 + 27: -1,5 + 28: -1,6 + 29: -1,7 + 30: -1,9 + 31: -1,10 + 32: -1,11 + 33: 0,11 + 34: 1,11 + 35: 1,10 + 58: 2,0 + 59: -2,0 + 60: 0,-2 + 61: -1,-3 + 62: -1,4 + 63: -1,5 + 64: -1,6 + 65: -1,7 + 66: -1,6 + 67: -1,6 + 68: -1,6 - node: color: '#FFFFFFFF' id: StandClear decals: - 69: 1,-1 + 7: 1,-1 - node: color: '#FFFFFFFF' id: StandClearGreyscale decals: - 72: 0,8 - 73: 0,3 + 8: 0,8 + 9: 0,3 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleN decals: - 65: 2,1 + 5: 2,1 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 68: 2,3 + 6: 2,3 - type: GridAtmosphere version: 2 data: @@ -251,7 +251,7 @@ entities: pos: 1.5,-0.5 parent: 2 - type: Door - secondsUntilStateChange: -93.89965 + secondsUntilStateChange: -239.95091 state: Opening - type: DeviceLinkSource lastSignals: @@ -642,96 +642,6 @@ entities: - type: Transform pos: 0.5,9.5 parent: 2 -- proto: CannonBall - entities: - - uid: 205 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 206 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 207 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 208 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: CannonBallGlassshot - entities: - - uid: 201 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 202 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 203 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 204 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: CannonBallGrapeshot - entities: - - uid: 198 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 199 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 200 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 210 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: Catwalk entities: - uid: 80 @@ -989,54 +899,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,10.5 parent: 2 -- proto: CratePirate - entities: - - uid: 197 - components: - - type: Transform - pos: 0.5,0.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - 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: - - 209 - - 208 - - 207 - - 206 - - 205 - - 204 - - 203 - - 202 - - 201 - - 200 - - 199 - - 198 - - 210 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: DefibrillatorCabinetFilled entities: - uid: 149 @@ -1473,15 +1335,6 @@ entities: - type: Transform pos: 2.5,-2.5 parent: 2 -- proto: PirateHandyFlag - entities: - - uid: 209 - components: - - type: Transform - parent: 197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: PlastitaniumWindow entities: - uid: 144 @@ -1677,61 +1530,34 @@ entities: - Pressed: Trigger 75: - Pressed: Trigger -- proto: SpawnPointLatejoin - entities: - - uid: 158 - components: - - type: Transform - pos: 0.5,6.5 - parent: 2 - proto: SpawnPointPirate entities: - - uid: 164 + - uid: 158 components: - type: Transform pos: 0.5,7.5 parent: 2 -- proto: SubstationBasic +- proto: SpawnPointPirateCaptain entities: - - uid: 102 + - uid: 156 components: - type: Transform - pos: -0.5,7.5 + pos: 0.5,6.5 parent: 2 -- proto: SuitStoragePirateCap +- proto: SpawnPointPirateFirstMate entities: - - uid: 156 + - uid: 76 components: - type: Transform - pos: -0.5,9.5 + pos: 0.5,5.5 parent: 2 -- proto: SuitStorageWallmountEVAPirate +- proto: SubstationBasic entities: - - uid: 76 + - uid: 102 components: - type: Transform - pos: -0.5,3.5 + pos: -0.5,7.5 parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: Physics - canCollide: False - proto: TableReinforced entities: - uid: 14 diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml index cbd42f342e5..7e6298b48d6 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/menace.yml @@ -96,23 +96,22 @@ entities: data: tiles: 0,0: - 0: 30583 + 0: 13107 1: 34952 0,-1: - 0: 30579 - 1: 4 - -1,-1: - 1: 36 - 0: 61128 + 0: 13104 + 2: 4 -1,0: - 0: 52974 + 0: 36076 1: 8192 0,1: - 0: 3 1: 12 + -1,-1: + 0: 51328 + 1: 32 + 2: 4 -1,1: 1: 6 - 0: 8 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -129,6 +128,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -150,20 +164,6 @@ entities: - type: BecomesStation id: mailhunter - type: SpreaderGrid -- proto: ActionToggleInternals - entities: - - uid: 53 - components: - - type: Transform - parent: 5 - - type: InstantAction - container: 5 - - uid: 131 - components: - - type: Transform - parent: 18 - - type: InstantAction - container: 18 - proto: AirAlarm entities: - uid: 125 @@ -224,12 +224,12 @@ entities: - uid: 133 components: - type: Transform - pos: 1.8442372,1.3896302 + pos: 0.67193127,0.721212 parent: 103 - uid: 134 components: - type: Transform - pos: 1.5838206,1.3792136 + pos: 0.3177646,0.721212 parent: 103 - proto: AmeShielding entities: @@ -554,7 +554,7 @@ entities: - type: Transform pos: 1.5,3.5 parent: 103 -- proto: ComputerTabletopShuttle +- proto: ComputerTabletopShuttleAntag entities: - uid: 95 components: @@ -569,13 +569,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,2.5 parent: 103 -- proto: CratePirateChest - entities: - - uid: 135 - components: - - type: Transform - pos: 1.5,2.5 - parent: 103 - proto: DefibrillatorCabinetFilled entities: - uid: 117 @@ -725,13 +718,6 @@ entities: - type: Transform pos: 1.5,4.5 parent: 103 -- proto: GunSafeShuttleT3Spawner - entities: - - uid: 34 - components: - - type: Transform - pos: -1.5,2.5 - parent: 103 - proto: Gyroscope entities: - uid: 119 @@ -741,35 +727,6 @@ entities: parent: 103 - type: Thruster originalPowerLoad: 1500 -- proto: NitrousOxideTankFilled - entities: - - uid: 5 - components: - - type: Transform - pos: -0.48881638,3.010011 - parent: 103 - - type: GasTank - toggleActionEntity: 53 - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 53 - - uid: 18 - components: - - type: Transform - parent: 10 - - type: GasTank - toggleActionEntity: 131 - - type: Physics - canCollide: False - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 131 - proto: PoweredlightColoredBlack entities: - uid: 127 @@ -778,6 +735,13 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,0.5 parent: 103 +- proto: Rack + entities: + - uid: 5 + components: + - type: Transform + pos: 0.5,0.5 + parent: 103 - proto: ReinforcedPlasmaWindow entities: - uid: 75 @@ -929,13 +893,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,0.5 parent: 103 -- proto: SuitStorageEVAPirate - entities: - - uid: 123 - components: - - type: Transform - pos: 0.5,0.5 - parent: 103 - proto: TableCarpet entities: - uid: 32 @@ -1136,21 +1093,4 @@ entities: - type: Transform pos: -0.5,1.5 parent: 103 -- proto: WeaponImprovisedPneumaticCannon - entities: - - uid: 10 - components: - - type: Transform - pos: -0.3918358,2.7159653 - parent: 103 - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - gas_tank: !type:ContainerSlot - showEnts: False - occludes: True - ent: 18 ... diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml index 0059d9bacd9..e8c142d918a 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml @@ -428,58 +428,67 @@ entities: data: tiles: 0,0: - 0: 65535 - 0,-1: - 0: 65535 + 0: 65294 -1,0: - 0: 63487 - 1: 2048 - -1,-1: - 0: 65407 - 1: 128 + 0: 60942 0,1: - 0: 65535 + 0: 59455 + -1,1: + 0: 57998 0,2: - 0: 65535 + 0: 14190 + -1,2: + 0: 35854 + 1: 256 0,3: - 0: 13175 + 0: 3 + 1: 13056 + -1,3: + 0: 8 + 1: 34816 + 0,4: + 1: 273 + 0,-1: + 0: 57599 + 1,2: + 1: 256 1,0: - 0: 30515 + 1: 17410 + 2: 8704 1,1: - 0: 4919 - 1,2: - 0: 273 + 2: 2 + 1: 516 + 1,-1: + 1: 8260 + 2: 34 0,-3: - 0: 65280 + 0: 29184 + -1,-3: + 0: 51200 + 1: 256 0,-2: - 0: 65535 + 0: 49663 + -1,-2: + 0: 24814 + -1,-1: + 0: 57582 1,-3: - 0: 4352 + 1: 256 1,-2: - 0: 29489 - 1,-1: - 0: 13175 + 1: 16416 + 2: 8192 -2,0: - 0: 52360 + 1: 17416 + 2: 34816 -2,1: - 0: 2188 - -1,1: - 0: 65535 - -1,2: - 0: 61439 - -1,3: - 0: 35020 - -2,-2: - 0: 51328 + 1: 2052 + 2: 8 -2,-1: - 0: 35020 - -1,-3: - 0: 48896 - 1: 16384 - -1,-2: - 0: 65535 - 0,4: - 0: 273 + 1: 32836 + 2: 136 + -2,-2: + 1: 16512 + 2: 32768 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -497,10 +506,25 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14996 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 moles: - - 20.078888 - - 75.53487 + - 0 + - 0 - 0 - 0 - 0 @@ -1815,47 +1839,24 @@ entities: - type: Transform pos: 3.5,0.5 parent: 1 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 204 - - 203 - - 202 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: ClosetWallEmergencyFilledRandom - entities: - - uid: 205 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-4.5 - parent: 1 - - uid: 206 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-8.5 - parent: 1 -- proto: ClosetWallFireFilledRandom - entities: - - uid: 207 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,1.5 - parent: 1 - - uid: 208 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-8.5 - parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: ClosetWallMaintenanceFilledRandom entities: - uid: 209 @@ -1863,13 +1864,26 @@ entities: - type: Transform pos: -0.5,6.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: ClothingEyesEyepatch entities: - - uid: 210 - components: - - type: Transform - pos: -0.3120169,12.330579 - parent: 1 - uid: 211 components: - type: Transform @@ -1880,14 +1894,14 @@ entities: - uid: 212 components: - type: Transform - pos: 1.2214307,2.6089354 + pos: -0.4273789,2.6294885 parent: 1 - proto: ClothingHeadHatPirate entities: - uid: 213 components: - type: Transform - pos: 1.5811653,12.328757 + pos: 1.4499189,12.408553 parent: 1 - proto: ClothingHeadHatPirateTricord entities: @@ -1896,40 +1910,13 @@ entities: - type: Transform pos: -0.27106684,-0.46582198 parent: 1 -- proto: ClothingNeckCloakPirateCap - entities: - - uid: 202 - components: - - type: Transform - parent: 201 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingOuterCoatJensen entities: - uid: 215 components: - type: Transform - pos: -0.3756531,12.328757 + pos: -0.3953849,12.460637 parent: 1 -- proto: ClothingOuterCoatPirate - entities: - - uid: 203 - components: - - type: Transform - parent: 201 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitPirate - entities: - - uid: 204 - components: - - type: Transform - parent: 201 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ComputerIFF entities: - uid: 216 @@ -1946,7 +1933,7 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,8.5 parent: 1 -- proto: ComputerShuttle +- proto: ComputerShuttleAntag entities: - uid: 218 components: @@ -1963,6 +1950,11 @@ entities: parent: 1 - proto: CrateEmptySpawner entities: + - uid: 203 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 - uid: 220 components: - type: Transform @@ -1983,33 +1975,13 @@ entities: - type: Transform pos: 1.5,-2.5 parent: 1 -- proto: CrateFunPirate - entities: - - uid: 225 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 1 -- proto: CratePirateChest - entities: - - uid: 224 - components: - - type: Transform - pos: -0.5,5.5 - parent: 1 -- proto: CratePirateChestCaptain - entities: - - uid: 274 - components: - - type: Transform - pos: -0.5,2.5 - parent: 1 - proto: DefibrillatorCabinetFilled entities: - - uid: 228 + - uid: 202 components: - type: Transform - pos: 2.5,5.5 + rot: 3.141592653589793 rad + pos: 1.5,-4.5 parent: 1 - proto: DresserFilled entities: @@ -2108,13 +2080,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,9.5 parent: 1 -- proto: FoodMealNachosCuban - entities: - - uid: 244 - components: - - type: Transform - pos: 2.418281,9.579869 - parent: 1 - proto: GravityGeneratorMini entities: - uid: 245 @@ -2309,13 +2274,6 @@ entities: - type: Transform pos: 2.3989987,-8.34466 parent: 1 -- proto: PinpointerUniversal - entities: - - uid: 280 - components: - - type: Transform - pos: 0.67992365,2.5024152 - parent: 1 - proto: PirateFlag entities: - uid: 281 @@ -2470,6 +2428,11 @@ entities: parent: 1 - proto: Rack entities: + - uid: 204 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 - uid: 304 components: - type: Transform @@ -2662,21 +2625,6 @@ entities: - type: Transform pos: 3.5,-0.5 parent: 1 - - uid: 337 - components: - - type: Transform - pos: -1.5,4.5 - parent: 1 - - uid: 338 - components: - - type: Transform - pos: 2.5,7.5 - parent: 1 - - uid: 339 - components: - - type: Transform - pos: 1.5,9.5 - parent: 1 - proto: RemoteSignaller entities: - uid: 505 @@ -2722,6 +2670,8 @@ entities: - type: Transform pos: -0.51266235,8.61944 parent: 1 + - type: Stack + count: 15 - proto: ShuttersNormal entities: - uid: 341 @@ -3004,13 +2954,6 @@ entities: parent: 1 - type: SpamEmitSound enabled: False -- proto: SpawnMobParrot - entities: - - uid: 372 - components: - - type: Transform - pos: 0.5,4.5 - parent: 1 - proto: SpawnPointPirate entities: - uid: 373 @@ -3047,40 +2990,13 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,7.5 parent: 1 -- proto: SuitStorageEVAPirate - entities: - - uid: 378 - components: - - type: Transform - pos: 3.5,7.5 - parent: 1 -- proto: SuitStoragePirateCap +- proto: TableCarpet entities: - - uid: 379 + - uid: 205 components: - type: Transform - pos: -1.5,-8.5 + pos: -0.5,2.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: TableCarpet - entities: - uid: 380 components: - type: Transform @@ -3584,34 +3500,6 @@ entities: - type: Transform pos: 0.5,3.5 parent: 1 -- proto: WeaponGrapplingGun - entities: - - uid: 471 - components: - - type: Transform - pos: 0.44128692,2.693194 - parent: 1 -- proto: WeaponLauncherPirateCannon - entities: - - uid: 472 - components: - - type: Transform - pos: 0.4072001,5.6771774 - parent: 1 -- proto: WeaponRevolverPirate - entities: - - uid: 473 - components: - - type: Transform - pos: 0.6162869,5.484689 - parent: 1 -- proto: WeaponShotgunBlunderbuss - entities: - - uid: 474 - components: - - type: Transform - pos: 0.5503819,5.2956195 - parent: 1 - proto: Window entities: - uid: 475 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml index 5679150b0ff..6f57c3f7fc5 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml @@ -195,4 +195,15 @@ - type: Sprite sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi - type: AccessReader - access: [["Security"]] \ No newline at end of file + access: [["Security"]] + +- type: entity + parent: CratePirate + id: CratePirateGrey + name: pirate chest + description: A space pirate chest, not for station lubbers. + components: + - type: Sprite + sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi + - type: Icon + sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml index c4f99e02454..f7afc7bdd73 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml @@ -12,7 +12,7 @@ id: Menace name: Menace description: 'Mail is no longer an option: you either receive it or you die.' - price: 50000 + price: 21000 category: Small group: BlackMarket shuttlePath: /Maps/_NF/Shuttles/BlackMarket/menace.yml diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate.png new file mode 100644 index 0000000000000000000000000000000000000000..eb02df2e4c138734bffc322f30991e485d1b0363 GIT binary patch literal 438 zcmV;n0ZIOeP)Px$a7jc#R9J=WmN9F>P!vW_Y$iL_L2$5$lx8Re5h)7A&8~uLC!uu6?jOm}rBmrv zaCVb|MT!V%3n@jU>8!DfPL|i9jZ_nC2qbavEO|Wcz2C>Z$;*Q+Ted`uB!r06KrB-A zO)ww>6l-eebI5&NNm_G`T&$@gdwfErln+h3)#=gK5r8BER7!cy3fa&M01Wgl@H+yV zn|hfn{Z<@j$)hJr>4qKR!bfO(heHwIqbV{vU+JK=1N! zr%CW<1n;kX0F<}3ry|Bdd9n7BV}n<+*SC6jL(swZ%^B7qmJ(UpWK4 zi&~Y@nsZ`WbM6TIuaFyla$o~K!^jORodXlg;;5l{PA(`J0M9uS%UW;X(HMFbhvCZ8 g9}5Ha6)9}K0rXgXBAwOS)c^nh07*qoM6N<$g4avC*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png new file mode 100644 index 0000000000000000000000000000000000000000..4b948b1073eb8377406a2fb71634b91520f4c877 GIT binary patch literal 527 zcmV+q0`UEbP)Px$$w@>(R9J=WmOn@WQ5?s=PbH|72yG6mC2EL@2t8`l1_w!noFW_~ZfJ>`G9-kC zAgG`rqzob|NRU7q8p1*(ZYpSypgE+WB8u!a=)=FKmzFu)XMFsA-|zSR-rcC<36EF{VORfh1%hW7bh@uG;Hi@Cr>1wWLD1h|t{i`0)qTj^7>Vcqi zQ{I~1yTV}Osn5Gq7juTsy97b$ra)!_|4HKo&@_GhiIJFY$+w_Qqb~d8)>ABRdZs_vr7a!67l^=Q9KuobUXoa~_yQ43Pne4XFfQhul7vQA z_7Sh}aC)#aW)khu+cs|q8%%|9}9EG8*uaUmMo#-UeBDtBaw-M#?;HiIds z*rg!cy#oMVANnMT2zP1{4ZY9>r?1iB#ve RzbgO$002ovPDHLkV1mJq<-Py_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..afecdb012ebb60998d193c414ca4daf204552470 GIT binary patch literal 619 zcmV-x0+juUP)Px%B}qg) zlPw~F3_`&O9fD{Dkt$dSLgOG(5(%LMI<-hB?qV{yiRn2cFT~_>d3Ur)!Ty(nkMH~c z|M$M{y>}-J!=PUfLg4C~dL4Z?;BE~B!_fol$=CNuVQC;3jvDEgOZ@m**>~}i!zT!a zqeh^*ERrAoG~z-Ip%e#r`{1%A*^pj{e0mL6K_C#EwS+DQg@bDS%9NRk(p-#MQ z2NBdJ+HBH0!ESy>1M7tn5zWWUlXTa@U%w%u`G7s8e93?D^su>s_)3PU@loDoca_MT zBEFL0&h_bb0}>mtn@U6zi8o|&n@o+5+Nx=V=?nn)ea9`yBATz>0@zTjF@xzg>_&9& z^=Gt@4uBTYd6vsN5{IT0kbSxF>XRd)3kz#XdCmQY`fV5tM~#v5muv~9Vl!wVooqUV zo>;Y2TiVJKs4k1=YgOFQYi<~r=lf0(0ROiyN+gpzMY8D>leZr#*KD7;(iUs9;MCbb zeWGh*-FiAPJBOZFOND*i#TV~+j%mLBKOu)rSy`ExdspI-rZ;P3*!Yb_+hmu&Gw_*v?8AL6 zm3EcCZuRK~Mg~9-#g_j6{+4vXlcSV`bv4<&0kf+N>SoW_0Uy3dkN<+z>Zy z@$JKh4jecTaASYd!uofNyDS*eQXSZ^$5X5FCBsLJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/welded.png new file mode 100644 index 0000000000000000000000000000000000000000..c7b469bb46d6d8c2c03890c04e684c0940c97a7b GIT binary patch literal 17749 zcmeI4e{3699l)vxTkSjd z?vgl`HY(T{8`2m|VjY?g;}6i77)+qHz@%pUD4PZ>f6z@Jv=)TK#;UKG*0lNsJ)p7-CGfeuXYDLozL60rM zInx@6yz>2%5!M7Fk^Ql}kgsInyg62L;8bl-L9ZRsQy_9vW++`%k%KbyG`3nUS*}_g ziPZh7NcM;M2wPY24vj=c{ebLreuB-~4rF7|IHwEo1e-`j#aJStBzCZpAjWt>=4FAC zWK|JVMPkEGBr}Ahv;z!vGPgSnhyELh%zIu%<@u$hrRb6zwVgR$Or=u1An}sKAq~!5 zwmhxMS?+a#lZKxhbalt9c&2T!zF)0qFL)!7h##o=3D2usX$G>~kR77PSG5W+Mg_i` z5zw19l?A6%pBm74Sb}9}c`mXOyV_OeZO?Y+?H(bUhkFJ_ImzdnvAfQ!^H z1R>I{mTqCW0{Kbk+6#^jcP*k*xvtyUyWS*hWv35UNWH5g&op}Y@sIR`0IOyXGyh0n zRt-g$OiH>&pwS zi}?Y%YS>O$^D<^xn}dACnoIMoK}@q*o@&-E*$$c(%*biJ+i+K_oUJeT*T<-(Ll-5( z#gc?lRqp^hwYm1u#(|QV3HlGPbrYzqpaLiYprm4)5-ZA_C_=y`fn4O0vMh=kl#P@D z(!AdVkc-y5!rBPOyStV}STsaAj$CWnn{|y!DGJbxV?ZoQhU8CCfm~cs3@$0e6fPD6 zpeUu{imn^o=NXK)lfkiHh^t?&`Mf%Axt@lwkLNP}d`vW-I280a&}B}G%Oa;G6~GmB zN#qieU?>S7qv>e%8g4gl5e!{7q9fPcDMCquiKGBHB`zgHiYZ;<3@Ga;cF{m}}G7UwN%D?;T@l9$FXbZh@=1R&OV+ zZFozX14rl3b>C0p4ZOCSb-M3!UjTH>i|H`fEcFH^w%$|!f6jT`S7v{^GJ0h;cSL??uJ7*KcV>+Z z<=UNGW7`^3=Wc(^_HP1E^$|91XpurUvMSaO8(Zmq+i8b++lmo-2jM+Z&)sx?w>!a9 zF=yRk+3Vd<2T{7XX+>+~A=koBeZGoz9_AMMQ)vP+T|-qD*lS z5#b6H7fypHQ(QzuxB|t6(;&(e7ZDMzKyl$Th%&`RM1(6)TsRG)OmPtr;R+NNPJ<{@ zTtq~;0>y>XAj%XM5fQFHap5$GGQ~wigey>7I1QpqaS;*W3KSPkgD6v6L`1j(#f8%# z$`lt75w1XS;WUWy1#u0vUaJ8u^e&Ah^wNy)Z2RdZ^ui5RADhfGOznDxIr2${`TM`n z_sa~kATZ1yW*J63$}n%YKmV~G?`D_{d&hI5h3c>V^!yXI4UArMD1( zv1!|}Up{2teQ@~t$ivdllZU5|42C}|Cz-!&-}2!Py>|P%K6CC3WA&A1OPNg*qt`I2 zuf72eEDwKn-w$7h*Y4UldOwg)eR}bolaFqF{P`zK@e>E!GcP|Kzwd#aGvCK-P4}N>*OJAL0 zzJB^f=5Muwcl>$f-G@K==+mXl{>N_k!RZ6X4&U;~1atO#h2lGY@|L@^r%Um{*=s-b z(yjLu)StP-1C`G`vwGX{eTN?Ol