From 4319640891b2c53bc4467aadda05d84964f15e67 Mon Sep 17 00:00:00 2001 From: PrismaticGynoid Date: Wed, 6 Oct 2021 21:03:16 -0700 Subject: [PATCH 1/3] Map fixes and tweaks part 7 Fixes for: Basic NTnet cards being unable to reach telecomms from the station Shuttles not showing location details when landed Ship sensors printing blank papers Certain shuttles not clearing weather visuals on landing Ninja/merc elite shuttles being unable to dock Mislabeled west solar SMES Engine flow/pump sensors not connected to cooling system computer Fixes a few non-cold tiles in telecomms compartment Adds a few missing rails Also, tweaks surgery rooms a bit --- code/_helpers/turfs.dm | 1 + .../hardware/network_card.dm | 2 +- code/modules/overmap/ships/landable.dm | 6 +- code/modules/paperwork/paper.dm | 13 +- maps/cynosure/cynosure-1.dmm | 12 +- maps/cynosure/cynosure-2.dmm | 46 +- maps/cynosure/cynosure-3.dmm | 10 +- maps/cynosure/cynosure-4.dmm | 72 +- maps/cynosure/cynosure-6.dmm | 114 +- maps/cynosure/cynosure-7.dmm | 1382 ++++++++--------- maps/cynosure/overmap/sectors.dm | 50 + 11 files changed, 927 insertions(+), 781 deletions(-) create mode 100644 maps/cynosure/overmap/sectors.dm 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..ed3e29cd8c3 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -199,10 +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." + else + return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines." return "Docked with an unknown object." if(SHIP_STATUS_TRANSIT) return "Maneuvering under secondary thrust." diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 95bcda3b36b..a86707d8412 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(text)) + name = title + if(istext(title)) + 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 2f3ede3d5c5..196b7485330 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -2038,6 +2038,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{ @@ -6763,7 +6769,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway) "dfs" = ( @@ -8585,7 +8590,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" = ( @@ -14415,7 +14419,7 @@ /area/surface/station/crew_quarters/heads/hop) "gEG" = ( /obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - Northeast"; + RCon_tag = "Solar - West"; input_attempt = 1; input_level = 300000; output_level = 200000 @@ -21700,6 +21704,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" @@ -22501,6 +22509,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" = ( @@ -25968,9 +25979,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, @@ -25987,6 +25995,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" = ( @@ -31474,6 +31488,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 @@ -37570,7 +37588,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" = ( @@ -39208,6 +39225,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 @@ -42580,6 +42601,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" = ( @@ -48000,7 +48025,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway) "vNz" = ( @@ -86184,7 +86208,7 @@ dns red kBa kMw -psC +rIW lVJ ykd suW @@ -88754,7 +88778,7 @@ bBP vJx esD dRW -ycR +otX vVA uBt toG @@ -92148,7 +92172,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 5dda79c3e91..31e9babc2a6 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -8770,15 +8770,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 c4373278ff9..25dbbbb11b3 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) }, @@ -1266,7 +1266,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) @@ -1785,16 +1785,10 @@ /area/holodeck/source_courtroom) "ccc" = ( /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle_sensor"; pixel_y = 28 }, -/obj/effect/shuttle_landmark{ - base_area = /area/ninja_dojo/dojo; - base_turf = /turf/snow; - landmark_tag = "ninja_start"; - name = "Dojo Outpost" - }, /turf/simulated/shuttle/floor/voidcraft/dark, /area/ninja_dojo/start) "ccf" = ( @@ -2060,7 +2054,7 @@ /area/syndicate_station) "ctM" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_southwest_lock"; req_access = list(150) }, @@ -2296,7 +2290,7 @@ /area/shuttle/supply) "cKC" = ( /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "vox_east_sensor"; pixel_x = -25 }, @@ -2793,8 +2787,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, @@ -4014,7 +4008,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) @@ -4330,8 +4324,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) }, @@ -4347,6 +4341,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, @@ -4982,13 +4985,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) @@ -6942,7 +6944,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); @@ -6953,7 +6955,7 @@ }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1331; + frequency = 1380; id_tag = "vox_west_vent" }, /obj/machinery/light/small, @@ -8994,7 +8996,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, @@ -9005,7 +9007,7 @@ /area/skipjack_station/start) "kqS" = ( /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "vox_west_sensor"; pixel_x = 25 }, @@ -10894,7 +10896,7 @@ /area/holodeck/source_picnicarea) "mrF" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_southeast_lock"; req_access = list(150) }, @@ -11593,6 +11595,9 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/syndicate_elite/mothership) "ngK" = ( @@ -11772,7 +11777,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, @@ -12239,7 +12244,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) @@ -12612,7 +12617,7 @@ /area/syndicate_station/start) "otk" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_northeast_lock"; req_access = list(150) }, @@ -13662,7 +13667,7 @@ "pFK" = ( /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; + frequency = 1380; master_tag = "merc_shuttle"; name = "interior access button"; pixel_x = -25; @@ -14790,7 +14795,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) @@ -15537,7 +15542,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{ @@ -15687,7 +15692,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) @@ -15699,7 +15704,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, @@ -15742,7 +15747,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, @@ -15848,10 +15853,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) @@ -17095,18 +17100,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 @@ -17224,10 +17229,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{ @@ -20355,7 +20357,7 @@ /area/syndicate_station/start) "wJs" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_northwest_lock"; req_access = list(150) }, @@ -20403,12 +20405,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 +21811,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{ @@ -21824,6 +21826,12 @@ name = "ship lockdown control"; pixel_x = -25 }, +/obj/effect/shuttle_landmark{ + base_area = /area/ninja_dojo/dojo; + base_turf = /turf/snow; + landmark_tag = "ninja_start"; + name = "Dojo Outpost" + }, /turf/simulated/shuttle/floor/voidcraft/dark, /area/ninja_dojo/start) "ymh" = ( @@ -85779,7 +85787,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 a24f4575295..2e25f956a1e 100644 --- a/maps/cynosure/cynosure-7.dmm +++ b/maps/cynosure/cynosure-7.dmm @@ -1747,7 +1747,7 @@ oR oR oR oR -eL +oR oR oR oR @@ -1988,8 +1988,6 @@ oR oR oR oR -eL -eL oR oR oR @@ -1997,23 +1995,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 @@ -2236,40 +2236,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 @@ -2493,39 +2493,39 @@ oR oR oR oR -eL oR oR -eL oR -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR eL oR oR oR -eL -eL oR oR oR -eL -oR -oR -eL -eL -oR -Wi -Wi -Wi -Wi -oR -oR -oR -eL -oR oR oR oR @@ -2751,11 +2751,25 @@ oR oR oR oR -eL oR +oR +oR +oR +oR +oR +oR +oR +oR +eL eL oR oR +oR +oR +oR +oR +oR +eL eL oR oR @@ -2766,26 +2780,12 @@ oR oR eL oR -eL -oR -eL -oR oR eL oR eL -Wi -Wi -Wi -Wi -eL -oR eL eL -eL -oR -oR -oR oR oR oR @@ -3008,40 +3008,40 @@ oR oR oR oR +eL +oR +oR +oR oR eL oR -Wi -Wi -Wi +oR oR 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 eL oR eL oR oR eL -oR +eL +eL +eL oR oR oR @@ -3266,42 +3266,42 @@ 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 +oR +oR +eL +oR +oR +oR eL eL oR +oR +oR eL oR oR +eL +eL +oR +Wi +Wi +Wi +Wi +oR +oR +oR +eL +oR +oR +oR +oR +oR oR oR oR @@ -3523,39 +3523,39 @@ oR oR oR oR +eL +oR +eL 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 @@ -3776,43 +3776,43 @@ oR oR oR oR -eL -eL +oR +oR +oR +oR oR 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 -Wi -Wi -oR -oR -oR +oR +eL +eL oR oR +eL +eL +Wi +Wi +Wi +eL +eL +oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +eL +oR +eL oR oR +eL oR oR oR @@ -4032,47 +4032,47 @@ oR oR oR oR +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 oR @@ -4290,44 +4290,44 @@ 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 -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 -oR -oR -oR -oR +eL oR oR oR @@ -4548,37 +4548,37 @@ 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 -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 +Wi +Wi +oR oR oR oR @@ -4804,8 +4804,11 @@ oR oR oR oR +eL +eL +eL oR -oR +eL oR Wi Wi @@ -4814,10 +4817,12 @@ Wi Wi Wi Wi -Wi -Wi -Wi Hb +Hb +Hb +Hb +Wi +Wi Wi Wi Wi @@ -4825,7 +4830,7 @@ Hb Hb Hb Wi -Hb +Wi Wi Wi Wi @@ -4833,11 +4838,6 @@ Wi eL eL eL -eL -oR -oR -oR -oR oR oR oR @@ -5060,41 +5060,41 @@ oR oR oR oR -eL oR 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 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 +eL oR oR oR @@ -5317,40 +5317,40 @@ oR oR oR oR -eL -oR -eL oR oR oR -Wi -Wi -Wi -Wi -Hb -Wi -Wi -Wi -Hb -Wi -Hb -Hb -Hb -Hb -Hb -Wi -Hb -Wi -Wi -Wi -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 -oR -oR -oR -oR +eL +eL oR oR oR @@ -5574,38 +5574,38 @@ oR oR oR oR -eL oR +oR +oR +oR +oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Hb +Wi +Wi +Wi +Hb +Hb +Hb +Wi +Hb +Wi +Wi +Wi +Wi +eL eL eL eL -oR -Wi -Wi -Wi -Wi -Wi -Hb -Hb -Wi -Wi -Hb -Hb -Hb -Hb -Wi -Hb -Hb -Hb -Wi -Wi -Wi -Wi -oR -oR -oR -oR -oR oR oR oR @@ -5830,10 +5830,10 @@ pM oR oR oR -eL +oR oR eL -eL +oR oR eL Wi @@ -5842,30 +5842,30 @@ Wi Wi Wi Wi +Wi +Hb +Wi +Wi +Hb +Wi Hb Hb Wi Hb Hb Hb -Hb Wi Wi Wi -Hb Wi Wi -oR -oR -Wi -oR -oR -oR -oR -oR +eL +eL +eL +eL eL oR -eL +oR oR oR oR @@ -6092,15 +6092,19 @@ oR eL oR eL -eL +oR +oR oR Wi Wi Wi Wi +Hb +Wi +Wi Wi Hb -Hb +Wi Hb Hb Hb @@ -6108,21 +6112,17 @@ Hb Hb Wi Hb -Hb Wi Wi Wi -Wi -Wi -oR -oR oR oR eL -eL oR oR -eL +oR +oR +oR oR oR oR @@ -6344,16 +6344,14 @@ pM oR oR oR -eL +oR oR eL oR eL eL -Wi -Wi -Wi -Wi +eL +oR Wi Wi Wi @@ -6361,10 +6359,15 @@ Wi Wi Hb Hb +Wi +Wi +Hb +Hb Hb Hb Wi -Wi +Hb +Hb Hb Wi Wi @@ -6372,10 +6375,7 @@ Wi Wi oR oR -eL -eL -eL -eL +oR oR oR oR @@ -6602,42 +6602,42 @@ oR oR oR oR -oR eL oR eL eL oR -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Hb -Hb -uP -Hb -Hb -Wi -Hb -Hb -Wi -Wi -Wi -Wi eL +Wi +Wi +Wi +Wi +Wi +Wi +Hb +Hb +Wi +Hb +Hb +Hb +Hb +Wi +Wi +Wi +Hb +Wi +Wi +oR +oR +Wi +oR +oR +oR oR oR eL oR -oR -oR -oR -oR -oR -oR +eL oR oR oR @@ -6861,19 +6861,22 @@ oR oR oR oR +eL oR eL eL +oR Wi Wi Wi Wi Wi Hb -Wi -Wi Hb -Wi +Hb +Hb +Hb +Hb Hb Wi Hb @@ -6883,14 +6886,12 @@ Wi Wi Wi Wi -Wi -eL -oR oR oR oR oR eL +eL oR oR eL @@ -6912,7 +6913,6 @@ oR oR oR oR -oR FR oR oR @@ -7116,9 +7116,10 @@ oR oR oR oR -oR +eL oR eL +oR eL eL Wi @@ -7127,27 +7128,26 @@ Wi Wi Wi Wi +Wi +Wi +Wi +Hb Hb Hb Hb Wi -Hb -Hb Wi Hb -Hb Wi Wi Wi Wi oR +oR +eL eL -oR eL -oR eL -oR -oR oR oR oR @@ -7376,6 +7376,7 @@ oR oR oR eL +oR eL eL oR @@ -7383,26 +7384,23 @@ Wi Wi Wi Wi -eL Wi Wi Wi Hb -Wi +Hb +uP +Hb Hb Wi Hb +Hb Wi Wi Wi Wi -Wi -eL -eL eL oR -eL -eL oR eL oR @@ -7427,6 +7425,8 @@ oR oR oR oR +oR +oR FR oR oR @@ -7632,15 +7632,21 @@ oR oR oR oR -eL oR oR -Wi -Wi -Wi -Wi -Wi eL +eL +Wi +Wi +Wi +Wi +Wi +Hb +Wi +Wi +Hb +Wi +Hb Wi Hb Hb @@ -7650,21 +7656,15 @@ Wi Wi Wi Wi -Wi -Wi -Wi -Wi -eL -eL -eL -eL -eL eL oR oR oR oR +oR eL +oR +oR eL oR oR @@ -7890,34 +7890,34 @@ oR oR oR oR +eL +eL +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 -eL -eL -eL -eL -eL +oR eL oR +eL oR oR oR @@ -8147,40 +8147,40 @@ oR oR oR oR -oR -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 eL oR oR oR oR -eL -oR -oR oR oR oR @@ -8405,11 +8405,17 @@ oR oR oR eL +oR +oR +Wi +Wi +Wi +Wi +Wi eL Wi -Wi -Wi -oR +Hb +Hb Wi Wi Wi @@ -8420,18 +8426,11 @@ Wi Wi Wi Wi -Wi -oR -Wi eL eL eL -oR -oR eL -oR -oR -oR +eL eL oR oR @@ -8455,6 +8454,7 @@ oR oR oR oR +oR FR oR oR @@ -8658,39 +8658,39 @@ oR oR oR oR -eL -oR -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 -eL oR oR oR oR oR +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 +oR oR oR oR @@ -8917,7 +8917,8 @@ oR oR oR oR -eL +oR +oR oR eL Wi @@ -8926,33 +8927,32 @@ Wi Wi Wi Wi -oR -eL -eL -oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi Wi Wi oR -Wi -Wi eL eL eL -eL -oR -eL -eL -oR -oR -eL -eL oR oR oR +eL oR oR oR oR +eL +oR +oR oR oR oR @@ -9171,46 +9171,46 @@ pM pM oR oR -eL +oR oR oR oR oR eL +eL +Wi +Wi +Wi +oR +Wi +Wi +Wi +Wi +Wi Wi Wi Wi Wi Wi Wi -oR -eL -eL -oR oR Wi eL -oR -eL -oR -eL -oR eL eL oR +oR eL oR +oR +oR eL oR oR oR oR -oR -oR -oR -oR -oR -oR +eL +eL oR oR oR @@ -9430,34 +9430,34 @@ oR oR oR oR -oR -oR -eL -eL eL oR eL -oR +eL +eL +Wi +Wi +Wi +Wi +Wi Wi Wi oR -eL oR -oR -eL -eL +Wi +Wi +Wi +Wi +Wi +Wi eL oR eL oR eL -oR eL eL eL -eL -oR -oR oR oR oR @@ -9687,37 +9687,37 @@ oR oR oR oR +oR +oR +eL +oR +eL +Wi +Wi +Wi +Wi +Wi +Wi +oR eL eL -eL -eL -eL +oR +Wi +Wi +oR +Wi +Wi eL eL eL eL oR eL -oR -eL -eL -oR -oR -oR eL oR oR eL -oR -oR -oR eL -eL -oR -oR -eL -oR -oR oR oR oR @@ -9943,36 +9943,36 @@ pM oR oR oR +eL +oR oR oR oR eL -eL -eL -eL -eL +Wi +Wi +Wi +Wi +Wi +Wi oR eL eL -eL oR oR +Wi +eL +oR +eL oR eL oR eL eL oR -oR -oR -oR -oR -oR -oR -oR -oR eL oR +eL oR oR oR @@ -10203,31 +10203,31 @@ oR oR oR oR -eL -eL -eL -eL -eL +oR 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 oR oR @@ -10458,36 +10458,36 @@ oR oR oR oR -eL -oR oR eL eL -oR +eL +eL +eL +eL +eL eL eL oR eL oR -oR -oR -oR -oR -oR -oR -oR eL eL +oR +oR +oR eL oR oR eL oR oR +oR +eL eL oR oR -oR +eL oR oR oR @@ -10714,7 +10714,20 @@ oR oR oR oR +oR +oR +oR +oR eL +eL +eL +eL +eL +oR +eL +eL +eL +oR oR oR eL @@ -10724,26 +10737,13 @@ eL oR oR oR -eL +oR +oR oR oR oR oR eL -eL -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR oR oR oR @@ -10975,18 +10975,13 @@ oR oR oR oR -oR -oR eL -oR -oR -oR -oR -oR eL -oR -oR -oR +eL +eL +eL +eL +eL eL oR oR @@ -10996,9 +10991,14 @@ oR oR oR oR +eL +eL oR oR oR +eL +oR +oR oR oR oR @@ -11229,14 +11229,18 @@ oR oR oR oR -eL +oR eL oR oR +eL +eL oR eL eL oR +eL +oR oR oR oR @@ -11244,19 +11248,15 @@ oR oR oR oR -oR -oR -oR -oR -oR -oR +eL +eL +eL oR oR eL oR oR -oR -oR +eL oR oR oR @@ -11486,6 +11486,8 @@ oR oR oR oR +eL +oR oR eL oR @@ -11494,17 +11496,15 @@ eL oR oR oR -oR eL oR oR oR oR +eL +eL oR -oR -oR -oR -oR +eL oR oR oR @@ -11749,26 +11749,16 @@ oR oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR +eL oR oR oR oR oR eL +oR +oR +oR eL oR oR @@ -11796,6 +11786,16 @@ oR oR oR oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR FR oR oR @@ -12001,11 +12001,12 @@ oR oR oR oR +eL +eL oR oR oR -oR -oR +eL eL oR oR @@ -12023,8 +12024,7 @@ oR oR oR oR -oR -oR +eL oR oR oR @@ -12259,15 +12259,15 @@ oR oR oR oR +eL +oR +eL +eL oR oR oR oR -oR -oR -oR -oR -oR +eL oR oR oR @@ -12540,8 +12540,8 @@ oR oR oR oR -oR -oR +eL +eL oR oR oR @@ -12778,7 +12778,7 @@ oR oR oR oR -oR +eL 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) From 34b26a9051d3a8381d5d3bf6078b45fd541ea0b0 Mon Sep 17 00:00:00 2001 From: PrismaticGynoid Date: Sun, 17 Oct 2021 15:20:15 -0700 Subject: [PATCH 2/3] Fix paper --- code/modules/paperwork/paper.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index a86707d8412..9e78f7e942d 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -109,9 +109,9 @@ /obj/item/weapon/paper/Initialize(mapload, var/text, var/title) . = ..() - if(istext(text)) - name = title 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. From 81e8f7b80bcad2661a7397e958889f4857dc675e Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Wed, 27 Oct 2021 21:23:43 -0400 Subject: [PATCH 3/3] Fix unreachable --- code/modules/overmap/ships/landable.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm index ed3e29cd8c3..a76a39b60e6 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -203,7 +203,6 @@ return "Docked with \the [location.name]. Use secondary thrust to get clear before activating primary engines." else return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines." - return "Docked with an unknown object." if(SHIP_STATUS_TRANSIT) return "Maneuvering under secondary thrust." if(SHIP_STATUS_OVERMAP)