mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 19:44:58 +01:00
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 🆑 sound: Shaving Ian will no longer sound like you're using a Welder. /🆑
This commit is contained in:
@@ -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))
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user