DZD 3939abaf5d Fix Conflicts and Sync with Upstream ...

Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172

2015-01-16 17:07:22 -05:00

..

ammunition

Fixes-Tweakes

2014-12-14 03:18:10 -05:00

guns

Fix Conflicts and Sync with Upstream

2015-01-16 17:07:22 -05:00

projectile

Fix Conflicts and Sync with Upstream

2015-01-16 17:07:22 -05:00

ammunition.dm

Gun Harmonization

2014-12-13 11:18:56 -05:00

gun.dm

Rebalance Stamina

2015-01-05 06:53:48 -05:00

projectile.dm

Odds and Ends

2015-01-01 21:05:50 -05:00

targeting.dm

Updates to gun targeting UI. Fixes #5710

2014-07-24 18:36:52 -04:00