Merge remote-tracking branch 'master/master'

locations/bras.qsrc

@@ -68,7 +68,17 @@ if $ARGS[0] = 'view_bra_list':
 	clo_i = 0
 	:loopbraquality_filter
 
-	i = 1
+	!! default bra
+	gs 'underwear_attributes', 'gm_bras', 1
+	gs 'bras', 'bra_filter'
+	!!sort by filter
+	if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+		if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+			*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''gm'', 1"><img src="images/pc/items/gm/bras/1.jpg" 	height="150" /></a>'
+		end
+	end
+
+	i = 2
 	:loopgmbras
 		if gm_brasS[i] = metka_bras and gm_bras[i] = 1:
 			gs 'underwear_attributes', 'gm_bras', i
@@ -427,7 +437,7 @@ if $ARGS[0] = 'view_bra_item':
 					end
 				end
 			end
-			gs 'bras', 'storage_options'
+			if $ARGS[2] ! 'gm' or ARGS[3] ! 1: gs 'bras', 'storage_options'
 		end
 	end
 end

locations/intro_initialization_sg.qsrc

@@ -14,9 +14,11 @@ gs 'intro_initialization'
 $coatworntype = 'none'
 coatwornnumber = 0
 
+!! cheapo underwear that Sveta will always have
+gm_panties[1] = 1
+gm_bras[1] = 1
+
 if $ARGS[1] ! 'CSB' and $start_type['cat'] ! 'goth' and $start_type['cat'] ! 'bimbo':
-	gm_panties[1] = 1
-	gm_bras[1] = 1
 	gm_shoe[6] = 1
 	danilovich_shoe[21] = 1
 	gs 'panties', 'wear', 'gm', 1

locations/panties.qsrc

@@ -71,7 +71,17 @@ if $ARGS[0] = 'view_panty_list':
 	clo_i = 0
 	:looppantyquality_filter
 
-	i = 1
+	!! default panties
+	gs 'underwear_attributes', 'gm_panties', 1
+	gs 'panties', 'panty_filter'
+	!!sort by filter
+	if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
+		if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+			*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''gm'', 1"><img src="images/pc/items/gm/panties/1.jpg" 	height="150" /></a>'
+		end
+	end
+
+	i = 2
 	:loopgmpanties
 		if gm_pantiesS[i] = metka_panties and gm_panties[i] = 1:
 			gs 'underwear_attributes', 'gm_panties', i
@@ -427,7 +437,7 @@ if $ARGS[0] = 'view_panty_item':
 					end
 				end
 			end
-			gs 'panties', 'storage_options'
+			if $ARGS[2] ! 'gm' or ARGS[3] ! 1: gs 'panties', 'storage_options'
 		end
 	end
 end
@@ -495,6 +505,7 @@ if $ARGS[0] = 'sum':
 end
 
 if $ARGS[0] = 'dispose':
+	if $pantyworntype = 'gm' and pantywornnumber = 1: gs 'panties', 'remove'
 	if underwear['type'] = 2: gs 'underwear_bodysuits', 'dispose'
 	dynamic $pantyworntype + '_panties[<<pantywornnumber>>] = 0'
 	$lastwornpantytype = 'none'