From d96c703d88fe3ff670a45c131657529c5215b144 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Tue, 22 Feb 2022 23:21:00 -0500 Subject: [PATCH] Update OmegaStation.dmm --- _maps/map_files/OmegaStation/OmegaStation.dmm | 571 +++++++++--------- 1 file changed, 301 insertions(+), 270 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 0da36eb120..ab56dbd057 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -20160,17 +20160,21 @@ /turf/open/floor/plasteel, /area/engineering/main) "aFB" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/airalarm{ - pixel_y = 24 - }, /obj/machinery/camera{ c_tag = "Starboard Bow Solar"; network = list("ss13","engine") }, +/obj/machinery/power/solar_control{ + id = "forestarboard"; + name = "Starboard Bow Solar Control" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "aFC" = ( @@ -24247,13 +24251,10 @@ /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aLL" = ( -/obj/effect/turf_decal/box, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/tracker, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solars/port/aft) +/obj/structure/grille, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "aLM" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -32801,7 +32802,6 @@ pixel_x = -32; pixel_y = 32 }, -/obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "4-8" }, @@ -32814,6 +32814,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/caution, /turf/open/floor/plasteel, /area/maintenance/solars/port/aft) "bal" = ( @@ -33361,13 +33362,13 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bbf" = ( -/obj/machinery/power/smes, /obj/machinery/camera{ c_tag = "Port Quarter Solar"; dir = 4; network = list("ss13","engine") }, -/obj/structure/cable{ +/obj/machinery/power/smes, +/obj/structure/cable/white{ icon_state = "0-4" }, /turf/open/floor/plating, @@ -33382,6 +33383,9 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bbi" = ( @@ -33392,10 +33396,7 @@ pixel_x = 24 }, /obj/structure/cable/white{ - icon_state = "2-8" - }, -/obj/structure/cable/white{ - icon_state = "0-2" + icon_state = "0-8" }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -33484,10 +33485,10 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable/white{ +/obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bbp" = ( @@ -33834,9 +33835,15 @@ /area/solars/starboard/fore) "bbR" = ( /obj/machinery/light/small, -/obj/structure/cable/white{ - icon_state = "1-8" +/obj/machinery/power/solar_control{ + dir = 8; + id = "aftport"; + name = "Port Quarter Solar Control" }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bbS" = ( @@ -33884,7 +33891,6 @@ /turf/open/floor/plating/airless, /area/solars/starboard/fore) "bbZ" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -33894,6 +33900,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/effect/turf_decal/caution, /turf/open/floor/plasteel, /area/maintenance/solars/starboard/fore) "bca" = ( @@ -33905,7 +33912,6 @@ dir = 8 }, /obj/effect/landmark/xeno_spawn, -/obj/effect/turf_decal/delivery, /obj/structure/cable{ icon_state = "4-8" }, @@ -34321,25 +34327,19 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcJ" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/box, -/obj/machinery/power/tracker, -/turf/open/floor/plasteel/airless/solarpanel, -/area/solars/starboard/fore) +/obj/structure/lattice, +/obj/structure/grille, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "bcK" = ( -/obj/machinery/power/solar_control{ - id = "forestarboard"; - name = "Starboard Bow Solar Control" - }, -/obj/effect/turf_decal/bot, /obj/machinery/power/terminal{ dir = 4 }, /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcL" = ( @@ -34403,6 +34403,10 @@ /obj/structure/cable/white{ icon_state = "1-8" }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bcS" = ( @@ -34892,14 +34896,11 @@ /turf/open/floor/plating/airless, /area/solars/starboard/fore) "bdC" = ( -/obj/machinery/power/solar_control{ - id = "aftport"; - name = "Port Quarter Solar Control" - }, -/obj/effect/turf_decal/bot, -/obj/structure/cable, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" + }, +/obj/structure/cable/white{ + icon_state = "4-8" }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -34929,17 +34930,17 @@ }, /area/command/heads_quarters/rd) "bdE" = ( -/obj/machinery/power/apc{ - areastring = "/area/maintenance/solars/starboard/fore"; - name = "Starboard Bow Solar APC"; - pixel_y = -26 - }, /obj/structure/cable/white{ icon_state = "4-8" }, /obj/structure/cable/white{ icon_state = "0-8" }, +/obj/machinery/power/apc{ + areastring = "/area/maintenance/solars/starboard/fore"; + name = "Starboard Bow Solar APC"; + pixel_y = -26 + }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bdF" = ( @@ -34966,7 +34967,7 @@ dir = 1; pixel_y = -22 }, -/obj/structure/cable/white{ +/obj/structure/cable{ icon_state = "4-8" }, /turf/open/floor/plating, @@ -36811,8 +36812,11 @@ /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "bgk" = ( -/obj/structure/cable/white{ - icon_state = "4-8" +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) @@ -40903,6 +40907,10 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) +"eDE" = ( +/obj/effect/landmark/carpspawn, +/turf/open/space/basic, +/area/space/station_ruins) "eOg" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -47275,6 +47283,14 @@ /obj/item/pickaxe, /turf/open/floor/plating, /area/engineering/atmos) +"uBW" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/box, +/obj/machinery/power/tracker, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solars/starboard/fore) "uCY" = ( /turf/open/pool, /area/maintenance/starboard/aft) @@ -47653,6 +47669,14 @@ "vMb" = ( /turf/open/floor/engine/n2o, /area/engineering/atmos) +"vPH" = ( +/obj/effect/turf_decal/box, +/obj/machinery/power/tracker, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solars/port/aft) "vPZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -47781,6 +47805,13 @@ }, /turf/open/floor/plasteel/dark, /area/command/bridge) +"wle" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/space/basic, +/area/solars/starboard/fore) "wqL" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 @@ -71075,7 +71106,7 @@ jFP jFP jFP jFP -jFP +eDE jFP jFP jFP @@ -71587,23 +71618,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -71844,23 +71875,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -72101,23 +72132,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -72358,23 +72389,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +fMP +sdX +fMP +fMP +fMP +sdX +vPH +sdX +fMP +fMP +fMP +sdX +fMP +aaa +aaa jFP jFP jFP @@ -72615,23 +72646,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +fMP +aaa +aaa +aaa +aaa +aaa +aMH +aaa +aaa +aaa +aaa +aaa +fMP +aaa +aaa jFP jFP jFP @@ -72872,21 +72903,21 @@ jFP jFP jFP jFP -jFP -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa +fMP aaa +aKr +aKr +aKr +aKr +aMI +aKr +aKr +aKr +aKr aaa +fMP aaa aaa jFP @@ -73129,21 +73160,21 @@ jFP jFP jFP jFP -jFP -aaa -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa +sdX +sdX +aKB +aLz +aLz +aLz +aMQ +bar +bar +bar +bbS +sdX +sdX aaa aaa jFP @@ -73388,18 +73419,18 @@ aaa aaa aaa aaa -pZU -sdX -pZU -pZU -pZU -sdX -aLL -sdX -pZU -pZU -pZU -sdX +fMP +aaa +aKF +aKF +aKF +aKF +aMH +aKF +aKF +aKF +aKF +aaa pZU aaa aaa @@ -73645,13 +73676,13 @@ aaa aaa aaa aaa -pZU +fMP aaa aaa aaa aaa aaa -aMH +aZS aaa aaa aaa @@ -96714,7 +96745,7 @@ aaa aaa aaa aaa -pZU +sdX aaa aaa aaa @@ -96726,7 +96757,7 @@ aaa aaa aaa aaa -pZU +sdX aaa aaa aaa @@ -96971,7 +97002,7 @@ aaa aaa aaa aaa -sdX +aLL aaa abL abL @@ -96983,7 +97014,7 @@ abL abL abL aaa -sdX +pZU aaa aaa aaa @@ -97228,7 +97259,7 @@ jFP aaa aaa aaa -pZU +aLL sdX abM bbQ @@ -97485,13 +97516,13 @@ jFP aaa aaa aaa -pZU +aLL aaa acu acu acu acu -aef +wle acu acu acu @@ -97742,19 +97773,19 @@ jFP aaa aaa aaa -pZU +sdX aaa aaa aaa aaa aaa -adt +aef aaa aaa aaa aaa aaa -pZU +sdX aaa aaa aaa @@ -97999,19 +98030,19 @@ jFP aaa aaa aaa -sdX -sdX -pZU -pZU -pZU -sdX bcJ -sdX +aaa +abL +abL +abL +abL +adt +abL +abL +abL +abL +aaa pZU -pZU -pZU -sdX -sdX aaa aaa aaa @@ -98256,19 +98287,19 @@ jFP aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aLL +sdX +abM +bbQ +bbQ +bbQ +adM +bbV +bbV +bbV +bcD +sdX +pZU aaa aaa aaa @@ -98513,19 +98544,19 @@ jFP aaa aaa aaa +pZU aaa +acu +acu +acu +acu +aef +acu +acu +acu +acu aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU aaa aaa aaa @@ -98770,19 +98801,19 @@ jFP aaa aaa aaa +pZU aaa aaa aaa aaa aaa +adt aaa aaa aaa aaa aaa -aaa -aaa -aaa +pZU aaa aaa aaa @@ -99027,19 +99058,19 @@ jFP aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pZU +sdX +pZU +pZU +pZU +sdX +uBW +sdX +pZU +pZU +pZU +sdX +pZU aaa aaa aaa @@ -99539,23 +99570,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP @@ -99796,23 +99827,23 @@ jFP jFP jFP jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP -jFP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa jFP jFP jFP