Accidently reverted someone else's changes with my last commit. This commit has both sets of changes included.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2660 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/gamemodes/changeling/changeling_powers.dm

@@ -202,9 +202,15 @@
 
 	usr.visible_message(text("\red <B>[usr] transforms!</B>"))
 
+<<<<<<< .mine
+	usr.changeling.geneticdamage = 30
+  	usr << "Our genes cry out!"
+
+=======
 	usr.changeling.geneticdamage = 30
 	usr << "Our genes cry out!"
 
+>>>>>>> .r2659
 	var/list/implants = list() //Try to preserve implants.
 	for(var/obj/item/weapon/W in usr)
 		if (istype(W, /obj/item/weapon/implant))