[fixed] refillable water bottle couldn't be refilled if it's 3/4 full

[changed] hunger and thirst icons now can be used to eat a sandwich and drink from the (refillable) water bottle

locations/kit_din.qsrc

@@ -516,7 +516,7 @@ $driwater = {
 }
 
 $fill_bottle = {
-	if refillable_bottle = 1 or refillable_bottle = 2:
+	if refillable_bottle > 0 and refillable_bottle < 4:
 		*nl
 		'You can fill your sports water bottle with filtrated tap water.'
 		act 'Fill your water bottle (0:01)':

locations/stat_display.qsrc

@@ -1132,9 +1132,23 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec:msg ''You are feeling a tingling sensation between your legs.''"><img title="You are feeling a bit aroused." height = 54 src="images/system/icon/status_icons/arousal_low.png"></a></td>'
 	end
 
-	if cheatNoEat = 0 and $stat_hunger_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_hunger_msg"><img title="<<$stat_hunger_tooltip>>" height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
-	
-	if cheatNoDrink = 0 and $stat_thirst_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	if cheatNoEat = 0 and $stat_hunger_msg ! '' and buterbrod = 0: 
+		$statusIconBarTab += '<td><a href="exec:msg $stat_hunger_msg"><img title="<<$stat_hunger_tooltip>>" height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
+	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and buterbrod = 1 and menu_off = 0:
+		$statusIconBarTab += '<td><a href="exec: buterbrod = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat''"><img title="Click to eat your sandwich." height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
+	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and buterbrod = 1 and menu_off = 1:
+		$statusIconBarTab += '<td><a href="exec: $stat_hunger_msg"><img title="Your sandwich has to wait until you can spare a minute." height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
+	end
+		
+	if cheatNoDrink = 0 and $stat_thirst_msg ! '' and bottle = 0 and refillable_bottle < 2: 
+		$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and refillable_bottle > 1 and menu_off = 0: 
+		$statusIconBarTab += '<td><a href="exec: refillable_bottle -= 1 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your refillable water bottle." height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and bottle > 0 and menu_off = 0: 
+		$statusIconBarTab += '<td><a href="exec: bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your water bottle." height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and (bottle > 0 or refillable_bottle > 1) and menu_off = 1:
+		$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="Your water bottle has to wait until you can spare a minute." height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+	end
 		
 	if cheatNoSleep= 0 and $stat_sleep_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_sleep_msg"><img title="<<$stat_sleep_tooltip>>" height = 54 src="images/system/icon/status_icons/need_sleep.png"></a></td>'