Merge branch 'develop' into feature/ascension_7_8

# Conflicts:
#	impostor.inc
#	inc/decision/decision.have_a_coffee.lua
#	inc/decision/decision.sumphore_discussion.lua
#	inc/screen/screen.mysterious_man.lua
#	inc/screen/screen.walking_to_home.lua
#	inc/screen/screen.walking_to_office.lua
#	inc/window/window.menu.lua

inc/screen/screen.mysterious_man.lua

@@ -54,6 +54,32 @@ local ASC_45_TEXT = [[
 
 ]]
 
+local ASC_56_TEXT = [[
+  Norman is not as productive as he should be.
+
+  Can we distract him?
+
+  We need to keep him busy.
+
+  We need
+
+  More
+
+  Time
+]]
+
+local ASC_67_TEXT = [[
+  He knows.
+
+  Norman has broken through the first veil.
+
+  The simulation is compromised.
+
+  This was not supposed to happen.
+
+  Not yet.
+]]
+
 local ASC_78_TEXT = [[
   The road has run out
   of road.
@@ -74,6 +100,8 @@ local ascension_texts = {
   [3] = ASC_23_TEXT,
   [4] = ASC_34_TEXT,
   [5] = ASC_45_TEXT,
+  [6] = ASC_56_TEXT,
+  [7] = ASC_67_TEXT,
   [8] = ASC_78_TEXT,
 }
 
@@ -147,6 +175,7 @@ function MysteriousManScreen.wake_up()
     target_points = 100,
     instruction_text = "Wake up Norman!",
     show_progress_text = false,
+    meter_on_complete = Meter.apply_wakeup_reward,
     on_win = function()
       Audio.music_play_wakingup()
       Meter.show()
@@ -160,11 +189,25 @@ function MysteriousManScreen.wake_up()
 end
 
 -- Norman chooses to stay in bed, skipping the minigame and flash, and going straight to the next day.
+-- At ascension level 4, staying in bed triggers 4->5: shows the ascension text then wakes with flash.
 -- @within MysteriousManScreen
 function MysteriousManScreen.stay_in_bed()
-  Day.increase()
-  state = STATE_DAY
-  day_timer = day_display_seconds
+  if Ascension.get_level() == 4 then
+    Context.should_ascend = true
+    Day.increase()
+    Ascension.consume_increase()
+    trigger_flash_on_wake = true
+    show_mysterious_screen = true
+    text = MysteriousManScreen.get_text_for_level(Ascension.get_level())
+    text_y = Config.screen.height
+    text_done = false
+    text_done_timer = 0
+    state = STATE_TEXT
+  else
+    Day.increase()
+    state = STATE_DAY
+    day_timer = day_display_seconds
+  end
 end
 
 --- Starts the mysterious man screen.