DZD 5e977cbfc9 Merge remote-tracking branch 'upstream/master' into changeling

2015-02-20 19:05:25 -05:00

..

admin

Merge pull request #367 from Markolie/master

2015-02-20 16:22:32 -05:00

assembly

Revert "Revert "Emergency communications hotfix""

2015-02-20 17:59:07 +01:00

awaymissions

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

client

Revert "Revert "Emergency communications hotfix""

2015-02-20 17:59:07 +01:00

clothing

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

computer3

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01: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

…

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

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

library

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01:00

liquid

…

media

…

mining

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

mob

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

2015-02-20 19:05:25 -05:00

nano

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

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

organs

Part 2 of saycode/language/species port from Bay. Also includes bugfixes.

2015-02-20 00:50:28 +01:00

paperwork

Merge pull request #367 from Markolie/master

2015-02-20 16:22: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

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01:00

recycling

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01:00

research

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

scripting

…

security levels

Z-level check refactor

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

shieldgen

…

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

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

telesci

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01: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