re-adds radio sounds, properly this time (#8237)

they should have proper pauses and checks and shit, and should actually be properly balanced because I ported these from Bay
This commit is contained in:
Wowzewow (Wezzy)
2020-05-30 22:36:42 +08:00
committed by GitHub
parent aa94e7a23f
commit 1f754c759c
11 changed files with 70 additions and 3 deletions

View File

@@ -73,8 +73,9 @@
#define ASFX_VOX 8 #define ASFX_VOX 8
#define ASFX_DROPSOUND 16 #define ASFX_DROPSOUND 16
#define ASFX_ARCADE 32 #define ASFX_ARCADE 32
#define ASFX_RADIO 64
#define ASFX_DEFAULT (ASFX_AMBIENCE|ASFX_FOOTSTEPS|ASFX_VOTE|ASFX_VOX|ASFX_DROPSOUND|ASFX_ARCADE) #define ASFX_DEFAULT (ASFX_AMBIENCE|ASFX_FOOTSTEPS|ASFX_VOTE|ASFX_VOX|ASFX_DROPSOUND|ASFX_ARCADE|ASFX_RADIO)
// For secHUDs and medHUDs and variants. The number is the location of the image on the list hud_list of humans. // For secHUDs and medHUDs and variants. The number is the location of the image on the list hud_list of humans.
#define HEALTH_HUD 1 // A simple line reading the pulse. #define HEALTH_HUD 1 // A simple line reading the pulse.

View File

@@ -268,6 +268,14 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
if(R.receive_range(display_freq, level) > -1) if(R.receive_range(display_freq, level) > -1)
radios += R radios += R
// --- Radio sounds. ---
for(var/obj/item/device/radio/R in radios)
if((R.last_radio_sound + 1 SECOND) < world.time && R != radio)
playsound(R.loc, 'sound/effects/radio_chatter.ogg', 2.5, 0, -6, required_asfx_toggles = ASFX_RADIO)
R.last_radio_sound = world.time
// Get a list of mobs who can hear from the radios we collected. // Get a list of mobs who can hear from the radios we collected.
var/list/receive = get_mobs_in_radio_ranges(radios) var/list/receive = get_mobs_in_radio_ranges(radios)

View File

@@ -52,6 +52,7 @@ var/global/list/default_medbay_channels = list(
var/obj/item/cell/cell = /obj/item/cell/device var/obj/item/cell/cell = /obj/item/cell/device
var/last_radio_sound = -INFINITY
/obj/item/device/radio /obj/item/device/radio
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
@@ -312,6 +313,9 @@ var/global/list/default_medbay_channels = list(
if(!radio_connection) if(!radio_connection)
set_frequency(frequency) set_frequency(frequency)
if(loc == M)
playsound(loc, 'sound/effects/walkietalkie.ogg', 5, 0, -1, required_asfx_toggles = ASFX_RADIO)
/* Quick introduction: /* Quick introduction:
This new radio system uses a very robust FTL signaling technology unoriginally This new radio system uses a very robust FTL signaling technology unoriginally
dubbed "subspace" which is somewhat similar to 'blue-space' but can't dubbed "subspace" which is somewhat similar to 'blue-space' but can't

View File

@@ -4,7 +4,8 @@
/client/proc/Toggle_asfx_vote, /client/proc/Toggle_asfx_vote,
/client/proc/toggle_vox_voice, /client/proc/toggle_vox_voice,
/client/proc/Toggle_dropsounds, /client/proc/Toggle_dropsounds,
/client/proc/Toggle_arcadesounds /client/proc/Toggle_arcadesounds,
/client/proc/Toggle_radiosounds
) )
/client/verb/asf_toggle() /client/verb/asf_toggle()
@@ -87,3 +88,15 @@
to_chat(src, "You will now hear arcade sounds.") to_chat(src, "You will now hear arcade sounds.")
else else
to_chat(src, "<font color='red'>You will no longer hear arcade sounds.</font>") to_chat(src, "<font color='red'>You will no longer hear arcade sounds.</font>")
/client/proc/Toggle_radiosounds()
set name = "Toggle Radio SFX"
set category = "SoundFx Prefs"
set desc = "Toggles hearing noises made by radios."
prefs.asfx_togs ^= ASFX_RADIO
prefs.save_preferences()
if(prefs.asfx_togs & ASFX_RADIO)
to_chat(src, "You will now hear radio sounds.")
else
to_chat(src, "<font color='red'>You will no longer hear radio sounds.</font>")

View File

@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Wowzewow (Wezzy)
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Re-adds radio sounds. They should be working properly this time."

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.