diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 2eddf0724ae..f8a535325d9 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -224,8 +224,8 @@ GLOBAL_LIST_INIT(backpacklist, list( GLOBAL_LIST_EMPTY(female_clothing_icons) GLOBAL_LIST_INIT(scarySounds, list( - 'sound/effects/clownstep1.ogg', - 'sound/effects/clownstep2.ogg', + 'sound/effects/footstep/clownstep1.ogg', + 'sound/effects/footstep/clownstep2.ogg', 'sound/effects/glassbr1.ogg', 'sound/effects/glassbr2.ogg', 'sound/effects/glassbr3.ogg', diff --git a/code/controllers/subsystem/ambience.dm b/code/controllers/subsystem/ambience.dm index 1381c4c5f5c..e138c2d6048 100644 --- a/code/controllers/subsystem/ambience.dm +++ b/code/controllers/subsystem/ambience.dm @@ -69,8 +69,8 @@ SUBSYSTEM_DEF(ambience) var/static/list/minecraft_cave_noises = list( 'sound/machines/airlock.ogg', 'sound/effects/snap.ogg', - 'sound/effects/clownstep1.ogg', - 'sound/effects/clownstep2.ogg', + 'sound/effects/footstep/clownstep1.ogg', + 'sound/effects/footstep/clownstep2.ogg', 'sound/items/welder.ogg', 'sound/items/welder2.ogg', 'sound/items/crowbar.ogg', diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 588e3ac5287..8491dc53c16 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -134,7 +134,7 @@ /obj/effect/decal/cleanable/blood/gibs/on_entered(datum/source, atom/movable/L) if(isliving(L) && has_gravity(loc)) - playsound(loc, 'sound/effects/gib_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 20 : 50, TRUE) + playsound(loc, 'sound/effects/footstep/gib_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 20 : 50, TRUE) . = ..() /obj/effect/decal/cleanable/blood/gibs/proc/on_pipe_eject(atom/source, direction) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 08de1f30d49..537cad9c5b7 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -384,7 +384,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( if(isliving(AM)) var/mob/living/L = AM if(!(L.movement_type & (FLYING|FLOATING)) || L.buckled) - playsound(src, 'sound/effects/glass_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE) + playsound(src, 'sound/effects/footstep/glass_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE) /obj/item/shard/plasma name = "purple shard" diff --git a/code/game/sound.dm b/code/game/sound.dm index f554a6a49ca..c1dec90898a 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -201,7 +201,7 @@ if (SFX_PUNCH) soundin = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') if (SFX_CLOWN_STEP) - soundin = pick('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg') + soundin = pick('sound/effects/footstep/clownstep1.ogg','sound/effects/footstep/clownstep2.ogg') if (SFX_SUIT_STEP) soundin = pick('sound/effects/suitstep1.ogg','sound/effects/suitstep2.ogg') if (SFX_SWING_HIT) diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index e235fe6f500..00fa4546768 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -95,7 +95,7 @@ barefootstep = null clawfootstep = null heavyfootstep = null - var/sound = 'sound/effects/clownstep1.ogg' + var/sound = 'sound/effects/footstep/clownstep1.ogg' /turf/open/indestructible/honk/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index d6b30dcaadd..adfb9fe96bc 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -291,7 +291,7 @@ if(isliving(movable)) var/mob/living/crusher = movable if(crusher.m_intent != MOVE_INTENT_WALK && (!(crusher.movement_type & (FLYING|FLOATING)) || crusher.buckled)) - playsound(src, 'sound/effects/glass_step.ogg', 30, TRUE) + playsound(src, 'sound/effects/footstep/glass_step.ogg', 30, TRUE) visible_message(span_warning("[crusher] steps on [src], damaging it!")) take_damage(100, sound_effect = FALSE) diff --git a/code/modules/clothing/shoes/clown.dm b/code/modules/clothing/shoes/clown.dm index 8867915fb4e..d28b8441320 100644 --- a/code/modules/clothing/shoes/clown.dm +++ b/code/modules/clothing/shoes/clown.dm @@ -6,7 +6,7 @@ slowdown = SHOES_SLOWDOWN+1 var/enabled_waddle = TRUE ///List of possible sounds for the squeak component to use, allows for different clown shoe subtypes to have different sounds. - var/list/squeak_sound = list('sound/effects/clownstep1.ogg'=1,'sound/effects/clownstep2.ogg'=1) + var/list/squeak_sound = list('sound/effects/footstep/clownstep1.ogg'=1,'sound/effects/footstep/clownstep2.ogg'=1) lace_time = 20 SECONDS // how the hell do these laces even work?? species_exception = list(/datum/species/golem/bananium) @@ -53,7 +53,7 @@ name = "meown shoes" desc = "The adorable sound they make when you walk will mean making friends is more likely." icon_state = "meown_shoes" - squeak_sound = list('sound/effects/meowstep1.ogg'=1) //mew mew mew mew + squeak_sound = list('sound/effects/footstep/meowstep1.ogg'=1) //mew mew mew mew /obj/item/clothing/shoes/clown_shoes/ducky_shoes name = "ducky shoes" diff --git a/code/modules/mapfluff/ruins/spaceruin_code/meateor.dm b/code/modules/mapfluff/ruins/spaceruin_code/meateor.dm index 3a3ec7569d8..8af5d4e5a9d 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/meateor.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/meateor.dm @@ -127,5 +127,5 @@ /obj/structure/meateor_fluff/abandoned_headcrab_egg/atom_destruction(damage_flag) new /obj/effect/decal/cleanable/xenoblood(loc) - playsound(loc, 'sound/effects/gib_step.ogg', vol = 50, vary = TRUE, pressure_affected = FALSE) + playsound(loc, 'sound/effects/footstep/gib_step.ogg', vol = 50, vary = TRUE, pressure_affected = FALSE) return ..() diff --git a/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm b/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm index 3df23393a60..57d90da264a 100644 --- a/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm +++ b/code/modules/mob/living/basic/space_fauna/netherworld/migo.dm @@ -34,7 +34,7 @@ /mob/living/basic/migo/Initialize(mapload) . = ..() - migo_sounds = list('sound/items/bubblewrap.ogg', 'sound/items/change_jaws.ogg', 'sound/items/crowbar.ogg', 'sound/items/drink.ogg', 'sound/items/deconstruct.ogg', 'sound/items/carhorn.ogg', 'sound/items/change_drill.ogg', 'sound/items/dodgeball.ogg', 'sound/items/eatfood.ogg', 'sound/items/megaphone.ogg', 'sound/items/screwdriver.ogg', 'sound/items/weeoo1.ogg', 'sound/items/wirecutter.ogg', 'sound/items/welder.ogg', 'sound/items/zip.ogg', 'sound/items/rped.ogg', 'sound/items/ratchet.ogg', 'sound/items/polaroid1.ogg', 'sound/items/pshoom.ogg', 'sound/items/airhorn.ogg', 'sound/items/geiger/high1.ogg', 'sound/items/geiger/high2.ogg', 'sound/voice/beepsky/creep.ogg', 'sound/voice/beepsky/iamthelaw.ogg', 'sound/voice/ed209_20sec.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss6.ogg', 'sound/voice/medbot/patchedup.ogg', 'sound/voice/medbot/feelbetter.ogg', 'sound/voice/human/manlaugh1.ogg', 'sound/voice/human/womanlaugh.ogg', 'sound/weapons/sear.ogg', 'sound/ambience/antag/clockcultalr.ogg', 'sound/ambience/antag/ling_alert.ogg', 'sound/ambience/antag/tatoralert.ogg', 'sound/ambience/antag/monkey.ogg', 'sound/mecha/nominal.ogg', 'sound/mecha/weapdestr.ogg', 'sound/mecha/critdestr.ogg', 'sound/mecha/imag_enh.ogg', 'sound/effects/adminhelp.ogg', 'sound/effects/alert.ogg', 'sound/effects/attackblob.ogg', 'sound/effects/bamf.ogg', 'sound/effects/blobattack.ogg', 'sound/effects/break_stone.ogg', 'sound/effects/bubbles.ogg', 'sound/effects/bubbles2.ogg', 'sound/effects/clang.ogg', 'sound/effects/clockcult_gateway_disrupted.ogg', 'sound/effects/clownstep2.ogg', 'sound/effects/curse1.ogg', 'sound/effects/dimensional_rend.ogg', 'sound/effects/doorcreaky.ogg', 'sound/effects/empulse.ogg', 'sound/effects/explosion_distant.ogg', 'sound/effects/explosionfar.ogg', 'sound/effects/explosion1.ogg', 'sound/effects/grillehit.ogg', 'sound/effects/genetics.ogg', 'sound/effects/heart_beat.ogg', 'sound/runtime/hyperspace/hyperspace_begin.ogg', 'sound/runtime/hyperspace/hyperspace_end.ogg', 'sound/effects/his_grace_awaken.ogg', 'sound/effects/pai_boot.ogg', 'sound/effects/phasein.ogg', 'sound/effects/picaxe1.ogg', 'sound/effects/ratvar_reveal.ogg', 'sound/effects/sparks1.ogg', 'sound/effects/smoke.ogg', 'sound/effects/splat.ogg', 'sound/effects/snap.ogg', 'sound/effects/tendril_destroyed.ogg', 'sound/effects/supermatter.ogg', 'sound/misc/desecration-01.ogg', 'sound/misc/desecration-02.ogg', 'sound/misc/desecration-03.ogg', 'sound/misc/bloblarm.ogg', 'sound/misc/airraid.ogg', 'sound/misc/bang.ogg','sound/misc/highlander.ogg', 'sound/misc/interference.ogg', 'sound/misc/notice1.ogg', 'sound/misc/notice2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/misc/slip.ogg', 'sound/misc/splort.ogg', 'sound/weapons/armbomb.ogg', 'sound/weapons/beam_sniper.ogg', 'sound/weapons/chainsawhit.ogg', 'sound/weapons/emitter.ogg', 'sound/weapons/emitter2.ogg', 'sound/weapons/blade1.ogg', 'sound/weapons/bladeslice.ogg', 'sound/weapons/blastcannon.ogg', 'sound/weapons/blaster.ogg', 'sound/weapons/bulletflyby3.ogg', 'sound/weapons/circsawhit.ogg', 'sound/weapons/cqchit2.ogg', 'sound/weapons/drill.ogg', 'sound/weapons/genhit1.ogg', 'sound/weapons/gun/pistol/shot_suppressed.ogg', 'sound/weapons/gun/pistol/shot.ogg', 'sound/weapons/handcuffs.ogg', 'sound/weapons/homerun.ogg', 'sound/weapons/kenetic_accel.ogg', 'sound/machines/clockcult/steam_whoosh.ogg', 'sound/machines/fryer/deep_fryer_emerge.ogg', 'sound/machines/airlock.ogg', 'sound/machines/airlock_alien_prying.ogg', 'sound/machines/airlockclose.ogg', 'sound/machines/airlockforced.ogg', 'sound/machines/airlockopen.ogg', 'sound/machines/alarm.ogg', 'sound/machines/blender.ogg', 'sound/machines/boltsdown.ogg', 'sound/machines/boltsup.ogg', 'sound/machines/buzz-sigh.ogg', 'sound/machines/buzz-two.ogg', 'sound/machines/chime.ogg', 'sound/machines/cryo_warning.ogg', 'sound/machines/defib_charge.ogg', 'sound/machines/defib_failed.ogg', 'sound/machines/defib_ready.ogg', 'sound/machines/defib_zap.ogg', 'sound/machines/deniedbeep.ogg', 'sound/machines/ding.ogg', 'sound/machines/disposalflush.ogg', 'sound/machines/door_close.ogg', 'sound/machines/door_open.ogg', 'sound/machines/engine_alert1.ogg', 'sound/machines/engine_alert2.ogg', 'sound/machines/hiss.ogg', 'sound/machines/honkbot_evil_laugh.ogg', 'sound/machines/juicer.ogg', 'sound/machines/ping.ogg', 'sound/ambience/signal.ogg', 'sound/machines/synth_no.ogg', 'sound/machines/synth_yes.ogg', 'sound/machines/terminal_alert.ogg', 'sound/machines/triple_beep.ogg', 'sound/machines/twobeep.ogg', 'sound/machines/ventcrawl.ogg', 'sound/machines/warning-buzzer.ogg', 'sound/ai/default/outbreak5.ogg', 'sound/ai/default/outbreak7.ogg', 'sound/ai/default/poweroff.ogg', 'sound/ai/default/radiation.ogg', 'sound/ai/default/shuttlecalled.ogg', 'sound/ai/default/shuttledock.ogg', 'sound/ai/default/shuttlerecalled.ogg', 'sound/ai/default/aimalf.ogg') //hahahaha fuck you code divers + migo_sounds = list('sound/items/bubblewrap.ogg', 'sound/items/change_jaws.ogg', 'sound/items/crowbar.ogg', 'sound/items/drink.ogg', 'sound/items/deconstruct.ogg', 'sound/items/carhorn.ogg', 'sound/items/change_drill.ogg', 'sound/items/dodgeball.ogg', 'sound/items/eatfood.ogg', 'sound/items/megaphone.ogg', 'sound/items/screwdriver.ogg', 'sound/items/weeoo1.ogg', 'sound/items/wirecutter.ogg', 'sound/items/welder.ogg', 'sound/items/zip.ogg', 'sound/items/rped.ogg', 'sound/items/ratchet.ogg', 'sound/items/polaroid1.ogg', 'sound/items/pshoom.ogg', 'sound/items/airhorn.ogg', 'sound/items/geiger/high1.ogg', 'sound/items/geiger/high2.ogg', 'sound/voice/beepsky/creep.ogg', 'sound/voice/beepsky/iamthelaw.ogg', 'sound/voice/ed209_20sec.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss6.ogg', 'sound/voice/medbot/patchedup.ogg', 'sound/voice/medbot/feelbetter.ogg', 'sound/voice/human/manlaugh1.ogg', 'sound/voice/human/womanlaugh.ogg', 'sound/weapons/sear.ogg', 'sound/ambience/antag/clockcultalr.ogg', 'sound/ambience/antag/ling_alert.ogg', 'sound/ambience/antag/tatoralert.ogg', 'sound/ambience/antag/monkey.ogg', 'sound/mecha/nominal.ogg', 'sound/mecha/weapdestr.ogg', 'sound/mecha/critdestr.ogg', 'sound/mecha/imag_enh.ogg', 'sound/effects/adminhelp.ogg', 'sound/effects/alert.ogg', 'sound/effects/attackblob.ogg', 'sound/effects/bamf.ogg', 'sound/effects/blobattack.ogg', 'sound/effects/break_stone.ogg', 'sound/effects/bubbles.ogg', 'sound/effects/bubbles2.ogg', 'sound/effects/clang.ogg', 'sound/effects/clockcult_gateway_disrupted.ogg', 'sound/effects/footstep/clownstep2.ogg', 'sound/effects/curse1.ogg', 'sound/effects/dimensional_rend.ogg', 'sound/effects/doorcreaky.ogg', 'sound/effects/empulse.ogg', 'sound/effects/explosion_distant.ogg', 'sound/effects/explosionfar.ogg', 'sound/effects/explosion1.ogg', 'sound/effects/grillehit.ogg', 'sound/effects/genetics.ogg', 'sound/effects/heart_beat.ogg', 'sound/runtime/hyperspace/hyperspace_begin.ogg', 'sound/runtime/hyperspace/hyperspace_end.ogg', 'sound/effects/his_grace_awaken.ogg', 'sound/effects/pai_boot.ogg', 'sound/effects/phasein.ogg', 'sound/effects/picaxe1.ogg', 'sound/effects/sparks1.ogg', 'sound/effects/smoke.ogg', 'sound/effects/splat.ogg', 'sound/effects/snap.ogg', 'sound/effects/tendril_destroyed.ogg', 'sound/effects/supermatter.ogg', 'sound/misc/desecration-01.ogg', 'sound/misc/desecration-02.ogg', 'sound/misc/desecration-03.ogg', 'sound/misc/bloblarm.ogg', 'sound/misc/airraid.ogg', 'sound/misc/bang.ogg','sound/misc/highlander.ogg', 'sound/misc/interference.ogg', 'sound/misc/notice1.ogg', 'sound/misc/notice2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/misc/slip.ogg', 'sound/misc/splort.ogg', 'sound/weapons/armbomb.ogg', 'sound/weapons/beam_sniper.ogg', 'sound/weapons/chainsawhit.ogg', 'sound/weapons/emitter.ogg', 'sound/weapons/emitter2.ogg', 'sound/weapons/blade1.ogg', 'sound/weapons/bladeslice.ogg', 'sound/weapons/blastcannon.ogg', 'sound/weapons/blaster.ogg', 'sound/weapons/bulletflyby3.ogg', 'sound/weapons/circsawhit.ogg', 'sound/weapons/cqchit2.ogg', 'sound/weapons/drill.ogg', 'sound/weapons/genhit1.ogg', 'sound/weapons/gun/pistol/shot_suppressed.ogg', 'sound/weapons/gun/pistol/shot.ogg', 'sound/weapons/handcuffs.ogg', 'sound/weapons/homerun.ogg', 'sound/weapons/kenetic_accel.ogg', 'sound/machines/clockcult/steam_whoosh.ogg', 'sound/machines/fryer/deep_fryer_emerge.ogg', 'sound/machines/airlock.ogg', 'sound/machines/airlock_alien_prying.ogg', 'sound/machines/airlockclose.ogg', 'sound/machines/airlockforced.ogg', 'sound/machines/airlockopen.ogg', 'sound/machines/alarm.ogg', 'sound/machines/blender.ogg', 'sound/machines/boltsdown.ogg', 'sound/machines/boltsup.ogg', 'sound/machines/buzz-sigh.ogg', 'sound/machines/buzz-two.ogg', 'sound/machines/chime.ogg', 'sound/machines/cryo_warning.ogg', 'sound/machines/defib_charge.ogg', 'sound/machines/defib_failed.ogg', 'sound/machines/defib_ready.ogg', 'sound/machines/defib_zap.ogg', 'sound/machines/deniedbeep.ogg', 'sound/machines/ding.ogg', 'sound/machines/disposalflush.ogg', 'sound/machines/door_close.ogg', 'sound/machines/door_open.ogg', 'sound/machines/engine_alert1.ogg', 'sound/machines/engine_alert2.ogg', 'sound/machines/hiss.ogg', 'sound/machines/honkbot_evil_laugh.ogg', 'sound/machines/juicer.ogg', 'sound/machines/ping.ogg', 'sound/ambience/signal.ogg', 'sound/machines/synth_no.ogg', 'sound/machines/synth_yes.ogg', 'sound/machines/terminal_alert.ogg', 'sound/machines/triple_beep.ogg', 'sound/machines/twobeep.ogg', 'sound/machines/ventcrawl.ogg', 'sound/machines/warning-buzzer.ogg', 'sound/ai/default/outbreak5.ogg', 'sound/ai/default/outbreak7.ogg', 'sound/ai/default/poweroff.ogg', 'sound/ai/default/radiation.ogg', 'sound/ai/default/shuttlecalled.ogg', 'sound/ai/default/shuttledock.ogg', 'sound/ai/default/shuttlerecalled.ogg', 'sound/ai/default/aimalf.ogg') //hahahaha fuck you code divers AddElement(/datum/element/swabable, CELL_LINE_TABLE_NETHER, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 0) AddComponent(/datum/component/health_scaling_effects, min_health_slowdown = -1.5, additional_status_callback = CALLBACK(src, PROC_REF(update_dodge_chance))) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 72bda27ea6e..b4262830179 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -489,7 +489,7 @@ if(!lamp_functional) return lamp_functional = FALSE - playsound(src, 'sound/effects/glass_step.ogg', 50) + playsound(src, 'sound/effects/footstep/glass_step.ogg', 50) toggle_headlamp(TRUE) to_chat(src, span_danger("Your headlamp is broken! You'll need a human to help replace it.")) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 6285cb4031a..47c5e5dd5bc 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -130,7 +130,7 @@ var/peels_to_spawn = min(peel_amount, reachable_turfs.len) for(var/i in 1 to peels_to_spawn) new banana_type(pick_n_take(reachable_turfs)) - playsound(owner, 'sound/creatures/clown/clownana_rustle.ogg', 100) + playsound(owner, 'sound/creatures/clown/clownana_rustle.ogg', 60) animate(owner, time = 1, pixel_x = 6, easing = CUBIC_EASING | EASE_OUT) animate(time = 2, pixel_x = -8, easing = CUBIC_EASING) animate(time = 1, pixel_x = 0, easing = CUBIC_EASING | EASE_IN) diff --git a/code/modules/mod/modules/modules_service.dm b/code/modules/mod/modules/modules_service.dm index e4ddb5d611e..061c8131322 100644 --- a/code/modules/mod/modules/modules_service.dm +++ b/code/modules/mod/modules/modules_service.dm @@ -69,7 +69,7 @@ incompatible_modules = list(/obj/item/mod/module/waddle) /obj/item/mod/module/waddle/on_suit_activation() - mod.boots.AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg'=1,'sound/effects/clownstep2.ogg'=1), 50, falloff_exponent = 20) //die off quick please + mod.boots.AddComponent(/datum/component/squeak, list('sound/effects/footstep/clownstep1.ogg'=1,'sound/effects/footstep/clownstep2.ogg'=1), 50, falloff_exponent = 20) //die off quick please mod.wearer.AddElement(/datum/element/waddling) if(is_clown_job(mod.wearer.mind?.assigned_role)) mod.wearer.add_mood_event("clownshoes", /datum/mood_event/clownshoes) diff --git a/code/modules/power/lighting/light_items.dm b/code/modules/power/lighting/light_items.dm index e040ff0a484..cf96dbe52c8 100644 --- a/code/modules/power/lighting/light_items.dm +++ b/code/modules/power/lighting/light_items.dm @@ -49,7 +49,7 @@ /obj/item/light/tube/broken status = LIGHT_BROKEN - sharpness = SHARP_POINTY + sharpness = SHARP_POINTY /obj/item/light/bulb name = "light bulb" @@ -64,7 +64,7 @@ /obj/item/light/bulb/broken status = LIGHT_BROKEN - sharpness = SHARP_POINTY + sharpness = SHARP_POINTY /obj/item/light/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) if(!..()) //not caught by a mob @@ -108,7 +108,7 @@ return var/mob/living/moving_mob = moving_atom if(!(moving_mob.movement_type & (FLYING|FLOATING)) || moving_mob.buckled) - playsound(src, 'sound/effects/glass_step.ogg', HAS_TRAIT(moving_mob, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE) + playsound(src, 'sound/effects/footstep/glass_step.ogg', HAS_TRAIT(moving_mob, TRAIT_LIGHT_STEP) ? 30 : 50, TRUE) if(status == LIGHT_BURNED || status == LIGHT_OK) shatter(moving_mob) @@ -125,7 +125,7 @@ visible_message(span_danger("[src] shatters."),span_hear("You hear a small glass object shatter.")) status = LIGHT_BROKEN force = 5 - sharpness = SHARP_POINTY + sharpness = SHARP_POINTY playsound(loc, 'sound/effects/glasshit.ogg', 75, TRUE) if(length(reagents.reagent_list)) visible_message(span_danger("The contents of [src] splash onto you as you step on it!"),span_hear("You feel the contents of [src] splash onto you as you step on it!.")) diff --git a/sound/ai/newai.ogg b/sound/ai/newai.ogg deleted file mode 100644 index 35aba34564f..00000000000 Binary files a/sound/ai/newai.ogg and /dev/null differ diff --git a/sound/chemistry/SoundSources.txt b/sound/chemistry/SoundSources.txt index 9148efb61e3..a4d3c97fd1c 100644 --- a/sound/chemistry/SoundSources.txt +++ b/sound/chemistry/SoundSources.txt @@ -1,7 +1,3 @@ -heatmelt.ogg - from https://freesound.org/people/toiletrolltube/sounds/181483/ - from https://freesound.org/people/MrVasLuk/sounds/304619/ - from https://freesound.org/people/Benboncan/sounds/74899/ - from bubbles2.ogg heatacid.ogg - from https://freesound.org/people/klankbeeld/sounds/233697/ from bubbles2.ogg from fuse.ogg diff --git a/sound/chemistry/acidmelt.ogg b/sound/chemistry/acidmelt.ogg deleted file mode 100644 index bef257be557..00000000000 Binary files a/sound/chemistry/acidmelt.ogg and /dev/null differ diff --git a/sound/chemistry/heatmelt.ogg b/sound/chemistry/heatmelt.ogg deleted file mode 100644 index 87dab3a18ff..00000000000 Binary files a/sound/chemistry/heatmelt.ogg and /dev/null differ diff --git a/sound/chemistry/shockwave_explosion.ogg b/sound/chemistry/shockwave_explosion.ogg index 2dcfaa6c3a6..1aee4142786 100644 Binary files a/sound/chemistry/shockwave_explosion.ogg and b/sound/chemistry/shockwave_explosion.ogg differ diff --git a/sound/creatures/clown/clownana_rustle.ogg b/sound/creatures/clown/clownana_rustle.ogg index 611d322a31e..a5e98686c4c 100644 Binary files a/sound/creatures/clown/clownana_rustle.ogg and b/sound/creatures/clown/clownana_rustle.ogg differ diff --git a/sound/creatures/legion_death.ogg b/sound/creatures/legion_death.ogg deleted file mode 100644 index fdcf9c8a659..00000000000 Binary files a/sound/creatures/legion_death.ogg and /dev/null differ diff --git a/sound/creatures/legion_death_far.ogg b/sound/creatures/legion_death_far.ogg deleted file mode 100644 index 3e3261687c3..00000000000 Binary files a/sound/creatures/legion_death_far.ogg and /dev/null differ diff --git a/sound/creatures/rattle.ogg b/sound/creatures/rattle.ogg deleted file mode 100644 index 7c0cf1104bb..00000000000 Binary files a/sound/creatures/rattle.ogg and /dev/null differ diff --git a/sound/effects/-adminhelp.ogg b/sound/effects/-adminhelp.ogg deleted file mode 100644 index 7386395858a..00000000000 Binary files a/sound/effects/-adminhelp.ogg and /dev/null differ diff --git a/sound/effects/clockcult_gateway_active.ogg b/sound/effects/clockcult_gateway_active.ogg deleted file mode 100644 index 86487e3bdd4..00000000000 Binary files a/sound/effects/clockcult_gateway_active.ogg and /dev/null differ diff --git a/sound/effects/clockcult_gateway_charging.ogg b/sound/effects/clockcult_gateway_charging.ogg deleted file mode 100644 index f8b8444d7ad..00000000000 Binary files a/sound/effects/clockcult_gateway_charging.ogg and /dev/null differ diff --git a/sound/effects/clockcult_gateway_closing.ogg b/sound/effects/clockcult_gateway_closing.ogg deleted file mode 100644 index 1c69f386834..00000000000 Binary files a/sound/effects/clockcult_gateway_closing.ogg and /dev/null differ diff --git a/sound/effects/confirmdropoff.ogg b/sound/effects/confirmdropoff.ogg deleted file mode 100644 index 835d9319921..00000000000 Binary files a/sound/effects/confirmdropoff.ogg and /dev/null differ diff --git a/sound/effects/clownstep1.ogg b/sound/effects/footstep/clownstep1.ogg similarity index 100% rename from sound/effects/clownstep1.ogg rename to sound/effects/footstep/clownstep1.ogg diff --git a/sound/effects/clownstep2.ogg b/sound/effects/footstep/clownstep2.ogg similarity index 100% rename from sound/effects/clownstep2.ogg rename to sound/effects/footstep/clownstep2.ogg diff --git a/sound/effects/gib_step.ogg b/sound/effects/footstep/gib_step.ogg similarity index 100% rename from sound/effects/gib_step.ogg rename to sound/effects/footstep/gib_step.ogg diff --git a/sound/effects/glass_step.ogg b/sound/effects/footstep/glass_step.ogg similarity index 100% rename from sound/effects/glass_step.ogg rename to sound/effects/footstep/glass_step.ogg diff --git a/sound/effects/meowstep1.ogg b/sound/effects/footstep/meowstep1.ogg similarity index 100% rename from sound/effects/meowstep1.ogg rename to sound/effects/footstep/meowstep1.ogg diff --git a/sound/effects/ratvar_reveal.ogg b/sound/effects/ratvar_reveal.ogg deleted file mode 100644 index e70cd9873c5..00000000000 Binary files a/sound/effects/ratvar_reveal.ogg and /dev/null differ diff --git a/sound/effects/ratvar_rises.ogg b/sound/effects/ratvar_rises.ogg deleted file mode 100644 index 4c22d250c38..00000000000 Binary files a/sound/effects/ratvar_rises.ogg and /dev/null differ diff --git a/sound/machines/clockcult/ark_recall.ogg b/sound/machines/clockcult/ark_recall.ogg deleted file mode 100644 index c02b19c2594..00000000000 Binary files a/sound/machines/clockcult/ark_recall.ogg and /dev/null differ diff --git a/sound/machines/clockcult/ark_scream.ogg b/sound/machines/clockcult/ark_scream.ogg deleted file mode 100644 index 3e2fde4fdac..00000000000 Binary files a/sound/machines/clockcult/ark_scream.ogg and /dev/null differ diff --git a/sound/machines/clockcult/eminence_command.ogg b/sound/machines/clockcult/eminence_command.ogg deleted file mode 100644 index a4133d2d5c5..00000000000 Binary files a/sound/machines/clockcult/eminence_command.ogg and /dev/null differ diff --git a/sound/machines/clockcult/eminence_selected.ogg b/sound/machines/clockcult/eminence_selected.ogg deleted file mode 100644 index f70ddd1dc37..00000000000 Binary files a/sound/machines/clockcult/eminence_selected.ogg and /dev/null differ diff --git a/sound/machines/clockcult/ocularwarden-dot1.ogg b/sound/machines/clockcult/ocularwarden-dot1.ogg deleted file mode 100644 index fc2836ff1f4..00000000000 Binary files a/sound/machines/clockcult/ocularwarden-dot1.ogg and /dev/null differ diff --git a/sound/machines/clockcult/ocularwarden-dot2.ogg b/sound/machines/clockcult/ocularwarden-dot2.ogg deleted file mode 100644 index 635116cb67c..00000000000 Binary files a/sound/machines/clockcult/ocularwarden-dot2.ogg and /dev/null differ diff --git a/sound/machines/clockcult/ocularwarden-target.ogg b/sound/machines/clockcult/ocularwarden-target.ogg deleted file mode 100644 index 557437a6721..00000000000 Binary files a/sound/machines/clockcult/ocularwarden-target.ogg and /dev/null differ diff --git a/sound/machines/clockcult/stargazer_activate.ogg b/sound/machines/clockcult/stargazer_activate.ogg deleted file mode 100644 index 38fe2e730e3..00000000000 Binary files a/sound/machines/clockcult/stargazer_activate.ogg and /dev/null differ diff --git a/sound/magic/clockwork/scripture_tier_up.ogg b/sound/magic/clockwork/scripture_tier_up.ogg deleted file mode 100644 index 7a8d51a4c08..00000000000 Binary files a/sound/magic/clockwork/scripture_tier_up.ogg and /dev/null differ