Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/hookup.qsrc

@@ -1634,9 +1634,9 @@ if $ARGS[0] = 'virgin_condom1':
 				'<<$npc_firstname>> sighs. "Okay, fine." Pulling himself off of you, he grabs a package from his nightstand, tearing it open and rolling it onto his dick before taking his place back between you legs.'
 				act'Lose your virginity':
 					if rand(0,1) = 1:
-						gt'miss_virg_norm1'
+						gt 'hookup','miss_virg_norm1'
 					else
-						gt'miss_virg_hard1'
+						gt 'hookup','miss_virg_hard1'
 					end
 				end
 			end
@@ -1647,9 +1647,9 @@ if $ARGS[0] = 'virgin_condom1':
 				'"Maybe..." you start. "... it''ll be okay this one time... this... first time..."'
 				act'Lose your virginity':
 					if rand(0,1) = 1:
-						gt'miss_virg_norm1'
+						gt 'hookup','miss_virg_norm1'
 					else
-						gt'miss_virg_hard1'
+						gt 'hookup','miss_virg_hard1'
 					end
 				end
 			end
@@ -1670,9 +1670,9 @@ if $ARGS[0] = 'virgin_condom2':
 	'He grins back at you, pushing you down onto the bed and climbing on top of you.'
 	act'Lose your virginity':
 		if rand(0,1) = 1:
-			gt'miss_virg_norm1'
+			gt 'hookup','miss_virg_norm1'
 		else
-			gt'miss_virg_hard1'
+			gt 'hookup','miss_virg_hard1'
 		end
 	end
 end
@@ -3008,7 +3008,7 @@ if $ARGS[0] = 'cum_mouth':
 end
 
 if $ARGS[0] = 'cum_inside':
-	if hookup['condom'] = 1:gt'cum_condom'
+	if hookup['condom'] = 1:gt 'hookup','cum_condom'
 	gs'cum_call','',$boy,1
 	$hookup['cum_choice'] = 'creampie'
 	!! differing descriptions based on position

locations/rex_events.qsrc

@@ -338,7 +338,7 @@ if $ARGS[0] = 'avto':
 	act 'Agree':
 		*clr & cla
 		minut += 15
-		gs 'drugs ', 'alcohol', 'beer'
+		gs 'drugs', 'alcohol', 'beer'
 		npc_rel['A57'] += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/reks/rex.jpg"></center>'

locations/rex_party_boys_events.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'drink':
 	cls
 	minut += 5
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	party_boys_drink += 1
 	$menu_loc = 'rex_party_boys_events'
 	$menu_arg = 'drink'
@@ -527,7 +527,7 @@ end
 if $ARGS[0] = 'gost_drink':
 	cls
 	minut += 5
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	party_boys_in += 1
 	menu_off = 1
 	gs 'stat'
@@ -661,7 +661,7 @@ if $ARGS[0] = 'gost_drink_else':
 	cls
 	menu_off = 1
 	minut += 5
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_boys_party_gost_9_4.jpg"></center>'
 	'Despite feeling very drunk you decide that it is time for another drink. But this time it seems to have been too much as you feel very dizzy and your legs begin to buckle, sending you to the floor. You are suddenly surrounded by a bunch of guys who drag you off.'

locations/rex_party_girls_events.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'smoke':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_home_3_1.jpg"></center>'
 		'"Girls, look what I stole from my worthless, addicted brother.", one of the girls says, showing you two bags of marijuana. "So, do you want to keep staring at me, or do you want to have fun?"'
 		act 'Start smoking': gt 'rex_party_girls_events', 'smoke'
-		gs 'willpower', 'drugs ', 'resist', 'medium'
+		gs 'willpower', 'drugs', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Move away (<<will_cost>> Willpower)':
 				*clr & cla
@@ -464,7 +464,7 @@ if $ARGS[0] = 'ira_drink':
 	menu_off = 1
 	minut += 5
 	drunk_sveta += 1
-	gs 'drugs ', 'alcohol', 'beer', 1
+	gs 'drugs', 'alcohol', 'beer', 1
 	gs 'stat'
 	'<center><b><font color = maroon>Ira and Lena</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_iralena_2.jpg"></center>'
@@ -761,7 +761,7 @@ end
 if $ARGS[0] = 'drink':
 	cls
 	minut += 5
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	drunk_sveta +=1
 	gs 'stat'
 	i = rand(1,2)

locations/rex_party_home.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'party':
 		cls
 		minut += 5
 		alkoParty += 1
-		gs 'drugs ', 'alcohol', 'vodka'
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_2_' + rand(1,4) + '.jpg"></center>'
 		'In all this mess, you are unable to find a clean cup and are handed a full bottle of booze. Clinking glasses with the bottle, you put your lips to its mouth and turn it up, gulping down several swigs of strong drink, noticing the effects almost at once.'
@@ -104,7 +104,7 @@ if $ARGS[0] = 'party_drink':
 	cls
 	minut += 5
 	alkoParty += 1
-	gs 'drugs ', 'alcohol', 'vodka'
+	gs 'drugs', 'alcohol', 'vodka'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_2_' + rand(1,4) + '.jpg"></center>'
 	'Someone hands you a half full bottle of booze. Putting your lips to the mouth of the bottle, you turn it up and gulp down several swigs of strong drink, noticing the effects almost at once.'

locations/rex_party_sister_events.qsrc

@@ -88,7 +88,7 @@ end
 if $ARGS[0] = 'sister_drink':
 	minut += 5
 	*clr & cla
-	gs 'drugs ', 'alcohol', 'beer'
+	gs 'drugs', 'alcohol', 'beer'
 	drunk_sveta += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Anya</font></b></center>'
@@ -294,7 +294,7 @@ if $ARGS[0] = 'sisboyQW_party':
 	act 'Accept the drink':
 		*clr & cla
 		minut += 15
-		gs 'drugs ', 'alcohol', 'vodka'
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
@@ -307,7 +307,7 @@ if $ARGS[0] = 'sisboyQW_party':
 	act 'Get up to dance':
 		*clr & cla
 		minut += 15
-		gs 'drugs ', 'alcohol', 'vodka'
+		gs 'drugs', 'alcohol', 'vodka'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_9.jpg"></center>'
 		*nl
@@ -334,7 +334,7 @@ if $ARGS[0] = 'dance':
 	act 'Drink':
 		*clr & cla
 		minut += 10
-		gs 'drugs ', 'alcohol', 'whiskey'
+		gs 'drugs', 'alcohol', 'whiskey'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_13.jpg"></center>'
 		*nl
@@ -471,7 +471,7 @@ end
 if $ARGS[0] = 'reks':
 	*clr & cla
 	minut += 5
-	gs 'drugs ', 'alcohol', 'champagne'
+	gs 'drugs', 'alcohol', 'champagne'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_19.jpg"></center>'
 	*nl
@@ -575,7 +575,7 @@ end
 if $ARGS[0] = 'drink':
 	*clr & cla
 	minut += 10
-	gs 'drugs ', 'alcohol', 'vodka'
+	gs 'drugs', 'alcohol', 'vodka'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_11.jpg"></center>'
 	*nl

locations/sister.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'pav_commcenter':
 			*clr & cla
 			minut += 60
 			npc_rel['A33'] += 5
-			gs 'drugs ', 'alcohol', 'beer', 3
+			gs 'drugs', 'alcohol', 'beer', 3
 			gs 'stat'
 			if AniaFrends >= 1:
 				gt 'sister', 'scene1'

locations/wardrobe.qsrc

@@ -115,7 +115,7 @@ if $ARGS[0] = 'removeall':
 	gs 'panties', 'remove'
 	gs 'shoes', 'strip'
 	gs 'purses', 'remove'
-	gs 'coat', 'remove'
+	gs 'coats', 'remove'
 end
 
 !!---------------------------Oufit stuff----------------------------------