From cb7233aa72dd1eb7220d28ca4b09dc5cbc9aeaf1 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Sat, 24 Dec 2022 15:23:50 +1000
Subject: [PATCH] Adds some New Year cheer

---
 maps/groundbase/gb-z1.dmm          | 31 +++++++++++++++---------------
 maps/tether/tether-03-surface3.dmm | 17 ++++++++--------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index d923b8ba8ce..432a44282da 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -6073,6 +6073,20 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos/monitoring)
+"np" = (
+/obj/machinery/hologram/holopad,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/obj/structure/flora/tree/pine/xmas/presents,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "nq" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -9436,19 +9450,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
-"vF" = (
-/obj/machinery/hologram/holopad,
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar)
 "vH" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_security{
@@ -14721,7 +14722,7 @@
 	frequency = 1443;
 	level = 3;
 	name = "Distribution and Waste Monitor";
-	sensors = list("dist_main_meter"="Surface - Distribution Loop","scrub_main_meter"="Surface - Scrubbers Loop","mair_main_meter"="Surface - Mixed Air Tank","dist_aux_meter"="Station - Distribution Loop","scrub_aux_meter"="Station - Scrubbers Loop","mair_aux_meter"="Station - Mixed Air Tank","mair_mining_meter"="Mining Outpost - Mixed Air Tank")
+	sensors = list("dist_main_meter" = "Surface - Distribution Loop", "scrub_main_meter" = "Surface - Scrubbers Loop", "mair_main_meter" = "Surface - Mixed Air Tank", "dist_aux_meter" = "Station - Distribution Loop", "scrub_aux_meter" = "Station - Scrubbers Loop", "mair_aux_meter" = "Station - Mixed Air Tank", "mair_mining_meter" = "Mining Outpost - Mixed Air Tank")
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -26537,7 +26538,7 @@ oe
 gF
 FB
 JX
-vF
+np
 Cy
 cN
 Bo
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 2ef7dd857ba..cc976fe650f 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -27413,6 +27413,14 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/third_south)
+"aUq" = (
+/obj/effect/landmark{
+	name = "Observer-Start"
+	},
+/obj/machinery/hologram/holopad,
+/obj/structure/flora/tree/pine/xmas/presents,
+/turf/simulated/floor/wood,
+/area/crew_quarters/bar)
 "aUr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -34068,13 +34076,6 @@
 /obj/structure/sign/botany,
 /turf/simulated/floor/plating,
 /area/hydroponics)
-"bgd" = (
-/obj/effect/landmark{
-	name = "Observer-Start"
-	},
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
 "bge" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -60225,7 +60226,7 @@ asX
 aLd
 aHl
 aIi
-bgd
+aUq
 aLd
 baC
 bcm