ehh
Revert "ehh"

This reverts commit 9345d55d874ae5d6380dd9d66b8778232767293d.
Mapfixes - Hopefully

Signed-off-by: Jamini <mobiousjami@gmail.com>
Merge pull request #2828 from Jamini/master

More mapfixes.
Fixed some sharp stuff not being recognized as such.
That lead to knives bruising people you stab, for example.
Pulls back map changes.  Put those in BEF.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge branch 'master' of github.com:Baystation12/Baystation12
the fuck did I do there.  should be fixed now.

Signed-off-by: Mloc <colmohici@gmail.com>
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.
Fixes #2836
Winners do not use space drugs.
Fixes LSD giving you an ability to escape death once.
Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.
Merge pull request #2837 from comma/master

Fix for LSD zombies.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
merges