diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 345ff07ea18..2dcb96b8c42 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -176,3 +176,5 @@ GLOBAL_LIST_INIT(announcer_keys, list( #define SFX_PORTAL_CLOSE "portal_closed" #define SFX_PORTAL_CREATED "portal_created" #define SFX_SCREECH "screech" +#define SFX_STONE_DROP "stone_drop" +#define SFX_STONE_PICKUP "stone_pickup" diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index 410724862f3..29795410389 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -21,6 +21,8 @@ points = 0 refined_type = null merge_type = /obj/item/stack/ore/bluespace_crystal/refined + drop_sound = null //till I make a better one + pickup_sound = null /obj/item/stack/ore/bluespace_crystal/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1) . = ..() @@ -60,6 +62,8 @@ refined_type = null grind_results = list(/datum/reagent/bluespace = 10, /datum/reagent/silicon = 20) merge_type = /obj/item/stack/ore/bluespace_crystal/artificial + drop_sound = null //till I make a better one + pickup_sound = null //Polycrystals, aka stacks /obj/item/stack/sheet/bluespace_crystal @@ -79,6 +83,7 @@ material_type = /datum/material/bluespace var/crystal_type = /obj/item/stack/ore/bluespace_crystal/refined + /obj/item/stack/sheet/bluespace_crystal/attack_self(mob/user)// to prevent the construction menu from ever happening to_chat(user, span_warning("You cannot crush the polycrystal in-hand, try breaking one off.")) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 425a6249845..7443085aa4d 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -940,6 +940,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra merge_type = /obj/item/stack/sheet/sandblock material_type = /datum/material/sand material_modifier = 1 + drop_sound = SFX_STONE_DROP + pickup_sound = SFX_STONE_PICKUP /obj/item/stack/sheet/sandblock/fifty amount = 50 diff --git a/code/game/sound.dm b/code/game/sound.dm index 7c9784bcc7f..49c716d8e0c 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -472,4 +472,15 @@ 'sound/creatures/monkey/monkey_screech_6.ogg', 'sound/creatures/monkey/monkey_screech_7.ogg', ) + if(SFX_STONE_DROP) + soundin = pick( + 'sound/items/stones/stone_drop1.ogg', + 'sound/items/stones/stone_drop2.ogg', + 'sound/items/stones/stone_drop3.ogg', + ) + if(SFX_STONE_PICKUP) + soundin = pick( + 'sound/items/stones/stone_pick_up1.ogg', + 'sound/items/stones/stone_pick_up2.ogg', + ) return soundin diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 5d9809a01f7..e9e8b3a7c3d 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -22,6 +22,9 @@ var/list/stack_overlays var/scan_state = "" //Used by mineral turfs for their scan overlay. var/spreadChance = 0 //Also used by mineral turfs for spreading veins + drop_sound = SFX_STONE_DROP + pickup_sound = SFX_STONE_PICKUP + sound_vary = TRUE /obj/item/stack/ore/update_overlays() . = ..() diff --git a/sound/items/stones/attribution.txt b/sound/items/stones/attribution.txt new file mode 100644 index 00000000000..9095ff55594 --- /dev/null +++ b/sound/items/stones/attribution.txt @@ -0,0 +1,7 @@ +{ +stone_drop1.ogg - https://freesound.org/people/kernschall/sounds/425035/ , license: CC BY 4.0 +stone_drop2.ogg - https://freesound.org/people/kernschall/sounds/425035/ , license: CC BY 4.0 +stone_drop3.og - https://freesound.org/people/Benboncan/sounds/74445/ , license: CC BY 4.0 +stone_pick_up1.ogg - https://freesound.org/people/kernschall/sounds/425035/ , license: CC BY 4.0 +stone_pick_up2.ogg - https://freesound.org/people/Benboncan/sounds/74445/ , license: CC BY 4.0 +} edited by sadboysuss \ No newline at end of file diff --git a/sound/items/stones/stone_drop1.ogg b/sound/items/stones/stone_drop1.ogg new file mode 100644 index 00000000000..a645ff7eb68 Binary files /dev/null and b/sound/items/stones/stone_drop1.ogg differ diff --git a/sound/items/stones/stone_drop2.ogg b/sound/items/stones/stone_drop2.ogg new file mode 100644 index 00000000000..3fd4415e29e Binary files /dev/null and b/sound/items/stones/stone_drop2.ogg differ diff --git a/sound/items/stones/stone_drop3.ogg b/sound/items/stones/stone_drop3.ogg new file mode 100644 index 00000000000..650dbf87497 Binary files /dev/null and b/sound/items/stones/stone_drop3.ogg differ diff --git a/sound/items/stones/stone_pick_up1.ogg b/sound/items/stones/stone_pick_up1.ogg new file mode 100644 index 00000000000..af89dc415ab Binary files /dev/null and b/sound/items/stones/stone_pick_up1.ogg differ diff --git a/sound/items/stones/stone_pick_up2.ogg b/sound/items/stones/stone_pick_up2.ogg new file mode 100644 index 00000000000..85b7f5a6881 Binary files /dev/null and b/sound/items/stones/stone_pick_up2.ogg differ