Возвращает утерянные звуки

см. ПР

code/modules/organs/internal/heart.dm

@@ -179,6 +179,10 @@
 				FONT_HUGE(SPAN_DANGER("Blood sprays out from your [spray_organ]!"))
 			)
 
+			owner.eye_blurry = 2
+
+			playsound(owner.loc, 'packs/infinity/sound/effects/gore/blood_splat.ogg', 100, 0, -2)
+
 			//AB occurs every heartbeat, this only throttles the visible effect
 			next_blood_squirt = world.time + 80
 			var/turf/sprayloc = get_turf(owner)

maps/sierra/sierra_lobby.dm

@@ -29,6 +29,16 @@
 
 		// Space Oddity - Chris Hadfield		--,
 		/singleton/audio/track/space_oddity,
+
+		//Additional Duke Gneiss
+		/singleton/audio/track/owl,
+		/singleton/audio/track/codebrain,
+		/singleton/audio/track/getset,
+		/singleton/audio/track/intruder,
+		/singleton/audio/track/natc,
+		/singleton/audio/track/oxygenfacility,
+		/singleton/audio/track/quantum,
+		/singleton/audio/track/gneiss
 	)
 
 
@@ -74,3 +84,59 @@
 	author = "Chris Remo"
 	license = /singleton/license/cc_by_4_0
 	url = "https://idlethumbs.bandcamp.com/album/the-music-of-idle-thumbs"
+
+/singleton/audio/track/owl
+	source = 'packs/infinity/sound/music/gneiss/O.W.L.mp3'
+	author = "Duke Gneiss"
+	title = "O.W.L"
+	license = /singleton/license/cc_by_nc_sa_3_0
+	url = "https://soundcloud.com/dukegneiss/o-w-l"
+
+/singleton/audio/track/codebrain
+	source = 'packs/infinity/sound/music/gneiss/codebrain.mp3'
+	author = "Duke Gneiss"
+	title = "Codebrain"
+	license = /singleton/license/cc_by_nc_sa_3_0
+	url = "https://soundcloud.com/dukegneiss/codebrain"
+
+/singleton/audio/track/getset
+	source = 'packs/infinity/sound/music/gneiss/Get Set.mp3'
+	author = "Duke Gneiss"
+	title = "Get Set"
+	license = /singleton/license/cc_by_nc_sa_3_0
+	url = "https://soundcloud.com/dukegneiss/get-set"
+
+/singleton/audio/track/intruder
+	source = 'packs/infinity/sound/music/gneiss/Intruder.mp3'
+	author = "Duke Gneiss"
+	title = "Intruder"
+	license = /singleton/license/cc_by_nc_sa_3_0
+	url = "https://soundcloud.com/dukegneiss/intruder"
+
+/singleton/audio/track/quantum
+	source = 'packs/infinity/sound/music/gneiss/Quantum.mp3'
+	author = "Duke Gneiss"
+	title = "Quantum"
+	license = /singleton/license/cc_by_nc_sa_3_0
+	url = "https://soundcloud.com/dukegneiss/quantum"
+
+/singleton/audio/track/natc
+	source = 'packs/infinity/sound/music/gneiss/Night at the Citadel.mp3'
+	author = "Duke Gneiss"
+	title = "Night at the Citadel"
+	license = /singleton/license/cc_by_nc_sa_3_0
+	url = "https://soundcloud.com/dukegneiss/night-at-the-citadel"
+
+/singleton/audio/track/oxygenfacility
+	source = 'packs/infinity/sound/music/gneiss/Oxygen Facility.mp3'
+	author = "Duke Gneiss"
+	title = "Oxygen Facility"
+	license = /singleton/license/cc_by_nc_sa_3_0
+	url = "https://soundcloud.com/dukegneiss/oxygen-facility"
+
+/singleton/audio/track/gneiss
+	source = 'packs/infinity/sound/music/gneiss/Gneiss.mp3'
+	author = "Duke Gneiss"
+	title = "Gneiss"
+	license = /singleton/license/cc_by_nc_sa_3_0
+	url = "https://soundcloud.com/dukegneiss/gneiss"

mods/emote_panel/_emote_panel_includes.dm

@@ -5,7 +5,7 @@
 #include "code/audible.dm"
 #include "code/emotes.dm"
 #include "code/overrides.dm"
-// #include "code/pain.dm" // SIERRA TODO: Use it
+#include "code/pain.dm"
 #include "code/silicon.dm"
 #include "code\species.dm"
 #include "code/unathi.dm"

mods/emote_panel/code/audible.dm

@@ -168,6 +168,11 @@
 	)
 	sounded_species = SOUNDED_SPECIES
 
+/datum/species/monkey
+	var/default_emotes = list(
+		/singleton/emote/audible/scream/monkey
+	) //monke scream
+
 /singleton/emote/audible/scream/monkey
 	emote_sound = list(
 		'mods/emote_panel/sound/pain_monkey_1.ogg',
@@ -185,7 +190,21 @@
 	key = "purrl"
 	emote_sound = 'mods/emote_panel/sound/cat_purr_long.ogg'
 
+/singleton/emote/audible/cat_purr/strong
+	key = "purrs"
+	emote_sound = 'mods/emote_panel/sound/cat_purr_long2.ogg'
+
+
 /singleton/emote/audible/finger_snap
 	key = "snap"
 	emote_message_3p = "USER щёлкает пальцами."
 	emote_sound = 'mods/emote_panel/sound/fingersnap.ogg'
+
+/singleton/emote/audible/hiss
+	key = "hiss"
+	emote_message_3p = "USER шипит!"
+	emote_sound = list(
+	'mods/emote_panel/sound/tajhiss1.ogg',
+	'mods/emote_panel/sound/tajhiss2.ogg',
+	'mods/emote_panel/sound/tajhiss3.ogg'
+	)

mods/emote_panel/code/pain.dm

@@ -1,24 +1,11 @@
-// SIERRA TODO: Use these sounds
-#define PICK_MALE_PAIN_SOUND pick(\
-	'mods/emote_panel/sound/pain_male_1.ogg', \
-	'mods/emote_panel/sound/pain_male_2.ogg', \
-	'mods/emote_panel/sound/pain_male_3.ogg' \
-)
-#define PICK_FEMALE_PAIN_SOUND pick(\
-	'mods/emote_panel/sound/agony_female_1.ogg', \
-	'mods/emote_panel/sound/agony_female_2.ogg', \
-	'mods/emote_panel/sound/agony_female_3.ogg' \
-)
-#define PICK_MALE_MOAN_SOUND pick(\
-	'mods/emote_panel/sound/moan_male_1.ogg', \
-	'mods/emote_panel/sound/moan_male_2.ogg', \
-	'mods/emote_panel/sound/moan_male_3.ogg' \
-)
-#define PICK_FEMALE_MOAN_SOUND pick(\
-	'mods/emote_panel/sound/moan_female_1.ogg', \
-	'mods/emote_panel/sound/moan_female_2.ogg', \
-	'mods/emote_panel/sound/moan_female_3.ogg' \
-)
+/obj/item/organ/external/add_pain(amount) //запускаем в ход agony_scream
+	if(owner && ((amount > 15 && prob(20)) || (amount > 30 && prob(60))))
+		owner.agony_scream()
+
+/mob/living/carbon/human/handle_shock() // вводим agony_moan
+	if(shock_stage >= 30)
+		if(prob(15))
+			src.agony_moan()
 
 /mob/living/proc/agony_scream()
 	if(stat || is_species(SPECIES_MONKEY))
@@ -27,12 +14,14 @@
 	var/message = null
 
 	if(ishuman(src))
-		var/mob/living/carbon/human/H = src
 		if(!is_muzzled())
 			switch(gender)
-				if(MALE) scream_sound = PICK_MALE_PAIN_SOUND
-				if(FEMALE) scream_sound = PICK_FEMALE_PAIN_SOUND
+				if(MALE)
+					scream_sound = pick('mods/emote_panel/sound/pain_male_1.ogg','mods/emote_panel/sound/pain_male_2.ogg','mods/emote_panel/sound/pain_male_3.ogg')
+				if(FEMALE)
+					scream_sound = pick('mods/emote_panel/sound/agony_female_1.ogg') //найти что-то лучше криков ведьмы L4D для вариаций агонии
 			message = "кричит от боли!"
+			playsound(src, scream_sound, 50, 0, 1)
 		else
 			message = "издает громкое мычание!"
 
@@ -49,8 +38,10 @@
 		var/mob/living/carbon/human/H = src
 		if(!is_muzzled())
 			switch(gender)
-				if(MALE) moan_sound = PICK_MALE_MOAN_SOUND
-				if(FEMALE) moan_sound = PICK_FEMALE_MOAN_SOUND
+				if(MALE)
+					moan_sound = pick('mods/emote_panel/sound/moan_male_1.ogg','mods/emote_panel/sound/moan_male_2.ogg','mods/emote_panel/sound/moan_male_3.ogg')
+				if(FEMALE)
+					moan_sound = pick('mods/emote_panel/sound/moan_female_1.ogg','mods/emote_panel/sound/moan_female_2.ogg','mods/emote_panel/sound/moan_female_3.ogg')
 			message = "стонет от боли!"
 		else
 			message = "издает громкое мычание!"
@@ -61,8 +52,3 @@
 
 	if(message)
 		custom_emote(2, message)
-
-#undef PICK_MALE_PAIN_SOUND
-#undef PICK_FEMALE_PAIN_SOUND
-#undef PICK_MALE_MOAN_SOUND
-#undef PICK_FEMALE_MOAN_SOUND

mods/emote_panel/code/silicon.dm

@@ -1,6 +1,39 @@
 /mob/living/silicon
 	var/speech_sounds
 
+/mob/living/silicon/robot/default_emotes = list(
+	/singleton/emote/audible/clap,
+	/singleton/emote/visible/bow,
+	/singleton/emote/visible/salute,
+	/singleton/emote/visible/rsalute,
+	/singleton/emote/visible/flap,
+	/singleton/emote/visible/aflap,
+	/singleton/emote/visible/twitch,
+	/singleton/emote/visible/twitch_v,
+	/singleton/emote/visible/nod,
+	/singleton/emote/visible/shake,
+	/singleton/emote/visible/glare,
+	/singleton/emote/visible/look,
+	/singleton/emote/visible/stare,
+	/singleton/emote/visible/deathgasp_robot,
+	/singleton/emote/audible/synth,
+	/singleton/emote/audible/synth/ping,
+	/singleton/emote/audible/synth/buzz,
+	/singleton/emote/audible/synth/confirm,
+	/singleton/emote/audible/synth/deny,
+	/singleton/emote/audible/synth/security,
+	/singleton/emote/audible/synth/security/halt,
+	/singleton/emote/audible/synth/scream
+)
+
+/mob/living/silicon/handle_speech_sound()
+	if(prob(20))
+		var/list/returns[2]
+		returns[1] = sound(pick(speech_sounds))
+		returns[2] = 20
+		return returns
+	return ..()
+
 /mob/living/silicon/ai
 	speech_sounds = list(
 		'mods/emote_panel/sound/robot_talk_heavy_1.ogg',

mods/global_modpacks.dm

@@ -52,3 +52,4 @@
 #include "vehicle\_vehicle_includes.dm"
 #include "../packs/sierra-tweaks/_pack.dm"
 #include "on_floor_icon\_on_floor_icons_includes.dm"
+#include "sound_effects/_sound_effects_includes.dm"

mods/music_player/code/music_player.dm

@@ -13,60 +13,6 @@ GLOBAL_LIST_EMPTY(music_players)
 // If this type will be spawned, it'll get instantly deleted by Initialization
 // Because we can create subtypes, we should use only them for regular playthrought
 
-GLOBAL_LIST_INIT(heavystep_sound, list(
-'packs/infinity/sound/effects/x1.ogg',
-'packs/infinity/sound/effects/x2.ogg',
-'packs/infinity/sound/effects/x3.ogg',
-'packs/infinity/sound/effects/x4.ogg'
-))
-GLOBAL_LIST_INIT(light_strike_sound, list(
-'packs/infinity/sound/effects/hit_kick.ogg',
-'packs/infinity/sound/effects/hit_punch.ogg'
-))
-GLOBAL_LIST_INIT(gun_sound, list(
-'packs/infinity/sound/weapons/gunshot.ogg',
-'packs/infinity/sound/weapons/gunshot2.ogg',
-'packs/infinity/sound/weapons/gunshot3.ogg',
-'packs/infinity/sound/weapons/gunshot4.ogg'
-))
-GLOBAL_LIST_INIT(human_clearing_throat, list(
-	FEMALE = "packs/infinity/sound/voice/clearing-throat-f.ogg",
-	MALE = "packs/infinity/sound/voice/clearing-throat-m.ogg"
-))
-GLOBAL_LIST_INIT(machinery_exposed_sound, list(
-'packs/infinity/sound/machines/Custom_screwdriveropen.ogg',
-'packs/infinity/sound/machines/Custom_screwdriverclose.ogg'
-))
-GLOBAL_LIST_INIT(rig_breath_sound, list(
-'packs/infinity/sound/voice/gasmask1.ogg','packs/infinity/sound/voice/gasmask2.ogg',
-'packs/infinity/sound/voice/gasmask3.ogg','packs/infinity/sound/voice/gasmask4.ogg',
-'packs/infinity/sound/voice/gasmask5.ogg','packs/infinity/sound/voice/gasmask6.ogg',
-'packs/infinity/sound/voice/gasmask7.ogg','packs/infinity/sound/voice/gasmask8.ogg',
-'packs/infinity/sound/voice/gasmask9.ogg','packs/infinity/sound/voice/gasmask10.ogg'
-))
-GLOBAL_LIST_INIT(console_interact_sound, list(
-'packs/infinity/sound/machines/console/console_interact1.ogg',
-'packs/infinity/sound/machines/console/console_interact2.ogg',
-'packs/infinity/sound/machines/console/console_interact3.ogg',
-'packs/infinity/sound/machines/console/console_interact4.ogg',
-'packs/infinity/sound/machines/console/console_interact5.ogg',
-'packs/infinity/sound/machines/console/console_interact6.ogg',
-'packs/infinity/sound/machines/console/console_interact7.ogg'
-))
-GLOBAL_LIST_INIT(radio_chatter_sound, list(
-'packs/infinity/sound/effects/radio1.ogg',
-'packs/infinity/sound/effects/radio2.ogg',
-'packs/infinity/sound/effects/radio3.ogg',
-'packs/infinity/sound/effects/radio4.ogg'
-))
-GLOBAL_LIST_INIT(trauma_sound, list(
-'packs/infinity/sound/effects/gore/trauma1.ogg',
-'packs/infinity/sound/effects/gore/trauma2.ogg',
-'packs/infinity/sound/effects/gore/trauma3.ogg'
-))
-
-GLOBAL_LIST_INIT(switch_small_sound, list(
-'packs/infinity/sound/effects/using/switch/small1.ogg','packs/infinity/sound/effects/using/switch/small2.ogg'))
 
 
 

mods/sound_effects/_sound_effects.dm

@@ -0,0 +1,4 @@
+/singleton/modpack/sound_effects
+	name = "Звуковые эффекты"
+	desc = "Мод, добавляющий старые звуки Инфинити и позволяющий дополнительно накинуть в него новые, включая музыку лобби, эмбиенты, и подобное."
+	author = "Vipo24"

mods/sound_effects/_sound_effects_includes.dm

@@ -0,0 +1,13 @@
+#ifndef MODPACK_SOUNDREVAMP
+#define MODPACK_SOUNDREVAMP
+
+#include "_sound_effects.dm"
+
+#include "code/sound.dm"
+#include "code/sounds.dm"
+#include "code/say.dm"
+
+// Далее просто включай свой код
+// #include "code/something.dm"
+
+#endif

mods/sound_effects/code/say.dm

@@ -0,0 +1,7 @@
+/singleton/species/human
+	speech_chance = 40
+
+/mob/living/carbon/human/handle_speech_sound()
+	if(species.name == SPECIES_HUMAN) // gender check
+		species.speech_sounds = GLOB.human_clearing_throat[gender]
+	.=..()