Merge branch 'master' into translate

ss220club · Dec 2, 2024 · 374a604 · 374a604
2 parents 79ae73d + c71428e
commit 374a604
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm
@@ -19625,7 +19625,8 @@
 /area/station/hallway/secondary/entry)
 "bwP" = (
 /obj/structure/toilet{
-	pixel_y = 8
+	pixel_y = 8;
+	dir = 4
 	},
 /obj/machinery/light/small/directional/west,
 /obj/machinery/door_control/bolt_control/south{
@@ -20138,7 +20139,8 @@
 /area/station/hallway/secondary/entry)
 "bzu" = (
 /obj/structure/toilet{
-	pixel_y = 8
+	pixel_y = 8;
+	dir = 4
 	},
 /obj/machinery/light/small/directional/west,
 /obj/effect/landmark/start/assistant,
@@ -61996,7 +61998,8 @@
 /area/station/medical/surgery/secondary)
 "jog" = (
 /obj/structure/toilet{
-	pixel_y = 8
+	pixel_y = 8;
+	dir = 4
 	},
 /obj/machinery/light/small/directional/west,
 /obj/machinery/door_control/bolt_control/south{

diff --git a/modular_ss220/camera_nanomap/code/camera.dm b/modular_ss220/camera_nanomap/code/camera.dm
@@ -87,8 +87,7 @@
 	return data
 
 /obj/machinery/computer/security/ui_static_data()
-	var/list/data = list()
-	data["mapRef"] = map_name
+	var/list/data = ..()
 	data["stationLevel"] = level_name_to_num(MAIN_STATION)
 	return data