Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b

This commit is contained in:
Majkl-J
2024-10-23 23:27:16 -07:00
4642 changed files with 25352 additions and 14167 deletions
+1 -1
View File
@@ -26,7 +26,7 @@
/// Does some sparks after it's done
/obj/machinery/byteforge/proc/flash(atom/movable/thing)
playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
playsound(src, 'sound/effects/magic/blink.ogg', 50, TRUE)
var/datum/effect_system/spark_spread/quantum/sparks = new()
sparks.set_up(5, 1, loc)
+1 -1
View File
@@ -47,7 +47,7 @@
atom_storage.max_total_storage = 3
atom_storage.locked = STORAGE_NOT_LOCKED
icon_state = icon_closed
playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
playsound(src, 'sound/effects/magic/blink.ogg', 50, TRUE)
/obj/item/storage/lockbox/bitrunning/decrypted/PopulateContents()
var/choice = SSbitrunning.pick_secondary_loot(source_domain)
@@ -37,7 +37,7 @@
rewards_multiplier = 1,
)
. = ..()
playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
playsound(src, 'sound/effects/magic/blink.ogg', 50, TRUE)
if(isnull(completed_domain))
return