From b15b01f57cbe644f6864bb7e643464f3d60aff95 Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Wed, 13 Aug 2025 07:04:12 -0400 Subject: [PATCH] Headmaster GPS + Access Reqs (#21147) Headmaster now has stationary GPS units for shuttle and ship, as well as special gps network Adds access requirements to buttons in bridge and airlock Co-authored-by: Ben10083 --- .../Ben10083 - Headmaster Tweaks.yml | 59 ++++++ .../ships/pra/headmaster/headmaster_ship.dmm | 176 +++++++++++++----- 2 files changed, 192 insertions(+), 43 deletions(-) create mode 100644 html/changelogs/Ben10083 - Headmaster Tweaks.yml diff --git a/html/changelogs/Ben10083 - Headmaster Tweaks.yml b/html/changelogs/Ben10083 - Headmaster Tweaks.yml new file mode 100644 index 00000000000..55ff2ceab64 --- /dev/null +++ b/html/changelogs/Ben10083 - Headmaster Tweaks.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Headmaster ship now has GPS network." + - qol: "Additional access requirements added to certain Headmaster equipment, such as airlocks" diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index b2a7c3cb48b..2b0745bb6a1 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -252,6 +252,12 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/item/device/gps/stationary{ + pixel_y = -28; + gps_prefix = "KOSMO"; + gpstag = "HEADMASTER"; + pixel_x = 6 + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -671,7 +677,9 @@ req_access = list(209) }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 }, @@ -1253,7 +1261,9 @@ dir = 8; id = "headmaster_dock" }, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 }, @@ -1946,7 +1956,9 @@ pixel_x = -32 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 }, @@ -2176,7 +2188,9 @@ }, /obj/structure/lattice/catwalk/indoor, /obj/machinery/light/small/emergency, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -2187,7 +2201,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -2723,7 +2739,9 @@ pixel_x = -6 }, /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -2747,7 +2765,9 @@ dir = 1 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 }, @@ -3359,8 +3379,8 @@ }, /obj/item/device/gps/stationary{ pixel_y = 32; - gps_prefix = "SSRM"; - gpstag = "SAMV"; + gps_prefix = "KOSMO"; + gpstag = "KOSMOSHUTTLE"; pixel_x = 6 }, /obj/effect/floor_decal/industrial/hatch_tiny/blue{ @@ -3800,7 +3820,9 @@ pixel_x = 32 }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 }, @@ -3972,7 +3994,9 @@ req_access = list(209) }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock{ + req_one_access = list(209) + }, /obj/effect/shuttle_landmark/headmaster_ship/dock/aft, /obj/effect/landmark/entry_point/aft{ name = "aft, docking arm" @@ -4021,7 +4045,9 @@ /obj/machinery/light/small/emergency{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -4634,7 +4660,9 @@ dir = 4; pixel_y = -6 }, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -5293,7 +5321,9 @@ "ul" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -5487,7 +5517,9 @@ /area/headmaster_ship/helm) "vd" = ( /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -5569,7 +5601,9 @@ /area/headmaster_ship/hangar) "vq" = ( /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -5619,7 +5653,9 @@ req_access = list(209) }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 }, @@ -6542,7 +6578,9 @@ /obj/machinery/light/small/emergency{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -7807,7 +7845,9 @@ pixel_x = 5 }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 }, @@ -7917,7 +7957,9 @@ pixel_x = 5 }, /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -8278,28 +8320,32 @@ name = "Docking Port Lockdown"; dir = 10; pixel_y = 8; - pixel_x = -6 + pixel_x = -6; + req_access = list(209) }, /obj/machinery/button/remote/blast_door{ id = "headmaster_helm"; name = "Helm Lockdown"; dir = 10; pixel_x = 5; - pixel_y = 8 + pixel_y = 8; + req_access = list(209) }, /obj/machinery/button/remote/blast_door{ id = "headmaster_windows"; name = "Window Shields"; dir = 10; pixel_x = -6; - pixel_y = -1 + pixel_y = -1; + req_access = list(209) }, /obj/machinery/button/remote/blast_door{ id = "headmaster_robots"; name = "Automated Defences"; dir = 10; pixel_x = 5; - pixel_y = -1 + pixel_y = -1; + req_access = list(209) }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 @@ -9350,7 +9396,9 @@ /obj/effect/shuttle_landmark/headmaster_ship/dock/port{ dir = 8 }, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock{ + req_one_access = list(209) + }, /obj/effect/landmark/entry_point/port{ name = "port, docking arm" }, @@ -9425,7 +9473,9 @@ "MS" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -9686,7 +9736,9 @@ /area/headmaster_ship/helm) "NG" = ( /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -9958,7 +10010,9 @@ /obj/effect/shuttle_landmark/headmaster_ship/dock/starboard{ dir = 4 }, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 }, @@ -10251,7 +10305,9 @@ /area/headmaster_ship/infirmary) "QL" = ( /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -10386,7 +10442,9 @@ req_access = list(209) }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock{ + req_one_access = list(209) + }, /obj/effect/landmark/entry_point/starboard{ name = "starboard, docking arm" }, @@ -10399,7 +10457,9 @@ dir = 4 }, /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -10569,12 +10629,30 @@ /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, /obj/item/tank/jetpack/oxygen, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, +/obj/item/device/gps{ + gps_prefix = "KOSMO"; + gpstag = "KOSMO0" + }, +/obj/item/device/gps{ + gps_prefix = "KOSMO"; + gpstag = "KOSMO0" + }, +/obj/item/device/gps{ + gps_prefix = "KOSMO"; + gpstag = "KOSMO0" + }, +/obj/item/device/gps{ + gps_prefix = "KOSMO"; + gpstag = "KOSMO0" + }, +/obj/item/device/gps{ + gps_prefix = "KOSMO"; + gpstag = "KOSMO0" + }, +/obj/item/device/gps{ + gps_prefix = "KOSMO"; + gpstag = "KOSMO0" + }, /obj/effect/floor_decal/spline/plain/red{ dir = 8 }, @@ -10683,7 +10761,9 @@ pixel_y = -6 }, /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/aft_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -10796,7 +10876,9 @@ req_access = list(209) }, /obj/effect/map_effect/marker_helper/airlock/interior, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock{ + req_one_access = list(209) + }, /turf/simulated/floor/tiled/dark/full{ temperature = 278.15 }, @@ -11377,7 +11459,9 @@ }, /obj/structure/lattice/catwalk/indoor, /obj/machinery/light/small/emergency, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/starboard_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -11507,8 +11591,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port{ + req_one_access = list(209) + }, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/shuttle_port{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -11577,7 +11665,9 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor, -/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock, +/obj/effect/map_effect/marker/airlock/docking/headmaster_ship/port_dock{ + req_one_access = list(209) + }, /turf/simulated/floor{ temperature = 278.15 },