diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index b6fb4f54eef..fbe59a4f176 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -265,7 +265,7 @@ for(var/mob/living/L in oview(2, user)) if(L.stat == DEAD) continue - playsound(L, 'sound/magic/fleshtostone.ogg', 20, 1) + playsound(L, 'sound/magic/fireball.ogg', 20, 1) new /obj/effect/temp_visual/fire(L.loc) addtimer(CALLBACK(src, .proc/pushback, L, user), 1) //no free backstabs, we push AFTER module stuff is done L.adjustBruteLoss(bonus_value) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 52e5b32c12e..1dad6d7ee19 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -753,7 +753,7 @@ message_admins("[key_name_admin(user)] fired the lava staff at [get_area(target)]. [ADMIN_COORDJMP(T)]") log_game("[key_name(user)] fired the lava staff at [get_area(target)] [COORD(T)].") timer = world.time + create_cooldown - playsound(T,'sound/magic/fleshtostone.ogg', 200, 1) + playsound(T,'sound/magic/fireball.ogg', 200, 1) else timer = world.time qdel(L) @@ -762,7 +762,7 @@ if(T.TerraformTurf(reset_turf_type)) user.visible_message("[user] turns \the [old_name] into [reset_string]!") timer = world.time + reset_cooldown - playsound(T,'sound/magic/fleshtostone.ogg', 200, 1) + playsound(T,'sound/magic/fireball.ogg', 200, 1) /obj/effect/temp_visual/lavastaff icon_state = "lavastaff_warn" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index 5e2e99bcf23..8221d905d90 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -128,7 +128,7 @@ Difficulty: Medium new /obj/effect/temp_visual/target(turf) /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_walls() - playsound(get_turf(src),'sound/magic/fleshtostone.ogg', 200, 1) + playsound(get_turf(src),'sound/magic/fireball.ogg', 200, 1) for(var/d in GLOB.cardinal) INVOKE_ASYNC(src, .proc/fire_wall, d) diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index f593f9e0f47..41b1d9ecf55 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -70,7 +70,7 @@ /obj/item/weapon/gun/magic/staff/spellblade name = "spellblade" desc = "A deadly combination of laziness and boodlust, this blade allows the user to dismember their enemies without all the hard work of actually swinging the sword." - fire_sound = 'sound/magic/fleshtostone.ogg' + fire_sound = 'sound/magic/fireball.ogg' ammo_type = /obj/item/ammo_casing/magic/spellblade icon_state = "spellblade" item_state = "spellblade" diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index f6c0a63e2f0..047ac752e54 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -159,7 +159,7 @@ /obj/item/weapon/gun/magic/wand/fireball name = "wand of fireball" desc = "This wand shoots scorching balls of fire that explode into destructive flames." - fire_sound = 'sound/magic/fleshtostone.ogg' + fire_sound = 'sound/magic/fireball.ogg' ammo_type = /obj/item/ammo_casing/magic/fireball icon_state = "firewand" max_charges = 8 //8, 4, 4, 3 diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm index 350b18d734b..94597de40f6 100644 --- a/code/modules/spells/spell_types/aimed.dm +++ b/code/modules/spells/spell_types/aimed.dm @@ -105,7 +105,7 @@ projectile_type = /obj/item/projectile/magic/aoe/fireball base_icon_state = "fireball" action_icon_state = "fireball0" - sound = 'sound/magic/fleshtostone.ogg' + sound = 'sound/magic/fireball.ogg' active_msg = "You prepare to cast your fireball spell!" deactive_msg = "You extinguish your fireball... for now." active = FALSE diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 4719cf68f02..f1543d16918 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -58,7 +58,7 @@ name = "\improper petrifying touch" desc = "That's the bottom line, because flesh to stone said so!" catchphrase = "STAUN EI!!" - on_use_sound = 'sound/magic/FleshToStone.ogg' + on_use_sound = 'sound/magic/fleshtostone.ogg' icon_state = "fleshtostone" item_state = "fleshtostone" diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index 1baf51826d3..caedacb59e8 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -58,4 +58,4 @@ cooldown_min = 200 //100 deciseconds reduction per rank action_icon_state = "statue" - sound = 'sound/magic/FleshToStone.ogg' \ No newline at end of file + sound = 'sound/magic/fleshtostone.ogg' \ No newline at end of file diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm index 0fd16382c92..03be2d4d0ba 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -323,7 +323,7 @@ include_user = 1 selection_type = "view" action_icon_state = "sacredflame" - sound = 'sound/magic/fleshtostone.ogg' + sound = 'sound/magic/fireball.ogg' /obj/effect/proc_holder/spell/targeted/sacred_flame/cast(list/targets, mob/user = usr) for(var/mob/living/L in targets)