From bb0c3ef18083db177399cfa34f5a312b4400c1e4 Mon Sep 17 00:00:00 2001
From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Date: Fri, 27 Sep 2024 21:13:45 +0300
Subject: [PATCH] Weapon racks (Update) (#2070)

* new racks

* removed old racks

* fixes

* Revert "fixes"

This reverts commit 27fe078d6582930bdddfa18f73091bc58b6e11db.

* Revert "removed old racks"

This reverts commit 806e4f49f0efca132ad0247cf167861c35cf2223.

* ftl, filled version of salv rack

* removed old racks

* fixes

* more fixes

* tiny fix

* migrations

* tiny edits
---
 .../en-US/_NF/structure/weapon-racks.ftl      |  13 +
 Resources/Maps/_NF/Bluespace/bloodmoon.yml    | 389 +----------------
 Resources/Maps/_NF/Dungeon/lava_mercenary.yml |  70 +--
 Resources/Maps/_NF/POI/cove.yml               |  72 +--
 .../Maps/_NF/Shuttles/Expedition/anchor.yml   |   4 +-
 .../Maps/_NF/Shuttles/Nfsd/broadhead.yml      |   2 +-
 Resources/Maps/_NF/Shuttles/Nfsd/empress.yml  |   8 +-
 Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml  |   4 +-
 Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml     |   6 +-
 Resources/Maps/_NF/Shuttles/prospector.yml    | 118 +----
 .../Furniture/Armory/base_weapon_rack.yml     | 409 ++++++++++++++++++
 .../Furniture/Armory/gun_racks_base.yml       | 166 -------
 .../Armory/melee_weaapon_racks_base.yml       | 112 -----
 .../Furniture/Armory/pistol_racks_base.yml    | 159 -------
 .../Furniture/Armory/weapon_racks.yml         | 350 +++++++++++++++
 .../Furniture/Armory/weapon_racks_captain.yml | 119 -----
 .../Furniture/Armory/weapon_racks_filled.yml  |  65 +++
 .../Armory/weapon_racks_mercenary.yml         | 117 -----
 .../Furniture/Armory/weapon_racks_salvage.yml | 117 -----
 .../Armory/weapon_racks_security.yml          | 117 -----
 .../Graphs/furniture/armory_racks_graphs.yml  |  12 +-
 .../furniture_armory_construction.yml         |  24 +-
 .../gun_racks.rsi/base_generic_gunrack.png    | Bin 6359 -> 0 bytes
 .../base_generic_gunrack_wallmounted.png      | Bin 6233 -> 0 bytes
 .../Furniture/Armory/gun_racks.rsi/locked.png | Bin 5445 -> 0 bytes
 .../Furniture/Armory/gun_racks.rsi/meta.json  |  38 --
 .../Armory/gun_racks.rsi/unlocked.png         | Bin 5447 -> 0 bytes
 .../base_generic_meleerack.png                | Bin 6409 -> 0 bytes
 .../base_generic_meleerack_wallmounted.png    | Bin 6296 -> 0 bytes
 .../Armory/melee_weapon_racks.rsi/locked.png  | Bin 5445 -> 0 bytes
 .../Armory/melee_weapon_racks.rsi/meta.json   |  38 --
 .../melee_weapon_racks.rsi/unlocked.png       | Bin 5447 -> 0 bytes
 .../base_generic_pistolrack.png               | Bin 777 -> 0 bytes
 .../base_generic_pistolrack_wallmounted.png   | Bin 773 -> 0 bytes
 .../Armory/pistol_racks.rsi/meta.json         |  35 --
 .../Armory/weapon_rack.rsi/base-gun-decal.png | Bin 0 -> 617 bytes
 .../weapon_rack.rsi/base-gun-wall-decal.png   | Bin 0 -> 604 bytes
 .../Armory/weapon_rack.rsi/base-gun-wall.png  | Bin 0 -> 648 bytes
 .../Armory/weapon_rack.rsi/base-gun.png       | Bin 0 -> 730 bytes
 .../weapon_rack.rsi/base-melee-decal.png      | Bin 0 -> 181 bytes
 .../weapon_rack.rsi/base-melee-wall-decal.png | Bin 0 -> 232 bytes
 .../weapon_rack.rsi/base-melee-wall.png       | Bin 0 -> 298 bytes
 .../Armory/weapon_rack.rsi/base-melee.png     | Bin 0 -> 303 bytes
 .../base-pistol-decal.png}                    | Bin 652 -> 577 bytes
 .../base-pistol-wall-decal.png}               | Bin 654 -> 603 bytes
 .../weapon_rack.rsi/base-pistol-wall.png      | Bin 0 -> 634 bytes
 .../Armory/weapon_rack.rsi/base-pistol.png    | Bin 0 -> 653 bytes
 .../Armory/weapon_rack.rsi/gun-0.png          | Bin 0 -> 94 bytes
 .../gun-1.png}                                | Bin
 .../gun-2.png}                                | Bin
 .../gun-3.png}                                | Bin
 .../gun-4.png}                                | Bin
 .../gun-5.png}                                | Bin
 .../Furniture/Armory/weapon_rack.rsi/lock.png | Bin 0 -> 555 bytes
 .../locked.png                                | Bin 621 -> 528 bytes
 .../Armory/weapon_rack.rsi/melee-0.png        | Bin 0 -> 94 bytes
 .../melee-1.png}                              | Bin
 .../melee-2.png}                              | Bin
 .../melee-3.png}                              | Bin
 .../melee-4.png}                              | Bin
 .../melee-5.png}                              | Bin
 .../Armory/weapon_rack.rsi/meta.json          | 107 +++++
 .../Armory/weapon_rack.rsi/pistol-0.png       | Bin 0 -> 94 bytes
 .../pistol-1.png}                             | Bin
 .../pistol-2.png}                             | Bin
 .../Armory/weapon_rack.rsi/pistol-3.png       | Bin 0 -> 555 bytes
 .../Armory/weapon_rack.rsi/pistol-4.png       | Bin 0 -> 555 bytes
 .../unlocked.png                              | Bin 626 -> 532 bytes
 Resources/migration.yml                       |  32 ++
 69 files changed, 1074 insertions(+), 1629 deletions(-)
 create mode 100644 Resources/Locale/en-US/_NF/structure/weapon-racks.ftl
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/base_weapon_rack.yml
 delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/gun_racks_base.yml
 delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/melee_weaapon_racks_base.yml
 delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/pistol_racks_base.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks.yml
 delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_captain.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_filled.yml
 delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_mercenary.yml
 delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_salvage.yml
 delete mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/Armory/weapon_racks_security.yml
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/base_generic_gunrack.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/base_generic_gunrack_wallmounted.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/locked.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/meta.json
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/gun_racks.rsi/unlocked.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/base_generic_meleerack.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/base_generic_meleerack_wallmounted.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/locked.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/meta.json
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi/unlocked.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/base_generic_pistolrack.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/base_generic_pistolrack_wallmounted.png
 delete mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/pistol_racks.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-decal.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-wall-decal.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun-wall.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-gun.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-decal.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-wall-decal.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee-wall.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-melee.png
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{pistol_racks.rsi/weapon_generic_pistol3.png => weapon_rack.rsi/base-pistol-decal.png} (58%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{pistol_racks.rsi/weapon_generic_pistol4.png => weapon_rack.rsi/base-pistol-wall-decal.png} (58%)
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol-wall.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/base-pistol.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/gun-0.png
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{gun_racks.rsi/weapon_generic_gun1.png => weapon_rack.rsi/gun-1.png} (100%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{gun_racks.rsi/weapon_generic_gun2.png => weapon_rack.rsi/gun-2.png} (100%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{gun_racks.rsi/weapon_generic_gun3.png => weapon_rack.rsi/gun-3.png} (100%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{gun_racks.rsi/weapon_generic_gun4.png => weapon_rack.rsi/gun-4.png} (100%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{gun_racks.rsi/weapon_generic_gun5.png => weapon_rack.rsi/gun-5.png} (100%)
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/lock.png
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{pistol_racks.rsi => weapon_rack.rsi}/locked.png (61%)
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/melee-0.png
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{melee_weapon_racks.rsi/weapon_generic_melee1.png => weapon_rack.rsi/melee-1.png} (100%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{melee_weapon_racks.rsi/weapon_generic_melee2.png => weapon_rack.rsi/melee-2.png} (100%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{melee_weapon_racks.rsi/weapon_generic_melee3.png => weapon_rack.rsi/melee-3.png} (100%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{melee_weapon_racks.rsi/weapon_generic_melee4.png => weapon_rack.rsi/melee-4.png} (100%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{melee_weapon_racks.rsi/weapon_generic_melee5.png => weapon_rack.rsi/melee-5.png} (100%)
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-0.png
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{pistol_racks.rsi/weapon_generic_pistol1.png => weapon_rack.rsi/pistol-1.png} (100%)
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{pistol_racks.rsi/weapon_generic_pistol2.png => weapon_rack.rsi/pistol-2.png} (100%)
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-3.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/Armory/weapon_rack.rsi/pistol-4.png
 rename Resources/Textures/_NF/Structures/Furniture/Armory/{pistol_racks.rsi => weapon_rack.rsi}/unlocked.png (61%)

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 eda18dbadeb7ae3d0423be8f72b27bf01bf19c2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6359
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
S^@l;NAr!K&+bNfg+y4pvl)v5p

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 7f886fb91a57bbe904f25caefec266c6c5f2b6fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6233
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

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 6dc45a0b494a534a268566cbc0adac7d7be82b8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5445
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
KL}l2boPPt89`Nb_

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 56b3e8e1297077081c009e1b2868c57885913171..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5447
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
GdH)8AJM-xP

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 9a204cc39524b2e871316b25918ffeb66321b186..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6409
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
SN?sQ%B!cO@#;MF9F!moiF~#rz

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 e3769eac3b5e55246f7375fc70c8c2a18435cbbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6296
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
Bi1q*g

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 6dc45a0b494a534a268566cbc0adac7d7be82b8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5445
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
KL}l2boPPt89`Nb_

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 56b3e8e1297077081c009e1b2868c57885913171..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5447
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
GdH)8AJM-xP

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 ec8a116f81e340f3e0dc12a6a20ede26c784cfd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 777
zcmV+k1NQuhP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7{`4i*)0$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MGzr$qaOnjGxbDzAp_6xbq^n3@1i`*``n)+q~uKo_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4Cb}vG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^da{Nhh$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFc>Dp!3DHKSqGSF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w_@qmQ<Vb#+LZJY>pV2qvfWBLxXVvYkxsTHaAVXa(-2exN
zz-W=O*F4_c)!y5`XPW)}09RIWoHwQ`%K!iX24YJ`L;yknO#n@+Uz6wn000SaNLh0L
z01FcU01FcV0GgZ_00007bV*G`2j>h84j>oo#yBYe000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0002sNkl<ZSi|j=F$;q*5QSfhRq9v=AuR#HZf?@i|38UK
zog4%yLTar}(#=j4+QFQr)S>y75V*VdF60tGqgj}hEa2dIy^6pk&qp;3nfNgXRGaL_
zOc<03wGgwE9oLn{7*ugevClk;af8xDEd;V8nPgzc7#!Edy{gm<Se69<V7@=ez@zJi
z+%eWmkD)doy#r-YOe(nN{B3`VB3$xZeF`WS3IN)s`R)n4gg2&1DtIkRoZ}cl7!IqF
zfvs%=0B$p1L*)}_n+A;Y!HA43O{HD`^f#pZh#HMXqxo;13u{B8ZTRDP00000NkvXX
Hu0mjfew<D|

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 7d79a0c5056e1570b3ca691670f42706177f0b15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 773
zcmV+g1N!`lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7{`4i*)0$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MGzr$qaOnjGxbDzAp_6xbq^n3@1i`*``n)+q~uKo_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4Cb}vG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^da{Nhh$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFc>Dp!3DHKSqGSF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w_@qmQ<Vb#+LZJY>pV2qvfWBLxXVvYkxsTHaAVXa(-2exN
zz-W=O*F4_c)!y5`XPW)}09RIWoHwQ`%K!iX24YJ`L;yknO#n@+Uz6wn000SaNLh0L
z01FcU01FcV0GgZ_00007bV*G`2j>h84ks6*hpz4b000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0002oNkl<ZSi|j=y9$Fa6oyYsb(KKCC+K9hy#EUbE~UFm
z2`Itn+75PU#8xFq1G=0KB>o|sI|%@SoD6Xt5K>Mt4(@eL{tm!8Pbh_)F-WrvUe70t
z#&~I?wKIssl|e!&+^UL<#>~cjHRC+41wzV+aqgY*mhO~_t3aA%U&ceVv%;<eHY001
zR7VF8((^5iGjR9}<ct9?ig~@3<*_p`7_<5goq<o!K}fk=cl}&^?sHpC%kuwMcS;4l
z70v*R*1$Li-L~FFg_P&LhC|=4_8v_`06`E0L3VfpScqHED!d@S00000NkvXXu0mjf
DkPAzN

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 0000000000000000000000000000000000000000..76b97db70302011ccedb560937e64bb81fa1e67e
GIT binary patch
literal 617
zcmV-v0+#)WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$^8=gB?T!GgK!FQl&Ub6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UeP&La)
z#baVNw<`9$B7iaUBZ8>JOg)ia%)oPe-NVP%yD-o4KKJJsQ1T`Nd?N82(+!JwgE+cr
z>74h8gRCSe#OK7523?T&k?XR{Z=8z`3p_JuWK#3QL1MAk!Ey()lA#jM5Qh|1qkJLj
zvch?bvs$UK);;+P19@#F&2^fih+_!}Bq2gZ4P{hdAxx`Aiis5M$2|Najz38*nOtQs
zax9<<6_Voz|AXJ%nuY0zn-quv-7mKNF%I<X0?oQ@e;?a+^91le16NwxUu^)hpQP8@
zTIdKE+y*YL+nT%wT<!qFPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM>
zOcW`5-Q(T8oxS~grq$mM9HesV8E42-0001>Nkl<ZScUD^F%Ezr3<Xdz?yQWgoB(b|
zI2s$=f{~FM=!A(=A)(fo{so5yUPz5rY(PQ?XMgtI3#fiJ2UMVxT7BjmKx<74NGZ_*
zoO7sv9d&mGFkm3yTTn_t1(4qW0~jy_sI}4pFvEcF19}5uH6jQw#yr;50Y64kO4Q%7
z@Ats(0pxQ5IP2w{@7d5=`~Ga$T3dbQ93aMs3Lwt~o@pQTd}}s300000NkvXXu0mjf
D*!~ZX

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..c83ecc434b867c42cf03a8f91d11863503a78a17
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$^8=gB?T!GgK!FQl&Ub6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UeP&La)
z#baVNw<`9$B7iaUBZ8>JOg)ia%)oPe-NVP%yD-o4KKJJsQ1T`Nd?N82(+!JwgE+cr
z>74h8gRCSe#OK7523?T&k?XR{Z=8z`3p_JuWK#3QL1MAk!Ey()lA#jM5Qh|1qkJLj
zvch?bvs$UK);;+P19@#F&2^fih+_!}Bq2gZ4P{hdAxx`Aiis5M$2|Najz38*nOtQs
zax9<<6_Voz|AXJ%nuY0zn-quv-7mKNF%I<X0?oQ@e;?a+^91le16NwxUu^)hpQP8@
zTIdKE+y*YL+nT%wT<!qFPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM>
zOcW`5-Q(T8oxS~grq$mM9HesV8E42-0001!Nkl<ZScUD9F$x1Q3<UQ=z@^@yPNm=G
z#<=m@T)NXc^n$x8wH=5N1Z|~aVMj24bFNjPlyZOW-utruZC<N_h#;i|5&8A@9)PN%
z)_SR`4*)ZxwRSVJ4*(H?nL$K80A>bNg_-#PgahF~I1mnm1K~h85Dxsk1MgLVh>&wW
qGQI_H>ho=YF@`U|obxC^#61r!d~}UeWv+Vw0000<MNUMnLSTY(=?)+O

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..0b8d07bbddea7c3ca06f6ad15ac1c87dcf16b7d6
GIT binary patch
literal 648
zcmV;30(bq1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$^8=gB?T!GgK!FQl&Ub6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UeP&La)
z#baVNw<`9$B7iaUBZ8>JOg)ia%)oPe-NVP%yD-o4KKJJsQ1T`Nd?N82(+!JwgE+cr
z>74h8gRCSe#OK7523?T&k?XR{Z=8z`3p_JuWK#3QL1MAk!Ey()lA#jM5Qh|1qkJLj
zvch?bvs$UK);;+P19@#F&2^fih+_!}Bq2gZ4P{hdAxx`Aiis5M$2|Najz38*nOtQs
zax9<<6_Voz|AXJ%nuY0zn-quv-7mKNF%I<X0?oQ@e;?a+^91le16NwxUu^)hpQP8@
zTIdKE+y*YL+nT%wT<!qFPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM>
zOcW`5-Q(T8oxS~grq$mM9HesV8E42-0002LNkl<ZScUDEArizO3`NtO^_&A2iQ`@v
z9QVRi#&M3EU{}#0Te@bmLq)#(9WwuuJ_EpFZKFvkz5X3oN)efd>EVb7tu^r8gL4j;
zS<MsCsl;P!)5CMlTWjqY*7AsW+KAXdj8XN*Ghb`H-T*U$b50Cv`%j4iW8*%o?Y|b#
z{^v7q3>X8(fH7bU7z4(DF>pHuL;*ycu1QPG3`8UfJZFbO2<qYczE8i40z?FeczO6&
i^@qu*<xexya=ihsp&mk_V_}y70000<MNUMnLSTZ;G9=3Y

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..4afe12228031cfcedae3d29076e82f441aec5535
GIT binary patch
literal 730
zcmV<00ww*4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$^8=gB?T!GgK!FQl&Ub6^me@v=v%)FuC*#nlvOS
zE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_3;J6>}?mh0_0Yam~RI_UeP&La)
z#baVNw<`9$B7iaUBZ8>JOg)ia%)oPe-NVP%yD-o4KKJJsQ1T`Nd?N82(+!JwgE+cr
z>74h8gRCSe#OK7523?T&k?XR{Z=8z`3p_JuWK#3QL1MAk!Ey()lA#jM5Qh|1qkJLj
zvch?bvs$UK);;+P19@#F&2^fih+_!}Bq2gZ4P{hdAxx`Aiis5M$2|Najz38*nOtQs
zax9<<6_Voz|AXJ%nuY0zn-quv-7mKNF%I<X0?oQ@e;?a+^91le16NwxUu^)hpQP8@
zTIdKE+y*YL+nT%wT<!qFPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4RCM>
zOcW`5-Q(T8oxS~grq$mM9HesV8E42-0003INkl<ZScUDDJr0B*5QQI`O)PD(vn5`@
zBhYyt8^e)2f}IyIwsuZwYvoqBpc^-v@Uw-lB9npl0fP>MA*IxY0BV|s>G3{LN^P9;
z5dI*d9fBRr^E~%zK24Ja!Ror+k|Y7=97JR#mt~2*@14dp1QB6fS6BePcdumvJc2l0
z$O6#!<5NeE(+T*5__X!|0Hl;w0s4S2*CZlHDc=BDmR(M8X|AO`pTACYt^axjH^2=5
z;PgZC5xWEkt^WX+=Q+5s_Kbc4)~8q(OvpmC0E7@2#}PsZE6GRfBS4y_d*5ctb<9-s
z8n^+h8aVdxK>>7+76o8gmMG>sK-YC~0fu2f+qUdmvP)G}wG~By7t8UYh;Zul$p8QV
M07*qoM6N<$g3j_tH2?qr

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..5fe3fcc7d2c0bebdaa84c95f5124eb4b54e97d01
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`JOJ0ArY-_
zuWaNzV8Fw2!2g6moTGGx^<zVu&S!<sb?2Pg%Hg6hVZYbWW;tmV0l|y+W#bln-}h_|
zLqpW++4Zl!FjZG-K7D)F#pV8kdDpJpx>bBiv#+d@F_c$#!at^$tatPUCf;F6n--nW
dBN(M{msd+cgw6l3>0hAL44$rjF6*2UngA``LiGRu

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..3a89edd4e1ba4859b05c641268cf8b24c62f6c9f
GIT binary patch
literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}i#%N%Ln2z=
zPTk0R*no%Sek0>ldv@!o_Z+NO8s4c;&tGs!_W1)Auc=X739b$YR!7);INru0bG%S(
z^A;w{=f7s2|D5w||I@2nM<fKD9C|*!d}qfPdUW6W?p5am1q5Y|2fC*8F?e=xc<>1p
z$fR4Hy<Ha@ZfZQi#p~tw{Rhr0SY@zz`R?B=|Ne=uS<B#=bK7jm9`A%J&+alUowAeZ
gdo90c!LrY6DR%mK)7$l*0$t1C>FVdQ&MBb@0K}<X761SM

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..e952864ba3bbeb45fd0a890364901f1732ac4f3e
GIT binary patch
literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#<Vi$9R9J=WmN629APhz0j(yHym(tGCJK5NICrUfYbetn6a4Q@lxXp&4;Wf^8
z0{Q*{1fbLDbQ&|HV%xT>cEjU1RL@()=0pS`1em4?5D`SgOfz$4;*+|G&G&sDLJ0R@
zD@{aMA}WDpSxmpUq|ftwPe4Qf5!GO8{bWo9BEq_^Lsn&kb1qxtSpqdF&94j~VpRjB
z`FjFA0ksW91e|kM+`l!RPqGB!$(0VW)ISYapZz8Mr1`%<86cvn3sFRXnU#UDR5Z`C
wd2{c5@x3y@%s@o1#s3m7Bq`0WWS!=G0TOYVHjKk_Z~y=R07*qoM6N<$g4~vQ`2YX_

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..402fa9229d469009ad103428e03b72433f55fc55
GIT binary patch
literal 303
zcmV+~0nq-5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#=}AOER9J=WmN5>4AQ(np8xP<pM=&mq-hyLz2RDwvF_^r9Ba3m>&5;|>q0v}O
zlMcmp;7!25`||$;fJ7pZ0JPR#YwdsGyLDaXrIY|zYiZl|7F%A|H2}sK?f}j?gb*>k
zF9;!U&H<1C%=3Ji9AKKJ-I;BRd7cBHl=4MUu&yfrF~*w<c(&k3Y<Wl)E?jX4kMmOn
zt|kRY0aAdU2RL0sN~z19W%$PmY&1>tRnagEp9T1~INUdU`v0#5Wm!fQh85TYSZe|3
z`#x%bqiYYaEK79hJ2HTA95Kd3{fLA}DScH{JOE=edFfqjk+uK;002ovPDHLkV1h@}
BczOT;

literal 0
HcmV?d00001

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 c42caad8a4ff8434e1274ad88e8c09b98ca99f2b..ff38528ab9e4ea8dc7205b39e91f80e60c21cb82 100644
GIT binary patch
delta 149
zcmV;G0BZk?1;GTcwE=&3Nkl<ZScUD?u?YYn429vxalN>WTcmRf7jdH$_Rf(-ax-`Y
zg7E%c^A%zM#%@bQTtqw#psKE_VSxAaz}`D*_CG*tEf+B7%mwt`0RU^Q5Wo|13jsF+
zjvryIH5X7y$pu9JgvXhgn_1p27-K}uW{fe$0019zI~{d8WVa0^00000NkvXXu0mjf
D8lpWF

delta 224
zcmX@e(!;u8D`P!dlDE4HgA;=<gYWA2$uAff7&r?&B8wRqxP?KOkzv*x37{Z*iKnkC
z`*R*%J`?dn8SiU=LXst}5hc#~xw)x%B@E6*sfi`2DGKG8B^e6tp1uL$jeO!jMaiBn
zjv*0;-(J|rdBA{&#X)rmUxl>qawl&|qsA=fXN3_}3y&x~I`rYX?R^`676u0GpsVXv
z*`C@bZE3`O=8fs^yp;1i328~s41VXGVqQAu$}QP6!JEtMKP<n(yftpVB+!OwpBU!N
WS9J*x3t<HE7(8A5T-G@yGywqM!cAfT

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 6369d0430c23a48413265280196403066024b5b8..61d8d526c6e313864970658728c21a8319d341f3 100644
GIT binary patch
delta 175
zcmV;g08syq1=|F$wE=&TNkl<ZScUDCAr1sF2t}FAB$eEt9>@7=nwp-ivJT%HaDrL2
zE7mccgk-~0m>-__0e~QI=CB4zDc5K2y_@sDysQCchLjR8^X~3@0wMyn)<Z;m1c(S)
zYZnpu2p}R55g?+EfU1IsfU5ckL<gb+f7b!?EnjPWe?iW9`xhsi*1#BJcjunKobyqE
dAP9mWcmvi;J|0c0`w9R6002ovPDHLkV1oCBOV0oR

delta 226
zcmcc3(#N`CD`P!dlDE4HgA;=<gYWA2$uAff7&r?&B8wRqxP?KOkzv*x37{Z*iKnkC
z`*R*%J`?#fo74S(LXst}5hc#~xw)x%B@E6*sfi`2DGKG8B^e6tp1uL$jeO!jMX8=H
zjv*0;-(J|rdBA{&#X)rmUxl>qawl&|qsA=fXN6H!(F&r4i9c4y?OCPH#Ly7CA}jo=
z-Ln<lF*n_fi;J(go_nKgENtv=`Km5@!Iari)yr+}DHZ8NCQSXpwAC)}TOQDk8>iT#
XWQ~r8I<{T_@)$f_{an^LB{Ts5=HE>Z

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 0000000000000000000000000000000000000000..e0472f796fd5b4d39efe3676fe6366aae0f3fc4f
GIT binary patch
literal 634
zcmV-=0)_pFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7{`4i*)0$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MGzr$qaOnjGxbDzAp_6xbq^n3@1i`*``n)+q~uKo_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4Cb}vG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^da{Nhh$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFc>Dp!3DHKSqGSF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w_@qmQ<Vb#+LZJY>pV2qvfWBLxXVvYkxsTHaAVXa(-2exN
zz-W=O*F4_c)!y5`XPW)}09RIWoHwQ`%K!iXut`KgR9J=Wl_3rUAq++TY&Jo14qPQ?
z!{E3V4vFhIIKi%BlbM}NAqY&L`zf@)r3rwdZ03*-gb+R}1yV|nH6DY#xG@IKIaq7a
zS_3l==~}C3;w5!pj6sa?VCG-)QB6crdU*mwG~Dr>&N;75z*>7sKC2}}1HGf3d{!?T
zn0fO%EulN0JFtBR-l9bS-g`LbPWl?Z>d^^^25PM!B9u}_y#C#l*!~+TilQjW7wE1~
U_#qr_>i_@%07*qoM6N<$f_8Kp<NyEw

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..aa392783c079aacd9481c68c4feb689cb4f9ae05
GIT binary patch
literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7{`4i*)0$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MGzr$qaOnjGxbDzAp_6xbq^n3@1i`*``n)+q~uKo_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4Cb}vG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^da{Nhh$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFc>Dp!3DHKSqGSF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w_@qmQ<Vb#+LZJY>pV2qvfWBLxXVvYkxsTHaAVXa(-2exN
zz-W=O*F4_c)!y5`XPW)}09RIWoHwQ`%K!iX!%0LzR9J=Wm8%iMFc3sHnQ%+cog6YY
zGjkCt#odUx1R+tCAa&s&XFLHqeUdS`hi`8mISCMin|W{p%d#9j1=iYZ$BQdB#`N?9
zz>$;43Y<9Snwp7-onZye@{(oWxe{?!fQaCn!?tZz0@E~sh~T~N6HrP40M>P_5=be1
zvN@hrTmOIvumbzOH!m;A7GHtZx~e>-^xG>KhM`K}n(Y!8#}Po=Yj|e61VRXy=ecOv
nl^7#J2<+VLzo8%qf*`yB2gE;0XzCLe00000NkvXXu0mjfN<k$|

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1e189caf153fe06a62d5109823cf9049d20cf0cf
GIT binary patch
literal 94
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzRZkbkkcif|7YrF03^<rK%=2OR
rxAc%bw~CNZL;QXzO$LSn_erc5FEFZQo9t@<YGCkm^>bP0l+XkK)~*;V

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..229d6f396eb7a7f6a37f40812eb5bfd4208eae42
GIT binary patch
literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7{`4i*)0$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MGzr$qaOnjGxbDzAp_6xbq^n3@1i`*``n)+q~uKo_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4Cb}vG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^da{Nhh$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFc>Dp!3DHKSqGSF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w_@qmQ<Vb#+LZJY>pV2qvfWBLxXVvYkxsTHaAVXa(-2exN
zz-W=O*F4_c)!y5`XPW)}09RIWoHwQ`%K!iXVM#<mR9J=W(!C9UKnMk3G|s^~l<dP+
zjKCE1ETZ+Di9ZF}ysx<gF7OJ70001fwsa1!s(r38^RRR443L?(f7Z?b5kVp{yq^Ym
tqCJ3_UG`g#P*qPy=<cmM0RRAAI{*=r6mzG7jEn#P002ovPDHLkV1g*|_&5Ln

literal 0
HcmV?d00001

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 11a37b428ed7b77079989e94db8b2d00fee90156..04301e98b0727ea22ba7e44fa966843d74a85827 100644
GIT binary patch
delta 99
zcmV-p0G$8r1ds%<wE<g3Nkl<ZScUD-K?(pM2t?5-I#!<E&J}HH7wrt9|5k$Hh!Ow*
zze|zJyIEazc5l0x9C^Uxr)G&vPJYambms$hAp-z_hYh~&29dSbVRZli002ovPDHLk
FV1gfCDK-EA

delta 193
zcmbQh@|I=8R>pd^ByV>Y1}6qz2H(~3lV30}FmM)lL>4nJa0`PlBg3pY5<o%r5>H=O
z_UAmjd<vSn%T=3zLXst}5hc#~xw)x%B@E6*sfi`2DGKG8B^e6tp1uL$jeO!jMJ}E$
zjv*0;-(E80Vo>05zNjU4dY;`p?>TcqH*|cse?`$!L@JAofkDoDyLj1mtLHjfL+#jQ
qm)%X+8Mm@zN`KaYpLq-i%-Qy}vQ4ZIJ?RTHkipZ{&t;ucLK6TwX+9?a

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 0000000000000000000000000000000000000000..1e189caf153fe06a62d5109823cf9049d20cf0cf
GIT binary patch
literal 94
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzRZkbkkcif|7YrF03^<rK%=2OR
rxAc%bw~CNZL;QXzO$LSn_erc5FEFZQo9t@<YGCkm^>bP0l+XkK)~*;V

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1e189caf153fe06a62d5109823cf9049d20cf0cf
GIT binary patch
literal 94
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzRZkbkkcif|7YrF03^<rK%=2OR
rxAc%bw~CNZL;QXzO$LSn_erc5FEFZQo9t@<YGCkm^>bP0l+XkK)~*;V

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..23885acfd887d2e884da29160047dffc3e28f5f7
GIT binary patch
literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7{`4i*)0$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MGzr$qaOnjGxbDzAp_6xbq^n3@1i`*``n)+q~uKo_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4Cb}vG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^da{Nhh$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFc>Dp!3DHKSqGSF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w_@qmQ<Vb#+LZJY>pV2qvfWBLxXVvYkxsTHaAVXa(-2exN
zz-W=O*F4_c)!y5`XPW)}09RIWoHwQ`%K!iXVM#<mR9J=W(!mM9Fbo4gQ~EAs8_nmX
z0-eBnc#!mO90I0+7IZ(Mj~)^sBBDQ1)uE~*%duNID+A1Inq#+eR0aSL0BMfhmI19@
t;_hjV-If7wDt(~$dzxcML_|cN_W*hCDJbP$DhB`n002ovPDHLkV1jMU_QL=G

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..a02590657f6253fd20a8c470099e065e211c3697
GIT binary patch
literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>7{`4i*)0$WWauh>AE$6^me@v=v%)FuC+YXws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi<J1kq|hS9gX4a@yZ5+z2MF~tQ_YTXK-DZG
z6_1J8+=>`@MGzr$qaOnjGxbDzAp_6xbq^n3@1i`*``n)+q~uKo_(bAarW+RVI`Q<T
zrE}gV4zrS^5T6r|8FWG7N3P2*zi}=)Ebz>*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8
z%L?Z$&T6^Jn)l={4Cb}vG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^da{Nhh$>iDq
zBgZ@{P$4;f@IUz7ty!3yaFc>Dp!3DHKSqGSF3_mi_V=-EH%<WmGjOG~{FOQ|^GSNG
zrA3Z_-fiIGx~0i`z~v4w_@qmQ<Vb#+LZJY>pV2qvfWBLxXVvYkxsTHaAVXa(-2exN
zz-W=O*F4_c)!y5`XPW)}09RIWoHwQ`%K!iXVM#<mR9J=W(y<A^Fbo7h5mE=d&CjQ$
z44y!Hco3(L4X?t11pcar|3Zb#L`38-+<mzFcxKiyXLcA7%gj3F$PNJ*fGM+X+X1Cq
t)_b2a>$V;6mh=zQ+LoDhA|fL4c{kucHrpg_n$7?K002ovPDHLkV1jcn`~?62

literal 0
HcmV?d00001

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 e1548f4445b27e360708463ec42b2b58ceb747db..7f8bf1c0464dc02a4a74d8da5661c239410f5c01 100644
GIT binary patch
delta 103
zcmeywGKFQsR>pWQPZ!6Kh}Pr;3D(64B0Wuk23&4d2}_nftgJWAO?cyZ=5l{R@L?Bk
zc87zBHIsC<Y^fBzT+)>FLXc@&$%bU8hJzXshZq=ktY!0k(j}4400f?{elF{r5}E*A
CtS9gQ

delta 198
zcmbQj@`+``R>pd^ByV>Y1}6qz2H(~3lV30}FmM)lL>4nJa0`PlBg3pY5<o%r5>H=O
z_UAmjd<w=Fj^6nJ6p}1)jVN)>&&^HED`9XhN=+<DO;IS%EXh!C_w)@2Z{!mPD)RJn
zaSVw#oSY!Rx;R0krzy~Y%k3Zovs;$*jPK@`*^b%GJ7V*fL-DJR$)_8MNurwqZa)k4
px$GI_zgl2}tnXczo;Dr^hU*b*zGt?7cLtiu;OXk;vd$@?2>@IAK~Mky

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