diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 88d75d7a0c6..441000852a2 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -334,7 +334,7 @@ visible_message(span_warning("[helper] tries to boop [src] on the nose, but [p_they()] move[p_s()] out of the way.")) return else - playsound(src, 'modular_skyrat/modules/emotes/sound/emotes/Nose_boop.ogg', 50, 0) + playsound(src, 'modular_zubbers/sound/emotes/nose_boop.ogg', 50, 0) if(HAS_TRAIT(src, TRAIT_SENSITIVESNOUT) && get_location_accessible(src, BODY_ZONE_PRECISE_MOUTH)) to_chat(src, span_warning("[helper] boops you on your sensitive nose, sending you to the ground!")) src.Knockdown(20) diff --git a/modular_skyrat/master_files/sound/effects/heart_beat_once.ogg b/modular_skyrat/master_files/sound/effects/heart_beat_once.ogg deleted file mode 100644 index d8f6f9343b9..00000000000 Binary files a/modular_skyrat/master_files/sound/effects/heart_beat_once.ogg and /dev/null differ diff --git a/modular_skyrat/master_files/sound/effects/suitstep1.ogg b/modular_skyrat/master_files/sound/effects/suitstep1.ogg deleted file mode 100644 index fc5287d703a..00000000000 Binary files a/modular_skyrat/master_files/sound/effects/suitstep1.ogg and /dev/null differ diff --git a/modular_skyrat/master_files/sound/effects/suitstep2.ogg b/modular_skyrat/master_files/sound/effects/suitstep2.ogg deleted file mode 100644 index b6700dd9917..00000000000 Binary files a/modular_skyrat/master_files/sound/effects/suitstep2.ogg and /dev/null differ diff --git a/modular_skyrat/modules/alerts/code/security_level_datums.dm b/modular_skyrat/modules/alerts/code/security_level_datums.dm index acb4e3f01ef..720cffe14e7 100644 --- a/modular_skyrat/modules/alerts/code/security_level_datums.dm +++ b/modular_skyrat/modules/alerts/code/security_level_datums.dm @@ -1,21 +1,7 @@ -/** - * Contains some overrides and our sec levels. - */ - -/datum/security_level/green - sound = 'modular_skyrat/modules/alerts/sound/security_levels/green.ogg' - -/datum/security_level/blue - sound = 'modular_skyrat/modules/alerts/sound/security_levels/blue.ogg' - -/datum/security_level/red - sound = 'modular_skyrat/modules/alerts/sound/security_levels/red.ogg' - /datum/security_level/delta announcement_color = "pink" lowering_to_configuration_key = /datum/config_entry/string/alert_delta_downto elevating_to_configuration_key = /datum/config_entry/string/alert_delta_upto - sound = 'modular_skyrat/modules/alerts/sound/security_levels/delta.ogg' looping_sound = 'modular_skyrat/modules/alerts/sound/misc/alarm_delta.ogg' looping_sound_interval = 8 SECONDS @@ -34,7 +20,6 @@ fire_alarm_light_color = COLOR_VIOLET lowering_to_configuration_key = /datum/config_entry/string/alert_violet_downto elevating_to_configuration_key = /datum/config_entry/string/alert_violet_upto - sound = 'modular_skyrat/modules/alerts/sound/security_levels/violet.ogg' shuttle_call_time_mod = 0.75 /** @@ -51,7 +36,6 @@ fire_alarm_light_color = LIGHT_COLOR_ORANGE lowering_to_configuration_key = /datum/config_entry/string/alert_orange_downto elevating_to_configuration_key = /datum/config_entry/string/alert_orange_upto - sound = 'modular_skyrat/modules/alerts/sound/security_levels/orange.ogg' shuttle_call_time_mod = 0.75 /** @@ -69,7 +53,6 @@ fire_alarm_light_color = LIGHT_COLOR_DIM_YELLOW lowering_to_configuration_key = /datum/config_entry/string/alert_amber_downto elevating_to_configuration_key = /datum/config_entry/string/alert_amber_upto - sound = 'modular_skyrat/modules/alerts/sound/security_levels/amber.ogg' shuttle_call_time_mod = 0.5 /** @@ -104,6 +87,3 @@ fire_alarm_light_color = COLOR_ASSEMBLY_PURPLE elevating_to_configuration_key = /datum/config_entry/string/alert_gamma shuttle_call_time_mod = 0.25 - sound = 'modular_skyrat/modules/alerts/sound/security_levels/gamma_alert.ogg' - looping_sound = 'modular_skyrat/modules/alerts/sound/security_levels/gamma_alert.ogg' - looping_sound_interval = 13 SECONDS diff --git a/modular_skyrat/modules/alerts/sound/misc/notice1.ogg b/modular_skyrat/modules/alerts/sound/misc/notice1.ogg deleted file mode 100644 index fef4e9af0f0..00000000000 Binary files a/modular_skyrat/modules/alerts/sound/misc/notice1.ogg and /dev/null differ diff --git a/modular_skyrat/modules/alerts/sound/misc/redalert1.ogg b/modular_skyrat/modules/alerts/sound/misc/redalert1.ogg deleted file mode 100644 index 49800f1f672..00000000000 Binary files a/modular_skyrat/modules/alerts/sound/misc/redalert1.ogg and /dev/null differ diff --git a/modular_skyrat/modules/alerts/sound/misc/voyalert.ogg b/modular_skyrat/modules/alerts/sound/misc/voyalert.ogg deleted file mode 100644 index c5a1b9ff310..00000000000 Binary files a/modular_skyrat/modules/alerts/sound/misc/voyalert.ogg and /dev/null differ diff --git a/modular_skyrat/modules/alerts/sound/misc/voybluealert.ogg b/modular_skyrat/modules/alerts/sound/misc/voybluealert.ogg deleted file mode 100644 index f450185e274..00000000000 Binary files a/modular_skyrat/modules/alerts/sound/misc/voybluealert.ogg and /dev/null differ diff --git a/modular_skyrat/modules/alerts/sound/security_levels/amber.ogg b/modular_skyrat/modules/alerts/sound/security_levels/amber.ogg deleted file mode 100644 index c5a1b9ff310..00000000000 Binary files a/modular_skyrat/modules/alerts/sound/security_levels/amber.ogg and /dev/null differ diff --git a/modular_skyrat/modules/alerts/sound/security_levels/blue.ogg b/modular_skyrat/modules/alerts/sound/security_levels/blue.ogg deleted file mode 100644 index fef4e9af0f0..00000000000 Binary files a/modular_skyrat/modules/alerts/sound/security_levels/blue.ogg and /dev/null differ diff --git a/modular_skyrat/modules/alerts/sound/security_levels/orange.ogg b/modular_skyrat/modules/alerts/sound/security_levels/orange.ogg deleted file mode 100644 index c5a1b9ff310..00000000000 Binary files a/modular_skyrat/modules/alerts/sound/security_levels/orange.ogg and /dev/null differ diff --git a/modular_skyrat/modules/alerts/sound/security_levels/red.ogg b/modular_skyrat/modules/alerts/sound/security_levels/red.ogg deleted file mode 100644 index 49800f1f672..00000000000 Binary files a/modular_skyrat/modules/alerts/sound/security_levels/red.ogg and /dev/null differ diff --git a/modular_skyrat/modules/alerts/sound/security_levels/violet.ogg b/modular_skyrat/modules/alerts/sound/security_levels/violet.ogg deleted file mode 100644 index f450185e274..00000000000 Binary files a/modular_skyrat/modules/alerts/sound/security_levels/violet.ogg and /dev/null differ diff --git a/modular_skyrat/modules/customization/game/objects/items/instruments.dm b/modular_skyrat/modules/customization/game/objects/items/instruments.dm index 8f9bafe3ef9..e0cecc8577c 100644 --- a/modular_skyrat/modules/customization/game/objects/items/instruments.dm +++ b/modular_skyrat/modules/customization/game/objects/items/instruments.dm @@ -10,4 +10,4 @@ attack_verb_simple = list("flutter", "flap", "squeak") w_class = WEIGHT_CLASS_TINY force = 0 - hitsound = 'modular_skyrat/modules/emotes/sound/emotes/mothsqueak.ogg' + hitsound = 'modular_zubbers/sound/emotes/mothsqueak.ogg' diff --git a/modular_skyrat/modules/customization/game/objects/items/plushes.dm b/modular_skyrat/modules/customization/game/objects/items/plushes.dm index c504893b0d5..5775a1bad46 100644 --- a/modular_skyrat/modules/customization/game/objects/items/plushes.dm +++ b/modular_skyrat/modules/customization/game/objects/items/plushes.dm @@ -29,7 +29,7 @@ icon_state = "plushie_fermis" attack_verb_continuous = list("cuddles", "petpatts", "wigglepurrs") attack_verb_simple = list("cuddle", "petpatt", "wigglepurr") - squeak_override = list('modular_skyrat/modules/customization/game/objects/items/sound/merowr.ogg' = 1) + squeak_override = list('modular_zubbers/sound/voice/merowr.ogg' = 1) gender = FEMALE /obj/item/toy/plush/skyrat/fermis/chen @@ -104,7 +104,7 @@ icon_state = "plushie_duffy" attack_verb_continuous = list("flutters", "flaps", "squeaks") attack_verb_simple = list("flutter", "flap", "squeak") - squeak_override = list('modular_skyrat/modules/emotes/sound/emotes/mothsqueak.ogg'= 1) + squeak_override = list('modular_zubbers/sound/emotes/mothsqueak.ogg' = 1) gender = MALE /obj/item/toy/plush/skyrat/leaplush @@ -192,7 +192,7 @@ icon_state = "blackcat" attack_verb_continuous = list("cuddles", "meows", "hisses") attack_verb_simple = list("cuddle", "meow", "hiss") - squeak_override = list('modular_skyrat/modules/customization/game/objects/items/sound/merowr.ogg' = 1) + squeak_override = list('modular_zubbers/sound/voice/merowr.ogg' = 1) /obj/item/toy/plush/skyrat/cat/tux name = "tux cat plushie" @@ -463,7 +463,7 @@ gender = FEMALE attack_verb_continuous = list("pats", "hugs", "scolds", "pets") attack_verb_simple = list("pat", "hug", "scold", "pet") - squeak_override = list('sound/mobs/non-humanoids/mouse/mousesqueek.ogg' = 1, 'modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg' = 1,) + squeak_override = list('sound/mobs/non-humanoids/mouse/mousesqueek.ogg' = 1, 'modular_zubbers/sound/emotes/mothsqueak.ogg' = 1,) responses = list("Rabbits are prey animals and are therefore constantly aware of their surroundings.", "Things to jump up on (they like to be in high places)", "become a rabbit today!", "Be cunning and full of tricks...", "Subscription confirmed! Thank you for choosing RABBITFACTS +TM+!", "Holland Lops are a breed of rabbit originating in the Netherlands.", "Rabbits may need medication to keep themselves healthy, and that's ok! Make sure to take yours too!", "rabbits really liked this product", "A healthy rabbit diet includes fresh vegetables.", "Rabbits do not hibernate. Their schedules are much too busy.", "the rate of bunnies is measured by RPB (rabbits per bunny)", ) /obj/item/toy/plush/skyrat/chunko/andrew @@ -473,7 +473,7 @@ gender = MALE attack_verb_continuous = list("pats", "hugs", "scolds", "pets") attack_verb_simple = list("pat", "hug", "scold", "pet") - squeak_override = list('sound/mobs/non-humanoids/mouse/mousesqueek.ogg' = 1, 'modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg' = 1,) + squeak_override = list('sound/mobs/non-humanoids/mouse/mousesqueek.ogg' = 1, 'modular_zubbers/sound/emotes/mothsqueak.ogg' = 1,) // All lowercase messages are intentional responses = list("bunny who you best pray you never encounter, lest you suffer a fate worse than death.", "this is a bunny!", "I wonder what would happen if you took bunnies, and combined them with rabbits, and merged their properties and characteristics. It's something to think about.", "If you're cold, they're cold. Give them the deed to your house.", "bunny that goes yeah! woo! yeah! woo! yeah! woo! yeah! woo! yeah! woo! yeah!", "the bunnies are beyond my comprehension", "it's a bunny thing, you wouldn't get it", "this bunny has an unfathomable power level", "%pull the string and I'll bink at you...I'm your bunny.", "Bunny (1954)", "the bunny that pulls the strings....", ) @@ -577,7 +577,7 @@ icon_state = "plush_lonie" attack_verb_continuous = list("snuggles", "nibbles", "awoos", "tail whaps") attack_verb_simple = list("snuggle", "nibble", "awoo", "tail whap") - squeak_override = list('modular_skyrat/modules/customization/game/objects/items/sound/merowr.ogg' = 1) + squeak_override = list('modular_zubbers/sound/voice/merowr.ogg' = 1) //Donation reward for syntax1112 /obj/item/toy/plush/skyrat/plushie_syntax1112 diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm b/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm index 2f3e048f6e8..9611df67013 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm @@ -32,7 +32,7 @@ icon_state = "water" src.add_overlay(image('modular_skyrat/master_files/icons/effects/turf_effects.dmi', "water_top", EXTRA_ABOVE_MOB_LAYER)) flick_overlay_static(image('modular_skyrat/modules/liquids/icons/obj/effects/splash.dmi', "splash", EXTRA_ABOVE_MOB_LAYER), 20) - playsound(get_turf(src), 'modular_skyrat/master_files/sound/effects/watersplash.ogg', 25, TRUE) + playsound(get_turf(src), 'modular_zubbers/sound/effects/watersplash.ogg', 25, TRUE) if("smoke") name = "blazing mist" diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm index 176c3225ff5..e038723f7bb 100644 --- a/modular_skyrat/modules/emotes/code/emotes.dm +++ b/modular_skyrat/modules/emotes/code/emotes.dm @@ -126,7 +126,7 @@ message = "lets out a tiny squeak!" emote_type = EMOTE_AUDIBLE vary = TRUE - sound = 'modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg' + sound = 'modular_zubbers/sound/emotes/mothsqueak.ogg' /datum/emote/living/mousesqueak key = "squeak" @@ -272,8 +272,8 @@ mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai) /datum/emote/living/clap1/get_sound(mob/living/user) - return pick('modular_skyrat/modules/emotes/sound/emotes/claponce1.ogg', - 'modular_skyrat/modules/emotes/sound/emotes/claponce2.ogg') + return pick('modular_zubbers/sound/emotes/claponce1.ogg', + 'modular_zubbers/sound/emotes/claponce2.ogg') /datum/emote/living/clap1/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional) if(user.usable_hands < 2) diff --git a/modular_skyrat/modules/emotes/sound/emotes/Nose_boop.ogg b/modular_skyrat/modules/emotes/sound/emotes/Nose_boop.ogg deleted file mode 100644 index 6a742e95eac..00000000000 Binary files a/modular_skyrat/modules/emotes/sound/emotes/Nose_boop.ogg and /dev/null differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/claponce1.ogg b/modular_skyrat/modules/emotes/sound/emotes/claponce1.ogg deleted file mode 100644 index 1e12d0daa3b..00000000000 Binary files a/modular_skyrat/modules/emotes/sound/emotes/claponce1.ogg and /dev/null differ diff --git a/modular_skyrat/modules/emotes/sound/emotes/claponce2.ogg b/modular_skyrat/modules/emotes/sound/emotes/claponce2.ogg deleted file mode 100644 index 10dfdba121b..00000000000 Binary files a/modular_skyrat/modules/emotes/sound/emotes/claponce2.ogg and /dev/null differ diff --git a/modular_skyrat/modules/emotes/sound/voice/merowr.ogg b/modular_skyrat/modules/emotes/sound/voice/merowr.ogg deleted file mode 100644 index 01fb993c618..00000000000 Binary files a/modular_skyrat/modules/emotes/sound/voice/merowr.ogg and /dev/null differ diff --git a/modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg b/modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg deleted file mode 100644 index c5ac979aed1..00000000000 Binary files a/modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg and /dev/null differ diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm index 11c395e0d1c..e8691404f2e 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm @@ -381,10 +381,10 @@ //Splash if(prob(WATER_HEIGH_DIFFERENCE_SOUND_CHANCE)) var/sound_to_play = pick(list( - 'modular_skyrat/modules/liquids/sound/effects/water_wade1.ogg', - 'modular_skyrat/modules/liquids/sound/effects/water_wade2.ogg', - 'modular_skyrat/modules/liquids/sound/effects/water_wade3.ogg', - 'modular_skyrat/modules/liquids/sound/effects/water_wade4.ogg' + 'modular_zubbers/sound/effects/water_wade1.ogg', + 'modular_zubbers/sound/effects/water_wade2.ogg', + 'modular_zubbers/sound/effects/water_wade3.ogg', + 'modular_zubbers/sound/effects/water_wade4.ogg', )) playsound(my_turf, sound_to_play, 60, 0) var/obj/splashy = new /obj/effect/temp_visual/liquid_splash(my_turf) @@ -430,10 +430,10 @@ if(liquid_state >= LIQUID_STATE_ANKLES) if(prob(30)) var/sound_to_play = pick(list( - 'modular_skyrat/modules/liquids/sound/effects/water_wade1.ogg', - 'modular_skyrat/modules/liquids/sound/effects/water_wade2.ogg', - 'modular_skyrat/modules/liquids/sound/effects/water_wade3.ogg', - 'modular_skyrat/modules/liquids/sound/effects/water_wade4.ogg' + 'modular_zubbers/sound/effects/water_wade1.ogg', + 'modular_zubbers/sound/effects/water_wade2.ogg', + 'modular_zubbers/sound/effects/water_wade3.ogg', + 'modular_zubbers/sound/effects/water_wade4.ogg', )) playsound(T, sound_to_play, 50, 0) if(iscarbon(AM)) @@ -450,7 +450,7 @@ SIGNAL_HANDLER var/turf/T = source if(liquid_state >= LIQUID_STATE_ANKLES && T.has_gravity(T)) - playsound(T, 'modular_skyrat/modules/liquids/sound/effects/splash.ogg', 50, 0) + playsound(T, 'modular_zubbers/sound/effects/splash.ogg', 50, 0) if(iscarbon(M)) var/mob/living/carbon/falling_carbon = M diff --git a/modular_skyrat/modules/liquids/sound/effects/heart_beat_loop3.ogg b/modular_skyrat/modules/liquids/sound/effects/heart_beat_loop3.ogg deleted file mode 100644 index ca647ff78b9..00000000000 Binary files a/modular_skyrat/modules/liquids/sound/effects/heart_beat_loop3.ogg and /dev/null differ diff --git a/modular_skyrat/modules/liquids/sound/effects/heart_beat_once.ogg b/modular_skyrat/modules/liquids/sound/effects/heart_beat_once.ogg deleted file mode 100644 index d8f6f9343b9..00000000000 Binary files a/modular_skyrat/modules/liquids/sound/effects/heart_beat_once.ogg and /dev/null differ diff --git a/modular_skyrat/modules/liquids/sound/effects/splash.ogg b/modular_skyrat/modules/liquids/sound/effects/splash.ogg deleted file mode 100644 index 22f17c07901..00000000000 Binary files a/modular_skyrat/modules/liquids/sound/effects/splash.ogg and /dev/null differ diff --git a/modular_skyrat/modules/liquids/sound/effects/water_wade1.ogg b/modular_skyrat/modules/liquids/sound/effects/water_wade1.ogg deleted file mode 100644 index 27527f9d8b8..00000000000 Binary files a/modular_skyrat/modules/liquids/sound/effects/water_wade1.ogg and /dev/null differ diff --git a/modular_skyrat/modules/liquids/sound/effects/water_wade2.ogg b/modular_skyrat/modules/liquids/sound/effects/water_wade2.ogg deleted file mode 100644 index f9c15cab64a..00000000000 Binary files a/modular_skyrat/modules/liquids/sound/effects/water_wade2.ogg and /dev/null differ diff --git a/modular_skyrat/modules/liquids/sound/effects/water_wade3.ogg b/modular_skyrat/modules/liquids/sound/effects/water_wade3.ogg deleted file mode 100644 index 3daccae01a1..00000000000 Binary files a/modular_skyrat/modules/liquids/sound/effects/water_wade3.ogg and /dev/null differ diff --git a/modular_skyrat/modules/liquids/sound/effects/water_wade4.ogg b/modular_skyrat/modules/liquids/sound/effects/water_wade4.ogg deleted file mode 100644 index 7ba705f4991..00000000000 Binary files a/modular_skyrat/modules/liquids/sound/effects/water_wade4.ogg and /dev/null differ diff --git a/modular_skyrat/modules/liquids/sound/effects/watersplash.ogg b/modular_skyrat/modules/liquids/sound/effects/watersplash.ogg deleted file mode 100644 index a9a6e486087..00000000000 Binary files a/modular_skyrat/modules/liquids/sound/effects/watersplash.ogg and /dev/null differ diff --git a/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm b/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm index 6cb966394ef..6b5f6f70647 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm @@ -179,7 +179,7 @@ Lasers set the target on fire. heat_addition = 90 slot = GUN_SLOT_BARREL projectile_override = /obj/projectile/beam/laser/microfusion/superheated - new_fire_sound = 'modular_skyrat/modules/microfusion/sound/vaporize.ogg' + new_fire_sound = 'modular_zubbers/sound/weapons/vaporize.ogg' /* HELLFIRE ATTACHMENT @@ -195,7 +195,7 @@ Makes the gun shoot hellfire lasers. power_usage = 20 slot = GUN_SLOT_BARREL projectile_override = /obj/projectile/beam/laser/microfusion/hellfire - new_fire_sound = 'modular_skyrat/modules/microfusion/sound/melt.ogg' + new_fire_sound = 'modular_zubbers/sound/weapons/melt.ogg' /* REPEATER ATTACHMENT @@ -247,7 +247,7 @@ The gun can fire X-RAY shots. attachment_overlay_icon_state = "attachment_xray" heat_addition = 90 power_usage = 50 - new_fire_sound = 'modular_skyrat/modules/microfusion/sound/incinerate.ogg' + new_fire_sound = 'modular_zubbers/sound/weapons/incinerate.ogg' projectile_override = /obj/projectile/beam/laser/microfusion/xray /obj/item/microfusion_gun_attachment/barrel/xray/examine(mob/user) @@ -556,7 +556,7 @@ Converts shots to STAMINA damage. /obj/item/microfusion_gun_attachment/undercharger/run_attachment(obj/item/gun/microfusion/microfusion_gun) . = ..() - microfusion_gun.fire_sound = 'modular_skyrat/modules/microfusion/sound/burn.ogg' + microfusion_gun.fire_sound = 'modular_zubbers/sound/weapons/burn.ogg' /obj/item/microfusion_gun_attachment/undercharger/process_fire(obj/item/gun/microfusion/microfusion_gun, obj/item/ammo_casing/chambered) . = ..() diff --git a/modular_skyrat/modules/microfusion/code/projectiles.dm b/modular_skyrat/modules/microfusion/code/projectiles.dm index 83749597ca3..180fbac43a0 100644 --- a/modular_skyrat/modules/microfusion/code/projectiles.dm +++ b/modular_skyrat/modules/microfusion/code/projectiles.dm @@ -7,7 +7,7 @@ projectile_type = /obj/projectile/beam/laser/microfusion e_cost = LASER_SHOTS(12, STANDARD_CELL_CHARGE) select_name = "laser" - fire_sound = 'modular_skyrat/modules/microfusion/sound/laser_1.ogg' + fire_sound = 'modular_zubbers/sound/weapons/laser.ogg' fire_sound_volume = 100 /obj/item/ammo_casing/proc/refresh_shot() diff --git a/modular_skyrat/modules/microfusion/sound/laser_1.ogg b/modular_skyrat/modules/microfusion/sound/laser_1.ogg deleted file mode 100644 index 285f74416d9..00000000000 Binary files a/modular_skyrat/modules/microfusion/sound/laser_1.ogg and /dev/null differ diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm index 864464ff824..41bc6610184 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm @@ -203,8 +203,8 @@ if(prob(50)) attacked.try_lewd_autoemote(pick("twitch_s" , "gasp", "shiver")) user.visible_message(span_purple("[user] [message]!")) - conditional_pref_sound(loc, pick('modular_skyrat/modules/modular_items/lewd_items/sounds/vax1.ogg', - 'modular_skyrat/modules/modular_items/lewd_items/sounds/vax2.ogg'), 70, TRUE) + conditional_pref_sound(loc, pick('modular_zubbers/sound/lewd/vax1.ogg', + 'modular_zubbers/sound/lewd/vax2.ogg'), 70, TRUE) #undef CANDLE_LUMINOSITY #undef PAIN_DEFAULT diff --git a/modular_skyrat/modules/modular_items/lewd_items/sounds/champ1.ogg b/modular_skyrat/modules/modular_items/lewd_items/sounds/champ1.ogg deleted file mode 100644 index 07f2118f2a4..00000000000 Binary files a/modular_skyrat/modules/modular_items/lewd_items/sounds/champ1.ogg and /dev/null differ diff --git a/modular_skyrat/modules/modular_items/lewd_items/sounds/champ2.ogg b/modular_skyrat/modules/modular_items/lewd_items/sounds/champ2.ogg deleted file mode 100644 index 63a1e8f1b85..00000000000 Binary files a/modular_skyrat/modules/modular_items/lewd_items/sounds/champ2.ogg and /dev/null differ diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm index 79c051eb5fa..4098390d86f 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/ammo/grenade.dm @@ -65,7 +65,7 @@ /// Generic proc that is called when the projectile should 'detonate', being either on impact or when the range runs out /obj/projectile/bullet/c980grenade/proc/fuse_activation(atom/target) - playsound(src, 'modular_skyrat/modules/modular_weapons/sounds/grenade_burst.ogg', 50, TRUE, -3) + playsound(src, 'modular_zubbers/sound/weapons/grenade_burst.ogg', 50, TRUE, -3) do_sparks(3, FALSE, src) @@ -101,7 +101,7 @@ /obj/projectile/bullet/c980grenade/smoke/fuse_activation(atom/target) - playsound(src, 'modular_skyrat/modules/modular_weapons/sounds/grenade_burst.ogg', 50, TRUE, -3) + playsound(src, 'modular_zubbers/sound/weapons/grenade_burst.ogg', 50, TRUE, -3) playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) var/datum/effect_system/fluid_spread/smoke/bad/smoke = new smoke.set_up(GRENADE_SMOKE_RANGE, holder = src, location = src) @@ -146,7 +146,7 @@ shrapnel_maker.detonate() qdel(shrapnel_maker) - playsound(src, 'modular_skyrat/modules/modular_weapons/sounds/grenade_burst.ogg', 50, TRUE, -3) + playsound(src, 'modular_zubbers/sound/weapons/grenade_burst.ogg', 50, TRUE, -3) /obj/item/ammo_box/c980grenade/shrapnel @@ -237,7 +237,7 @@ name = ".980 Tydhouer tear gas grenade" /obj/projectile/bullet/c980grenade/riot/fuse_activation(atom/target) - playsound(src, 'modular_skyrat/modules/modular_weapons/sounds/grenade_burst.ogg', 50, TRUE, -3) + playsound(src, 'modular_zubbers/sound/weapons/grenade_burst.ogg', 50, TRUE, -3) playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) var/datum/effect_system/fluid_spread/smoke/chem/smoke = new() smoke.chemholder.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 10) diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm index f2861db1658..9a701a8c569 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/projectiles.dm @@ -4,7 +4,7 @@ projectile_type = /obj/projectile/beam/cybersun_laser e_cost = LASER_SHOTS(20, STANDARD_CELL_CHARGE * 2) select_name = "Kill" - fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/laser_firing/laser.ogg' + fire_sound = 'modular_zubbers/sound/weapons/laser.ogg' /obj/projectile/beam/cybersun_laser icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/saibasan/projectiles.dmi' @@ -20,7 +20,7 @@ projectile_type = /obj/projectile/beam/cybersun_laser/marksman e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE * 2) select_name = "Marksman" - fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/laser_firing/vaporize.ogg' + fire_sound = 'modular_zubbers/sound/weapons/vaporize.ogg' /obj/projectile/beam/cybersun_laser/marksman icon_state = "sniper" @@ -80,7 +80,7 @@ /obj/projectile/beam/cybersun_laser/granata/proc/fuse_activation(atom/target) var/obj/item/grenade/shrapnel_maker = new casing_to_spawn(get_turf(target)) shrapnel_maker.detonate() - playsound(src, 'modular_skyrat/modules/modular_weapons/sounds/grenade_burst.ogg', 50, TRUE, -3) + playsound(src, 'modular_zubbers/sound/weapons/grenade_burst.ogg', 50, TRUE, -3) qdel(shrapnel_maker) /obj/projectile/beam/cybersun_laser/granata_shrapnel @@ -109,7 +109,7 @@ pellets = 4 variance = 30 select_name = "Shotgun" - fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/laser_firing/melt.ogg' + fire_sound = 'modular_zubbers/sound/weapons/melt.ogg' /obj/projectile/beam/cybersun_laser/granata_shrapnel/shotgun_pellet icon_state = "because_it_doesnt_miss" @@ -126,7 +126,7 @@ projectile_type = /obj/projectile/beam/cybersun_laser/hellfire e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE) select_name = "Incinerate" - fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/laser_firing/incinerate.ogg' + fire_sound = 'modular_zubbers/sound/weapons/incinerate.ogg' /obj/projectile/beam/cybersun_laser/hellfire icon_state = "hellfire" @@ -224,7 +224,7 @@ pellets = 3 variance = 20 select_name = "Shotgun" - fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/laser_firing/melt.ogg' + fire_sound = 'modular_zubbers/sound/weapons/melt.ogg' // Dummy casing that does nothing but have a projectile that looks like a sword diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm index 396bae41b43..f36d6a9b524 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/plasma.dm @@ -2,7 +2,7 @@ /obj/item/ammo_casing/energy/laser/plasma_glob projectile_type = /obj/projectile/beam/laser/plasma_glob - fire_sound = 'modular_skyrat/modules/microfusion/sound/incinerate.ogg' + fire_sound = 'modular_zubbers/sound/weapons/incinerate.ogg' /obj/item/ammo_casing/energy/laser/plasma_glob/Initialize(mapload) . = ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm index c3153dea187..ecceb11bd72 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm @@ -9,7 +9,7 @@ icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi' icon_state = "slonce" - fire_sound = 'modular_skyrat/modules/microfusion/sound/incinerate.ogg' + fire_sound = 'modular_zubbers/sound/weapons/incinerate.ogg' fire_sound_volume = 40 // This thing is comically loud otherwise w_class = WEIGHT_CLASS_NORMAL @@ -61,7 +61,7 @@ icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi' icon_state = "gwiazda" - fire_sound = 'modular_skyrat/modules/microfusion/sound/burn.ogg' + fire_sound = 'modular_zubbers/sound/weapons/burn.ogg' fire_sound_volume = 40 // This thing is comically loud otherwise w_class = WEIGHT_CLASS_NORMAL diff --git a/modular_skyrat/modules/modular_weapons/sounds/laser_firing/burn.ogg b/modular_skyrat/modules/modular_weapons/sounds/laser_firing/burn.ogg deleted file mode 100644 index ea37d14ccc1..00000000000 Binary files a/modular_skyrat/modules/modular_weapons/sounds/laser_firing/burn.ogg and /dev/null differ diff --git a/modular_skyrat/modules/modular_weapons/sounds/laser_firing/incinerate.ogg b/modular_skyrat/modules/modular_weapons/sounds/laser_firing/incinerate.ogg deleted file mode 100644 index 38f7846d7ab..00000000000 Binary files a/modular_skyrat/modules/modular_weapons/sounds/laser_firing/incinerate.ogg and /dev/null differ diff --git a/modular_skyrat/modules/modular_weapons/sounds/laser_firing/melt.ogg b/modular_skyrat/modules/modular_weapons/sounds/laser_firing/melt.ogg deleted file mode 100644 index 45a847ad35f..00000000000 Binary files a/modular_skyrat/modules/modular_weapons/sounds/laser_firing/melt.ogg and /dev/null differ diff --git a/modular_skyrat/modules/modular_weapons/sounds/laser_firing/vaporize.ogg b/modular_skyrat/modules/modular_weapons/sounds/laser_firing/vaporize.ogg deleted file mode 100644 index 0ba30857973..00000000000 Binary files a/modular_skyrat/modules/modular_weapons/sounds/laser_firing/vaporize.ogg and /dev/null differ diff --git a/modular_skyrat/modules/mold/code/mold_structures.dm b/modular_skyrat/modules/mold/code/mold_structures.dm index a41cf5033a6..5cd190ff4fc 100644 --- a/modular_skyrat/modules/mold/code/mold_structures.dm +++ b/modular_skyrat/modules/mold/code/mold_structures.dm @@ -49,7 +49,7 @@ /datum/looping_sound/core_heartbeat mid_length = 3 SECONDS - mid_sounds = list('modular_skyrat/master_files/sound/effects/heart_beat_loop3.ogg' = 1) + mid_sounds = list('modular_zubbers/sound/effects/heart_beat_loop3.ogg' = 1) volume = 20 /** diff --git a/modular_zubbers/code/game/objects/items/plushes.dm b/modular_zubbers/code/game/objects/items/plushes.dm index 5505523ec7e..57fad0cefcd 100644 --- a/modular_zubbers/code/game/objects/items/plushes.dm +++ b/modular_zubbers/code/game/objects/items/plushes.dm @@ -78,7 +78,7 @@ desc = "He looks very eepy. A tag on the back of the plushie reads, 'Happy birthday, big guy.'" icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' icon_state = "tiredtesh" - squeak_override = list('modular_skyrat/modules/emotes/sound/emotes/Nose_boop.ogg' = 1) + squeak_override = list('modular_zubbers/sound/emotes/nose_boop.ogg' = 1) /obj/item/toy/plush/xenoplush name = "xenomorph plushie" @@ -224,7 +224,7 @@ icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' icon_state = "FoxyPlush" gender = MALE - squeak_override = list('modular_skyrat/modules/emotes/sound/emotes/claponce1.ogg' = 1) + squeak_override = list('modular_zubbers/sound/emotes/claponce1.ogg' = 1) // Rin/Yayyay007's plush /obj/item/toy/plush/squeaky_toy diff --git a/modular_zubbers/code/modules/blooper/bark_list.dm b/modular_zubbers/code/modules/blooper/bark_list.dm index 902918d5a87..9bb9294f825 100644 --- a/modular_zubbers/code/modules/blooper/bark_list.dm +++ b/modular_zubbers/code/modules/blooper/bark_list.dm @@ -87,7 +87,7 @@ name = "Chirp" id = "chirp" allow_random = TRUE - soundpath = 'modular_zubbers/code/modules/blooper/voice/bloopers/chirp.ogg' + soundpath = 'modular_zubbers/sound/voice/chirp.ogg' /datum/blooper/caw name = "Caw" diff --git a/modular_zubbers/code/modules/clothing/donator_clothing.dm b/modular_zubbers/code/modules/clothing/donator_clothing.dm index 43831549aae..d432e3c419d 100644 --- a/modular_zubbers/code/modules/clothing/donator_clothing.dm +++ b/modular_zubbers/code/modules/clothing/donator_clothing.dm @@ -130,6 +130,6 @@ icon = 'modular_zubbers/icons/donator/idmaco.dmi' attack_verb_continuous = list ("cuddles", "meows", "hisses") attack_verb_simple = list ("cuddle", "meow", "hiss") - squeak_override = list ('modular_skyrat/modules/customization/game/objects/items/sound/merowr.ogg' = 1) + squeak_override = list ('modular_zubbers/sound/voice/merowr.ogg' = 1) resistance_flags = FIRE_PROOF diff --git a/modular_zubbers/code/modules/emotes/emotes.dm b/modular_zubbers/code/modules/emotes/emotes.dm index 584d5058979..15cf9b92332 100644 --- a/modular_zubbers/code/modules/emotes/emotes.dm +++ b/modular_zubbers/code/modules/emotes/emotes.dm @@ -6,7 +6,7 @@ message = "chirps!" emote_type = EMOTE_AUDIBLE vary = TRUE - sound = 'modular_zubbers/code/modules/emotes/sound/voice/chirp.ogg' + sound = 'modular_zubbers/sound/voice/chirp.ogg' /datum/emote/living/caw key = "caw" diff --git a/modular_zubbers/code/modules/emotes/sound/voice/chirp.ogg b/modular_zubbers/code/modules/emotes/sound/voice/chirp.ogg deleted file mode 100644 index 73cb0376d21..00000000000 Binary files a/modular_zubbers/code/modules/emotes/sound/voice/chirp.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/modular_weapons/sounds/grenade_burst.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/grenade_burst.ogg deleted file mode 100644 index d5a8562f45f..00000000000 Binary files a/modular_zubbers/code/modules/modular_weapons/sounds/grenade_burst.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/burn.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/burn.ogg deleted file mode 100644 index ea37d14ccc1..00000000000 Binary files a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/burn.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/incinerate.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/incinerate.ogg deleted file mode 100644 index 38f7846d7ab..00000000000 Binary files a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/incinerate.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/laser.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/laser.ogg deleted file mode 100644 index 285f74416d9..00000000000 Binary files a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/laser.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/melt.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/melt.ogg deleted file mode 100644 index 45a847ad35f..00000000000 Binary files a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/melt.ogg and /dev/null differ diff --git a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/vaporize.ogg b/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/vaporize.ogg deleted file mode 100644 index 0ba30857973..00000000000 Binary files a/modular_zubbers/code/modules/modular_weapons/sounds/laser_firing/vaporize.ogg and /dev/null differ diff --git a/modular_skyrat/master_files/sound/effects/heart_beat_loop3.ogg b/modular_zubbers/sound/effects/heart_beat_loop3.ogg similarity index 100% rename from modular_skyrat/master_files/sound/effects/heart_beat_loop3.ogg rename to modular_zubbers/sound/effects/heart_beat_loop3.ogg diff --git a/modular_skyrat/master_files/sound/effects/splash.ogg b/modular_zubbers/sound/effects/splash.ogg similarity index 100% rename from modular_skyrat/master_files/sound/effects/splash.ogg rename to modular_zubbers/sound/effects/splash.ogg diff --git a/modular_skyrat/master_files/sound/effects/water_wade1.ogg b/modular_zubbers/sound/effects/water_wade1.ogg similarity index 100% rename from modular_skyrat/master_files/sound/effects/water_wade1.ogg rename to modular_zubbers/sound/effects/water_wade1.ogg diff --git a/modular_skyrat/master_files/sound/effects/water_wade2.ogg b/modular_zubbers/sound/effects/water_wade2.ogg similarity index 100% rename from modular_skyrat/master_files/sound/effects/water_wade2.ogg rename to modular_zubbers/sound/effects/water_wade2.ogg diff --git a/modular_skyrat/master_files/sound/effects/water_wade3.ogg b/modular_zubbers/sound/effects/water_wade3.ogg similarity index 100% rename from modular_skyrat/master_files/sound/effects/water_wade3.ogg rename to modular_zubbers/sound/effects/water_wade3.ogg diff --git a/modular_skyrat/master_files/sound/effects/water_wade4.ogg b/modular_zubbers/sound/effects/water_wade4.ogg similarity index 100% rename from modular_skyrat/master_files/sound/effects/water_wade4.ogg rename to modular_zubbers/sound/effects/water_wade4.ogg diff --git a/modular_skyrat/master_files/sound/effects/watersplash.ogg b/modular_zubbers/sound/effects/watersplash.ogg similarity index 100% rename from modular_skyrat/master_files/sound/effects/watersplash.ogg rename to modular_zubbers/sound/effects/watersplash.ogg diff --git a/modular_skyrat/modules/emotes/sound/claponce1.ogg b/modular_zubbers/sound/emotes/claponce1.ogg similarity index 100% rename from modular_skyrat/modules/emotes/sound/claponce1.ogg rename to modular_zubbers/sound/emotes/claponce1.ogg diff --git a/modular_skyrat/modules/emotes/sound/claponce2.ogg b/modular_zubbers/sound/emotes/claponce2.ogg similarity index 100% rename from modular_skyrat/modules/emotes/sound/claponce2.ogg rename to modular_zubbers/sound/emotes/claponce2.ogg diff --git a/modular_skyrat/modules/emotes/sound/emotes/mothsqueak.ogg b/modular_zubbers/sound/emotes/mothsqueak.ogg similarity index 100% rename from modular_skyrat/modules/emotes/sound/emotes/mothsqueak.ogg rename to modular_zubbers/sound/emotes/mothsqueak.ogg diff --git a/modular_skyrat/modules/liquids/sound/emotes/nose_boop.ogg b/modular_zubbers/sound/emotes/nose_boop.ogg similarity index 100% rename from modular_skyrat/modules/liquids/sound/emotes/nose_boop.ogg rename to modular_zubbers/sound/emotes/nose_boop.ogg diff --git a/modular_skyrat/modules/modular_items/lewd_items/sounds/vax1.ogg b/modular_zubbers/sound/lewd/vax1.ogg similarity index 100% rename from modular_skyrat/modules/modular_items/lewd_items/sounds/vax1.ogg rename to modular_zubbers/sound/lewd/vax1.ogg diff --git a/modular_skyrat/modules/modular_items/lewd_items/sounds/vax2.ogg b/modular_zubbers/sound/lewd/vax2.ogg similarity index 100% rename from modular_skyrat/modules/modular_items/lewd_items/sounds/vax2.ogg rename to modular_zubbers/sound/lewd/vax2.ogg diff --git a/modular_zubbers/code/modules/blooper/voice/bloopers/chirp.ogg b/modular_zubbers/sound/voice/chirp.ogg similarity index 100% rename from modular_zubbers/code/modules/blooper/voice/bloopers/chirp.ogg rename to modular_zubbers/sound/voice/chirp.ogg diff --git a/modular_skyrat/modules/customization/game/objects/items/sound/merowr.ogg b/modular_zubbers/sound/voice/merowr.ogg similarity index 100% rename from modular_skyrat/modules/customization/game/objects/items/sound/merowr.ogg rename to modular_zubbers/sound/voice/merowr.ogg diff --git a/modular_skyrat/modules/microfusion/sound/burn.ogg b/modular_zubbers/sound/weapons/burn.ogg similarity index 100% rename from modular_skyrat/modules/microfusion/sound/burn.ogg rename to modular_zubbers/sound/weapons/burn.ogg diff --git a/modular_skyrat/modules/modular_weapons/sounds/grenade_burst.ogg b/modular_zubbers/sound/weapons/grenade_burst.ogg similarity index 100% rename from modular_skyrat/modules/modular_weapons/sounds/grenade_burst.ogg rename to modular_zubbers/sound/weapons/grenade_burst.ogg diff --git a/modular_skyrat/modules/microfusion/sound/incinerate.ogg b/modular_zubbers/sound/weapons/incinerate.ogg similarity index 100% rename from modular_skyrat/modules/microfusion/sound/incinerate.ogg rename to modular_zubbers/sound/weapons/incinerate.ogg diff --git a/modular_skyrat/modules/modular_weapons/sounds/laser_firing/laser.ogg b/modular_zubbers/sound/weapons/laser.ogg similarity index 100% rename from modular_skyrat/modules/modular_weapons/sounds/laser_firing/laser.ogg rename to modular_zubbers/sound/weapons/laser.ogg diff --git a/modular_skyrat/modules/microfusion/sound/melt.ogg b/modular_zubbers/sound/weapons/melt.ogg similarity index 100% rename from modular_skyrat/modules/microfusion/sound/melt.ogg rename to modular_zubbers/sound/weapons/melt.ogg diff --git a/modular_skyrat/modules/microfusion/sound/vaporize.ogg b/modular_zubbers/sound/weapons/vaporize.ogg similarity index 100% rename from modular_skyrat/modules/microfusion/sound/vaporize.ogg rename to modular_zubbers/sound/weapons/vaporize.ogg