guh (#22479)

Author: SapphicOverload

code/datums/weather/weather.dm

@@ -194,22 +194,27 @@
 	var/turf/mob_turf = get_turf(mob_to_check)
 
 	if(!mob_turf)
-		return
+		return FALSE
 
 	if(!(mob_turf.z in impacted_z_levels))
-		return
+		return FALSE
 
 	if(istype(mob_to_check.loc, /obj/structure/closet))
 		var/obj/structure/closet/current_locker = mob_to_check.loc
 		if(current_locker.weather_protection)
 			if(current_locker.weather_protection & immunity_type)
 				return
+	
+	if(ismecha(mob_to_check.loc))
+		var/obj/mecha/mecha_to_check = mob_to_check.loc
+		if(mecha_to_check.weather_protection & immunity_type)
+			return FALSE
 
 	if(mob_to_check.weather_immunities & immunity_type)
-		return
+		return FALSE
 
 	if(!(get_area(mob_to_check) in impacted_areas))
-		return
+		return FALSE
 
 	return TRUE
 

code/datums/weather/weather_types/acid_rain.dm

@@ -65,8 +65,6 @@
 
 /datum/weather/acid_rain/proc/is_acid_immune(atom/L)
 	while (L && !isturf(L))
-		if(ismecha(L)) //Mechs are immune
-			return TRUE
 		if(isliving(L))// if we're a non immune mob inside an immune mob we have to reconsider if that mob is immune to protect ourselves
 			var/mob/living/the_mob = L
 			var/acid_armour = the_mob.getarmor(null, ACID)

code/datums/weather/weather_types/ash_storm.dm

@@ -77,8 +77,6 @@
 
 /datum/weather/ash_storm/proc/is_ash_immune(atom/L)
 	while (L && !isturf(L))
-		if(ismecha(L)) //Mechs are immune
-			return TRUE
 		if(ishuman(L)) //Are you immune?
 			var/mob/living/carbon/human/H = L
 			var/thermal_protection = H.get_thermal_protection()

code/game/mecha/mecha.dm

@@ -28,6 +28,7 @@
 	light_on = FALSE
 	flags_1 = HEAR_1
 	demolition_mod = 3 // mech punch go brr
+	var/weather_protection = WEATHER_STORM
 	var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming.
 	var/can_move = 0 //time of next allowed movement
 	var/mob/living/carbon/occupant = null

code/game/mecha/working/clarke.dm

@@ -10,6 +10,7 @@
 	fast_pressure_step_in = 1.5
 	slow_pressure_step_in = 2
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	weather_protection = WEATHER_LAVA|WEATHER_STORM
 	light_power = 7
 	deflect_chance = 10
 	flags_1 = HEAR_1 | RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1

code/game/mecha/working/ripley.dm

@@ -14,6 +14,7 @@
 	var/list/cargo = new
 	var/cargo_capacity = 15
 	var/hides = 0
+	weather_protection = NONE
 	enclosed = FALSE //Normal ripley has an open cockpit design
 	enter_delay = 10 //can enter in a quarter of the time of other mechs
 	exit_delay = 10
@@ -72,6 +73,7 @@
 	slow_pressure_step_in = 3 //step_in while in normal pressure conditions
 	step_in = 3
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	weather_protection = WEATHER_LAVA|WEATHER_STORM
 	flags_1 = HEAR_1 | RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1
 	armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 60, BIO = 100, RAD = 100, FIRE = 100, ACID = 100)
 	enclosed = TRUE