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

Conflicts:
	config/admins.txt

2015-01-03 07:07:03 -06:00

..

__DEFINES

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

2014-12-28 11:20:15 +03:00

__HELPERS

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

2015-01-03 07:07:03 -06:00

_globalvars

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

2015-01-03 07:07:03 -06:00

_onclick

Merge pull request #6707 from phil235/HostileAttackingTargetFix

2015-01-01 12:47:27 -03:00

ATMOSPHERICS

* Fixed unwrencheable atmos objects' stored pipe being wrongly created on New() because initialize directions weren't set when instanciating

2014-12-29 20:34:13 +01:00

controllers

Merge pull request #6490 from tkdrg/nomoreadmingrudges

2014-12-27 19:25:43 -08:00

datums

Merge pull request #6676 from Jordie0608/beeverycarefulwiththese

2015-01-02 02:33:23 -03:00

defines

…

game

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

2015-01-03 07:07:03 -06:00

js

…

LINDA

…

modules

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

2015-01-03 07:07:03 -06:00

_compile_options.dm

…

hub.dm

…

world.dm

Reserve PascalCase inits

2014-12-16 12:29:04 +02:00