diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 9a21013c434..4012179e5b8 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -196,3 +196,13 @@ GLOBAL_LIST_INIT(announcer_keys, list( #define SFX_PIG_OINK "pig_oink" #define SFX_VISOR_UP "visor_up" #define SFX_VISOR_DOWN "visor_down" +#define SFX_SIZZLE "sizzle" +#define SFX_GROWL "growl" +#define SFX_POLAROID "polaroid" +#define SFX_HALLUCINATION_TURN_AROUND "hallucination_turn_around" +#define SFX_HALLUCINATION_I_SEE_YOU "hallucination_i_see_you" +#define SFX_HALLUCINATION_OVER_HERE "hallucination_over_here" +#define SFX_HALLUCINATION_I_M_HERE "hallucination_i_m_here" +#define SFX_VOID_DEFLECT "void_deflect" +#define SFX_LOW_HISS "low_hiss" + diff --git a/code/datums/ai/dog/dog_behaviors.dm b/code/datums/ai/dog/dog_behaviors.dm index 958b1f3d03d..6ae1529d470 100644 --- a/code/datums/ai/dog/dog_behaviors.dm +++ b/code/datums/ai/dog/dog_behaviors.dm @@ -54,4 +54,4 @@ living_pawn.manual_emote("[pick("barks", "growls", "stares")] menacingly at [target]!") if(!SPT_PROB(40, seconds_per_tick)) return - playsound(living_pawn, pick('sound/mobs/non-humanoids/dog/growl1.ogg', 'sound/mobs/non-humanoids/dog/growl2.ogg'), 50, TRUE, -1) + playsound(living_pawn, SFX_GROWL, 50, TRUE, -1) diff --git a/code/datums/components/irradiated.dm b/code/datums/components/irradiated.dm index 0f70e0d80b7..a798124528c 100644 --- a/code/datums/components/irradiated.dm +++ b/code/datums/components/irradiated.dm @@ -143,7 +143,7 @@ human_parent.apply_damage(RADIATION_BURN_SPLOTCH_DAMAGE, BURN, affected_limb, wound_clothing = FALSE) playsound( human_parent, - pick('sound/effects/wounds/sizzle1.ogg', 'sound/effects/wounds/sizzle2.ogg'), + SFX_SIZZLE, 50, vary = TRUE, ) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index f52050d8d76..d2142b02a8b 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -204,7 +204,7 @@ span_danger("[carp_user] effortlessly swats [hitting_projectile] aside! [carp_user.p_They()] can block bullets with [carp_user.p_their()] bare hands!"), span_userdanger("You deflect [hitting_projectile]!"), ) - playsound(carp_user, pick('sound/items/weapons/bulletflyby.ogg', 'sound/items/weapons/bulletflyby2.ogg', 'sound/items/weapons/bulletflyby3.ogg'), 75, TRUE) + playsound(carp_user, SFX_BULLET_MISS, 75, TRUE) hitting_projectile.firer = carp_user hitting_projectile.set_angle(rand(0, 360))//SHING return COMPONENT_BULLET_PIERCED diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 8033c697bfa..8385a639b7f 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -2374,7 +2374,7 @@ new /obj/effect/temp_visual/cult/sac(loc) var/atom/throwtarget throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src))) - SEND_SOUND(L, sound(pick('sound/effects/hallucinations/turn_around1.ogg','sound/effects/hallucinations/turn_around2.ogg'),0,1,50)) + SEND_SOUND(L, sound(SFX_HALLUCINATION_TURN_AROUND,0,1,50)) flash_color(L, flash_color=COLOR_CULT_RED, flash_time=20) L.Paralyze(40) L.throw_at(throwtarget, 5, 1) diff --git a/code/game/machinery/photobooth.dm b/code/game/machinery/photobooth.dm index d1244bcc85d..917e28947d1 100644 --- a/code/game/machinery/photobooth.dm +++ b/code/game/machinery/photobooth.dm @@ -130,7 +130,7 @@ if(obj_flags & EMAGGED) var/mob/living/carbon/carbon_occupant = occupant for(var/i in 1 to 5) //play a ton of sounds to mimic it blinding you - playsound(src, pick('sound/items/polaroid/polaroid1.ogg', 'sound/items/polaroid/polaroid2.ogg'), 75, TRUE) + playsound(src, SFX_POLAROID, 75, TRUE) if(carbon_occupant) carbon_occupant.flash_act(5) sleep(0.2 SECONDS) diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index 11b04240dd4..f2d81ac4bde 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -123,7 +123,7 @@ /obj/item/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE) if(attack_type == PROJECTILE_ATTACK) owner.visible_message(span_danger("Ranged attacks just make [owner] angrier!")) - playsound(src, pick('sound/items/weapons/bulletflyby.ogg', 'sound/items/weapons/bulletflyby2.ogg', 'sound/items/weapons/bulletflyby3.ogg'), 75, TRUE) + playsound(src, SFX_BULLET_MISS, 75, TRUE) return TRUE return FALSE diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm index db493b341d1..7a2054e6657 100644 --- a/code/game/objects/items/food/burgers.dm +++ b/code/game/objects/items/food/burgers.dm @@ -255,7 +255,7 @@ var/obj/machinery/light/light = locate(/obj/machinery/light) in view(4, src) light?.flicker() if(62 to 64) - playsound(loc, pick('sound/effects/hallucinations/i_see_you1.ogg', 'sound/effects/hallucinations/i_see_you2.ogg'), 50, TRUE, ignore_walls = FALSE) + playsound(loc, SFX_HALLUCINATION_I_SEE_YOU, 50, TRUE, ignore_walls = FALSE) if(61) visible_message("[src] spews out a glob of ectoplasm!") new /obj/effect/decal/cleanable/greenglow/ecto(loc) diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index 93d4cd65f34..eb38b5a9783 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -187,7 +187,7 @@ log_combat(user, target, "given a noogie to", addition = "([damage] brute before armor)") target.apply_damage(damage, BRUTE, BODY_ZONE_HEAD) user.adjustStaminaLoss(iteration + 5) - playsound(get_turf(user), pick('sound/effects/rustle/rustle1.ogg','sound/effects/rustle/rustle2.ogg','sound/effects/rustle/rustle3.ogg','sound/effects/rustle/rustle4.ogg','sound/effects/rustle/rustle5.ogg'), 50) + playsound(get_turf(user), SFX_RUSTLE, 50) if(prob(33)) user.visible_message(span_danger("[user] continues noogie'ing [target]!"), span_warning("You continue giving [target] a noogie!"), vision_distance=COMBAT_MESSAGE_RANGE, ignored_mobs=target) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 2e7682eda1f..96bae7452ac 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -607,7 +607,13 @@ smoke.start() sleep(0.2 SECONDS) for(var/i in 1 to 4) - playsound(borg, pick('sound/items/tools/drill_use.ogg', 'sound/items/tools/jaws_cut.ogg', 'sound/items/tools/jaws_pry.ogg', 'sound/items/tools/welder.ogg', 'sound/items/tools/ratchet.ogg'), 80, TRUE, -1) + playsound(borg, pick( + 'sound/items/tools/drill_use.ogg', + 'sound/items/tools/jaws_cut.ogg', + 'sound/items/tools/jaws_pry.ogg', + 'sound/items/tools/welder.ogg', + 'sound/items/tools/ratchet.ogg', + ), 80, TRUE, -1) sleep(1.2 SECONDS) if(!prev_lockcharge) borg.SetLockdown(FALSE) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index bddc056b99e..65a0dc0e76a 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -1169,7 +1169,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 if(attack_type == PROJECTILE_ATTACK) if(HAS_TRAIT(src, TRAIT_WIELDED) || prob(final_block_chance)) owner.visible_message(span_danger("[owner] deflects [attack_text] with [src]!")) - playsound(src, pick('sound/items/weapons/bulletflyby.ogg', 'sound/items/weapons/bulletflyby2.ogg', 'sound/items/weapons/bulletflyby3.ogg'), 75, TRUE) + playsound(src, SFX_BULLET_MISS, 75, TRUE) return TRUE return FALSE if(prob(final_block_chance * (HAS_TRAIT(src, TRAIT_WIELDED) ? 2 : 1))) diff --git a/code/game/sound.dm b/code/game/sound.dm index 85b338eade4..bb4d1e868db 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -210,36 +210,93 @@ return soundin switch(soundin) if(SFX_SHATTER) - soundin = pick('sound/effects/glass/glassbr1.ogg','sound/effects/glass/glassbr2.ogg','sound/effects/glass/glassbr3.ogg') + soundin = pick( + 'sound/effects/glass/glassbr1.ogg', + 'sound/effects/glass/glassbr2.ogg', + 'sound/effects/glass/glassbr3.ogg', + ) if(SFX_EXPLOSION) - soundin = pick('sound/effects/explosion/explosion1.ogg','sound/effects/explosion/explosion2.ogg') + soundin = pick( + 'sound/effects/explosion/explosion1.ogg', + 'sound/effects/explosion/explosion2.ogg', + ) if(SFX_EXPLOSION_CREAKING) - soundin = pick('sound/effects/explosion/explosioncreak1.ogg', 'sound/effects/explosion/explosioncreak2.ogg') + soundin = pick( + 'sound/effects/explosion/explosioncreak1.ogg', + 'sound/effects/explosion/explosioncreak2.ogg', + ) if(SFX_HULL_CREAKING) - soundin = pick('sound/effects/creak/creak1.ogg', 'sound/effects/creak/creak2.ogg', 'sound/effects/creak/creak3.ogg') + soundin = pick( + 'sound/effects/creak/creak1.ogg', + 'sound/effects/creak/creak2.ogg', + 'sound/effects/creak/creak3.ogg', + ) if(SFX_SPARKS) - soundin = pick('sound/effects/sparks/sparks1.ogg','sound/effects/sparks/sparks2.ogg','sound/effects/sparks/sparks3.ogg','sound/effects/sparks/sparks4.ogg') + soundin = pick( + 'sound/effects/sparks/sparks1.ogg', + 'sound/effects/sparks/sparks2.ogg', + 'sound/effects/sparks/sparks3.ogg', + 'sound/effects/sparks/sparks4.ogg', + ) if(SFX_RUSTLE) - soundin = pick('sound/effects/rustle/rustle1.ogg','sound/effects/rustle/rustle2.ogg','sound/effects/rustle/rustle3.ogg','sound/effects/rustle/rustle4.ogg','sound/effects/rustle/rustle5.ogg') + soundin = pick( + 'sound/effects/rustle/rustle1.ogg', + 'sound/effects/rustle/rustle2.ogg', + 'sound/effects/rustle/rustle3.ogg', + 'sound/effects/rustle/rustle4.ogg', + 'sound/effects/rustle/rustle5.ogg', + ) if(SFX_BODYFALL) - soundin = pick('sound/effects/bodyfall/bodyfall1.ogg','sound/effects/bodyfall/bodyfall2.ogg','sound/effects/bodyfall/bodyfall3.ogg','sound/effects/bodyfall/bodyfall4.ogg') + soundin = pick( + 'sound/effects/bodyfall/bodyfall1.ogg', + 'sound/effects/bodyfall/bodyfall2.ogg', + 'sound/effects/bodyfall/bodyfall3.ogg', + 'sound/effects/bodyfall/bodyfall4.ogg', + ) if(SFX_PUNCH) - soundin = pick('sound/items/weapons/punch1.ogg','sound/items/weapons/punch2.ogg','sound/items/weapons/punch3.ogg','sound/items/weapons/punch4.ogg') + soundin = pick( + 'sound/items/weapons/punch1.ogg', + 'sound/items/weapons/punch2.ogg', + 'sound/items/weapons/punch3.ogg', + 'sound/items/weapons/punch4.ogg', + ) if(SFX_CLOWN_STEP) - soundin = pick('sound/effects/footstep/clownstep1.ogg','sound/effects/footstep/clownstep2.ogg') + soundin = pick( + 'sound/effects/footstep/clownstep1.ogg', + 'sound/effects/footstep/clownstep2.ogg', + ) if(SFX_SUIT_STEP) soundin = pick( 'sound/items/handling/armor_rustle/riot_armor/suitstep1.ogg', 'sound/items/handling/armor_rustle/riot_armor/suitstep2.ogg', ) if(SFX_SWING_HIT) - soundin = pick('sound/items/weapons/genhit1.ogg', 'sound/items/weapons/genhit2.ogg', 'sound/items/weapons/genhit3.ogg') + soundin = pick( + 'sound/items/weapons/genhit1.ogg', + 'sound/items/weapons/genhit2.ogg', + 'sound/items/weapons/genhit3.ogg', + ) if(SFX_HISS) - soundin = pick('sound/mobs/non-humanoids/hiss/hiss1.ogg','sound/mobs/non-humanoids/hiss/hiss2.ogg','sound/mobs/non-humanoids/hiss/hiss3.ogg','sound/mobs/non-humanoids/hiss/hiss4.ogg') + soundin = pick( + 'sound/mobs/non-humanoids/hiss/hiss1.ogg', + 'sound/mobs/non-humanoids/hiss/hiss2.ogg', + 'sound/mobs/non-humanoids/hiss/hiss3.ogg', + 'sound/mobs/non-humanoids/hiss/hiss4.ogg', + ) if(SFX_PAGE_TURN) - soundin = pick('sound/effects/page_turn/pageturn1.ogg', 'sound/effects/page_turn/pageturn2.ogg','sound/effects/page_turn/pageturn3.ogg') + soundin = pick( + 'sound/effects/page_turn/pageturn1.ogg', + 'sound/effects/page_turn/pageturn2.ogg', + 'sound/effects/page_turn/pageturn3.ogg', + ) if(SFX_RICOCHET) - soundin = pick( 'sound/items/weapons/effects/ric1.ogg', 'sound/items/weapons/effects/ric2.ogg','sound/items/weapons/effects/ric3.ogg','sound/items/weapons/effects/ric4.ogg','sound/items/weapons/effects/ric5.ogg') + soundin = pick( + 'sound/items/weapons/effects/ric1.ogg', + 'sound/items/weapons/effects/ric2.ogg', + 'sound/items/weapons/effects/ric3.ogg', + 'sound/items/weapons/effects/ric4.ogg', + 'sound/items/weapons/effects/ric5.ogg', + ) if(SFX_TERMINAL_TYPE) soundin = pick(list( 'sound/machines/terminal/terminal_button01.ogg', @@ -252,15 +309,34 @@ 'sound/machines/terminal/terminal_button08.ogg', )) if(SFX_DESECRATION) - soundin = pick('sound/effects/desecration/desecration-01.ogg', 'sound/effects/desecration/desecration-02.ogg', 'sound/effects/desecration/desecration-03.ogg') + soundin = pick( + 'sound/effects/desecration/desecration-01.ogg', + 'sound/effects/desecration/desecration-02.ogg', + 'sound/effects/desecration/desecration-03.ogg', + ) if(SFX_IM_HERE) - soundin = pick('sound/effects/hallucinations/im_here1.ogg', 'sound/effects/hallucinations/im_here2.ogg') + soundin = pick( + 'sound/effects/hallucinations/im_here1.ogg', + 'sound/effects/hallucinations/im_here2.ogg', + ) if(SFX_CAN_OPEN) - soundin = pick('sound/effects/can/can_open1.ogg', 'sound/effects/can/can_open2.ogg', 'sound/effects/can/can_open3.ogg') + soundin = pick( + 'sound/effects/can/can_open1.ogg', + 'sound/effects/can/can_open2.ogg', + 'sound/effects/can/can_open3.ogg', + ) if(SFX_BULLET_MISS) - soundin = pick('sound/items/weapons/bulletflyby.ogg', 'sound/items/weapons/bulletflyby2.ogg', 'sound/items/weapons/bulletflyby3.ogg') + soundin = pick( + 'sound/items/weapons/bulletflyby.ogg', + 'sound/items/weapons/bulletflyby2.ogg', + 'sound/items/weapons/bulletflyby3.ogg', + ) if(SFX_REVOLVER_SPIN) - soundin = pick('sound/items/weapons/gun/revolver/spin1.ogg', 'sound/items/weapons/gun/revolver/spin2.ogg', 'sound/items/weapons/gun/revolver/spin3.ogg') + soundin = pick( + 'sound/items/weapons/gun/revolver/spin1.ogg', + 'sound/items/weapons/gun/revolver/spin2.ogg', + 'sound/items/weapons/gun/revolver/spin3.ogg', + ) if(SFX_LAW) soundin = pick(list( 'sound/mobs/non-humanoids/beepsky/creep.ogg', @@ -289,7 +365,12 @@ 'sound/items/weapons/flashbang.ogg', )) if(SFX_GOOSE) - soundin = pick('sound/mobs/non-humanoids/goose/goose1.ogg', 'sound/mobs/non-humanoids/goose/goose2.ogg', 'sound/mobs/non-humanoids/goose/goose3.ogg', 'sound/mobs/non-humanoids/goose/goose4.ogg') + soundin = pick( + 'sound/mobs/non-humanoids/goose/goose1.ogg', + 'sound/mobs/non-humanoids/goose/goose2.ogg', + 'sound/mobs/non-humanoids/goose/goose3.ogg', + 'sound/mobs/non-humanoids/goose/goose4.ogg', + ) if(SFX_WARPSPEED) soundin = 'sound/runtime/hyperspace/hyperspace_begin.ogg' if(SFX_SM_CALM) @@ -437,11 +518,23 @@ 'sound/machines/sm/accent/delam/33.ogg', )) if(SFX_CRUNCHY_BUSH_WHACK) - soundin = pick('sound/effects/bush/crunchybushwhack1.ogg', 'sound/effects/bush/crunchybushwhack2.ogg', 'sound/effects/bush/crunchybushwhack3.ogg') + soundin = pick( + 'sound/effects/bush/crunchybushwhack1.ogg', + 'sound/effects/bush/crunchybushwhack2.ogg', + 'sound/effects/bush/crunchybushwhack3.ogg', + ) if(SFX_TREE_CHOP) - soundin = pick('sound/effects/treechop/treechop1.ogg', 'sound/effects/treechop/treechop2.ogg', 'sound/effects/treechop/treechop3.ogg') + soundin = pick( + 'sound/effects/treechop/treechop1.ogg', + 'sound/effects/treechop/treechop2.ogg', + 'sound/effects/treechop/treechop3.ogg', + ) if(SFX_ROCK_TAP) - soundin = pick('sound/effects/rock/rocktap1.ogg', 'sound/effects/rock/rocktap2.ogg', 'sound/effects/rock/rocktap3.ogg') + soundin = pick( + 'sound/effects/rock/rocktap1.ogg', + 'sound/effects/rock/rocktap2.ogg', + 'sound/effects/rock/rocktap3.ogg', + ) if(SFX_SEAR) soundin = 'sound/items/weapons/sear.ogg' if(SFX_REEL) @@ -595,4 +688,45 @@ 'sound/items/handling/helmet/visor_up1.ogg', 'sound/items/handling/helmet/visor_up2.ogg', ) + if(SFX_GROWL) + soundin = pick( + 'sound/mobs/non-humanoids/dog/growl1.ogg', + 'sound/mobs/non-humanoids/dog/growl2.ogg', + ) + if(SFX_GROWL) + soundin = pick( + 'sound/effects/wounds/sizzle1.ogg', + 'sound/effects/wounds/sizzle2.ogg', + ) + if(SFX_POLAROID) + soundin = pick( + 'sound/items/polaroid/polaroid1.ogg', + 'sound/items/polaroid/polaroid2.ogg', + ) + if(SFX_HALLUCINATION_TURN_AROUND) + soundin = pick( + 'sound/effects/hallucinations/turn_around1.ogg', + 'sound/effects/hallucinations/turn_around2.ogg', + ) + if(SFX_HALLUCINATION_I_SEE_YOU) + soundin = pick( + 'sound/effects/hallucinations/i_see_you1.ogg', + 'sound/effects/hallucinations/i_see_you2.ogg', + ) + if(SFX_LOW_HISS) + soundin = pick( + 'sound/mobs/non-humanoids/hiss/lowHiss2.ogg', + 'sound/mobs/non-humanoids/hiss/lowHiss3.ogg', + 'sound/mobs/non-humanoids/hiss/lowHiss4.ogg', + ) + if(SFX_HALLUCINATION_I_M_HERE) + soundin = pick( + 'sound/effects/hallucinations/im_here1.ogg', + 'sound/effects/hallucinations/im_here2.ogg', + ) + if(SFX_HALLUCINATION_OVER_HERE) + soundin = pick( + 'sound/effects/hallucinations/over_here2.ogg', + 'sound/effects/hallucinations/over_here3.ogg', + ) return soundin diff --git a/code/modules/antagonists/cult/datums/cult_team.dm b/code/modules/antagonists/cult/datums/cult_team.dm index 87ad2ab6491..3554a59c3b4 100644 --- a/code/modules/antagonists/cult/datums/cult_team.dm +++ b/code/modules/antagonists/cult/datums/cult_team.dm @@ -165,7 +165,7 @@ continue to_chat(cultist.current, span_bold(span_cult_large("[marker] has marked [blood_target] in the [target_area.name] as the cult's top priority, get there immediately!"))) - SEND_SOUND(cultist.current, sound(pick('sound/effects/hallucinations/over_here2.ogg','sound/effects/hallucinations/over_here3.ogg'), 0, 1, 75)) + SEND_SOUND(cultist.current, sound(SFX_HALLUCINATION_OVER_HERE, 0, 1, 75)) cultist.current.client.images += blood_target_image if(duration != INFINITY) diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm index c23fbf3441d..6f0f006842d 100644 --- a/code/modules/antagonists/heretic/knowledge/void_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm @@ -341,7 +341,7 @@ span_danger("The void storm surrounding [ascended_heretic] deflects [hitting_projectile]!"), span_userdanger("The void storm protects you from [hitting_projectile]!"), ) - playsound(ascended_heretic, pick('sound/effects/magic/VoidDeflect01.ogg', 'sound/effects/magic/VoidDeflect02.ogg', 'sound/effects/magic/VoidDeflect03.ogg'), 75, TRUE) + playsound(ascended_heretic, SFX_VOID_DEFLECT, 75, TRUE) hitting_projectile.firer = ascended_heretic if(prob(75)) hitting_projectile.set_angle(get_angle(hitting_projectile.firer, hitting_projectile.fired_from)) diff --git a/code/modules/antagonists/heretic/magic/expand_sight.dm b/code/modules/antagonists/heretic/magic/expand_sight.dm index 126a5a180ec..ade4bb1567d 100644 --- a/code/modules/antagonists/heretic/magic/expand_sight.dm +++ b/code/modules/antagonists/heretic/magic/expand_sight.dm @@ -17,7 +17,7 @@ /datum/action/innate/expand_sight/Activate() active = TRUE owner.client?.view_size.setTo(boost_to) - playsound(owner, pick('sound/effects/hallucinations/i_see_you1.ogg', 'sound/effects/hallucinations/i_see_you2.ogg'), 50, TRUE, ignore_walls = FALSE) + playsound(owner, SFX_HALLUCINATION_I_SEE_YOU, 50, TRUE, ignore_walls = FALSE) COOLDOWN_START(src, last_toggle, 8 SECONDS) /datum/action/innate/expand_sight/Deactivate() diff --git a/code/modules/meteors/meteor_types.dm b/code/modules/meteors/meteor_types.dm index 74e5ecb78c1..36fdad25d84 100644 --- a/code/modules/meteors/meteor_types.dm +++ b/code/modules/meteors/meteor_types.dm @@ -464,6 +464,6 @@ /obj/effect/meteor/pumpkin/Initialize(mapload) . = ..() - meteorsound = pick('sound/effects/hallucinations/im_here1.ogg','sound/effects/hallucinations/im_here2.ogg') + meteorsound = SFX_HALLUCINATION_I_M_HERE #undef DEFAULT_METEOR_LIFETIME diff --git a/code/modules/mob/living/carbon/alien/adult/adult.dm b/code/modules/mob/living/carbon/alien/adult/adult.dm index 8c8acf793f5..c53491e0ce7 100644 --- a/code/modules/mob/living/carbon/alien/adult/adult.dm +++ b/code/modules/mob/living/carbon/alien/adult/adult.dm @@ -67,7 +67,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( /mob/living/carbon/alien/adult/check_breath(datum/gas_mixture/breath) if(breath?.total_moles() > 0 && !HAS_TRAIT(src, TRAIT_SNEAK)) - playsound(get_turf(src), pick('sound/mobs/non-humanoids/hiss/lowHiss2.ogg', 'sound/mobs/non-humanoids/hiss/lowHiss3.ogg', 'sound/mobs/non-humanoids/hiss/lowHiss4.ogg'), 50, FALSE, -5) + playsound(get_turf(src), SFX_LOW_HISS, 50, FALSE, -5) return ..() /mob/living/carbon/alien/adult/setGrabState(newstate) diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index f9e458510ee..257601977f5 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -178,7 +178,10 @@ /datum/emote/living/carbon/snap/get_sound(mob/living/user) if(ishuman(user)) - return pick('sound/mobs/humanoids/human/snap/fingersnap1.ogg', 'sound/mobs/humanoids/human/snap/fingersnap2.ogg') + return pick( + 'sound/mobs/humanoids/human/snap/fingersnap1.ogg', + 'sound/mobs/humanoids/human/snap/fingersnap2.ogg', + ) return null /datum/emote/living/carbon/shoesteal diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 0dda080ad07..92099c7dac3 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -193,8 +193,15 @@ var/mob/living/carbon/human/human_user = user if(human_user.physique == FEMALE) - return pick('sound/mobs/humanoids/human/gasp/gasp_female1.ogg', 'sound/mobs/humanoids/human/gasp/gasp_female2.ogg', 'sound/mobs/humanoids/human/gasp/gasp_female3.ogg') - return pick('sound/mobs/humanoids/human/gasp/gasp_male1.ogg', 'sound/mobs/humanoids/human/gasp/gasp_male2.ogg') + return pick( + 'sound/mobs/humanoids/human/gasp/gasp_female1.ogg', + 'sound/mobs/humanoids/human/gasp/gasp_female2.ogg', + 'sound/mobs/humanoids/human/gasp/gasp_female3.ogg', + ) + return pick( + 'sound/mobs/humanoids/human/gasp/gasp_male1.ogg', + 'sound/mobs/humanoids/human/gasp/gasp_male2.ogg', + ) /datum/emote/living/gasp/shock key = "gaspshock" diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index 221b1d18478..77764f5ea44 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -303,7 +303,13 @@ cyborg.logevent("Chassis model has been set to [name].") sleep(0.1 SECONDS) for(var/i in 1 to 4) - playsound(cyborg, pick('sound/items/tools/drill_use.ogg', 'sound/items/tools/jaws_cut.ogg', 'sound/items/tools/jaws_pry.ogg', 'sound/items/tools/welder.ogg', 'sound/items/tools/ratchet.ogg'), 80, TRUE, -1) + playsound(cyborg, pick( + 'sound/items/tools/drill_use.ogg', + 'sound/items/tools/jaws_cut.ogg', + 'sound/items/tools/jaws_pry.ogg', + 'sound/items/tools/welder.ogg', + 'sound/items/tools/ratchet.ogg', + ), 80, TRUE, -1) sleep(0.7 SECONDS) cyborg.SetLockdown(FALSE) cyborg.ai_lockdown = FALSE diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm index eefc3389e87..ee7e53b7141 100644 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm @@ -124,7 +124,11 @@ target = C oldtarget_name = C.name speak("Level [threatlevel] infraction alert!") - playsound(src, pick('sound/mobs/non-humanoids/beepsky/criminal.ogg', 'sound/mobs/non-humanoids/beepsky/justice.ogg', 'sound/mobs/non-humanoids/beepsky/freeze.ogg'), 50, FALSE) + playsound(src, pick( + 'sound/mobs/non-humanoids/beepsky/criminal.ogg', + 'sound/mobs/non-humanoids/beepsky/justice.ogg', + 'sound/mobs/non-humanoids/beepsky/freeze.ogg', + ), 50, FALSE) playsound(src,'sound/items/weapons/saberon.ogg',50,TRUE,-1) visible_message(span_warning("[src] ignites his energy swords!")) icon_state = "grievous-c" diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index c2ff78cb76b..df9db2defb1 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -59,7 +59,10 @@ /mob/living/simple_animal/bot/secbot/ed209/threat_react(threatlevel) speak("Level [threatlevel] infraction alert!") - playsound(src, pick('sound/mobs/non-humanoids/ed209/ed209_20sec.ogg', 'sound/mobs/non-humanoids/ed209/edplaceholder.ogg'), 50, FALSE) + playsound(src, pick( + 'sound/mobs/non-humanoids/ed209/ed209_20sec.ogg', + 'sound/mobs/non-humanoids/ed209/edplaceholder.ogg', + ), 50, FALSE) /mob/living/simple_animal/bot/secbot/ed209/proc/set_weapon() //used to update the projectile type and firing sound shoot_sound = 'sound/items/weapons/laser.ogg' diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 269f08629e1..0f60aac10fa 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -509,7 +509,11 @@ /// React to detecting criminal scum by making some kind of noise /mob/living/simple_animal/bot/secbot/proc/threat_react(threatlevel) speak("Level [threatlevel] infraction alert!") - playsound(src, pick('sound/mobs/non-humanoids/beepsky/criminal.ogg', 'sound/mobs/non-humanoids/beepsky/justice.ogg', 'sound/mobs/non-humanoids/beepsky/freeze.ogg'), 50, FALSE) + playsound(src, pick( + 'sound/mobs/non-humanoids/beepsky/criminal.ogg', + 'sound/mobs/non-humanoids/beepsky/justice.ogg', + 'sound/mobs/non-humanoids/beepsky/freeze.ogg', + ), 50, FALSE) /mob/living/simple_animal/bot/secbot/explode() var/atom/Tsec = drop_location() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 70d27f023f1..c7171b3c555 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -300,7 +300,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/bullet_act(obj/projectile/P) if(BUBBLEGUM_IS_ENRAGED) visible_message(span_danger("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons while enraged!"), span_userdanger("You deflect the projectile!")) - playsound(src, pick('sound/items/weapons/bulletflyby.ogg', 'sound/items/weapons/bulletflyby2.ogg', 'sound/items/weapons/bulletflyby3.ogg'), 300, TRUE) + playsound(src, SFX_BULLET_MISS, 300, TRUE) return BULLET_ACT_BLOCK return ..() diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 3f29e3006be..79ed186472a 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -559,7 +559,10 @@ if(!use_energy()) return if(HAS_TRAIT(SSstation, STATION_TRAIT_PDA_GLITCHED)) - playsound(src, pick('sound/machines/beep/twobeep_voice1.ogg', 'sound/machines/beep/twobeep_voice2.ogg'), 50, TRUE) + playsound(src, pick( + 'sound/machines/beep/twobeep_voice1.ogg', + 'sound/machines/beep/twobeep_voice2.ogg', + ), 50, TRUE) else playsound(src, 'sound/machines/beep/twobeep_high.ogg', 50, TRUE) audible_message("*[ringtone]*") diff --git a/code/modules/pai/camera.dm b/code/modules/pai/camera.dm index a30601e4154..1341288991f 100644 --- a/code/modules/pai/camera.dm +++ b/code/modules/pai/camera.dm @@ -6,7 +6,7 @@ var/number = length(stored) picture.picture_name = "Image [number] (taken by [loc.name])" stored[picture] = TRUE - playsound(src, pick('sound/items/polaroid/polaroid1.ogg', 'sound/items/polaroid/polaroid2.ogg'), 75, TRUE, -3) + playsound(src, SFX_POLAROID, 75, TRUE, -3) balloon_alert(user, "image recorded") /** diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index 5e9d8443408..a9695fe6a8a 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -252,7 +252,7 @@ printpicture(user, picture) if(!silent) - playsound(loc, pick('sound/items/polaroid/polaroid1.ogg', 'sound/items/polaroid/polaroid2.ogg'), 75, TRUE, -3) + playsound(loc, SFX_POLAROID, 75, TRUE, -3) /obj/item/camera/proc/printpicture(mob/user, datum/picture/picture) //Normal camera proc for creating photos pictures_left-- diff --git a/code/modules/photography/camera/other.dm b/code/modules/photography/camera/other.dm index 149d69252a6..cb976a8cf31 100644 --- a/code/modules/photography/camera/other.dm +++ b/code/modules/photography/camera/other.dm @@ -34,4 +34,4 @@ /obj/item/camera/detective/after_picture(mob/user, datum/picture/picture) . = ..() - user.playsound_local(get_turf(src), pick('sound/items/polaroid/polaroid1.ogg', 'sound/items/polaroid/polaroid2.ogg'), 35, TRUE) + user.playsound_local(get_turf(src), SFX_POLAROID, 35, TRUE) diff --git a/code/modules/photography/camera/silicon_camera.dm b/code/modules/photography/camera/silicon_camera.dm index fdc390fe061..ac77ce15379 100644 --- a/code/modules/photography/camera/silicon_camera.dm +++ b/code/modules/photography/camera/silicon_camera.dm @@ -80,7 +80,7 @@ picture.picture_name = "Image [number] (taken by [loc.name])" stored[picture] = TRUE balloon_alert(user, "image recorded") - user.playsound_local(get_turf(user), pick('sound/items/polaroid/polaroid1.ogg', 'sound/items/polaroid/polaroid2.ogg'), 50, TRUE, -3) + user.playsound_local(get_turf(user), SFX_POLAROID, 50, TRUE, -3) /obj/item/camera/siliconcam/robot_camera name = "Cyborg photo camera" @@ -102,7 +102,7 @@ picture.picture_name = "Image [number] (taken by [loc.name])" stored[picture] = TRUE balloon_alert(user, "image recorded and saved locally") - playsound(src, pick('sound/items/polaroid/polaroid1.ogg', 'sound/items/polaroid/polaroid2.ogg'), 75, TRUE, -3) + playsound(src, SFX_POLAROID, 75, TRUE, -3) /obj/item/camera/siliconcam/robot_camera/selectpicture(mob/living/silicon/robot/user) if(istype(user) && user.connected_ai) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 6a2fd57821f..16db09042b3 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -60,7 +60,10 @@ /obj/vehicle/sealed/car/clowncar/mob_forced_enter(mob/M, silent = FALSE) . = ..() - playsound(src, pick('sound/vehicles/clowncar_load1.ogg', 'sound/vehicles/clowncar_load2.ogg'), 75) + playsound(src, pick( + 'sound/vehicles/clowncar_load1.ogg', + 'sound/vehicles/clowncar_load2.ogg', + ), 75) if(iscarbon(M)) var/mob/living/carbon/forced_mob = M if(forced_mob.has_reagent(/datum/reagent/consumable/ethanol/irishcarbomb)) @@ -143,13 +146,20 @@ carb.Paralyze(4 SECONDS) //I play to make sprites go horizontal hittarget_living.visible_message(span_warning("[src] rams into [hittarget_living] and sucks [hittarget_living.p_them()] up!")) //fuck off shezza this isn't ERP. mob_forced_enter(hittarget_living) - playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75) + playsound(src, pick( + 'sound/vehicles/clowncar_ram1.ogg', + 'sound/vehicles/clowncar_ram2.ogg', + 'sound/vehicles/clowncar_ram3.ogg', + ), 75) log_combat(src, hittarget_living, "sucked up") return if(!isclosedturf(bumped)) return visible_message(span_warning("[src] rams into [bumped] and crashes!")) - playsound(src, pick('sound/vehicles/clowncar_crash1.ogg', 'sound/vehicles/clowncar_crash2.ogg'), 75) + playsound(src, pick( + 'sound/vehicles/clowncar_crash1.ogg', + 'sound/vehicles/clowncar_crash2.ogg', + ), 75) playsound(src, 'sound/vehicles/clowncar_crashpins.ogg', 75) dump_mobs(TRUE) log_combat(src, bumped, "crashed into", null, "dumping all passengers") @@ -301,7 +311,11 @@ var/mob/living/unlucky_sod = pick(return_controllers_with_flag(VEHICLE_CONTROL_KIDNAPPED)) mob_exit(unlucky_sod, silent = TRUE) flick("clowncar_recoil", src) - playsound(src, pick('sound/vehicles/carcannon1.ogg', 'sound/vehicles/carcannon2.ogg', 'sound/vehicles/carcannon3.ogg'), 75) + playsound(src, pick( + 'sound/vehicles/carcannon1.ogg', + 'sound/vehicles/carcannon2.ogg', + 'sound/vehicles/carcannon3.ogg', + ), 75) unlucky_sod.throw_at(target, 10, 2) log_combat(user, unlucky_sod, "fired", src, "towards [target]") //this doesn't catch if the mob hits something between the car and the target return COMSIG_MOB_CANCEL_CLICKON