LetterJay f5e8a7e4e4 rej merges

2017-05-12 23:57:11 -05:00

..

__DATASTRUCTURES

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

__DEFINES

Merge pull request #672 from Citadel-Station-13/upstream-merge-26717

2017-05-01 08:09:22 -05:00

__HELPERS

Fixes templates/ruins not updating area list

2017-04-27 17:02:33 -05:00

_globalvars

Merge pull request #669 from Citadel-Station-13/upstream-merge-26680

2017-05-01 08:06:52 -05:00

_js

April sync (#360)

2017-04-13 23:37:00 -05:00

_onclick

Initialize Refactor

2017-04-26 16:03:17 -05:00

citadel

fixes #618 (#675)

2017-05-01 05:29:35 -04:00

controllers

Merge pull request #578 from Citadel-Station-13/upstream-merge-25981

2017-04-28 09:29:00 -05:00

datums

Merge pull request #679 from Citadel-Station-13/upstream-merge-26709

2017-05-01 08:10:13 -05:00

game

rej merges

2017-05-12 23:57:11 -05:00

modules

rej merges

2017-05-12 23:57:11 -05:00

orphaned_procs

Admin ticket tgstyle (#493)

2017-04-20 22:00:47 -05:00

_compile_options.dm

Updates travis and the config to require byond 511

2017-04-19 16:42:24 -05:00

world.dm

[s]Exploit whack-a-mole

2017-04-25 01:31:50 -05:00