phil235 45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix ...

Conflicts:
	code/modules/recycling/disposal.dm

2014-10-15 18:23:40 +02:00

..

__DEFINES

Defines for the define god

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

__HELPERS

general code optimizations

2014-10-08 10:10:03 -07:00

_globalvars

Fixes undershirts to play nice with female uniforms.

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

_onclick

Merge pull request #4873 from optimumtact/clicktyclackety

2014-10-15 11:03:02 -03:00

ATMOSPHERICS

Merge pull request #4759 from Donkie/pipes2

2014-10-15 11:36:25 -03:00

controllers

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

2014-10-15 18:23:40 +02:00

datums

Makes surplus crates show up in the round end report. Fixed #5031.

2014-10-11 14:20:22 +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 DisplacedGirderFix

2014-10-15 18:23:40 +02: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 DisplacedGirderFix

2014-10-15 18:23:40 +02:00

unused

…

WorkInProgress

…

_compile_options.dm

Edited comment and added delay to roman armor

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

hub.dm

…

world.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00