Chinsky 027b0d8ec6 Merge branch 'master' into dev-freeze ...

Conflicts:
	html/changelog.html

2013-11-30 05:16:49 +04:00

..

ammunition

Expansion of every "icon = ''" path.

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

guns

Conflict fix.

2013-10-21 04:37:28 +03:00

projectile

Changed the embed check to use its own var instead of checking damagetype

2013-10-31 22:05:58 -04: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

Merge branch 'master' into dev-freeze

2013-11-30 05:16:49 +04:00

projectile.dm

Changed the embed check to use its own var instead of checking damagetype

2013-10-31 22:05:58 -04:00

targeting.dm

Expansion of every "icon = ''" path.

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