LetterJay 80896d0371 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27675

2017-05-30 14:14:25 -05:00

..

__DATASTRUCTURES

…

__DEFINES

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

2017-05-29 02:12:41 -05:00

__HELPERS

Refactors how diagonal smoothing underlays work (#1187)

2017-05-27 13:40:09 -07:00

_globalvars

rej cleanup/commit

2017-05-22 16:59:39 -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 branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27675

2017-05-30 14:14:25 -05:00

datums

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

2017-05-29 02:12:41 -05:00

game

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

2017-05-30 14:14:25 -05:00

modules

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

2017-05-30 14:14:25 -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