Neerti c90e9eb931 More merge conflict resolution goodness.

2014-12-10 02:14:58 -05:00

..

area

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

2014-12-05 21:29:50 -05:00

dna

Fixes exploit that lets AIs use machinery even after cameras are disabled.

2014-11-30 15:24:39 +01:00

gamemodes

Merge pull request #7300 from PsiOmegaDelta/RoundEnd

2014-12-10 03:11:38 +10:30

jobs

Fix virologists spawning without jumpsuits, IDs or PDAs. Fixes #7312.

2014-12-08 18:48:14 +00:00

machinery

More merge conflict resolution goodness.

2014-12-10 02:14:58 -05:00

magic

…

mecha

More merge conflict resolution goodness.

2014-12-10 02:14:58 -05:00

objects

More merge conflict resolution goodness.

2014-12-10 02:14:58 -05:00

turfs

Merge resolution.

2014-12-08 13:01:04 +10:30

vehicles

…

verbs

Chat tags for OOC and LOOC.

2014-11-28 11:15:53 +01:00

asteroid.dm

…

atoms_movable.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

atoms.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

…