Merge remote-tracking branch 'upstream/master'

Getting up to date with the main

locations/gschool_coolkid_chats.qsrc

@@ -715,7 +715,7 @@ if $ARGS[0] = 'katja':
 					gs 'gschool_coolkid_chats', 'katja_tampon'
 				end
 			end
-		elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+		elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 			act'Ask for a tampon':
 				$temp['tampon_ask'] = '"Katja," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'katja_tampon'
@@ -959,7 +959,7 @@ if $ARGS[0] = 'bella':
 				gs 'gschool_coolkid_chats', 'bella_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Bella," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'bella_tampon'
@@ -1189,7 +1189,7 @@ if $ARGS[0] = 'lizaveta':
 				gs 'gschool_coolkid_chats', 'lizaveta_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lizaveta," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'lizaveta_tampon'
@@ -1591,7 +1591,7 @@ if $ARGS[0] = 'vicky':
 				gs 'gschool_coolkid_chats', 'vicky_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Vicky," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'vicky_tampon'
@@ -1701,7 +1701,7 @@ if $ARGS[0] = 'stasya':
 				gs 'gschool_coolkid_chats', 'stasya_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Stasya," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'stasya_tampon'
@@ -1857,7 +1857,7 @@ if $ARGS[0] = 'irina':
 				gs 'gschool_coolkid_chats', 'irina_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Irina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'irina_tampon'
@@ -2023,7 +2023,7 @@ if $ARGS[0] = 'sonia':
 				gs 'gschool_coolkid_chats', 'sonia_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'sonia_tampon'
@@ -2040,7 +2040,7 @@ end
 
 if $ARGS[0] = 'sonia_tampon':
 	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big139.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
 	if $temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A25'] >= 70:

locations/gschool_gopnik_chats.qsrc

@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'alyona':
 				gs 'gschool_gopnik_chats', 'alyona_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Alyona," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_gopnik_chats', 'alyona_tampon'
@@ -1384,7 +1384,7 @@ if $ARGS[0] = 'anushka':
 				gs 'gschool_gopnik_chats', 'anushka_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Anushka," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_gopnik_chats', 'anushka_tampon'
@@ -1424,7 +1424,6 @@ if $ARGS[0] = 'nush_invite_yes':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
-
 if $ARGS[0] = 'anushka_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'

locations/gschool_jock_chats.qsrc

@@ -524,7 +524,7 @@ if $ARGS[0] = 'christina':
 				gs 'gschool_jock_chats', 'christina_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'christina_tampon'
@@ -701,7 +701,7 @@ if $ARGS[0] = 'albina':
 				gs 'gschool_jock_chats', 'albina_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'albina_tampon'
@@ -917,7 +917,7 @@ if $ARGS[0] = 'veronika':
 				gs 'gschool_jock_chats', 'veronika_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'veronika_tampon'
@@ -1115,7 +1115,7 @@ if $ARGS[0] = 'lina':
 				gs 'gschool_jock_chats', 'lina_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lina_tampon'
@@ -1363,7 +1363,7 @@ if $ARGS[0] = 'lariska':
 				gs 'gschool_jock_chats', 'lariska_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lariska_tampon'

locations/gschool_nerd_chats.qsrc

@@ -292,7 +292,7 @@ if $ARGS[0] = 'julia':
 				gs 'gschool_nerd_chats', 'julia_tampon'
 			end
 		end
-	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
+	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
 			$temp['tampon_ask'] = '"Julia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_nerd_chats', 'julia_tampon'

locations/sewing.qsrc

@@ -38,6 +38,8 @@ if $ARGS[0] = 'start':
 		act 'Finish':gt 'sewing', 'start'
 		if tkan < 1:
 			'You do not have any material to sew anything. You should buy some from the supermarket.'
+		elseif tovarL = 30 and (YouCanGar = 0 or GarTorgItem = 100):
+			'You do not have any further storage space, you need to sell some trinkets to make room before sewing more of them.'
 		else
 			sew_trinket_success = rand(1,240)
 			tkan -= 1