Tastyfish ca9f25a1e4 Merge remote-tracking branch 'upstream/master'

2012-02-28 15:56:02 -05:00

..

admin

Merge pull request #546 from SkyMarshal/master

2012-02-28 12:45:08 -08:00

assembly

Added some more feedbacks on the blood_DNA stuff

2012-02-14 21:34:52 -07:00

chemical

Iconchanges for upcoming patch, changes to keep the icons in line with what exists.

2012-02-28 20:34:46 +00:00

clothing

Changes to singularity radiation and suits.

2012-02-24 14:05:47 -08:00

critters

Space carp and other critter balancing.

2012-02-12 11:48:15 +01:00

DetectiveWork

Blob now occurs only 33% of the time it it announced. Readded damp rags.

2012-02-26 23:34:01 -07:00

flufftext

Fix for HERP DERP LAG.

2012-02-03 10:51:52 -07:00

food

food fixes / improvements

2012-02-27 21:18:20 -05:00

mining

added missing file

2012-02-15 17:17:03 +10:00

mob

new manifest at mid-game new player screen

2012-02-28 15:43:22 -05:00

power

Singularity can no longer eat the AI's eye mob

2012-02-25 16:01:00 -07:00

projectiles

TG UPDATES: Hurr durr I'm fucking retarded forgot to check a file last commit.

2012-02-28 20:36:36 +00:00

recycling

Teleporter has a cancel button.

2012-02-28 13:39:51 -07:00

research

fixed some design datums, added command to debug RnD

2012-02-22 18:47:06 -05:00

security levels

TG Updates: Bugfixes: Fix for Issue 161. Fix for Issue 239. Circuit imprinter runtime involving Atmosphereic Alert circuits.

2012-02-03 08:09:32 +00:00