Merge remote-tracking branch 'Hornguy6/master'

locations/sex_ev_after.qsrc

@@ -1148,7 +1148,7 @@ if $ARGS[0] = 'cum_clean':
 				end
 			end
 			
-			if mc_inventory['makeup_wipes'] > 0:
+            if mc_inventory['makeup_wipes'] > 0:
 				act'Use your wipes':
 					gs'sex_ev_after', 'wipe_menu'
 					act'Clean everything':
@@ -1341,13 +1341,13 @@ if $ARGS[0] = 'after_sex2':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle2.jpg"></center>'
 			'Your midnight fuck over, you and <<$npc_firstname[$boy]>> cuddle up together and fall asleep again.'
-			act 'Sleep': gt'sex_ev_after', 'sleep_function'
+			act'Sleep':gt'sex_ev_after', 'sleep_function'
 		end
 	else
 		if $sex_ev['type'] = 'hookup':
-			gs 'sex_ev_hookup_leave', 'gotta_go'
+			gs'sex_ev_hookup_leave', 'gotta_go'
 		else
-			act 'Get dressed': gt 'sex_ev_leave', 'dressing1'
+			act'Get dressed':gt'sex_ev_leave', 'dressing1'
 		end
 	end
 	if sex_ev['npc_late'] ! 1 and $clothingworntype = 'nude' and sex_ev['boy_in_shower'] ! 1:
@@ -2330,10 +2330,10 @@ if $ARGS[0] = 'sore_pussy_msg':
 end
 
 if $ARGS[0] = 'sleep':
-	act 'Fall asleep':
+	act'Fall asleep':
 		cla & *nl
 		'You lay there, your eyelids slowly grow heavier until they close completely and your consciousness drifts slowly into darkness...'
-		act '. . .': gt 'sex_ev_after', 'sleep_function'
+		act'. . .':gt'sex_ev_after', 'sleep_function'
 	end
 end
 
@@ -2364,10 +2364,10 @@ if $ARGS[0] = 'sleep_function':
 		else
 			sex_ev['sleepover'] = 1
 			if alko > 6:
-				gs 'sleep_simple', 'simple'
-				gs 'pain', 3, 'head', 'ache'
+				gs'sleep', 'simple'
+				gs'pain', 3, 'head', 'ache'
 			else
-				gs 'sleep_simple', 'simple'
+				gs'sleep', 'simple'
 			end
 			sex_ev['extra_cum'] += npc_sexdrive[$boy]
 			sex_ev['wake_fuck'] = 1
@@ -2377,14 +2377,14 @@ if $ARGS[0] = 'sleep_function':
 		sex_ev['sleepover'] = 1
 		if alko > 6:
 			sex_ev['hangover'] = 1
-			gs 'sleep_simple', 'simple'
-			gs 'pain', 3, 'head', 'ache'
+			gs'sleep', 'simple'
+			gs'pain', 3, 'head', 'ache'
 		else
-			gs 'sleep_simple', 'simple'
+			gs'sleep', 'simple'
 		end
 
 		if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): sveta_punishment['no_come_home'] = 1
-		gt 'sex_ev_wakeup', 'start'
+		gt'sex_ev_wakeup', 'start'
 	end
 	
 	if npc_latesleeper[$boy] = 0 and npc_caretaker[$boy] = 1 and rand(1,4) < 4 and $sex_ev['loc'] ! 'hotel_room':
@@ -2401,14 +2401,14 @@ if $ARGS[0] = 'sleep_function':
 	end
 	
 	if sex_ev['wake_fuck'] = 1:
-		gt 'sex_ev_sex', 'wakeup_sex'
+		gt'sex_ev_sex', 'wakeup_sex'
 	elseif sex_ev['sleep_fuck'] = 0:
-		gt 'sex_ev_wakeup', 'start'
+		gt'sex_ev_wakeup', 'start'
 	elseif sex_ev['sleep_fuck'] = 1:
-		gt 'sex_ev_sex', 'sleep_sex'
+		gt'sex_ev_sex', 'sleep_sex'
 	else
 		!! failsafe option
-		gt 'sex_ev_wakeup', 'start'
+		gt'sex_ev_wakeup', 'start'
 	end
 end
 --- sex_ev_after ---------------------------------

locations/sex_ev_sex.qsrc

@@ -936,7 +936,7 @@ if $ARGS[0] = 'birth_control_take':
 				end
 			end
 			sex_ev['bc_take'] = 1
-			gs'fertility','birth_control', 1
+			gs 'din_bad', 'quick_takepill'
 			gs 'stat'
 			act'Take it shyly':
 				cla & *clr