merge conflict fixes

fuckiiiinnnn
shiptest-ss13 · Sep 16, 2023 · f9ff908 · f9ff908
1 parent e03c4ae
commit f9ff908
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 688 deletions.
diff --git a/_maps/outpost/hangar/indie_space_40x20.dmm b/_maps/outpost/hangar/indie_space_40x20.dmm
@@ -1,20 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
-/turf/open/floor/plating,
-/area/hangar)
 "ab" = (
 /turf/closed/indestructible/reinforced,
 /area/hangar)
-"ac" = (
-/obj/effect/turf_decal/arrows{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/hangar)
-"ad" = (
-/obj/machinery/atmospherics/components/binary/pump/on,
-/turf/open/floor/plasteel,
-/area/hangar)
 "ae" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{
 	dir = 1
@@ -29,18 +16,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"ag" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/hangar)
-"ah" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/hangar)
 "ai" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
 /obj/machinery/light/floor/hangar,
@@ -53,12 +28,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"ak" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/hangar)
 "al" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
 	dir = 1
@@ -75,31 +44,12 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"an" = (
-/obj/item/pipe/binary,
-/turf/closed/indestructible/reinforced,
-/area/hangar)
-"ao" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	volume = 10000000
-	},
-/turf/open/floor/plasteel,
-/area/hangar)
 "ap" = (
 /obj/effect/landmark/outpost/hangar_dock,
 /turf/open/floor/plating{
 	planetary_atmos = 1
 	},
 /area/hangar)
-"aq" = (
-/turf/open/floor/plasteel,
-/area/hangar)
-"ar" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/hangar)
 "as" = (
 /obj/effect/turf_decal/arrows{
 	dir = 1
@@ -108,15 +58,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"at" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
-/obj/machinery/light/floor/hangar,
-/turf/open/floor/plasteel,
-/area/hangar)
-"au" = (
-/obj/effect/landmark/outpost/elevator,
-/turf/open/floor/plasteel/elevatorshaft,
-/area/hangar)
 "av" = (
 /obj/machinery/atmospherics/components/unary/passive_vent{
 	dir = 1
@@ -133,49 +74,17 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"ax" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning{
-	dir = 4
-	},
-/turf/open/floor/plasteel/tech,
-/area/hangar)
-"ay" = (
-/obj/machinery/elevator_call_button{
-	pixel_y = 25
-	},
-/obj/effect/landmark/outpost/elevator_machine,
-/turf/open/floor/plasteel,
-/area/hangar)
-"az" = (
-/obj/effect/landmark/outpost/hangar_numbers,
-/turf/open/floor/plasteel,
-/area/hangar)
 "aA" = (
 /obj/machinery/light/floor/hangar,
 /turf/open/floor/plasteel{
 	planetary_atmos = 1
 	},
 /area/hangar)
-"aB" = (
-/obj/effect/turf_decal/arrows{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/hangar)
-"aC" = (
-/obj/machinery/light/floor/hangar,
-/turf/open/floor/plasteel,
-/area/hangar)
 "aD" = (
 /turf/open/floor/plating{
 	planetary_atmos = 1
 	},
 /area/hangar)
-"aE" = (
-/obj/machinery/door/airlock,
-/obj/effect/landmark/outpost/elevator_machine,
-/turf/open/floor/plasteel,
-/area/hangar)
 "aF" = (
 /obj/machinery/door/airlock,
 /obj/effect/landmark/outpost/elevator_machine,
@@ -195,23 +104,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"aI" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
-	dir = 1
-	},
-/obj/machinery/light/floor/hangar,
-/turf/open/floor/plasteel,
-/area/hangar)
-"aJ" = (
-/obj/effect/landmark/outpost/hangar_dock,
-/turf/open/floor/plating,
-/area/hangar)
-"aK" = (
-/obj/structure/marker_beacon{
-	picked_color = "Teal"
-	},
-/turf/open/floor/plating,
-/area/hangar)
 "aL" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
 /turf/open/floor/plasteel{
@@ -226,10 +118,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"aN" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
-/turf/open/floor/plasteel,
-/area/hangar)
 "aO" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/warning{
 	dir = 8
@@ -241,9 +129,6 @@
 "aP" = (
 /turf/template_noop,
 /area/template_noop)
-"aQ" = (
-/turf/open/floor/plasteel/tech,
-/area/hangar)
 "aR" = (
 /obj/machinery/elevator_call_button{
 	pixel_y = 25
@@ -253,12 +138,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"aS" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech,
-/area/hangar)
 "aT" = (
 /obj/machinery/door/poddoor/multi_tile/four_tile_ver,
 /turf/closed/indestructible/reinforced,
@@ -271,15 +150,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"aV" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/hangar)
-"aW" = (
-/turf/open/floor/plasteel/elevatorshaft,
-/area/hangar)
 "aX" = (
 /obj/effect/turf_decal/arrows{
 	dir = 4
@@ -297,12 +167,6 @@
 	planetary_atmos = 1
 	},
 /area/hangar)
-"aZ" = (
-/obj/effect/turf_decal/arrows{
-	dir = 1
-	},
-/turf/open/floor/plasteel/tech,
-/area/hangar)
 "JT" = (
 /turf/open/floor/plasteel/elevatorshaft{
 	planetary_atmos = 1
@@ -315,10 +179,6 @@
 	},
 /area/hangar)
 "TX" = (
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---",
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
 /obj/machinery/atmospherics/pipe/simple/general,
 /turf/closed/indestructible/reinforced,
 /area/hangar)