LetterJay 474b66fed1 Merge pull request #3209 from Citadel-Station-13/upstream-merge-31371 ...

[MIRROR] Allows editing config.allow_admin_ooccolor

2017-10-08 16:18:34 -04:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #3205 from Citadel-Station-13/upstream-merge-31374

2017-10-08 15:36:39 -04:00

__HELPERS

Update type2type.dm

2017-10-05 22:44:50 -05:00

_globalvars

Gives nightmares a random shadowling name (#31188)

2017-10-03 18:41:37 -05:00

_js

…

_onclick

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

citadel

Crew objective/miscreant system tweaks (#3213)

2017-10-08 10:05:40 -07:00

controllers

Merge branch 'master' into upstream-merge-31371

2017-10-08 15:37:46 -04:00

datums

Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386

2017-10-08 16:18:18 -04:00

game

Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386

2017-10-08 16:18:18 -04:00

modules

Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386

2017-10-08 16:18:18 -04:00

_compile_options.dm

…

world.dm

…