July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -22,7 +22,7 @@
 	var/datum/outfit/outfit
 	// How long until we respawn them after their death.
 	var/respawn_time = 50
-	var/respawn_sound = 'sound/magic/Staff_animation.ogg'
+	var/respawn_sound = 'sound/magic/staff_animation.ogg'

 /obj/structure/life_candle/attack_hand(mob/user)
 	if(!user.mind)