Kelenius 24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm

2015-03-28 19:14:59 +03:00

..

ammunition

Adjusts ammunition autolathe costs, makes 7.62 mags printable

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

guns

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

projectile

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +10:30

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

Fixes damage multiplier mixup, bumped var not being reset

2015-03-14 02:56:05 -04:00

projectile.dm

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

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

targeting.dm

Adds targeting hotkey

2015-02-11 22:54:40 -05:00