diff --git a/gamedir/Data-1.13/TableData/Backgrounds.xml b/gamedir/Data-1.13/TableData/Backgrounds.xml
index ccf10cf64..91d7cacee 100644
--- a/gamedir/Data-1.13/TableData/Backgrounds.xml
+++ b/gamedir/Data-1.13/TableData/Backgrounds.xml
@@ -103,6 +103,14 @@
 
 		<!-- on/off properties: 1 for on, 0 for off -->		  
 		<druguse>0</druguse>			<!-- might use drugs from inventory (the 'Larry'-behaviour) -->
+		<drugtypes>						<!-- optional tags specifying drug types relevant for druguse tag, if none specified all drug types will be viable -->
+			<drugtype>0</drugtype>
+			<drugtype>0</drugtype>
+		</drugtypes>
+		<drugitems>						<!-- optional tags specifying items relevant for druguse tag, if none specified all drug items will be viable -->
+			<drugitem>0</drugitem>
+			<drugitem>0</drugitem>
+		</drugitems>
 		<xenophobic>0</xenophobic>		<!-- lower opinion of everybody without this background -->
 		<level_underground>0</level_underground>  <!-- +1 effective level if underground -->
 		<scrounging>0</scrounging>		<!-- might steal money from the locals (chance to anger locals) -->
diff --git a/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml b/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml
index 1694a3c36..d93b53343 100644
--- a/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml
+++ b/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml
@@ -44,6 +44,11 @@
 				<ubChance>500</ubChance>
 				<bBaseEffect>1</bBaseEffect>
 				<ubRange>0</ubRange>
+				<drugitems>
+					<drugitem>245</drugitem>
+					<drugitem>255</drugitem>
+					<drugitem>256</drugitem>
+				</drugitems>
 			</DRUNK>
 		</ASSIGNMENT>
 		<ASSIGNMENT>
diff --git a/gamedir/Data-UB/TableData/Map/FacilityTypes.xml b/gamedir/Data-UB/TableData/Map/FacilityTypes.xml
index 62d45d846..ed4401c44 100644
--- a/gamedir/Data-UB/TableData/Map/FacilityTypes.xml
+++ b/gamedir/Data-UB/TableData/Map/FacilityTypes.xml
@@ -44,6 +44,11 @@
 				<ubChance>500</ubChance>
 				<bBaseEffect>1</bBaseEffect>
 				<ubRange>0</ubRange>
+				<drugitems>
+					<drugitem>245</drugitem>
+					<drugitem>255</drugitem>
+					<drugitem>256</drugitem>
+				</drugitems>
 			</DRUNK>
 		</ASSIGNMENT>
 	</FACILITYTYPE>
diff --git a/gamedir/Data/TableData/Backgrounds.xml b/gamedir/Data/TableData/Backgrounds.xml
index fb8f65712..cf71d3b10 100644
--- a/gamedir/Data/TableData/Backgrounds.xml
+++ b/gamedir/Data/TableData/Backgrounds.xml
@@ -103,6 +103,14 @@
 
 		<!-- on/off properties: 1 for on, 0 for off -->		  
 		<druguse>0</druguse>			<!-- might use drugs from inventory (the 'Larry'-behaviour) -->
+		<drugtypes>						<!-- optional tags specifying drug types relevant for druguse tag, if none specified all drug types will be viable -->
+			<drugtype>0</drugtype>
+			<drugtype>0</drugtype>
+		</drugtypes>
+		<drugitems>						<!-- optional tags specifying items relevant for druguse tag, if none specified all drug items will be viable -->
+			<drugitem>0</drugitem>
+			<drugitem>0</drugitem>
+		</drugitems>
 		<xenophobic>0</xenophobic>		<!-- lower opinion of everybody without this background -->
 		<level_underground>0</level_underground>  <!-- +1 effective level if underground -->
 		<scrounging>0</scrounging>		<!-- might steal items (and put them in personal inventory) -->
diff --git a/gamedir/Data/TableData/Map/Facilities.xml b/gamedir/Data/TableData/Map/Facilities.xml
index b58f545e4..0b2725e30 100644
--- a/gamedir/Data/TableData/Map/Facilities.xml
+++ b/gamedir/Data/TableData/Map/Facilities.xml
@@ -20,6 +20,11 @@
 		<FacilityType>1</FacilityType>
 		<ubHidden>2</ubHidden>
 	</FACILITY>	
+	<FACILITY>
+		<SectorGrid>C13</SectorGrid>
+		<FacilityType>2</FacilityType>
+		<ubHidden>2</ubHidden>
+	</FACILITY>
 	<FACILITY>
 		<SectorGrid>D13</SectorGrid>
 		<FacilityType>1</FacilityType>
@@ -53,6 +58,23 @@
 		<ubHidden>2</ubHidden>
 	</FACILITY>
 	
+	<!-- SAN MONA -->
+	<FACILITY>
+		<SectorGrid>C5</SectorGrid>
+		<FacilityType>2</FacilityType>
+		<ubHidden>2</ubHidden>
+	</FACILITY>
+	<FACILITY>
+		<SectorGrid>C6</SectorGrid>
+		<FacilityType>2</FacilityType>
+		<ubHidden>2</ubHidden>
+	</FACILITY>
+	<FACILITY>
+		<SectorGrid>D5</SectorGrid>
+		<FacilityType>2</FacilityType>
+		<ubHidden>2</ubHidden>
+	</FACILITY>
+	
 	<!-- CHITZENA -->
 	<FACILITY>
 		<SectorGrid>A2</SectorGrid>
@@ -91,6 +113,11 @@
 		<FacilityType>1</FacilityType>
 		<ubHidden>2</ubHidden>
 	</FACILITY>	
+	<FACILITY>
+		<SectorGrid>G9</SectorGrid>
+		<FacilityType>2</FacilityType>
+		<ubHidden>2</ubHidden>
+	</FACILITY>
 	<FACILITY>
 		<SectorGrid>H8</SectorGrid>
 		<FacilityType>1</FacilityType>
@@ -122,7 +149,12 @@
 		<SectorGrid>H2</SectorGrid>
 		<FacilityType>1</FacilityType>
 		<ubHidden>2</ubHidden>
-	</FACILITY>			
+	</FACILITY>	
+	<FACILITY>
+		<SectorGrid>H2</SectorGrid>
+		<FacilityType>2</FacilityType>
+		<ubHidden>2</ubHidden>
+	</FACILITY>	
 	<FACILITY>
 		<SectorGrid>H3</SectorGrid>
 		<FacilityType>1</FacilityType>
diff --git a/gamedir/Data/TableData/Map/FacilityTypes.xml b/gamedir/Data/TableData/Map/FacilityTypes.xml
index 30b1890ab..7a2824a4c 100644
--- a/gamedir/Data/TableData/Map/FacilityTypes.xml
+++ b/gamedir/Data/TableData/Map/FacilityTypes.xml
@@ -6,4 +6,20 @@
 		<ubTotalStaffLimit>0</ubTotalStaffLimit>
 		<ubMilitiaTrainersAllowed>2</ubMilitiaTrainersAllowed>
 	</FACILITYTYPE>
+	<FACILITYTYPE>
+		<ubIndex>2</ubIndex>
+		<szFacilityName>Small Sleazy Bar</szFacilityName>
+		<szFacilityShortName>Bar</szFacilityShortName>
+		<ubTotalStaffLimit>0</ubTotalStaffLimit>
+		<ASSIGNMENT>
+			<ubAssignmentType>REST</ubAssignmentType>
+			<szTooltipText></szTooltipText>
+			<ubStaffLimit>1</ubStaffLimit>
+			<DRUNK>
+				<ubChance>1</ubChance>
+				<bBaseEffect>0</bBaseEffect>
+				<ubRange>0</ubRange>
+			</DRUNK>
+		</ASSIGNMENT>
+	</FACILITYTYPE>
 </FACILITYTYPES>
\ No newline at end of file