Wooden Walls
Hopefully merge conflict fixes
Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat

Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/mineral_doors.dm
	code/modules/research/protolathe.dm
	icons/obj/doors/door_assembly.dmi
Merge pull request #3254 from Jordie0608/manidontevenknowwhatwentwrongwiththat

Wooden Walls
changelog for 3254
Merge pull request #3392 from Jordie0608/peteisatotaldorkeveryonepointandlaugh

Changelog for 3254