diff --git a/code/_helpers/turfs.dm b/code/_helpers/turfs.dm index cc908296198..cdca430fb63 100644 --- a/code/_helpers/turfs.dm +++ b/code/_helpers/turfs.dm @@ -121,6 +121,7 @@ var/old_icon1 = T.icon var/old_decals = T.decals ? T.decals.Copy() : null + B.Destroy() X = B.ChangeTurf(T.type) X.set_dir(old_dir1) X.icon_state = old_icon_state1 diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index 7a3a4da6323..65014be37ff 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -103,7 +103,7 @@ var/global/ntnet_card_uid = 1 var/holderz = get_z(holder2) if(!holderz) //no reception in nullspace return 0 - var/list/zlevels_in_range = using_map.get_map_levels(holderz, FALSE) + var/list/zlevels_in_range = using_map.get_map_levels(holderz, FALSE)// VOREStation Edit - , om_range = DEFAULT_OVERMAP_RANGE) var/list/zlevels_in_long_range = using_map.get_map_levels(holderz, TRUE, om_range = DEFAULT_OVERMAP_RANGE) - zlevels_in_range var/best = 0 for(var/obj/machinery/ntnet_relay/R as anything in ntnet_global.relays) diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm index 4c16b991bc0..a76a39b60e6 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -199,11 +199,10 @@ switch(status) if(SHIP_STATUS_LANDED) var/obj/effect/overmap/visitable/location = loc - if(istype(loc, /obj/effect/overmap/visitable/sector)) - return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines." - if(istype(loc, /obj/effect/overmap/visitable/ship)) + if(location.in_space) return "Docked with \the [location.name]. Use secondary thrust to get clear before activating primary engines." - return "Docked with an unknown object." + else + return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines." if(SHIP_STATUS_TRANSIT) return "Maneuvering under secondary thrust." if(SHIP_STATUS_OVERMAP) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 0b4b0ed3c04..6920a73f28c 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -106,11 +106,16 @@ //lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm! -/obj/item/weapon/paper/Initialize(mapload) - . = ..() +/obj/item/weapon/paper/Initialize(mapload, var/text, var/title) + . = ..() - if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player. - was_maploaded = TRUE + if(istext(title)) + name = title + if(istext(text)) + info = text + + if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player. + was_maploaded = TRUE /obj/item/weapon/paper/New(var/newloc, var/text, var/title) ..() diff --git a/maps/cynosure/cynosure-1.dmm b/maps/cynosure/cynosure-1.dmm index 61b5d30ceb4..48a0b40a9a7 100644 --- a/maps/cynosure/cynosure-1.dmm +++ b/maps/cynosure/cynosure-1.dmm @@ -16534,6 +16534,9 @@ /area/surface/station/hallway/primary/bmt/west/elevator) "Kc" = ( /obj/structure/stairs/spawner/south, +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/surface/station/medical/hallway/bmt) "Kd" = ( @@ -19063,6 +19066,9 @@ /turf/simulated/floor/plating, /area/surface/station/maintenance/incineratormaint) "Ph" = ( +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/surface/station/medical/hallway/bmt) "Pi" = ( @@ -54513,7 +54519,7 @@ RQ RQ xW xW -RQ +xW RQ RQ RQ @@ -55025,7 +55031,7 @@ RQ RQ RQ RQ -xW +RQ xW xW xW @@ -56327,7 +56333,7 @@ RQ RQ RQ RQ -RQ +Kj Kj Kj Kj diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index d723bb4373c..832f0090da1 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -2056,6 +2056,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/surface/station/ai/upload_foyer) +"aZV" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/surface/station/engineering/hallway) "aZZ" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloorwhite/corner{ @@ -6768,7 +6774,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway) "dfs" = ( @@ -8592,7 +8597,6 @@ /obj/machinery/camera/network/medbay{ c_tag = "MED - Operating Theatre 2" }, -/obj/machinery/optable, /turf/simulated/floor/tiled/white, /area/surface/station/medical/surgery2) "ecL" = ( @@ -14432,12 +14436,8 @@ /area/surface/station/crew_quarters/heads/hop) "gEG" = ( /obj/machinery/power/smes/buildable{ -<<<<<<< HEAD - RCon_tag = "Solar - Northeast"; -======= RCon_tag = "Solar - West"; cur_coils = 2; ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 input_attempt = 1; input_level = 300000; output_level = 200000 @@ -21729,6 +21729,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /obj/machinery/power/sensor{ name = "Powernet Sensor - Master Grid"; name_tag = "Master" @@ -22531,6 +22535,9 @@ /area/surface/station/medical/emt_bay) "kxM" = ( /obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/surface/station/engineering/hallway) "kyJ" = ( @@ -25996,9 +26003,6 @@ dir = 6 }, /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32 - }, /obj/structure/table/steel_reinforced, /obj/item/ammo_magazine/s45/practice, /obj/item/ammo_magazine/s45/practice, @@ -26015,6 +26019,12 @@ /obj/item/ammo_magazine/m9mmt/practice, /obj/item/weapon/storage/box/blanks/large, /obj/item/weapon/storage/box/blanks/large, +/obj/machinery/magnetic_controller{ + autolink = 1; + density = 0; + dir = 4; + pixel_x = 30 + }, /turf/simulated/floor/tiled, /area/surface/station/security/range) "maD" = ( @@ -31500,6 +31510,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/medical/reception) +"otX" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/surface/station/medical/surgery2) "oub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -37594,7 +37608,6 @@ /obj/machinery/camera/network/medbay{ c_tag = "MED - Operating Theatre 1" }, -/obj/machinery/optable, /turf/simulated/floor/tiled/white, /area/surface/station/medical/surgery) "qVW" = ( @@ -39226,6 +39239,10 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/surface/station/maintenance/surgery) +"rIW" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/surface/station/medical/surgery) "rJl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -42586,6 +42603,10 @@ /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 32; + pixel_y = -10 + }, /turf/simulated/floor/tiled, /area/surface/station/security/range) "toQ" = ( @@ -47994,7 +48015,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway) "vNz" = ( @@ -86168,7 +86188,7 @@ dns red kBa kMw -psC +rIW lVJ ykd suW @@ -88738,7 +88758,7 @@ bBP vJx esD dRW -ycR +otX vVA uBt toG @@ -92132,7 +92152,7 @@ ekV eJU rxO dfk -lsu +aZV dlE sUN drL diff --git a/maps/cynosure/cynosure-3.dmm b/maps/cynosure/cynosure-3.dmm index 7c9e1683f45..d4942804fa7 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -8771,15 +8771,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/surface/station/ai_monitored/storage/eva) "fSH" = ( -/obj/machinery/computer/general_air_control/supermatter_core{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 4 }, +/obj/machinery/computer/general_air_control/supermatter_core{ + dir = 8; + input_tag = "cooling_in"; + name = "Engine Cooling Control"; + output_tag = "cooling_out"; + sensors = list("engine_sensor" = "Engine Core") + }, /turf/simulated/floor/tiled, /area/surface/station/engineering/reactor_monitoring) "fTe" = ( diff --git a/maps/cynosure/cynosure-4.dmm b/maps/cynosure/cynosure-4.dmm index 0f67278d5c8..deece45f479 100644 --- a/maps/cynosure/cynosure-4.dmm +++ b/maps/cynosure/cynosure-4.dmm @@ -1473,7 +1473,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 5 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "pq" = ( /obj/structure/cable/yellow, @@ -1572,7 +1576,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 6 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "qc" = ( /obj/effect/floor_decal/borderfloor{ @@ -1899,7 +1907,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 10 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "ta" = ( /obj/structure/cable{ @@ -2461,13 +2473,21 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "zJ" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 6 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "zO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -2586,7 +2606,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "BD" = ( /obj/effect/floor_decal/borderfloor{ @@ -2855,7 +2879,11 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "Eq" = ( /obj/structure/cable{ @@ -3024,7 +3052,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "Gq" = ( /obj/structure/bed/chair/shuttle, @@ -3148,7 +3180,11 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "Hk" = ( /obj/effect/floor_decal/techfloor, @@ -4212,7 +4248,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 10 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "QG" = ( /obj/structure/window/reinforced{ @@ -4733,7 +4773,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 5 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "UY" = ( /obj/structure/window/reinforced, @@ -5050,7 +5094,11 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "Yb" = ( /obj/effect/floor_decal/industrial/warning{ diff --git a/maps/cynosure/cynosure-6.dmm b/maps/cynosure/cynosure-6.dmm index c736f85e2e4..5fbfaa4e5be 100644 --- a/maps/cynosure/cynosure-6.dmm +++ b/maps/cynosure/cynosure-6.dmm @@ -94,7 +94,7 @@ }, /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; + frequency = 1380; master_tag = "ninja_shuttle"; name = "interior access button"; pixel_x = -25; @@ -530,7 +530,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible, /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; + frequency = 1380; master_tag = "merc_shuttle"; name = "interior access button"; pixel_x = 25; @@ -797,7 +797,7 @@ "aTS" = ( /obj/machinery/access_button{ command = "cycle_exterior"; - frequency = 1331; + frequency = 1380; master_tag = "vox_west_control"; req_one_access = list(150) }, @@ -1267,7 +1267,7 @@ opacity = 0 }, /obj/machinery/door/airlock/voidcraft{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_outer"; name = "Ship External Access"; req_access = list(150) @@ -1786,7 +1786,7 @@ /area/holodeck/source_courtroom) "ccc" = ( /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle_sensor"; pixel_y = 28 }, @@ -2055,7 +2055,7 @@ /area/syndicate_station) "ctM" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_southwest_lock"; req_access = list(150) }, @@ -2292,7 +2292,7 @@ /area/shuttle/supply) "cKC" = ( /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "vox_east_sensor"; pixel_x = -25 }, @@ -2789,8 +2789,8 @@ "dqX" = ( /obj/machinery/access_button{ command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_east_control"; + frequency = 1380; + master_tag = "skipjack_shuttle"; req_access = list(150) }, /turf/simulated/wall/skipjack, @@ -4011,7 +4011,7 @@ /area/ninja_dojo/start) "eOt" = ( /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle_outer"; name = "Ship External Hatch"; req_access = list(150) @@ -4327,8 +4327,8 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_east_control"; + frequency = 1380; + master_tag = "skipjack_shuttle"; pixel_x = 22; req_access = list(150) }, @@ -4344,6 +4344,15 @@ name = "plating" }, /area/skipjack_station) +"fgd" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/shuttle/floor/darkred, +/area/shuttle/syndicate_elite/mothership) "fhd" = ( /obj/structure/table/rack, /obj/item/weapon/gun/projectile/automatic/wt550, @@ -4979,13 +4988,12 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1331; +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; id_tag = "merc_elite_shuttle"; - pixel_x = -24; - pixel_y = -2; - req_access = list(150); - tag_exterior_door = "merc_elite_shuttle_hatch" + pixel_x = -25; + req_one_access = list(150); + tag_door = "merc_elite_shuttle_hatch" }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/syndicate_elite/mothership) @@ -6931,7 +6939,7 @@ /area/syndicate_station/start) "idR" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; + frequency = 1380; id_tag = "vox_west_control"; pixel_x = 24; req_access = list(150); @@ -6942,7 +6950,7 @@ }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1331; + frequency = 1380; id_tag = "vox_west_vent" }, /obj/machinery/light/small, @@ -8983,7 +8991,7 @@ "kqh" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_pump" }, /obj/machinery/light/small, @@ -8994,7 +9002,7 @@ /area/skipjack_station/start) "kqS" = ( /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "vox_west_sensor"; pixel_x = 25 }, @@ -10883,7 +10891,7 @@ /area/holodeck/source_picnicarea) "mrF" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_southeast_lock"; req_access = list(150) }, @@ -11582,6 +11590,9 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/syndicate_elite/mothership) "ngK" = ( @@ -11761,7 +11772,7 @@ /area/centcom/specops) "nsa" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1331; + frequency = 1380; id_tag = "vox_west_vent" }, /turf/simulated/shuttle/plating, @@ -12228,7 +12239,7 @@ dir = 4 }, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle_inner"; name = "Ship Internal Hatch"; req_access = list(150) @@ -12601,7 +12612,7 @@ /area/syndicate_station/start) "otk" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_northeast_lock"; req_access = list(150) }, @@ -13651,7 +13662,7 @@ "pFK" = ( /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; + frequency = 1380; master_tag = "merc_shuttle"; name = "interior access button"; pixel_x = -25; @@ -14779,7 +14790,7 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; + frequency = 1380; master_tag = "vox_west_control"; pixel_x = -22; req_one_access = list(150) @@ -15526,7 +15537,7 @@ "rzx" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_pump" }, /obj/effect/shuttle_landmark{ @@ -15676,7 +15687,7 @@ /area/syndicate_station/start) "rGU" = ( /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_inner"; name = "Ship External Access"; req_access = list(150) @@ -15688,7 +15699,7 @@ /area/syndicate_station/start) "rHT" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1331; + frequency = 1380; id_tag = "vox_east_vent" }, /turf/simulated/shuttle/plating, @@ -15731,7 +15742,7 @@ "rKS" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_pump" }, /turf/simulated/shuttle/floor/voidcraft/dark, @@ -15837,10 +15848,10 @@ /area/centcom/main_hall) "rOP" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 + dir = 4 }, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_inner"; name = "Ship External Access"; req_access = list(150) @@ -17084,18 +17095,18 @@ "teW" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_pump" }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle"; pixel_x = 24; pixel_y = -2; req_access = list(150) }, /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_sensor"; pixel_x = 28; pixel_y = 8 @@ -17213,10 +17224,7 @@ }, /area/skipjack_station) "tnL" = ( -/turf/simulated/shuttle/wall/dark{ - hard_corner = 1; - join_group = "shuttle_ert" - }, +/turf/simulated/shuttle/wall/dark/hard_corner, /area/shuttle/response_ship/start) "tos" = ( /obj/machinery/light{ @@ -20354,7 +20362,7 @@ /area/syndicate_station/start) "wJs" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_northwest_lock"; req_access = list(150) }, @@ -20402,12 +20410,12 @@ "wNk" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1331; + frequency = 1380; id_tag = "vox_east_vent" }, /obj/machinery/light/small, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1331; + frequency = 1380; id_tag = "skipjack_shuttle"; pixel_x = -24; req_access = list(150); @@ -21809,14 +21817,14 @@ /area/shuttle/escape/centcom) "ymb" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle"; pixel_y = -25; req_access = list(150) }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle_pump" }, /obj/machinery/button/remote/blast_door{ @@ -85785,7 +85793,7 @@ dFI eUF eUF fSe -fSe +fgd hht iai iSX diff --git a/maps/cynosure/cynosure-7.dmm b/maps/cynosure/cynosure-7.dmm index f80655426c3..cc01185cfe8 100644 --- a/maps/cynosure/cynosure-7.dmm +++ b/maps/cynosure/cynosure-7.dmm @@ -1675,7 +1675,7 @@ oR oR oR oR -eL +oR oR oR oR @@ -1916,8 +1916,6 @@ oR oR oR oR -eL -eL oR oR oR @@ -1925,23 +1923,25 @@ oR oR oR oR -eL -eL -oR -oR -eL oR oR oR oR -eL oR oR -eL oR -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -2164,40 +2164,40 @@ oR oR oR oR -eL oR oR oR oR -eL oR oR oR -eL -oR -eL oR oR oR -eL oR oR oR -eL oR oR oR -eL -eL -eL -oR -eL oR oR -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -2421,37 +2421,29 @@ oR oR oR oR -eL -oR -oR -eL -oR -eL -eL -oR -oR -eL oR oR oR -eL -eL oR oR oR -eL oR oR -<<<<<<< HEAD -eL -eL -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR -Wi -Wi -Wi -Wi +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -2683,52 +2675,43 @@ oR oR oR oR -eL +oR +oR oR eL -oR -oR -<<<<<<< HEAD -eL -======= -oR -oR -oR -oR -oR -oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR eL oR oR oR oR -<<<<<<< HEAD +oR +oR +oR +oR +oR +oR +eL +oR +eL +oR +oR +oR +eL eL oR eL -======= oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR eL oR oR -oR -<<<<<<< HEAD eL -Wi -Wi -Wi -Wi +oR +eL +eL eL -======= -oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR oR oR @@ -2748,12 +2731,6 @@ oR oR oR oR -<<<<<<< HEAD -FR -======= -oR -oR -oR oR oR oR @@ -2769,7 +2746,6 @@ oR oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR oR oR @@ -2966,60 +2942,40 @@ oR oR oR oR -<<<<<<< HEAD -======= oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR -oR -Wi -Wi -Wi -oR -<<<<<<< HEAD eL +oR eL oR oR +oR +eL +oR +oR +oR +eL +oR +oR +oR eL eL -Wi -Wi -Wi -eL eL oR -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi +oR +oR +oR +oR +oR +oR +oR +oR +oR +eL eL -======= -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -oR -<<<<<<< HEAD eL -oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR oR oR @@ -3257,14 +3213,6 @@ oR oR oR oR -<<<<<<< HEAD -eL -eL -eL -Wi -Wi -Wi -oR Wi Wi Wi @@ -3274,7 +3222,6 @@ Wi Wi Wi Wi -======= oR oR oR @@ -3289,24 +3236,29 @@ oR oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi +oR +oR oR oR eL eL +oR +oR +oR +eL +oR +oR eL eL oR +Wi +Wi +Wi +Wi +oR +oR +oR eL oR oR @@ -3546,41 +3498,33 @@ oR oR oR oR -<<<<<<< HEAD oR oR +eL +oR +oR +eL +oR +oR +oR +oR +eL +oR +eL +oR +eL +oR +oR +eL +oR +eL Wi Wi Wi Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Hb -Hb -Wi eL oR eL -eL -eL -eL -eL -eL -eL -oR -eL -======= oR oR oR @@ -3621,7 +3565,6 @@ uP oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR oR oR @@ -3835,17 +3778,28 @@ oR oR oR oR +oR +oR +oR +oR +oR +oR +Wi +Wi +Wi +oR eL eL oR oR -<<<<<<< HEAD -Wi -Wi -Wi +eL +eL Wi Wi Wi +eL +eL +oR Wi Wi Wi @@ -3865,20 +3819,6 @@ Wi Wi Wi Wi -======= -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -oR -oR -<<<<<<< HEAD -======= -uP -oR -oR -oR -uP oR uP oR @@ -3890,15 +3830,12 @@ oR oR uP oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR oR uP uP uP oR -<<<<<<< HEAD -======= uP oR oR @@ -3906,7 +3843,6 @@ uP uP uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR oR oR @@ -4123,48 +4059,45 @@ oR oR oR oR -<<<<<<< HEAD +oR +oR +oR +oR +oR +eL +eL +eL +Wi +Wi +Wi +oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +oR +eL +oR +eL eL eL eL oR -eL -oR -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Hb -Hb -Hb -Hb -Wi -Wi -Wi -Wi -Wi -Hb -Hb -Hb -Wi -Wi -Wi -Wi -Wi -Wi -eL -eL -eL -oR -oR -oR -oR -oR -oR -======= oR oR oR @@ -4180,7 +4113,6 @@ oR uP uP oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR uP oR @@ -4424,38 +4356,40 @@ oR oR oR oR +oR +oR +oR +oR +oR +oR +oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Hb +Hb +Wi eL oR -oR -<<<<<<< HEAD -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Hb -Hb -Hb -Wi -Wi -Hb -Wi -Wi -Wi -Hb -Hb -Hb -Hb -Wi -Wi -Wi -oR -Wi -Wi -Wi -oR +eL +eL +eL +eL +eL eL eL oR @@ -4463,8 +4397,6 @@ oR oR oR oR -======= -uP oR uP oR @@ -4492,7 +4424,7 @@ uP uP uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR uP uP @@ -4716,81 +4648,78 @@ oR oR oR oR -oR -<<<<<<< HEAD -eL -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Hb -Wi -Wi -Wi -Hb -Hb -Hb -Wi -Wi -Hb -Hb -Hb -Wi -Wi -Wi -Wi eL eL -eL -======= -oR -oR -oR -oR -oR -oR -uP -oR -uP -uP -uP -oR -uP -uP -oR -oR -uP -uP -uP -uP -uP -uP -uP -oR -uP -uP -uP -uP -uP -uP -uP -uP -uP -oR -uP -oR -oR -uP -oR -oR -oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 oR eL -eL +oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Hb +Hb +Wi +Wi +Wi +Wi +oR +oR +oR +oR +oR +oR +uP +oR +uP +uP +uP +oR +uP +uP +oR +oR +uP +uP +uP +uP +uP +uP +uP +oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +oR +uP +oR +oR +uP +oR +oR +oR + + +oR oR oR oR @@ -5004,9 +4933,15 @@ oR oR oR oR +eL +eL +eL oR -<<<<<<< HEAD -oR + +eL + + + oR Wi Wi @@ -5015,10 +4950,12 @@ Wi Wi Wi Wi -Wi -Wi -Wi Hb +Hb +Hb +Hb +Wi +Wi Wi Wi Wi @@ -5026,7 +4963,7 @@ Hb Hb Hb Wi -Hb +Wi Wi Wi Wi @@ -5034,14 +4971,17 @@ Wi eL eL eL + + eL oR oR oR oR -======= + + oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR @@ -5296,40 +5236,52 @@ oR oR oR oR -<<<<<<< HEAD + + + +eL + +oR +oR eL oR oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Hb +Hb +Hb +Wi +Wi +Hb +Wi +Wi +Wi +Hb +Hb +Hb +Hb +Wi +Wi +Wi +oR +Wi +Wi +Wi +oR eL -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Hb -Wi -Wi -Hb -Wi -Hb -Hb -Wi -Hb -Hb -Hb -Wi -Wi -Wi -Wi -Wi +eL + + eL eL eL -eL -eL -======= + oR oR oR @@ -5373,9 +5325,10 @@ uP oR uP oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR + oR oR oR @@ -5394,13 +5347,13 @@ oR oR oR oR -<<<<<<< HEAD + oR oR oR FR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -5595,42 +5548,51 @@ oR oR oR oR +oR +oR +oR +oR + +eL +Wi +Wi +Wi + + + +Wi +Wi +Wi +Wi +Hb +Wi +Wi +Wi +Hb +Hb +Hb +Wi +Wi +Hb +Hb +Hb +Wi +Wi +Wi +Wi +eL +eL eL oR + eL -oR -oR -oR -<<<<<<< HEAD -Wi -Wi -Wi -Wi -Hb -Wi -Wi -Wi -Hb -Wi -Hb -Hb -Hb -Hb -Hb -Wi -Hb -Wi -Wi -Wi -oR -oR eL + oR oR oR oR -oR -======= + oR uP uP @@ -5663,10 +5625,11 @@ uP uP uP oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR + oR oR oR @@ -5885,66 +5848,73 @@ oR oR oR oR -eL oR +oR +oR +oR +oR + +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi + +oR +oR +uP +uP +uP +oR +uP +oR +uP +uP +uP +uP +uP +uP +uP +Hb +Hb +Wi +Wi +Wi +Hb + +Hb +uP +uP +uP +uP +uP +Hb +Hb + +Hb +Wi +Hb +Wi +Wi +Wi +Wi + eL eL eL -oR -<<<<<<< HEAD -Wi -Wi -Wi -Wi -Wi -Hb -Hb -Wi -Wi -======= -oR -oR -uP -uP -uP -oR -uP -oR -uP -uP -uP -uP -uP -uP -uP -Hb -Hb -Hb ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -Hb -uP -uP -uP -uP -uP -Hb -Hb -<<<<<<< HEAD -Hb -Wi -Hb -Hb -Hb -Wi -Wi -Wi -Wi +eL + oR oR oR oR oR -======= + Hb uP uP @@ -5955,7 +5925,7 @@ uP uP uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR @@ -5984,6 +5954,7 @@ oR oR oR oR + oR oR oR @@ -6174,17 +6145,21 @@ pM oR oR oR -<<<<<<< HEAD + +oR + + eL -======= + oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR eL -eL oR -<<<<<<< HEAD +oR + eL Wi Wi @@ -6192,7 +6167,10 @@ Wi Wi Wi Wi -======= + +Wi + + oR oR uP @@ -6205,8 +6183,11 @@ uP uP uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + Hb +Wi +Wi Hb Hb uP @@ -6216,40 +6197,43 @@ uP uP uP Hb -<<<<<<< HEAD + +Wi +Hb + + + Hb Hb Wi Wi Wi -Hb Wi + + + +Hb +Hb +Hb +uP +uP +uP +oR +uP +uP +uP +oR +uP +uP + +oR +oR + Wi -======= -Hb -Hb -Hb -uP -uP -uP -oR -uP -uP -uP -oR -uP -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -Wi -oR -oR -oR -oR -oR eL -oR +eL +eL +eL eL oR oR @@ -6272,6 +6256,12 @@ oR oR oR oR + +oR +oR +FR + + oR oR oR @@ -6470,76 +6460,88 @@ oR oR oR oR -<<<<<<< HEAD -eL -eL -oR -Wi -Wi -Wi -Wi -Wi -Hb -Hb -======= -oR -oR -oR -oR -oR -uP -uP -uP -uP -uP -uP -uP -uP -Hb -uP -uP -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -Hb -Hb -Hb -uP -uP -Hb -Hb -Hb -<<<<<<< HEAD -Hb -Wi -Wi -Wi -Wi -Wi -======= -uP -uP -uP -uP -uP -uP -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -uP -uP -oR -<<<<<<< HEAD -======= -oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -eL + eL oR oR +oR +Wi +Wi +Wi +Wi +Hb +Wi +Wi +Wi +Hb + +Wi + + +oR +oR +oR +oR +oR +uP +uP +uP +uP +uP +uP +uP +uP +Hb +uP +uP +uP + + +Hb +Hb +Hb +uP +uP +Hb +Hb +Hb + + + +Hb +Wi +Wi + +Wi +Wi +Wi + +uP +uP +uP +uP +uP +uP +uP + +oR +uP +uP +oR + eL oR + + + +oR + + +oR +oR +oR +oR +oR oR oR oR @@ -6752,17 +6754,19 @@ pM oR oR oR -<<<<<<< HEAD + +oR + + +eL + +oR eL oR eL -oR eL eL -Wi -Wi -Wi -Wi +oR Wi Wi Wi @@ -6770,40 +6774,49 @@ Wi Wi Hb Hb -======= -oR -oR -oR -oR -oR -oR -oR -oR -oR -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -Hb -uP -uP -uP -Hb -<<<<<<< HEAD Wi Wi -======= +Hb +Hb + +oR +oR +oR +oR +oR +oR +oR +oR +oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP + +Hb +uP +uP +uP +Hb + +Wi + +Hb +Hb + +Wi + + Hb Hb uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + Hb uP uP @@ -6815,10 +6828,7 @@ uP uP oR oR -eL -eL -eL -eL +oR oR oR oR @@ -7038,78 +7048,96 @@ oR oR oR oR -<<<<<<< HEAD + + + oR + eL -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR -<<<<<<< HEAD -Wi -Wi -Wi -Wi -Wi -Wi -Wi -======= -oR -oR -uP -oR -oR -uP -uP -uP -uP -uP -uP -uP -uP -Hb -uP -uP -Hb -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -Hb -Hb -uP -Hb -Hb -<<<<<<< HEAD -Wi -Hb -Hb -Wi -Wi -Wi -Wi + eL + + +Wi + +Wi +Wi +Wi +Wi +Wi +Wi + +oR +oR +uP +oR +oR +uP +uP +uP +uP +uP +uP +uP +uP +Hb +uP +uP +Hb + +Wi +Hb +Hb + +uP + +Hb +Hb +uP +Hb +Hb + +Wi + +Hb +Hb +Wi +Wi +Wi +Hb +Wi +Wi +oR +oR + +Wi + + +Hb +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP + +oR +oR + +oR oR oR eL oR -======= -Hb -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP -oR -oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -oR -oR +eL oR oR oR @@ -7327,21 +7355,26 @@ oR oR oR oR +eL oR -<<<<<<< HEAD + eL eL +oR Wi Wi Wi Wi Wi Hb -Wi -Wi Hb + +Hb +Hb +Hb + Wi -======= + oR uP oR @@ -7362,36 +7395,47 @@ uP Hb Hb Hb ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + Hb Hb uP Hb -<<<<<<< HEAD -Wi + +Wi +Hb +Hb Wi Wi Wi Wi Wi + + eL -======= + uP uP uP oR + oR uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR -oR -oR -<<<<<<< HEAD + eL -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 +eL + + +oR +oR + +eL + + oR oR oR @@ -7412,14 +7456,17 @@ PH oR oR oR + + oR oR oR -<<<<<<< HEAD + oR + FR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -7616,10 +7663,11 @@ oR oR oR oR -oR -oR -<<<<<<< HEAD eL +oR + +eL +oR eL eL Wi @@ -7628,26 +7676,29 @@ Wi Wi Wi Wi +Wi +Wi +Wi +Hb Hb Hb Hb Wi -Hb -Hb Wi Hb -Hb Wi Wi Wi Wi oR +oR eL -oR eL -oR + eL -======= +eL + + oR oR uP @@ -7680,8 +7731,9 @@ uP oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR + oR oR oR @@ -7710,12 +7762,12 @@ oR oR oR oR -<<<<<<< HEAD + oR oR FR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -7912,8 +7964,9 @@ oR oR oR oR -<<<<<<< HEAD + eL +oR eL eL oR @@ -7921,13 +7974,14 @@ Wi Wi Wi Wi -eL Wi Wi Wi Hb + + Wi -======= + oR uP oR @@ -7946,20 +8000,26 @@ Hb uP Hb Hb ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + Hb +uP +Hb +Hb + Wi Hb -<<<<<<< HEAD -Wi +Hb Wi Wi Wi Wi eL + + eL eL -======= + uP uP uP @@ -7972,16 +8032,15 @@ uP oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR -eL -eL oR -<<<<<<< HEAD + eL -======= + uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR uP oR @@ -8006,6 +8065,12 @@ oR oR oR oR + +oR +oR +FR + + oR oR oR @@ -8204,23 +8269,28 @@ oR oR oR oR -eL oR oR -<<<<<<< HEAD -Wi -Wi -Wi -Wi -Wi + eL +eL + + + +Wi +Wi +Wi +Wi Wi -Hb Hb Wi Wi +Hb Wi +Hb Wi +Hb +Hb Wi Wi Wi @@ -8228,12 +8298,16 @@ Wi Wi Wi eL + +oR + eL eL eL eL eL -======= + + oR uP oR @@ -8261,21 +8335,28 @@ uP uP uP oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + +eL +oR +oR +eL + + + oR oR oR uP uP oR -<<<<<<< HEAD + eL eL -======= + oR uP oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR @@ -8496,39 +8577,45 @@ oR oR oR oR -<<<<<<< HEAD + +eL +eL + + +oR + +eL +Wi +Wi +Wi +Wi +Wi +Wi +Hb +Hb +Hb +Wi +Hb +Hb +Wi +Hb +Hb +Wi +Wi +Wi +Wi oR eL -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi +oR eL -eL -eL -eL -eL -eL -======= + uP oR uP oR + +eL + uP uP uP @@ -8551,13 +8638,14 @@ uP uP uP uP + oR oR uP uP uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR @@ -8783,33 +8871,43 @@ oR oR oR oR + + oR -<<<<<<< HEAD -eL -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -oR + + eL eL eL oR +Wi +Wi +Wi +Wi +eL +Wi +Wi +Wi +Hb +Wi +Hb +Wi +Hb +Wi +Wi +Wi +Wi +Wi +eL +eL +eL oR -======= + +eL +eL + +oR + oR uP oR @@ -8844,11 +8942,9 @@ oR oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -oR + oR + oR eL oR @@ -8864,6 +8960,8 @@ oR oR oR oR +oR +oR PH oR oR @@ -9070,37 +9168,36 @@ oR oR oR oR -<<<<<<< HEAD + eL -eL -Wi -Wi -Wi +oR oR Wi Wi Wi Wi Wi +eL +Wi +Hb +Hb +Wi +Wi +Wi Wi Wi Wi Wi Wi Wi -oR Wi eL eL eL -oR -oR eL -oR -oR -oR eL -======= +eL + oR oR oR @@ -9128,7 +9225,7 @@ uP uP uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR @@ -9148,12 +9245,15 @@ oR oR oR oR + + oR oR oR -<<<<<<< HEAD + + FR -======= + oR oR PH @@ -9165,7 +9265,7 @@ oR oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR @@ -9360,36 +9460,44 @@ oR oR oR oR -eL oR -<<<<<<< HEAD -eL -eL -eL -Wi -Wi -Wi -Wi -Wi -Wi -Wi + oR oR -Wi -Wi -Wi -Wi -Wi -Wi -eL oR -eL oR + + +eL +eL + +eL +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi eL eL eL eL -======= +eL +eL + oR uP uP @@ -9422,7 +9530,7 @@ uP oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR @@ -9447,13 +9555,16 @@ oR oR oR oR -<<<<<<< HEAD + + + oR oR oR + FR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -9652,8 +9763,13 @@ oR oR oR oR -<<<<<<< HEAD + +oR +oR + + eL + oR eL Wi @@ -9662,20 +9778,22 @@ Wi Wi Wi Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi oR eL eL -oR -Wi -Wi -oR -Wi -Wi eL -eL -eL -eL -======= + oR oR oR @@ -9712,22 +9830,24 @@ oR uP oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR +oR +oR + eL + + eL oR + + + +oR +oR +oR oR -<<<<<<< HEAD eL -eL -oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -oR -oR oR oR oR @@ -9939,27 +10059,33 @@ pM pM oR oR -eL oR oR oR oR -<<<<<<< HEAD -eL -Wi -Wi -Wi -Wi -Wi -Wi oR + eL eL -oR +Wi +Wi +Wi oR Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi + + eL -======= + oR oR uP @@ -9990,35 +10116,43 @@ uP uP uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR +Wi eL + +eL +eL +oR + oR oR eL eL oR -<<<<<<< HEAD + eL -======= + uP uP + oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR +eL oR oR -<<<<<<< HEAD + oR oR +eL +eL oR -oR -oR -oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -10231,32 +10365,45 @@ oR oR oR oR -<<<<<<< HEAD + + + oR oR + +eL +oR eL eL + eL -======= +Wi +Wi +Wi +Wi +Wi + + oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR eL oR -<<<<<<< HEAD + + Wi Wi oR -eL -oR oR +Wi +Wi +Wi +Wi +Wi +Wi eL -eL -eL -oR -eL -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -10314,13 +10461,16 @@ oR oR oR oR + + oR -<<<<<<< HEAD + oR oR + FR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -10517,7 +10667,11 @@ oR oR oR oR -<<<<<<< HEAD + +oR +oR + + eL eL eL @@ -10526,62 +10680,74 @@ eL eL eL eL + eL oR eL +Wi +Wi +Wi +Wi +Wi +Wi +oR +eL +eL +oR +Wi +Wi +oR +Wi +Wi +eL +eL +eL +eL + +oR + +eL +eL + +oR + +oR oR eL eL oR oR oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP + +oR +uP +uP +uP +oR + eL oR oR -eL -oR -oR -oR -eL -eL -======= -oR -oR -oR -oR -oR -oR -oR -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -uP -uP -uP -oR -<<<<<<< HEAD -eL -oR -oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR uP @@ -10808,7 +10974,9 @@ pM oR oR oR -<<<<<<< HEAD + + + oR oR oR @@ -10816,21 +10984,37 @@ eL eL eL eL -eL -oR -eL -eL + eL oR oR -======= -oR +oR + +oR + +eL +Wi +Wi +Wi +Wi +Wi +Wi + + oR oR oR +Wi +eL oR +eL oR +eL oR + +eL +eL + uP uP uP @@ -10848,25 +11032,27 @@ uP uP uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR uP uP uP uP oR + oR -<<<<<<< HEAD + +oR +eL oR oR oR oR oR oR -oR -======= + uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR @@ -10897,11 +11083,11 @@ oR oR oR oR -<<<<<<< HEAD + oR FR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -11100,33 +11286,44 @@ oR oR oR oR -<<<<<<< HEAD + +oR + + eL eL eL eL eL + eL eL eL oR -oR -oR -oR -oR -oR -oR -oR -eL eL oR -oR +Wi +Wi oR eL oR oR +eL +eL +eL oR -======= +eL +oR +eL +oR + +eL +eL +eL +eL + + + oR uP oR @@ -11162,7 +11359,7 @@ oR oR oR oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR @@ -11383,74 +11580,88 @@ oR oR oR oR -<<<<<<< HEAD + + + eL oR + oR eL eL +eL +eL +eL +eL +eL +eL +eL + +oR +eL oR eL eL oR + +oR +oR + + +uP +oR + + +uP +uP +uP +uP +uP +uP +uP +oR +uP +uP + +oR +uP +uP +oR +uP +uP +uP +uP +uP +uP +oR + + +uP +uP + +oR +oR +uP +uP +oR + eL -======= -oR -oR -oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -uP -oR -<<<<<<< HEAD -======= -uP -uP -uP -uP -uP -uP -uP -oR -uP -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -uP -uP -oR -uP -uP -uP -uP -uP -uP -oR -<<<<<<< HEAD -======= -uP -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -uP -uP -oR -<<<<<<< HEAD eL + +eL +oR +oR +eL + + +oR +oR +oR eL eL oR oR eL -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -oR -oR -oR oR oR oR @@ -11472,13 +11683,13 @@ oR oR oR oR -<<<<<<< HEAD + oR oR oR FR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -11674,43 +11885,59 @@ oR oR oR oR -eL oR oR -<<<<<<< HEAD -eL -oR -eL -eL -======= -oR -uP -oR -oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -uP -uP -uP -uP -uP -uP -uP -oR -uP -uP -oR -<<<<<<< HEAD -oR + oR oR eL eL +eL +eL +eL oR eL -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 +eL +eL + + +eL +oR +eL +eL + +oR +uP +oR +oR + +oR +oR +uP +uP +uP +uP +uP +uP +uP +oR +uP +uP +oR + + +oR +oR +oR +eL +oR +eL + +eL + + + + oR uP uP @@ -11728,11 +11955,15 @@ uP oR oR oR -<<<<<<< HEAD + +eL + + oR oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + + oR oR oR @@ -11958,12 +12189,21 @@ oR oR oR oR -<<<<<<< HEAD + +eL +eL +eL +eL +eL +eL +eL + + oR oR eL -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -11976,39 +12216,49 @@ oR uP uP oR -<<<<<<< HEAD + + eL -======= + uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR uP uP uP oR -<<<<<<< HEAD + + + eL -======= + uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR uP + oR uP uP uP uP oR -<<<<<<< HEAD + oR oR oR +eL +eL oR oR oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + +eL + + + + oR oR oR @@ -12235,15 +12485,26 @@ oR oR oR oR -<<<<<<< HEAD + +oR +eL + + eL eL -======= + oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR + +eL +eL +oR +eL + uP uP uP @@ -12254,10 +12515,11 @@ uP uP uP oR -<<<<<<< HEAD -======= + + uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR uP uP @@ -12270,23 +12532,31 @@ oR uP oR oR + +eL +eL +eL + oR uP uP oR oR -<<<<<<< HEAD + oR oR oR oR + oR -======= + uP oR +eL oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR +eL oR oR oR @@ -12315,14 +12585,14 @@ oR oR oR oR -<<<<<<< HEAD + oR oR oR oR FR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -12516,48 +12786,63 @@ oR oR oR oR -<<<<<<< HEAD -======= + +eL oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + + +oR + + oR oR oR oR oR -<<<<<<< HEAD + + + +oR + +eL + +uP +uP +uP +uP +uP +oR +uP +uP +uP +oR +oR +oR + +eL +eL oR eL -======= -uP -uP -uP -uP + uP oR uP uP -uP -oR -oR -oR -uP -oR -uP -uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR oR oR oR + oR -<<<<<<< HEAD + oR oR oR oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -12794,8 +13079,11 @@ oR oR oR oR -<<<<<<< HEAD -======= + +eL + + + uP uP uP @@ -12804,32 +13092,35 @@ uP uP uP uP + oR ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 -oR -oR -oR -oR -oR -oR -oR -uP -uP -oR -oR -oR -uP -oR -oR -oR -oR -oR + oR oR oR oR eL +oR +oR +oR + eL + +uP +uP + +oR +oR +oR +uP +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -13052,15 +13343,19 @@ oR oR oR oR +eL +eL oR -oR -oR -<<<<<<< HEAD + oR oR eL -======= + +eL + + uP + oR oR uP @@ -13068,7 +13363,7 @@ uP oR uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR uP oR @@ -13091,11 +13386,15 @@ uP oR oR oR -<<<<<<< HEAD + +eL + + oR oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + + oR oR oR @@ -13321,29 +13620,39 @@ oR oR oR oR +eL oR -<<<<<<< HEAD -======= + +eL +eL + + + uP + oR oR uP oR uP uP ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + oR + +eL + oR oR uP oR -<<<<<<< HEAD + +oR + oR oR oR -oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -13633,8 +13942,8 @@ oR oR oR oR -oR -oR +eL +eL oR oR oR @@ -13652,7 +13961,7 @@ oR oR oR oR -<<<<<<< HEAD + oR oR oR @@ -13683,8 +13992,8 @@ oR FR oR oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR @@ -13885,17 +14194,21 @@ uP oR oR oR + +eL + uP uP oR + oR oR oR oR -<<<<<<< HEAD + oR -======= ->>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8 + + oR oR oR diff --git a/maps/cynosure/overmap/sectors.dm b/maps/cynosure/overmap/sectors.dm new file mode 100644 index 00000000000..968a30544ca --- /dev/null +++ b/maps/cynosure/overmap/sectors.dm @@ -0,0 +1,50 @@ +// Overmap object for Sif, hanging in the void of space +/obj/effect/overmap/visitable/planet/Sif + name = "Sif" + desc = "A cold, Earth-like planet. Cynosure Station is located here." + map_z = list( + Z_LEVEL_STATION_ONE, + Z_LEVEL_STATION_TWO, + Z_LEVEL_STATION_THREE, + Z_LEVEL_SURFACE_WILD + ) + base = 1 + in_space = 0 + start_x = 10 + start_y = 10 + skybox_offset_x = 128 + skybox_offset_y = 128 + surface_color = "#2D545B" + mountain_color = "#735555" + ice_color = "FFFFFF" + icecaps = "icecaps" + initial_generic_waypoints = list( + "nav_pad3_cynosure", //Northwest Pad 3, + "nav_pad4_cynosure" //Northwest Pad 4 + ) + + +/obj/effect/overmap/visitable/planet/Sif/Initialize() + atmosphere = new(CELL_VOLUME) + atmosphere.adjust_gas_temp("oxygen", MOLES_O2STANDARD, 273) + atmosphere.adjust_gas_temp("nitrogen", MOLES_N2STANDARD, 273) + + . = ..() + + docking_codes = null + +/obj/effect/overmap/visitable/planet/Sif/get_skybox_representation() + var/image/tmp = ..() + tmp.pixel_x = skybox_offset_x + tmp.pixel_y = skybox_offset_y + return tmp +/obj/effect/overmap/visitable/telecomm_sat + name = "Telecommunications Satellite" + icon_state = "object" + initial_generic_waypoints = list( + "nav_telecomm_dockarm" //Tcomm sat docking + ) + in_space = 1 + start_x = 10 + start_y = 10 + map_z = list(Z_LEVEL_TCOMM, Z_LEVEL_EMPTY_SPACE)