Chinsky 9e2dcc4e4a Merge pull request #6455 from Zuhayr/master ...

Calamity and hydro tweaks

2014-09-20 00:07:56 +04:00

..

admin

Changes last debug verb to proc and adds it to debug list

2014-09-15 23:31:55 -04:00

assembly

…

awaymissions

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

client

Reapplies LightningIron's fix for #6131

2014-09-02 10:02:37 +09:30

clothing

Merge pull request #6416 from Hubblenaut/master

2014-09-18 09:00:38 +04:00

customitems

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

destilery

…

detectivework

Initial commit of detective console rewrite.

2014-08-19 00:50:14 +04:00

economy

…

events

Removed borer from roundstart calamity, added it to the dynamic event handler. Increased event frequency.

2014-09-18 21:41:54 +09:30

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

hydroponics

Hydro tweaks.

2014-09-18 21:45:12 +09:30

icon generation

…

library

…

liquid

…

maps

…

mining

Fixes #6436

2014-09-18 13:12:36 +09:30

mob

Merge pull request #6454 from PsiOmegaDelta/pAI

2014-09-19 10:49:21 +04:00

nano

…

organs

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

paperwork

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

power

Map changes

2014-09-15 15:30:27 +02:00

projectiles

Adjusts laser cannon damage

2014-08-16 22:34:23 -04:00

reagents

Adds random seeds to Cargo for Xenobotany.

2014-09-18 16:39:44 +09:30

recycling

Disposals install fix

2014-09-15 17:04:30 +10:00

research

Fixes empty genome lists when reconstituting fossils.

2014-09-18 13:37:16 +09:30

scripting

…

security levels

…

shieldgen

…

shuttles

Merged dev-freeze into master. Two map conflicts, used dev-freeze map.

2014-08-27 20:46:04 +09:30

supermatter

Increases SM power output

2014-09-12 23:01:15 -04:00

surgery

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

vehicles

…

virus2

…