SkyMarshal 1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.

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

..

admin

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

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

assembly

…

chemical

MOAR BUGFIXES

2012-02-05 21:56:12 -07: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

added orderable chickens and cows

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

mining

Secure Airlock update!

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

mob

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

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