mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +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:
@@ -32,8 +32,8 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
|
||||
cost = SHEET_MATERIAL_AMOUNT
|
||||
source = /datum/robot_energy_storage/material/glass
|
||||
sniffable = TRUE
|
||||
pickup_sound = 'sound/items/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/glass_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/glass_drop.ogg'
|
||||
|
||||
/datum/armor/sheet_glass
|
||||
fire = 50
|
||||
@@ -104,8 +104,8 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
|
||||
grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10)
|
||||
material_flags = NONE
|
||||
tableVariant = /obj/structure/table/glass/plasmaglass
|
||||
pickup_sound = 'sound/items/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/glass_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/glass_drop.ogg'
|
||||
|
||||
/obj/item/stack/sheet/plasmaglass/fifty
|
||||
amount = 50
|
||||
@@ -164,8 +164,8 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
|
||||
grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/iron = 10)
|
||||
matter_amount = 6
|
||||
tableVariant = /obj/structure/table/reinforced/rglass
|
||||
pickup_sound = 'sound/items/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/glass_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/glass_drop.ogg'
|
||||
|
||||
/obj/item/stack/sheet/rglass/fifty
|
||||
amount = 50
|
||||
@@ -204,8 +204,8 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
|
||||
gulag_valid = TRUE
|
||||
matter_amount = 8
|
||||
tableVariant = /obj/structure/table/reinforced/plasmarglass
|
||||
pickup_sound = 'sound/items/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/glass_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/glass_drop.ogg'
|
||||
|
||||
/datum/armor/sheet_plasmarglass
|
||||
melee = 20
|
||||
@@ -236,8 +236,8 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
|
||||
resistance_flags = ACID_PROOF
|
||||
merge_type = /obj/item/stack/sheet/titaniumglass
|
||||
tableVariant = /obj/structure/table/reinforced/titaniumglass
|
||||
pickup_sound = 'sound/items/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/glass_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/glass_drop.ogg'
|
||||
|
||||
/obj/item/stack/sheet/titaniumglass/fifty
|
||||
amount = 50
|
||||
@@ -268,8 +268,8 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
|
||||
resistance_flags = ACID_PROOF
|
||||
merge_type = /obj/item/stack/sheet/plastitaniumglass
|
||||
tableVariant = /obj/structure/table/reinforced/plastitaniumglass
|
||||
pickup_sound = 'sound/items/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/glass_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/glass_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/glass_drop.ogg'
|
||||
|
||||
/obj/item/stack/sheet/plastitaniumglass/fifty
|
||||
amount = 50
|
||||
@@ -296,7 +296,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
|
||||
custom_materials = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT)
|
||||
attack_verb_continuous = list("stabs", "slashes", "slices", "cuts")
|
||||
attack_verb_simple = list("stab", "slash", "slice", "cut")
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
||||
resistance_flags = ACID_PROOF
|
||||
armor_type = /datum/armor/item_shard
|
||||
max_integrity = 40
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
inhand_icon_state = null
|
||||
novariants = TRUE
|
||||
merge_type = /obj/item/stack/sheet/animalhide
|
||||
pickup_sound = 'sound/items/skin_pick_up.ogg'
|
||||
drop_sound = 'sound/items/skin_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/skin_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/skin_drop.ogg'
|
||||
|
||||
/obj/item/stack/sheet/animalhide/human
|
||||
name = "human skin"
|
||||
@@ -193,8 +193,8 @@ GLOBAL_LIST_INIT(carp_recipes, list ( \
|
||||
icon_state = "sheet-leather"
|
||||
inhand_icon_state = null
|
||||
merge_type = /obj/item/stack/sheet/leather
|
||||
pickup_sound = 'sound/items/skin_pick_up.ogg'
|
||||
drop_sound = 'sound/items/skin_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/skin_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/skin_drop.ogg'
|
||||
|
||||
GLOBAL_LIST_INIT(leather_recipes, list ( \
|
||||
new/datum/stack_recipe("wallet", /obj/item/storage/wallet, 1, crafting_flags = NONE, category = CAT_CONTAINERS), \
|
||||
@@ -326,7 +326,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
|
||||
|
||||
/obj/item/stack/sheet/animalhide/attackby(obj/item/W, mob/user, params)
|
||||
if(W.get_sharpness())
|
||||
playsound(loc, 'sound/weapons/slice.ogg', 50, TRUE, -1)
|
||||
playsound(loc, 'sound/items/weapons/slice.ogg', 50, TRUE, -1)
|
||||
user.visible_message(span_notice("[user] starts cutting hair off \the [src]."), span_notice("You start cutting the hair off \the [src]..."), span_hear("You hear the sound of a knife rubbing against flesh."))
|
||||
if(do_after(user, 5 SECONDS, target = src))
|
||||
to_chat(user, span_notice("You cut the hair from [src.name]."))
|
||||
@@ -348,8 +348,8 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
|
||||
icon_state = "sheet-hairlesshide"
|
||||
inhand_icon_state = null
|
||||
merge_type = /obj/item/stack/sheet/hairlesshide
|
||||
pickup_sound = 'sound/items/skin_pick_up.ogg'
|
||||
drop_sound = 'sound/items/skin_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/skin_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/skin_drop.ogg'
|
||||
|
||||
/obj/item/stack/sheet/hairlesshide/examine(mob/user)
|
||||
. = ..()
|
||||
@@ -363,8 +363,8 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
|
||||
icon_state = "sheet-wetleather"
|
||||
inhand_icon_state = null
|
||||
merge_type = /obj/item/stack/sheet/wethide
|
||||
pickup_sound = 'sound/items/skin_pick_up.ogg'
|
||||
drop_sound = 'sound/items/skin_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/skin_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/skin_drop.ogg'
|
||||
/// Reduced when exposed to high temperatures
|
||||
var/wetness = 30
|
||||
/// Kelvin to start drying
|
||||
|
||||
@@ -385,8 +385,8 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
|
||||
grind_results = list(/datum/reagent/cellulose = 20) //no lignocellulose or lignin reagents yet,
|
||||
walltype = /turf/closed/wall/mineral/wood
|
||||
stairs_type = /obj/structure/stairs/wood
|
||||
pickup_sound = 'sound/items/wood_pick_up.ogg'
|
||||
drop_sound = 'sound/items/wood_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/wood_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/wood_drop.ogg'
|
||||
|
||||
/datum/armor/mineral_wood
|
||||
fire = 50
|
||||
@@ -684,8 +684,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
|
||||
merge_type = /obj/item/stack/sheet/cardboard
|
||||
grind_results = list(/datum/reagent/cellulose = 10)
|
||||
material_type = /datum/material/cardboard
|
||||
pickup_sound = 'sound/items/cardboard_pick_up.ogg'
|
||||
drop_sound = 'sound/items/cardboard_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/cardboard_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/cardboard_drop.ogg'
|
||||
|
||||
/obj/item/stack/sheet/cardboard/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt)
|
||||
. = ..()
|
||||
@@ -863,8 +863,8 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
|
||||
throwforce = 7
|
||||
material_type = /datum/material/plastic
|
||||
merge_type = /obj/item/stack/sheet/plastic
|
||||
pickup_sound = 'sound/items/plastic_pick_up.ogg'
|
||||
drop_sound = 'sound/items/plastic_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/plastic_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/plastic_drop.ogg'
|
||||
|
||||
/obj/item/stack/sheet/plastic/fifty
|
||||
amount = 50
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash")
|
||||
novariants = FALSE
|
||||
material_flags = MATERIAL_EFFECTS
|
||||
pickup_sound = 'sound/items/metal_pick_up.ogg'
|
||||
drop_sound = 'sound/items/metal_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/materials/metal_pick_up.ogg'
|
||||
drop_sound = 'sound/items/handling/materials/metal_drop.ogg'
|
||||
var/sheettype = null //this is used for girders in the creation of walls/false walls
|
||||
///If true, this is worth points in the gulag labour stacker
|
||||
var/gulag_valid = FALSE
|
||||
|
||||
Reference in New Issue
Block a user