Snowdin 2.0

code/game/objects/effects/decals/remains.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /obj/effect/decal/remains
 	name = "remains"
 	gender = PLURAL
@@ -27,4 +28,38 @@
 
 /obj/effect/decal/cleanable/robot_debris/old
 	name = "dusty robot debris"
+=======
+/obj/effect/decal/remains
+	name = "remains"
+	gender = PLURAL
+	icon = 'icons/effects/blood.dmi'
+
+/obj/effect/decal/remains/acid_act()
+	visible_message("<span class='warning'>[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!</span>")
+	playsound(src, 'sound/items/welder.ogg', 150, 1)
+	new /obj/effect/decal/cleanable/greenglow(drop_location())
+	qdel(src)
+
+/obj/effect/decal/remains/human
+	desc = "They look like human remains. They have a strange aura about them."
+	icon_state = "remains"
+
+/obj/effect/decal/remains/plasma
+	icon_state = "remainsplasma"
+
+/obj/effect/decal/remains/xeno
+	desc = "They look like the remains of something... alien. They have a strange aura about them."
+	icon_state = "remainsxeno"
+
+/obj/effect/decal/remains/xeno/larva
+	icon_state = "remainslarva"
+
+/obj/effect/decal/remains/robot
+	desc = "They look like the remains of something mechanical. They have a strange aura about them."
+	icon = 'icons/mob/robots.dmi'
+	icon_state = "remainsrobot"
+
+/obj/effect/decal/cleanable/robot_debris/old
+	name = "dusty robot debris"
+>>>>>>> 6c2db52... Snowdin 2.0 (#35000)
 	desc = "Looks like nobody has touched this in a while."

code/game/objects/effects/decals/turfdecal/weather.dm

@@ -0,0 +1,12 @@
+/obj/effect/turf_decal/weather
+	name = "sandy floor"
+	icon_state = "sandyfloor"
+
+/obj/effect/turf_decal/weather/snow
+	name = "snowy floor"
+	icon_state = "snowyfloor"
+
+/obj/effect/turf_decal/weather/snow/corner
+	name = "snow corner piece"
+	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow_corner"