Vetinari 28b84ce8b8 Merge remote-tracking branch 'upstream/dev' into dev

2014-02-21 20:01:33 +11:00

..

admin

Revert "derp"

2014-02-21 18:17:15 +11:00

assembly

…

awaymissions

…

client

Revert "derp"

2014-02-21 18:17:15 +11:00

clothing

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

2014-02-03 04:36:03 +03:00

customitems

…

destilery

Reintroducing the dough-based cooking system.

2014-02-01 02:17:38 +01:00

detectivework

…

economy

…

events

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

ext_scripts

…

flufftext

…

food

Diona roasts needs cooperation for acid

2014-02-01 11:16:55 +01:00

genetics

…

icon generation

…

library

medical manual

2014-02-16 02:29:20 +11:00

liquid

…

maps

…

mining

Fix for unlocking exploit.

2014-02-09 13:34:40 +03:00

mob

Revert "derp"

2014-02-21 18:17:15 +11:00

nano

…

organs

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

paperwork

…

power

Revert "derp"

2014-02-21 18:17:15 +11:00

projectiles

Bullet inscriptions

2014-02-09 22:52:27 +13:00

reagents

Revert "derp"

2014-02-21 18:17:15 +11:00

recycling

Mass correction of controler to controller.

2014-01-25 03:15:13 +10:30

research

…

scripting

…

security levels

…

supermatter

Revert "derp"

2014-02-21 18:17:15 +11:00

surgery

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

2014-02-03 04:36:03 +03:00

telesci

Because we HAVE to define Del() three times

2014-02-04 11:30:35 -08:00

virus2

…