Merge remote-tracking branch 'hornguy6/master'

# Conflicts:
#	locations/cikl.qsrc

locations/cikl.qsrc

@@ -256,7 +256,7 @@ bimbo_flag = 0
 if orgasm_anal > orgasm_anal[1]:
 	if pcs_traits['buttslut_lvl'] > 0: pcs_traits['buttslut_exp'] += orgasm_anal - orgasm_anal[1]
 else
-	if pcs_traits[''buttslut_exp''] > 1: pcs_traits['buttslut_exp'] -= 1
+	if pcs_traits['buttslut_exp'] > 1: pcs_traits['buttslut_exp'] -= 1
 end
 orgasm_anal[1] = orgasm_anal
 if orgasm_anal > 10 and pcs_traits['buttslut_lvl'] = 0: pcs_traits['buttslut_lvl'] = 1

locations/orgasm.qsrc

@@ -20,6 +20,8 @@ end
 
 orgasm_buildup -= 70
 
+if orgasm_buildup < 0:orgasm_buildup = 0
+
 if orgasm_flag['anal'] = 1: orgasm_anal += 1
 if orgasm_flag['masturbate'] = 1: orgasm_masturbate += 1
 if orgasm_flag['clit'] = 1: orgasm_clit += 1

locations/sleep.qsrc

@@ -1,7 +1,7 @@
 # sleep
 
 if $ARGS[0] = 'simple':
-!! to avoid sleeping the whole day I decide to calcululate the duration of the sleep in advance
+!! to avoid sleeping the whole day I decide to calculate the duration of the sleep in advance
 !! the quality of the sleep depends on many factors, so the time of sleep can be modify later, especially the part when the time of sleep is shortened
 
 	varsleep['time_to_full'] = (100 - pcs_sleep) * 6