sfad (#18021)

code/game/machinery/iv_drip.dm

@@ -448,7 +448,7 @@
 		user.visible_message(
 			SPAN_NOTICE("[user] [is_loose ? "tightens" : "loosens"] the nuts on [src]."),
 			SPAN_NOTICE("You [is_loose ? "tighten" : "loosen"] the nuts on [src], [is_loose ? "securing \the [tank]" : "allowing \the [tank] to be removed"]."))
-		playsound(src.loc, "sound/items/wrench.ogg", 50, 1)
+		playsound(src.loc, 'sound/items/wrench.ogg', 50, 1)
 		is_loose = !is_loose
 		return TRUE
 	if(default_deconstruction_screwdriver(user, W))

code/game/objects/items/airbubble.dm

@@ -246,7 +246,8 @@
 		return FALSE
 
 	if ((world.time - last_shake) > 5 SECONDS)
-		playsound(loc, "sound/items/[pick("rip1","rip2")].ogg", 100, 1)
+		var/sound_to_play = pick(list('sound/items/rip1.ogg', 'sound/items/rip2.ogg'))
+		playsound(loc, sound_to_play, 100, 1)
 		shake_animation()
 		last_shake = world.time
 
@@ -275,7 +276,8 @@
 	breakout = FALSE
 	to_chat(escapee, "<span class='warning'>You successfully break out! Tearing the bubble's walls!</span>") // holy shit this is hilarious
 	visible_message("<span class='danger'>\the [escapee] successfully broke out of \the [src]! Tearing the bubble's walls!</span>")
-	playsound(loc, "sound/items/[pick("rip1","rip2")].ogg", 100, 1)
+	var/sound_to_play = pick(list('sound/items/rip1.ogg', 'sound/items/rip2.ogg'))
+	playsound(loc, sound_to_play, 100, 1)
 	break_open()
 	shake_animation()
 	desc += " <span class='danger'>It has hole in it! Maybe you shouldn't use it!</span>"
@@ -513,11 +515,11 @@
 				STOP_PROCESSING(SSfast_process, src)
 				use_internal_tank = !use_internal_tank
 				visible_message("<span class='warning'>You hear last bits of air coming out from [src]'s hole.Maybe the tank run out of air?</span>")
-				playsound(loc, "sound/effects/wind/wind_2_1.ogg", 100, 1)
+				playsound(loc, 'sound/effects/wind/wind_2_1.ogg', 100, 1)
 				return
 			inside_air = get_turf_air()
 			visible_message("<span class='warning'>You hear air howling from [src]'s hole. Maybe it is good to shut off valve on the internals tank?</span>")
-			playsound(loc, "sound/effects/wind/wind_2_2.ogg", 100, 1)
+			playsound(loc, 'sound/effects/wind/wind_2_2.ogg', 100, 1)
 
 			var/transfer_moles = inside_air.volume/(inside_air.temperature * R_IDEAL_GAS_EQUATION)
 			var/datum/gas_mixture/removed = tank_air.remove(transfer_moles)

code/game/objects/items/devices/geiger.dm

@@ -18,7 +18,7 @@
 
 /obj/item/device/geiger/proc/update_sound(playing)
 	if(playing && !sound_token)
-		sound_token = sound_player.PlayLoopingSound(src, sound_id, "sound/items/geiger.ogg", volume = geiger_volume, range = 4, falloff = 3, prefer_mute = TRUE)
+		sound_token = sound_player.PlayLoopingSound(src, sound_id, 'sound/items/geiger.ogg', volume = geiger_volume, range = 4, falloff = 3, prefer_mute = TRUE)
 	else if(!playing && sound_token)
 		QDEL_NULL(sound_token)
 

code/game/objects/items/devices/magnetic_lock.dm

@@ -138,11 +138,13 @@
 		if (I.force >= 18)
 			user.visible_message("<span class='danger'>[user] bashes [src] with [I]!</span>", "<span class='danger'>You strike [src] with [I], damaging it!</span>")
 			takedamage(I.force)
-			playsound(loc, "sound/weapons/genhit[rand(1,3)].ogg", I.force*3, 1)
-			addtimer(CALLBACK(GLOBAL_PROC, /proc/playsound, loc, "sound/effects/sparks[rand(1,4)].ogg", 30, 1), 3, TIMER_CLIENT_TIME)
+			var/sound_to_play = pick(list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))
+			playsound(loc, sound_to_play, I.force*3, 1)
+			sound_to_play = pick(list('sound/effects/sparks1.ogg', 'sound/effects/sparks2.ogg', 'sound/effects/sparks3.ogg', 'sound/effects/sparks4.ogg'))
+			addtimer(CALLBACK(GLOBAL_PROC, /proc/playsound, loc, sound_to_play, 30, 1), 3, TIMER_CLIENT_TIME)
 		else
 			user.visible_message("<span class='danger'>[user] hits [src] with [I] but fails to damage it.</span>", "<span class='warning'>You hit [src] with [I], [I.force >= 10 ? "and it almost makes a dent!" : "but it appears to have no visible effect."]</span>")
-			playsound(loc, "sound/weapons/Genhit.ogg", I.force*2.5, 1)
+			playsound(loc, 'sound/weapons/Genhit.ogg', I.force*2.5, 1)
 		return TRUE
 
 	if(invincible)

code/game/objects/items/weapons/autopsy.dm

@@ -140,7 +140,7 @@
 
 	for(var/mob/O in viewers(usr))
 		O.show_message(SPAN_NOTICE("\The [src] rattles and prints out a sheet of paper."), 1)
-		playsound(loc, "sound/bureaucracy/print_short.ogg", 50, 1)
+		playsound(loc, 'sound/bureaucracy/print_short.ogg', 50, 1)
 
 	sleep(10)
 

code/game/objects/items/weapons/material/twohanded.dm

@@ -405,7 +405,7 @@
 /obj/item/material/twohanded/chainsaw/proc/PowerUp()
 	var/turf/T = get_turf(src)
 	T.audible_message(SPAN_NOTICE("\The [src] rumbles to life."))
-	playsound(src, "sound/weapons/chainsawstart.ogg", 25, 0, 30)
+	playsound(src, 'sound/weapons/saw/chainsawstart.ogg', 25, 0, 30)
 	force_unwielded = 30
 	force = force_unwielded
 	force_wielded = 60
@@ -482,7 +482,7 @@
 /obj/item/material/twohanded/chainsaw/attack(mob/M as mob, mob/living/user as mob)
 	. = ..()
 	if(powered)
-		playsound(loc, "sound/weapons/saw/chainsword.ogg", 25, 0, 30)
+		playsound(loc, 'sound/weapons/saw/chainsword.ogg', 25, 0, 30)
 		RemoveFuel(3)
 
 /obj/item/material/twohanded/chainsaw/afterattack(obj/O as obj, mob/user as mob, proximity)
@@ -496,7 +496,7 @@
 		if(!istype(O))
 			user.visible_message(SPAN_DANGER("[user] revs the chainsaw!"), SPAN_WARNING("You rev the chainsaw!"), SPAN_WARNING("You hear a chainsaw rev!"))
 			user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
-			playsound(loc, "sound/weapons/saw/chainsword.ogg", 25, 0, 30)
+			playsound(loc, 'sound/weapons/saw/chainsword.ogg', 25, 0, 30)
 			RemoveFuel(3)
 	. = ..()
 

code/game/objects/items/weapons/traps.dm

@@ -247,7 +247,7 @@
 		return FALSE
 
 	if ((world.time - last_shake) > 5 SECONDS)
-		playsound(loc, "sound/effects/grillehit.ogg", 100, 1)
+		playsound(loc, 'sound/effects/grillehit.ogg', 100, 1)
 		shake_animation()
 		last_shake = world.time
 
@@ -273,7 +273,7 @@
 	breakout = FALSE
 	to_chat(escapee, "<span class='warning'>You successfully break out!</span>")
 	visible_message("<span class='danger'>\The [escapee] successfully breaks out of \the [src]!</span>")
-	playsound(loc, "sound/effects/grillehit.ogg", 100, 1)
+	playsound(loc, 'sound/effects/grillehit.ogg', 100, 1)
 
 	release()
 
@@ -419,7 +419,8 @@
 
 		user.visible_message("<span class='notice'>[user] is trying to [anchored ? "un" : "" ]secure \the [src]!</span>",
 								"<span class='notice'>You are trying to [anchored ? "un" : "" ]secure \the [src]!</span>")
-		playsound(src.loc, "sound/items/[pick("Screwdriver", "Screwdriver2")].ogg", 50, 1)
+		var/sound_to_play = pick(list('sound/items/Screwdriver.ogg', 'sound/items/Screwdriver2.ogg'))
+		playsound(src.loc, sound_to_play, 50, 1)
 
 		if(W.use_tool(src, user, 30, volume = 50))
 			density = !density

code/modules/admin/admin.dm

@@ -1356,7 +1356,7 @@ var/global/enabled_spooking = 0
 		message = sanitize(message, 500, extra = 0)
 
 
-	var/list/sounds = file2list("sound/serversound_list.txt");
+	var/list/sounds = file2list('sound/serversound_list.txt');
 	sounds += "--CANCEL--"
 	sounds += "--LOCAL--"
 	sounds += sounds_cache

code/modules/admin/verbs/playsound.dm

@@ -37,7 +37,7 @@ var/list/sounds_cache = list()
 	set name = "Play Server Sound"
 	if(!check_rights(R_SOUNDS))	return
 
-	var/list/sounds = file2list("sound/serversound_list.txt");
+	var/list/sounds = file2list('sound/serversound_list.txt');
 	sounds += "--CANCEL--"
 	sounds += sounds_cache
 

code/modules/heavy_vehicle/mech_damage.dm

@@ -144,8 +144,8 @@
 
 	apply_damage(damage, DAMAGE_BRUTE, BP_L_LEG) // can target any leg, it will be changed to the proper component
 
-	playsound(loc, "sound/effects/bang.ogg", 100, 1)
-	playsound(loc, "sound/effects/bamf.ogg", 100, 1)
+	playsound(loc, 'sound/effects/bang.ogg', 100, 1)
+	playsound(loc, 'sound/effects/bamf.ogg', 100, 1)
 	return TRUE
 
 /mob/living/heavy_vehicle/get_bullet_impact_effect_type(var/def_zone)

code/modules/mining/machine_processing.dm

@@ -248,7 +248,7 @@
 	P.stamps += "<HR><i>This paper has been stamped by the SCC Ore Processing System.</i>"
 
 	user.visible_message("\The [src] rattles and prints out a sheet of paper.")
-	playsound(get_turf(src), "sound/bureaucracy/print_short.ogg", 50, 1)
+	playsound(get_turf(src), 'sound/bureaucracy/print_short.ogg', 50, 1)
 
 	// reset
 	output_mats = list()

code/modules/multiz/movement.dm

@@ -471,15 +471,16 @@
 	if(!isSynthetic())
 		switch(damage)
 			if(-INFINITY to 10)
-				playsound(src.loc, "sound/weapons/bladeslice.ogg", 50, 1)
+				playsound(src.loc, 'sound/weapons/bladeslice.ogg', 50, 1)
 			if(11 to 50)
-				playsound(src.loc, "sound/weapons/punch[rand(1, 4)].ogg", 75, 1)
+				var/sound_to_play = pick(list('sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg'))
+				playsound(src.loc, sound_to_play, 75, 1)
 			if(51 to INFINITY)
-				playsound(src.loc, "sound/weapons/heavysmash.ogg", 100, 1)
+				playsound(src.loc, 'sound/weapons/heavysmash.ogg', 100, 1)
 			else
 				playsound(src.loc, /singleton/sound_category/swing_hit_sound, 75, 1)
 	else
-		playsound(src.loc, "sound/weapons/smash.ogg", 75, 1)
+		playsound(src.loc, 'sound/weapons/smash.ogg', 75, 1)
 
 	return TRUE
 
@@ -631,15 +632,15 @@
 	if(!isSynthetic())
 		switch(damage)
 			if(-INFINITY to 10)
-				playsound(src.loc, "sound/weapons/bladeslice.ogg", 50, 1)
+				playsound(src.loc, 'sound/weapons/bladeslice.ogg', 50, 1)
 			if(11 to 50)
 				playsound(src.loc, /singleton/sound_category/punch_sound, 75, 1)
 			if(51 to INFINITY)
-				playsound(src.loc, "sound/weapons/heavysmash.ogg", 100, 1)
+				playsound(src.loc, 'sound/weapons/heavysmash.ogg', 100, 1)
 			else
 				playsound(src.loc, /singleton/sound_category/swing_hit_sound, 75, 1)
 	else
-		playsound(src.loc, "sound/weapons/smash.ogg", 75, 1)
+		playsound(src.loc, 'sound/weapons/smash.ogg', 75, 1)
 
 	// Stats.
 	SSstatistics.IncrementSimpleStat("openturf_human_falls")
@@ -667,7 +668,7 @@
 
 	health -= (damage * brute_dam_coeff)
 
-	playsound(loc, "sound/effects/clang.ogg", 75, 1)
+	playsound(loc, 'sound/effects/clang.ogg', 75, 1)
 
 /**
  * Used to handle damage dealing for objects post fall. Why is it separated from
@@ -744,7 +745,8 @@
 	else
 		admin_attack_log((ismob(src) ? src : null), L, "fell onto", "was fallen on by", "fell ontop of")
 
-	playsound(L.loc, "sound/waepons/genhit[rand(1, 3)].ogg", 75, 1)
+	var/sound_to_play = pick(list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))
+	playsound(L.loc, sound_to_play, 75, 1)
 
 	return L
 

code/modules/overmap/contacts/contact_sensors.dm

@@ -128,7 +128,7 @@
 					QDEL_IN(record, 2 SECOND) // Need to restart the search if you've lost contact with the object.
 					if(contact.scannable)	  // Scannable objects are the only ones that give off notifications to prevent spam
 						visible_message(SPAN_NOTICE("\The [src] states, \"Contact lost with [record.name].\""))
-						playsound(loc, "sound/machines/sensors/contact_lost.ogg", 30, 1)
+						playsound(loc, 'sound/machines/sensors/contact_lost.ogg', 30, 1)
 				objects_in_view -= contact
 				continue
 
@@ -152,12 +152,12 @@
 						objects_in_view[contact] += round(sensors.sensor_strength**2)
 						if(!muted)
 							visible_message(SPAN_NOTICE("<b>\The [src]</b> states, \"Contact '[contact.unknown_id]' tracing [objects_in_view[contact]]% complete, bearing [bearing_estimate], error +/- [bearing_variability].\""))
-					playsound(loc, "sound/machines/sensors/contactgeneric.ogg", 10, 1) //Let players know there's something nearby.
+					playsound(loc, 'sound/machines/sensors/contactgeneric.ogg', 10, 1) //Let players know there's something nearby.
 				if(objects_in_view[contact] >= 100) // Identification complete.
 					record = new /datum/overmap_contact(src, contact)
 					contact_datums[contact] = record
 					if(contact.scannable)
-						playsound(loc, "sound/machines/sensors/newcontact.ogg", 30, 1)
+						playsound(loc, 'sound/machines/sensors/newcontact.ogg', 30, 1)
 						visible_message(SPAN_NOTICE("<b>\The [src]</b> states, \"New contact identified, designation [record.name], bearing [bearing].\""))
 					record.show()
 					animate(record.marker, alpha=255, 2 SECOND, 1, LINEAR_EASING)

code/modules/overmap/ships/computers/sensors.dm

@@ -313,7 +313,7 @@
 				contact_details = null
 			if("print")
 				if(contact_details)
-					playsound(loc, "sound/machines/dotprinter.ogg", 30, 1)
+					playsound(loc, 'sound/machines/dotprinter.ogg', 30, 1)
 					new/obj/item/paper/(get_turf(src), contact_details, "paper (Sensor Scan - [contact_name])")
 		return TRUE
 
@@ -321,7 +321,7 @@
 		var/obj/effect/overmap/O = locate(params["scan"])
 		if(istype(O) && !QDELETED(O))
 			if((O in view(7,linked))|| (O in contact_datums))
-				playsound(loc, "sound/machines/dotprinter.ogg", 30, 1)
+				playsound(loc, 'sound/machines/dotprinter.ogg', 30, 1)
 				LAZYSET(last_scan, "data", O.get_scan_data(usr))
 				LAZYSET(last_scan, "location", "[O.x],[O.y]")
 				LAZYSET(last_scan, "name", "[O]")

code/modules/paperwork/faxmachine.dm

@@ -226,7 +226,7 @@ var/list/admin_departments
 	if (!istype(incoming, /obj/item/paper) && !istype(incoming, /obj/item/photo) && !istype(incoming, /obj/item/paper_bundle))
 		return 0
 
-	playsound(loc, "sound/bureaucracy/print.ogg", 75, 1)
+	playsound(loc, 'sound/bureaucracy/print.ogg', 75, 1)
 
 	// give the sprite some time to flick
 	spawn(20)

code/modules/shuttles/shuttle_lift.dm

@@ -24,7 +24,7 @@
 	if(!obstruction_check(start_location, destination))
 		if(assigned_controller)
 			assigned_controller.audible_message("\The [assigned_controller] buzzes loudly: <i>Obstruction detected!</i>")
-			playsound(assigned_controller.loc, "sound/machines/buzz-two.ogg", 50, 1)
+			playsound(assigned_controller.loc, 'sound/machines/buzz-two.ogg', 50, 1)
 		return FALSE
 	..()
 

code/modules/turbolift/turbolift.dm

@@ -61,7 +61,7 @@
 			doors_closing = 0
 			open_doors()
 			control_panel_interior.audible_message("\The [current_floor.ext_panel] buzzes loudly.")
-			playsound(control_panel_interior.loc, "sound/machines/buzz-two.ogg", 50, 1)
+			playsound(control_panel_interior.loc, 'sound/machines/buzz-two.ogg', 50, 1)
 			return 0
 
 	doors_closing = 0 // The doors weren't open, so they are done closing

html/changelogs/fluffyghost-staticsoundfilepaths.yml

@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: FluffyGhost
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - backend: "Moved all filepaths for sounds to static links, with single quotes instead of doubles."
+  - bugfix: "Repathed wrong chainsaw sounds to the correct path."
+  - soundadd: "Added a missed sound that was forgotten when porting the overmap sensors, from Nebula."