PsiOmegaDelta 27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml

2015-10-11 17:37:01 +02:00

..

ammunition

Merge branch 'capgun' into russian_roulette

2015-08-14 06:03:33 +03:00

guns

Merge pull request #11208 from mwerezak/firemode-cleanup

2015-09-28 11:41:03 +01:00

projectile

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

2015-10-11 17:37:01 +02:00

ammunition.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

effects.dm

Projectile visual bug fixes

2015-07-11 00:06:44 +12:00

gun.dm

Merge pull request #11208 from mwerezak/firemode-cleanup

2015-09-28 11:41:03 +01:00

projectile.dm

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

targeting.dm

fixes #8391

2015-07-09 13:23:13 -07:00