diff --git a/Data-1.13/BigItems/p2item244.sti b/Data-1.13/BigItems/p2item244.sti
new file mode 100644
index 000000000..6c0babad6
Binary files /dev/null and b/Data-1.13/BigItems/p2item244.sti differ
diff --git a/Data-1.13/BigItems/p2item245.sti b/Data-1.13/BigItems/p2item245.sti
new file mode 100644
index 000000000..132e17703
Binary files /dev/null and b/Data-1.13/BigItems/p2item245.sti differ
diff --git a/Data-1.13/Interface/MDP2ITEMS.STI b/Data-1.13/Interface/MDP2ITEMS.STI
index 8aa485d12..120b82b86 100644
Binary files a/Data-1.13/Interface/MDP2ITEMS.STI and b/Data-1.13/Interface/MDP2ITEMS.STI differ
diff --git a/Data-1.13/TableData/Inventory/MercStartingGear.xml b/Data-1.13/TableData/Inventory/MercStartingGear.xml
index ea24b9505..1b177cd89 100644
--- a/Data-1.13/TableData/Inventory/MercStartingGear.xml
+++ b/Data-1.13/TableData/Inventory/MercStartingGear.xml
@@ -2306,12 +2306,12 @@
 			<mBig2Quantity>3</mBig2Quantity>
 			<mSmall0>201</mSmall0>
 			<mSmall1>214</mSmall1>
-			<mSmall5>1710</mSmall5>
-			<mSmall6>1711</mSmall6>
+			<mSmall5>1764</mSmall5>
+			<mSmall6>1712</mSmall6>
 			<mSmall7>1712</mSmall7>
 			<lVest>1090</lVest>
 			<lLeftThigh>1091</lLeftThigh>
-			<lRightThigh>1091</lRightThigh>
+			<lRightThigh>1205</lRightThigh>
 			<lCPack>1098</lCPack>
 		</GEARKIT>
 		<GEARKIT>
@@ -2333,8 +2333,8 @@
 			<mSmall3Quantity>2</mSmall3Quantity>
 			<mSmall4>75</mSmall4>
 			<mSmall4Quantity>2</mSmall4Quantity>
-			<mSmall5>1710</mSmall5>
-			<mSmall6>1711</mSmall6>
+			<mSmall5>1764</mSmall5>
+			<mSmall6>1712</mSmall6>
 			<mSmall7>1712</mSmall7>
 			<lVest>1090</lVest>
 			<lLeftThigh>1092</lLeftThigh>
@@ -25206,7 +25206,13 @@
 			<mSmall1>71</mSmall1>
 			<mSmall1Status>100</mSmall1Status>
 			<mSmall1Quantity>1</mSmall1Quantity>
+			<mSmall2>1764</mSmall2>
+			<mSmall2Status>100</mSmall2Status>
+			<mSmall2Quantity>1</mSmall2Quantity>
+			<lVest>1090</lVest>
+			<lVestStatus>100</lVestStatus>
 			<lLeftThigh>1091</lLeftThigh>
+			<lLeftThighStatus>100</lLeftThighStatus>
 			<lRightThigh>1204</lRightThigh>
 			<lRightThighStatus>92</lRightThighStatus>
 		</GEARKIT>
@@ -28632,6 +28638,12 @@
 			<mSmall0Quantity>2</mSmall0Quantity>
 			<mSmall3>1756</mSmall3>
 			<mSmall3Quantity>2</mSmall3Quantity>
+			<mSmall4>1764</mSmall4>
+			<mSmall4Status>100</mSmall4Status>
+			<mSmall4Quantity>1</mSmall4Quantity>
+			<mSmall5>1758</mSmall5>
+			<mSmall5Status>100</mSmall5Status>
+			<mSmall5Quantity>1</mSmall5Quantity>
 			<lVest>1090</lVest>
 			<lVestStatus>99</lVestStatus>
 			<lRightThigh>1200</lRightThigh>
diff --git a/Data-1.13/TableData/Items/AttachmentComboMerges.xml b/Data-1.13/TableData/Items/AttachmentComboMerges.xml
index d520a8e70..3eb943744 100644
--- a/Data-1.13/TableData/Items/AttachmentComboMerges.xml
+++ b/Data-1.13/TableData/Items/AttachmentComboMerges.xml
@@ -2,8 +2,8 @@
 <ATTACHMENTCOMBOMERGELIST>
 	<ATTACHMENTCOMBOMERGE>
 		<uiIndex>0</uiIndex>
-		<usItem>305</usItem>
-		<usAttachment1>306</usAttachment1>
+		<usItem>305</usItem>                   <!-- Aluminum Rod -->
+		<usAttachment1>306</usAttachment1>     <!-- Spring -->
 		<usAttachment2>0</usAttachment2>
 		<usAttachment3>0</usAttachment3>
 		<usAttachment4>0</usAttachment4>
@@ -23,13 +23,13 @@
 		<usAttachment18>0</usAttachment18>
 		<usAttachment19>0</usAttachment19>
 		<usAttachment20>0</usAttachment20>
-		<usResult>307</usResult>
+		<usResult>307</usResult>                <!-- Rod & Spring -->
 	</ATTACHMENTCOMBOMERGE>
 	<ATTACHMENTCOMBOMERGE>
 		<uiIndex>1</uiIndex>
-		<usItem>308</usItem>
-		<usAttachment1>309</usAttachment1>
-		<usAttachment2>304</usAttachment2>
+		<usItem>308</usItem>                    <!-- Steel Tube -->
+		<usAttachment1>309</usAttachment1>      <!--  Glue -->
+		<usAttachment2>304</usAttachment2>      <!-- Duct Tape -->
 		<usAttachment3>0</usAttachment3>
 		<usAttachment4>0</usAttachment4>
 		<usAttachment5>0</usAttachment5>
@@ -48,13 +48,13 @@
 		<usAttachment18>0</usAttachment18>
 		<usAttachment19>0</usAttachment19>
 		<usAttachment20>0</usAttachment20>
-		<usResult>310</usResult>
+		<usResult>310</usResult>                 <!-- Gun Barrel Extender -->
 	</ATTACHMENTCOMBOMERGE>
 	<ATTACHMENTCOMBOMERGE>
 		<uiIndex>2</uiIndex>
-		<usItem>318</usItem>
-		<usAttachment1>319</usAttachment1>
-		<usAttachment2>320</usAttachment2>
+		<usItem>318</usItem>                     <!-- FumblePak -->
+		<usAttachment1>319</usAttachment1>       <!-- X-ray Tube -->
+		<usAttachment2>320</usAttachment2>       <!-- Pack of Gum -->
 		<usAttachment3>0</usAttachment3>
 		<usAttachment4>0</usAttachment4>
 		<usAttachment5>0</usAttachment5>
@@ -73,12 +73,12 @@
 		<usAttachment18>0</usAttachment18>
 		<usAttachment19>0</usAttachment19>
 		<usAttachment20>0</usAttachment20>
-		<usResult>321</usResult>
+		<usResult>321</usResult>               <!-- X-ray Device -->
 	</ATTACHMENTCOMBOMERGE>
 	<ATTACHMENTCOMBOMERGE>
 		<uiIndex>3</uiIndex>
-		<usItem>315</usItem>
-		<usAttachment1>316</usAttachment1>
+		<usItem>315</usItem>                   <!-- LameBoy Display  -->
+		<usAttachment1>316</usAttachment1>      <!-- Copper Wire -->
 		<usAttachment2>0</usAttachment2>
 		<usAttachment3>0</usAttachment3>
 		<usAttachment4>0</usAttachment4>
@@ -98,12 +98,12 @@
 		<usAttachment18>0</usAttachment18>
 		<usAttachment19>0</usAttachment19>
 		<usAttachment20>0</usAttachment20>
-		<usResult>317</usResult>
+		<usResult>317</usResult>              <!-- Display Unit -->
 	</ATTACHMENTCOMBOMERGE>
 	<ATTACHMENTCOMBOMERGE>
 		<uiIndex>4</uiIndex>
-		<usItem>264</usItem>
-		<usAttachment1>316</usAttachment1>
+		<usItem>264</usItem>                  <!-- Platinum Watch -->
+		<usAttachment1>316</usAttachment1>     <!-- Copper Wire -->
 		<usAttachment2>0</usAttachment2>
 		<usAttachment3>0</usAttachment3>
 		<usAttachment4>0</usAttachment4>
@@ -123,13 +123,13 @@
 		<usAttachment18>0</usAttachment18>
 		<usAttachment19>0</usAttachment19>
 		<usAttachment20>0</usAttachment20>
-		<usResult>223</usResult>
+		<usResult>223</usResult>               <!-- Detonator -->
 	</ATTACHMENTCOMBOMERGE>
 	<ATTACHMENTCOMBOMERGE>
 		<uiIndex>5</uiIndex>
-		<usItem>1360</usItem>
-		<usAttachment1>1360</usAttachment1>
-		<usAttachment2>1360</usAttachment2>
+		<usItem>1360</usItem>                   <!-- MERC Wrist Watch -->
+		<usAttachment1>1360</usAttachment1>       <!-- MERC Wrist Watch -->
+		<usAttachment2>1360</usAttachment2>           <!-- MERC Wrist Watch -->
 		<usAttachment3>0</usAttachment3>
 		<usAttachment4>0</usAttachment4>
 		<usAttachment5>0</usAttachment5>
@@ -148,6 +148,31 @@
 		<usAttachment18>0</usAttachment18>
 		<usAttachment19>0</usAttachment19>
 		<usAttachment20>0</usAttachment20>
-		<usResult>1360</usResult>
+		<usResult>1360</usResult>                  <!-- MERC Wrist Watch --> 
+	</ATTACHMENTCOMBOMERGE>
+	<ATTACHMENTCOMBOMERGE>
+		<uiIndex>6</uiIndex>
+		<usItem>1763</usItem>                     <!-- Empy PPE Bag -->
+		<usAttachment1>1710</usAttachment1>       <!-- Surgical mask -->
+		<usAttachment2>1711</usAttachment2>       <!-- Surgical gloves -->
+		<usAttachment3>0</usAttachment3>
+		<usAttachment4>0</usAttachment4>
+		<usAttachment5>0</usAttachment5>
+		<usAttachment6>0</usAttachment6>
+		<usAttachment7>0</usAttachment7>
+		<usAttachment8>0</usAttachment8>
+		<usAttachment9>0</usAttachment9>
+		<usAttachment10>0</usAttachment10>
+		<usAttachment11>0</usAttachment11>
+		<usAttachment12>0</usAttachment12>
+		<usAttachment13>0</usAttachment13>
+		<usAttachment14>0</usAttachment14>
+		<usAttachment15>0</usAttachment15>
+		<usAttachment16>0</usAttachment16>
+		<usAttachment17>0</usAttachment17>
+		<usAttachment18>0</usAttachment18>
+		<usAttachment19>0</usAttachment19>
+		<usAttachment20>0</usAttachment20>
+		<usResult>1764</usResult>               <!-- PPE Bag -->
 	</ATTACHMENTCOMBOMERGE>
 </ATTACHMENTCOMBOMERGELIST>
\ No newline at end of file
diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml
index 605c42abb..01ae57044 100644
--- a/Data-1.13/TableData/Items/Items.xml
+++ b/Data-1.13/TableData/Items/Items.xml
@@ -51302,6 +51302,9 @@
 		<szBRDesc>If you are a doctor or live in an Asian mega-city, you will need these.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
 		<nasLayoutClass>1</nasLayoutClass>
+		<nasAttachmentClass>1</nasAttachmentClass>
+		<AttachmentPoint>8</AttachmentPoint>
+		<AttachToPointAPCost>15</AttachToPointAPCost>		
 		<ubGraphicType>2</ubGraphicType>
 		<ubGraphicNum>224</ubGraphicNum>
 		<ubWeight>1</ubWeight>
@@ -51311,7 +51314,10 @@
 		<ubCoolness>3</ubCoolness>
 		<Damageable>1</Damageable>
 		<WaterDamages>1</WaterDamages>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>		
 		<Medical>1</Medical>
+		<Attachment>1</Attachment>
 		<BR_NewInventory>20</BR_NewInventory>
 		<diseaseprotectionface>1</diseaseprotectionface>
 		<DiseaseSystemExclusive>1</DiseaseSystemExclusive>
@@ -51328,6 +51334,10 @@
 		<szBRDesc>Useful for doctors. Not for keeping your hands warm.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
 		<nasLayoutClass>1</nasLayoutClass>
+		<nasAttachmentClass>1</nasAttachmentClass>
+		<AttachmentPoint>8</AttachmentPoint>
+		<AttachToPointAPCost>15</AttachToPointAPCost>
+		<Attachment>1</Attachment>
 		<ubGraphicType>2</ubGraphicType>
 		<ubGraphicNum>225</ubGraphicNum>
 		<ubWeight>1</ubWeight>
@@ -51337,7 +51347,10 @@
 		<ubCoolness>3</ubCoolness>
 		<Damageable>1</Damageable>
 		<WaterDamages>1</WaterDamages>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>
 		<Medical>1</Medical>
+		<Attachment>1</Attachment>
 		<BR_NewInventory>20</BR_NewInventory>
 		<diseaseprotectionhand>1</diseaseprotectionhand>
 		<DiseaseSystemExclusive>1</DiseaseSystemExclusive>
@@ -52781,4 +52794,57 @@
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
 	</ITEM>
+	<ITEM>
+		<uiIndex>1763</uiIndex>
+		<szItemName>Empty PPE Bag</szItemName>
+		<szLongItemName>Empty PPE Bag</szLongItemName>
+		<szItemDesc>Protect your PPE from wear and tear. Safely store masks and gloves and keep your inventory tidy. Perfect for a long tour in unhealthy conditions.</szItemDesc>
+		<szBRName>Empty PPE Bag</szBRName>
+		<szBRDesc>Perfect storage for masks and gloves, keep your inventory tidy and your PPE in prime condition. Mask and gloves not included.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<AvailableAttachmentPoint>8</AvailableAttachmentPoint>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>244</ubGraphicNum>
+		<ubWeight>4</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>11</ItemSize>
+		<usPrice>20</usPrice>
+		<ubCoolness>3</ubCoolness>
+		<Medical>1</Medical>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>
+		<BR_NewInventory>20</BR_NewInventory>
+		<BR_UsedInventory>3</BR_UsedInventory>
+		<DiseaseSystemExclusive>1</DiseaseSystemExclusive>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1764</uiIndex>
+		<szItemName>PPE Bag</szItemName>
+		<szLongItemName>PPE Bag</szLongItemName>
+		<szItemDesc>This small bag holds minimum PPE (mask and gloves), protecting against infection risk born by airborne diseases and contact with infected persons. Perfect for frolicing through a disease riddled country.</szItemDesc>
+		<szBRName>PPE Bag</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>245</ubGraphicNum>
+		<ubWeight>5</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>11</ItemSize>
+		<usPrice>25</usPrice>
+		<ubCoolness>4</ubCoolness>
+		<Medical>1</Medical>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>
+		<diseaseprotectionface>1</diseaseprotectionface>
+		<diseaseprotectionhand>1</diseaseprotectionhand>
+		<DiseaseSystemExclusive>1</DiseaseSystemExclusive>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
 </ITEMLIST>
\ No newline at end of file
diff --git a/Data-1.13/TableData/Items/Merges.xml b/Data-1.13/TableData/Items/Merges.xml
index 9f6f888ef..43feaaffe 100644
--- a/Data-1.13/TableData/Items/Merges.xml
+++ b/Data-1.13/TableData/Items/Merges.xml
@@ -2073,17 +2073,17 @@
 		<APCost>20</APCost>
 	</MERGE>
 	<MERGE>
-		<firstItemIndex>299</firstItemIndex>
-		<secondItemIndex>1016</secondItemIndex>
-		<firstResultingItemIndex>315</firstResultingItemIndex>
+		<firstItemIndex>299</firstItemIndex>                     <!-- Utility Knife -->
+		<secondItemIndex>1016</secondItemIndex>                  <!-- Gameboy -->
+		<firstResultingItemIndex>315</firstResultingItemIndex>   <!-- LameBoy Display -->
 		<secondResultingItemIndex>0</secondResultingItemIndex>
 		<mergeType>6</mergeType>
 		<APCost>60</APCost>
 	</MERGE>
 	<MERGE>
-		<firstItemIndex>299</firstItemIndex>
-		<secondItemIndex>267</secondItemIndex>
-		<firstResultingItemIndex>318</firstResultingItemIndex>
+		<firstItemIndex>299</firstItemIndex>                        <!-- Utility Knife -->
+		<secondItemIndex>267</secondItemIndex>                      <!--   Portable TV -->
+		<firstResultingItemIndex>318</firstResultingItemIndex>      <!-- FumblePack -->
 		<secondResultingItemIndex>0</secondResultingItemIndex>
 		<mergeType>6</mergeType>
 		<APCost>60</APCost>
@@ -2585,17 +2585,17 @@
 		<APCost>32</APCost>
 	</MERGE>
 	<MERGE>
-		<firstItemIndex>317</firstItemIndex>
-		<secondItemIndex>321</secondItemIndex>
-		<firstResultingItemIndex>324</firstResultingItemIndex>
+		<firstItemIndex>317</firstItemIndex>                     <!-- Display Unit -->
+		<secondItemIndex>321</secondItemIndex>                   <!-- X-ray Device -->
+		<firstResultingItemIndex>324</firstResultingItemIndex>   <!-- X-ray Detector -->
 		<secondResultingItemIndex>0</secondResultingItemIndex>
 		<mergeType>5</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
 	<MERGE>
-		<firstItemIndex>321</firstItemIndex>
-		<secondItemIndex>317</secondItemIndex>
-		<firstResultingItemIndex>324</firstResultingItemIndex>
+		<firstItemIndex>321</firstItemIndex>                     <!-- X-ray Device -->
+		<secondItemIndex>317</secondItemIndex>                   <!-- Display Unit -->
+		<firstResultingItemIndex>324</firstResultingItemIndex>   <!-- X-ray Detector -->
 		<secondResultingItemIndex>0</secondResultingItemIndex>
 		<mergeType>5</mergeType>
 		<APCost>32</APCost>
diff --git a/Data-1.13/TableData/NPCInventory/AdditionalDealer_21_Inventory.xml b/Data-1.13/TableData/NPCInventory/AdditionalDealer_21_Inventory.xml
index d0b146663..8919e870c 100644
--- a/Data-1.13/TableData/NPCInventory/AdditionalDealer_21_Inventory.xml
+++ b/Data-1.13/TableData/NPCInventory/AdditionalDealer_21_Inventory.xml
@@ -160,4 +160,24 @@
 		<sItemIndex>1728</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>32</uiIndex>
+		<sItemIndex>1710</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>33</uiIndex>
+		<sItemIndex>1711</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>34</uiIndex>
+		<sItemIndex>1763</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>35</uiIndex>
+		<sItemIndex>1764</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>
\ No newline at end of file
diff --git a/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml b/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml
index a6515ada8..b57375ae4 100644
--- a/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml
+++ b/Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml
@@ -43,12 +43,12 @@
 	<INVENTORY>
 		<uiIndex>8</uiIndex>
 		<sItemIndex>1710</sItemIndex>
-		<ubOptimalNumber>4</ubOptimalNumber>
+		<ubOptimalNumber>6</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>9</uiIndex>
 		<sItemIndex>1711</sItemIndex>
-		<ubOptimalNumber>4</ubOptimalNumber>
+		<ubOptimalNumber>6</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>10</uiIndex>
@@ -90,4 +90,19 @@
 		<sItemIndex>1756</sItemIndex>
 		<ubOptimalNumber>6</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>1758</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1763</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>1764</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>
\ No newline at end of file
diff --git a/Data-1.13/TableData/NPCInventory/Merchants.xml b/Data-1.13/TableData/NPCInventory/Merchants.xml
index 1e2d4c85c..f68692e58 100644
--- a/Data-1.13/TableData/NPCInventory/Merchants.xml
+++ b/Data-1.13/TableData/NPCInventory/Merchants.xml
@@ -640,7 +640,7 @@ uiFlags must be of
     <szName>additional dealer 3</szName>
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
-    <ubShopKeeperID>255</ubShopKeeperID>
+        <ubShopKeeperID>255</ubShopKeeperID>
 		<ubTypeOfArmsDealer>0</ubTypeOfArmsDealer>
 		<iInitialCash>800</iInitialCash>
 		<uiFlags>268435456</uiFlags>
@@ -1017,7 +1017,7 @@ uiFlags must be of
 	<!-- The inventory files are numbered, for example, slot 40 uses AdditionalDealer_21_Inventory.xml, and so on -->
 	<MERCHANT>
 		<uiIndex>40</uiIndex>
-		<szName>A10 bunker rebel quartermaster</szName>
+		<szName>A10 bunker rebel quartermaster</szName>     <!-- 21 (AdditionalDealer_21_Inventory.xml) -->
 		<dBuyModifier>0.2</dBuyModifier>
 		<dSellModifier>0.5</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>		<!-- Important: no profile -->
@@ -1040,7 +1040,7 @@ uiFlags must be of
 	<!-- as there are several stores, we need to set up several merchantes, otherwise they'll share inventory and money -->
 	<MERCHANT>
 		<uiIndex>41</uiIndex>
-		<szName>general store Drassen (D13)</szName>
+		<szName>general store Drassen (D13)</szName>     <!-- 22 -->
 		<dBuyModifier>0.7</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1062,7 +1062,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>42</uiIndex>
-		<szName>general store Alma (I14)</szName>
+		<szName>general store Alma (I14)</szName>     <!-- 23 -->
 		<dBuyModifier>0.7</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1084,7 +1084,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>43</uiIndex>
-		<szName>general store Cambria (G9)</szName>
+		<szName>general store Cambria (G9)</szName>     <!-- 24 -->
 		<dBuyModifier>0.7</dBuyModifier>	<!-- slightly worse than Keith -->
 		<dSellModifier>1.05</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1106,7 +1106,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>44</uiIndex>
-		<szName>general store Grumm (H1)</szName>
+		<szName>general store Grumm (H1)</szName>     <!-- 25 -->
 		<dBuyModifier>0.7</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1128,7 +1128,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>45</uiIndex>
-		<szName>general store San Mona (C5)</szName>
+		<szName>general store San Mona (C5)</szName>     <!-- 26 -->
 		<dBuyModifier>0.7</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1150,7 +1150,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>46</uiIndex>
-		<szName>posh general store Meduna (O4)</szName>
+		<szName>posh general store Meduna (O4)</szName>     <!-- 27 -->
 		<dBuyModifier>0.7</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1172,7 +1172,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>47</uiIndex>
-		<szName>pharmacy Cambria (G9)</szName>
+		<szName>pharmacy Cambria (G9)</szName>     <!-- 28 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1194,7 +1194,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>48</uiIndex>
-		<szName>pharmacy Meduna (O4)</szName>
+		<szName>pharmacy Meduna (O4)</szName>     <!-- 29 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1216,7 +1216,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>49</uiIndex>
-		<szName>restaurant Cambria (G9)</szName>
+		<szName>restaurant Cambria (G9)</szName>     <!-- 30 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1238,7 +1238,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>50</uiIndex>
-		<szName>restaurant Grumm (H1)</szName>
+		<szName>restaurant Grumm (H1)</szName>     <!-- 31 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1260,7 +1260,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>51</uiIndex>
-		<szName>restaurant Balime gas station (L10)</szName>
+		<szName>restaurant Balime gas station (L10)</szName>     <!-- 32 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1282,7 +1282,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>52</uiIndex>
-		<szName>restaurant San Mona (C5)</szName>
+		<szName>restaurant San Mona (C5)</szName>     <!-- 33 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1304,7 +1304,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>53</uiIndex>
-		<szName>restaurant Meduna 1 (O4)</szName>
+		<szName>restaurant Meduna 1 (O4)</szName>     <!-- 34 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1326,7 +1326,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>54</uiIndex>
-		<szName>restaurant Meduna 2 (O4)</szName>
+		<szName>restaurant Meduna 2 (O4)</szName>     <!-- 35 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1348,7 +1348,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>55</uiIndex>
-		<szName>wine store Drassen (D13)</szName>
+		<szName>wine store Drassen (D13)</szName>     <!-- 36 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1370,7 +1370,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>56</uiIndex>
-		<szName>wine store Alma (I14)</szName>
+		<szName>wine store Alma (I14)</szName>     <!-- 37 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1392,7 +1392,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>57</uiIndex>
-		<szName>wine store Cambria (G9)</szName>
+		<szName>wine store Cambria (G9)</szName>     <!-- 38 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1414,7 +1414,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>58</uiIndex>
-		<szName>wine store Grumm (H1)</szName>
+		<szName>wine store Grumm (H1)</szName>     <!-- 39 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1436,7 +1436,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>59</uiIndex>
-		<szName>wine store San Mona (C5)</szName>
+		<szName>wine store San Mona (C5)</szName>     <!-- 40 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1458,7 +1458,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>60</uiIndex>
-		<szName>drug dealer Cambria ruins (F9)</szName>
+		<szName>drug dealer Cambria ruins (F9)</szName>     <!-- 41 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.3</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1480,7 +1480,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>61</uiIndex>
-		<szName>tool shop Grumm (H1)</szName>
+		<szName>tool shop Grumm (H1)</szName>     <!-- 42 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.3</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1502,7 +1502,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>62</uiIndex>
-		<szName>hunting store San Mona (C6)</szName>
+		<szName>hunting store San Mona (C6)</szName>     <!-- 43 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1524,7 +1524,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>63</uiIndex>
-		<szName>construction materials store San Mona (C6)</szName>
+		<szName>construction materials store San Mona (C6)</szName>     <!-- 44 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1546,7 +1546,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>64</uiIndex>
-		<szName>luxury store Balime (L12)</szName>
+		<szName>luxury store Balime (L12)</szName>     <!-- 45 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>2.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1568,7 +1568,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>65</uiIndex>
-		<szName>luxury store Meduna (O4)</szName>
+		<szName>luxury store Meduna (O4)</szName>     <!-- 46 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>2.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1590,7 +1590,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>66</uiIndex>
-		<szName>restaurant San Mona (C6)</szName>
+		<szName>restaurant San Mona (C6)</szName>     <!-- 47 -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1612,7 +1612,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>67</uiIndex>
-		<szName>armour store San Mona (C6)</szName>
+		<szName>armour store San Mona (C6)</szName>     <!-- 48 -->
 		<dBuyModifier>0.66</dBuyModifier>
 		<dSellModifier>1.1</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>
@@ -1634,7 +1634,7 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
 		<uiIndex>68</uiIndex>
-		<szName>Black Market dealer San Mona (C6)</szName>
+		<szName>Black Market dealer San Mona (C6)</szName>     <!-- 49, but Blackmarket Inventory is set in Overhead.lua instead -->
 		<dBuyModifier>1.0</dBuyModifier>
 		<dSellModifier>1.0</dSellModifier>
 		<ubShopKeeperID>200</ubShopKeeperID>		<!-- Important: no profile -->
diff --git a/Data-1.13/TableData/NPCInventory/TinaInventory.xml b/Data-1.13/TableData/NPCInventory/TinaInventory.xml
index dd2e6d8a1..cefff236d 100644
--- a/Data-1.13/TableData/NPCInventory/TinaInventory.xml
+++ b/Data-1.13/TableData/NPCInventory/TinaInventory.xml
@@ -165,4 +165,9 @@
 		<sItemIndex>1709</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>33</uiIndex>
+		<sItemIndex>1763</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>
\ No newline at end of file
diff --git a/Data-1.13/tilesets/0/SMP2ITEMS.STI b/Data-1.13/tilesets/0/SMP2ITEMS.STI
index bd3ebf3ba..b73020121 100644
Binary files a/Data-1.13/tilesets/0/SMP2ITEMS.STI and b/Data-1.13/tilesets/0/SMP2ITEMS.STI differ