Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

code/game/objects/effects/countdown.dm

@@ -20,7 +20,7 @@
 
 /obj/effect/countdown/examine(mob/user)
 	. = ..()
-	to_chat(user, "This countdown is displaying: [displayed_text].")
+	. += "This countdown is displaying: [displayed_text]."
 
 /obj/effect/countdown/proc/attach(atom/A)
 	attached_to = A

code/game/objects/effects/decals/cleanable/humans.dm

@@ -130,12 +130,10 @@
 /obj/effect/decal/cleanable/blood/footprints/examine(mob/user)
 	. = ..()
 	if(shoe_types.len)
-		. += "You recognise the footprints as belonging to:\n"
+		. += "You recognise the footprints as belonging to:"
 		for(var/shoe in shoe_types)
 			var/obj/item/clothing/shoes/S = shoe
-			. += "some <B>[initial(S.name)]</B> [icon2html(initial(S.icon), user)]\n"
-
-	to_chat(user, .)
+			. += "some <B>[initial(S.name)]</B> [icon2html(initial(S.icon), user)]"
 
 /obj/effect/decal/cleanable/blood/footprints/replace_decal(obj/effect/decal/cleanable/C)
 	if(blood_state != C.blood_state) //We only replace footprints of the same type as us

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

@@ -234,5 +234,5 @@
 /obj/effect/turf_decal/trimline/neutral/filled/corner
 	icon_state = "trimline_corner_fill"
 
-/obj/effect/turf_decal/trimline/brown/filled/end
+/obj/effect/turf_decal/trimline/neutral/filled/end
 	icon_state = "trimline_end_fill"

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

@@ -9,4 +9,17 @@
 /obj/effect/turf_decal/weather/snow/corner
 	name = "snow corner piece"
 	icon = 'icons/turf/snow.dmi'
-	icon_state = "snow_corner"
+	icon_state = "snow_corner"
+
+/obj/effect/turf_decal/weather/dirt
+	name = "dirt siding"
+	icon = 'icons/turf/decals.dmi'
+	icon_state = "dirt_side"
+
+/obj/effect/turf_decal/weather/sand
+	name = "sand siding"
+	icon = 'icons/misc/beach.dmi'
+	icon_state = "sand_side"
+
+/obj/effect/turf_decal/weather/sand/light
+	icon_state = "lightsand_side"

code/game/objects/effects/glowshroom.dm

@@ -36,7 +36,7 @@
 
 /obj/structure/glowshroom/examine(mob/user)
 	. = ..()
-	to_chat(user, "This is a [generation]\th generation [name]!")
+	. += "This is a [generation]\th generation [name]!"
 
 /obj/structure/glowshroom/Destroy()
 	if(myseed)

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -315,6 +315,11 @@
 	randomdir = 0
 	duration = 6
 
+/obj/effect/temp_visual/desynchronizer
+	name = "desynchronizer field"
+	icon_state = "chronofield"
+	duration = 3
+
 /obj/effect/temp_visual/impact_effect
 	icon_state = "impact_bullet"
 	duration = 5