Fixes #6702 and cleanup

Makes reinforced glass a subtype of glass, cleans up window creation copypasta.
Cleaned up window initialization leaking outside of the window constructor.
Removes unnecessary init_dir var from windows.
Merge remote-tracking branch 'upstream/master' into window-fix
Mapping changes for #6702 fix
Adjusts glass sheet construction menu input
Merge pull request #7003 from mwerezak/window-fix

Fixes #6702 and cleanup