Zuhayr 1e135f91af Merge resolution with master.

2014-06-02 12:05:12 +09:30

..

area

Fixes #4816 and nothing else. Cherry picked from #5036.

2014-05-22 23:12:50 +02:00

dna

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

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

gamemodes

Merge resolution with master.

2014-06-02 12:05:12 +09:30

jobs

Else Ifs

2014-05-09 16:06:44 +03:00

machinery

Merge resolution with master.

2014-06-02 12:05:12 +09:30

magic

…

mecha

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

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

objects

Merge resolution with master.

2014-06-02 12:05:12 +09:30

turfs

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

2014-05-03 16:56:19 +01:00

vehicles

…

verbs

Adds Mentors.

2014-05-04 23:12:06 -05:00

asteroid.dm

…

atoms_movable.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

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

Mutiny Mode

2014-05-11 15:03:50 -05:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

Code for new bots allowing admins to PM Players via IRC and vice versa.

2014-04-16 23:14:17 -05:00

sound.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

supplyshuttle.dm

Merge resolution with master.

2014-06-02 12:05:12 +09:30