Ravensdale 68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron ...

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-16 21:44:26 -07:00

..

ammunition

Adds 9 new Chameleon items.

2014-03-23 14:08:23 -07:00

guns

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

projectile

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 21:44:26 -07:00

ammunition.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

gun.dm

Merge branch 'master' into dev-freeze

2013-11-30 05:16:49 +04:00

projectile.dm

Fix to fix a fix that needs fixing.

2013-11-20 16:00:07 -08:00

targeting.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-02-26 09:34:38 -06:00