Jack Edge 3f5d8c4b00 Merge branch 'master' into slimeperson-qol ...

Conflicts:
	code/__DEFINES/misc.dm
	tgui/assets/tgui.js

2016-06-27 11:53:47 +01:00

..

__DATASTRUCTURES

…

__DEFINES

Merge branch 'master' into slimeperson-qol

2016-06-27 11:53:47 +01:00

__HELPERS

Multiple color flashes won't make one permanent (#18894)

2016-06-25 18:56:07 -04:00

__PATH_COMPATIBILITY

…

_globalvars

Merge pull request #18484 from coiax/random-space

2016-06-23 09:12:48 +12:00

_onclick

Ghosts can click to use transition space turfs

2016-06-23 00:36:21 +01:00

controllers

Merge branch 'master' into tips

2016-06-24 07:47:41 +01:00

datums

Merge branch 'master' into shuttle-processing

2016-06-26 01:00:25 +01:00

game

Merge pull request #18932 from SnipeDragon/cutout-fix

2016-06-27 10:20:20 +02:00

js

…

modules

Merge branch 'master' into slimeperson-qol

2016-06-27 11:53:47 +01:00

orphaned_procs

…

_compile_options.dm

…

hub.dm

…

world.dm

Yelling at other servers

2016-06-18 13:52:07 -05:00