cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 20:11:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Grants Xenobotanists and Xenobiologists access to the Shuttles (#21065)

Browse Source 
Permission given by Matt. Have fun y'all.

Did a little extra code refactoring in here while fixing things up to be
a bit more consistent. Xenoarchs also had access to the pilot room for
sensor readings etc, so gave the same to xenobots/xenobios.

However, while in here I got annoyed by the fact that while
ACCESS_INTREPID exists, the other shuttles all rely on per-job manual
overrides to their mapped objects to handle access control. Therefore, I
added ACCESS_SPARK, ACCESS_QUARK, and ACCESS_CANARY, and updated all the
associated jobs/objects to use them instead of a mishmash of bespoke
edits.

_(I would have preferred to use naming conventions like
ACCESS_SHUTTLE_EXPEDITION, ACCESS_SHUTTLE_MINING,
ACCESS_SHUTTLE_SCIENCE, ACCESS_SHUTTLE_INTERCEPTOR, but I was good and
used the in-game names in the code, as was existing convention.)_
This commit is contained in:
Batrachophreno
2025-08-03 16:12:44 +00:00
committed by GitHub
parent 531e2287d3
commit d15abdac1f
13 changed files with 336 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+24 -41
View File
@@ -1543,87 +1543,87 @@ ABSTRACT_TYPE(/obj/machinery/power/apc)
dir = SOUTH
pixel_y = -4
/obj/machinery/power/apc/intrepid
/obj/machinery/power/apc/shuttle/intrepid
cell_type = /obj/item/cell/high
req_access = null
req_one_access = list(ACCESS_INTREPID,ACCESS_ENGINE_EQUIP)
req_one_access = list(ACCESS_ENGINE_EQUIP, ACCESS_INTREPID)
/obj/machinery/power/apc/intrepid/north
/obj/machinery/power/apc/shuttle/intrepid/north
dir = NORTH
pixel_y = 22
/obj/machinery/power/apc/intrepid/east
/obj/machinery/power/apc/shuttle/intrepid/east
dir = EAST
pixel_x = 12
/obj/machinery/power/apc/intrepid/west
/obj/machinery/power/apc/shuttle/intrepid/west
dir = WEST
pixel_x = -12
/obj/machinery/power/apc/intrepid/south
/obj/machinery/power/apc/shuttle/intrepid/south
dir = SOUTH
pixel_y = -4
/obj/machinery/power/apc/canary
/obj/machinery/power/apc/shuttle/canary
cell_type = /obj/item/cell/high
req_access = null
req_one_access = list(ACCESS_INTREPID,ACCESS_ENGINE_EQUIP)
req_one_access = list(ACCESS_ENGINE_EQUIP, ACCESS_CANARY)
/obj/machinery/power/apc/canary/north
/obj/machinery/power/apc/shuttle/canary/north
dir = NORTH
pixel_y = 22
/obj/machinery/power/apc/canary/east
/obj/machinery/power/apc/shuttle/canary/east
dir = EAST
pixel_x = 12
/obj/machinery/power/apc/canary/west
/obj/machinery/power/apc/shuttle/canary/west
dir = WEST
pixel_x = -12
/obj/machinery/power/apc/canary/south
/obj/machinery/power/apc/shuttle/canary/south
dir = SOUTH
pixel_y = -4
ABSTRACT_TYPE(/obj/machinery/power/apc/quark)
ABSTRACT_TYPE(/obj/machinery/power/apc/shuttle/quark)
cell_type = /obj/item/cell/high
req_access = null
req_one_access = list(ACCESS_XENOARCH, ACCESS_RESEARCH, ACCESS_BRIDGE_CREW)
req_one_access = list(ACCESS_ENGINE_EQUIP, ACCESS_QUARK)
/obj/machinery/power/apc/quark/north
/obj/machinery/power/apc/shuttle/quark/north
dir = NORTH
pixel_y = 22
/obj/machinery/power/apc/quark/east
/obj/machinery/power/apc/shuttle/quark/east
dir = EAST
pixel_x = 12
/obj/machinery/power/apc/quark/west
/obj/machinery/power/apc/shuttle/quark/west
dir = WEST
pixel_x = -12
/obj/machinery/power/apc/quark/south
/obj/machinery/power/apc/shuttle/quark/south
dir = SOUTH
pixel_y = -4
/obj/machinery/power/apc/mining_shuttle
/obj/machinery/power/apc/shuttle/spark
cell_type = /obj/item/cell/high
req_access = null
req_one_access = list(ACCESS_MINING,ACCESS_ENGINE_EQUIP)
req_one_access = list(ACCESS_ENGINE_EQUIP, ACCESS_SPARK)
/obj/machinery/power/apc/mining_shuttle/north
/obj/machinery/power/apc/shuttle/spark/north
dir = NORTH
pixel_y = 22
/obj/machinery/power/apc/mining_shuttle/east
/obj/machinery/power/apc/shuttle/spark/east
dir = EAST
pixel_x = 12
/obj/machinery/power/apc/mining_shuttle/west
/obj/machinery/power/apc/shuttle/spark/west
dir = WEST
pixel_x = -12
/obj/machinery/power/apc/mining_shuttle/south
/obj/machinery/power/apc/shuttle/spark/south
dir = SOUTH
pixel_y = -4
@@ -1637,23 +1637,6 @@ ABSTRACT_TYPE(/obj/machinery/power/apc/quark)
coverlocked = FALSE
start_charge = 100
/obj/machinery/power/apc/canary/north
dir = NORTH
pixel_y = 22
/obj/machinery/power/apc/canary/east
dir = EAST
pixel_x = 12
/obj/machinery/power/apc/canary/west
dir = WEST
pixel_x = -12
/obj/machinery/power/apc/canary/south
dir = SOUTH
pixel_y = -4
/obj/machinery/power/apc/super
cell_type = /obj/item/cell/super