cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-27 04:11:30 -04:00
parent 09b01407e3
commit 4e67e1b9ab
7 changed files with 4 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/planet/sif.dm
-6
View File
@@ -461,12 +461,6 @@ var/datum/planet/sif/planet_sif = null
observed_message = "Everything is red. Something really wrong is going on."
transition_messages = list(
"The sky turns blood red!"
<<<<<<< refs/remotes/VOREStation/master
)
=======
<<<<<<< HEAD
)
=======
)
outdoor_sounds_type = /datum/looping_sound/weather/wind
indoor_sounds_type = /datum/looping_sound/weather/wind/indoors