Greenjoe12345/xmas2022

code/game/objects/structures/signs.dm

@@ -948,12 +948,15 @@
 	desc = "Flashy and pretty."
 	icon = 'icons/obj/christmas.dmi'
 	icon_state = "xmaslights"
+	layer = 4.9
+	plane = PLANE_LIGHTING_ABOVE
 
 /obj/structure/sign/christmas/wreath
 	name = "wreath"
 	desc = "Prickly and festive."
 	icon = 'icons/obj/christmas.dmi'
 	icon_state = "doorwreath"
+	layer = 5
 
 /obj/structure/sign/hostilefauna
 	icon = 'icons/obj/decals_vr.dmi'

code/game/turfs/flooring/flooring.dm

@@ -240,6 +240,12 @@ var/list/flooring_types
 		'sound/effects/footstep/snow4.ogg',
 		'sound/effects/footstep/snow5.ogg'))
 
+/decl/flooring/snow/fake
+		desc = "A coating of fake snow, looks surprisingly realistic, though not as cold as the real thing."
+		icon = 'icons/turf/flooring/fakesnow.dmi'
+		icon_base = "snow"
+		flags = TURF_HAS_EDGES | TURF_HAS_CORNERS | TURF_REMOVE_SHOVEL
+
 /decl/flooring/snow/snow2
 	name = "snow"
 	desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is."

code/game/turfs/flooring/flooring_premade.dm

@@ -489,6 +489,12 @@
 	initial_flooring = /decl/flooring/snow
 	var/list/crossed_dirs = list()
 
+/turf/simulated/floor/fakesnow
+	name = "fake snow"
+	icon = 'icons/turf/outdoors.dmi'
+	icon_state = "snow"
+	initial_flooring = /decl/flooring/snow/fake
+
 /turf/simulated/floor/snow/snow2
 	name = "snow"
 	icon = 'icons/turf/snow.dmi'

code/game/turfs/simulated/outdoors/snow.dm

@@ -79,3 +79,4 @@
 	icon_state = "ice"
 	desc = "Looks slippery."
 	movement_cost = 4
+	edge_blending_priority = 0

code/modules/planet/sif.dm

@@ -128,10 +128,8 @@ var/datum/planet/sif/planet_sif = null
 		WEATHER_OVERCAST	= 30,
 		WEATHER_LIGHT_SNOW	= 20,
 		WEATHER_SNOW		= 5,
-		WEATHER_BLIZZARD	= 5,
-		WEATHER_RAIN		= 5,
-		WEATHER_STORM		= 2.5,
-		WEATHER_HAIL		= 2.5
+		WEATHER_BLIZZARD	= 2.5,
+		WEATHER_HAIL		= 5
 		)
 
 /datum/weather/sif
@@ -164,7 +162,6 @@ var/datum/planet/sif/planet_sif = null
 		WEATHER_OVERCAST = 50,
 		WEATHER_LIGHT_SNOW = 10,
 		WEATHER_SNOW = 5,
-		WEATHER_RAIN = 5,
 		WEATHER_HAIL = 5
 		)
 	observed_message = "It is overcast, all you can see are clouds."
@@ -280,8 +277,6 @@ var/datum/planet/sif/planet_sif = null
 	transition_chances = list(
 		WEATHER_OVERCAST = 25,
 		WEATHER_LIGHT_SNOW = 10,
-		WEATHER_RAIN = 50,
-		WEATHER_STORM = 10,
 		WEATHER_HAIL = 5
 		)
 	observed_message = "It is raining."
@@ -338,8 +333,6 @@ var/datum/planet/sif/planet_sif = null
 
 
 	transition_chances = list(
-		WEATHER_RAIN = 45,
-		WEATHER_STORM = 40,
 		WEATHER_HAIL = 10,
 		WEATHER_OVERCAST = 5
 		)
@@ -390,10 +383,8 @@ var/datum/planet/sif/planet_sif = null
 	effect_message = "<span class='warning'>The hail smacks into you!</span>"
 
 	transition_chances = list(
-		WEATHER_RAIN = 45,
-		WEATHER_STORM = 40,
 		WEATHER_HAIL = 10,
-		WEATHER_OVERCAST = 5
+		WEATHER_OVERCAST = 10 //higher chance to switch to overcase since rain/storm are off
 		)
 	observed_message = "Ice is falling from the sky."
 	transition_messages = list(