From a9864a5268c9147842c2eeeffdce11e6b84ba4e1 Mon Sep 17 00:00:00 2001 From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Date: Sat, 16 Nov 2024 23:12:29 -0500 Subject: [PATCH] THERE IS NO OGG! I LIED! (#87808) Fixes mislabeled audio files. @francinum and I found this while working on https://github.com/tgstation/rust-g/pull/192 ![image](https://github.com/user-attachments/assets/2d564842-876a-4915-9eba-a5d6847d81b3) https://www.youtube.com/watch?v=plrlrGtoiik --- code/game/objects/items/stacks/tape.dm | 8 ++++---- code/modules/clothing/masks/muzzle.dm | 2 +- code/modules/paperwork/paper_biscuit.dm | 2 +- .../{duct_tape_rip.ogg => duct_tape_rip.mp3} | Bin .../{duct_tape_snap.ogg => duct_tape_snap.mp3} | Bin 5 files changed, 6 insertions(+), 6 deletions(-) rename sound/items/duct_tape/{duct_tape_rip.ogg => duct_tape_rip.mp3} (100%) rename sound/items/duct_tape/{duct_tape_snap.ogg => duct_tape_snap.mp3} (100%) diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm index a1394bbad4f..16b19a9387d 100644 --- a/code/game/objects/items/stacks/tape.dm +++ b/code/game/objects/items/stacks/tape.dm @@ -29,14 +29,14 @@ if(user.get_inactive_held_item() == src) if(is_zero_amount(delete_if_zero = TRUE)) return - playsound(user, 'sound/items/duct_tape/duct_tape_rip.ogg', 50, TRUE) + playsound(user, 'sound/items/duct_tape/duct_tape_rip.mp3', 50, TRUE) if(!do_after(user, 1 SECONDS)) return var/new_tape_gag = new tape_gag(src) user.put_in_hands(new_tape_gag) use(1) to_chat(user, span_notice("You rip off a piece of tape.")) - playsound(user, 'sound/items/duct_tape/duct_tape_snap.ogg', 50, TRUE) + playsound(user, 'sound/items/duct_tape/duct_tape_snap.mp3', 50, TRUE) return TRUE return ..() @@ -53,10 +53,10 @@ return ITEM_INTERACT_BLOCKING user.visible_message(span_notice("[user] begins wrapping [target] with [src]."), span_notice("You begin wrapping [target] with [src].")) - playsound(user, 'sound/items/duct_tape/duct_tape_rip.ogg', 50, TRUE) + playsound(user, 'sound/items/duct_tape/duct_tape_rip.mp3', 50, TRUE) if(do_after(user, 3 SECONDS, target=target)) - playsound(user, 'sound/items/duct_tape/duct_tape_snap.ogg', 50, TRUE) + playsound(user, 'sound/items/duct_tape/duct_tape_snap.mp3', 50, TRUE) use(1) if(istype(target, /obj/item/clothing/gloves/fingerless)) var/obj/item/clothing/gloves/tackler/offbrand/O = new /obj/item/clothing/gloves/tackler/offbrand diff --git a/code/modules/clothing/masks/muzzle.dm b/code/modules/clothing/masks/muzzle.dm index 05bdd086efe..fa13eaf2e87 100644 --- a/code/modules/clothing/masks/muzzle.dm +++ b/code/modules/clothing/masks/muzzle.dm @@ -62,7 +62,7 @@ . = ..() if(user.get_item_by_slot(ITEM_SLOT_MASK) != src) return - playsound(user, 'sound/items/duct_tape/duct_tape_rip.ogg', 50, TRUE) + playsound(user, 'sound/items/duct_tape/duct_tape_rip.mp3', 50, TRUE) if(harmful_strip) user.apply_damage(stripping_damage, BRUTE, BODY_ZONE_HEAD) INVOKE_ASYNC(user, TYPE_PROC_REF(/mob, emote), "scream") diff --git a/code/modules/paperwork/paper_biscuit.dm b/code/modules/paperwork/paper_biscuit.dm index d98eb234c95..cf07597c59a 100644 --- a/code/modules/paperwork/paper_biscuit.dm +++ b/code/modules/paperwork/paper_biscuit.dm @@ -136,7 +136,7 @@ cracked = FALSE has_been_sealed = TRUE contents_hidden = TRUE - playsound(get_turf(user), 'sound/items/duct_tape/duct_tape_snap.ogg', 60) + playsound(get_turf(user), 'sound/items/duct_tape/duct_tape_snap.mp3', 60) icon_state = "[sealed_icon]" update_appearance() diff --git a/sound/items/duct_tape/duct_tape_rip.ogg b/sound/items/duct_tape/duct_tape_rip.mp3 similarity index 100% rename from sound/items/duct_tape/duct_tape_rip.ogg rename to sound/items/duct_tape/duct_tape_rip.mp3 diff --git a/sound/items/duct_tape/duct_tape_snap.ogg b/sound/items/duct_tape/duct_tape_snap.mp3 similarity index 100% rename from sound/items/duct_tape/duct_tape_snap.ogg rename to sound/items/duct_tape/duct_tape_snap.mp3