Ccomp5950 a63f358049 Merge pull request #6272 from faerindel/dfreeze_pipe_dupe_fix ...

Fixes #6268 #6122 #6121

2014-09-04 04:18:10 -05:00

..

admin

fix for contaminants not processing if air is OK otherwise

2014-09-03 19:00:00 +01:00

assembly

…

awaymissions

…

client

Reapplies LightningIron's fix for #6131

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

clothing

Allows refitting to change worn sprite

2014-09-02 08:31:16 -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

…

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 some issues with new Hydro.

2014-08-27 22:04:19 +09:30

icon generation

…

library

Made arcane tomes a subtype of books, fixes #5838

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

liquid

…

maps

…

mining

Fixes 5866#

2014-09-01 23:20:46 +09:30

mob

fix for contaminants not processing if air is OK otherwise

2014-09-03 19:00:00 +01:00

nano

…

organs

Merge resolution, master into dev.

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

paperwork

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

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

power

Fixes #6121

2014-09-04 05:02:03 +01: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

Increased disposal flow rate and pump power

2014-08-30 16:19:19 -04:00

research

Merge pull request #6258 from mwerezak/rddesigns

2014-09-02 10:06:48 -05: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

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

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

supermatter

Adjusts the supermatter reaction parameters

2014-08-23 12:35:12 -04:00

surgery

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

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

vehicles

Fixes runtime in train/explode()

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

virus2

…