Firecage d8b99bbab1 Merge conflict fix

2015-01-23 07:52:24 +02:00

..

__DEFINES

Merge pull request #7006 from Incoming5643/hot_wiz_on_wiz

2015-01-21 15:34:25 -03:00

__HELPERS

Merge pull request #7198 from Deantwo/PaperCut

2015-01-21 15:44:03 +01:00

_globalvars

Resolves #6971 - non-lighting_subarea areas are now stored in list/sortedAreas. This list is sorted by area name using timSort only when areas are added to it. Currently the only other thing that adds to this list is the station-blueprints object.

2015-01-18 20:46:30 +00:00

_onclick

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

ATMOSPHERICS

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

controllers

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

datums

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

2015-01-22 15:15:17 +11: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 pull request #7128 from Jordie0608/timeforanewnew()

2015-01-23 02:38:42 -03: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 conflict fix

2015-01-23 07:52:24 +02:00

_compile_options.dm

…

hub.dm

…

world.dm

Merge pull request #6806 from paprka/endroundshuttle

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