diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index e0fbd6b8f0a..077c715440c 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -500,7 +500,7 @@ spawn(10) if(M && usr) - //playsound(usr.loc, 'gib.ogg', 50, 1) + playsound(usr.loc, 'sound/goonstation/effects/gib.ogg', 50, 1) usr.UpdateAppearance(M.dna.UI) usr:real_name = M:real_name usr:name = M:name diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index 3ba98fcecee..2bab01e5ec5 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -83,5 +83,5 @@ var/datum/effect/system/spark_spread/sparks = new sparks.set_up(4, 0, target.loc) //no idea what the 0 is sparks.start() - playsound(target.loc, 'sound/effects/gib.ogg', 100, 1, 10) + playsound(target.loc, 'sound/goonstation/effects/gib.ogg', 50, 1) ..() \ No newline at end of file diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index e95b39e28f8..cb658ff937d 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -266,7 +266,7 @@ occupant.attack_log += "\[[time_stamp()]\] Was gibbed by an autogibber (\the [src])" occupant.emote("scream") - playsound(get_turf(src), 'sound/effects/gib.ogg', 50, 1) + playsound(get_turf(src), 'sound/goonstation/effects/gib.ogg', 50, 1) victims += "\[[time_stamp()]\] [occupant.name] ([occupant.ckey]) killed by [UserOverride ? "Autogibbing" : "[user] ([user.ckey])"]" //have to do this before ghostizing occupant.death(1) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 64bc3e61181..a66b8326f62 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1399,12 +1399,12 @@ obj/item/toy/cards/deck/syndicate/black user << "\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!" qdel(stored_minature) stored_minature = null - playsound(user, 'sound/effects/gib.ogg', 20, 1) + playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1) cooldown = world.time if(cooldown < world.time - 8) user << "You hit the gib button on \the [src]." - playsound(user, 'sound/effects/gib.ogg', 20, 1) + playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1) cooldown = world.time /obj/item/toy/minigibber/attackby(var/obj/O, var/mob/user, params) diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index 908d6510d03..2bfe10a1f35 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -8,7 +8,7 @@ icon = null invisibility = 101 - playsound(src.loc, 'sound/effects/gib.ogg', 100, 1, 10) + playsound(src.loc, 'sound/goonstation/effects/gib.ogg', 50, 1) animation = new(loc) animation.icon_state = "blank" diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index dbfe27f78e9..795ab7b7ba8 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -11,7 +11,7 @@ animation.icon = 'icons/mob/mob.dmi' animation.master = src - playsound(src.loc, 'sound/effects/gib.ogg', 100, 1, 10) + playsound(src.loc, 'sound/goonstation/effects/gib.ogg', 50, 1) for(var/obj/item/organ/internal/I in internal_organs) if(istype(loc,/turf)) diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm index 067e8e7928b..6dc6ae21c46 100644 --- a/code/modules/mob/living/silicon/death.dm +++ b/code/modules/mob/living/silicon/death.dm @@ -11,6 +11,8 @@ animation.icon = 'icons/mob/mob.dmi' animation.master = src + playsound(src.loc, 'sound/goonstation/effects/robogib.ogg', 50, 1) + // flick("gibbed-r", animation) robogibs(loc, viruses) diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index cafb53d8621..6bff1a8260f 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -11,6 +11,8 @@ animation.icon = 'icons/mob/mob.dmi' animation.master = src + playsound(src.loc, 'sound/goonstation/effects/robogib.ogg', 50, 1) + flick("gibbed-r", animation) robogibs(loc, viruses) diff --git a/sound/effects/gib.ogg b/sound/effects/gib.ogg deleted file mode 100644 index 6bf8c537e3f..00000000000 Binary files a/sound/effects/gib.ogg and /dev/null differ diff --git a/sound/goonstation/effects/gib.ogg b/sound/goonstation/effects/gib.ogg new file mode 100644 index 00000000000..2b33c33f369 Binary files /dev/null and b/sound/goonstation/effects/gib.ogg differ diff --git a/sound/goonstation/effects/robogib.ogg b/sound/goonstation/effects/robogib.ogg new file mode 100644 index 00000000000..322da42a3f3 Binary files /dev/null and b/sound/goonstation/effects/robogib.ogg differ