diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 179aee4ecfd..9dc0176b875 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -263,6 +263,11 @@ GLOBAL_LIST_INIT(announcer_keys, list( #define SFX_SUTURE_END "suture_end" #define SFX_SUTURE_PICKUP "suture_pickup" #define SFX_SUTURE_DROP "suture_drop" +#define SFX_REGEN_MESH_BEGIN "regen_mesh_begin" +#define SFX_REGEN_MESH_CONTINUOUS "regen_mesh_continuous" +#define SFX_REGEN_MESH_END "regen_mesh_end" +#define SFX_REGEN_MESH_PICKUP "regen_mesh_pickup" +#define SFX_REGEN_MESH_DROP "regen_mesh_drop" // Standard is 44.1khz #define MIN_EMOTE_PITCH 40000 diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index f74846418b2..88c634823f1 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -599,8 +599,11 @@ repeating = TRUE sanitization = 0.75 flesh_regeneration = 3 - pickup_sound = SFX_CLOTH_PICKUP - drop_sound = SFX_CLOTH_DROP + pickup_sound = SFX_REGEN_MESH_PICKUP + drop_sound = SFX_REGEN_MESH_DROP + heal_begin_sound = SFX_REGEN_MESH_BEGIN + heal_continuous_sound = SFX_REGEN_MESH_CONTINUOUS + heal_end_sound = SFX_REGEN_MESH_END var/is_open = TRUE ///This var determines if the sterile packaging of the mesh has been opened. grind_results = list(/datum/reagent/medicine/spaceacillin = 2) diff --git a/code/game/sound.dm b/code/game/sound.dm index 7a062a24d80..e00d54e81ef 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -853,9 +853,36 @@ ) if(SFX_SUTURE_DROP) soundin = pick( - 'sound/items/handling/suture/needle_drop1.ogg', 'sound/items/handling/suture/needle_drop2.ogg', 'sound/items/handling/suture/needle_drop3.ogg', ) + if(SFX_REGEN_MESH_BEGIN) + soundin = pick( + 'sound/items/regenerative_mesh/regen_mesh_begin1.ogg', + 'sound/items/regenerative_mesh/regen_mesh_begin2.ogg', + 'sound/items/regenerative_mesh/regen_mesh_begin3.ogg', + 'sound/items/regenerative_mesh/regen_mesh_begin4.ogg', + ) + if(SFX_REGEN_MESH_CONTINUOUS) + soundin = pick( + 'sound/items/regenerative_mesh/regen_mesh_continuous1.ogg', + 'sound/items/regenerative_mesh/regen_mesh_continuous2.ogg', + 'sound/items/regenerative_mesh/regen_mesh_continuous3.ogg', + 'sound/items/regenerative_mesh/regen_mesh_continuous4.ogg', + 'sound/items/regenerative_mesh/regen_mesh_continuous5.ogg', + ) + if(SFX_REGEN_MESH_END) + soundin = pick( + 'sound/items/regenerative_mesh/regen_mesh_end1.ogg', + 'sound/items/regenerative_mesh/regen_mesh_end2.ogg', + ) + if(SFX_REGEN_MESH_PICKUP) + soundin = pick( + 'sound/items/handling/regenerative_mesh/regen_mesh_pickup1.ogg', + 'sound/items/handling/regenerative_mesh/regen_mesh_pickup2.ogg', + 'sound/items/handling/regenerative_mesh/regen_mesh_pickup3.ogg', + ) + if(SFX_REGEN_MESH_DROP) + soundin = 'sound/items/regenerative_mesh/regen_mesh_drop1.ogg' return soundin diff --git a/sound/items/handling/regenerative_mesh/regen_mesh_pickup1.ogg b/sound/items/handling/regenerative_mesh/regen_mesh_pickup1.ogg new file mode 100644 index 00000000000..8d23fa33962 Binary files /dev/null and b/sound/items/handling/regenerative_mesh/regen_mesh_pickup1.ogg differ diff --git a/sound/items/handling/regenerative_mesh/regen_mesh_pickup2.ogg b/sound/items/handling/regenerative_mesh/regen_mesh_pickup2.ogg new file mode 100644 index 00000000000..800e06e8d37 Binary files /dev/null and b/sound/items/handling/regenerative_mesh/regen_mesh_pickup2.ogg differ diff --git a/sound/items/handling/regenerative_mesh/regen_mesh_pickup3.ogg b/sound/items/handling/regenerative_mesh/regen_mesh_pickup3.ogg new file mode 100644 index 00000000000..4a741ce142e Binary files /dev/null and b/sound/items/handling/regenerative_mesh/regen_mesh_pickup3.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_begin1.ogg b/sound/items/regenerative_mesh/regen_mesh_begin1.ogg new file mode 100644 index 00000000000..68d096fc18a Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_begin1.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_begin2.ogg b/sound/items/regenerative_mesh/regen_mesh_begin2.ogg new file mode 100644 index 00000000000..82f5f696022 Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_begin2.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_begin3.ogg b/sound/items/regenerative_mesh/regen_mesh_begin3.ogg new file mode 100644 index 00000000000..5bc067da0dd Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_begin3.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_begin4.ogg b/sound/items/regenerative_mesh/regen_mesh_begin4.ogg new file mode 100644 index 00000000000..c495557125e Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_begin4.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_continuous1.ogg b/sound/items/regenerative_mesh/regen_mesh_continuous1.ogg new file mode 100644 index 00000000000..d6fa5e5d317 Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_continuous1.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_continuous2.ogg b/sound/items/regenerative_mesh/regen_mesh_continuous2.ogg new file mode 100644 index 00000000000..1eae0ccf82d Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_continuous2.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_continuous3.ogg b/sound/items/regenerative_mesh/regen_mesh_continuous3.ogg new file mode 100644 index 00000000000..46beeb2dfa9 Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_continuous3.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_continuous4.ogg b/sound/items/regenerative_mesh/regen_mesh_continuous4.ogg new file mode 100644 index 00000000000..c1755da4595 Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_continuous4.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_continuous5.ogg b/sound/items/regenerative_mesh/regen_mesh_continuous5.ogg new file mode 100644 index 00000000000..de9b4167b9c Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_continuous5.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_drop1.ogg b/sound/items/regenerative_mesh/regen_mesh_drop1.ogg new file mode 100644 index 00000000000..047d9451554 Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_drop1.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_end1.ogg b/sound/items/regenerative_mesh/regen_mesh_end1.ogg new file mode 100644 index 00000000000..aa7fa4ecdce Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_end1.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_end2.ogg b/sound/items/regenerative_mesh/regen_mesh_end2.ogg new file mode 100644 index 00000000000..d9c7cbb1a8f Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_end2.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply1.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply1.ogg new file mode 100644 index 00000000000..c9ea77c2e3b Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply1.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply10.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply10.ogg new file mode 100644 index 00000000000..29e843f605c Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply10.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply2.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply2.ogg new file mode 100644 index 00000000000..3a9360d83ad Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply2.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply3.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply3.ogg new file mode 100644 index 00000000000..5bd10f0578f Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply3.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply4.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply4.ogg new file mode 100644 index 00000000000..7f7f6f0776f Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply4.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply5.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply5.ogg new file mode 100644 index 00000000000..e2cb1504a26 Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply5.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply6.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply6.ogg new file mode 100644 index 00000000000..a5d5b502ed2 Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply6.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply7.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply7.ogg new file mode 100644 index 00000000000..8bcf9ddb61f Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply7.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply8.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply8.ogg new file mode 100644 index 00000000000..9f362b07591 Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply8.ogg differ diff --git a/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply9.ogg b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply9.ogg new file mode 100644 index 00000000000..4020f8183aa Binary files /dev/null and b/sound/items/regenerative_mesh/regen_mesh_unused/regen_mesh_apply9.ogg differ