Merge remote-tracking branch 'Awesome/master'

# Conflicts:
#	locations/intro_customization.qsrc

locations/clothing.qsrc

@@ -863,7 +863,7 @@ if $ARGS[0] = 'clothing_list':
 	if $args[1] = 'scandalicious_swimwear' or $args[1] = 'all':
 		if $args[1] ! 'all':
 			$ward_list_store = $args[1]
-			'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+			'<center><img src="images/locations/city/citycenter/mall/scandalicious_swimwear.png"></center>'
 			gs 'clothing_QV', 'filter_header', 'store'
 			gs 'clothing', 'clothinglist_header'
 			!!To filter just this set
@@ -914,7 +914,7 @@ if $ARGS[0] = 'clothing_list':
 	if $args[1] = 'allure' or $args[1] = 'all':
 		if $args[1] ! 'all':
 			$ward_list_store = $args[1]
-			'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+			'<center><img src="images/locations/pavlovsk/commercial/allure/shop_name.png"></center>'
 			gs 'clothing_QV', 'filter_header', 'store'
 			gs 'clothing', 'clothinglist_header'
 			!!To filter just this set

locations/gschool_boys_bathroom.qsrc

@@ -158,7 +158,7 @@ if $ARGS[0] = 'boy2':
 				'He starts pulling your clothes off. "Sure you do, every girl wants a strong man to fuck her."'
 				'You struggle and do your best to break free, but his grip is too tight. He pushes you up against the sinks and slips his hand up your skirt.'
 
-				if gruptipe = 4:'As he finds and rubs your clit '+iif($pantyworntype ! 'nude', 'through your panties','')+', he whispers: "If you''re an obedient little bitch, I will put in a good word with the rest. Who knows, maybe I could get you fully accepted."'
+				if gruptipe = 4:'As he finds and rubs your clit '+iif($pantyworntype ! 'none', 'through your panties','')+', he whispers: "If you''re an obedient little bitch, I will put in a good word with the rest. Who knows, maybe I could get you fully accepted."'
 				gs 'arousal', 'foreplay', 5
 				gs 'stat'
 
@@ -401,7 +401,7 @@ if $ARGS[0] = 'boy3_kiss':
 				gs 'stat'
 				'His dick barely exits your ass before the first jet of cum lands on your inner thigh, another lands on your pubic area and a third hits your wet cunt and fingers. He looks at you and smiles, giving you a quick kiss while he helps you down from the sink. "That was amazing," he comments and you''re inclined to agree.'
 				*nl
-				if $pantyworntype ! 'nude':
+				if $pantyworntype ! 'none':
 					'You use the sinks to clean yourselves up, exchanging remarks on the sex you just had while you''re coming down from that post-coital high. As you get cleaned up in the sink, he gets dressed. After cleaning yourself up, you get dressed as well.'
 				else
 					gs 'panties', 'dispose'