Merge pull request #28031 from zaredman/revert-27916-xmas2019

Revert "Map the Christmas tree"

maps/torch/torch3_deck3.dmm

@@ -3253,6 +3253,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "gz" = (
@@ -3781,9 +3784,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/item/clothing/head/festive,
-/obj/item/clothing/head/festive,
-/turf/simulated/floor/carpet/green,
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "hx" = (
 /obj/structure/fitness/weightlifter,
@@ -5263,6 +5267,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "kc" = (
@@ -7684,14 +7691,16 @@
 /turf/simulated/floor/plating,
 /area/thruster/d3port)
 "pw" = (
+/obj/structure/railing/mapped{
+	dir = 8;
+	icon_state = "railing0-1";
+	tag = "icon-railing0 (EAST)"
+	},
 /obj/structure/railing/mapped{
 	dir = 1;
 	icon_state = "railing0-1"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/bed/chair{
-	dir = 1
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/thirddeck/starboard)
 "py" = (
@@ -8590,9 +8599,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/item/clothing/head/festive,
-/obj/item/clothing/head/festive,
-/turf/simulated/floor/carpet/green,
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "rN" = (
 /obj/machinery/atmospherics/binary/pump/on{
@@ -12190,9 +12200,13 @@
 	dir = 4;
 	pixel_x = 24
 	},
-/obj/item/clothing/head/festive,
-/obj/item/clothing/head/festive,
-/turf/simulated/floor/carpet/green,
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
+/obj/structure/bed/chair{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "Ar" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -12271,9 +12285,11 @@
 /obj/machinery/light/spot{
 	dir = 1
 	},
-/obj/item/clothing/head/festive,
-/obj/item/clothing/head/festive,
-/turf/simulated/floor/carpet/green,
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
+/obj/machinery/vending/cigarette,
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "AD" = (
 /obj/structure/table/standard,
@@ -16743,10 +16759,6 @@
 /obj/effect/shuttle_landmark/ert/deck3,
 /turf/space,
 /area/space)
-"Me" = (
-/obj/machinery/vending/cigarette,
-/turf/simulated/floor/plating,
-/area/maintenance/thirddeck/starboard)
 "Mf" = (
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled/techfloor,
@@ -17449,10 +17461,6 @@
 	tag = "icon-railing0 (EAST)"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/computer/modular/preset/civilian{
-	icon_state = "console";
-	dir = 1
-	},
 /turf/simulated/floor/plating,
 /area/maintenance/thirddeck/starboard)
 "Ou" = (
@@ -18937,6 +18945,9 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "ST" = (
@@ -18982,9 +18993,10 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/obj/item/clothing/head/festive,
-/obj/item/clothing/head/festive,
-/turf/simulated/floor/carpet/green,
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "Te" = (
 /obj/structure/table/steel,
@@ -20046,9 +20058,10 @@
 	name = "Hydroponics";
 	sort_type = "Hydroponics"
 	},
-/obj/item/clothing/head/festive,
-/obj/item/clothing/head/festive,
-/turf/simulated/floor/carpet/green,
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "VU" = (
 /turf/simulated/floor/tiled,
@@ -20743,16 +20756,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/hallway/primary/thirddeck/aft)
-"XQ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/obj/structure/flora/tree/pine/xmas,
-/obj/item/clothing/head/festive,
-/obj/item/clothing/head/festive,
-/turf/simulated/floor/carpet/green,
-/area/crew_quarters/mess)
 "XR" = (
 /turf/simulated/floor/tiled,
 /area/crew_quarters/cryolocker)
@@ -21370,14 +21373,16 @@
 /turf/simulated/floor/plating,
 /area/maintenance/thirddeck/foreport)
 "ZK" = (
+/obj/effect/floor_decal/corner/blue/diagonal{
+	dir = 4
+	},
 /obj/machinery/alarm{
 	dir = 8;
 	icon_state = "alarm0";
 	pixel_x = 24
 	},
-/obj/item/clothing/head/festive,
-/obj/item/clothing/head/festive,
-/turf/simulated/floor/carpet/green,
+/obj/machinery/computer/modular/preset/civilian,
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/mess)
 "ZN" = (
 /turf/simulated/wall/r_wall/hull,
@@ -39299,7 +39304,7 @@ wn
 Pn
 bA
 AC
-XQ
+Tb
 hw
 iv
 gz
@@ -40715,7 +40720,7 @@ cl
 NH
 Ux
 cl
-Me
+aY
 vd
 RB
 RB