mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 22:19:30 +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:
@@ -15,11 +15,11 @@
|
||||
if(buckled == attacker ? prob(60) : prob(30)) //its easier to remove the slime from yourself
|
||||
attacker.visible_message(span_warning("[attacker] attempts to wrestle \the [defender_slime.name] off [buckled == attacker ? "" : buckled] !"), \
|
||||
span_danger("[buckled == attacker ? "You attempt" : "[attacker] attempts" ] to wrestle \the [defender_slime.name] off [buckled == attacker ? "" : buckled]!"))
|
||||
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, TRUE, -1)
|
||||
playsound(loc, 'sound/items/weapons/punchmiss.ogg', 25, TRUE, -1)
|
||||
return
|
||||
|
||||
attacker.visible_message(span_warning("[attacker] manages to wrestle \the [defender_slime.name] off!"), span_notice("You manage to wrestle \the [defender_slime.name] off!"))
|
||||
playsound(loc, 'sound/weapons/shove.ogg', 50, TRUE, -1)
|
||||
playsound(loc, 'sound/items/weapons/shove.ogg', 50, TRUE, -1)
|
||||
|
||||
defender_slime.discipline_slime()
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
has_found = TRUE
|
||||
if(applied_crossbreed_amount >= SLIME_EXTRACT_CROSSING_REQUIRED)
|
||||
to_chat(user, span_notice("You feed the slime as many of the extracts from the bag as you can, and it mutates!"))
|
||||
playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/effects/blob/attackblob.ogg', 50, TRUE)
|
||||
spawn_corecross()
|
||||
has_output = TRUE
|
||||
break
|
||||
@@ -99,7 +99,7 @@
|
||||
to_chat(user, span_warning("There are no extracts in the bag that this slime will accept!"))
|
||||
else
|
||||
to_chat(user, span_notice("You feed the slime some extracts from the bag."))
|
||||
playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/effects/blob/attackblob.ogg', 50, TRUE)
|
||||
|
||||
///Handles the adverse effects of water on slimes
|
||||
/mob/living/basic/slime/proc/apply_water()
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
icon_living = "grey-baby"
|
||||
icon_dead = "grey-baby-dead"
|
||||
|
||||
attack_sound = 'sound/weapons/bite.ogg'
|
||||
attack_sound = 'sound/items/weapons/bite.ogg'
|
||||
|
||||
//Base physiology
|
||||
|
||||
@@ -353,7 +353,7 @@
|
||||
/mob/living/basic/slime/proc/spawn_corecross()
|
||||
var/static/list/crossbreeds = subtypesof(/obj/item/slimecross)
|
||||
visible_message(span_danger("[src] shudders, its mutated core consuming the rest of its body!"))
|
||||
playsound(src, 'sound/magic/smoke.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/effects/magic/smoke.ogg', 50, TRUE)
|
||||
var/selected_crossbreed_path
|
||||
for(var/crossbreed_path in crossbreeds)
|
||||
var/obj/item/slimecross/cross_item = crossbreed_path
|
||||
|
||||
Reference in New Issue
Block a user