From a4af4ed9d72ae0c5d938f7aa62ebc0f20cc4116d Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Sun, 11 Dec 2011 08:44:43 +0000 Subject: [PATCH] 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 7cecab471be..197e65e85b2 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -202,9 +202,15 @@ 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))