Update soulstone.dm

2018-05-16 09:04:51 -05:00
parent fe93e1ccbd
commit 3103119f6b
1 changed files with 0 additions and 4 deletions
@@ -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)
 	..()