From fefa4ed846467425face263b797435b7e8ab93c7 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sat, 19 Oct 2024 17:44:16 +0200 Subject: [PATCH] Revert "Fixes some map errors" (#9261) --- maps/southern_cross/southern_cross-2.dmm | 35 +++--- maps/southern_cross/southern_cross-3.dmm | 151 ++++++++++------------- 2 files changed, 85 insertions(+), 101 deletions(-) diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index a16fff9707..35f0f17e7c 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -28213,6 +28213,9 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/hallway/secondary/firstdeck/research_access) +"rYm" = ( +/turf/simulated/wall, +/area/maintenance/firstdeck/centralstarboard) "rZP" = ( /obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/border_only, @@ -80422,13 +80425,13 @@ xIH moQ alI kcv -moQ -dHz -dHz -dHz -dHz -dHz -dHz +rYm +fiA +fiA +fiA +fiA +fiA +fiA dHz hvg dHz @@ -80681,7 +80684,7 @@ moQ jUv fVu bjM -dHz +fiA hbK gAa ppt @@ -80691,7 +80694,7 @@ kJV uPj wHq aMP -fiA +dHz sal wZo lIC @@ -80939,7 +80942,7 @@ moQ axo fVu lrd -dHz +fiA ybM iEb iEb @@ -80949,7 +80952,7 @@ iEb taP iEb uvG -fiA +dHz sal poW lIC @@ -81197,7 +81200,7 @@ moQ asx bnA dLu -dHz +fiA bJP yks tMg @@ -81207,7 +81210,7 @@ exY thk iEb iGI -fiA +dHz sal qwb wnb @@ -81455,7 +81458,7 @@ moQ upc wDG mGR -dHz +fiA vhz iEb iEb @@ -81465,7 +81468,7 @@ iEb npi iEb uRT -fiA +dHz jVV sal ghB @@ -81713,7 +81716,7 @@ moQ dsS mRt moQ -dHz +fiA kfy tYn tYn diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index c919ace8c6..c0b2e36880 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -17914,11 +17914,6 @@ pixel_x = -6; pixel_y = 10 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "bcS" = ( @@ -27553,10 +27548,6 @@ dir = 8 }, /obj/machinery/r_n_d/protolathe/medical, -/obj/machinery/light{ - dir = 8; - name = "1E-light fixture" - }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "bFv" = ( @@ -28611,10 +28602,6 @@ pixel_x = -34; pixel_y = 1 }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "bIO" = ( @@ -29463,6 +29450,10 @@ pixel_y = 5 }, /obj/item/storage/firstaid/toxin, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "bMf" = ( @@ -44516,8 +44507,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/sortjunction/flipped{ - name = "Genetics" +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) @@ -49401,6 +49392,7 @@ /turf/simulated/floor/tiled/white, /area/rnd/mixing) "fAK" = ( +/obj/structure/table/glass, /obj/item/roller, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -49408,7 +49400,6 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 10 }, -/obj/structure/table/standard, /turf/simulated/floor/tiled/steel, /area/medical/genetics) "fAL" = ( @@ -50799,10 +50790,6 @@ dir = 4 }, /obj/machinery/organ_printer/flesh/full, -/obj/machinery/light{ - dir = 4; - name = "1E-light fixture" - }, /turf/simulated/floor/tiled/white, /area/medical/cryo) "gju" = ( @@ -51006,6 +50993,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/research) "goD" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) @@ -52347,6 +52339,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/fscenter) "hai" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 + }, /obj/structure/sink{ dir = 8; pixel_x = -12; @@ -53310,6 +53306,14 @@ /turf/simulated/floor/tiled/white, /area/medical/foyer) "hBX" = ( +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "virology_airlock_control"; + name = "Virology Access Button"; + pixel_y = 24; + req_access = list(39) + }, /obj/effect/floor_decal/borderfloorwhite/corner{ dir = 1 }, @@ -53490,17 +53494,17 @@ "hHj" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/hologram/holopad, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "hHE" = ( @@ -53994,10 +53998,10 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/warehouse) "hPZ" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/white, /area/medical/distillery) "hQg" = ( @@ -54549,6 +54553,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay2) "ief" = ( +/obj/structure/table/glass, /obj/item/packageWrap, /obj/item/hand_labeler, /obj/item/reagent_containers/spray/cleaner{ @@ -54561,7 +54566,6 @@ /obj/effect/floor_decal/corner/beige/border{ dir = 8 }, -/obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/medical/chemistry) "iej" = ( @@ -57764,7 +57768,7 @@ /area/hallway/secondary/entry/D3) "jMw" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/medical/medical_lockerroom) "jMO" = ( /obj/structure/table/standard, @@ -57852,7 +57856,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/item/roller, +/obj/item/roller_holder, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "jQa" = ( @@ -62166,7 +62170,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/medical/medical_lockerroom) "mjR" = ( /obj/item/roller, @@ -62856,10 +62860,6 @@ c_tag = "MED - Virology Airlock"; dir = 5 }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23 - }, /turf/simulated/floor/tiled/steel, /area/medical/virology) "mFY" = ( @@ -63861,6 +63861,9 @@ }, /turf/simulated/floor/plating, /area/holodeck_control) +"njW" = ( +/turf/simulated/wall, +/area/medical/genetics) "nke" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 @@ -64845,7 +64848,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/roller, +/obj/item/roller_holder, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "nMj" = ( @@ -65994,15 +65997,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "SC-ALCvirology"; - name = "Virology Access Button"; - pixel_y = 0; - req_access = list(39); - pixel_x = -26 - }, /turf/simulated/floor/tiled/steel_grid, /area/medical/virology) "oqY" = ( @@ -66967,14 +66961,6 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/assembly/chargebay) -"oWS" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay_primary_storage) "oWW" = ( /turf/simulated/floor/tiled/techfloor, /area/assembly/chargebay) @@ -67751,6 +67737,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay_emt_bay) +"ppR" = ( +/obj/machinery/shield_diffuser, +/turf/simulated/floor/plating, +/area/space) "ppW" = ( /obj/machinery/atmospherics/valve/shutoff{ name = "Deck 2 Starboard automatic shutoff valve" @@ -72536,14 +72526,14 @@ /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay foyer."; id = "chemcounter"; - name = "Chemistry Counter"; + name = "Medbay Doors Control"; pixel_y = 24; pixel_x = 5 }, /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay foyer."; id = "chemwindow"; - name = "Chemistry Windows"; + name = "Medbay Doors Control"; pixel_y = 24; pixel_x = -5 }, @@ -78202,7 +78192,7 @@ dir = 8 }, /obj/machinery/shield_diffuser, -/turf/simulated/floor/airless, +/turf/simulated/floor/plating, /area/space) "vIB" = ( /obj/machinery/firealarm{ @@ -78276,16 +78266,20 @@ /area/maintenance/research_medical) "vLc" = ( /obj/structure/closet/l3closet/virology, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = -24 + }, /obj/machinery/light{ dir = 8 }, -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - id_tag = "SC-ALCvirology"; - name = "Virology Access Console"; - tag_exterior_door = "SC-ALEvirology"; - tag_interior_door = "SC-ALIvirology"; - dir = 1; - pixel_y = -23 +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "xenostation_airlock_control"; + name = "Xenobiology Access Button"; + pixel_y = -26; + req_access = list(55) }, /turf/simulated/floor/tiled/steel, /area/medical/virology) @@ -78826,10 +78820,6 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, -/obj/machinery/light{ - dir = 8; - name = "1E-light fixture" - }, /turf/simulated/floor/tiled/white, /area/medical/distillery) "wdx" = ( @@ -81440,14 +81430,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/D1) -"xFB" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/medical/medbay_primary_storage) "xFC" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -81553,7 +81535,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light, /turf/simulated/floor/tiled/white, /area/medical/chemistry) "xIB" = ( @@ -124269,8 +124250,8 @@ bys lvy bKt tAA -oWS -xFB +tAA +tAA bcR aql xLY @@ -133037,15 +133018,15 @@ nSZ mSO qrI hBo -oMg +njW sKv -oMg +njW jMw mjF -qNE -qNE -qNE -qNE +guk +guk +guk +guk qNE aaa aaa @@ -135611,9 +135592,9 @@ rJB pzW aaa aaa -abx +ppR dLq -abx +ppR vIA aaa aaa