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

Conflicts:
	code/WorkInProgress/Cael_Aislinn/MultiZ.dm

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

2012-02-06 02:51:49 +10:00

..

admin

Bugfixes for adminhelp and the Power Offline event.

2012-02-04 16:20:19 -07:00

assembly

…

chemical

Fixes for gibber and detective computer.

2012-02-02 19:30:12 -07:00

clothing

Spess suit tweaking

2012-01-25 13:39:26 -07:00

critters

…

flufftext

Fix for HERP DERP LAG.

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

food

added orderable chickens and cows

2012-01-16 20:26:17 -05:00

mining

Merge pull request #352 from Hawk-v3/master

2012-02-03 18:25:27 -08:00

mob

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

2012-02-06 02:51:49 +10:00

power

Merge pull request #352 from Hawk-v3/master

2012-02-03 18:25:27 -08:00

projectiles

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

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

recycling

Updates to cigarettes and cigars

2012-02-04 18:24:22 -07:00

research

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

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