Remie Richards 80b4c3ca7f Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui ...

Conflicts:
	tgui/assets/tgui.css
	tgui/assets/tgui.js

2016-05-28 00:24:58 +01:00

..

__DATASTRUCTURES

…

__DEFINES

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

__HELPERS

Shuttle manipulator (#17436)

2016-05-26 15:15:19 +02:00

__PATH_COMPATIBILITY

Add back path_compatibility.dm

2016-02-13 00:11:05 -06:00

_globalvars

Turns tablecrafting into personal crafting (#17341)

2016-05-09 18:14:48 +02:00

_onclick

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

controllers

Shuttle manipulator (#17436)

2016-05-26 15:15:19 +02:00

datums

Merge pull request #17835 from LanCartwright/chokingruntime

2016-05-27 14:56:10 -05:00

game

Merge pull request #17901 from MrPerson/bawhoppen_copyen

2016-05-27 18:02:42 -05:00

js

…

modules

Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui

2016-05-28 00:24:58 +01:00

orphaned_procs

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

_compile_options.dm

Removes 509 support.

2016-04-16 02:16:19 -07:00

hub.dm

Adds a compile option for hub password

2016-01-01 19:23:06 -08:00

world.dm

Map changing will now delay round end until it finishes

2016-05-14 12:47:00 -07:00