phil235 6ee5ab6680 Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff ...

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/admin/verbs/one_click_antag.dm

2015-09-19 22:34:30 +02:00

..

beams.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

bullets.dm

NewChanges

2015-09-16 17:53:04 +08:00

energy.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

magic.dm

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

reusable.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

special.dm

Plasma cutter's fire rate is now a bit slower but its projectile can pierce multiple asteroid walls(2 for normal cutter, 3 for advanced). Its range is no longer reduced in pressurized environment (so the projectile is no longer invisible).

2015-08-05 21:58:19 +02:00