[fixed] The default uniform needed an exception in case it was used as the default outfit. Default.

locations/wardrobe.qsrc

@@ -962,41 +962,46 @@ if $ARGS[0] = 'default_clothing_options':
 		end
 
 		if (default_school_number ! 0 and SchoolAtestat = 0):
+			!! If using the default uniform as their default
+			if $defclothingtype[default_school_number] = 'gm_school' and defclothingnumber[default_school_number] = 6:
+				act 'Put on your school uniform': gs 'wardrobe', 'default_school_wear'
 			!! check to see if schools outfit is worn out
-			if dyneval('RESULT = <<$defclothingtype[default_school_number]>>_h[<<defclothingnumber[default_school_number]>>]') <= 0:
+			elseif dyneval('RESULT = <<$defclothingtype[default_school_number]>>_h[<<defclothingnumber[default_school_number]>>]') <= 0:
 				act 'Put on your school uniform': msg '<font color="red">Unavailable as outfit is worn out!</font>'
 			!! check to see that player is not wearing default schools outfit
 			elseif default_school_number[2] ! 5:
-				act 'Put on your school uniform':
-					if func('prostitution_functions', 'is_default') ! 0: gs 'wardrobe', 'back_to_regular_clothes'
-					
-					$lastwornclothingtype['school'] = $clothingworntype
-					lastwornclothingnumber['school'] = clothingwornnumber
-					lastwornunderwear['school'] = 0
-					if underwear['type'] = 2:
-						lastwornunderwear['school'] = 2
-						$lastwornbodysuittype['school'] = $bodysuitworntype
-						lastwornbodysuitnumber['school'] = bodysuitwornnumber
-					else
-						$lastwornpantytype['school'] = $pantyworntype
-						lastwornpantynumber['school'] = pantywornnumber
-						$lastwornbratype['school'] = $braworntype
-						lastwornbranumber['school'] = brawornnumber
-					end
-					$lastwornshoetype['school'] = $shoeworntype
-					lastwornshoenumber['school'] = shoewornnumber
-					$lastwornpursetype['school'] = $currentpursetype
-					lastwornpursenumber['school'] = currentpursenumber
-					$lastworncoattype['school'] = $coatworntype
-					lastworncoatnumber['school'] = coatwornnumber
-					gs  'wardrobe', 'default_entry_wear', default_school_number
-					gt $loc, $loc_arg
-				end
+				act 'Put on your school uniform': gs 'wardrobe', 'default_school_wear'
 			end
 		end
 	end
 end
 
+if $ARGS[0] = 'default_school_wear':
+	if func('prostitution_functions', 'is_default') ! 0: gs 'wardrobe', 'back_to_regular_clothes'
+	
+	$lastwornclothingtype['school'] = $clothingworntype
+	lastwornclothingnumber['school'] = clothingwornnumber
+	lastwornunderwear['school'] = 0
+	if underwear['type'] = 2:
+		lastwornunderwear['school'] = 2
+		$lastwornbodysuittype['school'] = $bodysuitworntype
+		lastwornbodysuitnumber['school'] = bodysuitwornnumber
+	else
+		$lastwornpantytype['school'] = $pantyworntype
+		lastwornpantynumber['school'] = pantywornnumber
+		$lastwornbratype['school'] = $braworntype
+		lastwornbranumber['school'] = brawornnumber
+	end
+	$lastwornshoetype['school'] = $shoeworntype
+	lastwornshoenumber['school'] = shoewornnumber
+	$lastwornpursetype['school'] = $currentpursetype
+	lastwornpursenumber['school'] = currentpursenumber
+	$lastworncoattype['school'] = $coatworntype
+	lastworncoatnumber['school'] = coatwornnumber
+	gs  'wardrobe', 'default_entry_wear', default_school_number
+	gt $loc, $loc_arg
+end
+
 if $ARGS[0] = 'is_sport':
 	!! checks to see if player is wearing the default sports set using default_sport_number[2]
 	default_sport_number[2] = 0