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

Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2014-10-20 21:38:39 -07:00

..

__DEFINES

Defines for the define god

2014-10-09 14:49:28 +13:00

__HELPERS

Merge pull request #5319 from phil235/InjectFix

2014-10-20 20:04:39 -07:00

_globalvars

Fixes undershirts to play nice with female uniforms.

2014-10-11 13:09:52 -04:00

_onclick

Merge pull request #5182 from RemieRichards/XenoLeaping

2014-10-17 07:36:57 -07:00

ATMOSPHERICS

Updated maps and fixed runtime

2014-10-16 16:42:32 +02:00

controllers

Merge pull request #5240 from paprka/assantag

2014-10-20 20:19:08 -07:00

datums

Merge pull request #5240 from paprka/assantag

2014-10-20 20:19:08 -07:00

defines

Merge pull request #5137 from paprka/holosignoff

2014-10-10 17:41:41 +01:00

game

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

2014-10-20 21:38:39 -07:00

js

…

LINDA

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00

modules

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

2014-10-20 21:38:39 -07:00

unused

…

WorkInProgress

Fix cyborg flashes being useable in flashers and cyborg heads.

2014-10-19 04:35:10 +01:00

_compile_options.dm

…

hub.dm

…

world.dm

…