kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

SDQL2

SDQL cleanup (#904)

2017-05-11 18:26:15 -07:00

adminhelp.dm

[MIRROR] Cleans up some Initializes (#943)

2017-05-18 11:13:53 -05:00

adminjump.dm

manual merge

2017-04-29 11:42:28 -05:00

adminpm.dm

Fixes the most annoying thing about admin helping.

2017-05-04 20:40:09 -05:00

adminsay.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

atmosdebug.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

bluespacearty.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

BrokenInhands.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

buildmode.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

cinematic.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

deadsay.dm

Merge branch 'master' into upstream-merge-26685

2017-05-05 09:42:36 -05:00

debug.dm

IsAdminAdvancedProcCall returns FALSE in TESTING

2017-05-19 16:00:23 -05:00

diagnostics.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

fps.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

getlogs.dm

Persistent investigate and game logs separated by round ID

2017-05-02 18:47:58 -05:00

individual_logging.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

machine_upgrade.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

manipulate_organs.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

map_template_loadverb.dm

Changes a bunch of hrefs to the proper defines

2017-05-02 02:20:07 -05:00

mapping.dm

[MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876)

2017-05-18 06:51:26 -05:00

maprotation.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

massmodvar.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

modifyvariables.dm

Admin ticket tgstyle (#493)

2017-04-20 22:00:47 -05:00

one_click_antag.dm

applies the previous fixes for cult on a closed PR

2017-05-16 22:59:41 -05:00

onlyone.dm

Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted

2017-05-01 07:24:45 -05:00

panicbunker.dm

manual merge

2017-04-29 11:42:28 -05:00

playsound.dm

Merge pull request #707 from Citadel-Station-13/upstream-merge-26746

2017-05-05 09:39:04 -05:00

possess.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

pray.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

randomverbs.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

reestablish_db_connection.dm

manual merge

2017-04-29 11:42:28 -05:00

tripAI.dm

April sync (#360)

2017-04-13 23:37:00 -05:00