From d4bb05bcc773cbbb70c8aae0193a506540fc66a7 Mon Sep 17 00:00:00 2001 From: Cursor <102828457+theselfish@users.noreply.github.com> Date: Wed, 15 Apr 2026 00:00:34 +0100 Subject: [PATCH] Replaces uses of welder sounds when using razors with hair cutting noises (#95754) ## About The Pull Request Title. I saw someone shaving Ian and it annoyed me it was using a welder sound. ## Why It's Good For The Game Yo ass ain' welding. ## Changelog :cl: sound: Shaving Ian will no longer sound like you're using a Welder. /:cl: --- code/game/objects/items/cosmetics.dm | 2 +- code/modules/mob/living/basic/pets/dog/corgi.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index c0834a6d459..37f32507dd6 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -209,7 +209,7 @@ skinhead.set_facial_hairstyle("Shaved", update = TRUE) else skinhead.set_hairstyle("Skinhead", update = TRUE) - playsound(loc, 'sound/items/tools/welder2.ogg', 20, TRUE) + playsound(loc, 'sound/items/hair-clippers.ogg', 20, TRUE) /obj/item/razor/attack(mob/target_mob, mob/living/user, list/modifiers, list/attack_modifiers) if(!ishuman(target_mob)) diff --git a/code/modules/mob/living/basic/pets/dog/corgi.dm b/code/modules/mob/living/basic/pets/dog/corgi.dm index b41ce94d0ac..447e6b32e34 100644 --- a/code/modules/mob/living/basic/pets/dog/corgi.dm +++ b/code/modules/mob/living/basic/pets/dog/corgi.dm @@ -123,7 +123,7 @@ user.visible_message(span_notice("[user] starts to shave [src] using \the [attacking_item]."), span_notice("You start to shave [src] using \the [attacking_item]...")) if(do_after(user, 5 SECONDS, target = src)) user.visible_message(span_notice("[user] shaves [src]'s hair using \the [attacking_item].")) - playsound(get_turf(src), 'sound/items/tools/welder2.ogg', 20, TRUE) + playsound(get_turf(src), 'sound/items/hair-clippers.ogg', 20, TRUE) shaved = TRUE icon_living = "[icon_living]_shaved" icon_dead = "[icon_living]_shaved_dead"