LetterJay 805913f107 Merge pull request #3149 from Citadel-Station-13/upstream-merge-31269 ...

[MIRROR] Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.

2017-10-05 09:12:09 -04:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #3142 from Citadel-Station-13/upstream-merge-31193

2017-10-05 08:38:19 -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

Nerf to 10mm Soporific Bullets (#3085)

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

controllers

Hosts can lock config options from admins (#31254)

2017-10-04 14:59:33 -05:00

datums

Merge branch 'master' into upstream-merge-31222

2017-10-04 21:50:07 -04:00

game

Merge pull request #3148 from Citadel-Station-13/upstream-merge-31244

2017-10-05 09:11:38 -04:00

modules

Merge pull request #3149 from Citadel-Station-13/upstream-merge-31269

2017-10-05 09:12:09 -04:00

_compile_options.dm

Merge pull request #3028 from Raeschen/master

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

world.dm

…