mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 15:17:01 +01:00
Ore ore ore ore ore... sounds. (#85738)
## About The Pull Request Closes https://github.com/tgstation/tgstation/issues/85615 #### Applied to: - all ore subtypes, except bluespace polycrystals - Sandstone blocks ### Video: https://github.com/user-attachments/assets/7fdd322a-4f57-4df7-bd72-e6400382b58b ## Why It's Good For The Game immersion. ## Changelog 🆑 grungussuss sound: ore and sandstone blocks have their own sound /🆑
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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."))
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
. = ..()
|
||||
|
||||
@@ -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
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user