From 5f1485366f220cdcd8152fbed4c8c10394f4a022 Mon Sep 17 00:00:00 2001 From: skoglol Date: Tue, 29 Sep 2020 04:02:05 +0200 Subject: [PATCH] Removes construction, research, cargo, mining from aux base --- .../map_files/Deltastation/DeltaStation2.dmm | 10 +++++----- .../map_files/IceBoxStation/IceBoxStation.dmm | 4 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 4 ++-- _maps/map_files/PubbyStation/PubbyStation.dmm | 4 ++-- .../jobs/job_types/research_director.dm | 20 +++++++++---------- code/modules/jobs/job_types/roboticist.dm | 6 ++++-- code/modules/jobs/job_types/scientist.dm | 6 ++++-- .../jobs/job_types/security_officer.dm | 2 +- code/modules/mining/aux_base.dm | 2 +- 9 files changed, 31 insertions(+), 27 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index d34808afc04..425c3512d65 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1681,7 +1681,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/engineering{ name = "Auxiliary Construction Storage"; - req_one_access_txt = "10;32;47;48;72" + req_one_access_txt = "72" }, /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -2019,7 +2019,7 @@ id = "construction"; name = "Auxiliary Construction Shutters"; pixel_x = -26; - req_access_txt = "32;47;48;72" + req_access_txt = "72" }, /obj/machinery/light_switch{ pixel_x = -38 @@ -2283,7 +2283,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ name = "Auxiliary Construction Zone"; - req_one_access_txt = "32;47;48;72" + req_one_access_txt = "72" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2343,7 +2343,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ name = "Auxiliary Construction Zone"; - req_one_access_txt = "32;47;48;72" + req_one_access_txt = "72" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2530,7 +2530,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; - req_one_access_txt = "32;47;48;72" + req_one_access_txt = "72" }, /obj/structure/cable, /obj/effect/turf_decal/stripes/line, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 8ff0dcd9409..3e8c0f41be9 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -15625,7 +15625,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_x = 24; - req_one_access_txt = "32;47;48;72" + req_one_access_txt = "72" }, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -16715,7 +16715,7 @@ "aLu" = ( /obj/machinery/door/airlock/engineering{ name = "Auxillary Base Construction"; - req_one_access_txt = "32;47;48;72" + req_one_access_txt = "72" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 9f67704ba46..94b9fd20afa 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -14749,7 +14749,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_y = -24; - req_one_access_txt = "32;47;48;72" + req_one_access_txt = "72" }, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -60508,7 +60508,7 @@ }, /obj/machinery/door/airlock/engineering{ name = "Auxiliary Base Construction"; - req_one_access_txt = "32;47;48;72" + req_one_access_txt = "72" }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 1dbbd7f47f8..2a5f1a70cbd 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -49728,7 +49728,7 @@ "hDG" = ( /obj/machinery/door/airlock/engineering{ name = "Auxiliary Base Construction"; - req_one_access_txt = "32;47;48;72" + req_one_access_txt = "72" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, @@ -56392,7 +56392,7 @@ id = "aux_base_shutters"; name = "Public Shutters Control"; pixel_x = -26; - req_one_access_txt = "32;47;48;72" + req_one_access_txt = "72" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/yellow, diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 09973607dc7..2d4d3488475 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -17,17 +17,17 @@ outfit = /datum/outfit/job/rd access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_RND, ACCESS_GENETICS, ACCESS_MORGUE, - ACCESS_TOXINS, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, - ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, - ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, - ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK, - ACCESS_TOXINS_STORAGE) + ACCESS_TOXINS, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, + ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, + ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK, + ACCESS_TOXINS_STORAGE, ACCESS_AUX_BASE) minimal_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_RND, ACCESS_GENETICS, ACCESS_MORGUE, - ACCESS_TOXINS, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, - ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, - ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, - ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK, - ACCESS_TOXINS_STORAGE) + ACCESS_TOXINS, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE, + ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, + ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK, + ACCESS_TOXINS_STORAGE, ACCESS_AUX_BASE) paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index 33ca5715048..8c5def4e58a 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -12,8 +12,10 @@ outfit = /datum/outfit/job/roboticist - access = list(ACCESS_ROBOTICS, ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM, ACCESS_XENOBIOLOGY, ACCESS_GENETICS) - minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_RND) + access = list(ACCESS_ROBOTICS, ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE, + ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_AUX_BASE) + minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, + ACCESS_RND, ACCESS_AUX_BASE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 9be376552ee..82282ae6719 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -12,8 +12,10 @@ outfit = /datum/outfit/job/scientist - access = list(ACCESS_ROBOTICS, ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS) - minimal_access = list(ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_ROBOTICS, ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, + ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE) + minimal_access = list(ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, + ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE) paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_SCI diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 3571e4010e4..7dce915fd5d 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -67,7 +67,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S accessory = /obj/item/clothing/accessory/armband/medblue if(SEC_DEPT_SCIENCE) ears = /obj/item/radio/headset/headset_sec/alt/department/sci - dep_access = list(ACCESS_RESEARCH, ACCESS_RND) + dep_access = list(ACCESS_RESEARCH, ACCESS_RND, ACCESS_AUX_BASE) destination = /area/security/checkpoint/science spawn_point = locate(/obj/effect/landmark/start/depsec/science) in GLOB.department_security_spawns accessory = /obj/item/clothing/accessory/armband/science diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 1619765b7c6..0c5fc7cfab5 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -21,7 +21,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also var/launch_warning = TRUE var/list/turrets = list() //List of connected turrets - req_one_access = list(ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_AUX_BASE, ACCESS_HEADS, ACCESS_RESEARCH) + req_one_access = list(ACCESS_AUX_BASE, ACCESS_HEADS) var/possible_destinations circuit = /obj/item/circuitboard/computer/auxiliary_base