Merge remote-tracking branch 'upstream/master'

ErdGinalD · Sep 17, 2024 · cd9f9a2 · cd9f9a2
2 parents 340979f + 04e65c7
commit cd9f9a2
Show file tree

Hide file tree

Showing 68 changed files with 216,447 additions and 15,610 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
@@ -54612,7 +54612,6 @@
 /area/station/maintenance/apmaint)
 "fdg" = (
 /obj/structure/reflector/single{
-	anchored = 1;
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
@@ -68256,7 +68255,6 @@
 /area/station/aisat/service)
 "lKP" = (
 /obj/structure/reflector/single{
-	anchored = 1;
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -73969,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"
 	},
@@ -77730,7 +77726,6 @@
 /area/station/maintenance/aft)
 "qpq" = (
 /obj/structure/reflector/box{
-	anchored = 1;
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{