PsiOmega ef8b7466ac Merge remote-tracking branch 'upstream/dev' into NarsiePort ...

Conflicts:
	code/modules/projectiles/projectile/change.dm

2015-03-30 20:17:05 +02:00

..

ammunition

Adjusts ammunition autolathe costs, makes 7.62 mags printable

2015-03-23 00:06:28 -04:00

guns

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

projectile

Merge remote-tracking branch 'upstream/dev' into NarsiePort

2015-03-30 20:17:05 +02:00

ammunition.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

effects.dm

Projectile effects - Part 1

2015-03-09 22:17:06 +13:00

gun.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

projectile.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-16 12:39:32 +01:00

targeting.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00