From ea22a09adb1c1e9059d0b77c61dbff81eb62663b Mon Sep 17 00:00:00 2001
From: forest2001 <ingram.josh@gmail.com>
Date: Mon, 4 Mar 2024 23:09:13 +0000
Subject: [PATCH] conflicts

---
 maps/map_files/USS_Almayer/USS_Almayer.dmm | 32 ++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index bd016443dfaf..e91a32a20bac 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -16679,6 +16679,15 @@
 	icon_state = "cargo"
 	},
 /area/almayer/living/tankerbunks)
+"bTo" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E"
+	},
+/obj/structure/pipes/vents/pump/no_boom/gas{
+	vent_tag = "Server chamber"
+	},
+/turf/open/floor/almayer/aicore/glowing/no_build,
+/area/almayer/command/airoom)
 "bTq" = (
 /obj/structure/machinery/door/airlock/almayer/secure/reinforced{
 	name = "\improper Evacuation Airlock PL-3";
@@ -26212,6 +26221,16 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/req)
+"eHe" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	layer = 3.3
+	},
+/obj/structure/pipes/vents/pump/no_boom/gas{
+	vent_tag = "CPU Chamber"
+	},
+/turf/open/floor/almayer/aicore/glowing/no_build,
+/area/almayer/command/airoom)
 "eHx" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/faxmachine/uscm/command,
@@ -46011,7 +46030,8 @@
 /turf/closed/wall/almayer,
 /area/almayer/engineering/lower/workshop/hangar)
 "lFq" = (
-/obj/structure/pipes/vents/pump/no_boom{
+/obj/structure/pipes/vents/pump/no_boom/gas{
+	vent_tag = "Operations - Observation";
 	dir = 1
 	},
 /turf/open/floor/almayer/aicore/no_build{
@@ -58350,7 +58370,8 @@
 	},
 /area/almayer/hallways/lower/starboard_midship_hallway)
 "pYi" = (
-/obj/structure/pipes/vents/pump/no_boom{
+/obj/structure/pipes/vents/pump/no_boom/gas{
+	vent_tag = "Access Corridor";
 	dir = 8
 	},
 /turf/open/floor/almayer/aicore/no_build{
@@ -82854,7 +82875,8 @@
 	},
 /area/almayer/maint/hull/lower/l_m_s)
 "yit" = (
-/obj/structure/pipes/vents/pump/no_boom{
+/obj/structure/pipes/vents/pump/no_boom/gas{
+	vent_tag = "Operations - Records";
 	dir = 1
 	},
 /turf/open/floor/almayer/aicore/no_build,
@@ -140025,7 +140047,7 @@ qQS
 bIp
 fKe
 dDp
-dDp
+eHe
 frM
 lcg
 daz
@@ -142055,7 +142077,7 @@ qQS
 mFN
 igr
 sEK
-sEK
+bTo
 mlb
 lcg
 daz