Chinsky 2d52f2eac7 Merge pull request #5365 from volas/master ...

Fix infinite loop

2014-06-27 01:14:36 +04:00

..

area

Fixes #5205.

2014-06-10 20:32:16 +02:00

dna

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00

gamemodes

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

jobs

Merge pull request #5319 from DJSnapshot/hotfix

2014-06-23 00:00:55 +09:30

machinery

Fixes two wires in airlocks not triggering

2014-06-26 03:33:47 +02:00

magic

…

mecha

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

objects

Merge pull request #5365 from volas/master

2014-06-27 01:14:36 +04:00

turfs

Merge pull request #5325 from mwerezak/temperature-expose

2014-06-23 00:19:15 +09:30

vehicles

…

verbs

color change ( http://i.imgur.com/6SAj7OT.png )

2014-06-02 23:17:23 -07:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons

2014-05-11 13:48:51 +00:00

communications.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00