cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13236 from Heroman3003/bloodmoon-fix

Browse Source 
Fixes blood moon transition breaking weather system
This commit is contained in:
Novacat
2022-07-01 17:23:33 -04:00
committed by CHOMPStation2
parent acb9521a80
commit 91db3eba3b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/planet/sif.dm
View File

@@ -447,7 +447,7 @@ var/datum/planet/sif/planet_sif = null
light_color = "#FF0000" light_color = "#FF0000"
flight_failure_modifier = 25 flight_failure_modifier = 25
transition_chances = list( transition_chances = list(
WEATHER_BLOODMOON = 100 WEATHER_BLOOD_MOON = 100
) )
observed_message = "Everything is red. Something really wrong is going on." observed_message = "Everything is red. Something really wrong is going on."
transition_messages = list( transition_messages = list(

4
code/modules/planet/virgo3b_vr.dm
View File

@@ -395,7 +395,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null
if(show_message) if(show_message)
to_chat(H, "<span class='notice'>Hail patters onto your umbrella.</span>") to_chat(H, "<span class='notice'>Hail patters onto your umbrella.</span>")
continue continue
var/target_zone = pick(BP_ALL) var/target_zone = pick(BP_ALL)
var/amount_blocked = H.run_armor_check(target_zone, "melee") var/amount_blocked = H.run_armor_check(target_zone, "melee")
var/amount_soaked = H.get_armor_soak(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" light_color = "#FF0000"
flight_failure_modifier = 25 flight_failure_modifier = 25
transition_chances = list( transition_chances = list(
WEATHER_BLOODMOON = 100 WEATHER_BLOOD_MOON = 100
) )
observed_message = "Everything is red. Something really ominous is going on." observed_message = "Everything is red. Something really ominous is going on."
transition_messages = list( transition_messages = list(

4
code/modules/planet/virgo3c_vr.dm
View File

@@ -150,7 +150,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
WEATHER_CLEAR = 60, WEATHER_CLEAR = 60,
WEATHER_OVERCAST = 20, WEATHER_OVERCAST = 20,
WEATHER_LIGHT_SNOW = 1, WEATHER_LIGHT_SNOW = 1,
WEATHER_BLOODMOON = 1, WEATHER_BLOOD_MOON = 1,
WEATHER_EMBERFALL = 0.5) WEATHER_EMBERFALL = 0.5)
transition_messages = list( transition_messages = list(
"The sky clears up.", "The sky clears up.",
@@ -410,7 +410,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
temp_low = 273.15 // 0c temp_low = 273.15 // 0c
flight_failure_modifier = 25 flight_failure_modifier = 25
transition_chances = list( transition_chances = list(
WEATHER_BLOODMOON = 25, WEATHER_BLOOD_MOON = 25,
WEATHER_CLEAR = 75 WEATHER_CLEAR = 75
) )
observed_message = "Everything is red. Something really ominous is going on." observed_message = "Everything is red. Something really ominous is going on."

2
code/modules/planet/virgo4_vr.dm
View File

@@ -392,7 +392,7 @@ var/datum/planet/virgo4/planet_virgo4 = null
temp_low = 283.15 // 10c temp_low = 283.15 // 10c
flight_failure_modifier = 25 flight_failure_modifier = 25
transition_chances = list( transition_chances = list(
WEATHER_BLOODMOON = 100 WEATHER_BLOOD_MOON = 100
) )
observed_message = "Everything is red. Something really ominous is going on." observed_message = "Everything is red. Something really ominous is going on."
transition_messages = list( transition_messages = list(