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

locations/bras.qsrc

@@ -68,7 +68,7 @@ if $ARGS[0] = 'view_bra_list':
 
 	i = 1
 	:loopcheapbras
-	if cheap_brasS[i] = metka_panties and cheap_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''cheap'', <<i>>"><img src="images/pc/bras/basic/<<i>>.jpg" 	height="300" /></a>'
+	if cheap_brasS[i] = metka_bras and cheap_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''cheap'', <<i>>"><img src="images/pc/bras/basic/<<i>>.jpg" 	height="300" /></a>'
 	i += 1
 	if i <= ARRSIZE('cheap_bras'):jump 'loopcheapbras'
 
@@ -185,6 +185,15 @@ if $ARGS[0] = 'view_bra_item':
 				end
 			end	
 		end
+		if $ARGS[1] ! 'store':
+			act 'Move to storage': gt 'bras', 'dest1', $ARGS[0], $ARGS[1], ARGS[2]
+		end
+		if $ARGS[1] ! 'unwanted':
+			act 'Move to unwanted': gt 'bras', 'dest2', $ARGS[0], $ARGS[1], ARGS[2]
+		end
+		if $ARGS[1] ! 'store':
+			act 'Move to wardrobe': gt 'bras', 'dest0', $ARGS[0], $ARGS[1], ARGS[2]
+		end
 	end
 end
 

locations/lact_lib.qsrc

@@ -1584,7 +1584,7 @@ end
 if $ARGS[0] = 'hand_milking':
 	*clr
 	cla
-	if lactate > 0 and pain['nipples'] <= 60:
+	if lactate > 0 and pain['nipples'] <= 60 and pcs_knowsaboutlactation > 0:
 		'You start to massage your breasts, your fingers gliding down your breasts skin, over the areolas. Your fingers pressing down into the areola, stretching it forwards to your nipple.'
 		'Several small streams of your milk start to jet out of your nipples.'
 		'You go on for <<pumptime>> minutes until you stop. You clean yourself up and everything else that got wet from your milk.<br>'

locations/panties.qsrc

@@ -185,6 +185,15 @@ if $ARGS[0] = 'view_panty_item':
 				end
 			end
 		end
+		if $ARGS[1] ! 'store':
+			act 'Move to storage': gt 'panties', 'dest1', $ARGS[0], $ARGS[1], ARGS[2]
+		end
+		if $ARGS[1] ! 'unwanted':
+			act 'Move to unwanted': gt 'panties', 'dest2', $ARGS[0], $ARGS[1], ARGS[2]
+		end
+		if $ARGS[1] ! 'store':
+			act 'Move to wardrobe': gt 'panties', 'dest0', $ARGS[0], $ARGS[1], ARGS[2]
+		end
 	end
 end