DZD 4bcdb94a99 Merge with upstream/master ...

Fixes conflicts

2015-02-18 13:41:32 -05:00

..

admin

Merge with upstream/master

2015-02-18 13:41:32 -05:00

assembly

Merge with upstream/master

2015-02-18 13:41:32 -05:00

awaymissions

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

client

Merge pull request #322 from Markolie/master

2015-02-17 14:05:49 -05:00

clothing

Merge with upstream/master

2015-02-18 13:41:32 -05:00

computer3

Merge with upstream/master

2015-02-18 13:41:32 -05:00

customitems

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

destilery

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

DetectiveWork

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

economy

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

events

Move mass hallucination event to moderate, change weight of cargo bonus

2015-02-16 23:05:25 +01:00

ext_scripts

…

flufftext

Crossbow Rework

2015-02-03 23:35:09 -05:00

food

…

games

…

genetics

…

genetics2

…

hydroponics

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

icon generation

…

jungle

Defib update, cell path update

2015-02-09 16:12:01 +01:00

karma

Additional karma check to prevent potential exploit?

2015-02-16 06:14:06 -05:00

library

Merge with upstream/master

2015-02-18 13:41:32 -05:00

liquid

…

media

Remove jukebox debug

2015-01-31 15:38:16 +01:00

mining

Merge with upstream/master

2015-02-18 13:41:32 -05:00

mob

Merge with upstream/master

2015-02-18 13:41:32 -05:00

nano

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

organs

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

paperwork

Merge with upstream/master

2015-02-18 13:41:32 -05:00

power

Merge with upstream/master

2015-02-18 13:41:32 -05:00

projectiles

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

reagents

Merge with upstream/master

2015-02-18 13:41:32 -05:00

recycling

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

research

Merge with upstream/master

2015-02-18 13:41:32 -05:00

scripting

…

security levels

Z-level check refactor

2015-02-16 20:33:28 +01:00

shieldgen

Blob event fixes, toggle preferences age check, jobban check

2015-02-01 14:19:11 +01:00

shuttles

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

store

Z-level check refactor

2015-02-16 20:33:28 +01:00

supermatter

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

surgery

Merge surgical borgs and crisis borgs

2015-02-16 22:47:55 +01:00

telesci

Merge with upstream/master

2015-02-18 13:41:32 -05:00

vehicles

Merge with upstream/master

2015-02-18 13:41:32 -05:00

virus2

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00