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

impostor.inc

@@ -7,6 +7,7 @@ init/init.context_debug.lua
 system/system.util.lua
 system/system.print.lua
 system/system.input.lua
+system/system.textinput.lua
 system/system.mouse.lua
 system/system.asciiart.lua
 system/system.rle.lua
@@ -18,6 +19,7 @@ logic/logic.trigger.lua
 logic/logic.minigame.lua
 logic/logic.glitch.lua
 logic/logic.commute_glitch.lua
+logic/logic.codegenerator.lua
 logic/logic.discussion.lua
 system/system.ui.lua
 audio/audio.manager.lua
@@ -59,6 +61,8 @@ discussion/discussion.sumphore.lua
 discussion/discussion.coworker.lua
 discussion/discussion.commute_glitch.lua
 discussion/discussion.truth.lua
+decision/decision.eating_fast_food.lua
+discussion/discussion.pizza_vendor.lua
 map/map.manager.lua
 map/map.bedroom.lua
 map/map.street.lua
@@ -73,6 +77,7 @@ screen/screen.work.lua
 screen/screen.mysterious_man.lua
 window/window.manager.lua
 window/window.register.lua
+window/window.gameover.lua
 window/window.end.lua
 window/window.intro.title.lua
 window/window.intro.ttg.lua
@@ -87,6 +92,8 @@ window/window.minigame.rhythm.lua
 window/window.minigame.ddr.lua
 window/window.discussion.lua
 window/window.continued.lua
+window/window.credits.lua
+window/window.player_name.lua
 window/window.game.lua
 system/system.main.lua
 meta/meta.assets.lua