Fixed some sharp stuff not being recognized as such.
That lead to knives bruising people you stab, for example.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Untracked accidentally committed file.
what the hell is this file doing in repo...
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 pull request #2831 from comma/master

I did something.