From b310fb8567d7f22d264e98d2b63a6081449f9ede Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 2 Dec 2024 00:56:27 +0300 Subject: [PATCH 1/3] Apply some fixes --- _maps/map_files220/stations/boxstation.dmm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index cbba111ade92..e0d5ffb553e7 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -19653,7 +19653,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{ @@ -20213,7 +20214,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, @@ -20748,7 +20750,7 @@ /turf/simulated/wall, /area/station/maintenance/disposal) "bCg" = ( -/obj/machinery/computer/security/telescreen/entertainment/television, +/obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/carpet/royalblack, /area/station/maintenance/apmaint) "bCi" = ( @@ -60789,7 +60791,7 @@ /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "iPb" = ( -/obj/machinery/computer/security/telescreen/entertainment/television, +/obj/machinery/computer/security/wooden_tv, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/station/maintenance/asmaint) @@ -62023,7 +62025,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{ From 50c26b9908a490c9f5a6b541f44158c77cf1eb1f Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 2 Dec 2024 01:30:13 +0300 Subject: [PATCH 2/3] Fix telescreen runtime --- modular_ss220/camera_nanomap/code/camera.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modular_ss220/camera_nanomap/code/camera.dm b/modular_ss220/camera_nanomap/code/camera.dm index ba92bbb29f59..bb903e6d06d6 100644 --- 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 From da90de3cad377be73aafe397cdaedaad30f157bd Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 2 Dec 2024 01:33:49 +0300 Subject: [PATCH 3/3] Revert tv replacement --- _maps/map_files220/stations/boxstation.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index e0d5ffb553e7..423945b84e30 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -20750,7 +20750,7 @@ /turf/simulated/wall, /area/station/maintenance/disposal) "bCg" = ( -/obj/machinery/computer/security/wooden_tv, +/obj/machinery/computer/security/telescreen/entertainment/television, /turf/simulated/floor/carpet/royalblack, /area/station/maintenance/apmaint) "bCi" = ( @@ -60791,7 +60791,7 @@ /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "iPb" = ( -/obj/machinery/computer/security/wooden_tv, +/obj/machinery/computer/security/telescreen/entertainment/television, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/station/maintenance/asmaint)