From 161891e51b8b8fd6e2cadbc700f7645ad9509e49 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 1 May 2017 15:26:17 -0500
Subject: [PATCH] conflict res

---
 code/game/gamemodes/wizard/artefact.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index e409b087d8..137514d1e3 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -471,7 +471,7 @@
 		else if(istype(I,/obj/item/weapon/bikehorn))
 			to_chat(target, "<span class='userdanger'>HONK</span>")
 			target << 'sound/items/AirHorn.ogg'
-			target.adjustEarDamage(0,3)
+			target.adjustEarDamage(0,3)
 			GiveHint(target)
 		cooldown = world.time +cooldown_time
 		return
@@ -630,6 +630,6 @@
 	duration = 40
 	pixel_x = 500
 
-/obj/effect/overlay/temp/tornado/Initialize()
-	. = ..()
+/obj/effect/overlay/temp/tornado/Initialize()
+	. = ..()
 	animate(src, pixel_x = -500, time = 40)