merge master into branch to enable mission completion#22

Merged

I-am-Erk merged 57 commits intoI-am-Erk:exodialoguefrom CleverRaven:master

Sep 23, 2021

+2,459-1,086

Commits on Nov 22, 2020

Commits on Nov 23, 2020

removed sentences that shouldn't be there
PatrikLundell
committed

Commits on Nov 26, 2020

fixed log stable appearing as kitchen construction
PatrikLundell
committed

Commits on Dec 5, 2020

Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into base_camp_reorganization
PatrikLundell
committed
Reworked to push expansions back to the top level + doc
PatrikLundell
committed

Commits on Dec 11, 2020

Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into base_camp_reorganization
PatrikLundell
committed

Commits on Dec 12, 2020

Commits on Jan 11, 2021

Commits on Jan 12, 2021

incorporated some old reverse conflict changes
PatrikLundell
committed

Commits on Aug 15, 2021

Commits on Aug 17, 2021

Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into base_camp_reorganization
PatrikLundell
committed

Commits on Sep 19, 2021

Commits on Sep 20, 2021

resolved conflict
PatrikLundell
committed

Commits on Sep 21, 2021

Update the table of contents
kevingranade
authored

Commits on Sep 23, 2021