mwerezak 398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix ...

Conflicts:
	code/modules/organs/organ_external.dm

2015-03-31 02:13:22 -04:00

..

ammunition

Adjusts ammunition autolathe costs, makes 7.62 mags printable

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

guns

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

2015-03-31 02:13:22 -04:00

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

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

2015-03-31 00:16:56 -04:00

projectile.dm

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

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

targeting.dm

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

2015-03-31 01:37:55 -04:00