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:
@@ -168,7 +168,7 @@ ADMIN_VERB(disable_shuttle, R_ADMIN, "Disable Shuttle", "Those fuckers aren't ge
|
||||
priority_announce(
|
||||
text = "Emergency Shuttle uplink failure, shuttle disabled until further notice.",
|
||||
title = "Uplink Failure",
|
||||
sound = 'sound/misc/announce_dig.ogg',
|
||||
sound = 'sound/announcer/announcement/announce_dig.ogg',
|
||||
sender_override = "Emergency Shuttle Uplink Alert",
|
||||
color_override = "grey",
|
||||
)
|
||||
@@ -194,7 +194,7 @@ ADMIN_VERB(enable_shuttle, R_ADMIN, "Enable Shuttle", "Those fuckers ARE getting
|
||||
priority_announce(
|
||||
text = "Emergency Shuttle uplink reestablished, shuttle enabled.",
|
||||
title = "Uplink Restored",
|
||||
sound = 'sound/misc/announce_dig.ogg',
|
||||
sound = 'sound/announcer/announcement/announce_dig.ogg',
|
||||
sender_override = "Emergency Shuttle Uplink Alert",
|
||||
color_override = "green",
|
||||
)
|
||||
|
||||
@@ -147,7 +147,7 @@ ADMIN_VERB(polymorph_all, R_ADMIN, "Polymorph All", "Applies the effects of the
|
||||
continue
|
||||
|
||||
M.audible_message(span_hear("...wabbajack...wabbajack..."))
|
||||
playsound(M.loc, 'sound/magic/staff_change.ogg', 50, TRUE, -1)
|
||||
playsound(M.loc, 'sound/effects/magic/staff_change.ogg', 50, TRUE, -1)
|
||||
|
||||
M.wabbajack()
|
||||
|
||||
@@ -187,7 +187,7 @@ ADMIN_VERB_AND_CONTEXT_MENU(admin_smite, R_ADMIN|R_FUN, "Smite", "Smite a player
|
||||
/proc/firing_squad(mob/living/carbon/target, turf/source_turf, body_zone, wound_bonus, damage)
|
||||
if(!target.get_bodypart(body_zone))
|
||||
return
|
||||
playsound(target, 'sound/weapons/gun/revolver/shot.ogg', 100)
|
||||
playsound(target, 'sound/items/weapons/gun/revolver/shot.ogg', 100)
|
||||
var/obj/projectile/bullet/smite/divine_wrath = new(source_turf)
|
||||
divine_wrath.damage = damage
|
||||
divine_wrath.wound_bonus = wound_bonus
|
||||
|
||||
@@ -103,7 +103,7 @@ ADMIN_VERB(cmd_admin_pm_panel, R_NONE, "Admin PM", "Show a list of clients to PM
|
||||
if(length(recipient_interactions) == 1)
|
||||
if(length(opening_interactions)) // Inform the admin that they aren't the first
|
||||
var/printable_interators = english_list(opening_interactions)
|
||||
SEND_SOUND(src, sound('sound/machines/buzz-sigh.ogg', volume=30))
|
||||
SEND_SOUND(src, sound('sound/machines/buzz/buzz-sigh.ogg', volume=30))
|
||||
message_prompt += "\n\n**This ticket is already being responded to by: [printable_interators]**"
|
||||
// add the admin who is currently responding to the list of people responding
|
||||
LAZYADD(recipient_ticket.opening_responders, src)
|
||||
|
||||
@@ -268,7 +268,7 @@ GLOBAL_DATUM(current_anonymous_theme, /datum/anonymous_theme)
|
||||
set_station_name("[pick(GLOB.first_names)] [pick(GLOB.last_names)]")
|
||||
|
||||
/datum/anonymous_theme/station/announce_to_all_players()
|
||||
priority_announce("Confirmed level 9 reality error event near [station_name()]. All personnel must try their best to carry on, as to not trigger more reality events by accident.", "Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
|
||||
priority_announce("Confirmed level 9 reality error event near [station_name()]. All personnel must try their best to carry on, as to not trigger more reality events by accident.", "Central Command Higher Dimensional Affairs", 'sound/announcer/notice/notice1.ogg')
|
||||
|
||||
/datum/anonymous_theme/station/anonymous_name(mob/target)
|
||||
return new_station_name()
|
||||
|
||||
@@ -648,12 +648,12 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
|
||||
/proc/portalAnnounce(announcement, playlightning)
|
||||
set waitfor = FALSE
|
||||
if (playlightning)
|
||||
sound_to_playing_players('sound/magic/lightning_chargeup.ogg')
|
||||
sound_to_playing_players('sound/effects/magic/lightning_chargeup.ogg')
|
||||
sleep(8 SECONDS)
|
||||
priority_announce(replacetext(announcement, "%STATION%", station_name()))
|
||||
if (playlightning)
|
||||
sleep(2 SECONDS)
|
||||
sound_to_playing_players('sound/magic/lightningbolt.ogg')
|
||||
sound_to_playing_players('sound/effects/magic/lightningbolt.ogg')
|
||||
|
||||
/// Spawns a portal storm that spawns in sentient/non sentient mobs
|
||||
/// portal_appearance is a list in the form (turf's plane offset + 1) -> appearance to use
|
||||
@@ -671,7 +671,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
|
||||
H.equipOutfit(humanoutfit)
|
||||
var/turf/T = get_step(loc, SOUTHWEST)
|
||||
T.flick_overlay_static(portal_appearance[GET_TURF_PLANE_OFFSET(T) + 1], 15)
|
||||
playsound(T, 'sound/magic/lightningbolt.ogg', rand(80, 100), TRUE)
|
||||
playsound(T, 'sound/effects/magic/lightningbolt.ogg', rand(80, 100), TRUE)
|
||||
|
||||
/datum/everyone_is_an_antag_controller
|
||||
var/chosen_antag = ""
|
||||
|
||||
@@ -98,7 +98,7 @@ ADMIN_VERB(start_now, R_SERVER, "Start Now", "Start the round RIGHT NOW.", ADMIN
|
||||
SSticker.start_immediately = FALSE
|
||||
SSticker.SetTimeLeft(3 MINUTES)
|
||||
to_chat(world, span_big(span_notice("The game will start in 3 minutes.")))
|
||||
SEND_SOUND(world, sound('sound/ai/default/attention.ogg'))
|
||||
SEND_SOUND(world, sound('sound/announcer/default/attention.ogg'))
|
||||
message_admins(span_adminnotice("[key_name_admin(user)] has cancelled immediate game start. Game will start in 3 minutes."))
|
||||
log_admin("[key_name(user)] has cancelled immediate game start.")
|
||||
return
|
||||
@@ -206,7 +206,7 @@ ADMIN_VERB(delay, R_SERVER, "Delay Pre-Game", "Delay the game start.", ADMIN_CAT
|
||||
log_admin("[key_name(user)] delayed the round start.")
|
||||
else
|
||||
to_chat(world, span_infoplain(span_bold("The game will start in [DisplayTimeText(newtime)].")), confidential = TRUE)
|
||||
SEND_SOUND(world, sound('sound/ai/default/attention.ogg'))
|
||||
SEND_SOUND(world, sound('sound/announcer/default/attention.ogg'))
|
||||
log_admin("[key_name(user)] set the pre-game delay to [DisplayTimeText(newtime)].")
|
||||
BLACKBOX_LOG_ADMIN_VERB("Delay Game Start")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user