Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

2015-06-22 13:40:07 -07:00

..

ammunition

Finally done

2015-05-09 07:12:54 -04:00

guns

Merge remote-tracking branch 'upstream/master' into poolit

2015-06-22 13:40:07 -07:00

projectile

Merge remote-tracking branch 'upstream/master' into poolit

2015-06-22 13:40:07 -07:00

ammunition.dm

Fixes

2015-05-08 17:59:42 -04:00

gun.dm

Small object manipulation stuff

2015-05-26 14:00:20 -04:00

projectile.dm

Fixes reflecting projectiles

2015-05-10 20:10:27 -04:00

targeting.dm

Squishing commits

2015-04-11 14:46:15 -05:00