Chinsky 8e60315b11 Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm

2012-11-13 04:02:26 +04:00

..

energy

Fix for practice lasers.

2012-11-12 20:21:30 +00:00

projectile

Fix for detective revolver.

2012-10-30 03:07:51 +04:00

energy.dm

Fix for training gun runtime.

2012-11-13 01:42:11 +04:00

projectile.dm

Removed shooting yourself.

2012-07-14 17:02:34 +00:00