phil235 57203430fd Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor ...

Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/inventory.dm
	code/modules/mob/living/carbon/life.dm
	icons/mob/actions.dmi

2016-02-23 19:49:38 +01:00

..

ammunition

Merge pull request #15647 from Boredone/master

2016-02-21 22:16:34 -03:00

guns

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

2016-02-23 19:49:38 +01:00

projectile

Merge pull request #15151 from CPTANT/laserfire

2016-02-20 19:19:22 -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

Refactored the item's action system. Items can now hold multiple actions.

2016-02-23 19:37:42 +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