Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

ammunition

Removes nook awps stunlock. Nerfs SAW back to where it should be, 25 damage, not 60. Fuckin' SAW.

2013-08-13 16:51:48 -04:00

guns

Doublesuperheating fix.

2013-08-08 02:43:23 +03:00

projectile

Fixed language datum comparison, fixed staff of change runtime.

2013-08-06 07:33:07 -07:00

ammunition.dm

…

gun.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00

projectile.dm

Removed undeeded "ATTACK:"

2013-08-28 03:37:11 +01:00

targeting.dm

Made syringe gun work with aiming system.

2013-06-01 08:23:38 +04:00