cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reorganizes the sound folder (#86726)

Browse Source 
## 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:
grungussuss
2024-09-23 22:24:50 -07:00
committed by GitHub
parent 8c494a4736
commit 58501dce77
3639 changed files with 5089 additions and 5093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/markets/_market.dm
+1 -1
View File
@@ -68,7 +68,7 @@
uplink.current_user.adjust_money(-price, "Other: Third Party Transaction")
if(ismob(user))
var/mob/m_user = user
m_user.playsound_local(get_turf(m_user), 'sound/machines/twobeep_high.ogg', 50, TRUE)
m_user.playsound_local(get_turf(m_user), 'sound/machines/beep/twobeep_high.ogg', 50, TRUE)
return TRUE
return FALSE
code/modules/cargo/markets/market_telepad.dm
+6 -6
View File
@@ -176,7 +176,7 @@
if(state_open)
if(locate(/mob/living) in tool.get_all_contents())
say("Living being detected, cannot sell!")
playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE)
return ITEM_INTERACT_BLOCKING
if(!user.transferItemToLoc(tool, src))
balloon_alert(user, "stuck to your hands!")
@@ -193,7 +193,7 @@
if(creds_value < restock_cost)
say("Insufficient credits!")
playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE)
return ITEM_INTERACT_BLOCKING
if(istype(tool, /obj/item/holochip))
@@ -271,7 +271,7 @@
return
if(locate(/mob/living) in occupant.get_all_contents())
say("Living being detected, cannot sell!")
playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE)
return
var/datum/bank_account/account
var/datum/market/our_market = SSmarket.markets[/datum/market/blackmarket]
@@ -280,17 +280,17 @@
return
if(length(our_market.available_items[/datum/market_item/local_good::category]) >= LTSRBT_MAX_MARKET_ITEMS)
say("Local market saturated, buy some goods first!")
playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE)
return
var/mob/living/living_user = user
var/obj/item/card/id/card = living_user.get_idcard(TRUE)
if(!(card?.registered_account))
say("No bank account to charge market fees detected!")
playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE)
return
if(!card.registered_account.adjust_money(-PLACE_ON_MARKET_COST, "Market: Placement Fee"))
say("Insufficient credits!")
playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE)
return
account = card.registered_account
code/modules/cargo/materials_market.dm
+4 -4
View File
@@ -68,7 +68,7 @@
if(!amount)
say("Not enough material. Aborting.")
playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE)
playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, FALSE)
return TRUE
qdel(exportable)
@@ -77,7 +77,7 @@
new_block.export_mat = material_to_export
new_block.quantity = amount
to_chat(user, span_notice("You have created a stock block worth [new_block.export_value] cr! Sell it before it becomes liquid!"))
playsound(src, 'sound/machines/synth_yes.ogg', 50, FALSE)
playsound(src, 'sound/machines/synth/synth_yes.ogg', 50, FALSE)
return TRUE
return ..()
@@ -274,14 +274,14 @@
var/prior_sheets = current_order.pack.contains[sheet_to_buy]
if(prior_sheets + quantity > SSstock_market.materials_quantity[material_bought] )
say("There aren't enough sheets on the market! Please wait for more sheets to be traded before adding more.")
playsound(usr, 'sound/machines/synth_no.ogg', 35, FALSE)
playsound(usr, 'sound/machines/synth/synth_no.ogg', 35, FALSE)
return
// Check if the order exceeded the purchase limit
var/prior_stacks = ROUND_UP(prior_sheets / MAX_STACK_SIZE)
if(prior_stacks >= MAX_STACK_LIMIT)
say("There are already 10 stacks of sheets on order! Please wait for them to arrive before ordering more.")
playsound(usr, 'sound/machines/synth_no.ogg', 35, FALSE)
playsound(usr, 'sound/machines/synth/synth_no.ogg', 35, FALSE)
return
// Prevents you from ordering more than the available budget
code/modules/cargo/orderconsole.dm
+2 -2
View File
@@ -240,13 +240,13 @@
return
if(pack.goody && !self_paid)
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
say("ERROR: Small crates may only be purchased by private accounts.")
return
var/similar_count = SSshuttle.supply.get_order_count(pack)
if(similar_count == OVER_ORDER_LIMIT)
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
say("ERROR: No more then [CARGO_MAX_ORDER] of any pack may be ordered at once")
return
code/modules/cargo/supplypod.dm
+2 -2
View File
@@ -40,7 +40,7 @@
var/reversing = FALSE //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
var/list/reverse_dropoff_coords //Turf that the reverse pod will drop off its newly-acquired cargo to
var/fallingSoundLength = 11
var/fallingSound = 'sound/weapons/mortar_long_whistle.ogg'//Admin sound to play before the pod lands
var/fallingSound = 'sound/items/weapons/mortar_long_whistle.ogg'//Admin sound to play before the pod lands
var/landingSound //Admin sound to play when the pod lands
var/openingSound //Admin sound to play when the pod opens
var/leavingSound //Admin sound to play when the pod leaves
@@ -695,7 +695,7 @@
target_living.Stun(pod.delays[POD_TRANSIT]+10, ignore_canstun = TRUE)//you ain't goin nowhere, kid.
if (pod.delays[POD_TRANSIT] + pod.delays[POD_FALLING] < pod.fallingSoundLength)
pod.fallingSoundLength = 3 //The default falling sound is a little long, so if the landing time is shorter than the default falling sound, use a special, shorter default falling sound
pod.fallingSound = 'sound/weapons/mortar_whistle.ogg'
pod.fallingSound = 'sound/items/weapons/mortar_whistle.ogg'
var/soundStartTime = pod.delays[POD_TRANSIT] - pod.fallingSoundLength + pod.delays[POD_FALLING]
if (soundStartTime < 0)
soundStartTime = 1
code/modules/cargo/supplypod_beacon.dm
+3 -3
View File
@@ -27,17 +27,17 @@
switch(consoleStatus)
if (SP_LINKED)
linked = TRUE
playsound(src,'sound/machines/twobeep.ogg',50,FALSE)
playsound(src,'sound/machines/beep/twobeep.ogg',50,FALSE)
if (SP_READY)
ready = TRUE
if (SP_LAUNCH)
launched = TRUE
playsound(src,'sound/machines/triple_beep.ogg',50,FALSE)
playsound(src,'sound/machines/beep/triple_beep.ogg',50,FALSE)
playsound(src,'sound/machines/warning-buzzer.ogg',50,FALSE)
addtimer(CALLBACK(src, PROC_REF(endLaunch)), 33)//wait 3.3 seconds (time it takes for supplypod to land), then update icon
if (SP_UNLINK)
linked = FALSE
playsound(src,'sound/machines/synth_no.ogg',50,FALSE)
playsound(src,'sound/machines/synth/synth_no.ogg',50,FALSE)
if (SP_UNREADY)
ready = FALSE
update_appearance()
code/modules/cargo/universal_scanner.dm
+1 -1
View File
@@ -200,7 +200,7 @@
to_chat(user, span_notice(message))
if(price)
playsound(src, 'sound/machines/terminal_select.ogg', 50, vary = TRUE)
playsound(src, 'sound/machines/terminal/terminal_select.ogg', 50, vary = TRUE)
if(istype(target, /obj/item/delivery))
var/obj/item/delivery/parcel = target