From 444bd799107f27a1edd7ad85ffc84282f2f1aa5d Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sun, 5 Jan 2025 20:45:34 +0000 Subject: [PATCH] mirror mirror on the wall... (#16840) --- maps/groundbase/gb-z1.dmm | 42 ++++++++--------------- maps/stellar_delight/stellar_delight1.dmm | 7 ++++ maps/tether/tether-01-surface1.dmm | 19 +++++----- maps/tether/tether-02-surface2.dmm | 7 ++-- 4 files changed, 34 insertions(+), 41 deletions(-) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 07f3d9869a8..ad9a20b2b98 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -1389,7 +1389,6 @@ "dc" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; - id_tag = null; locked = 1; name = "AI Core"; req_access = list(16) @@ -1766,7 +1765,6 @@ }, /obj/machinery/door/airlock/security{ name = "Armory"; - req_access = null; req_one_access = list() }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1883,7 +1881,6 @@ "ec" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; - id_tag = null; locked = 1; name = "AI Core"; req_access = list(16) @@ -2798,9 +2795,7 @@ }, /obj/effect/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/maintenance_hatch{ - frequency = null; icon_state = "door_locked"; - id_tag = null; locked = 1; name = "Telecoms Server Access"; req_access = list(61) @@ -3286,7 +3281,6 @@ id = "PubPrep"; name = "Public Access Shutter"; pixel_x = -26; - req_access = null; req_one_access = list(18) }, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, @@ -3569,8 +3563,7 @@ /area/groundbase/cargo/mining) "hS" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - id_tag = null + dir = 8 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/machinery/firealarm{ @@ -4008,9 +4001,7 @@ }, /obj/effect/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/maintenance_hatch{ - frequency = null; icon_state = "door_locked"; - id_tag = null; locked = 1; name = "Telecoms Server Access"; req_access = list(61) @@ -5509,9 +5500,7 @@ /obj/machinery/conveyor_switch/oneway{ id = "recycling"; name = "Recycling conveyor switch"; - pixel_y = 20; - req_access = null; - req_one_access = null + pixel_y = 20 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -5712,8 +5701,7 @@ "mr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Bar"; - req_access = null + name = "Bar" }, /turf/simulated/floor/bmarble, /area/groundbase/civilian/bar) @@ -9392,8 +9380,7 @@ "uK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ - name = "Security"; - req_access = null + name = "Security" }, /obj/machinery/door/blast/regular{ density = 0; @@ -11139,7 +11126,6 @@ tag_east = 1; tag_east_con = 0.21; tag_north = 2; - tag_north_con = null; tag_south = 1; tag_south_con = 0.79 }, @@ -11322,9 +11308,7 @@ /area/groundbase/medical/lhallway) "zb" = ( /obj/machinery/door/airlock/multi_tile/glass/polarized{ - id_tag = null; - name = "Tool Storage"; - req_one_access = null + name = "Tool Storage" }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11974,6 +11958,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/mirror{ + dir = 4; + pixel_x = -23 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "AC" = ( @@ -12277,8 +12265,7 @@ "Bo" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Bar"; - req_access = null + name = "Bar" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -12481,7 +12468,6 @@ }, /obj/machinery/door/airlock/security{ name = "Armory"; - req_access = null; req_one_access = list() }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12944,8 +12930,7 @@ "CS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ - name = "Security"; - req_access = null + name = "Security" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13790,7 +13775,6 @@ "ES" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - id_tag = null; name = "Restroom" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -16356,6 +16340,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/mirror{ + pixel_y = -25; + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/autoresleeving) "KB" = ( diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index 1d6a026bee1..0749458fd96 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -3005,6 +3005,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/mirror{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck1/resleeving) "fM" = ( @@ -8310,6 +8313,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/mirror{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) "qS" = ( diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index e10e40e95ad..dabe7246c84 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -11445,7 +11445,6 @@ /obj/effect/shuttle_landmark{ base_area = /area/tether/surfacebase/tram; base_turf = /turf/simulated/floor/tiled/techfloor/grid; - docking_controller = null; landmark_tag = "escape_station"; name = "Tether Surface Base" }, @@ -12183,7 +12182,6 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_security{ - id_tag = null; layer = 2.8; name = "Security Checkpoint"; req_access = list(1) @@ -13738,7 +13736,6 @@ /area/tether/surfacebase/tram) "axz" = ( /obj/machinery/door/airlock/medical{ - id_tag = null; name = "Auto Resleeving"; req_access = list(5) }, @@ -17918,7 +17915,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ dir = 2; - id_tag = null; name = "Construction Site" }, /turf/simulated/floor/tiled/monotile, @@ -18357,7 +18353,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ dir = 2; - id_tag = null; name = "Cafe" }, /turf/simulated/floor/tiled/monotile, @@ -26413,7 +26408,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ dir = 2; - id_tag = null; name = "Laundry" }, /turf/simulated/floor/tiled/monotile, @@ -30693,7 +30687,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central1, /obj/machinery/door/airlock/multi_tile/glass{ dir = 2; - id_tag = null; name = "Laundry" }, /obj/structure/cable/orange{ @@ -31698,10 +31691,6 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) "fKm" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -31709,6 +31698,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/structure/mirror{ + dir = 4; + pixel_x = -25 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/autoresleeving) "fLB" = ( @@ -32854,6 +32847,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/autoresleeving) "iue" = ( diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 672c5178e6e..febf7d5b369 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -1611,6 +1611,10 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, +/obj/structure/mirror{ + dir = 4; + pixel_x = -25 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acs" = ( @@ -31252,7 +31256,6 @@ dir = 8 }, /obj/machinery/alarm{ - alarm_id = null; breach_detection = 0; dir = 1; pixel_y = -22 @@ -33808,7 +33811,6 @@ "vzk" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; - id_tag = null; locked = 1; name = "AI Core"; req_access = list(16) @@ -33854,7 +33856,6 @@ "vYb" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; - id_tag = null; locked = 1; name = "AI Core"; req_access = list(16)