From 1c9018eb6b7095ae558af931ceaf2789a1389106 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Mon, 21 Aug 2023 20:18:49 +1000
Subject: [PATCH] Adds fake weather options to fake sun

---
 code/modules/lighting/lighting_fake_sun_vr.dm |  20 ++++++++++++++++--
 code/modules/planet/virgo3b_vr.dm             |   1 -
 code/modules/planet/virgo3c_vr.dm             |   1 -
 code/modules/planet/virgo4_vr.dm              |   1 -
 code/modules/planet/weather.dm                |   3 +++
 code/modules/planet/weather_vr.dm             |   7 ------
 icons/effects/weather.dmi                     | Bin 37987 -> 38440 bytes
 icons/effects/weather_vr.dmi                  | Bin 992 -> 0 bytes
 vorestation.dme                               |   1 -
 9 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 100644 code/modules/planet/weather_vr.dm
 delete mode 100644 icons/effects/weather_vr.dmi

diff --git a/code/modules/lighting/lighting_fake_sun_vr.dm b/code/modules/lighting/lighting_fake_sun_vr.dm
index 18f65ee88d0..55d07337620 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 336fdfc3be4..4b156a840e1 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 2ebc4ee0d27..2a32d563e26 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 af423c17146..678285c12b3 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 e815f2dd062..a2ea891028f 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 71b3cd8fe18..00000000000
--- 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 2c10f216a6d845df08662a13df7dddbe01140b05..dc29f8fd2e1638350663e0f77b1bc3a00da2af13 100644
GIT binary patch
delta 5036
zcmXw5c{tSF`~Hk=yp}A5Y-3(pWQpuq23baw?8{^;JCUWBAwEPXGL$8INOsCD#ui4x
z5M$rh*RB~`*5CBKuHX6dJm=ikec$K4&hso3P!*I=#a#i-157NQX*&Aa`?z{NbA9Rw
z0O)jL62Y@glBtu>Yi!}Q$?75BnU`GXvIeoqt{AR*y?D*|T`2mP|C-60qsZ(#ufzm=
zy0(3r6nvI<zW%xAANRz#W~EcN6dp0s@eTt`QG(pk{Fh9VoaY5HuJ?OKJ#tD!T+&I1
z7kia<OClNUyu$<`GlX%}vVKp++`g`Shbem|ic`OX%qIMD;cT?;bsJBWRrp!>m?`>m
z;rDQ--|?!C_BjZ>oBl2aMf+2&ZdGaS-HxdwFREUsE-L>%v9unM{DK@<K|A(ns<+44
z?esl#01cy0*wy5uPk07}c5V`jUx&^_1rBRgT+)Ah*VKtNn`3j<)ZJB<rt~rodL(@-
zyzp5cvmyevO6z*~P*P|8k9E508^%5`cUU}5=UmyuFqwbB&Z6}5i(K#T9tMP|=uKM`
z$K>tXI_Lx5*5xl_S1BIsGd@`ewyL^m4pw?Vq(Z1JSyg6-KB59wV)=e}htIX4>RvCt
zpXLb@jbeK?Y@rdM^OQM51L48FE_o-Aw#BZUX9)7_B03K8^78JmP?o9X*g01yoa;m3
z!9C~mQ**Po8yM=`8paaH`o98MGvLY5oV>M-LP@l<a_1c0Hu&&popAJ4wuQwZx#0V%
zEt<vd?**Z%XizFx>G;TLD$ls05{a;O_TLj(>vQ+mF@JM<@k4>HLfZm)j{5|Y{-2t7
zAeVCa3|m=wrq@wz9#viHUx3<DeAy<Qoty#Oqvdk?d$DP}JcC_Q1N3P{RtjIX$Gb+X
zlCa~i5xp-40_HCpu{BFp(i)-RN0(U$-qX)7xTkl3$1Y{S<CP?dF|xMSQvpEjf}hPq
zNF#Qo{pg550^YrN^s?jqYF}&G1}4|67F)q73*%=IEW#=sYv_$l9J`ENTR-a^$MpU?
z&ljsUjXd`;pTnFYn!pq&D<*fJdKww`PmjM%+`#~sRkQDxCtQ-wzYT<5tj_=NgU-=5
zVw*tp)`eZc)T1s#m_I2dAaPDTylFG;z*~0Cr$%sl;hBCt<LJUx$76H;g0M#H>^(b`
z#qWaU@Zk>Wy5NayBf$Udi~8uuUk_I2zh2fLR5A%sxSzqdbD24_w6^#9d80FM*u3^B
zj7Pk=<iwAMziI+rAe6&Y2^VoyWEE3LJIK$}X@{H*iuv*XK6c5`8Iys`pcS(lh_!{X
zjbHL;fm8Kqq>7UAKmA46_-5&xB5YodAzX;i8?UpLdp$S!0!NFOl5d69mQ|d*+k?0R
zHsFisD8?hq{5%q-wza5*V^nB35>}B3+)d>VYtC3^!3YFpm%MW6Mrne3-p-)Qjle*G
z_ycc=EA|`2bIFDf6|!9E@`k@e9{lN0tiu7KjLu$~E9S3{hMf&Yk0*&PWI5NPFVP3L
z+LZ6UPN3M;&|~knz2K&8zfh{IJN!syj}0R*axwd9*RjIq;XX+QI~l1(+U^%CZLRiv
zVt&L>#W6Akb%7mZ>_H;L<|Db+?*y?&4J)z91}y7mRtaRD*4ii=uDFHc`_>a%vz9gE
z_?IOEr}0Dse8=EO^3pT9=s^sHj{Z=_2<QAjOe59+2&1Bvf?f_g4WYdD>Zsj4$Vc_J
z0uc;$LtV`YlbBqER@)&2D&Ts~zBdgC(Nv)~GaIxEzLJug#t7hWG19{U?Uk)q7ksNP
zUv5=zE_Ub;!T?8WBxO`Pn=?`(@t|TQ$cniW8e%>KQ@hc{TODhY7I*ObVb1<n=wH0S
z6Gy^v9Z&ZmTEv~(&nCIzd@t?Ih=ukK6gvviJ~dwdq3|ZAOuXdbV$dWTS|F%(w1;*9
zR9WVw?N^*9CamnyN0Yu~n1pc}9{0PAlr&=V4n?k-P2&s5NC-y2cFYkr7qsgrBR8Gd
z#Iz<vLX1;jX`XvI+dqhC47T7Rpkp*5tp6BNqGBs~b2fE-Pi-G~ccRW<+j7(Y2TFMC
zRA|O=yUeC~yo32naG#*~)TA9@1n!Jta8ieZ>GT!f`2@FfCAyAXkX62|?q2iIcT{!j
z{Oy!nu23^LT#%$YhWxL7nTw2Ui66YI={a$)ZzpuJu#`s-wDFtusej=mc2+~KMRpt`
zw~50)3!BZk^3EnYx9hEHb4{VNo=R?xdUy*ZI-~vw^H}mK4yJtyCY6;>AD^A@Du<}O
zBKGx2)9|WP?5iI2P3Z%5Qit<&rYfJfjDN~C_BXUtkFWBF>#qFa`PGs1J5`!4JFkR0
z(tgIg1iCd|K7bmWdakn%2yPR;`3N1OOGtE148d2()%NE&65UO!?OJoygpr|ORL_Mo
z829sl9g9D%xH4MsIjn9o=OjZBUwZV=Be#dK)>dfAWhmKx2W}abPPnrfG}%myi=p20
zov(+X%2y211|KyW-3YNXy=0K}umJ1lz(?JERA&TS#Xd%%3qA3S)#f4B{{fW8bC@IQ
zvE4F7g0E12WQm3OntR>zHMt`ZC>5bAy8r1-B_L|2XNo~vvd!DXkcX<(7v5A@i8hR@
zK8L9-o?@Jm8&%l_tBU1n%`nvB1TmYtRq1IqV%@xGlL|M6<oq>1F?r)1b7SLAn{j<%
zd+6BVj{km3m|m?iQw!Wfi)8<r?RMi6&XV{^sC5WJn4MX>%ja$2jo#e|`KYh`+*y{J
z)TU+0B{~5P7yx=H=ZDWC+H@Wz9?5HLx)ViB1H`CiY%rA^{gy5qe)of_@zXdtFO_gy
zg|MSfqRP#u!wnObEtVv@0B7gg7Qv@>n%lV@$GBNK@K-Q;e@5}YcQwzwS;vi78YN;z
z_S{YoJWJuE2FsFNQ5$K|L*7KZYozw;eVD)Kt8_4@z^GF_Hzamk%e8#(epnF`7wry{
zt2SWq&m|q+o5??C618-i`msf!9m(I?i=UrfHk!CltafLdPL$Tm2^b}37>(a@??Jka
z-J?ZUAC(q1=Ob#?1cGjwF3jZsy3Ir45_Cec^92ZPG9u}nM$m3>v-6lC5pRTMaM0ZQ
zngG^k`6I8aWh|ef+!_SM$6HN>#Farjsmg0YwYZEpv^+dPR&<NjKJ`ot{KRpnyT0`{
zc|>SoIM7q?M(wI{2%8BlP{FQJE|8eK{SP(m4o|FYS2Vqcu$Esox$HP9kzEv1qI1JO
zLQuAH2IuE8ATo=S66a9pOI;{x<0GutgEy9jd#UT*5L*SbUMq+MvJsJsL00CT4od?f
zl>aon>3WIjYxe>h5s6pf>q{iQXtvyMw;L?P*K!;68yL+<O=h@sK=BQG5r3o*p1+oJ
z&xo49IYh8pUrDR^!lCxIEy+6L=XA4+T_bru<={6@4wXw@9~!e^R_rEf+A&53)wJeC
zhZ@WG&v?>*S6nc-;t`)?T|TUon5SD@{I0K$x}bj6soA1@YsO{EEwjyKZ6Sq(DEmx|
zqz@wZ9J|mUY16VJN_XtF3P7T=*V>}pQb)-R#AFNdoBi<Ga|w?)&#GU-IB`dl%CRm|
zP^sUS#*~K`;A=yj{{9&RX2AkJyTmZdSgTd`!K;5u&c;xcwouVb)VWi6X#DG7L@XPu
zJGqK)y+&ttYjpE;>KpT=Z=3WBkWZ6ek)zgp@${!Z-yQrWA7kfm*h~=|=bEyXnLr93
z$3^$6_l#j9wIiZ<#^Q>HWVJu>!@eiD4&~BLjX$Y{jeU=+VwH!hcTao48qYkSjAj}y
z*RcO|#E)8uj^X28N9TmG)>R{=f@$GxM%9)0PtS2?Z*m;2i`AB-Fr>fA8eqWg;WMbW
z7G@veL}<OfH|$;8L3F?FSM{8x1Z%U#X1$suRe%-Eu6jEVjFos%ELEK;S32&nS{O|_
ze3n>YQtYq&FxDMzbZ!gImPwS2|78AvRB|_Ob;YNROi!wu$ZFY?m$;Y~ZHSmtY_e5k
zfSW>6JQ(u7pl<&z06#@o&`1`WwD3rqsOjR^pBo*g6cn~yQiWIBxT%<(4cYK2IO>{C
zEFaHc=s-5#60J`o0v=xPRTNNDs@<p|kwEDoeC1-0gBosO1r(u@P6#uba4zJ8?FIHx
z*IKig!bRQG@i9#{P)A&I?OAVVQHUPL9mXr6{@b#|=6ID5?!+Xqd>%B_wtd>hX><f0
z&6`C-rFLUqWHLsvdav0o`^<Gb+i<?okN;so!Od3rG3vU(SFuGObi$hNF<fcH`j{O&
zmGS4yyz_L=8%%D*0+JTlji_M`$NW+n{d4ES+D9A<;(ick6IAfYQe=7a*@-{_mOt*`
zD<w0%Gz{<$_w*bC8jsG$_C|ILnzZ-s8{*E?)}+&0tGqv?LJf+pZTNl7-8JSpu@si7
zzNjup3BI>8hkV=0zk1V1)@$dJmM(?r(x)kvvxhFAvoWK>1Ee`5{8z{=1<@Tu%~&;9
z?f3K(fGVcqtNyN$k(!4NMHG`x`Bzk59&u(f=V=-ONL!N9RGvmqjJ2OkBMz&Cbqptj
z+fO6c-wOpi=R0pcII`i+<n!&YjHRyS&o_U<XTcE?N&fB;@nc1OkG?LzuE9|8pLIru
z@Mw@TG73_xHKrp^y5}xdy&k;M@~%zqT-!bVYpWjVsv9?bUqQb1CRNY<1a}p`gqd>s
zJ8Um9som7v>S4lJ_0#TdS<ton>kGa453*`rq*q>SKu9gj6A6_uGh&jN<yJS7Ssc?D
za$XVbM^U$>*?-n_|K<rB5ULqR8%%6ym7jsb7MLnLIsT767U7Kj{`F?@p5!=F`;Dw_
z`Au}~`l}Y{l+7{9cj;h1OMFo5lZ`+O@;>MtpRo!`m?Zj6Yt)O@8r8^P%dXn1c~Ix`
zNf3K|#Oidf<@F2%%Dj0H&C$(O-89^6+HJn1lHg}i7RgZ$Yvz71AT&#FyGz6qV!+1W
z)IoW{-K>|NGn8mcDbol3E)JW-C3|<rkz?2T-2d7n5<k7&e1?;uuW1^!Igd5o-+)&w
z^^)nEv^`vjgg=22hZX72t>eJ;@9*Wwm0GYC{x4nYkw{;H179RzTQ&G}XQJ73T}Vlk
zggE<6KT7o}G0xgT9Do1#KlJhm`1TSUd+T=6Ps6j4werO4)pj})-ur~rEE$fLf|Wx$
zQ`S+;soUwOg?b^ow@@@RAy_v|HTqAD0-FO}+Dee}y4KQ%nO<Go`;Ucz`zMARQqcjQ
zun{T={iazLS1*5}W3XfYs5VZC78hj@H3<+QFfDnQG|PBx5L->*)q8rNWuaQlxIy=k
zA6#cpJ##QEKmR&bqD45`t*7^3M!dA?q^aV_=<I9FQT}$5E$V#jH+Zz#the5bIdXM9
zeW2$qu{1Yldu}xuzGSs^(-yWRa8~n;A5LkUQ^}E$$Isjsx3)Z=Urdr3rx8?Xx0r9<
zQBV%t51j;nFC3|}+diOwtzv|2=hW0vG$tiki7X}Fb@?RJ4;WRd#QHP|Ajdy%D3X{o
zA;5Ly#jZ)~4eHPU6}i?>$NqgU5Y#9$A3L*LxVO~Au3(#>KBqz@E*XykEEuPS>2&oH
zH}f)6LWP0ZPhM0hLI*6quq+fUG_|Q{&9nv_R!BDLUIHsXyS*paU+(f(t9hAL(G?R5
zAG@8LcIoR9i#tW*zTFJehQC3!QOL5Ex-GYUxBb{|STL0^<SALTaMu*;UL@wCu?Gyh
z(AuXj=Ho!@S%ml$<?!ttcy|bt%_TdNM#_k&-TIM}pmqrWlBig6n9!^<R4jtC@Y@WY
z%m4ONgWr&?cIyZ9G!URn$CMk*dKwD7B`}~I)!@wp6#h9D{A9{aWCjI*78-OMiHc>u
zsfPr2T2cfOoMMt`P`Q9lJ_S0C?|;Rd7-<Y^C8?}mpitN6Pqod&afT!OO$#dk(6xjK
zQ^VS8Tf*wNtXO8dkRv|{NQ{F!8yIDz?nMt6u=R$~u*_dZv*KIA&=-VV?P6WzOe|=v
zC%-p&^YH;Ke2ePTs9ANI;*Y{1zbJja!8344lb-S}ucOw~UqWw5P$ah$3ItqnwJW=w
z+1Gk^>q$opg_#%CtU8KXIZA3){e_;UtgKW5V8E;P_N6AH(+~szvO$VZFijua4*Vtc
zyUGx~0nA!Kc`egCD=QW73&JAU&u%Ci2KByB3d9xX7*e+;PAk!b0)TX10+bon-bf*9
zQ-Xb2Iq4exmIny=0%t+NX4MnComd{zxj{ZUW~vZ&MRQ5+&0!4mz-1~Hc4jo|ocfiK
zhIr_2F|SK49N-&1`NC(L+g%WPzz*`idT3G<ti4i=8DLX@0BUfGXzmcGH-D;TKLB{~
z<Y3}v)qDObatdIT&bd#+3;_86rhlG7Ryk@hz}uJ1Tn(^h-UeD+qyD2<6Hlic1$1#Q
zL7wn$M-0jVz>N^--M@Pqy?THGsHlBEU|2%lVuLpAubtTnzAzayD;Z#!zl||}(sxvP
zs?RQF)9mjEX8?fD8-HbM^6bFd!s?`9X=(xLNzQ;1M-&y%A~UN#$%STZ?X!S}B+M3l
z?!?eI7E>7l0G#@Nv4iw~Rb-ACvA5L!i=-hKK+*AnQCc}Fup$h4OUMiYe|ZB?bMrfZ
kw}yRSL9=>me~CD!u5Z8hOYE@N7ND%VTKbx0ckEvN9}$tyO8@`>

delta 4580
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

diff --git a/icons/effects/weather_vr.dmi b/icons/effects/weather_vr.dmi
deleted file mode 100644
index 0d977a2f15b4a19b0d5a50882ba90b9d530fbcb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 992
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRS6RScZN?cNllZ!G7N;32F7#J$%
zwDxS|I%FW?`h3s&9b2*mf>~qlDQQkx__sYFNP5Fs75=65?-i8%ik2DA34VNKUM&A@
z%c>(WmyDV>-p}#04W1y_6YHGS^U~^6bXP@ZLP+`i)U_V1Q@ADCu1xqV!Y$z*q<HTS
zm)l}{iQFwepG{AdTjcSp+Tw-$3b)(QH_lz;{yxW0Z?4O->kJIcT%InDAr*7p-aQz4
z$3Ubtab{W&!<(gImsmn3GX=FqPx$W17?NxzGs*Zy!tcy4DtG@!Z*oYh>95JXC+VME
z@kdm~_hJ9@Pl`6b_4eD@?OgZ&!7i&if((T$4l;}a?hHq$#JnR?w|?Dy{tf&7e2ua5
zdENc`*Xq}=-Y|UPXs}>X=ws+mW_Uy;X5J~wYWe2fGal`E@^tz4!iofT4#fz+I-irj
zt>t{|m=b<E2lW)sJp40nZb-`9N$R;LE3Njd`}pJiN6TVPf#a$R7!9x9blfh`z*bQ<
zA&tp_edn=Tj$P#qQy$H6&0kqnQo(L<E5Y(-?L$3>7-QK3v$NO@*%Mwb*k*U;N7S<i
z`)%iSZx2a7b!F|ID?8sjRTYnX{(t}0+1?I4nQ>gT3_qS<<_pN0t=T)dUVc6kkaf^9
zPIk#}ArJPAr4#b38ny>ocVx2fnDtG+UR`#{sz=rhpGtiD%gP&8U-#KM`F=I~Lgtc3
zKpn4lGgx)pUCD5z>RIiTYxQz#FPmnacl2XjaLxF=zzYTUNb3_*ikI!=uI6y8*1MO~
z!k47ixcB_g=$;FXJ9zI1#$Vp^M`FK#S)ud`OY!~g51+JO@L+hMaDB=P1@-yNJ?7%|
z$2w$N_%5u7l3mj2?ZCfg_wmTBRve!h*bVs$1pGyRAF^o>{LHYTsj`8$M8NtPV_yC9
z1*!S`pBd&R%Q2{(VU_?|G=tqhVqtTE^p57rhOQaxA1=FqtT5mQx^KIEvRs0|8Rn2B
zcN{q!F1%CNqkmw<cRnX}aQN@hcaV9{%~3L8bwxabPepu##XF`Wrk5G_tSl3_C;p-D
zJF7|FmG`f{9{bI7<m0{uw-5Uox?d=4<NL%`{qG3h=I%0kV3uX@boFyt=akR{0O`h_
A>Hq)$

diff --git a/vorestation.dme b/vorestation.dme
index 8feff524ff1..6c008d53faf 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"