Merge remote-tracking branch 'Derryth_Love/master'

locations/home_activity.qsrc

@@ -350,7 +350,7 @@ end
 			gt 'city_house_res_bathr', 'bathr'
 		elseif $loc = 'mey_home':
 			!! location = 'Meynold Household'
-			gt 'mey_home', '2'
+			gt 'mey_home', 'bathroom'
 		end}
 !! --------------- end vomiting ----------------------------
 --- home_activity ---------------------------------

locations/mey_home.qsrc

@@ -142,10 +142,10 @@ end
 if $ARGS[0] = 'kitchen':
 	*clr & cla
 	$loc = 'mey_home'
-	$loc_arg = '1'
+	$loc_arg = 'kitchen'
 	$locclass = 'kitr'
 	$menu_loc = 'mey_home'
-	$menu_arg = '1'
+	$menu_arg = 'kitchen'
 	menu_off = 0
 	gs 'kit_din'
 	gs 'stat'
@@ -192,10 +192,10 @@ end
 if $ARGS[0] = 'bathroom':
 	!bathroom
 	$locM = 'mey_home'
-	$locM_arg = '2'
-	$loc_arg = '2'
+	$locM_arg = 'bathroom'
+	$loc_arg = 'bathroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '2'
+	$menu_arg = 'bathroom'
 	menu_off = 0
 	$location_type = 'bathroom'
 	$bathtype = 'glass shower and tub'
@@ -216,11 +216,11 @@ end
 if $ARGS[0] = 'guest_bedroom':
 	cls
 	$locM = 'mey_home'
-	$locM_arg = '3'
+	$locM_arg = 'guest_bedroom'
 	$loc = 'mey_home'
-	$loc_arg = '3'
+	$loc_arg = 'guest_bedroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '3'
+	$menu_arg = 'guest_bedroom'
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Guest room</font></h4></center>'
@@ -286,9 +286,9 @@ end
 if $ARGS[0] = 'lounge':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '4'
+	$loc_arg = 'lounge'
 	$menu_loc = 'mey_home'
-	$menu_arg = '4'
+	$menu_arg = 'lounge'
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Lounge</font></h4></center>'
@@ -303,9 +303,9 @@ end
 if $ARGS[0] = 'katja_bedroom':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '5'
+	$loc_arg = 'katja_bedroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '5'
+	$menu_arg = 'katja_bedroom'
 	menu_off = 0
 	$locclass = 'livingr'
 	gs 'katja_meynold_schedule'
@@ -331,9 +331,9 @@ end
 if $ARGS[0] = 'vicky_bedroom':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '6'
+	$loc_arg = 'vicky_bedroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '6'
+	$menu_arg = 'vicky_bedroom
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Vicky''s room</font></h4></center>'
@@ -348,9 +348,9 @@ end
 if $ARGS[0] = 'tamara_bedroom':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '7'
+	$loc_arg = 'tamara_bedroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '7'
+	$menu_arg = 'tamara_bedroom'
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Tamara''s room</font></h4></center>'
@@ -365,9 +365,9 @@ end
 if $ARGS[0] = 'garden':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '8'
+	$loc_arg = 'garden'
 	$menu_loc = 'mey_home'
-	$menu_arg = '8'
+	$menu_arg = 'garden'
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Garden</font></h4></center>'