DZD 8de0140dcc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm

2015-04-21 18:56:34 -04:00

..

animate.dm

Beamcode fix

2013-10-20 19:59:29 -04:00

beams.dm

Practice and Lasertag Logs

2015-01-22 12:06:30 -05:00

bullets.dm

[Goonchem] Few Recipes Tweaks

2015-04-03 01:25:42 -04:00

change.dm

It compiles!

2015-04-12 19:54:45 -04:00

energy.dm

Teleporter Gun, Fixes, and Tweaks

2015-03-22 02:45:02 -04:00

force.dm

Projectile update

2013-11-01 14:00:50 -04:00

magic.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling

2015-04-21 18:56:34 -04:00

special.dm

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00