Merge branch 'master' of aesthete/glife into master

[fixed] Fix period bugs in notification and skipping menstruation

locations/femcyc.qsrc

@@ -848,7 +848,7 @@ if $ARGS[0] = 'cyc3':
 			!! the setting of the max_time can be here although it can be changed in the future
 			FocH_Max = rand(312,360) & !! 13-15 days including menstruation
 			temprand = rand(0,10)
-			if pillcon >= 38000 or rand(1,24) = 1:
+			if pillcon >= 38000 or (pillcon > 0 and rand(1,24) = 1):
 				EggRH = 0
 				cycle = 1
 				mesec = 0

locations/hourly_events.qsrc

@@ -138,7 +138,7 @@ elseif pcs_period['period_warning'] = 1 and LutH_Max-LutH <= 2:
 		msg'Your stomach twinges again. Another cramp of pain. It must mean your period is about to start. You really need to get a tampon in there ASAP.'
 	end
 elseif mesec > 0:
-	period['cramp'] = 0
+	pcs_period['period_warning'] = 0
 end