phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction ...

Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm

2016-04-26 21:49:51 +02:00

..

__DATASTRUCTURES

…

__DEFINES

Grammar fixes

2016-04-25 16:28:16 +01:00

__HELPERS

Merge pull request #17087 from optimumtact/patch-4

2016-04-26 19:34:24 +02:00

__PATH_COMPATIBILITY

…

_globalvars

Adds detecting newly made byond accounts (#16269)

2016-04-15 11:04:52 +10:00

_onclick

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

2016-04-26 21:49:51 +02:00

controllers

Fixes sloth ruin atmos runtime.

2016-04-25 10:54:45 -07:00

datums

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

2016-04-26 21:49:51 +02:00

game

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

2016-04-26 21:49:51 +02:00

js

…

modules

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

2016-04-26 21:49:51 +02:00

orphaned procs

…

_compile_options.dm

Removes 509 support.

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

hub.dm

…

world.dm

…