Merge remote-tracking branch 'hornguy6/master'

locations/hookup_after.qsrc

@@ -701,6 +701,7 @@ if $ARGS[0] = 'pre':
 	
 	if siga > 0:
 		act'Have a smoke':
+			cla
 			hookup['cigarette'] = 1
 			gt'hookup_after','start'
 		end
@@ -817,6 +818,7 @@ end
 if $ARGS[0] = 'start':
 	gs'stat'
 	if hookup['cigarette'] = 3:
+		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/phone_smoke.jpg"></center>'
 		gs 'drugs','smoke'
 		if npc_smoker > 0:
@@ -825,15 +827,18 @@ if $ARGS[0] = 'start':
 			'Reaching down to your purse, you pull out your phone and one of your cigarettes, sparking the latter and taking a long enjoyable drag from it. Sitting back up, you unlocking your phone and breathe out, relaxing with your cigarette while you unwind, checking messages and scrolling through social media feeds.'
 		end
 	elseif npc_smoker > 0 and hookup['cigarette'] = 2:
+		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 		siga += 1
 		gs 'drugs','smoke'
 		'The two of you lay back and relax, enjoying a post-fuck smoke together as you wind down.'
 	elseif npc_smoker > 0 and hookup['cigarette'] = 1:
+		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 		gs 'drugs','smoke'
 		'You pull a cigarette from your purse and a lighter to go with it. Seeing you get one out, <<$npc_firstname>> does as well, pulling a pack from his nightstand. You spark the end with your lighter and lay back on the bed, relaxing as you take a long drag, relishing the flavor as it fills your mouth and lungs, and you relax with <<$npc_firstname>>, enjoying a post-fuck smoke together as you wind down.'
 	elseif hookup['cigarette'] = 1:
+		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
 		gs 'drugs','smoke'
 		'Pulling a cigarette from your purse, you spark it with a lighter and lay back on the bed, relaxing as you take a long drag, relishing the flavor of the smoke as it fills your mouth and lungs, before releasing it through your nostrils.'

locations/stat_display.qsrc

@@ -440,9 +440,11 @@ if $pantyworntype = 'none' and PCloswimwear = 0:
 	elseif towel = 1:
 		$stat_panty_msg = 'Your naked body is covered only by a short towel.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
-	elseif $clothingworntype ! 'nude':
+	elseif $clothingworntype ! 'nude' and trait['commando_lvl'] < 1:
 		$stat_panty_msg = 'You are not wearing panties and it makes you uncomfortable.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+	elseif $clothingworntype ! 'nude':
+		$stat_panty_msg = 'You are not wearing panties.'
 	end
 elseif $pantyworntype = 'exhibitionist' and PCloswimwear = 0:
 	if PCloStyle = 4: