diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index d180f58de5..6a6023ba17 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -947,12 +947,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/deck/first name = "\improper First Deck" diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 4d54e93b8f..48135496c3 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -241,6 +241,12 @@ var/global/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." diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 95a7dcf100..762859c095 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -431,6 +431,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' diff --git a/icons/obj/christmas.dmi b/icons/obj/christmas.dmi index dfdc46c088..3c7addf9fe 100644 Binary files a/icons/obj/christmas.dmi and b/icons/obj/christmas.dmi differ diff --git a/icons/turf/flooring/fakesnow.dmi b/icons/turf/flooring/fakesnow.dmi new file mode 100644 index 0000000000..7a2ebdaeea Binary files /dev/null and b/icons/turf/flooring/fakesnow.dmi differ