From d7edc335117b817c8650a34211d163ea2acda5a3 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Wed, 23 Nov 2022 22:31:42 +0100 Subject: [PATCH] Adds a Static GPS to the Intrepid (#15151) --- code/modules/telesci/gps.dm | 21 ++- html/changelogs/intrepid_static_gps.yml | 6 + .../sccv_horizon/code/sccv_horizon_overmap.dm | 13 +- maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 131 ++++++++++-------- 4 files changed, 100 insertions(+), 71 deletions(-) create mode 100644 html/changelogs/intrepid_static_gps.yml diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 4930c273479..56ec4b55108 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -310,10 +310,14 @@ var/list/GPS_list = list() compass_color = "#EAD152" gpstag = "MAROON0" +/********** Static GPS Start **********/ // Static GPS /obj/item/device/gps/stationary name = "static GPS" desc = "A static global positioning system." + anchored = TRUE + unacidable = TRUE + layer = 2.1 gpstag = "STAT0" /obj/item/device/gps/stationary/Initialize() @@ -350,12 +354,21 @@ var/list/GPS_list = list() /obj/item/device/gps/stationary/attack_hand() // Don't let users pick it up. return +// Spark /obj/item/device/gps/stationary/mining_shuttle - name = "static GPS (mining shuttle)" + name = "static GPS (SCCV Spark)" desc = "A static global positioning system helpful for finding your way back to the mining shuttle." icon_state = "gps-min" - anchored = TRUE - layer = 2.1 gps_prefix = "MIN" compass_color = "#5F4519" - gpstag = "MINSHUT" \ No newline at end of file + gpstag = "SPARK" + +// Intrepid +/obj/item/device/gps/stationary/sccv_intrepid + name = "static GPS (SCCV Intrepid)" + desc = "A static global positioning system helpful for finding your way back to the SCCV Intrepid." + icon_state = "gps-com" + gps_prefix = "COM" + compass_color = "#193A7A" + gpstag = "INTREPID" +/********** Static GPS End **********/ \ No newline at end of file diff --git a/html/changelogs/intrepid_static_gps.yml b/html/changelogs/intrepid_static_gps.yml new file mode 100644 index 00000000000..77b4d0ac3ba --- /dev/null +++ b/html/changelogs/intrepid_static_gps.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Adds a static GPS to the Intrepid." \ No newline at end of file diff --git a/maps/sccv_horizon/code/sccv_horizon_overmap.dm b/maps/sccv_horizon/code/sccv_horizon_overmap.dm index 83ed9dddd0e..2fd080cd9ba 100644 --- a/maps/sccv_horizon/code/sccv_horizon_overmap.dm +++ b/maps/sccv_horizon/code/sccv_horizon_overmap.dm @@ -35,12 +35,6 @@ "deck_three_aft_of_horizon" ) - -/obj/machinery/computer/shuttle_control/explore/intrepid - name = "Intrepid control console" - shuttle_tag = "Intrepid" - req_access = list(access_intrepid) - /obj/effect/overmap/visitable/ship/landable/intrepid name = "Intrepid" class = "SCCV" @@ -54,6 +48,11 @@ fore_dir = SOUTH vessel_size = SHIP_SIZE_SMALL +/obj/machinery/computer/shuttle_control/explore/intrepid + name = "\improper Intrepid control console" + shuttle_tag = "Intrepid" + req_access = list(access_intrepid) + /obj/effect/overmap/visitable/ship/landable/mining_shuttle name = "Spark" class = "SCCV" @@ -67,7 +66,7 @@ vessel_size = SHIP_SIZE_TINY /obj/machinery/computer/shuttle_control/explore/mining_shuttle - name = "pickaxe control console" + name = "\improper Spark control console" shuttle_tag = "Spark" req_access = list(access_mining) diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 722957c18bf..5079eb86396 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -3031,6 +3031,9 @@ dir = 8 }, /obj/machinery/portable_atmospherics/canister/oxygen, +/obj/item/device/gps/stationary/sccv_intrepid{ + pixel_x = 32 + }, /turf/simulated/floor/plating, /area/shuttle/intrepid/cargo_bay) "cty" = ( @@ -3729,7 +3732,8 @@ req_access = list(13) }, /obj/structure/plasticflaps/airtight, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/hangar/operations) "cWd" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -6764,8 +6768,7 @@ dir = 10 }, /obj/structure/railing/mapped, -/obj/machinery/iff_beacon/horizon, -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "fjS" = ( /obj/structure/ladder/up{ @@ -7259,7 +7262,8 @@ req_access = list(13) }, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "fFf" = ( /obj/structure/railing/mapped{ @@ -10110,7 +10114,7 @@ dir = 6 }, /obj/structure/railing/mapped, -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "hMr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11551,15 +11555,15 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/computer/shuttle_control/explore/mining_shuttle, /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/dark/airless, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "iZk" = ( /obj/machinery/door/blast/regular/open{ @@ -13810,7 +13814,8 @@ req_access = list(13) }, /obj/structure/plasticflaps/airtight, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/hangar/operations) "kKz" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, @@ -13927,7 +13932,8 @@ /obj/effect/landmark/entry_point/aft{ name = "aft, airlock" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "kOJ" = ( /obj/machinery/camera/network/supply{ @@ -14086,6 +14092,9 @@ dir = 9 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/item/device/gps/stationary/mining_shuttle{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "kVv" = ( @@ -17347,7 +17356,8 @@ /obj/structure/bed/handrail{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "nBK" = ( /obj/effect/floor_decal/industrial/warning, @@ -18235,6 +18245,11 @@ }, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) +"osc" = ( +/obj/machinery/iff_beacon/horizon, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/mining) "otX" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/green{ @@ -18509,7 +18524,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "oDv" = ( /obj/machinery/conveyor{ @@ -18740,7 +18755,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "oSD" = ( /obj/effect/shuttle_landmark/merc_ship/first_deck, @@ -21207,7 +21222,7 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "mining_shuttle_dock"; - name = "mining shuttle hatch controller"; + name = "\improper Spark docking port controller"; pixel_x = 6; pixel_y = -25; req_one_access = list(31,48,67); @@ -23111,7 +23126,8 @@ tag_exterior_door = "mining_shuttle_external"; tag_interior_door = "mining_shuttle_internal" }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "soD" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ @@ -23409,7 +23425,7 @@ /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "sxT" = ( /obj/structure/sign/directions/cryo{ @@ -23939,7 +23955,7 @@ /area/storage/eva) "sVu" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "sVZ" = ( /obj/effect/landmark/entry_point/aft{ @@ -24442,7 +24458,7 @@ /turf/simulated/floor/tiled/full, /area/maintenance/engineering) "tqs" = ( -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "tqT" = ( /obj/structure/cable{ @@ -25244,18 +25260,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "tVI" = ( -/obj/machinery/door/window/northleft{ - name = "Mining Shuttle Maintenance Exterior"; - req_access = list(48) +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/bed/handrail{ + dir = 1; + pixel_y = 8 }, -/obj/machinery/door/window/southleft{ - name = "Mining Shuttle Maintenance Interior"; - req_access = list(48) - }, -/obj/structure/disposalpipe/segment, -/obj/structure/plasticflaps/airtight, -/turf/simulated/floor/tiled, -/area/hangar/operations) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/mining) "tWc" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /obj/structure/cable/green{ @@ -25463,7 +25476,6 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/item/device/gps/stationary/mining_shuttle, /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "ucG" = ( @@ -26473,7 +26485,8 @@ id_tag = "mining_shuttle_internal"; req_access = list(13) }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "uUZ" = ( /obj/machinery/light{ @@ -26821,7 +26834,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "vht" = ( /obj/machinery/door/blast/regular/open{ @@ -27433,7 +27446,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "vIF" = ( /obj/structure/shuttle_part{ @@ -27467,19 +27480,19 @@ }, /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; - id_tag = "mining_dock"; - name = "mining docking hatch controller"; + id_tag = "mining_shuttle_dock"; + name = "\improper Spark docking port controller"; pixel_x = -39; pixel_y = -25; - req_one_access = list(31,48,67) + req_one_access = list(74) }, /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "intrepid_dock"; - name = "intrepid docking port controller"; + name = "\improper Intrepid docking port controller"; pixel_x = -26; pixel_y = -25; - req_one_access = list(31,48,67) + req_one_access = list(74) }, /turf/simulated/floor/tiled/dark, /area/hangar/control) @@ -27836,7 +27849,8 @@ req_access = list(13) }, /obj/effect/shuttle_landmark/mining/hangar, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "vZT" = ( /obj/machinery/light/spot/weak{ @@ -28876,16 +28890,13 @@ /area/engineering/atmos) "wSS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/window/northright{ - name = "Mining Shuttle Maintenance Exterior"; - req_access = list(48) - }, -/obj/machinery/door/window/southright{ - name = "Mining Shuttle Maintenance Interior"; - req_access = list(48) - }, /obj/structure/plasticflaps/airtight, -/turf/simulated/floor/tiled, +/obj/machinery/door/airlock/glass_mining{ + name = "Spark Dock Maintenance Access"; + req_access = list(48) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/full, /area/hangar/operations) "wTM" = ( /obj/machinery/alarm{ @@ -29634,7 +29645,7 @@ "xpX" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/bed/handrail, -/turf/simulated/floor/tiled/dark/airless, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/mining) "xqe" = ( /obj/structure/cable/green, @@ -45873,7 +45884,7 @@ wkD wos rcA oXD -tVI +wSS ixU pgW gyo @@ -46287,7 +46298,7 @@ qqS ePy xpX tqs -sxP +tVI tNp jCg tNp @@ -46689,7 +46700,7 @@ aNO uNw rAa ePy -xpX +osc tqs vhg tNp @@ -47095,7 +47106,7 @@ mWV ePy xpX tqs -sxP +tVI tNp jCg tNp @@ -48693,11 +48704,11 @@ wuD nyV wuD wuD -qju -qju -qju -qju -qju +xmc +xmc +xmc +xmc +xmc wKW mBx qju