diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 43d931f7bf7..eac8267b577 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -190,3 +190,32 @@ GLOBAL_LIST_INIT(announcer_keys, list( ANNOUNCER_KLAXON //SKYRAT EDIT END )) + +/// List of all of our sound keys. +#define SFX_BODYFALL "bodyfall" +#define SFX_BULLET_MISS "bullet_miss" +#define SFX_CAN_OPEN "can_open" +#define SFX_CLOWN_STEP "clown_step" +#define SFX_DESECRATION "desecration" +#define SFX_EXPLOSION "explosion" +#define SFX_EXPLOSION_CREAKING "explosion_creaking" +#define SFX_HISS "hiss" +#define SFX_HONKBOT_E "honkbot_e" +#define SFX_HULL_CREAKING "hull_creaking" +#define SFX_HYPERTORUS_CALM "hypertorus_calm" +#define SFX_HYPERTORUS_MELTING "hypertorus_melting" +#define SFX_IM_HERE "im_here" +#define SFX_LAW "law" +#define SFX_PAGE_TURN "page_turn" +#define SFX_PUNCH "punch" +#define SFX_REVOLVER_SPIN "revolver_spin" +#define SFX_RICOCHET "ricochet" +#define SFX_RUSTLE "rustle" +#define SFX_SHATTER "shatter" +#define SFX_SM_CALM "sm_calm" +#define SFX_SM_DELAM "sm_delam" +#define SFX_SPARKS "sparks" +#define SFX_SUIT_STEP "suit_step" +#define SFX_SWING_HIT "swing_hit" +#define SFX_TERMINAL_TYPE "terminal_type" +#define SFX_WARPSPEED "warpspeed" diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm index bc3310e38b0..59f81443a1c 100644 --- a/code/controllers/subsystem/explosions.dm +++ b/code/controllers/subsystem/explosions.dm @@ -528,7 +528,7 @@ SUBSYSTEM_DEF(explosions) * - [creaking_sound][/sound]: The sound that plays when the station creaks during the explosion. * - [hull_creaking_sound][/sound]: The sound that plays when the station creaks after the explosion. */ -/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx("explosion")), sound/far_sound = sound('sound/effects/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx("explosion_creaking")), hull_creaking_sound = sound(get_sfx("hull_creaking"))) +/datum/controller/subsystem/explosions/proc/shake_the_room(turf/epicenter, near_distance, far_distance, quake_factor, echo_factor, creaking, sound/near_sound = sound(get_sfx(SFX_SHATTER)), sound/far_sound = sound('sound/effects/explosionfar.ogg'), sound/echo_sound = sound('sound/effects/explosion_distant.ogg'), sound/creaking_sound = sound(get_sfx(SFX_EXPLOSION_CREAKING)), hull_creaking_sound = sound(get_sfx(SFX_HULL_CREAKING))) var/frequency = get_rand_frequency() var/blast_z = epicenter.z if(isnull(creaking)) // Autoset creaking. diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index aa5aea20b7e..acc8c8d2a0c 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -530,7 +530,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) to_chat(M, span_warning("[parent] seems to be locked!")) return FALSE if(dump_destination.storage_contents_dump_act(src, M)) - playsound(A, "rustle", 50, TRUE, -5) + playsound(A, SFX_RUSTLE, 50, TRUE, -5) A.do_squish(0.8, 1.2) //SKYRAT EDIT ADDITION - AESTHETICS return TRUE return FALSE @@ -613,7 +613,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return if(A.loc != M) return - //playsound(A, "rustle", 50, TRUE, -5) //SKYRAT EDIT REMOVAL - AESTHETICS + //playsound(A, SFX_RUSTLE, 50, TRUE, -5) //SKYRAT EDIT REMOVAL - AESTHETICS if(istype(over_object, /atom/movable/screen/inventory/hand)) var/atom/movable/screen/inventory/hand/H = over_object M.putItemFromInventoryInHandIfPossible(A, H.held_index) @@ -724,7 +724,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(silent && !override) return if(rustle_sound) - playsound(parent, "rustle", 50, TRUE, -5) + playsound(parent, SFX_RUSTLE, 50, TRUE, -5) var/atom/A = parent //SKYRAT EDIT ADDITION - AESTHETICS A.do_squish() //SKYRAT EDIT ADDITION - AESTHETICS for(var/mob/viewing in viewers(user, null)) @@ -822,7 +822,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return if(rustle_sound) - playsound(A, "rustle", 50, TRUE, -5) + playsound(A, SFX_RUSTLE, 50, TRUE, -5) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -885,7 +885,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(!quickdraw) A.add_fingerprint(user) user_show_to_mob(user) - playsound(A, "rustle", 50, TRUE, -5) + playsound(A, SFX_RUSTLE, 50, TRUE, -5) A.do_jiggle() //SKYRAT EDIT ADDITION - AESTHETICS return diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 4f8e6cfce25..28991d60341 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -478,7 +478,7 @@ /datum/component/tackler/proc/delayedSmash(obj/structure/window/W) if(W) W.atom_destruction() - playsound(W, "shatter", 70, TRUE) + playsound(W, SFX_SHATTER, 70, TRUE) ///Check to see if we hit a table, and if so, make a big mess! /datum/component/tackler/proc/checkObstacle(mob/living/carbon/owner) diff --git a/code/datums/components/vacuum.dm b/code/datums/components/vacuum.dm index 601fdc0d873..ff403899775 100644 --- a/code/datums/components/vacuum.dm +++ b/code/datums/components/vacuum.dm @@ -58,7 +58,7 @@ // if we did indeed suck up something, play a funny noise if (sucked) - playsound(parent, "rustle", 50, TRUE, -5) + playsound(parent, SFX_RUSTLE, 50, TRUE, -5) /** * Handler for when a new trash bag is attached diff --git a/code/datums/elements/deliver_first.dm b/code/datums/elements/deliver_first.dm index 16ab14ebc8a..6c6bb92bc39 100644 --- a/code/datums/elements/deliver_first.dm +++ b/code/datums/elements/deliver_first.dm @@ -93,5 +93,5 @@ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread() spark_system.set_up(4, 0, target.loc) spark_system.start() - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) target.RemoveElement(/datum/element/deliver_first, goal_area_type, payment) diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index 2ebece40d3b..20b3f22e76f 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -194,7 +194,7 @@ If you make a derivative work from this code, you must include this notification D.visible_message(span_danger("[A] throws [D]!"), \ span_userdanger("You're thrown by [A]!"), span_hear("You hear aggressive shuffling and a loud thud!"), null, A) to_chat(A, span_danger("You throw [D]!")) - playsound(A.loc, "swing_hit", 50, TRUE) + playsound(A.loc, SFX_SWING_HIT, 50, TRUE) var/turf/T = get_edge_target_turf(A, A.dir) if (T && isturf(T)) if (!D.stat) @@ -296,7 +296,7 @@ If you make a derivative work from this code, you must include this notification D.visible_message(span_danger("[A] [fluff] [D]!"), \ span_userdanger("You're [fluff]ed by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) to_chat(A, span_danger("You [fluff] [D]!")) - playsound(A.loc, "swing_hit", 50, TRUE) + playsound(A.loc, SFX_SWING_HIT, 50, TRUE) if (!D.stat) D.emote("scream") D.Paralyze(40) @@ -342,7 +342,7 @@ If you make a derivative work from this code, you must include this notification span_userdanger("You're headbutted by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) to_chat(A, span_danger("You headbutt [D]!")) D.adjustBruteLoss(rand(10,20)) - playsound(A.loc, "swing_hit", 50, TRUE) + playsound(A.loc, SFX_SWING_HIT, 50, TRUE) D.Unconscious(20) log_combat(A, D, "headbutted") @@ -356,7 +356,7 @@ If you make a derivative work from this code, you must include this notification D.visible_message(span_danger("[A] roundhouse-kicks [D]!"), \ span_userdanger("You're roundhouse-kicked by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) to_chat(A, span_danger("You roundhouse-kick [D]!")) - playsound(A.loc, "swing_hit", 50, TRUE) + playsound(A.loc, SFX_SWING_HIT, 50, TRUE) D.adjustBruteLoss(rand(10,20)) var/turf/T = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) @@ -422,7 +422,7 @@ If you make a derivative work from this code, you must include this notification D.visible_message(span_danger("[A] leg-drops [D]!"), \ span_userdanger("You're leg-dropped by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, A) to_chat(A, span_danger("You leg-drop [D]!")) - playsound(A.loc, "swing_hit", 50, TRUE) + playsound(A.loc, SFX_SWING_HIT, 50, TRUE) A.emote("scream") if (falling == 1) diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index b3a49861456..c279e2fdf90 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -240,7 +240,7 @@ yeeted_person.visible_message(span_danger("[the_hulk] throws [yeeted_person]!"), \ span_userdanger("You're thrown by [the_hulk]!"), span_hear("You hear aggressive shuffling and a loud thud!"), null, the_hulk) to_chat(the_hulk, span_danger("You throw [yeeted_person]!")) - playsound(the_hulk.loc, "swing_hit", 50, TRUE) + playsound(the_hulk.loc, SFX_SWING_HIT, 50, TRUE) var/turf/T = get_edge_target_turf(the_hulk, the_hulk.dir) if(!isturf(T)) return diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 9f51694f17f..f5e46be09e5 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -553,7 +553,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, "desecration", 100, TRUE, -1) + playsound(T, SFX_DESECRATION, 100, TRUE, -1) /datum/status_effect/stacking/saw_bleed/bloodletting id = "bloodletting" diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 2c393b86473..d80725367e8 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -111,7 +111,7 @@ return req_access = list() req_one_access = list() - playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) obj_flags |= EMAGGED /obj/machinery/button/attack_ai(mob/user) diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm index c44d5c56b4b..5b76e4d1fb9 100644 --- a/code/game/machinery/civilian_bounties.dm +++ b/code/game/machinery/civilian_bounties.dm @@ -379,7 +379,7 @@ addtimer(CALLBACK(src, .proc/launch_payload), 1 SECONDS) /obj/item/civ_bounty_beacon/proc/launch_payload() - playsound(src, "sparks", 80, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 80, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) switch(uses) if(2) new /obj/machinery/piratepad/civilian(drop_location()) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index cb82fbdb32c..9e04be0e1e7 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -124,7 +124,7 @@ addtimer(CALLBACK(src, .proc/restore_comp), rand(3,5) * 9) if("access-apc") var/ref = params["ref"] - playsound(src, "terminal_type", 50, FALSE) + playsound(src, SFX_TERMINAL_TYPE, 50, FALSE) var/obj/machinery/power/apc/APC = locate(ref) in GLOB.apcs_list if(!APC) return @@ -196,7 +196,7 @@ return obj_flags |= EMAGGED log_game("[key_name(user)] emagged [src] at [AREACOORD(src)]") - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /obj/machinery/computer/apc_control/proc/log_activity(log_text) if(!should_log) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 6e42cf93b7b..f3a078d538d 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -130,7 +130,7 @@ var/list/cameras = get_available_cameras() var/obj/machinery/camera/selected_camera = cameras[c_tag] active_camera = selected_camera - playsound(src, get_sfx("terminal_type"), 25, FALSE) + playsound(src, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE) if(!selected_camera) return TRUE diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index e22a0a4a7f3..5491d46a739 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -293,7 +293,7 @@ if(isnull(T[camera])) return var/obj/machinery/camera/final = T[camera] - playsound(src, "terminal_type", 25, FALSE) + playsound(src, SFX_TERMINAL_TYPE, 25, FALSE) if(final) playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE) remote_eye.setLoc(get_turf(final)) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 8db68a3492e..831df83669b 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -360,7 +360,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) if (state == STATE_BUYING_SHUTTLE && can_buy_shuttles(usr) != TRUE) return set_state(usr, params["state"]) - playsound(src, "terminal_type", 50, FALSE) + playsound(src, SFX_TERMINAL_TYPE, 50, FALSE) if ("setStatusMessage") if (!authenticated(usr)) return @@ -369,7 +369,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) post_status("alert", "blank") post_status("message", line_one, line_two) last_status_display = list(line_one, line_two) - playsound(src, "terminal_type", 50, FALSE) + playsound(src, SFX_TERMINAL_TYPE, 50, FALSE) if ("setStatusPicture") if (!authenticated(usr)) return @@ -380,7 +380,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) post_status(picture) else post_status("alert", picture) - playsound(src, "terminal_type", 50, FALSE) + playsound(src, SFX_TERMINAL_TYPE, 50, FALSE) if ("toggleAuthentication") // Log out if we're logged in if (authorize_name) diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm index 21a7b9cff83..5af5bfba95f 100644 --- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm +++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm @@ -148,7 +148,7 @@ prisoner.Paralyze(40) // small travel dizziness to_chat(prisoner, span_warning("The teleportation makes you a little dizzy.")) new /obj/effect/particle_effect/sparks(get_turf(prisoner)) - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(teleporter.locked) teleporter.locked = FALSE teleporter.toggle_open() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 03a997e78de..c7b3c3786ac 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -558,7 +558,7 @@ What a mess.*/ to_chat(usr, span_notice("The fine has been paid in full.")) SSblackbox.ReportCitation(text2num(href_list["cdataid"]),"","","","", 0, pay) qdel(C) - playsound(src, "terminal_type", 25, FALSE) + playsound(src, SFX_TERMINAL_TYPE, 25, FALSE) else to_chat(usr, span_warning("Fines can only be paid with holochips!")) diff --git a/code/game/machinery/computer/warrant.dm b/code/game/machinery/computer/warrant.dm index f592ebd1a08..52f06860752 100644 --- a/code/game/machinery/computer/warrant.dm +++ b/code/game/machinery/computer/warrant.dm @@ -130,7 +130,7 @@ to_chat(M, span_notice("The fine has been paid in full.")) SSblackbox.ReportCitation(text2num(href_list["cdataid"]),"","","","", 0, pay) qdel(C) - playsound(src, "terminal_type", 25, FALSE) + playsound(src, SFX_TERMINAL_TYPE, 25, FALSE) else to_chat(M, span_warning("Fines can only be paid with holochips!")) updateUsrDialog() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 98ec3b4bc42..4a633bc3b87 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -70,7 +70,7 @@ set_density(FALSE) QDEL_LIST(debris) if(atom_integrity == 0) - playsound(src, "shatter", 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) electronics = null var/turf/floor = get_turf(src) floor.air_update_turf(TRUE, FALSE) @@ -274,7 +274,7 @@ obj_flags |= EMAGGED operating = TRUE flick("[base_state]spark", src) - playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) sleep(6) operating = FALSE desc += "
[span_warning("Its access panel is smoking slightly.")]" diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index e9f34cf9df1..04b338c10e4 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -31,7 +31,7 @@ obj_flags |= EMAGGED req_access = list() req_one_access = list() - playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(user, span_warning("You short out the access controller.")) /obj/machinery/door_buttons/proc/removeMe() diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index c3a287c9736..1992bcd0f41 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -145,7 +145,7 @@ if(user) user.visible_message(span_warning("Sparks fly out of [src]!"), span_notice("You override [src], disabling the speaker.")) - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) set_status() /** diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 6a6d877bc33..b757ee80184 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -1014,7 +1014,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster/security_unit, 30) if(curr_page == 0) //We're at the start, get to the middle screen=1 curr_page++ - playsound(loc, "pageturn", 50, TRUE) + playsound(loc, SFX_PAGE_TURN, 50, TRUE) else if(href_list["prev_page"]) if(curr_page == 0) return @@ -1024,7 +1024,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster/security_unit, 30) if(curr_page == pages+1) //we're at the end, let's go back to the middle. screen = 1 curr_page-- - playsound(loc, "pageturn", 50, TRUE) + playsound(loc, SFX_PAGE_TURN, 50, TRUE) if(ismob(loc)) attack_self(loc) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index e7c9ba8d002..69a1f15c258 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -90,7 +90,7 @@ if(safety_mode) safety_mode = FALSE update_appearance() - playsound(src, "sparks", 75, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 75, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(user, span_notice("You use the cryptographic sequencer on [src].")) /obj/machinery/recycler/update_icon_state() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 28fb29e3bc6..b8e0f6e5355 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -246,7 +246,7 @@ return obj_flags |= EMAGGED locked = FALSE - playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(user, span_warning("You short out the access controller.")) /obj/machinery/shieldgen/update_icon_state() @@ -450,7 +450,7 @@ return obj_flags |= EMAGGED locked = FALSE - playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(user, span_warning("You short out the access controller.")) //////////////Containment Field START diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index ad1aef979ef..4e33d5affe7 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -132,7 +132,7 @@ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread() spark_system.set_up(4, 0, src.loc) spark_system.start() - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /obj/machinery/computer/slot_machine/ui_interact(mob/living/user) . = ..() diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm index 413edd9ec17..86800d0522c 100644 --- a/code/game/objects/effects/effect_system/effects_sparks.dm +++ b/code/game/objects/effects/effect_system/effects_sparks.dm @@ -27,7 +27,7 @@ /obj/effect/particle_effect/sparks/LateInitialize() flick(icon_state, src) - playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) var/turf/T = loc if(isturf(T)) T.hotspot_expose(1000,100) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8fa2fb10b79..b8df44d4306 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -236,7 +236,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e if(damtype == BURN) hitsound = 'sound/items/welder.ogg' if(damtype == BRUTE) - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT add_weapon_description() @@ -826,7 +826,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e if(damtype == BURN) . = 'sound/weapons/sear.ogg' else - . = "desecration" + . = SFX_DESECRATION /obj/item/proc/open_flame(flame_heat=700) var/turf/location = loc @@ -1243,12 +1243,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e var/obj/item/shard/broken_glass = new /obj/item/shard(loc) broken_glass.name = "broken [name]" broken_glass.desc = "This used to be \a [name], but it sure isn't anymore." - playsound(victim, "shatter", 25, TRUE) + playsound(victim, SFX_SHATTER, 25, TRUE) qdel(src) if(QDELETED(source_item)) broken_glass.on_accidental_consumption(victim, user) else //33% chance to just "crack" it (play a sound) and leave it in the bread - playsound(victim, "shatter", 15, TRUE) + playsound(victim, SFX_SHATTER, 15, TRUE) discover_after = FALSE victim.adjust_disgust(33) diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index 1870e2566da..b4f196ec1a4 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -16,7 +16,7 @@ custom_materials = list(/datum/material/iron=13000) attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices") attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice") - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT sharpness = SHARP_EDGED actions_types = list(/datum/action/item_action/startchainsaw) tool_behaviour = TOOL_SAW @@ -70,7 +70,7 @@ if(on) hitsound = 'sound/weapons/chainsawhit.ogg' else - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT if(src == user.get_active_held_item()) //update inhands user.update_inv_hands() diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index eda3ff1c665..950a8763649 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -282,7 +282,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM reagents.flags |= NO_REACT lit = FALSE update_icon() - + if(ismob(loc)) var/mob/living/M = loc to_chat(M, span_notice("Your [name] goes out.")) @@ -742,7 +742,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM attack_verb_simple = string_list(list("burn", "singe")) START_PROCESSING(SSobj, src) else - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT force = 0 attack_verb_continuous = null //human_defense.dm takes care of it attack_verb_simple = null diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 086e4e728fc..bab5a9a85b0 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -244,6 +244,6 @@ /obj/effect/dumpeet_target/proc/endLaunch() QDEL_NULL(DF) //Delete the falling machine effect, because at this point its animation is over. We dont use temp_visual because we want to manually delete it as soon as the pod appears - playsound(src, "explosion", 80, TRUE) + playsound(src, SFX_SHATTER, 80, TRUE) dump.forceMove(get_turf(src)) qdel(src) //The target's purpose is complete. It can rest easy now diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 4935774ce10..b7f81a75d92 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -597,7 +597,7 @@ return if(H.stat == DEAD) H.visible_message(span_warning("[H]'s body convulses a bit.")) - playsound(src, "bodyfall", 50, TRUE) + playsound(src, SFX_BODYFALL, 50, TRUE) playsound(src, 'sound/machines/defib_zap.ogg', 75, TRUE, -1) shock_pulling(30, H) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 57b186db457..31d25faa385 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -222,7 +222,7 @@ /obj/item/lightreplacer/proc/Emag() obj_flags ^= EMAGGED - playsound(src.loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src.loc, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(obj_flags & EMAGGED) name = "shortcircuited [initial(name)]" else diff --git a/code/game/objects/items/drug_items.dm b/code/game/objects/items/drug_items.dm index da3de0fc495..134b1dc43ab 100644 --- a/code/game/objects/items/drug_items.dm +++ b/code/game/objects/items/drug_items.dm @@ -64,7 +64,7 @@ if(QDELING(src) || !hit_atom) //Invalid loc return var/obj/item/shard/ampoule_shard = new(drop_location()) - playsound(src, "shatter", 40, TRUE) + playsound(src, SFX_SHATTER, 40, TRUE) transfer_fingerprints_to(ampoule_shard) spillable = TRUE SplashReagents(hit_atom, TRUE) diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 10df93102b3..3a92ff3449c 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -14,7 +14,7 @@ throw_range = 5 sharpness = SHARP_EDGED w_class = WEIGHT_CLASS_SMALL - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT armour_penetration = 35 light_system = MOVABLE_LIGHT light_range = 6 //TWICE AS BRIGHT AS A REGULAR ESWORD @@ -64,7 +64,7 @@ wielded = FALSE w_class = initial(w_class) - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT STOP_PROCESSING(SSobj, src) set_light_on(FALSE) diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm index 8d616159ebb..8aaaebc709e 100644 --- a/code/game/objects/items/food/pie.dm +++ b/code/game/objects/items/food/pie.dm @@ -55,7 +55,7 @@ living_target_getting_hit.StaminaKnockdown(10, TRUE) //SKYRAT EDIT CHANGE - COMBAT living_target_getting_hit.adjust_blurriness(1) living_target_getting_hit.visible_message(span_warning("[living_target_getting_hit] is creamed by [src]!"), span_userdanger("You've been creamed by [src]!")) - playsound(living_target_getting_hit, "desecration", 50, TRUE) + playsound(living_target_getting_hit, SFX_DESECRATION, 50, TRUE) if(is_type_in_typecache(hit_atom, GLOB.creamable)) hit_atom.AddComponent(/datum/component/creamed, src) qdel(src) diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm index 36e5ea55dd7..52cf32b292e 100644 --- a/code/game/objects/items/food/pizza.dm +++ b/code/game/objects/items/food/pizza.dm @@ -324,7 +324,7 @@ return to_chat(user, span_userdanger("Maybe I'll give you a pizza, maybe I'll break off your arm.")) //makes the reference more obvious user.visible_message(span_warning("\The [src] breaks off [user]'s arm!"), span_warning("\The [src] breaks off your arm!")) - playsound(user, "desecration", 50, TRUE, -1) + playsound(user, SFX_DESECRATION, 50, TRUE, -1) /obj/item/food/proc/i_kill_you(obj/item/item, mob/living/user) if(istype(item, /obj/item/food/pineappleslice)) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index d1944c7c38a..d3bcfb594ed 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -198,7 +198,7 @@ hitsound = 'sound/weapons/sear.ogg' damtype = BURN attack_verb_continuous = list("punches", "cross counters", "pummels") - attack_verb_simple = list("punch", "cross counter", "pummel") + attack_verb_simple = list(SFX_PUNCH, "cross counter", "pummel") menu_description = "An undroppable god hand dealing burn damage. Disappears if the arm holding it is cut off." /obj/item/nullrod/godhand/Initialize(mapload) @@ -608,7 +608,7 @@ slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY sharpness = NONE - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks") attack_verb_simple = list("smash", "slam", "whack", "thwack") icon = 'icons/obj/items_and_weapons.dmi' diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index 192edf53f54..40dc9e8497c 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -506,7 +506,7 @@ if(cell?.charge >= cell_hit_cost) active = !active balloon_alert(user, "turned [active ? "on" : "off"]") - playsound(src, "sparks", 75, TRUE, -1) + playsound(src, SFX_SPARKS, 75, TRUE, -1) else active = FALSE if(!cell) @@ -526,7 +526,7 @@ //we're below minimum, turn off active = FALSE update_appearance() - playsound(src, "sparks", 75, TRUE, -1) + playsound(src, SFX_SPARKS, 75, TRUE, -1) /obj/item/melee/baton/security/clumsy_check(mob/living/carbon/human/user) . = ..() @@ -614,7 +614,7 @@ if (!cell || cell.charge < cell_hit_cost) return active = !active - playsound(src, "sparks", 75, TRUE, -1) + playsound(src, SFX_SPARKS, 75, TRUE, -1) update_appearance() /obj/item/melee/baton/security/loaded //this one starts with a cell pre-installed. diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index e74e16d9ae6..15105cefb45 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -166,7 +166,7 @@ icon_state = "e_sword" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT force = 3 throwforce = 5 throw_speed = 3 diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index a03b8a8601d..c6d8880ca1c 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -615,7 +615,7 @@ return ..() if(splat) to_chat(user, span_notice("[src] doesn't seem to be able to go hard right now.")) - return + return if(going_hard) to_chat(user, span_notice("[src] is already going too hard!")) return @@ -635,7 +635,7 @@ going_hard = FALSE update_icon(UPDATE_OVERLAYS) icon_state = "goat_splat" - playsound(src, "desecration", 50, TRUE) + playsound(src, SFX_DESECRATION, 50, TRUE) visible_message(span_danger("[src] gets absolutely flattened!")) splat = TRUE diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index bf414aea570..4bbdac3474f 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -31,7 +31,7 @@ return user.visible_message("[user] flourishes [src]!", \ span_notice("You raise [src] skywards, inspiring your allies!")) - playsound(src, "rustle", 100, FALSE) + playsound(src, SFX_RUSTLE, 100, FALSE) if(warcry) user.say("[warcry]", forced="banner") var/old_transform = user.transform diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm index 3bf15d05eaa..b9c7e62af5a 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/singularityhammer.dm @@ -104,7 +104,7 @@ /obj/item/mjollnir/ComponentInitialize() . = ..() - AddComponent(/datum/component/two_handed, force_multiplier=5, icon_wielded="[base_icon_state]1", attacksound="sparks") + AddComponent(/datum/component/two_handed, force_multiplier=5, icon_wielded="[base_icon_state]1", attacksound=SFX_SPARKS) /// triggered on wield of two handed item /obj/item/mjollnir/proc/on_wield(obj/item/source, mob/user) diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index 4ef2efa87d8..1ba35286628 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -33,7 +33,7 @@ /obj/item/stack/ore/bluespace_crystal/attack_self(mob/user) user.visible_message(span_warning("[user] crushes [src]!"), span_danger("You crush [src]!")) new /obj/effect/particle_effect/sparks(loc) - playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) blink_mob(user) use(1) @@ -45,7 +45,7 @@ visible_message(span_notice("[src] fizzles and disappears upon impact!")) var/turf/T = get_turf(hit_atom) new /obj/effect/particle_effect/sparks(T) - playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(isliving(hit_atom)) blink_mob(hit_atom) use(1) diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index 176a33688d4..9bf0591c74a 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -41,7 +41,7 @@ if(!shards.len) return FALSE user.do_attack_animation(src, ATTACK_EFFECT_BOOP) - playsound(src, "shatter", 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) use(1) user.visible_message(span_notice("[user] shatters the sheet of [name] on the floor, leaving [english_list(shards)]."), \ span_notice("You shatter the sheet of [name] on the floor, leaving [english_list(shards)].")) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index c00e2a6b9d5..45a29ffe51e 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -71,7 +71,7 @@ user.dropItemToGround(src, TRUE) user.Stun(100, ignore_canstun = TRUE) sleep(20) - playsound(src, "rustle", 50, TRUE, -5) + playsound(src, SFX_RUSTLE, 50, TRUE, -5) qdel(user) /obj/item/storage/backpack/santabag diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 081b2732e77..3da07236684 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -160,7 +160,7 @@ spam_protection = TRUE continue if(show_message) - playsound(user, "rustle", 50, TRUE) + playsound(user, SFX_RUSTLE, 50, TRUE) if (box) user.visible_message(span_notice("[user] offloads the ores beneath [user.p_them()] into [box]."), \ span_notice("You offload the ores beneath you into your [box].")) diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 64fec2c45a5..02c6b23eae8 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -148,7 +148,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", H.update_damage_overlays() H.visible_message(span_notice("[user] heals [H] with the power of [deity_name]!")) to_chat(H, span_boldnotice("May the power of [deity_name] compel you to be healed!")) - playsound(src.loc, "punch", 25, TRUE, -1) + playsound(src.loc, SFX_PUNCH, 25, TRUE, -1) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) return TRUE @@ -174,7 +174,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if (M.stat == DEAD) M.visible_message(span_danger("[user] smacks [M]'s lifeless corpse with [src].")) - playsound(src.loc, "punch", 25, TRUE, -1) + playsound(src.loc, SFX_PUNCH, 25, TRUE, -1) return if(user == M) @@ -194,7 +194,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if(smack) M.visible_message(span_danger("[user] beats [M] over the head with [src]!"), \ span_userdanger("[user] beats [M] over the head with [src]!")) - playsound(src.loc, "punch", 25, TRUE, -1) + playsound(src.loc, SFX_PUNCH, 25, TRUE, -1) log_combat(user, M, "attacked", src) /obj/item/storage/book/bible/afterattack(atom/bible_smacked, mob/user, proximity) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index af56dc5a297..392617f36fd 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -833,7 +833,7 @@ /obj/item/storage/box/hug/attack_self(mob/user) ..() user.changeNext_move(CLICK_CD_MELEE) - playsound(loc, "rustle", 50, TRUE, -5) + playsound(loc, SFX_RUSTLE, 50, TRUE, -5) user.visible_message(span_notice("[user] hugs \the [src]."),span_notice("You hug \the [src].")) /////clown box & honkbot assembly diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 9ca87910be6..0146a83e4f4 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -6,7 +6,7 @@ righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' flags_1 = CONDUCT_1 force = 8 - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT throw_speed = 2 throw_range = 4 w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 6bb17213b82..fdf8591cd98 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -133,7 +133,7 @@ righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' desc = "A large briefcase with a digital locking system." force = 8 - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT throw_speed = 2 throw_range = 4 w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 143eb8b3161..c7bfd2eae9d 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -131,7 +131,7 @@ var/obj/item/bodypart/target_bodypart = suicide_victim.get_bodypart(BODY_ZONE_HEAD) if(target_bodypart) target_bodypart.drop_limb() - playsound(loc, "desecration", 50, TRUE, -1) + playsound(loc, SFX_DESECRATION, 50, TRUE, -1) return (BRUTELOSS) /obj/item/crowbar/power/attack(mob/living/carbon/attacked_carbon, mob/user) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index fd1c3e00ecd..e4011c2e855 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -13,7 +13,7 @@ slot_flags = ITEM_SLOT_BELT force = 3 throwforce = 5 - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg') drop_sound = 'sound/items/handling/weldingtool_drop.ogg' pickup_sound = 'sound/items/handling/weldingtool_pickup.ogg' @@ -257,7 +257,7 @@ force = 3 damtype = BRUTE - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT update_appearance() diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 72e7e34b834..941fb3f69d5 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -801,7 +801,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 desc = "A wooden stick with white streamers at the end. Originally used by shrine maidens to purify things. Now used by the station's valued weeaboos." force = 5 throwforce = 5 - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT attack_verb_continuous = list("whacks", "thwacks", "wallops", "socks") attack_verb_simple = list("whack", "thwack", "wallop", "sock") icon = 'icons/obj/items_and_weapons.dmi' diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index a1aeaa0ad5e..8c5695d6185 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -654,7 +654,7 @@ user.visible_message(span_warning("Sparks fly from [src]!"), span_warning("You scramble [src]'s lock, breaking it open!"), span_hear("You hear a faint electrical spark.")) - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) broken = TRUE locked = FALSE update_appearance() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 3b921c4971e..f77c4cbd697 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -92,7 +92,7 @@ set_density(FALSE) broken = TRUE new /obj/item/shard(drop_location()) - playsound(src, "shatter", 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) update_appearance() trigger_alarm() @@ -586,7 +586,7 @@ . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) broken = TRUE - playsound(src, "shatter", 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) update_appearance() trigger_alarm() //In case it's given an alarm anyway. diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 14f2e059c1e..c406877eb1d 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -83,7 +83,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) return icon_state = "mirror_broke" if(!mapload) - playsound(src, "shatter", 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) if(desc == initial(desc)) desc = "Oh no, seven years of bad luck!" broken = TRUE diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 31531df5be1..735a2316747 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -397,7 +397,7 @@ visible_message(span_warning("[src] breaks!"), span_danger("You hear breaking glass.")) var/turf/T = get_turf(src) - playsound(T, "shatter", 50, TRUE) + playsound(T, SFX_SHATTER, 50, TRUE) for(var/I in debris) var/atom/movable/AM = I AM.forceMove(T) @@ -414,7 +414,7 @@ return else var/turf/T = get_turf(src) - playsound(T, "shatter", 50, TRUE) + playsound(T, SFX_SHATTER, 50, TRUE) for(var/X in debris) var/atom/movable/AM = X AM.forceMove(T) diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm index 8a9422f4cff..9a36705a5fe 100644 --- a/code/game/objects/structures/training_machine.dm +++ b/code/game/objects/structures/training_machine.dm @@ -117,7 +117,7 @@ return attach_item(target) to_chat(user, span_notice("You attach \the [attached_item] to the training device.")) - playsound(src, "rustle", 50, TRUE) + playsound(src, SFX_RUSTLE, 50, TRUE) /** * Attach an item to the machine @@ -187,7 +187,7 @@ return to_chat(user, span_notice("You remove \the [attached_item] from the training device.")) remove_attached_item(user) - playsound(src, "rustle", 50, TRUE) + playsound(src, SFX_RUSTLE, 50, TRUE) /** * Toggle the machine's movement diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index a499bef5503..e6902e03e73 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -24,7 +24,7 @@ return if(swirlie) user.changeNext_move(CLICK_CD_MELEE) - playsound(src.loc, "swing_hit", 25, TRUE) + playsound(src.loc, SFX_SWING_HIT, 25, TRUE) swirlie.visible_message(span_danger("[user] slams the toilet seat onto [swirlie]'s head!"), span_userdanger("[user] slams the toilet seat onto your head!"), span_hear("You hear reverberating porcelain.")) log_combat(user, swirlie, "swirlied (brute)") swirlie.adjustBruteLoss(5) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index fe9f1b69fa9..7cbee674cac 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -27,7 +27,7 @@ var/glass_amount = 1 var/mutable_appearance/crack_overlay var/real_explosion_block //ignore this, just use explosion_block - var/break_sound = "shatter" + var/break_sound = SFX_SHATTER var/knock_sound = 'sound/effects/glassknock.ogg' var/bash_sound = 'sound/effects/glassbash.ogg' var/hit_sound = 'sound/effects/glasshit.ogg' @@ -742,7 +742,7 @@ can_atmos_pass = ATMOS_PASS_YES resistance_flags = FLAMMABLE armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) - knock_sound = "pageturn" + knock_sound = SFX_PAGE_TURN bash_sound = 'sound/weapons/slashmiss.ogg' break_sound = 'sound/items/poster_ripped.ogg' hit_sound = 'sound/weapons/slashmiss.ogg' diff --git a/code/game/sound.dm b/code/game/sound.dm index 92419e892b3..a790a653649 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -211,62 +211,62 @@ distance_multiplier - Can be used to multiply the distance at which the sound is if(istext(soundin)) soundin = get_sfx_skyrat(soundin) //SKYRAT EDIT ADDITION - This overrides the default sound effects too, so use it to modularly change a sound effect output. switch(soundin) - if ("shatter") + if (SFX_SHATTER) soundin = pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg') - if ("explosion") + if (SFX_EXPLOSION_CREAKING) soundin = pick('sound/effects/explosion1.ogg','sound/effects/explosion2.ogg') - if ("explosion_creaking") + if (SFX_EXPLOSION_CREAKING) soundin = pick('sound/effects/explosioncreak1.ogg', 'sound/effects/explosioncreak2.ogg') - if ("hull_creaking") + if (SFX_HULL_CREAKING) soundin = pick('sound/effects/creak1.ogg', 'sound/effects/creak2.ogg', 'sound/effects/creak3.ogg') - if ("sparks") + if (SFX_SPARKS) soundin = pick('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks4.ogg') - if ("rustle") + if (SFX_RUSTLE) soundin = pick('sound/effects/rustle1.ogg','sound/effects/rustle2.ogg','sound/effects/rustle3.ogg','sound/effects/rustle4.ogg','sound/effects/rustle5.ogg') - if ("bodyfall") + if (SFX_BODYFALL) soundin = pick('sound/effects/bodyfall1.ogg','sound/effects/bodyfall2.ogg','sound/effects/bodyfall3.ogg','sound/effects/bodyfall4.ogg') - if ("punch") + if (SFX_PUNCH) soundin = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') - if ("clownstep") + if (SFX_CLOWN_STEP) soundin = pick('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg') - if ("suitstep") + if (SFX_SUIT_STEP) soundin = pick('sound/effects/suitstep1.ogg','sound/effects/suitstep2.ogg') - if ("swing_hit") + if (SFX_SWING_HIT) soundin = pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg') - if ("hiss") + if (SFX_HISS) soundin = pick('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg') - if ("pageturn") + if (SFX_PAGE_TURN) soundin = pick('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg') - if ("ricochet") + if (SFX_RICOCHET) soundin = pick( 'sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg','sound/weapons/effects/ric3.ogg','sound/weapons/effects/ric4.ogg','sound/weapons/effects/ric5.ogg') - if ("terminal_type") + if (SFX_TERMINAL_TYPE) soundin = pick('sound/machines/terminal_button01.ogg', 'sound/machines/terminal_button02.ogg', 'sound/machines/terminal_button03.ogg', \ 'sound/machines/terminal_button04.ogg', 'sound/machines/terminal_button05.ogg', 'sound/machines/terminal_button06.ogg', \ 'sound/machines/terminal_button07.ogg', 'sound/machines/terminal_button08.ogg') - if ("desecration") + if (SFX_DESECRATION) soundin = pick('sound/misc/desecration-01.ogg', 'sound/misc/desecration-02.ogg', 'sound/misc/desecration-03.ogg') - if ("im_here") + if (SFX_IM_HERE) soundin = pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg') - if ("can_open") + if (SFX_CAN_OPEN) soundin = pick('sound/effects/can_open1.ogg', 'sound/effects/can_open2.ogg', 'sound/effects/can_open3.ogg') - if("bullet_miss") + if(SFX_BULLET_MISS) soundin = pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg') - if("revolver_spin") + if(SFX_REVOLVER_SPIN) soundin = pick('sound/weapons/gun/revolver/spin1.ogg', 'sound/weapons/gun/revolver/spin2.ogg', 'sound/weapons/gun/revolver/spin3.ogg') - if("law") + if(SFX_LAW) soundin = pick('sound/voice/beepsky/god.ogg', 'sound/voice/beepsky/iamthelaw.ogg', 'sound/voice/beepsky/secureday.ogg', 'sound/voice/beepsky/radio.ogg', 'sound/voice/beepsky/insult.ogg', 'sound/voice/beepsky/creep.ogg') - if("honkbot_e") + if(SFX_HONKBOT_E) soundin = pick('sound/items/bikehorn.ogg', 'sound/items/AirHorn2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/items/AirHorn.ogg', 'sound/effects/reee.ogg', 'sound/items/WEEOO1.ogg', 'sound/voice/beepsky/iamthelaw.ogg', 'sound/voice/beepsky/creep.ogg','sound/magic/Fireball.ogg' ,'sound/effects/pray.ogg', 'sound/voice/hiss1.ogg','sound/machines/buzz-sigh.ogg', 'sound/machines/ping.ogg', 'sound/weapons/flashbang.ogg', 'sound/weapons/bladeslice.ogg') if("goose") soundin = pick('sound/creatures/goose1.ogg', 'sound/creatures/goose2.ogg', 'sound/creatures/goose3.ogg', 'sound/creatures/goose4.ogg') - if("warpspeed") + if(SFX_WARPSPEED) soundin = 'sound/runtime/hyperspace/hyperspace_begin.ogg' - if("smcalm") + if(SFX_SM_CALM) soundin = pick('sound/machines/sm/accent/normal/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg') - if("smdelam") + if(SFX_SM_DELAM) soundin = pick('sound/machines/sm/accent/delam/1.ogg', 'sound/machines/sm/accent/delam/2.ogg', 'sound/machines/sm/accent/delam/3.ogg', 'sound/machines/sm/accent/delam/4.ogg', 'sound/machines/sm/accent/delam/5.ogg', 'sound/machines/sm/accent/delam/6.ogg', 'sound/machines/sm/accent/delam/7.ogg', 'sound/machines/sm/accent/delam/8.ogg', 'sound/machines/sm/accent/delam/9.ogg', 'sound/machines/sm/accent/delam/10.ogg', 'sound/machines/sm/accent/delam/11.ogg', 'sound/machines/sm/accent/delam/12.ogg', 'sound/machines/sm/accent/delam/13.ogg', 'sound/machines/sm/accent/delam/14.ogg', 'sound/machines/sm/accent/delam/15.ogg', 'sound/machines/sm/accent/delam/16.ogg', 'sound/machines/sm/accent/delam/17.ogg', 'sound/machines/sm/accent/delam/18.ogg', 'sound/machines/sm/accent/delam/19.ogg', 'sound/machines/sm/accent/delam/20.ogg', 'sound/machines/sm/accent/delam/21.ogg', 'sound/machines/sm/accent/delam/22.ogg', 'sound/machines/sm/accent/delam/23.ogg', 'sound/machines/sm/accent/delam/24.ogg', 'sound/machines/sm/accent/delam/25.ogg', 'sound/machines/sm/accent/delam/26.ogg', 'sound/machines/sm/accent/delam/27.ogg', 'sound/machines/sm/accent/delam/28.ogg', 'sound/machines/sm/accent/delam/29.ogg', 'sound/machines/sm/accent/delam/30.ogg', 'sound/machines/sm/accent/delam/31.ogg', 'sound/machines/sm/accent/delam/32.ogg', 'sound/machines/sm/accent/delam/33.ogg') - if("hypertoruscalm") + if(SFX_HYPERTORUS_CALM) soundin = pick('sound/machines/sm/accent/normal/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg') - if("hypertorusmelting") + if(SFX_HYPERTORUS_MELTING) soundin = pick('sound/machines/sm/accent/delam/1.ogg', 'sound/machines/sm/accent/delam/2.ogg', 'sound/machines/sm/accent/delam/3.ogg', 'sound/machines/sm/accent/delam/4.ogg', 'sound/machines/sm/accent/delam/5.ogg', 'sound/machines/sm/accent/delam/6.ogg', 'sound/machines/sm/accent/delam/7.ogg', 'sound/machines/sm/accent/delam/8.ogg', 'sound/machines/sm/accent/delam/9.ogg', 'sound/machines/sm/accent/delam/10.ogg', 'sound/machines/sm/accent/delam/11.ogg', 'sound/machines/sm/accent/delam/12.ogg', 'sound/machines/sm/accent/delam/13.ogg', 'sound/machines/sm/accent/delam/14.ogg', 'sound/machines/sm/accent/delam/15.ogg', 'sound/machines/sm/accent/delam/16.ogg', 'sound/machines/sm/accent/delam/17.ogg', 'sound/machines/sm/accent/delam/18.ogg', 'sound/machines/sm/accent/delam/19.ogg', 'sound/machines/sm/accent/delam/20.ogg', 'sound/machines/sm/accent/delam/21.ogg', 'sound/machines/sm/accent/delam/22.ogg', 'sound/machines/sm/accent/delam/23.ogg', 'sound/machines/sm/accent/delam/24.ogg', 'sound/machines/sm/accent/delam/25.ogg', 'sound/machines/sm/accent/delam/26.ogg', 'sound/machines/sm/accent/delam/27.ogg', 'sound/machines/sm/accent/delam/28.ogg', 'sound/machines/sm/accent/delam/29.ogg', 'sound/machines/sm/accent/delam/30.ogg', 'sound/machines/sm/accent/delam/31.ogg', 'sound/machines/sm/accent/delam/32.ogg', 'sound/machines/sm/accent/delam/33.ogg') return soundin diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm index 5b2fdadc017..74613aa8715 100644 --- a/code/game/turfs/open/floor/mineral_floor.dm +++ b/code/game/turfs/open/floor/mineral_floor.dm @@ -213,7 +213,7 @@ /turf/open/floor/mineral/bananium/proc/squeak() if(sound_cooldown < world.time) - playsound(src, "clownstep", 50, TRUE) + playsound(src, SFX_CLOWN_STEP, 50, TRUE) sound_cooldown = world.time + 10 /turf/open/floor/mineral/bananium/airless diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index ff6557328a2..2f79afca55d 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -589,7 +589,7 @@ GLOBAL_LIST_EMPTY(station_turfs) /turf/handle_fall(mob/faller) SEND_SIGNAL(src, COMSIG_TURF_MOB_FALL, faller) //SKYRAT EDIT ADDITION if(has_gravity(src)) - playsound(src, "bodyfall", 50, TRUE) + playsound(src, SFX_BODYFALL, 50, TRUE) faller.drop_all_held_items() /turf/proc/photograph(limit=20) diff --git a/code/modules/antagonists/abductor/equipment/glands/electric.dm b/code/modules/antagonists/abductor/equipment/glands/electric.dm index 6c15d82e336..b7969cd4be7 100644 --- a/code/modules/antagonists/abductor/equipment/glands/electric.dm +++ b/code/modules/antagonists/abductor/equipment/glands/electric.dm @@ -18,7 +18,7 @@ /obj/item/organ/heart/gland/electric/activate() owner.visible_message(span_danger("[owner]'s skin starts emitting electric arcs!"),\ span_warning("You feel electric energy building up inside you!")) - playsound(get_turf(owner), "sparks", 100, TRUE, -1, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(get_turf(owner), SFX_SPARKS, 100, TRUE, -1, SHORT_RANGE_SOUND_EXTRARANGE) addtimer(CALLBACK(src, .proc/zap), rand(30, 100)) /obj/item/organ/heart/gland/electric/proc/zap() diff --git a/code/modules/antagonists/abductor/equipment/glands/heal.dm b/code/modules/antagonists/abductor/equipment/glands/heal.dm index 3845462d736..7335c4fdb35 100644 --- a/code/modules/antagonists/abductor/equipment/glands/heal.dm +++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm @@ -170,7 +170,7 @@ /obj/item/organ/heart/gland/heal/proc/replace_limb(body_zone, obj/item/bodypart/limb) if(limb) owner.visible_message(span_warning("[owner]'s [limb.name] suddenly detaches from [owner.p_their()] body!"), span_userdanger("Your [limb.name] suddenly detaches from your body!")) - playsound(owner, "desecration", 50, TRUE, -1) + playsound(owner, SFX_DESECRATION, 50, TRUE, -1) limb.drop_limb() else to_chat(owner, span_warning("You feel a weird tingle in your [parse_zone(body_zone)]... even if you don't have one.")) diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index 25d38de519b..3ee18c3f7a0 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -186,13 +186,13 @@ switch(i) if(1) new /obj/effect/temp_visual/cult/sparks(mobloc, B.current.dir) - playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(mobloc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(2) new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, B.current.dir) - playsound(mobloc, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(mobloc, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(3) new /obj/effect/temp_visual/dir_setting/cult/phase(mobloc, B.current.dir) - playsound(mobloc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(mobloc, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(4) playsound(mobloc, 'sound/magic/exit_blood.ogg', 100, TRUE) if(B.current != owner) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 7b572bbf327..3d54936f0fd 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -634,7 +634,7 @@ Striking a noncultist, however, will tear their flesh."} uses-- if(uses <= 0) icon_state ="shifter_drained" - playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(mobloc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) new /obj/effect/temp_visual/dir_setting/cult/phase/out(mobloc, C.dir) var/atom/movable/pulled = handle_teleport_grab(destination, C) @@ -643,7 +643,7 @@ Striking a noncultist, however, will tear their flesh."} C.start_pulling(pulled) //forcemove resets pulls, so we need to re-pull new /obj/effect/temp_visual/dir_setting/cult/phase(destination, C.dir) playsound(destination, 'sound/effects/phasein.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(destination, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) else to_chat(C, span_warning("The veil cannot be torn here!")) diff --git a/code/modules/antagonists/heretic/items/heretic_blades.dm b/code/modules/antagonists/heretic/items/heretic_blades.dm index 4f9d67d9754..fe15376efaa 100644 --- a/code/modules/antagonists/heretic/items/heretic_blades.dm +++ b/code/modules/antagonists/heretic/items/heretic_blades.dm @@ -37,7 +37,7 @@ to_chat(user, span_warning("You shatter [src], but your plea goes unanswered.")) else to_chat(user,span_warning("You shatter [src].")) - playsound(src, "shatter", 70, TRUE) //copied from the code for smashing a glass sheet onto the ground to turn it into a shard + playsound(src, SFX_SHATTER, 70, TRUE) //copied from the code for smashing a glass sheet onto the ground to turn it into a shard qdel(src) /obj/item/melee/sickly_blade/afterattack(atom/target, mob/user, proximity_flag, click_parameters) diff --git a/code/modules/antagonists/nightmare/nightmare_species.dm b/code/modules/antagonists/nightmare/nightmare_species.dm index 219e91391ab..5bd607809a3 100644 --- a/code/modules/antagonists/nightmare/nightmare_species.dm +++ b/code/modules/antagonists/nightmare/nightmare_species.dm @@ -38,7 +38,7 @@ var/light_amount = T.get_lumcount() if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) H.visible_message(span_danger("[H] dances in the shadows, evading [P]!")) - playsound(T, "bullet_miss", 75, TRUE) + playsound(T, SFX_BULLET_MISS, 75, TRUE) return BULLET_ACT_FORCE_PIERCE return ..() diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 7ecf7a98680..3a7654cc122 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -326,7 +326,7 @@ GLOBAL_VAR(station_nuke_source) . = ..() if(.) return - playsound(src, "terminal_type", 20, FALSE) + playsound(src, SFX_TERMINAL_TYPE, 20, FALSE) switch(action) if("eject_disk") if(auth && auth.loc == src) diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 46687586002..c17da72e1d3 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -537,7 +537,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) if(is_type_in_typecache(target, GLOB.blacklisted_malf_machines)) to_chat(ranged_ability_user, span_warning("You cannot overload that device!")) return - ranged_ability_user.playsound_local(ranged_ability_user, "sparks", 50, 0) + ranged_ability_user.playsound_local(ranged_ability_user, SFX_SPARKS, 50, 0) attached_action.adjust_uses(-1) if(attached_action?.uses) attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining." @@ -554,7 +554,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) cost = 15 power_type = /datum/action/innate/ai/blackout unlock_text = "You hook into the powernet and route bonus power towards the station's lighting." - unlock_sound = "sparks" + unlock_sound = SFX_SPARKS /datum/action/innate/ai/blackout name = "Blackout" @@ -575,7 +575,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) else apc.overload++ to_chat(owner, span_notice("Overcurrent applied to the powernet.")) - owner.playsound_local(owner, "sparks", 50, 0) + owner.playsound_local(owner, SFX_SPARKS, 50, 0) adjust_uses(-1) if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe desc = "[initial(desc)] It has [uses] use\s remaining." @@ -747,7 +747,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) one_purchase = TRUE power_type = /datum/action/innate/ai/emergency_lights unlock_text = "You hook into the powernet and locate the connections between light fixtures and their fallbacks." - unlock_sound = "sparks" + unlock_sound = SFX_SPARKS /datum/action/innate/ai/emergency_lights name = "Disable Emergency Lights" diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 3fa6fd7a91e..ae106344590 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -817,7 +817,7 @@ return obj_flags |= EMAGGED visible_message(span_warning("Sparks fly out of [src]!"), span_notice("You emag [src], disabling its safeties.")) - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /obj/machinery/airalarm/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm index a7bf9129811..c8085b9c35d 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm @@ -219,9 +219,9 @@ if(last_accent_sound < world.time && prob(20)) var/aggression = min(((critical_threshold_proximity / 800) * ((power_level) / 5)), 1.0) * 100 if(critical_threshold_proximity >= 300) - playsound(src, "hypertorusmelting", max(50, aggression), FALSE, 40, 30, falloff_distance = 10) + playsound(src, SFX_HYPERTORUS_MELTING, max(50, aggression), FALSE, 40, 30, falloff_distance = 10) else - playsound(src, "hypertoruscalm", max(50, aggression), FALSE, 25, 25, falloff_distance = 10) + playsound(src, SFX_HYPERTORUS_CALM, max(50, aggression), FALSE, 25, 25, falloff_distance = 10) var/next_sound = round((100 - aggression) * 5) + 5 last_accent_sound = world.time + max(HYPERTORUS_ACCENT_SOUND_MIN_COOLDOWN, next_sound) diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 089081d43ac..f2c0a87b5c4 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -270,7 +270,7 @@ if (explosion_sum != 0) //If the explosion list isn't all zeroes, call an explosion explosion(turf_underneath, B[1], B[2], B[3], flame_range = B[4], silent = effectQuiet, ignorecap = istype(src, /obj/structure/closet/supplypod/centcompod), explosion_cause = src) //less advanced equipment than bluespace pod, so larger explosion when landing else if (!effectQuiet && !(pod_flags & FIRST_SOUNDS)) //If our explosion list IS all zeroes, we still make a nice explosion sound (unless the effectQuiet var is true) - playsound(src, "explosion", landingSound ? soundVolume * 0.25 : soundVolume, TRUE) + playsound(src, SFX_SHATTER, landingSound ? soundVolume * 0.25 : soundVolume, TRUE) if (landingSound) playsound(turf_underneath, landingSound, soundVolume, FALSE, FALSE) if (effectMissile) //If we are acting like a missile, then right after we land and finish fucking shit up w explosions, we should delete diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 72140e6cd6f..e206e5ac07d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -508,7 +508,7 @@ //either used up correctly or taken off before polling finished (punish this by destroying the helmet) UnregisterSignal(magnification, COMSIG_SPECIES_LOSS) playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) - playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) visible_message(span_warning("[src] fizzles and breaks apart!")) magnification = null new /obj/effect/decal/cleanable/ash/crematorium(drop_location()) //just in case they're in a locker or other containers it needs to use crematorium ash, see the path itself for an explanation diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 277225a09de..83285a497a0 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -31,7 +31,7 @@ l_leg.dismember() if(r_leg) r_leg.dismember() - playsound(user, "desecration", 50, TRUE, -1) + playsound(user, SFX_DESECRATION, 50, TRUE, -1) return BRUTELOSS else//didnt realize this suicide act existed (was in miscellaneous.dm) and didnt want to remove it, so made it a 50/50 chance. Why not! user.visible_message(span_suicide("[user] is bashing [user.p_their()] own head in with [src]! Ain't that a kick in the head?")) diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 708819f0716..331d1b8922b 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -219,7 +219,7 @@ obj_flags |= EMAGGED user.visible_message(span_warning("You emag [src], overwriting thermal regulator restrictions.")) log_game("[key_name(user)] emagged [src] at [AREACOORD(src)], overwriting thermal regulator restrictions.") - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) // update the HUD icon /obj/item/clothing/suit/space/proc/update_hud_icon(mob/user) diff --git a/code/modules/experisci/destructive_scanner.dm b/code/modules/experisci/destructive_scanner.dm index 5b119db8eb1..f4fa42289e6 100644 --- a/code/modules/experisci/destructive_scanner.dm +++ b/code/modules/experisci/destructive_scanner.dm @@ -87,7 +87,7 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - playsound(src, "sparks", 75, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 75, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(user, span_notice("You disable the safety sensor BIOS on [src].")) /obj/machinery/destructive_scanner/update_icon_state() diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 5c5c80d2f1b..e5c733d59e3 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -440,12 +440,12 @@ GLOBAL_LIST_INIT(hallucination_list, list( if("stunprod") //Stunprod + cablecuff process = FALSE target.playsound_local(source, 'sound/weapons/egloves.ogg', 40, 1) - target.playsound_local(source, get_sfx("bodyfall"), 25, 1) + target.playsound_local(source, get_sfx(SFX_BODYFALL), 25, 1) addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/weapons/cablecuff.ogg', 15, 1), 20) if("harmbaton") //zap n slap iterations_left = rand(5, 12) target.playsound_local(source, 'sound/weapons/egloves.ogg', 40, 1) - target.playsound_local(source, get_sfx("bodyfall"), 25, 1) + target.playsound_local(source, get_sfx(SFX_BODYFALL), 25, 1) next_action = 2 SECONDS if("bomb") // Tick Tock iterations_left = rand(3, 11) @@ -485,7 +485,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( if ("gun") fire_sound = 'sound/weapons/gun/shotgun/shot.ogg' hit_person_sound = 'sound/weapons/pierce.ogg' - hit_wall_sound = "ricochet" + hit_wall_sound = SFX_RICOCHET number_of_hits = 2 chance_to_fall = 80 @@ -500,14 +500,14 @@ GLOBAL_LIST_INIT(hallucination_list, list( next_action = rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 6) if(hits >= number_of_hits && prob(chance_to_fall)) - addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, get_sfx("bodyfall"), 25, 1), next_action) + addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, get_sfx(SFX_BODYFALL), 25, 1), next_action) qdel(src) return if ("esword") target.playsound_local(source, 'sound/weapons/blade1.ogg', 50, 1) if (hits == 4) - target.playsound_local(source, get_sfx("bodyfall"), 25, 1) + target.playsound_local(source, get_sfx(SFX_BODYFALL), 25, 1) next_action = rand(CLICK_CD_MELEE, CLICK_CD_MELEE + 6) hits += 1 @@ -515,7 +515,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( if (iterations_left == 1) target.playsound_local(source, 'sound/weapons/saberoff.ogg', 15, 1) if ("harmbaton") - target.playsound_local(source, "swing_hit", 50, 1) + target.playsound_local(source, SFX_SWING_HIT, 50, 1) next_action = rand(CLICK_CD_MELEE, CLICK_CD_MELEE + 4) if ("bomb") target.playsound_local(source, 'sound/items/timer.ogg', 25, 0) @@ -596,7 +596,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( image_file = 'icons/mob/inhands/equipment/security_righthand.dmi' else image_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' - target.playsound_local(H, "sparks",75,1,-1) + target.playsound_local(H, SFX_SPARKS,75,1,-1) A = image(image_file,H,"baton", layer=ABOVE_MOB_LAYER) if("ttv") if(side == "right") @@ -1564,7 +1564,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( target.client.images |= shock_image target.client.images |= electrocution_skeleton_anim addtimer(CALLBACK(src, .proc/reset_shock_animation), 40) - target.playsound_local(get_turf(src), "sparks", 100, 1) + target.playsound_local(get_turf(src), SFX_SPARKS, 100, 1) target.staminaloss += 50 target.Stun(40) target.jitteriness += 1000 diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 0be0dc673bd..36f3c5f6a24 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -158,7 +158,7 @@ if(prob(33)) var/obj/item/shard/S = new(drop_location()) target.Bumped(S) - playsound(src, "shatter", 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) transfer_fingerprints_to(B) qdel(src) target.Bumped(B) @@ -705,7 +705,7 @@ to_chat(user, "You pull back the tab of [src] with a satisfying pop.") //Ahhhhhhhh reagents.flags |= OPENCONTAINER - playsound(src, "can_open", 50, TRUE) + playsound(src, SFX_CAN_OPEN, 50, TRUE) spillable = TRUE throwforce = 0 diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 0860c5fb876..3695071b694 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -49,7 +49,7 @@ if(prob(33)) var/obj/item/shard/S = new(drop_location()) target.Bumped(S) - playsound(src, "shatter", 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) else B.force = 0 B.throwforce = 0 diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 583c28e3bb5..1be1ff84445 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -401,7 +401,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf if(!LAZYLEN(emag_programs)) to_chat(user, "[src] does not seem to have a card swipe port. It must be an inferior model.") return - playsound(src, "sparks", 75, TRUE) + playsound(src, SFX_SPARKS, 75, TRUE) obj_flags |= EMAGGED to_chat(user, span_warning("You vastly increase projector power and override the safety and security protocols.")) say("Warning. Automatic shutoff and derezzing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.") diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 7a04e14eb70..b0dbf6fb78e 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -535,7 +535,7 @@ var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) if(BP) BP.drop_limb() - playsound(src, "desecration" ,50, TRUE, -1) + playsound(src, SFX_DESECRATION ,50, TRUE, -1) return (BRUTELOSS) /obj/item/scythe/pre_attack(atom/A, mob/living/user, params) diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 1b2d64ed1d0..f0ba386a94a 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -55,7 +55,7 @@ desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\"" icon_state = "violin" inhand_icon_state = "violin" - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT allowed_instrument_ids = "violin" /obj/item/instrument/violin/golden diff --git a/code/modules/language/language_manuals.dm b/code/modules/language/language_manuals.dm index a1a3976218a..77ee8b28dd0 100644 --- a/code/modules/language/language_manuals.dm +++ b/code/modules/language/language_manuals.dm @@ -28,7 +28,7 @@ attack_self(user) return - playsound(loc, "punch", 25, TRUE, -1) + playsound(loc, SFX_PUNCH, 25, TRUE, -1) if(M.stat == DEAD) M.visible_message(span_danger("[user] smacks [M]'s lifeless corpse with [src]."), span_userdanger("[user] smacks your lifeless corpse with [src]."), span_hear("You hear smacking.")) diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index 3d4eed48c55..7c1615e75c5 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -33,7 +33,7 @@ /// Override for the visual attack effect shown on 'do_attack_animation()'. var/attack_vis_effect ///Played when someone punches the creature. - var/attacked_sound = "punch" //This should be an element + var/attacked_sound = SFX_PUNCH //This should be an element ///What kind of objects this mob can smash. var/environment_smash = ENVIRONMENT_SMASH_NONE diff --git a/code/modules/mob/living/basic/basic_defense.dm b/code/modules/mob/living/basic/basic_defense.dm index 252558b002c..06993b1d1ea 100644 --- a/code/modules/mob/living/basic/basic_defense.dm +++ b/code/modules/mob/living/basic/basic_defense.dm @@ -49,7 +49,7 @@ . = ..() if(!.) return - playsound(loc, "punch", 25, TRUE, -1) + playsound(loc, SFX_PUNCH, 25, TRUE, -1) visible_message(span_danger("[user] punches [src]!"), \ span_userdanger("You're punched by [user]!"), null, COMBAT_MESSAGE_RANGE, user) to_chat(user, span_danger("You punch [src]!")) diff --git a/code/modules/mob/living/carbon/alien/emote.dm b/code/modules/mob/living/carbon/alien/emote.dm index 570697d9344..edf529858f3 100644 --- a/code/modules/mob/living/carbon/alien/emote.dm +++ b/code/modules/mob/living/carbon/alien/emote.dm @@ -15,7 +15,7 @@ /datum/emote/living/alien/hiss/get_sound(mob/living/user) if(isalienadult(user)) - return "hiss" + return SFX_HISS /datum/emote/living/alien/roar key = "roar" 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 047cba6ff23..16777169158 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm @@ -9,7 +9,7 @@ if(mob_size < MOB_SIZE_LARGE) safe_throw_at(get_edge_target_turf(src, get_dir(user, src)), 2, 1, user) hitverb = "slam" - playsound(loc, "punch", 25, TRUE, -1) + playsound(loc, SFX_PUNCH, 25, TRUE, -1) visible_message(span_danger("[user] [hitverb]s [src]!"), \ span_userdanger("[user] [hitverb]s you!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, user) to_chat(user, span_danger("You [hitverb] [src]!")) @@ -29,7 +29,7 @@ return TRUE var/damage = rand(1, 9) if (prob(90)) - playsound(loc, "punch", 25, TRUE, -1) + playsound(loc, SFX_PUNCH, 25, TRUE, -1) visible_message(span_danger("[user] punches [src]!"), \ span_userdanger("[user] punches you!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, user) to_chat(user, span_danger("You punch [src]!")) 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 a286e05c311..debec99bd69 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm @@ -4,7 +4,7 @@ if(..()) var/damage = rand(1, 9) if (prob(90)) - playsound(loc, "punch", 25, TRUE, -1) + playsound(loc, SFX_PUNCH, 25, TRUE, -1) log_combat(user, src, "attacked") visible_message(span_danger("[user] kicks [src]!"), \ span_userdanger("[user] kicks you!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, user) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 7c7347bfb97..c77b446a0e2 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -158,7 +158,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/list/inherent_factions ///Punch-specific attack verb. - var/attack_verb = "punch" + var/attack_verb = SFX_PUNCH /// The visual effect of the attack. var/attack_effect = ATTACK_EFFECT_PUNCH var/sound/attack_sound //SKYRAT EDIT CHANGE diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index f7e2d36d5f1..ed657763240 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -442,7 +442,7 @@ special_names = list("Lens", "Prism", "Fiber", "Bead") /datum/species/golem/glass/spec_death(gibbed, mob/living/carbon/human/H) - playsound(H, "shatter", 70, TRUE) + playsound(H, SFX_SHATTER, 70, TRUE) H.visible_message(span_danger("[H] shatters!")) for(var/obj/item/W in H) H.dropItemToGround(W) @@ -483,7 +483,7 @@ /datum/species/golem/bluespace/proc/reactive_teleport(mob/living/carbon/human/H) H.visible_message(span_warning("[H] teleports!"), span_danger("You destabilize and teleport!")) new /obj/effect/particle_effect/sparks(get_turf(H)) - playsound(get_turf(H), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(get_turf(H), SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) do_teleport(H, get_turf(H), 6, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) last_teleport = world.time @@ -1133,7 +1133,7 @@ var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) - playsound(H, get_sfx("desecration"), 50, TRUE, -1) //You just want to socialize + playsound(H, get_sfx(SFX_DESECRATION), 50, TRUE, -1) //You just want to socialize H.visible_message(span_warning("[H] rattles loudly and flails around!!"), span_danger("Your bones hurt so much that your missing muscles spasm!!")) H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index d0e5f9164af..9682527dc4c 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -128,7 +128,7 @@ var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) - playsound(H, get_sfx("desecration"), 50, TRUE, -1) //You just want to socialize + playsound(H, get_sfx(SFX_DESECRATION), 50, TRUE, -1) //You just want to socialize H.visible_message(span_warning("[H] rattles loudly and flails around!!"), span_danger("Your bones hurt so much that your missing muscles spasm!!")) H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index db843ff535c..79fedfcff28 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -66,7 +66,7 @@ var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = H.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood if(bp) - playsound(H, get_sfx("desecration"), 50, TRUE, -1) //You just want to socialize + playsound(H, get_sfx(SFX_DESECRATION), 50, TRUE, -1) //You just want to socialize H.visible_message(span_warning("[H] rattles loudly and flails around!!"), span_danger("Your bones hurt so much that your missing muscles spasm!!")) H.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(200, 0, 0) //But I don't think we should diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index ce9a2a1c426..7370930b811 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -54,7 +54,7 @@ if(!.) return adjustBruteLoss(rand(10, 15)) - playsound(loc, "punch", 25, TRUE, -1) + playsound(loc, SFX_PUNCH, 25, TRUE, -1) visible_message(span_danger("[user] punches [src]!"), \ span_userdanger("[user] punches you!"), null, COMBAT_MESSAGE_RANGE, user) to_chat(user, span_danger("You punch [src]!")) diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index b9cc47ea948..3610bc8633a 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -46,7 +46,7 @@ . = ..() if(!.) return - playsound(loc, "punch", 25, TRUE, -1) + playsound(loc, SFX_PUNCH, 25, TRUE, -1) visible_message(span_danger("[user] punches [src]!"), \ span_userdanger("You're punched by [user]!"), null, COMBAT_MESSAGE_RANGE, user) to_chat(user, span_danger("You punch [src]!")) diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm index af48f814350..fa7b6e753d6 100644 --- a/code/modules/mob/living/simple_animal/bot/firebot.dm +++ b/code/modules/mob/living/simple_animal/bot/firebot.dm @@ -107,7 +107,7 @@ if(user) to_chat(user, span_danger("[src] buzzes and beeps.")) audible_message(span_danger("[src] buzzes oddly!")) - playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(user) old_target_fire = user extinguish_fires = FALSE diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 6fcfa1734f9..d45de538b18 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -118,7 +118,7 @@ . = ..() if(bot_cover_flags & BOT_COVER_EMAGGED) //emagged honkbots will spam short and memorable sounds. if(!limiting_spam) - playsound(src, "honkbot_e", 50, FALSE) + playsound(src, SFX_HONKBOT_E, 50, FALSE) icon_state = "honkbot-e" else if(!limiting_spam) playsound(src, honksound, 50, TRUE, -1) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 789dc34e40c..1d6244c07c2 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -228,7 +228,7 @@ to_chat(user, span_notice("You short out [src]'s reagent synthesis circuits.")) audible_message(span_danger("[src] buzzes oddly!")) flick("medibot_spark", src) - playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) if(user) oldpatient = user diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 08991730da1..6aa930e04a8 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -201,7 +201,7 @@ bot_cover_flags ^= BOT_COVER_LOCKED to_chat(user, span_notice("You [bot_cover_flags & BOT_COVER_LOCKED ? "lock" : "unlock"] [src]'s controls!")) flick("[base_icon]-emagged", src) - playsound(src, "sparks", 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) /mob/living/simple_animal/bot/mulebot/update_icon_state() //if you change the icon_state names, please make sure to update /datum/wires/mulebot/on_pulse() as well. <3 . = ..() diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index a1f57057caa..7579c256753 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -290,7 +290,7 @@ if(!current_target.handcuffed) current_target.set_handcuffed(new cuff_type(current_target)) current_target.update_handcuffed() - playsound(src, "law", 50, FALSE) + playsound(src, SFX_LAW, 50, FALSE) back_to_idle() /mob/living/simple_animal/bot/secbot/proc/stun_attack(mob/living/carbon/current_target, harm = FALSE) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 9f9fd7e96bf..48321556ea3 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -287,7 +287,7 @@ response_harm_simple = "take a bite out of" attacked_sound = 'sound/items/eatfood.ogg' deathmessage = "loses her false life and collapses!" - deathsound = "bodyfall" + deathsound = SFX_BODYFALL held_state = "cak" /mob/living/simple_animal/pet/cat/cak/add_cell_sample() 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 a48d9c4c617..30528abb72e 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 @@ -49,7 +49,7 @@ Difficulty: Medium var/obj/item/melee/cleaving_saw/miner/miner_saw var/guidance = FALSE deathmessage = "falls to the ground, decaying into glowing particles." - deathsound = "bodyfall" + deathsound = SFX_BODYFALL footstep_type = FOOTSTEP_MOB_HEAVY move_force = MOVE_FORCE_NORMAL //Miner beeing able to just move structures like bolted doors and glass looks kinda strange /// Dash ability diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm index 14d3df22c9e..372e0281f67 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm @@ -36,7 +36,7 @@ I'd rather there be something than the clockwork ruin be entirely empty though s wander = FALSE del_on_death = TRUE deathmessage = "falls, quickly decaying into centuries old dust." - deathsound = "bodyfall" + deathsound = SFX_BODYFALL footstep_type = FOOTSTEP_MOB_HEAVY attack_action_types = list() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index f4eb72fb123..5f3f5dbd133 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -41,7 +41,7 @@ Difficulty: Extremely Hard crusher_achievement_type = /datum/award/achievement/boss/demonic_miner_crusher score_achievement_type = /datum/award/score/demonic_miner_score deathmessage = "falls to the ground, decaying into plasma particles." - deathsound = "bodyfall" + deathsound = SFX_BODYFALL footstep_type = FOOTSTEP_MOB_HEAVY /// If the demonic frost miner is in its enraged state var/enraged = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 5e5f1ba8888..84a024406b3 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -321,7 +321,7 @@ if(ismineralturf(T)) var/turf/closed/mineral/M = T M.gets_drilled() - playsound(T, "explosion", 80, TRUE) + playsound(T, SFX_SHATTER, 80, TRUE) new /obj/effect/hotspot(T) T.hotspot_expose(DRAKE_FIRE_TEMP, DRAKE_FIRE_EXPOSURE, 1) for(var/mob/living/L in T.contents) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 7c930aa3c94..8ccb075e757 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -134,7 +134,7 @@ var/allow_movement_on_non_turfs = FALSE ///Played when someone punches the creature. - var/attacked_sound = "punch" + var/attacked_sound = SFX_PUNCH ///If the creature has, and can use, hands. var/dextrous = FALSE diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index ff83b4d68ce..47a44966c6a 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -171,7 +171,7 @@ for(var/obj/item/stack/ore/ore in get_turf(mod.wearer)) INVOKE_ASYNC(src, .proc/move_ore, ore) - playsound(src, "rustle", 50, TRUE) + playsound(src, SFX_RUSTLE, 50, TRUE) /obj/item/mod/module/orebag/proc/move_ore(obj/item/stack/ore) for(var/obj/item/stack/stored_ore as anything in ores) diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm index 55b156f5175..4bc2890630d 100644 --- a/code/modules/modular_computers/file_system/programs/card.dm +++ b/code/modules/modular_computers/file_system/programs/card.dm @@ -183,7 +183,7 @@ if(!new_name) target_id_card.registered_name = null - playsound(computer, "terminal_type", 50, FALSE) + playsound(computer, SFX_TERMINAL_TYPE, 50, FALSE) target_id_card.update_label() // We had a name before and now we have no name, so this will unassign the card and we update the icon. if(old_name) @@ -198,7 +198,7 @@ return TRUE target_id_card.registered_name = new_name - playsound(computer, "terminal_type", 50, FALSE) + playsound(computer, SFX_TERMINAL_TYPE, 50, FALSE) target_id_card.update_label() // Card wasn't assigned before and now it is, so update the icon accordingly. if(!old_name) @@ -215,7 +215,7 @@ return TRUE target_id_card.registered_age = new_age - playsound(computer, "terminal_type", 50, FALSE) + playsound(computer, SFX_TERMINAL_TYPE, 50, FALSE) return TRUE // Change assignment if("PRG_assign") @@ -223,14 +223,14 @@ return TRUE var/new_asignment = sanitize(params["assignment"]) target_id_card.assignment = new_asignment - playsound(computer, "terminal_type", 50, FALSE) + playsound(computer, SFX_TERMINAL_TYPE, 50, FALSE) target_id_card.update_label() return TRUE // Add/remove access. if("PRG_access") if(!computer || !authenticated_card || !target_id_card) return TRUE - playsound(computer, "terminal_type", 50, FALSE) + playsound(computer, SFX_TERMINAL_TYPE, 50, FALSE) var/access_type = params["access_target"] var/try_wildcard = params["access_wildcard"] if(!(access_type in valid_access)) @@ -256,7 +256,7 @@ if(!computer || !authenticated_card || !target_id_card) return TRUE - playsound(computer, "terminal_type", 50, FALSE) + playsound(computer, SFX_TERMINAL_TYPE, 50, FALSE) var/template_name = params["name"] if(!template_name) diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm index 7bf038be4e9..145dc5f2680 100644 --- a/code/modules/modular_computers/file_system/programs/secureye.dm +++ b/code/modules/modular_computers/file_system/programs/secureye.dm @@ -124,7 +124,7 @@ var/list/cameras = get_available_cameras() var/obj/machinery/camera/selected_camera = cameras[c_tag] camera_ref = WEAKREF(selected_camera) - playsound(src, get_sfx("terminal_type"), 25, FALSE) + playsound(src, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE) if(!selected_camera) return TRUE diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 4ae738d5cb5..26965892d68 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -93,7 +93,7 @@ if(doSpark) spark_system.start() - playsound(get_turf(src), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(get_turf(src), SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) var/msg = "" diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index 60b5f2cf332..74ddbedeb9e 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -36,7 +36,7 @@ if (do_after(ninja ,10, target = src)) spark_system.start() - playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) cell.use(drain) ninja_suit.cell.give(drain) drain_total += drain @@ -45,7 +45,7 @@ if(!(obj_flags & EMAGGED)) flick("apc-spark", ninja_gloves) - playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) obj_flags |= EMAGGED locked = FALSE update_appearance() @@ -77,7 +77,7 @@ if (do_after(ninja,10, target = src)) spark_system.start() - playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) charge -= drain ninja_suit.cell.give(drain) drain_total += drain @@ -262,7 +262,7 @@ maxcapacity = TRUE if (do_after(ninja, 10, target = src)) spark_system.start() - playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) cell.use(drain) ninja_suit.cell.give(drain) drain_total += drain @@ -286,7 +286,7 @@ to_chat(src, span_danger("Warni-***BZZZZZZZZZRT*** UPLOADING SPYDERPATCHER VERSION 9.5.2...")) if (do_after(ninja, 60, target = src)) spark_system.start() - playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(src, span_danger("UPLOAD COMPLETE. NEW CYBORG MODEL DETECTED. INSTALLING...")) faction = list(ROLE_NINJA) bubble_icon = "syndibot" @@ -319,6 +319,6 @@ //Got that electric touch var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread() spark_system.set_up(5, 0, loc) - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) visible_message(span_danger("[ninja] electrocutes [src] with [ninja.p_their()] touch!"), span_userdanger("[ninja] electrocutes you with [ninja.p_their()] touch!")) Knockdown(3 SECONDS) diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_sword_recall.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_sword_recall.dm index a82822fdfd0..702a7a964c2 100644 --- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_sword_recall.dm +++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_sword_recall.dm @@ -39,7 +39,7 @@ if(inview) //If we can see the katana, throw it towards ourselves, damaging people as we go. energyKatana.spark_system.start() - playsound(ninja, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(ninja, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) ninja.visible_message(span_danger("\the [energyKatana] flies towards [ninja]!"),span_warning("You hold out your hand and \the [energyKatana] flies towards you!")) energyKatana.throw_at(ninja, distance+1, energyKatana.throw_speed, ninja) diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index dedb5ea65ad..5e0351a346b 100644 --- a/code/modules/paperwork/paper_cutter.dm +++ b/code/modules/paperwork/paper_cutter.dm @@ -26,7 +26,7 @@ var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) if(BP) BP.drop_limb() - playsound(loc, "desecration" ,50, TRUE, -1) + playsound(loc, SFX_DESECRATION ,50, TRUE, -1) return (BRUTELOSS) else user.visible_message(span_suicide("[user] repeatedly bashes [src.name] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -56,7 +56,7 @@ if(istype(P, /obj/item/paper) && !storedpaper) if(!user.transferItemToLoc(P, src)) return - playsound(loc, "pageturn", 60, TRUE) + playsound(loc, SFX_PAGE_TURN, 60, TRUE) to_chat(user, span_notice("You place [P] in [src].")) storedpaper = P update_appearance() diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 512ae88d59e..a95c48050a9 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -918,7 +918,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET to_chat(user, span_warning("Nothing happens!")) else flick("apc-spark", src) - playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) obj_flags |= EMAGGED locked = FALSE to_chat(user, span_notice("You emag the APC interface.")) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 82a046eaa03..dc8c6821aea 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -120,7 +120,7 @@ S.forceMove(loc) S.give_glass(machine_stat & BROKEN) else - playsound(src, "shatter", 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) new /obj/item/shard(src.loc) new /obj/item/shard(src.loc) qdel(src) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index c20c0bf8d52..a1a85875c94 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -529,9 +529,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) if(last_accent_sound < world.time && prob(20)) var/aggression = min(((damage / 800) * (power / 2500)), 1.0) * 100 if(damage >= 300) - playsound(src, "smdelam", max(50, aggression), FALSE, 40, 30, falloff_distance = 10) + playsound(src, SFX_SM_DELAM, max(50, aggression), FALSE, 40, 30, falloff_distance = 10) else - playsound(src, "smcalm", max(50, aggression), FALSE, 25, 25, falloff_distance = 10) + playsound(src, SFX_SM_CALM, max(50, aggression), FALSE, 25, 25, falloff_distance = 10) var/next_sound = round((100 - aggression) * 5) last_accent_sound = world.time + max(SUPERMATTER_ACCENT_SOUND_MIN_COOLDOWN, next_sound) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 39be0677a79..694e1a5b2c3 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -135,7 +135,7 @@ S.forceMove(loc) S.give_glass(machine_stat & BROKEN) else - playsound(src, "shatter", 70, TRUE) + playsound(src, SFX_SHATTER, 70, TRUE) new /obj/item/shard(src.loc) new /obj/item/shard(src.loc) qdel(src) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index b3c6cc61561..ef813e1961b 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -53,7 +53,7 @@ recent_spin = world.time + spin_delay if(do_spin()) - playsound(usr, "revolver_spin", 30, FALSE) + playsound(usr, SFX_REVOLVER_SPIN, 30, FALSE) usr.visible_message(span_notice("[usr] spins [src]'s chamber."), span_notice("You spin [src]'s chamber.")) else verbs -= /obj/item/gun/ballistic/revolver/verb/spin diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 88b6e19f574..0c52700e325 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -5,7 +5,7 @@ damage_type = BRUTE nodamage = FALSE flag = BULLET - hitsound_wall = "ricochet" + hitsound_wall = SFX_RICOCHET sharpness = SHARP_POINTY impact_effect_type = /obj/effect/temp_visual/impact_effect shrapnel_type = /obj/item/shrapnel/bullet diff --git a/code/modules/projectiles/projectile/bullets/dnainjector.dm b/code/modules/projectiles/projectile/bullets/dnainjector.dm index 074cd52ba0e..139f20c339c 100644 --- a/code/modules/projectiles/projectile/bullets/dnainjector.dm +++ b/code/modules/projectiles/projectile/bullets/dnainjector.dm @@ -3,7 +3,7 @@ icon_state = "syringeproj" var/obj/item/dnainjector/injector damage = 5 - hitsound_wall = "shatter" + hitsound_wall = SFX_SHATTER embedding = null shrapnel_type = null diff --git a/code/modules/projectiles/projectile/special/hallucination.dm b/code/modules/projectiles/projectile/special/hallucination.dm index 718b9520932..306c684b894 100644 --- a/code/modules/projectiles/projectile/special/hallucination.dm +++ b/code/modules/projectiles/projectile/special/hallucination.dm @@ -128,7 +128,7 @@ hal_icon_state = "bullet" hal_fire_sound = "gunshot" hal_hitsound = 'sound/weapons/pierce.ogg' - hal_hitsound_wall = "ricochet" + hal_hitsound_wall = SFX_RICOCHET hal_impact_effect = "impact_bullet" hal_impact_effect_wall = "impact_bullet" hit_duration = 5 diff --git a/code/modules/projectiles/projectile/special/wormhole.dm b/code/modules/projectiles/projectile/special/wormhole.dm index f3543668337..2a4478053d1 100644 --- a/code/modules/projectiles/projectile/special/wormhole.dm +++ b/code/modules/projectiles/projectile/special/wormhole.dm @@ -1,7 +1,7 @@ /obj/projectile/beam/wormhole name = "bluespace beam" icon_state = "spark" - hitsound = "sparks" + hitsound = SFX_SPARKS damage = 0 nodamage = TRUE pass_flags = PASSGLASS | PASSTABLE | PASSGRILLE | PASSMOB diff --git a/code/modules/reagents/chemistry/items.dm b/code/modules/reagents/chemistry/items.dm index 31b49f713d7..17900d6903d 100644 --- a/code/modules/reagents/chemistry/items.dm +++ b/code/modules/reagents/chemistry/items.dm @@ -222,7 +222,7 @@ attack_verb_simple = string_list(list("burn", "singe")) START_PROCESSING(SSobj, src) else - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT force = 0 attack_verb_continuous = null //human_defense.dm takes care of it attack_verb_simple = null diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 6fc141e3b75..19e9798e1a7 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -831,7 +831,7 @@ M.blood_volume += 1 * delta_time else if(DT_PROB(10, delta_time)) //lmao at the newbs who eat energy bars M.electrocute_act(rand(5,10), "Liquid Electricity in their body", 1, SHOCK_NOGLOVES) //the shock is coming from inside the house - playsound(M, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(M, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) return ..() /datum/reagent/consumable/astrotame diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index 6c802c1c16b..49d6d2da0a7 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -332,7 +332,7 @@ if(shock_timer >= rand(5, 30)) //Random shocks are wildly unpredictable shock_timer = 0 M.electrocute_act(rand(5, 20), "Teslium in their body", 1, SHOCK_NOGLOVES) //SHOCK_NOGLOVES because it's caused from INSIDE of you - playsound(M, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(M, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) ..() /datum/reagent/teslium/on_mob_metabolize(mob/living/carbon/human/L) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 8cc7f1a13cd..7811a7d9567 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -1155,7 +1155,7 @@ var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly. var/obj/item/bodypart/bp = M.get_bodypart(selected_part) if(bp) - playsound(M, get_sfx("desecration"), 50, TRUE, -1) + playsound(M, get_sfx(SFX_DESECRATION), 50, TRUE, -1) M.visible_message(span_warning("[M]'s bones hurt too much!!"), span_danger("Your bones hurt too much!!")) M.say("OOF!!", forced = /datum/reagent/toxin/bonehurtingjuice) bp.receive_damage(20, 0, 200, wound_bonus = rand(30, 130)) diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm index c8c14a2ba78..807f79f6e48 100644 --- a/code/modules/religion/religion_sects.dm +++ b/code/modules/religion/religion_sects.dm @@ -113,7 +113,7 @@ blessed.update_damage_overlays() blessed.visible_message(span_notice("[chap] heals [blessed] with the power of [GLOB.deity]!")) to_chat(blessed, span_boldnotice("May the power of [GLOB.deity] compel you to be healed!")) - playsound(chap, "punch", 25, TRUE, -1) + playsound(chap, SFX_PUNCH, 25, TRUE, -1) SEND_SIGNAL(blessed, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) return TRUE @@ -358,7 +358,7 @@ blessed.reagents.add_reagent(/datum/reagent/drug/maint/sludge, 5) blessed.visible_message(span_notice("[chap] empowers [blessed] with the power of [GLOB.deity]!")) to_chat(blessed, span_boldnotice("The power of [GLOB.deity] has made you harder to wound for a while!")) - playsound(chap, "punch", 25, TRUE, -1) + playsound(chap, SFX_PUNCH, 25, TRUE, -1) SEND_SIGNAL(blessed, COMSIG_ADD_MOOD_EVENT, "blessing", /datum/mood_event/blessing) return TRUE //trust me, you'll be feeling the pain from the maint drugs all well enough diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index a5112a85174..7cfcc8306d0 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -602,19 +602,19 @@ smoke.start() /obj/item/relic/proc/corgicannon(mob/user) - playsound(src, "sparks", rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) var/mob/living/simple_animal/pet/dog/corgi/C = new/mob/living/simple_animal/pet/dog/corgi(get_turf(user)) C.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, .proc/throwSmoke, C)) warn_admins(user, "Corgi Cannon", 0) /obj/item/relic/proc/clean(mob/user) - playsound(src, "sparks", rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) var/obj/item/grenade/chem_grenade/cleaner/CL = new/obj/item/grenade/chem_grenade/cleaner(get_turf(user)) CL.detonate() warn_admins(user, "Foam", 0) /obj/item/relic/proc/flash(mob/user) - playsound(src, "sparks", rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) var/obj/item/grenade/flashbang/CB = new/obj/item/grenade/flashbang(user.loc) CB.detonate() warn_admins(user, "Flash") diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index f5cc7c65a80..7ef84c60a6f 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -131,7 +131,7 @@ Nothing else in the console has ID requirements. /obj/machinery/computer/rdconsole/emag_act(mob/user) if(!(obj_flags & EMAGGED)) to_chat(user, span_notice("You disable the security protocols[locked? " and unlock the console":""].")) - playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) obj_flags |= EMAGGED locked = FALSE return ..() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 98c4de3a38c..78904de857c 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -196,7 +196,7 @@ /obj/machinery/computer/rdservercontrol/emag_act(mob/user) if(obj_flags & EMAGGED) return - playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) obj_flags |= EMAGGED to_chat(user, span_notice("You disable the security protocols.")) diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm index 070ae53849e..63263f05e6c 100644 --- a/code/modules/research/xenobiology/crossbreeding/burning.dm +++ b/code/modules/research/xenobiology/crossbreeding/burning.dm @@ -157,7 +157,7 @@ Burning extracts: if(L != user) do_teleport(L, get_turf(L), 6, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) //Somewhere between the effectiveness of fake and real BS crystal new /obj/effect/particle_effect/sparks(get_turf(L)) - playsound(get_turf(L), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(get_turf(L), SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) ..() /obj/item/slimecross/burning/sepia diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm index ba108763483..9b4cfa25aa2 100644 --- a/code/modules/research/xenobiology/crossbreeding/charged.dm +++ b/code/modules/research/xenobiology/crossbreeding/charged.dm @@ -204,7 +204,7 @@ Charged extracts: /obj/item/slimecross/charged/gold/process() visible_message(span_warning("[src] lets off a spark, and produces a living creature!")) new /obj/effect/particle_effect/sparks(get_turf(src)) - playsound(get_turf(src), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(get_turf(src), SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) create_random_mob(get_turf(src), HOSTILE_SPAWN) spawned++ if(spawned >= max_spawn) diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm index 5f56a70d837..de2f027d6b7 100644 --- a/code/modules/research/xenobiology/crossbreeding/consuming.dm +++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm @@ -247,7 +247,7 @@ Consuming extracts: if(target) do_teleport(M, target, 0, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) new /obj/effect/particle_effect/sparks(get_turf(M)) - playsound(get_turf(M), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(get_turf(M), SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /obj/item/slimecross/consuming/sepia colour = "sepia" diff --git a/code/modules/research/xenobiology/vatgrowing/vatgrower.dm b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm index b34ebf6d514..be6ddd5d560 100644 --- a/code/modules/research/xenobiology/vatgrowing/vatgrower.dm +++ b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm @@ -124,7 +124,7 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED - playsound(src, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(user, span_warning("You overload [src]'s resampling circuit.")) flick("growing_vat_emagged", src) diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index 2ced97ff6a8..f8248879591 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -35,7 +35,7 @@ actions += new /datum/action/innate/shuttledocker_place(src) set_init_ports() - + if(!mapload) connect_to_shuttle(SSshuttle.get_containing_shuttle(src)) @@ -390,7 +390,7 @@ return if(QDELETED(src) || QDELETED(owner) || !isliving(owner)) return - playsound(src, "terminal_type", 25, FALSE) + playsound(src, SFX_TERMINAL_TYPE, 25, FALSE) var/turf/T = get_turf(L[selected]) if(isnull(T)) return diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index d741c3f291c..2f144490a9e 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -354,7 +354,7 @@ languages_possible = languages_possible_alien /obj/item/organ/tongue/alien/modify_speech(datum/source, list/speech_args) - playsound(owner, "hiss", 25, TRUE, TRUE) + playsound(owner, SFX_HISS, 25, TRUE, TRUE) /obj/item/organ/tongue/bone name = "bone \"tongue\"" diff --git a/code/modules/vehicles/mecha/combat/honker.dm b/code/modules/vehicles/mecha/combat/honker.dm index 0e66a40dc2b..3f94eebfcef 100644 --- a/code/modules/vehicles/mecha/combat/honker.dm +++ b/code/modules/vehicles/mecha/combat/honker.dm @@ -105,7 +105,7 @@ /obj/vehicle/sealed/mecha/combat/honker/play_stepsound() if(squeak) - playsound(src, "clownstep", 70, 1) + playsound(src, SFX_CLOWN_STEP, 70, 1) squeak = !squeak /obj/vehicle/sealed/mecha/combat/honker/Topic(href, href_list) diff --git a/code/modules/wiremod/shell/bot.dm b/code/modules/wiremod/shell/bot.dm index ca7cab94d21..43d66060e8a 100644 --- a/code/modules/wiremod/shell/bot.dm +++ b/code/modules/wiremod/shell/bot.dm @@ -43,7 +43,7 @@ /obj/item/circuit_component/bot/proc/on_attack_hand(atom/source, mob/user) SIGNAL_HANDLER source.balloon_alert(user, "pushed button") - playsound(source, get_sfx("terminal_type"), 25, FALSE) + playsound(source, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE) entity.set_output(user) signal.set_output(COMPONENT_SIGNAL) diff --git a/code/modules/wiremod/shell/compact_remote.dm b/code/modules/wiremod/shell/compact_remote.dm index 41c2bdc8f92..15b80328d5d 100644 --- a/code/modules/wiremod/shell/compact_remote.dm +++ b/code/modules/wiremod/shell/compact_remote.dm @@ -45,6 +45,6 @@ /obj/item/circuit_component/compact_remote/proc/send_trigger(atom/source, mob/user) SIGNAL_HANDLER source.balloon_alert(user, "clicked primary button") - playsound(source, get_sfx("terminal_type"), 25, FALSE) + playsound(source, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE) entity.set_output(user) signal.set_output(COMPONENT_SIGNAL) diff --git a/code/modules/wiremod/shell/controller.dm b/code/modules/wiremod/shell/controller.dm index 9cb40208047..190136e692c 100644 --- a/code/modules/wiremod/shell/controller.dm +++ b/code/modules/wiremod/shell/controller.dm @@ -59,7 +59,7 @@ if(!user.Adjacent(source)) return source.balloon_alert(user, "clicked primary button") - playsound(source, get_sfx("terminal_type"), 25, FALSE) + playsound(source, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE) entity.set_output(user) signal.set_output(COMPONENT_SIGNAL) @@ -71,7 +71,7 @@ if(!user.Adjacent(source)) return source.balloon_alert(user, "clicked alternate button") - playsound(source, get_sfx("terminal_type"), 25, FALSE) + playsound(source, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE) entity.set_output(user) alt.set_output(COMPONENT_SIGNAL) @@ -83,6 +83,6 @@ if(!user.Adjacent(source)) return source.balloon_alert(user, "clicked extra button") - playsound(source, get_sfx("terminal_type"), 25, FALSE) + playsound(source, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE) entity.set_output(user) right.set_output(COMPONENT_SIGNAL) diff --git a/code/modules/wiremod/shell/gun.dm b/code/modules/wiremod/shell/gun.dm index ff37c9046dd..7f39be2b77b 100644 --- a/code/modules/wiremod/shell/gun.dm +++ b/code/modules/wiremod/shell/gun.dm @@ -68,7 +68,7 @@ /obj/item/circuit_component/wiremod_gun/proc/handle_shot(atom/source, mob/firer, atom/target, angle) SIGNAL_HANDLER - playsound(source, get_sfx("terminal_type"), 25, FALSE) + playsound(source, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE) shooter.set_output(firer) shot.set_output(target) signal.set_output(COMPONENT_SIGNAL) diff --git a/code/modules/wiremod/shell/scanner.dm b/code/modules/wiremod/shell/scanner.dm index 87f53c03925..311084fcf12 100644 --- a/code/modules/wiremod/shell/scanner.dm +++ b/code/modules/wiremod/shell/scanner.dm @@ -54,7 +54,7 @@ if(!proximity_flag) return source.balloon_alert(user, "scanned object") - playsound(source, get_sfx("terminal_type"), 25, FALSE) + playsound(source, get_sfx(SFX_TERMINAL_TYPE), 25, FALSE) attacker.set_output(user) attacking.set_output(target) signal.set_output(COMPONENT_SIGNAL) diff --git a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm index 4f82e5bed3f..2fc867cd09e 100644 --- a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm +++ b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm @@ -23,7 +23,7 @@ to_chat(M, span_warning("[parent] seems to be locked!")) return FALSE if(dump_destination.storage_contents_dump_act(STR, M)) - playsound(used_belt, "rustle", 50, TRUE, -5) + playsound(used_belt, SFX_RUSTLE, 50, TRUE, -5) used_belt.do_squish(0.8, 1.2) return TRUE return FALSE diff --git a/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm b/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm index ed36c47c5ff..8fb53768a48 100644 --- a/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm +++ b/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm @@ -37,7 +37,7 @@ SIGNAL_HANDLER wielded = FALSE - hitsound = "swing_hit" + hitsound = SFX_SWING_HIT STOP_PROCESSING(SSobj, src) set_light_on(FALSE) diff --git a/modular_skyrat/modules/goofsec/code/department_guards.dm b/modular_skyrat/modules/goofsec/code/department_guards.dm index 8b5ece9b543..2bcbcce0cd3 100644 --- a/modular_skyrat/modules/goofsec/code/department_guards.dm +++ b/modular_skyrat/modules/goofsec/code/department_guards.dm @@ -436,7 +436,7 @@ span_warning("[user] prods you with [src]. Luckily, it shut off due to being in the wrong area.")) active = FALSE balloon_alert(user, "wrong department") - playsound(src, "sparks", 75, TRUE, -1) + playsound(src, SFX_SPARKS, 75, TRUE, -1) update_appearance() return BATON_ATTACK_DONE . = ..() @@ -458,7 +458,7 @@ span_warning("You scramble [src]'s departmental lock, allowing it to be used freely!"), span_hear("You hear a faint electrical spark.")) balloon_alert(user, "emagged") - playsound(src, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) emagged = TRUE /obj/item/melee/baton/security/loaded/departmental/medical diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index 92d1fef78d5..09faac4492d 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -94,7 +94,7 @@ if(istype(I, /obj/item/gun)) playsound(parent, 'modular_skyrat/modules/sec_haul/sound/holsterin.ogg', 50, TRUE, -5) else - playsound(parent, "rustle", 50, TRUE, -5) + playsound(parent, SFX_RUSTLE, 50, TRUE, -5) for(var/mob/viewing in viewers(user, null)) if(M == viewing) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm index a1635ab0315..5ccf84e0855 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm @@ -933,7 +933,7 @@ user.visible_message(span_warning("[user] starts masturbating into [target]!"), span_danger("You start masturbating into [target]!")) if(do_after(user,60)) user.visible_message(span_warning("[user] cums into [target]!"), span_danger("You cum into [target]!")) - playsound(target, "desecration", 50, TRUE, ignore_walls = FALSE) + playsound(target, SFX_DESECRATION, 50, TRUE, ignore_walls = FALSE) R.trans_to(target, cum_volume) if(prob(40)) user.emote("moan") @@ -943,7 +943,7 @@ if(do_after(user,60)) var/turf/T = get_turf(target) user.visible_message(span_warning("[user] cums on [target]!"), span_danger("You cum on [target]!")) - playsound(target, "desecration", 50, TRUE, ignore_walls = FALSE) + playsound(target, SFX_DESECRATION, 50, TRUE, ignore_walls = FALSE) new/obj/effect/decal/cleanable/cum(T) if(prob(40)) user.emote("moan") diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm index 9eb438317f7..9551254f21a 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm @@ -252,7 +252,7 @@ if(istype(I, /obj/item/gun/ballistic/automatic/pistol)) playsound(parent, 'modular_skyrat/modules/sec_haul/sound/holsterin.ogg', 50, TRUE, -5) else - playsound(parent, "rustle", 50, TRUE, -5) + playsound(parent, SFX_RUSTLE, 50, TRUE, -5) for(var/mob/viewing in viewers(user, null)) if(M == viewing) diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm index 0f74d4f8359..410a757f47d 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm @@ -256,7 +256,7 @@ spam_protection = TRUE continue if(show_message) - playsound(user, "rustle", 50, TRUE) + playsound(user, SFX_RUSTLE, 50, TRUE) user.visible_message(span_notice("[user] scoops up the rocks beneath [user.p_them()]."), \ span_notice("You scoop up the rocks beneath you with your [name].")) spam_protection = FALSE