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

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01:00

..

ammunition

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

guns

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

2013-09-02 23:32:33 +01:00

projectile

Fixed language datum comparison, fixed staff of change runtime.

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

ammunition.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

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

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00