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

..

ammunition

Merge pull request #15216 from KorPhaeron/fixes_bulldogs

2016-02-06 14:19:35 -03:00

guns

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

2016-02-08 08:50:44 -06:00

projectile

Merge pull request #15070 from MMMiracles/instagib

2016-02-06 08:36:06 -03:00

ammunition.dm

Trashbag can pick up ammo casings and reagent_containers/food/drinks again.

2015-10-08 01:26:55 +02:00

firing.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00

gun.dm

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

2016-02-04 14:34:45 +01:00

pins.dm

Fixes firing_pin not qdeling.

2016-01-17 16:06:36 +01:00

projectile.dm

removes a bunch of unneeded spawns

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