Merge conflict fix

_maps/RandomZLevels/away_mission/Academy.dmm

@@ -3598,6 +3598,9 @@
 /turf/open/floor/carpet,
 /area/awaymission/academy/academygate)
 "km" = (
+/obj/machinery/gateway{
+	dir = 9
+	},
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
@@ -3635,16 +3638,25 @@
 /turf/open/floor/plasteel,
 /area/awaymission/academy/classrooms)
 "kr" = (
+/obj/machinery/gateway{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/awaymission/academy/academygate)
 "ks" = (
-	/turf/open/floor/plating,
+/obj/machinery/gateway{
+	dir = 10
+	},
+/turf/open/floor/plating,
 /area/awaymission/academy/academygate)
 "kt" = (
 /obj/machinery/gateway,
 /turf/open/floor/plating,
 /area/awaymission/academy/academygate)
 "ku" = (
+/obj/machinery/gateway{
+	dir = 6
+	},
 /turf/open/floor/plating,
 /area/awaymission/academy/academygate)
 "kv" = (
@@ -3731,7 +3743,6 @@
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
 "kI" = (
-/obj/machinery/gateway/away,
 /obj/structure/cable,
 /obj/machinery/gateway/centeraway{
 	calibrated = 1
@@ -4311,7 +4322,7 @@
 /turf/open/floor/plating/asteroid/snow,
 /area/awaymission/academy/academycellar)
 "mV" = (
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
 /turf/open/floor/plating/asteroid/snow,
 /area/awaymission/academy/academycellar)
 "mW" = (
@@ -12997,11 +13008,10 @@ jU
 jZ
 kb
 ke
-ke
-kf
-kf
-kf
-ke
+kj
+km
+kp
+ks
 kf
 kf
 ky
@@ -13129,10 +13139,9 @@ jY
 kc
 jW
 kf
-kf
+kn
 kI
-ke
-ke
+kt
 kf
 kf
 ky
@@ -13260,9 +13269,9 @@ jY
 kc
 jW
 kf
-kf
-kf
-kf
+ko
+kr
+ku
 kf
 kf
 ky

_maps/RandomZLevels/away_mission/spacebattle.dmm

@@ -243,7 +243,7 @@
 /area/awaymission/spacebattle/syndicate1)
 "bg" = (
 /obj/structure/table/reinforced,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/tackler/combat/insulated,
 /turf/open/floor/mineral/plastitanium/red,
 /area/awaymission/spacebattle/syndicate1)
 "bh" = (
@@ -978,6 +978,24 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
+"ec" = (
+/obj/machinery/gateway{
+	dir = 9
+	},
+/turf/open/floor/plating,
+/area/awaymission/spacebattle/cruiser)
+"ed" = (
+/obj/machinery/gateway{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/awaymission/spacebattle/cruiser)
+"ee" = (
+/obj/machinery/gateway{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/awaymission/spacebattle/cruiser)
 "ef" = (
 /mob/living/simple_animal/hostile/syndicate/melee/spacebattle,
 /turf/open/floor/mineral/plastitanium/red,
@@ -1015,12 +1033,24 @@
 "el" = (
 /turf/open/floor/engine,
 /area/awaymission/spacebattle/cruiser)
+"em" = (
+/obj/machinery/gateway{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/awaymission/spacebattle/cruiser)
 "en" = (
-/obj/machinery/gateway/away{
+/obj/machinery/gateway/centeraway{
 	calibrated = 0
 	},
 /turf/open/floor/plating,
 /area/awaymission/spacebattle/cruiser)
+"eo" = (
+/obj/machinery/gateway{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/awaymission/spacebattle/cruiser)
 "ep" = (
 /obj/structure/chair{
 	dir = 1
@@ -1034,6 +1064,22 @@
 "er" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/awaymission/spacebattle/syndicate4)
+"et" = (
+/obj/machinery/gateway{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/awaymission/spacebattle/cruiser)
+"eu" = (
+/obj/machinery/gateway,
+/turf/open/floor/plating,
+/area/awaymission/spacebattle/cruiser)
+"ev" = (
+/obj/machinery/gateway{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/awaymission/spacebattle/cruiser)
 "ew" = (
 /obj/structure/chair,
 /turf/open/floor/mineral/plastitanium/red,
@@ -26892,9 +26938,9 @@ cc
 cc
 bT
 cK
-cK
-cK
-cK
+ec
+em
+et
 cK
 cK
 cK
@@ -27149,9 +27195,9 @@ cA
 cc
 bT
 cK
-cK
+ed
 en
-cK
+eu
 cK
 cK
 cK
@@ -27406,9 +27452,9 @@ cc
 cc
 bT
 cK
-cK
-cK
-cK
+ee
+eo
+ev
 cK
 jF
 fb