conflict res

This commit is contained in:
LetterJay
2017-05-01 15:26:17 -05:00
parent 0cf401934b
commit 161891e51b
+3 -3
View File
@@ -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)