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

..

ai

fixed derpy ai movement.

2012-02-08 06:16:12 +10:00

decoy

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2536 316c924e-a436-60f5-8080-3fe189b3f50e

2011-11-20 15:53:23 +00:00

pai

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

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

robot

Secure Airlock update!

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

say.dm

Added the ability for borgs to ude departmental radios

2011-12-08 22:02:46 -07:00

silicon.dm

TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure.

2011-12-26 23:39:45 +02:00