LetterJay 04a273eb8e Merge pull request #2213 from Citadel-Station-13/upstream-merge-29606 ...

[MIRROR] Fixes the fruity pebbles in the code

2017-08-14 22:18:28 -05:00

..

__DATASTRUCTURES

Made some object lists less terrible to read

2017-07-18 09:44:43 -05:00

__DEFINES

Merge branch 'master' into upstream-merge-29288

2017-08-14 18:35:28 -05:00

__HELPERS

Merge pull request #2335 from ktccd/Flavor-elevator

2017-08-12 06:35:45 -05:00

_globalvars

Spellchecking

2017-08-01 08:46:20 -05:00

_js

…

_onclick

Fixes help text for embedded objects

2017-08-11 02:47:05 -05:00

citadel

Adds Taur cocks (#2329)

2017-08-11 12:29:01 -07:00

controllers

Tiny bit better splitting on add_details

2017-08-14 09:07:03 -05:00

datums

Merge branch 'master' into upstream-merge-29288

2017-08-14 18:35:28 -05:00

game

Merge pull request #2337 from Citadel-Station-13/upstream-merge-29815

2017-08-14 22:18:07 -05:00

modules

Merge pull request #2278 from Citadel-Station-13/upstream-merge-29651

2017-08-14 20:48:21 -05:00

_compile_options.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

world.dm

Update world.dm

2017-08-14 19:09:51 -05:00

world.dm.rej

Fixes the fruity pebbles in the code

2017-07-31 21:25:46 -05:00