deathride58 5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants

2017-10-04 20:18:03 -04:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #3113 from Citadel-Station-13/upstream-merge-31237

2017-10-04 12:27:53 -04:00

__HELPERS

Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103)

2017-10-02 02:48:51 -05:00

_globalvars

Gives nightmares a random shadowling name (#31188)

2017-10-03 18:41:37 -05:00

_js

…

_onclick

Merge pull request #31261 from AnturK/lockedslot

2017-10-04 06:12:46 -05:00

citadel

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants

2017-10-04 20:18:03 -04:00

controllers

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants

2017-10-04 20:18:03 -04:00

datums

Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232

2017-10-03 20:13:06 -04:00

game

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants

2017-10-04 20:18:03 -04:00

modules

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants

2017-10-04 20:18:03 -04:00

_compile_options.dm

Merge pull request #3028 from Raeschen/master

2017-09-30 12:56:20 -04:00

world.dm

…