Merge pull request #3 from Baystation12/bleeding-edge-freeze

Bleeding edge freeze
Merge pull request #2304 from caelaislinn/bleeding-edge-freeze

Merge from master, issue resolutions / mapfixes, events updates, admin updates
Merge pull request #2337 from Baystation12/bleeding-edge-freeze

Update staging
Virologist is an alt title again.
Hotfix: Update the .dme

The FILE_DIR entries were missing, which makes it impossible to compile the game using linux' DreamMaker CLI command(The CLI command doesn't rebuild the directories like the IDE does).
Fixed a bug with intercept reports.
Merge branch 'feature' of github.com:CIB/Baystation12 into feature
Forgot to give MD virology access.
Merge pull request #2339 from CIB/feature

Virologist is an alt title again.
Merge pull request #4 from Baystation12/bleeding-edge-freeze

Bleeding edge freeze
Changes Secret-Nuke ready requirements from 15 to 25.
Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze
Merge pull request #2348 from Gamerofthegame/bleeding-edge-freeze

Secret-Nuke playerlimit raised
added some info text to adminwho/modwho

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
made carp migration actually end (carp disappear back into the void)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
beepsky now fights hostile NPC mobs, and vice versa

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
some more useability tweaks to adminwho/modwho

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>