Joan Lung 7ba3c93db9 Merge branch 'master' of https://github.com/tgstation/tgstation into definecomponents ...

Conflicts:
	code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
	code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm
	code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm

2016-10-30 11:29:55 -04:00

..

__DATASTRUCTURES

…

__DEFINES

Component IDs are now defines

2016-10-29 11:40:33 -04:00

__HELPERS

Fixes sentience potions

2016-10-27 23:56:31 -02:00

__PATH_COMPATIBILITY

…

_globalvars

Reorganizes the area folder to be more readable (multiple files instead of a big one with a million areas defined, moving areas that were defined outside the folder back into the folder).

2016-10-17 21:19:31 +02:00

_onclick

You can see your own attack log once again

2016-10-28 17:35:22 -02:00

controllers

Bit of weather code cleanup (#21133)

2016-10-24 22:51:17 +13:00

datums

Merge pull request #21243 from lzimann/selflog

2016-10-29 15:50:55 -04:00

game

Merge branch 'master' of https://github.com/tgstation/tgstation into definecomponents

2016-10-30 11:29:55 -04:00

js

…

modules

Tweak Duplicate object proc (#21069)

2016-10-30 13:41:54 +01:00

orphaned_procs

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

_compile_options.dm

…

world.dm

Fixes hub not taking effect in certain edge cases.

2016-10-10 11:11:45 -07:00