Bugs 6.16.24 (#994)

* fix catatonic message

* mention mutadone in ryetalyn

* gravity

* remove spatial instability

* whoops

* fix weather overlays

Author: Kapu1178

code/__DEFINES/traits.dm

@@ -343,6 +343,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Makes you flashable from any direction
 #define TRAIT_FLASH_SENSITIVE "flash_sensitive"
 #define TRAIT_NAIVE "naive"
+/// always detect storm weathers
+#define TRAIT_DETECT_STORM "detect_storm"
 #define TRAIT_PRIMITIVE "primitive"
 #define TRAIT_GUNFLIP "gunflip"
 /// Increases chance of getting special traumas, makes them harder to cure

code/datums/mutations/body.dm

@@ -302,36 +302,6 @@
 		return
 	owner.physiology.burn_mod *= 2
 
-/datum/mutation/human/badblink
-	name = "Spatial Instability"
-	desc = "The victim of the mutation has a very weak link to spatial reality, and may be displaced. Often causes extreme nausea."
-	quality = NEGATIVE
-	text_gain_indication = "<span class='warning'>The space around you twists sickeningly.</span>"
-	text_lose_indication = "<span class='notice'>The space around you settles back to normal.</span>"
-	difficulty = 18//high so it's hard to unlock and abuse
-	instability = 10
-	synchronizer_coeff = 1
-	energy_coeff = 1
-	power_coeff = 1
-	var/warpchance = 0
-
-/datum/mutation/human/badblink/on_life(delta_time, times_fired)
-	if(DT_PROB(warpchance, delta_time))
-		var/warpmessage = pick(
-		span_warning("With a sickening 720-degree twist of [owner.p_their()] back, [owner] vanishes into thin air."),
-		span_warning("[owner] does some sort of strange backflip into another dimension. It looks pretty painful."),
-		span_warning("[owner] does a jump to the left, a step to the right, and warps out of reality."),
-		span_warning("[owner]'s torso starts folding inside out until it vanishes from reality, taking [owner] with it."),
-		span_warning("One moment, you see [owner]. The next, [owner] is gone."))
-		owner.visible_message(warpmessage, span_userdanger("You feel a wave of nausea as you fall through reality!"))
-		var/warpdistance = rand(10, 15) * GET_MUTATION_POWER(src)
-		do_teleport(owner, get_turf(owner), warpdistance, channel = TELEPORT_CHANNEL_FREE)
-		owner.adjust_disgust(GET_MUTATION_SYNCHRONIZER(src) * (warpchance * warpdistance))
-		warpchance = 0
-		owner.visible_message(span_danger("[owner] appears out of nowhere!"))
-	else
-		warpchance += 0.0625 * GET_MUTATION_ENERGY(src) * delta_time
-
 /datum/mutation/human/acidflesh
 	name = "Acidic Flesh"
 	desc = "Subject has acidic chemicals building up underneath the skin. This is often lethal."

code/datums/weather/weather.dm

@@ -59,11 +59,16 @@
 	/// Since it's above everything else, this is the layer used by default. TURF_LAYER is below mobs and walls if you need to use that.
 	var/overlay_layer = AREA_LAYER
 	/// Plane for the overlay
-	var/overlay_plane = ABOVE_LIGHTING_PLANE
+	var/overlay_plane = AREA_PLANE
 	/// If the weather has no purpose other than looks
 	var/aesthetic = FALSE
 	/// Used by mobs (or movables containing mobs, such as enviro bags) to prevent them from being affected by the weather.
 	var/immunity_type
+	/// If this bit of weather should also draw an overlay that's uneffected by lighting onto the area
+	/// Taken from weather_glow.dmi
+	var/use_glow = TRUE
+	/// List of all overlays to apply to our turfs
+	var/list/overlay_cache
 
 	/// The stage of the weather, from 1-4
 	var/stage = END_STAGE
@@ -94,35 +99,33 @@
 /datum/weather/proc/telegraph(get_to_the_good_part)
 	if(stage == STARTUP_STAGE)
 		return
+
 	SEND_GLOBAL_SIGNAL(COMSIG_WEATHER_TELEGRAPH(type))
 	stage = STARTUP_STAGE
+
 	var/list/affectareas = list()
 	for(var/V in get_areas(area_type))
 		affectareas += V
+
 	for(var/V in protected_areas)
 		affectareas -= get_areas(V)
+
 	for(var/V in affectareas)
 		var/area/A = V
 		if(protect_indoors && !A.outdoors)
 			continue
 		if(A.z in impacted_z_levels)
 			impacted_areas |= A
+
 	weather_duration = rand(weather_duration_lower, weather_duration_upper)
 	SSweather.processing |= src
 	update_areas()
-	if(!get_to_the_good_part)
-		for(var/z_level in impacted_z_levels)
-			for(var/mob/player as anything in SSmobs.clients_by_zlevel[z_level])
-				var/turf/mob_turf = get_turf(player)
-				if(!mob_turf)
-					continue
-				if(telegraph_message)
-					to_chat(player, telegraph_message)
-				if(telegraph_sound)
-					SEND_SOUND(player, sound(telegraph_sound))
-		addtimer(CALLBACK(src, PROC_REF(start)), telegraph_duration)
-	else
+
+	if(get_to_the_good_part)
 		start()
+	else
+		send_alert(telegraph_message, telegraph_sound)
+		addtimer(CALLBACK(src, PROC_REF(start)), telegraph_duration)
 
 /**
  * Starts the actual weather and effects from it
@@ -134,18 +137,13 @@
 /datum/weather/proc/start()
 	if(stage >= MAIN_STAGE)
 		return
+
 	SEND_GLOBAL_SIGNAL(COMSIG_WEATHER_START(type))
+
 	stage = MAIN_STAGE
 	update_areas()
-	for(var/z_level in impacted_z_levels)
-		for(var/mob/player as anything in SSmobs.clients_by_zlevel[z_level])
-			var/turf/mob_turf = get_turf(player)
-			if(!mob_turf)
-				continue
-			if(weather_message)
-				to_chat(player, weather_message)
-			if(weather_sound)
-				SEND_SOUND(player, sound(weather_sound))
+
+	send_alert(weather_message, weather_sound)
 	if(!perpetual)
 		addtimer(CALLBACK(src, PROC_REF(wind_down)), weather_duration)
 
@@ -159,18 +157,13 @@
 /datum/weather/proc/wind_down()
 	if(stage >= WIND_DOWN_STAGE)
 		return
+
 	SEND_GLOBAL_SIGNAL(COMSIG_WEATHER_WINDDOWN(type))
 	stage = WIND_DOWN_STAGE
+
 	update_areas()
-	for(var/z_level in impacted_z_levels)
-		for(var/mob/player as anything in SSmobs.clients_by_zlevel[z_level])
-			var/turf/mob_turf = get_turf(player)
-			if(!mob_turf)
-				continue
-			if(end_message)
-				to_chat(player, end_message)
-			if(end_sound)
-				SEND_SOUND(player, sound(end_sound))
+
+	send_alert(end_message, end_sound)
 	addtimer(CALLBACK(src, PROC_REF(end)), end_duration)
 
 /**
@@ -183,11 +176,30 @@
 /datum/weather/proc/end()
 	if(stage == END_STAGE)
 		return
+
 	SEND_GLOBAL_SIGNAL(COMSIG_WEATHER_END(type))
 	stage = END_STAGE
+
 	SSweather.processing -= src
 	update_areas()
 
+/datum/weather/proc/send_alert(alert_msg, alert_sfx)
+	for(var/z_level in impacted_z_levels)
+		for(var/mob/player as anything in SSmobs.clients_by_zlevel[z_level])
+			if(!can_get_alert(player))
+				continue
+
+			if(telegraph_message)
+				to_chat(player, alert_msg)
+
+			if(telegraph_sound)
+				SEND_SOUND(player, sound(alert_sfx))
+
+// the checks for if a mob should recieve alerts, returns TRUE if can
+/datum/weather/proc/can_get_alert(mob/player)
+	var/turf/mob_turf = get_turf(player)
+	return !isnull(mob_turf)
+
 /**
  * Returns TRUE if the living mob can be affected by the weather
  *
@@ -227,23 +239,38 @@
  *
  */
 /datum/weather/proc/update_areas()
-	for(var/V in impacted_areas)
-		var/area/N = V
-		N.layer = overlay_layer
-		N.plane = overlay_plane
-		N.icon = 'icons/effects/weather_effects.dmi'
-		N.color = weather_color
-		switch(stage)
-			if(STARTUP_STAGE)
-				N.icon_state = telegraph_overlay
-			if(MAIN_STAGE)
-				N.icon_state = weather_overlay
-			if(WIND_DOWN_STAGE)
-				N.icon_state = end_overlay
-			if(END_STAGE)
-				N.color = null
-				N.icon_state = ""
-				N.icon = null
-				N.layer = initial(N.layer)
-				N.plane = initial(N.plane)
-				N.set_opacity(FALSE)
+	var/list/new_overlay_cache = generate_overlay_cache()
+	for(var/area/impacted as anything in impacted_areas)
+		if(length(overlay_cache))
+			impacted.overlays -= overlay_cache
+		if(length(new_overlay_cache))
+			impacted.overlays += new_overlay_cache
+
+	overlay_cache = new_overlay_cache
+
+/// Returns a list of visual offset -> overlays to use
+/datum/weather/proc/generate_overlay_cache()
+	// We're ending, so no overlays at all
+	if(stage == END_STAGE)
+		return list()
+
+	var/weather_state = ""
+	switch(stage)
+		if(STARTUP_STAGE)
+			weather_state = telegraph_overlay
+		if(MAIN_STAGE)
+			weather_state = weather_overlay
+		if(WIND_DOWN_STAGE)
+			weather_state = end_overlay
+
+	var/list/gen_overlay_cache = list()
+	if(use_glow)
+		var/mutable_appearance/glow_image = mutable_appearance('icons/effects/glow_weather.dmi', weather_state, overlay_layer, ABOVE_LIGHTING_PLANE, 100)
+		glow_image.color = weather_color
+		gen_overlay_cache += glow_image
+
+	var/mutable_appearance/weather_image = mutable_appearance('icons/effects/weather_effects.dmi', weather_state, overlay_layer, plane = overlay_plane)
+	weather_image.color = weather_color
+	gen_overlay_cache += weather_image
+
+	return gen_overlay_cache

code/datums/weather/weather_types/snow_storm.dm

@@ -22,8 +22,30 @@
 	immunity_type = TRAIT_SNOWSTORM_IMMUNE
 
 	barometer_predictable = TRUE
-
+	use_glow = FALSE
 
 /datum/weather/snow_storm/weather_act(mob/living/L)
 	L.adjust_bodytemperature(-rand(5,15))
 
+// since snowstorm is on a station z level, add extra checks to not annoy everyone
+/datum/weather/snow_storm/can_get_alert(mob/player)
+	if(!..())
+		return FALSE
+
+	if(!is_station_level(player.z))
+		return TRUE  // bypass checks
+
+	if(isobserver(player))
+		return TRUE
+
+	if(HAS_TRAIT(player, TRAIT_DETECT_STORM))
+		return TRUE
+
+	if(istype(get_area(player), /area/mine))
+		return TRUE
+
+	for(var/area/snow_area in impacted_areas)
+		if(locate(snow_area) in view(player))
+			return TRUE
+
+	return FALSE

code/game/area/areas.dm

@@ -295,23 +295,6 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 	for(var/obj/machinery/door/door in src)
 		close_and_lock_door(door)
 
-/**
- * Update the icon state of the area
- *
- * Im not sure what the heck this does, somethign to do with weather being able to set icon
- * states on areas?? where the heck would that even display?
- */
-/area/update_icon_state()
-	var/weather_icon
-	for(var/V in SSweather.processing)
-		var/datum/weather/W = V
-		if(W.stage != END_STAGE && (src in W.impacted_areas))
-			W.update_areas()
-			weather_icon = TRUE
-	if(!weather_icon)
-		icon_state = null
-	return ..()
-
 /**
  * Update the icon of the area (overridden to always be null for space
  */

code/game/atoms.dm

@@ -2033,18 +2033,19 @@
 			return 0
 
 	var/list/forced_gravity = list()
-	if(SEND_SIGNAL(src, COMSIG_ATOM_HAS_GRAVITY, gravity_turf, forced_gravity))
-		if(!length(forced_gravity))
-			SEND_SIGNAL(gravity_turf, COMSIG_TURF_HAS_GRAVITY, src, forced_gravity)
+	SEND_SIGNAL(src, COMSIG_ATOM_HAS_GRAVITY, gravity_turf, forced_gravity)
+	SEND_SIGNAL(gravity_turf, COMSIG_TURF_HAS_GRAVITY, src, forced_gravity)
+	if(length(forced_gravity))
+		var/positive_grav = max(forced_gravity)
+		var/negative_grav = min(min(forced_gravity), 0) //negative grav needs to be below or equal to 0
 
-		var/max_grav = 0
-		for(var/i in forced_gravity)//our gravity is the strongest return forced gravity we get
-			max_grav = max(max_grav, i)
-		//cut so we can reuse the list, this is ok since forced gravity movers are exceedingly rare compared to all other movement
-		return max_grav
+		//our gravity is sum of the most massive positive and negative numbers returned by the signal
+		//so that adding two forced_gravity elements with an effect size of 1 each doesnt add to 2 gravity
+		//but negative force gravity effects can cancel out positive ones
 
-	var/area/turf_area = gravity_turf.loc
+		return (positive_grav + negative_grav)
 
+	var/area/turf_area = gravity_turf.loc
 	return !gravity_turf.force_no_gravity && (turf_area.has_gravity || SSmapping.gravity_by_zlevel[gravity_turf.z])
 
 /**

code/game/objects/items/dna_injector.dm

@@ -376,14 +376,6 @@
 	name = "\improper DNA injector (Anti-Shock Touch)"
 	remove_mutations = list(/datum/mutation/human/shock)
 
-/obj/item/dnainjector/spatialinstability
-	name = "\improper DNA injector (Spatial Instability)"
-	add_mutations = list(/datum/mutation/human/badblink)
-
-/obj/item/dnainjector/antispatialinstability
-	name = "\improper DNA injector (Anti-Spatial Instability)"
-	remove_mutations = list(/datum/mutation/human/badblink)
-
 /obj/item/dnainjector/acidflesh
 	name = "\improper DNA injector (Acid Flesh)"
 	add_mutations = list(/datum/mutation/human/acidflesh)

code/modules/mob/living/carbon/human/examine.dm

@@ -297,11 +297,11 @@
 				if(HAS_TRAIT(src, TRAIT_SOFT_CRITICAL_CONDITION))
 					msg += "[t_He] [t_is] barely conscious.\n"
 
-	if(getorgan(/obj/item/organ/brain))
-		if(ai_controller?.ai_status == AI_STATUS_ON)
-			msg += "[span_deadsay("[t_He] do[t_es]n't appear to be [t_him]self.")]\n"
-		else if(!key)
-			msg += "[span_deadsay("[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.")]\n"
+		if(getorgan(/obj/item/organ/brain))
+			if(ai_controller?.ai_status == AI_STATUS_ON)
+				msg += "[span_deadsay("[t_He] do[t_es]n't appear to be [t_him]self.")]\n"
+			else if(!key)
+				msg += "[span_deadsay("[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.")]\n"
 
 	if (length(msg))
 		. += span_warning("[msg.Join("")]")

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -668,7 +668,7 @@
 
 /datum/reagent/medicine/ryetalyn
 	name = "Ryetalyn"
-	description = "Ryetalyn can cure all genetic mutations and abnormalities via a catalytic process."
+	description = "Ryetalyn can cure all genetic mutations and abnormalities via a catalytic process. Known by the brand name \"Mutadone\"."
 	taste_description = "acid"
 	reagent_state = SOLID
 	color = "#004000"