Merge remote-tracking branch 'julzor/master'

locations/din_van.qsrc

@@ -545,7 +545,7 @@ $removepan = {
 !! purse_____ variables get wiped in 'wardrobe', 'clothing', 'panties' and 'bra' so there isn''t a chance of duplication
 $publicpan = {
 	if $pantyworntype ! 'none' and $braworntype ! 'none':
-		act 'Remove underwear' + iif(bag = 1, ' and put it in your purse','') + ' (0:02)':
+		act 'Remove underwear'+iif(bag = 1, ' and put it in your purse ',' ') + '(0:02)':
 			minut += 2
 			gs 'stat'
 			if bag = 1:
@@ -570,7 +570,7 @@ $publicpan = {
 	end
 
 	if $pantyworntype ! 'none':
-		act 'Remove panties ' + iif(bag = 1, ' and put them in your purse','') + '(0:02)':
+		act 'Remove panties'+iif(bag = 1, ' and put them in your purse ',' ') + '(0:02)':
 			minut += 2
 			gs 'stat'
 			if bag = 1:
@@ -591,7 +591,7 @@ $publicpan = {
 	end
 
 	if $braworntype ! 'none':
-		act 'Remove bra ' + iif(bag = 1, ' and put it in your purse','') + '(0:02)':
+		act 'Remove bra'+iif(bag = 1, ' and put it in your purse ',' ') + '(0:02)':
 			minut += 2
 			gs 'stat'
 			if bag = 1:

locations/gschool_lessons2.qsrc

@@ -823,6 +823,15 @@ if $ARGS[0] = 'science':
 					demerit += 5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 					'Even though Miss Orlov saw you use your phone. You don''t care and just keep browsing the internet. Realizing you still won''t put the phone away, Miss Orlov walks over to your desk.'
+					act 'Hand over the phone':
+						*clr & cla
+						grupvalue[4] -= 1
+						grupvalue[3] += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/takephone.jpg"></center>'
+						'Wow, Mrs. Orlov called your bluff. You decide it''s not worth the conflict, and silently hand your phone to Mrs. Orlov .'
+						'As she walks back to the front of the class, she says, "I''m holding onto your phone for now, Mrs. <<$pcs_lastname>>. You can have it back after class."'
+						act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
+					end
 					gs 'willpower', 'exhib', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Take photos under your skirt (<<will_cost>> Willpower)':