CitadelStationBotandkevinz000 83da8141f4 Fixes SM getting energy when hit in space. (#1723)

2017-06-30 18:41:49 -07:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #1812 from Citadel-Station-13/upstream-merge-28858

2017-06-30 10:31:53 -05:00

__HELPERS

should fix file extension issue with logs

2017-06-29 22:27:51 -05:00

_globalvars

Merge pull request #1666 from Citadel-Station-13/upstream-merge-28407

2017-06-20 01:29:44 -05:00

_js

…

_onclick

[s] Fixes TK remote grab exploit

2017-06-25 07:41:23 -05:00

citadel

this is ugly

2017-06-19 19:31:48 -04:00

controllers

Clean up .rej files

2017-06-28 02:24:03 -05:00

datums

Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584

2017-06-27 21:25:50 -05:00

game

Reduces default brig times to be consistent with suggested policy. (#1609)

2017-06-28 04:07:43 -05:00

modules

Fixes SM getting energy when hit in space. (#1723)

2017-06-30 18:41:49 -07:00

_compile_options.dm

…

world.dm

another huge sync

2017-06-21 18:00:00 -05:00