a few more fixes for gm stuff

locations/budgetclothes.qsrc

@@ -241,7 +241,7 @@ if $ARGS[0] = 'office':
 
 		:loopoffice
 			if gm_office[i] = 0:
-				gs 'clothing_attributes', 'office', i
+				gs 'clothing_attributes', 'gm_office', i
 				gs 'clothing_QV', 'shop_filter'
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
@@ -296,7 +296,7 @@ if $ARGS[0] = 'uniform':
 
 		:loopuniform
 			if gm_uniform[i] = 0:
-				gs 'clothing_attributes', 'uniform', i
+				gs 'clothing_attributes', 'gm_uniform', i
 				gs 'clothing_QV', 'shop_filter'
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
@@ -351,7 +351,7 @@ if $ARGS[0] = 'school':
 
 		:loopschool
 			if gm_school[i] = 0:
-				gs 'clothing_attributes', 'school', i
+				gs 'clothing_attributes', 'gm_school', i
 				gs 'clothing_QV', 'shop_filter'
 
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:

locations/clothing_QV.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'list':
 
 	'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
 
-	if ARRSIZE('school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''school''"><img src="images/locations/city/citycenter/mall/s.uniform2.png"></a></center>'
+	if ARRSIZE('gm_school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_school''"><img src="images/locations/city/citycenter/mall/s.uniform2.png"></a></center>'
  
 	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
 
@@ -61,9 +61,9 @@ if $ARGS[0] = 'list':
 
 		if ARRSIZE('gm_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_dress''">G&M dresses</a></center>'
 
-		if ARRSIZE('office') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_office''">Office wear</a></center>'
+		if ARRSIZE('gm_office') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_office''">Office wear</a></center>'
 
-		if ARRSIZE('uniform') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_uniform''">Work uniforms</a></center>'
+		if ARRSIZE('gm_uniform') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_uniform''">Work uniforms</a></center>'
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
@@ -142,13 +142,13 @@ if $ARGS[0] = 'list':
 		i = 1
 		:loopoffice
 		if gm_office[i] = 1:
-			gs 'clothing_attributes', 'office', i
+			gs 'clothing_attributes', 'gm_office', i
 			if CloInhibit <= pcs_inhib:
-				if gm_office_s[i] = 0 and gm_office_h[i] > 0 and gm_office_b[i] >= (pcs_hips - 8) and gm_office_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''office'', <<i>>"><img src="images/pc/clothing/5office/<<i>>.jpg" 	height="250" /></a>'
+				if gm_office_s[i] = 0 and gm_office_h[i] > 0 and gm_office_b[i] >= (pcs_hips - 8) and gm_office_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_office'', <<i>>"><img src="images/pc/clothing/5office/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('office'):jump 'loopoffice'
+		if i <= ARRSIZE('gm_office'):jump 'loopoffice'
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
@@ -167,18 +167,18 @@ if $ARGS[0] = 'list':
 		i = 1
 		:loopuniform
 		if gm_uniform[i] = 1:
-			gs 'clothing_attributes', 'uniform', i
+			gs 'clothing_attributes', 'gm_uniform', i
 			if CloInhibit <= pcs_inhib:
-				if gm_uniform_s[i] = 0 and gm_uniform_h[i] > 0 and gm_uniform_b[i] >= (pcs_hips - 8) and gm_uniform_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><img src="images/pc/clothing/10uniform/<<i>>.jpg" 	height="250" /></a>'
+				if gm_uniform_s[i] = 0 and gm_uniform_h[i] > 0 and gm_uniform_b[i] >= (pcs_hips - 8) and gm_uniform_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_uniform'', <<i>>"><img src="images/pc/clothing/10uniform/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('uniform'):jump 'loopuniform'
+		if i <= ARRSIZE('gm_uniform'):jump 'loopuniform'
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'school':
+	if $ARGS[1] = 'gm_school':
 		$ward_list_store = $ARGS[1]
 		*clr & cla
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
@@ -190,19 +190,19 @@ if $ARGS[0] = 'list':
 		'<center>These are the school uniforms you own that are currently available for you to wear.</center><br>'
 		*nl
 
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', 6"><img src="images/pc/clothing/6school/6.jpg" 	height="250" /></a>'
+		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/clothing/6school/6.jpg" 	height="250" /></a>'
 
 		i = 1
 		:loopschool
 		if gm_school[i] = 1:
-			gs 'clothing_attributes', 'school', i
+			gs 'clothing_attributes', 'gm_school', i
 			if CloInhibit <= pcs_inhib:
-				if gm_school_s[i] = 0 and gm_school_h[i] > 0 and gm_school_b[i] >= (pcs_hips - 8) and gm_school_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', <<i>>"><img src="images/pc/clothing/6school/<<i>>.jpg" 	height="250" /></a>'
+				if gm_school_s[i] = 0 and gm_school_h[i] > 0 and gm_school_b[i] >= (pcs_hips - 8) and gm_school_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', <<i>>"><img src="images/pc/clothing/6school/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
 		if i = 6: i = 7
-		if i <= ARRSIZE('school'):jump 'loopschool'
+		if i <= ARRSIZE('gm_school'):jump 'loopschool'
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end

locations/clothing_attributes.qsrc

@@ -111,9 +111,9 @@ elseif $ARGS[0] = 'fashionista':
 	*P FUNC('$attributes_fashionista', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'moncheri':
 	*P FUNC('$attributes_moncheri', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'office':
+elseif $ARGS[0] = 'gm_office':
 	*P FUNC('$attributes_office', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'school':
+elseif $ARGS[0] = 'gm_school':
 	*P FUNC('$attributes_school', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'exercise':
 	*P FUNC('$attributes_exercise', $ARGS[0], ARGS[1])
@@ -121,7 +121,7 @@ elseif $ARGS[0] = 'fetish':
 	*P FUNC('$attributes_fetish', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'exhibit':
 	*P FUNC('$attributes_exhibit', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'uniform':
+elseif $ARGS[0] = 'gm_uniform':
 	*P FUNC('$attributes_uniform', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'coat':
 	*P FUNC('$attributes_coat', $ARGS[0], ARGS[1])