diff --git a/gamedir/Data-1.13/Morale_Settings.INI b/gamedir/Data-1.13/Morale_Settings.INI
index 76c86b3d9..818291f1e 100644
--- a/gamedir/Data-1.13/Morale_Settings.INI
+++ b/gamedir/Data-1.13/Morale_Settings.INI
@@ -120,10 +120,6 @@ MORALE_PREVENTED_MISBEHAVIOUR = -1
 ; limits maximum range < -MORALE_MOD_MAX, MORALE_MOD_MAX > of morale change during hourly update (0-100)
 MORALE_MOD_MAX = 50
 
-; modifies how strong effect alcohol and drugs have on morale (in percents, 0 - 10000)
-DRUG_EFFECT_MORALE_MOD = 150
-ALCOHOL_EFFECT_MORALE_MOD = 160
-
 PHOBIC_LIMIT = 20
 
 ; modifiers to morale gain depending on merc character (only if new trait system is on)
diff --git a/gamedir/Data-1.13/TableData/Backgrounds.xml b/gamedir/Data-1.13/TableData/Backgrounds.xml
index 51be97d0f..02c7aecb7 100644
--- a/gamedir/Data-1.13/TableData/Backgrounds.xml
+++ b/gamedir/Data-1.13/TableData/Backgrounds.xml
@@ -85,6 +85,9 @@
 		<disease_treatment>0</disease_treatment>          <!-- +- % effectiveness on treating civilians against disease, -50 to 50 -->
 		<tracker_ability>0</tracker_ability>			  <!-- + % range on tracking ability, see [Ranger] in Skills_Setings.ini, 0 to 40 -->
 		<ambush_radius>0</ambush_radius>				  <!-- + % bonus on ambush range, see AMBUSH_MERCS_SPREAD_RADIUS in JA2_Options.ini, 0 to 50 -->
+		<smoker>0</smoker>								  <!-- 0: doesn't care about smoking 
+															   1: smoker: consumes cigarettes, dislikes anti-smokers 
+															   2: anti-smoker: refuses to smoke, dislikes smokers-->
 
 		<dislikebackground>0</dislikebackground>          <!-- dislike everybody with a background that has the negative of this value -->
 
@@ -125,6 +128,7 @@
 		<drink_energyregen>10</drink_energyregen>
 		<capitulation>15</capitulation>
 		<spotter>5</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -184,6 +188,7 @@
 		<carrystrength>3</carrystrength>
 		<approach_direct>8</approach_direct>
 		<approach_threaten>5</approach_threaten>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -229,6 +234,7 @@
 		<traplevel>1</traplevel>
 		<ap_inventory>-10</ap_inventory> 
 		<insurance>40</insurance>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -269,6 +275,7 @@
 		<drink_energyregen>15</drink_energyregen>
 		<capitulation>10</capitulation>
 		<spotter>3</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -319,6 +326,7 @@
 		<spotter>5</spotter>
 		<food>-20</food>
 		<water>-5</water>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -365,6 +373,7 @@
 		<traplevel>1</traplevel>
 		<spotter>3</spotter>
 		<insurance>50</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -392,6 +401,7 @@
 		<capitulation>10</capitulation>
 		<insurance>20</insurance>
 		<spotter>5</spotter>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -409,6 +419,7 @@
 		<resistance_suppression>10</resistance_suppression>
 		<insurance>40</insurance>
 		<spotter>3</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -448,6 +459,7 @@
 		<approach_recruit>10</approach_recruit>
 		<carrystrength>-5</carrystrength>
 		<spotter>3</spotter>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -475,6 +487,7 @@
 		<agility>-8</agility>
 		<spotter>5</spotter>
 		<capitulation>25</capitulation>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -502,6 +515,7 @@
 		<carrystrength>3</carrystrength>
 		<prisonguard>10</prisonguard>
 		<increased_maxcth>3</increased_maxcth>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -522,6 +536,7 @@
 		<spotter>3</spotter>
 		<capitulation>10</capitulation>
 		<xenophobic>1</xenophobic>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -540,6 +555,7 @@
 		<ap_assault>-5</ap_assault>
 		<cth_blades>5</cth_blades> 
 		<speed_bandaging>25</speed_bandaging>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -582,6 +598,7 @@
 		<carrystrength>50</carrystrength>
 		<spotter>3</spotter>
 		<prisonguard>300</prisonguard>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 		<dislikebackground>-1</dislikebackground>
@@ -608,6 +625,7 @@
 		<capitulation>15</capitulation>
 		<spotter>5</spotter>
 		<insurance>-20</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -636,6 +654,7 @@
 		<spotter>15</spotter>
 		<capitulation>15</capitulation>
 		<insurance>-20</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -678,6 +697,7 @@
 		<prisonguard>75</prisonguard>
 		<breachingcharge>50</breachingcharge>
 		<spotter>15</spotter>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 		<dislikebackground>-2</dislikebackground>
@@ -706,6 +726,7 @@
 		<capitulation>15</capitulation>
 		<insurance>-20</insurance>
 		<druguse>1</druguse>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -772,6 +793,7 @@
 		<drink_energyregen>66</drink_energyregen>
 		<carrystrength>6</carrystrength>
 		<insurance>66</insurance>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -792,6 +814,7 @@
 		<breachingcharge>20</breachingcharge>
 		<spotter>3</spotter>
 		<scrounging>1</scrounging>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 		<dislikebackground>2</dislikebackground>
@@ -812,6 +835,7 @@
 		<approach_recruit>5</approach_recruit>
 		<spotter>3</spotter>
 		<capitulation>10</capitulation>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -835,6 +859,7 @@
 		<spotter>5</spotter>
 		<capitulation>15</capitulation>
 		<insurance>-20</insurance>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -849,6 +874,7 @@
 		<resistance_physical>5</resistance_physical>
 		<resistance_fear>3</resistance_fear>
 		<spotter>3</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -868,6 +894,7 @@
 		<resistance_alcohol>-20</resistance_alcohol>
 		<meleedamage>6</meleedamage>
 		<cth_blades>3</cth_blades>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -897,6 +924,7 @@
 		<capitulation>10</capitulation>
 		<spotter>3</spotter>
 		<insurance>40</insurance>
+		<smoker>1</smoker>
 		<druguse>1</druguse>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
@@ -917,6 +945,7 @@
 		<resistance_fear>5</resistance_fear>
 		<resistance_suppression>5</resistance_suppression>
 		<resistance_alcohol>10</resistance_alcohol>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -989,6 +1018,7 @@
 		<resistance_suppression>-10</resistance_suppression>
 		<spotter>-5</spotter>
 		<insurance>25</insurance>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1006,6 +1036,7 @@
 		<approach_threaten>10</approach_threaten>
 		<capitulation>10</capitulation>
 		<spotter>3</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1034,6 +1065,7 @@
 		<resistance_fear>-20</resistance_fear>
 		<resistance_suppression>-20</resistance_suppression>
 		<spotter>-10</spotter>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1056,6 +1088,7 @@
 		<spotter>2</spotter>
 		<druguse>1</druguse>
 		<insurance>15</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1087,6 +1120,7 @@
 		<traplevel>1</traplevel>
 		<drink_energyregen>10</drink_energyregen>
 		<druguse>1</druguse>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>  
@@ -1134,7 +1168,7 @@
 		<betterprices_guns>10</betterprices_guns>
 		<betterprices>10</betterprices>
 		<resistance_alcohol>5</resistance_alcohol>
-		<druguse>1</druguse>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1180,6 +1214,7 @@
 		<spotter>3</spotter>
 		<scrounging>1</scrounging>
 		<insurance>50</insurance>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1204,6 +1239,7 @@
 		<druguse>1</druguse>
 		<scrounging>1</scrounging>
 		<insurance>100</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1246,6 +1282,7 @@
 		<stealth>2</stealth>
 		<approach_recruit>-15</approach_recruit>
 		<druguse>1</druguse>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>				
 	</BACKGROUND>
@@ -1342,6 +1379,7 @@
 		<capitulation>12</capitulation>
 		<travel_foot>5</travel_foot>
 		<approach_recruit>15</approach_recruit>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 		<loyalitylossondeath>1</loyalitylossondeath>
@@ -1367,6 +1405,7 @@
 		<travel_foot>5</travel_foot>
 		<approach_threaten>10</approach_threaten>
 		<level_underground>1</level_underground>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1394,6 +1433,7 @@
 		<spotter>9</spotter>
 		<disease_diagnose>30</disease_diagnose>
 		<disease_treatment>25</disease_treatment>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1436,6 +1476,7 @@
 		<resistance_alcohol>5</resistance_alcohol>
 		<insurance>60</insurance>
 		<stealth>4</stealth>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1539,6 +1580,7 @@
 		<hearing_night>2</hearing_night>
 		<druguse>1</druguse>
 		<level_underground>1</level_underground>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 		<dislikebackground>1</dislikebackground>
@@ -1587,6 +1629,7 @@
 		<speed_bandaging>20</speed_bandaging>
 		<betterprices>3</betterprices>
 		<approach_friendly>10</approach_friendly>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -1647,6 +1690,7 @@
 		<drink_energyregen>20</drink_energyregen>
 		<scrounging>1</scrounging>
 		<druguse>1</druguse>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3327,6 +3371,7 @@
 		<speed_bandaging>10</speed_bandaging>
 		<approach_friendly>4</approach_friendly>
 		<spotter>2</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3349,6 +3394,7 @@
 		<spotter>5</spotter>
 		<capitulation>15</capitulation>
 		<insurance>-20</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3403,6 +3449,7 @@
 		<insurance>20</insurance>
 		<tracker_ability>20</tracker_ability>
 		<ambush_radius>8</ambush_radius>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3501,6 +3548,7 @@
 		<approach_recruit>5</approach_recruit>
 		<spotter>3</spotter>
 		<capitulation>10</capitulation>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3515,6 +3563,7 @@
 		<resistance_physical>7</resistance_physical>
 		<resistance_fear>3</resistance_fear>
 		<spotter>3</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3558,6 +3607,7 @@
 		<cth_blades>4</cth_blades>
 		<resistance_fear>3</resistance_fear>
 		<insurance>10</insurance>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3598,6 +3648,7 @@
 		<ambush_radius>30</ambush_radius>
 		<traplevel>1</traplevel>
 		<spotter>5</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3625,6 +3676,7 @@
 		<approach_recruit>-50</approach_recruit>
 		<insurance>100</insurance>
 		<druguse>1</druguse>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3640,6 +3692,7 @@
 		<hearing_day>2</hearing_day>
 		<interrogation>50</interrogation>
 		<spotter>10</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3685,6 +3738,7 @@
 		<approach_friendly>-5</approach_friendly>
 		<approach_threaten>10</approach_threaten>
 		<resistance_disease>-20</resistance_disease>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3708,6 +3762,7 @@
 		<capitulation>15</capitulation>
 		<approach_friendly>7</approach_friendly>
 		<insurance>100</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3763,6 +3818,7 @@
 		<resistance_fear>5</resistance_fear>
 		<speed_bandaging>20</speed_bandaging>
 		<approach_friendly>10</approach_friendly>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3791,6 +3847,7 @@
 		<spotter>-10</spotter>
 		<capitulation>-30</capitulation>
 		<insurance>20</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3837,6 +3894,7 @@
 		<approach_recruit>3</approach_recruit>
 		<meleedamage>-3</meleedamage>
 		<xenophobic>1</xenophobic>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3862,6 +3920,7 @@
 		<water>-5</water>
 		<drink_energyregen>25</drink_energyregen>
 		<carrystrength>6</carrystrength>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4225,6 +4284,7 @@
 		<speed_run>2</speed_run>
 		<spotter>2</spotter>
 		<insurance>-20</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>	
 	</BACKGROUND>
@@ -4285,6 +4345,7 @@
 		<capitulation>15</capitulation>
 		<spotter>5</spotter>
 		<insurance>-20</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4310,6 +4371,7 @@
 		<spotter>2</spotter>
 		<xenophobic>1</xenophobic>
 		<insurance>50</insurance>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4330,6 +4392,7 @@
 		<approach_friendly>20</approach_friendly>
 		<approach_threaten>-20</approach_threaten>
 		<disarm_trap>10</disarm_trap>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4355,6 +4418,7 @@
 		<hearing_night>1</hearing_night>
 		<hearing_day>1</hearing_day>
 		<spotter>3</spotter>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4405,6 +4469,7 @@
 		<resistance_fear>-10</resistance_fear>
 		<drink_energyregen>-10</drink_energyregen>
 		<scrounging>1</scrounging>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4473,6 +4538,7 @@
 		<capitulation>15</capitulation>
 		<spotter>5</spotter>
 		<insurance>-20</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4545,6 +4611,7 @@
 		<capitulation>15</capitulation>
 		<tracker_ability>10</tracker_ability>
 		<ambush_radius>20</ambush_radius>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4572,6 +4639,7 @@
 		<breachingcharge>20</breachingcharge>
 		<spotter>3</spotter>
 		<scrounging>1</scrounging>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 		<dislikebackground>1</dislikebackground>
@@ -4585,6 +4653,7 @@
 		<marksmanship>8</marksmanship>
 		<increased_maxcth>3</increased_maxcth>
 		<spotter>9</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4658,7 +4727,8 @@
 		<approach_recruit>10</approach_recruit>
 		<meleedamage>3</meleedamage>
 		<cth_blades>3</cth_blades>
-		<scrounging>1</scrounging> 
+		<scrounging>1</scrounging>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4723,6 +4793,7 @@
 		<disarm_trap>10</disarm_trap>
 		<traplevel>1</traplevel>
 		<insurance>20</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4740,6 +4811,7 @@
 		<ap_airdrop>-5</ap_airdrop>
 		<cth_blades>5</cth_blades> 
 		<speed_bandaging>25</speed_bandaging>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>		
 	</BACKGROUND>
@@ -4799,6 +4871,7 @@
 		<interrogation>-15</interrogation>
 		<camo>10</camo>
 		<stealth>10</stealth>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4819,6 +4892,7 @@
 		<drink_energyregen>15</drink_energyregen>
 		<camo>5</camo>
 		<spotter>2</spotter>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4845,6 +4919,7 @@
 		<approach_threaten>-10</approach_threaten>
 		<approach_recruit>10</approach_recruit>
 		<scrounging>1</scrounging>
+		<smoker>2</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4927,6 +5002,7 @@
 		<disarm_trap>10</disarm_trap>
 		<traplevel>1</traplevel>
 		<insurance>20</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -4991,6 +5067,7 @@
 		<traplevel>1</traplevel>
 		<spotter>-5</spotter>
 		<insurance>50</insurance>
+		<smoker>1</smoker>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
diff --git a/gamedir/Data-1.13/TableData/Disease.xml b/gamedir/Data-1.13/TableData/Disease.xml
index 28db0f810..644062c7b 100644
--- a/gamedir/Data-1.13/TableData/Disease.xml
+++ b/gamedir/Data-1.13/TableData/Disease.xml
@@ -40,6 +40,7 @@
 		<sNeedToSleep>1</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>1</uiIndex>
@@ -82,6 +83,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>400</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>2</uiIndex>
@@ -124,6 +126,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>200</sDrinkModifier>
 		<sFoodModifier>200</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>3</uiIndex>
@@ -166,6 +169,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>4</uiIndex>
@@ -208,6 +212,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>5</uiIndex>
@@ -250,6 +255,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>400</sDrinkModifier>
 		<sFoodModifier>200</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>6</uiIndex>
@@ -292,6 +298,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>900</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>7</uiIndex>
@@ -334,6 +341,7 @@
 		<sNeedToSleep>1</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>8</uiIndex>
@@ -376,6 +384,7 @@
 		<sNeedToSleep>2</sNeedToSleep>
 		<sDrinkModifier>100</sDrinkModifier>
 		<sFoodModifier>100</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>	
 	<DISEASE>
 		<uiIndex>9</uiIndex>
@@ -418,6 +427,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>10</uiIndex>
@@ -460,6 +470,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>0.95</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>11</uiIndex>
@@ -502,6 +513,7 @@
 		<sNeedToSleep>1</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>0.9</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>12</uiIndex>
@@ -544,6 +556,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>13</uiIndex>
@@ -586,6 +599,7 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 	<DISEASE>
 		<uiIndex>14</uiIndex>
@@ -628,5 +642,136 @@
 		<sNeedToSleep>0</sNeedToSleep>
 		<sDrinkModifier>0</sDrinkModifier>
 		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
+	</DISEASE>
+	<DISEASE>
+		<uiIndex>15</uiIndex>
+		<szName>Drug Addiction</szName>
+		<szFatName>|D|r|u|g |A|d|d|i|c|t|i|o|n</szFatName>
+		<szDescription>You've become addicted to various substances. Until your body has removed all traces of drugs, you will suffer from withdrawal.</szDescription>
+		<sInfectionPtsInitial>100</sInfectionPtsInitial>
+		<sInfectionPtsOutbreak>1000</sInfectionPtsOutbreak>
+		<sInfectionPtsFull>2000</sInfectionPtsFull>
+		<sInfectionPtsGainPerHour>-20</sInfectionPtsGainPerHour>		
+		<InfectionChance_SWAMP>0</InfectionChance_SWAMP>
+		<InfectionChance_TROPICS>0</InfectionChance_TROPICS>
+		<InfectionChance_SEX>0</InfectionChance_SEX>
+		<InfectionChance_CONTACT_HUMAN>0</InfectionChance_CONTACT_HUMAN>
+		<InfectionChance_CONTACT_CORPSE>0</InfectionChance_CONTACT_CORPSE>
+		<InfectionChance_WOUND_ANIMAL>0</InfectionChance_WOUND_ANIMAL>
+		<InfectionChance_WOUND_OPEN>0</InfectionChance_WOUND_OPEN>
+		<InfectionChance_WOUND_GUNSHOT>0</InfectionChance_WOUND_GUNSHOT>
+		<InfectionChance_WOUND_AGI>0</InfectionChance_WOUND_AGI>
+		<InfectionChance_WOUND_DEX>0</InfectionChance_WOUND_DEX>
+		<InfectionChance_WOUND_STR>0</InfectionChance_WOUND_STR>
+		<InfectionChance_WOUND_WIS>0</InfectionChance_WOUND_WIS>
+		<InfectionChance_WOUND_TRAUMATIC>0</InfectionChance_WOUND_TRAUMATIC>
+		<InfectionChance_BADFOOD>0</InfectionChance_BADFOOD>
+		<InfectionChance_BADWATER>0</InfectionChance_BADWATER>
+		<fCanBeCured>0</fCanBeCured>
+		<fReverseOnFull>0</fReverseOnFull>
+		<fCanReInfect>1</fCanReInfect>
+		<fHideSymbol>1</fHideSymbol>
+		<fDisgusting>1</fDisgusting>
+		<sEffStatAGI>-20</sEffStatAGI>
+		<sEffStatDEX>-40</sEffStatDEX>
+		<sEffStatSTR>-20</sEffStatSTR>
+		<sEffStatWIS>-20</sEffStatWIS>
+		<sEffStatEXP>-2</sEffStatEXP>
+		<sEffAP>-20</sEffAP>
+		<usMaxBreath>6</usMaxBreath>
+		<sEffCarryStrength>0</sEffCarryStrength>
+		<sLifeRegenHundreds>-40</sLifeRegenHundreds>
+		<sNeedToSleep>1</sNeedToSleep>
+		<sDrinkModifier>200</sDrinkModifier>
+		<sFoodModifier>100</sFoodModifier>
+		<moralemodifier>0.3</moralemodifier>
+	</DISEASE>
+	<DISEASE>
+		<uiIndex>16</uiIndex>
+		<szName>Hungover</szName>
+		<szFatName>|H|u|n|g|o|v|e|r</szFatName>
+		<szDescription>That last beer was definitely spoiled.</szDescription>
+		<sInfectionPtsInitial>10</sInfectionPtsInitial>
+		<sInfectionPtsOutbreak>112</sInfectionPtsOutbreak>
+		<sInfectionPtsFull>280</sInfectionPtsFull>
+		<sInfectionPtsGainPerHour>-9</sInfectionPtsGainPerHour>		
+		<InfectionChance_SWAMP>0</InfectionChance_SWAMP>
+		<InfectionChance_TROPICS>0</InfectionChance_TROPICS>
+		<InfectionChance_SEX>0</InfectionChance_SEX>
+		<InfectionChance_CONTACT_HUMAN>0</InfectionChance_CONTACT_HUMAN>
+		<InfectionChance_CONTACT_CORPSE>0</InfectionChance_CONTACT_CORPSE>
+		<InfectionChance_WOUND_ANIMAL>0</InfectionChance_WOUND_ANIMAL>
+		<InfectionChance_WOUND_OPEN>0</InfectionChance_WOUND_OPEN>
+		<InfectionChance_WOUND_GUNSHOT>0</InfectionChance_WOUND_GUNSHOT>
+		<InfectionChance_WOUND_AGI>0</InfectionChance_WOUND_AGI>
+		<InfectionChance_WOUND_DEX>0</InfectionChance_WOUND_DEX>
+		<InfectionChance_WOUND_STR>0</InfectionChance_WOUND_STR>
+		<InfectionChance_WOUND_WIS>0</InfectionChance_WOUND_WIS>
+		<InfectionChance_WOUND_TRAUMATIC>0</InfectionChance_WOUND_TRAUMATIC>
+		<InfectionChance_BADFOOD>0</InfectionChance_BADFOOD>
+		<InfectionChance_BADWATER>0</InfectionChance_BADWATER>
+		<fCanBeCured>0</fCanBeCured>
+		<fReverseOnFull>0</fReverseOnFull>
+		<fCanReInfect>1</fCanReInfect>
+		<fHideSymbol>1</fHideSymbol>
+		<fDisgusting>0</fDisgusting>
+		<sEffStatAGI>-20</sEffStatAGI>
+		<sEffStatDEX>0</sEffStatDEX>
+		<sEffStatSTR>0</sEffStatSTR>
+		<sEffStatWIS>-20</sEffStatWIS>
+		<sEffStatEXP>-4</sEffStatEXP>
+		<sEffAP>-20</sEffAP>
+		<usMaxBreath>0</usMaxBreath>
+		<sEffCarryStrength>0</sEffCarryStrength>
+		<sLifeRegenHundreds>0</sLifeRegenHundreds>
+		<sNeedToSleep>4</sNeedToSleep>
+		<sDrinkModifier>40</sDrinkModifier>
+		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>0.5</moralemodifier>
+	</DISEASE>
+	<DISEASE>
+		<!-- As cancer grows over a long time, it does not grow on itself ingame, only by consuming cigarettes -->
+		<uiIndex>17</uiIndex>
+		<szName>Lung Cancer</szName>
+		<szFatName>|L|u|n|g |C|a|n|c|e|r</szFatName>
+		<szDescription>Lung cancer is a malignant lung tumor characterized by uncontrolled cell growth in tissues of the lung. If left untreated, this growth can spread beyond the lung.</szDescription>
+		<sInfectionPtsInitial>100</sInfectionPtsInitial>
+		<sInfectionPtsOutbreak>1000</sInfectionPtsOutbreak>
+		<sInfectionPtsFull>3000</sInfectionPtsFull>
+		<sInfectionPtsGainPerHour>0</sInfectionPtsGainPerHour>		
+		<InfectionChance_SWAMP>0</InfectionChance_SWAMP>
+		<InfectionChance_TROPICS>0</InfectionChance_TROPICS>
+		<InfectionChance_SEX>0</InfectionChance_SEX>
+		<InfectionChance_CONTACT_HUMAN>0</InfectionChance_CONTACT_HUMAN>
+		<InfectionChance_CONTACT_CORPSE>0</InfectionChance_CONTACT_CORPSE>
+		<InfectionChance_WOUND_ANIMAL>0</InfectionChance_WOUND_ANIMAL>
+		<InfectionChance_WOUND_OPEN>0</InfectionChance_WOUND_OPEN>
+		<InfectionChance_WOUND_GUNSHOT>0</InfectionChance_WOUND_GUNSHOT>
+		<InfectionChance_WOUND_AGI>0</InfectionChance_WOUND_AGI>
+		<InfectionChance_WOUND_DEX>0</InfectionChance_WOUND_DEX>
+		<InfectionChance_WOUND_STR>0</InfectionChance_WOUND_STR>
+		<InfectionChance_WOUND_WIS>0</InfectionChance_WOUND_WIS>
+		<InfectionChance_WOUND_TRAUMATIC>0</InfectionChance_WOUND_TRAUMATIC>
+		<InfectionChance_BADFOOD>0</InfectionChance_BADFOOD>
+		<InfectionChance_BADWATER>0</InfectionChance_BADWATER>
+		<fCanBeCured>0</fCanBeCured>
+		<fReverseOnFull>0</fReverseOnFull>
+		<fCanReInfect>1</fCanReInfect>
+		<fHideSymbol>1</fHideSymbol>
+		<fDisgusting>0</fDisgusting>
+		<sEffStatAGI>0</sEffStatAGI>
+		<sEffStatDEX>0</sEffStatDEX>
+		<sEffStatSTR>0</sEffStatSTR>
+		<sEffStatWIS>0</sEffStatWIS>
+		<sEffStatEXP>0</sEffStatEXP>
+		<sEffAP>-8</sEffAP>
+		<usMaxBreath>20</usMaxBreath>
+		<sEffCarryStrength>-10</sEffCarryStrength>
+		<sLifeRegenHundreds>-50</sLifeRegenHundreds>
+		<sNeedToSleep>0</sNeedToSleep>
+		<sDrinkModifier>0</sDrinkModifier>
+		<sFoodModifier>0</sFoodModifier>
+		<moralemodifier>1.0</moralemodifier>
 	</DISEASE>
 </DISEASESLIST>
diff --git a/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml b/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml
index b1cdd5fe4..d6a7698f4 100644
--- a/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>45</ubChoices>
+		<ubChoices>47</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -379,8 +379,8 @@
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
 		<bItemNo45>1626</bItemNo45>
-		<bItemNo46>0</bItemNo46>
-		<bItemNo47>0</bItemNo47>
+		<bItemNo46>1536</bItemNo46>
+		<bItemNo47>1537</bItemNo47>
 		<bItemNo48>0</bItemNo48>
 		<bItemNo49>0</bItemNo49>
 		<bItemNo50>0</bItemNo50>
diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml
index b1cdd5fe4..d6a7698f4 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>45</ubChoices>
+		<ubChoices>47</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -379,8 +379,8 @@
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
 		<bItemNo45>1626</bItemNo45>
-		<bItemNo46>0</bItemNo46>
-		<bItemNo47>0</bItemNo47>
+		<bItemNo46>1536</bItemNo46>
+		<bItemNo47>1537</bItemNo47>
 		<bItemNo48>0</bItemNo48>
 		<bItemNo49>0</bItemNo49>
 		<bItemNo50>0</bItemNo50>
diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml
index 72397619e..a54ebcc3b 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>46</ubChoices>
+		<ubChoices>48</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -380,8 +380,8 @@
 		<bItemNo44>1576</bItemNo44>
 		<bItemNo45>1626</bItemNo45>
 		<bItemNo46>1709</bItemNo46>
-		<bItemNo47>0</bItemNo47>
-		<bItemNo48>0</bItemNo48>
+		<bItemNo47>1536</bItemNo47>
+		<bItemNo48>1537</bItemNo48>
 		<bItemNo49>0</bItemNo49>
 		<bItemNo50>0</bItemNo50>
 	</ENEMYITEMCHOICES>
diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml
index b1cdd5fe4..d6a7698f4 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>45</ubChoices>
+		<ubChoices>47</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -379,8 +379,8 @@
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
 		<bItemNo45>1626</bItemNo45>
-		<bItemNo46>0</bItemNo46>
-		<bItemNo47>0</bItemNo47>
+		<bItemNo46>1536</bItemNo46>
+		<bItemNo47>1537</bItemNo47>
 		<bItemNo48>0</bItemNo48>
 		<bItemNo49>0</bItemNo49>
 		<bItemNo50>0</bItemNo50>
diff --git a/gamedir/Data-1.13/TableData/Items/Drugs.xml b/gamedir/Data-1.13/TableData/Items/Drugs.xml
index e9d7f9743..c4c9dd46c 100644
--- a/gamedir/Data-1.13/TableData/Items/Drugs.xml
+++ b/gamedir/Data-1.13/TableData/Items/Drugs.xml
@@ -1,332 +1,767 @@
 <!--
+<uiIndex>				number referred to by DrugType in Items.xml
+<szName>				name of drug
+<opinionevent>			if 1, other mercs will complain about drug use
 
-You can now select several drug components and build your own drugs from them.
+There can be multiple <DRUG_EFFECT>, even of the same type.
+possible drug effects:
+		DRUG_EFFECT_HP			0
+		DRUG_EFFECT_BP			1
+		DRUG_EFFECT_AP			2
+		DRUG_EFFECT_MORALE		3
+		DRUG_EFFECT_PHYS_RES	4
+		DRUG_EFFECT_STR			5
+		DRUG_EFFECT_AGI			6
+		DRUG_EFFECT_DEX			7
+		DRUG_EFFECT_WIS			8
 
-<ubType> 
-	is the number of the component, the specific effects are hardcoded (couldn't externalise those, or I'd need A LOT more tags).
-<ubDrugTravelRate>
-	determines how fast the drug comes to its full effect.
-<ubDrugWearoffRate>
-	determines how fast the drug effect will wear out.
-<ubDrugEffect>
-	measures the effect a drug has. As long as this value is > 0 the drug will have its main effect. 
-<ubDrugSideEffect>
-	measures the drugs sideeffect. This starts once <ubDrugEffect> hits 0. This starts the second effect, which is mostly negative.
-<ubDrugSideEffectRate>
-	determines how fast the sideeffect will wear out.
-<ubMoralBacklash>
-	determines if there will be a morale drop once the <ubDrugEffect> hits 0.
-<ubDiseaseCure>
-  cures the amount of an outbreak of disease x - 1
-	
-How do you make a drug?
-- Simply create a new Item in the Items.xml with the following values set:
+<duration> 				is how many turns this lasts
+<size> 					is how strong the effect is. This can be positive or negative.
+If <chance> is set, this is the chance that this effect is applied when consuming drug
 
-	<usItemClass>268435456</usItemClass>     // always set this to 268435456
-	<Medical>1</Medical>                     // always set this to 1
-	<DrugType>30824</DrugType>				 // Set the drug type effect here. List below:
+There can be multiple <DISEASE_EFFECT>, even of the same type.
+<disease> 				refers to a disease from Disease.xml
+<size> 					is how many points are added to this disease. This can be positive (increase disease) or negative (cure disease)
+If <chance> is set, this is the chance that this effect is applied when consuming drug
 
-<DrugType> effect Flag in Items.xml:
+There can be multiple <DISABILITY_EFFECT>, even of the same type. For the duration of the effect, the merc will gain an extra disability.
+Note: Currently only one such effect per time is allowed, additional effects overwrite previous ones.
+<disability> 			refers to a disability:
+		HEAT_INTOLERANT			1
+		NERVOUS					2
+		CLAUSTROPHOBIC			3
+		NONSWIMMER				4
+		FEAR_OF_INSECTS			5
+		FORGETFUL				6
+		PSYCHO					7
+		DEAF					8
+		SHORTSIGHTED			9
+		
+<duration> 				is how many turns this lasts
+If <chance> is set, this is the chance that this effect is applied when consuming drug
 
-	1        DRUG_ADRENALINE		vanilla adrenaline
-	2        DRUG_ALCOHOL			vanilla alcohol
-	4        DRUG_REGENERATION		vanilla health regeneration
-	8        DRUG_DAMAGERESISTANCE	damage resistance of up to 25%/-20%
-	16       DRUG_STRENGTH			increases strength up to 25 points, lowers it by up to 10 as a side effect
-	32       DRUG_AGILITY			increases agility up to 25 points, lowers it by up to 10 as a side effect
-	64       DRUG_DEXTERITY   		increases dexterity up to 25 points, lowers it by up to 10 as a side effect
-	128      DRUG_WISDOM   			increases wisdom up to 25 points, lowers it by up to 10 as a side effect
-	256      DRUG_PERCEPTION		+/- 1 level during interrupts
-	512      DRUG_PSYCHO			merc gets the 'psycho' disability while drug/side effect lasts
-	1024     DRUG_NERVOUS			merc gets the 'nervous' disability while drug/side effect lasts
-	2048     DRUG_CLAUSTROPHOBIC	merc gets the 'claustrophobic' disability while drug/side effect lasts
-	4096     DRUG_HEATINTOLERANT	merc gets the 'heat intolerant' disability while drug/side effect lasts
-	8192     DRUG_FEAROFINSECTS		merc gets the 'fear of insects' disability while drug/side effect lasts
-	16384    DRUG_FORGETFUL			merc gets the 'forgetful' disability while drug/side effect lasts
-	32768    DRUG_BLIND 			merc goes blind for 2 turns once side effect hits 1
-	65536    DRUG_KNOCKOUT 			heart attack once side effect hits 1 (lose all breath and fall down)
-	131072   DRUG_VISION 			increases sight range 10% on drug effect, decreases it 10% as a side effect
-	262144   DRUG_TUNNELVISION 		increases tunnelvison, side effect only
-	524288   DRUG_LIFEDAMAGE 		damages life, sideeffect only
-	1048576  DRUG_CUREPOISON		cures poison
-	2097152  DRUG_STUNANDKILL   stuns the target for its duration. Can be lethal if overdosed (depends on bodytype)
-
-You can combine "mix" different drug effects.
-For example, the new drug 'Occulin' has a <DrugType>425984</DrugType>. This gives it the effects of DRUG_BLIND, DRUG_VISION and DRUG_TUNNELVISION. I've set the effects so that
-	- once you take the drug, your sight range increases 10%
-	- once the side effect starts, your sight range is lowered 10% and you get up to 25% tunnelvison
-	- once that is over, you are blinded for 2 turns
-
-You can test the drug effect in game by showing the vision range of your merc. You will also notice icons on the merc portraits for different drug effects.
-
-More Infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303972#Post303972
-
-Note: The regeneration drug has no entries - that is intended, because this effect is treated in a very different way.
-	
+There can be multiple <PERSONALITY_EFFECT>, even of the same type. For the duration of the effect, the merc will gain an extra disability.
+Note: Currently only one such effect per time is allowed, additional effects overwrite previous ones.
+<personality> 			refers to a disability:
+		CHAR_TRAIT_SOCIABLE		1
+		CHAR_TRAIT_LONER		2
+		CHAR_TRAIT_OPTIMIST		3
+		CHAR_TRAIT_ASSERTIVE	4
+		CHAR_TRAIT_INTELLECTUAL	5
+		CHAR_TRAIT_PRIMITIVE	6
+		CHAR_TRAIT_AGGRESSIVE	7
+		CHAR_TRAIT_PHLEGMATIC	8
+		CHAR_TRAIT_DAUNTLESS	9
+		CHAR_TRAIT_PACIFIST		10
+		CHAR_TRAIT_MALICIOUS	11
+		CHAR_TRAIT_SHOWOFF		12
+		
+<duration> 				is how many turns this lasts
+If <chance> is set, this is the chance that this effect is applied when consuming drug
 -->
 <DRUGSLIST>
 	<DRUG>
-		<ubType>0</ubType>
-		<name>None</name>
-		<ubDrugTravelRate>0</ubDrugTravelRate>
-		<ubDrugWearoffRate>0</ubDrugWearoffRate>
-		<ubDrugEffect>0</ubDrugEffect>
-		<ubDrugSideEffect>0</ubDrugSideEffect>
-		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
-		<ubDiseaseCure>0</ubDiseaseCure>
+		<uiIndex>0</uiIndex>
+		<szName>None</szName>
+		<opinionevent>0</opinionevent>
+		<DRUG_EFFECT>
+			<effect>0</effect>
+			<duration>0</duration>
+			<size>0</size>
+			<chance>0</chance>
+		</DRUG_EFFECT>
+		<DISEASE_EFFECT>
+			<disease>0</disease>
+			<size>0</size>
+			<chance>0</chance>
+		</DISEASE_EFFECT>
+		<DISABILITY_EFFECT>
+			<disability>0</disability>
+			<duration>0</duration>
+			<chance>0</chance>
+		</DISABILITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>0</personality>
+			<duration>0</duration>
+			<chance>0</chance>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>1</ubType>
-		<name>Adrenaline</name>
-		<ubDrugTravelRate>4</ubDrugTravelRate>
-		<ubDrugWearoffRate>2</ubDrugWearoffRate>
-		<ubDrugEffect>15</ubDrugEffect>
-		<ubDrugSideEffect>20</ubDrugSideEffect>
-		<ubDrugSideEffectRate>2</ubDrugSideEffectRate>
-		<ubMoralBacklash>1</ubMoralBacklash>
+		<uiIndex>1</uiIndex>
+		<szName>Energy Booster</szName>
+		<opinionevent>1</opinionevent>
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>8</duration>
+			<size>400</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>2</effect>
+			<duration>8</duration>
+			<size>15</size>
+		</DRUG_EFFECT>
+		
+		<DISEASE_EFFECT>
+			<disease>15</disease>
+			<size>150</size>
+		</DISEASE_EFFECT>
+		
+		<DISABILITY_EFFECT>
+			<disability>2</disability>
+			<duration>8</duration>
+			<chance>40</chance>
+		</DISABILITY_EFFECT>
+		
+		<PERSONALITY_EFFECT>
+			<personality>7</personality>
+			<duration>8</duration>
+			<chance>80</chance>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>2</ubType>
-		<name>Alcohol</name>
-		<ubDrugTravelRate>2</ubDrugTravelRate>
-		<ubDrugWearoffRate>2</ubDrugWearoffRate>
-		<ubDrugEffect>8</ubDrugEffect>
-		<ubDrugSideEffect>10</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>1</ubMoralBacklash>
+		<uiIndex>2</uiIndex>
+		<szName>Alcohol (40%)</szName>
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>10</duration>
+			<size>150</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>2</effect>
+			<duration>10</duration>
+			<size>11</size>
+			<chance>50</chance>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>3</effect>
+			<duration>10</duration>
+			<size>11</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>8</effect>
+			<duration>20</duration>
+			<size>-11</size>
+			<chance>30</chance>
+		</DRUG_EFFECT>
+		
+		<!-- Hungover effect - if we drink too much, hungover disease becomes active -->
+		<DISEASE_EFFECT>
+			<disease>16</disease>
+			<size>192</size>		<!-- alcohol (g) -->
+		</DISEASE_EFFECT>
+		
+		<DISABILITY_EFFECT>
+			<disability>9</disability>
+			<duration>30</duration>
+			<chance>5</chance>
+		</DISABILITY_EFFECT>
+		
+		<PERSONALITY_EFFECT>
+			<personality>1</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>2</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>3</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>4</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>5</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>6</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>7</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>8</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>9</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>10</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>11</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>12</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>3</ubType>
-		<name>Regeneration</name>
-		<ubDrugTravelRate>0</ubDrugTravelRate>
-		<ubDrugWearoffRate>0</ubDrugWearoffRate>
-		<ubDrugEffect>0</ubDrugEffect>
-		<ubDrugSideEffect>0</ubDrugSideEffect>
-		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<uiIndex>3</uiIndex>
+		<szName>Alcohol (beer, 6.9%)</szName>
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>10</duration>
+			<size>50</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>2</effect>
+			<duration>10</duration>
+			<size>2</size>
+			<chance>50</chance>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>3</effect>
+			<duration>10</duration>
+			<size>1</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>8</effect>
+			<duration>20</duration>
+			<size>-3</size>
+			<chance>15</chance>
+		</DRUG_EFFECT>
+		
+		<!-- Hungover effect - if we drink too much, hungover disease becomes active -->
+		<DISEASE_EFFECT>
+			<disease>16</disease>
+			<size>17</size>		<!-- alcohol (g) -->
+		</DISEASE_EFFECT>
+		
+		<DISABILITY_EFFECT>
+			<disability>9</disability>
+			<duration>5</duration>
+			<chance>5</chance>
+		</DISABILITY_EFFECT>
+		
+		<PERSONALITY_EFFECT>
+			<personality>1</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>2</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>3</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>4</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>5</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>6</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>7</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>8</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>9</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>10</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>11</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>12</personality>
+			<duration>5</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>4</ubType>
-		<name>Resistance</name>
-		<ubDrugTravelRate>13</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>25</ubDrugEffect>
-		<ubDrugSideEffect>20</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<uiIndex>4</uiIndex>
+		<szName>Alcohol (wine, 11%)</szName>
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>10</duration>
+			<size>90</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>2</effect>
+			<duration>10</duration>
+			<size>7</size>
+			<chance>50</chance>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>3</effect>
+			<duration>10</duration>
+			<size>7</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>8</effect>
+			<duration>20</duration>
+			<size>-17</size>
+			<chance>20</chance>
+		</DRUG_EFFECT>
+		
+		<!-- Hungover effect - if we drink too much, hungover disease becomes active -->
+		<DISEASE_EFFECT>
+			<disease>16</disease>
+			<size>62</size>		<!-- alcohol (g) -->
+		</DISEASE_EFFECT>
+		
+		<DISABILITY_EFFECT>
+			<disability>9</disability>
+			<duration>30</duration>
+			<chance>5</chance>
+		</DISABILITY_EFFECT>
+		
+		<PERSONALITY_EFFECT>
+			<personality>1</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>2</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>3</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>4</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>5</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>6</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>7</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>8</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>9</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>10</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>11</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>12</personality>
+			<duration>30</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>5</ubType>
-		<name>Strength</name>
-		<ubDrugTravelRate>25</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>50</ubDrugEffect>
-		<ubDrugSideEffect>10</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>1</ubMoralBacklash>
+		<uiIndex>5</uiIndex>
+		<szName>Regen Booster</szName>
+		<opinionevent>1</opinionevent>
+		<DRUG_EFFECT>
+			<effect>0</effect>
+			<duration>4</duration>
+			<size>10</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>4</effect>
+			<duration>8</duration>
+			<size>5</size>
+		</DRUG_EFFECT>
+		
+		<DISEASE_EFFECT>
+			<disease>15</disease>
+			<size>350</size>
+		</DISEASE_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>6</ubType>
-		<name>Agility</name>
-		<ubDrugTravelRate>25</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>50</ubDrugEffect>
-		<ubDrugSideEffect>10</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>1</ubMoralBacklash>
+		<uiIndex>6</uiIndex>
+		<szName>Barrage</szName>
+		<opinionevent>1</opinionevent>
+		<DRUG_EFFECT>
+			<effect>5</effect>
+			<duration>20</duration>
+			<size>60</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>4</effect>
+			<duration>20</duration>
+			<size>5</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>1</duration>
+			<size>-10000</size>
+			<chance>5</chance>
+		</DRUG_EFFECT>
+		
+		<DISEASE_EFFECT>
+			<disease>15</disease>
+			<size>200</size>
+		</DISEASE_EFFECT>
+		
+		<PERSONALITY_EFFECT>
+			<personality>7</personality>
+			<duration>30</duration>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>7</ubType>
-		<name>Dexterity</name>
-		<ubDrugTravelRate>25</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>50</ubDrugEffect>
-		<ubDrugSideEffect>10</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>1</ubMoralBacklash>
+		<uiIndex>7</uiIndex>
+		<szName>Cigar</szName>
+		<!-- slightly lowered breath -->
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>3</duration>
+			<size>-100</size>
+		</DRUG_EFFECT>
+		
+		<!-- slightly increased morale breath -->
+		<DRUG_EFFECT>
+			<effect>3</effect>
+			<duration>3</duration>
+			<size>1</size>
+		</DRUG_EFFECT>
+		
+		<!-- lung cancer -->
+		<DISEASE_EFFECT>
+			<disease>17</disease>
+			<size>100</size>
+		</DISEASE_EFFECT>	
 	</DRUG>
 	<DRUG>
-		<ubType>8</ubType>
-		<name>Wisdom</name>
-		<ubDrugTravelRate>25</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>50</ubDrugEffect>
-		<ubDrugSideEffect>10</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>1</ubMoralBacklash>
+		<!-- this drug is applied when hit with certain bullets -->
+		<uiIndex>8</uiIndex>
+		<szName>High-capacity bullet</szName>
+		<opinionevent>0</opinionevent>
+		<!-- ballistic trauma -->
+		<DISEASE_EFFECT>
+			<disease>10</disease>
+			<size>50</size>
+			<chance>80</chance>
+		</DISEASE_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>9</ubType>
-		<name>Perception</name>
-		<ubDrugTravelRate>25</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>100</ubDrugEffect>
-		<ubDrugSideEffect>0</ubDrugSideEffect>
-		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<uiIndex>9</uiIndex>
+		<szName>Reflex</szName>
+		<opinionevent>1</opinionevent>
+		<DRUG_EFFECT>
+			<effect>2</effect>
+			<duration>20</duration>
+			<size>6</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>6</effect>
+			<duration>20</duration>
+			<size>15</size>
+		</DRUG_EFFECT>
+		
+		<!-- addiction -->
+		<DISEASE_EFFECT>
+			<disease>15</disease>
+			<size>225</size>
+		</DISEASE_EFFECT>
+		
+		<DISABILITY_EFFECT>
+			<disability>1</disability>
+			<duration>25</duration>
+			<chance>80</chance>
+		</DISABILITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>10</ubType>
-		<name>Psychosis</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>120</ubDrugEffect>
-		<ubDrugSideEffect>120</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<uiIndex>10</uiIndex>
+		<szName>Stim</szName>
+		<opinionevent>1</opinionevent>
+		<DRUG_EFFECT>
+			<effect>0</effect>
+			<duration>5</duration>
+			<size>2</size>
+			<chance>15</chance>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>8</duration>
+			<size>150</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>2</effect>
+			<duration>8</duration>
+			<size>5</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>4</effect>
+			<duration>8</duration>
+			<size>15</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>5</effect>
+			<duration>8</duration>
+			<size>30</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>6</effect>
+			<duration>8</duration>
+			<size>10</size>
+		</DRUG_EFFECT>
+		
+		<!-- addiction -->
+		<DISEASE_EFFECT>
+			<disease>15</disease>
+			<size>350</size>
+		</DISEASE_EFFECT>
+		
+		<DISABILITY_EFFECT>
+			<disability>7</disability>
+			<duration>10</duration>
+			<chance>90</chance>
+		</DISABILITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>11</personality>
+			<duration>10</duration>
+			<chance>70</chance>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>11</ubType>
-		<name>Nervousness</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>120</ubDrugEffect>
-		<ubDrugSideEffect>120</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<!-- This is basically a knockoff of Stim that can cause nasty diseases -->
+		<uiIndex>11</uiIndex>
+		<szName>Stim Copy</szName>
+		<opinionevent>1</opinionevent>
+		<DRUG_EFFECT>
+			<effect>0</effect>
+			<duration>5</duration>
+			<size>2</size>
+			<chance>5</chance>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>8</duration>
+			<size>150</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>2</effect>
+			<duration>7</duration>
+			<size>5</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>4</effect>
+			<duration>8</duration>
+			<size>13</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>5</effect>
+			<duration>6</duration>
+			<size>35</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>6</effect>
+			<duration>6</duration>
+			<size>10</size>
+		</DRUG_EFFECT>
+		
+		<!-- addiction -->
+		<DISEASE_EFFECT>
+			<disease>15</disease>
+			<size>350</size>
+		</DISEASE_EFFECT>
+		
+		<!-- Arulcan plague -->
+		<DISEASE_EFFECT>
+			<disease>0</disease>
+			<size>40</size>
+			<chance>40</chance>
+		</DISEASE_EFFECT>
+		<!-- Typhoid -->
+		<DISEASE_EFFECT>
+			<disease>1</disease>
+			<size>30</size>
+			<chance>40</chance>
+		</DISEASE_EFFECT>
+		<!-- Hepatitis A -->
+		<DISEASE_EFFECT>
+			<disease>2</disease>
+			<size>50</size>
+			<chance>40</chance>
+		</DISEASE_EFFECT>
+		<!-- Tetanus -->
+		<DISEASE_EFFECT>
+			<disease>3</disease>
+			<size>50</size>
+			<chance>40</chance>
+		</DISEASE_EFFECT>
+		<!-- Staphylococcus -->
+		<DISEASE_EFFECT>
+			<disease>8</disease>
+			<size>70</size>
+			<chance>40</chance>
+		</DISEASE_EFFECT>
+		
+		<DISABILITY_EFFECT>
+			<disability>7</disability>
+			<duration>10</duration>
+			<chance>95</chance>
+		</DISABILITY_EFFECT>
+		<DISABILITY_EFFECT>
+			<disability>9</disability>
+			<duration>12</duration>
+			<chance>20</chance>
+		</DISABILITY_EFFECT>
+		<PERSONALITY_EFFECT>
+			<personality>11</personality>
+			<duration>10</duration>
+			<chance>75</chance>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>12</ubType>
-		<name>Claustrophobia</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>120</ubDrugEffect>
-		<ubDrugSideEffect>120</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<!-- energy drinks are basically very light versions of the energy booster -->
+		<uiIndex>12</uiIndex>
+		<szName>Energy Drink</szName>
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>8</duration>
+			<size>100</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>2</effect>
+			<duration>8</duration>
+			<size>3</size>
+		</DRUG_EFFECT>
+		
+		<!-- addiction -->
+		<DISEASE_EFFECT>
+			<disease>15</disease>
+			<size>40</size>
+		</DISEASE_EFFECT>
+		
+		<PERSONALITY_EFFECT>
+			<personality>7</personality>
+			<duration>8</duration>
+			<chance>10</chance>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>13</ubType>
-		<name>Heat Intolerant</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>120</ubDrugEffect>
-		<ubDrugSideEffect>120</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<uiIndex>13</uiIndex>
+		<szName>Coffee</szName>
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>6</duration>
+			<size>50</size>
+		</DRUG_EFFECT>
+		<DRUG_EFFECT>
+			<effect>3</effect>
+			<duration>6</duration>
+			<size>1</size>
+		</DRUG_EFFECT>
+				
+		<PERSONALITY_EFFECT>
+			<personality>1</personality>
+			<duration>12</duration>
+			<chance>50</chance>
+		</PERSONALITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>14</ubType>
-		<name>Fear of Insects</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>120</ubDrugEffect>
-		<ubDrugSideEffect>120</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<!-- M99 is used to knock down targets by removing their breath regen-->
+		<uiIndex>14</uiIndex>
+		<szName>M99</szName>
+		<!-- health damage -->
+		<DRUG_EFFECT>
+			<effect>0</effect>
+			<duration>10</duration>
+			<size>-3</size>
+		</DRUG_EFFECT>
+		<!-- breath damage - each turn all breath is removed -->
+		<DRUG_EFFECT>
+			<effect>1</effect>
+			<duration>10</duration>
+			<size>-10000</size>
+		</DRUG_EFFECT>
+				
+		<DISABILITY_EFFECT>
+			<disability>6</disability>
+			<duration>30</duration>
+		</DISABILITY_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>15</ubType>
-		<name>Forgetfulness</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>120</ubDrugEffect>
-		<ubDrugSideEffect>120</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<uiIndex>15</uiIndex>
+		<szName>Plague medicine</szName>
+		<DISEASE_EFFECT>
+			<disease>0</disease>
+			<size>-400</size>
+		</DISEASE_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>16</ubType>
-		<name>Blindness</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>5</ubDrugEffect>
-		<ubDrugSideEffect>8</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
+		<uiIndex>16</uiIndex>
+		<szName>Tetanus medicine</szName>
+		<DISEASE_EFFECT>
+			<disease>3</disease>
+			<size>-700</size>
+		</DISEASE_EFFECT>
 	</DRUG>
 	<DRUG>
-		<ubType>17</ubType>
-		<name>Unconsciousness</name>
-		<ubDrugTravelRate>25</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>50</ubDrugEffect>
-		<ubDrugSideEffect>11</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
-	</DRUG>
-	<DRUG>
-		<ubType>18</ubType>
-		<name>Vision</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>5</ubDrugEffect>
-		<ubDrugSideEffect>7</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
-	</DRUG>
-	<DRUG>
-		<ubType>19</ubType>
-		<name>Tunnel Vision</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>5</ubDrugEffect>
-		<ubDrugSideEffect>7</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
-	</DRUG>
-	<DRUG>
-		<ubType>20</ubType>
-		<name>Cyanide</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>2</ubDrugEffect>
-		<ubDrugSideEffect>4</ubDrugSideEffect>
-		<ubDrugSideEffectRate>1</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
-	</DRUG>
-	<DRUG>
-		<ubType>21</ubType>
-		<name>Antidote</name>
-		<ubDrugTravelRate>1</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>25</ubDrugEffect>
-		<ubDrugSideEffect>0</ubDrugSideEffect>
-		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
-		<ubMoralBacklash>1</ubMoralBacklash>
-	</DRUG>
-	<DRUG>
-		<ubType>22</ubType>
-		<name>Etorphine</name>
-		<ubDrugTravelRate>10</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>10</ubDrugEffect>
-		<ubDrugSideEffect>0</ubDrugSideEffect>
-		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
-	</DRUG>
-	<DRUG>
-		<ubType>23</ubType>
-		<name>Plague cure</name>
-		<ubDrugTravelRate>10</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>10</ubDrugEffect>
-		<ubDrugSideEffect>0</ubDrugSideEffect>
-		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
-		<ubDiseaseCure>1</ubDiseaseCure>
-	</DRUG>
-	<DRUG>
-		<ubType>24</ubType>
-		<name>Tetanus cure</name>
-		<ubDrugTravelRate>10</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>10</ubDrugEffect>
-		<ubDrugSideEffect>0</ubDrugSideEffect>
-		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
-		<ubDiseaseCure>4</ubDiseaseCure>
-	</DRUG>
-	<DRUG>
-		<ubType>25</ubType>
-		<name>Cholera cure</name>
-		<ubDrugTravelRate>10</ubDrugTravelRate>
-		<ubDrugWearoffRate>1</ubDrugWearoffRate>
-		<ubDrugEffect>10</ubDrugEffect>
-		<ubDrugSideEffect>0</ubDrugSideEffect>
-		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
-		<ubMoralBacklash>0</ubMoralBacklash>
-		<ubDiseaseCure>6</ubDiseaseCure>
+		<uiIndex>17</uiIndex>
+		<szName>Cholera medicine</szName>
+		<DISEASE_EFFECT>
+			<disease>5</disease>
+			<size>-800</size>
+		</DISEASE_EFFECT>
 	</DRUG>
 </DRUGSLIST>
diff --git a/gamedir/Data-1.13/TableData/Items/Food.xml b/gamedir/Data-1.13/TableData/Items/Food.xml
index db6bc4afd..2cc6738ec 100644
--- a/gamedir/Data-1.13/TableData/Items/Food.xml
+++ b/gamedir/Data-1.13/TableData/Items/Food.xml
@@ -4,7 +4,6 @@
 		<szName>(none)</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>0</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -12,7 +11,6 @@
 		<szName>Canteen</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>2000</bDrinkPoints>
-		<ubPortionSize>20</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -20,7 +18,6 @@
 		<szName>Alcohol</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>6000</bDrinkPoints>
-		<ubPortionSize>10</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -28,7 +25,6 @@
 		<szName>Beer</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>2200</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -36,7 +32,6 @@
 		<szName>Wine</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>4400</bDrinkPoints>
-		<ubPortionSize>20</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -44,7 +39,6 @@
 		<szName>Calory bars</szName>
 		<bFoodPoints>150</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>20</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -52,7 +46,6 @@
 		<szName>MRE</szName>
 		<bFoodPoints>1200</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -60,7 +53,6 @@
 		<szName>EPA</szName>
 		<bFoodPoints>1600</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>50</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -68,7 +60,6 @@
 		<szName>Calorie Mate</szName>
 		<bFoodPoints>100</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>10</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -76,7 +67,6 @@
 		<szName>Peak EPA</szName>
 		<bFoodPoints>80</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>15</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -84,7 +74,6 @@
 		<szName>Hotdog</szName>
 		<bFoodPoints>380</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>1.8</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -92,7 +81,6 @@
 		<szName>Hamburger</szName>
 		<bFoodPoints>420</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>1.6</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -100,7 +88,6 @@
 		<szName>Fries</szName>
 		<bFoodPoints>160</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>1.5</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -108,7 +95,6 @@
 		<szName>Pizza</szName>
 		<bFoodPoints>620</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>13</ubPortionSize>
 		<usDecayRate>1.8</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -116,7 +102,6 @@
 		<szName>Spam</szName>
 		<bFoodPoints>600</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>50</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -124,7 +109,6 @@
 		<szName>Spam 2</szName>
 		<bFoodPoints>800</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>50</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -132,7 +116,6 @@
 		<szName>C. vegetables</szName>
 		<bFoodPoints>600</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>50</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 <FOOD>
@@ -140,7 +123,6 @@
 		<szName>C. scorpions</szName>
 		<bFoodPoints>360</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -148,7 +130,6 @@
 		<szName>Cat food</szName>
 		<bFoodPoints>320</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>80</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -156,7 +137,6 @@
 		<szName>Baked beans</szName>
 		<bFoodPoints>620</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>50</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -164,7 +144,6 @@
 		<szName>Steak</szName>
 		<bFoodPoints>920</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>2.1</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -172,7 +151,6 @@
 		<szName>Bean stew</szName>
 		<bFoodPoints>800</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>2.0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -180,7 +158,6 @@
 		<szName>French toast</szName>
 		<bFoodPoints>300</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>1.6</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -188,7 +165,6 @@
 		<szName>Crepes</szName>
 		<bFoodPoints>340</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>1.9</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -196,7 +172,6 @@
 		<szName>Pasta</szName>
 		<bFoodPoints>860</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>2.2</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -204,7 +179,6 @@
 		<szName>Omelet</szName>
 		<bFoodPoints>700</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>2.1</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -212,7 +186,6 @@
 		<szName>Cow meat</szName>
 		<bFoodPoints>2000</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>10</ubPortionSize>
 		<usDecayRate>3</usDecayRate>
 	</FOOD>
   <FOOD>
@@ -220,7 +193,6 @@
 		<szName>Bloodcat meat</szName>
 		<bFoodPoints>2200</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>10</ubPortionSize>
 		<usDecayRate>3.2</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -228,7 +200,6 @@
 		<szName>Bread</szName>
 		<bFoodPoints>550</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>20</ubPortionSize>
 		<usDecayRate>1</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -236,7 +207,6 @@
 		<szName>Applepie</szName>
 		<bFoodPoints>600</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>50</ubPortionSize>
 		<usDecayRate>1.7</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -244,7 +214,6 @@
 		<szName>Water drum</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>100000</bDrinkPoints>
-		<ubPortionSize>1</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -252,7 +221,6 @@
 		<szName>PET bottle</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>2000</bDrinkPoints>
-		<ubPortionSize>20</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -260,7 +228,6 @@
 		<szName>Vegetable juice</szName>
 		<bFoodPoints>60</bFoodPoints>
 		<bDrinkPoints>2000</bDrinkPoints>
-		<ubPortionSize>20</ubPortionSize>
 		<usDecayRate>1.2</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -268,7 +235,6 @@
 		<szName>Milk</szName>
 		<bFoodPoints>10</bFoodPoints>
 		<bDrinkPoints>2000</bDrinkPoints>
-		<ubPortionSize>20</ubPortionSize>
 		<usDecayRate>1.8</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -276,7 +242,6 @@
 		<szName>Energy drink</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>800</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -284,7 +249,6 @@
 		<szName>Energy drink 2</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>700</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -292,7 +256,6 @@
 		<szName>Coffee</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>600</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>0.2</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -300,7 +263,6 @@
 		<szName>Oatmeal</szName>
 		<bFoodPoints>500</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>100</ubPortionSize>
 		<usDecayRate>2.3</usDecayRate>
 	</FOOD>
 	<FOOD>
@@ -308,23 +270,13 @@
 		<szName>Bag of rice</szName>
 		<bFoodPoints>2000</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>5</ubPortionSize>
 		<usDecayRate>1.5</usDecayRate>
 	</FOOD>
 	<FOOD>
 		<uiIndex>39</uiIndex>
-		<szName>Medical</szName>
-		<bFoodPoints>1</bFoodPoints>
-		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>5</ubPortionSize>
-		<usDecayRate>0.0</usDecayRate>
-	</FOOD>
-		<FOOD>
-		<uiIndex>40</uiIndex>
 		<szName>bladder</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>4000</bDrinkPoints>
-		<ubPortionSize>20</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 29f2dd51a..8da08d350 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -185,6 +185,8 @@
 		<SleepModifier>0</SleepModifier>
 		<sBackpackWeightModifier>0</sBackpackWeightModifier>
 		<fAllowClimbing>0</fAllowClimbing>
+		<cigarette>0</cigarette>
+		<usPortionSize>0</usPortionSize>
 		<diseaseprotectionface>0</diseaseprotectionface>
 		<diseaseprotectionhand>0</diseaseprotectionhand>
 		<STAND_MODIFIERS>
@@ -6618,6 +6620,7 @@
 		<Canteen>1</Canteen>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<FoodType>1</FoodType>
+		<usPortionSize>20</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -7110,7 +7113,7 @@
 		<SciFi>1</SciFi>
 		<Unaerodynamic>1</Unaerodynamic>
 		<Medical>1</Medical>
-		<DrugType>4</DrugType>
+		<DrugType>5</DrugType>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -7372,9 +7375,11 @@
 		<usPrice>30</usPrice>
 		<ubCoolness>1</ubCoolness>
 		<Damageable>1</Damageable>
-		<Alcohol>1</Alcohol>
+		<Alcohol>192</Alcohol>		<!-- full bottle weighs 1000g - bottle weighs 400g - 40% alc, volume mass 0.8 -> 600 * 0.4 * 0.8 = 192g of alcohol -->
 		<DrugType>2</DrugType>
+		<FoodType>2</FoodType>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<usPortionSize>10</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -7587,9 +7592,11 @@
 		<usPrice>20</usPrice>
 		<ubCoolness>1</ubCoolness>
 		<Damageable>1</Damageable>
-		<Alcohol>1</Alcohol>
-		<DrugType>2</DrugType>
+		<Alcohol>61.6</Alcohol>	<!-- full bottle weighs 1200g - bottle weighs 500g - 11% alc, volume mass 0.8 -> 700 * 0.11 * 0.8 = 192g of alcohol -->
+		<DrugType>4</DrugType>
+		<FoodType>4</FoodType>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<usPortionSize>20</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -7605,15 +7612,17 @@
 		<nasLayoutClass>1</nasLayoutClass>
 		<ubGraphicType>1</ubGraphicType>
 		<ubGraphicNum>101</ubGraphicNum>
-		<ubWeight>4</ubWeight>
+		<ubWeight>6</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<ItemSize>22</ItemSize>
 		<usPrice>10</usPrice>
 		<ubCoolness>1</ubCoolness>
 		<Damageable>1</Damageable>
-		<Alcohol>1</Alcohol>
-		<DrugType>2</DrugType>
+		<Alcohol>16.56</Alcohol>	<!-- full bottle weighs 600g - bottle weighs 300g - 6.9% alc, volume mass 0.8 -> 300 * 0.069 * 0.8 = 192g of alcohol -->
+		<DrugType>3</DrugType>
+		<FoodType>3</FoodType>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -7908,6 +7917,9 @@
 		<ubCoolness>1</ubCoolness>
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<DrugType>7</DrugType>
+		<cigarette>1</cigarette>
+		<usPortionSize>5</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -14255,6 +14267,7 @@
 		<Sinks>1</Sinks>
 		<BigGunList>1</BigGunList>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<DrugType>8</DrugType>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -31782,7 +31795,7 @@
 		<uiIndex>1019</uiIndex>
 		<szItemName>Oil</szItemName>
 		<szLongItemName>Oil</szLongItemName>
-		<szItemDesc>A can of Esso brand oil.  Funny, you don't remember seeing any Esso stations around here.</szItemDesc>
+		<szItemDesc>A can of Esso brand oil. Funny, you don't remember seeing any Esso stations around here.</szItemDesc>
 		<szBRName>Oil</szBRName>
 		<szBRDesc>We believe it is safe to say that this oil can is uncontestably the best oil can on the market today. (One year warranty, void if tampered with)</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -31803,7 +31816,7 @@
 		<uiIndex>1020</uiIndex>
 		<szItemName>Medal</szItemName>
 		<szLongItemName>Medal</szLongItemName>
-		<szItemDesc>This medal seems to be what passes for a reward for service around here.  Maybe there's a chocolately centre?</szItemDesc>
+		<szItemDesc>This medal seems to be what passes for a reward for service around here. Maybe there's a chocolately centre?</szItemDesc>
 		<szBRName>Medal</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -31826,7 +31839,7 @@
 		<uiIndex>1021</uiIndex>
 		<szItemName>Laptop</szItemName>
 		<szLongItemName>Laptop</szLongItemName>
-		<szItemDesc>This thing just crashes with a blue screen when you boot it up.  It might be the humidity.  It might just be Windows.</szItemDesc>
+		<szItemDesc>This thing just crashes with a blue screen when you boot it up. It might be the humidity. It might just be Windows.</szItemDesc>
 		<szBRName>Laptop</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -31852,7 +31865,7 @@
 		<uiIndex>1022</uiIndex>
 		<szItemName>Rag</szItemName>
 		<szLongItemName>Rag</szLongItemName>
-		<szItemDesc>A torn scrap of cloth.  Completely devoid of snot.</szItemDesc>
+		<szItemDesc>A torn scrap of cloth. Completely devoid of snot.</szItemDesc>
 		<szBRName>Rag</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -31875,7 +31888,7 @@
 		<uiIndex>1023</uiIndex>
 		<szItemName>Cuban Cigars</szItemName>
 		<szLongItemName>Cuban Cigars</szLongItemName>
-		<szItemDesc>The finest in Central American cigars.  So how did they end up here?</szItemDesc>
+		<szItemDesc>The finest in Central American cigars. So how did they end up here?</szItemDesc>
 		<szBRName>Cuban Cigars</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -31889,6 +31902,9 @@
 		<ubCoolness>2</ubCoolness>
 		<BigGunList>1</BigGunList>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<DrugType>7</DrugType>
+		<cigarette>1</cigarette>
+		<usPortionSize>8</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46275,7 +46291,7 @@
 		<uiIndex>1535</uiIndex>
 		<szItemName>Barrage</szItemName>
 		<szLongItemName>Barrage Drug</szLongItemName>
-		<szItemDesc>This combat drug increases physical strength to impressive levels for a short time. Side effects include greatly increased aggresiveness and the risk of heart attack.</szItemDesc>
+		<szItemDesc>This combat drug increases physical strength to impressive levels for a short time. Side effects include greatly increased aggressiveness and the risk of heart attack.</szItemDesc>
 		<szBRName>Barrage Drug</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -46293,7 +46309,7 @@
 		<SciFi>1</SciFi>
 		<Unaerodynamic>1</Unaerodynamic>
 		<Medical>1</Medical>
-		<DrugType>66064</DrugType>
+		<DrugType>6</DrugType>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -46303,7 +46319,7 @@
 		<uiIndex>1536</uiIndex>
 		<szItemName>Reflex</szItemName>
 		<szLongItemName>Reflex Drug</szLongItemName>
-		<szItemDesc>This combat drug increases reflexes and reaction times... while it lasts. Afterwards the effects reverse. May cause paranoia.</szItemDesc>
+		<szItemDesc>This combat drug increases makes you feel more agile. Warning: your body temperature might rise.</szItemDesc>
 		<szBRName>Reflex Drug</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -46321,7 +46337,7 @@
 		<SciFi>1</SciFi>
 		<Unaerodynamic>1</Unaerodynamic>
 		<Medical>1</Medical>
-		<DrugType>1280</DrugType>
+		<DrugType>9</DrugType>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -46329,10 +46345,10 @@
 	</ITEM>
 	<ITEM>
 		<uiIndex>1537</uiIndex>
-		<szItemName>Occulin</szItemName>
-		<szLongItemName>Occulin Drug</szLongItemName>
-		<szItemDesc>Temporarily enhances vision, but puts a heavy strain on the eyes.</szItemDesc>
-		<szBRName>Occulin Drug</szBRName>
+		<szItemName>Stim Copy</szItemName>
+		<szLongItemName>Stim Drug (Copy)</szLongItemName>
+		<szItemDesc>This cheap knockoff has more nasty sideeffects than pure stim.</szItemDesc>
+		<szBRName>Stim Drug (Copy)</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
 		<nasLayoutClass>1</nasLayoutClass>
@@ -46341,15 +46357,15 @@
 		<ubWeight>1</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<ItemSize>10</ItemSize>
-		<usPrice>110</usPrice>
-		<ubCoolness>6</ubCoolness>
+		<usPrice>80</usPrice>
+		<ubCoolness>2</ubCoolness>
 		<Damageable>1</Damageable>
 		<Attachment>1</Attachment>
 		<BigGunList>1</BigGunList>
 		<SciFi>1</SciFi>
 		<Unaerodynamic>1</Unaerodynamic>
 		<Medical>1</Medical>
-		<DrugType>425984</DrugType>
+		<DrugType>11</DrugType>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -46359,7 +46375,7 @@
 		<uiIndex>1538</uiIndex>
 		<szItemName>Stim</szItemName>
 		<szLongItemName>Stim Drug</szLongItemName>
-		<szItemDesc>Allows great physical feats and increases your endurance, while your mind goes haywire.</szItemDesc>
+		<szItemDesc>The ultimate combat drug. Makes you stronger, tougher, faster and generally more unpleasant.</szItemDesc>
 		<szBRName>Stim Drug</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -46369,7 +46385,7 @@
 		<ubWeight>1</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<ItemSize>10</ItemSize>
-		<usPrice>220</usPrice>
+		<usPrice>320</usPrice>
 		<ubCoolness>5</ubCoolness>
 		<Damageable>1</Damageable>
 		<Attachment>1</Attachment>
@@ -46377,7 +46393,7 @@
 		<SciFi>1</SciFi>
 		<Unaerodynamic>1</Unaerodynamic>
 		<Medical>1</Medical>
-		<DrugType>30824</DrugType>
+		<DrugType>10</DrugType>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -46519,6 +46535,7 @@
 		<BR_NewInventory>3</BR_NewInventory>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>5</FoodType>
+		<usPortionSize>20</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46543,6 +46560,7 @@
 		<BR_NewInventory>25</BR_NewInventory>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>6</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46567,6 +46585,7 @@
 		<BR_NewInventory>20</BR_NewInventory>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>7</FoodType>
+		<usPortionSize>50</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46590,6 +46609,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>8</FoodType>
+		<usPortionSize>10</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46613,6 +46633,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>9</FoodType>
+		<usPortionSize>15</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46636,6 +46657,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>10</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46659,6 +46681,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>11</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46682,6 +46705,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>12</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46705,6 +46729,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>13</FoodType>
+		<usPortionSize>13</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46729,13 +46754,14 @@
 		<BR_NewInventory>15</BR_NewInventory>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>14</FoodType>
+		<usPortionSize>50</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
 	</ITEM>
 	<ITEM>
 		<uiIndex>1554</uiIndex>
-		<szItemName>Spam 2</szItemName>
+		<szItemName>More Spam</szItemName>
 		<szLongItemName>Spam in a can</szLongItemName>
 		<szItemDesc>Spam, spam, spam, spam, spam, spam, spam, spam, lovely spam, wonderful spam!</szItemDesc>
 		<szBRName>Spam 2</szBRName>
@@ -46753,6 +46779,7 @@
 		<BR_NewInventory>15</BR_NewInventory>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>15</FoodType>
+		<usPortionSize>50</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46777,6 +46804,7 @@
 		<BR_NewInventory>18</BR_NewInventory>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>16</FoodType>
+		<usPortionSize>50</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46799,9 +46827,9 @@
 		<ubCoolness>4</ubCoolness>
 		<Damageable>1</Damageable>
 		<BR_NewInventory>7</BR_NewInventory>
-		<DrugType>8192</DrugType>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>17</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46825,6 +46853,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>18</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46848,6 +46877,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>19</FoodType>
+		<usPortionSize>50</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46856,7 +46886,7 @@
 		<uiIndex>1559</uiIndex>
 		<szItemName>Steak</szItemName>
 		<szLongItemName>Steak</szLongItemName>
-		<szItemDesc>The best arulcan steak you'll find in .. Arulco.</szItemDesc>
+		<szItemDesc>The best arulcan steak you'll find in ... Arulco.</szItemDesc>
 		<szBRName>Steak</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -46871,6 +46901,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>20</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46894,6 +46925,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>21</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46917,6 +46949,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>22</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46940,6 +46973,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>23</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46963,6 +46997,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>24</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46986,6 +47021,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>25</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47010,6 +47046,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>26</FoodType>
+		<usPortionSize>10</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47034,6 +47071,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>27</FoodType>
+		<usPortionSize>10</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47057,6 +47095,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>28</FoodType>
+		<usPortionSize>20</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47080,6 +47119,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>29</FoodType>
+		<usPortionSize>50</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47105,6 +47145,7 @@
 		<Canteen>1</Canteen>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>30</FoodType>
+		<usPortionSize>1</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47129,6 +47170,7 @@
 		<BR_NewInventory>30</BR_NewInventory>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>31</FoodType>
+		<usPortionSize>20</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47153,6 +47195,7 @@
 		<BR_NewInventory>14</BR_NewInventory>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>32</FoodType>
+		<usPortionSize>20</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47176,6 +47219,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>33</FoodType>
+		<usPortionSize>20</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47197,9 +47241,10 @@
 		<usPrice>6</usPrice>
 		<ubCoolness>1</ubCoolness>
 		<Damageable>1</Damageable>
-		<DrugType>1</DrugType>
+		<DrugType>12</DrugType>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>34</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47221,9 +47266,10 @@
 		<usPrice>6</usPrice>
 		<ubCoolness>1</ubCoolness>
 		<Damageable>1</Damageable>
-		<DrugType>1</DrugType>
+		<DrugType>12</DrugType>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>35</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47245,9 +47291,10 @@
 		<usPrice>4</usPrice>
 		<ubCoolness>1</ubCoolness>
 		<Damageable>1</Damageable>
-		<DrugType>1</DrugType>
+		<DrugType>13</DrugType>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>36</FoodType>
+		<usPortionSize>100</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -47463,6 +47510,7 @@
 		<Damageable>1</Damageable>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<FoodType>38</FoodType>
+		<usPortionSize>8</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -48877,7 +48925,7 @@
 		<uiIndex>1634</uiIndex>
 		<szItemName>M99</szItemName>
 		<szLongItemName>M99</szLongItemName>
-		<szItemDesc>A very strong animal tranquilizer. Lethal if overdosed, and you are not an elephant.</szItemDesc>
+		<szItemDesc>A very strong animal tranquilizer. Lethal if overdosed and you're no elephant.</szItemDesc>
 		<szBRName>M99</szBRName>
 		<szBRDesc>Not for sale through BR.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
@@ -48891,7 +48939,7 @@
 		<ubCoolness>5</ubCoolness>
 		<Damageable>1</Damageable>
 		<Medical>1</Medical>
-		<DrugType>2097152</DrugType>
+		<DrugType>14</DrugType>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -51012,8 +51060,7 @@
 		<usPrice>400</usPrice>
 		<ubCoolness>4</ubCoolness>
 		<Medical>1</Medical>
-		<DrugType>4194304</DrugType>
-		<FoodType>39</FoodType>
+		<DrugType>15</DrugType>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -51036,7 +51083,7 @@
 		<ubCoolness>2</ubCoolness>
 		<Damageable>1</Damageable>
 		<Medical>1</Medical>
-		<DrugType>8388608</DrugType>
+		<DrugType>16</DrugType>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -51059,7 +51106,7 @@
 		<ubCoolness>3</ubCoolness>
 		<Damageable>1</Damageable>
 		<Medical>1</Medical>
-		<DrugType>16777216</DrugType>
+		<DrugType>17</DrugType>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -51086,7 +51133,8 @@
 		<Hardware>1</Hardware>
 		<Canteen>1</Canteen>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
-		<FoodType>40</FoodType>
+		<FoodType>39</FoodType>
+		<usPortionSize>20</usPortionSize>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
diff --git a/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml
index fcfc96e00..aa240845a 100644
--- a/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml
+++ b/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml
@@ -67,37 +67,47 @@
 	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>13</uiIndex>
-		<sItemIndex>1537</sItemIndex>
-		<ubOptimalNumber>4</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>14</uiIndex>
 		<sItemIndex>1538</sItemIndex>
 		<ubOptimalNumber>4</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>15</uiIndex>
+		<uiIndex>14</uiIndex>
 		<sItemIndex>1544</sItemIndex>
 		<ubOptimalNumber>4</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>16</uiIndex>
+		<uiIndex>15</uiIndex>
 		<sItemIndex>1547</sItemIndex>
 		<ubOptimalNumber>5</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>17</uiIndex>
+		<uiIndex>16</uiIndex>
 		<sItemIndex>1548</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>18</uiIndex>
+		<uiIndex>17</uiIndex>
 		<sItemIndex>1578</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>19</uiIndex>
+		<uiIndex>18</uiIndex>
 		<sItemIndex>1634</sItemIndex>
 		<ubOptimalNumber>5</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1712</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>1713</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>1714</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>
\ No newline at end of file