diff --git a/code/modules/lighting/lighting_fake_sun_vr.dm b/code/modules/lighting/lighting_fake_sun_vr.dm
index 18f65ee88d..55d0733762 100644
--- a/code/modules/lighting/lighting_fake_sun_vr.dm
+++ b/code/modules/lighting/lighting_fake_sun_vr.dm
@@ -5,10 +5,14 @@
 	icon_state = "fakesun"
 	invisibility = INVISIBILITY_ABSTRACT
 	var/atom/movable/sun_visuals/sun
+	var/atom/movable/weather_visuals/visuals
 	var/family = null	//Allows multipe maps that are THEORETICALLY connected to use the same settings when not in a connected Z stack
 	var/shared_settings	//Automatically set if using the family var
 	var/static/world_suns = list()	//List of all the fake_suns in the world, used for checking for family members
 
+	var/do_sun = TRUE
+	var/do_weather = FALSE
+
 	var/list/possible_light_setups = list(
 		list(
 			"brightness" = 6.0,
@@ -81,6 +85,9 @@
 
 	)
 
+	var/weather_visuals_icon = 'icons/effects/weather.dmi'
+	var/weather_visuals_icon_state = null
+
 /obj/effect/fake_sun/New(loc, ...)
 	. = ..()
 	world_suns += src
@@ -125,11 +132,20 @@
 
 	sun = new(null)
 
+	visuals = new(null)
+	visuals.icon = weather_visuals_icon
+	visuals.icon_state = weather_visuals_icon_state
+
 	sun.set_color(choice["color"])
 	sun.set_alpha(round(CLAMP01(choice["brightness"])*255,1))
 
-	for(var/turf/T as anything in turfs_to_use)
-		sun.apply_to_turf(T)
+	if(do_sun)
+		for(var/turf/T as anything in turfs_to_use)
+			sun.apply_to_turf(T)
+
+	if(do_weather)
+		for(var/turf/T as anything in turfs_to_use)
+			T.vis_contents += visuals
 
 /obj/effect/fake_sun/warm
 	name = "warm fake sun"
diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm
index 336fdfc3be..4b156a840e 100644
--- a/code/modules/planet/virgo3b_vr.dm
+++ b/code/modules/planet/virgo3b_vr.dm
@@ -613,7 +613,6 @@ var/datum/planet/virgo3b/planet_virgo3b = null
 
 /datum/weather/virgo3b/confetti
 	name = "confetti"
-	icon = 'icons/effects/weather_vr.dmi'
 	icon_state = "confetti"
 
 	transition_chances = list(
diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm
index 2ebc4ee0d2..2a32d563e2 100644
--- a/code/modules/planet/virgo3c_vr.dm
+++ b/code/modules/planet/virgo3c_vr.dm
@@ -617,7 +617,6 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 
 /datum/weather/virgo3c/confetti
 	name = "confetti"
-	icon = 'icons/effects/weather_vr.dmi'
 	icon_state = "confetti"
 
 	transition_chances = list(
diff --git a/code/modules/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm
index af423c1714..678285c12b 100644
--- a/code/modules/planet/virgo4_vr.dm
+++ b/code/modules/planet/virgo4_vr.dm
@@ -588,7 +588,6 @@ var/datum/planet/virgo4/planet_virgo4 = null
 
 /datum/weather/virgo4/confetti
 	name = "confetti"
-	icon = 'icons/effects/weather_vr.dmi'
 	icon_state = "confetti"
 
 	transition_chances = list(
diff --git a/code/modules/planet/weather.dm b/code/modules/planet/weather.dm
index e815f2dd06..a2ea891028 100644
--- a/code/modules/planet/weather.dm
+++ b/code/modules/planet/weather.dm
@@ -15,6 +15,8 @@
 	var/atom/movable/weather_visuals/visuals = null
 	var/atom/movable/weather_visuals/special/special_visuals = null
 
+	var/firework_override = FALSE
+
 /datum/weather_holder/New(var/source)
 	..()
 	our_planet = source
@@ -134,6 +136,7 @@
 
 /datum/weather_holder/proc/update_icon_effects()
 	visuals.icon_state = current_weather.icon_state
+	visuals.icon = current_weather.icon
 
 /datum/weather_holder/proc/update_temperature()
 	temperature = LERP(current_weather.temp_low, current_weather.temp_high, our_planet.sun_position)
diff --git a/code/modules/planet/weather_vr.dm b/code/modules/planet/weather_vr.dm
deleted file mode 100644
index 71b3cd8fe1..0000000000
--- a/code/modules/planet/weather_vr.dm
+++ /dev/null
@@ -1,7 +0,0 @@
-/datum/weather_holder
-	var/firework_override = FALSE
-
-/datum/weather_holder/update_icon_effects()
-	..()
-	if(current_weather.icon)
-		visuals.icon = current_weather.icon
\ No newline at end of file
diff --git a/icons/effects/weather.dmi b/icons/effects/weather.dmi
index 2c10f216a6..dc29f8fd2e 100644
Binary files a/icons/effects/weather.dmi and b/icons/effects/weather.dmi differ
diff --git a/icons/effects/weather_vr.dmi b/icons/effects/weather_vr.dmi
deleted file mode 100644
index 0d977a2f15..0000000000
Binary files a/icons/effects/weather_vr.dmi and /dev/null differ
diff --git a/vorestation.dme b/vorestation.dme
index 8feff524ff..6c008d53fa 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3531,7 +3531,6 @@
 #include "code\modules\planet\virgo3c_vr.dm"
 #include "code\modules\planet\virgo4_vr.dm"
 #include "code\modules\planet\weather.dm"
-#include "code\modules\planet\weather_vr.dm"
 #include "code\modules\player_tips_vr\player_tips_controller_vr.dm"
 #include "code\modules\player_tips_vr\player_tips_list_vr.dm"
 #include "code\modules\power\apc.dm"