Zuhayr 3c66bd3920 Merge resolution.

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

..

admin

Adjusted ninja spawn proc to check rig internals.

2014-12-07 20:13:59 +10:30

assembly

refactor 'dir = ' into 'set_dir()'

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

awaymissions

refactor 'dir = ' into 'set_dir()'

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

client

Lowered to 2 points.

2014-11-30 23:20:24 -06:00

clothing

Fixes #7199

2014-12-07 22:13:31 +10:30

customitems

…

destilery

…

detectivework

…

economy

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

2014-11-26 22:10:09 +01:00

events

…

ext_scripts

…

flufftext

refactor 'dir = ' into 'set_dir()'

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

food

…

games

…

genetics

…

hydroponics

Merge resolution.

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

icon generation

…

library

…

liquid

…

maps

Fixes Map Loader issues.

2014-11-28 08:37:23 +01:00

mining

Merge pull request #7205 from Mloc/bs12-setdir

2014-12-02 14:38:31 +01:00

mob

Merge resolution.

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

nano

Fixes #7199

2014-12-07 22:13:31 +10:30

organs

refactor 'dir = ' into 'set_dir()'

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

paperwork

Duct Tape

2014-12-02 23:17:45 +13:00

power

Merge pull request #7205 from Mloc/bs12-setdir

2014-12-02 14:38:31 +01:00

projectiles

refactor 'dir = ' into 'set_dir()'

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

reagents

Cargo can now order empty blood packs.

2014-11-30 16:45:52 +01:00

recycling

refactor 'dir = ' into 'set_dir()'

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

research

Merge resolution.

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

scripting

…

security levels

…

shieldgen

refactor 'dir = ' into 'set_dir()'

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

shuttles

Merge resolution.

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

supermatter

Supermatter warning now has its own proc. Fixed some SM bugs.

2014-11-30 00:23:55 +01:00

surgery

Fixes #7238

2014-12-07 11:52:29 +10:30

vehicles

refactor 'dir = ' into 'set_dir()'

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

virus2

…