From fd0d5ac5b014aadfa19ed9d9c58c14134547ccc8 Mon Sep 17 00:00:00 2001 From: Profakos Date: Sun, 26 Mar 2023 17:40:14 +0200 Subject: [PATCH] Adds a syndicate docking port to Tramstation (#74237) ## About The Pull Request Tram was missing its syndicate docking port, so while the Syndicate Infiltrator could use their station locked advanced navigational console to get to the station, the Starfury's Corvette and fighters could not do such a thing, as they defaulted to gaze upon the areas around the Starfury, and could not swap the camera view to the station z level, due to this missing port. In addition, I noticed that the same values have been copy pasted on all stations, so I have decided to create some new docking port subtypes, one generic nearby the station (though no shuttles use it as of now), and one for northwest of the station (used by meta, kilo, and now, Tram), and one for northeast of station (used by delta and icebox). ### Mapping March Ckey to receive rewards: N/A ## Why It's Good For The Game When the traitor does enough tasks to summon the battlecruiser, the backup and extraction should arrive on every station. Closes #72204 Closes #73441 ## Changelog :cl: fix: The Starfury's Corvette and Fighters can now visit Tramstation /:cl: --- _maps/map_files/Deltastation/DeltaStation2.dmm | 10 ++-------- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 10 ++-------- _maps/map_files/KiloStation/KiloStation.dmm | 10 ++-------- _maps/map_files/MetaStation/MetaStation.dmm | 10 ++-------- _maps/map_files/tramstation/tramstation.dmm | 8 +++++++- code/modules/shuttle/shuttle.dm | 17 +++++++++++++++++ 6 files changed, 32 insertions(+), 33 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index ad5ab7542f9..ba07a589676 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -58642,14 +58642,8 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "oFv" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 8; - dwidth = 12; - height = 17; - name = "northeast of station"; - shuttle_id = "syndicate_ne"; - width = 23 +/obj/docking_port/stationary/syndicate/northeast{ + dir = 8 }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index a67f90e337f..749d4111437 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -50355,14 +50355,8 @@ /turf/open/floor/iron/dark/textured, /area/station/security/office) "pWu" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 8; - dwidth = 12; - height = 17; - name = "northeast of station"; - shuttle_id = "syndicate_ne"; - width = 23 +/obj/docking_port/stationary/syndicate/northeast{ + dir = 8 }, /turf/open/genturf, /area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 0a2e41f81f8..a95ba70c412 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -44913,14 +44913,8 @@ /turf/open/floor/grass, /area/station/medical/virology) "oJU" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 8; - dwidth = 12; - height = 17; - name = "northwest of station"; - shuttle_id = "syndicate_nw"; - width = 23 +/obj/docking_port/stationary/syndicate/northwest{ + dir = 8 }, /turf/open/space/basic, /area/space) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1ac7f38456c..8dd4847ccbf 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -58726,14 +58726,8 @@ /turf/closed/wall/r_wall, /area/station/engineering/main) "uXt" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 8; - dwidth = 12; - height = 17; - name = "northwest of station"; - shuttle_id = "syndicate_nw"; - width = 23 +/obj/docking_port/stationary/syndicate/northwest{ + dir = 8 }, /turf/open/space/basic, /area/space) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 62c0ba87e30..e8bc0cfd26f 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -27593,6 +27593,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"iKN" = ( +/obj/docking_port/stationary/syndicate/northwest{ + dir = 8 + }, +/turf/open/space/openspace, +/area/space) "iKY" = ( /obj/item/experi_scanner{ pixel_x = 5 @@ -144802,7 +144808,7 @@ jhd jhd jhd jhd -jhd +iKN jhd jhd jhd diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 081ecc1c322..cd173693d22 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -300,6 +300,23 @@ if (HAS_TRAIT(SSstation, STATION_TRAIT_BIGGER_PODS)) roundstart_template = /datum/map_template/shuttle/escape_pod/luxury +// should fit the syndicate infiltrator, and smaller ships like the battlecruiser corvettes and fighters +/obj/docking_port/stationary/syndicate + name = "near the station" + dheight = 1 + dwidth = 12 + height = 17 + width = 23 + shuttle_id = "syndicate_nearby" + +/obj/docking_port/stationary/syndicate/northwest + name = "northwest of station" + shuttle_id = "syndicate_nw" + +/obj/docking_port/stationary/syndicate/northeast + name = "northeast of station" + shuttle_id = "syndicate_ne" + /obj/docking_port/stationary/transit name = "In Transit" override_can_dock_checks = TRUE