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

Update sif.dm

Browse Source
This commit is contained in:
Nadyr
2021-05-08 08:14:31 -04:00
committed by GitHub
parent 644108b2d9
commit 93b1ce71fd
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,16 +336,8 @@ var/datum/planet/sif/planet_sif = null
"Loud thunder is heard in the distance.",
"A bright flash heralds the approach of a storm."
)
<<<<<<< HEAD
outdoor_sounds_type = /datum/looping_sound/weather/rain
indoor_sounds_type = /datum/looping_sound/weather/rain/indoors
||||||| parent of cdbee2a178... Merge pull request #10246 from VOREStation/upstream-merge-8056
// outdoor_sounds_type = /datum/looping_sound/weather/rain
// indoor_sounds_type = /datum/looping_sound/weather/rain/indoors
=======
outdoor_sounds_type = /datum/looping_sound/weather/rain/heavy
indoor_sounds_type = /datum/looping_sound/weather/rain/heavy/indoors
>>>>>>> cdbee2a178... Merge pull request #10246 from VOREStation/upstream-merge-8056
transition_chances = list(