GunHog 0bab26452b Merge remote-tracking branch 'remotes/upstream/master' into The_Mech_Every_CMO_Will_Want ...

Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm

2016-02-08 08:50:44 -06: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 pull request #15243 from KorPhaeron/laser_rifle_tweaks

2016-02-07 21:18:45 -03: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

Merge remote-tracking branch 'remotes/upstream/master' into The_Mech_Every_CMO_Will_Want

2016-02-08 08:50:44 -06: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