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

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

..

admin

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

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

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 resolution, using dev-freeze map due to unreconcilable conflicts.

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

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

Various grammar and spelling fixes in ion laws

2014-08-24 23:40:25 +01:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

hydroponics

Fixes several outstanding bugs with new hydroponics.

2014-09-10 22:16:05 -04:00

icon generation

…

library

…

liquid

…

maps

…

mining

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

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

mob

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

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

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

Increased SMES starting charge

2014-09-12 01:16:31 -04:00

projectiles

Adjusts laser cannon damage

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

reagents

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

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

recycling

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

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

research

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

2014-09-13 16:54:48 +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

Reduces supermatter DAMAGE_RATE_LIMIT

2014-09-10 22:13:31 -04:00

surgery

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

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

vehicles

…

virus2

…