Merge remote-tracking branch 'upstream/master' into familyport

_maps/map_files/BoxStation/BoxStation.dmm

@@ -17830,7 +17830,7 @@
 /turf/open/floor/wood,
 /area/service/bar)
 "aRx" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/orion_trail,
 /turf/open/floor/wood,
 /area/service/bar)
 "aRy" = (
@@ -60122,7 +60122,7 @@
 /turf/open/floor/plasteel,
 /area/commons/dorms)
 "nZL" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/orion_trail,
 /turf/open/floor/wood,
 /area/command/heads_quarters/captain)
 "oax" = (
@@ -64938,7 +64938,7 @@
 /turf/open/floor/plasteel,
 /area/security/prison/upper)
 "vim" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/battle,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
 	icon_state = "1-2"

_maps/map_files/CogStation/CogStation.dmm

@@ -858,7 +858,7 @@
 /turf/open/floor/plating/airless,
 /area/router/aux)
 "acf" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/battle,
 /turf/open/floor/carpet/arcade,
 /area/commons/arcade)
 "acg" = (
@@ -4505,7 +4505,7 @@
 /area/maintenance/solars/starboard/fore)
 "alg" = (
 /obj/structure/frame/machine,
-/obj/item/circuitboard/computer/arcade/minesweeper,
+/obj/item/circuitboard/computer/arcade/orion_trail,
 /turf/open/floor/plating,
 /area/construction/secondary)
 "alh" = (

_maps/map_files/LambdaStation/dorms.dmm

@@ -9501,7 +9501,7 @@
 /obj/machinery/camera/autoname{
 	dir = 4
 	},
-/obj/machinery/computer/arcade/minesweeper{
+/obj/machinery/computer/arcade/orion_trail{
 	dir = 4
 	},
 /turf/open/floor/plasteel,

_maps/map_files/MetaStation/MetaStation.dmm

@@ -70208,7 +70208,7 @@
 	},
 /area/command/gateway)
 "pCQ" = (
-/obj/machinery/computer/arcade/minesweeper{
+/obj/machinery/computer/arcade/battle{
 	dir = 4
 	},
 /turf/open/floor/plasteel,

_maps/map_files/Snaxi/Snaxi.dmm

@@ -870,7 +870,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/computer/arcade/minesweeper{
+/obj/machinery/computer/arcade/orion_trail{
 	dir = 8
 	},
 /obj/structure/sign/poster/official/nanomichi_ad{
@@ -5842,7 +5842,7 @@
 /turf/open/floor/plating,
 /area/maintenance/aft/secondary)
 "akQ" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/battle,
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "akR" = (
@@ -34938,7 +34938,7 @@
 	dir = 1;
 	pixel_y = -24
 	},
-/obj/machinery/computer/arcade/minesweeper{
+/obj/machinery/computer/arcade/orion_trail{
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,