LetterJay ae9e4495f9 Merge branch 'master' into upstream-merge-29747

2017-08-20 09:53:17 -05:00

..

__DATASTRUCTURES

…

__DEFINES

Moves most of world.dm

2017-08-16 17:51:33 -05:00

__HELPERS

Merge pull request #2221 from Citadel-Station-13/upstream-merge-29523

2017-08-18 14:16:44 -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

Climaxing/masturbation changes, exposing through clothing, breastmilk and masturbation (#2357)

2017-08-19 19:01:02 -07:00

controllers

The station explosion cinematic now uses the old "far explosion" sound

2017-08-17 09:18:58 -05:00

datums

Diseases will properly make new symptoms instead of sharing the same for everyone

2017-08-19 18:41:34 -05:00

game

Merge branch 'master' into upstream-merge-29747

2017-08-20 09:53:17 -05:00

modules

Merge branch 'master' into upstream-merge-29747

2017-08-20 09:53:17 -05:00

_compile_options.dm

Moves most of world.dm

2017-08-16 17:51:33 -05:00

world.dm

Update world.dm

2017-08-16 19:40:40 -05:00

world.dm.rej

Moves most of world.dm

2017-08-16 17:51:33 -05:00