|
|
@@ -277,13 +277,13 @@ if $ARGS[0] = 'girls_restroom_events':
|
|
|
*clr & cla
|
|
|
gs 'willpower', 'pay', 'resist'
|
|
|
gs 'stat'
|
|
|
-<<<<<<< HEAD
|
|
|
+!!<<<<<<< HEAD
|
|
|
'<center><img <<$set_imgh>> src="images/characters/shared/photos/big20.jpg"></center>'
|
|
|
'You turn and run for the door. As you make it through the door you hear Lena call after you, "Run all you want bitch, I will find and kick your ass, eventually"'
|
|
|
-=======
|
|
|
+!!=======
|
|
|
'<center><img <<$set_imgh>> src="images/characters/shared/photos/big20.jpg"></center>'
|
|
|
'You turn and run for the door. As you make it to the door you hear Lena call after you. "You can run all you want bitch, I will find you and kick your ass, eventually"'
|
|
|
->>>>>>> hornguy6/master
|
|
|
+!!>>>>>>> hornguy6/master
|
|
|
act 'Continue': gt 'gschool_lessons', 'short_break'
|
|
|
end
|
|
|
else
|
