Kelenius 41ff9819bd Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm

2015-03-31 17:44:42 +03:00

..

ammunition

Adjusts ammunition autolathe costs, makes 7.62 mags printable

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

guns

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03: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