diff --git a/Resources/Locale/en-US/_NF/structure/weapon-racks.ftl b/Resources/Locale/en-US/_NF/structure/weapon-racks.ftl new file mode 100644 index 00000000000..53229abdac7 --- /dev/null +++ b/Resources/Locale/en-US/_NF/structure/weapon-racks.ftl @@ -0,0 +1,13 @@ +weapon-rack-name-stored-weapon-slot = stored weapon + +weapon-rack-verb-insert-weapon-01 = "Insert weapon (1)" +weapon-rack-verb-insert-weapon-02 = "Insert weapon (2)" +weapon-rack-verb-insert-weapon-03 = "Insert weapon (3)" +weapon-rack-verb-insert-weapon-04 = "Insert weapon (4)" +weapon-rack-verb-insert-weapon-05 = "Insert weapon (5)" + +weapon-rack-verb-eject-weapon-01 = "Eject weapon (1)" +weapon-rack-verb-eject-weapon-02 = "Eject weapon (2)" +weapon-rack-verb-eject-weapon-03 = "Eject weapon (3)" +weapon-rack-verb-eject-weapon-04 = "Eject weapon (4)" +weapon-rack-verb-eject-weapon-05 = "Eject weapon (5)" diff --git a/Resources/Maps/_NF/Bluespace/bloodmoon.yml b/Resources/Maps/_NF/Bluespace/bloodmoon.yml index 0c745230764..07f0a1b2eb2 100644 --- a/Resources/Maps/_NF/Bluespace/bloodmoon.yml +++ b/Resources/Maps/_NF/Bluespace/bloodmoon.yml @@ -228,11 +228,9 @@ entities: 0: 36078 1: 17 0,1: - 1: 3 - 2: 13104 + 1: 13107 0,2: - 2: 51 - 1: 13056 + 1: 13107 0,3: 1: 255 -1,2: @@ -270,17 +268,15 @@ entities: 4,3: 1: 1023 0,-4: - 1: 3 - 2: 29488 + 1: 29491 0,-5: 1: 16376 0,-3: - 2: 3311 + 1: 3311 -1,-1: 0: 60544 1,-3: - 2: 1904 - 1: 2176 + 1: 4080 1,-4: 2: 1 1,-5: @@ -318,7 +314,7 @@ entities: -3,1: 1: 36046 -2,0: - 2: 255 + 1: 255 -2,1: 1: 29456 -2,2: @@ -636,83 +632,23 @@ entities: - type: Transform pos: 12.5,-1.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 306 - components: - - type: Transform - pos: 0.5,-15.5 - parent: 1 - - uid: 395 - components: - - type: Transform - pos: -8.5,1.5 - parent: 1 - - uid: 396 - components: - - type: Transform - pos: -8.5,0.5 - parent: 1 - - uid: 397 - components: - - type: Transform - pos: 7.5,-9.5 - parent: 1 - - uid: 398 - components: - - type: Transform - pos: 7.5,-10.5 - parent: 1 - - uid: 399 - components: - - type: Transform - pos: 0.5,4.5 - parent: 1 - - uid: 400 - components: - - type: Transform - pos: -3.5,0.5 - parent: 1 - - uid: 401 components: - type: Transform pos: 3.5,-19.5 parent: 1 - - uid: 402 + - uid: 349 components: - type: Transform pos: 4.5,-19.5 parent: 1 - - uid: 403 + - uid: 350 components: - type: Transform pos: 5.5,-19.5 parent: 1 - - uid: 404 - components: - - type: Transform - pos: 1.5,-15.5 - parent: 1 - - uid: 405 - components: - - type: Transform - pos: -3.5,1.5 - parent: 1 - - uid: 406 - components: - - type: Transform - pos: 1.5,4.5 - parent: 1 - - uid: 408 - components: - - type: Transform - pos: 0.5,10.5 - parent: 1 - - uid: 409 - components: - - type: Transform - pos: 1.5,10.5 - parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 323 @@ -845,116 +781,6 @@ entities: - type: Transform pos: 4.5,-15.5 parent: 1 - - uid: 349 - components: - - type: Transform - pos: 0.5,-14.5 - parent: 1 - - uid: 350 - components: - - type: Transform - pos: 0.5,-13.5 - parent: 1 - - uid: 351 - components: - - type: Transform - pos: 0.5,-12.5 - parent: 1 - - uid: 352 - components: - - type: Transform - pos: 0.5,-11.5 - parent: 1 - - uid: 353 - components: - - type: Transform - pos: 1.5,-14.5 - parent: 1 - - uid: 354 - components: - - type: Transform - pos: 1.5,-13.5 - parent: 1 - - uid: 355 - components: - - type: Transform - pos: 1.5,-12.5 - parent: 1 - - uid: 356 - components: - - type: Transform - pos: 1.5,-11.5 - parent: 1 - - uid: 357 - components: - - type: Transform - pos: 2.5,-12.5 - parent: 1 - - uid: 358 - components: - - type: Transform - pos: 2.5,-11.5 - parent: 1 - - uid: 359 - components: - - type: Transform - pos: 2.5,-10.5 - parent: 1 - - uid: 360 - components: - - type: Transform - pos: 1.5,-10.5 - parent: 1 - - uid: 361 - components: - - type: Transform - pos: 3.5,-11.5 - parent: 1 - - uid: 362 - components: - - type: Transform - pos: 3.5,-10.5 - parent: 1 - - uid: 363 - components: - - type: Transform - pos: 3.5,-9.5 - parent: 1 - - uid: 364 - components: - - type: Transform - pos: 2.5,-9.5 - parent: 1 - - uid: 365 - components: - - type: Transform - pos: 4.5,-9.5 - parent: 1 - - uid: 366 - components: - - type: Transform - pos: 4.5,-10.5 - parent: 1 - - uid: 367 - components: - - type: Transform - pos: 5.5,-9.5 - parent: 1 - - uid: 368 - components: - - type: Transform - pos: 5.5,-10.5 - parent: 1 - - uid: 369 - components: - - type: Transform - pos: 6.5,-9.5 - parent: 1 - - uid: 370 - components: - - type: Transform - pos: 6.5,-10.5 - parent: 1 - uid: 371 components: - type: Transform @@ -965,96 +791,6 @@ entities: - type: Transform pos: -8.5,-2.5 parent: 1 - - uid: 373 - components: - - type: Transform - pos: -7.5,0.5 - parent: 1 - - uid: 374 - components: - - type: Transform - pos: -7.5,1.5 - parent: 1 - - uid: 375 - components: - - type: Transform - pos: -6.5,0.5 - parent: 1 - - uid: 376 - components: - - type: Transform - pos: -6.5,1.5 - parent: 1 - - uid: 377 - components: - - type: Transform - pos: -5.5,0.5 - parent: 1 - - uid: 378 - components: - - type: Transform - pos: -5.5,1.5 - parent: 1 - - uid: 379 - components: - - type: Transform - pos: -4.5,0.5 - parent: 1 - - uid: 380 - components: - - type: Transform - pos: -4.5,1.5 - parent: 1 - - uid: 381 - components: - - type: Transform - pos: 0.5,9.5 - parent: 1 - - uid: 382 - components: - - type: Transform - pos: 0.5,8.5 - parent: 1 - - uid: 383 - components: - - type: Transform - pos: 0.5,7.5 - parent: 1 - - uid: 384 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1 - - uid: 385 - components: - - type: Transform - pos: 0.5,5.5 - parent: 1 - - uid: 386 - components: - - type: Transform - pos: 1.5,9.5 - parent: 1 - - uid: 387 - components: - - type: Transform - pos: 1.5,8.5 - parent: 1 - - uid: 388 - components: - - type: Transform - pos: 1.5,7.5 - parent: 1 - - uid: 389 - components: - - type: Transform - pos: 1.5,6.5 - parent: 1 - - uid: 390 - components: - - type: Transform - pos: 1.5,5.5 - parent: 1 - uid: 391 components: - type: Transform @@ -2004,23 +1740,6 @@ entities: - type: Transform pos: 11.5,-10.5 parent: 1 -- proto: BloodCultTurret - entities: - - uid: 470 - components: - - type: Transform - pos: 8.5,13.5 - parent: 1 - - uid: 472 - components: - - type: Transform - pos: 20.5,1.5 - parent: 1 - - uid: 1044 - components: - - type: Transform - pos: 12.5,-7.5 - parent: 1 - proto: BookNames entities: - uid: 1268 @@ -6033,20 +5752,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-16.5 parent: 1 -- proto: PlasteelArmingSword - entities: - - uid: 1186 - components: - - type: Transform - parent: 1185 - - type: Physics - canCollide: False - - uid: 1188 - components: - - type: Transform - parent: 1185 - - type: Physics - canCollide: False - proto: PottedPlantRandomPlastic entities: - uid: 1077 @@ -6115,18 +5820,6 @@ entities: parent: 1 - proto: RitualDagger entities: - - uid: 1187 - components: - - type: Transform - parent: 1185 - - type: Physics - canCollide: False - - uid: 1189 - components: - - type: Transform - parent: 1185 - - type: Physics - canCollide: False - uid: 1197 components: - type: Transform @@ -6352,14 +6045,13 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-11.5 parent: 1 -- proto: SpearBone +- proto: StructureMeleeWeaponRackBloodCultFilled entities: - - uid: 1190 + - uid: 470 components: - type: Transform - parent: 1185 - - type: Physics - canCollide: False + pos: -7.5,8.5 + parent: 1 - proto: SubstationBasic entities: - uid: 575 @@ -8034,6 +7726,15 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-4.5 parent: 1 +- proto: WarpPointShip + entities: + - uid: 468 + components: + - type: MetaData + name: Blood Moon + - type: Transform + pos: 4.5,-17.5 + parent: 1 - proto: WindowCultIndestructibleInvisible entities: - uid: 1280 @@ -8221,50 +7922,4 @@ entities: - type: Transform pos: -0.5,5.5 parent: 1 -- proto: WarpPointShip - entities: - - uid: 468 - components: - - type: MetaData - name: Blood Moon - - type: Transform - pos: 4.5,-17.5 - parent: 1 -- proto: WeaponRackMeleeBase - entities: - - uid: 1185 - components: - - type: Transform - pos: -7.5,8.5 - parent: 1 - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1186 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1187 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1190 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1189 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1188 - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null ... diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml index f5840b32812..95e245b0ec0 100644 --- a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml +++ b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml @@ -8262,6 +8262,14 @@ entities: - type: Transform pos: 26.5,39.5 parent: 588 +- proto: GrilleBroken + entities: + - uid: 1302 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,39.5 + parent: 588 - proto: GrilleDungeon entities: - uid: 209 @@ -8341,14 +8349,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,43.5 parent: 588 -- proto: GrilleBroken - entities: - - uid: 1302 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,39.5 - parent: 588 - proto: HighSecArmoryLocked entities: - uid: 1597 @@ -11837,6 +11837,13 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,13.5 parent: 588 +- proto: StructurePistolRackWallmountedMercenaryFilled + entities: + - uid: 772 + components: + - type: Transform + pos: 13.5,15.5 + parent: 588 - proto: SubstationBasic entities: - uid: 467 @@ -12902,53 +12909,6 @@ entities: - type: Transform pos: 16.5,24.5 parent: 588 -- proto: WeaponRackPistolWallmountedMercenary - entities: - - uid: 772 - components: - - type: Transform - pos: 13.5,15.5 - parent: 588 - - type: Lock - locked: False - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1613 - 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: WeaponRevolverArgenti - entities: - - uid: 1613 - components: - - type: Transform - parent: 772 - - type: Physics - canCollide: False - proto: WindoorAssemblySecure entities: - uid: 696 diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml index 3dae1b23b29..223925595ab 100644 --- a/Resources/Maps/_NF/POI/cove.yml +++ b/Resources/Maps/_NF/POI/cove.yml @@ -5903,7 +5903,7 @@ entities: pos: 7.5,28.5 parent: 1 - type: Door - secondsUntilStateChange: -7224.6685 + secondsUntilStateChange: -7268.7188 state: Opening - proto: FenceWoodSmallCorner entities: @@ -9617,6 +9617,13 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 1 +- proto: StructurePistolRackPiratesFilled + entities: + - uid: 1875 + components: + - type: Transform + pos: -14.5,24.5 + parent: 1 - proto: Stunbaton entities: - uid: 2090 @@ -12846,32 +12853,6 @@ entities: - type: Transform pos: -3.5,7.5 parent: 1 -- proto: WeaponDisabler - entities: - - uid: 1911 - components: - - type: Transform - parent: 1875 - - type: Physics - canCollide: False - - uid: 1912 - components: - - type: Transform - parent: 1875 - - type: Physics - canCollide: False - - uid: 1913 - components: - - type: Transform - parent: 1875 - - type: Physics - canCollide: False - - uid: 1914 - components: - - type: Transform - parent: 1875 - - type: Physics - canCollide: False - proto: WeaponGrapplingGun entities: - uid: 2063 @@ -12879,43 +12860,6 @@ entities: - type: Transform pos: 0.49590623,-4.4579954 parent: 1 -- proto: WeaponRackPistolBase - entities: - - uid: 1875 - components: - - type: Transform - pos: -14.5,24.5 - parent: 1 - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1911 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1914 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1912 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 1913 - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: WeaponRevolverArgentiNonlethal entities: - uid: 2071 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml index 2b5846f04a9..a0c30104645 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml @@ -12904,14 +12904,14 @@ entities: - type: Transform pos: -3.5,-3.5 parent: 1 -- proto: WeaponRackBase +- proto: StructureGunRack entities: - uid: 1811 components: - type: Transform pos: -5.5,-1.5 parent: 1 -- proto: WeaponRackPistolBase +- proto: StructurePistolRack entities: - uid: 1376 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml index 2a236135ab4..86909e6ca2c 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml @@ -5549,7 +5549,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-13.5 parent: 2 -- proto: WeaponRackPistolBase +- proto: StructurePistolRackNfsd entities: - uid: 260 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index 09984f984bb..e248424857a 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -17237,7 +17237,7 @@ entities: - type: Transform pos: -2.485515,-4.420809 parent: 1 -- proto: WeaponRackBase +- proto: StructureGunRackNfsd entities: - uid: 250 components: @@ -17246,7 +17246,7 @@ entities: parent: 1 - type: Lock locked: True -- proto: WeaponRackMeleeWallmountedBase +- proto: StructureMeleeWeaponRackWallmountedNfsd entities: - uid: 323 components: @@ -17255,15 +17255,13 @@ entities: parent: 1 - type: Lock locked: True -- proto: WeaponRackPistolWallmountedBase +- proto: StructurePistolRackWallmountedNfsd entities: - uid: 253 components: - type: Transform pos: 28.5,5.5 parent: 1 - - type: Lock - locked: True - proto: WeldingFuelTankHighCapacity entities: - uid: 823 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml index d6e21133e5c..6de9136ae26 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml @@ -4264,7 +4264,7 @@ entities: - type: Transform pos: 0.6566181,3.439952 parent: 1 -- proto: WeaponRackBase +- proto: StructureGunRackNfsd entities: - uid: 611 components: @@ -4276,7 +4276,7 @@ entities: - type: Transform pos: 10.5,-1.5 parent: 1 -- proto: WeaponRackPistolWallmountedBase +- proto: StructurePistolRackWallmountedNfsd entities: - uid: 613 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index 146129edc9e..32540168203 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -12100,21 +12100,21 @@ entities: - type: Transform pos: -5.391229,4.418746 parent: 1 -- proto: WeaponRackBase +- proto: StructureGunRackNfsd entities: - uid: 1789 components: - type: Transform pos: -4.5,9.5 parent: 1 -- proto: WeaponRackMeleeBase +- proto: StructureMeleeWeaponRackNfsd entities: - uid: 1790 components: - type: Transform pos: -2.5,9.5 parent: 1 -- proto: WeaponRackPistolWallmountedBase +- proto: StructurePistolRackWallmountedNfsd entities: - uid: 1791 components: diff --git a/Resources/Maps/_NF/Shuttles/prospector.yml b/Resources/Maps/_NF/Shuttles/prospector.yml index 950bd3592d0..f728b079784 100644 --- a/Resources/Maps/_NF/Shuttles/prospector.yml +++ b/Resources/Maps/_NF/Shuttles/prospector.yml @@ -210,14 +210,6 @@ entities: - type: BecomesStation id: Prospector - type: SpreaderGrid -- proto: ActionToggleLight - entities: - - uid: 164 - components: - - type: Transform - parent: 160 - - type: InstantAction - container: 160 - proto: AirAlarm entities: - uid: 235 @@ -1202,6 +1194,23 @@ entities: - type: Transform pos: 1.6783751,-4.3457556 parent: 201 +- proto: NFSignDock + entities: + - uid: 151 + components: + - type: Transform + pos: -6.5,-3.5 + parent: 201 + - uid: 208 + components: + - type: Transform + pos: 2.5,4.5 + parent: 201 + - uid: 209 + components: + - type: Transform + pos: 1.5,-7.5 + parent: 201 - proto: NitrogenCanister entities: - uid: 120 @@ -1229,14 +1238,6 @@ entities: parent: 201 - type: Physics bodyType: Static -- proto: Pickaxe - entities: - - uid: 182 - components: - - type: Transform - parent: 232 - - type: Physics - canCollide: False - proto: PlasticFlapsAirtightClear entities: - uid: 26 @@ -1437,23 +1438,6 @@ entities: - Pressed: Toggle 206: - Pressed: Toggle -- proto: NFSignDock - entities: - - uid: 151 - components: - - type: Transform - pos: -6.5,-3.5 - parent: 201 - - uid: 208 - components: - - type: Transform - pos: 2.5,4.5 - parent: 201 - - uid: 209 - components: - - type: Transform - pos: 1.5,-7.5 - parent: 201 - proto: SMESBasic entities: - uid: 84 @@ -1475,6 +1459,13 @@ entities: - type: Transform pos: 0.5,-5.5 parent: 201 +- proto: StructureMeleeWeaponRackWallmountedSalvageFilled + entities: + - uid: 160 + components: + - type: Transform + pos: 2.5,0.5 + parent: 201 - proto: SubstationBasic entities: - uid: 85 @@ -1741,14 +1732,6 @@ entities: parent: 201 - type: WarpPoint location: Prospector -- proto: WeaponCrusher - entities: - - uid: 204 - components: - - type: Transform - parent: 232 - - type: Physics - canCollide: False - proto: WeaponCrusherDagger entities: - uid: 240 @@ -1756,59 +1739,6 @@ entities: - type: Transform pos: 0.5,-5.5 parent: 201 -- proto: WeaponCrusherGlaive - entities: - - uid: 160 - components: - - type: Transform - parent: 232 - - type: UnpoweredFlashlight - toggleActionEntity: 164 - - type: Physics - canCollide: False - - type: ActionsContainer - - type: ContainerContainer - containers: - actions: !type:Container - ents: - - 164 -- proto: WeaponRackMeleeWallmountedSalvage - entities: - - uid: 232 - components: - - type: Transform - pos: 2.5,0.5 - parent: 201 - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 182 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 160 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 204 - 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: Window entities: - uid: 55 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/base_weapon_rack.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/base_weapon_rack.yml new file mode 100644 index 00000000000..39a5638900b --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/base_weapon_rack.yml @@ -0,0 +1,409 @@ +# Base +# Localisation file \Resources\Locale\en-US\_NF\structure\weapon-racks.ftl +- type: entity + id: StructureWeaponRackBase + name: weapon rack + parent: BaseStructure + description: A storage unit for expedited pacification measures. + abstract: true + components: + - type: Anchorable + - type: InteractionOutline + - type: Transform + anchored: true + noRot: true + - type: Sprite + snapCardinals: true + noRot: true + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + layers: + - state: base-gun + color: "#515e5e" + - type: Appearance + - type: Damageable + damageModifierSet: Metallic + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: StaticPrice + price: 80 + +- type: entity + id: StructureWeaponRackSlots + parent: StructureWeaponRackBase + abstract: true + components: + - type: ContainerContainer + containers: + weapon1: !type:ContainerSlot + weapon2: !type:ContainerSlot + weapon3: !type:ContainerSlot + weapon4: !type:ContainerSlot + weapon5: !type:ContainerSlot + +# Gun racks +- type: entity + id: StructureGunRack + name: gun rack + parent: StructureWeaponRackSlots + suffix: Empty + components: + - type: ItemSlots + slots: + weapon1: + insertVerbText: weapon-rack-verb-insert-weapon-01 + ejectVerbText: weapon-rack-verb-eject-weapon-01 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - Gun + weapon2: + insertVerbText: weapon-rack-verb-insert-weapon-02 + ejectVerbText: weapon-rack-verb-eject-weapon-02 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - Gun + weapon3: + insertVerbText: weapon-rack-verb-insert-weapon-03 + ejectVerbText: weapon-rack-verb-eject-weapon-03 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - Gun + weapon4: + insertVerbText: weapon-rack-verb-insert-weapon-04 + ejectVerbText: weapon-rack-verb-eject-weapon-04 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - Gun + weapon5: + insertVerbText: weapon-rack-verb-insert-weapon-05 + ejectVerbText: weapon-rack-verb-eject-weapon-05 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - Gun + - type: ItemMapper + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + mapLayers: + gun-1: + minCount: 1 + whitelist: + components: + - Gun + gun-2: + minCount: 2 + whitelist: + components: + - Gun + gun-3: + minCount: 3 + whitelist: + components: + - Gun + gun-4: + minCount: 4 + whitelist: + components: + - Gun + gun-5: + minCount: 5 + whitelist: + components: + - Gun + - type: Construction + graph: WeaponRackConstructionGraph + node: GunRackNode + +- type: entity + id: StructureGunRackWallmounted + parent: StructureGunRack + suffix: Empty, Wallmount + components: + - type: WallMount + arc: 360 + - type: Sprite + layers: + - state: base-gun-wall + color: "#515e5e" + - type: Construction + graph: WeaponRackConstructionGraph + node: GunRackWallmountedNode + +# Melee weapon racks +- type: entity + id: StructureMeleeWeaponRack + name: melee weapon rack + parent: StructureWeaponRackSlots + suffix: Empty + components: + - type: Sprite + layers: + - state: base-melee + color: "#515e5e" + - type: ItemSlots + slots: + weapon1: + insertVerbText: weapon-rack-verb-insert-weapon-01 + ejectVerbText: weapon-rack-verb-eject-weapon-01 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - MeleeWeapon + weapon2: + insertVerbText: weapon-rack-verb-insert-weapon-02 + ejectVerbText: weapon-rack-verb-eject-weapon-02 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - MeleeWeapon + weapon3: + insertVerbText: weapon-rack-verb-insert-weapon-03 + ejectVerbText: weapon-rack-verb-eject-weapon-03 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - MeleeWeapon + weapon4: + insertVerbText: weapon-rack-verb-insert-weapon-04 + ejectVerbText: weapon-rack-verb-eject-weapon-04 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - MeleeWeapon + weapon5: + insertVerbText: weapon-rack-verb-insert-weapon-05 + ejectVerbText: weapon-rack-verb-eject-weapon-05 + name: weapon-rack-name-stored-weapon-slot + whitelist: + components: + - MeleeWeapon + - type: ItemMapper + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + mapLayers: + melee-1: + minCount: 1 + whitelist: + components: + - MeleeWeapon + melee-2: + minCount: 2 + whitelist: + components: + - MeleeWeapon + melee-3: + minCount: 3 + whitelist: + components: + - MeleeWeapon + melee-4: + minCount: 4 + whitelist: + components: + - MeleeWeapon + melee-5: + minCount: 5 + whitelist: + components: + - MeleeWeapon + - type: Construction + graph: WeaponRackConstructionGraph + node: MeleeRackNode + +- type: entity + id: StructureMeleeWeaponRackWallmounted + parent: StructureMeleeWeaponRack + suffix: Empty, Wallmount + components: + - type: WallMount + arc: 360 + - type: Sprite + layers: + - state: base-melee-wall + color: "#515e5e" + - type: Construction + graph: WeaponRackConstructionGraph + node: PistolRackWallmountedNode + +# Pistol rack (slots) +- type: entity + id: StructurePistolRack + name: sidearm rack + parent: StructureWeaponRackSlots + suffix: Empty + components: + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.10,-0.10,0.10,0.10" + density: 500 + mask: + - TabletopMachineMask + - type: Sprite + layers: + - state: base-pistol + color: "#515e5e" + - type: ItemSlots + slots: + weapon1: + insertVerbText: weapon-rack-verb-insert-weapon-01 + ejectVerbText: weapon-rack-verb-eject-weapon-01 + name: weapon-rack-name-stored-weapon-slot + whitelist: + tags: + - Sidearm + weapon2: + insertVerbText: weapon-rack-verb-insert-weapon-02 + ejectVerbText: weapon-rack-verb-eject-weapon-02 + name: weapon-rack-name-stored-weapon-slot + whitelist: + tags: + - Sidearm + weapon3: + insertVerbText: weapon-rack-verb-insert-weapon-03 + ejectVerbText: weapon-rack-verb-eject-weapon-03 + name: weapon-rack-name-stored-weapon-slot + whitelist: + tags: + - Sidearm + weapon4: + insertVerbText: weapon-rack-verb-insert-weapon-04 + ejectVerbText: weapon-rack-verb-eject-weapon-04 + name: weapon-rack-name-stored-weapon-slot + whitelist: + tags: + - Sidearm + - type: ItemMapper + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + mapLayers: + pistol-1: + minCount: 1 + whitelist: + tags: + - Sidearm + pistol-2: + minCount: 2 + whitelist: + tags: + - Sidearm + pistol-3: + minCount: 3 + whitelist: + tags: + - Sidearm + pistol-4: + minCount: 4 + whitelist: + tags: + - Sidearm + - type: Construction + graph: WeaponRackConstructionGraph + node: PistolRackNode + +- type: entity + id: StructurePistolRackWallmounted + parent: StructurePistolRack + suffix: Empty, Wallmount + components: + - type: WallMount + arc: 360 + - type: Sprite + layers: + - state: base-pistol-wall + color: "#515e5e" + - type: Construction + graph: WeaponRackConstructionGraph + node: PistolRackWallmountedNode + +# Pistol racks (inventory, lock) +- type: entity + id: StructurePistolRackLock + name: personal defence weapon rack + parent: StructureWeaponRackBase + abstract: true + components: + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.10,-0.10,0.10,0.10" + density: 500 + mask: + - TabletopMachineMask + - type: Sprite + layers: + - state: base-pistol + color: "#515e5e" + - state: lock + color: "#515e5e" + - state: pistol-0 + - map: ["enum.StorageFillLayers.Fill"] + - state: locked + map: [ enum.LockVisualLayers.Lock ] + shader: unshaded + - type: AccessReader + - type: LockVisuals + - type: Lock + locked: false + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: StorageFillVisualizer + maxFillLevels: 5 + fillBaseName: pistol + - type: Storage + grid: + - 0,0,3,1 + - 0,3,3,4 + maxItemSize: Ginormous + whitelist: + components: + - Gun + +- type: entity + id: StructurePistolRackLockWallmounted + parent: StructurePistolRackLock + abstract: true + components: + - type: WallMount + arc: 360 + - type: Sprite + layers: + - state: base-pistol-wall + color: "#515e5e" + - state: lock + color: "#515e5e" + - state: pistol-0 + - map: ["enum.StorageFillLayers.Fill"] + - state: locked + map: [ enum.LockVisualLayers.Lock ] + shader: unshaded diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/gun_racks_base.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/gun_racks_base.yml deleted file mode 100644 index b03fd49be0f..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/gun_racks_base.yml +++ /dev/null @@ -1,166 +0,0 @@ -# Gun racks -- type: entity - id: WeaponRackBase - parent: BaseStructure - name: gun rack - description: A storage unit for expedited pacification measures. -# placement: -# mode: SnapgridCenter - components: -# - type: Rotatable -# - type: Icon -# sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi -# state: icon_generic_gunrack - - type: Sprite - snapCardinals: true #false - noRot: true - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: Appearance - - type: EntityStorageVisuals - - type: AccessReader - - type: Lock - locked: false - - type: Damageable - damageModifierSet: Metallic - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 600 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:SpawnEntitiesBehavior - spawn: - SheetSteel1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: ["Destruction"] - - type: Tag - tags: - - Structure - - type: Transform - anchored: true - noRot: true - - type: Physics - bodyType: Static - - type: Anchorable - - type: Pullable - - type: InteractionOutline - - type: ItemSlots - slots: - weapon1_slot: - name: stored weapon - whitelist: - components: - - Gun - insertOnInteract: false - priority: 8 - weapon2_slot: - name: stored weapon - whitelist: - components: - - Gun - insertOnInteract: false - priority: 7 - weapon3_slot: - name: stored weapon - whitelist: - components: - - Gun - insertOnInteract: false - priority: 6 - weapon4_slot: - name: stored weapon - whitelist: - components: - - Gun - insertOnInteract: false - priority: 5 - weapon5_slot: - name: stored weapon - whitelist: - components: - - Gun - insertOnInteract: false - priority: 4 - - type: ItemMapper - mapLayers: - weapon_generic_gun1: - minCount: 1 - whitelist: - components: - - Gun - weapon_generic_gun2: - minCount: 2 - whitelist: - components: - - Gun - weapon_generic_gun3: - minCount: 3 - whitelist: - components: - - Gun - weapon_generic_gun4: - minCount: 4 - whitelist: - components: - - Gun - weapon_generic_gun5: - minCount: 5 - whitelist: - components: - - Gun - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] - weapon1_slot: !type:ContainerSlot {} - weapon2_slot: !type:ContainerSlot {} - weapon3_slot: !type:ContainerSlot {} - weapon4_slot: !type:ContainerSlot {} - weapon5_slot: !type:ContainerSlot {} - weapon6_slot: !type:ContainerSlot {} - - type: StaticPrice - price: 80 - - type: Construction - graph: WeaponRackConstructionGraph - node: GunRackNode - -- type: entity - id: WeaponRackWallmountedBase - parent: WeaponRackBase - suffix: Wallmount - components: - - type: WallMount - arc: 360 - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack_wallmounted - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: Appearance - - type: EntityStorageVisuals - - type: Construction - graph: WeaponRackConstructionGraph - node: GunRackWallmountedNode diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/melee_weaapon_racks_base.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/melee_weaapon_racks_base.yml deleted file mode 100644 index bf77a42098c..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/melee_weaapon_racks_base.yml +++ /dev/null @@ -1,112 +0,0 @@ -# Melee weapon racks -- type: entity - id: WeaponRackMeleeBase - parent: WeaponRackBase - name: melee weapon rack - description: A storage unit for expedited pacification measures. - components: - - type: Sprite - noRot: true - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - snapCardinals: true - layers: - - state: base_generic_meleerack - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: Appearance - - type: EntityStorageVisuals - - type: AccessReader - - type: Lock - locked: false - - type: ItemSlots - slots: - weapon1_slot: - name: stored weapon - whitelist: - components: - - MeleeWeapon - insertOnInteract: false - priority: 8 - weapon2_slot: - name: stored weapon - whitelist: - components: - - MeleeWeapon - insertOnInteract: false - priority: 7 - weapon3_slot: - name: stored weapon - whitelist: - components: - - MeleeWeapon - insertOnInteract: false - priority: 6 - weapon4_slot: - name: stored weapon - whitelist: - components: - - MeleeWeapon - insertOnInteract: false - priority: 5 - weapon5_slot: - name: stored weapon - whitelist: - components: - - MeleeWeapon - insertOnInteract: false - priority: 4 - - type: ItemMapper - mapLayers: - weapon_generic_melee1: - minCount: 1 - whitelist: - components: - - MeleeWeapon - weapon_generic_melee2: - minCount: 2 - whitelist: - components: - - MeleeWeapon - weapon_generic_melee3: - minCount: 3 - whitelist: - components: - - MeleeWeapon - weapon_generic_melee4: - minCount: 4 - whitelist: - components: - - MeleeWeapon - weapon_generic_melee5: - minCount: 5 - whitelist: - components: - - MeleeWeapon - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - - type: Construction - graph: WeaponRackConstructionGraph - node: MeleeRackNode - -- type: entity - id: WeaponRackMeleeWallmountedBase - parent: WeaponRackMeleeBase - suffix: Wallmount - components: - - type: WallMount - arc: 360 - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - layers: - - state: base_generic_meleerack_wallmounted - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: Appearance - - type: EntityStorageVisuals - - type: Construction - graph: WeaponRackConstructionGraph - node: MeleeRackWallmountedNode diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/pistol_racks_base.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/pistol_racks_base.yml deleted file mode 100644 index 3451b922db0..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/pistol_racks_base.yml +++ /dev/null @@ -1,159 +0,0 @@ -# Pistol weapon racks -- type: entity - id: WeaponRackPistolBase - parent: WeaponRackBase - name: pistol rack - description: A storage unit for expedited pacification measures. - placement: - mode: SnapgridCenter - components: - - type: Sprite - drawdepth: SmallObjects - noRot: true - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: Appearance - - type: EntityStorageVisuals - - type: AccessReader - - type: Lock - locked: false - - type: Damageable - damageModifierSet: Metallic - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 600 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:SpawnEntitiesBehavior - spawn: - SheetSteel1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: ["Destruction"] - - type: Tag - tags: - - Structure - - type: Transform - anchored: true - noRot: true - - type: Physics - bodyType: Static - - type: Anchorable - - type: Pullable - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.10,-0.10,0.10,0.10" - density: 500 - mask: - - TabletopMachineMask - - type: ItemSlots - slots: - weapon1_slot: - name: stored weapon - whitelist: - tags: - - Sidearm - insertOnInteract: false - priority: 8 - weapon2_slot: - name: stored weapon - whitelist: - tags: - - Sidearm - insertOnInteract: false - priority: 7 - weapon3_slot: - name: stored weapon - whitelist: - tags: - - Sidearm - insertOnInteract: false - priority: 6 - weapon4_slot: - name: stored weapon - whitelist: - tags: - - Sidearm - insertOnInteract: false - priority: 5 - - type: ItemMapper - mapLayers: - weapon_generic_pistol1: - minCount: 1 - whitelist: - tags: - - Sidearm - weapon_generic_pistol2: - minCount: 2 - whitelist: - tags: - - Sidearm - weapon_generic_pistol3: - minCount: 3 - whitelist: - tags: - - Sidearm - weapon_generic_pistol4: - minCount: 4 - whitelist: - tags: - - Sidearm - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - - type: InteractionOutline - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] - weapon1_slot: !type:ContainerSlot {} - weapon2_slot: !type:ContainerSlot {} - weapon3_slot: !type:ContainerSlot {} - weapon4_slot: !type:ContainerSlot {} - weapon5_slot: !type:ContainerSlot {} - weapon6_slot: !type:ContainerSlot {} - - type: StaticPrice - price: 80 - - type: Construction - graph: WeaponRackConstructionGraph - node: PistolRackNode - -- type: entity - id: WeaponRackPistolWallmountedBase - parent: WeaponRackPistolBase - suffix: Wallmount - components: - - type: WallMount - arc: 360 - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack_wallmounted - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: Appearance - - type: EntityStorageVisuals - - type: Construction - graph: WeaponRackConstructionGraph - node: PistolRackWallmountedNode diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks.yml new file mode 100644 index 00000000000..a827c8f48bd --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks.yml @@ -0,0 +1,350 @@ +## Command +# SR PDW racks +- type: entity + id: StructurePistolRackLockSR + parent: StructurePistolRackLock + suffix: SR, Empty + components: + - type: Sprite + layers: + - state: base-pistol + color: "#1f6626" + - state: lock + color: "#1f6626" + - state: base-pistol-decal + color: "#f1b223" + - state: pistol-0 + - map: ["enum.StorageFillLayers.Fill"] + - state: locked + map: [ enum.LockVisualLayers.Lock ] + shader: unshaded + - type: AccessReader + access: [ ["HeadOfPersonnel"] ] + - type: Lock + locked: true + +- type: entity + id: StructurePistolRackLockSRWallmounted + parent: StructurePistolRackLockWallmounted + suffix: SR, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-pistol-wall + color: "#1f6626" + - state: lock + color: "#1f6626" + - state: base-pistol-wall-decal + color: "#f1b223" + - state: pistol-0 + - map: ["enum.StorageFillLayers.Fill"] + - state: locked + map: [ enum.LockVisualLayers.Lock ] + shader: unshaded + - type: AccessReader + access: [ ["HeadOfPersonnel"] ] + - type: Lock + locked: true + +# Sheriff PDW racks +- type: entity + id: StructurePistolRackLockSheriff + parent: StructurePistolRackLock + suffix: Sheriff, Empty + components: + - type: Sprite + layers: + - state: base-pistol + color: "#56422b" + - state: lock + color: "#1f6626" + - state: base-pistol-decal + color: "#f1b223" + - state: pistol-0 + - map: ["enum.StorageFillLayers.Fill"] + - state: locked + map: [ enum.LockVisualLayers.Lock ] + shader: unshaded + - type: AccessReader + access: [ ["HeadOfSecurity"] ] + - type: Lock + locked: true + +- type: entity + id: StructurePistolRackLockSheriffWallmounted + parent: StructurePistolRackLockWallmounted + suffix: Sheriff, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-pistol-wall + color: "#56422b" + - state: lock + color: "#1f6626" + - state: base-pistol-wall-decal + color: "#f1b223" + - state: pistol-0 + - map: ["enum.StorageFillLayers.Fill"] + - state: locked + map: [ enum.LockVisualLayers.Lock ] + shader: unshaded + - type: AccessReader + access: [ ["HeadOfSecurity"] ] + - type: Lock + locked: true + +## Mercenary +# Gun racks +- type: entity + id: StructureGunRackMercenary + parent: StructureGunRack + suffix: Mercenary, Empty + components: + - type: Sprite + layers: + - state: base-gun + color: "#7b7b3f" + - state: base-gun-decal + color: "#b8b873" + +- type: entity + id: StructureGunRackWallmountedMercenary + parent: StructureGunRackWallmounted + suffix: Mercenary, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-gun-wall + color: "#7b7b3f" + - state: base-gun-wall-decal + color: "#b8b873" + +# Melee weapon racks +- type: entity + id: StructureMeleeWeaponRackMercenary + parent: StructureMeleeWeaponRack + suffix: Mercenary, Empty + components: + - type: Sprite + layers: + - state: base-melee + color: "#7b7b3f" + - state: base-melee-decal + color: "#b8b873" + +- type: entity + id: StructureMeleeWeaponRackWallmountedMercenary + parent: StructureMeleeWeaponRackWallmounted + suffix: Mercenary, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-melee-wall + color: "#7b7b3f" + - state: base-melee-wall-decal + color: "#b8b873" + +# Sidearm racks +- type: entity + id: StructurePistolRackMercenary + parent: StructurePistolRack + suffix: Mercenary, Empty + components: + - type: Sprite + layers: + - state: base-pistol + color: "#7b7b3f" + - state: base-pistol-decal + color: "#b8b873" + +- type: entity + id: StructurePistolRackWallmountedMercenary + parent: StructurePistolRackWallmounted + suffix: Mercenary, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-pistol-wall + color: "#7b7b3f" + - state: base-pistol-wall-decal + color: "#b8b873" + +## Salvage +# Gun racks +- type: entity + id: StructureGunRackSalvage + parent: StructureGunRack + suffix: Salvage, Empty + components: + - type: Sprite + layers: + - state: base-gun + color: "#765428" + - state: base-gun-decal + color: "#9a54bf" + +- type: entity + id: StructureGunRackWallmountedSalvage + parent: StructureGunRackWallmounted + suffix: Salvage, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-gun-wall + color: "#765428" + - state: base-gun-wall-decal + color: "#9a54bf" + +# Melee weapon racks +- type: entity + id: StructureMeleeWeaponRackSalvage + parent: StructureMeleeWeaponRack + suffix: Salvage, Empty + components: + - type: Sprite + layers: + - state: base-melee + color: "#765428" + - state: base-melee-decal + color: "#9a54bf" + +- type: entity + id: StructureMeleeWeaponRackWallmountedSalvage + parent: StructureMeleeWeaponRackWallmounted + suffix: Salvage, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-melee-wall + color: "#765428" + - state: base-melee-wall-decal + color: "#9a54bf" + +# Sidearm racks +- type: entity + id: StructurePistolRackSalvage + parent: StructurePistolRack + suffix: Salvage, Empty + components: + - type: Sprite + layers: + - state: base-pistol + color: "#765428" + - state: base-pistol-decal + color: "#9a54bf" + +- type: entity + id: StructurePistolRackWallmountedSalvage + parent: StructurePistolRackWallmounted + suffix: Salvage, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-pistol-wall + color: "#765428" + - state: base-pistol-wall-decal + color: "#9a54bf" + +## NFSD +# Gun racks +- type: entity + id: StructureGunRackNfsd + parent: StructureGunRack + suffix: NFSD, Empty + components: + - type: Sprite + layers: + - state: base-gun + color: "#56422b" + - state: base-gun-decal + color: "#537045" + +- type: entity + id: StructureGunRackWallmountedNfsd + parent: StructureGunRackWallmounted + suffix: NFSD, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-gun-wall + color: "#56422b" + - state: base-gun-wall-decal + color: "#537045" + +# Melee weapon racks +- type: entity + id: StructureMeleeWeaponRackNfsd + parent: StructureMeleeWeaponRack + suffix: NFSD, Empty + components: + - type: Sprite + layers: + - state: base-melee + color: "#56422b" + - state: base-melee-decal + color: "#537045" + +- type: entity + id: StructureMeleeWeaponRackWallmountedNfsd + parent: StructureMeleeWeaponRackWallmounted + suffix: NFSD, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-melee-wall + color: "#56422b" + - state: base-melee-wall-decal + color: "#537045" + +# Sidearm racks +- type: entity + id: StructurePistolRackNfsd + parent: StructurePistolRack + suffix: NFSD, Empty + components: + - type: Sprite + layers: + - state: base-pistol + color: "#56422b" + - state: base-pistol-decal + color: "#537045" + +- type: entity + id: StructurePistolRackWallmountedNfsd + parent: StructurePistolRackWallmounted + suffix: NFSD, Empty, Wallmount + components: + - type: Sprite + layers: + - state: base-pistol-wall + color: "#56422b" + - state: base-pistol-wall-decal + color: "#537045" + +## Blood Cult +# Melee weapon racks +- type: entity + id: StructureMeleeWeaponRackBloodCult + parent: StructureMeleeWeaponRack + suffix: Blood Cult, Empty + components: + - type: Sprite + layers: + - state: base-melee + color: "#776756" + - state: base-melee-decal + color: "#562f2f" + +## Pirates/Freelancers +# Sidearm racks +- type: entity + id: StructurePistolRackPirates + parent: StructurePistolRack + suffix: Pirate, Empty + components: + - type: Sprite + layers: + - state: base-pistol + color: "#4c3117" + - state: base-pistol-decal + color: "#23211f" diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_captain.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_captain.yml deleted file mode 100644 index 701850b4972..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_captain.yml +++ /dev/null @@ -1,119 +0,0 @@ -# Captain -- type: entity - id: WeaponRackCaptain - parent: WeaponRackBase - suffix: Captain - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack - color: darkcyan - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackWallmountedCaptain - parent: WeaponRackWallmountedBase - suffix: Captain, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack_wallmounted - color: darkcyan - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackMeleeCaptain - parent: WeaponRackMeleeBase - name: melee weapon rack - suffix: Captain - description: A storage unit for expedited pacification measures. - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - layers: - - state: base_generic_meleerack - color: darkcyan - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackMeleeWallmountedCaptain - parent: WeaponRackMeleeWallmountedBase - suffix: Captain, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - layers: - - state: base_generic_meleerack_wallmounted - color: darkcyan - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackPistolBaseCaptain - parent: WeaponRackPistolBase - suffix: Captain - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack - color: darkcyan - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackPistolWallmountedCaptain - parent: WeaponRackPistolWallmountedBase - suffix: Captain, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack_wallmounted - color: darkcyan - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"]] - - type: Lock - locked: true diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_filled.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_filled.yml new file mode 100644 index 00000000000..be152caba90 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_filled.yml @@ -0,0 +1,65 @@ +## Mercenary +# Sidearm racks +- type: entity + id: StructurePistolRackWallmountedMercenaryFilled + parent: StructurePistolRackWallmountedMercenary + suffix: Dunegeon, Mercenary, Filled, Wallmount + components: + - type: ContainerFill + containers: + weapon1: + - WeaponRevolverArgenti + +## Salvage +# Melee weapon racks +- type: entity + id: StructureMeleeWeaponRackWallmountedSalvageFilled + parent: StructureMeleeWeaponRackWallmountedSalvage + suffix: Salvage, Filled, Wallmount + components: + - type: ContainerFill + containers: + weapon1: + - WeaponCrusherGlaive + weapon2: + - WeaponCrusher + weapon3: + - Pickaxe + +## Pirates/Freelancers +# Sidearm racks +- type: entity + id: StructurePistolRackPiratesFilled + parent: StructurePistolRackPirates + suffix: Pirate, Filled + components: + - type: ContainerFill + containers: + weapon1: + - WeaponDisabler + weapon2: + - WeaponDisabler + weapon3: + - WeaponDisabler + weapon4: + - WeaponDisabler + +## Blood Cult +# Melee weapon racks +- type: entity + id: StructureMeleeWeaponRackBloodCultFilled + parent: StructureMeleeWeaponRackBloodCult + suffix: Blood Cult, Filled + components: + - type: ContainerFill + containers: + weapon1: + - RitualDagger + weapon2: + - PlasteelArmingSword + weapon3: + - RitualDagger + weapon4: + - SpearBone + weapon5: + - PlasteelArmingSword diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_mercenary.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_mercenary.yml deleted file mode 100644 index dca0fbfffe8..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_mercenary.yml +++ /dev/null @@ -1,117 +0,0 @@ -# Mercenary -- type: entity - id: WeaponRackMercenary - parent: WeaponRackBase - suffix: Mercenary - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack - color: yellow - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Mercenary"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackWallmountedMercenary - parent: WeaponRackWallmountedBase - suffix: Mercenary, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack_wallmounted - color: yellow - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Mercenary"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackMeleeMercenary - parent: WeaponRackMeleeBase - suffix: Mercenary - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - layers: - - state: base_generic_meleerack - color: yellow - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Mercenary"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackMeleeWallmountedMercenary - parent: WeaponRackMeleeWallmountedBase - suffix: Mercenary, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - layers: - - state: base_generic_meleerack_wallmounted - color: yellow - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Mercenary"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackPistolBaseMercenary - parent: WeaponRackPistolBase - suffix: Mercenary - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack - color: yellow - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Mercenary"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackPistolWallmountedMercenary - parent: WeaponRackPistolWallmountedBase - suffix: Mercenary, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack_wallmounted - color: yellow - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Mercenary"]] - - type: Lock - locked: true diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_salvage.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_salvage.yml deleted file mode 100644 index a8e072e8c95..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_salvage.yml +++ /dev/null @@ -1,117 +0,0 @@ -# Salvage -- type: entity - id: WeaponRackSalvage - parent: WeaponRackBase - suffix: Salvage - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack - color: orange - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Salvage"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackWallmountedSalvage - parent: WeaponRackWallmountedBase - suffix: Salvage, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack_wallmounted - color: orange - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Salvage"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackMeleeSalvage - parent: WeaponRackMeleeBase - suffix: Salvage - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - layers: - - state: base_generic_meleerack - color: orange - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Salvage"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackMeleeWallmountedSalvage - parent: WeaponRackMeleeWallmountedBase - suffix: Salvage, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - layers: - - state: base_generic_meleerack_wallmounted - color: orange - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Salvage"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackPistolBaseSalvage - parent: WeaponRackPistolBase - suffix: Salvage - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack - color: orange - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Salvage"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackPistolWallmountedSalvage - parent: WeaponRackPistolWallmountedBase - suffix: Salvage, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack_wallmounted - color: orange - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Captain"], ["Salvage"]] - - type: Lock - locked: true diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_security.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_security.yml deleted file mode 100644 index a1ded723889..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_security.yml +++ /dev/null @@ -1,117 +0,0 @@ -# Security -- type: entity - id: WeaponRackSecurity - parent: WeaponRackBase - suffix: Security - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack - color: red - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Security"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackWallmountedSecurity - parent: WeaponRackWallmountedBase - suffix: Security, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - layers: - - state: base_generic_gunrack_wallmounted - color: red - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Security"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackMeleeSecurity - parent: WeaponRackMeleeBase - suffix: Security - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - layers: - - state: base_generic_meleerack - color: red - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Security"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackMeleeWallmountedSecurity - parent: WeaponRackMeleeWallmountedBase - suffix: Security, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - layers: - - state: base_generic_meleerack_wallmounted - color: red - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Security"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackPistolBaseSecurity - parent: WeaponRackPistolBase - suffix: Security - components: - - type: Sprite - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack - color: red - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Security"]] - - type: Lock - locked: true - -- type: entity - id: WeaponRackPistolWallmountedSecurity - parent: WeaponRackPistolWallmountedBase - suffix: Security, Wallmount - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - layers: - - state: base_generic_pistolrack_wallmounted - color: red - - state: locked - map: [ locked ] - - state: unlocked - map: [ unlocked ] - - type: AccessReader - access: [["Security"]] - - type: Lock - locked: true diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/armory_racks_graphs.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/armory_racks_graphs.yml index 3c8985fa987..dde1540c9a0 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/armory_racks_graphs.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/armory_racks_graphs.yml @@ -101,7 +101,7 @@ doAfter: 1 - node: GunRackNode - entity: WeaponRackBase + entity: StructureGunRack edges: - to: start steps: @@ -109,7 +109,7 @@ doAfter: 5 - node: GunRackWallmountedNode - entity: WeaponRackWallmountedBase + entity: StructureGunRackWallmounted edges: - to: start steps: @@ -117,7 +117,7 @@ doAfter: 5 - node: MeleeRackNode - entity: WeaponRackMeleeBase + entity: StructureMeleeWeaponRack edges: - to: start steps: @@ -125,7 +125,7 @@ doAfter: 5 - node: MeleeRackWallmountedNode - entity: WeaponRackMeleeWallmountedBase + entity: StructureMeleeWeaponRackWallmounted edges: - to: start steps: @@ -133,7 +133,7 @@ doAfter: 5 - node: PistolRackNode - entity: WeaponRackPistolBase + entity: StructurePistolRack edges: - to: start steps: @@ -141,7 +141,7 @@ doAfter: 5 - node: PistolRackWallmountedNode - entity: WeaponRackPistolWallmountedBase + entity: StructurePistolRackWallmounted edges: - to: start steps: diff --git a/Resources/Prototypes/_NF/Recipes/Construction/furniture_armory_construction.yml b/Resources/Prototypes/_NF/Recipes/Construction/furniture_armory_construction.yml index 04bc00dfd83..fce05e92cbf 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/furniture_armory_construction.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/furniture_armory_construction.yml @@ -8,8 +8,8 @@ category: construction-category-furniture description: A storage unit for expeditiated pacification measures. icon: - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - state: base_generic_gunrack + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + state: base-gun objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -25,8 +25,8 @@ category: construction-category-furniture description: A storage unit for expeditiated pacification measures. icon: - sprite: _NF/Structures/Furniture/Armory/gun_racks.rsi - state: base_generic_gunrack_wallmounted + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + state: base-gun-wall objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: true @@ -42,8 +42,8 @@ category: construction-category-furniture description: A storage unit for expeditiated pacification measures. icon: - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - state: base_generic_meleerack + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + state: base-melee objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -59,8 +59,8 @@ category: construction-category-furniture description: A storage unit for expeditiated pacification measures. icon: - sprite: _NF/Structures/Furniture/Armory/melee_weapon_racks.rsi - state: base_generic_meleerack_wallmounted + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + state: base-melee-wall objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: true @@ -76,8 +76,8 @@ category: construction-category-furniture description: A storage unit for expeditiated pacification measures. icon: - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - state: base_generic_pistolrack + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + state: base-pistol objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -91,8 +91,8 @@ category: construction-category-furniture description: A storage unit for expeditiated pacification measures. icon: - sprite: _NF/Structures/Furniture/Armory/pistol_racks.rsi - state: base_generic_pistolrack_wallmounted + sprite: _NF/Structures/Furniture/Armory/weapon_rack.rsi + state: base-pistol-wall objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: true diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/base_generic_gunrack.png b/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/base_generic_gunrack.png deleted file mode 100644 index eda18dbadeb..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/base_generic_gunrack.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/base_generic_gunrack_wallmounted.png b/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/base_generic_gunrack_wallmounted.png deleted file mode 100644 index 7f886fb91a5..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/base_generic_gunrack_wallmounted.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/locked.png b/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/locked.png deleted file mode 100644 index 6dc45a0b494..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/meta.json b/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/meta.json deleted file mode 100644 index 82b2895b8b8..00000000000 --- a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Used TG Station 13 sprites as a base, edited by erhardsteinhauer (discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base_generic_gunrack" - }, - { - "name": "base_generic_gunrack_wallmounted" - }, - { - "name": "locked" - }, - { - "name": "unlocked" - }, - { - "name": "weapon_generic_gun1" - }, - { - "name": "weapon_generic_gun2" - }, - { - "name": "weapon_generic_gun3" - }, - { - "name": "weapon_generic_gun4" - }, - { - "name": "weapon_generic_gun5" - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/unlocked.png deleted file mode 100644 index 56b3e8e1297..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/unlocked.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/base_generic_meleerack.png b/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/base_generic_meleerack.png deleted file mode 100644 index 9a204cc3952..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/base_generic_meleerack.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/base_generic_meleerack_wallmounted.png b/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/base_generic_meleerack_wallmounted.png deleted file mode 100644 index e3769eac3b5..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/base_generic_meleerack_wallmounted.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/locked.png b/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/locked.png deleted file mode 100644 index 6dc45a0b494..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/meta.json b/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/meta.json deleted file mode 100644 index bf1f7fa9abc..00000000000 --- a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Used TG Station 13 sprites as a base, edited by erhardsteinhauer (discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base_generic_meleerack" - }, - { - "name": "base_generic_meleerack_wallmounted" - }, - { - "name": "locked" - }, - { - "name": "unlocked" - }, - { - "name": "weapon_generic_melee1" - }, - { - "name": "weapon_generic_melee2" - }, - { - "name": "weapon_generic_melee3" - }, - { - "name": "weapon_generic_melee4" - }, - { - "name": "weapon_generic_melee5" - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/unlocked.png deleted file mode 100644 index 56b3e8e1297..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/unlocked.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/base_generic_pistolrack.png b/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/base_generic_pistolrack.png deleted file mode 100644 index ec8a116f81e..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/base_generic_pistolrack.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/base_generic_pistolrack_wallmounted.png b/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/base_generic_pistolrack_wallmounted.png deleted file mode 100644 index 7d79a0c5056..00000000000 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/base_generic_pistolrack_wallmounted.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/meta.json b/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/meta.json deleted file mode 100644 index abdab704c8d..00000000000 --- a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Used TG Station 13 sprites as a base, edited by erhardsteinhauer (discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base_generic_pistolrack" - }, - { - "name": "base_generic_pistolrack_wallmounted" - }, - { - "name": "locked" - }, - { - "name": "unlocked" - }, - { - "name": "weapon_generic_pistol1" - }, - { - "name": "weapon_generic_pistol2" - }, - { - "name": "weapon_generic_pistol3" - }, - { - "name": "weapon_generic_pistol4" - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-decal.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-decal.png new file mode 100644 index 00000000000..76b97db7030 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-decal.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-wall-decal.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-wall-decal.png new file mode 100644 index 00000000000..c83ecc434b8 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-wall-decal.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-wall.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-wall.png new file mode 100644 index 00000000000..0b8d07bbdde Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-wall.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun.png new file mode 100644 index 00000000000..4afe1222803 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-decal.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-decal.png new file mode 100644 index 00000000000..5fe3fcc7d2c Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-decal.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-wall-decal.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-wall-decal.png new file mode 100644 index 00000000000..3a89edd4e1b Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-wall-decal.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-wall.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-wall.png new file mode 100644 index 00000000000..e952864ba3b Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-wall.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee.png new file mode 100644 index 00000000000..402fa9229d4 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol3.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-decal.png similarity index 58% rename from Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol3.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-decal.png index c42caad8a4f..ff38528ab9e 100644 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol3.png and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-decal.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol4.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-wall-decal.png similarity index 58% rename from Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol4.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-wall-decal.png index 6369d0430c2..61d8d526c6e 100644 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol4.png and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-wall-decal.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-wall.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-wall.png new file mode 100644 index 00000000000..e0472f796fd Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-wall.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol.png new file mode 100644 index 00000000000..aa392783c07 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-0.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-0.png new file mode 100644 index 00000000000..1e189caf153 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-0.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun1.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-1.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun1.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-1.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun2.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-2.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun2.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-2.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun3.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-3.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun3.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-3.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun4.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-4.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun4.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-4.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun5.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-5.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/weapon_generic_gun5.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-5.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/lock.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/lock.png new file mode 100644 index 00000000000..229d6f396eb Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/lock.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/locked.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/locked.png similarity index 61% rename from Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/locked.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/locked.png index 11a37b428ed..04301e98b07 100644 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/locked.png and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-0.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-0.png new file mode 100644 index 00000000000..1e189caf153 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-0.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee1.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-1.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee1.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-1.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee2.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-2.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee2.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-2.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee3.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-3.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee3.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-3.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee4.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-4.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee4.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-4.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee5.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-5.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/weapon_generic_melee5.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-5.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/meta.json b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/meta.json new file mode 100644 index 00000000000..33073d92330 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/meta.json @@ -0,0 +1,107 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Used TG Station 13 sprites as a base, edited by erhardsteinhauer (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base-gun" + }, + { + "name": "base-gun-wall" + }, + { + "name": "base-gun-decal" + }, + { + "name": "base-gun-wall-decal" + }, + { + "name": "base-melee" + }, + { + "name": "base-melee-wall" + }, + { + "name": "base-melee-decal" + }, + { + "name": "base-melee-wall-decal" + }, + { + "name": "base-pistol" + }, + { + "name": "base-pistol-wall" + }, + { + "name": "base-pistol-decal" + }, + { + "name": "base-pistol-wall-decal" + }, + { + "name": "lock" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "gun-0" + }, + { + "name": "gun-1" + }, + { + "name": "gun-2" + }, + { + "name": "gun-3" + }, + { + "name": "gun-4" + }, + { + "name": "gun-5" + }, + { + "name": "melee-0" + }, + { + "name": "melee-1" + }, + { + "name": "melee-2" + }, + { + "name": "melee-3" + }, + { + "name": "melee-4" + }, + { + "name": "melee-5" + }, + { + "name": "pistol-0" + }, + { + "name": "pistol-1" + }, + { + "name": "pistol-2" + }, + { + "name": "pistol-3" + }, + { + "name": "pistol-4" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-0.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-0.png new file mode 100644 index 00000000000..1e189caf153 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-0.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol1.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-1.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol1.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-1.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol2.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-2.png similarity index 100% rename from Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/weapon_generic_pistol2.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-2.png diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-3.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-3.png new file mode 100644 index 00000000000..23885acfd88 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-3.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-4.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-4.png new file mode 100644 index 00000000000..a02590657f6 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-4.png differ diff --git a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/unlocked.png similarity index 61% rename from Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/unlocked.png rename to Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/unlocked.png index e1548f4445b..7f8bf1c0464 100644 Binary files a/Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/unlocked.png and b/Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/unlocked.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index cd03ce2efb9..f5e1b16f8d1 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -466,3 +466,35 @@ RandomPosterContrabandDeadDrop100: RandomPosterContrabandDeadDrop # 2024-09-22 SignBusNF: NFSignBus SignDockNF: NFSignDock + +# 2024-09-25 Frontier: weapon racks update +WeaponRackBase: StructureGunRack +WeaponRackWallmountedBase: StructureGunRackWallmounted +WeaponRackMeleeBase: StructureMeleeWeaponRack +WeaponRackMeleeWallmountedBase: StructureMeleeWeaponRackWallmounted +WeaponRackPistolBase: StructurePistolRack +WeaponRackPistolWallmountedBase: StructurePistolRackWallmounted +WeaponRackCaptain: StructureGunRack +WeaponRackWallmountedCaptain: StructureGunRackWallmounted +WeaponRackMeleeCaptain: StructureMeleeWeaponRack +WeaponRackMeleeWallmountedCaptain: StructureMeleeWeaponRackWallmounted +WeaponRackPistolBaseCaptain: StructurePistolRack +WeaponRackPistolWallmountedCaptain: StructurePistolRackWallmounted +WeaponRackMercenary: StructureGunRackMercenary +WeaponRackWallmountedMercenary: StructureGunRackWallmountedMercenary +WeaponRackMeleeMercenary: StructureMeleeWeaponRackMercenary +WeaponRackMeleeWallmountedMercenary: StructureMeleeWeaponRackWallmountedMercenary +WeaponRackPistolBaseMercenary: StructurePistolRackMercenary +WeaponRackPistolWallmountedMercenary: StructurePistolRackWallmountedMercenary +WeaponRackSalvage: StructureGunRackSalvage +WeaponRackWallmountedSalvage: StructureGunRackWallmountedSalvage +WeaponRackMeleeSalvage: StructureMeleeWeaponRackSalvage +WeaponRackMeleeWallmountedSalvage: StructureMeleeWeaponRackWallmountedSalvage +WeaponRackPistolBaseSalvage: StructurePistolRackSalvage +WeaponRackPistolWallmountedSalvage: StructurePistolRackWallmountedSalvage +WeaponRackSecurity: StructureGunRackNfsd +WeaponRackWallmountedSecurity: StructureGunRackWallmountedNfsd +WeaponRackMeleeSecurity: StructureMeleeWeaponRackNfsd +WeaponRackMeleeWallmountedSecurity: StructureMeleeWeaponRackWallmountedNfsd +WeaponRackPistolBaseSecurity: StructurePistolRackNfsd +WeaponRackPistolWallmountedSecurity: StructurePistolRackWallmountedNfsd \ No newline at end of file