Zuhayr b47d91b612 Merge resolution, master into dev.

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

..

admin

Gives filters proper names, updates airlocks to use filters

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

assembly

…

awaymissions

…

client

Merge resolution, master into dev.

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

clothing

Merge resolution, master into dev.

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

customitems

…

destilery

…

detectivework

Initial commit of detective console rewrite.

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

economy

…

events

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

hydroponics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Moved ambiance sounds out of horrendous ifchain to area definitions.

2014-08-16 04:40:46 +04:00

mob

Merge resolution, master into dev.

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

nano

…

organs

Merge resolution, master into dev.

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

paperwork

…

power

Merge resolution, master into dev.

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

projectiles

Adjusts laser cannon damage

2014-08-16 22:34:23 -04:00

reagents

Merge resolution, master into dev.

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

recycling

…

research

…

scripting

…

security levels

…

shieldgen

…

shuttles

Merge resolution, master into dev.

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

supermatter

…

surgery

Merge resolution, master into dev.

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

vehicles

…

virus2

…