From 686536d916f66f5cd217f1315c6c26031f7d267f Mon Sep 17 00:00:00 2001
From: VerySoft <a.roaming.shadow@gmail.com>
Date: Wed, 6 Mar 2024 14:11:05 -0500
Subject: [PATCH] Grass related

---
 code/game/turfs/flooring/flooring.dm    |  6 ++++++
 code/game/turfs/flooring/seasonal.dm    | 14 ++++++++++++++
 code/game/turfs/simulated/floor_icon.dm |  4 ++++
 maps/groundbase/rp-z3.dmm               |  6 +-----
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index f2051fa1343..8c6d5fd5448 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -117,6 +117,9 @@ var/list/flooring_types
 
 	var/check_season = FALSE	//VOREStation Addition
 	var/preset_season = null	//RS ADD
+	var/skipseason = null		//RS ADD
+	var/replacement_season = null	//RS ADD
+
 
 /decl/flooring/proc/get_plating_type(var/turf/T)
 	return plating_type
@@ -644,3 +647,6 @@ var/list/flooring_types
 	preset_season = "autumn"
 /decl/flooring/grass/seasonal_grass/winter
 	preset_season = "winter"
+/decl/flooring/grass/seasonal_grass/skipwinter_autumn
+	skipseason = "winter"
+	replacement_season = "autumn"
diff --git a/code/game/turfs/flooring/seasonal.dm b/code/game/turfs/flooring/seasonal.dm
index 24fc5431992..bbd425bfb18 100644
--- a/code/game/turfs/flooring/seasonal.dm
+++ b/code/game/turfs/flooring/seasonal.dm
@@ -18,6 +18,7 @@ var/world_time_day
 			world_time_season = "winter"
 	world_time_day = text2num(time2text(world.timeofday, "DD"))
 	world_time_year = text2num(time2text(world.timeofday, "YYYY"))
+	world_time_season = "winter"
 
 /turf/simulated/floor/outdoors/grass/seasonal
 	name = "grass"
@@ -36,6 +37,8 @@ var/world_time_day
 	var/tree_types = list()
 	var/snow_chance = 10
 	var/preset_season = null
+	var/skipseason = null
+	var/replacement_season = null
 
 /turf/simulated/floor/outdoors/grass/seasonal/Initialize()
 
@@ -217,6 +220,11 @@ var/world_time_day
 		if(preset_season == "spring" || "summer" || "autumn" || "winter")
 			ourseason = preset_season
 
+	else if(skipseason && replacement_season)
+		if(ourseason == skipseason)
+			if(replacement_season == "spring" || "summer" || "autumn" || "winter")
+				ourseason = replacement_season
+
 	switch(ourseason)
 		if("spring")
 			if(prob(50))
@@ -323,3 +331,9 @@ var/world_time_day
 	initial_flooring = /decl/flooring/grass/seasonal_grass/winter
 	color = "#0066ff"
 	preset_season = "winter"
+
+/turf/simulated/floor/outdoors/grass/seasonal/preset/skipwinter_autumn
+	initial_flooring = /decl/flooring/grass/seasonal_grass/skipwinter_autumn
+	color = "#ff00c8"
+	skipseason = "winter"
+	replacement_season = "autumn"
diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm
index 6cdab59b08e..889f1610274 100644
--- a/code/game/turfs/simulated/floor_icon.dm
+++ b/code/game/turfs/simulated/floor_icon.dm
@@ -30,6 +30,10 @@ var/image/no_ceiling_image = null
 				if(flooring.preset_season)
 					if(flooring.preset_season == "spring" || "summer" || "autumn" || "winter")
 						ourseason = flooring.preset_season
+				else if(flooring.skipseason && flooring.replacement_season)
+					if(ourseason == flooring.skipseason)
+						if(flooring.replacement_season == "spring" || "summer" || "autumn" || "winter")
+							ourseason = flooring.replacement_season
 
 				icon_state = "[icon_state]-[ourseason]"	//VOREStation Addition End
 			if(flooring.has_base_range)
diff --git a/maps/groundbase/rp-z3.dmm b/maps/groundbase/rp-z3.dmm
index 6bc5900f964..3fade9091db 100644
--- a/maps/groundbase/rp-z3.dmm
+++ b/maps/groundbase/rp-z3.dmm
@@ -719,11 +719,7 @@
 /turf/simulated/floor/wood,
 /area/groundbase/hotspring)
 "mv" = (
-/turf/simulated/floor/outdoors/grass/seasonal/preset/autumn{
-	animal_chance = 0;
-	grass_chance = 0;
-	tree_chance = 0
-	},
+/turf/simulated/floor/outdoors/grass/seasonal/preset/skipwinter_autumn,
 /area/groundbase/level3/nw)
 "mw" = (
 /obj/structure/railing/grey{