diff --git a/Resources/Maps/_Forge/Shuttles/Nfsd/broadhead.yml b/Resources/Maps/_Forge/Shuttles/Nfsd/broadhead.yml index 9e4900a1d6a9..e303d6e786fb 100644 --- a/Resources/Maps/_Forge/Shuttles/Nfsd/broadhead.yml +++ b/Resources/Maps/_Forge/Shuttles/Nfsd/broadhead.yml @@ -4,8 +4,8 @@ meta: engineVersion: 268.1.0 forkId: "" forkVersion: "" - time: 01/19/2026 11:47:34 - entityCount: 808 + time: 01/20/2026 11:34:38 + entityCount: 806 maps: [] grids: - 2 @@ -45,7 +45,7 @@ entities: chunks: 0,0: ind: 0,0 - tiles: fQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB8AAAAAAAAAAAAAAAAAHwAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: fQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAAuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAH0AAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== version: 7 -1,-1: ind: -1,-1 @@ -664,40 +664,40 @@ entities: version: 2 data: tiles: - 0,0: - 0: 160 0,1: - 1: 1 + 0: 1 -1,0: - 0: 33824 - 1: 1 + 1: 33824 + 0: 1 0,-1: 2: 61182 + 0,0: + 1: 64 1,-1: 2: 65535 1,1: - 1: 1 + 0: 1 1,0: - 0: 9344 + 1: 9344 2,0: - 1: 1 + 0: 1 -2,-4: 2: 200 - 1: 16384 + 0: 16384 -2,-5: 2: 49152 - 1: 64 - 0: 8 + 0: 64 + 1: 8 -1,-4: 2: 62703 -2,-3: - 1: 128 + 0: 128 -1,-3: 2: 3823 - 1: 4096 + 0: 4096 -1,-2: - 1: 4096 - 0: 546 + 0: 4096 + 1: 546 2: 2184 -1,-1: 2: 61166 @@ -713,43 +713,43 @@ entities: 2: 61695 1,-2: 2: 819 - 0: 2184 + 1: 2184 1,-3: 2: 3822 1,-5: 2: 20464 2,-4: 2: 4195 - 1: 16384 + 0: 16384 2,-3: 2: 1 - 1: 4128 + 0: 4128 2,-2: - 1: 4096 + 0: 4096 2,-5: 2: 24576 - 1: 64 + 0: 64 0,-6: - 0: 61696 - 1: 2560 + 1: 61696 + 0: 2560 -1,-6: - 0: 36640 - 1: 80 + 1: 36640 + 0: 80 -1,-5: 2: 3826 1,-6: - 0: 16256 - 1: 64 + 1: 16256 + 0: 64 2: 32768 2,-6: - 1: 528 - 0: 8448 + 0: 528 + 1: 8448 -2,-6: - 1: 2048 - 0: 32768 + 0: 2048 + 1: 32768 uniqueMixes: - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 @@ -764,7 +764,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -932,6 +932,18 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-15.5 parent: 2 +- proto: AmmoLoaderSmall + entities: + - uid: 787 + components: + - type: Transform + pos: 1.5,-13.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 221: + - - AmmoLoaderLoad + - SpaceArtilleryLoad - proto: APCBasic entities: - uid: 167 @@ -1110,11 +1122,6 @@ entities: - type: Transform pos: 0.5,-21.5 parent: 2 - - uid: 97 - components: - - type: Transform - pos: 9.5,-19.5 - parent: 2 - uid: 458 components: - type: Transform @@ -1215,6 +1222,12 @@ entities: - type: Transform pos: -4.5,-20.5 parent: 2 + - uid: 791 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-20.5 + parent: 2 - proto: Bed entities: - uid: 28 @@ -2174,6 +2187,11 @@ entities: - type: Transform pos: -2.5,-22.5 parent: 2 + - uid: 260 + components: + - type: Transform + pos: 2.5,1.5 + parent: 2 - uid: 318 components: - type: Transform @@ -2274,16 +2292,6 @@ entities: - type: Transform pos: -1.5,2.5 parent: 2 - - uid: 787 - components: - - type: Transform - pos: 1.5,1.5 - parent: 2 - - uid: 788 - components: - - type: Transform - pos: 3.5,1.5 - parent: 2 - uid: 789 components: - type: Transform @@ -2420,6 +2428,14 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-19.5 parent: 2 +- proto: ComputerGunneryConsole + entities: + - uid: 469 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-3.5 + parent: 2 - proto: ComputerTabletopAdvancedRadar entities: - uid: 265 @@ -3843,6 +3859,17 @@ entities: - type: Transform pos: 4.5,-10.5 parent: 2 +- proto: GunneryServerMedium + entities: + - uid: 727 + components: + - type: Transform + pos: -2.5,-12.5 + parent: 2 + - type: Battery + startingCharge: 0 + - type: ApcPowerReceiver + powerLoad: 10 - proto: GyroscopeNfsd entities: - uid: 104 @@ -4657,13 +4684,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-10.5 parent: 2 -- proto: StructurePistolRackNfsd - entities: - - uid: 260 - components: - - type: Transform - pos: 7.5,-3.5 - parent: 2 - proto: SubstationBasic entities: - uid: 172 @@ -4878,21 +4898,11 @@ entities: - type: Transform pos: 1.5,-3.5 parent: 2 - - uid: 221 - components: - - type: Transform - pos: 7.5,-3.5 - parent: 2 - uid: 227 components: - type: Transform pos: 7.5,-2.5 parent: 2 - - uid: 469 - components: - - type: Transform - pos: 1.5,-13.5 - parent: 2 - proto: TableWood entities: - uid: 528 @@ -5897,6 +5907,13 @@ entities: - type: Transform pos: 7.5,-16.5 parent: 2 +- proto: WallWeaponCapacitorRecharger + entities: + - uid: 788 + components: + - type: Transform + pos: 4.5,-13.5 + parent: 2 - proto: WarpPoint entities: - uid: 700 @@ -5918,37 +5935,27 @@ entities: - type: Transform pos: 7.5,-2.5 parent: 2 - - uid: 727 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-13.5 - parent: 2 -- proto: WeaponTurretType35 +- proto: WeaponTurretM220 entities: - - uid: 790 + - uid: 97 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,-20.5 parent: 2 - - uid: 791 + - uid: 790 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-20.5 parent: 2 - - uid: 800 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,1.5 - parent: 2 - - uid: 801 +- proto: WeaponTurretTarnyxReload + entities: + - uid: 221 components: - type: Transform rot: 3.141592653589793 rad - pos: 3.5,1.5 + pos: 2.5,1.5 parent: 2 - proto: WindoorSecureBrigLocked entities: diff --git a/Resources/Maps/_Forge/Shuttles/Nfsd/inquisitor.yml b/Resources/Maps/_Forge/Shuttles/Nfsd/inquisitor.yml index f85518e56654..f9d52325021b 100644 --- a/Resources/Maps/_Forge/Shuttles/Nfsd/inquisitor.yml +++ b/Resources/Maps/_Forge/Shuttles/Nfsd/inquisitor.yml @@ -4,7 +4,7 @@ meta: engineVersion: 268.1.0 forkId: "" forkVersion: "" - time: 01/19/2026 11:51:28 + time: 01/20/2026 11:31:47 entityCount: 713 maps: [] grids: @@ -4834,31 +4834,31 @@ entities: - type: Transform pos: 3.5,13.5 parent: 1 -- proto: WeaponTurretType35 +- proto: WeaponTurretM220 entities: - uid: 678 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,9.5 + rot: 3.141592653589793 rad + pos: 7.5,15.5 parent: 1 - uid: 679 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,3.5 + rot: 1.5707963267948966 rad + pos: 10.5,9.5 parent: 1 - uid: 680 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,9.5 + rot: -1.5707963267948966 rad + pos: -1.5,3.5 parent: 1 - uid: 681 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,3.5 + rot: -1.5707963267948966 rad + pos: -1.5,9.5 parent: 1 - uid: 682 components: @@ -4869,7 +4869,7 @@ entities: - uid: 683 components: - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,15.5 + rot: 1.5707963267948966 rad + pos: 10.5,3.5 parent: 1 ... diff --git a/Resources/Maps/_Forge/Shuttles/Nfsd/orion.yml b/Resources/Maps/_Forge/Shuttles/Nfsd/orion.yml index 3e9c6e3e0ed3..c4e7ca45c297 100644 --- a/Resources/Maps/_Forge/Shuttles/Nfsd/orion.yml +++ b/Resources/Maps/_Forge/Shuttles/Nfsd/orion.yml @@ -4,8 +4,8 @@ meta: engineVersion: 268.1.0 forkId: "" forkVersion: "" - time: 01/19/2026 11:54:39 - entityCount: 2927 + time: 01/20/2026 11:31:05 + entityCount: 2939 maps: [] grids: - 2 @@ -6074,6 +6074,66 @@ entities: - type: Transform pos: -0.5,-2.5 parent: 2 + - uid: 2928 + components: + - type: Transform + pos: -3.5,21.5 + parent: 2 + - uid: 2929 + components: + - type: Transform + pos: -2.5,21.5 + parent: 2 + - uid: 2930 + components: + - type: Transform + pos: -1.5,21.5 + parent: 2 + - uid: 2931 + components: + - type: Transform + pos: -0.5,21.5 + parent: 2 + - uid: 2932 + components: + - type: Transform + pos: 0.5,21.5 + parent: 2 + - uid: 2933 + components: + - type: Transform + pos: 1.5,21.5 + parent: 2 + - uid: 2934 + components: + - type: Transform + pos: 2.5,21.5 + parent: 2 + - uid: 2935 + components: + - type: Transform + pos: 3.5,21.5 + parent: 2 + - uid: 2936 + components: + - type: Transform + pos: 4.5,21.5 + parent: 2 + - uid: 2937 + components: + - type: Transform + pos: 5.5,21.5 + parent: 2 + - uid: 2938 + components: + - type: Transform + pos: 6.5,21.5 + parent: 2 + - uid: 2939 + components: + - type: Transform + pos: 6.5,20.5 + parent: 2 - proto: CableMV entities: - uid: 10 diff --git a/Resources/Maps/_Forge/Shuttles/Syndicate/triton.yml b/Resources/Maps/_Forge/Shuttles/Syndicate/triton.yml index 822353711c50..d1e67ae9257c 100644 --- a/Resources/Maps/_Forge/Shuttles/Syndicate/triton.yml +++ b/Resources/Maps/_Forge/Shuttles/Syndicate/triton.yml @@ -4,7 +4,7 @@ meta: engineVersion: 268.1.0 forkId: "" forkVersion: "" - time: 01/19/2026 12:05:56 + time: 01/20/2026 11:35:46 entityCount: 1591 maps: [] grids: @@ -7037,7 +7037,7 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,-25.5 parent: 1 -- proto: GunneryServerHigh +- proto: GunneryServerOmega entities: - uid: 1006 components: @@ -7045,9 +7045,11 @@ entities: pos: 2.5,3.5 parent: 1 - type: Battery - startingCharge: 0 + startingCharge: 3.324171 - type: ApcPowerReceiver - powerLoad: 20 + powerLoad: 100 + - type: ApcPowerReceiverBattery + enabled: True - proto: GyroscopeSyndicate entities: - uid: 1007