hornygranny a24eeb7f93 Merge pull request #5758 from phil235/TorchFix ...

Fixes the torch and flare icons.

2014-11-24 15:18:08 -08:00

..

area

* limit atmos/fire alerts to the current z_level

2014-11-14 10:10:45 +01:00

gamemodes

Merge pull request #5916 from Perakp/infiniteAbsorbFix

2014-11-20 08:43:19 -06:00

jobs

Revert "Fix for starting up"

2014-11-24 10:31:01 -08:00

machinery

Merge pull request #5906 from Razharas/MachinePower

2014-11-24 10:40:41 -08:00

mecha

Fixes runtimes of the mechs

2014-11-22 18:34:41 +03:00

objects

Merge pull request #5758 from phil235/TorchFix

2014-11-24 15:18:08 -08:00

pooling

…

turfs

Merge pull request #6033 from tkdrg/grabmyrod

2014-11-24 13:16:31 -08:00

verbs

Conflicts:

2014-11-13 17:33:32 +01:00

asteroid.dm

Conflicts:

2014-11-13 17:33:32 +01:00

atoms_movable.dm

…

atoms.dm

…

communications.dm

* limit atmos/fire alerts to the current z_level

2014-11-14 10:10:45 +01:00

data_huds.dm

Conflicts:

2014-11-13 17:33:32 +01:00

dna.dm

Conflicts:

2014-11-13 17:33:32 +01:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

…