Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

animate.dm

Fixes #3777

2013-10-16 11:21:51 +01:00

beams.dm

replaced electrodes with insta hit taser beams.

2014-04-05 17:13:09 -07:00

bullets.dm

Fixed chameleon bullets being able to embed.

2014-04-13 19:21:49 -07:00

change.dm

Prevented staff of change from working on infested mobs.

2013-12-18 13:49:35 +10:30

energy.dm

Churp

2014-04-11 12:21:28 -05:00

force.dm

Fix for embedding.

2014-02-22 10:16:55 +03:00

special.dm

Vast array of changes to replace mutantrace with species datum

2013-08-03 15:08:54 -07:00