Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix

code/game/objects/effects/overlays.dm

@@ -52,3 +52,48 @@
 	..()
 	pixel_x += rand(-10, 10)
 	pixel_y += rand(-10, 10)
+
+/obj/effect/overlay/snow
+	name = "snow"
+	icon = 'icons/turf/overlays.dmi'
+	icon_state = "snow"
+	anchored = 1
+
+/obj/effect/overlay/snow/floor
+	icon_state = "snowfloor"
+	layer = 2.01 //Just above floor
+
+/obj/effect/overlay/snow/floor/edges
+	icon_state = "snow_edges"
+
+/obj/effect/overlay/snow/floor/surround
+	icon_state = "snow_surround"
+
+/obj/effect/overlay/snow/airlock
+	icon_state = "snowairlock"
+	layer = 3.2 //Just above airlocks
+
+/obj/effect/overlay/snow/floor/north
+	icon_state = "snowfloor_n"
+
+/obj/effect/overlay/snow/floor/south
+	icon_state = "snowfloor_s"
+
+/obj/effect/overlay/snow/floor/east
+	icon_state = "snowfloor_e"
+
+/obj/effect/overlay/snow/floor/west
+	icon_state = "snowfloor_w"
+
+/obj/effect/overlay/snow/wall/north
+	icon_state = "snowwall_n"
+	layer = 5 //Same as lights so humans can stand under it
+
+/obj/effect/overlay/snow/wall/south
+	icon_state = "snowwall_s"
+
+/obj/effect/overlay/snow/wall/east
+	icon_state = "snowwall_e"
+
+/obj/effect/overlay/snow/wall/west
+	icon_state = "snowwall_w"

code/game/turfs/flooring/flooring.dm

@@ -56,6 +56,26 @@ var/list/flooring_types
 	flags = TURF_HAS_EDGES | TURF_REMOVE_SHOVEL
 	build_type = null
 
+/decl/flooring/snow
+	name = "snow"
+	desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is."
+	icon = 'icons/turf/snow.dmi'
+	icon_base = "snow"
+	flags = TURF_HAS_EDGES
+
+/decl/flooring/snow/gravsnow
+	name = "snow"
+	icon_base = "gravsnow"
+
+/decl/flooring/snow/plating
+	name = "snowy plating"
+	desc = "Steel plating coated with a light layer of snow."
+	icon_base = "snowyplating"
+	flags = null
+
+/decl/flooring/snow/plating/drift
+	icon_base = "snowyplayingdrift"
+
 /decl/flooring/carpet
 	name = "carpet"
 	desc = "Imported and comfy."

code/game/turfs/flooring/flooring_premade.dm

@@ -45,6 +45,27 @@
 	icon_state = "reinforced"
 	initial_flooring = /decl/flooring/reinforced
 
+/turf/simulated/floor/snow
+	name = "snow"
+	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow"
+	initial_flooring = /decl/flooring/snow
+
+/turf/simulated/floor/snow/gravsnow
+	name = "snow"
+	icon_state = "gravsnow"
+	initial_flooring = /decl/flooring/snow/gravsnow
+
+/turf/simulated/floor/snow/plating
+	name = "snowy playing"
+	icon_state = "snowyplating"
+	initial_flooring = /decl/flooring/snow/plating
+
+/turf/simulated/floor/snow/plating/drift
+	name = "snowy plating"
+	icon_state = "snowyplayingdrift"
+	initial_flooring = /decl/flooring/snow/plating/drift
+
 /turf/simulated/floor/reinforced/airless
 	oxygen = 0
 	nitrogen = 0
@@ -195,7 +216,6 @@
 
 /turf/simulated/floor/airless/lava
 /turf/simulated/floor/light
-/turf/simulated/floor/snow
 /*
 /turf/simulated/floor/beach
 /turf/simulated/floor/beach/sand
@@ -204,5 +224,5 @@
 /turf/simulated/floor/beach/water
 /turf/simulated/floor/beach/water/ocean
 */
-/turf/simulated/floor/plating/snow
 /turf/simulated/floor/airless/ceiling
+/turf/simulated/floor/plating

code/game/turfs/simulated/floor_types.dm

@@ -40,3 +40,5 @@
 	name = "skipjack floor"
 	oxygen = 0
 	nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
+
+