From 4cf6595d12e8d3532a7446e36dd659606e11231b Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Tue, 9 Jul 2024 01:54:38 +0200 Subject: [PATCH] Makes all playsounds use bools for vary (#26183) * Makes all playsounds use `TRUE` for vary * Same but for `FALSE` --- code/_onclick/item_attack.dm | 2 +- code/datums/components/defibrillator.dm | 6 +++--- code/datums/components/paintable.dm | 2 +- code/datums/diseases/berserker.dm | 4 ++-- code/datums/spells/charge_up_bounce.dm | 2 +- code/datums/spells/ethereal_jaunt.dm | 2 +- code/datums/status_effects/debuffs.dm | 2 +- code/game/area/areas/depot-areas.dm | 2 +- .../miniantags/abduction/abduction_gear.dm | 6 +++--- .../demons/slaughter_demon/slaughter.dm | 2 +- .../guardian/types/standard_guardian.dm | 8 ++++---- code/game/machinery/PDApainter.dm | 2 +- code/game/machinery/doors/airlock.dm | 6 +++--- code/game/machinery/iv_drip.dm | 2 +- code/game/machinery/portable_turret.dm | 2 +- code/game/machinery/syndicatebomb.dm | 2 +- code/game/mecha/equipment/tools/work_tools.dm | 4 ++-- code/game/mecha/mecha.dm | 4 ++-- code/game/objects/items.dm | 2 +- code/game/objects/items/cardboard_cutouts.dm | 4 ++-- .../items/devices/chameleon_counter.dm | 4 ++-- .../objects/items/devices/chameleonproj.dm | 6 +++--- code/game/objects/items/devices/powersink.dm | 2 +- .../objects/items/devices/radio/beacon.dm | 4 ++-- code/game/objects/items/devices/whistle.dm | 4 ++-- code/game/objects/items/robot/robot_items.dm | 2 +- .../items/stacks/sheets/sheet_types.dm | 2 +- code/game/objects/items/tools/crowbar.dm | 2 +- code/game/objects/items/tools/wirecutters.dm | 2 +- code/game/objects/items/tools/wrench.dm | 2 +- code/game/objects/items/toys.dm | 6 +++--- .../objects/items/weapons/bee_briefcase.dm | 2 +- code/game/objects/items/weapons/courtroom.dm | 2 +- code/game/objects/items/weapons/defib.dm | 2 +- code/game/objects/items/weapons/garrote.dm | 4 ++-- .../items/weapons/grenades/clusterbuster.dm | 4 ++-- .../objects/items/weapons/grenades/grenade.dm | 4 ++-- .../items/weapons/grenades/smokebomb.dm | 2 +- code/game/objects/items/weapons/handcuffs.dm | 2 +- .../objects/items/weapons/holy_weapons.dm | 2 +- code/game/objects/items/weapons/legcuffs.dm | 2 +- .../objects/items/weapons/storage/bags.dm | 2 +- .../objects/items/weapons/storage/bible.dm | 6 +++--- .../objects/items/weapons/storage/boxes.dm | 2 +- code/game/objects/items/weapons/twohanded.dm | 2 +- code/game/objects/items/weapons/weaponry.dm | 4 ++-- code/game/objects/structures/curtains.dm | 2 +- .../objects/structures/depot_structures.dm | 2 +- .../structures/stool_bed_chair_nest/chairs.dm | 4 ++-- .../stool_bed_chair_nest/wheelchair.dm | 2 +- code/game/objects/structures/tables_racks.dm | 4 ++-- code/game/turfs/simulated/floor/plating.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/admin/verbs/playsound.dm | 2 +- .../antagonists/changeling/powers/revive.dm | 2 +- code/modules/assembly/mousetrap.dm | 4 ++-- .../atmospherics/machinery/atmospherics.dm | 2 +- code/modules/clothing/gloves/misc_gloves.dm | 2 +- code/modules/clothing/head/helmet.dm | 4 ++-- code/modules/clothing/masks/gasmask.dm | 4 ++-- code/modules/clothing/shoes/magboots.dm | 2 +- code/modules/clothing/shoes/misc_shoes.dm | 2 +- code/modules/clothing/suits/armor_suits.dm | 2 +- .../under/jobs/plasmamen/_plasmamen.dm | 2 +- code/modules/customitems/item_defines.dm | 2 +- code/modules/events/floorcluwne_event.dm | 2 +- code/modules/events/vent_clog.dm | 2 +- .../food_and_drinks/food/foods/pizza.dm | 4 ++-- code/modules/hydroponics/grown/banana.dm | 4 ++-- code/modules/hydroponics/grown/citrus.dm | 2 +- code/modules/hydroponics/hydroitemdefines.dm | 4 ++-- .../objs/items/instrument_items.dm | 6 +++--- code/modules/martial_arts/brawling.dm | 8 ++++---- .../martial_arts/combos/cqc/consecutive.dm | 2 +- code/modules/martial_arts/combos/cqc/kick.dm | 4 ++-- .../martial_arts/combos/cqc/pressure.dm | 2 +- code/modules/martial_arts/combos/cqc/slam.dm | 2 +- .../combos/krav_maga/leg_sweep.dm | 2 +- .../combos/krav_maga/lung_punch.dm | 2 +- .../combos/krav_maga/neck_chop.dm | 2 +- .../combos/mimejutsu/mimechucks.dm | 4 ++-- .../combos/plasma_fist/the_plasma_fist.dm | 2 +- .../combos/plasma_fist/throwback.dm | 2 +- .../combos/plasma_fist/tornado_sweep.dm | 2 +- code/modules/martial_arts/cqc.dm | 8 ++++---- code/modules/martial_arts/grav_stomp.dm | 2 +- code/modules/martial_arts/martial.dm | 6 +++--- .../mining/equipment/kinetic_crusher.dm | 2 +- code/modules/mining/fulton.dm | 4 ++-- .../mob/living/carbon/alien/alien_death.dm | 2 +- .../mob/living/carbon/alien/alien_defense.dm | 2 +- .../carbon/alien/humanoid/caste/hunter.dm | 2 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../carbon/alien/humanoid/humanoid_defense.dm | 12 +++++------ .../carbon/alien/larva/larva_defense.dm | 4 ++-- .../modules/mob/living/carbon/carbon_procs.dm | 6 +++--- .../mob/living/carbon/human/human_defense.dm | 4 ++-- .../living/carbon/human/human_inventory.dm | 2 +- .../mob/living/carbon/human/human_mob.dm | 2 +- .../living/carbon/human/species/_species.dm | 4 ++-- code/modules/mob/living/living_defense.dm | 8 ++++---- code/modules/mob/living/silicon/pai/pai.dm | 2 +- .../mob/living/silicon/silicon_defense.dm | 8 ++++---- .../living/simple_animal/animal_defense.dm | 8 ++++---- .../mob/living/simple_animal/bot/bot.dm | 2 +- .../mob/living/simple_animal/bot/ed209bot.dm | 2 +- .../mob/living/simple_animal/bot/griefsky.dm | 10 +++++----- .../mob/living/simple_animal/bot/honkbot.dm | 6 +++--- .../mob/living/simple_animal/bot/secbot.dm | 2 +- .../simple_animal/friendly/diona_nymph.dm | 2 +- .../simple_animal/hostile/floorcluwne.dm | 4 ++-- .../hostile/megafauna/ancient_robot.dm | 2 +- .../hostile/megafauna/blood_drunk_miner.dm | 4 ++-- .../hostile/mining/elites/elite.dm | 12 +++++------ code/modules/mob/mob_grab.dm | 2 +- code/modules/ninja/energy_katana.dm | 2 +- code/modules/paperwork/photography.dm | 6 +++--- code/modules/projectiles/guns/energy_guns.dm | 4 ++-- .../projectiles/guns/grenade_launcher.dm | 2 +- code/modules/projectiles/guns/magic.dm | 2 +- .../projectiles/guns/projectile_gun.dm | 2 +- code/modules/projectiles/guns/syringe_gun.dm | 2 +- code/modules/projectiles/projectile_base.dm | 6 +++--- .../chemistry/reagents/food_reagents.dm | 2 +- .../reagents/chemistry/reagents/medicine.dm | 2 +- .../chemistry/reagents/misc_reagents.dm | 2 +- .../reagents/chemistry/reagents/water.dm | 2 +- .../chemistry/recipes/pyrotechnics.dm | 2 +- .../reagents/reagent_containers/spray.dm | 2 +- code/modules/recycling/disposal.dm | 20 +++++++++---------- code/modules/recycling/sortingmachinery.dm | 2 +- code/modules/research/experimentor.dm | 10 +++++----- code/modules/ruins/objects_and_mobs/gym.dm | 2 +- code/modules/surgery/organs/organ_external.dm | 2 +- code/modules/telesci/telepad.dm | 2 +- code/modules/vehicle/vehicle.dm | 2 +- 136 files changed, 233 insertions(+), 233 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 894e0d63f5b..848cf74f4d7 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -70,7 +70,7 @@ return if(!force) - playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1) + playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), TRUE, -1) else SEND_SIGNAL(M, COMSIG_ITEM_ATTACK) add_attack_logs(user, M, "Attacked with [name] ([uppertext(user.a_intent)]) ([uppertext(damtype)])", (M.ckey && force > 0 && damtype != STAMINA) ? null : ATKLOG_ALMOSTALL) diff --git a/code/datums/components/defibrillator.dm b/code/datums/components/defibrillator.dm index 460615868d1..be017d71dd2 100644 --- a/code/datums/components/defibrillator.dm +++ b/code/datums/components/defibrillator.dm @@ -226,7 +226,7 @@ set_cooldown(cooldown) user.visible_message("[defib_ref] pings: Cardiac arrhythmia corrected.") target.visible_message("[target]'s body convulses a bit.", "You feel a jolt, and your heartbeat seems to steady.") - playsound(get_turf(defib_ref), 'sound/machines/defib_zap.ogg', 50, 1, -1) + playsound(get_turf(defib_ref), 'sound/machines/defib_zap.ogg', 50, TRUE, -1) playsound(get_turf(defib_ref), "bodyfall", 50, 1) playsound(get_turf(defib_ref), 'sound/machines/defib_success.ogg', 50, 0) busy = FALSE @@ -240,7 +240,7 @@ target.visible_message("[target]'s body convulses a bit.") playsound(get_turf(defib_ref), "bodyfall", 50, 1) - playsound(get_turf(defib_ref), 'sound/machines/defib_zap.ogg', 50, 1, -1) + playsound(get_turf(defib_ref), 'sound/machines/defib_zap.ogg', 50, TRUE, -1) ghost = target.get_ghost(TRUE) // We have to double check whether the dead guy has entered their body during the above // Run through some quick failure states after shocking. @@ -340,7 +340,7 @@ "[user] touches you with [parent], and you feel a strong jolt!") target.apply_damage(60, STAMINA) target.KnockDown(10 SECONDS) - playsound(get_turf(parent), 'sound/machines/defib_zap.ogg', 50, 1, -1) + playsound(get_turf(parent), 'sound/machines/defib_zap.ogg', 50, TRUE, -1) target.emote("gasp") if(combat && prob(heart_attack_chance)) target.set_heartattack(TRUE) diff --git a/code/datums/components/paintable.dm b/code/datums/components/paintable.dm index 813610f619d..e77e0514719 100644 --- a/code/datums/components/paintable.dm +++ b/code/datums/components/paintable.dm @@ -27,5 +27,5 @@ current_paint = colour var/atom/A = parent A.add_atom_colour(colour, FIXED_COLOUR_PRIORITY) - playsound(spraycan, 'sound/effects/spray.ogg', 5, 1, 5) + playsound(spraycan, 'sound/effects/spray.ogg', 5, TRUE, 5) to_chat(user, "You spray [spraycan] on [A], painting it.") diff --git a/code/datums/diseases/berserker.dm b/code/datums/diseases/berserker.dm index b9610057d13..0a310eeb8d6 100644 --- a/code/datums/diseases/berserker.dm +++ b/code/datums/diseases/berserker.dm @@ -47,9 +47,9 @@ continue var/damage = rand(1, 5) if(prob(80)) - playsound(affected_mob.loc, "punch", 25, 1, -1) + playsound(affected_mob.loc, "punch", 25, TRUE, -1) affected_mob.visible_message("[affected_mob] hits [M] with [affected_mob.p_their()] thrashing!") M.adjustBruteLoss(damage) else - playsound(affected_mob.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(affected_mob.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) affected_mob.visible_message("[affected_mob] fails to hit [M] with [affected_mob.p_their()] thrashing!") diff --git a/code/datums/spells/charge_up_bounce.dm b/code/datums/spells/charge_up_bounce.dm index 6555f7646ce..516403313d8 100644 --- a/code/datums/spells/charge_up_bounce.dm +++ b/code/datums/spells/charge_up_bounce.dm @@ -57,7 +57,7 @@ create_beam(origin, target) apply_bounce_effect(origin, target, energy, user) add_attack_logs(user, target, "Bounce spell '[src]' bounced on") - playsound(get_turf(target), bounce_hit_sound, 50, 1, -1) + playsound(get_turf(target), bounce_hit_sound, 50, TRUE, -1) if(bounces >= 1) var/list/possible_targets = list() diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 731cbaf83d3..e707040501d 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -53,7 +53,7 @@ jaunt_steam(mobloc) ADD_TRAIT(target, TRAIT_IMMOBILIZED, "jaunt") holder.reappearing = 1 - playsound(get_turf(target), 'sound/magic/ethereal_exit.ogg', 50, 1, -1) + playsound(get_turf(target), 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1) sleep(jaunt_in_time * 4) new jaunt_in_type(mobloc, holder.dir) target.setDir(holder.dir) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index caba75e2659..8285baf82e7 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -146,7 +146,7 @@ new /obj/effect/temp_visual/bleed/explode(T) for(var/d in GLOB.alldirs) new /obj/effect/temp_visual/dir_setting/bloodsplatter(T, d) - playsound(T, "desceration", 200, 1, -1) + playsound(T, "desceration", 200, TRUE, -1) owner.adjustBruteLoss(bleed_damage) else new /obj/effect/temp_visual/bleed(get_turf(owner)) diff --git a/code/game/area/areas/depot-areas.dm b/code/game/area/areas/depot-areas.dm index b9e045e1d45..7c25b50b623 100644 --- a/code/game/area/areas/depot-areas.dm +++ b/code/game/area/areas/depot-areas.dm @@ -286,7 +286,7 @@ var/log_msg = "[key_name(user)] has triggered the depot self destruct at [A.name] ([T.x],[T.y],[T.z])" message_admins(log_msg) log_game(log_msg) - playsound(user, 'sound/machines/alarm.ogg', 100, 0, 0) + playsound(user, 'sound/machines/alarm.ogg', 100, FALSE, 0) else log_game("Depot self destruct activated.") if(reactor) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 1827bfb96ec..ec13c9c829b 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -332,7 +332,7 @@ CONTENTS: L.visible_message("[user] has stunned [L] with [src]!", \ "[user] has stunned you with [src]!") - playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1) add_attack_logs(user, L, "Stunned with [src]") @@ -340,7 +340,7 @@ CONTENTS: if(L.IsStunned() || L.IsSleeping()) L.visible_message("[user] has induced sleep in [L] with [src]!", \ "You suddenly feel very drowsy!") - playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1) L.Sleeping(120 SECONDS) add_attack_logs(user, L, "Put to sleep with [src]") else @@ -354,7 +354,7 @@ CONTENTS: return var/mob/living/carbon/C = L if(!C.handcuffed) - playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2) C.visible_message("[user] begins restraining [C] with [src]!", \ "[user] begins shaping an energy field around your hands!") if(do_mob(user, C, 30)) diff --git a/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm b/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm index 9274bf55b80..abb62267c8a 100644 --- a/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm +++ b/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm @@ -297,7 +297,7 @@ /mob/living/simple_animal/demon/slaughter/laughter/release_consumed(mob/living/M) if(M.revive()) M.grab_ghost(force = TRUE) - playsound(get_turf(src), feast_sound, 50, 1, -1) + playsound(get_turf(src), feast_sound, 50, TRUE, -1) to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") ..(M) diff --git a/code/game/gamemodes/miniantags/guardian/types/standard_guardian.dm b/code/game/gamemodes/miniantags/guardian/types/standard_guardian.dm index d0f7eee819c..2ffa36b78eb 100644 --- a/code/game/gamemodes/miniantags/guardian/types/standard_guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/types/standard_guardian.dm @@ -21,10 +21,10 @@ visible_message("[src] punches [target]!") else say("[battlecry][battlecry][battlecry][battlecry][battlecry]", TRUE) - playsound(loc, attack_sound, 50, 1, 1) - playsound(loc, attack_sound, 50, 1, 1) - playsound(loc, attack_sound, 50, 1, 1) - playsound(loc, attack_sound, 50, 1, 1) + playsound(loc, attack_sound, 50, TRUE, 1) + playsound(loc, attack_sound, 50, TRUE, 1) + playsound(loc, attack_sound, 50, TRUE, 1) + playsound(loc, attack_sound, 50, TRUE, 1) /mob/living/simple_animal/hostile/guardian/punch/sealpunch name = "Seal Sprit" diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index f5ef17c1d15..5e5edfdcefb 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -174,7 +174,7 @@ if(storedpda) storedpda.icon_state = preview_icon_state storedpda.desc = colorlist[preview_icon_state][2] - playsound(loc, 'sound/effects/spray.ogg', 5, 1, 5) + playsound(loc, 'sound/effects/spray.ogg', 5, TRUE, 5) update_pda_cache() /obj/machinery/pdapainter/proc/update_pda_cache() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 60a7b9d96c6..090765d4845 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -616,7 +616,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) if("deny") if(stat == CONSCIOUS) update_icon(AIRLOCK_DENY) - playsound(src,doorDeni,50,0,3) + playsound(src, doorDeni, 50, FALSE, 3) sleep(6) update_icon(AIRLOCK_CLOSED) @@ -1358,7 +1358,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) return 0 locked = TRUE - playsound(src, boltDown, 30, 0, 3) + playsound(src, boltDown, 30, FALSE, 3) update_icon() return 1 @@ -1371,7 +1371,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) return locked = FALSE - playsound(src,boltUp, 30, 0, 3) + playsound(src,boltUp, 30, FALSE, 3) update_icon() return 1 diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 4afbe9da35e..431e78e175a 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -94,7 +94,7 @@ . = ..() if(!.) // ..() will return 0 if we didn't actually move anywhere. return - playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, 1, ignore_walls = FALSE) + playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE) #undef IV_TAKING #undef IV_INJECTING diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 94b79874bdb..017fede1164 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -416,7 +416,7 @@ GLOBAL_LIST_EMPTY(turret_icons) M.changeNext_move(CLICK_CD_MELEE) M.do_attack_animation(src) if(!(stat & BROKEN)) - playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1) + playsound(src.loc, 'sound/weapons/slash.ogg', 25, TRUE, -1) visible_message("[M] has slashed at [src]!") take_damage(15) else diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 3859c6a0c62..d4d0257317d 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -522,7 +522,7 @@ message_admins(adminlog) log_game(adminlog) - playsound(loc, 'sound/effects/bamf.ogg', 75, 1, 5) + playsound(loc, 'sound/effects/bamf.ogg', 75, TRUE, 5) if(loc && istype(loc, /obj/machinery/syndicatebomb)) qdel(loc) diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 7b7976c79c0..0ef043446c2 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -147,10 +147,10 @@ var/obj/structure/reagent_dispensers/watertank/WT = target WT.reagents.trans_to(src, 1000) occupant_message("Extinguisher refilled.") - playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6) + playsound(chassis, 'sound/effects/refill.ogg', 50, TRUE, -6) else if(reagents.total_volume > 0) - playsound(chassis, 'sound/effects/extinguish.ogg', 75, 1, -3) + playsound(chassis, 'sound/effects/extinguish.ogg', 75, TRUE, -3) var/direction = get_dir(chassis,target) var/turf/T = get_turf(target) var/turf/T1 = get_step(T,turn(direction, 90)) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 94eebd80efb..0c7d5ca91db 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -421,7 +421,7 @@ L.buckled = 0 L.Weaken(10 SECONDS) L.apply_effect(STUTTER, 10 SECONDS) - playsound(src, pick(hit_sound), 50, 0, 0) + playsound(src, pick(hit_sound), 50, FALSE, 0) breakthrough = TRUE else @@ -555,7 +555,7 @@ /obj/mecha/attack_hand(mob/living/user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) - playsound(loc, 'sound/weapons/tap.ogg', 40, 1, -1) + playsound(loc, 'sound/weapons/tap.ogg', 40, TRUE, -1) user.visible_message("[user] hits [name]. Nothing happens", "You hit [name] with no visible effect.") log_message("Attack by hand/paw. Attacker - [user].") diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 13ae04c8d8e..7042243b7bf 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -625,7 +625,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons src.add_fingerprint(user) - playsound(loc, src.hitsound, 30, 1, -1) + playsound(loc, src.hitsound, 30, TRUE, -1) user.do_attack_animation(M) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 18e3de3759e..1995f8d2e8f 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -47,9 +47,9 @@ if(I.flags & NOBLUDGEON) return if(!I.force) - playsound(loc, 'sound/weapons/tap.ogg', 20, 1, -1) + playsound(loc, 'sound/weapons/tap.ogg', 20, TRUE, -1) else if(I.hitsound) - playsound(loc, I.hitsound, 20, 1, -1) + playsound(loc, I.hitsound, 20, TRUE, -1) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) diff --git a/code/game/objects/items/devices/chameleon_counter.dm b/code/game/objects/items/devices/chameleon_counter.dm index c32d56d7f1a..bef3d4e5681 100644 --- a/code/game/objects/items/devices/chameleon_counter.dm +++ b/code/game/objects/items/devices/chameleon_counter.dm @@ -27,7 +27,7 @@ return if(dummy_active || !isitem(target)) return - playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6) + playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, TRUE, -6) to_chat(user, "Scanned [target].") saved_name = target.name saved_desc = target.desc @@ -43,7 +43,7 @@ /obj/item/chameleon_counterfeiter/proc/matter_toggle(mob/living/user) if(!can_use || !saved_name) return - playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) + playsound(get_turf(src), 'sound/effects/pop.ogg', 100, TRUE, -6) if(dummy_active) matter_deactivate() to_chat(user, "You deactivate [src].") diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 5470f5adeec..673140791c3 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -39,7 +39,7 @@ return if(!active_dummy) if(isitem(target) && !istype(target, /obj/item/disk/nuclear)) - playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6) + playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, TRUE, -6) to_chat(user, "Scanned [target].") saved_item = target.type saved_icon = target.icon @@ -55,7 +55,7 @@ return if(active_dummy) eject_all() - playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) + playsound(get_turf(src), 'sound/effects/pop.ogg', 100, TRUE, -6) QDEL_NULL(active_dummy) to_chat(usr, "You deactivate [src].") var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) @@ -64,7 +64,7 @@ spawn(8) qdel(T) else - playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) + playsound(get_turf(src), 'sound/effects/pop.ogg', 100, TRUE, -6) var/obj/O = new saved_item(src) if(!O) return diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index daa6652feed..c7721034e0b 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -141,7 +141,7 @@ if(!admins_warned) admins_warned = TRUE message_admins("Power sink at ([x],[y],[z] - JMP) is 95% full. Explosion imminent.") - playsound(src, 'sound/effects/screech.ogg', 100, 1, 1) + playsound(src, 'sound/effects/screech.ogg', 100, TRUE, 1) if(power_drained >= max_power) STOP_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index ae560fec034..498e3c41aba 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -59,7 +59,7 @@ if(user) to_chat(user, "Locked In") new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) - playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) + playsound(src, 'sound/effects/pop.ogg', 100, TRUE, 1) user.drop_item() qdel(src) @@ -132,7 +132,7 @@ if(user) to_chat(user, "Locked In") new bomb(user.loc) - playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) + playsound(src, 'sound/effects/pop.ogg', 100, TRUE, 1) user.drop_item() qdel(src) diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index b7a80d4cf7a..7a4dfbd41e0 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -17,10 +17,10 @@ return if(emagged) - playsound(get_turf(src), 'sound/voice/binsult.ogg', 100, 1, vary = 0)//hueheuheuheuheuheuhe + playsound(get_turf(src), 'sound/voice/binsult.ogg', 100, TRUE, vary = 0)//hueheuheuheuheuheuhe user.visible_message("[user]'s [name] gurgles, \"FUCK YOUR CUNT YOU SHIT EATING CUNT TILL YOU ARE A MASS EATING SHIT CUNT. EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS TO FUCK UP SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FROM THE DEPTHS OF SHIT\"") else - playsound(get_turf(src), 'sound/voice/halt.ogg', 100, 1, vary = 0) + playsound(get_turf(src), 'sound/voice/halt.ogg', 100, TRUE, vary = 0) user.visible_message("[user]'s [name] rasps, \"Halt! Security!\"") next_use_time = world.time + USE_COOLDOWN diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index f15eb6d4e9d..c40fb8d86c3 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -28,7 +28,7 @@ M.visible_message("[user] has prodded [M] with [src]!", \ "[user] has prodded you with [src]!") - playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1) add_attack_logs(user, M, "Stunned with [src] ([uppertext(user.a_intent)])") #define CYBORG_HUGS 0 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 94585a31f1a..8cf42add853 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -491,7 +491,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( if(istype(I, /obj/item/stamp/clown) && !isstorage(loc)) var/atom/droploc = drop_location() if(use(1)) - playsound(I, 'sound/items/bikehorn.ogg', 50, 1, -1) + playsound(I, 'sound/items/bikehorn.ogg', 50, TRUE, -1) to_chat(user, "You stamp the cardboard! It's a clown box! Honk!") new/obj/item/storage/box/clown(droploc) //bugfix else diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index c53a55e217a..8becf16684d 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -128,7 +128,7 @@ /obj/item/crowbar/power/suicide_act(mob/user) user.visible_message("[user] is putting [user.p_their()] head in [src]. It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) + playsound(loc, 'sound/items/jaws_pry.ogg', 50, TRUE, -1) return BRUTELOSS /obj/item/crowbar/power/attack_self(mob/user) diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 7a2d0f8db30..eaa00d8e638 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -44,7 +44,7 @@ /obj/item/wirecutters/suicide_act(mob/user) user.visible_message("[user] is cutting at [user.p_their()] [is_robotic_suicide(user) ? "wiring" : "arteries"] with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, usesound, 50, 1, -1) + playsound(loc, usesound, 50, TRUE, -1) return BRUTELOSS /obj/item/wirecutters/proc/is_robotic_suicide(mob/user) diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index 9b56a07e0c4..d921a5a4cd4 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -107,7 +107,7 @@ // Immobilize stops them from wandering off and dropping the wrench user.Immobilize(10 SECONDS) - playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) + playsound(loc, 'sound/effects/pray.ogg', 50, TRUE, -1) // Let the sound effect finish playing sleep(20) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 6de7872a42b..45ceb057785 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -372,7 +372,7 @@ user.visible_message("[user] presses a button on [src]", "You activate [src], it plays a loud noise!", "You hear the click of a button.") spawn(5) //gia said so icon_state = "nuketoy" - playsound(src, 'sound/machines/alarm.ogg', 100, 0, 0) + playsound(src, 'sound/machines/alarm.ogg', 100, FALSE, 0) sleep(135) icon_state = "nuketoycool" sleep(cooldown - world.time) @@ -546,10 +546,10 @@ if(has_stuffing || grenade) var/cuddle_verb = pick("hugs", "cuddles", "snugs") user.visible_message("[user] [cuddle_verb] [src].") - playsound(get_turf(src), poof_sound, 50, 1, -1) + playsound(get_turf(src), poof_sound, 50, TRUE, -1) if(grenade && !grenade.active) add_attack_logs(user, user, "activated a hidden grenade in [src].", ATKLOG_MOST) - playsound(loc, 'sound/weapons/armbomb.ogg', 10, 1, -3) + playsound(loc, 'sound/weapons/armbomb.ogg', 10, TRUE, -3) //We call with grenade as argument, so cutting the grenade out doesn't magically defuse it addtimer(CALLBACK(src, PROC_REF(explosive_betrayal), grenade), rand(1, 3) SECONDS) else diff --git a/code/game/objects/items/weapons/bee_briefcase.dm b/code/game/objects/items/weapons/bee_briefcase.dm index 9175430e454..8575e710b45 100644 --- a/code/game/objects/items/weapons/bee_briefcase.dm +++ b/code/game/objects/items/weapons/bee_briefcase.dm @@ -53,7 +53,7 @@ else if(istype(I, /obj/item/reagent_containers/spray/pestspray)) bees_left = max(0, (bees_left - 6)) to_chat(user, "You spray [I] into [src].") - playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6) + playsound(loc, 'sound/effects/spray3.ogg', 50, TRUE, -6) /obj/item/bee_briefcase/attack_self(mob/user) var/bees_released diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm index 2febfabde3b..fada7d9a400 100644 --- a/code/game/objects/items/weapons/courtroom.dm +++ b/code/game/objects/items/weapons/courtroom.dm @@ -15,7 +15,7 @@ /obj/item/gavelhammer/suicide_act(mob/user) user.visible_message("[user] has sentenced [user.p_themselves()] to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) + playsound(loc, 'sound/items/gavel.ogg', 50, TRUE, -1) return BRUTELOSS /obj/item/gavelblock diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 55b7a9b25a0..828f6366bb4 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -345,7 +345,7 @@ /obj/item/shockpaddles/suicide_act(mob/user) user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!") defib.deductcharge(revivecost) - playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) + playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, TRUE, -1) return OXYLOSS /obj/item/shockpaddles/dropped(mob/user) diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index 8dc50c67ca3..cc70eb9816a 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -105,7 +105,7 @@ strangling = M update_icon(UPDATE_ICON_STATE) - playsound(loc, 'sound/weapons/cablecuff.ogg', 15, 1, -10, ignore_walls = FALSE) + playsound(loc, 'sound/weapons/cablecuff.ogg', 15, TRUE, -10, ignore_walls = FALSE) M.visible_message("[U] comes from behind and begins garroting [M] with [src]!", \ "[U] begins garroting you with [src]![improvised ? "" : " You are unable to speak!"]", \ @@ -174,5 +174,5 @@ /obj/item/garrote/suicide_act(mob/user) user.visible_message("[user] is wrapping [src] around [user.p_their()] neck and pulling the handles! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/cablecuff.ogg', 15, 1, -10, ignore_walls = FALSE) + playsound(loc, 'sound/weapons/cablecuff.ogg', 15, TRUE, -10, ignore_walls = FALSE) return OXYLOSS diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm index 6ca1d16e3fd..041fa0f20f0 100644 --- a/code/game/objects/items/weapons/grenades/clusterbuster.dm +++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm @@ -24,7 +24,7 @@ new /obj/effect/payload_spawner(loc, payload, numspawned)//Launches payload - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) qdel(src) @@ -52,7 +52,7 @@ new /obj/effect/payload_spawner(loc, payload, rand(4,8)) - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) qdel(src) diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 0a2f8626210..b76df931a0b 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -26,7 +26,7 @@ to_chat(user, "Huh? How does this thing work?") active = TRUE icon_state = initial(icon_state) + "_active" - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) spawn(5) if(user) user.drop_item() @@ -42,7 +42,7 @@ to_chat(user, "You prime the [name]! [det_time/10] seconds!") active = TRUE icon_state = initial(icon_state) + "_active" - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) spawn(det_time) prime() return diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index ad386ee5503..854b921648b 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -18,7 +18,7 @@ return ..() /obj/item/grenade/smokebomb/prime() - playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(src.loc, 'sound/effects/smoke.ogg', 50, TRUE, -3) smoke.set_up(10, FALSE) spawn(0) src.smoke.start() diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 8bb2e5984e3..1ce36a89618 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -91,7 +91,7 @@ C.visible_message("[user] is trying to put [src.name] on [C]!", \ "[user] is trying to put [src.name] on [C]!") - playsound(loc, cuffsound, 15, 1, -10) + playsound(loc, cuffsound, 15, TRUE, -10) if(do_mob(user, C, 30)) apply_cuffs(C, user, remove_src) to_chat(user, "You handcuff [C].") diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 5fcb242846c..d06e662958b 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -53,7 +53,7 @@ user.unEquip(src, 1) user.visible_message("[src] slips out of the grip of [user] as they try to pick it up, bouncing upwards and smacking [user.p_them()] in the face!", \ "[src] slips out of your grip as you pick it up, bouncing upwards and smacking you in the face!") - playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1) + playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, TRUE, -1) throw_at(get_edge_target_turf(user, pick(GLOB.alldirs)), rand(1, 3), 5) diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 130d000a155..f816d7c8dd5 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -36,7 +36,7 @@ /obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user) user.visible_message("[user] is sticking [user.p_their()] head in [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, TRUE, -1) return BRUTELOSS /obj/item/restraints/legcuffs/beartrap/attack_self(mob/user) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index e6bdd19d4bf..fd596ae58b3 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -76,7 +76,7 @@ /obj/item/storage/bag/trash/suicide_act(mob/user) user.visible_message("[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting!") - playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1) + playsound(loc, 'sound/items/eatfood.ogg', 50, TRUE, -1) return TOXLOSS /obj/item/storage/bag/trash/update_icon_state() diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index dd88e73e614..4ecea20ac62 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -101,15 +101,15 @@ bless(H) H.visible_message("[user] heals [H == user ? "[user.p_themselves()]" : "[H]"] with the power of [deity_name]!", "May the power of [deity_name] compel you to be healed!") - playsound(loc, "punch", 25, 1, -1) + playsound(loc, "punch", 25, TRUE, -1) else M.adjustBrainLoss(10) to_chat(M, "You feel dumber.") H.visible_message("[user] beats [H == user ? "[user.p_themselves()]" : "[H]"] over the head with [src]!") - playsound(src.loc, "punch", 25, 1, -1) + playsound(src.loc, "punch", 25, TRUE, -1) else M.visible_message("[user] smacks [M]'s lifeless corpse with [src].") - playsound(src.loc, "punch", 25, 1, -1) + playsound(src.loc, "punch", 25, TRUE, -1) /obj/item/storage/bible/afterattack(atom/target, mob/user, proximity, params) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index c4ff3c0aa5c..570c764f553 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1130,7 +1130,7 @@ /obj/item/storage/box/hug/attack_self(mob/user) ..() user.changeNext_move(CLICK_CD_MELEE) - playsound(loc, "rustle", 50, 1, -5) + playsound(loc, "rustle", 50, TRUE, -5) user.visible_message("[user] hugs \the [src].","You hug \the [src].") /obj/item/storage/box/wizard diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 8eb10832c58..121e103b2f4 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -513,7 +513,7 @@ /obj/item/butcher_chainsaw/attack(mob/living/target, mob/living/user) . = ..() if(HAS_TRAIT(src, TRAIT_WIELDED)) - playsound(loc, 'sound/weapons/chainsaw.ogg', 100, 1, -1) //incredibly loud; you ain't goin' for stealth with this thing. Credit to Lonemonk of Freesound for this sound. + playsound(loc, 'sound/weapons/chainsaw.ogg', 100, TRUE, -1) //incredibly loud; you ain't goin' for stealth with this thing. Credit to Lonemonk of Freesound for this sound. if(isnull(.)) //necessary check, successful attacks return null, without it target will drop any shields they may have before they get a chance to block target.KnockDown(8 SECONDS) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index e6aa7655081..5d037490ddb 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -226,7 +226,7 @@ return TRUE else if(prob(30)) visible_message("[owner] swings! And [p_they()] miss[p_es()]! How embarassing.", "You swing! You miss! Oh no!") - playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) do_attack_animation(get_step(owner, pick(GLOB.alldirs)), ATTACK_EFFECT_DISARM) deflectmode = FALSE if(!istype(I, /obj/item/beach_ball)) @@ -234,7 +234,7 @@ return FALSE else visible_message("[owner] swings and deflects [I]!", "You swing and deflect [I]!") - playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, 1, -1) + playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, TRUE, -1) do_attack_animation(I, ATTACK_EFFECT_DISARM) I.throw_at(get_edge_target_turf(owner, pick(GLOB.cardinal)), rand(8,10), 14, owner) deflectmode = FALSE diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 8a884d9af6a..7d2ed5496b7 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -16,7 +16,7 @@ opacity = FALSE /obj/structure/curtain/attack_hand(mob/user) - playsound(get_turf(loc), "rustle", 15, 1, -5) + playsound(get_turf(loc), "rustle", 15, TRUE, -5) toggle() ..() diff --git a/code/game/objects/structures/depot_structures.dm b/code/game/objects/structures/depot_structures.dm index 4d3a1919a49..ebdb7cdfc61 100644 --- a/code/game/objects/structures/depot_structures.dm +++ b/code/game/objects/structures/depot_structures.dm @@ -60,7 +60,7 @@ depotarea.activate_self_destruct("Fusion reactor cracked open. Core loose!", TRUE) var/obj/effect/overload/O = new /obj/effect/overload(get_turf(src)) if(containment_failure) - playsound(loc, 'sound/machines/alarm.ogg', 100, 0, 0) + playsound(loc, 'sound/machines/alarm.ogg', 100, FALSE, 0) O.deliberate = TRUE O.max_cycles = 6 if(!skip_qdel) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 1aa58675359..5e9d5804a4d 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -263,7 +263,7 @@ buckled_mob.Weaken(12 SECONDS) buckled_mob.Stuttering(12 SECONDS) buckled_mob.take_organ_damage(10) - playsound(loc, 'sound/weapons/punch1.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1) buckled_mob.visible_message("[buckled_mob] crashed into [A]!") /obj/structure/chair/office/light @@ -545,7 +545,7 @@ if(C.health < C.maxHealth*0.5) C.Weaken(12 SECONDS) C.Stuttering(12 SECONDS) - playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1) smash(user) /obj/item/chair/stool/attack(mob/M as mob, mob/user as mob) diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 67e1d659ef1..360d5ee184f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -87,7 +87,7 @@ occupant.Weaken(12 SECONDS) occupant.Stuttering(12 SECONDS) - playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1) if(isliving(A)) var/mob/living/victim = A victim.Weaken(12 SECONDS) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 44dc6f04292..01920f047e4 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -247,7 +247,7 @@ if(slippery) step_away(I, user) visible_message("[I] slips right off [src]!") - playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1) + playsound(loc, 'sound/misc/slip.ogg', 50, TRUE, -1) else //Don't want slippery moving tables to have the item attached to them if it slides off. item_placed(I) else @@ -805,7 +805,7 @@ if(direct & (direct - 1)) // This represents a diagonal movement, which is split into multiple cardinal movements. We'll handle moving the items on the cardinals only. return - playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, 1, ignore_walls = FALSE) + playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE) var/atom/movable/held for(var/held_uid in held_items) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 37b500dc366..6e34004f1ea 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -405,7 +405,7 @@ M.visible_message("[M] nudges \the [src].") else if(M.attack_sound) - playsound(loc, M.attack_sound, 50, 1, 1) + playsound(loc, M.attack_sound, 50, TRUE, 1) M.visible_message("\The [M] [M.attacktext] [src]!") smash(src) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 102110acdcf..38fd5422c87 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2089,7 +2089,7 @@ // These smiting types are valid for all living mobs if("Lightning bolt") M.electrocute_act(5, "Lightning Bolt", flags = SHOCK_NOGLOVES) - playsound(get_turf(M), 'sound/magic/lightningshock.ogg', 50, 1, -1) + playsound(get_turf(M), 'sound/magic/lightningshock.ogg', 50, TRUE, -1) M.adjustFireLoss(75) M.Weaken(10 SECONDS) to_chat(M, "The gods have punished you for your sins!") diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index f9d83d26ede..6bee256df5c 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_EMPTY(sounds_cache) log_admin("[key_name(src)] played a local sound [S]") message_admins("[key_name_admin(src)] played a local sound [S]", 1) - playsound(get_turf(src.mob), S, 50, 0, 0) + playsound(get_turf(src.mob), S, 50, FALSE, 0) SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Local Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/play_server_sound() diff --git a/code/modules/antagonists/changeling/powers/revive.dm b/code/modules/antagonists/changeling/powers/revive.dm index a9fc7711678..7a8b6113438 100644 --- a/code/modules/antagonists/changeling/powers/revive.dm +++ b/code/modules/antagonists/changeling/powers/revive.dm @@ -21,7 +21,7 @@ user.visible_message("[user] suddenly hits [M] in the face and slips out of their grab!") M.Stun(2 SECONDS) //Drops the grab M.apply_damage(5, BRUTE, "head", M.run_armor_check("head", "melee")) - playsound(user.loc, 'sound/weapons/punch1.ogg', 25, 1, -1) + playsound(user.loc, 'sound/weapons/punch1.ogg', 25, TRUE, -1) user.revive() user.updatehealth("revive sting") user.update_blind_effects() diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 57450b5060d..5284fc3fdc8 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -29,7 +29,7 @@ update_icon() if(usr) - playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) + playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) /obj/item/assembly/mousetrap/update_icon_state() @@ -94,7 +94,7 @@ armed = !armed update_icon() - playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) + playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3) /obj/item/assembly/mousetrap/attack_hand(mob/living/user) if(armed) diff --git a/code/modules/atmospherics/machinery/atmospherics.dm b/code/modules/atmospherics/machinery/atmospherics.dm index ca4a16fdb83..2ce2e9343d8 100644 --- a/code/modules/atmospherics/machinery/atmospherics.dm +++ b/code/modules/atmospherics/machinery/atmospherics.dm @@ -331,7 +331,7 @@ Pipelines + Other Objects -> Pipe network user.forceMove(target_move) if(world.time - user.last_played_vent > VENT_SOUND_DELAY) user.last_played_vent = world.time - playsound(src, 'sound/machines/ventcrawl.ogg', 50, 1, -3) + playsound(src, 'sound/machines/ventcrawl.ogg', 50, TRUE, -3) else if((direction & initialize_directions) || is_type_in_list(src, GLOB.ventcrawl_machinery)) //if we move in a way the pipe can connect, but doesn't - or we're in a vent user.remove_ventcrawl() diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm index 87b4f8cc5a8..8e5b97724fe 100644 --- a/code/modules/clothing/gloves/misc_gloves.dm +++ b/code/modules/clothing/gloves/misc_gloves.dm @@ -152,7 +152,7 @@ var/mob/living/carbon/C = A if(cell.use(stun_cost)) do_sparks(5, 0, loc) - playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1) H.do_attack_animation(C) visible_message("[C] has been touched with [src] by [H]!") add_attack_logs(H, C, "Touched with stun gloves") diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 13801f6917e..72954cd06f5 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -33,10 +33,10 @@ if(active_sound) while(up) - playsound(src.loc, "[active_sound]", 100, 0, 4) + playsound(src.loc, "[active_sound]", 100, FALSE, 4) sleep(15) if(toggle_sound) - playsound(src.loc, "[toggle_sound]", 100, 0, 4) + playsound(src.loc, "[toggle_sound]", 100, FALSE, 4) /obj/item/clothing/head/helmet/visor name = "visor helmet" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index f1875a85c80..b3f22518068 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -415,12 +415,12 @@ if(!safety) message = "FUCK YOUR CUNT YOU SHIT EATING COCKSUCKER MAN EAT A DONG FUCKING ASS RAMMING SHIT FUCK EAT PENISES IN YOUR FUCK FACE AND SHIT OUT ABORTIONS OF FUCK AND DO SHIT IN YOUR ASS YOU COCK FUCK SHIT MONKEY FUCK ASS WANKER FROM THE DEPTHS OF SHIT." usr.visible_message("[usr]'s Compli-o-Nator: [message]") - playsound(src.loc, 'sound/voice/binsult.ogg', 100, 0, 4) + playsound(src.loc, 'sound/voice/binsult.ogg', 100, FALSE, 4) cooldown = world.time return usr.visible_message("[usr]'s Compli-o-Nator: [message]") - playsound(src.loc, "sound/voice/complionator/[key].ogg", 100, 0, 4) + playsound(src.loc, "sound/voice/complionator/[key].ogg", 100, FALSE, 4) cooldown = world.time diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 797006d07ad..1d0947ad5de 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -326,7 +326,7 @@ user.flying = TRUE do_callback = TRUE if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = do_callback ? VARSET_CALLBACK(user, flying, FALSE) : null)) - playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1) + playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1) user.visible_message("[usr] dashes forward into the air!") recharging_time = world.time + recharging_rate cell.use(dash_cost) diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index a7707bb0062..681f25935ba 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -445,7 +445,7 @@ user.flying = TRUE do_callback = TRUE if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = do_callback ? VARSET_CALLBACK(user, flying, FALSE) : null)) - playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1) + playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1) user.visible_message("[usr] dashes forward into the air!") recharging_time = world.time + recharging_rate else diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm index d005f2ea912..3dc70242333 100644 --- a/code/modules/clothing/suits/armor_suits.dm +++ b/code/modules/clothing/suits/armor_suits.dm @@ -625,7 +625,7 @@ continue owner.Beam(M,icon_state="lightning[rand(1, 12)]",icon='icons/effects/effects.dmi',time=5) M.adjustFireLoss(20) - playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1) + playsound(M, 'sound/machines/defib_zap.ogg', 50, TRUE, -1) add_attack_logs(owner, M, "[M] was shocked by [owner]'s [src]", ATKLOG_ALMOSTALL) disable(rand(2, 5)) // let's not have buckshot set it off 4 times and do 80 burn damage. return TRUE diff --git a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm index a558758822b..9d25abd92ca 100644 --- a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm +++ b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm @@ -31,7 +31,7 @@ H.visible_message("[H]'s suit automatically extinguishes [H.p_them()]!","Your suit automatically extinguishes you.") if(!extinguishes_left) to_chat(H, "Onboard auto-extinguisher depleted, refill with a cartridge.") - playsound(H.loc, 'sound/effects/spray.ogg', 10, 1, -3) + playsound(H.loc, 'sound/effects/spray.ogg', 10, TRUE, -3) H.ExtinguishMob() new /obj/effect/particle_effect/water(get_turf(H)) return FALSE diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 57867a27c5d..241295ad2be 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -738,7 +738,7 @@ icon_state = new_state["icon_state"] state = choice to_chat(user, "You adjust the helmet.") - playsound(src.loc, "[toggle_sound]", 100, 0, 4) + playsound(src.loc, "[toggle_sound]", 100, FALSE, 4) user.update_inv_head() return 1 diff --git a/code/modules/events/floorcluwne_event.dm b/code/modules/events/floorcluwne_event.dm index 3e4a3d5910a..f6fc7774da7 100644 --- a/code/modules/events/floorcluwne_event.dm +++ b/code/modules/events/floorcluwne_event.dm @@ -9,7 +9,7 @@ var/turf/T = get_turf(pick(GLOB.xeno_spawn)) var/mob/living/simple_animal/hostile/floor_cluwne/S = new(T) - playsound(S, 'sound/spookoween/scary_horn.ogg', 50, 1, -1) + playsound(S, 'sound/spookoween/scary_horn.ogg', 50, TRUE, -1) message_admins("A floor cluwne has been spawned at [COORD(T)][ADMIN_JMP(T)]") log_game("A floor cluwne has been spawned at [COORD(T)]") return 1 diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 793f0c83b63..f00a3415d2f 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -34,6 +34,6 @@ var/datum/effect_system/smoke_spread/chem/smoke = new smoke.set_up(R, vent, TRUE) - playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(vent.loc, 'sound/effects/smoke.ogg', 50, TRUE, -3) smoke.start(3) qdel(R) diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index 9cdfabe8f6e..0da9469455f 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -548,7 +548,7 @@ var/chosen_wire = tgui_input_list(user, "OH GOD OH GOD", "WHAT WIRE?!", wires) if(!in_range(src, user) || issilicon(usr) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || user.restrained() || !chosen_wire) return - playsound(src, I.usesound, 50, 1, 1) + playsound(src, I.usesound, 50, TRUE, 1) user.visible_message("[user] cuts the [chosen_wire] wire!", "You cut the [chosen_wire] wire!") sleep(5) if(chosen_wire == correct_wire) @@ -570,7 +570,7 @@ return user.visible_message("[user] starts removing the payload and wires from [src].") if(do_after(user, 40 * I.toolspeed, target = src)) - playsound(src, I.usesound, 50, 1, 1) + playsound(src, I.usesound, 50, TRUE, 1) user.unEquip(src) user.visible_message("[user] removes the insides of [src]!") var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(src.loc) diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 526d007a88c..da8012befd4 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -32,7 +32,7 @@ /obj/item/food/snacks/grown/banana/suicide_act(mob/user) user.visible_message("[user] is aiming [src] at [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) + playsound(loc, 'sound/items/bikehorn.ogg', 50, TRUE, -1) sleep(25) if(!user) return OXYLOSS @@ -70,7 +70,7 @@ /obj/item/grown/bananapeel/suicide_act(mob/user) user.visible_message("[user] is deliberately slipping on [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1) + playsound(loc, 'sound/misc/slip.ogg', 50, TRUE, -1) return BRUTELOSS diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 888bcdc9aef..f4d1b53d0e3 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -124,7 +124,7 @@ var/mob/living/carbon/C = user C.throw_mode_on() icon_state = "firelemon_active" - playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) addtimer(CALLBACK(src, PROC_REF(prime)), rand(10, 60)) /obj/item/food/snacks/grown/firelemon/burn() diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 5b7a1977e65..262c623b226 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -122,7 +122,7 @@ /obj/item/hatchet/suicide_act(mob/user) user.visible_message("[user] is chopping at [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, TRUE, -1) return BRUTELOSS /obj/item/hatchet/unathiknife @@ -172,7 +172,7 @@ var/obj/item/organ/external/affecting = H.get_organ("head") if(affecting) affecting.droplimb(1, DROPLIMB_SHARP) - playsound(loc, pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg'), 50, 1, -1) + playsound(loc, pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg'), 50, TRUE, -1) return BRUTELOSS /obj/item/scythe/pre_attack(atom/A, mob/living/user, params) diff --git a/code/modules/instruments/objs/items/instrument_items.dm b/code/modules/instruments/objs/items/instrument_items.dm index 355e9def2cd..ef53ea410fa 100644 --- a/code/modules/instruments/objs/items/instrument_items.dm +++ b/code/modules/instruments/objs/items/instrument_items.dm @@ -92,7 +92,7 @@ AddComponent(/datum/component/spooky) /obj/item/instrument/trumpet/spectral/attack(mob/living/carbon/C, mob/user) - playsound(src, 'sound/instruments/trombone/En4.mid', 100, 1, -1) + playsound(src, 'sound/instruments/trombone/En4.mid', 100, TRUE, -1) ..() /obj/item/instrument/saxophone @@ -115,7 +115,7 @@ AddComponent(/datum/component/spooky) /obj/item/instrument/saxophone/spectral/attack(mob/living/carbon/C, mob/user) - playsound(src, 'sound/instruments/saxophone/En4.mid', 100,1,-1) + playsound(src, 'sound/instruments/saxophone/En4.mid', 100, TRUE,-1) ..() /obj/item/instrument/trombone @@ -148,7 +148,7 @@ attack_verb = list("Wahed", "Waahed", "Waaahed", "Honked") /obj/item/instrument/trombone/sad/attack(mob/living/carbon/C, mob/user) - playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 1, -1) + playsound(loc, 'sound/misc/sadtrombone.ogg', 50, TRUE, -1) ..() /obj/item/instrument/recorder diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm index 14a67dfc7f3..ade32720246 100644 --- a/code/modules/martial_arts/brawling.dm +++ b/code/modules/martial_arts/brawling.dm @@ -18,7 +18,7 @@ var/damage = rand(5, 8) + A.dna.species.punchdamagelow if(!damage) - playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) D.visible_message("[A] has attempted to hit [D] with a [atk_verb]!") add_attack_logs(A, D, "Melee attacked with [src] (miss/block)", ATKLOG_ALL) return 0 @@ -27,7 +27,7 @@ var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected)) var/armor_block = D.run_armor_check(affecting, MELEE) - playsound(D.loc, 'sound/weapons/punch1.ogg', 25, 1, -1) + playsound(D.loc, 'sound/weapons/punch1.ogg', 25, TRUE, -1) D.visible_message("[A] has hit [D] with a [atk_verb]!", \ "[A] has hit [D] with a [atk_verb]!") @@ -76,14 +76,14 @@ damage = 0 if(!damage) - playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) D.visible_message("[A] has attempted to hit [D] with a [atk_verb]!") return 1 //returns 1 so that they actually miss and don't switch to attackhand damage var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected)) var/armor_block = D.run_armor_check(affecting, MELEE) - playsound(D.loc, 'sound/weapons/punch1.ogg', 25, 1, -1) + playsound(D.loc, 'sound/weapons/punch1.ogg', 25, TRUE, -1) D.visible_message("[A] has hit [D] with a [atk_verb]!", \ diff --git a/code/modules/martial_arts/combos/cqc/consecutive.dm b/code/modules/martial_arts/combos/cqc/consecutive.dm index fc7efc897f8..4e71938cc8a 100644 --- a/code/modules/martial_arts/combos/cqc/consecutive.dm +++ b/code/modules/martial_arts/combos/cqc/consecutive.dm @@ -7,7 +7,7 @@ if(!target.stat) target.visible_message("[user] strikes [target]'s abdomen, neck and back consecutively", \ "[user] strikes your abdomen, neck and back consecutively!") - playsound(get_turf(target), 'sound/weapons/cqchit2.ogg', 50, 1, -1) + playsound(get_turf(target), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1) target.apply_damage(70, STAMINA) target.apply_damage(20, BRUTE) add_attack_logs(user, target, "Melee attacked with martial-art [src] : Consecutive", ATKLOG_ALL) diff --git a/code/modules/martial_arts/combos/cqc/kick.dm b/code/modules/martial_arts/combos/cqc/kick.dm index d94023cc5c9..132c6cbc71e 100644 --- a/code/modules/martial_arts/combos/cqc/kick.dm +++ b/code/modules/martial_arts/combos/cqc/kick.dm @@ -8,7 +8,7 @@ if(!IS_HORIZONTAL(target) && user != target) target.visible_message("[user] kicks [target] back!", \ "[user] kicks you back!") - playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 25, 1, -1) + playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 25, TRUE, -1) var/atom/throw_target = get_edge_target_turf(target, user.dir) target.throw_at(throw_target, 1, 14, user) target.apply_damage(25, STAMINA) @@ -18,7 +18,7 @@ else if(IS_HORIZONTAL(target) && user != target) target.visible_message("[user] kicks [target]'s head, disorienting [target.p_them()]!", \ "[user] kicks your head, disorienting you!") - playsound(get_turf(user), 'sound/weapons/genhit1.ogg', 25, 1, -1) + playsound(get_turf(user), 'sound/weapons/genhit1.ogg', 25, TRUE, -1) var/atom/throw_target = get_edge_target_turf(target, user.dir) target.throw_at(throw_target, 1, 8, user) target.apply_damage(40, STAMINA) diff --git a/code/modules/martial_arts/combos/cqc/pressure.dm b/code/modules/martial_arts/combos/cqc/pressure.dm index 90de2f1be93..374bd297e94 100644 --- a/code/modules/martial_arts/combos/cqc/pressure.dm +++ b/code/modules/martial_arts/combos/cqc/pressure.dm @@ -9,6 +9,6 @@ if(I && target.drop_item()) user.put_in_hands(I) target.apply_damage(40, STAMINA) - playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 5, 1, -1) + playsound(get_turf(user), 'sound/weapons/cqchit1.ogg', 5, TRUE, -1) add_attack_logs(user, target, "Melee attacked with martial-art [src] : Pressure", ATKLOG_ALL) return MARTIAL_COMBO_DONE diff --git a/code/modules/martial_arts/combos/cqc/slam.dm b/code/modules/martial_arts/combos/cqc/slam.dm index eaa5f88d29f..525500e16fc 100644 --- a/code/modules/martial_arts/combos/cqc/slam.dm +++ b/code/modules/martial_arts/combos/cqc/slam.dm @@ -9,7 +9,7 @@ return MARTIAL_COMBO_FAIL target.visible_message("[user] slams [target] into the ground!", \ "[user] slams you into the ground!") - playsound(get_turf(user), 'sound/weapons/slam.ogg', 40, 1, -1) + playsound(get_turf(user), 'sound/weapons/slam.ogg', 40, TRUE, -1) target.apply_damage(50, STAMINA) target.KnockDown(7 SECONDS) target.SetConfused(12 SECONDS) diff --git a/code/modules/martial_arts/combos/krav_maga/leg_sweep.dm b/code/modules/martial_arts/combos/krav_maga/leg_sweep.dm index e70fa5dfbe4..3f12a91c134 100644 --- a/code/modules/martial_arts/combos/krav_maga/leg_sweep.dm +++ b/code/modules/martial_arts/combos/krav_maga/leg_sweep.dm @@ -14,7 +14,7 @@ user.do_attack_animation(target, ATTACK_EFFECT_KICK) target.visible_message("[user] leg sweeps [target]!", \ "[user] leg sweeps you!") - playsound(get_turf(user), 'sound/effects/hit_kick.ogg', 50, 1, -1) + playsound(get_turf(user), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) target.apply_damage(5, BRUTE) target.KnockDown(4 SECONDS) add_attack_logs(user, target, "Melee attacked with martial-art [src] : Leg Sweep", ATKLOG_ALL) diff --git a/code/modules/martial_arts/combos/krav_maga/lung_punch.dm b/code/modules/martial_arts/combos/krav_maga/lung_punch.dm index 9ed06508ca8..b4f91d32090 100644 --- a/code/modules/martial_arts/combos/krav_maga/lung_punch.dm +++ b/code/modules/martial_arts/combos/krav_maga/lung_punch.dm @@ -6,7 +6,7 @@ user.do_attack_animation(target, ATTACK_EFFECT_PUNCH) target.visible_message("[user] pounds [target] on the chest!", \ "[user] slams your chest! You can't breathe!") - playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1) + playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, TRUE, -1) target.AdjustLoseBreath(10 SECONDS) target.apply_damage(30, STAMINA) add_attack_logs(user, target, "Melee attacked with martial-art [src] : Lung Punch", ATKLOG_ALL) diff --git a/code/modules/martial_arts/combos/krav_maga/neck_chop.dm b/code/modules/martial_arts/combos/krav_maga/neck_chop.dm index 687c6bbc4a5..c5158a9d334 100644 --- a/code/modules/martial_arts/combos/krav_maga/neck_chop.dm +++ b/code/modules/martial_arts/combos/krav_maga/neck_chop.dm @@ -6,7 +6,7 @@ user.do_attack_animation(target, ATTACK_EFFECT_PUNCH) target.visible_message("[user] karate chops [target]'s neck!", \ "[user] karate chops your neck, rendering you unable to speak for a short time!") - playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1) + playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, TRUE, -1) target.apply_damage(5, BRUTE, BODY_ZONE_HEAD) target.AdjustSilence(20 SECONDS) add_attack_logs(user, target, "Melee attacked with martial-art [src] : Neck Chop", ATKLOG_ALL) diff --git a/code/modules/martial_arts/combos/mimejutsu/mimechucks.dm b/code/modules/martial_arts/combos/mimejutsu/mimechucks.dm index a710ebfe910..5bce85ff114 100644 --- a/code/modules/martial_arts/combos/mimejutsu/mimechucks.dm +++ b/code/modules/martial_arts/combos/mimejutsu/mimechucks.dm @@ -7,7 +7,7 @@ if(!target.stat && !target.IsStunned() && !target.IsWeakened()) var/damage = rand(5, 8) + user.dna.species.punchdamagelow if(!damage) - playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) target.visible_message("[user] swings invisible nunchcuks at [target]..and misses?") return MARTIAL_COMBO_DONE @@ -17,7 +17,7 @@ target.visible_message("[user] has hit [target] with invisible nunchucks!", \ "[user] has hit [target] with a with invisible nunchuck!") - playsound(get_turf(user), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(get_turf(user), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) target.apply_damage(damage, STAMINA, affecting, armor_block) add_attack_logs(user, target, "Melee attacked with [src] (mimechuck)") diff --git a/code/modules/martial_arts/combos/plasma_fist/the_plasma_fist.dm b/code/modules/martial_arts/combos/plasma_fist/the_plasma_fist.dm index 93c3e3ef480..c5dfcec393d 100644 --- a/code/modules/martial_arts/combos/plasma_fist/the_plasma_fist.dm +++ b/code/modules/martial_arts/combos/plasma_fist/the_plasma_fist.dm @@ -5,7 +5,7 @@ /datum/martial_combo/plasma_fist/plasma_fist/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) user.do_attack_animation(target, ATTACK_EFFECT_PUNCH) - playsound(target.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) + playsound(target.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1) user.say("PLASMA FIST!") target.visible_message("[user] has hit [target] with THE PLASMA FIST TECHNIQUE!", \ "[user] has hit [target] with THE PLASMA FIST TECHNIQUE!") diff --git a/code/modules/martial_arts/combos/plasma_fist/throwback.dm b/code/modules/martial_arts/combos/plasma_fist/throwback.dm index 7057452a913..3df734457e3 100644 --- a/code/modules/martial_arts/combos/plasma_fist/throwback.dm +++ b/code/modules/martial_arts/combos/plasma_fist/throwback.dm @@ -6,7 +6,7 @@ /datum/martial_combo/plasma_fist/throwback/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) target.visible_message("[user] has hit [target] with Plasma Punch!", \ "[user] has hit [target] with Plasma Punch!") - playsound(target.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) + playsound(target.loc, 'sound/weapons/punch1.ogg', 50, TRUE, -1) var/atom/throw_target = get_edge_target_turf(target, get_dir(target, get_step_away(target, user))) target.throw_at(throw_target, 200, 4, user) user.say("HYAH!") diff --git a/code/modules/martial_arts/combos/plasma_fist/tornado_sweep.dm b/code/modules/martial_arts/combos/plasma_fist/tornado_sweep.dm index bc1d44bebfc..0141a1b9cd8 100644 --- a/code/modules/martial_arts/combos/plasma_fist/tornado_sweep.dm +++ b/code/modules/martial_arts/combos/plasma_fist/tornado_sweep.dm @@ -16,5 +16,5 @@ /datum/martial_combo/plasma_fist/tornado_sweep/proc/do_tornado_effect(mob/living/carbon/human/user) for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH)) user.dir = i - playsound(user.loc, 'sound/weapons/punch1.ogg', 15, 1, -1) + playsound(user.loc, 'sound/weapons/punch1.ogg', 15, TRUE, -1) sleep(1) diff --git a/code/modules/martial_arts/cqc.dm b/code/modules/martial_arts/cqc.dm index 416d2d7dea0..405c52d2a99 100644 --- a/code/modules/martial_arts/cqc.dm +++ b/code/modules/martial_arts/cqc.dm @@ -100,16 +100,16 @@ picked_hit_type = "stomps on" D.apply_damage(bonus_damage, STAMINA) if(picked_hit_type == "kicks" || picked_hit_type == "stomps on") - playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 10, 1, -1) + playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 10, TRUE, -1) else - playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 10, 1, -1) + playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 10, TRUE, -1) D.visible_message("[A] [picked_hit_type] [D]!", \ "[A] [picked_hit_type] you!") add_attack_logs(A, D, "Melee attacked with martial-art [src] : [picked_hit_type]", ATKLOG_ALL) if(IS_HORIZONTAL(A) && !IS_HORIZONTAL(D)) D.visible_message("[A] leg sweeps [D]!", \ "[A] leg sweeps you!") - playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 10, 1, -1) + playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 10, TRUE, -1) D.KnockDown(5 SECONDS) A.SetKnockDown(0 SECONDS) A.resting = FALSE @@ -134,7 +134,7 @@ D.apply_damage(15, STAMINA) else D.visible_message("[A] attempted to disarm [D]!", "[A] attempted to disarm [D]!") - playsound(D, 'sound/weapons/punchmiss.ogg', 5, 1, -1) + playsound(D, 'sound/weapons/punchmiss.ogg', 5, TRUE, -1) add_attack_logs(A, D, "Disarmed with martial-art [src]", ATKLOG_ALL) return TRUE diff --git a/code/modules/martial_arts/grav_stomp.dm b/code/modules/martial_arts/grav_stomp.dm index e024be28a48..b5877b231d1 100644 --- a/code/modules/martial_arts/grav_stomp.dm +++ b/code/modules/martial_arts/grav_stomp.dm @@ -11,7 +11,7 @@ bonus_damage = 15 picked_hit_type = "stomps on" A.do_attack_animation(D, ATTACK_EFFECT_KICK) - playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, 1, -1) + playsound(get_turf(D), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) D.apply_damage(bonus_damage, BRUTE) D.visible_message("[A] [picked_hit_type] [D]!", \ "[A] [picked_hit_type] you!") diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 015531e55bc..b9d1100c17c 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -131,14 +131,14 @@ A.do_attack_animation(D, attack.animation_type) if(!damage) - playsound(D.loc, attack.miss_sound, 25, 1, -1) + playsound(D.loc, attack.miss_sound, 25, TRUE, -1) D.visible_message("[A] has attempted to [atk_verb] [D]!") return FALSE var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected)) var/armor_block = D.run_armor_check(affecting, MELEE) - playsound(D.loc, attack.attack_sound, 25, 1, -1) + playsound(D.loc, attack.attack_sound, 25, TRUE, -1) D.visible_message("[A] has [atk_verb]ed [D]!", \ "[A] has [atk_verb]ed [D]!") @@ -420,7 +420,7 @@ "[user] twirls and slams [H] with [src]!") H.visible_message("[pick(fluffmessages)]", \ "[pick(fluffmessages)]") - playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, 1, -1) + playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, TRUE, -1) H.apply_damage(rand(13,20), STAMINA) if(prob(10)) H.visible_message("[H] collapses!", \ diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 9c13db2b3ff..7f50e031d79 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -105,7 +105,7 @@ return if(user.has_status_effect(STATUS_EFFECT_DASH) && user.a_intent == INTENT_HELP) if(user.throw_at(target, range = 3, speed = 3, spin = FALSE, diagonals_first = TRUE)) - playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1) + playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1) user.visible_message("[user] dashes!") else to_chat(user, "Something prevents you from dashing!") diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 11bec33326e..12cb30ef9c6 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -91,7 +91,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) balloon.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM holder_obj.cut_overlay(balloon2) holder_obj.add_overlay(balloon) - playsound(holder_obj.loc, 'sound/items/fultext_deploy.ogg', 50, 1, -3) + playsound(holder_obj.loc, 'sound/items/fultext_deploy.ogg', 50, TRUE, -3) animate(holder_obj, pixel_z = 10, time = 20) sleep(20) animate(holder_obj, pixel_z = 15, time = 10) @@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) sleep(10) animate(holder_obj, pixel_z = 10, time = 10) sleep(10) - playsound(holder_obj.loc, 'sound/items/fultext_launch.ogg', 50, 1, -3) + playsound(holder_obj.loc, 'sound/items/fultext_launch.ogg', 50, TRUE, -3) animate(holder_obj, pixel_z = 1000, time = 30) if(ishuman(A)) var/mob/living/carbon/human/L = A diff --git a/code/modules/mob/living/carbon/alien/alien_death.dm b/code/modules/mob/living/carbon/alien/alien_death.dm index fa5e5a1f12c..d6bf44791b1 100644 --- a/code/modules/mob/living/carbon/alien/alien_death.dm +++ b/code/modules/mob/living/carbon/alien/alien_death.dm @@ -69,6 +69,6 @@ if(!gibbed) if(death_sound) - playsound(loc, death_sound, 80, 1, 1) + playsound(loc, death_sound, 80, TRUE, 1) visible_message("[src] [death_message]") update_icons() diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index 491d5612f72..1cc859a9295 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -26,7 +26,7 @@ This code could certainly use with a touch of TLC, but it functions alright. Bit else if(health > 0) M.do_attack_animation(src, ATTACK_EFFECT_BITE) - playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bite.ogg', 50, TRUE, -1) visible_message("[M.name] bites [src]!", \ "[M.name] bites [src]!") adjustBruteLoss(1) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 213e0d33c2c..ac5eea221d0 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -88,7 +88,7 @@ else if(A.density && !A.CanPass(src)) visible_message("[src] smashes into [A]!", "[src] smashes into [A]!") Weaken(2 SECONDS, TRUE) - playsound(get_turf(src), 'sound/effects/bang.ogg', 50, 0, 0) // owwie + playsound(get_turf(src), 'sound/effects/bang.ogg', 50, FALSE, 0) // owwie ..() if(leaping) leaping = FALSE diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index f86cc9387d5..34462f3f988 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( . += alien_movement_delay /mob/living/carbon/alien/humanoid/resist_restraints(attempt_breaking) - playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1) //Alien roars when starting to break free + playsound(src, 'sound/voice/hiss5.ogg', 40, TRUE, 1) //Alien roars when starting to break free attempt_breaking = TRUE return ..() diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm index 43c9bd95936..7be3ae028f9 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm @@ -10,7 +10,7 @@ Stun(2 SECONDS) throw_at(get_edge_target_turf(user, get_dir(user, src)), 3, 7) hitverb = "slammed" - playsound(loc, "punch", 25, 1, -1) + playsound(loc, "punch", 25, TRUE, -1) visible_message("[user] has [hitverb] [src]!", "[user] has [hitverb] [src]!") return TRUE @@ -20,7 +20,7 @@ if(INTENT_HARM) var/damage = rand(1, 9) if(prob(90)) - playsound(loc, "punch", 25, 1, -1) + playsound(loc, "punch", 25, TRUE, -1) visible_message("[M] has punched [src]!", \ "[M] has punched [src]!") if((stat != DEAD) && (damage > 9||prob(5)))//Regular humans have a very small chance of weakening an alien. @@ -31,25 +31,25 @@ adjustBruteLoss(damage) add_attack_logs(M, src, "Melee attacked with fists") else - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) visible_message("[M] has attempted to punch [src]!") if(INTENT_DISARM) if(!IS_HORIZONTAL(src)) if(prob(5))//Very small chance to push an alien down. Paralyse(4 SECONDS) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) add_attack_logs(M, src, "Pushed over") visible_message("[M] has pushed down [src]!", \ "[M] has pushed down [src]!") else if(prob(50)) drop_item() - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) visible_message("[M] has disarmed [src]!", \ "[M] has disarmed [src]!") else - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) visible_message("[M] has attempted to disarm [src]!") /mob/living/carbon/alien/humanoid/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect) diff --git a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm index 8765db04c6d..68c45b36ed3 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm @@ -2,7 +2,7 @@ if(..()) var/damage = rand(1, 9) if(prob(90)) - playsound(loc, "punch", 25, 1, -1) + playsound(loc, "punch", 25, TRUE, -1) add_attack_logs(M, src, "Melee attacked with fists") visible_message("[M] has kicked [src]!", \ "[M] has kicked [src]!") @@ -12,7 +12,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) visible_message("[M] has attempted to kick [src]!", \ "[M] has attempted to kick [src]!") diff --git a/code/modules/mob/living/carbon/carbon_procs.dm b/code/modules/mob/living/carbon/carbon_procs.dm index 49de19a2499..6cb2a9481a4 100644 --- a/code/modules/mob/living/carbon/carbon_procs.dm +++ b/code/modules/mob/living/carbon/carbon_procs.dm @@ -223,7 +223,7 @@ adjustStaminaLoss(-10) resting = FALSE stand_up() // help them up if possible - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) if(!player_logged) M.visible_message( \ "[M] shakes [src] trying to wake [p_them()] up!",\ @@ -236,7 +236,7 @@ M.apply_status_effect(effect.type) return // BEGIN HUGCODE - N3X - playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) if(M.zone_selected == "head") M.visible_message(\ "[M] pats [src] on the head.",\ @@ -1067,7 +1067,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven stop_pulling() to_chat(src, "You [slipVerb]ped on [description]!") - playsound(loc, 'sound/misc/slip.ogg', 50, 1, -3) + playsound(loc, 'sound/misc/slip.ogg', 50, TRUE, -3) // Something something don't run with scissors moving_diagonally = 0 //If this was part of diagonal move slipping will stop it. KnockDown(knockdown) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 36e0a478082..44ecca61d2b 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -698,10 +698,10 @@ emp_act if(M.a_intent == INTENT_DISARM) //If not absorbed, you get disarmed, knocked down, and hit with stamina damage. if(absorb_stun(0)) visible_message("[src] is not affected by [M]'s disarm attempt!") - playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) return FALSE var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected)) - playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/pierce.ogg', 25, TRUE, -1) apply_effect(10 SECONDS, KNOCKDOWN, run_armor_check(affecting, MELEE)) M.changeNext_move(1.6 SECONDS) apply_damage(M.alien_disarm_damage, STAMINA) diff --git a/code/modules/mob/living/carbon/human/human_inventory.dm b/code/modules/mob/living/carbon/human/human_inventory.dm index 1ee19379c31..f8bcaf5d402 100644 --- a/code/modules/mob/living/carbon/human/human_inventory.dm +++ b/code/modules/mob/living/carbon/human/human_inventory.dm @@ -443,4 +443,4 @@ return if(thing && equipped_item.can_be_inserted(thing)) // put thing in belt or bag equipped_item.handle_item_insertion(thing, src) - playsound(loc, "rustle", 50, 1, -5) + playsound(loc, "rustle", 50, TRUE, -5) diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm index 5ecfde966c7..2a85e521316 100644 --- a/code/modules/mob/living/carbon/human/human_mob.dm +++ b/code/modules/mob/living/carbon/human/human_mob.dm @@ -807,7 +807,7 @@ if(!src.xylophone) visible_message("[src] begins playing [p_their()] ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.") var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg') - playsound(loc, song, 50, 1, -1) + playsound(loc, song, 50, TRUE, -1) xylophone = 1 spawn(1200) xylophone=0 diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 731134e710b..88d336acdc8 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -574,7 +574,7 @@ if(target.absorb_stun(0)) target.visible_message("[target] is not affected by [user]'s disarm attempt!") user.do_attack_animation(target, ATTACK_EFFECT_DISARM) - playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1) return FALSE if(attacker_style && attacker_style.disarm_act(user, target) == MARTIAL_ARTS_ACT_SUCCESS) return TRUE @@ -590,7 +590,7 @@ var/shove_dir = get_dir(user.loc, target.loc) var/turf/shove_to = get_step(target.loc, shove_dir) - playsound(shove_to, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(shove_to, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) if(shove_to == user.loc) return FALSE diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index c005bea8bea..13b6818105d 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -96,7 +96,7 @@ "[src] was arc flashed by \the [source]!", "\The [source] arc flashes and electrocutes you!", "You hear a lightning-like crack!") - playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1) + playsound(loc, 'sound/effects/eleczap.ogg', 50, TRUE, -1) explosion(loc, -1, 0, 2, 2) else apply_damage(shock_damage, STAMINA) @@ -311,7 +311,7 @@ G.synch() LAssailant = user - playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) /*if(user.dir == src.dir) G.state = GRAB_AGGRESSIVE G.last_upgrade = world.time @@ -353,7 +353,7 @@ return FALSE if(M.attack_sound) - playsound(loc, M.attack_sound, 50, 1, 1) + playsound(loc, M.attack_sound, 50, TRUE, 1) M.do_attack_animation(src) visible_message("\The [M] [M.attacktext] [src]!", \ "\The [M] [M.attacktext] [src]!") @@ -376,7 +376,7 @@ add_attack_logs(L, src, "Larva attacked") visible_message("[L.name] bites [src]!", \ "[L.name] bites [src]!") - playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/bite.ogg', 50, TRUE, -1) return 1 else visible_message("[L.name] has attempted to bite [src]!", \ diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 45e8c30d2d6..90b6b19860f 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -320,7 +320,7 @@ return if(user.a_intent == INTENT_HELP) user.visible_message("[user] pets [src].") - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) else visible_message("[user.name] boops [src] on the head.") spawn(1) diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index a43af4749c7..6b564a9a80b 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -5,7 +5,7 @@ if(..()) //if harm or disarm intent var/damage = 20 if(prob(90)) - playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slash.ogg', 25, TRUE, -1) visible_message("[M] has slashed at [src]!", "[M] has slashed at [src]!") if(prob(8)) flash_eyes(affect_silicon = 1) @@ -14,7 +14,7 @@ adjustBruteLoss(damage) updatehealth() else - playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slashmiss.ogg', 25, TRUE, -1) visible_message("[M] took a swipe at [src]!", \ "[M] took a swipe at [src]!") return @@ -50,7 +50,7 @@ return FALSE ..(user, TRUE) adjustBruteLoss(run_armor(rand(10, 15), BRUTE, MELEE)) - playsound(loc, "punch", 25, 1, -1) + playsound(loc, "punch", 25, TRUE, -1) visible_message("[user] has punched [src]!", "[user] has punched [src]!") return TRUE return FALSE @@ -60,7 +60,7 @@ if(INTENT_HELP) M.visible_message("[M] pets [src]!", \ "You pet [src]!") - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) if("grab") grabbedby(M) else diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index 69079d0bcdd..9df8ebb79c9 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -12,7 +12,7 @@ if(INTENT_HELP) if(health > 0) visible_message("[M] [response_help] [src].", "[M] [response_help] you.") - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) if(INTENT_GRAB) grabbedby(M) @@ -23,7 +23,7 @@ return M.do_attack_animation(src, ATTACK_EFFECT_PUNCH) visible_message("[M] [response_harm] [src]!", "[M] [response_harm] you!") - playsound(loc, attacked_sound, 25, 1, -1) + playsound(loc, attacked_sound, 25, TRUE, -1) attack_threshold_check(harm_intent_damage) add_attack_logs(M, src, "Melee attacked with fists") updatehealth() @@ -35,7 +35,7 @@ to_chat(user, "You don't want to hurt [src]!") return FALSE ..(user, TRUE) - playsound(loc, "punch", 25, 1, -1) + playsound(loc, "punch", 25, TRUE, -1) visible_message("[user] has punched [src]!", "[user] has punched [src]!") adjustBruteLoss(15) return TRUE @@ -50,7 +50,7 @@ var/damage = rand(15, 30) visible_message("[M] has slashed at [src]!", \ "[M] has slashed at [src]!") - playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1) add_attack_logs(M, src, "Alien attacked") attack_threshold_check(damage) return TRUE diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index e73c6cef021..20d43196300 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -363,7 +363,7 @@ user.do_attack_animation(src) apply_damage(rand(15,30), BRUTE) visible_message("[user] has slashed [src]!") - playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) + playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1) if(prob(10)) new /obj/effect/decal/cleanable/blood/oil(loc) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index f533a05e494..f4c2c989097 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -575,7 +575,7 @@ /mob/living/simple_animal/bot/ed209/proc/cuff(mob/living/carbon/C) mode = BOT_ARREST - playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2) C.visible_message("[src] is trying to put zipties on [C]!",\ "[src] is trying to put zipties on you!") diff --git a/code/modules/mob/living/simple_animal/bot/griefsky.dm b/code/modules/mob/living/simple_animal/bot/griefsky.dm index 4b76c0696a4..b5bcd9b442b 100644 --- a/code/modules/mob/living/simple_animal/bot/griefsky.dm +++ b/code/modules/mob/living/simple_animal/bot/griefsky.dm @@ -42,7 +42,7 @@ /mob/living/simple_animal/bot/secbot/griefsky/back_to_idle() ..() - playsound(loc, 'sound/weapons/saberoff.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/saberoff.ogg', 50, TRUE, -1) /mob/living/simple_animal/bot/secbot/griefsky/emag_act(mob/user) ..() @@ -74,13 +74,13 @@ retaliate(P.firer) if((icon_state == spin_icon) && (prob(block_chance_ranged))) //only when the eswords are on visible_message("[src] deflects [P] with its energy swords!") - playsound(loc, 'sound/weapons/blade1.ogg', 50, 1, 0) + playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, 0) else ..() /mob/living/simple_animal/bot/secbot/griefsky/proc/sword_attack(mob/living/carbon/C) // esword attack do_attack_animation(C) - playsound(loc, 'sound/weapons/blade1.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, -1) addtimer(CALLBACK(src, PROC_REF(do_sword_attack), C), 2) /mob/living/simple_animal/bot/secbot/griefsky/proc/do_sword_attack(mob/living/carbon/C) @@ -119,7 +119,7 @@ mode = BOT_START_PATROL // switch to patrol mode if(BOT_HUNT) // hunting for perp icon_state = spin_icon - playsound(loc,'sound/effects/spinsabre.ogg',50,1,-1) + playsound(loc,'sound/effects/spinsabre.ogg',50, TRUE,-1) if(frustration >= frustration_number) // general beepsky doesn't give up so easily, jedi scum walk_to(src,0) set_path(null) @@ -211,7 +211,7 @@ retaliate(P.firer) if((icon_state == spin_icon) && (prob(block_chance_ranged))) //only when the eswords are on visible_message("[src] deflects [P] with its energy swords!") - playsound(loc, 'sound/weapons/blade1.ogg', 50, 1, 0) + playsound(loc, 'sound/weapons/blade1.ogg', 50, TRUE, 0) else ..() diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 00c6667b5e9..db8e397271e 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -127,7 +127,7 @@ to_chat(user, "You short out [src]'s target assessment circuits. It gives out an evil laugh!!") oldtarget_name = user.name audible_message("[src] gives out an evil laugh!") - playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 75, 1, -1) // evil laughter + playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 75, TRUE, -1) // evil laughter update_icon() /mob/living/simple_animal/bot/honkbot/cmag_act(mob/user) @@ -270,7 +270,7 @@ // if can't reach perp for long enough, go idle if(frustration >= 5) //gives up easier than beepsky walk_to(src, 0) - playsound(loc, 'sound/misc/sadtrombone.ogg', 25, 1, -1) + playsound(loc, 'sound/misc/sadtrombone.ogg', 25, TRUE, -1) back_to_idle() return @@ -386,7 +386,7 @@ "[C] topples over [src]!", \ "[C] leaps out of [src]'s way!")]") C.KnockDown(10 SECONDS) - playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 1, -1) + playsound(loc, 'sound/misc/sadtrombone.ogg', 50, TRUE, -1) if(!client) speak("Honk!") sensor_blink() diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 2b92811e96d..05704ccb59b 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -241,7 +241,7 @@ /mob/living/simple_animal/bot/secbot/proc/cuff(mob/living/carbon/C) mode = BOT_ARREST - playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2) C.visible_message("[src] is trying to put zipties on [C]!",\ "[src] is trying to put zipties on you!") INVOKE_ASYNC(src, PROC_REF(cuff_callback), C) diff --git a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm index 538368a9c05..ec8c532b451 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm @@ -219,7 +219,7 @@ else if(do_after_once(src, 20, target = G)) visible_message("[src] ravenously consumes [G].", "You ravenously devour [G].") - playsound(loc, 'sound/items/eatfood.ogg', 30, 0, frequency = 1.5) + playsound(loc, 'sound/items/eatfood.ogg', 30, FALSE, frequency = 1.5) if(G.reagents.get_reagent_amount("nutriment") + G.reagents.get_reagent_amount("plantmatter") < 1) adjust_nutrition(2) else diff --git a/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm b/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm index 11c9de2d711..dd33037817b 100644 --- a/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm +++ b/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm @@ -338,7 +338,7 @@ if(do_after(src, 10, target = H)) step_towards(H, src) - playsound(H, pick('sound/effects/bodyscrape-01.ogg', 'sound/effects/bodyscrape-02.ogg'), 20, 1, -4) + playsound(H, pick('sound/effects/bodyscrape-01.ogg', 'sound/effects/bodyscrape-02.ogg'), 20, TRUE, -4) H.emote("scream") if(prob(25)) playsound(src, pick('sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg', 'sound/items/bikehorn.ogg'), 50, 1) @@ -402,7 +402,7 @@ if(prob(2)) switch_stage = max(switch_stage * 0.75, switch_stage_min) //he gets a chance to be faster after each feast if(smiting) - playsound(loc, 'sound/spookoween/scary_horn2.ogg', 100, 0, -4) + playsound(loc, 'sound/spookoween/scary_horn2.ogg', 100, FALSE, -4) qdel(src) else Acquire_Victim() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm index 88e1daee67c..6452c440823 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm @@ -487,7 +487,7 @@ Difficulty: Hard say(pick("OTZKMXOZE LGORAXK, YKRL JKYZXAIZ GIZOBK", "RUYY IKXZGOT, KTMGMKOTM XKIUBKXE JKTOGR", "VUCKX IUXKY 8-12 HXKGINKJ, UBKXRUGJOTM XKSGOTOTM IUXKY", "KXXUX KXXUX KXXUX KXXUX KXX-", "-ROQK ZKGXY OT XGOT- - -ZOSK ZU JOK")) visible_message("[src] begins to overload it's core. It is going to explode!") walk(src, 0) - playsound(src,'sound/machines/alarm.ogg',100,0,5) + playsound(src,'sound/machines/alarm.ogg', 100, FALSE, 5) addtimer(CALLBACK(src, PROC_REF(kaboom)), 10 SECONDS) /mob/living/simple_animal/hostile/megafauna/ancient_robot/proc/kaboom() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index f5807283cd4..56c38fb4ddd 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -265,14 +265,14 @@ Difficulty: Medium new /obj/effect/temp_visual/small_smoke/halfsecond(step_forward_turf) var/obj/effect/temp_visual/decoy/fading/halfsecond/D = new (own_turf, src) forceMove(step_back_turf) - playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1) + playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, TRUE, -1) dashing = TRUE alpha = 0 animate(src, alpha = 255, time = 5) SLEEP_CHECK_DEATH(2) D.forceMove(step_forward_turf) forceMove(target_turf) - playsound(target_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1) + playsound(target_turf, 'sound/weapons/punchmiss.ogg', 40, TRUE, -1) SLEEP_CHECK_DEATH(1) dashing = FALSE return TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm index a6508166dca..88c8bb0a212 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm @@ -232,7 +232,7 @@ While using this makes the system rely on OnFire, it still gives options for tim var/selectedspawn = pick(potentialspawns) mychild = new selectedspawn(loc) visible_message("[mychild] emerges from [src]!") - playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) + playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE) if(boosted) mychild.key = elitemind.key mychild.sentience_act() @@ -246,7 +246,7 @@ While using this makes the system rely on OnFire, it still gives options for tim /obj/structure/elite_tumor/proc/return_elite() mychild.forceMove(loc) visible_message("[mychild] emerges from [src]!") - playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) + playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE) mychild.revive() if(boosted) mychild.maxHealth = mychild.maxHealth * 2.5 @@ -339,11 +339,11 @@ While using this makes the system rely on OnFire, it still gives options for tim if(activator != null && get_dist(src, activator) >= ARENA_RADIUS) activator.forceMove(loc) visible_message("[activator] suddenly reappears above [src]!") - playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) + playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE) if(mychild != null && get_dist(src, mychild) >= ARENA_RADIUS) mychild.forceMove(loc) visible_message("[mychild] suddenly reappears above [src]!") - playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) + playsound(loc,'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE) /obj/structure/elite_tumor/HasProximity(atom/movable/AM) if(!ishuman(AM) && !isrobot(AM)) @@ -360,11 +360,11 @@ While using this makes the system rely on OnFire, it still gives options for tim invaders += M var/list/valid_turfs = RANGE_EDGE_TURFS(ARENA_RADIUS + 2, src) // extra safety M.forceMove(pick(valid_turfs)) //Doesn't check for lava. Don't cheese it. - playsound(M, 'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE) + playsound(M, 'sound/effects/phasein.ogg', 200, FALSE, 50, TRUE, TRUE) /obj/structure/elite_tumor/proc/onEliteLoss() - playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, TRUE, TRUE) + playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE) visible_message("[src] begins to convulse violently before beginning to dissipate.") visible_message("As [src] closes, something is forced up from down below.") var/obj/structure/closet/crate/necropolis/tendril/lootbox = new /obj/structure/closet/crate/necropolis/tendril(loc) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 8958daeee77..793850891d8 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -402,7 +402,7 @@ if(istype(hat)) damage += hat.force * 3 affecting.apply_damage(damage*rand(90, 110)/100, BRUTE, "head", affected.run_armor_check(affecting, MELEE)) - playsound(assailant.loc, "swing_hit", 25, 1, -1) + playsound(assailant.loc, "swing_hit", 25, TRUE, -1) add_attack_logs(assailant, affecting, "Headbutted") return diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index be34bf70541..9700564be7f 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -13,7 +13,7 @@ /obj/item/katana/energy/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - playsound(user, 'sound/weapons/blade1.ogg', 50, 1, -1) + playsound(user, 'sound/weapons/blade1.ogg', 50, TRUE, -1) return ..() /obj/item/katana/energy/afterattack(atom/target, mob/user, proximity_flag, click_parameters) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index f151998b1f7..14f700299f0 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -144,7 +144,7 @@ var/mob/M = usr if(!is_screen_atom(over_object)) return ..() - playsound(loc, "rustle", 50, 1, -5) + playsound(loc, "rustle", 50, TRUE, -5) if((!M.restrained() && !M.stat && M.back == src)) switch(over_object.name) if("r_hand") @@ -369,7 +369,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor return captureimage(target, user, flag) - playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) + playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, TRUE, -3) set_light(3, 2, LIGHT_COLOR_TUNGSTEN) addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, set_light), 0), 2) pictures_left-- @@ -500,7 +500,7 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor return captureimage(target, user, flag) - playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) + playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, TRUE, -3) icon_state = icon_off on = FALSE diff --git a/code/modules/projectiles/guns/energy_guns.dm b/code/modules/projectiles/guns/energy_guns.dm index 2085ef01f53..63f5852da1f 100644 --- a/code/modules/projectiles/guns/energy_guns.dm +++ b/code/modules/projectiles/guns/energy_guns.dm @@ -211,7 +211,7 @@ sleep(25) if(user.is_holding(src)) user.visible_message("[user] melts [user.p_their()] face off with [src]!") - playsound(loc, fire_sound, 50, 1, -1) + playsound(loc, fire_sound, 50, TRUE, -1) var/obj/item/ammo_casing/energy/shot = ammo_type[select] cell.use(shot.e_cost) update_icon() @@ -221,7 +221,7 @@ return OXYLOSS else user.visible_message("[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/empty.ogg', 50, TRUE, -1) return OXYLOSS /obj/item/gun/energy/vv_edit_var(var_name, var_value) diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm index 2ba796623d9..26e5ed6ae18 100644 --- a/code/modules/projectiles/guns/grenade_launcher.dm +++ b/code/modules/projectiles/guns/grenade_launcher.dm @@ -52,6 +52,6 @@ log_game("[key_name(user)] fired a grenade ([F.name]) from a grenade launcher ([name]).") F.active = TRUE F.icon_state = initial(icon_state) + "_active" - playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) + playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) spawn(15) F.prime() diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index e44e32525ac..227ea6264d4 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -87,5 +87,5 @@ /obj/item/gun/magic/suicide_act(mob/user) user.visible_message("[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, fire_sound, 50, 1, -1) + playsound(loc, fire_sound, 50, TRUE, -1) return FIRELOSS diff --git a/code/modules/projectiles/guns/projectile_gun.dm b/code/modules/projectiles/guns/projectile_gun.dm index 25dc5282cb4..fd8ffce281d 100644 --- a/code/modules/projectiles/guns/projectile_gun.dm +++ b/code/modules/projectiles/guns/projectile_gun.dm @@ -207,7 +207,7 @@ return OXYLOSS else user.visible_message("[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/empty.ogg', 50, TRUE, -1) return OXYLOSS /obj/item/gun/projectile/proc/sawoff(mob/user) diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 091b37dd56b..090eef860bb 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -279,7 +279,7 @@ // Running out of syringes is just handled by *click* to_chat(user, "[src] [alarmed ? "beeps" : "whines"]: Internal chemical reservoir empty!") if(!alarmed) - playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 25, 1, frequency = 60000) + playsound(loc, 'sound/weapons/smg_empty_alarm.ogg', 25, TRUE, frequency = 60000) alarmed = TRUE // always send the to_chat so there's still feedback if the gun tries to fire diff --git a/code/modules/projectiles/projectile_base.dm b/code/modules/projectiles/projectile_base.dm index 0e25287c36f..f10e7ea0a22 100644 --- a/code/modules/projectiles/projectile_base.dm +++ b/code/modules/projectiles/projectile_base.dm @@ -210,12 +210,12 @@ if(L.has_limbs) organ_hit_text = " in \the [parse_zone(def_zone)]" if(suppressed) - playsound(loc, hitsound, 5, 1, -1) + playsound(loc, hitsound, 5, TRUE, -1) to_chat(L, "You're shot by \a [src][organ_hit_text]!") else if(hitsound) var/volume = vol_by_damage() - playsound(loc, hitsound, volume, 1, -1) + playsound(loc, hitsound, volume, TRUE, -1) L.visible_message("[L] is hit by \a [src][organ_hit_text]!", \ "[L] is hit by \a [src][organ_hit_text]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter if(immolate) @@ -288,7 +288,7 @@ var/volume = clamp(vol_by_damage() + 20, 0, 100) if(suppressed) volume = 5 - playsound(loc, hitsound_wall, volume, 1, -1) + playsound(loc, hitsound_wall, volume, TRUE, -1) else if(ishuman(A)) var/mob/living/carbon/human/H = A var/obj/item/organ/external/organ = H.get_organ(check_zone(def_zone)) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 293230dd83d..c4719868392 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -763,7 +763,7 @@ /datum/reagent/consumable/meatslurry/reaction_turf(turf/T, volume) if(prob(10) && volume >= 5 && !isspaceturf(T)) new /obj/effect/decal/cleanable/blood/gibs/cleangibs(T) - playsound(T, 'sound/effects/splat.ogg', 50, 1, -3) + playsound(T, 'sound/effects/splat.ogg', 50, TRUE, -3) /datum/reagent/consumable/mashedpotatoes name = "Mashed potatoes" diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 159c91faa66..98b0089694e 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -325,7 +325,7 @@ /datum/reagent/medicine/heal_on_apply/synthflesh/reaction_turf(turf/T, volume) //let's make a mess! if(volume >= 5 && !isspaceturf(T)) new /obj/effect/decal/cleanable/blood/gibs/cleangibs(T) - playsound(T, 'sound/effects/splat.ogg', 50, 1, -3) + playsound(T, 'sound/effects/splat.ogg', 50, TRUE, -3) /datum/reagent/medicine/heal_on_apply/styptic_powder name = "Styptic Powder" diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm index c48798fa304..becb5f5bb50 100644 --- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm @@ -436,7 +436,7 @@ continue if(!C.stat) M.visible_message("[M] gives [C] a [pick("hug","warm embrace")].") - playsound(get_turf(M), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + playsound(get_turf(M), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) break return ..() diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index 1988a1a8e19..c5c811b7a67 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -426,7 +426,7 @@ /datum/reagent/liquidgibs/reaction_turf(turf/T, volume) //yes i took it from synthflesh... if(volume >= 5 && !isspaceturf(T)) new /obj/effect/decal/cleanable/blood/gibs/cleangibs(T) - playsound(T, 'sound/effects/splat.ogg', 50, 1, -3) + playsound(T, 'sound/effects/splat.ogg', 50, TRUE, -3) /datum/reagent/lye name = "Lye" diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 0614786d2d1..98c1b7ea6dd 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -267,7 +267,7 @@ holder.del_reagent(f_reagent) var/location = get_turf(holder.my_atom) var/datum/effect_system/smoke_spread/chem/S = new - playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(location, 'sound/effects/smoke.ogg', 50, TRUE, -3) if(S) S.set_up(holder, location) if(created_volume < 5) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 0c276897980..ef2ab713ca3 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -52,7 +52,7 @@ var/contents_log = reagents.reagent_list.Join(", ") INVOKE_ASYNC(src, PROC_REF(spray), A) - playsound(loc, 'sound/effects/spray2.ogg', 50, 1, -6) + playsound(loc, 'sound/effects/spray2.ogg', 50, TRUE, -6) user.changeNext_move(delay) user.newtonian_move(get_dir(A, user)) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 5899bb7a4b7..1edfcd5125e 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -161,7 +161,7 @@ gripper.gripped_item.forceMove(src) user.visible_message( - "[user] places [gripper.gripped_item] into the disposal unit.", + "[user] places [gripper.gripped_item] into the disposal unit.", "You place [gripper.gripped_item] into the disposal unit.", "You hear someone dropping something into a disposal unit." ) @@ -216,11 +216,11 @@ . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return - + if(length(contents) > 0) to_chat(user, "You need to empty the contents of the disposal unit first!") return - + if(mode == DISPOSALS_OFF) // It's off but still not unscrewed mode = DISPOSALS_UNSCREWED else if(mode == DISPOSALS_UNSCREWED) @@ -558,7 +558,7 @@ sleep(10) if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time) - playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0) + playsound(src, 'sound/machines/disposalflush.ogg', 50, FALSE, 0) last_sound = world.time sleep(5) // wait for animation to finish @@ -593,7 +593,7 @@ var/turf/target if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time) - playsound(src, 'sound/machines/hiss.ogg', 50, 0, FALSE) + playsound(src, 'sound/machines/hiss.ogg', 50, FALSE, FALSE) last_sound = world.time if(H) // Somehow, someone managed to flush a window which broke mid-transit and caused the disposal to go in an infinite loop trying to expel null, hopefully this fixes it @@ -816,7 +816,7 @@ for(var/mob/M in hearers(loc.loc)) to_chat(M, "CLONG, clong!") - playsound(loc, 'sound/effects/clang.ogg', 50, 0, 0) + playsound(loc, 'sound/effects/clang.ogg', 50, FALSE, 0) // called to vent all gas in holder to a location /obj/structure/disposalholder/proc/vent_gas(turf/location) @@ -960,7 +960,7 @@ target = get_ranged_target_turf(T, direction, 10) if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time) - playsound(src, 'sound/machines/hiss.ogg', 50, 0, FALSE) + playsound(src, 'sound/machines/hiss.ogg', 50, FALSE, FALSE) last_sound = world.time if(H) @@ -978,7 +978,7 @@ else // no specified direction, so throw in random direction if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time) - playsound(src, 'sound/machines/hiss.ogg', 50, 0, FALSE) + playsound(src, 'sound/machines/hiss.ogg', 50, FALSE, FALSE) last_sound = world.time if(H) for(var/atom/movable/AM in H) @@ -1540,10 +1540,10 @@ play_sound = TRUE last_sound = world.time if(play_sound) - playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, FALSE) + playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE, FALSE) sleep(20) //wait until correct animation frame if(play_sound) - playsound(src, 'sound/machines/hiss.ogg', 50, 0, FALSE) + playsound(src, 'sound/machines/hiss.ogg', 50, FALSE, FALSE) for(var/atom/movable/AM in contents) AM.forceMove(loc) AM.pipe_eject(dir) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 5e9f2d3ff23..0e3f0568fe5 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -332,7 +332,7 @@ sleep(10) if(last_sound + DISPOSAL_SOUND_COOLDOWN < world.time) - playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, FALSE) + playsound(src, 'sound/machines/disposalflush.ogg', 50, FALSE, FALSE) last_sound = world.time sleep(5) // wait for animation to finish diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 946691db282..1784c584970 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -308,7 +308,7 @@ investigate_log("Experimentor has released [chosenchem] smoke.", "experimentor") var/datum/effect_system/smoke_spread/chem/smoke = new smoke.set_up(R, src, TRUE) - playsound(loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(loc, 'sound/effects/smoke.ogg', 50, TRUE, -3) smoke.start() qdel(R) ejectItem(TRUE) @@ -320,7 +320,7 @@ R.add_reagent(chosenchem , 15) var/datum/effect_system/smoke_spread/chem/smoke = new smoke.set_up(R, src, TRUE) - playsound(loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(loc, 'sound/effects/smoke.ogg', 50, TRUE, -3) smoke.start() qdel(R) ejectItem(TRUE) @@ -399,7 +399,7 @@ investigate_log("Experimentor has released frostoil gas.", "experimentor") var/datum/effect_system/smoke_spread/chem/smoke = new smoke.set_up(R, src, TRUE) - playsound(loc, 'sound/effects/smoke.ogg', 50, 1, -3) + playsound(loc, 'sound/effects/smoke.ogg', 50, TRUE, -3) smoke.start() qdel(R) ejectItem(TRUE) @@ -427,7 +427,7 @@ linked_materials.insert_amount( min((linked_materials.max_amount - linked_materials.total_amount), (exp_on.materials[material])), material) if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!") - playsound(loc, 'sound/effects/supermatter.ogg', 50, 1, -3) + playsound(loc, 'sound/effects/supermatter.ogg', 50, TRUE, -3) investigate_log("Experimentor has triggered the 'throw things' reaction.", "experimentor") for(var/atom/movable/AM in oview(7,src)) if(!AM.anchored) @@ -436,7 +436,7 @@ if(prob(EFFECT_PROB_LOW-badThingCoeff)) visible_message("[src]'s crusher goes one level too high, crushing right into space-time!") - playsound(loc, 'sound/effects/supermatter.ogg', 50, 1, -3) + playsound(loc, 'sound/effects/supermatter.ogg', 50, TRUE, -3) investigate_log("Experimentor has triggered the 'minor throw things' reaction.", "experimentor") var/list/throwAt = list() for(var/atom/movable/AM in oview(7,src)) diff --git a/code/modules/ruins/objects_and_mobs/gym.dm b/code/modules/ruins/objects_and_mobs/gym.dm index 6fcec57e452..7284e9f9226 100644 --- a/code/modules/ruins/objects_and_mobs/gym.dm +++ b/code/modules/ruins/objects_and_mobs/gym.dm @@ -14,7 +14,7 @@ if(.) return flick("[icon_state]2", src) - playsound(loc, pick(hit_sounds), 25, 1, -1) + playsound(loc, pick(hit_sounds), 25, TRUE, -1) /obj/structure/weightmachine diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index bbbca5041ff..e9313788a4a 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -711,7 +711,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(!length(contents)) to_chat(user, "There is nothing left inside [src]!") return - playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) + playsound(loc, 'sound/weapons/slice.ogg', 50, TRUE, -1) user.visible_message("[user] begins to cut open [src].",\ "You begin to cut open [src]...") if(do_after(user, 5.4 SECONDS, target = src)) diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 88b78120916..002530787f0 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -108,6 +108,6 @@ if(user) to_chat(user, " Locked In") new /obj/machinery/telepad_cargo(user.loc) - playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) + playsound(src, 'sound/effects/pop.ogg', 100, TRUE, 1) qdel(src) return diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm index 6f5063090b8..96d276aa504 100644 --- a/code/modules/vehicle/vehicle.dm +++ b/code/modules/vehicle/vehicle.dm @@ -185,7 +185,7 @@ if(issimulatedturf(loc)) var/turf/simulated/T = loc if(T.wet == TURF_WET_LUBE) //Lube! Fall off! - playsound(src, 'sound/misc/slip.ogg', 50, 1, -3) + playsound(src, 'sound/misc/slip.ogg', 50, TRUE, -3) for(var/m in buckled_mobs) var/mob/living/buckled_mob = m buckled_mob.KnockDown(10 SECONDS)