Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/FedorMisc.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'Fedor Chat':
 	end
 
 	if pcs_hairbsh = 0:
-		'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb''">comb</a>.'
+		'Fedor notices your messy hair and pulls out his <a href="exec:gt ''FedorMisc'', ''Comb'', <<ARGS[1]>>">comb</a>.'
 	end
 
 	if npc_grupTipe['A5'] = 5:'Fedor is an outcast in school, and doesn''t have anyone to sit with during lunch.'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'Comb':
 	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 
-	act 'Move away':gt $loc, $loc_arg
+	act 'Move away':gt $loc, $loc_arg, ARGS[1]
 end
 
 if $ARGS[0] = 'Locker Room':

locations/dreams.qsrc

@@ -147,7 +147,7 @@ if $ARGS[0] = 'hypno_dreams':
 	end
 	if dreamedOfTherapistFucking = 1:
 		'Why was your therapist fucking you though? Maybe you should <font color=grey><s>be worried</s></font> <i>talk to your therapist about it.</i>'
-	elseif
+	else
 		'Fucking your therapist felt good... really good. You wonder what it would be like to feel him inside of you for real.'
 	end
 end

locations/pav_library.qsrc

@@ -18,7 +18,7 @@ if lernHome > 0:
 'You could do your homework with the help of one of the computers'
 end
 if 	storyline = 1 and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
-	'The nerd''s are siting at a table studying togheter'
+	'The nerd''s are siting at a table studying together.'
 end
 
 act 'Leave': gt 'pav_commcenter'

locations/pav_train_market.qsrc

@@ -1009,7 +1009,7 @@ if ARGS[0] = 19:
 				tabletkirej += 1 & !Pills are factory rejects with variable strength
 			else
 				!Pills were tampered with
-				if rand(0,1) = 1>:
+				if rand(0,1) = 1:
 					tabletkifake += 1 & !Pills are counterfeit and useless
 				else
 					tabletkisug += 1 & ! pills were all replaced with sugar pills