Added 5 TC uplink to RevHeads.
Fixed some sharp stuff not being recognized as such.
That lead to knives bruising people you stab, for example.
Renamed bruise pack back to gauze.
STAY LIKE THAT.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Untracked accidentally committed file.
what the hell is this file doing in repo...
Merge branch 'master' into bleeding-edge-freeze

Conflicts:
	baystation12.dme
Reapplies reverted changes.
Which are:
fixed psych pipes linking distro,
fixed pipes and wires and disposals in sec,
added missing cameras to sec/research dock,
fixed the bridge charger,
moved the ugly wallchargers in sec,
added a valve for the permabrig nitrus
Merge branch 'master' into bleeding-edge-freeze

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
Merge pull request #2832 from comma/bleeding-edge-freeze

Bleeding edge freeze