Zuhayr 0bb2cd835c Merge pull request #8600 from mwerezak/bread-tube ...

Adds bread tube trash item, merc shuttle vendor

2015-03-25 00:54:16 +10:30

..

admin

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

alarm

…

assembly

…

awaymissions

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

2015-03-05 08:05:44 +01:00

client

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

2015-03-23 11:45:32 +01:00

clothing

Fixes #8485

2015-03-24 13:20:24 +10:30

customitems

Adds Andrewmeythaler's custom item.

2015-03-17 22:19:13 -05:00

detectivework

…

economy

…

events

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

examine

Fixes #8439.

2015-03-13 23:27:35 +01:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

Should fix issues with invisible seeds/products/plants.

2015-03-24 13:51:44 +10:30

icon generation

…

library

…

liquid

…

maps

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

2015-03-05 08:05:44 +01:00

mining

…

mob

Merge pull request #8584 from Kelenius/ofBorgsAndGlass

2015-03-23 21:34:36 +10:30

nano

Station alert monitor should now only react to major alarms.

2015-03-08 17:58:48 +01:00

organs

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

2015-03-16 12:37:43 +01:00

overmap

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

2015-03-13 09:31:03 +01:00

paperwork

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

2015-03-23 21:14:32 +01:00

power

Fixes #8485

2015-03-24 13:20:24 +10:30

projectiles

Fixes damage multiplier mixup, bumped var not being reset

2015-03-14 02:56:05 -04:00

random_map

…

reagents

Adds bread tube trash item

2015-03-24 04:03:06 -04:00

recycling

…

research

Fixes xenoarch runtime

2015-03-09 12:20:08 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

supermatter

…

surgery

Rebalanced xenoflora sprites, fixed numerous issues.

2015-03-22 16:13:15 +10:30

vehicles

…

virus2

Master into dev-freeze.

2015-03-07 11:33:39 +10:30