Zuhayr ddf860fb13 Update preferences.dm ...

Fixing a merge error.

2014-08-27 20:56:05 +09:30

..

admin

Gives filters proper names, updates airlocks to use filters

2014-08-15 20:27:00 -04:00

assembly

…

awaymissions

…

client

Update preferences.dm

2014-08-27 20:56:05 +09:30

clothing

Cables are now stacks

2014-08-25 18:54:35 +04:00

customitems

Master to dev merge.

2014-08-11 17:23:40 +09:30

destilery

…

detectivework

Initial commit of detective console rewrite.

2014-08-19 00:50:14 +04:00

economy

Announcement system refactoring.

2014-08-21 06:34:41 +02:00

events

Various grammar and spelling fixes in ion laws

2014-08-24 23:40:25 +01:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

hydroponics

Fixed #5912

2014-08-10 16:29:09 -04:00

icon generation

…

library

Made arcane tomes a subtype of books, fixes #5838

2014-08-10 02:23:36 -07:00

liquid

…

maps

…

mining

Cables are now stacks

2014-08-25 18:54:35 +04:00

mob

Master to dev merge.

2014-08-27 20:24:07 +09:30

nano

…

organs

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

paperwork

Master to dev merge.

2014-08-27 20:24:07 +09:30

power

Master to dev merge.

2014-08-27 20:24:07 +09:30

projectiles

Cables are now stacks

2014-08-25 18:54:35 +04:00

reagents

Master to dev merge.

2014-08-27 20:24:07 +09:30

recycling

fixes #5907

2014-08-21 15:41:28 +02:00

research

Merge pull request #6153 from PsiOmegaDelta/AtmosList

2014-08-26 15:25:59 +04:00

scripting

…

security levels

Expands the use of the new announcement system.

2014-08-21 12:58:02 +02:00

shieldgen

Cables are now stacks

2014-08-25 18:54:35 +04:00

shuttles

Master to dev merge.

2014-08-27 20:24:07 +09:30

supermatter

Master to dev merge.

2014-08-11 17:23:40 +09:30

surgery

Master to dev merge.

2014-08-27 20:24:07 +09:30

vehicles

Cables are now stacks

2014-08-25 18:54:35 +04:00

virus2

…