Звуковой пакет (TauCetiStation#6863)

Co-authored-by: T6751 <[email protected]>
Riverz1 · Feb 14, 2021 · f963f8f · f963f8f
1 parent 37c760e
commit f963f8f
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 7 deletions.
diff --git a/code/_globalvars/lists/sound.dm b/code/_globalvars/lists/sound.dm
@@ -1,5 +1,6 @@
 // ----- Effects ------
 var/global/list/SOUNDIN_SHATTER   = list('sound/effects/glassbr1.ogg', 'sound/effects/glassbr2.ogg', 'sound/effects/glassbr3.ogg')
+var/global/list/SOUNDIN_WINDOW_SHATTER = list('sound/effects/window_broken_1.ogg', 'sound/effects/window_broken_2.ogg', 'sound/effects/window_broken_3.ogg')
 var/global/list/SOUNDIN_EXPLOSION = list('sound/effects/explosion1.ogg', 'sound/effects/explosion2.ogg')
 var/global/list/SOUNDIN_SPARKS    = list('sound/effects/sparks1.ogg', 'sound/effects/sparks2.ogg', 'sound/effects/sparks3.ogg', 'sound/effects/sparks4.ogg')
 var/global/list/SOUNDIN_BODYFALL  = list('sound/effects/bodyfall1.ogg', 'sound/effects/bodyfall2.ogg', 'sound/effects/bodyfall3.ogg', 'sound/effects/bodyfall4.ogg')

diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
@@ -69,7 +69,7 @@
 			ae.broken = TRUE
 			operating = 0
 	src.density = 0
-	playsound(src, pick(SOUNDIN_SHATTER), VOL_EFFECTS_MASTER)
+	playsound(src, pick(SOUNDIN_WINDOW_SHATTER), VOL_EFFECTS_MASTER)
 	if(display_message)
 		visible_message("[src] shatters!")
 	qdel(src)

diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
@@ -51,6 +51,7 @@
 	M.set_dir(dir)
 	buckled_mob = M
 	post_buckle_mob(M)
+	playsound(src, 'sound/effects/mob_buckle.ogg', VOL_EFFECTS_MASTER, 70, FALSE)
 
 	SEND_SIGNAL(src, COMSIG_MOVABLE_BUCKLE, M)
 

diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
@@ -420,7 +420,7 @@
 	canconnect = FALSE
 	update_adjacent()
 
-	playsound(src, pick(SOUNDIN_SHATTER), VOL_EFFECTS_MASTER)
+	playsound(src, pick(SOUNDIN_WINDOW_SHATTER), VOL_EFFECTS_MASTER)
 	visible_message("<span class='warning'>[src] breaks!</span>", "<span class='danger'>You hear breaking glass.</span>")
 
 	var/T = get_turf(src)

diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
@@ -62,7 +62,7 @@
 	update_icon()
 
 /obj/structure/window/proc/shatter(display_message = 1)
-	playsound(src, pick(SOUNDIN_SHATTER), VOL_EFFECTS_MASTER)
+	playsound(src, pick(SOUNDIN_WINDOW_SHATTER), VOL_EFFECTS_MASTER)
 	if(display_message)
 		visible_message("[src] shatters!")
 	if(dir == SOUTHWEST)
@@ -391,7 +391,7 @@
 
 /obj/structure/window/Destroy()
 	density = 0
-	playsound(src, pick(SOUNDIN_SHATTER), VOL_EFFECTS_MASTER)
+	playsound(src, pick(SOUNDIN_WINDOW_SHATTER), VOL_EFFECTS_MASTER)
 	update_nearby_tiles()
 	update_nearby_icons()
 	return ..()

diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
@@ -129,7 +129,7 @@
 		return ..()
 
 /obj/structure/window/reinforced/holowindow/shatter(display_message = 1)
-	playsound(src, pick(SOUNDIN_SHATTER), VOL_EFFECTS_MASTER)
+	playsound(src, pick(SOUNDIN_WINDOW_SHATTER), VOL_EFFECTS_MASTER)
 	if(display_message)
 		visible_message("[src] fades away as it shatters!")
 	qdel(src)
@@ -168,7 +168,7 @@
 
 /obj/machinery/door/window/holowindoor/shatter(display_message = 1)
 	src.density = 0
-	playsound(src, pick(SOUNDIN_SHATTER), VOL_EFFECTS_MASTER)
+	playsound(src, pick(SOUNDIN_WINDOW_SHATTER), VOL_EFFECTS_MASTER)
 	if(display_message)
 		visible_message("[src] fades away as it shatters!")
 	qdel(src)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
@@ -136,7 +136,7 @@
 	else
 		lawupdate = 0
 
-	playsound(src, 'sound/voice/liveagain.ogg', VOL_EFFECTS_MASTER)
+	playsound(src, 'sound/effects/robot_initialization.ogg', VOL_EFFECTS_MASTER, 100, FALSE)
 
 // setup the PDA and its name
 /mob/living/silicon/robot/proc/setup_PDA()
@@ -317,6 +317,7 @@
 	var/new_icon_state = show_radial_menu(usr, usr, choose_icon, radius = 50, tooltips = TRUE)
 	if(new_icon_state)
 		icon_state = module_sprites[new_icon_state]
+		playsound(src, 'sound/effects/robot_reset_module.ogg', VOL_EFFECTS_MASTER, 100, FALSE)
 
 	radio.config(module.channels)
 

diff --git a/code/modules/projectiles/guns/plasma/plasma.dm b/code/modules/projectiles/guns/plasma/plasma.dm
@@ -40,6 +40,7 @@
 	icon_state = "plasma104_stg"
 	item_state = "plasma104_stg"
 	origin_tech = "combat=4;magnets=3"
+	fire_sound = 'sound/weapons/guns/plasma10_shotgun.ogg'
 
 	overcharge_fire_sound = 'sound/weapons/guns/plasma10_overcharge_massive_shot.ogg'
 

diff --git a/sound/effects/mob_buckle.ogg b/sound/effects/mob_buckle.ogg
diff --git a/sound/effects/robot_initialization.ogg b/sound/effects/robot_initialization.ogg
diff --git a/sound/effects/robot_reset_module.ogg b/sound/effects/robot_reset_module.ogg
diff --git a/sound/effects/window_broken_1.ogg b/sound/effects/window_broken_1.ogg
diff --git a/sound/effects/window_broken_2.ogg b/sound/effects/window_broken_2.ogg
diff --git a/sound/effects/window_broken_3.ogg b/sound/effects/window_broken_3.ogg
diff --git a/sound/weapons/guns/plasma10_shotgun.ogg b/sound/weapons/guns/plasma10_shotgun.ogg