CaelAislinn 03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>

2012-02-10 09:11:08 +10:00

..

admin

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2012-02-10 09:11:08 +10:00

assembly

…

chemical

fixed horribly buggy camera assembly

2012-02-08 20:56:04 -05:00

clothing

Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity

2012-02-07 20:05:43 +02:00

critters

…

flufftext

Fix for HERP DERP LAG.

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

food

…

mining

Secure Airlock update!

2012-02-08 12:07:12 -07:00

mob

Merge pull request #388 from Tastyfish/master

2012-02-08 18:17:30 -08:00

power

Secure Airlock update!

2012-02-08 12:07:12 -07:00

projectiles

Fixed some borkenness with guns, and tried making the command channel readable.

2012-01-22 23:50:58 -07:00

recycling

Herp, derp made blood work right.

2012-02-05 11:22:05 -07:00

research

Secure Airlock update!

2012-02-08 12:07:12 -07: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