paprka 045b564cdf Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart ...

Conflicts:
	code/game/objects/structures/janicart.dm

2015-01-20 20:50:01 -08:00

..

__DEFINES

Merge pull request #6960 from Iamgoofball/goonetics

2015-01-19 17:47:33 +00:00

__HELPERS

Merge pull request #7049 from RemieRichards/PipesAndBuckles

2015-01-20 20:07:18 -06:00

_globalvars

EmergencyResponseTeamV2

2015-01-11 19:21:38 +08:00

_onclick

Tweaks and changes

2015-01-11 20:35:17 -08:00

ATMOSPHERICS

Ports Mloc's Refactor of buckling, All /obj can now buckle things. HE Pipes now change colour based on heat.

2015-01-14 19:07:18 +00:00

controllers

Merge pull request #7105 from Carn/#6993

2015-01-19 20:17:14 -03:00

datums

Merge pull request #7049 from RemieRichards/PipesAndBuckles

2015-01-20 20:07:18 -06:00

defines

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

game

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

2015-01-20 20:50:01 -08:00

js

…

LINDA

Resolves #3947 - Fires can now spread on shuttle turfs (and all simulated turfs). However, fires will not burn non-turf/simulated/floor

2015-01-11 00:11:22 +00:00

modules

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

2015-01-20 20:50:01 -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