From 91db3eba3bfa2d0bb495a852230a9477cef9db5e Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Fri, 1 Jul 2022 17:23:33 -0400 Subject: [PATCH] Merge pull request #13236 from Heroman3003/bloodmoon-fix Fixes blood moon transition breaking weather system --- code/modules/planet/sif.dm | 2 +- code/modules/planet/virgo3b_vr.dm | 4 ++-- code/modules/planet/virgo3c_vr.dm | 4 ++-- code/modules/planet/virgo4_vr.dm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index e8a467e24c..499dc6f915 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -447,7 +447,7 @@ var/datum/planet/sif/planet_sif = null light_color = "#FF0000" flight_failure_modifier = 25 transition_chances = list( - WEATHER_BLOODMOON = 100 + WEATHER_BLOOD_MOON = 100 ) observed_message = "Everything is red. Something really wrong is going on." transition_messages = list( diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm index 822faa2d7e..9e76fd1eda 100644 --- a/code/modules/planet/virgo3b_vr.dm +++ b/code/modules/planet/virgo3b_vr.dm @@ -395,7 +395,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue - + var/target_zone = pick(BP_ALL) var/amount_blocked = H.run_armor_check(target_zone, "melee") var/amount_soaked = H.get_armor_soak(target_zone, "melee") @@ -419,7 +419,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null light_color = "#FF0000" flight_failure_modifier = 25 transition_chances = list( - WEATHER_BLOODMOON = 100 + WEATHER_BLOOD_MOON = 100 ) observed_message = "Everything is red. Something really ominous is going on." transition_messages = list( diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index 4c2e5bfeb8..95e870a79f 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -150,7 +150,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null WEATHER_CLEAR = 60, WEATHER_OVERCAST = 20, WEATHER_LIGHT_SNOW = 1, - WEATHER_BLOODMOON = 1, + WEATHER_BLOOD_MOON = 1, WEATHER_EMBERFALL = 0.5) transition_messages = list( "The sky clears up.", @@ -410,7 +410,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null temp_low = 273.15 // 0c flight_failure_modifier = 25 transition_chances = list( - WEATHER_BLOODMOON = 25, + WEATHER_BLOOD_MOON = 25, WEATHER_CLEAR = 75 ) observed_message = "Everything is red. Something really ominous is going on." diff --git a/code/modules/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm index 74cd6c33b4..f4e2118e80 100644 --- a/code/modules/planet/virgo4_vr.dm +++ b/code/modules/planet/virgo4_vr.dm @@ -392,7 +392,7 @@ var/datum/planet/virgo4/planet_virgo4 = null temp_low = 283.15 // 10c flight_failure_modifier = 25 transition_chances = list( - WEATHER_BLOODMOON = 100 + WEATHER_BLOOD_MOON = 100 ) observed_message = "Everything is red. Something really ominous is going on." transition_messages = list(