diff --git a/gamedir/Data-1.13/TableData/Items/AttachmentSlots.xml b/gamedir/Data-1.13/TableData/Items/AttachmentSlots.xml
index d859b16a0..a3ce7e9cd 100644
--- a/gamedir/Data-1.13/TableData/Items/AttachmentSlots.xml
+++ b/gamedir/Data-1.13/TableData/Items/AttachmentSlots.xml
@@ -290,7 +290,7 @@
26
MOLLE Leg Upper Row 1
4096
- 3
+ 4
190
10
0
@@ -301,7 +301,7 @@
27
MOLLE Leg Upper Row 2
4096
- 3
+ 4
226
10
0
@@ -311,8 +311,8 @@
28
MOLLE Leg Lower Row 1
- 8192
- 3
+ 4096
+ 4
190
34
0
@@ -322,8 +322,8 @@
29
MOLLE Leg Lower Row 2
- 8192
- 3
+ 4096
+ 4
226
34
0
@@ -334,7 +334,7 @@
30
MOLLE Leg Middle Medium
8192
- 3
+ 4
193
58
0
@@ -345,7 +345,7 @@
31
MOLLE Vest Upper Row 1 Small
4096
- 4
+ 8
10
10
0
@@ -356,7 +356,7 @@
32
MOLLE Vest Upper Row 2 Small
4096
- 4
+ 8
46
10
0
@@ -367,7 +367,7 @@
33
MOLLE Vest Upper Row 3 Small
4096
- 4
+ 8
82
10
0
@@ -378,7 +378,7 @@
34
MOLLE Vest Upper Row 4 Small
4096
- 4
+ 8
118
10
0
@@ -389,7 +389,7 @@
35
MOLLE Vest Upper Row 5 Small
4096
- 4
+ 8
154
10
0
@@ -400,7 +400,7 @@
36
MOLLE Vest Lower Row 1 Small
4096
- 4
+ 8
10
34
0
@@ -411,7 +411,7 @@
37
MOLLE Vest Lower Row 2 Small
4096
- 4
+ 8
46
34
0
@@ -422,7 +422,7 @@
38
MOLLE Vest Lower Row 3 Small
4096
- 4
+ 8
82
34
0
@@ -433,7 +433,7 @@
39
MOLLE Vest Lower Row 4 Small
4096
- 4
+ 8
118
34
0
@@ -444,7 +444,7 @@
40
MOLLE Vest Lower Row 5 Small
4096
- 4
+ 8
154
34
0
@@ -455,7 +455,7 @@
41
MOLLE Vest Upper Row 6 Medium
8192
- 4
+ 8
190
10
0
@@ -466,11 +466,220 @@
42
MOLLE Vest Lower Row 6 Medium
8192
- 4
+ 8
190
34
0
1
12
+
+ 43
+ MOLLE Combat Pack Upper Row 1 Small
+ 4096
+ 16
+ 118
+ 10
+ 0
+ 0
+ 1
+
+
+ 44
+ MOLLE Combat Pack Upper Row 2 Small
+ 4096
+ 16
+ 154
+ 10
+ 0
+ 0
+ 2
+
+
+ 45
+ MOLLE Combat Pack Lower Row 1 Small
+ 4096
+ 16
+ 118
+ 34
+ 0
+ 0
+ 3
+
+
+ 46
+ MOLLE Combat Pack Lower Row 2 Small
+ 4096
+ 16
+ 154
+ 34
+ 0
+ 0
+ 4
+
+
+ 47
+ MOLLE Combat Pack Upper Medium
+ 8192
+ 16
+ 193
+ 10
+ 0
+ 1
+ 5
+
+
+ 48
+ MOLLE Combat Pack Middle Medium
+ 8192
+ 16
+ 193
+ 34
+ 0
+ 1
+ 6
+
+
+ 49
+ MOLLE Combat Pack Lower Medium
+ 8192
+ 16
+ 193
+ 58
+ 0
+ 1
+ 7
+
+
+ 50
+ MOLLE Backpack 1st Row Left Small
+ 4096
+ 32
+ 40
+ 10
+ 0
+ 0
+ 1
+
+
+ 51
+ MOLLE Backpack 2nd Row Left Small
+ 4096
+ 32
+ 40
+ 34
+ 0
+ 0
+ 2
+
+
+ 52
+ MOLLE Backpack 3rd Row Left Small
+ 4096
+ 32
+ 118
+ 10
+ 0
+ 0
+ 3
+
+
+ 53
+ MOLLE Backpack 4th Row Left Small
+ 4096
+ 32
+ 118
+ 34
+ 0
+ 0
+ 4
+
+
+ 54
+ MOLLE Backpack 1st Row Right Small
+ 4096
+ 32
+ 76
+ 10
+ 0
+ 0
+ 5
+
+
+ 55
+ MOLLE Backpack 2nd Row Right Small
+ 4096
+ 32
+ 76
+ 34
+ 0
+ 0
+ 6
+
+
+ 56
+ MOLLE Backpack 3rd Row Right Small
+ 4096
+ 32
+ 154
+ 10
+ 0
+ 0
+ 7
+
+
+ 57
+ MOLLE Backpack 4th Row Right Small
+ 4096
+ 32
+ 154
+ 34
+ 0
+ 0
+ 8
+
+
+ 58
+ MOLLE Backpack 1st Row Medium
+ 8192
+ 32
+ 193
+ 10
+ 0
+ 1
+ 9
+
+
+ 59
+ MOLLE Backpack 2nd Row Medium
+ 8192
+ 32
+ 193
+ 34
+ 0
+ 1
+ 10
+
+
+ 60
+ MOLLE Backpack 3rd Row Medium
+ 8192
+ 32
+ 193
+ 58
+ 0
+ 1
+ 11
+
+
+ 61
+ MOLLE Backpack 4th Row Medium
+ 8192
+ 32
+ 193
+ 82
+ 0
+ 1
+ 12
+
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index ab8aecb2b..0c6f64079 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -12313,7 +12313,7 @@
Not for sale
This should not be available through Bobby Ray. It is an internal item that is needed for the 1.13 XML-Editor. Removal of this item and subsequent use of the 1.13 XML-Editor may cause bugs.
131072
- 1
+ 4
1
573
1
@@ -12464,7 +12464,7 @@
Not for sale
This should not be available through Bobby Ray. It is an internal item that is needed for the 1.13 XML-Editor. Removal of this item and subsequent use of the 1.13 XML-Editor may cause bugs.
131072
- 1
+ 8
1
1
573
@@ -12662,7 +12662,7 @@
Not for sale
This should not be available through Bobby Ray. It is an internal item that is needed for the 1.13 XML-Editor. Removal of this item and subsequent use of the 1.13 XML-Editor may cause bugs.
131072
- 1
+ 16
2
1
573
@@ -12810,7 +12810,7 @@
Not for sale
This should not be available through Bobby Ray. It is an internal item that is needed for the 1.13 XML-Editor. Removal of this item and subsequent use of the 1.13 XML-Editor may cause bugs.
131072
- 1
+ 32
3
1
573
@@ -33602,7 +33602,7 @@
TT Assault Vest
The Tactical Tailor Assault Vest is for primary combat soldiers, and can carry 12 AR magazines, or whatever you need.
131072
- 1
+ 8
4
1
708
@@ -33630,7 +33630,7 @@
40mm Grenade Panel
A quadruple pouch mounted on a leg rig. The long adjustable straps let you store 40mm grenades on any length.
131072
- 1
+ 4
5
1
685
@@ -33658,7 +33658,7 @@
Double Mag Pouch
A pouch for carrying two longer magazines (like P90-mags) strapped to the upper thigh.
131072
- 1
+ 4
6
1
707
@@ -33685,7 +33685,7 @@
SAW Pouch
This pouch is designed to hold the ammo box for your machinegun. Mounted onto a leg rig.
131072
- 1
+ 4
7
1
706
@@ -33712,7 +33712,7 @@
Blackhawk Vest
A tactical vest that can carry an assortment of AR and pistol magazines.
131072
- 1
+ 8
8
1
705
@@ -33740,7 +33740,7 @@
Hongkong Police Vest
Your dedicated grenadier will love this vest, with its four 40mm grenade pockets. Although it's a police vest, you need not necessarily load only tear gas...
131072
- 1
+ 8
9
1
704
@@ -33768,7 +33768,7 @@
German Flecktarn Vest
A German assault vest. What you can't see on the picture is the large pocket at the left side, near the back of the vest.
131072
- 1
+ 8
10
1
703
@@ -33796,7 +33796,7 @@
Russian 106 Vest
The high number of pockets of various sizes lets you carry a lot of different things. Russian ingenuity at its best.
131072
- 1
+ 8
11
1
702
@@ -33824,7 +33824,7 @@
Russian 107 Vest
This is a vest for the primary combat soldier, who needs lots of rifle magazines.
131072
- 1
+ 8
12
1
701
@@ -33852,7 +33852,7 @@
Russian RM22SF Vest
Designed for carrying magazines, grenades, and a few other things, this is the Russian special forces vest.
131072
- 1
+ 8
13
1
700
@@ -33880,7 +33880,7 @@
TT Utility Vest
The Tactical Tailor Utility Vest is for those who are not primary combat soldiers, but have other duties as well.
131072
- 1
+ 8
14
1
699
@@ -33908,7 +33908,7 @@
LBE Gear
Load Bearing Equipment lets you carry your equipment into battle.
131072
- 1
+ 8
15
1
698
@@ -33936,7 +33936,7 @@
Holster
The Eagle SAS Tactical Holster carries a medium pistol and a spare magazine.
131072
- 1
+ 4
16
16384
1
@@ -33964,7 +33964,7 @@
Holster Rig
This Tactical Tailor Leg Rig can carry a pistol and three magazines.
131072
- 1
+ 4
17
1
696
@@ -33991,7 +33991,7 @@
MP Holster
With this Holster you can strap a small machinepistol or large pistol to your upper thigh. Has a pocket for an additional mag.
131072
- 1
+ 4
18
1
697
@@ -34018,7 +34018,7 @@
TIMS Backpack
If you want to carry all sorts of big things cross-country, you'll need a backpack like this one. Can be worn in conjunction with a TIMS combat pack.
131072
- 1
+ 32
19
1
686
@@ -34045,7 +34045,7 @@
ARUC Backpack
For a little bit of more organization, the ARUC backpack has two outer pockets for those items you need fast at hand.
131072
- 1
+ 32
20
1
687
@@ -34072,7 +34072,7 @@
MALICE3 Backpack
You do not want to rummage through the main compartment of your backpack for that elusive piece of gear that always sits at the bottom? This one has lots of outer pockets, to store your items for easy access.
131072
- 1
+ 32
21
1
688
@@ -34099,7 +34099,7 @@
TIMS Combat Pack
This combat pack can be worn in conjunction with the TIMS backpack, so you may want to have a look at the backpack as well.
131072
- 1
+ 16
22
1
689
@@ -34126,7 +34126,7 @@
Tactical Tailor 3-Day Pack
You want storage capacity to lug some things around during combat, but a backpack slows you down to much. This smaller combat pack may be the solution to your needs.
131072
- 1
+ 16
23
1
690
@@ -34153,7 +34153,7 @@
Blackhawk Patrol Pack
If you need to carry a very diverse assortment of goodies into combat, this is the combat pack for you!
131072
- 1
+ 16
24
1
691
@@ -36716,7 +36716,7 @@
AR-Mag / Grenade Pouch
This leg rig mounts a double AR-magazine pouch and three individual grenade pouches. Great for your primary combat soldiers.
131072
- 1
+ 4
25
1
714
@@ -36743,7 +36743,7 @@
AR-Mag / Utility Pouch
A double AR-magazine pouch and a larger utility pouch mounted together on a leg rig, this is useful for carrying larger things like explosives.
131072
- 1
+ 4
26
1
715
@@ -36770,7 +36770,7 @@
Canteen / Utility Pouch
This leg rig has a utility pouch mounted besides a canteen pouch.
131072
- 1
+ 4
27
1
716
@@ -36797,7 +36797,7 @@
Utility / Grenade Pouch
Here we have a utility pouch combined with three individual grenade pouches.
131072
- 1
+ 4
28
1
717
@@ -36824,7 +36824,7 @@
Large Mag / Utility Pouch
This leg rig offers a utility pouch together with two large mag pouches for those extremely long P90 or G11 magazines (or similar odd magazines).
131072
- 1
+ 4
29
1
718
@@ -36851,7 +36851,7 @@
Large Mag / Grenade Pouch
This leg rig mounts two large magazine pouches combined with two individual grenade pouches.
131072
- 1
+ 4
30
1
719
@@ -36878,7 +36878,7 @@
Hunter Vest
Not for sale through BR.
131072
- 1
+ 8
31
1
711
@@ -37600,7 +37600,7 @@
TT Pistol Vest
The Tactical Tailor 1E Vest is useful if your legs already carry some rigs, but you still want to pack a pistol. The holster on this vest will fit most standard pistols.
131072
- 1
+ 8
32
1
725
@@ -37738,7 +37738,7 @@
Revolver Holster
This holster can be clipped onto your equipment and fits small and medium shortbarreled revolvers. Comes with two separate speedloader pockets that are also of the clip-on type.
131072
- 1
+ 4
33
16384
344
@@ -37828,7 +37828,7 @@
LRAK SAW-Vest
Your machinegunner will love this vest, provided he's strong enough to wear it when it is filled to capacity.
131072
- 1
+ 8
34
512
1
@@ -37856,7 +37856,7 @@
First Aid Rig
Great for storing a first aid kit with additional syringes of whatever stimulants your troops need.
131072
- 1
+ 4
35
1
744
@@ -37882,7 +37882,7 @@
Medical Pouch
Great for storing a first aid kit with additional syringes of whatever stimulants your troops need. Also keeps a canteen handy.
131072
- 1
+ 4
36
1
745
@@ -37908,7 +37908,7 @@
Canteen / Grenade Pouch
This panel is equipped with a canteen pouch and three grenade pouches.
131072
- 1
+ 4
37
1
735
@@ -37935,7 +37935,7 @@
AR-Mag. / Canteen / Grenade Panel
A sub-version of one of our other leg rigs, this panel replaces one grenade pouch with a canteen pouch.
131072
- 1
+ 4
38
1
736
@@ -37962,7 +37962,7 @@
Large Mag. / Canteen / Grenade Panel
This panel has a canteen pouch instead of the second grenade pouch of our other large magazine pouch setup.
131072
- 1
+ 4
39
1
737
@@ -48882,7 +48882,7 @@
Diving Bottle
Standard equipment for divers.
131072
- 1
+ 16
40
2097152
2
@@ -49222,6 +49222,7 @@
Large Holster
This pistol holster can store a larger pistol and up to two spare magazines.
131072
+ 4
41
2
191
@@ -49248,6 +49249,7 @@
Shotgun holster
This is the perfect holster to store a small handheld shotgun in.
131072
+ 4
42
2
164
@@ -49274,6 +49276,7 @@
SMG Leg Rig
A leg pouch to carry SMG ammunition, as used by SAS teams during hostage rescue operations.
131072
+ 4
43
2
165
@@ -49301,6 +49304,7 @@
TK Rig
Stealthy assassins like their knives. This rig can hold several knives.
131072
+ 4
44
2
166
@@ -49328,6 +49332,7 @@
Pistol Magazines
A leg rig with three pouches for pistol magazines.
131072
+ 4
45
2
167
@@ -49355,6 +49360,7 @@
Equipment Pouch
A versatile leg pouch with pockets to carry various items.
131072
+ 4
46
2
168
@@ -49382,6 +49388,7 @@
Bomb Pouch
Not for sale.
131072
+ 4
47
2
169
@@ -49408,6 +49415,7 @@
12g Shotgun Rig
This leg rig can hold several 12 gauge shotgun shells and allows access to the regular pants pockets.
131072
+ 4
48
2
170
@@ -49434,7 +49442,7 @@
3.11 Thigh Rig
A highly useful accessory used by sportsmen, patrol officers, and tactical operators across the country, the 3.11 Thigh Rig is a lightweight, reliable, and completely customizable.
131072
- 3
+ 4
1
3
49
@@ -49465,7 +49473,7 @@
131072
16777216
8192
- 3
+ 4
2
15
50
@@ -49496,7 +49504,7 @@
VTAC LBE Tactical Vest
Our MOLLE Vest is made from a stiffened mesh providing the necessary structure for gear and is fully compatible with our VTAC NAS pouches or standard MOLLE gear.
131072
- 4
+ 8
1
3
51
@@ -49527,7 +49535,7 @@
131072
16777216
8192
- 3
+ 4
2
15
52
@@ -49560,7 +49568,7 @@
131072
16777216
4096
- 3
+ 4
1
15
53
@@ -49593,7 +49601,7 @@
131072
16777216
4096
- 3
+ 4
1
10
54
@@ -49626,7 +49634,7 @@
131072
16777216
4096
- 3
+ 4
1
10
55
@@ -49659,7 +49667,7 @@
131072
16777216
4096
- 3
+ 4
1
10
56
@@ -49691,7 +49699,7 @@
131072
16777216
4096
- 3
+ 4
1
10
57
@@ -49724,7 +49732,7 @@
131072
16777216
4096
- 3
+ 4
1
10
58
@@ -49756,7 +49764,7 @@
131072
16777216
4096
- 3
+ 4
1
10
59
@@ -49788,7 +49796,7 @@
131072
16777216
4096
- 3
+ 4
1
10
60
@@ -49821,7 +49829,7 @@
131072
16777216
8192
- 3
+ 4
2
15
61
@@ -49854,7 +49862,7 @@
131072
16777216
4096
- 3
+ 4
1
10
62
@@ -49887,7 +49895,7 @@
131072
16777216
4096
- 3
+ 4
1
10
63
@@ -49919,7 +49927,7 @@
131072
16777216
4096
- 3
+ 4
1
10
64
@@ -49950,7 +49958,7 @@
MOLLE Drop Leg Ambi Holster
Versatility comes from the number of carry modes and weapon configurations allowed by this holster.
131072
- 3
+ 4
1
65
2
@@ -49978,7 +49986,7 @@
Casualty Response Kit - Medic/Leg Rig Bag
Here we have a Trauma shear storage for quick access and MOLLE style attachment system compatible.
131072
- 3
+ 4
3
66
2
@@ -50007,7 +50015,7 @@
Black M.O.L.L.E. Modular Tactical Vest
This military vest has hanging loops for added storage and features two inner mesh pockets with zippers, perfect to carry smaller items that cannot be attached to the molle webbing.
131072
- 4
+ 8
3
3
67
@@ -50037,7 +50045,7 @@
Multicam Military Tactical Molle Vest
The Multicam MOLLE compatible cross draw military vest is the maximum in practicality and durabilty for a tactical vest.
131072
- 4
+ 8
1
3
68
@@ -50069,7 +50077,7 @@
131072
16777216
4096
- 3
+ 4
1
10
69
@@ -50102,7 +50110,7 @@
131072
16777216
4096
- 3
+ 4
1
10
70
@@ -50135,7 +50143,7 @@
131072
16777216
4096
- 3
+ 4
1
10
71
@@ -50168,7 +50176,7 @@
131072
16777216
4096
- 3
+ 4
1
10
72
@@ -50201,7 +50209,7 @@
131072
16777216
4096
- 3
+ 4
1
10
73
@@ -50234,7 +50242,7 @@
131072
16777216
4096
- 3
+ 4
1
10
74
@@ -50266,7 +50274,7 @@
131072
16777216
8192
- 3
+ 4
2
15
75
@@ -50297,7 +50305,7 @@
Specter Modular Thigh Rig
This rig features 4 rows of MOLLE compatible modular webbing strips that allow the user to configure a thigh rig with the pouches they want and need for the mission at hand.
131072
- 3
+ 4
3
3
76
@@ -50329,7 +50337,7 @@
131072
16777216
8192
- 3
+ 4
2
15
77
@@ -50362,7 +50370,7 @@
131072
16777216
4096
- 3
+ 4
1
10
78
@@ -50395,7 +50403,7 @@
131072
16777216
4096
- 3
+ 4
1
10
79
@@ -50428,7 +50436,7 @@
131072
16777216
4096
- 3
+ 4
1
10
80
@@ -50461,7 +50469,7 @@
131072
16777216
4096
- 3
+ 4
1
10
81
@@ -50492,7 +50500,7 @@
TT Modular Tactical Assault Vest
The Modular Adjustable Tactical Vest is a modern update to the traditional modular vest. The MAT-V has been designed to combine function and comfort without sacrificing either
131072
- 4
+ 8
3
82
2
@@ -50521,7 +50529,7 @@
S.T.R.I.K.E. - ELITE VEST
Two large, zippered map pouches inside, Shoulder D-rings for accessory attachment, See 3.11. section for all pouch options.
131072
- 4
+ 8
3
83
2
@@ -50553,7 +50561,7 @@
131072
16777216
4096
- 3
+ 4
1
10
84
@@ -50586,7 +50594,7 @@
131072
16777216
8192
- 3
+ 4
2
15
85
@@ -50619,7 +50627,7 @@
131072
16777216
8192
- 3
+ 4
2
15
86
@@ -50652,7 +50660,7 @@
131072
16777216
8192
- 3
+ 4
2
15
87
@@ -50685,7 +50693,7 @@
131072
16777216
8192
- 3
+ 4
2
15
88
@@ -50718,7 +50726,7 @@
131072
16777216
8192
- 3
+ 4
2
15
89
@@ -50749,7 +50757,7 @@
Large Modular Tactical Thigh Rig
This rig features 4 rows of MOLLE compatible modular webbing strips that allow the user to configure a tactical thigh rig with exactly the right pouches they want.
131072
- 3
+ 4
3
90
2
@@ -50806,7 +50814,7 @@
Sporting Clay Vest
This versatile, value-priced vest has plenty of range-perfect features. Organize loads between two double shell pockets (four total), and secure empties in the mesh back pouch
131072
- 4
+ 8
1
92
1
@@ -50834,7 +50842,7 @@
Condor Heavy Assault Vest
When the job is going to get messy, you need the Heavy Assault Vest. The vest itself is a MOLLE system which means that shooters can configure the vest to their own specifications.
131072
- 4
+ 8
1
93
2
@@ -50863,7 +50871,7 @@
FSBE LBV Load Bearing Molle Assault Vest
Chinese made Special force load bearing vest with1-inch molle webbing cross straps for attaching molle pouches.
131072
- 4
+ 8
3
94
2
diff --git a/gamedir/Data-1.13/TableData/Lookup/NasLayoutClass.xml b/gamedir/Data-1.13/TableData/Lookup/NasLayoutClass.xml
new file mode 100644
index 000000000..fb062e007
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Lookup/NasLayoutClass.xml
@@ -0,0 +1,31 @@
+
+
+
+ 0
+ None
+
+
+ 1
+ Weapons
+
+
+ 2
+ Multi-Shot Launchers
+
+
+ 4
+ Molle Leg Rigs
+
+
+ 8
+ Molle Vests
+
+
+ 16
+ Molle Combat Packs
+
+
+ 32
+ Molle Backpacks
+
+
\ No newline at end of file