From 6aada9251d99142333ff0640c3d55be7e19771da Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:06:38 -0600 Subject: [PATCH 1/5] Move/update new salvage map (#798) Co-authored-by: Velcroboy <> --- .../Maps/Salvage/DeltaV/DV-outpost-arm.yml | 1851 +++++++++++++++++ Resources/Prototypes/Maps/salvage.yml | 2 +- 2 files changed, 1852 insertions(+), 1 deletion(-) create mode 100644 Resources/Maps/Salvage/DeltaV/DV-outpost-arm.yml diff --git a/Resources/Maps/Salvage/DeltaV/DV-outpost-arm.yml b/Resources/Maps/Salvage/DeltaV/DV-outpost-arm.yml new file mode 100644 index 00000000000..b15f6e4e857 --- /dev/null +++ b/Resources/Maps/Salvage/DeltaV/DV-outpost-arm.yml @@ -0,0 +1,1851 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 65: FloorMetalDiamond + 67: FloorMining + 71: FloorOldConcrete + 72: FloorOldConcreteMono + 78: FloorReinforced + 121: Lattice + 122: Plating + 124: PlatingBurnt + 125: PlatingDamaged +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: grid + - type: Transform + pos: -6.1930037,0.9843712 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: RwAAAAADfAAAAAAAfQAAAAAAeQAAAAAAfAAAAAAARwAAAAACegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAACSAAAAAADSAAAAAADSAAAAAAAfQAAAAAASAAAAAACegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAASAAAAAABSAAAAAAASAAAAAABSAAAAAABSAAAAAAAfAAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAAASAAAAAAASAAAAAADSAAAAAAASAAAAAAASAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAABSAAAAAABSAAAAAAASAAAAAABfAAAAAAASAAAAAACfAAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAASAAAAAAASAAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAADegAAAAAASAAAAAABSAAAAAACegAAAAAAegAAAAAAegAAAAAATgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAASAAAAAABSAAAAAABfAAAAAAAegAAAAAATgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAACegAAAAAAfQAAAAAASAAAAAAASAAAAAACSAAAAAADfQAAAAACTgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAABfAAAAAAAeQAAAAAAegAAAAAASAAAAAADSAAAAAADRwAAAAAATgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARwAAAAACegAAAAAAegAAAAAASAAAAAABSAAAAAACegAAAAAARwAAAAACTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAASAAAAAACSAAAAAADSAAAAAABegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAQQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAegAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAegAAAAAAQQAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAegAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAegAAAAAAQQAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAegAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAfQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,1: + ind: 0,1 + tiles: QQAAAAAAegAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAegAAAAAAQQAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAegAAAAAAegAAAAAAQQAAAAAAegAAAAAAegAAAAAAQQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,1: + ind: -1,1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + cleanable: True + color: '#000000FF' + id: Damaged + decals: + 13: 4,6 + 14: -1,11 + 15: 2,10 + 16: 6,3 + 17: 5,5 + 18: 4,1 + - node: + cleanable: True + color: '#FFFFFFFF' + id: Dirt + decals: + 0: 2,2 + 1: 5,9 + 8: 1,10 + 9: 6,5 + 10: 0,1 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavy + decals: + 2: 0,11 + 3: 6,10 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtHeavyMonotile + decals: + 7: 5,4 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtLight + decals: + 4: 0,1 + 5: 5,0 + - node: + cleanable: True + color: '#FFFFFFFF' + id: DirtMedium + decals: + 6: 0,9 + - node: + cleanable: True + color: '#FFFFFFFF' + id: Rust + decals: + 11: -1,-1 + - node: + cleanable: True + color: '#636200FF' + id: danger + decals: + 12: 4.9819956,1.0227132 + - node: + cleanable: True + color: '#7F0000FF' + id: o + decals: + 22: 4.302699,3.1356921 + - node: + cleanable: True + color: '#7F0000FF' + id: s + decals: + 20: 3.943324,3.1513171 + 21: 4.755824,3.1356921 + - node: + cleanable: True + color: '#500000FF' + id: splatter + decals: + 19: 1.5020199,7.7976913 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 65535 + 1,0: + 0: 65535 + 2,0: + 0: 4369 + 0,1: + 0: 65535 + 0,2: + 0: 65535 + 0,3: + 0: 65535 + 1,1: + 0: 65535 + 1,2: + 0: 65535 + 1,3: + 0: 65535 + 2,1: + 0: 4369 + 2,2: + 0: 17 + 2,3: + 0: 8818 + -1,3: + 0: 43770 + -1,0: + 0: 61160 + -1,1: + 0: 52462 + -1,2: + 0: 34956 + -1,-1: + 0: 34944 + 0,-1: + 0: 28928 + 1,-1: + 0: 63264 + 2,-1: + 0: 4096 + 0,4: + 0: 65535 + 0,5: + 0: 242 + 1,4: + 0: 65535 + 1,5: + 0: 2 + 2,4: + 0: 50 + -1,4: + 0: 35578 + -1,5: + 0: 128 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: RadiationGridResistance +- proto: BlastDoor + entities: + - uid: 105 + components: + - type: Transform + pos: 4.5,11.5 + parent: 1 + - uid: 107 + components: + - type: Transform + pos: 3.5,11.5 + parent: 1 + - uid: 108 + components: + - type: Transform + pos: 2.5,11.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 76 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 236 + components: + - type: Transform + pos: 1.5,17.5 + parent: 1 + - uid: 237 + components: + - type: Transform + pos: 2.5,17.5 + parent: 1 + - uid: 238 + components: + - type: Transform + pos: 3.5,17.5 + parent: 1 + - uid: 239 + components: + - type: Transform + pos: 4.5,17.5 + parent: 1 + - uid: 240 + components: + - type: Transform + pos: 5.5,17.5 + parent: 1 + - uid: 241 + components: + - type: Transform + pos: 3.5,16.5 + parent: 1 + - uid: 242 + components: + - type: Transform + pos: 3.5,16.5 + parent: 1 + - uid: 243 + components: + - type: Transform + pos: 3.5,15.5 + parent: 1 + - uid: 244 + components: + - type: Transform + pos: 3.5,14.5 + parent: 1 + - uid: 245 + components: + - type: Transform + pos: 3.5,13.5 + parent: 1 + - uid: 246 + components: + - type: Transform + pos: 3.5,12.5 + parent: 1 + - uid: 247 + components: + - type: Transform + pos: 3.5,12.5 + parent: 1 + - uid: 248 + components: + - type: Transform + pos: 3.5,11.5 + parent: 1 + - uid: 249 + components: + - type: Transform + pos: 3.5,9.5 + parent: 1 + - uid: 250 + components: + - type: Transform + pos: 3.5,10.5 + parent: 1 + - uid: 251 + components: + - type: Transform + pos: 2.5,12.5 + parent: 1 + - uid: 252 + components: + - type: Transform + pos: 1.5,12.5 + parent: 1 + - uid: 253 + components: + - type: Transform + pos: 0.5,12.5 + parent: 1 + - uid: 254 + components: + - type: Transform + pos: 4.5,12.5 + parent: 1 + - uid: 255 + components: + - type: Transform + pos: 5.5,12.5 + parent: 1 + - uid: 256 + components: + - type: Transform + pos: 6.5,12.5 + parent: 1 + - uid: 257 + components: + - type: Transform + pos: 0.5,17.5 + parent: 1 + - uid: 258 + components: + - type: Transform + pos: 1.5,17.5 + parent: 1 + - uid: 259 + components: + - type: Transform + pos: 2.5,17.5 + parent: 1 + - uid: 260 + components: + - type: Transform + pos: 2.5,17.5 + parent: 1 + - uid: 261 + components: + - type: Transform + pos: 4.5,17.5 + parent: 1 + - uid: 262 + components: + - type: Transform + pos: 5.5,17.5 + parent: 1 + - uid: 263 + components: + - type: Transform + pos: 6.5,17.5 + parent: 1 + - uid: 264 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 + - uid: 265 + components: + - type: Transform + pos: 3.5,7.5 + parent: 1 + - uid: 266 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 + - uid: 267 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 + - uid: 268 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - uid: 269 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 270 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 + - uid: 271 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 + - uid: 272 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 273 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 274 + components: + - type: Transform + pos: 4.5,2.5 + parent: 1 + - uid: 275 + components: + - type: Transform + pos: 5.5,2.5 + parent: 1 +- proto: CableHV + entities: + - uid: 12 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: 3.5,7.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: 7.5,10.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: 7.5,8.5 + parent: 1 + - uid: 22 + components: + - type: Transform + pos: 7.5,9.5 + parent: 1 + - uid: 23 + components: + - type: Transform + pos: 7.5,6.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: 7.5,7.5 + parent: 1 + - uid: 25 + components: + - type: Transform + pos: 6.5,7.5 + parent: 1 + - uid: 26 + components: + - type: Transform + pos: 5.5,7.5 + parent: 1 + - uid: 27 + components: + - type: Transform + pos: 4.5,7.5 + parent: 1 + - uid: 28 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - uid: 29 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 30 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - uid: 31 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 32 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 33 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 34 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - uid: 276 + components: + - type: Transform + pos: 4.5,8.5 + parent: 1 + - uid: 277 + components: + - type: Transform + pos: 4.5,9.5 + parent: 1 + - uid: 278 + components: + - type: Transform + pos: 4.5,10.5 + parent: 1 + - uid: 279 + components: + - type: Transform + pos: 4.5,11.5 + parent: 1 + - uid: 280 + components: + - type: Transform + pos: 4.5,12.5 + parent: 1 + - uid: 281 + components: + - type: Transform + pos: 5.5,12.5 + parent: 1 + - uid: 282 + components: + - type: Transform + pos: 6.5,12.5 + parent: 1 + - uid: 283 + components: + - type: Transform + pos: 6.5,13.5 + parent: 1 + - uid: 284 + components: + - type: Transform + pos: 6.5,14.5 + parent: 1 + - uid: 285 + components: + - type: Transform + pos: 6.5,15.5 + parent: 1 + - uid: 286 + components: + - type: Transform + pos: 6.5,16.5 + parent: 1 + - uid: 287 + components: + - type: Transform + pos: 6.5,17.5 + parent: 1 + - uid: 288 + components: + - type: Transform + pos: 6.5,18.5 + parent: 1 + - uid: 289 + components: + - type: Transform + pos: 6.5,19.5 + parent: 1 + - uid: 290 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 291 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 292 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 + - uid: 293 + components: + - type: Transform + pos: 2.5,3.5 + parent: 1 + - uid: 294 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 295 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 +- proto: Chair + entities: + - uid: 111 + components: + - type: Transform + pos: 5.5,4.5 + parent: 1 +- proto: CigarGoldCase + entities: + - uid: 191 + components: + - type: Transform + pos: 4.752561,14.569866 + parent: 1 +- proto: ClosetEmergencyFilledRandom + entities: + - uid: 132 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 +- proto: ClothingHeadHelmetScaf + entities: + - uid: 196 + components: + - type: Transform + pos: 3.752561,14.507366 + parent: 1 +- proto: ClothingOuterArmorScaf + entities: + - uid: 195 + components: + - type: Transform + pos: 3.346311,14.569866 + parent: 1 +- proto: CrateEngineeringCableBulk + entities: + - uid: 122 + components: + - type: Transform + pos: 6.5,9.5 + parent: 1 +- proto: GeneratorRTG + entities: + - uid: 8 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 +- proto: Girder + entities: + - uid: 206 + components: + - type: Transform + pos: 3.5,0.5 + parent: 1 +- proto: Grille + entities: + - uid: 2 + components: + - type: Transform + pos: -3.5,13.5 + parent: 1 + - uid: 3 + components: + - type: Transform + pos: -2.5,1.5 + parent: 1 + - uid: 4 + components: + - type: Transform + pos: -2.5,2.5 + parent: 1 + - uid: 5 + components: + - type: Transform + pos: -2.5,3.5 + parent: 1 + - uid: 6 + components: + - type: Transform + pos: -2.5,4.5 + parent: 1 + - uid: 7 + components: + - type: Transform + pos: -2.5,5.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 17 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 18 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - uid: 35 + components: + - type: Transform + pos: 7.5,6.5 + parent: 1 + - uid: 36 + components: + - type: Transform + pos: 7.5,7.5 + parent: 1 + - uid: 37 + components: + - type: Transform + pos: 7.5,8.5 + parent: 1 + - uid: 38 + components: + - type: Transform + pos: 7.5,9.5 + parent: 1 + - uid: 39 + components: + - type: Transform + pos: 7.5,10.5 + parent: 1 + - uid: 198 + components: + - type: Transform + pos: -2.5,13.5 + parent: 1 + - uid: 199 + components: + - type: Transform + pos: -2.5,14.5 + parent: 1 + - uid: 200 + components: + - type: Transform + pos: -2.5,12.5 + parent: 1 + - uid: 201 + components: + - type: Transform + pos: -2.5,15.5 + parent: 1 + - uid: 202 + components: + - type: Transform + pos: -2.5,16.5 + parent: 1 + - uid: 204 + components: + - type: Transform + pos: -3.5,17.5 + parent: 1 + - uid: 205 + components: + - type: Transform + pos: -2.5,17.5 + parent: 1 + - uid: 207 + components: + - type: Transform + pos: 9.5,14.5 + parent: 1 + - uid: 208 + components: + - type: Transform + pos: 9.5,13.5 + parent: 1 + - uid: 209 + components: + - type: Transform + pos: 9.5,15.5 + parent: 1 + - uid: 210 + components: + - type: Transform + pos: 9.5,16.5 + parent: 1 + - uid: 213 + components: + - type: Transform + pos: 0.5,21.5 + parent: 1 + - uid: 214 + components: + - type: Transform + pos: 1.5,21.5 + parent: 1 + - uid: 215 + components: + - type: Transform + pos: 2.5,21.5 + parent: 1 +- proto: GrilleBroken + entities: + - uid: 203 + components: + - type: Transform + pos: -2.5,18.5 + parent: 1 + - uid: 211 + components: + - type: Transform + pos: 9.5,17.5 + parent: 1 + - uid: 212 + components: + - type: Transform + pos: 1.5,20.5 + parent: 1 +- proto: GrilleSpawner + entities: + - uid: 216 + components: + - type: Transform + pos: -0.5,21.5 + parent: 1 + - uid: 217 + components: + - type: Transform + pos: 3.5,21.5 + parent: 1 + - uid: 218 + components: + - type: Transform + pos: 9.5,12.5 + parent: 1 +- proto: HighSecCommandLocked + entities: + - uid: 168 + components: + - type: Transform + pos: 3.5,17.5 + parent: 1 +- proto: InflatableWall + entities: + - uid: 97 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 + - uid: 103 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 104 + components: + - type: Transform + pos: 4.5,5.5 + parent: 1 +- proto: InflatableWallStack5 + entities: + - uid: 106 + components: + - type: Transform + pos: 2.3491457,6.305113 + parent: 1 +- proto: IngotGold + entities: + - uid: 190 + components: + - type: Transform + pos: 2.549436,14.585491 + parent: 1 +- proto: LandMineExplosive + entities: + - uid: 77 + components: + - type: Transform + pos: 1.5668869,-0.46386743 + parent: 1 + - uid: 78 + components: + - type: Transform + pos: 4.582512,-0.27636743 + parent: 1 +- proto: MaintenanceToolSpawner + entities: + - uid: 183 + components: + - type: Transform + pos: 6.5,17.5 + parent: 1 +- proto: MaintenanceWeaponSpawner + entities: + - uid: 112 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 +- proto: MaterialDiamond1 + entities: + - uid: 185 + components: + - type: Transform + pos: 2.2577534,14.522991 + parent: 1 + - uid: 186 + components: + - type: Transform + pos: 2.2577534,14.522991 + parent: 1 + - uid: 187 + components: + - type: Transform + pos: 2.2577534,14.522991 + parent: 1 + - uid: 188 + components: + - type: Transform + pos: 2.2577534,14.522991 + parent: 1 + - uid: 189 + components: + - type: Transform + pos: 2.2577534,14.522991 + parent: 1 +- proto: MaterialWoodPlank + entities: + - uid: 182 + components: + - type: Transform + pos: 1.6308241,12.5394535 + parent: 1 +- proto: Poweredlight + entities: + - uid: 219 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,15.5 + parent: 1 + - uid: 220 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,15.5 + parent: 1 + - uid: 221 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,17.5 + parent: 1 + - uid: 222 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,17.5 + parent: 1 + - uid: 223 + components: + - type: Transform + pos: 2.5,12.5 + parent: 1 + - uid: 224 + components: + - type: Transform + pos: 4.5,12.5 + parent: 1 + - uid: 225 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,8.5 + parent: 1 + - uid: 226 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 + - uid: 227 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,1.5 + parent: 1 + - uid: 228 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + - uid: 229 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,3.5 + parent: 1 + - uid: 230 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,1.5 + parent: 1 +- proto: PoweredSmallLight + entities: + - uid: 234 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,10.5 + parent: 1 + - uid: 235 + components: + - type: Transform + pos: 3.5,18.5 + parent: 1 +- proto: PoweredSmallLightEmpty + entities: + - uid: 231 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,6.5 + parent: 1 + - uid: 232 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,6.5 + parent: 1 + - uid: 233 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,10.5 + parent: 1 +- proto: Rack + entities: + - uid: 179 + components: + - type: Transform + pos: 2.5,14.5 + parent: 1 + - uid: 180 + components: + - type: Transform + pos: 3.5,14.5 + parent: 1 + - uid: 184 + components: + - type: Transform + pos: 4.5,14.5 + parent: 1 +- proto: RandomArtifactSpawner20 + entities: + - uid: 87 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 +- proto: RandomInstruments + entities: + - uid: 85 + components: + - type: Transform + pos: 4.5,16.5 + parent: 1 +- proto: RandomPosterAny + entities: + - uid: 129 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: 7.5,2.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 +- proto: RandomSecurityCorpseSpawner + entities: + - uid: 109 + components: + - type: Transform + pos: 2.5,8.5 + parent: 1 +- proto: RandomSpawner + entities: + - uid: 86 + components: + - type: Transform + pos: 6.5,8.5 + parent: 1 +- proto: RandomSpawner100 + entities: + - uid: 84 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 +- proto: RandomVendingDrinks + entities: + - uid: 133 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 +- proto: ReinforcedGirder + entities: + - uid: 70 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 + - uid: 71 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - uid: 72 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 73 + components: + - type: Transform + pos: 4.5,0.5 + parent: 1 + - uid: 74 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 + - uid: 75 + components: + - type: Transform + pos: 6.5,0.5 + parent: 1 +- proto: ReinforcedPlasmaWindow + entities: + - uid: 9 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 10 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 11 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 40 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 41 + components: + - type: Transform + pos: 7.5,6.5 + parent: 1 + - uid: 42 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: 7.5,7.5 + parent: 1 + - uid: 44 + components: + - type: Transform + pos: 7.5,8.5 + parent: 1 + - uid: 45 + components: + - type: Transform + pos: 7.5,9.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: 7.5,10.5 + parent: 1 +- proto: ResearchDisk10000 + entities: + - uid: 192 + components: + - type: Transform + pos: 4.408811,14.491741 + parent: 1 +- proto: SalvageCanisterSpawner + entities: + - uid: 82 + components: + - type: Transform + pos: 0.5,8.5 + parent: 1 + - uid: 121 + components: + - type: Transform + pos: 6.5,10.5 + parent: 1 +- proto: SalvageLootSpawner + entities: + - uid: 193 + components: + - type: Transform + pos: 2.5,16.5 + parent: 1 +- proto: SalvageMaterialCrateSpawner + entities: + - uid: 80 + components: + - type: Transform + pos: 3.5,3.5 + parent: 1 + - uid: 81 + components: + - type: Transform + pos: 6.5,1.5 + parent: 1 + - uid: 120 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 +- proto: SalvageMobSpawner + entities: + - uid: 113 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 + - uid: 114 + components: + - type: Transform + pos: 0.5,9.5 + parent: 1 +- proto: SalvageMobSpawner75 + entities: + - uid: 115 + components: + - type: Transform + pos: 3.5,10.5 + parent: 1 +- proto: ShuttersNormal + entities: + - uid: 47 + components: + - type: Transform + pos: -0.5,10.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 50 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 51 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 7.5,6.5 + parent: 1 + - uid: 53 + components: + - type: Transform + pos: 7.5,7.5 + parent: 1 + - uid: 54 + components: + - type: Transform + pos: 7.5,8.5 + parent: 1 + - uid: 55 + components: + - type: Transform + pos: 7.5,10.5 + parent: 1 +- proto: ShuttersNormalOpen + entities: + - uid: 49 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 56 + components: + - type: Transform + pos: 7.5,9.5 + parent: 1 +- proto: ShuttersWindowOpen + entities: + - uid: 123 + components: + - type: Transform + pos: 1.5,9.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - uid: 125 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 5.5,9.5 + parent: 1 + - uid: 127 + components: + - type: Transform + pos: 5.5,8.5 + parent: 1 + - uid: 128 + components: + - type: Transform + pos: 5.5,7.5 + parent: 1 +- proto: SignElectricalMed + entities: + - uid: 296 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 +- proto: SignRedTwo + entities: + - uid: 298 + components: + - type: Transform + pos: 3.5,13.5 + parent: 1 +- proto: SignSomethingOld2 + entities: + - uid: 297 + components: + - type: Transform + pos: 5.5,6.5 + parent: 1 +- proto: SpaceTickSpawner + entities: + - uid: 117 + components: + - type: Transform + pos: -1.5,1.5 + parent: 1 + - uid: 118 + components: + - type: Transform + pos: 8.5,7.5 + parent: 1 + - uid: 119 + components: + - type: Transform + pos: 8.5,2.5 + parent: 1 +- proto: SpawnMobBearSalvage + entities: + - uid: 177 + components: + - type: Transform + pos: 0.5,14.5 + parent: 1 + - uid: 178 + components: + - type: Transform + pos: 6.5,14.5 + parent: 1 +- proto: SpawnMobCobraSalvage + entities: + - uid: 83 + components: + - type: Transform + pos: 6.5,7.5 + parent: 1 + - uid: 116 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1 +- proto: SpawnMobShark + entities: + - uid: 181 + components: + - type: Transform + pos: 3.5,18.5 + parent: 1 +- proto: SteelBench + entities: + - uid: 110 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,2.5 + parent: 1 +- proto: UraniumOre + entities: + - uid: 194 + components: + - type: Transform + pos: 6.5117617,6.5053644 + parent: 1 +- proto: WallPlastitanium + entities: + - uid: 57 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 + - uid: 58 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 + - uid: 59 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - uid: 60 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 61 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 62 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 63 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 64 + components: + - type: Transform + pos: 7.5,4.5 + parent: 1 + - uid: 65 + components: + - type: Transform + pos: 7.5,5.5 + parent: 1 + - uid: 66 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 + - uid: 67 + components: + - type: Transform + pos: 7.5,2.5 + parent: 1 + - uid: 68 + components: + - type: Transform + pos: 7.5,0.5 + parent: 1 + - uid: 69 + components: + - type: Transform + pos: 7.5,1.5 + parent: 1 + - uid: 88 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 89 + components: + - type: Transform + pos: -0.5,11.5 + parent: 1 + - uid: 90 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 + - uid: 91 + components: + - type: Transform + pos: 7.5,11.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: 6.5,11.5 + parent: 1 + - uid: 93 + components: + - type: Transform + pos: 6.5,5.5 + parent: 1 + - uid: 94 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 95 + components: + - type: Transform + pos: 1.5,11.5 + parent: 1 + - uid: 96 + components: + - type: Transform + pos: 5.5,11.5 + parent: 1 + - uid: 98 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 + - uid: 99 + components: + - type: Transform + pos: 5.5,10.5 + parent: 1 + - uid: 100 + components: + - type: Transform + pos: 5.5,6.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 102 + components: + - type: Transform + pos: 5.5,5.5 + parent: 1 + - uid: 134 + components: + - type: Transform + pos: -0.5,12.5 + parent: 1 + - uid: 135 + components: + - type: Transform + pos: -0.5,13.5 + parent: 1 + - uid: 136 + components: + - type: Transform + pos: -0.5,14.5 + parent: 1 + - uid: 137 + components: + - type: Transform + pos: -0.5,15.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: -0.5,16.5 + parent: 1 + - uid: 139 + components: + - type: Transform + pos: -0.5,17.5 + parent: 1 + - uid: 140 + components: + - type: Transform + pos: -0.5,18.5 + parent: 1 + - uid: 141 + components: + - type: Transform + pos: -0.5,19.5 + parent: 1 + - uid: 142 + components: + - type: Transform + pos: 0.5,19.5 + parent: 1 + - uid: 143 + components: + - type: Transform + pos: 1.5,19.5 + parent: 1 + - uid: 144 + components: + - type: Transform + pos: 2.5,19.5 + parent: 1 + - uid: 145 + components: + - type: Transform + pos: 4.5,19.5 + parent: 1 + - uid: 146 + components: + - type: Transform + pos: 3.5,19.5 + parent: 1 + - uid: 147 + components: + - type: Transform + pos: 5.5,19.5 + parent: 1 + - uid: 148 + components: + - type: Transform + pos: 6.5,19.5 + parent: 1 + - uid: 149 + components: + - type: Transform + pos: 7.5,19.5 + parent: 1 + - uid: 150 + components: + - type: Transform + pos: 7.5,18.5 + parent: 1 + - uid: 151 + components: + - type: Transform + pos: 7.5,18.5 + parent: 1 + - uid: 152 + components: + - type: Transform + pos: 7.5,17.5 + parent: 1 + - uid: 153 + components: + - type: Transform + pos: 7.5,16.5 + parent: 1 + - uid: 154 + components: + - type: Transform + pos: 7.5,16.5 + parent: 1 + - uid: 155 + components: + - type: Transform + pos: 7.5,15.5 + parent: 1 + - uid: 156 + components: + - type: Transform + pos: 7.5,14.5 + parent: 1 + - uid: 157 + components: + - type: Transform + pos: 7.5,13.5 + parent: 1 + - uid: 158 + components: + - type: Transform + pos: 7.5,12.5 + parent: 1 + - uid: 159 + components: + - type: Transform + pos: 1.5,13.5 + parent: 1 + - uid: 160 + components: + - type: Transform + pos: 2.5,13.5 + parent: 1 + - uid: 161 + components: + - type: Transform + pos: 4.5,13.5 + parent: 1 + - uid: 162 + components: + - type: Transform + pos: 5.5,13.5 + parent: 1 + - uid: 163 + components: + - type: Transform + pos: 1.5,14.5 + parent: 1 + - uid: 164 + components: + - type: Transform + pos: 1.5,15.5 + parent: 1 + - uid: 165 + components: + - type: Transform + pos: 1.5,16.5 + parent: 1 + - uid: 166 + components: + - type: Transform + pos: 1.5,17.5 + parent: 1 + - uid: 167 + components: + - type: Transform + pos: 2.5,17.5 + parent: 1 + - uid: 169 + components: + - type: Transform + pos: 4.5,17.5 + parent: 1 + - uid: 170 + components: + - type: Transform + pos: 5.5,17.5 + parent: 1 + - uid: 171 + components: + - type: Transform + pos: 5.5,16.5 + parent: 1 + - uid: 172 + components: + - type: Transform + pos: 5.5,15.5 + parent: 1 + - uid: 173 + components: + - type: Transform + pos: 5.5,14.5 + parent: 1 + - uid: 176 + components: + - type: Transform + pos: 3.5,13.5 + parent: 1 +- proto: WarpPoint + entities: + - uid: 299 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 + - type: WarpPoint + location: Space Debris +- proto: WeaponTurretSyndicateBroken + entities: + - uid: 197 + components: + - type: Transform + pos: 3.5,15.5 + parent: 1 +- proto: WetFloorSign + entities: + - uid: 79 + components: + - type: Transform + pos: 1.2387619,2.9111326 + parent: 1 +- proto: WindoorSecureCommandLocked + entities: + - uid: 174 + components: + - type: Transform + pos: 0.5,13.5 + parent: 1 + - uid: 175 + components: + - type: Transform + pos: 6.5,13.5 + parent: 1 +... diff --git a/Resources/Prototypes/Maps/salvage.yml b/Resources/Prototypes/Maps/salvage.yml index 9099a6a9578..f1472b7e4b7 100644 --- a/Resources/Prototypes/Maps/salvage.yml +++ b/Resources/Prototypes/Maps/salvage.yml @@ -62,7 +62,7 @@ - type: salvageMap id: OutpostArm - mapPath: /Maps/Salvage/outpost-arm.yml + mapPath: /Maps/Salvage/DeltaV/DV-outpost-arm.yml #DeltaV: DV salvage map Location - type: salvageMap id: Medium1 From 1561e966d0402464a0bdda592387cb10335601e8 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 9 Feb 2024 11:47:35 +0100 Subject: [PATCH 2/5] Fix mantis stamp (#800) move paper_stamp-matis --- .../Textures/Objects/Misc/bureaucracy.rsi/meta.json | 3 +++ .../paper_stamp-mantis.png | Bin .../Textures/Objects/Misc/stamps.rsi/meta.json | 3 --- 3 files changed, 3 insertions(+), 3 deletions(-) rename Resources/Textures/Objects/Misc/{stamps.rsi => bureaucracy.rsi}/paper_stamp-mantis.png (100%) diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 50de8633135..46bf1f122f6 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -247,6 +247,9 @@ }, { "name": "paper_stamp-generic" + }, + { + "name": "paper_stamp-mantis" } ] } diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/paper_stamp-mantis.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-mantis.png similarity index 100% rename from Resources/Textures/Objects/Misc/stamps.rsi/paper_stamp-mantis.png rename to Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-mantis.png diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json index e87b0fa31b9..f755ac3b6fe 100644 --- a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json @@ -54,9 +54,6 @@ }, { "name": "stamp-warden" - }, - { - "name": "paper_stamp-mantis" } ] } From aff33a6c66ba6683ff8a1c2827e03cfe543cf4c1 Mon Sep 17 00:00:00 2001 From: DeltaV-Bot Date: Fri, 9 Feb 2024 10:47:50 +0000 Subject: [PATCH 3/5] Automatic Changelog Update (#800) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 36d4b0c9581..468f6248744 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1552,3 +1552,9 @@ Entries: addition of medical cyborgs. id: 233 time: '2024-02-08T19:21:16.0000000+00:00' +- author: FluffiestFloof + changes: + - type: Fix + message: Fixed missing Mantis stamp sprite. + id: 234 + time: '2024-02-09T10:47:35.0000000+00:00' From e1337f7f5ec87a4687a995f8707fc421c575cbad Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:51:32 +0100 Subject: [PATCH 4/5] Update patreon list (#807) --- Content.Client/Credits/CreditsWindow.xaml.cs | 6 +- Resources/Credits/Patrons.yml | 268 ++++--------------- 2 files changed, 60 insertions(+), 214 deletions(-) diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs index 60ac5798454..d804246687b 100644 --- a/Content.Client/Credits/CreditsWindow.xaml.cs +++ b/Content.Client/Credits/CreditsWindow.xaml.cs @@ -29,9 +29,9 @@ public sealed partial class CreditsWindow : DefaultWindow private static readonly Dictionary PatronTierPriority = new() { - ["Nuclear Operative"] = 1, - ["Syndicate Agent"] = 2, - ["Revolutionary"] = 3 + ["Central Commander"] = 1, + ["Captain"] = 2, + ["Assistant"] = 3 }; public CreditsWindow() diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml index 9b8752a5e89..ff98e134cec 100644 --- a/Resources/Credits/Patrons.yml +++ b/Resources/Credits/Patrons.yml @@ -1,212 +1,58 @@ -- Name: "Tomeno" - Tier: Revolutionary -- Name: "Daniel Thompson" - Tier: Revolutionary -- Name: "Farewell Fire" - Tier: Syndicate Agent -- Name: "MetalClone" - Tier: Nuclear Operative -- Name: "CPM311" - Tier: Revolutionary -- Name: "Bobberunio" - Tier: Revolutionary -- Name: "vifs_vestige" - Tier: Syndicate Agent -- Name: "Anthony Fleck" - Tier: Nuclear Operative -- Name: "Nico Thate" - Tier: Revolutionary -- Name: "Zandario" - Tier: Nuclear Operative -- Name: "Darren Brady" - Tier: Revolutionary -- Name: "DramaBuns" - Tier: Revolutionary -- Name: "Ethan Keller" - Tier: Revolutionary -- Name: "Eric VW" - Tier: Revolutionary -- Name: "Joshington Awesomahee" - Tier: Revolutionary -- Name: "Altana" - Tier: Revolutionary -- Name: "clyf" - Tier: Nuclear Operative -- Name: "spinnermaster" - Tier: Syndicate Agent -- Name: "Will M." - Tier: Revolutionary -- Name: "The Hateful Flesh" - Tier: Revolutionary -- Name: "Viridian" - Tier: Revolutionary -- Name: "Nicholas Hillblom" - Tier: Revolutionary -- Name: "Austin Nelson" - Tier: Syndicate Agent -- Name: "John Edward Hamilton Barchard" - Tier: Revolutionary -- Name: "Cormos Lemming" - Tier: Nuclear Operative -- Name: "Hamcha" - Tier: Revolutionary -- Name: "Peter \"Azmond\" Newhouse" - Tier: Revolutionary -- Name: "Zakanater 19" - Tier: Revolutionary -- Name: "Kris Piper" - Tier: Revolutionary -- Name: "Mikhail" - Tier: Revolutionary -- Name: "Ramiro Agis" - Tier: Revolutionary -- Name: "osborn" - Tier: Syndicate Agent -- Name: "Uinseann" - Tier: Revolutionary -- Name: "Brandon Campbell" - Tier: Nuclear Operative -- Name: "KevKev" - Tier: Revolutionary -- Name: "Jacob Schramm" - Tier: Revolutionary -- Name: "Matouš Hrdlička" - Tier: Nuclear Operative -- Name: "Pasemi" - Tier: Revolutionary -- Name: "Late Fox" - Tier: Revolutionary -- Name: "Dan" - Tier: Syndicate Agent -- Name: "Scott MacCombie" - Tier: Nuclear Operative -- Name: "Gaxeer" - Tier: Syndicate Agent -- Name: "Tamora Droppa" - Tier: Revolutionary -- Name: "Gavin Simmons" - Tier: Syndicate Agent -- Name: "Saphire" - Tier: Revolutionary -- Name: "DubzyVEVO" - Tier: Revolutionary -- Name: "Never Solus" - Tier: Syndicate Agent -- Name: "Gnomo" - Tier: Nuclear Operative -- Name: "TheGoldElite" - Tier: Revolutionary -- Name: "JhenMaster" - Tier: Revolutionary -- Name: "Akira" - Tier: Revolutionary -- Name: "Dave" - Tier: Revolutionary -- Name: "Александр Белошапка" - Tier: Revolutionary -- Name: "Gordod" - Tier: Syndicate Agent -- Name: "tomhendo" - Tier: Syndicate Agent -- Name: "Odin The Wanderer" - Tier: Revolutionary -- Name: "tokie" - Tier: Nuclear Operative -- Name: "Wallace Megas" - Tier: Revolutionary -- Name: "Vandell" - Tier: Revolutionary -- Name: "Enricoc3l" - Tier: Revolutionary -- Name: "DadNotTheBelt" - Tier: Nuclear Operative -- Name: "David" - Tier: Revolutionary -- Name: "Watson Whittington" - Tier: Syndicate Agent -- Name: "Tim Foley" - Tier: Syndicate Agent -- Name: "Blight" - Tier: Syndicate Agent -- Name: "Katarn" - Tier: Revolutionary -- Name: "eric156" - Tier: Revolutionary -- Name: "SHANE ALAN ZINDA" - Tier: Nuclear Operative -- Name: "Glenn Olsen" - Tier: Syndicate Agent -- Name: "Constellations" - Tier: Syndicate Agent -- Name: "Charles Baron" - Tier: Syndicate Agent -- Name: "Shaina Gibson" - Tier: Revolutionary -- Name: "Wolfie" - Tier: Revolutionary -- Name: "Alexandre Courtin" - Tier: Revolutionary -- Name: "Geekyhobo2" - Tier: Revolutionary -- Name: "Nicholas" - Tier: Nuclear Operative -- Name: "GeneralMarty" - Tier: Revolutionary -- Name: "HCG" - Tier: Revolutionary -- Name: "ShaunTexas" - Tier: Syndicate Agent -- Name: "Malachi Housewright" - Tier: Revolutionary -- Name: "Petalmeat" - Tier: Syndicate Agent -- Name: "Jakub Kędziora" - Tier: Syndicate Agent -- Name: "Adam Smedstad" - Tier: Revolutionary +- Name: "weirdrock" + Tier: Captain +- Name: "Drifter Drifter" + Tier: Captain +- Name: "Bikowu" + Tier: Assistant +- Name: "Hasan al-Binabi" + Tier: Central Commander +- Name: "lleft The Dragon" + Tier: Central Commander +- Name: "Pandaconda" + Tier: Assistant +- Name: "Lazhannya" + Tier: Captain +- Name: "Bonktrauma" + Tier: Captain +- Name: "Haltell" + Tier: Captain +- Name: "Delta.Pizza" + Tier: Captain +- Name: "steph kaus" + Tier: Captain +- Name: "HyperionGM" + Tier: Central Commander +- Name: "MikeAndIkes" + Tier: Assistant +- Name: "Ashley" + Tier: Central Commander +- Name: "mura" + Tier: Captain +- Name: "Adeinitas" + Tier: Captain +- Name: "Shock" + Tier: Captain +- Name: "Dead Rabbit" + Tier: Captain +- Name: "T-Dog" + Tier: Captain - Name: "oBerry" - Tier: Nuclear Operative -- Name: "DireBoar" - Tier: Revolutionary -- Name: "Ignoramis" - Tier: Revolutionary -- Name: "Repo" - Tier: Nuclear Operative -- Name: "612" - Tier: Revolutionary -- Name: "Higgtastic" - Tier: Revolutionary -- Name: "Sandvich enjoyer" - Tier: Revolutionary -- Name: "Mihailo Trickovic" - Tier: Syndicate Agent -- Name: "Vice Emargo" - Tier: Revolutionary -- Name: "awndrssk" - Tier: Revolutionary -- Name: "François Desautels" - Tier: Revolutionary -- Name: "MasterFurret" - Tier: Revolutionary -- Name: "tapohuy" - Tier: Revolutionary -- Name: "Adam Clarke" - Tier: Nuclear Operative -- Name: "Sam Hediger" - Tier: Syndicate Agent -- Name: "Vexxtraordinary" - Tier: Revolutionary -- Name: "Graded" - Tier: Syndicate Agent -- Name: "Christian Hodel" - Tier: Revolutionary -- Name: "IceStorm theDragon" - Tier: Revolutionary -- Name: "Solidus Snake" - Tier: Nuclear Operative -- Name: "Pangaron" - Tier: Syndicate Agent -- Name: "Sed" - Tier: Nuclear Operative -- Name: "Aiden Baker" - Tier: Revolutionary + Tier: Central Commander +- Name: "Wakefield" + Tier: Captain +- Name: "Hûvy" + Tier: Assistant +- Name: "TheGungeonologist" + Tier: Central Commander +- Name: "Ethan" + Tier: Captain +- Name: "TeeJay Neuroth" + Tier: Captain +- Name: "Neptunia_Counseling" + Tier: Central Commander +- Name: "rosysyntax" + Tier: Assistant +- Name: "Kurzaen" + Tier: Captain +- Name: "tokie" + Tier: Central Commander From ae2790bcb25f049f219bd1955e35be1fed9b120b Mon Sep 17 00:00:00 2001 From: Tryded <139474617+Tryded@users.noreply.github.com> Date: Sat, 10 Feb 2024 14:42:00 -0600 Subject: [PATCH 5/5] Energy gun sprites + Minor bug fixes (#811) * New Pistol Sprites * Carbine Sprites Fix * Kill and Lethal Consistency fix --- .../Weapons/Guns/Battery/battery_guns.yml | 4 ++-- .../equipped-BACKPACK.png | Bin 0 -> 1423 bytes .../energygun_carbine.rsi/inhand-left.png | Bin 0 -> 546 bytes .../energygun_carbine.rsi/inhand-right.png | Bin 0 -> 573 bytes .../lethal-inhand-left.png | Bin 871 -> 0 bytes .../lethal-inhand-right.png | Bin 862 -> 0 bytes .../Battery/energygun_carbine.rsi/meta.json | 10 +++++++--- .../disabler-inhand-left.png | Bin 871 -> 555 bytes .../disabler-inhand-right.png | Bin 862 -> 475 bytes .../lethal-inhand-left.png | Bin 1005 -> 551 bytes .../lethal-inhand-right.png | Bin 956 -> 462 bytes .../disabler-inhand-left.png | Bin 871 -> 567 bytes .../disabler-inhand-right.png | Bin 862 -> 479 bytes .../mini_energygun.rsi/lethal-inhand-left.png | Bin 1005 -> 557 bytes .../mini_energygun.rsi/lethal-inhand-right.png | Bin 956 -> 485 bytes 15 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-left.png delete mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/lethal-inhand-right.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 76704910a11..17bc14742f5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -36,7 +36,7 @@ state: disabler - proto: BulletEnergyGunLaser fireCost: 200 - name: kill + name: lethal state: lethal - type: MagazineVisuals magState: mag @@ -151,7 +151,7 @@ state: disabler - proto: BulletEnergyGunLaser fireCost: 200 - name: kill + name: lethal state: lethal - type: MagazineVisuals magState: mag diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..5ac3c6c8c48cf3391fee18c06d7eed1d82478ed5 GIT binary patch literal 1423 zcmV;A1#tR_P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1tdvCK~#8N?V7tw zEmstWcTy-8z6A?K@zJQ!bB!dLLI{cwY%BypB7uNlij+eB2}zYkE^-?|B3M`(s|13H zMn!xSqA9cxe2a*RoSbiE)?u!k$DZ+=xpQ$o7-r8fv-fYU{hl=@A|fKvc&d8fL zZ{nP2 z=z!YVTFIchyW4bhbjZCh)6mc$deMqzP#ZkMiyV#@FJScSXo(-b5T)|+1}pHs3+?nNCpoN4_ODm zii!#+m0$k-<|i{SFd#;2&AW|H)V7?_oXvR1>Hx^pgn)jx-TR|+l|QKY&;NQWMvjk< zixafj12unqd@MDeO|xS4P$tI4#^O&;Pv-RW)GRG6y*NJ`T3TAf_{91|t^ucDJT-4? zJiJIS#{U`n&V2dLyTAuVoKR3uU~X=1oI7@X{yDxyW4x0zv$L~-7(X>NC1uXc%ovP^ z&CN}mA&&4;^NKIwBO@d6zq`ISU#z_|^Yin87_Vr}1I-=U+uO~>#f7gfXf+7BVFaeI z=HGr!X}tE&T%vh$Zf$Lqdo?vRrmU=tnZT^Bu3~(0n)HGvkGTuT=X~#m)m&$1r`g%r zNj7_o2P)#^Nr%3>zP@g%s;bQ8<)!rXy}dnI;X!qE zwX9M6&Omvu#o^&$F=An1!BbiK9>y!h#l`0A>?}Fh4Gs>*aR&I^srqUGnTW+=$r@)b zvA@4BX)pa#pXFT!It=G{4y}L|0JIiAtu5y*;Q7vrL5c;6*BZhY`nooC#XZ&O;CO$3 zFV}urLCzhZ=uXm)@rv6Ce&%=^a^3}$%F4Fw>s z=(v884ikMlZ`|&zqq&Cq5WP{AjawKxt`d@>?9? zsIZ}$(1=!BtQ~N5btT(dSYBS1bC^&~Xhf?mdHWvlu@H3u=bV*S-vwA;6c!dr2pVta zBLd_Xw4e!XX!NoevR%$%EYHScu~>4sxx2gj-uryc4k}`#5U1SQ+LAPe6D&<2TAg!7 ztXe=~aUns7gs0^i!=D?ke{BTG#Kc5=^Q#{uII4Qkh*mV)kkJ9Gs+^>JnkE>T3XJCu zk)VE)0cxJu;MaSHsn#Qv#FF+}vy?Cnu#)nxOt06r}N-ak#tY(S$ZYE1ETI z_9EP)Jsx$({%`wCTnhw7F|N=Q9<%tor(T2E#y&c9Sm1iYByq4WL-B1IU;V zRb5@3(Z4i41nH((G@%WRdEE}P(sIY_!vdOgrRoJw4&dj6RB`&Spg&M}!P)`(k&y!U zXD4i+NsadsO1E+VeTos5ct1y2QGIB&9S5vDrJ3m_gE=W?74R-=w?HqM1Q5_S)ZVv zY!7xs=&aG`dQxEFVKVnr#+RSz0tK><4dgz@Tt9nES$N$u=?Tkq;~G^wQ?}o(n={923u0fF2Gk$_@FeH9*nj0|Pkwq{d%bl{*lPLLd~D5EKHF@Jk9+#} z+*z~xN6Z%(dOZJF@h4mAan-zUE=XYd72UZjud>Z0Vz&S^L79L literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..63454347e587f2b687feff0b4936764de470661e GIT binary patch literal 573 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4VOG!978JN-ricDcPK!F?ZaUqtM2toA?D2v zlSNzuP7B>jDE?q_;w`ViWR@dBCQKXGb}ev74!`^~`<-g5XvV^vJI{X4{IvYSZ`nM< z=Ny6%aCBAJ>c*-W*54)!P&SvHd%@x9UaDWc{)t>E^j>_CW7_GZFFrIM zRQP5i{J?!nZnWBD&z!b+>jhuMSo#-F+_6skXj0&{*ITQO%Ury@;ARfjCxz)%nWw`T z3xZaE)s?@yZcUhWq>h-8T>s%yGr!0i%s+qF)Vfdj-IMci{u8v-R~t<`z*yE( z|DT>|n`ingzx*TSZJG6fZGry9tUD+8+o~$T!J-zQ%*m>SC3XqohyGvRb3k?7%v}r( z(|*Q_JBr(7ujFp1Q+&p{$n{39MH=V*wTI)A0v<1sWtbs-psDZc{qqacMGJUiUJGsJ zTDg1w57R||zZdP)nQ>sp`|qh1d!{~gR-D|oXoh~dGb4rt z$lP7#4Bx&5&AGLDHRt5Y_?HYpD@Eq}Jn=IM_*W_S)^GOd76nlT*8fWLkFPJAEiWtk zv-WAx%vrhWXS(|iuT~E|W~ss46gF!~dIQJ3{OEb@f1`N$oH#ZxY`Ps(;hn)cNzZ@Gs1-|Y zTO24+^FefiuBx}fkNJMfEgcJD`6WM^*>2RoF^x5R%j%TQYR*)KV*=PUjw zxHP71zG+Y^{dE_Aq9yl={&f?NJ>GbK72mus;eJhrA5L)nw?2lcaKF%|lKj3yt5O&o ziX|B?#IP}#OlM>`n~I&wFXS*sXm8i08$D5mjVvPBac#3Z(`~!Ho%jB7`RTvVNqi1A za{?ze7uxBDYF*h{C=`9-J8!_3-m1B}*CkiD=s%k%@HXdicfce58+U8F{_1aSVLo?y z>i13Zg1^}I?bU3lYgzH^Wqq)q*_27P2Y%ml`t;WN#(X;?_ME77Axlynx0Jlws<$FL zbpp#Xv)>Iy%`WS2Gpw zr;B4q#hkaZ?grg*kZ8M~dMcw^IfilWrN>L=zFc9u@{8W9Oiz7n%kM{KZ*V^vb$rQ} z17RiwjIQo{iN9;TohJ%z`V^ktb>;bLe1CU!4bLQn=6fC$6A~GX zURK&U${b&1DEaNJ>OAI(M~k1ws|i22dDFbJUTD|Bj^l{|4)%Z2ue-i}#@1RRw|)C| zkE*(vtSTQqpBMVkZ541YU|M;ihK-a`NguxdW{Np}@Zv?mIo;eXi7eMkr?iBv z-uh*sFq{3quA_^d@IBG_StJ=KacE&rpvYZoH_ingiqgx)d((n>e?R)HG=W{J_t>cx z`L_3a9d=rH_het)<}Il?foJiG`QDrlKB!+^mGwYz{u~BvK6YIZuD_kLjf<`oB#3A* zK2AFsn*Kp>+287iGq+ZW&SSwE?#HVG8;S1C?<`X_S26K{||arb}L0pv2ESe zr@FD)#-~3o<9fgyT=6lWa?b7Ys;kr1`RUdhx}`i gH}{#~>GdB&TVu!UlVKY?fEk9t)78&qol`;+0Kq|u2><{9 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json index f0e887bcf2d..79adf10713d 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json @@ -29,12 +29,16 @@ "name": "mag-unshaded-4" }, { - "name": "lethal-inhand-left", + "name": "inhand-left", "directions": 4 }, { - "name": "lethal-inhand-right", + "name": "inhand-right", "directions": 4 - } + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/disabler-inhand-left.png index 6b65b3077526bb168aa588dab3cf5d685910ad66..2bcb74b1eb1d8220759071f377f31a5b2b241479 100644 GIT binary patch delta 530 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 Q00000Ne4wvM6N<$g41K}{r~^~ delta 983 zcmV;|11S8b1nmcqB!3BTNLh0L01m_e01m_fl`9S#000A@NklK+eZ+W@mA5czC|Fw1k**c#Vem zX>3T7vEx+v+S(c;Qz8PyQz~595nz$?sogz)7hg8Fga`bi>kehisV-X$*TbimljJpr z3Q6ArBK*ZR2!Hl};={rMKD#cnR#whe>-B-6z^PW_hUcMDSp?hJzU*g`H#l-V)CLAm?e%r*>)o^SmufN)AEs92*-$VR{+@!du(M zuIrAD)N0~PILGY};+o@Fbpll?&EcfezC87_uYhzZ*?$6gdunQmzaj{J5aRt}1%9&$ z+qOr-Fud_y`ps&#TKG*XAFi*%F4?SDEG9=sN0#iB&!zMpKoe&L+vcxlifE&g_La+J zv5n&(3`eg1w`AMNe7TI{<72ctZOqU+Y&x|e^}F9MuEMHh06=pY0MJ|p z05q2Y0L^6pKyw)Y&|C%pG?xJY&1C>Ua~S~8T+b4~ASrqksj);nX#z?U8rfJP-;mH) z*ODw*iaze|ze&;o(BMpDco^qtc9(SLB!&>LIe!ip-fwMgvi>BCNYT?gM5;cyYayfq z5QC48zrfdTn-;GwbJtsyJp>%bLEUxPyYf7;dW37r!apsjxXYH3Ga%gCPxJa4-YP@2 z8oQn+Eegna-f&%178Vfh?1-)#ofKg1a}Fpgkcc|%41#B&x*TVb@DLFEs`F74rG2-B z_j~J&Lk?VJ^#P(b zKuj|5eN+|~5w=<)|Ico#4fvPnJ+zul{HjzCtZ$%HA_ylZ*OIQoO4&UiuMH^96cM4F z_GPsJ37y*aUa=C{$m<58P6xssF6suPWKffpUWEE<14RB`)BywoM1gRgK6Pn3uNyd$ zST~^jCU`YWsSQ5}26|t0-N3WF3J)R!0Gi7HfacO3z#m-{pmWdgMwb8p002ovPDHLk FV1gwK%W41s diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi/lethal-inhand-right.png index 86a384f15b53ffc792322724985fcb2bd1c1c850..f9200bfef2edc0ed2084ca4eb13871428bd2d75f 100644 GIT binary patch delta 436 zcmV;l0Zab82hIbKB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGV@X6oRCr$P+B#Svcst<+;O5AR2q z`SMYP8y1A+P=AE*-)5VCY31UE7qTnkhjZ`t^VD7?2LJ#70000005|}3TGsmSu{>+e z!rg7}(1qRVzsI6;=v=YgTL9lR){m|Jdki|Z&JpG;#I&mbqZYaUF3U2}omuO@KT5|O z&sm6VR{?a_=kMWG|NRj<)_l%FY`b3pUBq~@#J~IRJ1vF(m$f+yhog&*{RG53-c!(j e2LJ%)2B!3BTNLh0L01m_e01m_fl`9S#000ASNkl0%{dL$vW-G50u z(CaJ7=zVzqUb)iarYCpx8!NzZ9PCIb-j+7vzbSaWENliO2ti|{A3M?$s6M6@$ z>%%0o&*XAB#S`ea+bC~sA!sx>MiB(TjXtq}f^DmfQVAy~CkVS;l<`@Cc93udl zV+25Ri~wlPqbZNymsA2M_-H+!SN>2{h1>Z`V(u(K&w_cC=OzlE5AIR$;<`M318TRp zs6s?iO1{oRM3kIUXf>N+coL>1O$Kn6rx&;Lxo0P`T#9x!h6 zOAbwR!thFh>srcjqT2M!A)=XA6uia3huyfiIhXSMR9}M}{L<1=e2#!6ys~Y4mC~Y2 z0Don|ty+9ac+JOYUnmrDM!^rBQ<(KP(NqGG!K|#Ts24QIwjZFpRYp*+kF3R~f%;kX zMgzZS=7YUG*mFLoFp~$Nq!zyx*W$Zz+o)RnBnr0OOU@~DXy*BTV$SCjX7(hQrWQX5 zen0nPl5+~-oX;uD^igpG%t=H+RCr$P*-uLXK^O+`*YHq@e-2iH;;Dn^>Q%gZ=++1D?6>K| z)V;g+P05p>Xl$Uc2ZbPM@>ymiR7`C)jGmt??(59X?mIK?<$o0-A|fIpA|fKPtX8Y3 zMx&v0xD)ipbvg{yiT<`KpU*2CNaDIsP`zGHx9kS}9mmm8xI&qL!C(-lXFQu&nvN4;LR zav$r((Q37dnx2lrgL@Q82B$lQ4 zLs*}H@pvp3msj%m5dFR!eu%}G7`xl;%8U29R%zb%Z(+UMY|7#3bUKJJA)CtKhd^>z zc_iQO_hmAfEKBHs_I>YVeFtDWqLz=uGnq^<5jI{{Ci!-|y)k)AJnnl`@X$7rH*Akb gL_|dNj~9u20<$6Jz^IjM@Bjb+07*qoM6N<$g3(zH!2kdN delta 848 zcmV-W1F!tI1m^~jB!3BTNLh0L01m_e01m_fl`9S#0009SNklMCs@2En{qj}?yroHf2dy^(YGqe?(M0~f0FZJC&ZzCo z$HkD@%eW zs|k~NU+Dl+sT7|~D@b zRmM3e1AeocnJIK zj396UA=bo2@PB-#RDvt+5fziXxTFFI)_wq?*Xsd`5a{xz5O_5B^YicF#wUCIlay?N z)FzWjWHT8MgpqCIz;%P=;IHL1!?{x|V(0jneHLSeqfr=q@D-3PB}*XqpH8PaL2z9U z8Syqfu`k$`1y{7IWQl7ZPETQ7UixEf+X8Yq-tYIB?0+{ONa;C%CZ4q{o_m%Ua~S~8Tm}F%mjM9H zWdJ~P8GiuKTn`dJoD#i?(%6hzF@XdWYhH$%iDx~E_RmZ7)8+nEk`6#ToKca3aXu|o zD%7=c5?jdk4N&xrdYvuT8K^`r=8+KXY}1QS;t$x}eTw}rwS)uC%a!-C9})TnzP%}g zeuSvz>3>rZHk6V*!28)k^6fj=pFT1NY+9~Vq<>{Wv~=#ZE~sl|kOby7`+zcoM6cTc zt|3q+Oy`+!7Z3}+0pEKd`qriRzuW|Q=nW7MMlWCCp!p-=umsirrq~X`AHD&)|9Ctm z*t5HAxXSzip*Nt}L`GzS=QgSS&%8C>fSa_+H$V`gMb~Ym>>RM@4e0oNg+hTWJ~Odv z-%0w7srC&hJqRs(1HLvI8xZeUyR@On9&W0000xu{f diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/disabler-inhand-right.png index 4040a1d85520d57e7ec955a52054e6aa5ea78c25..25bc79ca34a7e264662951ef8c5516277b46a882 100644 GIT binary patch delta 453 zcmV;$0XqKP2HyjaB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGbV)=(RCr$P+COfCFdW5kr|QVck^>-diKs(|Dod}LGjItc4v>YF zv8tPA`G-ROwIrs3==+f(Y6y)VnCamF000000A#z}`pstJ<9~3`ltX#q@XSlx4s>1T zilPW7mt`3~@zCNZhw@x=b^$(i-s`0OejmnlU9S$Gix+AMltX!xEAAQ?2J_Cpe}09N zbk*9nb-Me9mGB+EF?(^oeOTpC9_3QLxVyKC+pyg2&RclheI2t$z{Yc?x#oH9s;cVe zu5p%SZoOW+rhjSrV-i-tt?*_E;YIV*{EdxmB`D|d3h8O*#RE@dRK_>wUgMvO_AEI7 z000000002M45(?j)xW1Q)jJD!*WT8`s%um4HZ}c*ek-+mFM!?|2xX}ij@SD46i(k+ zNNLmsu$ufJY*jN`>w2w!f7r=83#pB+ytV9)`}N=Y_dZA1BWB?*)%K4X{Rn6hM=Rm) v{rgD&5k5IhIz@Ps`u|OW{v7}SER%CTbTIgBX0tVK00000NkvXXu0mjf9hBJ! delta 839 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 FV1hgr%Wwby diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi/lethal-inhand-right.png index 86a384f15b53ffc792322724985fcb2bd1c1c850..42caf92772da805142f8c37618107216d6226901 100644 GIT binary patch delta 459 zcmV;+0W|)+2jv5hB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGdPzh?~{;O{@(y@1|cFMA|fIpB7!{6yDZB(9e?f`av+ZmFTCjQMBBEK zB#GNOO;b1Ns@*{jEgjq0PJ-9ILiC!G=$f?A6OxD(_O)}BM)*R-?%v7 z3V?<7*pI`zEq~Pcc&qG&85`S^VE=8p`Ue)yu6QDgGQNqt>g=vPOAaC;A|fIpA|fIp zBH93ST7K)l`|_x77Vd6)TNn0L|J@gy1LyMX-U7I;F=lS{-+jQbt$FL)q5_Os?!PbeAK|^jMf(VEd>`*2*ncM?BBFf~`3Bzw_m2}7hJyeA002ovPDHLkV1i6J B)2jdg delta 934 zcmV;X16lm#1H1>2B!3BTNLh0L01m_e01m_fl`9S#000ASNkl0%{dL$vW-G50u z(CaJ7=zVzqUb)iarYCpx8!NzZ9PCIb-j+7vzbSaWENliO2ti|{A3M?$s6M6@$ z>%%0o&*XAB#S`ea+bC~sA!sx>MiB(TjXtq}f^DmfQVAy~CkVS;l<`@Cc93udl zV+25Ri~wlPqbZNymsA2M_-H+!SN>2{h1>Z`V(u(K&w_cC=OzlE5AIR$;<`M318TRp zs6s?iO1{oRM3kIUXf>N+coL>1O$Kn6rx&;Lxo0P`T#9x!h6 zOAbwR!thFh>srcjqT2M!A)=XA6uia3huyfiIhXSMR9}M}{L<1=e2#!6ys~Y4mC~Y2 z0Don|ty+9ac+JOYUnmrDM!^rBQ<(KP(NqGG!K|#Ts24QIwjZFpRYp*+kF3R~f%;kX zMgzZS=7YUG*mFLoFp~$Nq!zyx*W$Zz+o)RnBnr0OOU@~DXy*BTV$SCjX7(hQrWQX5 zen0nPl5+~-oX;uD^ige9O8@`>