LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 ...

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

2018-05-20 23:11:16 -05:00

..

__HELPERS

modular_citadel

2018-05-20 23:04:13 -05:00

_globalvars/lists

Mentor System (#5235)

2018-02-05 04:09:56 -06:00

_onclick

Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498)

2018-04-27 07:41:31 -07:00

controllers

modular_citadel

2018-05-20 23:04:13 -05:00

datums

trait => quirk

2018-05-14 12:31:49 -05:00

game

modular_citadel

2018-05-20 23:04:13 -05:00

modules

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:11:16 -05:00

init.dm

Adds IPC Antennas (#6049)

2018-03-24 12:33:19 -07:00