phil235 99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor ...

Conflicts:
	code/modules/reagents/chemistry/holder.dm

2016-02-06 20:38:16 +01:00

..

energy

outlining on rifle is more defined, made a red and blue variant along with a generic variant.

2016-02-02 18:19:22 -05:00

magic

Merge pull request #12304 from Incoming5643/utility_aint_gonna_cut_it

2015-10-25 05:23:03 -05:00

projectile

Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor

2016-02-06 20:38:16 +01:00

energy.dm

Dual Wield

2015-12-20 00:22:35 -06:00

grenade_launcher.dm

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

magic.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

medbeam.dm

Fixes medbeam pass flags

2016-01-24 12:56:02 +01:00

mounted.dm

fixes the force values and removes ".0"s

2015-12-29 12:07:50 -08:00

projectile.dm

Update projectile.dm

2015-12-19 22:56:10 +00:00

syringe_gun.dm

Dual Wield

2015-12-20 00:22:35 -06:00