Jordan Brown f1dfc1b6db Merge pull request #31252 from MrStonedOne/whatthefuckcyberboss ...

Partial revert of #30763 (datum config refactor)

2017-10-03 17:55:05 -05:00

..

__DATASTRUCTURES

…

__DEFINES

ismecha define

2017-10-02 01:04:53 -05: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

Merge branch 'master' into upstream-merge-30763

2017-09-30 15:30:46 -04:00

_js

…

_onclick

Merge pull request #31231 from AnturK/longenoughiruntimelogtopissmeoff

2017-10-03 06:18:33 -05:00

citadel

Nerf to 10mm Soporific Bullets (#3085)

2017-10-03 02:18:42 -07:00

controllers

Merge pull request #31252 from MrStonedOne/whatthefuckcyberboss

2017-10-03 17:55:05 -05:00

datums

Merge pull request #3082 from ktccd/fixes_flavor_text_and_changeling_dicks

2017-10-02 21:26:15 -04:00

game

Merge pull request #3091 from Citadel-Station-13/upstream-merge-31233

2017-10-03 12:31:59 -04:00

modules

Merge pull request #2922 from Daniel0Mclovin/Kris's-Garbage

2017-10-03 15:22:43 -04:00

_compile_options.dm

Merge pull request #3028 from Raeschen/master

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

world.dm

…