diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 048836662..6a4d0d2db 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -47435,6 +47435,7 @@
 		<usPrice>1</usPrice>
 		<ubCoolness>1</ubCoolness>
 		<ShowStatus>1</ShowStatus>
+		<TwoHanded>1</TwoHanded>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<ItemFlag>32768</ItemFlag>
 		<STAND_MODIFIERS />
@@ -48260,7 +48261,7 @@
 		<szLongItemName>Green shirt</szLongItemName>
 		<szItemDesc>A totally unremarkable green T-shirt.</szItemDesc>
 		<szBRName>Green shirt</szBRName>
-		<szBRDesc>Apparently we sell clothes now. Well, this is a T-shirt, you know?</szBRDesc>
+		<szBRDesc>When they said 'Go green', this wasn't what they meant.</szBRDesc>
 		<usItemClass>8192</usItemClass>
 		<nasLayoutClass>1</nasLayoutClass>
 		<ubGraphicType>2</ubGraphicType>
@@ -48382,7 +48383,7 @@
 		<uiIndex>1614</uiIndex>
 		<szItemName>Red shirt</szItemName>
 		<szLongItemName>Red shirt</szLongItemName>
-		<szItemDesc>Warning: Wearing this while talking increases your death risk tremendously.</szItemDesc>
+		<szItemDesc>Warning: Wearing this on duty talking increases your death risk tremendously.</szItemDesc>
 		<szBRName>Red shirt</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>8192</usItemClass>
@@ -48406,7 +48407,7 @@
 		<uiIndex>1615</uiIndex>
 		<szItemName>Jean shirt</szItemName>
 		<szLongItemName>Jean shirt</szLongItemName>
-		<szItemDesc>Warning: Wearing this while talking increases your death risk tremendously.</szItemDesc>
+		<szItemDesc>A jean shirt.</szItemDesc>
 		<szBRName>Jean shirt</szBRName>
 		<szBRDesc>Jean. What kind of colour is 'jean' anyway? Stupid colour names. In my days, you wore black and that was it.</szBRDesc>
 		<usItemClass>8192</usItemClass>
diff --git a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml
index 1cf63968d..8e95c34ca 100644
--- a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml
+++ b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml
@@ -459,61 +459,56 @@
 	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>94</uiIndex>
-		<sItemIndex>1611</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>95</uiIndex>
 		<sItemIndex>1612</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>96</uiIndex>
+		<uiIndex>95</uiIndex>
 		<sItemIndex>1613</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>97</uiIndex>
+		<uiIndex>96</uiIndex>
 		<sItemIndex>1614</sItemIndex>
 		<ubOptimalNumber>0</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>98</uiIndex>
+		<uiIndex>97</uiIndex>
 		<sItemIndex>1615</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>99</uiIndex>
+		<uiIndex>98</uiIndex>
 		<sItemIndex>1616</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>100</uiIndex>
+		<uiIndex>99</uiIndex>
 		<sItemIndex>1617</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>101</uiIndex>
+		<uiIndex>100</uiIndex>
 		<sItemIndex>1618</sItemIndex>
 		<ubOptimalNumber>0</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>102</uiIndex>
+		<uiIndex>101</uiIndex>
 		<sItemIndex>1619</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>103</uiIndex>
+		<uiIndex>102</uiIndex>
 		<sItemIndex>1620</sItemIndex>
 		<ubOptimalNumber>0</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>104</uiIndex>
+		<uiIndex>103</uiIndex>
 		<sItemIndex>1621</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>105</uiIndex>
+		<uiIndex>104</uiIndex>
 		<sItemIndex>1622</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
diff --git a/gamedir/Data-1.13/TableData/NPCInventory/TinaInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/TinaInventory.xml
index ce847da38..c66aeace5 100644
--- a/gamedir/Data-1.13/TableData/NPCInventory/TinaInventory.xml
+++ b/gamedir/Data-1.13/TableData/NPCInventory/TinaInventory.xml
@@ -22,146 +22,141 @@
 	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>4</uiIndex>
-		<sItemIndex>1611</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
 		<sItemIndex>1612</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>6</uiIndex>
+		<uiIndex>5</uiIndex>
 		<sItemIndex>1613</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>7</uiIndex>
+		<uiIndex>6</uiIndex>
 		<sItemIndex>1615</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>8</uiIndex>
+		<uiIndex>7</uiIndex>
 		<sItemIndex>1616</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>9</uiIndex>
+		<uiIndex>8</uiIndex>
 		<sItemIndex>1617</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>10</uiIndex>
+		<uiIndex>9</uiIndex>
 		<sItemIndex>1619</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>11</uiIndex>
+		<uiIndex>10</uiIndex>
 		<sItemIndex>1621</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>12</uiIndex>
+		<uiIndex>11</uiIndex>
 		<sItemIndex>1622</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>	
 	<INVENTORY>
-		<uiIndex>13</uiIndex>
+		<uiIndex>12</uiIndex>
 		<sItemIndex>1079</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>14</uiIndex>
+		<uiIndex>13</uiIndex>
 		<sItemIndex>1080</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>15</uiIndex>
+		<uiIndex>14</uiIndex>
 		<sItemIndex>1081</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>16</uiIndex>
+		<uiIndex>15</uiIndex>
 		<sItemIndex>1082</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>17</uiIndex>
+		<uiIndex>16</uiIndex>
 		<sItemIndex>1083</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>18</uiIndex>
+		<uiIndex>17</uiIndex>
 		<sItemIndex>1084</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>19</uiIndex>
+		<uiIndex>18</uiIndex>
 		<sItemIndex>1086</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>20</uiIndex>
+		<uiIndex>19</uiIndex>
 		<sItemIndex>1087</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>21</uiIndex>
+		<uiIndex>20</uiIndex>
 		<sItemIndex>1088</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>22</uiIndex>
+		<uiIndex>21</uiIndex>
 		<sItemIndex>1089</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>23</uiIndex>
+		<uiIndex>22</uiIndex>
 		<sItemIndex>1090</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>24</uiIndex>
+		<uiIndex>23</uiIndex>
 		<sItemIndex>1091</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>25</uiIndex>
+		<uiIndex>24</uiIndex>
 		<sItemIndex>1093</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>26</uiIndex>
+		<uiIndex>25</uiIndex>
 		<sItemIndex>1094</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>27</uiIndex>
+		<uiIndex>26</uiIndex>
 		<sItemIndex>1095</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>28</uiIndex>
+		<uiIndex>27</uiIndex>
 		<sItemIndex>1096</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>29</uiIndex>
+		<uiIndex>28</uiIndex>
 		<sItemIndex>1097</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>30</uiIndex>
+		<uiIndex>29</uiIndex>
 		<sItemIndex>1098</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>31</uiIndex>
+		<uiIndex>30</uiIndex>
 		<sItemIndex>1099</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>32</uiIndex>
+		<uiIndex>31</uiIndex>
 		<sItemIndex>311</sItemIndex>
 		<ubOptimalNumber>10</ubOptimalNumber>
 	</INVENTORY>