Giacomand 44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff ...

Resolved Conflicts:
	code/modules/projectiles/projectile.dm

2013-12-18 18:27:22 +00:00

..

ammunition

* Added the THICKMATERIAL flag. It is used for thick coverall suits (space suits, firesuits, etc) and it will stop injections from syringes, hypos and parapens. It is also used for head items such as biohoods and space helmets. If you aim for the head, it will check if you can inject through the head equipped item, if you aim anywhere else it will check the external suit.

2013-12-13 00:00:20 +00:00

guns

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

2013-12-18 18:27:22 +00:00

projectile

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

2013-12-18 18:27:22 +00:00

ammunition.dm

Modification of .gitignore to include admins.txt. Hopefully.`

2013-10-30 17:56:00 -07:00

gun.dm

Modification of .gitignore to include admins.txt. Hopefully.`

2013-10-30 17:56:00 -07:00

projectile.dm

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

2013-12-18 18:27:22 +00:00