Merge branch 'master' of https://github.com/tgstation/-tg-station into Improved_eyecheck()
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
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
Merge branch 'master' of https://github.com/tgstation/-tg-station into corgibunker
Changed some light fittings to improve light coverage
checkpoint
Finished writing SetJobPreferenceLevel, it appears that SetJobDepartment doesnt support direct level input
Added GetJobLevel
Updated link handling and link href-s
Removed a check for removed argument
Bad values
Edited the URL handling again to make more sense.
Updated changelog.
Brute Damage for brain removal

Added 75 brute damage when head is sawed through + some new text for it, and 25 when brain is removed, this fixes an issue in which blood would not be tracked behind dead debrained bodies, and makes a little more sense
Brute Damage for brain removal

added 75 brute damage for saw step, and new text, added 25 for brian removal step. Fixes demrianed bodies not bleeding + makes more sense
separated map changes
Merge branch 'master' of https://github.com/tgstation/-tg-station into corgibunker
merged