mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 07:08:00 +01:00
Reorganizes the sound folder (#86726)
## About The Pull Request <details> - renamed ai folder to announcer -- announcer -- - moved vox_fem to announcer - moved approachingTG to announcer - separated the ambience folder into ambience and instrumental -- ambience -- - created holy folder moved all related sounds there - created engineering folder and moved all related sounds there - created security folder and moved ambidet there - created general folder and moved ambigen there - created icemoon folder and moved all icebox-related ambience there - created medical folder and moved all medbay-related ambi there - created ruin folder and moves all ruins ambi there - created beach folder and moved seag and shore there - created lavaland folder and moved related ambi there - created aurora_caelus folder and placed its ambi there - created misc folder and moved the rest of the files that don't have a specific category into it -- instrumental -- - moved traitor folder here - created lobby_music folder and placed our songs there (title0 not used anywhere? - server-side modification?) -- items -- - moved secdeath to hailer - moved surgery to handling -- effects -- - moved chemistry into effects - moved hallucinations into effects - moved health into effects - moved magic into effects -- vehicles -- - moved mecha into vehicles created mobs folder -- mobs -- - moved creatures folder into mobs - moved voice into mobs renamed creatures to non-humanoids renamed voice to humanoids -- non-humanoids-- created cyborg folder created hiss folder moved harmalarm.ogg to cyborg -- humanoids -- -- misc -- moved ghostwhisper to misc moved insane_low_laugh to misc I give up trying to document this. </details> - [X] ambience - [x] announcer - [x] effects - [X] instrumental - [x] items - [x] machines - [x] misc - [X] mobs - [X] runtime - [X] vehicles - [ ] attributions ## Why It's Good For The Game This folder is so disorganized that it's vomit inducing, will make it easier to find and add new sounds, providng a minor structure to the sound folder. ## Changelog 🆑 grungussuss refactor: the sound folder in the source code has been reorganized, please report any oddities with sounds playing or not playing server: lobby music has been repathed to sound/music/lobby_music /🆑
This commit is contained in:
@@ -67,7 +67,7 @@
|
||||
tool.play_tool_sound(src)
|
||||
if(tool.use_tool(src, user, 5 SECONDS))
|
||||
balloon_alert_to_viewers("repaired")
|
||||
playsound(user, 'sound/items/change_drill.ogg', 50, vary = TRUE)
|
||||
playsound(user, 'sound/items/tools/change_drill.ogg', 50, vary = TRUE)
|
||||
broken_ringer = FALSE
|
||||
times_rang = 0
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
|
||||
@@ -144,7 +144,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
|
||||
return FALSE
|
||||
if (!(obj_flags & EMAGGED))
|
||||
obj_flags |= EMAGGED
|
||||
playsound(src, 'sound/creatures/dog/growl2.ogg', 50, FALSE)
|
||||
playsound(src, 'sound/mobs/non-humanoids/dog/growl2.ogg', 50, FALSE)
|
||||
balloon_alert(user, "migrated to syndienet 2.0")
|
||||
to_chat(user, span_warning("An image appears on [src] screen for a moment with Ian in the cap of a Syndicate officer."))
|
||||
return TRUE
|
||||
@@ -369,7 +369,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
|
||||
if (FAX.jammed)
|
||||
do_sparks(5, TRUE, src)
|
||||
balloon_alert(usr, "destination port jammed")
|
||||
playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
return FALSE
|
||||
FAX.receive(loaded, fax_name)
|
||||
history_add("Send", FAX.fax_name)
|
||||
|
||||
@@ -287,7 +287,7 @@
|
||||
playsound(sticking_to, 'sound/items/handling/component_pickup.ogg', 20, TRUE)
|
||||
sticking_to.balloon_alert(user, "label renamed")
|
||||
else
|
||||
playsound(sticking_to, 'sound/items/poster_ripped.ogg', 20, TRUE)
|
||||
playsound(sticking_to, 'sound/items/poster/poster_ripped.ogg', 20, TRUE)
|
||||
sticking_to.balloon_alert(user, "label removed")
|
||||
qdel(src)
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
cracked = FALSE
|
||||
has_been_sealed = TRUE
|
||||
contents_hidden = TRUE
|
||||
playsound(get_turf(user), 'sound/items/duct_tape_snap.ogg', 60)
|
||||
playsound(get_turf(user), 'sound/items/duct_tape/duct_tape_snap.ogg', 60)
|
||||
icon_state = "[sealed_icon]"
|
||||
update_appearance()
|
||||
|
||||
|
||||
@@ -163,7 +163,7 @@
|
||||
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
|
||||
|
||||
/obj/item/papercutter/proc/cut_paper(mob/user)
|
||||
playsound(src.loc, 'sound/weapons/slash.ogg', 50, TRUE)
|
||||
playsound(src.loc, 'sound/items/weapons/slash.ogg', 50, TRUE)
|
||||
var/clumsy = (iscarbon(user) && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(cut_self_chance))
|
||||
to_chat(user, span_userdanger("You neatly cut [stored_paper][clumsy ? "... and your finger in the process!" : "."]"))
|
||||
if(clumsy)
|
||||
|
||||
@@ -327,7 +327,7 @@
|
||||
. = ..()
|
||||
AddComponent(/datum/component/butchering, \
|
||||
speed = 6 SECONDS, \
|
||||
butcher_sound = 'sound/weapons/blade1.ogg', \
|
||||
butcher_sound = 'sound/items/weapons/blade1.ogg', \
|
||||
)
|
||||
RegisterSignal(src, COMSIG_DETECTIVE_SCANNED, PROC_REF(on_scan))
|
||||
|
||||
@@ -368,14 +368,14 @@
|
||||
|
||||
/obj/item/pen/edagger/proc/on_containing_dart_fired(obj/projectile/source)
|
||||
SIGNAL_HANDLER
|
||||
playsound(source, 'sound/weapons/saberon.ogg', 5, TRUE)
|
||||
playsound(source, 'sound/items/weapons/saberon.ogg', 5, TRUE)
|
||||
var/datum/component/transforming/transform_comp = GetComponent(/datum/component/transforming)
|
||||
source.hitsound = transform_comp.hitsound_on
|
||||
source.set_light(light_range, light_power, light_color, l_on = TRUE)
|
||||
|
||||
/obj/item/pen/edagger/proc/on_containing_dart_drop(datum/source, obj/item/ammo_casing/new_casing)
|
||||
SIGNAL_HANDLER
|
||||
playsound(new_casing, 'sound/weapons/saberoff.ogg', 5, TRUE)
|
||||
playsound(new_casing, 'sound/items/weapons/saberoff.ogg', 5, TRUE)
|
||||
|
||||
/obj/item/pen/edagger/proc/on_containing_dart_embedded(datum/source, obj/item/ammo_casing/new_casing)
|
||||
SIGNAL_HANDLER
|
||||
@@ -384,12 +384,12 @@
|
||||
|
||||
/obj/item/pen/edagger/proc/on_containing_dart_failed_embed(obj/item/ammo_casing/source)
|
||||
SIGNAL_HANDLER
|
||||
playsound(source, 'sound/weapons/saberoff.ogg', 5, TRUE)
|
||||
playsound(source, 'sound/items/weapons/saberoff.ogg', 5, TRUE)
|
||||
UnregisterSignal(source, list(COMSIG_ITEM_UNEMBEDDED, COMSIG_ITEM_FAILED_EMBED))
|
||||
|
||||
/obj/item/pen/edagger/proc/on_embedded_removed(obj/item/ammo_casing/source, mob/living/carbon/victim)
|
||||
SIGNAL_HANDLER
|
||||
playsound(source, 'sound/weapons/saberoff.ogg', 5, TRUE)
|
||||
playsound(source, 'sound/items/weapons/saberoff.ogg', 5, TRUE)
|
||||
UnregisterSignal(source, list(COMSIG_ITEM_UNEMBEDDED, COMSIG_ITEM_FAILED_EMBED))
|
||||
victim.visible_message(
|
||||
message = span_warning("The blade of the [hidden_name] retracts as the [source.name] is removed from [victim]!"),
|
||||
@@ -432,7 +432,7 @@
|
||||
|
||||
if(user)
|
||||
balloon_alert(user, "[hidden_name] [active ? "active" : "concealed"]")
|
||||
playsound(src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 5, TRUE)
|
||||
playsound(src, active ? 'sound/items/weapons/saberon.ogg' : 'sound/items/weapons/saberoff.ogg', 5, TRUE)
|
||||
set_light_on(active)
|
||||
return COMPONENT_NO_DEFAULT_MESSAGE
|
||||
|
||||
@@ -514,7 +514,7 @@
|
||||
/obj/item/pen/screwdriver/on_transform(obj/item/source, mob/user, active)
|
||||
if(user)
|
||||
balloon_alert(user, active ? "extended" : "retracted")
|
||||
playsound(src, 'sound/weapons/batonextend.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/items/weapons/batonextend.ogg', 50, TRUE)
|
||||
|
||||
if(!active)
|
||||
tool_behaviour = initial(tool_behaviour)
|
||||
|
||||
@@ -87,7 +87,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/ticket_machine, 32)
|
||||
if(LAZYLEN(tickets))
|
||||
current_ticket = tickets[1]
|
||||
current_number++ //Increment the one we're serving.
|
||||
playsound(src, 'sound/misc/announce_dig.ogg', 50, FALSE)
|
||||
playsound(src, 'sound/announcer/announcement/announce_dig.ogg', 50, FALSE)
|
||||
say("Now serving [current_ticket]!")
|
||||
if(!(obj_flags & EMAGGED))
|
||||
current_ticket.audible_message(span_notice("\the [current_ticket] vibrates!"), hearing_distance = SAMETILE_MESSAGE_RANGE)
|
||||
@@ -213,7 +213,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/ticket_machine, 32)
|
||||
if((user_ref in ticket_holders) && !(obj_flags & EMAGGED))
|
||||
to_chat(user, span_warning("You already have a ticket!"))
|
||||
return
|
||||
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 100, FALSE)
|
||||
playsound(src, 'sound/machines/terminal/terminal_insert_disc.ogg', 100, FALSE)
|
||||
ticket_number++
|
||||
to_chat(user, span_notice("You take a ticket from [src], looks like you're number [ticket_number] in queue..."))
|
||||
var/obj/item/ticket_machine_ticket/theirticket = new (get_turf(src), ticket_number)
|
||||
|
||||
Reference in New Issue
Block a user