Merge branch 'master' into translate

ss220club · Sep 14, 2024 · a07c520 · a07c520
2 parents b4a2010 + 6e90643
commit a07c520
Show file tree

Hide file tree

Showing 108 changed files with 216,699 additions and 15,770 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -95,7 +95,7 @@ jobs:
     strategy:
       fail-fast: false # Let all map tests run to completion
       matrix:
-        maptype: ['/datum/map/boxstation', '/datum/map/deltastation', '/datum/map/metastation', '/datum/map/cerestation']
+        maptype: ['/datum/map/boxstation', '/datum/map/deltastation', '/datum/map/metastation', '/datum/map/cerestation', '/datum/map/emeraldstation']
         byondtype: ['STABLE']
     services:
       mariadb:

diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
@@ -39118,6 +39118,8 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
+/obj/item/circuitboard/rnd_backup_console,
+/obj/item/circuitboard/rnd_network_controller,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/tech_storage)
 "cBs" = (
@@ -54610,7 +54612,6 @@
 /area/station/maintenance/apmaint)
 "fdg" = (
 /obj/structure/reflector/single{
-	anchored = 1;
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
@@ -68254,7 +68255,6 @@
 /area/station/aisat/service)
 "lKP" = (
 /obj/structure/reflector/single{
-	anchored = 1;
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -73967,9 +73967,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
 "oBR" = (
-/obj/structure/reflector/double{
-	anchored = 1
-	},
+/obj/structure/reflector/double,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -77728,7 +77726,6 @@
 /area/station/maintenance/aft)
 "qpq" = (
 /obj/structure/reflector/box{
-	anchored = 1;
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{