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

..

energy

Summon Magic / Charge / Wands&Staffs / One time spellbooks / New Apprentice

2013-12-04 21:00:36 -05:00

magic

Aranclanos Fix Omnibus

2013-12-14 19:40:58 -05:00

projectile

* 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

energy.dm

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

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

magic.dm

Aranclanos Fix Omnibus

2013-12-14 19:40:58 -05:00

projectile.dm

* 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