Ccomp5950 fd37cf44e3 Merge pull request #6104 from mwerezak/power-net ...

Fixes for APCs (from dev), fix for solars area, and simple APC load balancing

2014-08-24 12:26:29 -05:00

..

admin

Gives filters proper names, updates airlocks to use filters

2014-08-15 20:27:00 -04:00

assembly

integrate XGM into the code

2014-07-22 19:52:12 +01:00

awaymissions

…

client

Fixes #6038. Adds a missing '

2014-08-21 21:52:59 +02:00

clothing

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

2014-08-22 01:24:34 -04:00

customitems

Master to dev merge.

2014-08-11 17:23:40 +09:30

destilery

…

detectivework

Initial commit of detective console rewrite.

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

economy

Merge resolution with PDA nanoui.

2014-07-25 22:57:53 +09:30

events

Removes the loophole ion-law. Adds in some other ion law changes.

2014-08-14 11:20:45 +02:00

ext_scripts

…

flufftext

integrate XGM into the code

2014-07-22 19:52:12 +01:00

food

…

games

…

genetics

…

hydroponics

Fixed #5912

2014-08-10 16:29:09 -04:00

icon generation

…

library

Made arcane tomes a subtype of books, fixes #5838

2014-08-10 02:23:36 -07:00

liquid

…

maps

…

mining

Moved ambiance sounds out of horrendous ifchain to area definitions.

2014-08-16 04:40:46 +04:00

mob

Removes comment, adjusts rel_sizes

2014-08-22 22:09:23 -04:00

nano

NanoUI updates.

2014-07-21 22:32:45 +01:00

organs

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

paperwork

Master to dev merge.

2014-08-11 17:23:40 +09:30

power

Merge remote-tracking branch 'upstream/dev-freeze' into power-net

2014-08-21 20:25:58 -04:00

projectiles

Adjusts laser cannon damage

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

reagents

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

2014-08-22 01:24:34 -04:00

recycling

Updates disposal bin pressurization

2014-08-07 19:31:17 -04:00

research

Removes telecomm and RD server temperature cap

2014-07-28 20:24:17 -04:00

scripting

…

security levels

Fixes icons and other things not updating when the master controller updates power status.

2014-08-10 03:45:20 -04:00

shieldgen

Reorganizes shieldgen source code and icon files

2014-08-10 11:58:25 -04:00

shuttles

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

supermatter

Master to dev merge.

2014-08-11 17:23:40 +09:30

surgery

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

vehicles

Fixes runtime in train/explode()

2014-08-10 18:37:39 -04:00

virus2

…