From fed7504f5209b8f34844577daa4eef1e0ddd14d4 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:24:56 -0400 Subject: [PATCH] 04/29/2024 - Armory Removal (Empress) (#1304) * 04/29/2024 - Armory Removal (Empress) Removed the filled armory from the Empress. * Update empress.yml --------- Co-authored-by: Dvir --- .../Maps/_NF/Shuttles/Security/empress.yml | 1439 +++-------------- .../_NF/Shipyard/Security/empress.yml | 2 +- 2 files changed, 187 insertions(+), 1254 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Security/empress.yml b/Resources/Maps/_NF/Shuttles/Security/empress.yml index 6ecc2ec1c53..399a1cb5204 100644 --- a/Resources/Maps/_NF/Shuttles/Security/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Security/empress.yml @@ -1014,214 +1014,225 @@ entities: data: tiles: 0,0: - 0: 65535 - -2,0: - 0: 65535 + 0: 62395 + 0,-1: + 0: 63795 + 1: 8 -1,0: - 0: 65535 + 0: 61166 0,1: - 0: 65535 + 0: 61167 + -1,1: + 0: 65326 0,2: - 0: 255 + 0: 14 1: 3072 + -1,2: + 0: 15 + 1: 256 1,0: - 0: 65535 + 0: 61695 + 1,-1: + 0: 64002 + 1: 8 1,1: - 0: 65535 + 0: 61102 1,2: - 0: 4095 + 0: 2730 2,0: - 0: 65535 + 0: 65279 + 2,-1: + 0: 64264 + 1: 3 2,1: - 0: 65535 + 0: 61166 2,2: - 0: 511 + 0: 14 1: 1536 3,0: 0: 65535 3,1: 0: 65535 3,2: - 0: 255 + 0: 15 + 3,-1: + 0: 65024 + 1: 14 + 4,1: + 0: 61168 -4,0: - 0: 65535 + 0: 65471 + -4,-1: + 0: 64002 + 1: 8 + -5,0: + 0: 30603 -4,1: - 0: 65535 + 0: 48049 + -5,1: + 0: 61431 -4,2: - 0: 255 + 0: 11 + -5,2: + 0: 15 -3,0: - 0: 65535 + 0: 65471 -3,1: - 0: 65535 + 0: 56793 -3,2: - 0: 3839 + 0: 205 1: 256 - -2,1: + -3,-1: + 0: 64264 + 1: 3 + -2,0: 0: 65535 + -2,-1: + 0: 65248 + -2,1: + 0: 26212 -2,2: - 0: 4095 - -1,1: - 0: 65535 - -1,2: - 0: 255 - 1: 256 + 0: 102 + -1,-1: + 0: 61678 -8,0: - 0: 65535 + 0: 3822 + -8,-1: + 0: 61164 -8,1: - 0: 3142 1: 32800 2: 136 + -7,0: + 0: 36863 -8,2: 1: 8 - -7,0: - 0: 65535 -7,1: - 0: 4061 1: 61440 3: 34 + 0: 136 -7,2: - 1: 15 + 1: 1 + 4: 14 + -7,-1: + 0: 61917 -6,0: - 0: 65535 + 0: 23839 -6,1: - 0: 61439 + 0: 3392 1: 4096 -6,2: - 1: 1 - 0: 206 - -5,0: - 0: 65535 - -5,1: - 0: 65535 - -5,2: - 0: 255 + 4: 1 + 0: 8 + -6,-1: + 0: 64185 + -5,-1: + 0: 63539 + 1: 8 + 4,-1: + 0: 61678 4,0: - 0: 65535 - 4,1: - 0: 65535 + 0: 61152 4,2: - 0: 255 + 0: 14 5,0: - 0: 65535 + 0: 48056 5,1: - 0: 16383 + 0: 5513 1: 49152 + 5,-1: + 0: 65263 5,2: - 0: 19 - 1: 12 + 4: 12 6,0: - 0: 65535 + 0: 59278 6,1: - 0: 4095 1: 61440 + 0: 238 6,2: - 1: 15 + 4: 3 + 1: 12 + 6,-1: + 0: 61679 7,0: - 0: 14199 + 0: 4147 1: 16384 7,1: - 0: 307 - -4,-1: - 0: 65527 - 1: 8 - -3,-1: - 1: 3 - 0: 65532 - -2,-1: - 0: 65535 + 0: 1 + 7,-1: + 0: 12339 -1,-4: - 0: 65535 + 0: 61166 -1,-3: - 0: 65535 + 0: 61166 -1,-2: - 0: 65535 - -1,-1: - 0: 65535 + 0: 61156 -1,-5: - 0: 65520 - 0,-5: - 0: 30576 + 0: 60928 0,-4: - 0: 30583 + 0: 13107 0,-3: - 0: 30583 + 0: 13107 0,-2: - 0: 30583 - 0,-1: - 0: 65527 - 1: 8 - 1,-1: - 0: 65527 - 1: 8 - 2,-1: - 1: 3 - 0: 65532 - 3,-1: - 0: 65521 - 1: 14 - -8,-1: - 0: 65535 + 0: 13104 + 0,-5: + 0: 13056 -8,-2: - 0: 61064 - -7,-3: - 1: 13311 - 0: 52224 + 0: 49152 -7,-2: - 0: 65535 - -7,-1: - 0: 65535 + 0: 56560 + -7,-3: + 1: 8955 + 4: 4356 + 0: 16384 -7,-4: - 1: 52224 + 1: 35840 + 4: 16384 -6,-4: - 1: 61696 + 1: 256 + 4: 61440 -6,-3: - 1: 31 - 0: 65504 + 1: 15 + 4: 16 + 0: 56320 -6,-2: - 0: 65535 - -6,-1: - 0: 65535 + 0: 56797 -5,-4: - 1: 28672 + 4: 4096 + 1: 24576 -5,-3: - 1: 26215 - 0: 4368 + 1: 8739 + 4: 17476 -5,-2: - 0: 30583 - -5,-1: - 0: 65527 - 1: 8 + 0: 13104 4,-4: - 1: 61440 + 1: 12288 + 4: 49152 4,-3: - 1: 13119 - 0: 52416 + 4: 4369 + 1: 8750 + 0: 34816 4,-2: - 0: 65535 - 4,-1: - 0: 65535 + 0: 3808 5,-4: - 1: 64512 + 4: 28672 + 1: 35840 5,-3: - 1: 207 - 0: 65328 + 1: 143 + 0: 28928 + 4: 64 5,-2: - 0: 65535 - 5,-1: - 0: 65535 + 0: 28276 6,-4: - 1: 4352 + 1: 256 + 4: 4096 6,-3: - 1: 26231 - 0: 4352 + 4: 17409 + 1: 8822 + 0: 4096 6,-2: - 0: 65535 - 6,-1: - 0: 65535 + 0: 1904 7,-2: - 0: 13056 - 7,-1: - 0: 30583 + 0: 4096 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -1239,7 +1250,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -1283,6 +1294,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -2465,14 +2491,6 @@ entities: - type: Transform pos: 10.5,9.5 parent: 1 -- proto: BaseBallBat - entities: - - uid: 1152 - components: - - type: Transform - parent: 1125 - - type: Physics - canCollide: False - proto: Bed entities: - uid: 875 @@ -2741,22 +2759,6 @@ entities: - type: Transform pos: 25.5,0.5 parent: 1 -- proto: BoxBeanbag - entities: - - uid: 1182 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1183 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: BoxBodyBag entities: - uid: 589 @@ -2790,86 +2792,6 @@ entities: - type: Transform pos: -0.29593712,-9.424562 parent: 1 -- proto: BoxLethalshot - entities: - - uid: 1180 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1181 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: BoxMagazinePistol - entities: - - uid: 249 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1179 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: BoxMagazinePistolRubber - entities: - - uid: 251 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1069 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: BoxMagazineRifle - entities: - - uid: 248 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1067 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: BoxMagazineRifleRubber - entities: - - uid: 253 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1178 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: BoxTrashbag entities: - uid: 708 @@ -5609,66 +5531,6 @@ entities: - type: Transform pos: 18.5,-2.5 parent: 1 -- proto: CartridgeRocket - entities: - - uid: 1206 - components: - - type: Transform - parent: 497 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1207 - components: - - type: Transform - parent: 497 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1208 - components: - - type: Transform - parent: 497 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1209 - components: - - type: Transform - parent: 497 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: CartridgeRocketEmp - entities: - - uid: 1196 - components: - - type: Transform - parent: 1016 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1197 - components: - - type: Transform - parent: 1016 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1198 - components: - - type: Transform - parent: 1016 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1199 - components: - - type: Transform - parent: 1016 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: Catwalk entities: - uid: 125 @@ -6475,98 +6337,25 @@ entities: - type: Transform pos: -1.5,6.5 parent: 1 +- proto: CrateNfsdSecure1 + entities: + - uid: 251 + components: + - type: Transform + pos: 19.5,1.5 + parent: 1 - proto: CrateNfsdSecure2 entities: - - uid: 247 + - uid: 141 components: - type: Transform - pos: 19.5,3.5 + pos: 18.5,1.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 1179 - - 1181 - - 1180 - - 1067 - - 1184 - - 1176 - - 248 - - 1188 - - 249 - - 1186 - - 1177 - - 1187 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 250 + - uid: 249 components: - type: Transform - pos: 21.5,3.5 + pos: 17.5,1.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 251 - - 1190 - - 146 - - 253 - - 1191 - - 1069 - - 1185 - - 1189 - - 1182 - - 141 - - 1183 - - 1178 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrateNfsdSupplies entities: - uid: 559 @@ -6602,50 +6391,6 @@ entities: - type: Transform pos: -18.5,-5.5 parent: 1 -- proto: CrateWeaponSecure - entities: - - uid: 1016 - components: - - type: Transform - pos: 18.5,3.5 - parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14926 - 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: - - 1195 - - 1194 - - 1192 - - 1193 - - 1196 - - 1200 - - 1198 - - 1199 - - 1197 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrayonBox entities: - uid: 988 @@ -7302,36 +7047,6 @@ entities: - type: Transform pos: 3.438164,6.5435786 parent: 1 -- proto: EmpGrenade - entities: - - uid: 1192 - components: - - type: Transform - parent: 1016 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1193 - components: - - type: Transform - parent: 1016 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1194 - components: - - type: Transform - parent: 1016 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1195 - components: - - type: Transform - parent: 1016 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: EmpressMothershipComputer entities: - uid: 617 @@ -7349,36 +7064,6 @@ entities: showEnts: False occludes: True ents: [] -- proto: ExGrenade - entities: - - uid: 1201 - components: - - type: Transform - parent: 497 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1202 - components: - - type: Transform - parent: 497 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1203 - components: - - type: Transform - parent: 497 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1204 - components: - - type: Transform - parent: 497 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: FaxMachineShip entities: - uid: 1103 @@ -11409,10 +11094,10 @@ entities: parent: 1 - proto: GunSafe entities: - - uid: 497 + - uid: 146 components: - type: Transform - pos: 17.5,3.5 + pos: 19.5,3.5 parent: 1 - type: EntityStorage air: @@ -11432,25 +11117,16 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 1203 - - 1204 - - 1202 - - 1205 - - 1209 - - 1201 - - 1207 - - 1208 - - 1206 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null + - uid: 247 + components: + - type: Transform + pos: 17.5,3.5 + parent: 1 + - uid: 248 + components: + - type: Transform + pos: 18.5,3.5 + parent: 1 - proto: GyroscopeNfsd entities: - uid: 660 @@ -11808,60 +11484,6 @@ entities: - type: Transform pos: 29.692461,1.1016078 parent: 1 -- proto: MagazineBoxMagnum - entities: - - uid: 1184 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: MagazineBoxMagnumRubber - entities: - - uid: 1185 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: MagazineBoxPistol - entities: - - uid: 1177 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: MagazineBoxPistolRubber - entities: - - uid: 146 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: MagazineBoxRifleBig - entities: - - uid: 1176 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: MagazineBoxRifleBigRubber - entities: - - uid: 141 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: MedicalBed entities: - uid: 481 @@ -13637,20 +13259,6 @@ entities: - type: Transform pos: 1.6063663,-8.880302 parent: 1 -- proto: SecBreachingHammer - entities: - - uid: 1148 - components: - - type: Transform - parent: 1125 - - type: Physics - canCollide: False - - uid: 1149 - components: - - type: Transform - parent: 1125 - - type: Physics - canCollide: False - proto: ShipyardRCD entities: - uid: 2576 @@ -14550,52 +14158,6 @@ entities: - type: Transform pos: 27.5,0.5 parent: 1 -- proto: SpeedLoaderMagnum - entities: - - uid: 1186 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1187 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1188 - components: - - type: Transform - parent: 247 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: SpeedLoaderMagnumRubber - entities: - - uid: 1189 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1190 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 1191 - components: - - type: Transform - parent: 250 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: StationMap entities: - uid: 1736 @@ -15793,20 +15355,6 @@ entities: - type: Transform pos: 29.509594,0.66229606 parent: 1 -- proto: Truncheon - entities: - - uid: 1150 - components: - - type: Transform - parent: 1125 - - type: Physics - canCollide: False - - uid: 1151 - components: - - type: Transform - parent: 1125 - - type: Physics - canCollide: False - proto: VendingMachineBooze entities: - uid: 529 @@ -17701,96 +17249,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,4.5 parent: 1 -- proto: WeaponDisabler - entities: - - uid: 1161 - components: - - type: Transform - parent: 1124 - - type: Physics - canCollide: False - - uid: 1162 - components: - - type: Transform - parent: 1124 - - type: Physics - canCollide: False - - uid: 1163 - components: - - type: Transform - parent: 1124 - - type: Physics - canCollide: False - - uid: 1164 - components: - - type: Transform - parent: 1124 - - type: Physics - canCollide: False -- proto: WeaponEmpEmitter - entities: - - uid: 490 - components: - - type: Transform - parent: 323 - - type: Physics - canCollide: False - - uid: 581 - components: - - type: Transform - parent: 323 - - type: Physics - canCollide: False - - uid: 601 - components: - - type: Transform - parent: 323 - - type: Physics - canCollide: False - - uid: 689 - components: - - type: Transform - parent: 323 - - type: Physics - canCollide: False - - uid: 697 - components: - - type: Transform - parent: 323 - - type: Physics - canCollide: False -- proto: WeaponEnergyGun - entities: - - uid: 1170 - components: - - type: Transform - parent: 1123 - - type: Physics - canCollide: False - - uid: 1171 - components: - - type: Transform - parent: 1123 - - type: Physics - canCollide: False - - uid: 1172 - components: - - type: Transform - parent: 1123 - - type: Physics - canCollide: False - - uid: 1173 - components: - - type: Transform - parent: 1123 - - type: Physics - canCollide: False - - uid: 1174 - components: - - type: Transform - parent: 1123 - - type: Physics - canCollide: False - proto: WeaponGrapplingGun entities: - uid: 1228 @@ -17808,558 +17266,33 @@ entities: - type: Transform pos: -2.485515,-4.420809 parent: 1 -- proto: WeaponLaserCarbine +- proto: WeaponRackBase entities: - - uid: 1143 - components: - - type: Transform - parent: 1131 - - type: Physics - canCollide: False - - uid: 1144 - components: - - type: Transform - parent: 1131 - - type: Physics - canCollide: False - - uid: 1145 - components: - - type: Transform - parent: 1131 - - type: Physics - canCollide: False - - uid: 1146 - components: - - type: Transform - parent: 1131 - - type: Physics - canCollide: False - - uid: 1147 - components: - - type: Transform - parent: 1131 - - type: Physics - canCollide: False -- proto: WeaponLauncherRocket - entities: - - uid: 1205 - components: - - type: Transform - parent: 497 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: WeaponLauncherRocketEmp - entities: - - uid: 1200 - components: - - type: Transform - parent: 1016 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: WeaponPistolMk58 - entities: - - uid: 1157 - components: - - type: Transform - parent: 1018 - - type: Physics - canCollide: False - - uid: 1158 - components: - - type: Transform - parent: 1018 - - type: Physics - canCollide: False - - uid: 1159 - components: - - type: Transform - parent: 1018 - - type: Physics - canCollide: False - - uid: 1160 - components: - - type: Transform - parent: 1018 - - type: Physics - canCollide: False -- proto: WeaponRackBase - entities: - - uid: 1126 - components: - - type: Transform - pos: 19.5,1.5 - parent: 1 - - type: Lock - locked: True - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1099 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1100 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1101 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1102 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1113 - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 1127 - components: - - type: Transform - pos: 18.5,1.5 - parent: 1 - - type: Lock - locked: True - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1138 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1139 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1140 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1141 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1142 - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 1131 + - uid: 250 components: - type: Transform - pos: 17.5,1.5 + pos: 21.5,3.5 parent: 1 - type: Lock locked: True - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1143 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1144 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1145 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1146 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1147 - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: WeaponRackMeleeBase +- proto: WeaponRackMeleeWallmountedBase entities: - - uid: 1125 + - uid: 323 components: - type: Transform pos: 20.5,1.5 parent: 1 - type: Lock locked: True - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1148 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1149 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1150 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1151 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1152 - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: WeaponRackPistolWallmountedBase entities: - - uid: 1010 - components: - - type: Transform - pos: 22.5,2.5 - parent: 1 - - type: Lock - locked: True - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1153 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1154 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1155 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1156 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 1018 - components: - - type: Transform - pos: 22.5,3.5 - parent: 1 - - type: Lock - locked: True - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1157 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1158 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1159 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1160 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 1124 - components: - - type: Transform - pos: 22.5,1.5 - parent: 1 - - type: Lock - locked: True - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1161 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1162 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1163 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1164 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: WeaponRackPistolWallmountedSecurity - entities: - - uid: 1013 + - uid: 253 components: - type: Transform pos: 28.5,5.5 parent: 1 - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1165 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: WeaponRackWallmountedBase - entities: - - uid: 323 - components: - - type: Transform - pos: 21.5,4.5 - parent: 1 - - type: Lock - locked: True - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 490 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 581 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 601 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 689 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 697 - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 1123 - components: - - type: Transform - pos: 19.5,4.5 - parent: 1 - type: Lock locked: True - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1170 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1171 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1172 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1173 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1174 - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: WeaponRevolverInspector - entities: - - uid: 1153 - components: - - type: Transform - parent: 1010 - - type: Physics - canCollide: False - - uid: 1154 - components: - - type: Transform - parent: 1010 - - type: Physics - canCollide: False - - uid: 1155 - components: - - type: Transform - parent: 1010 - - type: Physics - canCollide: False - - uid: 1156 - components: - - type: Transform - parent: 1010 - - type: Physics - canCollide: False -- proto: WeaponRevolverMateba - entities: - - uid: 1165 - components: - - type: Transform - parent: 1013 - - type: Physics - canCollide: False -- proto: WeaponRifleLecter - entities: - - uid: 1099 - components: - - type: Transform - parent: 1126 - - type: Physics - canCollide: False - - uid: 1100 - components: - - type: Transform - parent: 1126 - - type: Physics - canCollide: False - - uid: 1101 - components: - - type: Transform - parent: 1126 - - type: Physics - canCollide: False - - uid: 1102 - components: - - type: Transform - parent: 1126 - - type: Physics - canCollide: False - - uid: 1113 - components: - - type: Transform - parent: 1126 - - type: Physics - canCollide: False -- proto: WeaponShotgunEnforcer - entities: - - uid: 1138 - components: - - type: Transform - parent: 1127 - - type: Physics - canCollide: False - - uid: 1139 - components: - - type: Transform - parent: 1127 - - type: Physics - canCollide: False - - uid: 1140 - components: - - type: Transform - parent: 1127 - - type: Physics - canCollide: False - - uid: 1141 - components: - - type: Transform - parent: 1127 - - type: Physics - canCollide: False - - uid: 1142 - components: - - type: Transform - parent: 1127 - - type: Physics - canCollide: False - proto: WeldingFuelTankHighCapacity entities: - uid: 823 diff --git a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml b/Resources/Prototypes/_NF/Shipyard/Security/empress.yml index d4f2987fa1c..23ea5ea0eda 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/empress.yml @@ -2,7 +2,7 @@ id: Empress name: NSF Empress description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of security. - price: 203300 #Appraisal value is 173000 + price: 170000 #Appraisal value is 150000 category: Large group: Security shuttlePath: /Maps/_NF/Shuttles/Security/empress.yml