From 840bbae1ba849edc39b1ccc73d0f87ca2fd18251 Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Sun, 11 Dec 2011 08:50:09 +0000 Subject: [PATCH] I blame Kor for not submitting this earlier. Dammit, okay. This one works now. Stupid TortiseSVN, why would it do that. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2661 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/changeling/changeling_powers.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 197e65e85b2..7cecab471be 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -202,15 +202,9 @@ usr.visible_message(text("\red [usr] transforms!")) -<<<<<<< .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))