mwerezak 3f2aeb6dc4 Merge remote-tracking branch 'upstream/dev' into faxmachine

2014-11-01 11:49:15 -04:00

..

area

Merge pull request #6891 from PsiOmegaDelta/Z

2014-11-01 02:18:23 +03:00

dna

Manual icon file merge.

2014-10-11 06:40:36 +10:30

gamemodes

Merge remote-tracking branch 'upstream/dev' into faxmachine

2014-11-01 11:49:15 -04:00

jobs

Lobby menu refreshment

2014-10-29 14:23:32 +01:00

machinery

Merge pull request #6891 from PsiOmegaDelta/Z

2014-11-01 02:18:23 +03:00

magic

…

mecha

Merge pull request #6857 from mwerezak/hoverpod

2014-10-29 06:31:20 +03:00

objects

Merge pull request #6886 from PsiOmegaDelta/ShoppingList

2014-10-30 22:13:39 +03:00

turfs

Catwalks too.

2014-10-22 14:01:51 +02:00

vehicles

…

verbs

AI emotions and status displays

2014-10-23 13:16:17 +02:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Nabs /tg/ support procs and defines.

2014-10-23 14:35:34 +02:00

json.dm

…

response_team.dm

Merge pull request #6075 from MrSnapwalk/ertv3

2014-08-22 05:01:02 -05:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos.

2014-08-19 10:50:17 +02:00

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Stack update

2014-09-02 09:59:32 +04:00