Merge branch 'master' of https://github.com/tgstation/-tg-station
Redesigned HoP office

I've always felt the HoP was too isolated from the rest of the crew, the other heads especially, so I've made a little redesign of his office:
The HoP's spawn point is glassed off with a windoor thats set to HoP access to him a private office.
His locker is swapped position with his file cabinet (this does make the HoP office slightly more secure as break ins will need to unwrench the drawers to move them)
The airlocks into the main area are changed to bridge access so all heads of staff can access the HoP's office again.

The response was in favour:
http://ss13.eu/phpbb/viewtopic.php?f=5&t=291&view=unread#unread

hop office design B

HoP office design E

Merge branch 'master' of https://github.com/tgstation/-tg-station into corgibunker

Conflicts:
	maps/tgstation.2.1.2.dmm

Swapped the position of the APC and AI pad around because my autism was flaring up from the pad being off centre with the carpet

hop office type E v1.2

Merge branch 'master' of https://github.com/Malkevin/-tg-station into corgibunker

merged map changes

conflict

Merge branch 'master' of https://github.com/tgstation/-tg-station into corgibunker

Merged recent map updates with HoP Office Type E version 1.2

Resolved conflict... finally

HoP office E 1.3

removed the pen table left accidentally floating in space

Added missing AI camera
Changed r-walls to n-walls