cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-03-17 03:56:14 -04:00
committed by GitHub
parent b3806f26b7
commit a9ab79d6fd
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,16 +283,10 @@ var/datum/planet/sif/planet_sif = null
effect_message = "<span class='warning'>Rain falls on you.</span>" effect_message = "<span class='warning'>Rain falls on you.</span>"
transition_chances = list( transition_chances = list(
<<<<<<< HEAD
WEATHER_OVERCAST = 25,
WEATHER_LIGHT_SNOW = 10,
WEATHER_RAIN = 50,
=======
WEATHER_OVERCAST = 20, WEATHER_OVERCAST = 20,
WEATHER_LIGHT_SNOW = 5, WEATHER_LIGHT_SNOW = 5,
WEATHER_FOG = 20, WEATHER_FOG = 20,
WEATHER_RAIN = 40, WEATHER_RAIN = 40,
>>>>>>> 4994a56160... Merge pull request #14517 from VOREStation/upstream-merge-8940
WEATHER_STORM = 10, WEATHER_STORM = 10,
WEATHER_HAIL = 5 WEATHER_HAIL = 5
) )