Merge remote-tracking branch 'Anya/master'

locations/dachain.qsrc

@@ -252,6 +252,7 @@ if $args[0] = 'dachavann':
 	$menu_arg = 'dachavann'
 	menu_off = 0
 	$location_type = 'bathroom'
+	$bathtype = 'bathtub shower'
 	killvar '$locclass'
 	*clr & cla
 	gs 'stat'

locations/vanr.qsrc

@@ -6,6 +6,7 @@ $loc = 'vanr'
 $locM_arg = ''
 $locM = 'vanr'
 $location_type = 'bathroom'
+$bathtype = 'bathtub shower'
 $menu_loc = 'vanr'
 $menu_arg = ''
 menu_off = 0

locations/vanr2x.qsrc

@@ -7,6 +7,7 @@ $loc = 'vanr2x'
 $locM_arg = ''
 $locM = 'vanr2x'
 $location_type = 'bathroom'
+$bathtype = 'bathtub shower'
 $menu_loc = 'vanr2x'
 $menu_arg = ''
 menu_off = 0