Skip to content

Commit

Permalink
Grass related
Browse files Browse the repository at this point in the history
  • Loading branch information
Very-Soft committed Mar 6, 2024
1 parent 6f35a7d commit 686536d
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 5 deletions.
6 changes: 6 additions & 0 deletions code/game/turfs/flooring/flooring.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
14 changes: 14 additions & 0 deletions code/game/turfs/flooring/seasonal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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()

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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"
4 changes: 4 additions & 0 deletions code/game/turfs/simulated/floor_icon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 1 addition & 5 deletions maps/groundbase/rp-z3.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down

0 comments on commit 686536d

Please sign in to comment.