Fixes a piece of wall by cryo

maps/tether/tether-03-surface3.dmm

@@ -288210,6 +288210,47 @@ aaa
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/barbackmaintenance)
+<<<<<<< HEAD
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+"bgU" = (
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/sleep/cryo)
+"bgV" = (
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/obj/effect/landmark{
+	name = "JoinLateCyborg"
+	},
+/obj/effect/floor_decal/techfloor{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/crew_quarters/sleep/cryo)
+=======
+"bgU" = (
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/sleep/cryo)
+"bgV" = (
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/obj/effect/landmark{
+	name = "JoinLateCyborg"
+	},
+/obj/effect/floor_decal/techfloor{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/crew_quarters/sleep/cryo)
+"bgW" = (
+/turf/simulated/wall/r_wall,
+/area/tether/surfacebase/shuttle_pad)
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 "bgX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -288217,6 +288258,33 @@ aaa
 /obj/machinery/camera/network/research/xenobio,
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/xenobiology/outpost_autopsy)
+<<<<<<< HEAD
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+"bgY" = (
+/obj/effect/floor_decal/techfloor,
+/obj/machinery/camera/network/tether{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/crew_quarters/sleep/cryo)
+=======
+"bgY" = (
+/obj/effect/floor_decal/techfloor,
+/obj/machinery/camera/network/tether{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/crew_quarters/sleep/cryo)
+"bgZ" = (
+/turf/simulated/wall/r_wall,
+/area/tether/surfacebase/southhall)
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 "bha" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -308982,6 +309050,7 @@ aWc
 aWP
 aKU
 aOI
+<<<<<<< HEAD
 aPb
 aac
 aac
@@ -308990,6 +309059,25 @@ aac
 aac
 aac
 aac
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+aPb
+bdz
+bdz
+bdz
+bdz
+bdz
+bdz
+bdz
+=======
+bgW
+bdz
+bdz
+bdz
+bdz
+bdz
+bdz
+bdz
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 aac
 aac
 bhE
@@ -309124,6 +309212,7 @@ aWK
 aWP
 aKU
 aOI
+<<<<<<< HEAD
 aPb
 aac
 aac
@@ -309132,6 +309221,25 @@ aac
 aac
 aac
 aac
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+aPb
+bdE
+bdE
+bdE
+bdz
+bfa
+bfa
+bdz
+=======
+bgW
+bdE
+bdE
+bdE
+bdz
+bfa
+bfa
+bdz
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 aac
 aac
 bhE
@@ -309266,6 +309374,7 @@ jHw
 jHw
 aKU
 aOK
+<<<<<<< HEAD
 aKj
 jBt
 jBt
@@ -309274,6 +309383,25 @@ jBt
 jBt
 jBt
 jBt
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+aKj
+bdL
+bdL
+bdL
+bdz
+bfr
+bgV
+bdz
+=======
+bgW
+bdL
+bdL
+bdL
+bdz
+bfr
+bgV
+bdz
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 aac
 aac
 bhE
@@ -309420,6 +309548,7 @@ bbX
 >>>>>>> 544f25a31d... Merge pull request #10379 from TheFurryFeline/TFF-Move_Syringe_Gun
 aKU
 aOI
+<<<<<<< HEAD
 aKj
 kUh
 vWL
@@ -309428,6 +309557,25 @@ wWo
 rPu
 ixw
 bhE
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+aKj
+bdN
+bdX
+bdX
+bel
+bfs
+bcv
+bdz
+=======
+bgW
+bdN
+bdX
+bdX
+bel
+bfs
+bcv
+bdz
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 bhE
 bhE
 bhE
@@ -309562,6 +309710,7 @@ aKU
 aKU
 aKU
 aOI
+<<<<<<< HEAD
 aKj
 uIY
 udd
@@ -309570,6 +309719,25 @@ cSL
 csd
 ehr
 bhE
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+aKj
+bdR
+bdY
+bdY
+bdY
+bdY
+bgY
+bdz
+=======
+bgW
+bdR
+bdY
+bdY
+bdY
+bdY
+bgY
+bdz
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 bhF
 aLW
 bhQ
@@ -309704,6 +309872,7 @@ aKU
 aKU
 aKU
 aOI
+<<<<<<< HEAD
 aKj
 hqs
 nJe
@@ -309712,6 +309881,25 @@ cSL
 csd
 hQl
 bhE
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+aKj
+bdT
+bef
+bef
+beP
+bfw
+bdc
+bdz
+=======
+bgW
+bdT
+bef
+bef
+beP
+bfw
+bdc
+bdz
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 bhG
 bhN
 bhR
@@ -309846,6 +310034,7 @@ aKV
 aKV
 aKV
 aOL
+<<<<<<< HEAD
 aKj
 gTL
 udd
@@ -309854,6 +310043,25 @@ ddl
 hmT
 gSr
 bhE
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+aKj
+bdU
+bdU
+bdU
+bdz
+bfx
+bhb
+bdz
+=======
+bgW
+bdU
+bdU
+bdU
+bdz
+bfx
+bhb
+bdz
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 aLu
 bhO
 aMs
@@ -309988,6 +310196,7 @@ aMU
 aKe
 aKe
 aKe
+<<<<<<< HEAD
 aKj
 ooI
 uQt
@@ -309996,6 +310205,25 @@ tit
 mYT
 geQ
 bhE
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+aKj
+bdW
+bdW
+bdW
+bdz
+bgb
+bhc
+bdz
+=======
+bgW
+bdW
+bdW
+bdW
+bdz
+bgb
+bhc
+bdz
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 bhE
 bhP
 bhT
@@ -310130,6 +310358,7 @@ aKj
 aKj
 aKf
 aKf
+<<<<<<< HEAD
 aPs
 aPs
 aPs
@@ -310138,6 +310367,25 @@ bhh
 aPs
 yir
 aPs
+||||||| parent of cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
+aPs
+bdz
+bdz
+bdz
+bdz
+bgU
+bhd
+bdz
+=======
+bgZ
+bdz
+bdz
+bdz
+bdz
+bgU
+bhd
+bdz
+>>>>>>> cc97bc7c6a... Merge pull request #10467 from Heroman3003/mapfix5
 aPs
 aPs
 aPs