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

Conflicts:
	code/modules/events/carp_migration.dm

2014-10-25 11:29:07 +00:00

..

__DEFINES

Keep the define around as that is a good idea

2014-10-20 22:49:06 +13:00

__HELPERS

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

2014-10-25 11:29:07 +00:00

_globalvars

Fixes undershirts to play nice with female uniforms.

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

_onclick

Keep the define around as that is a good idea

2014-10-20 22:49:06 +13:00

ATMOSPHERICS

Merge pull request #5383 from Donkie/atmostankfixes

2014-10-22 10:50:16 -07:00

controllers

Merge pull request #5240 from paprka/assantag

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

datums

Fixes Space retrovirus being incurable.

2014-10-22 22:23:26 +02: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 thespookisreal

2014-10-25 11:29:07 +00: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 thespookisreal

2014-10-25 11:29:07 +00:00

unused

Finishes repathing flashes

2014-10-22 19:09:43 +01:00

WorkInProgress

Fix cyborg flashes being useable in flashers and cyborg heads.

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

_compile_options.dm

Edited comment and added delay to roman armor

2014-10-06 22:07:11 +04:00

hub.dm

…

world.dm

…