Merge remote-tracking branch 'NOX/master'

locations/city_center.qsrc

@@ -292,11 +292,5 @@ end
 
 gs 'camera', 'check_location'
 
-
-!! Savegame Compatibility
-if tanwork ! 0:
-	gt 'nichUtil','updateNotice'
-end
-
 --- city_center ---------------------------------
 

locations/lact_lib.qsrc

@@ -969,8 +969,6 @@ if $ARGS[0] = '$get_breastmilk':
 			
 			!! Next check is for cases when not only there is less milk than demanded, but also not enough max_nip_flow_rate 
 			if pumptime_left > 0: 
-				!! returning unused time (could use it a lot in RL... -_-)
-				minut -= pumptime_left
 				pumptime = ARGS[2] - pumptime_left + 1 
 				!!	time to add the pumped lactation['breastmv'] to the milkedvolume and empty lactation['breastmv'].
 				lactation['get_bm_milkedvolume'] += lactation['breastmv']

locations/loadg.qsrc

@@ -2,7 +2,5 @@
 
 gs 'saveupdater'
 
-gs 'nichUtil','onLoad'
-
 --- loadg ---------------------------------
 

locations/nichUtil.qsrc

@@ -365,82 +365,6 @@ if $ARGS[0] = 'hired':
 	$npc_nickname['A52'] = 'Master '+$npc_firstname['A52']
 end
 
-if $ARGS[0] = 'onLoad':
-	gs 'nichUtil','updateVars'
-	if $loc = 'tanapartment' or $loc = 'tanhouse' or $loc = 'tanhousezal' or $loc = 'tanhozspal' or $loc = 'tankitchen' or $loc = 'tanNicholas' or $loc = 'tanroom' or $loc = 'tanspalnya' or $loc = 'tanvanr':
-		$loc = 'nichApartment'
-		$loc_arg = ''
-		gt 'nichUtil','updateNotice'
-	end
-end
-
-!!
-if $ARGS[0] = 'updateVars':
-	if nichTanyaOpinion > 0:
-		nichTanyaKnown = 1
-		if nichTanyaOpinion = 1:
-			nichTanyaRelationship = 1
-			nichTanyaRelationshipState = 10
-		elseif nichTanyaOpinion = 10:
-			nichTanyaRelationship = 1
-			nichTanyaRelationshipState = 20
-		elseif nichTanyaOpinion = 20:
-			nichTanyaRelationship = 1
-			nichTanyaRelationshipState = 10
-		elseif nichTanyaOpinion = 30:
-			nichTanyaRelationship = 0
-			nichTanyaRelationshipState = 1010
-		end
-		killvar 'nichTanyaOpinion'
-	end
-end
-
-
-!! convert the old vars to the new system
-if $ARGS[0] = 'convert':
-	
-	killvar 'MaidWorkDay'
-	killvar 'MaidWork'
-	killvar 'TanHallClean'
-	killvar 'TanRoomClean'
-	killvar 'TanBathClean'
-	killvar 'TanMasterClean'
-	killvar 'TanLivingClean'
-	killvar 'TanMaidRoomClean'
-	killvar 'TanKitchenClean'
-	killvar 'TanMadeBreakfast'
-	killvar 'tanwork'
-	killvar 'tan_work_rep'
-	killvar 'tan_work_evaluation'
-end
-
-if $ARGS[0] = 'updateNotice':
-	
-	'<b><font color = red>Update Notice</font></b>'
-	'It appears as if you are currently the live-in maid of Nicholas.'
-	*nl
-	'This story-line has changed drastically in the last updates.'
-	*nl
-	'Please select one option:'
-	'1. Start over: You can play the whole story-line all over again as if it has never happened.'
-	'2. Stay hired: You will stay the maid of Nicholas and your job performance will be translated to the new system. You will be in a sexual relationship with Tanya.'
-	gs 'nichUtil','convert'
-	
-	act 'Start over':
-		gt $loc, $loc_arg
-	end
-	
-	act 'Stay hired':
-		gs 'nichUtil', 'hired'
-		nichPerformance = max(tan_work_rep * 5,10)
-		nichTanyaRelationship = 1
-		nichTanyaRelationshipState = 10
-		nichTanyaRelationshipBreakup = 0
-		gt $loc, $loc_arg
-	end
-	
-end
-
 if $ARGS[0] = 'checkOutfit':
 	if $clothingworntype = 'gm_maid':
 		nichOutfitState = 1

locations/obj_din.qsrc

@@ -2012,6 +2012,15 @@ if $ARGS[0] = 'emergency':
 	cla
 	if StoryLine = 1:act 'Go to Pavlovsk':gt 'pav_residential'
 	act 'Go to City Residental':gt 'city_residential'
+	act 'Remove all mods':
+		killqst
+		set mod_list=0
+		killvar '$mod_name'
+		killvar '$mod_version'
+		killvar '$mod_author'
+		killvar '$mod_desc'
+		killvar '$mod_opt'
+	end
 	if $loc ! '' and $loc_arg ! '':
 		act 'Cancel':gt $loc, $loc_arg
 	elseif $loc ! '':