LetterJay 6b7dffddb2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27661

2017-05-30 16:05:53 -05:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #1167 from Citadel-Station-13/upstream-merge-27589

2017-05-30 15:02:44 -05:00

__HELPERS

Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361

2017-05-30 15:15:51 -05:00

_globalvars

Refactors explosions

2017-05-24 16:45:00 -05:00

_js

…

_onclick

Moves attack chain proc from global to obj/item

2017-05-26 11:12:09 -05:00

citadel

EHHH

2017-05-28 15:49:22 -05:00

controllers

Merge pull request #1196 from Citadel-Station-13/upstream-merge-27675

2017-05-30 15:48:23 -05:00

datums

Merge pull request #1305 from Citadel-Station-13/upstream-merge-27839

2017-05-30 15:50:07 -05:00

game

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27661

2017-05-30 16:05:53 -05:00

modules

Merge pull request #1174 from Citadel-Station-13/upstream-merge-27414

2017-05-30 16:04:41 -05:00

_compile_options.dm

Wizards are now at least 30 years old. Apprentices are 17 to 29. (#978)

2017-05-18 12:05:55 -05:00

world.dm

Fixes pre-round-start logs

2017-05-26 19:41:20 -05:00