Merge branch 'history-events-typos' into 'master'

fixing some typos in history-events

See merge request !879

game/overworld-town/loc-school/classes/history-events.twee

@@ -80,7 +80,7 @@ You shift in your seat and lift up your skirt, revealing your <<undies>>.
 		<br>
 		One student wolf-whistles, and a laugh breaks out across the room.
 		<br><br>
-		"Cover youself," Winter demands. "The Head will talk to you about this in detention."
+		"Cover yourself," Winter demands. "The Head will talk to you about this in detention."
 	<<elseif $worn.under_upper.type.includes("naked") and $breastsize gte 1>>
 		notice. Until, while adjusting your $worn.upper.name you flash your <<breasts>>.
 		One student wolf-whistles and laugh breaks out across the room.
@@ -157,12 +157,12 @@ This is ridiculous, there's no way you're wearing that. Winter glares at you as
 		<<lstress>><<stress -1>>
 		<br><br>
 
-			<<if $skulduggery lte ($skulduggerydifficulty + 100)>>
+		<<if $skulduggery lte ($skulduggerydifficulty + 100)>>
 			<<skulduggeryskilluse>>
-			<<else>>
+		<<else>>
 			<span class="blue">That was too easy. You didn't learn anything.</span>
 			<br><br>
-			<</if>>
+		<</if>>
 
 		<<link [[Next|History Lesson]]>><<endevent>><</link>>
 		<br>
@@ -177,12 +177,12 @@ This is ridiculous, there's no way you're wearing that. Winter glares at you as
 		<<detention 2>><<stress 2>><<gstress>><<gdelinquency>>
 		<br><br>
 
-			<<if $skulduggery lte ($skulduggerydifficulty + 100)>>
+		<<if $skulduggery lte ($skulduggerydifficulty + 100)>>
 			<<skulduggeryskilluse>>
-			<<else>>
+		<<else>>
 			<span class="blue">That was too easy. You didn't learn anything.</span>
 			<br><br>
-			<</if>>
+		<</if>>
 
 		<<link [[Next|History Lesson]]>><<endevent>><</link>>
 		<br>
@@ -207,12 +207,12 @@ This is ridiculous, there's no way you're wearing that. Winter glares at you as
 		<<stress -2>><<lstress>>
 		<br>
 
-			<<if $skulduggery lte ($skulduggerydifficulty + 100)>>
+		<<if $skulduggery lte ($skulduggerydifficulty + 100)>>
 			<<skulduggeryskilluse>>
-			<<else>>
+		<<else>>
 			<span class="blue">That was too easy. You didn't learn anything.</span>
 			<br><br>
-			<</if>>
+		<</if>>
 
 		<<link [[Next|History Lesson]]>><<endevent>><</link>>
 		<br>
@@ -222,12 +222,12 @@ This is ridiculous, there's no way you're wearing that. Winter glares at you as
 		The <<person>> scoffs. "You think I was born yesterday? You better pick up your book."
 		<br>
 
-			<<if $skulduggery lte ($skulduggerydifficulty + 100)>>
+		<<if $skulduggery lte ($skulduggerydifficulty + 100)>>
 			<<skulduggeryskilluse>>
-			<<else>>
+		<<else>>
 			<span class="blue">That was too easy. You didn't learn anything.</span>
 			<br><br>
-			<</if>>
+		<</if>>
 
 		<<link [[Pick it up|History Events Pick]]>><<trauma 2>><<stress 2>><<status -10>><</link>><<gtrauma>><<gstress>><<lcool>>
 		<br>
@@ -498,13 +498,13 @@ You walk to the front of the classroom, and Winter gestures you to bend over the
 :: History Lesson Pillory Robin Save
 <<effects>>
 
-You hear rapid footsteps outside. Winter barges in. <<His>> gaze flicks to the dented book on the floor, then rests on the <<person>>.
+You hear rapid footsteps outside. Winter barges in. <<nnpc_His Winter>> gaze flicks to the dented book on the floor, then rests on the <<person>>.
 <br><br>
-"Out," <<he>> says. "I won't tolerate the destruction of school property."
+"Out," <<nnpc_he Winter>> says. "I won't tolerate the destruction of school property."
 <br><br>
 The <<person>> tries to argue, but Winter won't hear it. <<He>> rubs <<his>> head as <<he>> leaves the room.
 <br><br>
-"I'm sorry," Winter sighs as <<nnpc_he Winter>> releases you from the pillory. "We won't have time for this now." <<He>> sounds disappointed. <<tearful>> you walk back to your desk.
+"I'm sorry," Winter sighs as <<nnpc_he Winter>> releases you from the pillory. "We won't have time for this now." <<nnpc_He Winter>> sounds disappointed. <<tearful>> you walk back to your desk.
 <br><br>
 
 <<if $robinhistory is "active">>
@@ -769,7 +769,7 @@ Winter sighs. "Explain it to Leighton in detention."
 <br>
 
 :: History Robin Defend
-<<effects>>
+<<effects>><<person1>>
 
 <<if $submissive gte 1150>>
 	"R-Robin is innocent," you protest.
@@ -905,7 +905,7 @@ You stay silent.
 
 
 :: History Robin Yes Lie
-<<effects>>
+<<effects>><<person1>>
 
 <<if $submissive gte 1150>>
 	"Y-yes," you say. "I'm <<his>> <<girlfriend>>."
@@ -916,7 +916,7 @@ You stay silent.
 <</if>>
 <br><br>
 
-<<person1>>
+
 <<if $NPCName[$NPCNameList.indexOf("Robin")].dom gte 20>>
 	"Wait," Robin says. "That's not true. I'm not ready yet." The <<person2>><<person>> laughs at Robin's uncertainty, but attracts Winter's ireful gaze, and slinks back to <<his>> desk.
 	<br><br>
@@ -931,7 +931,7 @@ You stay silent.
 <br>
 
 :: History Robin No Lie
-<<effects>>
+<<effects>><<person1>>
 
 <<if $submissive gte 1150>>
 	"N-no," you say. "We're not a couple."
@@ -1020,7 +1020,7 @@ You turn your gaze towards Robin. <<person1>><<His>> cheeks are red, but <<he>>
 You hold Robin's chin, and turn <<person1>><<him>> to face you. You give <<him>> a peck on the lips. <<His>> eyes are shut when you pull away, lost in the moment.
 <<takeKissVirginity "Robin" "romantic">><<promiscuity1>>
 
-"Nice," the <<person2>><<person>> says. <<He>> looks at Robin. "You enjoyed that a lot." Robin's eyes flutter open, and <<he>> looks away, <<his>> blush deepening.
+"Nice," the <<person2>><<person>> says. <<He>> looks at Robin. "You enjoyed that a lot." Robin's eyes flutter open, and <<person1>><<he>> looks away, <<his>> blush deepening.
 <br><br>
 
 Satisfied, the <<person2>><<person>> returns to <<his>> desk.