From 3103119f6b8fe7a9d0633276037a01ba3b5ba712 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Wed, 16 May 2018 09:04:51 -0500
Subject: [PATCH] Update soulstone.dm

---
 code/modules/antagonists/wizard/equipment/soulstone.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index 66e9123c4e..11882f65d1 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -33,10 +33,6 @@
 	..()
 	if(!iscultist(user) && !iswizard(user) && !usability)
 		to_chat(user, "<span class='danger'>An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.</span>")
-<<<<<<< HEAD
-		user.Dizzy(120)
-=======
->>>>>>> 9f94b67... as kor suggested
 
 /obj/item/soulstone/examine(mob/user)
 	..()