Miniature 03a40195b1 Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	baystation12.dme

2012-03-01 19:17:38 +10:30

..

admin

[PATCH 064/285] TG UPDATES: Santa's toy bag!

2012-03-01 03:25:14 +00:00

assembly

Added some more feedbacks on the blood_DNA stuff

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

chemical

Bugfixes for Hallucinations, borgs'n'doors, and airlocks autorefreshing.

2012-02-29 22:21:01 -07:00

clothing

TG Updates: Sprited/added the blue magus and red magus robes

2012-03-01 02:59:33 +00:00

critters

Space carp and other critter balancing.

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

customitems

Housekeeping with custom items

2012-03-01 19:10:52 +10:30

DetectiveWork

Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space.

2012-02-29 13:48:16 -07:00

flufftext

Bugfixes for Hallucinations, borgs'n'doors, and airlocks autorefreshing.

2012-02-29 22:21:01 -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

[PATCH 056/285] TG UPdates: fingerprints on cans now log on any attackby() that isn't a wrench/analyzer/pda/tank; added a 2 minute

2012-03-01 03:16:34 +00:00

power

Added admin logging to PA controller

2012-02-29 12:27:14 +10:30

projectiles

Fix for borgs transformed by the Staff of Change dropping their cells and MMI on the ground.

2012-03-01 03:22:47 +00:00

recycling

Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space.

2012-02-29 13:48:16 -07:00

research

fixed some design datums, added command to debug RnD

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

scripting

Merge pull request #563 from SkyMarshal/master

2012-02-29 12:51:48 -08: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