Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13

code/datums/weather/weather_events/long.dm

@@ -0,0 +1,48 @@
+// Weather events for Big Red
+/datum/weather_event/dust/infinite
+	name = "Duststorm (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/sand/infinite
+	name = "Sandstorm (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/rock/infinite
+	name = "Rockstorm (Infinite)"
+	length = INFINITY
+
+// Weather events for Chances Claim
+/datum/weather_event/light_rain/lv522/infinite
+	name = "LV522 Light Rain (Infinite)"
+	length = INFINITY
+
+// Weather events for LV624
+/datum/weather_event/light_rain/infinite
+	name = "Light Rain (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/heavy_rain/infinite
+	name = "Heavy Rain (Infinite)"
+	length = INFINITY
+
+// Weather events for New Varadero
+/datum/weather_event/light_rain/varadero/infinite
+	name = "Tropical Storm (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/monsoon/infinite
+	name = "Monsoon Warning (Infinite)"
+	length = INFINITY
+
+// Weather events for Sorokyne
+/datum/weather_event/snow/infinite
+	name = "Snow (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/snowstorm/infinite
+	name = "Snowstorm (Infinite)"
+	length = INFINITY
+
+/datum/weather_event/blizzard/infinite
+	name = "Blizzard (Infinite)"
+	length = INFINITY

code/datums/weather/weather_events/lv522_chances_claim.dm

@@ -1,4 +1,6 @@
 /datum/weather_event/light_rain/lv522
+	name = "LV522 Light Rain"
+	display_name = "Light Rain"
 	length = 3 MINUTES
 	lightning_chance = 4
 

code/datums/weather/weather_events/new_varadero.dm

@@ -1,22 +1,13 @@
-/datum/weather_event/light_rain
+/datum/weather_event/light_rain/varadero
 	name = "Tropical Storm"
 	display_name = "Tropical Storm"
 	length = 4 MINUTES
-	fullscreen_type = /atom/movable/screen/fullscreen/weather/low
 
-	turf_overlay_icon_state = "strata_storm"
 	turf_overlay_alpha = 40
 
-	effect_message = null
-	damage_per_tick = 0
-
 	has_process = TRUE
 	lightning_chance = 1
 
-	ambience = 'sound/ambience/rainforest.ogg'
-
-	fire_smothering_strength = 1
-
 /datum/weather_event/monsoon
 	name = "Monsoon Warning"
 	display_name = "Monsoon Warning"

code/datums/weather/weather_map_holders/new_varadero.dm

@@ -5,7 +5,7 @@
 	no_weather_turf_icon_state = "strata_clearsky"
 
 	potential_weather_events = list(
-		/datum/weather_event/light_rain,
+		/datum/weather_event/light_rain/varadero,
 		/datum/weather_event/monsoon,
 	)
 

colonialmarines.dme

@@ -677,6 +677,7 @@
 #include "code\datums\weather\weather_map_holder.dm"
 #include "code\datums\weather\weather_events\big_red.dm"
 #include "code\datums\weather\weather_events\faction_clash.dm"
+#include "code\datums\weather\weather_events\long.dm"
 #include "code\datums\weather\weather_events\lv522_chances_claim.dm"
 #include "code\datums\weather\weather_events\lv624.dm"
 #include "code\datums\weather\weather_events\new_varadero.dm"