Steelpoint 34589f52bf Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam ...

Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi

2015-01-09 11:02:50 +08:00

..

__DEFINES

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

2015-01-04 01:52:14 +00:00

__HELPERS

Merge remote-tracking branch 'remotes/upstream/master' into knife_fix

2015-01-05 21:35:05 -05:00

_globalvars

Updating

2015-01-06 12:28:37 +08:00

_onclick

Merge pull request #6626 from psykzz/patch-1

2015-01-06 01:54:47 -03:00

ATMOSPHERICS

Merge pull request #6830 from Menshin/atmos_null_parent_fix

2015-01-07 00:20:36 -03:00

controllers

Resolves #6862 - "shuttle_away" docking port was too small to fit the supply shuttle into, so it could never return to centcom.

2015-01-07 18:28:55 +00:00

datums

Merge pull request #6879 from dannno/bandolier

2015-01-08 22:47:09 -03:00

defines

SubSystem rewrite

2014-12-31 13:25:41 +00:00

game

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

2015-01-09 11:02:50 +08:00

js

…

LINDA

SubSystem rewrite

2014-12-31 13:25:41 +00:00

modules

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

2015-01-09 11:02:50 +08:00

_compile_options.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

hub.dm

…

world.dm

Merge pull request #6806 from paprka/endroundshuttle

2015-01-06 01:19:24 -03:00