alright we're good i think (#22614)

Author: Chubbygummibear

…de/__DEFINES/dcs/signals/signals_huds.dm code/__DEFINES/dcs/signals/signals_hud.dmcode/__DEFINES/dcs/signals/signals_huds.dm renamed to code/__DEFINES/dcs/signals/signals_hud.dm code/__DEFINES/dcs/signals/signals_huds.dm renamed to code/__DEFINES/dcs/signals/signals_hud.dm

@@ -1,5 +1,7 @@
 /// Sent from /datum/hud/proc/on_eye_change(): (atom/old_eye, atom/new_eye)
 #define COMSIG_HUD_EYE_CHANGED "hud_eye_changed"
+/// Sent from /datum/hud/proc/eye_z_changed() : (new_z)
+#define COMSIG_HUD_Z_CHANGED "hud_z_changed"
 /// Sent from /datum/hud/proc/eye_z_changed() : (old_offset, new_offset)
 #define COMSIG_HUD_OFFSET_CHANGED "hud_offset_changed"
 /// Sent from /atom/movable/screen/lobby/button/collapse/proc/collapse_buttons() : ()

code/__DEFINES/dcs/signals/signals_plane_master_group.dm

@@ -0,0 +1,2 @@
+/// from /datum/plane_master_group/proc/set_hud(): (datum/hud/new_hud)
+#define COMSIG_GROUP_HUD_CHANGED "group_hud_changed"

code/__DEFINES/layers.dm

@@ -13,29 +13,31 @@
 #define PLANE_SPACE -21
 #define PLANE_SPACE_PARALLAX -20
 
-#define GRAVITY_PULSE_PLANE -12
+#define GRAVITY_PULSE_PLANE -19
 #define GRAVITY_PULSE_RENDER_TARGET "*GRAVPULSE_RENDER_TARGET"
 
-#define RENDER_PLANE_TRANSPARENT -11 //Transparent plane that shows openspace underneath the floor
+#define RENDER_PLANE_TRANSPARENT -18 //Transparent plane that shows openspace underneath the floor
+#define TRANSPARENT_FLOOR_PLANE -13
 
-#define TRANSPARENT_FLOOR_PLANE -10
+#define FLOOR_PLANE -12
+#define FLOOR_PLANE_RENDER_TARGET "*FLOOR_PLANE"
+#define WALL_PLANE -11
+#define GAME_PLANE -10
+#define ABOVE_GAME_PLANE -9
 
-#define FLOOR_PLANE -6
-
-#define WALL_PLANE -5
-#define GAME_PLANE -4
-#define ABOVE_GAME_PLANE -3
 ///Slightly above the game plane but does not catch mouse clicks. Useful for certain visuals that should be clicked through, like seethrough trees
 #define SEETHROUGH_PLANE -2
 
 #define RENDER_PLANE_GAME_WORLD -1
 
 #define DEFAULT_PLANE 0 //Marks out the default plane, even if we don't use it
 
+#define WEATHER_PLANE 1
 #define AREA_PLANE 2
-#define MASSIVE_OBJ_PLANE 3
-#define GHOST_PLANE 4
-#define POINT_PLANE 5
+
+#define MASSIVE_OBJ_PLANE 6
+#define GHOST_PLANE 7
+#define POINT_PLANE 8
 
 //---------- LIGHTING -------------
 ///Normal 1 per turf dynamic lighting underlays
@@ -64,6 +66,7 @@
 
 ///Things that should render ignoring lighting
 #define ABOVE_LIGHTING_PLANE 17
+#define WEATHER_GLOW_PLANE 18
 
 ///---------------- MISC -----------------------
 

code/__DEFINES/weather.dm

@@ -0,0 +1,7 @@
+//A reference to this list is passed into area sound managers, and it's modified in a manner that preserves that reference in ash_storm.dm
+GLOBAL_LIST_EMPTY(ash_storm_sounds)
+
+#define STARTUP_STAGE 1
+#define MAIN_STAGE 2
+#define WIND_DOWN_STAGE 3
+#define END_STAGE 4

code/_onclick/hud/hud.dm

@@ -195,6 +195,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	SIGNAL_HANDLER
 	update_parallax_pref() // If your eye changes z level, so should your parallax prefs
 	var/turf/eye_turf = get_turf(eye)
+	SEND_SIGNAL(src, COMSIG_HUD_Z_CHANGED, eye_turf.z)
 	var/new_offset = GET_TURF_PLANE_OFFSET(eye_turf)
 	if(current_plane_offset == new_offset)
 		return

code/_onclick/hud/rendering/plane_master_group.dm

@@ -24,28 +24,34 @@
 	build_plane_masters(0, SSmapping.max_plane_offset)
 
 /datum/plane_master_group/Destroy()
-	orphan_hud()
+	set_hud(null)
 	QDEL_LIST_ASSOC_VAL(plane_masters)
 	return ..()
 
+/datum/plane_master_group/proc/set_hud(datum/hud/new_hud)
+	if(new_hud == our_hud)
+		return
+	if(our_hud)
+		our_hud.master_groups -= key
+		hide_hud()
+	our_hud = new_hud
+	if(new_hud)
+		our_hud.master_groups[key] = src
+		show_hud()
+		transform_lower_turfs(our_hud, active_offset)
+	SEND_SIGNAL(src, COMSIG_GROUP_HUD_CHANGED, our_hud)
+
 /// Display a plane master group to some viewer, so show all our planes to it
 /datum/plane_master_group/proc/attach_to(datum/hud/viewing_hud)
 	if(viewing_hud.master_groups[key])
 		stack_trace("Hey brother, our key [key] is already in use by a plane master group on the passed in hud, belonging to [viewing_hud.mymob]. Ya fucked up, why are there dupes")
 		return
 
-	our_hud = viewing_hud
+	set_hud(viewing_hud)
 	our_hud.master_groups[key] = src
 	show_hud()
 	transform_lower_turfs(our_hud, active_offset)
 
-/// Hide the plane master from its current hud, fully clear it out
-/datum/plane_master_group/proc/orphan_hud()
-	if(our_hud)
-		our_hud.master_groups -= key
-		hide_hud()
-		our_hud = null
-
 /// Well, refresh our group, mostly useful for plane specific updates
 /datum/plane_master_group/proc/refresh_hud()
 	hide_hud()

code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm

@@ -252,6 +252,17 @@
 	documentation = "Holds the areas themselves, which ends up meaning it holds any overlays/effects we apply to areas. NOT snow or rad storms, those go on above lighting"
 	plane = AREA_PLANE
 
+/atom/movable/screen/plane_master/weather
+	name = "Weather"
+	documentation = "Holds the main tiling 32x32 sprites of weather. We mask against walls that are on the edge of weather effects."
+	plane = WEATHER_PLANE
+
+/atom/movable/screen/plane_master/weather/set_home(datum/plane_master_group/home)
+	. = ..()
+	if(!.)
+		return
+	home.AddComponent(/datum/component/hide_weather_planes, src)
+
 /atom/movable/screen/plane_master/massive_obj
 	name = "Massive object"
 	documentation = "Huge objects need to render above everything else on the game plane, otherwise they'd well, get clipped and look not that huge. This does that."
@@ -294,6 +305,16 @@
 	documentation = "Anything on the game plane that needs a space to draw on that will be above the lighting plane.\
 		<br>Mostly little alerts and effects, also sometimes contains things that are meant to look as if they glow."
 
+/atom/movable/screen/plane_master/weather_glow
+	name = "Weather Glow"
+	documentation = "Holds the glowing parts of the main tiling 32x32 sprites of weather."
+	plane = WEATHER_GLOW_PLANE
+
+/atom/movable/screen/plane_master/weather_glow/set_home(datum/plane_master_group/home)
+	. = ..()
+	if(!.)
+		return
+	home.AddComponent(/datum/component/hide_weather_planes, src)
 /**
  * Handles emissive overlays and emissive blockers.
  */

code/_onclick/hud/rendering/render_plate.dm

@@ -349,7 +349,7 @@
 	if(!.)
 		return
 
-	RegisterSignal(mymob, COMSIG_MOB_SIGHT_CHANGE, PROC_REF(handle_sight))
+	RegisterSignal(mymob, COMSIG_MOB_SIGHT_CHANGE, PROC_REF(handle_sight), override = TRUE)
 	handle_sight(mymob, mymob.sight, NONE)
 
 /atom/movable/screen/plane_master/rendering_plate/light_mask/hide_from(mob/oldmob)

code/controllers/subsystem/weather.dm

@@ -1,9 +1,4 @@
-#define STARTUP_STAGE 1
-#define MAIN_STAGE 2
-#define WIND_DOWN_STAGE 3
-#define END_STAGE 4
-
-//Used for all kinds of weather, ex. lavaland ash storms.
+/// Used for all kinds of weather, ex. lavaland ash storms.
 SUBSYSTEM_DEF(weather)
 	name = "Weather"
 	flags = SS_BACKGROUND
@@ -16,25 +11,23 @@ SUBSYSTEM_DEF(weather)
 /datum/controller/subsystem/weather/fire()
 	// process active weather
 	for(var/V in processing)
-		var/datum/weather/W = V
-		if(W.aesthetic || W.stage != MAIN_STAGE)
+		var/datum/weather/our_event = V
+		if(our_event.aesthetic || our_event.stage != MAIN_STAGE)
 			continue
-		for(var/i in GLOB.mob_living_list)
-			var/mob/living/L = i
-			if(W.can_weather_act(L))
-				W.weather_act(L)
+		for(var/mob/act_on as anything in GLOB.mob_living_list)
+			if(our_event.can_weather_act(act_on))
+				our_event.weather_act(act_on)
 
 	// start random weather on relevant levels
 	for(var/z in eligible_zlevels)
 		var/possible_weather = eligible_zlevels[z]
-		var/datum/weather/W = pickweight(possible_weather)
-		run_weather(W, list(text2num(z)))
+		var/datum/weather/our_event = pick_weight(possible_weather)
+		run_weather(our_event, list(text2num(z)))
 		eligible_zlevels -= z
-		var/randTime = rand(W.cooldown_lower, W.cooldown_higher)
-		addtimer(CALLBACK(src, PROC_REF(make_eligible), z, possible_weather), randTime + initial(W.weather_duration_upper), TIMER_UNIQUE) //Around 5-10 minutes between weathers
-		next_hit_by_zlevel["[z]"] = world.time + randTime + initial(W.telegraph_duration)
+		var/randTime = rand(our_event.cooldown_lower, our_event.cooldown_higher)
+		next_hit_by_zlevel["[z]"] = addtimer(CALLBACK(src, PROC_REF(make_eligible), z, possible_weather), randTime + initial(our_event.weather_duration_upper), TIMER_UNIQUE|TIMER_STOPPABLE) //Around 5-10 minutes between weathers
 
-/datum/controller/subsystem/weather/Initialize(start_timeofday)
+/datum/controller/subsystem/weather/Initialize()
 	for(var/V in subtypesof(/datum/weather))
 		var/datum/weather/W = V
 		var/probability = initial(W.probability)
@@ -75,17 +68,28 @@ SUBSYSTEM_DEF(weather)
 
 	var/datum/weather/W = new weather_datum_type(z_levels)
 	W.telegraph()
-	return W
 
 /datum/controller/subsystem/weather/proc/make_eligible(z, possible_weather)
 	eligible_zlevels[z] = possible_weather
 	next_hit_by_zlevel["[z]"] = null
 
 /datum/controller/subsystem/weather/proc/get_weather(z, area/active_area)
-    var/datum/weather/A
-    for(var/V in processing)
-        var/datum/weather/W = V
-        if((z in W.impacted_z_levels) && istype(active_area, W.area_type))
-            A = W
-            break
-    return A
+	var/datum/weather/A
+	for(var/V in processing)
+		var/datum/weather/W = V
+		if((z in W.impacted_z_levels) && W.area_type == active_area.type)
+			A = W
+			break
+	return A
+
+///Returns an active storm by its type
+/datum/controller/subsystem/weather/proc/get_weather_by_type(type)
+	return locate(type) in processing
+
+// ADMIN_VERB(stop_weather, R_DEBUG|R_ADMIN, "Stop All Active Weather", "Stop all currently active weather.", ADMIN_CATEGORY_DEBUG)
+// 	log_admin("[key_name(user)] stopped all currently active weather.")
+// 	message_admins("[key_name_admin(user)] stopped all currently active weather.")
+// 	for(var/datum/weather/current_weather as anything in SSweather.processing)
+// 		if(current_weather in SSweather.processing)
+// 			current_weather.end()
+// 	BLACKBOX_LOG_ADMIN_VERB("Stop All Active Weather")

code/datums/components/hide_weather_planes.dm

@@ -0,0 +1,116 @@
+/// Component that manages a list of plane masters that are dependent on weather
+/// Force hides/shows them depending on the weather activity of their z stack
+/// Applied to the plane master group that owns them
+/datum/component/hide_weather_planes
+	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+	var/list/datum/weather/active_weather = list()
+	var/list/atom/movable/screen/plane_master/plane_masters = list()
+
+/datum/component/hide_weather_planes/Initialize(atom/movable/screen/plane_master/care_about)
+	if(!istype(parent, /datum/plane_master_group))
+		return COMPONENT_INCOMPATIBLE
+	var/datum/plane_master_group/home = parent
+	plane_masters += care_about
+	RegisterSignal(care_about, COMSIG_QDELETING, PROC_REF(plane_master_deleted))
+
+	var/list/starting_signals = list()
+	var/list/ending_signals = list()
+	for(var/datum/weather/weather_type as anything in typesof(/datum/weather))
+		starting_signals += COMSIG_WEATHER_TELEGRAPH(weather_type)
+		ending_signals += COMSIG_WEATHER_END(weather_type)
+
+	RegisterSignals(SSdcs, starting_signals, PROC_REF(weather_started))
+	RegisterSignals(SSdcs, ending_signals, PROC_REF(weather_finished))
+
+	if(home.our_hud)
+		attach_hud(home.our_hud)
+	else
+		RegisterSignal(home, COMSIG_GROUP_HUD_CHANGED, PROC_REF(new_hud_attached))
+
+/datum/component/hide_weather_planes/Destroy(force)
+	hide_planes()
+	active_weather = null
+	plane_masters = null
+	return ..()
+
+/datum/component/hide_weather_planes/InheritComponent(datum/component/new_comp, i_am_original, atom/movable/screen/plane_master/care_about)
+	if(!i_am_original)
+		return
+	plane_masters += care_about
+	RegisterSignal(care_about, COMSIG_QDELETING, PROC_REF(plane_master_deleted))
+	if(length(active_weather))
+		care_about.enable_alpha()
+	else
+		care_about.disable_alpha()
+
+/datum/component/hide_weather_planes/proc/new_hud_attached(datum/source, datum/hud/new_hud)
+	SIGNAL_HANDLER
+	if(new_hud)
+		attach_hud(new_hud)
+
+/datum/component/hide_weather_planes/proc/attach_hud(datum/hud/new_hud)
+	RegisterSignal(new_hud, COMSIG_HUD_Z_CHANGED, PROC_REF(z_changed))
+	var/mob/eye = new_hud?.mymob?.client?.eye
+	var/turf/eye_location = get_turf(eye)
+	z_changed(new_hud, eye_location?.z)
+
+/datum/component/hide_weather_planes/proc/plane_master_deleted(atom/movable/screen/plane_master/source)
+	SIGNAL_HANDLER
+	plane_masters -= source
+
+/datum/component/hide_weather_planes/proc/display_planes()
+	var/datum/plane_master_group/home = parent
+	var/mob/our_lad = home.our_hud?.mymob
+	var/our_offset = GET_TURF_PLANE_OFFSET(our_lad)
+	for(var/atom/movable/screen/plane_master/weather_concious as anything in plane_masters)
+		//We need to make sure that planes above us are hidden, but below us are visible
+		if(!weather_concious.alpha_enabled && weather_concious.offset >= our_offset)
+			weather_concious.enable_alpha()
+
+/datum/component/hide_weather_planes/proc/hide_planes()
+	for(var/atom/movable/screen/plane_master/weather_concious as anything in plane_masters)
+		weather_concious.disable_alpha()
+
+/datum/component/hide_weather_planes/proc/z_changed(datum/source, new_z)
+	SIGNAL_HANDLER
+	/**
+	 * We hide all impacted planes on z change first because weather planes on lower offsets will show through the game world
+	 * so we can't count on them just not being visible like turfs above you. This is a result of attaching weather effects to areas,
+	 * which aren't beholden to z-levels and planes like atoms we're used to
+	 */
+	hide_planes()
+	active_weather = list()
+	if(!SSmapping.initialized)
+		return
+
+	var/list/connected_levels = SSmapping.get_connected_levels(new_z)
+	for(var/datum/weather/active as anything in SSweather.processing)
+		if(length(connected_levels & active.impacted_z_levels))
+			active_weather += WEAKREF(active)
+
+	if(length(active_weather))
+		display_planes()
+
+/datum/component/hide_weather_planes/proc/weather_started(datum/source, datum/weather/starting)
+	SIGNAL_HANDLER
+	var/datum/plane_master_group/home = parent
+	var/mob/eye = home.our_hud?.mymob?.client?.eye
+	var/turf/viewing_from = get_turf(eye)
+	if(!viewing_from)
+		return
+
+	var/list/connected_levels = SSmapping.get_connected_levels(viewing_from)
+	if(length(connected_levels & starting.impacted_z_levels))
+		active_weather += WEAKREF(starting)
+
+	if(!length(active_weather))
+		return
+	display_planes()
+
+/datum/component/hide_weather_planes/proc/weather_finished(datum/source, datum/weather/stopping)
+	SIGNAL_HANDLER
+	active_weather -= WEAKREF(stopping)
+
+	if(length(active_weather))
+		return
+	hide_planes()