Browse Source

Merge remote-tracking branch 'hornguy6/master'

KevinSmarts 4 years ago
parent
commit
861c639eef
3 changed files with 97 additions and 86 deletions
  1. 75 75
      locations/journal.qsrc
  2. 18 11
      locations/salon.qsrc
  3. 4 0
      locations/saveupdater.qsrc

+ 75 - 75
locations/journal.qsrc

@@ -308,37 +308,37 @@ end
 
 if $ARGS[0] = 'friends_family':
 	*clr & cla
-	'<center><img src="images/pc/notebook/29.png"></center>'
+	'<center><img src="images/pc/npc_headshots/29.jpg"></center>'
 	'Mother Natasha - Your mother was born in Gadukino village. She is still quite young and attractive. You have done the math and know she had Anya when she was only sixteen years old. She works at the station cafe. Your grandmother died in child birth with your mother and your grandfather was killed a couple of years later in the Afghanistan war.'
 	*nl
-	'<center><img src="images/pc/notebook/35.png"></center>'
+	'<center><img src="images/pc/npc_headshots/35.jpg"></center>'
 	'Father Mikhail Kuznetsov - You''ve never seen your biological father since your parents divorced, so you have no real memory of him.'
 	*nl
-	'<center><img src="images/pc/notebook/28.png"></center>'
+	'<center><img src="images/pc/npc_headshots/28.jpg"></center>'
 	'Step Father Vladimir - Your stepfather is a greying, slightly flabby man working as a truck driver. Your mother divorced your biological father then married Vladimir when you were less than a year old. One year after being married, your parents welcomed your little brother Kolka, Vladimir''s first born child. Kolka is his only child that you know of. When not working, your stepfather can often be found working on his cars in the garage.'
 	*nl
-	'<center><img src="images/pc/notebook/33.png"></center>'
+	'<center><img src="images/pc/npc_headshots/33.jpg"></center>'
 	'Sister Anya - She is your older sister, two years your senior, but she still lives at home and shares a bedroom with you. She works at the local supermarket instead of going to the University like your mother wanted. She spends most of her free time either partying, hanging out with her friends or with her boyfriend Roma.'
 	*nl
-	'<center><img src="images/pc/notebook/34.png"></center>'
+	'<center><img src="images/pc/npc_headshots/34.jpg"></center>'
 	'Brother Kolka - He is your younger brother, born about a year after you. While you share the same mother, Kolka''s dad is your stepfather. He is a student at the same school as you and enjoys football. When he is not playing football or doing homework, he spends much of his free time hanging out with his friends.'
 	*nl
-	'<center><img src="images/pc/notebook/30.png"></center>'
+	'<center><img src="images/pc/npc_headshots/30.jpg"></center>'
 	'Aunt Lyudmila Knavs - Your aunt Luda works at the pharmacy in Pavlovsk. She is your mother''s older sister. She has a live in boyfriend named Olu that she meet while traveling. He is an African man, which causes more than a few rumors and sour looks at your aunt. Your aunt doesn''t seem to care about that, and if anything, seems to enjoy flaunting her boyfriend in front of others.'
 	*nl
-	'<center><img src="images/pc/notebook/55.png"></center>'
+	'<center><img src="images/pc/npc_headshots/55.jpg"></center>'
 	'Oluuosegun "Olu" Maina - You don''t know much about your aunt''s live-in boyfriend, only that he is from Africa and doesn''t speak Russian very well. He''s a very large and muscular man. You know many in the area that find it disgraceful that your aunt lives with him.'
 	*nl
-	'<center><img src="images/pc/notebook/31.png"></center>'
+	'<center><img src="images/pc/npc_headshots/31.jpg"></center>'
 	'Great Grandpa Zlatek Knavs - Your great grandfather is a grumpy old man. He is always complaining about the village elders and how they have neglected the village to the point where it is now barely fit to live in. He can walk, but requires a cane. He doesn''t really leave the house anymore, unless he really has to. Your mother and aunt were raised by your great grandparents.'
 	*nl
-	'<center><img src="images/pc/notebook/32.png"></center>' 
+	'<center><img src="images/pc/npc_headshots/32.jpg"></center>' 
 	'Great Grandma Elena Knavs - Your great grandma is extremely old and almost never leaves the house. Most of the time, she just sits on her bed watching TV or slowly cleans the house. Having raised your mother and aunt Luda, she is like a grandmother to you and a mother to your mother. She has raised two generations of kids, so your great grandparents are now content with the peace and quiet of the village.'
 	*nl
-	'<center><img src="images/pc/notebook/54.png"></center>'
+	'<center><img src="images/pc/npc_headshots/54.jpg"></center>'
 	'Mikhail "Misha" - Your neighbor''s name is Mikhail, but everyone calls him "Uncle Misha". He lives in the apartment across the hall from you. Your mother always forbade you to talk to him by warning you that he used to be a local crime lord and that you shouldn''t get involved with him. However, he has always been polite and nice to you. He is close friends with your stepfather, but both have been evasive about how they met and became friends.'
 	*nl
-	'<center><img src="images/pc/notebook/112.png"></center>'
+	'<center><img src="images/pc/npc_headshots/112.jpg"></center>'
 	'Sergey Shulgin - He lives in the same building as you with his son, your childhood friend Vasily. He has gray hair and a small beer belly, but still hearty looking. His wife, Vasily''s mother, left when Vasily was still a small child. He has been close friends with your stepfather and mother for as long as you can remember. Oddly enough, he never re-married after being left by his ex-wife.'
 	
 	act 'Go back': gt 'journal', 'records'
@@ -423,19 +423,19 @@ end
 if $ARGS[0] = 'teachers':
 	*clr & cla
 	'<center><h2>Teachers & Facility</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/134.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/134.jpg"></center>'
 	'<center>Aleksandrina Volkov</center>'
 	'Aleksandrina Volkov is the school''s new headmistress. An attractive woman in her mid to late thirties who always dresses well, she was recently brought in to improve the school results after the school was falling behind in the national test scores. She has a reputation for being a strict, but fair disciplinarian. She also comes off as cold and distant to the students.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/132.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/132.jpg"></center>'
 	'<center>Ruslan Kuznetsov</center>'
 	'Ruslan Kuznetsov is the school''s special ed, career advisor and shop teacher. He is also the assistant Headmaster. He is one of the few teachers that''s passionate about his job and really believes that he can impact on the students future, but he is mostly ignored by everyone, even his colleagues. This has recently seen him start becoming bitter.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/26.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/26.jpg"></center>'
 	'<center>Anatoly E. Tsarev</center>'
 	'Anatoly Tsarev is the school''s math teacher. He''s a stern teacher who always demands the best out of his students. His daughter, Lera, is a gopnik who is also in your class. He''s married to Vera, who works at the train station as a ticket saleswoman and as a cleaner in the garment factory. There are rumors that since Lesco, his nephew, has come to live with them, his marriage has been on the rocks.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/135.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/135.jpg"></center>'
 	'<center>Yeva Sokoloff</center>'
 	if grupTipe = 4:
 		'Yeva Sokoloff is the school''s geography and history teacher. She is the oldest teacher at school and she likes to think she is tough, often giving those in her class a hard look. It''s funny coming from someone that looks like the little old lady in the market. She is quick to send you to the Headmistress if you misbehave too much.'
@@ -443,7 +443,7 @@ if $ARGS[0] = 'teachers':
 		'Yeva Sokoloff is the school''s geography and history teacher. She is the oldest teacher at school and has a very firm no-nonsense teaching style, but can also be very kind and motherly to students that work hard and behave.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/129.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/129.jpg"></center>'
 	'<center>Serafim Ivanov</center>'
 	if grupTipe = 3:
 		'Serafim Ivanov is the school''s science and computer science teacher. He''s a former student of the school that returned to the town after college. He is a no-nonsense teacher that is known to pile on the homework, have many pop quizzes, and is brutal when it comes to his grading. This is to push his students to their greatest potential. He always has time to answer questions or help out if a student has trouble as long as they put in the effort. Many of the other students complain about how he picks on them, but the truth is he only accepts the best from his students and has no sympathy for those that refuse to put in the work.'
@@ -451,19 +451,19 @@ if $ARGS[0] = 'teachers':
 		'Serafim Ivanov is the school''s science and computer science teacher. He''s a former student of the school that returned to the town after college. He is a no-nonsense, bitter teacher that is known to pile on the homework, have many pop quizzes, and is brutal when it comes to his grading. He is also known to be unfair, giving the nerds a free pass with homework or even quizzes, which he never does with the other cliques. He seems to take delight in catching the cool kids, jocks and gopniks out by ridiculing them on how little they know.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/128.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/128.jpg"></center>'
 	'<center>Makar Vasilyev</center>'
 	'Makar Vasilyev is the school''s music, art and drama teacher. He is always warm and friendly to all of his students; even those not in his class. He always smiles and will always take the time to listen or help out the students. He is well liked by most of them.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/137.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/137.jpg"></center>'
 	'<center>Raven Braakman</center>'
 	'Raven Braakman is the school''s Social Sciences and English teacher. She is from South Africa, but married a Russian man and moved to Pavlovsk. Her husband died in a car accident a few years ago. She has a strict teaching style and accepts only the best out of her students. It is rumored that she is a bit of a party goer in her free time.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/130.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/130.jpg"></center>'
 	'<center>Ilya Yenotin</center>'
 	'Ilya Yenotin is the school''s literature, language and your homeroom teacher. He does his best at keeping everyone happy, but is disliked by most of the students simply because he comes off as fake. You can often see him running down the halls chasing gopniks, trying to get them to attend class.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/131.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/131.jpg"></center>'
 	'<center>Viktor Pavlovich</center>'
 	if grupTipe = 3:
 		'Viktor Pavlovich is the school''s P.E. teacher. He is also the coach for the basketball and track teams. He looks like a former weight lifter, having a muscular build with massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from a wall in his office. He is tough on anyone that isn''t athletically gifted and often yells at those lacking any athletic ability to the point of bringing them to tears. He is one of the meanest, if not the meanest, teacher in school.'
@@ -471,7 +471,7 @@ if $ARGS[0] = 'teachers':
 		'Viktor Pavlovich is the school''s P.E. teacher. He is also the coach for the basketball and track teams. He looks like a former weight lifter, having a muscular build with massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from a wall his office. He likes to use it on students, especially female students. He is single and rumored to be a player. You''ve often seen him with different women around town.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/69.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/69.jpg"></center>'
 	'<center>Mikhail Nikolaevich</center>'
 	if grupTipe = 3:
 		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. He is almost as bad as Mr Pavlovich with how he treats the students, except he almost worships the best of the jocks by always talking and laughing with them.'
@@ -481,15 +481,15 @@ if $ARGS[0] = 'teachers':
 		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. Some say he almost went pro in some sport, but hurt himself or something like that and now he tries to live through the glory of his students.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/138.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/138.jpg"></center>'
 	'<center>Arina Orlov</center>'
 	'Arina Orlov is the school''s biology and health teacher. She is the youngest teacher at school, having just finished college and this is her first job. She is a bit shy and mousey, which causes many of the students to ignore her during class. This leads to her having a bit of a problem controlling her classes. She''s not much older than her students and is very cute. This causes the boys to sometimes pay extra special attention to her during class.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/136.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/136.jpg"></center>'
 	'<center>Olga Aleksandrov</center>'
 	'Olga Aleksandrov is the school''s nurse, having transferred to your school at the start of the year. All the boys have fallen head over heels over this true beauty, describing her as slim and stacked; the ideal woman.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/133.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/133.jpg"></center>'
 	'<center>Rolan Matveev</center>'
 	if grupTipe = 1:
 		'Rolan Matveev is the school''s janitor and handyman. He is quiet and rarely interacts with the students. There is a rumor going around that he got caught rummaging through the girls lockers stealing their panties, while other people say he stalks the girls and photographs them. Regardless if the rumors are true or not, you and the other girls have caught him staring at you when he doesn''t think you are watching and will quickly look away.'
@@ -504,7 +504,7 @@ end
 if $ARGS[0] = 'nerds':
 	*clr & cla
 	'<center><h2>Nerds</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/152.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/152.jpg"></center>'
 	'<center>Feofan Krupin</center>'
 	if grupTipe = 3:
 		'Feofan Krupin is heavily into science fiction, fantasy and the like. He has a serious love for superheroes and loves talking about them, their movies and comic books all the time. He also has a collection of cosplay outfits of all the most famous superheroes. He does well in school, but not as well as most would expect. He is the most outgoing of the nerds and is not afraid to talk to the other students, even flirting with girls that are way out of his league. He is the Game Master for the weekly game night and often invites others over to play games at his house.'
@@ -512,11 +512,11 @@ if $ARGS[0] = 'nerds':
 		'Feofan Krupin is heavily into science fiction, fantasy and the like. He has a serious love for superheroes and loves talking about them, their movies and comic books all the time. He also has a collection of cosplay outfits of all the most famous superheroes. He does well in school, but not as well as most would expect. He is a nerd''s nerd, but isn''t bad looking for one. He is the most outgoing of the nerds and is not afraid to talk to the other students, even flirting with girls that are way out of his league. Rumor is that he runs some silly game night for the other nerds, which has earned him the nickname "King of the Nerds."'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/2.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/2.jpg"></center>'
 	'<center>Artem Chebotarev</center>'
 	'Artem Chebotarev is a typical geek, but one could easily be deceived by his looks as he is actually not that bad looking. He does very well in school and is popular with the other geeks, not to mention that, thanks to his looks and good grades, he has befriended a lot of jocks as he is also their tutor outside of school. He otherwise tries to keep a low profile at school, especially around the cool kids and gopniks.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/142.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/142.jpg"></center>'
 	'<center>Zinaida "Zina" Alkaev</center>'
 	if grupTipe = 3:
 		'Zinaida Alkaev is a mousey girl who is very plain looking. She never wears makeup, dresses in baggy clothes and barely bothers to brush her hair. She mostly keeps to herself, playing various games on her phone, although she is great at video games and knows all about fantasy, sci-fi, superheroes and other important things. The boys seem to love that she knows as much as they do about that stuff and that she can beat most of them at the games they play.'
@@ -524,7 +524,7 @@ if $ARGS[0] = 'nerds':
 		'Zinaida Alkaev is a mousey girl who is very plain looking. She never wears makeup, dresses in baggy clothes and barely bothers to brush her hair. She mostly keeps to herself, playing various games on her phone, although she is fairly popular with the male nerds for reasons unknown to everyone else. She seems to be a complete loner unless she is around her fellow nerds.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/6.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/6.jpg"></center>'
 	'<center>Petka Klyuyev</center>'
 	if grupTipe = 3:
 		'Petka Klyuyev is a nerd who usually doesn''t interact with other students, preferring to only talk to his fellow nerds and mostly spends his time reading. He''s good friends with Artem and you can usually hear them recommending what to read to each other. He does very well in school and has been known to tutor others sometimes.'
@@ -532,23 +532,23 @@ if $ARGS[0] = 'nerds':
 		'Petka Klyuyev is a nerd who usually doesn''t interact with other people, mostly spending his time reading. He''s good friends with Artem and you can usually hear them recommending what to read to each other. He does very well in school and has been known to tutor others sometimes. However, he is afraid of his own shadow and is thus an easy target for bullying; other students are known to steal his homework.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/153.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/153.jpg"></center>'
 	'<center>Gerasim Vasilyev</center>'
 	'Gerasim Vasilyev is confined to a wheelchair from an early childhood accident. He is kind and nice to everyone, even if most don''t return the favor. He is well accepted by his fellow nerds and, surprisingly, a few of the jocks. The rest see him as an easy target to bully and/or force him to do their homework.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/12.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/12.jpg"></center>'
 	'<center>Julia Milov</center>'
 	'Julia is a diligent and silent girl. She''s very nerdy and doesn''t really have any friends other than her fellow nerds. She seems to like keeping to herself, but has sometimes been caught eyeing the other girls while they are changing after gym lessons, likely jealous of them.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/151.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/151.jpg"></center>'
 	'<center>Evgeny Kuznetsov</center>'
 	'Evgeny Kuznetsov is the school chess champion and you can always find him at the chess club at the community center. He is shy and very intelligent, but has not shown any interest in girls, or anyone else for that matter. No one would be surprised if he has mild autism.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/16.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/16.jpg"></center>'
 	'<center>Natasha Belova</center>'
 	'Natasha is an excellent student and one of the smartest people in your school. Even though you both live in the same building, her parents are very poor and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends as most of the other girls shun her or mock her poor clothing.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/240.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/240.jpg"></center>'
 	'<center><<"Natalia [Nat] Pavlova">></center>'	
 	'Natalia is a very smart, but weak willed girl. She constantly struggles to maintain friendships, but her good looks and eagerness to help others prevents her from being an outcast. Despite this, she is rarely seen hanging out with anyone. She also fiercely guards a notebook she likes to keep private, never letting anyone read or even touch it.'
 	
@@ -559,49 +559,49 @@ end
 if $ARGS[0] = 'jocks':
 	*clr & cla
 	'<center><h2>Jocks</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/149.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/149.jpg"></center>'
 	'<center>Lazar Pajari</center>'
 	'Lazar Pajari is the school football star and the best athlete in school. He is a central midfielder and the team captain. He excels in several sports, but his passion is football, at least when he is not chasing after girls or, more often not, being chased by them, whom he happily lets catch him. His status and good looks make him desirable among the girls and he is often seen with several different girls. Ivan is his biggest competition in sports. While Lazar is the over all better athlete, Ivan is far more focused on boxing than other sports.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/3.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/3.jpg"></center>'
 	'<center>Ivan Prokhorov</center>'
 	'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part in. He is mostly into boxing and running and is considered to be very good looking by the girls in school. He spends a lot of time training and is regularly away competing. He isn''t very sociable and, other than when he is training, tends to keep to himself, although he occasionally hangs out with Fedor. He is calm and collected by nature, some might even say apathetic.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/18.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/18.jpg"></center>'
 	'<center>Christina Zvereva</center>'
 	'Christina is one of the school''s best athletes and is the most athletic girl you know. She has leadership abilities that, together with her tenacity and intelligence, make her a dominant presence wherever she goes. She is, however, more than a bit of a bully to most of the other girls in school.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/8.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/8.jpg"></center>'
 	'<center>Svyatoslav Voinov</center>'
 	'Svyatoslav Voinov is an athletic guy with a very competitive spirit. He is always engaged in sports one way or another. He runs track and often competes with Ivan to be the fastest boy at school. His other focus is football, as well as many other sports the school offers. He''s always trying to one up Ivan or Lazar, but rarely manages to beat either of them at anything.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/23.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/23.jpg"></center>'
 	'<center>Albina Barlovskaya</center>'
 	'Albina Barlovskaya comes from a wealthy family and is considered to be one of the most attractive girls in school. She is a gifted dancer who is trying to conduct herself properly as her father is trying to become the town mayor, but she is well known for her short temper and is intimidating if angered. She leads a dance troupe that only the prettiest and best dancers are allowed to join. There are several rumors about her going around school, but nobody dares mention them in front of her out of fear of incurring her wrath.'
 	
 	if npc_grupTipe['A5'] = 2:
-		'<center><img <<$set_imgh>> src="images/pc/notebook/5.png"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/5.jpg"></center>'
 		'<center>Fyodor "Fedor" Kozlov</center>'
 		'Fedor Kozlov is a decent athlete. He often trains with his good friend Ivan, but lacks Ivan''s level of talent. He is decent looking and often is seen chasing Ivan''s leftovers.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/141.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/141.jpg"></center>'
 	'<center>Veronika "Ronnie" Sokolov</center>'
 	'Veronika Sokolov is called the "Ice Queen" by her fellow students behind her back for a few reasons. One is that she is a very talented ice skater, there is even talk about how she might compete in the next winter Olympics. The other is because she is cold and indifferent and never lets anyone get close to her. She comes from one of the wealthier families in Pavlovsk.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/165.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/165.jpg"></center>'
 	'<center>Vanya Yanka</center>'
 	'Vanya Yanka is a little goofy jock, playing jokes on his teammates and annoying the coaches. He never goes too far with his jokes and is a good morale booster, so everyone likes him. Despite his easy going attitude, he is a better athlete than most would suspect. When he''s not training or competing, he spends most of his free time hanging out with Vicky and Katja. Vanya is also popular with the girls at school, but only seems to have eyes for Vicky.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/150.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/150.jpg"></center>'
 	'<center>Erast Vagin</center>'
 	'Erast Vagin is a huge boy and is very strong. He is not a looker or even clever, but is always polite and a little shy. When he is playing sports he changes into a demon, always fighting to win, putting his all into winning and nothing else. He is an average athlete and relies on his size and strength to win the day for him. Other than playing sports, he sometimes boxes with Ivan.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/19.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/19.jpg"></center>'
 	'<center>Avelina "Lina" Starov</center>'
 	'Lina Starov is a mediocre athlete. She''s sort of Christina''s friend... but not really. The right term would be Christina''s lapdog. She usually does anything Christina wants her to do, as if she doesn''t have a mind of her own. She is a very pretty girl and if she would think for herself, she would be a lot more popular.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/13.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/13.jpg"></center>'
 	'<center>Lariska Gruzdeva</center>'
 	'Lariska is a very athletic girl, with an exceptional talent for volleyball. However, she has a very weak personality and is very dependent on other people''s opinions of her. She spends most of her time trying to appease others, especially Christina. She considers Christina to be her best friend and she can often be seen following her around school.'
 	
@@ -612,22 +612,22 @@ end
 if $ARGS[0] = 'outcasts':
 	*clr & cla
 	'<center><h2>Outcast</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/7.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/7.jpg"></center>'
 	'<center>Lesco Tsarev</center>'
 	'Everyone bullies Lesco about anything and everything. He is the nephew of Mr. Tsarev and the cousin of Lera. He resides with the Tsarev''s after his mother abandoned him for a week on one of her drug binges. He is very ugly and not very socialable. He always seems be sad and just wants to be left alone.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/159.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/159.jpg"></center>'
 	'<center>Petia Alkaev</center>'
 	'Petia Alkaev is the class mooch. He persistently asks others for food, money and cigarettes. He can''t take a hint and doesn''t know the meaning of "personal space", which is made worse by the fact that he seems to be unaware of what soap is. He is an unattractive, overweight loser who makes girls uncomfortable by repeatedly hitting on them. No matter how many beatdowns he suffers or how many cruel pranks are pulled on him, he doesn''t seem to learn his lesson.'
 
 	if npc_grupTipe['A25'] = 5:
-		'<center><img <<$set_imgh>> src="images/pc/notebook/25.png"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/25.jpg"></center>'
 		'<center>Sonia Ivanko</center>'
 		'After a series of slutty incidents that crescendoed at the dance where she got way too drunk, gave Vitek and his buddies a simultaneous blowjob and returned with her face covered in their cum, Sonia''s reputation has been in shambles. The girls give her the silent treatment, pretending she doesn''t exist, while the guys treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to refuse. Many say she has embraced being a cheap slut, happily letting anyone use her, while others say she has started to prostitute herself.'
 	end
 
 	if npc_grupTipe['A5'] = 5:
-		'<center><img <<$set_imgh>> src="images/pc/notebook/5.png"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/5.jpg"></center>'
 		'<center>Fedor Kozlov</center>'
 		'Ever since Fedor gave Vasily a blowjob outside the school in front of everyone, he has been an outcast. Fedor claims he was forced and had no choice, but most people think he actually wanted to do it. Many of the boys mock him, often asking if he has sucked any dicks lately. Even his former friend Ivan ignores him. The girls are nearly as bad, as many of them make fun of him as well. Fedor now mostly keeps to himself and tries to avoid the other students.'
 	end
@@ -639,7 +639,7 @@ end
 if $ARGS[0] = 'popular':
 	*clr & cla
 	'<center><h2>Cool kids</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/1.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/1.jpg"></center>'
 	'<center>Dimka Nosov</center>'
 	if grupTipe = 1:
 		'Dimka Nosov is a cute guy and all the girls adore him. He is considered the coolest kid in school. He comes from a fairly wealthy family and is always dressed in expensive stylish clothes. He is the king of the school and everyone wants to either be his friend or hang out with him.'
@@ -647,19 +647,19 @@ if $ARGS[0] = 'popular':
 		'Dimka Nosov is a cute guy and all the girls adore him. He is considered the coolest kid in school. The guys tend to either befriend him or loath him. He comes from a fairly wealthy family and is always dressed in expensive stylish clothes. Despite his pleasant smile and friendly demeanor, there are rumors saying he is a sadist bastard that always gets what he wants. He seems to love verbally tormenting the nerds and outcasts when given the chance.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/22.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/22.jpg"></center>'
 	'<center>Elžbieta "Bella" Artamonov</center>'
 	'Bella Artamonov is the most beautiful girl in school and knows it, which makes her come off as arrogant. You don''t know her very well since she doesn''t want to deal with "kids." She seems to consider herself an adult already and the rest of her classmates as being beneath her, too young and childish for her to be around. You''ve heard some rumors about her only hanging around with people much older than herself.'
 	
-	'<center><img <<$set_imgh>> src="images/pc/notebook/147.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/147.jpg"></center>'
 	'<center>Andrey Aleksandrov</center>'
 	'Andrey Aleksandrov''s family took part in the exchange student program. Rumor is they were less than happy when the student they sent was an African American, but Andrey doesn''t seem to mind. He and Marcus quickly became friends and he tends to use Marcus'' rising popularity to boost his own and in the process, spends a lot less time with his long time girlfriend Stasya. The school nurse is his aunt.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/17.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/17.jpg"></center>'
 	'<center>Irina Devyatova</center>'
 	'Irina Devyatova is a tall and pretty girl. She knows it and takes full advantage of it. She has a very arrogant and haughty personality hidden behind her sweet smile. She often makes the boys do her dirty work.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/140.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/140.jpg"></center>'
 	'<center>Yelizaveta "Lizaveta" Petrov</center>'
 	if grupTipe = 1:
 		'Lizaveta Petrov wants to know everyone''s secrets, but is completely incapable of keeping them. Extremely nosy, she is the first to arrive at the scene of any commotion, eager to pry into the details. She is pretty and willing to use her looks to sweet talk boys into sharing any juicy gossip. If you want to know anything about anyone, she is the one to ask. Luckily, she seems more interested in collecting and sharing gossip than using it for her own gain.'
@@ -667,23 +667,23 @@ if $ARGS[0] = 'popular':
 		'Lizaveta Petrov wants to know everyone''s secrets, but is completely incapable of keeping them. Extremely nosy, she is the first to arrive at the scene of any commotion, eager to pry into the details. She is pretty and most boys seem torn. Thay are attracted to her, but are afraid she will tell everyone everything about them and their whole life becomes public knowledge.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/15.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/15.jpg"></center>'
 	'<center>Viktoriya "Vicky" Meynold</center>'
 	'Vicky Meynold is the opposite of her sister. On one side a smart ass and on the other a cheerful girl. She is very sociable, being friends with many of the students in school and is considered to be one of the most popular girls in school. With a passionate love for dancing, Vicky can often be found at the disco with her sister and good friend Vanya. A good humored girl, she loves bright and crazy colored clothing. As a child, she took gymnastic lessons and as a result has excellent flexibility. A bit flighty and unpredictable, you never know what thoughts she will come up with next. Logic and reason were never her strong suit as she lives by her emotions and feelings, making decisions from her heart rather than her head. Despite her flighty and unpredictable nature, her liveliness and spontaneity make her fun to hang out with.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/4.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/4.jpg"></center>'
 	'<center>Igor Kruglov</center>'
 	'Igor Kruglov is Dimka''s best friend and whenever you see one of them, the other is usually not too far away. With a small stature, high pitched voice and pretty face, many consider him to be very feminine. Normally a boy like him would be mocked but his friendship with Dimka, the most popular boy in school, shields him from such abuse. Many wonder about their friendship as Igor follows Dimka around so often and they seem to have always been friends. Some would even say that Igor is overly attached to Dimka. Other than Dimka, Igor doesn''t seem to have any other close friends.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/139.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/139.jpg"></center>'
 	'<center>Stanislava "Stasya" Pavlov</center>'
 	'Stasya Pavlov is a complete bitch, and always has been one, but now that her boyfriend Andrey hangs around with Marcus more than her, she has become a lot worse. She doesn''t care for Marcus at all, but never says anything around Marcus or Andrey. Instead, she seems to take out her anger on everyone around her, especially the nerds and the outcasts.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/14.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/14.jpg"></center>'
 	'<center>Ekaterina "Katja" Meynold</center>'
 	'Katja Meynold is a very attractive and petite girl, a redhead with a keen interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but at times can also be impulsive. She can often be found at the disco with her sister.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/146.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/146.jpg"></center>'
 	'<center>Marcus Larson</center>'
 	if grupTipe = 1:
 		'Marcus Larson is an African American exchange student. He arrived at the school last year and opted to stay for a second year. He does well in school and is a good athlete. He seems to really enjoy Russia and has an eye for Russian girls, always going on about how they are so much more beautiful than the girls back home. He is a decent looking guy which, combined with his exotic looks, accent, athletic ability and different views, has made him pretty popular with the cool kids and jocks. He is friendly and outgoing and if he wasn''t such close friends with Andrey, he would have likely been a jock instead.'
@@ -691,12 +691,12 @@ if $ARGS[0] = 'popular':
 		'Marcus Larson is an African American exchange student. He arrived at the school last year and opted to stay for a second year. He does well in school and is a good athlete. He seems to really enjoy Russia and has an eye for Russian girls, always going on about how they are so much more beautiful than the girls back home. He is a decent looking guy which, combined with his exotic looks, accent, athletic ability and different views, has made him pretty popular with the cool kids and jocks. He is friendly and outgoing, and stays with Andrey''s family, whom he has become close friends with.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/148.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/148.jpg"></center>'
 	'<center>Mefodiy Utkin</center>'
 	'Mefodiy Utkin is reasonably intelligent, with middle-of-the-road grades. He is fairly average looking, but possesses a good sense of humor and timing. He isn''t too popular, just popular enough to hang among the cool kids, who like his humor.'
 
 	if npc_grupTipe['A25'] = 1:
-		'<center><img <<$set_imgh>> src="images/pc/notebook/25.png"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/25.jpg"></center>'
 		'<center>Sonia Ivanko</center>'
 		if grupTipe = 4:
 			'Sonia Ivanko is an ordinary girl and doesn''t stand out much. Pretty, smart and sociable, Sonia loves to party and is rarely in a bad mood. She has started hanging out with the gopniks, trying to go to their parties. She lives with her mother in a small apartment after her father left some time ago. Her mother is a nervous, hysterical and scandalous woman who, when not at work in the Garment Factory, is often out drinking and flirting with men.'
@@ -715,44 +715,44 @@ end
 if $ARGS[0] = 'gopniks':
 	*clr & cla
 	'<center><h2>Gopniks</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/notebook/9.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/9.jpg"></center>'
 	'<center>Vitek Kotov</center>'
 	'Vitek Kotov is an aggressive and strong guy who considers himself to be a "gangsta". He is very loud, obnoxious, and not very attractive. Lena is his twin sister, whom he is overly protective of, which has caused more than a fair share of drama. He is the leader of the local gopniks and as such is the most feared boy in school. Even some adults are afraid of him. He is even rumored to be involved with the local organized crime selling drugs.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/154.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/154.jpg"></center>'
 	'<center>Radomir Popov</center>'
 	'Radomir Popov is the lead singer, backup guitarist and leader of a local underground rock/punk band named Pizdá Buystvo (Pussy Riot). They are considered fairly talented. He is more or less an asshole who thinks he should already be a star. Thus, he can be arrogant to almost everybody. Some of the girls obviously adore him because they think he is cool or are just groupies that latch onto his limited fame. He is more than happy to use his small amount of fame to let him use as many girls as he can, as often as he can. He seems to think girls only exist to provide him with sexual gratification.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/157.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/157.jpg"></center>'
 	'<center>Roman Yakovlev</center>'
 	'Roman Yakovlev is an absolute psychopath. He''s one of the smaller kids, but he is always causing trouble. He''ll start fights out of boredom, knowing that the other gopniks will have his back. He enjoys being especially cruel or sadistic to his victims. He once smashed a bottle over a guy''s head and then stabbed him in the face with it, all because he said the guy looked at him funny. Roman always has a snide remark and is not afraid to speak back to the teachers or other adults. He''s not doing great at school because he doesn''t care. The other gopniks find his attitude amusing and seem to like that he''s always getting them into funny situations.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/10.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/10.jpg"></center>'
 	'<center>Dan Ryzhov</center>'
 	'Dan Ryzhov is a tall and skinny guy whose body language screams his disdain and contempt for others. He''s a very stubborn guy who will never let an argument be. He''s best friends with Vitek and Vasily and is considered to be the smartest of the bunch, although most don''t consider that to be much of a feat.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/145.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/145.jpg"></center>'
 	'<center>Ekaterina "Katyusha" Maksimov</center>'
 	'Ekaterina Maksimov, known as "Katyusha", is not a traditional beauty since her face is too masculine. She only seems to care about two things, booze and fighting. She gets the booze in any way she can, either by stealing it or convincing others to get it for her. When she "plays" with the boys, it only goes as far as she wants it. She is the only girl other than Lena who can do this. While the boys are afraid of Lena''s brother, she prefers fighting the boys herself.'
 	'Regardless of the weather, she practices Sambo in the park every day before school. She often taunts or makes fun of the boxers by claiming "boxing is for pussies" and that real fighters fight without rules. She doesn''t see herself as a gopnik, but other people consider her one. This doesn''t bother her because she only cares about the opinion of the people whom earn her respect, which is really hard to do.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/158.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/158.jpg"></center>'
 	'<center>Valentin Bogdanov</center>'
 	'Valentin Bogdanov is the bassist in Radomir''s band and the nicest guy in the band. However, this doesn''t stop him from using his small amount of fame to use girls. He is just rarely a dick about it. His goal is to make enough cash from the band to buy an old American motorbike and ride it across the country. He can often be found hanging out with Anushka''s dad, working on his motorcycle when he is not hanging out with the band.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/24.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/24.jpg"></center>'
 	'<center>Pauline Sebagotulina</center>'
 	'Pauline Sebagotulina is a bit of a wild child, which makes her very unpredictable. She often hangs out with the gopniks in your class and is liked by them. No one dares to mess with her because she''s been in more fights than anyone else. She and Katyusha can sometimes be found sparring together and starting fights with others.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/156.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/156.jpg"></center>'
 	'<center>Arkadi Fyodorov</center>'
 	'Arkadi Fyodorov is the drummer in Radomir''s band. His family recently moved from Saint Petersburg to Pavlovsk. He was held back a year, so looks a bit older than his fellow students. He is very violent when angry, especially with anyone outside the gopniks. He is also not shy about reminding everyone how much harder the city is and how lame Pavlovsk is.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/20.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/20.jpg"></center>'
 	'<center>Yalena "Lena" Kotova</center>'
 	'Lena Kotov is Vitek''s twin sister. Just like her brother, she is one of the local gopniks. She has a chip on her shoulder, so she can be aggressive and unpredictable. She''s best friends with Lera and they can often be found together smoking in the school''s restrooms or hanging out after school.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/11.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/11.jpg"></center>'
 	'<center>Vasily Shulgin</center>'
 	if grupTipe = 4:
 		'Also known as Shulga, Vasily is always hanging out with Dan and Vitek since they are his best friends. He''s considered the physically weakest one of the bunch, but is a bit of a prankster and is always making the others laugh, which makes him popular with the gopniks. He was raised by his father after his mother left when he was still an infant. When you were younger, you were good friends with him and as you both drifted towards the gopniks, have stayed good friends.'
@@ -760,23 +760,23 @@ if $ARGS[0] = 'gopniks':
 		'Also known as Shulga, Vasily is always hanging out with Dan and Vitek since they are his best friends. He''s considered the physically weakest one of the bunch, but is a bit of a prankster and is always making the others laugh, which makes him popular with the gopniks. He was raised by his father after his mother left when he was still an infant. When you were younger, you were good friends with him, but as you grew up you have somewhat drifted apart.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/144.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/144.jpg"></center>'
 	'<center>Anushka "Nush" Konstantinov</center>'
 	'Anushka Konstantinov is the lead guitarist and backup vocalist in Radomir''s band. She and the band often use her good looks to their advantage. She is very adventurous and is not shy about her bisexuality. She is also a bit of a exhibitionist and her main goal in life seems to just be having fun. She does surprisingly well in school, but she seems to like getting into and causing trouble. She doesn''t seem to be hung up on social standing and seems willing to hang out with or pick on everyone equally with whatever she deems to be the most fun at the time. Other than the band, she hangs out a lot with Alyona. She and Radomir used to date.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/143.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/143.jpg"></center>'
 	'<center>Alyona Zima</center>'
 	'Alyona Zima is a hardcore troublemaker. She lives to cause trouble and jumps into any trouble she can find. She comes from a troubled family as her parents are alcoholic drug addicts. Most people view her as the apple that didn''t fall far from the tree. Knowing this, the teachers don''t even bother to try and help her out anymore. She can often be found drinking alcohol and the only person she seems to spend a lot of time around is Anushka. Her father is well known as a bad guy and a bully.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/21.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/21.jpg"></center>'
 	'<center>Valeria "Lera" Tsarev</center>'
 	'Lera Tsarev comes from a poor family, but her father works at the school as a teacher. She often hangs out with the gopniks in your class and is liked by them. She''s best friends with Lena and they can often be found together, smoking in the school''s restrooms or hanging out after school. She is protective of Lena and always takes her lead. It is rumored that she is a lesbian and in love with Lena.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/155.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/155.jpg"></center>'
 	'<center>Lavrenti Romanov</center>'
 	'Lavrenti Romanov comes from a wealthy family. He is an only child with parents that are rarely around. He used to be one of the cool kids, but his attitude abruptly changed last year. He became mean and violent, which resulted in him and Dimika having a major falling out. Since the fight, he has been hanging with the gopniks. However, he is more of a follower, the gopniks tolerating him while using his money.'
 
-	'<center><img <<$set_imgh>> src="images/pc/notebook/189.png"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/189.jpg"></center>'
 	'<center>Nikolai Volkov</center>'
 	'Niko Volkov is clever, but short tempered. When he is not drinking and partying, he is hanging out with Roman, with many saying that he only spends time with Roman for his money. Niko always seems confident and well spoken, but he can sometimes come off as paranoid and unstable.'
 	

+ 18 - 11
locations/salon.qsrc

@@ -233,11 +233,18 @@ if $ARGS[0] = 'job_offer':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/xian.jpg"></center>'
 		'"Okay, that all sounds fine."'
-		'"Good," she flicks out a piece of paper and a pen. "This is your employee contract. Just sign there at the bottom and I''ll give you a quick orientation."'
-		act'Sign':
+		'"Great!" she says. "And are you a certified massage therapist?"'
+		if masseuse['certification'] >= 10:
 			masseuse['jobtype'] = 1
 			masseuse['hourly'] = 100
-			gt'salon','masseuse_orientation'
+			'"Yes I am."'
+			'"Okay, can I see your certificate?" You pull out the paper that certifies you as a massage therapist."
+			"Great. I''ll just get your contract set up for you," she says, typing something out on her computer.'
+			act'Next':gt'salon','part_time_full_time'
+		else
+			'"No..."'
+			'"Sorry, but we need you to have one of those to work here. If you''re still interested, they offer a 10 session course at the community center in the industrial area."'
+			act'Leave':gt'salon','start'
 		end
 	end
 end
@@ -269,7 +276,7 @@ if $ARGS[0] = 'whore_offer':
 				'"Yes I am."'
 				'"Okay, can I see your certificate?" You pull out the paper that certifies you as a massage therapist."
 				"Great. I''ll just get your contract set up for you," she says, typing something out on her computer.'
-				act'Next':gt'salon','whore_offer3'
+				act'Next':gt'salon','part_time_full_time'
 			else
 				'"No..."'
 				'"Sorry, but we need you to have one of those to work here. If you''re still interested, they offer a 10 session course at the community center in the industrial area."'
@@ -323,7 +330,7 @@ if $ARGS[0] = 'whore_offer2':
 				'"Yes I am."'
 				'"Okay, can I see your certificate?" You pull out the paper that certifies you as a massage therapist."'
 				'"Great. I''ll just get your contract set up for you," she says, typing something out on her computer.'
-				act'Next':gt'salon','whore_offer3'
+				act'Next':gt'salon','part_time_full_time'
 			else
 				'"No..."'
 				'"Sorry, but we need you to have one of those to work here. If you''re still interested, they offer a 10 session course at the community center in the industrial area."'
@@ -343,7 +350,7 @@ if $ARGS[0] = 'whore_offer2':
 			'"Yes I am."'
 			'"Okay, can I see your certificate?" You pull out the paper that certifies you as a massage therapist."'
 			'"Great. I''ll just get your contract set up for you," she says, typing something out on her computer.'
-			act'Next':gt'salon','whore_offer3'
+			act'Next':gt'salon','part_time_full_time'
 		else
 			'"No..."'
 			'"Sorry, but we need you to have one of those to work here. If you''re still interested, they offer a 10 session course at the community center in the industrial area."'
@@ -362,7 +369,7 @@ if $ARGS[0] = 'whore_offer2':
 			'"Yes I am."'
 			'"Okay, can I see your certificate?" You pull out the paper that certifies you as a massage therapist."'
 			'"Great. I''ll just get your contract set up for you," she says, typing something out on her computer.'
-			act'Next':gt'salon','whore_offer3'
+			act'Next':gt'salon','part_time_full_time'
 		else
 			'"What? No?"'
 			'"Sorry, but we need you to have one of those to work here."'
@@ -383,7 +390,7 @@ if $ARGS[0] = 'whore_offer2':
 			'"Yes I am."'
 			'"Okay, can I see your certificate?" You pull out the paper that certifies you as a massage therapist."'
 			'"Great. I''ll just get your contract set up for you," she says, typing something out on her computer.'
-			act'Next':gt'salon','whore_offer3'
+			act'Next':gt'salon','part_time_full_time'
 		else
 			'"What? No?"'
 			'"Sorry, but we need you to have one of those to work here."'
@@ -404,7 +411,7 @@ if $ARGS[0] = 'whore_offer2':
 			'"Yes I am."'
 			'"Okay, can I see your certificate?" You pull out the paper that certifies you as a massage therapist."'
 			'"Great. I''ll just get your contract set up for you," she says, typing something out on her computer.'
-			act'Next':gt'salon','whore_offer3'
+			act'Next':gt'salon','part_time_full_time'
 		else
 			'"What? No?"'
 			'"Sorry, but we need you to have one of those to work here."'
@@ -425,7 +432,7 @@ if $ARGS[0] = 'whore_offer2':
 			'"Yes I am."'
 			'"Okay, can I see your certificate?" You pull out the paper that certifies you as a massage therapist."'
 			'"Great. I''ll just get your contract set up for you," she says, typing something out on her computer.'
-			act'Next':gt'salon','whore_offer3'
+			act'Next':gt'salon','part_time_full_time'
 		else
 			'"What? No?"'
 			'"Sorry, but we need you to have one of those to work here."'
@@ -436,7 +443,7 @@ if $ARGS[0] = 'whore_offer2':
 	end
 end
 
-if $ARGS[0] = 'whore_offer3':
+if $ARGS[0] = 'part_time_full_time':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/xian.jpg"></center>'
 	'"And were you looking to be a full timer or a part timer? As a reminder, full timers are expected to work 10 shifts a week, part timers work 5. Full timers also get priority on available shifts."'

+ 4 - 0
locations/saveupdater.qsrc

@@ -866,5 +866,9 @@ if model['age'] = 0 and model > 0:
 	model = 0
 end
 
+!! Fixing Katja and Natasha relationship
+if npc_sex['A14'] > 1: npc_sex['A14'] = 1
+if npc_sex['A16'] > 1: npc_sex['A16'] = 1
+
 --- saveupdater ---------------------------------