1
0
Ver Fonte

fix `Time for the next class` in school chats

Stephan Fuchs há 11 meses atrás
pai
commit
d1addd9e3e

+ 61 - 183
sugarcube/src/activities/school/chats/gschool_coolkid_chats.tw

@@ -12,9 +12,7 @@
 				<<set $dimka_debt = 0>>
 				<<image "characters/shared/headshots_main/big1.jpg">>
 				You nod your head and dig around in your purse before pulling out the money and handing it to him. He takes his time slowly counting it out, then nods in satisfaction. You briefly talk back and forth as he puts the money away.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<<if getvar("$dimarudorient") == 1>>
 					<<actCLA 'Ask for some pale lady'>>
 						<<gt 'gschool_coolkid_chats' 'dim_drugs'>>
@@ -134,9 +132,7 @@
 				<</if>>
 			<</if>>
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<</if>>
 <<case 'dim_drugs'>>
 	<<image "characters/shared/headshots_main/big1.jpg">>
@@ -188,16 +184,12 @@
 	<<set $palelady = 0>>
 	<<image "shared/drugs/cocainebag.jpg">>
 	You nod your head and dig around in your purse before pulling out the money and quickly handing it to him. He takes his time slowly counting it out, which seems like an eternity before he finally hands over a small baggy. You snatch it from him and quickly leave.
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<actCLA 'Do a line'>>
 		<<gs 'drugs' 'cocaine'>>
 		<<image "shared/drugs/lineschool.jpg">>
 		You walk down the hall, looking into classrooms until you spot one that's empty. You glance around and when no one is looking, you duck inside and rush over to the teacher''s desk. You pour out a few lines and quickly snort them up. You feel the sensation of relief and pleasure rush through your body and spend the next few seconds in a stupor before the bell for the next class rings.
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<</actCLA>>
 <<case 'dimka_sex'>>
 	<<image "characters/pavlovsk/school/boy/dimka/sex/school/dimbj1.jpg">>
@@ -224,23 +216,17 @@
 					<<arousalEnd>>
 					<<if getvar("$dimka_debt") > 0>>
 						He puts his dick away and buttons up his pants. "I want my money by next week," he demands before he walks out, leaving you to get cleaned up on your own.
-						<<actCLA 'Time for the next class'>>
-							<<gt 'gschool_lessons' 'short_break'>>
-						<</actCLA>>
+						<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 					<<else>>
 						<<set $dur += 1>>
 						<<set $dimka_debt += 2000>>
 						He puts his dick away and buttons up his pants. "I want my money by next week," he demands before tossing a small baggy of white power on the floor before walking out, leaving you to get cleaned up on your own. Not even thinking about the cum on your face, you quickly snatch up the baggy.
-						<<actCLA 'Time for the next class'>>
-							<<gt 'gschool_lessons' 'short_break'>>
-						<</actCLA>>
+						<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 						<<actCLA 'Do a line'>>
 							<<gs 'drugs' 'cocaine'>>
 							<<image "shared/drugs/lineschool.jpg">>
 							You get up and rush over to the teacher''s desk. You pour out a few lines and quickly snort them up. You feel the sensation of relief and pleasure rush through your body and spend the next few seconds in a stupor before the bell for the next class rings.
-							<<actCLA 'Time for the next class'>>
-								<<gt 'gschool_lessons' 'short_break'>>
-							<</actCLA>>
+							<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 						<</actCLA>>
 					<</if>>
 				<</actCLA>>
@@ -251,9 +237,7 @@
 	
 	<<gs 'npc_relationship' 'modify' 'A4' 'like'>>
 	<<image "characters/shared/headshots_main/big4.jpg">>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<if getvar("$IgorLoverQW") > 0>>
 		When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kind of missed you..." he says shyly and it makes you giggle. While you talk with each other, his warm hand finds yours.
 		func('npc_reactions', 'general', 'A4')
@@ -261,9 +245,7 @@
 			<<set $igor_history = 1>>
 			<<image "characters/shared/headshots_main/big4.jpg">>
 			<p>Igor is almost offended that you'd even have to ask that. "What kind of boyfriend would I be if I didn't help my girlfriend?" he chuckles. "Of course I'll help you."</p>
-			<<actCLA 'Time for the next class'>>
-				<<gt 'gschool_lessons' 'short_break'>>
-			<</actCLA>>
+			<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
 		<<if getvar("$igorstrap") >= 1>>
 			<<actCLA 'Tease him'>>
@@ -273,9 +255,7 @@
 				<<actCLA 'Just chat'>>
 					<<image "characters/shared/headshots_main/big4.jpg">>
 					You choose not to press it any further and start talking to him about a variety of topics while holding hands until break is over. With a smile, you give him a quick kiss goodbye.
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 				<<actCLA 'Tell him you have a surprise'>>
 					<<image "characters/shared/headshots_main/big4.jpg">>
@@ -298,9 +278,7 @@
 					"Oh... yeah, I can help you with your homework..." Igor smiles, but glances down and shuffles restlessly.
 					You smirk and lean in closer. "Don't look so disappointed. Who knows, the quicker we finish with that, the more time we have for <i>other</i> things."
 					Hearing this, Igor''s eyes widen and his cheeks flush as he tries to play it cool, but you notice how he's suddenly more excited.
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</actCLA>>
 		<<else>>
@@ -312,18 +290,14 @@
 			<<actCLA 'Help with homework'>>
 				<<image "characters/shared/headshots_main/big4.jpg">>
 				Igor glances around not meeting your gaze. "No... I can't help you..." He looks like he is about to say more but instead just walks away hanging his head down.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<else>>
 			Igor is hanging with Dimka, Stasya and Bella when you approach. The others are quick to throw some insults your way while Igor mostly just silently nods in agreement. It seems the insults aren''t going to stop until you leave.
 			<<actCLA 'Help with homework'>>
 				<<image "characters/shared/headshots_main/big4.jpg">>
 				Igor can't help but laugh at your request. "Of course you're behind on your work. Maybe if you spent less time whoring around..." He doesn''t finish the sentence before walking away with a look of disgust.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
 	<<elseif $q.school.func('isGroupMember','cool')>>
@@ -346,9 +320,7 @@
 					<<set $igor_history = 1>>
 					<<image "characters/shared/headshots_main/big4.jpg">>
 					Before he can leave, you ask him if he can help with your homework and his face lights up. "Yeah, of course I'll help you."
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
 		<<elseif $npcs.get('A4','rel') <= 20>>
@@ -356,9 +328,7 @@
 			<<actCLA 'Help with homework'>>
 				<<image "characters/shared/headshots_main/big4.jpg">>
 				Igor hesitates, making the whole encounter extremely awkward. "I would... but I can't. I've got... other things I need to do."
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<else>>
 			As usual, Igor is hanging around Dimka, but he pays closer attention to you. With a smile, he asks you how your day has been so far and before long you're talking about all kinds of things. He even takes an interest in the more "girly" topics.
@@ -366,9 +336,7 @@
 				<<set $igor_history = 1>>
 				<<image "characters/shared/headshots_main/big4.jpg">>
 				<p>"Oh, you need my help?" he asks curiously, a bit surprised that you would ask him of all people. After a few seconds, he smiles and nods. "Yeah, of course I'll help you."</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
 	<<elseif $q.school.func('isGroupMember','jocks')>>
@@ -391,9 +359,7 @@
 					<<set $igor_history = 1>>
 					<<image "characters/shared/headshots_main/big4.jpg">>
 					After a few seconds, he smiles and nods. "Yeah, of course I'll help you."
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
 		<<elseif $npcs.get('A4','rel') <= 20>>
@@ -401,9 +367,7 @@
 			<<actCLA 'Help with homework'>>
 				<<image "characters/shared/headshots_main/big4.jpg">>
 				Igor hesitates, making the whole encounter extremely awkward. "I would... but I can't. I've got... other things I need to do."
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<else>>
 			As usual, Igor is hanging around Dimka, but he pays closer attention to you. With a smile, he asks you how your day has been so far and before long you're talking about all kinds of things. He even takes an interest in the more "girly" topics.
@@ -411,9 +375,7 @@
 				<<set $igor_history = 1>>
 				<<image "characters/shared/headshots_main/big4.jpg">>
 				After a few seconds, he smiles and nods. "Yeah, of course I'll help you."
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
 	<<elseif $q.school.func('isGroupMember','nerds')>>
@@ -436,9 +398,7 @@
 					<<set $igor_history = 1>>
 					<<image "characters/shared/headshots_main/big4.jpg">>
 					<p>"You need my help?" he asks curiously, a bit surprised that you would ask him of all people. After a few seconds, he smiles and nods. "Yeah, of course I'll help you."</p>
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
 		<<elseif $npcs.get('A4','rel') <= 20>>
@@ -446,9 +406,7 @@
 			<<actCLA 'Help with homework'>>
 				<<image "characters/shared/headshots_main/big4.jpg">>
 				Igor hesitates, making the whole encounter extremely awkward. "I would... but I can't. I've got... other things I need to do."
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<else>>
 			As usual, Igor is hanging around Dimka, but he pays closer attention to you. With a smile, he asks you how your day has been so far and before long you're talking about all kinds of things. He even takes an interest in the more "girly" topics.
@@ -456,9 +414,7 @@
 				<<set $igor_history = 1>>
 				<<image "characters/shared/headshots_main/big4.jpg">>
 				<p>"You need my help?" he asks curiously, a bit surprised that you would ask him of all people. After a few seconds, he shrugs. "Yeah, I guess I can help you."</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
 	<<elseif $q.school.func('isGroupMember','gopniks')>>
@@ -481,9 +437,7 @@
 					<<set $igor_history = 1>>
 					<<image "characters/shared/headshots_main/big4.jpg">>
 					<p>"Oh, you need my help?" he asks, seemingly not surprised you need help but perhaps a bit surprised you asked him. After a few seconds, he smiles and nods. "Yeah, of course I'll help you."</p>
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
 		<<elseif $npcs.get('A4','rel') <= 20>>
@@ -505,9 +459,7 @@
 				<<set $igor_history = 1>>
 				<<image "characters/shared/headshots_main/big4.jpg">>
 				<p>"Oh, you need my help?" he asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I'll help you."</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif $npcs.get('A4','rel') <= 20>>
 			<p>"Uh, hello?" Igor is unamused to see you and completely ignores you as you try to keep a one-sided conversation going. Eventually, he just walks away without saying a word.</p>
@@ -518,9 +470,7 @@
 			He seems a bit confused. "Oh..." he is all he says as he looks past you and waves at someone. "Sorry, I've got to go." He rushes way from you, unsure if he was actually waving at anyone and think he was just trying to get away from you.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'tease_igor'>>
 	<<gs 'npc_relationship' 'modify' 'A4' 'like'>>
 	<<image "characters/shared/headshots_main/big4.jpg">>
@@ -528,9 +478,7 @@
 	<<actCLA 'Just chat'>>
 		<<image "characters/shared/headshots_main/big4.jpg">>
 		You choose not to press it any further and start talking to him about a variety of topics while holding hands until break is over. With a smile, you give him a quick kiss goodbye.
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<</actCLA>>
 	<<actCLA 'Tell him you have a surprise'>>
 		<<image "characters/shared/headshots_main/big4.jpg">>
@@ -569,9 +517,7 @@
 					<p>"No, that is way too big! A smaller one is okay, but not that thing!" he says while shaking his head.</p>
 					You sigh and look down at the monster dildo, knowing he won''t budge on trying it. "Okay, I'll get something smaller and we can do it next time."
 					He nods. "Sounds good, I can't wait." The two of you talk for a bit before you decide it's time to leave.
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<<else>>
 					Having had enough, you want to give him his reward. You slide off the desk and grab your purse. You pull your strapon out and begin strapping it in place, Igor eagerly helping you. Once it's in place, you smile at him. "Suck my dick, bitch." He eagerly starts sucking your strapon.
 					<<arouse 'foreplay' 2 `['dom']`>>
@@ -598,9 +544,7 @@
 								<p>He blushes and nods as he replies. "Talk to you later $pc.name_nick." You then both hurry to your next class.</p>
 							<</if>>
 							<<setinit $igorqw['schoolstrap'] = 1>>
-							<<actCLA 'Time for the next class'>>
-								<<gt 'gschool_lessons' 'short_break'>>
-							<</actCLA>>
+							<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 						<</actCLA>>
 					<</actCLA>>
 				<</if>>
@@ -610,9 +554,7 @@
 <<case 'katja' 'A14'>>
 	<<todo>>Katjas Questline is on the todo list<</todo>>
 	<<gs 'npc_relationship' 'modify' 'A14' 'like'>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if rand(1,2) == 1 and getvar("$katjaQW['school_sex']") == 1 and getvar("$katjaQW['horny']") >= 40>>
 		<<image "characters/pavlovsk/school/girl/katja/tanga_kiss.jpg">>
 		Katja slowly leans in towards you, almost closing her eyes as she slowly opening her mouth. Unable to resist, you lean in and meet her with a kiss.
@@ -646,9 +588,7 @@
 				<<image "characters/shared/headshots_main/big14.jpg">>
 				<p>You approach Katja and thank her for taking you home from the disco when you were drunk and she gives you a knowing smile. "Don't mention it, $pc.name_nick! You really shouldn't get that drunk again though. It could end badly. Some of the guys there are real pigs..." she says. "Do you want to hang out after school? We could do our homework together?"</p>
 				<p>"Sure, why not?" you reply.</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
 		<<if getvar("$katjaQW['QWstage']") > 2 and $katjaQW['knows_masterbation'] + $katjaQW['knows_BJ'] + $katjaQW['knows_sex'] + $katjaQW['knows_anal'] + getvar("$katjaQW['knows_cuni']") >= 2>>
@@ -657,9 +597,7 @@
 				You lean in to kiss Katja.
 				<<if getvar("$katjaQW['horny']") < 30>>
 					She pulls away from you as you try and kiss her, looking around to see if anyone seen you. "Not here and not now."
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<<else>>
 					<h2><<<<=$npcs.get(''A14'','firstname')>>>> <<<<=$npcs.get(''A14'','lastname')>>>></h2>
 					<<image "characters/shared/headshots_main/big14.jpg">>
@@ -682,9 +620,7 @@
 						<<setinit $katjaQW['horny'] += 5 * (1 + $npcs.get('A14','sex'))>> 
 
 					<</if>>
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 					<<actCLA 'Keep talking to her'>>
 						<<gt 'gschool_coolkid_chats' 'katja'>>
 					<</actCLA>>
@@ -696,9 +632,7 @@
 						<<setinit $katjaQW['horny'] += 5 * (1 + $npcs.get('A14','sex'))>> 
 
 					<</if>>
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 					<<actCLA 'Keep talking to her'>>
 						<<gt 'gschool_coolkid_chats' 'katja'>>
 					<</actCLA>>
@@ -710,9 +644,7 @@
 						<<setinit $katjaQW['horny'] += 5 * (1 + $npcs.get('A14','sex'))>> 
 
 					<</if>>
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 					<<actCLA 'Keep talking to her'>>
 						<<gt 'gschool_coolkid_chats' 'katja'>>
 					<</actCLA>>
@@ -775,9 +707,7 @@
 				<</if>>
 			<</if>>
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 			<<actCLA 'Ask for a tampon'>>
 				<<setinit $temp['tampon_ask'] = '"Katja," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -812,9 +742,7 @@
 			"You're welcome," she smiles back.
 			You run off to the bathroom to go put the tampon in before class starts.
 			<<set $isprok = 1>>
-			<<actCLA 'Time for the next class'>>
-				<<gt 'gschool_lessons' 'short_break'>>
-			<</actCLA>>
+			<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<<else>>
 			<<if $npcs.get('A14','rel') > 20>>
 				<p>"Oh!" Katja squeaks, her eyes going wide and starts digging through her purse. "Yes, of course! Uhm... I only have pads, is that okay?"</p>
@@ -833,9 +761,7 @@
 			<</if>>
 			<<if $wardrobe.isWearingPanties>>
 				<<set $isprokp = 1>>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<<else>>
 				<<actCLA 'Uh...'>>
 					"Uh..."
@@ -843,9 +769,7 @@
 					"That will be fine, thanks," you say with a false smile.
 					"You're welcome," she mumbles, looking away as she hands you the pad.
 					You awkwardly walk away to the bathroom where you do <i>not</i> put on a pad without underwear and still have a woman''s issue to take care of.
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 				<<actCLA 'That`s not going to work'>>
 					<<setinit $katjaQW['no_panties_day'] = $time.daystart>>
@@ -855,9 +779,7 @@
 					"Uh... Uhm..." Her cheeks go bright red as she looks around nervously.
 					<p>"Maybe you can ask my sister. I know she uses tampons... I have to go!"</p>
 					She runs off to her next class and unfortunately you need to go too, so there''s no time to find Vicky.
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
 		<</if>>
@@ -869,9 +791,7 @@
 			"You're welcome," she winks.
 			You run off to the bathroom to go put the tampon in before class starts.
 			<<set $isprok = 1>>
-			<<actCLA 'Time for the next class'>>
-				<<gt 'gschool_lessons' 'short_break'>>
-			<</actCLA>>
+			<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<<else>>
 			<p>"Oh!" Katja squeaks, her eyes going wide. "Yes of course!"</p>
 			She quickly digs into her purse and comes up with a pad for you
@@ -879,9 +799,7 @@
 			"You're welcome," she smiles back.
 			You run off to the bathroom to go put the pad on before class starts.
 			<<set $isprokp = 1>>
-			<<actCLA 'Time for the next class'>>
-				<<gt 'gschool_lessons' 'short_break'>>
-			<</actCLA>>
+			<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<</if>>
 	<</if>>*/
 <<case 'Katjaproblems'>>
@@ -918,9 +836,7 @@
 		<</if>>
 		<<gs 'npc_relationship' 'modify' 'A14' 'like'>>
 		<<gs 'npc_relationship' 'modify' 'A15' 'like'>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<</actCLA>>
 <<case 'bella' 'A22'>>
 	<<gs 'npc_relationship' 'modify' 'A22' 'like'>>
@@ -1013,9 +929,7 @@
 			<p>"Come on Boris, pull it down already, you wanker!" Some boys from another class are encouraging their friend.</p>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Bella," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -1083,9 +997,7 @@
 		<</if>>
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'cherleading_notice'>>
 	<<run $q.cheerleading.set('bella_stasya_gossip',1)>>
 	<<image "characters/pavlovsk/school/girl/bella/notice/bella_stasya1.jpg">>
@@ -1162,9 +1074,7 @@
 <<case 'lizaveta' 'A140'>>
 	<<gs 'npc_relationship' 'modify' 'A140' 'like'>>
 	<<image "characters/shared/headshots_main/big140.jpg">>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<if $pc.fame('pav_slut') > 200>>
 		<<gs 'npc_relationship' 'modify' 'A140' 'dislike'>>
 		<<if $npcs.get('A140','rel') >= 50>>
@@ -1239,9 +1149,7 @@
 			<p>When you sit on the floor next to Lizaveta, she looks at you in shock and surprise before scooting away. "What the fuck, loser? Who said you could leave your cave or wherever it is you hide and socialize with the other freaks?" Her outburst attracts the attention of the other cool kids and jocks around and many of them laugh at her comment. Everyone is staring at you and making you feel very unwelcome as she continues to stare at you until you get up and leave.</p>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Lizaveta," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -1302,15 +1210,11 @@
 		<</if>>
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'lizaveta_latest_gossip'>>
 	<<image "characters/shared/headshots_main/big140.jpg">>
 	<<gs 'gschool_gossip' 'Lizaveta'>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'marcus' 'A146'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A146' 'like'>>
@@ -1380,9 +1284,7 @@
 			<p>You walk up to Marcus and try to talk to him. He mostly ignores you, with only the occasional "uh-huh" for an answer. You notice the others giving you disgusted looks and he finally speaks up. "Look, I don't mean to be rude, but we're not friends and I don't want to talk to you." You sigh and nod before walking away.</p>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'Marcus_Katja_talk'>>
 	
 	<<setinit $katjaQW['marcus_asked'] = 1>>
@@ -1391,16 +1293,12 @@
 	<p>"Yeah?" he answers and you smile. "Well, I have this friend who's never been with a boy before, but would like to try it. So I was wondering if you were up for helping me give her an amazing first time? She's '+iif( hotcat < hotcat_rating['A14'], 'even hotter than I am,', 'totally hot,')+' so you won't regret it."</p>
 	<p>"Are you asking me if I want to have a threesome with two beautiful girls, with one of them even being a virgin?" he asks with a surprised look on his face. "Of course I'm up for this!" he exclaims as his face turns into a huge grin.</p>
 	<p>"Great," you answer. "I'll call you with her address when we are ready. But you have to be discreet, we don't want any rumors spread around!" you tell him and he smiles. "Of course, I'm a gentleman and gentlemen never kiss and tell. I look forward to your call."</p>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'andrey' 'A147'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A147' 'like'>>
 	<<image "characters/shared/headshots_main/big147.jpg">>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<if $pc.fame('pav_slut') > 200>>
 		<<gs 'npc_relationship' 'modify' 'A147' 'dislike'>>
 		<<if $npcs.get('A147','rel') >= 50>>
@@ -1469,9 +1367,7 @@
 		<p>"Hey, Andrey! How's it been?" you ask with a small smile.</p>
 		<p>He gives you a slightly confused look as to why you're talking to him. "Get lost, loser! No one wants to talk to you." He proceeds to ignore you and you can feel everyone else staring at you. Afraid someone might start picking on you, you quickly leave.</p>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'mefodiy' 'A148'>>
 	<<gs 'npc_relationship' 'modify' 'A148' 'like'>>
 	<<image "characters/shared/headshots_main/big148.jpg">>
@@ -1573,9 +1469,7 @@
 		<</if>>
 		func('npc_reactions', 'general', 'A148')
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'vicky' 'A15'>>
 	<<gs 'npc_relationship' 'modify' 'A15' 'like'>>
 	<<image "characters/shared/headshots_main/big15.jpg">>
@@ -1652,9 +1546,7 @@
 		<</if>>
 		func('npc_reactions', 'general', 'A15')
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Vicky," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -1707,9 +1599,7 @@
 		<</if>>
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'stasya' 'A139'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A139' 'like'>>
@@ -1759,9 +1649,7 @@
 		<<gs 'npc_relationship' 'modify' 'A139' 'dislike'>>
 		<p>"Don't even fucking think about it!" Stasya warns when you try to approach. She stares you down until you finally back away and leave.</p>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Stasya," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -1820,9 +1708,7 @@
 		<</if>>
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'irina' 'A17'>>
 	<<gs 'npc_relationship' 'modify' 'A17' 'like'>>
 	<<image "characters/shared/headshots_main/big17.jpg">>
@@ -1910,9 +1796,7 @@
 		<</if>>
 	<</if>>
 	func('npc_reactions', 'general', 'A17')
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Irina," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -1971,9 +1855,7 @@
 		<</if>>
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'sonia' 'A25'>>
 	<<gs 'npc_relationship' 'modify' 'A25' 'like'>>
 	<<image "characters/shared/headshots_main/big25.jpg">>
@@ -2071,9 +1953,7 @@
 		<</if>>
 	<</if>>
 	func('npc_reactions', 'general', 'A25')
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -2122,7 +2002,5 @@
 		<</if>>
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <</switch>>

+ 25 - 75
sugarcube/src/activities/school/chats/gschool_gopnik_chats.tw

@@ -129,9 +129,7 @@
 			func('npc_reactions', 'general', 'A9')
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'radomir' 'A154'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
@@ -255,9 +253,7 @@
 		<<gs 'npc_relationship' 'modify' 'A154' 'dislike'>>
 		<p>As you start saying something to him, he interrupts you. "Get lost, loser! I can't be seen with the likes of you! I have a reputation to uphold!"</p>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'roman' 'A157'>>
 	
 	<<image "characters/shared/headshots_main/big157.jpg">>
@@ -323,9 +319,7 @@
 		"Calm down, I just want to talk." He mostly insults you as you try and talk to him, but at least he doesn''t run you off.
 		func('npc_reactions', 'general', 'A159')
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'dan' 'A10'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A10' 'like'>>
@@ -367,17 +361,13 @@
 		"I'm not in the mood." You persist and he relents. He briefly chats to you before making it clear that he's done talking, so you leave him in peace.
 		func('npc_reactions', 'general', 'A10')
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'valentin' 'A158'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
 	<<gs 'npc_relationship' 'modify' 'A158' 'like'>>
 	<<image "characters/shared/headshots_main/big158.jpg">>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<if $q.school.func('isGroupMember','gopniks') and getvar("$gopnik_slut") == 1>>
 		<p>He smiles as you approach. "What's up, $pc.name_nick?"</p>
 		You smile back. "Nothing much, just wanted to hang out and talk."
@@ -409,9 +399,7 @@
 			<<actCLA 'Ask for a ride on his bike'>>
 				<p>Listening to him, you tease him a little. "As soon as you've fixed your bike, I want you to take me on a ride! And I won't take no for an answer."</p>
 				<p>Valentin gives you a big smile. "Sure thing, $pc.name_nick. I'll send you a text as soon as I've finished repairing her and I'll take you on a ride."</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif $npcs.get('A158','rel') <= 20>>
 			<p>"Hey Valentin!" you greet him as you approach.</p>
@@ -434,9 +422,7 @@
 			<<actCLA 'Ask for a ride on his bike'>>
 				<p>Listening to him, you tease him a little. "As soon as you've fixed your bike, I want you to take me on a ride! And I won't take no for an answer."</p>
 				<p>Valentin gives you a big smile. "Sure thing, $pc.name_nick. I'll send you a text as soon as I've finished repairing her and I'll take you on a ride."</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif $npcs.get('A158','rel') <= 20>>
 			<p>"Hey Valentin!" you greet him as you approach.</p>
@@ -459,9 +445,7 @@
 			<<actCLA 'Ask for a ride on his bike'>>
 				<p>Listening to him, you tease him a little. "As soon as you've fixed your bike, I want you to take me on a ride! And I won't take no for an answer."</p>
 				<p>Valentin gives you a big smile. "Sure thing, $pc.name_nick. I'll send you a text as soon as I've finished repairing her and I'll take you on a ride."</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif $npcs.get('A158','rel') <= 20>>
 			<p>"Hey Valentin!" you greet him as you approach.</p>
@@ -484,9 +468,7 @@
 			<<actCLA 'Ask for a ride on his bike'>>
 				<p>Listening to him, you tease him a little. "As soon as you've fixed your bike, I want you to take me on a ride! And I won't take no for an answer."</p>
 				<p>Valentin gives you a big smile. "Sure thing, $pc.name_nick. I'll send you a text as soon as I've finished repairing her and I'll take you on a ride."</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif $npcs.get('A158','rel') <= 20>>
 			<p>"Hey Valentin!" you greet him as you walk up.</p>
@@ -514,9 +496,7 @@
 			<p>"Why would I want to talk to someone like you? Fuck off before things get ugly." You glance around and, seeing the stares of the other gopniks, decide to leave while you still can.</p>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'shulga' 'A11'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A11' 'like'>>
@@ -557,9 +537,7 @@
 		The two of you engage in a friendly conversation, mostly about when you were both kids.
 		func('npc_reactions', 'general', 'A11')
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'arkadi' 'A156'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
@@ -651,9 +629,7 @@
 			You shake your head as he gets up and takes a step towards you. You turn and run before they can do whatever it is they were planning. You can hear their laughter echoing behind you as you run away.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'lavrenti' 'A155'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A155' 'like'>>
@@ -800,9 +776,7 @@
 			You try talking to him, but he just ignores you. As soon as the bell rings, he walks away without a word.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'niko' 'A189'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
@@ -814,9 +788,7 @@
 		<<gt 'NikoEv' 'Lunch Chat'>>
 	<</if>>*/
 	<<todo>>Niko's content is on the todo-list<</todo>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'ekaterina' 'A145'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A145' 'like'>>
@@ -858,9 +830,7 @@
 		You raise your hands to show you didn''t mean anything by it. "I was just asking is all."
 		<p>"Yeah? Well don't." You change the subject to school and she pays half attention to you, obviously not that interested in talking.</p>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'lera' 'A21'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A21' 'like'>>
@@ -903,9 +873,7 @@
 		func('npc_reactions', 'general', 'A21')
 		The two of you continue talking for a while until Lena shows up and calls Lera over, ending your conversation.
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'alyona' 'A143'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
@@ -1052,9 +1020,7 @@
 			When you look back as you walk away, you see Alyona whispering something to Anushka. You can't hear them, but you're sure they're talking about you.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Alyona," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -1135,9 +1101,7 @@
 			<</if>>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>>*/
 <<case 'anushka' 'A144'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A144' 'like'>>
@@ -1156,9 +1120,7 @@
 				<<image "characters/pavlovsk/school/girl/anushka/nomake.jpg">>
 				You place your hand on her shoulders and gently push her away. "No, I don't want to."
 				She rolls her eyes. "Fine whatever. If you don't want to have a little fun, I'll find someone who does." She turns and walks away, leaving you unsure about what just happened.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Go with it'>>
 				<<setinit $anushkaQW['lunch'] = 1>>
@@ -1440,9 +1402,7 @@
 			<p>"Hey loser! No, I was looking at porn." She grins in amusement and you decide to change the subject and ask her about her music. She's reluctant to talk, but eventually opens up and you have a pleasant conversation with her. The two of you talk and laugh until the bell rings.</p>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Anushka," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -1472,9 +1432,7 @@
 	<<image "characters/shared/headshots_main/big144.jpg">>
 	<p>"Sorry, but I can't. Maybe some other time?" you reply.</p>
 	She frowns and shrugs. "Sure, whatever. Some other time then."
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'nush_invite_yes'>>
 	
 	<!-- !!should we change this to one of the stat code instead of like this?-->
@@ -1484,9 +1442,7 @@
 	<<image "characters/shared/headshots_main/big144.jpg">>
 	"Yeah, I would like that," you reply.
 	"Sweet, I'll wait for you at the doors after school."
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 /*<<case 'anushka_tampon' ''>>
 	<<image "characters/shared/headshots_main/big144.jpg">>
 	<<if $temp['tampon_ask'] == '"Anushka , " you whisper. "My period just started and $I don't have a tampon. Can I borrow one?"' or $temp['tampon_ask'] == '"Anushka , " you whisper. "My period is starting soon and $I don't have a tampon. Can I borrow one?"'>>
@@ -1517,9 +1473,7 @@
 		<</if>>
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'lena' 'A20'>>
 	
 	<<image "characters/shared/headshots_main/big20.jpg">>
@@ -1566,9 +1520,7 @@
 		The two of you talk for a while about how much school sucks and all the better things you could be doing with your time.
 		func('npc_reactions', 'general', 'A20')
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'pauline' 'A24'>>
 	
 	<<gs 'npc_relationship' 'modify' 'A24' 'like'>>
@@ -1651,7 +1603,5 @@
 			func('npc_reactions', 'general', 'A24')
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <</switch>>

+ 23 - 69
sugarcube/src/activities/school/chats/gschool_jock_chats.tw

@@ -100,9 +100,7 @@
 			<p>You approach and try to talk to him, but he straight up ignores you and pretends you're not there. After several minutes of this, he finally sighs loudly. "Can't you take a fucking hint? No one wants to talk to you!" He then returns to ignoring you and you walk away.</p>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'svyatoslav' 'A8'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
@@ -182,9 +180,7 @@
 			<p>He shakes his head as you approach. "Fuck no! Stay the fuck away from me, you worthless fuck. No one likes you, so just turn your fucking ass around and walk the fuck away from here." He glares at you and you notice a lot of the others giving you unkind looks. You sigh before turning and walking away.</p>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 
 <<case 'vanya' 'A165'>>
 	
@@ -235,9 +231,7 @@
 		"So easily agitated..." Vanya comments while you burst out in laughter over the stupid face Vitek is making.
 		func('npc_reactions', 'general', 'A165')
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'erast' 'A150'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
@@ -398,9 +392,7 @@
 			You have a few minutes before the next lesson, so you head to your classroom and try to kill the time.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <<case 'A18' 'christina'>>
 	
 	<<gs 'Zvereva_events' 'cikl'>>
@@ -419,9 +411,7 @@
 			<p>She snatches the money from your hand. "What, was she too scared to speak to me? She had to get you to do it for her?"</p>
 			"Something like that," you reply. "Anyway, don't lend her any more money."
 			<p>"Wasn't planning to. It took her long enough to pay this back!" She counts out the money and a slight smile crosses her face. "Alright, we're done here. You can leave now."</p>
-			<<actCLA 'Time for the next class'>>
-				<<gt 'gschool_lessons' 'short_break'>>
-			<</actCLA>>
+			<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
 	<<elseif $q.christina?.get('subpath') >= 2>>
 		<<if $q.christina?.get('subpath') >= 3>>
@@ -519,9 +509,7 @@
 			She coldly glares at you before storming off without answering. A satisifed grin on your face, you head to your next class.
 		<</actCLA>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<if $q.christina?.get('blackmail') == 0 and $q.christina?.get('pre_bm') == 0 and $q.christina?.get('pre_fight') == 0 and $q.christina?.get('fight') == 0 and $q.christina?.get('subpath') == 0 and $q.christina?.get('bully') <= 40>>
 		<<actCLA `'Think about '+$npcs.get('A18','usedname')`>>
 			<<gt 'Zvereva_events' 'christina_decide1'>>
@@ -573,9 +561,7 @@
 	<<else>>
 		<p>"Ha! That's the best thing I've heard all day! Fuck you, enjoy the humiliation!" she grins, flipping you the bird as she walks away. "And start using tampons you fucking loser! Nobody uses pads anymore!" she calls back over her shoulder.</p>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'albina' 'A23'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
@@ -708,9 +694,7 @@
 			<p>Albina is on her phone as you approach. She looks up at you before returning her attention to her phone and ignoring you. After a few seconds, she looks up again and glares at you. "Go hang out with the other losers, freak. Can't you see I'm busy here?" She shoos you away with a motion of her hand before going back to texting on her phone.</p>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Albina," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -759,9 +743,7 @@
 		<</if>>
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'veronika' 'A141'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
@@ -905,9 +887,7 @@
 			After a few minutes, she starts packing her things. "Okay, I'm leaving now." She keeps it short, and with that she goes on her business. You stay for a while and try to eavesdrop on others talking.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Veronika," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -973,9 +953,7 @@
 		<</if>>
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'lina' 'A19'>>
 	
 	<<image "characters/shared/headshots_main/big19.jpg">>
@@ -1104,9 +1082,7 @@
 			"I'm sorry, but I can't be seen talking to you."
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -1167,9 +1143,7 @@
 			She then walks away, leaving you cramping in the middle of the hallway.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'lariska' 'A13'>>
 	
 	<<image "characters/shared/headshots_main/big13.jpg">>
@@ -1357,9 +1331,7 @@
 			<</if>>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -1404,9 +1376,7 @@
 	"Just don't tell <<npc 'A18'>><</npc>>," she whispers. "I don't want to leave you hanging but she'll kill me if she finds out."
 	You run off to the bathroom to go put the tampon in before class starts.
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>*/
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>*/
 <<case 'fedor' 'A5'>>
 	
 	<<run $pc.skillExperienceGain('charisma',rand(1,2))>>
@@ -1441,17 +1411,13 @@
 				<</actCLA>>
 
 			<</if>>
-			<<actCLA 'Time for the next class'>>
-				<<gt 'gschool_lessons' 'short_break'>>
-			<</actCLA>>
+			<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<<actCLA 'Tell him you`re bored right now'>>
 				<<gt 'gdksport' 'Ivan_bored'>>
 			<</actCLA>>
 		<</actCLA>>
 	<<elseif getvar("$IvanShowerQW") == 11 and getvar("$IvanShowerYes") == 1>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<<if $npcs.get('A3','rel') >= 80 and getvar("$NikoPayback") == 2 and getvar("$IvanVsNiko") == 0>>
 			<<actCLA 'Ask for help with Niko'>>
 				<<gt 'NikoPayback' 'Ivan Help'>>
@@ -1477,16 +1443,12 @@
 		<p>As you're about to head for your next class, Ivan suddenly stops you. "$pc.name_nick, want to meet up with me in the showers after school?"</p>
 		<<actCLA 'Decline'>>
 			You give it some thought, but have to decline. You shake your head apologetically. "Sorry Ivan, I can't make it today."
-			<<actCLA 'Time for the next class'>>
-				<<gt 'gschool_lessons' 'short_break'>>
-			<</actCLA>>
+			<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
 		<<actCLA 'Agree'>>
 			<<set $IvanShowerYes = 1>>
 			<p>You give him a cute wink. "Sounds like fun. I'll see you there!"</p>
-			<<actCLA 'Time for the next class'>>
-				<<gt 'gschool_lessons' 'short_break'>>
-			<</actCLA>>
+			<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<</actCLA>>
 		<!-- !!end of his story arc stuff-->
 	<<elseif $pc.fame('pav_slut') >= 225>>
@@ -1526,9 +1488,7 @@
 				<p>You stop as you start to walk away. "Hey, do you think you could show me some boxing moves, for real?"</p>
 				He stops and seems to think about it. "Sure, stop by the gym at the community center just before it closes. I train after it closes some nights and I can show you some stuff then."
 				You smile at him. "Thanks." You wave goodbye before heading to class.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif $npcs.get('A3','rel') <= 20>>
 			<p>You see Ivan talking to Fedor and decide to approach them. "Hi Ivan, do you have a minute?" you ask.</p>
@@ -1561,9 +1521,7 @@
 				<p>You stop as you start to walk away. "Hey, do you think you could show me some boxing moves, for real?"</p>
 				He stops and seems to think about it. "Sure, stop by the gym at the community center just before it closes. I train after it closes some nights and I can show you some stuff then."
 				You smile at him. "Thanks." You wave goodbye before heading to class.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif $npcs.get('A3','rel') <= 20>>
 			As you step out into the corridor, you spot Ivan and approach him.
@@ -1619,9 +1577,7 @@
 				<p>You stop as you start to walk away. "Hey, do you think you could show me some boxing moves, for real?"</p>
 				He stops and seems to think about it. "Sure, stop by the gym at the community center just before it closes. I train after it closes some nights and I can show you some stuff then."
 				You smile at him. "Thanks." You wave goodbye before heading to class.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif $npcs.get('A3','rel') <= 20>>
 			You see Ivan talking to his fellow jocks and decide to try and talk to him.
@@ -1662,7 +1618,5 @@
 			There''s still a few minutes left of the break, so you decide to walk around a bit before heading back to the classroom.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <</switch>>

+ 18 - 54
sugarcube/src/activities/school/chats/gschool_nerd_chats.tw

@@ -34,9 +34,7 @@
 
 		<<npcReaction 'A2'>>
 
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<<if $npcs.get('A2','rel') > 20 and !$q.questIsStarted('artemTutoring')>>
 			<<actCLA 'Ask for help studying'>>
 				<<run $q.questStart('artemTutoring')>>
@@ -123,9 +121,7 @@
 				<p>"Oh hey $pc.name_nick. Did you say something?" He smiles tightly at you as he puts his book down. Before you can even respond, he continues. "This book is crazy interesting." He tells you, from here he doesn't exactly ignore you but he also mostly pays attention to the book, you know he is afraid of what it will do to his rep if he is seen talking to you.</p>
 			<</if>>
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<<if getvar("$petkasub") >= 1>>
 			<<actCLA 'Remind him you own him'>>
 				
@@ -170,9 +166,7 @@
 				<p>After a short pause, you reply. "Sorry, but I don't understand what you're offering?"</p>
 				She takes a deep breath and continues. "Well... I''d like to help you... So if you need help with your homework, or just need a friend, then come to my house and I'll be there for you. You just need to promise me that you won''t say anything to anyone else, at least until your reputation has improved."
 				"Thanks Julia. It's certainly something I'll consider," you reply with a smile.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif getvar("$juliaQW['study_unlocked']") == 0 and $npcs.get('A12','rel') >= 60>>
 			<<setinit $juliaQW['study_unlocked'] = 1>>
@@ -282,9 +276,7 @@
 				Julia looks up from her schoolwork. You manage to steal some of her attention away from her books as the two of you chat efficiently and comfortably.
 			<</if>>
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 			<<actCLA 'Ask for a tampon'>>
 				<<setinit $temp['tampon_ask'] = '"Julia," you whisper. "My period just started and I don`t have a tampon, can I borrow one?"'>>
@@ -329,9 +321,7 @@
 			<</if>>
 			<<if $wardrobe.isWearingPanties>>
 				<<set $isprokp = 1>>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<<else>>
 				<<actCLA 'Uh...'>>
 					"Uh..."
@@ -339,9 +329,7 @@
 					"That will be fine, thanks," you say with a false smile.
 					"You're welcome," she mumbles, looking away as she hands you the pad.
 					You awkwardly walk away to the bathroom where you do <i>not</i> put on a pad without underwear and still have a woman''s issue to take care of.
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 				<<actCLA 'That`s not going to work'>>
 					"Uhm... A pad''s not going to work for me," you say.
@@ -349,9 +337,7 @@
 					"You need panties to wear a pad," you reply with a wry smirk.
 					"Uh... Uhm..." Her cheeks go bright red as she looks around nervously.
 					"Thanks anyways," you say but unfortunately before you have a chance to ask someone else, the rest of the class starts filing back in.
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</if>>
 		<<else>>
@@ -368,9 +354,7 @@
 				"You're welcome," she mumbles and you run off to the bathroom to go put the tampon in before class starts.
 			<</if>>
 			<<set $isprokp = 1>>
-			<<actCLA 'Time for the next class'>>
-				<<gt 'gschool_lessons' 'short_break'>>
-			<</actCLA>>
+			<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<</if>>
 
 	<<case 'natasha' 'A16'>>
@@ -394,17 +378,13 @@
 		<<else>>
 			You strike up a conversation with Natasha. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 		<<if getvar("$NatbelQW['QWstage']") == 0 and $npcs.get('A16','rel') >= 60 and $pc.fame('pav_slut') < 200>>
 			<<actCLA 'Ask for help studying'>>
 				<<setinit $NatbelQW['QWstage'] = 1>>
 				<<image "characters/shared/headshots_main/big16.jpg">>
 				<p>You approach Natasha and explain how you're struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees. "Sure thing $pc.name_nick. That could be fun!"</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<elseif getvar("$NatbelQW['QWstage']") >= 8 and getvar("$NatbelQW['Debt']") > 0>>
 			<<actCLA 'Take her to the bathroom'>>
@@ -428,9 +408,7 @@
 					<<gs 'arousal' 'cuni' -10 'lesbian' 'dom'>>
 					Your whole body shudders as the orgasm rocks your body and you grind your pussy against her face as it does. Once the sensation passes, you look down and see Natasha smiling up at you, obviously pleased with herself. You lean down and give her a long slow passionate kiss, tasting your own pussy juices on her lips. A few seconds later, the bell rings and you both merrily hurry to class.
 					<<arousalEnd>>
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</actCLA>>
 		<</if>>
@@ -487,9 +465,7 @@
 				You strike up a conversation with Evgeny. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.
 			<</if>>
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 
 	<<case 'feofan' 'A152'>>
 		
@@ -551,9 +527,7 @@
 				<p>You strike up a conversation with Feofan. He seems a bit hesitant at first, but quickly engages you in a rather one sided conversation about sci-fi, comic books and fantasy role play. His fellow nerds give him dirty looks, but he ignores them and continues speaking with you.</p>
 			<</if>>
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 
 	<<case 'gerasim' 'A153'>>
 		
@@ -590,9 +564,7 @@
 					<<image "characters/shared/headshots_main/big153.jpg">>
 					<p>You walk over as the nerds gather around Gerasim. Several of them are asking if he's okay, followed by them wondering aloud why Anushka helped him. By the way they talk, it sounds like it's not uncommon for her to step in and help him. "Look, I'm fine, Dan just scared me a little is all." When pressed about Anushka helping him, he blushes. "Look, she's not like the rest of them, okay?"</p>
 					The other nerds point out the times she's picked on them and Gerasim keeps insisting she isn''t like the rest, but refuses to elaborate further on it. The conversation slowly turns into the nerds complaining about everyone but the outcasts picking on them. You never really get a chance to talk to Gerasim other than to say you're glad he's okay.
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Just watch'>>
@@ -609,9 +581,7 @@
 					<<image "characters/shared/headshots_main/big153.jpg">>
 					<p>You walk over as the nerds gather around Gerasim. Several of them are asking if he's ok, followed by them wondering aloud why Anushka helped him. By the way they talk, it sounds like it's not uncommon for her to step in and help him. "Look, I'm fine, Dan just scared me a little is all." When pressed about Anushka helping him, he blushes. "Look, she's not like the rest of them, okay?"</p>
 					The other nerds point out the times she's picked on them as Gerasim keeps insisting she isn''t like the rest, but refuses to elaborate further on it. The conversation slowly turns into the nerds complaining about everyone but the outcasts picking on them. You never really get a chance to talk to Gerasim other than to say you're glad he's okay.
-					<<actCLA 'Time for the next class'>>
-						<<gt 'gschool_lessons' 'short_break'>>
-					<</actCLA>>
+					<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 				<</actCLA>>
 			<</actCLA>>
 		<<elseif $pc.fame('pav_slut') > 175>>
@@ -662,9 +632,7 @@
 				He pauses for a moment before sighing. "Just... I need to get this done so..." You can tell he's trying to politely tell you not to bother him, so you sit with him and only occasionally say something, which he responds to but never adds much more than that.
 			<</if>>
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 
 	<<case 'zinaida' 'A142'>>
 		
@@ -815,9 +783,7 @@
 				After continuing to talk for a few more minutes, she takes her notes out of her backpack. "We'll continue this next time, maybe. But for now, I''d like to check my homework before the lesson starts. See you." With that, she turns to her desk and starts revising her homework.
 			<</if>>
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 
 	<<case 'natalia' 'A240'>>
 		
@@ -957,8 +923,6 @@
 				<</if>>
 			<</if>>
 		<</if>>
-		<<actCLA 'Time for the next class'>>
-			<<gt 'gschool_lessons' 'short_break'>>
-		<</actCLA>>
+		<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 
 <</switch>>

+ 12 - 36
sugarcube/src/activities/school/chats/gschool_outcast_chats.tw

@@ -52,9 +52,7 @@
 			You see Lesco sitting quietly by himself as usual. Feeling sorry for him, you approach with a friendly smile and strike up a conversation with him. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'A159'>>
 	<<set $menu_off = 1>>
@@ -135,9 +133,7 @@
 				<<else>>
 					<p>His eyes grow wide and he takes the money from you, letting his hand linger against yours way too long for comfort. "Thanks $pc.name_nick, you're the best!" he says with a grin and, is that love in his eyes? After another awkward moment, he leaves to go and buy lunch.</p>
 				<</if>>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Tell him to stop being a mooch'>>
 				<<gs 'npc_relationship' 'modify' 'A159' 'dislike'>>
@@ -147,9 +143,7 @@
 				<<image "characters/shared/headshots_main/big159.jpg">>
 				<p>Tired of him always mooching off you and the others, you snap. "Stop being a mooch and try taking care of yourself for once!"</p>
 				His eyes water up a little. "I thought we were friends... I'm..." He walks off with his head hung low.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<else>>
 			<p>You notice Petia desperately walking up and down the classroom, trying to mooch some stuff from the other students in the classroom. When he sees you, he quickly starts walking towards you. "Hey $pc.name_nick, do you have any money? I'm getting really hungry."</p>
@@ -163,9 +157,7 @@
 				<<else>>
 					<p>His eyes grow wide and he takes the money from you, letting his hand linger against yours way too long for comfort. "Thanks $pc.name_nick, you're the best!" he says with a grin and, is that love in his eyes? After another awkward moment, he leaves to go and buy lunch.</p>
 				<</if>>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Tell him to stop being a mooch'>>
 				<<gs 'npc_relationship' 'modify' 'A159' 'dislike'>>
@@ -175,9 +167,7 @@
 				<<image "characters/shared/headshots_main/big159.jpg">>
 				<p>Tired of him always mooching off you and the others, you snap. "Stop being a mooch and try taking care of yourself for once!"</p>
 				His eyes water up a little. "I... I'm..." He walks off with his head hung low.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
 	<<elseif $q.school.func('isGroupMember','gopniks')>>
@@ -214,9 +204,7 @@
 				<<else>>
 					<p>His eyes grow wide and he takes the money from you, letting his hand linger against yours way too long for comfort. "Thanks $pc.name_nick, you're the best!" he says with a grin and, is that love in his eyes? After another awkward moment, he leaves to go and buy lunch.</p>
 				<</if>>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Tell him to stop being a mooch'>>
 				<<gs 'npc_relationship' 'modify' 'A159' 'dislike'>>
@@ -226,9 +214,7 @@
 				<<image "characters/shared/headshots_main/big159.jpg">>
 				<p>Tired of him always mooching off you and the others, you snap. "Stop being a mooch and try taking care of yourself for once!"</p>
 				His eyes water up a little. "I thought we were friends... I'm..." He walks off with his head hung low.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<<else>>
 			<p>You notice Petia desperately walking up and down the classroom, trying to mooch some stuff from the other students in the classroom. When he sees you, he quickly starts walking towards you. "Hey $pc.name_nick, do you have any money? I'm getting really hungry."</p>
@@ -238,9 +224,7 @@
 				<<image "characters/shared/headshots_main/big159.jpg">>
 				You feel sorry for him and do have the money to spare. "Here, go and get yourself some lunch."
 				<p>His eyes grow wide and he takes the money from your hand, letting his hand linger against yours way too long for comfort. "Thanks $pc.name_nick, you're the best!" he says with a grin and, is that love in his eyes? After another awkward moment, he leaves to go and buy lunch.</p>
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 			<<actCLA 'Tell him to stop being a mooch'>>
 				<<gs 'npc_relationship' 'modify' 'A159' 'dislike'>>
@@ -250,15 +234,11 @@
 				<<image "characters/shared/headshots_main/big159.jpg">>
 				<p>Tired of him always mooching off you and the others, you snap. "Stop being a mooch and try taking care of yourself for once!"</p>
 				His eyes water up a little. "I... I'm..." He walks off with his head hung low.
-				<<actCLA 'Time for the next class'>>
-					<<gt 'gschool_lessons' 'short_break'>>
-				<</actCLA>>
+				<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 			<</actCLA>>
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'A25'>>
 	<<set $menu_off = 1>>
@@ -347,9 +327,7 @@
 			You sit next to her and engage her in conversation. The two of you talk about fashion, makeup and many other things. She seems well versed in these subjects and discusses them with great enthusiasm.
 		<</if>>
 	<</if>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 	/*<<if getvar("$mesec") > 0 and getvar("$isprok") == 0 and getvar("$isprokp") == 0>>
 		<<actCLA 'Ask for a tampon'>>
 			<<setinit $temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don`t have a tampon. Can I borrow one?"'>>
@@ -401,9 +379,7 @@
 		"We've all been there," she says with a shrug and a small smile and you run to the bathroom to put the tampon in.
 	<</if>>
 	<<set $isprok = 1>>
-	<<actCLA 'Time for the next class'>>
-		<<gt 'gschool_lessons' 'short_break'>>
-	<</actCLA>>
+	<<actCLA 'Time for the next class'>><<gs 'school_schedule'>><</actCLA>>
 <</if>>*/
 <<if $location_var[$here][0] == 'A5'>>
 	<<set $menu_off = 1>>