diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 930aaaa67fa..cca6686e99c 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -66,9 +66,6 @@ #define FULLSCREEN_PLANE 23 -///Visuals that represent sounds happening, and can be seen while blind. -#define SOUND_EFFECT_VISUAL_PLANE 25 - ///--------------- FULLSCREEN RUNECHAT BUBBLES ------------ ///Popup Chat Messages @@ -213,10 +210,11 @@ #define CRIT_LAYER 5 #define CURSE_LAYER 6 -///--------------- SOUND EFFECT VISUALS ------------ +#define FOV_EFFECT_LAYER 100 + +///--------------- FULLSCREEN RUNECHAT BUBBLES ------------ /// Bubble for typing indicators -#define TYPING_LAYER 1 -#define FOV_EFFECTS_LAYER 2 //Blindness effects are not layer 4, they lie to you +#define TYPING_LAYER 500 #define RADIAL_BACKGROUND_LAYER 0 ///1000 is an unimportant number, it's just to normalize copied layers diff --git a/code/_onclick/hud/rendering/plane_master.dm b/code/_onclick/hud/rendering/plane_master.dm index 4a163a6e347..f0c1c99a9b7 100644 --- a/code/_onclick/hud/rendering/plane_master.dm +++ b/code/_onclick/hud/rendering/plane_master.dm @@ -507,14 +507,6 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/plane_master) mouse_opacity = MOUSE_OPACITY_TRANSPARENT allows_offsetting = FALSE -/atom/movable/screen/plane_master/sound_effect_visual - name = "Sound Effect Visuals" - documentation = "Holds anything that is a game visual, but is displayed over fullscreen effects. \ -
Displayed over fullscreen effects, but still under runechat and the HUD." - plane = SOUND_EFFECT_VISUAL_PLANE - render_relay_planes = list(RENDER_PLANE_NON_GAME) - mouse_opacity = MOUSE_OPACITY_TRANSPARENT - /atom/movable/screen/plane_master/runechat name = "Runechat" documentation = "Holds runechat images, that text that pops up when someone say something. Uses a dropshadow to well, look nice." diff --git a/code/_onclick/hud/rendering/plane_master_controller.dm b/code/_onclick/hud/rendering/plane_master_controller.dm index 71e0032e908..58fc1bb9963 100644 --- a/code/_onclick/hud/rendering/plane_master_controller.dm +++ b/code/_onclick/hud/rendering/plane_master_controller.dm @@ -117,7 +117,6 @@ INITIALIZE_IMMEDIATE(/atom/movable/plane_master_controller) PIPECRAWL_IMAGES_PLANE, HIGH_GAME_PLANE, FULLSCREEN_PLANE, - SOUND_EFFECT_VISUAL_PLANE, RUNECHAT_PLANE, HUD_PLANE, ABOVE_HUD_PLANE, diff --git a/code/modules/mob/living/living_fov.dm b/code/modules/mob/living/living_fov.dm index a0d9cf34b39..e5b98f8eeb8 100644 --- a/code/modules/mob/living/living_fov.dm +++ b/code/modules/mob/living/living_fov.dm @@ -89,9 +89,9 @@ //did you know you can subtype /image and /mutable_appearance? // Stop telling them that they might actually do it /image/fov_image icon = 'icons/effects/fov/fov_effects.dmi' - layer = FOV_EFFECTS_LAYER + layer = EFFECTS_LAYER + FOV_EFFECT_LAYER appearance_flags = RESET_COLOR | RESET_TRANSFORM - plane = SOUND_EFFECT_VISUAL_PLANE + plane = FULLSCREEN_PLANE /// Plays a visual effect representing a sound cue for people with vision obstructed by FOV or blindness /proc/play_fov_effect(atom/center, range, icon_state, dir = SOUTH, ignore_self = FALSE, angle = 0, list/override_list) @@ -110,7 +110,6 @@ if(!fov_image) //Make the image once we found one recipient to receive it fov_image = new() fov_image.loc = anchor_point - SET_PLANE(fov_image, SOUND_EFFECT_VISUAL_PLANE, anchor_point) fov_image.icon_state = icon_state fov_image.dir = dir if(angle) diff --git a/code/modules/tgui_input/say_modal/typing.dm b/code/modules/tgui_input/say_modal/typing.dm index 082f01278e2..13f0055d0a0 100644 --- a/code/modules/tgui_input/say_modal/typing.dm +++ b/code/modules/tgui_input/say_modal/typing.dm @@ -77,8 +77,9 @@ /mob/living/create_thinking_indicator() if(active_thinking_indicator || active_typing_indicator || !thinking_IC || stat != CONSCIOUS ) return FALSE - active_thinking_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]3", TYPING_LAYER, src, SOUND_EFFECT_VISUAL_PLANE) + active_thinking_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]3", TYPING_LAYER) add_overlay(active_thinking_indicator) + play_fov_effect(src, 6, "talk", ignore_self = TRUE) /mob/living/remove_thinking_indicator() if(!active_thinking_indicator) @@ -89,8 +90,9 @@ /mob/living/create_typing_indicator() if(active_typing_indicator || active_thinking_indicator || !thinking_IC || stat != CONSCIOUS) return FALSE - active_typing_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]0", TYPING_LAYER, src, SOUND_EFFECT_VISUAL_PLANE) + active_typing_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]0", TYPING_LAYER) add_overlay(active_typing_indicator) + play_fov_effect(src, 6, "talk", ignore_self = TRUE) /mob/living/remove_typing_indicator() if(!active_typing_indicator) diff --git a/icons/effects/fov/fov_effects.dmi b/icons/effects/fov/fov_effects.dmi index d5b7de38a45..2ba9d11f579 100644 Binary files a/icons/effects/fov/fov_effects.dmi and b/icons/effects/fov/fov_effects.dmi differ