diff --git a/1Item_list.dmm b/1Item_list.dmm
index 5b9c46ec58..d9ce629faa 100644
--- a/1Item_list.dmm
+++ b/1Item_list.dmm
@@ -45961,7 +45961,7 @@
},
/area/survivalpod)
"nwq" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/turf/simulated/fitness{
icon_state = "vault"
},
@@ -76167,7 +76167,7 @@
},
/area/survivalpod)
"wsV" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/turf/simulated/fitness{
icon_state = "vault"
},
diff --git a/SouthernCrossRef.dmm b/SouthernCrossRef.dmm
index 0217634c8d..7cf1531693 100644
--- a/SouthernCrossRef.dmm
+++ b/SouthernCrossRef.dmm
@@ -48139,7 +48139,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/medbay)
"hEx" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/machinery/ai_status_display{
pixel_x = -32
},
@@ -71599,7 +71599,7 @@
/turf/simulated/floor/tiled,
/area/hallway/primary/seconddeck/aft)
"lsu" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/machinery/firealarm{
pixel_y = 24
},
diff --git a/archive/maps/cynosure/cynosure-3.dmm b/archive/maps/cynosure/cynosure-3.dmm
index dbb13c127e..218fe28e9c 100644
--- a/archive/maps/cynosure/cynosure-3.dmm
+++ b/archive/maps/cynosure/cynosure-3.dmm
@@ -1079,7 +1079,7 @@
/obj/effect/floor_decal/corner/blue/border{
dir = 4
},
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/random_multi/single_item/hand_tele,
/obj/structure/cable/green{
icon_state = "1-2"
@@ -21743,7 +21743,7 @@
/turf/simulated/floor/tiled/dark,
/area/surface/station/security/armoury)
"oNM" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/blue/border,
/obj/machinery/light,
@@ -30249,21 +30249,6 @@
},
/turf/simulated/shuttle/wall/dark/no_join,
/area/shuttle/large_escape_pod2/station)
-"uDG" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/machinery/door/blast/regular/open{
- dir = 4;
- id = "captainlockdown";
- layer = 3.3;
- name = "Site Manager Lockdown"
- },
-/turf/simulated/floor/plating,
-/area/surface/station/crew_quarters/captain)
"uDX" = (
/obj/machinery/light{
dir = 1
diff --git a/archive/maps/cynosure/cynosure_defines.dm b/archive/maps/cynosure/cynosure_defines.dm
index 1ed8e45479..56451ac16f 100644
--- a/archive/maps/cynosure/cynosure_defines.dm
+++ b/archive/maps/cynosure/cynosure_defines.dm
@@ -319,13 +319,13 @@
/obj/machinery/suit_cycler/exploration
name = "Explorer suit cycler"
model_text = "Exploration"
- req_one_access = list(access_explorer)
+ req_one_access = list(ACCESS_EXPLORER)
/obj/machinery/suit_cycler/pilot
name = "Pilot suit cycler"
model_text = "Pilot"
req_access = null
- req_one_access = list(access_explorer)
+ req_one_access = list(ACCESS_EXPLORER)
// Putting this here in order to not disrupt existing maps/downstreams.
/turf/simulated/open
diff --git a/archive/maps/cynosure/cynosure_jobs.dm b/archive/maps/cynosure/cynosure_jobs.dm
index 303d87eb42..c519a59258 100644
--- a/archive/maps/cynosure/cynosure_jobs.dm
+++ b/archive/maps/cynosure/cynosure_jobs.dm
@@ -1,11 +1,7 @@
// Pilots
-var/const/EXPLORER =(1<<14)
-
-var/const/access_explorer = 43
-
/datum/access/explorer
- id = access_explorer
+ id = ACCESS_EXPLORER
desc = "Explorer"
region = ACCESS_REGION_GENERAL
@@ -27,8 +23,8 @@ var/const/access_explorer = 43
supervisors = "the Research Director"
selection_color = "#633D63"
economic_modifier = 4
- access = list(access_explorer, access_research)
- minimal_access = list(access_explorer, access_research)
+ access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
+ minimal_access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
outfit_type = /decl/hierarchy/outfit/job/explorer2
job_description = "An Explorer searches for interesting things on the surface of Sif, and returns them to the station."
@@ -37,16 +33,16 @@ var/const/access_explorer = 43
JOB_PILOT = /decl/hierarchy/outfit/job/pilot)
/datum/job/rd
- access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
- access_tox_storage, access_teleporter, access_sec_doors,
- access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
- access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch,
- access_network, access_maint_tunnels, access_explorer, access_eva, access_external_airlocks)
- minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
- access_tox_storage, access_teleporter, access_sec_doors,
- access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
- access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch,
- access_network, access_maint_tunnels, access_explorer, access_eva, access_external_airlocks)
+ access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
+ ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS,
+ ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, ACCESS_TECH_STORAGE,
+ ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_XENOARCH,
+ ACCESS_NETWORK, ACCESS_MAINT_TUNNELS, ACCESS_EXPLORER, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
+ minimal_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
+ ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS,
+ ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, ACCESS_TECH_STORAGE,
+ ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_XENOARCH,
+ ACCESS_NETWORK, ACCESS_MAINT_TUNNELS, ACCESS_EXPLORER, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
/*
alt_titles = list(
diff --git a/archive/maps/cynosure/cynosure_shuttles.dm b/archive/maps/cynosure/cynosure_shuttles.dm
index 5401ab5ce3..82048753da 100644
--- a/archive/maps/cynosure/cynosure_shuttles.dm
+++ b/archive/maps/cynosure/cynosure_shuttles.dm
@@ -51,7 +51,7 @@
/obj/machinery/computer/shuttle_control/multi/centcom
name = "shuttle control console"
shuttle_tag = "Centcom"
- req_access = list(access_cent_general)
+ req_access = list(ACCESS_CENT_GENERAL)
/datum/shuttle/autodock/multi/centcom
name = "Centcom"
@@ -77,7 +77,7 @@
/obj/machinery/computer/shuttle_control/multi/administration
name = "administration shuttle console"
shuttle_tag = "Administration"
- req_access = list(access_cent_general)
+ req_access = list(ACCESS_CENT_GENERAL)
/datum/shuttle/autodock/multi/administration
name = "Administration"
@@ -101,7 +101,7 @@
/obj/machinery/computer/shuttle_control/multi/response
name = "response shuttle console"
shuttle_tag = "Response Operations"
- req_access = list(access_cent_specops)
+ req_access = list(ACCESS_CENT_SPECOPS)
/datum/shuttle/autodock/multi/response
name = "Response Operations"
@@ -151,7 +151,7 @@
/obj/machinery/computer/shuttle_control/multi/ninja
name = "ninja shuttle console"
shuttle_tag = "Ninja"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
/datum/shuttle/autodock/multi/ninja
name = "Ninja"
@@ -180,7 +180,7 @@
/obj/machinery/computer/shuttle_control/multi/heist
name = "skipjack control console"
shuttle_tag = "Skipjack"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
/datum/shuttle/autodock/multi/heist
name = "Skipjack"
@@ -206,7 +206,7 @@
/obj/machinery/computer/shuttle_control/multi/mercenary
name = "mercenary ship control console"
shuttle_tag = "Mercenary"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
/datum/shuttle/autodock/multi/mercenary
name = "Mercenary"
@@ -230,7 +230,7 @@
/obj/machinery/computer/shuttle_control/multi/mercenary_elite
name = "mercenary ship control console"
shuttle_tag = "Mercenary Elite"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
/datum/shuttle/autodock/multi/mercenary_elite
name = "Mercenary Elite"
@@ -438,7 +438,7 @@ ESCAPE_POD(1)
/obj/machinery/computer/shuttle_control/explore/explorer_shuttle
name = "takeoff and landing console"
shuttle_tag = "Exploration Shuttle"
- req_one_access = list(access_explorer)
+ req_one_access = list(ACCESS_EXPLORER)
/*
// Compile in the map for CI testing if we're testing compileability of all the maps
@@ -468,7 +468,7 @@ ESCAPE_POD(1)
/obj/machinery/computer/shuttle_control/explore/generic_shuttle
name = "short jump console"
shuttle_tag = "Private Vessel"
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/generic_shuttle
diff --git a/archive/maps/gateway_archive_vr/labyrinth.dm b/archive/maps/gateway_archive_vr/labyrinth.dm
index 0e147dadca..8c1d15cf53 100644
--- a/archive/maps/gateway_archive_vr/labyrinth.dm
+++ b/archive/maps/gateway_archive_vr/labyrinth.dm
@@ -114,7 +114,7 @@
damage_absorption = list("brute"=1.2,"fire"=1.5,"bullet"=1,"laser"=1,"energy"=1,"bomb"=1)
max_temperature = 25000
infra_luminosity = 5
- operation_req_access = list(access_cent_creed)
+ operation_req_access = list(ACCESS_CENT_CREED)
wreckage = /obj/effect/decal/mecha_wreckage/honker/cluwne
max_equip = 4
diff --git a/archive/maps/northern_star/polaris-1.dmm b/archive/maps/northern_star/polaris-1.dmm
index 4ac9208211..fec09ae875 100644
--- a/archive/maps/northern_star/polaris-1.dmm
+++ b/archive/maps/northern_star/polaris-1.dmm
@@ -3847,7 +3847,7 @@
"bvY" = (/obj/structure/table/reinforced,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
"bvZ" = (/obj/structure/table/reinforced,/obj/machinery/computer/skills{pixel_y = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
"bwa" = (/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
-"bwb" = (/obj/structure/closet/secure_closet/CMO,/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
+"bwb" = (/obj/structure/closet/secure_closet/chief_medical_officer,/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/item/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo)
"bwc" = (/obj/machinery/door/airlock/medical{name = "Morgue"; req_access = list(6,5)},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled,/area/medical/genetics_cloning)
"bwd" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/virology)
"bwe" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/medical/virology)
@@ -4785,7 +4785,7 @@
"bOa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research)
"bOb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice)
"bOc" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice)
-"bOd" = (/obj/structure/closet/secure_closet/RD,/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice)
+"bOd" = (/obj/structure/closet/secure_closet/research_director,/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice)
"bOe" = (/obj/machinery/light{dir = 8},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled,/area/assembly/robotics)
"bOf" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/assembly/robotics)
"bOg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/assembly/robotics)
diff --git a/archive/maps/old_yw/tether_better/tether-02-surface2.dmm b/archive/maps/old_yw/tether_better/tether-02-surface2.dmm
index 99fd1aac42..b2e5d309ee 100644
--- a/archive/maps/old_yw/tether_better/tether-02-surface2.dmm
+++ b/archive/maps/old_yw/tether_better/tether-02-surface2.dmm
@@ -3146,7 +3146,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/patient_c)
"afc" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/item/storage/belt/medical,
/obj/item/flashlight/pen,
/obj/item/clothing/accessory/stethoscope,
@@ -19327,7 +19327,7 @@
/turf/simulated/floor/plating,
/area/rnd/rdoffice)
"aJk" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/item/aicard,
/obj/item/clothing/glasses/omnihud/rnd,
/obj/effect/floor_decal/borderfloor{
diff --git a/archive/maps/old_yw/yw/cryogaia-05-main.dmm b/archive/maps/old_yw/yw/cryogaia-05-main.dmm
index f262fef149..16a41157d0 100644
--- a/archive/maps/old_yw/yw/cryogaia-05-main.dmm
+++ b/archive/maps/old_yw/yw/cryogaia-05-main.dmm
@@ -27236,7 +27236,7 @@
/turf/simulated/floor/tiled/old_tile/blue,
/area/bridge/blueshield)
"lrZ" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/item/clothing/glasses/omnihud/rnd,
/obj/effect/floor_decal/corner_oldtile/gray/diagonal{
dir = 4
@@ -36353,7 +36353,7 @@
/turf/simulated/floor/tiled/white,
/area/rnd/hallway)
"pau" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/item/pda/heads/cmo,
/obj/item/cmo_disk_holder,
/obj/item/defib_kit/compact/combat/loaded,
diff --git a/archive/maps/old_yw/yw/tether_phoronlock.dm b/archive/maps/old_yw/yw/tether_phoronlock.dm
index a1568eecaf..cf54a48f3d 100644
--- a/archive/maps/old_yw/yw/tether_phoronlock.dm
+++ b/archive/maps/old_yw/yw/tether_phoronlock.dm
@@ -9,8 +9,8 @@
// Interior doors: (obj/machinery/door/airlock), id_tag = "[base]_inner"
// Exterior access button: (obj/machinery/access_button/airlock_exterior), master_tag = "[base]"
// Interior access button: (obj/machinery/access_button/airlock_interior), master_tag = "[base]"
-// Srubbers: (obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary), frequency = "1379", scrub_id = "[base]_scrubber"
-// Pumps: (obj/machinery/atmospherics/unary/vent_pump/high_volume), frequency = 1379 id_tag = "[base]_pump"
+// Srubbers: (obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary), frequency = AIRLOCK_FREQ, scrub_id = "[base]_scrubber"
+// Pumps: (obj/machinery/atmospherics/unary/vent_pump/high_volume), frequency = AIRLOCK_FREQ id_tag = "[base]_pump"
//
obj/machinery/airlock_sensor/phoron
@@ -47,7 +47,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior
// Radio remote control
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/datum/radio_frequency/radio_connection
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize(mapload)
diff --git a/archive/maps/southern_cross/datums/supplypacks/munitions.dm b/archive/maps/southern_cross/datums/supplypacks/munitions.dm
index 4cce792053..fcd08a84b8 100644
--- a/archive/maps/southern_cross/datums/supplypacks/munitions.dm
+++ b/archive/maps/southern_cross/datums/supplypacks/munitions.dm
@@ -12,7 +12,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/hedberg
containername = "Hunting Rifle crate"
- access = access_brig
+ access = ACCESS_BRIG
/datum/supply_pack/munitions/phase_carbines_explorer
name = "Weapons - Surplus Phase Carbines"
@@ -22,7 +22,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/ward
containername = "Phase Carbine crate"
- access = access_brig
+ access = ACCESS_BRIG
/datum/supply_pack/munitions/phase_rifles_explorer
name = "Weapons - Phase Rifles"
@@ -32,4 +32,4 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/ward
containername = "Phase Rifle crate"
- access = access_brig
+ access = ACCESS_BRIG
diff --git a/archive/maps/southern_cross/shuttles/crew_shuttles.dm b/archive/maps/southern_cross/shuttles/crew_shuttles.dm
index 415faba24d..663ac9503f 100644
--- a/archive/maps/southern_cross/shuttles/crew_shuttles.dm
+++ b/archive/maps/southern_cross/shuttles/crew_shuttles.dm
@@ -3,7 +3,7 @@
/obj/machinery/computer/shuttle_control/web/shuttle1
name = "shuttle control console"
shuttle_tag = "Shuttle 1"
- req_access = list(access_pilot)
+ req_access = list(ACCESS_PILOT)
/datum/shuttle/autodock/web_shuttle/shuttle1
name = "Shuttle 1"
@@ -47,7 +47,7 @@
/obj/machinery/computer/shuttle_control/web/shuttle2
name = "shuttle control console"
shuttle_tag = "Shuttle 2"
- req_access = list(access_pilot)
+ req_access = list(ACCESS_PILOT)
/datum/shuttle/autodock/web_shuttle/shuttle2
name = "Shuttle 2"
@@ -273,4 +273,4 @@
return "Attention, [master.my_shuttle.visible_name] has arrived to the Wilderness Area."
/datum/shuttle_destination/shuttle2/mining_base/get_departure_message()
- return "Attention, [master.my_shuttle.visible_name] has departed the Wilderness Area."
\ No newline at end of file
+ return "Attention, [master.my_shuttle.visible_name] has departed the Wilderness Area."
diff --git a/archive/maps/southern_cross/shuttles/ert.dm b/archive/maps/southern_cross/shuttles/ert.dm
index b739d131ab..21b945c7d3 100644
--- a/archive/maps/southern_cross/shuttles/ert.dm
+++ b/archive/maps/southern_cross/shuttles/ert.dm
@@ -1,7 +1,7 @@
/obj/machinery/computer/shuttle_control/multi/response
name = "response shuttle console"
shuttle_tag = "Response Operations"
- req_access = list(access_cent_specops)
+ req_access = list(ACCESS_CENT_SPECOPS)
/*
/datum/shuttle/multi_shuttle/response
name = "Response Operations"
@@ -24,7 +24,7 @@
*/
/obj/machinery/computer/shuttle_control/web/ert
name = "response shuttle control console"
- req_access = list(access_cent_specops)
+ req_access = list(ACCESS_CENT_SPECOPS)
shuttle_tag = "Response Operations"
/datum/shuttle/autodock/web_shuttle/ert
@@ -122,4 +122,4 @@
/datum/shuttle_destination/ert/planet
name = "Sif Surface"
my_landmark = "response_ship_planet"
- preferred_interim_tag = "response_ship_sky_transit"
\ No newline at end of file
+ preferred_interim_tag = "response_ship_sky_transit"
diff --git a/archive/maps/southern_cross/shuttles/heist.dm b/archive/maps/southern_cross/shuttles/heist.dm
index 6fbadd9e21..d4678b1c7a 100644
--- a/archive/maps/southern_cross/shuttles/heist.dm
+++ b/archive/maps/southern_cross/shuttles/heist.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer/shuttle_control/web/heist
name = "skipjack control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Skipjack"
/datum/shuttle/autodock/web_shuttle/heist
@@ -102,4 +102,4 @@
/datum/shuttle_destination/heist/planet
name = "Sif Surface"
my_landmark = "skipjack_planet"
- preferred_interim_tag = "skipjack_sky_transit"
\ No newline at end of file
+ preferred_interim_tag = "skipjack_sky_transit"
diff --git a/archive/maps/southern_cross/shuttles/merc.dm b/archive/maps/southern_cross/shuttles/merc.dm
index 6027261e84..21b3a03902 100644
--- a/archive/maps/southern_cross/shuttles/merc.dm
+++ b/archive/maps/southern_cross/shuttles/merc.dm
@@ -29,7 +29,7 @@
/obj/machinery/computer/shuttle_control/web/syndicate
name = "mercenary shuttle control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Mercenary"
/datum/shuttle/autodock/web_shuttle/syndicate
@@ -132,4 +132,4 @@
/datum/shuttle_destination/syndie/planet
name = "Sif Surface"
my_landmark = "syndie_planet"
- preferred_interim_tag = "syndie_sky_transit"
\ No newline at end of file
+ preferred_interim_tag = "syndie_sky_transit"
diff --git a/archive/maps/southern_cross/shuttles/ninja.dm b/archive/maps/southern_cross/shuttles/ninja.dm
index 5cdded0255..fc2fb7a8d7 100644
--- a/archive/maps/southern_cross/shuttles/ninja.dm
+++ b/archive/maps/southern_cross/shuttles/ninja.dm
@@ -1,6 +1,6 @@
/obj/machinery/computer/shuttle_control/web/ninja
name = "stealth shuttle control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Ninja"
/datum/shuttle/autodock/web_shuttle/ninja
@@ -99,4 +99,4 @@
/datum/shuttle_destination/ninja/planet
name = "Sif Surface"
my_landmark = "ninja_planet"
- preferred_interim_tag = "ninja_sky_transit"
\ No newline at end of file
+ preferred_interim_tag = "ninja_sky_transit"
diff --git a/archive/maps/southern_cross/southern_cross-1.dmm b/archive/maps/southern_cross/southern_cross-1.dmm
index 95a430e9a0..f34ec9979e 100644
--- a/archive/maps/southern_cross/southern_cross-1.dmm
+++ b/archive/maps/southern_cross/southern_cross-1.dmm
@@ -53770,7 +53770,7 @@
/turf/simulated/floor/plating,
/area/maintenance/research)
"caR" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/machinery/firealarm{
pixel_y = 24
},
@@ -75313,7 +75313,7 @@
/turf/simulated/floor/plating,
/area/maintenance/medbay)
"cRs" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/machinery/ai_status_display{
pixel_x = -32
},
diff --git a/archive/maps/southern_cross/southern_cross_defines.dm b/archive/maps/southern_cross/southern_cross_defines.dm
index de6b27c40c..a8ef25f1a6 100644
--- a/archive/maps/southern_cross/southern_cross_defines.dm
+++ b/archive/maps/southern_cross/southern_cross_defines.dm
@@ -318,13 +318,13 @@
/obj/machinery/suit_cycler/exploration
name = "Explorer suit cycler"
model_text = "Exploration"
- req_one_access = list(access_pilot,access_explorer)
+ req_one_access = list(ACCESS_PILOT,ACCESS_EXPLORER)
/obj/machinery/suit_cycler/pilot
name = "Pilot suit cycler"
model_text = "Pilot"
req_access = null
- req_one_access = list(access_pilot,access_explorer)
+ req_one_access = list(ACCESS_PILOT,ACCESS_EXPLORER)
/datum/map/southern_cross/get_map_info()
. = list()
diff --git a/archive/maps/southern_cross/southern_cross_jobs.dm b/archive/maps/southern_cross/southern_cross_jobs.dm
index deb66093b1..dee5b338fe 100644
--- a/archive/maps/southern_cross/southern_cross_jobs.dm
+++ b/archive/maps/southern_cross/southern_cross_jobs.dm
@@ -4,16 +4,16 @@ var/const/SAR =(1<<11)
var/const/PILOT =(1<<13)
var/const/EXPLORER =(1<<14)
-var/const/access_pilot = 67
-var/const/access_explorer = 43
+var/const/ACCESS_PILOT = 67
+var/const/ACCESS_EXPLORER = 43
/datum/access/pilot
- id = access_pilot
+ id = ACCESS_PILOT
desc = "Pilot"
region = ACCESS_REGION_SUPPLY
/datum/access/explorer
- id = access_explorer
+ id = ACCESS_EXPLORER
desc = "Explorer"
region = ACCESS_REGION_GENERAL
@@ -66,8 +66,8 @@ var/const/access_explorer = 43
supervisors = "the Head of Personnel"
selection_color = "#515151"
economic_modifier = 4
- access = list(access_pilot, access_cargo, access_mining, access_mining_station)
- minimal_access = list(access_pilot, access_cargo, access_mining, access_mining_station)
+ access = list(ACCESS_PILOT, ACCESS_CARGO, ACCESS_MINING, ACCESS_MINING_STATION)
+ minimal_access = list(ACCESS_PILOT, ACCESS_CARGO, ACCESS_MINING, ACCESS_MINING_STATION)
outfit_type = /decl/hierarchy/outfit/job/pilot
job_description = "A Pilot flies one of the shuttles between the Southern Cross and the outpost on Sif."
@@ -83,8 +83,8 @@ var/const/access_explorer = 43
supervisors = "the Research Director"
selection_color = "#633D63"
economic_modifier = 4
- access = list(access_explorer, access_research)
- minimal_access = list(access_explorer, access_research)
+ access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
+ minimal_access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
banned_job_species = list(SPECIES_ZADDAT)
outfit_type = /decl/hierarchy/outfit/job/explorer2
@@ -107,8 +107,8 @@ var/const/access_explorer = 43
supervisors = "the Chief Medical Officer"
selection_color = "#515151"
economic_modifier = 4
- access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer)
- minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer)
+ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_EXPLORER)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_EXPLORER)
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
outfit_type = /decl/hierarchy/outfit/job/medical/sar
diff --git a/archive/maps/southern_cross/southern_cross_overrides.dm b/archive/maps/southern_cross/southern_cross_overrides.dm
index 2626c72147..62f8434236 100644
--- a/archive/maps/southern_cross/southern_cross_overrides.dm
+++ b/archive/maps/southern_cross/southern_cross_overrides.dm
@@ -1,10 +1,10 @@
/mob/living/silicon/robot/platform/explorer
- req_access = list(access_explorer)
+ req_access = list(ACCESS_EXPLORER)
/mob/living/silicon/robot/platform/cargo
- req_access = list(access_cargo_bot)
+ req_access = list(ACCESS_CARGO_BOT)
/obj/item/card/id/platform/Initialize(mapload)
. = ..()
- access |= access_explorer
- access |= access_pilot
+ access |= ACCESS_EXPLORER
+ access |= ACCESS_PILOT
diff --git a/archive/maps/southern_cross/southern_cross_presets.dm b/archive/maps/southern_cross/southern_cross_presets.dm
index 92707cd52c..9e7d04ea76 100644
--- a/archive/maps/southern_cross/southern_cross_presets.dm
+++ b/archive/maps/southern_cross/southern_cross_presets.dm
@@ -100,17 +100,17 @@ var/const/NETWORK_MAIN_OUTPOST = "Main Outpost"
/datum/map/southern_cross/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
- num2text(AI_FREQ) = list(access_synth),
+ num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
- num2text(ERT_FREQ) = list(access_cent_specops),
- num2text(COMM_FREQ)= list(access_heads),
- num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
- num2text(MED_FREQ) = list(access_medical_equip),
- num2text(MED_I_FREQ)=list(access_medical_equip),
- num2text(SEC_FREQ) = list(access_security),
- num2text(SEC_I_FREQ)=list(access_security),
- num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
- num2text(SUP_FREQ) = list(access_cargo),
- num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
- num2text(EXP_FREQ) = list(access_explorer)
+ num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
+ num2text(COMM_FREQ)= list(ACCESS_HEADS),
+ num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
+ num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
+ num2text(MED_I_FREQ)=list(ACCESS_MEDICAL_EQUIP),
+ num2text(SEC_FREQ) = list(ACCESS_SECURITY),
+ num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
+ num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
+ num2text(SUP_FREQ) = list(ACCESS_CARGO),
+ num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
+ num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
)
diff --git a/archive/maps/southern_cross/southern_cross_shuttles.dm b/archive/maps/southern_cross/southern_cross_shuttles.dm
index 2b4de0bffa..5e26e6d8f7 100644
--- a/archive/maps/southern_cross/southern_cross_shuttles.dm
+++ b/archive/maps/southern_cross/southern_cross_shuttles.dm
@@ -23,7 +23,7 @@
//Admin
/obj/machinery/computer/shuttle_control/administration
name = "shuttle control console"
- req_access = list(access_cent_general)
+ req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Administration"
/datum/shuttle/autodock/ferry/administration
@@ -51,7 +51,7 @@
/obj/machinery/computer/shuttle_control/centcom
name = "shuttle control console"
- req_access = list(access_cent_general)
+ req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Centcom"
/datum/shuttle/autodock/ferry/centcom
@@ -82,7 +82,7 @@
/*
/obj/machinery/computer/shuttle_control/multi/skipjack
name = "skipjack control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Skipjack"
@@ -100,7 +100,7 @@
/*
/obj/machinery/computer/shuttle_control/multi/ninja
name = "stealth shuttle control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Ninja"
/datum/shuttle/multi_shuttle/ninja
@@ -367,5 +367,3 @@ ESCAPE_POD(8)
// Heist shuttle
-
-
diff --git a/archive/maps/southern_cross/structures/closets/engineering.dm b/archive/maps/southern_cross/structures/closets/engineering.dm
index e66c96ff9d..766e1ad5c2 100644
--- a/archive/maps/southern_cross/structures/closets/engineering.dm
+++ b/archive/maps/southern_cross/structures/closets/engineering.dm
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/engineering_chief_wardrobe
name = "chief engineer's wardrobe"
- req_access = list(access_ce)
+ req_access = list(ACCESS_CE)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
starts_with = list(
diff --git a/archive/maps/southern_cross/structures/closets/medical.dm b/archive/maps/southern_cross/structures/closets/medical.dm
index 3c5a9c5634..284fdafdeb 100644
--- a/archive/maps/southern_cross/structures/closets/medical.dm
+++ b/archive/maps/southern_cross/structures/closets/medical.dm
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/CMO_wardrobe
name = "chief medical officer's locker"
- req_access = list(access_cmo)
+ req_access = list(ACCESS_CMO)
closet_appearance = /decl/closet_appearance/secure_closet/cmo
starts_with = list(
diff --git a/archive/maps/southern_cross/structures/closets/misc.dm b/archive/maps/southern_cross/structures/closets/misc.dm
index ba833a628a..9ee443a73e 100644
--- a/archive/maps/southern_cross/structures/closets/misc.dm
+++ b/archive/maps/southern_cross/structures/closets/misc.dm
@@ -2,7 +2,7 @@
/obj/structure/closet/secure_closet/guncabinet/sidearm
name = "emergency weapon cabinet"
- req_one_access = list(access_armory,access_captain)
+ req_one_access = list(ACCESS_ARMORY,ACCESS_CAPTAIN)
starts_with = list(
/obj/item/gun/energy/gun = 4)
@@ -10,7 +10,7 @@
/obj/structure/closet/secure_closet/guncabinet/rifle
name = "rifle cabinet"
- req_one_access = list(access_explorer,access_brig)
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_BRIG)
starts_with = list(
/obj/item/ammo_magazine/clip/c762/hunter = 9,
@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/guncabinet/phase
name = "explorer weapon cabinet"
- req_one_access = list(access_explorer,access_brig)
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_BRIG)
starts_with = list(
/obj/item/gun/energy/phasegun = 2,
@@ -37,7 +37,7 @@
/obj/structure/closet/secure_closet/explorer
name = "explorer locker"
- req_access = list(access_explorer)
+ req_access = list(ACCESS_EXPLORER)
starts_with = list(
/obj/item/clothing/under/explorer,
@@ -76,7 +76,7 @@
/obj/structure/closet/secure_closet/sar
name = "search and rescue locker"
desc = "Supplies for a wilderness first responder."
- req_access = list(access_medical_equip)
+ req_access = list(ACCESS_MEDICAL_EQUIP)
closet_appearance = /decl/closet_appearance/secure_closet/medical
starts_with = list(
@@ -110,7 +110,7 @@
/obj/structure/closet/secure_closet/pilot
name = "pilot locker"
- req_access = list(access_pilot)
+ req_access = list(ACCESS_PILOT)
starts_with = list(
/obj/item/storage/backpack/parachute,
diff --git a/archive/maps/southern_cross/structures/closets/research.dm b/archive/maps/southern_cross/structures/closets/research.dm
index a279eeef77..9e53887578 100644
--- a/archive/maps/southern_cross/structures/closets/research.dm
+++ b/archive/maps/southern_cross/structures/closets/research.dm
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/RD_wardrobe
name = "research director's locker"
- req_access = list(access_rd)
+ req_access = list(ACCESS_RD)
closet_appearance = /decl/closet_appearance/secure_closet/science/rd
starts_with = list(
diff --git a/archive/maps/southern_cross/structures/closets/security.dm b/archive/maps/southern_cross/structures/closets/security.dm
index ae59c57990..6af5d416fd 100644
--- a/archive/maps/southern_cross/structures/closets/security.dm
+++ b/archive/maps/southern_cross/structures/closets/security.dm
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/hos_wardrobe
name = "head of security's locker"
- req_access = list(access_hos)
+ req_access = list(ACCESS_HOS)
closet_appearance = /decl/closet_appearance/secure_closet/security/hos
starts_with = list(
diff --git a/archive/maps/submaps/depreciated_vr/talon.dm b/archive/maps/submaps/depreciated_vr/talon.dm
index 6bd5c93fa6..d338167548 100644
--- a/archive/maps/submaps/depreciated_vr/talon.dm
+++ b/archive/maps/submaps/depreciated_vr/talon.dm
@@ -58,7 +58,7 @@ GLOBAL_LIST_EMPTY(latejoin_talon)
/obj/machinery/computer/shuttle_control/explore/talonboat
name = "boat control console"
shuttle_tag = "Talon's boat"
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/talonboat
@@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(latejoin_talon)
/obj/machinery/computer/shuttle_control/explore/talon_lifeboat
name = "lifeboat control console"
shuttle_tag = "Talon lifeboat"
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/talon_lifeboat
@@ -173,7 +173,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/item/card/id/synthetic/talon/Initialize(mapload)
. = ..()
- access = list(access_talon, access_synth)
+ access = list(ACCESS_TALON, ACCESS_SYNTH)
/obj/machinery/power/smes/buildable/offmap_spawn/Initialize(mapload)
. = ..()
@@ -185,18 +185,18 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/machinery/power/apc/talon
req_access = list()
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
/obj/machinery/power/apc/talon/hyper
cell_type = /obj/item/cell/hyper
/obj/machinery/alarm/talon
req_access = list()
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
/obj/machinery/door/firedoor/glass/talon
req_access = list()
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
/obj/machinery/door/firedoor/glass/talon/hidden
name = "\improper Emergency Shutter System"
@@ -261,7 +261,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_captain
name = "talon captain's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/captain
starts_with = list(
@@ -279,7 +279,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_guard
name = "talon guard's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/guard
starts_with = list(
@@ -306,7 +306,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_doctor
name = "talon doctor's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/doctor
starts_with = list(
@@ -326,7 +326,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_engineer
name = "talon engineer's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/engineer
starts_with = list(
@@ -348,7 +348,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_pilot
name = "talon pilot's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/pilot
starts_with = list(
@@ -375,7 +375,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_miner
name = "talon miner's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/miner
starts_with = list(
@@ -401,7 +401,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
desc = "Medical drug dispenser."
icon_state = "med"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
products = list(/obj/item/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/reagent_containers/glass/bottle/inaprovaline = 4,
/obj/item/reagent_containers/glass/bottle/stoxin = 4,/obj/item/reagent_containers/glass/bottle/toxin = 4,
/obj/item/reagent_containers/syringe/antiviral = 4,/obj/item/reagent_containers/syringe = 12,
@@ -411,7 +411,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/item/glasses_kit = 1, /obj/item/storage/quickdraw/syringe_case = 4)
contraband = list(/obj/item/reagent_containers/pill/tox = 3,/obj/item/reagent_containers/pill/stox = 4,/obj/item/reagent_containers/pill/antitox = 6)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
- req_log_access = access_talon
+ req_log_access = ACCESS_TALON
has_logs = 1
///////////////////////////
@@ -423,7 +423,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
extended_desc = "This program allows remote access to Talon helmet camera systems."
size = 4 //Smaller because limited scope
tguimodule_path = /datum/tgui_module/camera/ntos/talon_helmet
- required_access = access_talon
+ required_access = ACCESS_TALON
// Talon ship cameras
/datum/computer_file/program/camera_monitor/talon_ship
@@ -432,7 +432,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
extended_desc = "This program allows remote access to the Talon's camera system."
size = 10 //Smaller because limited scope
tguimodule_path = /datum/tgui_module/camera/ntos/talon_ship
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/tgui_module/camera/ntos/talon_ship
name = "Talon Ship Camera Monitor"
@@ -447,23 +447,23 @@ Once in open space, consider disabling nonessential power-consuming electronics
/datum/computer_file/program/power_monitor/talon
filename = "tpowermonitor"
filedesc = "Power Monitoring (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/computer_file/program/alarm_monitor/talon
filename = "talarmmonitoreng"
filedesc = "Alarm Monitoring (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/computer_file/program/rcon_console/talon
filename = "trconconsole"
filedesc = "RCON Remote Control (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/computer_file/program/atmos_control/talon
filename = "tatmoscontrol"
filedesc = "Atmosphere Control (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/computer_file/program/suit_sensors/talon
filename = "tsensormonitor"
filedesc = "Suit Sensors Monitoring (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
// Modular computer/console presets
/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot
diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
index a2b6f4e3fd..3fa56b7da8 100644
--- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -33,7 +33,7 @@
var/input_pressure_min = INTERNAL_PRESSURE_BOUND
var/output_pressure_max = DEFAULT_PRESSURE_DELTA
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
index dcb0cd7739..d82d641c4d 100644
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -23,7 +23,7 @@
var/flowing = 0 //for icons - becomes zero if the valve closes itself due to regulation mode
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 315a250ba2..fbfaf71482 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -33,7 +33,7 @@ Thus, the two variables affect pump operation are set in New():
var/max_pressure_setting = 15000 //kPa
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index eb66f71609..85f58836dd 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -32,7 +32,7 @@ Thus, the two variables affect pump operation are set in New():
var/max_transfer_rate = ATMOS_DEFAULT_VOLUME_PUMP // Ls
var/transfer_rate = 20 // L
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index f055d9d856..61aa5c698c 100755
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -30,7 +30,7 @@
var/list/filtered_out = list()
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/datum/radio_frequency/radio_connection
/obj/machinery/atmospherics/trinary/atmos_filter/proc/set_frequency(new_frequency)
diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm
index 0dd7388966..45c0d55742 100644
--- a/code/ATMOSPHERICS/components/tvalve.dm
+++ b/code/ATMOSPHERICS/components/tvalve.dm
@@ -258,7 +258,7 @@
icon = 'icons/atmos/digital_tvalve.dmi'
pipe_state = "dtvalve"
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
index 57da19c723..e971889748 100644
--- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
@@ -18,7 +18,7 @@
var/volume_rate = 50 //flow rate limit
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
index decc9ea239..5cd2feec3f 100644
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -41,7 +41,7 @@
var/internal_pressure_bound_default = INTERNAL_PRESSURE_BOUND
var/pressure_checks_default = PRESSURE_CHECKS
- var/frequency = 1439
+ var/frequency = PUMPS_FREQ
var/datum/radio_frequency/radio_connection
var/radio_filter_out
diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
index cda1bc1de9..3979734143 100644
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -15,7 +15,7 @@
var/area/initial_loc
var/id_tag = null
- var/frequency = 1439
+ var/frequency = PUMPS_FREQ
var/datum/radio_frequency/radio_connection
var/scrubbing = 1 //0 = siphoning, 1 = scrubbing
diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm
index 167dfbfe26..167df1ae55 100644
--- a/code/ATMOSPHERICS/components/valve.dm
+++ b/code/ATMOSPHERICS/components/valve.dm
@@ -223,7 +223,7 @@
icon = 'icons/atmos/digital_valve.dmi'
pipe_state = "dvalve"
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
diff --git a/code/__defines/access.dm b/code/__defines/access.dm
new file mode 100644
index 0000000000..7f2179379f
--- /dev/null
+++ b/code/__defines/access.dm
@@ -0,0 +1,114 @@
+#define ACCESS_SECURITY 1
+#define ACCESS_BRIG 2 // Brig timers and permabrig
+#define ACCESS_ARMORY 3
+#define ACCESS_FORENSICS_LOCKERS 4
+
+#define ACCESS_MEDICAL 5
+#define ACCESS_MORGUE 6
+#define ACCESS_TOX 7
+#define ACCESS_TOX_STORAGE 8
+#define ACCESS_GENETICS 9
+
+#define ACCESS_ENGINE 10
+#define ACCESS_ENGINE_EQUIP 11
+#define ACCESS_MAINT_TUNNELS 12
+#define ACCESS_EXTERNAL_AIRLOCKS 13
+#define ACCESS_EMERGENCY_STORAGE 14
+#define ACCESS_CHANGE_IDS 15
+#define ACCESS_AI_UPLOAD 16
+#define ACCESS_TELEPORTER 17
+#define ACCESS_EVA 18
+
+#define ACCESS_HEADS 19
+#define ACCESS_CAPTAIN 20
+#define ACCESS_ALL_PERSONAL_LOCKERS 21
+
+#define ACCESS_CHAPEL_OFFICE 22
+#define ACCESS_TECH_STORAGE 23
+#define ACCESS_ATMOSPHERICS 24
+#define ACCESS_BAR 25
+#define ACCESS_JANITOR 26
+#define ACCESS_CREMATORIUM 27
+#define ACCESS_KITCHEN 28
+
+#define ACCESS_ROBOTICS 29
+#define ACCESS_RD 30
+
+#define ACCESS_CARGO 31
+#define ACCESS_CONSTRUCTION 32
+#define ACCESS_CHEMISTRY 33
+#define ACCESS_CARGO_BOT 34
+#define ACCESS_HYDROPONICS 35
+#define ACCESS_MANUFACTURING 36
+
+#define ACCESS_LIBRARY 37
+#define ACCESS_LAWYER 38
+#define ACCESS_VIROLOGY 39
+#define ACCESS_CMO 40
+#define ACCESS_QM 41
+#define ACCESS_NETWORK 42
+
+#define ACCESS_EXPLORER 43
+#define ACCESS_PATHFINDER 44
+#define ACCESS_SURGERY 45
+
+// #define UNUSED 46
+
+#define ACCESS_RESEARCH 47
+
+#define ACCESS_MINING 48
+#define ACCESS_MINING_OFFICE 49
+#define ACCESS_MAILSORTING 50
+
+// #define UNUSED 51
+// #define UNUSED 52
+
+#define ACCESS_HEADS_VAULT 53
+#define ACCESS_MINING_STATION 54
+#define ACCESS_XENOBIOLOGY 55
+
+#define ACCESS_CE 56
+#define ACCESS_HOP 57
+#define ACCESS_HOS 58
+
+#define ACCESS_RC_ANNOUNCE 59 //Request console announcements
+#define ACCESS_KEYCARD_AUTH 60 //Used for events which require at least two people to confirm them
+#define ACCESS_TCOMSAT 61 // has access to the entire telecomms satellite / machinery
+
+#define ACCESS_GATEWAY 62
+#define ACCESS_SEC_DOORS 63 // Security front doors
+#define ACCESS_PSYCHIATRIST 64 // Psychiatrist's office
+
+#define ACCESS_XENOARCH 65
+#define ACCESS_MEDICAL_EQUIP 66
+#define ACCESS_PILOT 67
+
+#define ACCESS_ENTERTAINMENT 72
+
+#define ACCESS_XENOBOTANY 77
+
+#define ACCESS_CENT_GENERAL 101 //General facilities.
+#define ACCESS_CENT_THUNDER 102 //Thunderdome.
+#define ACCESS_CENT_SPECOPS 103 //Special Ops.
+#define ACCESS_CENT_MEDICAL 104 //Medical/Research
+#define ACCESS_CENT_LIVING 105 //Living quarters.
+#define ACCESS_CENT_STORAGE 106 //Generic storage areas.
+#define ACCESS_CENT_TELEPORTER 107 //Teleporter.
+#define ACCESS_CENT_CREED 108 //Creed's office.
+#define ACCESS_CENT_CAPTAIN 109 //Captain's office/ID comp/AI.
+
+#define ACCESS_CLOWN 136
+#define ACCESS_TOMFOOLERY 137
+#define ACCESS_MIME 138
+
+#define ACCESS_SYNDICATE 150 //General Syndicate Access
+
+#define ACCESS_TRADER 160 //General Beruang Trader Access
+
+#define ACCESS_SYNTH 199
+#define ACCESS_CRATE_CASH 200
+
+#define ACCESS_ALIEN 300 // For things like crashed ships.
+#define ACCESS_TALON 301
+
+#define ACCESS_LOST 511 // For outsider borgs
diff --git a/code/__defines/click.dm b/code/__defines/click.dm
new file mode 100644
index 0000000000..88e018dc65
--- /dev/null
+++ b/code/__defines/click.dm
@@ -0,0 +1 @@
+#define TK_MAXRANGE 15
diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm
index 6451cef4de..26a2350114 100644
--- a/code/__defines/jobs.dm
+++ b/code/__defines/jobs.dm
@@ -410,7 +410,7 @@
#define JOB_ARTIFICER "Artificer"
#define JOB_WRAITH "Wraith"
#define JOB_JUGGERNAUT "Juggernaut"
-#define JOB_MODE = "MODE"
+#define JOB_MODE "MODE"
#define JOB_DISEMBODIED_VOICE "Disembodied Voice"
#define JOB_ALIEN "Alien"
#define JOB_GOLEM "Golem"
@@ -456,3 +456,83 @@
#define DEPARTMENT_BITFLAG_SILICON (1<<7)
#define DEPARTMENT_BITFLAG_ASSISTANT (1<<8)
#define DEPARTMENT_BITFLAG_CAPTAIN (1<<9)
+
+// Jobflags by Department
+#define ENGSEC (1<<0)
+
+#define CAPTAIN (1<<0)
+#define HOS (1<<1)
+#define WARDEN (1<<2)
+#define DETECTIVE (1<<3)
+#define OFFICER (1<<4)
+#define CHIEF (1<<5)
+#define ENGINEER (1<<6)
+#define ATMOSTECH (1<<7)
+#define AI_DEPT (1<<8)
+#define CYBORG (1<<9)
+#define BRIGPHYS (1<<10) // CHOMPAdd - Brig Physician
+#define CLOWN (1<<13)
+#define MIME (1<<14)
+#define INTERN (1<<15)
+
+#define MEDSCI (1<<1)
+
+#define RD (1<<0)
+#define SCIENTIST (1<<1)
+#define CHEMIST (1<<2)
+#define CMO (1<<3)
+#define DOCTOR (1<<4)
+#define GENETICIST (1<<5)
+#define VIROLOGIST (1<<6)
+#define PSYCHIATRIST (1<<7)
+#define ROBOTICIST (1<<8)
+#define XENOBIOLOGIST (1<<9)
+#define PARAMEDIC (1<<10)
+#define PATHFINDER (1<<11)
+#define EXPLORER (1<<12)
+#define SAR (1<<13)
+#define XENOBOTANIST (1<<14)
+#define PILOT (1<<15) //ChompEDIT - ours is with the other explo jobs.
+
+#define CIVILIAN (1<<2)
+
+#define HOP (1<<0)
+#define BARTENDER (1<<1)
+#define BOTANIST (1<<2)
+#define CHEF (1<<3)
+#define JANITOR (1<<4)
+#define LIBRARIAN (1<<5)
+#define QUARTERMASTER (1<<6)
+#define CARGOTECH (1<<7)
+#define MINER (1<<8)
+#define LAWYER (1<<9)
+#define CHAPLAIN (1<<10)
+#define ASSISTANT (1<<11)
+#define BRIDGE (1<<12)
+// #define PILOT (1<<13) // CHOMPRemove
+#define ENTERTAINER (1<<14)
+#define ENTREPRENEUR (1<<15)
+
+#define OTHER (1<<10) //VOREStation Note: Unused on VS. Used downstream.
+#define NONCREW (1<<0)
+#define ANOMALY (1<<0) //VOREStation Note: Unused on VS. Used downstream.
+
+#define TALON (1<<3)
+
+#define TALCAP (1<<0)
+#define TALPIL (1<<1)
+#define TALDOC (1<<2)
+#define TALSEC (1<<3)
+#define TALENG (1<<4)
+#define TALMIN (1<<5)
+
+GLOBAL_LIST_INIT(command_positions, list(
+ JOB_SITE_MANAGER,
+ JOB_HEAD_OF_PERSONNEL,
+ JOB_HEAD_OF_SECURITY,
+ JOB_CHIEF_ENGINEER,
+ JOB_RESEARCH_DIRECTOR,
+ JOB_CHIEF_MEDICAL_OFFICER,
+ JOB_COMMAND_SECRETARY,
+ JOB_BLUESHIELD_GUARD // CHOMPEnable
+))
diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm
index 3f5dc006cd..59c92a85d5 100644
--- a/code/__defines/machinery.dm
+++ b/code/__defines/machinery.dm
@@ -78,6 +78,11 @@
#define NETWORK_TALON_HELMETS "TalonHelmets" //VOREStation Add
#define NETWORK_TALON_SHIP "TalonShip" //VOREStation Add
+//Camera networks
+#define NETWORK_TETHER "Tether"
+#define NETWORK_OUTSIDE "Outside"
+#define NETWORK_HALLS "Halls"
+
// CHOMPAdd Start
#define NETWORK_THIRD_DECK "Third Deck"
#define NETWORK_SECOND_DECK "Second Deck"
diff --git a/code/__defines/radio.dm b/code/__defines/radio.dm
index 9e17fc7c99..1aa469c9ac 100644
--- a/code/__defines/radio.dm
+++ b/code/__defines/radio.dm
@@ -30,3 +30,103 @@
// CHOMPAdd Channels
#define CHANNEL_BODYCAM "Bodycam"
#define CHANNEL_OUTSIDER "Outsider"
+
+/*
+Frequency range: 1200 to 1600
+Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency, even during mapmaking)
+Radio:
+1459 - standard radio chat
+1351 - Science
+1353 - Command
+1355 - Medical
+1357 - Engineering
+1359 - Security
+1341 - deathsquad
+1443 - Confession Intercom
+1347 - Cargo techs
+1349 - Service people
+Devices:
+1451 - tracking implant
+1457 - RSD default
+On the map:
+1311 for prison shuttle console (in fact, it is not used)
+1433 for engine components
+1435 for status displays
+1437 for atmospherics/fire alerts
+1439 for air pumps, air scrubbers, atmo control
+1441 for atmospherics - supply tanks
+1443 for atmospherics - distribution loop/mixed air tank
+1445 for bot nav beacons
+1447 for mulebot, secbot and ed209 control
+1449 for airlock controls, electropack, magnets
+1451 for toxin lab access
+1453 for engineering access
+1455 for AI access
+*/
+
+#define RADIO_LOW_FREQ 1200
+#define PUBLIC_LOW_FREQ 1441
+#define PUBLIC_HIGH_FREQ 1489
+#define RADIO_HIGH_FREQ 1600
+
+// Machinery
+#define ZERO_FREQ 0
+#define AIRLOCK_FREQ 1379
+#define AUTODOCK_FREQ 1381
+#define ENGINE_FREQ 1433
+#define DISPLAY_FREQ 1435
+#define ALERT_FREQ 1437
+#define PUMPS_FREQ 1439
+#define BEACON_FREQ 1445
+#define AMAG_ELE_FREQ 1449
+#define TRACK_IMP_FREQ 1451
+#define RSD_FREQ 1457
+
+#define BOT_FREQ 1447
+#define COMM_FREQ 1353
+#define ERT_FREQ 1345
+#define AI_FREQ 1343
+#define DTH_FREQ 1341
+#define SYND_FREQ 1213
+#define RAID_FREQ 1277
+#define ENT_FREQ 1461 //entertainment frequency. This is not a diona exclusive frequency.
+
+#define BDCM_FREQ 1483 // CHOMPAdd
+#define OUT_FREQ 1367 // CHOMPAdd
+
+#define LOCKED_COM_FREQ 1481
+
+// department channels
+#define PUB_FREQ 1459
+#define SEC_FREQ 1359
+#define ENG_FREQ 1357
+#define MED_FREQ 1355
+#define SCI_FREQ 1351
+#define SRV_FREQ 1349
+#define SUP_FREQ 1347
+#define EXP_FREQ 1361
+
+// internal department channels
+#define MED_I_FREQ 1485
+#define SEC_I_FREQ 1475
+
+#define TALON_FREQ 1363
+#define CSN_FREQ 1365
+
+/* filters */
+//When devices register with the radio controller, they might register under a certain filter.
+//Other devices can then choose to send signals to only those devices that belong to a particular filter.
+//This is done for performance, so we don't send signals to lots of machines unnecessarily.
+
+//This filter is special because devices belonging to default also recieve signals sent to any other filter.
+#define RADIO_DEFAULT "radio_default"
+
+#define RADIO_TO_AIRALARM "radio_airalarm" //air alarms
+#define RADIO_FROM_AIRALARM "radio_airalarm_rcvr" //devices interested in recieving signals from air alarms
+#define RADIO_CHAT "radio_telecoms"
+#define RADIO_ATMOSIA "radio_atmos"
+#define RADIO_NAVBEACONS "radio_navbeacon"
+#define RADIO_AIRLOCK "radio_airlock"
+#define RADIO_SECBOT "radio_secbot"
+#define RADIO_MULEBOT "radio_mulebot"
+#define RADIO_MAGNETS "radio_magnet"
diff --git a/code/_global_vars/radio.dm b/code/_global_vars/radio.dm
index 4279b37867..0e9c676f3f 100644
--- a/code/_global_vars/radio.dm
+++ b/code/_global_vars/radio.dm
@@ -1,78 +1,11 @@
-
-/*
-Frequency range: 1200 to 1600
-Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency, even during mapmaking)
-Radio:
-1459 - standard radio chat
-1351 - Science
-1353 - Command
-1355 - Medical
-1357 - Engineering
-1359 - Security
-1341 - deathsquad
-1443 - Confession Intercom
-1347 - Cargo techs
-1349 - Service people
-Devices:
-1451 - tracking implant
-1457 - RSD default
-On the map:
-1311 for prison shuttle console (in fact, it is not used)
-1433 for engine components
-1435 for status displays
-1437 for atmospherics/fire alerts
-1439 for air pumps, air scrubbers, atmo control
-1441 for atmospherics - supply tanks
-1443 for atmospherics - distribution loop/mixed air tank
-1445 for bot nav beacons
-1447 for mulebot, secbot and ed209 control
-1449 for airlock controls, electropack, magnets
-1451 for toxin lab access
-1453 for engineering access
-1455 for AI access
-*/
-
-var/const/RADIO_LOW_FREQ = 1200
-var/const/PUBLIC_LOW_FREQ = 1441
-var/const/PUBLIC_HIGH_FREQ = 1489
-var/const/RADIO_HIGH_FREQ = 1600
-
-var/const/BOT_FREQ = 1447
-var/const/COMM_FREQ = 1353
-var/const/ERT_FREQ = 1345
-var/const/AI_FREQ = 1343
-var/const/DTH_FREQ = 1341
-var/const/SYND_FREQ = 1213
-var/const/RAID_FREQ = 1277
-var/const/ENT_FREQ = 1461 //entertainment frequency. This is not a diona exclusive frequency.
-var/const/BDCM_FREQ = 1481 // CHOMPEdit
-
-// department channels
-var/const/PUB_FREQ = 1459
-var/const/SEC_FREQ = 1359
-var/const/ENG_FREQ = 1357
-var/const/MED_FREQ = 1355
-var/const/SCI_FREQ = 1351
-var/const/SRV_FREQ = 1349
-var/const/SUP_FREQ = 1347
-var/const/EXP_FREQ = 1361
-
-// internal department channels
-var/const/MED_I_FREQ = 1485
-var/const/SEC_I_FREQ = 1475
-
-var/const/TALON_FREQ = 1363 //VOREStation Add
-var/const/CSN_FREQ = 1365 //VOREStation Add
-var/const/OUT_FREQ = 1367 //CHOMPstation Add
-
-var/list/radiochannels = list(
+GLOBAL_LIST_INIT(radiochannels, list(
CHANNEL_COMMON = PUB_FREQ,
CHANNEL_SCIENCE = SCI_FREQ,
CHANNEL_COMMAND = COMM_FREQ,
CHANNEL_MEDICAL = MED_FREQ,
CHANNEL_ENGINEERING = ENG_FREQ,
CHANNEL_SECURITY = SEC_FREQ,
- CHANNEL_BODYCAM = BDCM_FREQ, // CHOMPEdit
+ CHANNEL_BODYCAM = BDCM_FREQ, // CHOMPAdd
CHANNEL_RESPONSE_TEAM = ERT_FREQ,
CHANNEL_SPECIAL_OPS = DTH_FREQ,
CHANNEL_MERCENARY = SYND_FREQ,
@@ -86,8 +19,8 @@ var/list/radiochannels = list(
CHANNEL_SECURITY_1 = SEC_I_FREQ,
CHANNEL_TALON = TALON_FREQ, //VOREStation Add
CHANNEL_CASINO = CSN_FREQ,
- CHANNEL_OUTSIDER = OUT_FREQ //CHOMPstation Add
-)
+ CHANNEL_OUTSIDER = OUT_FREQ // CHOMPAdd
+))
// Hey, if anyone ever needs to update tgui/packages/tgui/constants.js with new radio channels
// I've kept this around just for you.
@@ -96,8 +29,8 @@ var/list/radiochannels = list(
set category = "Generate TGUI Radio Constants"
var/list/channel_info = list()
for(var/i in RADIO_LOW_FREQ to RADIO_HIGH_FREQ)
- for(var/key in radiochannels)
- if(i == radiochannels[key])
+ for(var/key in GLOB.radiochannels)
+ if(i == GLOB.radiochannels[key])
channel_info.Add(list(list("name" = key, "freq" = i, "color" = frequency_span_class(i))))
for(var/list/channel in channel_info)
switch(channel["color"])
@@ -170,21 +103,3 @@ var/list/OFFMAP_FREQS = list(TALON_FREQ, CSN_FREQ, OUT_FREQ) //VOREStation Add C
return "expradio"
//VOREStation Add End
return "radio"
-
-/* filters */
-//When devices register with the radio controller, they might register under a certain filter.
-//Other devices can then choose to send signals to only those devices that belong to a particular filter.
-//This is done for performance, so we don't send signals to lots of machines unnecessarily.
-
-//This filter is special because devices belonging to default also recieve signals sent to any other filter.
-var/const/RADIO_DEFAULT = "radio_default"
-
-var/const/RADIO_TO_AIRALARM = "radio_airalarm" //air alarms
-var/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in recieving signals from air alarms
-var/const/RADIO_CHAT = "radio_telecoms"
-var/const/RADIO_ATMOSIA = "radio_atmos"
-var/const/RADIO_NAVBEACONS = "radio_navbeacon"
-var/const/RADIO_AIRLOCK = "radio_airlock"
-var/const/RADIO_SECBOT = "radio_secbot"
-var/const/RADIO_MULEBOT = "radio_mulebot"
-var/const/RADIO_MAGNETS = "radio_magnet"
diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm
index 5d8b8bc192..144198ba08 100644
--- a/code/_helpers/global_lists.dm
+++ b/code/_helpers/global_lists.dm
@@ -86,7 +86,7 @@ GLOBAL_LIST_EMPTY(escape_list)
GLOBAL_LIST_EMPTY(endgame_exits)
GLOBAL_LIST_EMPTY(endgame_safespawns)
-GLOBAL_LIST_INIT(syndicate_access, list(access_maint_tunnels, access_syndicate, access_external_airlocks))
+GLOBAL_LIST_INIT(syndicate_access, list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS))
// Ores (for mining)
GLOBAL_LIST_EMPTY(ore_data)
@@ -681,20 +681,20 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard)
// Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't
GLOBAL_LIST_INIT(default_internal_channels, list(
num2text(PUB_FREQ) = list(),
- num2text(AI_FREQ) = list(access_synth),
+ num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
- num2text(ERT_FREQ) = list(access_cent_specops),
- num2text(COMM_FREQ)= list(access_heads),
- num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
- num2text(MED_FREQ) = list(access_medical_equip),
- num2text(MED_I_FREQ)=list(access_medical_equip),
- num2text(BDCM_FREQ) =list(access_security), // CHOMPAdd
- num2text(SEC_FREQ) = list(access_security),
- num2text(SEC_I_FREQ)=list(access_security),
- num2text(SCI_FREQ) = list(access_tox, access_robotics, access_xenobiology),
- num2text(SUP_FREQ) = list(access_cargo, access_mining_station),
- num2text(SRV_FREQ) = list(access_janitor, access_library, access_hydroponics, access_bar, access_kitchen),
- num2text(EXP_FREQ) = list(access_explorer, access_pilot) // CHOMPEdit
+ num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
+ num2text(COMM_FREQ)= list(ACCESS_HEADS),
+ num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
+ num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
+ num2text(MED_I_FREQ)=list(ACCESS_MEDICAL_EQUIP),
+ num2text(BDCM_FREQ) =list(ACCESS_SECURITY), // CHOMPAdd
+ num2text(SEC_FREQ) = list(ACCESS_SECURITY),
+ num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
+ num2text(SCI_FREQ) = list(ACCESS_TOX, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY),
+ num2text(SUP_FREQ) = list(ACCESS_CARGO, ACCESS_MINING_STATION),
+ num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_LIBRARY, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN),
+ num2text(EXP_FREQ) = list(ACCESS_EXPLORER, ACCESS_PILOT) // CHOMPEdit
))
GLOBAL_LIST_INIT(default_medbay_channels, list(
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 632a163b15..c4b97f0f5c 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -220,7 +220,7 @@
if((LASER in mutations) && a_intent == I_HURT)
LaserEyes(A) // moved into a proc below
else if(has_telegrip())
- if(get_dist(src, A) > tk_maxrange)
+ if(get_dist(src, A) > TK_MAXRANGE)
to_chat(src, TK_OUTRANGED_MESSAGE)
return
A.attack_tk(src)
diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index 5f374e072c..e5e30624d1 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -1,22 +1,22 @@
/obj/screen/ai/multicam/Click()
if(..())
return
- var/mob/living/silicon/ai/AI = usr
- AI.toggle_multicam()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.toggle_multicam()
/obj/screen/ai/add_multicam/Click()
if(..())
return
- var/mob/living/silicon/ai/AI = usr
- AI.drop_new_multicam()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.drop_new_multicam()
/obj/screen/ai/up/Click()
- var/mob/living/silicon/ai/AI = usr
- AI.zMove(UP)
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.zMove(UP)
/obj/screen/ai/down/Click()
- var/mob/living/silicon/ai/AI = usr
- AI.zMove(DOWN)
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.zMove(DOWN)
/mob/living/silicon/ai/create_mob_hud(datum/hud/HUD, apply_to_client = TRUE)
..()
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 9de135db36..96f0c06eb7 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -551,77 +551,77 @@
if("AI Core")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.view_core()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.view_core()
if("Show Camera List")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- var/camera = tgui_input_list(AI, "Pick Camera:", "Camera Choice", AI.get_camera_list())
- AI.ai_camera_list(camera)
+ var/mob/living/silicon/ai/ai_user = usr
+ var/camera = tgui_input_list(ai_user, "Pick Camera:", "Camera Choice", ai_user.get_camera_list())
+ ai_user.ai_camera_list(camera)
if("Track With Camera")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- var/target_name = tgui_input_list(AI, "Pick Mob:", "Mob Choice", AI.trackable_mobs())
- AI.ai_camera_track(target_name)
+ var/mob/living/silicon/ai/ai_user = usr
+ var/target_name = tgui_input_list(ai_user, "Pick Mob:", "Mob Choice", ai_user.trackable_mobs())
+ ai_user.ai_camera_track(target_name)
if("Toggle Camera Light")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.toggle_camera_light()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.toggle_camera_light()
if("Crew Monitoring")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.subsystem_crew_monitor()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.subsystem_crew_monitor()
if("Show Crew Manifest")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.subsystem_crew_manifest()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.subsystem_crew_manifest()
if("Show Alerts")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.subsystem_alarm_monitor()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.subsystem_alarm_monitor()
if("Announcement")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.ai_announcement()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.ai_announcement()
if("Call Emergency Shuttle")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.ai_call_shuttle()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.ai_call_shuttle()
if("State Laws")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.ai_checklaws()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.ai_checklaws()
if("PDA - Send Message")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.aiPDA.start_program(AI.aiPDA.find_program(/datum/data/pda/app/messenger))
- AI.aiPDA.cmd_pda_open_ui(usr)
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.aiPDA.start_program(ai_user.aiPDA.find_program(/datum/data/pda/app/messenger))
+ ai_user.aiPDA.cmd_pda_open_ui(usr)
if("PDA - Show Message Log")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.aiPDA.start_program(AI.aiPDA.find_program(/datum/data/pda/app/messenger))
- AI.aiPDA.cmd_pda_open_ui(usr)
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.aiPDA.start_program(ai_user.aiPDA.find_program(/datum/data/pda/app/messenger))
+ ai_user.aiPDA.cmd_pda_open_ui(usr)
if("Take Image")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.take_image()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.take_image()
if("View Images")
if(isAI(usr))
- var/mob/living/silicon/ai/AI = usr
- AI.view_images()
+ var/mob/living/silicon/ai/ai_user = usr
+ ai_user.view_images()
else
return attempt_vr(src,"Click_vr",list(location,control,params))
return 1
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index a2f9658bd0..af3718ada2 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -59,7 +59,7 @@
TKG.use_grip_power(src,TRUE)
if(client.eye != src) // Extremely bad exploits if allowed to TK while remote viewing
to_chat(src, TK_DENIED_MESSAGE)
- else if(get_dist(src, A) > tk_maxrange)
+ else if(get_dist(src, A) > TK_MAXRANGE)
to_chat(src, TK_OUTRANGED_MESSAGE)
else
A.attack_tk(src)
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index f840c6e226..b9cfe7a63f 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -1,10 +1,3 @@
-/*
- Telekinesis
-
- This needs more thinking out, but I might as well.
-*/
-var/const/tk_maxrange = 15
-
/*
Telekinetic attack:
@@ -114,7 +107,7 @@ var/const/tk_maxrange = 15
var/d = get_dist(user, target)
if(focus)
d = max(d, get_dist(user, focus)) // whichever is further
- if(d > tk_maxrange)
+ if(d > TK_MAXRANGE)
to_chat(user, TK_OUTRANGED_MESSAGE)
return
diff --git a/code/controllers/subsystems/communications.dm b/code/controllers/subsystems/communications.dm
index 6c25eecd59..6f1240a2a7 100644
--- a/code/controllers/subsystems/communications.dm
+++ b/code/controllers/subsystems/communications.dm
@@ -181,7 +181,7 @@ SUBSYSTEM_DEF(radio)
var/list/data = list()
var/encryption
- var/frequency = 0
+ var/frequency = ZERO_FREQ
/datum/signal/proc/copy_from(datum/signal/model)
source = model.source
diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index 214d304da2..9cb94996b5 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -97,7 +97,7 @@ SUBSYSTEM_DEF(job)
return type_occupations[jobtype]
// Determines if a job title is inside of a specific department.
-// Useful to replace the old `if(job_title in command_positions)` code.
+// Useful to replace the old `if(job_title in GLOB.command_positions)` code.
/datum/controller/subsystem/job/proc/is_job_in_department(rank, target_department_name)
var/datum/department/D = LAZYACCESS(department_datums, target_department_name)
if(istype(D))
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index c0e2014fd5..d25a8aa500 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -93,11 +93,13 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/fire(resumed = FALSE)
switch(current_state)
if(GAME_STATE_STARTUP)
- if(Master.initializations_finished_with_no_players_logged_in)
- start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
+ // if(Master.initializations_finished_with_no_players_logged_in) // We want to wait the full time after the startup finished
+ start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
for(var/client/C in GLOB.clients)
window_flash(C, ignorepref = TRUE) //let them know lobby has opened up.
- to_chat(world, span_notice("Welcome to [station_name()]!"))
+ to_chat(world, span_boldnotice("Welcome to [station_name()]!"))
+ //for(var/channel_tag in CONFIG_GET(str_list/channel_announce_new_game))
+ // send2chat(new /datum/tgs_message_content("New round starting on [SSmapping.current_map.map_name]!"), channel_tag)
current_state = GAME_STATE_PREGAME
SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME)
@@ -106,6 +108,7 @@ SUBSYSTEM_DEF(ticker)
//lobby stats for statpanels
if(isnull(timeLeft))
timeLeft = max(0,start_at - world.time)
+ to_chat(world, span_notice("Round starting in [round(timeLeft / 10)] Seonds!"))
totalPlayers = LAZYLEN(GLOB.new_player_list)
totalPlayersReady = 0
total_admins_ready = 0
diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm
index 11d518e662..4a821203c0 100644
--- a/code/datums/supplypacks/atmospherics.dm
+++ b/code/datums/supplypacks/atmospherics.dm
@@ -70,7 +70,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/large/aether
containername = "Pipe Dispenser Crate"
- access = access_atmospherics
+ access = ACCESS_ATMOSPHERICS
/datum/supply_pack/atmos/disposals_dispenser
contains = list(/obj/machinery/pipedispenser/disposal/orderable)
@@ -79,7 +79,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/large/aether
containername = "Disposal Dispenser Crate"
- access = access_atmospherics
+ access = ACCESS_ATMOSPHERICS
/datum/supply_pack/atmos/rapid_pipe_dispenser
contains = list(/obj/item/pipe_dispenser)
@@ -88,7 +88,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/aether
containername = "Rapid Pipe Dispenser Crate"
- access = access_atmospherics
+ access = ACCESS_ATMOSPHERICS
/datum/supply_pack/atmos/internals
name = "Internals crate"
diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm
index 4af43fc2ba..b13bffcb8d 100644
--- a/code/datums/supplypacks/engineering.dm
+++ b/code/datums/supplypacks/engineering.dm
@@ -167,7 +167,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Emitter crate"
- access = access_engine //CHOMPedit
+ access = ACCESS_ENGINE //CHOMPedit
/datum/supply_pack/eng/engine/field_gen
name = "Field Generator crate"
@@ -175,7 +175,7 @@
contains = list(/obj/machinery/field_generator = 2)
containertype = /obj/structure/closet/crate/secure/xion
containername = "Field Generator crate"
- access = access_ce
+ access = ACCESS_CE
/datum/supply_pack/eng/engine/sing_gen
name = "Singularity Generator crate"
@@ -183,7 +183,7 @@
contains = list(/obj/machinery/the_singularitygen)
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Singularity Generator crate"
- access = access_ce
+ access = ACCESS_CE
/datum/supply_pack/eng/engine/tesla_gen
name = "Tesla Generator crate"
@@ -191,7 +191,7 @@
contains = list(/obj/machinery/the_singularitygen/tesla)
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Tesla Generator crate"
- access = access_ce
+ access = ACCESS_CE
/datum/supply_pack/eng/engine/collector
name = "Collector crate"
@@ -215,7 +215,7 @@
)
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Particle Accelerator crate"
- access = list(access_ce, access_research) // CHOMPEdit
+ access = list(ACCESS_CE, ACCESS_RESEARCH) // CHOMPEdit
one_access = TRUE //CHOMPAdd
/datum/supply_pack/eng/shield_gen
@@ -225,7 +225,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/focalpoint
containername = "bubble shield generator circuitry crate"
- access = access_ce
+ access = ACCESS_CE
/datum/supply_pack/eng/shield_gen_ex
contains = list(/obj/item/circuitboard/shield_gen_ex)
@@ -234,7 +234,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/focalpoint
containername = "hull shield generator circuitry crate"
- access = access_ce
+ access = ACCESS_CE
/datum/supply_pack/eng/shield_cap
contains = list(/obj/item/circuitboard/shield_cap)
@@ -243,7 +243,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/focalpoint
containername = "shield capacitor circuitry crate"
- access = access_ce
+ access = ACCESS_CE
/datum/supply_pack/eng/smbig
name = "Supermatter Core"
@@ -252,7 +252,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/phoron
containername = "Supermatter crate (CAUTION)"
- access = access_ce
+ access = ACCESS_CE
/datum/supply_pack/eng/teg
contains = list(/obj/machinery/power/generator)
@@ -261,7 +261,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/large/einstein
containername = "Mk1 TEG crate"
- access = access_engine
+ access = ACCESS_ENGINE
/datum/supply_pack/eng/circulator
contains = list(/obj/machinery/atmospherics/binary/circulator)
@@ -270,7 +270,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/large/einstein
containername = "Atmospheric circulator crate"
- access = access_engine
+ access = ACCESS_ENGINE
/datum/supply_pack/eng/radsuit
contains = list(
@@ -300,7 +300,7 @@
cost = 25
containername = "P.A.C.M.A.N. Portable Generator Construction Kit"
containertype = /obj/structure/closet/crate/secure/focalpoint
- access = access_tech_storage
+ access = ACCESS_TECH_STORAGE
contains = list(
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/capacitor,
@@ -314,7 +314,7 @@
cost = 35
containername = "Super P.A.C.M.A.N. portable generator construction kit"
containertype = /obj/structure/closet/crate/secure/focalpoint
- access = access_tech_storage
+ access = ACCESS_TECH_STORAGE
contains = list(
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/capacitor,
@@ -328,7 +328,7 @@
cost = 50
containername = "R-UST Mk. 8 Tokamak Fusion Core crate"
containertype = /obj/structure/closet/crate/secure/einstein
- access = access_engine
+ access = ACCESS_ENGINE
contains = list(
/obj/item/book/manual/rust_engine,
/obj/machinery/power/fusion_core,
@@ -341,7 +341,7 @@
cost = 30
containername = "R-UST Mk. 8 fuel injector crate"
containertype = /obj/structure/closet/crate/secure/einstein
- access = access_engine
+ access = ACCESS_ENGINE
contains = list(
/obj/machinery/fusion_fuel_injector,
/obj/machinery/fusion_fuel_injector,
@@ -354,7 +354,7 @@
cost = 15
containername = "Gyrotron Crate"
containertype = /obj/structure/closet/crate/secure/einstein
- access = access_engine
+ access = ACCESS_ENGINE
contains = list(
/obj/machinery/power/emitter/gyrotron,
/obj/item/circuitboard/gyrotron
@@ -406,7 +406,7 @@
cost = 30
containertype = /obj/structure/closet/crate/large
containername = "thermal regulator crate"
- access = access_atmospherics
+ access = ACCESS_ATMOSPHERICS
/datum/supply_pack/eng/dosimeter
contains = list(/obj/item/storage/box/dosimeter = 6)
@@ -431,4 +431,4 @@
cost = 90 //Relatively expensive
containertype = /obj/structure/closet/crate/xion
containername = "Inducers crate"
- access = access_engine
+ access = ACCESS_ENGINE
diff --git a/code/datums/supplypacks/hardsuits.dm b/code/datums/supplypacks/hardsuits.dm
index 40d69975e9..3e1e77d963 100644
--- a/code/datums/supplypacks/hardsuits.dm
+++ b/code/datums/supplypacks/hardsuits.dm
@@ -16,10 +16,10 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "eva hardsuit crate"
- access = list(access_mining,
- access_eva,
- access_explorer, // CHOMP explo keep
- access_pilot)
+ access = list(ACCESS_MINING,
+ ACCESS_EVA,
+ ACCESS_EXPLORER, // CHOMP explo keep
+ ACCESS_PILOT)
one_access = TRUE
/datum/supply_pack/hardsuits/mining_rig
@@ -31,8 +31,8 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "industrial hardsuit crate"
- access = list(access_mining,
- access_eva)
+ access = list(ACCESS_MINING,
+ ACCESS_EVA)
one_access = TRUE
/datum/supply_pack/hardsuits/medical_rig
@@ -44,7 +44,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "medical hardsuit crate"
- access = access_medical
+ access = ACCESS_MEDICAL
/datum/supply_pack/hardsuits/security_rig
name = "hazard hardsuit (empty)"
@@ -55,7 +55,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "hazard hardsuit crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/hardsuits/science_rig
name = "ami hardsuit (empty)"
@@ -66,7 +66,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "ami hardsuit crate"
- access = access_rd
+ access = ACCESS_RD
/datum/supply_pack/hardsuits/ce_rig
name = "advanced hardsuit (empty)"
@@ -77,7 +77,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "advanced hardsuit crate"
- access = access_ce
+ access = ACCESS_CE
// CHOMPStation EDIT Start: Change Commonwealth to Solgov
/datum/supply_pack/misc/solgov_medical_rig
@@ -89,7 +89,7 @@
cost = 250
containertype = /obj/structure/closet/crate/secure/gear
containername = "Solgov medical hardsuit crate"
- access = access_medical
+ access = ACCESS_MEDICAL
/datum/supply_pack/misc/solgov_engineering_rig
name = "solgov engineering hardsuit (loaded)"
@@ -100,7 +100,7 @@
cost = 250
containertype = /obj/structure/closet/crate/secure/gear
containername = "Solgov engineering hardsuit crate"
- access = access_engine
+ access = ACCESS_ENGINE
// CHOMPStation EDIT End
@@ -113,7 +113,7 @@
cost = 250
containertype = /obj/structure/closet/crate/secure/gear
containername = "unathi breacher hardsuit crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/hardsuits/zero_rig
name = "null hardsuit (jets)"
diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm
index 00efcaca98..f3ec1f9df0 100644
--- a/code/datums/supplypacks/hydroponics.dm
+++ b/code/datums/supplypacks/hydroponics.dm
@@ -89,7 +89,7 @@
cost = 20
containertype = /obj/structure/closet/crate/hydroponics
containername = "Hydroponics crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/cow
name = "Cow crate"
@@ -97,7 +97,7 @@
cost = 25
containertype = /obj/structure/largecrate/animal/cow
containername = "Cow crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/goat
name = "Goat crate"
@@ -105,7 +105,7 @@
cost = 25
containertype = /obj/structure/largecrate/animal/goat
containername = "Goat crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/chicken
name = "Chicken crate"
@@ -113,7 +113,7 @@
cost = 25
containertype = /obj/structure/largecrate/animal/chick
containername = "Chicken crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/turkey
name = "Turkey crate"
@@ -121,7 +121,7 @@
cost = 25
containertype = /obj/structure/largecrate/animal/turkey
containername = "Turkey crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/seeds
name = "Seeds crate"
@@ -148,7 +148,7 @@
cost = 10
containertype = /obj/structure/closet/crate/carp
containername = "Seeds crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/weedcontrol
name = "Weed control crate"
@@ -163,7 +163,7 @@
cost = 45
containertype = /obj/structure/closet/crate/grayson
containername = "Weed control crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/watertank
name = "Water tank crate"
@@ -185,7 +185,7 @@
cost = 40
containertype = /obj/structure/closet/crate/carp
containername = "Beekeeping crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/tray
name = "Empty hydroponics trays"
@@ -194,7 +194,7 @@
containertype = /obj/structure/closet/crate/aether
containername = "Hydroponics tray crate"
contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = FALSE} = 3)
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/birds
name = "Birds Crate"
@@ -202,7 +202,7 @@
cost = 200 //You're getting 22 birds. Of course it's going to be a lot!
containertype = /obj/structure/largecrate/birds
containername = "Bird crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/sobaka
name = "Sobaka crate"
diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm
index c61876d007..6dc3a72bc5 100644
--- a/code/datums/supplypacks/medical.dm
+++ b/code/datums/supplypacks/medical.dm
@@ -77,7 +77,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Surgery crate"
- access = access_medical
+ access = ACCESS_MEDICAL
/datum/supply_pack/med/deathalarm
name = "Death Alarm crate"
@@ -89,7 +89,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/ward
containername = "Death Alarm crate"
- access = access_medical
+ access = ACCESS_MEDICAL
/datum/supply_pack/med/clotting
name = "Clotting Medicine crate"
@@ -100,7 +100,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/zenghu
containername = "Clotting Medicine crate"
- access = access_medical
+ access = ACCESS_MEDICAL
/datum/supply_pack/med/sterile
name = "Sterile equipment crate"
@@ -128,7 +128,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical surplus equipment"
- access = access_medical
+ access = ACCESS_MEDICAL
/datum/supply_pack/med/cmogear
name = "Chief Medical Officer equipment"
@@ -154,7 +154,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Chief medical officer equipment"
- access = access_cmo
+ access = ACCESS_CMO
/datum/supply_pack/med/doctorgear
name = JOB_MEDICAL_DOCTOR + " equipment"
@@ -178,7 +178,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = JOB_MEDICAL_DOCTOR + " equipment"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/chemistgear
name = JOB_CHEMIST + " equipment"
@@ -202,7 +202,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = JOB_CHEMIST + " equipment"
- access = access_chemistry
+ access = ACCESS_CHEMISTRY
/datum/supply_pack/med/paramedicgear
name = JOB_PARAMEDIC + " equipment"
@@ -231,7 +231,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = JOB_PARAMEDIC + " equipment"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/psychiatristgear
name = JOB_PSYCHIATRIST + " equipment"
@@ -251,7 +251,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = JOB_PSYCHIATRIST + " equipment"
- access = access_psychiatrist
+ access = ACCESS_PSYCHIATRIST
/datum/supply_pack/med/medicalscrubs
name = "Medical scrubs"
@@ -273,7 +273,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical scrubs crate"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/autopsy
name = "Autopsy equipment"
@@ -291,7 +291,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Autopsy equipment crate"
- access = access_morgue
+ access = ACCESS_MORGUE
/datum/supply_pack/med/medicaluniforms
name = "Medical uniforms"
@@ -319,7 +319,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical uniform crate"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/medicalbiosuits
name = "Medical biohazard gear"
@@ -338,7 +338,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical biohazard equipment"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/portablefreezers
name = "Portable freezers crate"
@@ -347,7 +347,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Portable freezers"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/virus
name = "Virus culture crate"
@@ -356,7 +356,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/zenghu
containername = "Virus culture crate"
- access = access_cmo
+ access = ACCESS_CMO
/datum/supply_pack/med/defib
name = "Defibrillator crate"
@@ -420,7 +420,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "Virology biohazard equipment"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/disease
name = "Experimental Disease crate"
@@ -430,7 +430,7 @@
)
cost = 60
containertype = /obj/structure/closet/crate/freezer
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/disease_minor
name = "Minor Experimental Disease crate"
@@ -440,7 +440,7 @@
)
cost = 40
containertype = /obj/structure/closet/crate/freezer
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/compactdefib
name = "Compact Defibrillator crate"
@@ -449,4 +449,4 @@
cost = 90
containertype = /obj/structure/closet/crate/secure
containername = "Compact Defibrillator crate"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm
index 5e1b5c7ed8..b9de56aaad 100644
--- a/code/datums/supplypacks/misc.dm
+++ b/code/datums/supplypacks/misc.dm
@@ -247,8 +247,8 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/gear
containername = "Belt-miner gear crate"
- access = list(access_mining,
- access_xenoarch)
+ access = list(ACCESS_MINING,
+ ACCESS_XENOARCH)
one_access = TRUE
/datum/supply_pack/misc/jetpack
@@ -260,11 +260,11 @@
cost = 75
containertype = /obj/structure/closet/crate/secure/gear
containername = "jetpack crate"
- access = list(access_mining,
- access_xenoarch,
- access_eva,
- access_explorer, //CHOMP explo keep
- access_pilot)
+ access = list(ACCESS_MINING,
+ ACCESS_XENOARCH,
+ ACCESS_EVA,
+ ACCESS_EXPLORER, // CHOMP explo keep
+ ACCESS_PILOT)
one_access = TRUE
/datum/supply_pack/randomised/misc/explorer_shield
@@ -280,9 +280,9 @@
cost = 75
containertype = /obj/structure/closet/crate/secure/gear
containername = "exploration shield crate"
- access = list(access_explorer, //CHOMP explo keep
- access_eva,
- access_pilot)
+ access = list(ACCESS_EXPLORER, // CHOMP explo keep
+ ACCESS_EVA,
+ ACCESS_PILOT)
one_access = TRUE
/datum/supply_pack/misc/music_players
@@ -315,9 +315,9 @@
containertype = /obj/structure/closet/crate/secure/gear
containername = "exploration radio headsets crate"
access = list(
- access_explorer, //CHOMP explo keep
- access_eva,
- access_pilot
+ ACCESS_EXPLORER,
+ ACCESS_EVA,
+ ACCESS_PILOT
)
one_access = TRUE
diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm
index 2457a7dff2..b66c8b879d 100644
--- a/code/datums/supplypacks/munitions.dm
+++ b/code/datums/supplypacks/munitions.dm
@@ -22,7 +22,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Security equipment crate"
- access = access_security*/
+ access = ACCESS_SECURITY*/
/datum/supply_pack/munitions/egunpistol
name = "Weapons - Energy sidearms"
@@ -31,7 +31,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Energy sidearms crate"
- access = access_armory //VOREStation Edit - Guns are for the armory.
+ access = ACCESS_ARMORY //VOREStation Edit - Guns are for the armory.
/datum/supply_pack/munitions/flareguns
name = "Weapons - Flare guns"
@@ -45,7 +45,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/gear
containername = "Flare gun crate"
- access = access_armory //VOREStation Edit - Guns are for the armory.
+ access = ACCESS_ARMORY //VOREStation Edit - Guns are for the armory.
/datum/supply_pack/munitions/eweapons
name = "Weapons - Experimental weapons crate"
@@ -56,7 +56,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/science
containername = "Experimental weapons crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/energyweapons
name = "Weapons - Laser rifle crate"
@@ -65,7 +65,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/heph
containername = "Energy weapons crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/shotgun
name = "Weapons - Shotgun crate"
@@ -78,7 +78,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Shotgun crate"
- access = access_armory
+ access = ACCESS_ARMORY
/* VOREStation edit -- This is a bad idea. -- So is this.
/datum/supply_pack/munitions/shotgunsemi
@@ -91,7 +91,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Semi-Auto Shotgun crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/erifle
name = "Weapons - Energy marksman"
@@ -99,7 +99,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/heph
containername = "Energy marksman crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/burstlaser
name = "Weapons - Burst laser"
@@ -107,7 +107,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Burst laser crate"
- access = access_armory
+ access = ACCESS_ARMORY
*/
/datum/supply_pack/munitions/ionweapons
name = "Weapons - Electromagnetic Pulse Rifles"
@@ -119,7 +119,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/ward
containername = "Electromagnetic weapons crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/ionpistols
name = "Weapons - Electromagnetic Pulse pistols"
@@ -131,7 +131,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/ward
containername = "Electromagnetic weapons crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/bsmg
name = "Weapons - Ballistic SMGs"
@@ -140,7 +140,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/ward
containername = "Ballistic weapon crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/brifle
name = "Weapons - Ballistic Rifles"
@@ -149,7 +149,7 @@
cost = 80
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic weapon crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/bolt_rifles_lethal
name = "Weapons - Bolt-Action Rifles"
@@ -161,7 +161,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic Weapons crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/bolt_rifles_competitive
name = "Weapons - Competitive shooting rifles"
@@ -177,7 +177,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic Weapons crate"
- access = access_armory //VOREStation Edit - Guns are for the armory.
+ access = ACCESS_ARMORY //VOREStation Edit - Guns are for the armory.
/datum/supply_pack/munitions/caseless
name = "Weapons - Prototype Caseless Rifle"
@@ -189,7 +189,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/heph
containername = "Caseless rifle crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/mrifle
name = "Weapons - Magnetic Rifles"
@@ -198,7 +198,7 @@
cost = 120
containertype = /obj/structure/closet/crate/secure/heph
containername = "Magnetic weapon crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/mpistol
name = "Weapons - Magnetic Pistols"
@@ -207,7 +207,7 @@
cost = 200
containertype = /obj/structure/closet/crate/secure/heph
containername = "Magnetic weapon crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/mcarbine
name = "Weapons - Magnetic Carbines"
@@ -216,7 +216,7 @@
cost = 130
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Magnetic weapon crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/mshells
name = "Weapons - Magnetic Shells"
@@ -225,7 +225,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Magnetic ammunition crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/claymore
name = "Weapons - Melee - Claymores"
@@ -234,7 +234,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Claymore crate"
- access = access_armory //two swords that are a one-hit 40 brute + IB chance should be armory-locked
+ access = ACCESS_ARMORY //two swords that are a one-hit 40 brute + IB chance should be armory-locked
/datum/supply_pack/munitions/shotgunammo
name = "Ammunition - Shotgun shells"
@@ -246,7 +246,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic ammunition crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/beanbagammo
name = "Ammunition - Beanbag shells"
@@ -255,7 +255,7 @@
cost = 25
containertype = /obj/structure/closet/crate
containername = "Ballistic ammunition crate"
- access = access_armory //VOREStation Edit - Guns are for the armory.
+ access = ACCESS_ARMORY //VOREStation Edit - Guns are for the armory.
/datum/supply_pack/munitions/bsmgammo
name = "Ammunition - 9mm top mounted lethal"
@@ -264,7 +264,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic ammunition crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/bsmgammorubber
name = "Ammunition - 9mm top mounted rubber"
@@ -273,7 +273,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic ammunition crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/brifleammo
name = "Ammunition - 7.62mm lethal"
@@ -282,7 +282,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic ammunition crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/pcellammo
name = "Ammunition - Power cell"
@@ -291,10 +291,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Energy ammunition crate"
- access = access_security
- containertype = /obj/structure/closet/crate
- containername = "Beanbag shells"
- access = null
+ access = ACCESS_SECURITY
/datum/supply_pack/randomised/munitions/yw_revolver
name = "Revolver Crate"
@@ -310,7 +307,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
containername = "Revolver Crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/randomised/munitions/yw_assault
name = "Assault rifle crate"
@@ -323,7 +320,7 @@
cost = 250
containertype = /obj/structure/closet/crate/secure
containername = "Assault rifle crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/randomised/munitions/yw_smg
name = "Smg crate"
@@ -335,7 +332,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure
containername = "Smg crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/munitions/munitions/yw_mg
name = "Light machine gun crate"
@@ -354,7 +351,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure
containername = "phasegun crate"
- access = access_explorer
+ access = ACCESS_EXPLORER
/datum/supply_pack/munitions/expeditioncannon
name = "Exploration phasecannon (station-locked) crate"
@@ -364,7 +361,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "phasegun cannon crate"
- access = access_explorer
+ access = ACCESS_EXPLORER
//CHOMP Edit end
/datum/supply_pack/munitions/ofd_charge_emp
@@ -376,7 +373,7 @@
cost = 35
containertype = /obj/structure/closet/crate/large/secure/heph
containername = "EMP disperser charge crate"
- access = access_security
+ access = ACCESS_SECURITY
/datum/supply_pack/munitions/ofd_charge_explosive
name = "OFD Charge - Explosive"
@@ -387,7 +384,7 @@
cost = 35
containertype = /obj/structure/closet/crate/large/secure/heph
containername = "Explosive disperser charge crate"
- access = access_security
+ access = ACCESS_SECURITY
/datum/supply_pack/munitions/ofd_charge_incendiary
name = "OFD Charge - Incendiary"
@@ -398,7 +395,7 @@
cost = 35
containertype = /obj/structure/closet/crate/large/secure/heph
containername = "Incendiary disperser charge crate"
- access = access_security
+ access = ACCESS_SECURITY
/datum/supply_pack/munitions/ofd_charge_mining
name = "OFD Charge - Mining"
@@ -409,7 +406,7 @@
cost = 35
containertype = /obj/structure/closet/crate/large/secure/heph
containername = "Mining disperser charge crate"
- access = access_security
+ access = ACCESS_SECURITY
/datum/supply_pack/munitions/longsword
name = "Weapons - Melee -Longsword (Steel)"
@@ -420,4 +417,4 @@
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "longsword"
- access = access_armory
+ access = ACCESS_ARMORY
diff --git a/code/datums/supplypacks/recreation.dm b/code/datums/supplypacks/recreation.dm
index 95fa8e2f1f..46bbdc00f0 100644
--- a/code/datums/supplypacks/recreation.dm
+++ b/code/datums/supplypacks/recreation.dm
@@ -9,7 +9,7 @@
/datum/supply_pack/randomised/recreation
group = "Recreation"
- access = access_security
+ access = ACCESS_SECURITY
/datum/supply_pack/recreation/foam_weapons
name = "Foam Weapon Crate"
diff --git a/code/datums/supplypacks/robotics.dm b/code/datums/supplypacks/robotics.dm
index 8f0d9e0ce7..883572a2d6 100644
--- a/code/datums/supplypacks/robotics.dm
+++ b/code/datums/supplypacks/robotics.dm
@@ -9,7 +9,7 @@
/datum/supply_pack/randomised/robotics
group = "Robotics"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robotics_assembly
name = "Robotics assembly crate"
@@ -23,7 +23,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Robotics assembly"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/*/datum/supply_pack/robotics/robolimbs_basic
name = "Basic robolimb blueprints"
@@ -34,7 +34,7 @@
cost = 15
containertype = /obj/structure/closet/crate/secure/gear
containername = "Robolimb blueprints (basic)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs_adv
name = "All robolimb blueprints"
@@ -50,7 +50,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/gear
containername = "Robolimb blueprints (adv)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
*/
/datum/supply_pack/robotics/robolimbs/morpheus
@@ -60,7 +60,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/morpheus
containername = "Robolimb blueprints (Morpheus)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/cybersolutions
name = "Cyber Solutions robolimb blueprints"
@@ -69,7 +69,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/cybersolutions
containername = "Robolimb blueprints (Cyber Solutions)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/xion
name = "Xion robolimb blueprints"
@@ -78,7 +78,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/xion
containername = "Robolimb blueprints (Xion)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/grayson
name = "Grayson robolimb blueprints"
@@ -87,7 +87,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/grayson
containername = "Robolimb blueprints (Grayson)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/hephaestus
name = "Hephaestus robolimb blueprints"
@@ -96,7 +96,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/heph
containername = "Robolimb blueprints (Hephaestus)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/wardtakahashi
name = "Ward-Takahashi robolimb blueprints"
@@ -105,7 +105,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/ward
containername = "Robolimb blueprints (Ward-Takahashi)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/zenghu
name = "Zeng Hu robolimb blueprints"
@@ -114,7 +114,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/zenghu
containername = "Robolimb blueprints (Zeng Hu)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/bishop
name = "Bishop robolimb blueprints"
@@ -123,7 +123,7 @@
cost = 70
containertype = /obj/structure/closet/crate/secure/bishop
containername = "Robolimb blueprints (Bishop)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/cenilimicybernetics
name = "Cenilimi Cybernetics robolimb blueprints"
@@ -132,7 +132,7 @@
cost = 45
containertype = /obj/structure/closet/crate/secure/science
containername = "Robolimb blueprints (Cenilimi Cybernetics)"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/mecha_ripley
name = "Circuit Crate (\"Ripley\" APLU)"
@@ -145,7 +145,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/xion
containername = "APLU \"Ripley\" Circuit Crate"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/mecha_odysseus
name = "Circuit Crate (\"Odysseus\")"
@@ -157,7 +157,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
containername = "\"Odysseus\" Circuit Crate"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/randomised/robotics/exosuit_mod
num_contained = 1
@@ -202,7 +202,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Jumper kit crate"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/restrainingbolt
name = "Restraining bolt crate"
@@ -214,7 +214,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/cybersolutions
containername = "Restraining bolt crate"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/bike
name = "Spacebike Crate"
@@ -251,7 +251,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/science
containername = "APLU \"Gopher\" Circuit Crate"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/mecha_polecat
name = "Circuit Crate (\"Polecat\" APLU)"
@@ -264,7 +264,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/science
containername = "APLU \"Polecat\" Circuit Crate"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/mecha_weasel
name = "Circuit Crate (\"Weasel\" APLU)"
@@ -277,7 +277,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/science
containername = "APLU \"Weasel\" Circuit Crate"
- access = access_robotics */
+ access = ACCESS_ROBOTICS */
/datum/supply_pack/robotics/some_robolimbs
name = "Basic Robolimb Blueprints"
@@ -290,7 +290,7 @@
cost = 15
containertype = /obj/structure/closet/crate/secure
containername = "Basic Robolimb Blueprint Crate"
- access = access_robotics
+ access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/all_robolimbs
name = "Advanced Robolimb Blueprints"
@@ -318,4 +318,4 @@
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "Advanced Robolimb Blueprint Crate"
- access = access_robotics
+ access = ACCESS_ROBOTICS
diff --git a/code/datums/supplypacks/science.dm b/code/datums/supplypacks/science.dm
index 03b6b6f554..226855560c 100644
--- a/code/datums/supplypacks/science.dm
+++ b/code/datums/supplypacks/science.dm
@@ -28,7 +28,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/phoron
containername = "Phoron assembly crate"
- access = access_tox_storage
+ access = ACCESS_TOX_STORAGE
/datum/supply_pack/sci/exoticseeds
name = "Exotic seeds crate"
@@ -44,7 +44,7 @@
cost = 15
containertype = /obj/structure/closet/crate/carp
containername = "Exotic Seeds crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/sci/integrated_circuit_printer
name = "Integrated circuit printer"
@@ -88,7 +88,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/xion
containername = "Xenoarchaeology Tech crate"
- access = access_research
+ access = ACCESS_RESEARCH
/*
/datum/supply_pack/sci/dune_buggy
@@ -107,7 +107,7 @@
cost = 40
containertype = /obj/structure/largecrate/animal/pred
containername = "Dangerous Predator crate"
- access = access_xenobiology
+ access = ACCESS_XENOBIOLOGY
/datum/supply_pack/sci/pred_doom
name = "EXTREMELY Dangerous Predator crate"
@@ -115,7 +115,7 @@
cost = 200
containertype = /obj/structure/largecrate/animal/dangerous
containername = "EXTREMELY Dangerous Predator crate"
- access = access_xenobiology
+ access = ACCESS_XENOBIOLOGY
contraband = 1
/datum/supply_pack/sci/weretiger
@@ -124,7 +124,7 @@
cost = 55
containertype = /obj/structure/largecrate/animal/weretiger
containername = "Weretiger crate"
- access = access_xenobiology
+ access = ACCESS_XENOBIOLOGY
//CHOMPEdit Start, enable this
/datum/supply_pack/sci/otie
@@ -132,12 +132,12 @@
cost = 100
containertype = /obj/structure/largecrate/animal/otie
containername = "VARMAcorp adoptable reject (Dangerous!)"
- access = access_xenobiology
+ access = ACCESS_XENOBIOLOGY
/datum/supply_pack/sci/phoronotie
name = "VARMAcorp adaptive beta subject (Experimental)"
cost = 200
containertype = /obj/structure/largecrate/animal/otie/phoron
containername = "VARMAcorp adaptive beta subject (Experimental)"
- access = access_xenobiology
+ access = ACCESS_XENOBIOLOGY
//CHOMEdit End
diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm
index 352b0e1fcd..a9731c7151 100644
--- a/code/datums/supplypacks/security.dm
+++ b/code/datums/supplypacks/security.dm
@@ -6,11 +6,11 @@
/datum/supply_pack/security
group = "Security"
- access = access_security
+ access = ACCESS_SECURITY
/datum/supply_pack/randomised/security
group = "Security"
- access = access_security
+ access = ACCESS_SECURITY
/datum/supply_pack/randomised/security/armor
name = "Armor - Security armor"
@@ -32,7 +32,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/gear
containername = "Armor crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/security/carriersblack
name = "Armor - Black modular armor"
@@ -280,7 +280,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Riot gear crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/security/riot_armor
name = "Armor - Riot"
@@ -294,7 +294,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Riot armor crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/security/riot_plates
name = "Armor - Riot plates"
@@ -306,7 +306,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Riot armor crate"
- access = access_armory
+ access = ACCESS_ARMORY
/*
/datum/supply_pack/security/riot_sprayer
name = "Gear - Riot sprayer"
@@ -316,7 +316,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Riot sprayer crate"
- access = access_armory*/
+ access = ACCESS_ARMORY*/
/datum/supply_pack/security/ablative_armor
name = "Armor - Ablative"
@@ -330,7 +330,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Ablative armor crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/security/ablative_plates
name = "Armor - Ablative plates"
@@ -342,7 +342,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Ablative armor crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/security/bullet_resistant_armor
name = "Armor - Ballistic"
@@ -356,7 +356,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/heph
containername = "Ballistic armor crate"
- access = access_armory
+ access = ACCESS_ARMORY
/* VOREStation Removal - Howabout no ERT armor being orderable?
/datum/supply_pack/security/bullet_resistant_plates
@@ -368,7 +368,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/heph
containername = "Ballistic armor crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/security/combat_armor
name = "Armor - Combat"
@@ -381,14 +381,14 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/saare
containername = "Combat armor crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/security/tactical
name = "Armor - Tactical"
containertype = /obj/structure/closet/crate/secure/saare
containername = "Tactical armor crate"
cost = 40
- access = access_armory
+ access = ACCESS_ARMORY
contains = list(
/obj/item/clothing/under/tactical,
/obj/item/clothing/suit/armor/tactical,
@@ -415,7 +415,7 @@
containertype = /obj/structure/closet/crate/secure/saare
containername = "Tactical Light armor crate"
cost = 75
- access = access_armory
+ access = ACCESS_ARMORY
contains = list(
/obj/item/clothing/suit/storage/vest/heavy/flexitac,
/obj/item/clothing/head/helmet/flexitac,
@@ -448,7 +448,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/heph
containername = "Wall shield generators crate"
- access = access_teleporter
+ access = ACCESS_TELEPORTER
/datum/supply_pack/randomised/security/holster
name = "Gear - Holsters"
@@ -506,7 +506,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Forensic equipment"
- access = access_forensics_lockers
+ access = ACCESS_FORENSICS_LOCKERS
/datum/supply_pack/security/detectivescan
name = "Forensic - Scanning Equipment"
@@ -520,7 +520,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/ward
containername = "Forensic equipment"
- access = access_forensics_lockers
+ access = ACCESS_FORENSICS_LOCKERS
/datum/supply_pack/security/detectiveclothes
name = "Forensic - Investigation apparel"
@@ -543,7 +543,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Investigation clothing"
- access = access_forensics_lockers
+ access = ACCESS_FORENSICS_LOCKERS
/datum/supply_pack/security/officergear
name = "Gear - Officer equipment"
@@ -574,7 +574,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Officer equipment"
- access = access_brig
+ access = ACCESS_BRIG
/datum/supply_pack/security/wardengear
name = "Gear - " + JOB_WARDEN + " equipment"
@@ -604,7 +604,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = JOB_WARDEN + " equipment"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/security/headofsecgear
name = "Gear - " + JOB_HEAD_OF_SECURITY + " equipment"
@@ -633,7 +633,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = JOB_HEAD_OF_SECURITY + " equipment"
- access = access_hos
+ access = ACCESS_HOS
/datum/supply_pack/security/securityclothing
name = "Misc - Security uniform red"
@@ -713,7 +713,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Security biohazard gear"
- access = access_security
+ access = ACCESS_SECURITY
/datum/supply_pack/security/posters
name = "Gear - Morale Posters"
@@ -724,7 +724,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Morale Posters"
- access = access_maint_tunnels
+ access = ACCESS_MAINT_TUNNELS
//CHOMPEdit Start, enable this
/datum/supply_pack/security/guardbeast
@@ -733,8 +733,8 @@
containertype = /obj/structure/largecrate/animal/guardbeast
containername = "VARMAcorp autoNOMous security solution crate"
access = list(
- access_security,
- access_xenobiology)
+ ACCESS_SECURITY,
+ ACCESS_XENOBIOLOGY)
one_access = TRUE
/datum/supply_pack/security/guardmutant
@@ -743,8 +743,8 @@
containertype = /obj/structure/largecrate/animal/guardmutant
containername = "VARMAcorp autoNOMous security phoron-proof solution crate"
access = list(
- access_security,
- access_xenobiology)
+ ACCESS_SECURITY,
+ ACCESS_XENOBIOLOGY)
one_access = TRUE
//CHOMPEdit End
@@ -757,7 +757,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "Tracking implants"
- access = access_security
+ access = ACCESS_SECURITY
/datum/supply_pack/security/chemicalimplant
name = "Implants - Chemical"
@@ -768,4 +768,4 @@
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "Chemical implants"
- access = access_security
+ access = ACCESS_SECURITY
diff --git a/code/datums/supplypacks/security_yw.dm b/code/datums/supplypacks/security_yw.dm
index 5ce7f6f8ac..a39f4a219c 100644
--- a/code/datums/supplypacks/security_yw.dm
+++ b/code/datums/supplypacks/security_yw.dm
@@ -6,4 +6,4 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/gear
containername = "Loyalty Implants Lockbox crate"
- access = access_heads
+ access = ACCESS_HEADS
diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm
index 4a45ed0198..a65ea33b7f 100644
--- a/code/datums/supplypacks/supply.dm
+++ b/code/datums/supplypacks/supply.dm
@@ -144,7 +144,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/xion
containername = "Shaft miner equipment"
- access = access_mining
+ access = ACCESS_MINING
/* //No longer supported on our current maps, as it requires specialized dropoff beacons and the pathfinding doesn't work well on multi-z
//plus we have the destination tagger
@@ -208,7 +208,7 @@
cost=25
containertype = /obj/structure/closet/crate/secure/xion
containername = JOB_EXPLORER + " equipment"
- access = access_explorer //CHOMP explo keep
+ access = ACCESS_EXPLORER //CHOMP explo keep
/datum/supply_pack/pilotgear
name= JOB_PILOT + " gear"
@@ -235,7 +235,7 @@
cost=20
containertype = /obj/structure/closet/crate/secure/xion
containername = JOB_PILOT + " equipment"
- access = access_pilot
+ access = ACCESS_PILOT
/datum/supply_pack/supply/foodcubes
name = "Emergency food cubes"
@@ -274,7 +274,7 @@
cost = 75
containertype = /obj/structure/closet/crate/secure/xion
containername = JOB_PATHFINDER + " equipment"
- access = list(access_explorer)
+ access = list(ACCESS_EXPLORER)
/datum/supply_pack/supply/postal_service
name = "Postal Service Supplies"
diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm
index f323c37eee..8039ddb75f 100644
--- a/code/datums/supplypacks/voidsuits.dm
+++ b/code/datums/supplypacks/voidsuits.dm
@@ -20,7 +20,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/aether
containername = "Atmospheric voidsuit crate"
- access = access_atmospherics
+ access = ACCESS_ATMOSPHERICS
/datum/supply_pack/voidsuits/atmos/alt
name = "Heavy Duty Atmospheric voidsuits"
@@ -35,7 +35,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/aether
containername = "Heavy Duty Atmospheric voidsuit crate"
- access = access_atmospherics
+ access = ACCESS_ATMOSPHERICS
/datum/supply_pack/voidsuits/engineering
name = "Engineering voidsuits"
@@ -50,7 +50,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Engineering voidsuit crate"
- access = access_engine_equip
+ access = ACCESS_ENGINE_EQUIP
/datum/supply_pack/voidsuits/engineering/construction
name = "Engineering Construction voidsuits"
@@ -65,7 +65,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Engineering Construction voidsuit crate"
- access = access_engine_equip
+ access = ACCESS_ENGINE_EQUIP
/datum/supply_pack/voidsuits/engineering/hazmat
name = "Engineering Hazmat voidsuits"
@@ -80,7 +80,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Engineering Hazmat voidsuit crate"
- access = access_engine_equip
+ access = ACCESS_ENGINE_EQUIP
/datum/supply_pack/voidsuits/engineering/alt
name = "Reinforced Engineering voidsuits"
@@ -95,7 +95,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/xion
containername = "Reinforced Engineering voidsuit crate"
- access = access_engine_equip
+ access = ACCESS_ENGINE_EQUIP
/datum/supply_pack/voidsuits/medical
name = "Medical voidsuits"
@@ -110,7 +110,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Medical voidsuit crate"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/voidsuits/medical/emt
name = "Medical EMT voidsuits"
@@ -125,7 +125,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Medical EMT voidsuit crate"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/voidsuits/medical/bio
name = "Medical Biohazard voidsuits"
@@ -140,7 +140,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical Biohazard voidsuit crate"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/voidsuits/medical/alt
name = "Vey-Med Autoadaptive Lightweight voidsuits"
@@ -155,7 +155,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Vey-Med Autoadaptive Lightweight voidsuit crate"
- access = access_medical_equip
+ access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/voidsuits/medical/alt/static
name = "Vey-Med Nonadaptive Lightweight voidsuits"
@@ -183,7 +183,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/heph
containername = "Security voidsuit crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/voidsuits/security/crowd
name = "Security Crowd Control voidsuits"
@@ -198,7 +198,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/heph
containername = "Security Crowd Control voidsuit crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/voidsuits/security/alt
name = "Security EVA voidsuits"
@@ -213,7 +213,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/heph
containername = "Security EVA voidsuit crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/voidsuits/supply
name = "Mining voidsuits"
@@ -227,7 +227,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Mining voidsuit crate"
- access = access_mining
+ access = ACCESS_MINING
/datum/supply_pack/voidsuits/supply/alt
name = "Frontier Mining voidsuits"
@@ -241,7 +241,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/grayson
containername = "Frontier Mining voidsuit crate"
- access = access_mining
+ access = ACCESS_MINING
/datum/supply_pack/voidsuits/zaddat
name = "Zaddat Shroud"
@@ -262,7 +262,7 @@
cost = 200 //Crap breacher suit, shouldn't be as expensive.
containertype = /obj/structure/closet/crate/secure
containername = "NT Unathi breacher chassis crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/voidsuits/unathi_bs_Auth
name = "Authentic Unathi breacher chassis"
@@ -270,7 +270,7 @@
cost = 400 //Better, costs more.
containertype = /obj/structure/closet/crate/secure
containername = "Authentic Unathi breacher chassis crate"
- access = access_armory
+ access = ACCESS_ARMORY
/datum/supply_pack/voidsuits/voxeng
name = "Vox Engineering Hardsuit"
@@ -285,7 +285,7 @@
cost = 90
containertype = /obj/structure/closet/crate/secure/heph
containername = "Vox security Rigsuit Crate"
- access = access_security
+ access = ACCESS_SECURITY
//ChompEdit End
/datum/supply_pack/voidsuits/explorer
@@ -301,7 +301,7 @@
cost = 45
containertype = /obj/structure/closet/crate/secure
containername = JOB_EXPLORER + "voidsuit crate"
- access = access_explorer //CHOMP explo keep
+ access = ACCESS_EXPLORER //CHOMP explo keep
/datum/supply_pack/voidsuits/explorer_medic
name = JOB_FIELD_MEDIC + " voidsuits"
@@ -316,7 +316,7 @@
cost = 45
containertype = /obj/structure/closet/crate/secure
containername = JOB_FIELD_MEDIC + " voidsuit crate"
- access = access_medical
+ access = ACCESS_MEDICAL
/datum/supply_pack/voidsuits/pilot
name = JOB_PILOT + " voidsuits"
@@ -331,7 +331,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = JOB_PILOT + " voidsuit crate"
- access = access_pilot
+ access = ACCESS_PILOT
// Surplus!
// CHOMPStation EDIT Start: Change Commonwealth to Solgov.
@@ -345,7 +345,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov mining voidsuit crate" //CHOMP explo keep
- access = access_mining
+ access = ACCESS_MINING
/datum/supply_pack/voidsuits/solgov_anomaly //CHOMP explo keep
name = "Solgov anomaly suit" //CHOMP explo keep
@@ -357,7 +357,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov anomaly suit crate" //CHOMP explo keep
- access = access_xenoarch
+ access = ACCESS_XENOARCH
/datum/supply_pack/voidsuits/solgov_riot //CHOMP explo keep
name = "Solgov riot voidsuit" //CHOMP explo keep
@@ -369,7 +369,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov riot voidsuit crate"
- access = access_brig
+ access = ACCESS_BRIG // CHOMPEdit
/datum/supply_pack/voidsuits/solgov_pilot //CHOMP explo keep
name = "Solgov pilot voidsuit" //CHOMP explo keep
@@ -381,7 +381,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov pilot voidsuit crate" //CHOMP explo keep
- access = access_pilot
+ access = ACCESS_PILOT
/datum/supply_pack/voidsuits/solgov_medical //CHOMP explo keep
name = "Solgov medical voidsuit" //CHOMP explo keep
@@ -393,6 +393,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov medical voidsuit crate"
+ access = ACCESS_MEDICAL
/datum/supply_pack/voidsuits/solgov_explore //CHOMP explo keep
name = "Solgov exploration voidsuit" //CHOMP explo keep
@@ -404,7 +405,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov exploration voidsuit crate" //CHOMP explo keep
- access = access_explorer //CHOMP explo keep
+ access = ACCESS_EXPLORER //CHOMP explo keep
/datum/supply_pack/voidsuits/solgov_engineer //CHOMP explo keep
name = "Solgov engineering voidsuit" //CHOMP explo keep
@@ -416,7 +417,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov engineering voidsuit crate" //CHOMP explo keep
- access = access_engine
+ access = ACCESS_ENGINE
/datum/supply_pack/voidsuits/solgov_atmos //CHOMP explo keep
name = "Solgov atmos voidsuit" //CHOMP explo keep
@@ -428,7 +429,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov atmos voidsuit crate" //CHOMP explo keep
- access = access_atmospherics
+ access = ACCESS_ATMOSPHERICS
/datum/supply_pack/voidsuits/solgov_captain //CHOMP explo keep
name = "Solgov captain voidsuit" //CHOMP explo keep
@@ -440,7 +441,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov captain voidsuit crate" //CHOMP explo keep
- access = access_captain
+ access = ACCESS_CAPTAIN
// CHOMPStation EDIT End
/datum/supply_pack/voidsuits/csc_breaker
diff --git a/code/defines/procs/radio.dm b/code/defines/procs/radio.dm
index a73de9d384..ccb8f9c466 100644
--- a/code/defines/procs/radio.dm
+++ b/code/defines/procs/radio.dm
@@ -20,8 +20,8 @@
if(display_freq in ANTAG_FREQS)
freq_text = "#unkn"
else
- for(var/channel in radiochannels)
- if(radiochannels[channel] == display_freq)
+ for(var/channel in GLOB.radiochannels)
+ if(GLOB.radiochannels[channel] == display_freq)
freq_text = channel
break
diff --git a/code/game/antagonist/antagonist_helpers.dm b/code/game/antagonist/antagonist_helpers.dm
index fc08d68e56..318554ba16 100644
--- a/code/game/antagonist/antagonist_helpers.dm
+++ b/code/game/antagonist/antagonist_helpers.dm
@@ -16,7 +16,7 @@
if(J.mob_type & JOB_SILICON)
return FALSE
else // If SSjob couldn't find a job, they don't have one yet, so the next best thing we can switch on are job preferences
- if((player.current.client.prefs.job_engsec_high | player.current.client.prefs.job_engsec_med | player.current.client.prefs.job_engsec_low) & (AI | CYBORG)) // If they have ANY chance of being silicon
+ if((player.current.client.prefs.job_engsec_high | player.current.client.prefs.job_engsec_med | player.current.client.prefs.job_engsec_low) & (AI_DEPT | CYBORG)) // If they have ANY chance of being silicon
return FALSE
return TRUE
diff --git a/code/game/antagonist/mutiny/mutineer.dm b/code/game/antagonist/mutiny/mutineer.dm
index c3467567be..40fac598ed 100644
--- a/code/game/antagonist/mutiny/mutineer.dm
+++ b/code/game/antagonist/mutiny/mutineer.dm
@@ -47,7 +47,7 @@ var/datum/antagonist/mutineer/mutineers
var/list/candidates[0]
for(var/mob/mutineer in GLOB.player_list)
if(mutineer.client.prefs.be_special & BE_MUTINEER)
- for(var/job in command_positions - JOB_SITE_MANAGER)
+ for(var/job in GLOB.command_positions - JOB_SITE_MANAGER)
if(mutineer.mind && mutineer.mind.assigned_role == job)
candidates.Add(mutineer.mind)
return candidates
diff --git a/code/game/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm
index cc748bf016..2c5a2aaec4 100644
--- a/code/game/antagonist/outsider/deathsquad.dm
+++ b/code/game/antagonist/outsider/deathsquad.dm
@@ -9,7 +9,7 @@ var/datum/antagonist/deathsquad/deathsquad
antag_sound = 'sound/effects/antag_notice/deathsquid_alert.ogg'
landmark_id = "Commando"
flags = ANTAG_OVERRIDE_JOB | ANTAG_OVERRIDE_MOB | ANTAG_HAS_NUKE | ANTAG_HAS_LEADER
- default_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
+ default_access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
antaghud_indicator = "huddeathsquad"
hard_cap = 4
diff --git a/code/game/antagonist/outsider/trader.dm b/code/game/antagonist/outsider/trader.dm
index 7f30a3018e..21edb086cb 100644
--- a/code/game/antagonist/outsider/trader.dm
+++ b/code/game/antagonist/outsider/trader.dm
@@ -52,7 +52,7 @@ var/datum/antagonist/trader/traders
var/obj/item/card/id/id = create_id("Trader", player, equip = 0)
id.name = "[player.real_name]'s Passport"
id.assignment = "Trader"
- id.access |= access_trader
+ id.access |= ACCESS_TRADER
var/obj/item/storage/wallet/W = new(player)
W.handle_item_insertion(id)
player.equip_to_slot_or_del(W, slot_wear_id)
diff --git a/code/game/area/Away Mission areas.dm b/code/game/area/Away Mission areas.dm
index 70f83543e2..3d57984241 100644
--- a/code/game/area/Away Mission areas.dm
+++ b/code/game/area/Away Mission areas.dm
@@ -66,24 +66,24 @@
if(!isanimal(M))
log_admin("[src] spawned [M.type], which is not a simplemob, FIXIT")
return
- var/datum/ai_holder/AI = M.ai_holder
+ var/datum/ai_holder/our_ai_holder = M.ai_holder
if(ghostjoin)
M.ghostjoin = TRUE
M.ghostjoin_icon()
- if(!AI)
+ if(!our_ai_holder)
return
switch(mob_intent)
if("default")
return
if("hostile")
- AI.hostile = TRUE
- AI.retaliate = TRUE
+ our_ai_holder.hostile = TRUE
+ our_ai_holder.retaliate = TRUE
if("retaliate")
- AI.hostile = FALSE
- AI.retaliate = TRUE
+ our_ai_holder.hostile = FALSE
+ our_ai_holder.retaliate = TRUE
if("passive")
- AI.hostile = FALSE
- AI.retaliate = FALSE
+ our_ai_holder.hostile = FALSE
+ our_ai_holder.retaliate = FALSE
/area/proc/spawn_flora_on_turf()
if(!valid_flora.len)
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 796e8f8e06..f185b412cb 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -69,15 +69,15 @@ GLOBAL_LIST_INIT(rnwords, list("ire","ego","nahlizet","certum","veri","jatkaa","
. = ..()
blood_image = image(loc = src)
blood_image.override = 1
- for(var/mob/living/silicon/ai/AI in GLOB.player_list)
- if(AI.client)
- AI.client.images += blood_image
+ for(var/mob/living/silicon/ai/our_ai in GLOB.player_list)
+ if(our_ai.client)
+ our_ai.client.images += blood_image
GLOB.rune_list.Add(src)
/obj/effect/rune/Destroy()
- for(var/mob/living/silicon/ai/AI in GLOB.player_list)
- if(AI.client)
- AI.client.images -= blood_image
+ for(var/mob/living/silicon/ai/our_ai in GLOB.player_list)
+ if(our_ai.client)
+ our_ai.client.images -= blood_image
qdel(blood_image)
blood_image = null
GLOB.rune_list.Remove(src)
diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm
index 9919a51b7b..38a245710e 100644
--- a/code/game/gamemodes/epidemic/epidemic.dm
+++ b/code/game/gamemodes/epidemic/epidemic.dm
@@ -74,7 +74,7 @@
var/list/crew = list()
for(var/mob/living/carbon/human/H in world) if(H.client)
// heads should not be infected
- if(H.mind.assigned_role in command_positions) continue
+ if(H.mind.assigned_role in GLOB.command_positions) continue
crew += H
if(crew.len < 2)
diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm
index e9a3429e45..3ad05215d7 100644
--- a/code/game/gamemodes/newobjective.dm
+++ b/code/game/gamemodes/newobjective.dm
@@ -593,7 +593,7 @@ datum
weight = 20
get_points(var/job)
- if(job in science_positions || job in command_positions)
+ if(job in science_positions || job in GLOB.command_positions)
return 20
return 40
diff --git a/code/game/gamemodes/technomancer/spells/control.dm b/code/game/gamemodes/technomancer/spells/control.dm
index ff27f1e6de..7c221af776 100644
--- a/code/game/gamemodes/technomancer/spells/control.dm
+++ b/code/game/gamemodes/technomancer/spells/control.dm
@@ -31,11 +31,11 @@
if(!L.has_AI())
return FALSE
- var/datum/ai_holder/AI = L.ai_holder
- AI.hostile = FALSE // The Technomancer chooses the target, not the AI.
- AI.retaliate = TRUE
- AI.wander = FALSE
- AI.forget_everything()
+ var/datum/ai_holder/our_ai_holder = L.ai_holder
+ our_ai_holder.hostile = FALSE // The Technomancer chooses the target, not the our_ai_holder.
+ our_ai_holder.retaliate = TRUE
+ our_ai_holder.wander = FALSE
+ our_ai_holder.forget_everything()
if(isanimal(L))
var/mob/living/simple_mob/SM = L
@@ -49,11 +49,11 @@
return FALSE
if(L.has_AI())
- var/datum/ai_holder/AI = L.ai_holder
- AI.hostile = initial(AI.hostile)
- AI.retaliate = initial(AI.retaliate)
- AI.wander = initial(AI.wander)
- AI.forget_everything()
+ var/datum/ai_holder/our_ai_holder = L.ai_holder
+ our_ai_holder.hostile = initial(our_ai_holder.hostile)
+ our_ai_holder.retaliate = initial(our_ai_holder.retaliate)
+ our_ai_holder.wander = initial(our_ai_holder.wander)
+ our_ai_holder.forget_everything()
if(isanimal(L))
var/mob/living/simple_mob/SM = L
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 4d7481784f..933252b436 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -47,21 +47,21 @@
/proc/get_centcom_access(job)
switch(job)
if("VIP Guest")
- return list(access_cent_general)
+ return list(ACCESS_CENT_GENERAL)
if("Custodian")
- return list(access_cent_general, access_cent_living, access_cent_storage)
+ return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
if("Thunderdome Overseer")
- return list(access_cent_general, access_cent_thunder)
+ return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER)
if("Intel Officer")
- return list(access_cent_general, access_cent_living)
+ return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING)
if("Medical Officer")
- return list(access_cent_general, access_cent_living, access_cent_medical)
+ return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL)
if("Death Commando")
- return list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
+ return list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
if("Research Officer")
- return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage)
+ return list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_TELEPORTER, ACCESS_CENT_STORAGE)
if("BlackOps Commander")
- return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed)
+ return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_CREED)
if("Supreme Commander")
return get_all_centcom_access()
diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm
index 895c569fab..9656e6b0b1 100644
--- a/code/game/jobs/access_datum.dm
+++ b/code/game/jobs/access_datum.dm
@@ -10,527 +10,437 @@
/*****************
* Station access *
*****************/
-/var/const/access_security = 1
/datum/access/security
- id = access_security
+ id = ACCESS_SECURITY
desc = "Security Equipment"
region = ACCESS_REGION_SECURITY
-/var/const/access_brig = 2 // Brig timers and permabrig
/datum/access/holding
- id = access_brig
+ id = ACCESS_BRIG
desc = "Holding Cells"
region = ACCESS_REGION_SECURITY
-/var/const/access_armory = 3
/datum/access/armory
- id = access_armory
+ id = ACCESS_ARMORY
desc = "Armory"
region = ACCESS_REGION_SECURITY
-/var/const/access_forensics_lockers = 4
/datum/access/forensics_lockers
- id = access_forensics_lockers
+ id = ACCESS_FORENSICS_LOCKERS
desc = "Forensics"
region = ACCESS_REGION_SECURITY
-/var/const/access_medical = 5
/datum/access/medical
- id = access_medical
+ id = ACCESS_MEDICAL
desc = "Medical"
region = ACCESS_REGION_MEDBAY
-/var/const/access_morgue = 6
/datum/access/morgue
- id = access_morgue
+ id = ACCESS_MORGUE
desc = "Morgue"
region = ACCESS_REGION_MEDBAY
-/var/const/access_tox = 7
/datum/access/tox
- id = access_tox
+ id = ACCESS_TOX
desc = "R&D Lab"
region = ACCESS_REGION_RESEARCH
-/var/const/access_tox_storage = 8
/datum/access/tox_storage
- id = access_tox_storage
+ id = ACCESS_TOX_STORAGE
desc = "Toxins Lab"
region = ACCESS_REGION_RESEARCH
-/var/const/access_genetics = 9
/datum/access/genetics
- id = access_genetics
+ id = ACCESS_GENETICS
desc = "Genetics Lab"
region = ACCESS_REGION_MEDBAY
-/var/const/access_engine = 10
/datum/access/engine
- id = access_engine
+ id = ACCESS_ENGINE
desc = "Engineering"
region = ACCESS_REGION_ENGINEERING
-/var/const/access_engine_equip = 11
/datum/access/engine_equip
- id = access_engine_equip
+ id = ACCESS_ENGINE_EQUIP
desc = "Engine Room"
region = ACCESS_REGION_ENGINEERING
-/var/const/access_maint_tunnels = 12
/datum/access/maint_tunnels
- id = access_maint_tunnels
+ id = ACCESS_MAINT_TUNNELS
desc = "Maintenance"
region = ACCESS_REGION_ENGINEERING
-/var/const/access_external_airlocks = 13
/datum/access/external_airlocks
- id = access_external_airlocks
+ id = ACCESS_EXTERNAL_AIRLOCKS
desc = "External Airlocks"
region = ACCESS_REGION_ENGINEERING
-/var/const/access_emergency_storage = 14
/datum/access/emergency_storage
- id = access_emergency_storage
+ id = ACCESS_EMERGENCY_STORAGE
desc = "Emergency Storage"
region = ACCESS_REGION_ENGINEERING
-/var/const/access_change_ids = 15
/datum/access/change_ids
- id = access_change_ids
+ id = ACCESS_CHANGE_IDS
desc = "ID Computer"
region = ACCESS_REGION_COMMAND
-/var/const/access_ai_upload = 16
/datum/access/ai_upload
- id = access_ai_upload
+ id = ACCESS_AI_UPLOAD
desc = "AI Upload"
region = ACCESS_REGION_COMMAND
-/var/const/access_teleporter = 17
/datum/access/teleporter
- id = access_teleporter
+ id = ACCESS_TELEPORTER
desc = "Teleporter"
region = ACCESS_REGION_COMMAND
-/var/const/access_eva = 18
/datum/access/eva
- id = access_eva
+ id = ACCESS_EVA
desc = "EVA"
region = ACCESS_REGION_COMMAND
-/var/const/access_heads = 19
/datum/access/heads
- id = access_heads
+ id = ACCESS_HEADS
desc = "Bridge"
region = ACCESS_REGION_COMMAND
-/var/const/access_captain = 20
/datum/access/captain
- id = access_captain
+ id = ACCESS_CAPTAIN
desc = JOB_SITE_MANAGER
region = ACCESS_REGION_COMMAND
-/var/const/access_all_personal_lockers = 21
/datum/access/all_personal_lockers
- id = access_all_personal_lockers
+ id = ACCESS_ALL_PERSONAL_LOCKERS
desc = "Personal Lockers"
region = ACCESS_REGION_COMMAND
-/var/const/access_chapel_office = 22
/datum/access/chapel_office
- id = access_chapel_office
+ id = ACCESS_CHAPEL_OFFICE
desc = "Chapel Office"
region = ACCESS_REGION_GENERAL
-/var/const/access_tech_storage = 23
/datum/access/tech_storage
- id = access_tech_storage
+ id = ACCESS_TECH_STORAGE
desc = "Technical Storage"
region = ACCESS_REGION_ENGINEERING
-/var/const/access_atmospherics = 24
/datum/access/atmospherics
- id = access_atmospherics
+ id = ACCESS_ATMOSPHERICS
desc = "Atmospherics"
region = ACCESS_REGION_ENGINEERING
-/var/const/access_bar = 25
/datum/access/bar
- id = access_bar
+ id = ACCESS_BAR
desc = "Bar"
region = ACCESS_REGION_GENERAL
-/var/const/access_janitor = 26
/datum/access/janitor
- id = access_janitor
+ id = ACCESS_JANITOR
desc = "Custodial Closet"
region = ACCESS_REGION_GENERAL
-/var/const/access_crematorium = 27
/datum/access/crematorium
- id = access_crematorium
+ id = ACCESS_CREMATORIUM
desc = "Crematorium"
region = ACCESS_REGION_GENERAL
-/var/const/access_kitchen = 28
/datum/access/kitchen
- id = access_kitchen
+ id = ACCESS_KITCHEN
desc = "Kitchen"
region = ACCESS_REGION_GENERAL
-/var/const/access_robotics = 29
/datum/access/robotics
- id = access_robotics
+ id = ACCESS_ROBOTICS
desc = "Robotics"
region = ACCESS_REGION_RESEARCH
-/var/const/access_rd = 30
/datum/access/rd
- id = access_rd
+ id = ACCESS_RD
desc = JOB_RESEARCH_DIRECTOR
region = ACCESS_REGION_RESEARCH
-/var/const/access_cargo = 31
/datum/access/cargo
- id = access_cargo
+ id = ACCESS_CARGO
desc = "Cargo Bay"
region = ACCESS_REGION_SUPPLY
-/var/const/access_construction = 32
/datum/access/construction
- id = access_construction
+ id = ACCESS_CONSTRUCTION
desc = "Construction Areas"
region = ACCESS_REGION_ENGINEERING
-/var/const/access_chemistry = 33
/datum/access/chemistry
- id = access_chemistry
+ id = ACCESS_CHEMISTRY
desc = "Chemistry Lab"
region = ACCESS_REGION_MEDBAY
-/var/const/access_cargo_bot = 34
/datum/access/cargo_bot
- id = access_cargo_bot
+ id = ACCESS_CARGO_BOT
desc = "Cargo Bot Delivery"
region = ACCESS_REGION_SUPPLY
-/var/const/access_hydroponics = 35
/datum/access/hydroponics
- id = access_hydroponics
+ id = ACCESS_HYDROPONICS
desc = "Hydroponics"
region = ACCESS_REGION_GENERAL
-/var/const/access_manufacturing = 36
/datum/access/manufacturing
- id = access_manufacturing
+ id = ACCESS_MANUFACTURING
desc = "Manufacturing"
access_type = ACCESS_TYPE_NONE
-/var/const/access_library = 37
/datum/access/library
- id = access_library
+ id = ACCESS_LIBRARY
desc = "Library"
region = ACCESS_REGION_GENERAL
-/var/const/access_lawyer = 38
/datum/access/lawyer
- id = access_lawyer
+ id = ACCESS_LAWYER
desc = "Internal Affairs"
region = ACCESS_REGION_COMMAND
-/var/const/access_virology = 39
/datum/access/virology
- id = access_virology
+ id = ACCESS_VIROLOGY
desc = "Virology"
region = ACCESS_REGION_MEDBAY
-/var/const/access_cmo = 40
/datum/access/cmo
- id = access_cmo
+ id = ACCESS_CMO
desc = JOB_CHIEF_MEDICAL_OFFICER
region = ACCESS_REGION_COMMAND
-/var/const/access_qm = 41
/datum/access/qm
- id = access_qm
+ id = ACCESS_QM
desc = JOB_QUARTERMASTER
region = ACCESS_REGION_SUPPLY
-/var/const/access_network = 42
/datum/access/network
- id = access_network
+ id = ACCESS_NETWORK
desc = "Station Network"
region = ACCESS_REGION_RESEARCH
-var/const/access_explorer = 43
/datum/access/explorer
- id = access_explorer
+ id = ACCESS_EXPLORER
desc = JOB_EXPLORER
region = ACCESS_REGION_GENERAL
//CHOMP explo keep removed a wide comment field on this line
-/var/const/access_pathfinder = 44
/datum/access/pathfinder
- id = access_pathfinder
+ id = ACCESS_PATHFINDER
desc = JOB_PATHFINDER
region = ACCESS_REGION_GENERAL
//CHOMP explo keep removed the closing wide comment field on this line. KEEP THE PATHFINDER
-/var/const/access_surgery = 45
/datum/access/surgery
- id = access_surgery
+ id = ACCESS_SURGERY
desc = "Surgery"
region = ACCESS_REGION_MEDBAY
-// /var/const/free_access_id = 46
-
-/var/const/access_research = 47
/datum/access/research
- id = access_research
+ id = ACCESS_RESEARCH
desc = "Science"
region = ACCESS_REGION_RESEARCH
-/var/const/access_mining = 48
/datum/access/mining
- id = access_mining
+ id = ACCESS_MINING
desc = "Mining"
region = ACCESS_REGION_SUPPLY
-/var/const/access_mining_office = 49
/datum/access/mining_office
- id = access_mining_office
+ id = ACCESS_MINING_OFFICE
desc = "Mining Office"
access_type = ACCESS_TYPE_NONE
-/var/const/access_mailsorting = 50
/datum/access/mailsorting
- id = access_mailsorting
+ id = ACCESS_MAILSORTING
desc = "Cargo Office"
region = ACCESS_REGION_SUPPLY
-// /var/const/free_access_id = 51
-// /var/const/free_access_id = 52
-
-/var/const/access_heads_vault = 53
/datum/access/heads_vault
- id = access_heads_vault
+ id = ACCESS_HEADS_VAULT
desc = "Main Vault"
region = ACCESS_REGION_COMMAND
-/var/const/access_mining_station = 54
/datum/access/mining_station
- id = access_mining_station
+ id = ACCESS_MINING_STATION
desc = "Mining EVA"
region = ACCESS_REGION_SUPPLY
-/var/const/access_xenobiology = 55
/datum/access/xenobiology
- id = access_xenobiology
+ id = ACCESS_XENOBIOLOGY
desc = "Xenobiology Lab"
region = ACCESS_REGION_RESEARCH
-/var/const/access_ce = 56
/datum/access/ce
- id = access_ce
+ id = ACCESS_CE
desc = JOB_CHIEF_ENGINEER
region = ACCESS_REGION_ENGINEERING
-/var/const/access_hop = 57
/datum/access/hop
- id = access_hop
+ id = ACCESS_HOP
desc = JOB_HEAD_OF_PERSONNEL
region = ACCESS_REGION_COMMAND
-/var/const/access_hos = 58
/datum/access/hos
- id = access_hos
+ id = ACCESS_HOS
desc = JOB_HEAD_OF_SECURITY
region = ACCESS_REGION_SECURITY
-/var/const/access_RC_announce = 59 //Request console announcements
/datum/access/RC_announce
- id = access_RC_announce
+ id = ACCESS_RC_ANNOUNCE
desc = "RC Announcements"
region = ACCESS_REGION_COMMAND
-/var/const/access_keycard_auth = 60 //Used for events which require at least two people to confirm them
/datum/access/keycard_auth
- id = access_keycard_auth
+ id = ACCESS_KEYCARD_AUTH
desc = "Keycode Auth. Device"
region = ACCESS_REGION_COMMAND
-/var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery
/datum/access/tcomsat
- id = access_tcomsat
+ id = ACCESS_TCOMSAT
desc = "Telecommunications"
region = ACCESS_REGION_COMMAND
-/var/const/access_gateway = 62
/datum/access/gateway
- id = access_gateway
+ id = ACCESS_GATEWAY
desc = "Gateway"
region = ACCESS_REGION_COMMAND
-/var/const/access_sec_doors = 63 // Security front doors
/datum/access/sec_doors
- id = access_sec_doors
+ id = ACCESS_SEC_DOORS
desc = "Security"
region = ACCESS_REGION_SECURITY
-/var/const/access_psychiatrist = 64 // Psychiatrist's office
/datum/access/psychiatrist
- id = access_psychiatrist
+ id = ACCESS_PSYCHIATRIST
desc = JOB_PSYCHIATRIST + "'s Office"
region = ACCESS_REGION_MEDBAY
-/var/const/access_xenoarch = 65
/datum/access/xenoarch
- id = access_xenoarch
+ id = ACCESS_XENOARCH
desc = "Xenoarchaeology"
region = ACCESS_REGION_RESEARCH
-/var/const/access_medical_equip = 66
/datum/access/medical_equip
- id = access_medical_equip
+ id = ACCESS_MEDICAL_EQUIP
desc = "Medical Equipment"
region = ACCESS_REGION_MEDBAY
-var/const/access_pilot = 67
/datum/access/pilot
- id = access_pilot
+ id = ACCESS_PILOT
desc = JOB_PILOT
region = ACCESS_REGION_GENERAL
-/var/const/access_entertainment = 72
/datum/access/entertainment
- id = access_entertainment
+ id = ACCESS_ENTERTAINMENT
desc = "Entertainment Backstage"
region = ACCESS_REGION_GENERAL
-/var/const/access_xenobotany = 77
/datum/access/xenobotany
- id = access_xenobotany
+ id = ACCESS_XENOBOTANY
desc = "Xenobotany Garden"
region = ACCESS_REGION_RESEARCH
/******************
* Central Command *
******************/
-/var/const/access_cent_general = 101//General facilities.
/datum/access/cent_general
- id = access_cent_general
+ id = ACCESS_CENT_GENERAL
desc = "General Facilities"
access_type = ACCESS_TYPE_CENTCOM
-/var/const/access_cent_thunder = 102//Thunderdome.
/datum/access/cent_thunder
- id = access_cent_thunder
+ id = ACCESS_CENT_THUNDER
desc = "Entertainment Facilities"
access_type = ACCESS_TYPE_CENTCOM
-/var/const/access_cent_specops = 103//Special Ops.
/datum/access/cent_specops
- id = access_cent_specops
+ id = ACCESS_CENT_SPECOPS
desc = JOB_EMERGENCY_RESPONSE_TEAM + " Prep"
access_type = ACCESS_TYPE_CENTCOM
-/var/const/access_cent_medical = 104//Medical/Research
/datum/access/cent_medical
- id = access_cent_medical
+ id = ACCESS_CENT_MEDICAL
desc = "Medical Facilities"
access_type = ACCESS_TYPE_CENTCOM
-/var/const/access_cent_living = 105//Living quarters.
/datum/access/cent_living
- id = access_cent_living
+ id = ACCESS_CENT_LIVING
desc = "Dormitories"
access_type = ACCESS_TYPE_CENTCOM
-/var/const/access_cent_storage = 106//Generic storage areas.
/datum/access/cent_storage
- id = access_cent_storage
+ id = ACCESS_CENT_STORAGE
desc = "Storage"
access_type = ACCESS_TYPE_CENTCOM
-/var/const/access_cent_teleporter = 107//Teleporter.
/datum/access/cent_teleporter
- id = access_cent_teleporter
+ id = ACCESS_CENT_TELEPORTER
desc = "Central Command Teleporter"
access_type = ACCESS_TYPE_CENTCOM
-/var/const/access_cent_creed = 108//Creed's office.
/datum/access/cent_creed
- id = access_cent_creed
+ id = ACCESS_CENT_CREED
desc = JOB_EMERGENCY_RESPONSE_TEAM + " Administration"
access_type = ACCESS_TYPE_CENTCOM
-/var/const/access_cent_captain = 109//Captain's office/ID comp/AI.
/datum/access/cent_captain
- id = access_cent_captain
+ id = ACCESS_CENT_CAPTAIN
desc = "Central Command Administration"
access_type = ACCESS_TYPE_CENTCOM
-/var/const/access_clown = 136
/datum/access/clown
- id = access_clown
+ id = ACCESS_CLOWN
desc = JOB_CLOWN + " Office"
region = ACCESS_REGION_GENERAL
-/var/const/access_tomfoolery = 137
/datum/access/tomfoolery
- id = access_tomfoolery
+ id = ACCESS_TOMFOOLERY
desc = "Tomfoolery Closet"
region = ACCESS_REGION_GENERAL
-/var/const/access_mime = 138
/datum/access/mime
- id = access_mime
+ id = ACCESS_MIME
desc = JOB_MIME + " Office"
region = ACCESS_REGION_GENERAL
/***************
* Antag access *
***************/
-/var/const/access_syndicate = 150//General Syndicate Access
/datum/access/syndicate
- id = access_syndicate
+ id = ACCESS_SYNDICATE
desc = "Syndicate"
access_type = ACCESS_TYPE_SYNDICATE
/*******
* Misc *
*******/
-/var/const/access_synth = 199
/datum/access/synthetic
- id = access_synth
+ id = ACCESS_SYNTH
desc = "Synthetic"
access_type = ACCESS_TYPE_NONE
-/var/const/access_crate_cash = 200
/datum/access/crate_cash
- id = access_crate_cash
+ id = ACCESS_CRATE_CASH
desc = "Crate cash"
access_type = ACCESS_TYPE_NONE
-/var/const/access_trader = 160//General Beruang Trader Access
/datum/access/trader
- id = access_trader
+ id = ACCESS_TRADER
desc = "Trader"
access_type = ACCESS_TYPE_PRIVATE
-/var/const/access_alien = 300 // For things like crashed ships.
/datum/access/alien
- id = access_alien
+ id = ACCESS_ALIEN
desc = "#%_^&*@!"
access_type = ACCESS_TYPE_PRIVATE
-/var/const/access_talon = 301
/datum/access/talon
- id = access_talon
+ id = ACCESS_TALON
desc = "Talon"
access_type = ACCESS_TYPE_PRIVATE
-/var/const/access_lost = 511 // For outsider borgs
/datum/access/lost
- id = access_lost
+ id = ACCESS_LOST
desc = "Lost"
access_type = ACCESS_TYPE_NONE
diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index 8579dadb6f..43a9e60255 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -25,7 +25,7 @@
/datum/job/assistant/get_access()
if(CONFIG_GET(flag/assistant_maint))
- return list(access_maint_tunnels)
+ return list(ACCESS_MAINT_TUNNELS)
else
return list()
@@ -143,7 +143,7 @@
/datum/job/intern/get_access()
if(CONFIG_GET(flag/assistant_maint))
- return list(access_maint_tunnels)
+ return list(ACCESS_MAINT_TUNNELS)
else
return list()
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index 04a9d2484b..5c62951605 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -110,8 +110,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
JOB_ALT_FACILITY_STEWARD = /datum/alt_title/facility_steward, JOB_ALT_FIRST_MATE = /datum/alt_title/first_mate //CHOMPEdit
, JOB_ALT_PERFORMANCE_MANAGEMENT_SUPERVISOR = /datum/alt_title/performance_management_supervisor) //CHOMPEdit
- access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway, access_entertainment)
- minimal_access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway, access_entertainment)
+ access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_CLOWN, ACCESS_TOMFOOLERY, ACCESS_MIME, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_ENTERTAINMENT)
+ minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS,ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_CLOWN, ACCESS_TOMFOOLERY, ACCESS_MIME, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_ENTERTAINMENT)
/datum/job/hop/get_request_reasons()
@@ -162,8 +162,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
JOB_ALT_BRIDGE_OFFICER = /datum/alt_title/bridge_officer //ChompEDIT add bridge officer
)
- access = list(access_heads, access_keycard_auth, access_RC_announce) //YAWN EDIT
- minimal_access = list(access_heads, access_keycard_auth, access_RC_announce)//YAWN EDIT
+ access = list(ACCESS_HEADS, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE) //YAWN EDIT
+ minimal_access = list(ACCESS_HEADS, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE)//YAWN EDIT
outfit_type = /decl/hierarchy/outfit/job/secretary
job_description = "A " + JOB_COMMAND_SECRETARY + " handles paperwork duty for the Heads of Staff, so they can better focus on managing their departments. \
diff --git a/code/game/jobs/job/cargo.dm b/code/game/jobs/job/cargo.dm
index 92d441aa5e..b31f8e9245 100644
--- a/code/game/jobs/job/cargo.dm
+++ b/code/game/jobs/job/cargo.dm
@@ -16,8 +16,8 @@
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#9b633e"
economic_modifier = 5
- access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_RC_announce)
- minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_RC_announce)
+ access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_RC_ANNOUNCE)
+ minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_RC_ANNOUNCE)
banned_job_species = list(FBP_DIGITAL, SPECIES_PROMETHEAN)
ideal_character_age = 40
@@ -54,8 +54,8 @@
pto_type = PTO_CARGO
supervisors = "the " + JOB_QUARTERMASTER + " and the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#7a4f33"
- access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station)
- minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
+ access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
+ minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING)
outfit_type = /decl/hierarchy/outfit/job/cargo/cargo_tech
job_description = "A " + JOB_CARGO_TECHNICIAN + " fills and delivers cargo orders. They are encouraged to return delivered crates to the Cargo Shuttle, \
@@ -101,8 +101,8 @@
supervisors = "the " + JOB_QUARTERMASTER + " and the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#7a4f33"
economic_modifier = 5
- access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station)
- minimal_access = list(access_mining, access_mining_station, access_mailsorting)
+ access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
+ minimal_access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING)
outfit_type = /decl/hierarchy/outfit/job/cargo/mining
job_description = "A " + JOB_SHAFT_MINER + " mines and processes minerals to be delivered to departments that need them."
diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index 36e5fd5fc6..0c99a38ad2 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -15,8 +15,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
- access = list(access_hydroponics, access_bar, access_kitchen)
- minimal_access = list(access_bar)
+ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
+ minimal_access = list(ACCESS_BAR)
outfit_type = /decl/hierarchy/outfit/job/service/bartender
job_description = "A " + JOB_BARTENDER + " mixes drinks for the crew. They generally have permission to charge for drinks or deny service to unruly patrons."
@@ -53,8 +53,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the "+ JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
- access = list(access_hydroponics, access_bar, access_kitchen)
- minimal_access = list(access_kitchen)
+ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
+ minimal_access = list(ACCESS_KITCHEN)
outfit_type = /decl/hierarchy/outfit/job/service/chef
job_description = "A " + JOB_CHEF + " cooks food for the crew. They generally have permission to charge for food or deny service to unruly diners."
@@ -87,8 +87,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
- access = list(access_hydroponics, access_bar, access_kitchen)
- minimal_access = list(access_hydroponics)
+ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
+ minimal_access = list(ACCESS_HYDROPONICS)
outfit_type = /decl/hierarchy/outfit/job/service/gardener
job_description = "A " + JOB_BOTANIST+ " grows plants for the " + JOB_CHEF + " and " + JOB_BARTENDER + "."
@@ -132,8 +132,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
- access = list(access_janitor, access_maint_tunnels)
- minimal_access = list(access_janitor, access_maint_tunnels)
+ access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS)
+ minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/service/janitor
job_description = "A " + JOB_JANITOR + " keeps the station clean, as long as it doesn't interfere with active crime scenes."
@@ -169,8 +169,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
- access = list(access_library, access_maint_tunnels)
- minimal_access = list(access_library)
+ access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS)
+ minimal_access = list(ACCESS_LIBRARY)
outfit_type = /decl/hierarchy/outfit/job/librarian
job_description = "The " + JOB_LIBRARIAN + " curates the book selection in the Library, so the crew might enjoy it."
@@ -234,8 +234,8 @@
supervisors = "company officials and Corporate Regulations"
selection_color = "#515151"
economic_modifier = 7
- access = list(access_lawyer, access_sec_doors, access_maint_tunnels, access_heads)
- minimal_access = list(access_lawyer, access_sec_doors, access_heads)
+ access = list(ACCESS_LAWYER, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_HEADS)
+ minimal_access = list(ACCESS_LAWYER, ACCESS_SEC_DOORS, ACCESS_HEADS)
minimal_player_age = 7
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_TESHARI, SPECIES_ZADDAT, FBP_DIGITAL)
@@ -281,8 +281,8 @@
economic_modifier = 5
minimal_player_age = 3
pto_type = PTO_CIVILIAN
- access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot)
- minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot)
+ access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT)
+ minimal_access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT)
outfit_type = /decl/hierarchy/outfit/job/pilot
job_description = "A " + JOB_PILOT + " flies the various shuttles in the Virgo-Erigone System."
alt_titles = list(JOB_ALT_COPILOT = /datum/alt_title/co_pilot, JOB_ALT_NAVIGATOR = /datum/alt_title/navigator, JOB_ALT_HELMSMAN = /datum/alt_title/helmsman)
@@ -315,8 +315,8 @@
spawn_positions = 4
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
- access = list(access_entertainment)
- minimal_access = list(access_entertainment)
+ access = list(ACCESS_ENTERTAINMENT)
+ minimal_access = list(ACCESS_ENTERTAINMENT)
pto_type = PTO_CIVILIAN
outfit_type = /decl/hierarchy/outfit/job/assistant/entertainer
diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm
index 302ec847fd..7846c40979 100644
--- a/code/game/jobs/job/civilian_chaplain.dm
+++ b/code/game/jobs/job/civilian_chaplain.dm
@@ -10,8 +10,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
- access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels)
- minimal_access = list(access_chapel_office, access_crematorium)
+ access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS)
+ minimal_access = list(ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM)
outfit_type = /decl/hierarchy/outfit/job/chaplain
job_description = "The " + JOB_CHAPLAIN + " ministers to the spiritual needs of the crew."
diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
index e1d7cb2ee1..149398782e 100644
--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -26,15 +26,15 @@
pto_type = PTO_ENGINEERING
dept_time_required = 60
- access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
- access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
- access_heads, access_construction,
- access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway)
+ access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
+ ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA,
+ ACCESS_HEADS, ACCESS_CONSTRUCTION,
+ ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_AI_UPLOAD, ACCESS_GATEWAY)
- minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
- access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
- access_heads, access_construction,
- access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway)
+ minimal_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
+ ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA,
+ ACCESS_HEADS, ACCESS_CONSTRUCTION,
+ ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_AI_UPLOAD, ACCESS_GATEWAY)
alt_titles = list(JOB_ALT_HEAD_ENGINEER = /datum/alt_title/head_engineer, JOB_ALT_FOREMAN = /datum/alt_title/foreman, JOB_ALT_MAINTENANCE_MANAGER = /datum/alt_title/maintenance_manager)
minimal_player_age = 31 //ChompEDIT
@@ -77,8 +77,8 @@
economic_modifier = 5
pto_type = PTO_ENGINEERING
- access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics)
- minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction)
+ access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS)
+ minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION)
alt_titles = list(JOB_ALT_MAINTENANCE_TECHNICIAN = /datum/alt_title/maint_tech, JOB_ALT_ENGINE_TECHNICIAN = /datum/alt_title/engine_tech,
JOB_ALT_ELECTRICIAN = /datum/alt_title/electrician, JOB_ALT_CONSTRUCTION_ENGINEER = /datum/alt_title/construction_engi, JOB_ALT_ENGINEERING_CONTRACTOR = /datum/alt_title/engineering_contractor, JOB_ALT_COMPUTER_TECHNICIAN = /datum/alt_title/computer_tech, JOB_ALT_SALVAGE_TECHNICIAN = /datum/alt_title/salvage_tech)
@@ -146,8 +146,8 @@
supervisors = "the " + JOB_CHIEF_ENGINEER
selection_color = "#5B4D20"
economic_modifier = 5
- access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_external_airlocks)
- minimal_access = list(access_eva, access_engine, access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction, access_external_airlocks)
+ access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_EXTERNAL_AIRLOCKS)
+ minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_EXTERNAL_AIRLOCKS)
alt_titles = list(JOB_ALT_ATMOSPHERIC_ENGINEER = /datum/alt_title/atmos_engi, JOB_ALT_ATMOSPHERIC_MAINTAINER = /datum/alt_title/atmos_maint, /*CHOMPEdit JOB_ALT_DISPOSALS_TECHNICIAN = /datum/alt_title/disposals_tech*/
JOB_ALT_FUEL_TECHNICIAN = /datum/alt_title/refuel_tech, JOB_ALT_FIREFIGHTER = /datum/alt_title/firefighter)
diff --git a/code/game/jobs/job/exploration.dm b/code/game/jobs/job/exploration.dm
index 6648cf40a8..9e339e156a 100644
--- a/code/game/jobs/job/exploration.dm
+++ b/code/game/jobs/job/exploration.dm
@@ -45,8 +45,8 @@
pto_type = PTO_EXPLORATION
dept_time_required = 20
- access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce)
- minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce)
+ access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT, ACCESS_EXPLORER, ACCESS_GATEWAY, ACCESS_PATHFINDER, ACCESS_RC_ANNOUNCE)
+ minimal_access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT, ACCESS_EXPLORER, ACCESS_GATEWAY, ACCESS_PATHFINDER, ACCESS_RC_ANNOUNCE)
outfit_type = /decl/hierarchy/outfit/job/pathfinder
job_description = "The " + JOB_PATHFINDER + "'s job is to lead and manage expeditions, and is the primary authority on all off-station expeditions."
alt_titles = list(JOB_ALT_EXPEDITION_LEAD = /datum/alt_title/expedition_lead, JOB_ALT_EXPLORATION_MANAGER = /datum/alt_title/exploration_manager)
@@ -74,8 +74,8 @@
economic_modifier = 5
minimal_player_age = 3
pto_type = PTO_EXPLORATION
- access = list(access_pilot, access_external_airlocks, access_eva,access_explorer) //CHOMPedit gave pilot a little more access
- minimal_access = list(access_pilot, access_external_airlocks, access_eva,access_explorer) //CHOMPedit gave pilot a little more access
+ access = list(ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_EXPLORER) //CHOMPedit gave pilot a little more access
+ minimal_access = list(ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_EXPLORER) //CHOMPedit gave pilot a little more access
outfit_type = /decl/hierarchy/outfit/job/pilot
job_description = "A Pilot flies the various shuttles in the Vir System." //CHOMPedit: Replaces Virgo reference with Vir.
alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman)
@@ -103,8 +103,8 @@
selection_color = "#999440"
economic_modifier = 6
pto_type = PTO_EXPLORATION
- access = list(access_explorer, access_external_airlocks, access_eva)
- minimal_access = list(access_explorer, access_external_airlocks, access_eva)
+ access = list(ACCESS_EXPLORER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA)
+ minimal_access = list(ACCESS_EXPLORER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA)
outfit_type = /decl/hierarchy/outfit/job/explorer2
job_description = "An " + JOB_EXPLORER + " searches for interesting things, and returns them to the station."
alt_titles = list(JOB_ALT_SURVEYOR = /datum/alt_title/surveyor, JOB_ALT_OFFSITE_SCOUT = /datum/alt_title/offsite_scout)
@@ -131,8 +131,8 @@
economic_modifier = 6
minimal_player_age = 3
pto_type = PTO_EXPLORATION
- access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks,access_explorer) // CHOMPedit: No more pilot, surgery or chemistry access.
- minimal_access = list(access_medical, access_medical_equip, access_morgue,access_explorer) // CHOMPedit: No more pilot access.
+ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS,ACCESS_EXPLORER) // CHOMPedit: No more pilot, surgery or chemistry access.
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE,ACCESS_EXPLORER) // CHOMPedit: No more pilot access.
outfit_type = /decl/hierarchy/outfit/job/medical/sar
job_description = "A " + JOB_FIELD_MEDIC + " works as the field doctor of expedition teams."
alt_titles = list(JOB_ALT_EXPEDITION_MEDIC = /datum/alt_title/expedition_medic, JOB_ALT_OFFSITE_MEDIC = /datum/alt_title/offsite_medic)
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index ebe84998b0..f0954d7b8a 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -15,13 +15,13 @@
selection_color = "#026865"
req_admin_notify = 1
economic_modifier = 10
- access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
- access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_teleporter, //CHOMPEdit
- access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway)
+ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS,
+ ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_TELEPORTER, //CHOMPEdit
+ ACCESS_KEYCARD_AUTH, ACCESS_PSYCHIATRIST, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MAINT_TUNNELS, ACCESS_GATEWAY)
- minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
- access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_teleporter,//CHOMPEdit
- access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS,
+ ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_TELEPORTER, //CHOMPEdit
+ ACCESS_KEYCARD_AUTH, ACCESS_PSYCHIATRIST, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MAINT_TUNNELS, ACCESS_GATEWAY)
alt_titles = list(JOB_ALT_CHIEF_PHYSICIAN = /datum/alt_title/chief_physician, JOB_ALT_MEDICAL_DIRECTOR = /datum/alt_title/medical_director, /*CHOMPEdit RemovalJOB_ALT_HEALTHCARE_MANAGER = /datum/alt_title/healthcare_manager*/)
minimum_character_age = 25
@@ -68,8 +68,8 @@
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
economic_modifier = 7
- access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_eva)
- minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_virology, access_eva)
+ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_VIROLOGY, ACCESS_EVA)
outfit_type = /decl/hierarchy/outfit/job/medical/doctor
job_description = "A " + JOB_MEDICAL_DOCTOR + " is a Jack-of-All-Trades Medical title, covering a variety of skill levels and minor specializations. They are likely \
familiar with basic first aid, and a number of accompanying medications, and can generally save, if not cure, a majority of the \
@@ -141,8 +141,8 @@
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
economic_modifier = 5
- access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
- minimal_access = list(access_medical, access_medical_equip, access_chemistry)
+ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_CHEMISTRY)
minimal_player_age = 3
min_age_by_species = list(SPECIES_PROMETHEAN = 3)
@@ -174,8 +174,8 @@
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER + " and " + JOB_RESEARCH_DIRECTOR
selection_color = "#013D3B"
economic_modifier = 7
- access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research)
- minimal_access = list(access_medical, access_morgue, access_genetics, access_research)
+ access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_RESEARCH)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_RESEARCH)
outfit_type = /decl/hierarchy/outfit/job/medical/geneticist
job_description = "A " + JOB_GENETICIST + " operates genetic manipulation equipment to repair any genetic defects encountered in crew, from cloning or radiation as examples. \
@@ -196,8 +196,8 @@
economic_modifier = 5
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
- access = list(access_medical, access_medical_equip, access_morgue, access_psychiatrist)
- minimal_access = list(access_medical, access_medical_equip, access_psychiatrist)
+ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_PSYCHIATRIST)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PSYCHIATRIST)
outfit_type = /decl/hierarchy/outfit/job/medical/psychiatrist
job_description = "A " + JOB_PSYCHIATRIST + " provides mental health services to crew members in need. They may also be called upon to determine whatever \
ails the mentally unwell, frequently under Security supervision. They understand the effects of various psychoactive drugs."
@@ -237,9 +237,10 @@
pto_type = PTO_MEDICAL
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
- economic_modifier = 5 //CHOMPstation edit - "Makes Parameds make as much as offduty medical."
- access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist)
- minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks)
+ economic_modifier = 4
+ economic_modifier = 5 // CHOMPAdd - "Makes Parameds make as much as offduty medical."
+ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
outfit_type = /decl/hierarchy/outfit/job/medical/paramedic
job_description = "A " + JOB_PARAMEDIC + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their own. \
They may also be called upon to keep patients stable when Medical is busy or understaffed."
diff --git a/code/game/jobs/job/medical_ch.dm b/code/game/jobs/job/medical_ch.dm
index c7a125c9d6..93e6ebcb47 100644
--- a/code/game/jobs/job/medical_ch.dm
+++ b/code/game/jobs/job/medical_ch.dm
@@ -1,7 +1,7 @@
//TFF 7/1/20 - Add Chemistry access to Psychs. Backported from old Chompcode
/datum/job/psychiatrist
- access = list(access_medical, access_chemistry, access_medical_equip, access_morgue, access_psychiatrist)
- minimal_access = list(access_medical, access_chemistry, access_medical_equip, access_psychiatrist)
+ access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_PSYCHIATRIST)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MEDICAL_EQUIP, ACCESS_PSYCHIATRIST)
/datum/job/geneticist
pto_type = PTO_MEDICAL
diff --git a/code/game/jobs/job/offduty.dm b/code/game/jobs/job/offduty.dm
index 627f812de9..335cadc953 100644
--- a/code/game/jobs/job/offduty.dm
+++ b/code/game/jobs/job/offduty.dm
@@ -11,8 +11,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#9b633e"
- access = list(access_maint_tunnels)
- minimal_access = list(access_maint_tunnels)
+ access = list(ACCESS_MAINT_TUNNELS)
+ minimal_access = list(ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/assistant/worker
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_CIVILIAN
@@ -27,8 +27,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#9b633e"
- access = list(access_maint_tunnels)
- minimal_access = list(access_maint_tunnels)
+ access = list(ACCESS_MAINT_TUNNELS)
+ minimal_access = list(ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/assistant/cargo
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_CARGO
@@ -43,8 +43,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#5B4D20"
- access = list(access_maint_tunnels, access_external_airlocks, access_construction)
- minimal_access = list(access_maint_tunnels, access_external_airlocks)
+ access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION)
+ minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
outfit_type = /decl/hierarchy/outfit/job/assistant/engineer
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_ENGINEERING
@@ -59,8 +59,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#013D3B"
- access = list(access_maint_tunnels, access_external_airlocks)
- minimal_access = list(access_maint_tunnels, access_external_airlocks)
+ access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
+ minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
outfit_type = /decl/hierarchy/outfit/job/assistant/medic
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_MEDICAL
@@ -75,8 +75,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#633D63"
- access = list(access_maint_tunnels)
- minimal_access = list(access_maint_tunnels)
+ access = list(ACCESS_MAINT_TUNNELS)
+ minimal_access = list(ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/assistant/scientist
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_SCIENCE
@@ -91,8 +91,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#601C1C"
- access = list(access_maint_tunnels)
- minimal_access = list(access_maint_tunnels)
+ access = list(ACCESS_MAINT_TUNNELS)
+ minimal_access = list(ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/assistant/officer
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_SECURITY
@@ -107,8 +107,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#999440"
- access = list(access_maint_tunnels, access_external_airlocks)
- minimal_access = list(access_maint_tunnels, access_external_airlocks)
+ access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
+ minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
outfit_type = /decl/hierarchy/outfit/job/assistant/explorer
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_EXPLORATION
diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
index ec74d7ba79..57a1f518f2 100644
--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -15,16 +15,16 @@
selection_color = "#AD6BAD"
req_admin_notify = 1
economic_modifier = 15
- access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
- access_tox_storage, access_teleporter,
- access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
- access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network,
- access_explorer, access_pathfinder, access_xenobotany) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany
- minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
- access_tox_storage, access_teleporter,
- access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
- access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network,
- access_explorer, access_pathfinder, access_xenobotany) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany
+ access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
+ ACCESS_TOX_STORAGE, ACCESS_TELEPORTER,
+ ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, ACCESS_TECH_STORAGE,
+ ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_XENOARCH, ACCESS_EVA, ACCESS_NETWORK,
+ ACCESS_EXPLORER, ACCESS_PATHFINDER, ACCESS_XENOBOTANY) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany
+ minimal_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
+ ACCESS_TOX_STORAGE, ACCESS_TELEPORTER,
+ ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, ACCESS_TECH_STORAGE,
+ ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_XENOARCH, ACCESS_EVA, ACCESS_NETWORK,
+ ACCESS_EXPLORER, ACCESS_PATHFINDER, ACCESS_XENOBOTANY) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany
minimum_character_age = 25
minimal_player_age = 31 //ChompEDIT
@@ -75,8 +75,8 @@
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 7
- access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_xenobotany)
- minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch)
+ access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_XENOBOTANY)
+ minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOARCH)
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
banned_job_species = list(FBP_DIGITAL)
@@ -154,8 +154,8 @@
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 7
- access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_hydroponics)
- minimal_access = list(access_research, access_xenobiology, access_hydroponics, access_tox_storage)
+ access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_HYDROPONICS)
+ minimal_access = list(ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_HYDROPONICS, ACCESS_TOX_STORAGE)
banned_job_species = list(FBP_DIGITAL)
minimal_player_age = 14
@@ -195,8 +195,8 @@
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 5
- access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
- minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
+ access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH) //As a job that handles so many corpses, it makes sense for them to have morgue access.
+ minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH) //As a job that handles so many corpses, it makes sense for them to have morgue access.
minimal_player_age = 7
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
banned_job_species = list(FBP_DIGITAL)
@@ -245,8 +245,8 @@
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 7
- access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobotany, access_hydroponics, access_xenobiology) //CHOMPS KSC 9/2/2020 - Added "access_xenobiology" to their access so they can enter Xenobotany.
- minimal_access = list(access_research, access_xenobotany, access_hydroponics, access_tox_storage)
+ access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBOTANY, ACCESS_HYDROPONICS, ACCESS_XENOBIOLOGY) //CHOMPS KSC 9/2/2020 - Added "access_xenobiology" to their access so they can enter Xenobotany.
+ minimal_access = list(ACCESS_RESEARCH, ACCESS_XENOBOTANY, ACCESS_HYDROPONICS, ACCESS_TOX_STORAGE)
pto_type = PTO_SCIENCE
minimal_player_age = 14
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 7e4a828def..3d1947dcdb 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -15,14 +15,14 @@
selection_color = "#8E2929"
req_admin_notify = 1
economic_modifier = 10
- access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory,
- access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
- access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
- access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_teleporter) //CHOMP Edit: Restores what access is given in security.dm.
- minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory,
- access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
- access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
- access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_teleporter) //CHOMP Edit: Restores what access is given in security.dm.
+ access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY,
+ ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
+ ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
+ ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TELEPORTER) // CHOMPEdit Restores what access is given in security.dm.
+ minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY,
+ ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
+ ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
+ ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TELEPORTER) // CHOMPEdit Restores what access is given in security.dm.
minimum_character_age = 25
min_age_by_species = list(SPECIES_HUMAN_VATBORN = 14)
minimal_player_age = 31 //ChompEDIT
@@ -76,8 +76,8 @@
economic_modifier = 5
pto_type = PTO_SECURITY
dept_time_required = 20
- access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_morgue, access_external_airlocks)
- minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_external_airlocks)
+ access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS)
+ minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
minimal_player_age = 5
banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_DIONA)
alt_titles = list(JOB_ALT_BRIG_SENTRY = /datum/alt_title/brig_sentry, JOB_ALT_ARMORY_SUPERINTENDENT = /datum/alt_title/armory_superintendent, JOB_ALT_MASTERATARMS = /datum/alt_title/master_at_arms)
@@ -114,8 +114,8 @@
pto_type = PTO_SECURITY
supervisors = "the " + JOB_HEAD_OF_SECURITY
selection_color = "#601C1C"
- access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks, access_brig) //Vorestation edit - access_brig
- minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks)
+ access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_BRIG) //Vorestation edit - ACCESS_BRIG
+ minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
economic_modifier = 5
minimal_player_age = 3
banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_DIONA)
@@ -154,9 +154,9 @@
pto_type = PTO_SECURITY
supervisors = "the " + JOB_HEAD_OF_SECURITY
selection_color = "#601C1C"
- economic_modifier = 5 //CHOMPstation edit - "Offduty officers make more than working, and this brings it in line with the rest of the jobs in sec barring HOS"
- access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_morgue, access_external_airlocks)
- minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_external_airlocks)
+ economic_modifier = 5 // CHOMPAdd - "Offduty officers make more than working, and this brings it in line with the rest of the jobs in sec barring HOS"
+ access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS)
+ minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
minimal_player_age = 3
banned_job_species = list(SPECIES_ZADDAT, SPECIES_TESHARI, SPECIES_DIONA)
diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm
index ba0ea0ae60..e4951a5b80 100644
--- a/code/game/jobs/job/silicon.dm
+++ b/code/game/jobs/job/silicon.dm
@@ -3,7 +3,7 @@
//////////////////////////////////
/datum/job/ai
title = JOB_AI
- flag = AI
+ flag = AI_DEPT
departments = list(DEPARTMENT_SYNTHETIC)
sorting_order = 1 // Be above their borgs.
department_flag = ENGSEC
diff --git a/code/game/jobs/job/special.dm b/code/game/jobs/job/special.dm
index bcd214c96c..7256bb18d4 100644
--- a/code/game/jobs/job/special.dm
+++ b/code/game/jobs/job/special.dm
@@ -126,9 +126,9 @@
/datum/job/clown/get_access()
if(CONFIG_GET(flag/assistant_maint))
- return list(access_maint_tunnels, access_entertainment, access_clown, access_tomfoolery)
+ return list(ACCESS_MAINT_TUNNELS, ACCESS_ENTERTAINMENT, ACCESS_CLOWN, ACCESS_TOMFOOLERY)
else
- return list(access_entertainment, access_clown, access_tomfoolery)
+ return list(ACCESS_ENTERTAINMENT, ACCESS_CLOWN, ACCESS_TOMFOOLERY)
/datum/job/mime
title = JOB_MIME
@@ -154,9 +154,9 @@
/datum/job/mime/get_access()
if(CONFIG_GET(flag/assistant_maint))
- return list(access_maint_tunnels, access_entertainment, access_tomfoolery, access_mime)
+ return list(ACCESS_MAINT_TUNNELS, ACCESS_ENTERTAINMENT, ACCESS_TOMFOOLERY, ACCESS_MIME)
else
- return list(access_entertainment, access_tomfoolery, access_mime)
+ return list(ACCESS_ENTERTAINMENT, ACCESS_TOMFOOLERY, ACCESS_MIME)
*/ //CHOMPEDIT: END remove Mime/clown defines (These are alt titles of Entertainer on our codebase)
/obj/item/card/id/civilian/lurker
@@ -178,5 +178,5 @@
latejoin_only = 1
requestable = FALSE
outfit_type = /decl/hierarchy/outfit/maint_lurker
- access = list(access_maint_tunnels)
- minimal_access = list(access_maint_tunnels)
+ access = list(ACCESS_MAINT_TUNNELS)
+ minimal_access = list(ACCESS_MAINT_TUNNELS)
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 303e27f365..5f4c3dc3b6 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -1,173 +1,5 @@
-
-var/const/ENGSEC =(1<<0)
-
-var/const/CAPTAIN =(1<<0)
-var/const/HOS =(1<<1)
-var/const/WARDEN =(1<<2)
-var/const/DETECTIVE =(1<<3)
-var/const/OFFICER =(1<<4)
-var/const/CHIEF =(1<<5)
-var/const/ENGINEER =(1<<6)
-var/const/ATMOSTECH =(1<<7)
-var/const/AI =(1<<8)
-var/const/CYBORG =(1<<9)
-var/const/BRIGPHYS =(1<<10) // CHOMPAdd - Brig Physician
-var/const/CLOWN =(1<<13)
-var/const/MIME =(1<<14)
-var/const/INTERN =(1<<15)
-
-var/const/MEDSCI =(1<<1)
-
-var/const/RD =(1<<0)
-var/const/SCIENTIST =(1<<1)
-var/const/CHEMIST =(1<<2)
-var/const/CMO =(1<<3)
-var/const/DOCTOR =(1<<4)
-var/const/GENETICIST =(1<<5)
-var/const/VIROLOGIST =(1<<6)
-var/const/PSYCHIATRIST =(1<<7)
-var/const/ROBOTICIST =(1<<8)
-var/const/XENOBIOLOGIST =(1<<9)
-var/const/PARAMEDIC =(1<<10)
-var/const/PATHFINDER =(1<<11)
-var/const/EXPLORER =(1<<12)
-var/const/SAR =(1<<13)
-var/const/XENOBOTANIST =(1<<14)
-var/const/PILOT =(1<<15) //ChompEDIT - ours is with the other explo jobs.
-
-var/const/CIVILIAN =(1<<2)
-
-var/const/HOP =(1<<0)
-var/const/BARTENDER =(1<<1)
-var/const/BOTANIST =(1<<2)
-var/const/CHEF =(1<<3)
-var/const/JANITOR =(1<<4)
-var/const/LIBRARIAN =(1<<5)
-var/const/QUARTERMASTER =(1<<6)
-var/const/CARGOTECH =(1<<7)
-var/const/MINER =(1<<8)
-var/const/LAWYER =(1<<9)
-var/const/CHAPLAIN =(1<<10)
-var/const/ASSISTANT =(1<<11)
-var/const/BRIDGE =(1<<12)
-//var/const/PILOT =(1<<13) //ChompEDIT - ours is with the other explo jobs.
-var/const/ENTERTAINER =(1<<14)
-var/const/ENTREPRENEUR =(1<<15)
-
-var/const/OTHER =(1<<10) //VOREStation Note: Unused on VS. Used downstream.
-var/const/NONCREW =(1<<0)
-var/const/ANOMALY =(1<<0) //VOREStation Note: Unused on VS. Used downstream.
-/* // CHOMPedit: Comment out Talon positions, we don't have that here.
-//VOREStation Add
-var/const/TALON =(1<<3)
-
-var/const/TALCAP =(1<<0)
-var/const/TALPIL =(1<<1)
-var/const/TALDOC =(1<<2)
-var/const/TALSEC =(1<<3)
-var/const/TALENG =(1<<4)
-var/const/TALMIN =(1<<5)
-//VOREStation Add End
-*/
-
-//CHOMPedit start: next chunk doesn't exist upstream, not sure what it's actually used for.
-var/list/assistant_occupations = list(
-)
-
-
-var/list/command_positions = list(
- JOB_SITE_MANAGER,
- JOB_HEAD_OF_PERSONNEL,
- JOB_HEAD_OF_SECURITY,
- JOB_CHIEF_ENGINEER,
- JOB_RESEARCH_DIRECTOR,
- JOB_CHIEF_MEDICAL_OFFICER,
- JOB_COMMAND_SECRETARY,
- JOB_BLUESHIELD_GUARD // YW Edit
-)
-
-
-var/list/engineering_positions = list(
- JOB_CHIEF_ENGINEER,
- JOB_ENGINEER,
- JOB_ATMOSPHERIC_TECHNICIAN
-)
-
-
-var/list/medical_positions = list(
- JOB_CHIEF_MEDICAL_OFFICER,
- JOB_MEDICAL_DOCTOR,
- JOB_GENETICIST,
- JOB_PSYCHIATRIST,
- JOB_CHEMIST,
- JOB_PARAMEDIC
-)
-
-
-var/list/science_positions = list(
- JOB_RESEARCH_DIRECTOR,
- JOB_SCIENTIST,
- JOB_GENETICIST, //Part of both medical and science
- JOB_ROBOTICIST,
- JOB_XENOBIOLOGIST
-)
-
-//BS12 EDIT
-var/list/cargo_positions = list(
- JOB_QUARTERMASTER,
- JOB_CARGO_TECHNICIAN,
- JOB_SHAFT_MINER
-)
-
-var/list/civilian_positions = list(
- JOB_HEAD_OF_PERSONNEL,
- JOB_BARTENDER,
- JOB_BOTANIST,
- JOB_CHEF,
- JOB_JANITOR,
- JOB_LIBRARIAN,
- JOB_ENTREPRENEUR,
- JOB_CHAPLAIN,
- JOB_ALT_VISITOR, //VOREStation Edit - Visitor not Assistant
- JOB_INTERN //VOREStation Edit - Intern
-)
-
-
-var/list/security_positions = list(
- JOB_HEAD_OF_SECURITY,
- JOB_WARDEN,
- JOB_DETECTIVE,
- JOB_SECURITY_OFFICER
-)
-
-
-var/list/planet_positions = list(
- JOB_PATHFINDER, // VOREStation Edit - Added Pathfinder
- JOB_EXPLORER,
- JOB_PILOT,
- JOB_FIELD_MEDIC // VOREStation Edit - Field Medic
-)
-
-
-var/list/nonhuman_positions = list(
- JOB_AI,
- JOB_CYBORG,
- JOB_PAI
-)
-
-var/list/whitelisted_positions = list(
- JOB_SITE_MANAGER,
- JOB_HEAD_OF_PERSONNEL,
- JOB_HEAD_OF_SECURITY,
- JOB_CHIEF_ENGINEER,
- JOB_RESEARCH_DIRECTOR,
- JOB_CHIEF_MEDICAL_OFFICER,
- JOB_INTERNAL_AFFAIRS_AGENT,
- JOB_AI
-) //CHOMPEdit: end
-
/proc/guest_jobbans(var/job)
- return // ((job in whitelisted_positions)) // CHOMPedit: spaghetti that is our whitelist system means this prevents use of config/jobswhitelist.txt
+ return
/proc/get_job_datums()
var/list/occupations = list()
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index cb087a8ea8..bbc2638df3 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -12,7 +12,7 @@
var/cooldown_time = 0
var/cooldown_timeleft = 0
var/cooldown_on = 0
- req_access = list(access_ai_upload)
+ req_access = list(ACCESS_AI_UPLOAD)
/obj/machinery/ai_slipper/Initialize(mapload)
. = ..()
diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
index d175d5371e..f296d54d16 100644
--- a/code/game/machinery/air_alarm.dm
+++ b/code/game/machinery/air_alarm.dm
@@ -63,16 +63,16 @@
idle_power_usage = 80
active_power_usage = 1000 //For heating/cooling rooms. 1000 joules equates to about 1 degree every 2 seconds for a single tile of air.
power_channel = ENVIRON
- req_one_access = list(access_atmospherics, access_engine_equip)
+ req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP)
clicksound = "button"
clickvol = 30
blocks_emissive = NONE
light_power = 0.25
var/alarm_id = null
var/breach_detection = 1 // Whether to use automatic breach detection or not
- var/frequency = 1439
+ var/frequency = PUMPS_FREQ
//var/skipprocess = 0 //Experimenting
- var/alarm_frequency = 1437
+ var/alarm_frequency = ALERT_FREQ
var/remote_control = 0
var/rcon_setting = 2
var/rcon_time = 0
@@ -892,7 +892,7 @@
/obj/machinery/alarm/server/Initialize(mapload)
. = ..()
- req_access = list(access_rd, access_atmospherics, access_engine_equip)
+ req_access = list(ACCESS_RD, ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP)
TLV[GAS_O2] = list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa
TLV[GAS_CO2] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
TLV[GAS_PHORON] = list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index bf1c5646b9..4316dc15b0 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -1,7 +1,7 @@
#define SENSOR_PRESSURE (1<<0)
#define SENSOR_TEMPERATURE (1<<1)
#define SENSOR_O2 (1<<2)
-#define SENSOR_PLASMA (1<<3)
+#define SENSOR_PHORON (1<<3)
#define SENSOR_N2 (1<<4)
#define SENSOR_CO2 (1<<5)
#define SENSOR_N2O (1<<6)
@@ -16,7 +16,7 @@
var/state = 0
var/id_tag
- var/frequency = 1439
+ var/frequency = PUMPS_FREQ
var/on = 1
var/output = 3
@@ -106,7 +106,7 @@
"Pressure: [ONOFF_TOGGLE(SENSOR_PRESSURE)]" = SENSOR_PRESSURE,
"Temperature: [ONOFF_TOGGLE(SENSOR_TEMPERATURE)]" = SENSOR_TEMPERATURE,
"Oxygen: [ONOFF_TOGGLE(SENSOR_O2)]" = SENSOR_O2,
- "Toxins: [ONOFF_TOGGLE(SENSOR_PLASMA)]" = SENSOR_PLASMA,
+ "Toxins: [ONOFF_TOGGLE(SENSOR_PHORON)]" = SENSOR_PHORON,
"Nitrogen: [ONOFF_TOGGLE(SENSOR_N2)]" = SENSOR_N2,
"Carbon Dioxide: [ONOFF_TOGGLE(SENSOR_CO2)]" = SENSOR_CO2,
"Nitrous Oxide: [ONOFF_TOGGLE(SENSOR_N2O)]" = SENSOR_N2O,
@@ -126,8 +126,8 @@
output ^= SENSOR_TEMPERATURE
if(SENSOR_O2)
output ^= SENSOR_O2
- if(SENSOR_PLASMA)
- output ^= SENSOR_PLASMA
+ if(SENSOR_PHORON)
+ output ^= SENSOR_PHORON
if(SENSOR_N2)
output ^= SENSOR_N2
if(SENSOR_CO2)
@@ -156,7 +156,7 @@
icon_screen = "tank"
name = "Computer"
desc = "Control atmospheric systems, remotely."
- var/frequency = 1439
+ var/frequency = PUMPS_FREQ
var/list/sensors = list()
var/list/sensor_information = list()
var/datum/radio_frequency/radio_connection
@@ -284,7 +284,7 @@
/obj/machinery/computer/general_air_control/large_tank_control
icon = 'icons/obj/computer.dmi'
- frequency = 1441
+ frequency = PUBLIC_LOW_FREQ
name = "Large Tank Computer"
desc = "Controls various devices for managing a gas tank."
var/input_tag
@@ -454,7 +454,7 @@
/obj/machinery/computer/general_air_control/supermatter_core
icon = 'icons/obj/computer.dmi'
- frequency = 1433
+ frequency = ENGINE_FREQ
var/input_tag
var/output_tag
var/list/input_info
@@ -744,7 +744,7 @@
#undef SENSOR_PRESSURE
#undef SENSOR_TEMPERATURE
#undef SENSOR_O2
-#undef SENSOR_PLASMA
+#undef SENSOR_PHORON
#undef SENSOR_N2
#undef SENSOR_CO2
#undef SENSOR_N2O
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 4752f2aa0f..526311e56d 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -33,7 +33,7 @@
circuit = /obj/item/circuitboard/clonepod
icon = 'icons/obj/cloning.dmi'
icon_state = "pod_0"
- req_access = list(access_genetics) // For premature unlocking.
+ req_access = list(ACCESS_GENETICS) // For premature unlocking.
VAR_PRIVATE/datum/weakref/weakref_occupant = null
var/heal_level = 20 // The clone is released once its health reaches this level.
var/heal_rate = 1
diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm
index e041a56719..eb2085737b 100644
--- a/code/game/machinery/computer/RCON_Console.dm
+++ b/code/game/machinery/computer/RCON_Console.dm
@@ -11,7 +11,7 @@
icon_screen = "ai-fixer"
light_color = "#a97faa"
circuit = /obj/item/circuitboard/rcon_console
- req_one_access = list(access_engine)
+ req_one_access = list(ACCESS_ENGINE)
var/current_tag = null
var/datum/tgui_module/rcon/rcon
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 70ec7f8717..6553ea04d0 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -1,7 +1,7 @@
/obj/machinery/computer/aifixer
name = "\improper AI system integrity restorer"
desc = "Used with intelliCards containing nonfunctional AIs to restore them to working order."
- req_one_access = list(access_robotics, access_heads)
+ req_one_access = list(ACCESS_ROBOTICS, ACCESS_HEADS)
circuit = /obj/item/circuitboard/aifixer
icon_keyboard = "tech_key"
icon_screen = "ai-fixer"
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index d6e3d21826..890c4e5596 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -11,7 +11,7 @@
density = TRUE
anchored = TRUE
circuit = /obj/item/circuitboard/atmoscontrol
- req_access = list(access_ce)
+ req_access = list(ACCESS_CE)
var/list/monitored_alarm_ids = null
var/datum/tgui_module/atmos_control/atmos_control
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 33ba458125..9a079fd10b 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -327,7 +327,7 @@ GLOBAL_LIST_EMPTY(bodycamera_screens) // CHOMPEdit
desc = "Used to watch over mining operations."
icon_keyboard = "mining_key"
icon_screen = "mining"
- network = list("Mining Outpost")
+ network = list(NETWORK_MINE)
circuit = /obj/item/circuitboard/security/mining
light_color = "#F9BBFC"
diff --git a/code/game/machinery/computer/camera_vr.dm b/code/game/machinery/computer/camera_vr.dm
index 12c045f3e3..14b2556cfa 100644
--- a/code/game/machinery/computer/camera_vr.dm
+++ b/code/game/machinery/computer/camera_vr.dm
@@ -3,26 +3,26 @@
desc = "Used for hacking into camera networks"
icon = 'icons/obj/abductor.dmi'
icon_state = "camera"
- network = list( "Mercenary",
- "Cargo",
- "Circuits",
- "Civilian",
- "Command",
- "Engine",
- "Engineering",
- "Exploration",
- "Medical",
- "Mining Outpost",
- "Outside",
- "Research",
- "Research Outpost",
- "Robots",
- "Security",
- "Telecommunications",
- "Tether",
- "TalonShip",
- "Entertainment",
- "Communicators"
+ network = list(NETWORK_MERCENARY,
+ NETWORK_CARGO,
+ NETWORK_CIRCUITS,
+ NETWORK_CIVILIAN,
+ NETWORK_COMMAND,
+ NETWORK_ENGINE,
+ NETWORK_ENGINEERING,
+ NETWORK_EXPLORATION,
+ NETWORK_MEDICAL,
+ NETWORK_MINE,
+ NETWORK_OUTSIDE,
+ NETWORK_RESEARCH,
+ NETWORK_RESEARCH_OUTPOST,
+ NETWORK_ROBOTS,
+ NETWORK_SECURITY,
+ NETWORK_TELECOM,
+ NETWORK_TETHER,
+ NETWORK_TALON_SHIP,
+ NETWORK_THUNDER,
+ NETWORK_COMMUNICATORS
)
/obj/machinery/computer/security/xenobio
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index ea7e3a4c06..d1b0185243 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -6,7 +6,7 @@
icon_keyboard = "id_key"
icon_screen = "id"
light_color = "#0099ff"
- req_access = list(access_change_ids)
+ req_access = list(ACCESS_CHANGE_IDS)
circuit = /obj/item/circuitboard/card
var/obj/item/card/id/scan = null
var/obj/item/card/id/modify = null
@@ -59,7 +59,7 @@
if(!istype(id_card))
return ..()
- if(!scan && (access_change_ids in id_card.GetAccess()) && (user.unEquip(id_card) || (id_card.loc == user && istype(user,/mob/living/silicon/robot)))) //Grippers. Again. ~Mechoid
+ if(!scan && (ACCESS_CHANGE_IDS in id_card.GetAccess()) && (user.unEquip(id_card) || (id_card.loc == user && istype(user,/mob/living/silicon/robot)))) //Grippers. Again. ~Mechoid
user.drop_item()
id_card.forceMove(src)
scan = id_card
@@ -291,7 +291,7 @@
/obj/machinery/computer/card/centcom
name = "\improper CentCom ID card modification console"
circuit = /obj/item/circuitboard/card/centcom
- req_access = list(access_cent_captain)
+ req_access = list(ACCESS_CENT_CAPTAIN)
/obj/machinery/computer/card/centcom/is_centcom()
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index f962921d1a..380440c4b9 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -7,7 +7,7 @@
icon_keyboard = "med_key"
icon_screen = "dna"
circuit = /obj/item/circuitboard/cloning
- req_access = list(access_heads) //Only used for record deletion right now.
+ req_access = list(ACCESS_HEADS) //Only used for record deletion right now.
var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
var/list/pods = null //Linked cloning pods.
var/list/temp = null
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index b0832d13cc..57fc7823b3 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -7,7 +7,7 @@
icon_keyboard = "tech_key"
icon_screen = "comm"
light_color = "#0099ff"
- req_access = list(access_heads)
+ req_access = list(ACCESS_HEADS)
circuit = /obj/item/circuitboard/communications
var/datum/tgui_module/communications/communications
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 97b58e93e5..a26c7adbdb 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -13,7 +13,7 @@
icon_keyboard = "med_key"
icon_screen = "medcomp"
light_color = "#315ab4"
- req_one_access = list(access_medical, access_forensics_lockers, access_robotics)
+ req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS, ACCESS_ROBOTICS)
circuit = /obj/item/circuitboard/med_data
var/obj/item/card/id/scan = null
var/authenticated = null
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index d3a6d28116..2a4556f11a 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -204,7 +204,7 @@
name = "ProComp Executive IIc"
desc = "Criminals often operate on a tight budget. Operates external airlocks."
title = "External Airlock Controls"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
/obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob)
if(!allowed(user))
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index e3cc5195ac..2b38769799 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -6,7 +6,7 @@
icon_keyboard = "security_key"
icon_screen = "explosive"
light_color = "#a91515"
- req_access = list(access_armory)
+ req_access = list(ACCESS_ARMORY)
circuit = /obj/item/circuitboard/prisoner
var/id = 0.0
var/temp = null
diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm
index 5e2c0e9399..f96e595c39 100644
--- a/code/game/machinery/computer/prisonshuttle.dm
+++ b/code/game/machinery/computer/prisonshuttle.dm
@@ -16,7 +16,7 @@ GLOBAL_VAR_INIT(prison_shuttle_timeleft, 0)
icon_keyboard = "security_key"
icon_screen = "syndishuttle"
light_color = "#00ffff"
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
circuit = /obj/item/circuitboard/prison_shuttle
var/temp = null
var/hacked = 0
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 0e5cb7f1ea..a200037df2 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -4,7 +4,7 @@
icon_keyboard = "tech_key"
icon_screen = "robot"
light_color = "#a97faa"
- req_access = list(access_robotics)
+ req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/circuitboard/robotics
var/safety = 1
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 04ae7ac3c0..550b27712e 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -10,7 +10,7 @@
icon_keyboard = "security_key"
icon_screen = "security"
light_color = "#a91515"
- req_one_access = list(access_security, access_forensics_lockers, access_lawyer)
+ req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS, ACCESS_LAWYER)
circuit = /obj/item/circuitboard/secure_data
var/obj/item/card/id/scan = null
var/authenticated = null
diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm
index bd464438f7..4fe8d40881 100644
--- a/code/game/machinery/computer/shuttle.dm
+++ b/code/game/machinery/computer/shuttle.dm
@@ -24,7 +24,7 @@
to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return
- if(!(access_heads in W:access)) //doesn't have this access
+ if(!(ACCESS_HEADS in W:access)) //doesn't have this access
to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return 0
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index 0e959f8d5d..d47c85f12e 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -13,7 +13,7 @@
icon_state = "pcu"
icon_keyboard = "pcu_key"
light_color = "#5284e7"
- req_one_access = list(access_heads)
+ req_one_access = list(ACCESS_HEADS)
circuit = /obj/item/circuitboard/skills/pcu
density = FALSE
var/obj/item/card/id/scan = null
diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm
index 63dd8119f3..5537e5688d 100644
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -16,7 +16,7 @@ var/specops_shuttle_timeleft = 0
icon_keyboard = "security_key"
icon_screen = "syndishuttle"
light_color = "#00ffff"
- req_access = list(access_cent_specops)
+ req_access = list(ACCESS_CENT_SPECOPS)
// req_access = list(ACCESS_CENT_SPECOPS)
var/temp = null
var/hacked = 0
diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm
index 9a8f02b704..0d1836143e 100644
--- a/code/game/machinery/computer/supply.dm
+++ b/code/game/machinery/computer/supply.dm
@@ -23,7 +23,7 @@
icon_keyboard = "tech_key"
icon_screen = "supply"
light_color = "#b88b2e"
- //req_access = list(access_cargo) //CHOMPedit, removing hard access locks.
+ //req_access = list(ACCESS_CARGO) //CHOMPRemove, removing hard access locks.
circuit = /obj/item/circuitboard/supplycomp/control
authorization = SUP_SEND_SHUTTLE | SUP_ACCEPT_ORDERS
diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm
index 8299466071..e33f056b23 100644
--- a/code/game/machinery/computer/syndicate_specops_shuttle.dm
+++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm
@@ -3,4 +3,4 @@
icon_keyboard = "syndie_key"
icon_screen = "syndishuttle"
light_color = "#00ffff"
- req_access = list(access_cent_specops)
+ req_access = list(ACCESS_CENT_SPECOPS)
diff --git a/code/game/machinery/computer3/computers/card.dm b/code/game/machinery/computer3/computers/card.dm
index 84f17202fa..633dc87033 100644
--- a/code/game/machinery/computer3/computers/card.dm
+++ b/code/game/machinery/computer3/computers/card.dm
@@ -1,3 +1,82 @@
+var/list/engineering_positions = list(
+ JOB_CHIEF_ENGINEER,
+ JOB_ENGINEER,
+ JOB_ATMOSPHERIC_TECHNICIAN
+)
+
+
+var/list/medical_positions = list(
+ JOB_CHIEF_MEDICAL_OFFICER,
+ JOB_MEDICAL_DOCTOR,
+ JOB_GENETICIST,
+ JOB_PSYCHIATRIST,
+ JOB_CHEMIST,
+ JOB_PARAMEDIC
+)
+
+
+var/list/science_positions = list(
+ JOB_RESEARCH_DIRECTOR,
+ JOB_SCIENTIST,
+ JOB_GENETICIST, //Part of both medical and science
+ JOB_ROBOTICIST,
+ JOB_XENOBIOLOGIST
+)
+
+//BS12 EDIT
+var/list/cargo_positions = list(
+ JOB_QUARTERMASTER,
+ JOB_CARGO_TECHNICIAN,
+ JOB_SHAFT_MINER
+)
+
+var/list/civilian_positions = list(
+ JOB_HEAD_OF_PERSONNEL,
+ JOB_BARTENDER,
+ JOB_BOTANIST,
+ JOB_CHEF,
+ JOB_JANITOR,
+ JOB_LIBRARIAN,
+ JOB_ENTREPRENEUR,
+ JOB_CHAPLAIN,
+ JOB_ALT_VISITOR, //VOREStation Edit - Visitor not Assistant
+ JOB_INTERN //VOREStation Edit - Intern
+)
+
+
+var/list/security_positions = list(
+ JOB_HEAD_OF_SECURITY,
+ JOB_WARDEN,
+ JOB_DETECTIVE,
+ JOB_SECURITY_OFFICER
+)
+
+
+var/list/planet_positions = list(
+ JOB_PATHFINDER, // VOREStation Edit - Added Pathfinder
+ JOB_EXPLORER,
+ JOB_PILOT,
+ JOB_FIELD_MEDIC // VOREStation Edit - Field Medic
+)
+
+
+var/list/nonhuman_positions = list(
+ JOB_AI,
+ JOB_CYBORG,
+ JOB_PAI
+)
+
+var/list/whitelisted_positions = list(
+ JOB_SITE_MANAGER,
+ JOB_HEAD_OF_PERSONNEL,
+ JOB_HEAD_OF_SECURITY,
+ JOB_CHIEF_ENGINEER,
+ JOB_RESEARCH_DIRECTOR,
+ JOB_CHIEF_MEDICAL_OFFICER,
+ JOB_INTERNAL_AFFAIRS_AGENT,
+ JOB_AI
+)
+
/obj/machinery/computer3/card
default_prog = /datum/file/program/card_comp
spawn_parts = list(/obj/item/part/computer/storage/hdd,/obj/item/part/computer/cardslot/dual)
@@ -189,7 +268,7 @@
// These are here partly in order to be overwritten by the centcom card computer code
/datum/file/program/card_comp/proc/authenticate()
- if(access_change_ids in reader.GetAccess())
+ if(ACCESS_CHANGE_IDS in reader.GetAccess())
return 1
if(isAI(usr))
return 1
@@ -342,6 +421,6 @@
return accesses
/datum/file/program/card_comp/centcom/authenticate()
- if(access_cent_captain in reader.GetAccess())
+ if(ACCESS_CENT_CAPTAIN in reader.GetAccess())
return 1
return 0
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index f8a86b5858..fbe9625124 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -27,7 +27,7 @@
var/storage_name = "Cryogenic Oversight Control"
var/allow_items = 1
- req_one_access = list(access_heads) //VOREStation Add
+ req_one_access = list(ACCESS_HEADS) //VOREStation Add
/obj/machinery/computer/cryopod/update_icon()
..()
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index c3848234ff..cdf5722a6f 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -7,7 +7,7 @@ Deployable items
name = "deployable"
desc = "deployable"
icon = 'icons/obj/objects.dmi'
- req_access = list(access_security)//I'm changing this until these are properly tested./N
+ req_access = list(ACCESS_SECURITY)//I'm changing this until these are properly tested./N
/obj/machinery/deployable/barrier
name = "deployable barrier"
@@ -19,7 +19,7 @@ Deployable items
var/health = 100.0
var/maxhealth = 100.0
var/locked = 0.0
-// req_access = list(access_maint_tunnels)
+// req_access = list(ACCESS_MAINT_TUNNELS)
/obj/machinery/deployable/barrier/Initialize(mapload)
. = ..()
@@ -50,12 +50,12 @@ Deployable items
if(health < maxhealth)
health = maxhealth
emagged = 0
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
visible_message(span_warning("[user] repairs \the [src]!"))
return
else if(emagged > 0)
emagged = 0
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
visible_message(span_warning("[user] repairs \the [src]!"))
return
return
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index dfbfc45805..3cf103c9b0 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -126,7 +126,7 @@
/obj/machinery/door/airlock/command
name = "Command Airlock"
icon = 'icons/obj/doors/Doorcom.dmi'
- req_one_access = list(access_heads)
+ req_one_access = list(ACCESS_HEADS)
assembly_type = /obj/structure/door_assembly/door_assembly_com
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
@@ -137,7 +137,7 @@
/obj/machinery/door/airlock/security
name = "Security Airlock"
icon = 'icons/obj/doors/Doorsec.dmi'
- req_one_access = list(access_security)
+ req_one_access = list(ACCESS_SECURITY)
assembly_type = /obj/structure/door_assembly/door_assembly_sec
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
@@ -148,7 +148,7 @@
/obj/machinery/door/airlock/engineering
name = "Engineering Airlock"
icon = 'icons/obj/doors/Dooreng.dmi'
- req_one_access = list(access_engine)
+ req_one_access = list(ACCESS_ENGINE)
assembly_type = /obj/structure/door_assembly/door_assembly_eng
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
@@ -159,7 +159,7 @@
/obj/machinery/door/airlock/engineeringatmos
name = "Atmospherics Airlock"
icon = 'icons/obj/doors/Doorengatmos.dmi'
- req_one_access = list(access_atmospherics)
+ req_one_access = list(ACCESS_ATMOSPHERICS)
assembly_type = /obj/structure/door_assembly/door_assembly_eat
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
@@ -170,7 +170,7 @@
/obj/machinery/door/airlock/medical
name = "Medical Airlock"
icon = 'icons/obj/doors/doormed.dmi'
- req_one_access = list(access_medical)
+ req_one_access = list(ACCESS_MEDICAL)
assembly_type = /obj/structure/door_assembly/door_assembly_med
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
@@ -181,14 +181,14 @@
/obj/machinery/door/airlock/maintenance
name = "Maintenance Access"
icon = 'icons/obj/doors/Doormaint.dmi'
- //req_one_access = list(access_maint_tunnels) //Maintenance is open access
+ //req_one_access = list(ACCESS_MAINT_TUNNELS) //Maintenance is open access
assembly_type = /obj/structure/door_assembly/door_assembly_mai
open_sound_powered = 'sound/machines/door/door2o.ogg'
close_sound_powered = 'sound/machines/door/door2c.ogg'
/obj/machinery/door/airlock/maintenance/cargo
icon = 'icons/obj/doors/Doormaint_cargo.dmi'
- req_one_access = list(access_cargo)
+ req_one_access = list(ACCESS_CARGO)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/door2o.ogg'
@@ -196,7 +196,7 @@
/obj/machinery/door/airlock/maintenance/command
icon = 'icons/obj/doors/Doormaint_command.dmi'
- req_one_access = list(access_heads)
+ req_one_access = list(ACCESS_HEADS)
/obj/machinery/door/airlock/maintenance/common
icon = 'icons/obj/doors/Doormaint_common.dmi'
@@ -205,22 +205,22 @@
/obj/machinery/door/airlock/maintenance/engi
icon = 'icons/obj/doors/Doormaint_engi.dmi'
- req_one_access = list(access_engine)
+ req_one_access = list(ACCESS_ENGINE)
/obj/machinery/door/airlock/maintenance/int
icon = 'icons/obj/doors/Doormaint_int.dmi'
/obj/machinery/door/airlock/maintenance/medical
icon = 'icons/obj/doors/Doormaint_med.dmi'
- req_one_access = list(access_medical)
+ req_one_access = list(ACCESS_MEDICAL)
/obj/machinery/door/airlock/maintenance/rnd
icon = 'icons/obj/doors/Doormaint_rnd.dmi'
- req_one_access = list(access_research)
+ req_one_access = list(ACCESS_RESEARCH)
/obj/machinery/door/airlock/maintenance/sec
icon = 'icons/obj/doors/Doormaint_sec.dmi'
- req_one_access = list(access_security)
+ req_one_access = list(ACCESS_SECURITY)
/obj/machinery/door/airlock/external
name = "External Airlock"
@@ -235,7 +235,7 @@
// For convenience in making docking ports: one that is pre-bolted with frequency set!
/obj/machinery/door/airlock/external/bolted/cycling
- frequency = 1379
+ frequency = AIRLOCK_FREQ
/obj/machinery/door/airlock/glass_external
name = "External Airlock"
@@ -243,7 +243,7 @@
assembly_type = /obj/structure/door_assembly/door_assembly_ext
opacity = 0
glass = 1
- req_one_access = list(access_external_airlocks)
+ req_one_access = list(ACCESS_EXTERNAL_AIRLOCKS)
open_sound_powered = 'sound/machines/door/space1o.ogg'
close_sound_powered = 'sound/machines/door/space1c.ogg'
@@ -264,7 +264,7 @@
/obj/machinery/door/airlock/centcom
name = "Centcom Airlock"
icon = 'icons/obj/doors/Doorele.dmi'
- req_one_access = list(access_cent_general)
+ req_one_access = list(ACCESS_CENT_GENERAL)
opacity = 1
open_sound_powered = 'sound/machines/door/cmd3o.ogg'
close_sound_powered = 'sound/machines/door/cmd3c.ogg'
@@ -286,7 +286,7 @@
opacity = 1
secured_wires = 1
assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites.
- req_one_access = list(access_heads_vault)
+ req_one_access = list(ACCESS_HEADS_VAULT)
open_sound_powered = 'sound/machines/door/vault1o.ogg'
close_sound_powered = 'sound/machines/door/vault1c.ogg'
security_level = 5
@@ -307,7 +307,7 @@
explosion_resistance = 20
opacity = 1
assembly_type = /obj/structure/door_assembly/door_assembly_hatch
- req_one_access = list(access_maint_tunnels)
+ req_one_access = list(ACCESS_MAINT_TUNNELS)
open_sound_powered = 'sound/machines/door/hatchopen.ogg'
close_sound_powered = 'sound/machines/door/hatchclose.ogg'
open_sound_unpowered = 'sound/machines/door/hatchforced.ogg'
@@ -318,7 +318,7 @@
explosion_resistance = 20
opacity = 1
assembly_type = /obj/structure/door_assembly/door_assembly_mhatch
- req_one_access = list(access_maint_tunnels)
+ req_one_access = list(ACCESS_MAINT_TUNNELS)
open_sound_powered = 'sound/machines/door/hatchopen.ogg'
close_sound_powered = 'sound/machines/door/hatchclose.ogg'
open_sound_unpowered = 'sound/machines/door/hatchforced.ogg'
@@ -332,7 +332,7 @@
opacity = 0
assembly_type = /obj/structure/door_assembly/door_assembly_com
glass = 1
- req_one_access = list(access_heads)
+ req_one_access = list(ACCESS_HEADS)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/cmd1o.ogg'
@@ -348,7 +348,7 @@
opacity = 0
assembly_type = /obj/structure/door_assembly/door_assembly_eng
glass = 1
- req_one_access = list(access_engine)
+ req_one_access = list(ACCESS_ENGINE)
department_open_powered = 'sound/machines/door/eng1o.ogg'
department_close_powered = 'sound/machines/door/eng1c.ogg'
security_level = 1.5
@@ -362,7 +362,7 @@
opacity = 0
assembly_type = /obj/structure/door_assembly/door_assembly_eat
glass = 1
- req_one_access = list(access_atmospherics)
+ req_one_access = list(ACCESS_ATMOSPHERICS)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/eng1o.ogg'
@@ -378,7 +378,7 @@
opacity = 0
assembly_type = /obj/structure/door_assembly/door_assembly_sec
glass = 1
- req_one_access = list(access_security)
+ req_one_access = list(ACCESS_SECURITY)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/sec1o.ogg'
@@ -394,7 +394,7 @@
opacity = 0
assembly_type = /obj/structure/door_assembly/door_assembly_med
glass = 1
- req_one_access = list(access_medical)
+ req_one_access = list(ACCESS_MEDICAL)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/med1o.ogg'
@@ -405,7 +405,7 @@
name = "Mining Airlock"
icon = 'icons/obj/doors/Doormining.dmi'
assembly_type = /obj/structure/door_assembly/door_assembly_min
- req_one_access = list(access_mining)
+ req_one_access = list(ACCESS_MINING)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/cgo1o.ogg'
@@ -415,7 +415,7 @@
name = "Atmospherics Airlock"
icon = 'icons/obj/doors/Dooratmo.dmi'
assembly_type = /obj/structure/door_assembly/door_assembly_atmo
- req_one_access = list(access_atmospherics)
+ req_one_access = list(ACCESS_ATMOSPHERICS)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/eng1o.ogg'
@@ -441,7 +441,7 @@
opacity = 0
assembly_type = /obj/structure/door_assembly/door_assembly_research
glass = 1
- req_one_access = list(access_research)
+ req_one_access = list(ACCESS_RESEARCH)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/sci1o.ogg'
@@ -457,7 +457,7 @@
opacity = 0
assembly_type = /obj/structure/door_assembly/door_assembly_min
glass = 1
- req_one_access = list(access_mining)
+ req_one_access = list(ACCESS_MINING)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/cgo1o.ogg'
@@ -472,7 +472,7 @@
opacity = 0
assembly_type = /obj/structure/door_assembly/door_assembly_atmo
glass = 1
- req_one_access = list(access_atmospherics)
+ req_one_access = list(ACCESS_ATMOSPHERICS)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/eng1o.ogg'
@@ -557,7 +557,7 @@
name = "Research Airlock"
icon = 'icons/obj/doors/doorsci.dmi'
assembly_type = /obj/structure/door_assembly/door_assembly_science
- req_one_access = list(access_research)
+ req_one_access = list(ACCESS_RESEARCH)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/sci1o.ogg'
@@ -570,7 +570,7 @@
opacity = 0
assembly_type = /obj/structure/door_assembly/door_assembly_science
glass = 1
- req_one_access = list(access_research)
+ req_one_access = list(ACCESS_RESEARCH)
open_sound_powered = 'sound/machines/door/hall1o.ogg'
close_sound_powered = 'sound/machines/door/hall1c.ogg'
department_open_powered = 'sound/machines/door/sci1o.ogg'
@@ -583,7 +583,7 @@
explosion_resistance = 20
secured_wires = 1
assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity
- req_one_access = list(access_heads_vault)
+ req_one_access = list(ACCESS_HEADS_VAULT)
open_sound_powered = 'sound/machines/door/secure1o.ogg'
close_sound_powered = 'sound/machines/door/secure1c.ogg'
security_level = 4
@@ -633,7 +633,7 @@
secured_wires = TRUE
hackProof = TRUE
assembly_type = /obj/structure/door_assembly/door_assembly_alien
- req_one_access = list(access_alien)
+ req_one_access = list(ACCESS_ALIEN)
security_level = 100
/obj/machinery/door/airlock/alien/locked
diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm
index 01a1038971..3119789181 100644
--- a/code/game/machinery/doors/airlock_control.dm
+++ b/code/game/machinery/doors/airlock_control.dm
@@ -167,7 +167,7 @@
var/id_tag
var/master_tag
- var/frequency = 1379
+ var/frequency = AIRLOCK_FREQ
var/command = "cycle"
var/datum/radio_frequency/radio_connection
@@ -294,7 +294,7 @@
circuit = /obj/item/circuitboard/airlock_cycling
var/master_tag
- var/frequency = 1449
+ var/frequency = AMAG_ELE_FREQ
var/command = "cycle"
var/datum/radio_frequency/radio_connection
@@ -378,9 +378,9 @@
return ..()
/obj/machinery/access_button/airlock_interior
- frequency = 1379
+ frequency = AIRLOCK_FREQ
command = "cycle_interior"
/obj/machinery/access_button/airlock_exterior
- frequency = 1379
+ frequency = AIRLOCK_FREQ
command = "cycle_exterior"
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index b337e6b2ca..cc097b51ac 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -6,8 +6,8 @@
matter = list(MAT_STEEL = 50,MAT_GLASS = 50)
- req_one_access = list(access_engine, access_talon) // Access to unlock the device, ignored if emagged //VOREStation Edit - Add talon
- var/list/apply_any_access = list(access_engine) // Can apply any access, not just their own
+ req_one_access = list(ACCESS_ENGINE, ACCESS_TALON) // Access to unlock the device, ignored if emagged //VOREStation Edit - Add talon
+ var/list/apply_any_access = list(ACCESS_ENGINE) // Can apply any access, not just their own
var/secure = 0 //if set, then wires will be randomized and bolts will drop if the door is broken
var/list/conf_access = null
diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm
index 76950f5f9a..445da8dcd7 100644
--- a/code/game/machinery/doors/alarmlock.dm
+++ b/code/game/machinery/doors/alarmlock.dm
@@ -6,7 +6,7 @@
glass = 1
var/datum/radio_frequency/air_connection
- var/air_frequency = 1437
+ var/air_frequency = ALERT_FREQ
autoclose = 0
/obj/machinery/door/airlock/alarmlock/Destroy()
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 4697c98675..8426e724ff 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -22,7 +22,7 @@
icon_state = "frame"
layer = ABOVE_WINDOW_LAYER
desc = "A remote control for a door."
- req_access = list(access_brig)
+ req_access = list(ACCESS_BRIG)
anchored = TRUE // can't pick it up
density = FALSE // can walk through it.
var/id = null // id of door it controls.
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index c4d9e7c84c..026e36dfb8 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -12,7 +12,7 @@
desc = "Emergency air-tight shutter, capable of sealing off breached areas."
icon = 'icons/obj/doors/DoorHazard.dmi'
icon_state = "door_open"
- req_one_access = list(access_eva) //access_atmospherics, access_engine_equip)
+ req_one_access = list(ACCESS_EVA) //ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP)
opacity = 0
density = FALSE
layer = DOOR_OPEN_LAYER - 0.01
diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index 6c78e6ca56..929dac754c 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -49,4 +49,4 @@
/obj/machinery/door/airlock/multi_tile/metal/mait
icon = 'icons/obj/doors/Door2x1_Maint.dmi'
- //req_one_access = list(access_maint_tunnels) //VOREStaiton Edit - Maintenance is open access
+ //req_one_access = list(ACCESS_MAINT_TUNNELS) //VOREStaiton Edit - Maintenance is open access
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index b5ef064dec..aeaad5e5e7 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -291,7 +291,7 @@
icon = 'icons/obj/doors/windoor.dmi'
icon_state = "leftsecure"
base_state = "leftsecure"
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
var/id = null
maxhealth = 300
health = 300.0 //Stronger doors for prison (regular window door health is 150)
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index c2f3bba77e..53c205b850 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -80,7 +80,7 @@
var/id_tag
//var/radio_power_use = 50 //power used to xmit signals
- var/frequency = 1379
+ var/frequency = AIRLOCK_FREQ
var/radio_filter = null
var/datum/radio_frequency/radio_connection
diff --git a/code/game/machinery/embedded_controller/mapping_helpers.dm b/code/game/machinery/embedded_controller/mapping_helpers.dm
index c0923c1978..4b84fc513d 100644
--- a/code/game/machinery/embedded_controller/mapping_helpers.dm
+++ b/code/game/machinery/embedded_controller/mapping_helpers.dm
@@ -2,7 +2,7 @@
Note that these have to be in the same /area that the controller is in for them to function.
You still need to set the controller's "id_tag" to something unique.
-Any frequency works, it's self-setting, but it seems like people have decided 1381 for airlocks so maybe set that on the controller too.
+Any frequency works, it's self-setting, but it seems like people have decided AUTODOCK_FREQ for airlocks so maybe set that on the controller too.
*/
diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm
index c62eb20195..13d9a94690 100644
--- a/code/game/machinery/gear_dispenser.dm
+++ b/code/game/machinery/gear_dispenser.dm
@@ -474,7 +474,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
/datum/gear_disp/ert/medical_rig,
/datum/gear_disp/ert/engineer_rig,
)
- req_one_access = list(access_cent_specops)
+ req_one_access = list(ACCESS_CENT_SPECOPS)
////////////////////////////// STATION SUIT DISPENSERS ///////////////////////////
@@ -487,7 +487,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
voidsuit_type = /obj/item/clothing/suit/space/void/security
voidhelmet_type = /obj/item/clothing/head/helmet/space/void/security
refit = TRUE
- req_one_access = list(access_brig)
+ req_one_access = list(ACCESS_BRIG)
/datum/gear_disp/voidsuit/station/engineering
name = "Engineering (Voidsuit)"
@@ -495,35 +495,35 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
voidhelmet_type = /obj/item/clothing/head/helmet/space/void/engineering
refit = TRUE
magboots_type = /obj/item/clothing/shoes/magboots
- req_one_access = list(access_engine)
+ req_one_access = list(ACCESS_ENGINE)
/datum/gear_disp/voidsuit/station/medical
name = "Medical (Voidsuit)"
voidsuit_type = /obj/item/clothing/suit/space/void/medical
voidhelmet_type = /obj/item/clothing/head/helmet/space/void/medical
refit = TRUE
- req_one_access = list(access_medical)
+ req_one_access = list(ACCESS_MEDICAL)
/datum/gear_disp/voidsuit/station/atmos
name = "Atmos Technician (Voidsuit)"
voidsuit_type = /obj/item/clothing/suit/space/void/atmos
voidhelmet_type = /obj/item/clothing/head/helmet/space/void/atmos
refit = TRUE
- req_one_access = list(access_atmospherics)
+ req_one_access = list(ACCESS_ATMOSPHERICS)
/datum/gear_disp/voidsuit/station/paramedic
name = JOB_PARAMEDIC + " (Voidsuit)"
voidsuit_type = /obj/item/clothing/suit/space/void/medical/emt
voidhelmet_type = /obj/item/clothing/head/helmet/space/void/medical/emt
refit = TRUE
- req_one_access = list(access_medical) // we don't have separate paramedic access
+ req_one_access = list(ACCESS_MEDICAL) // we don't have separate paramedic access
/datum/gear_disp/voidsuit/station/mining
name = "Mining (Voidsuit)"
voidsuit_type = /obj/item/clothing/suit/space/void/mining
voidhelmet_type = /obj/item/clothing/head/helmet/space/void/mining
refit = TRUE
- req_one_access = list(access_mining)
+ req_one_access = list(ACCESS_MINING)
/obj/machinery/gear_dispenser/suit/station
name = "Station Suit Dispenser"
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index cceb8e6177..e7f7f70f92 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -194,7 +194,7 @@
anchored = TRUE
use_power = USE_POWER_IDLE
idle_power_usage = 45
- var/frequency = 1449
+ var/frequency = AMAG_ELE_FREQ
var/code = 0
var/list/magnets = list()
var/title = "Magnetic Control Console"
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index 78db39aab8..3dbec11300 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(navbeacons) // no I don't like putting this in, but it will do
var/location = "" // location response text
var/codes_txt // DEPRECATED codes as set on map: "tag1;tag2" or "tag1=value;tag2=value"
var/list/codes = list() // assoc. list of transponder codes
- req_access = list(access_engine)
+ req_access = list(ACCESS_ENGINE)
/obj/machinery/navbeacon/Initialize(mapload)
. = ..()
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 9588d87d76..67f4e25701 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -44,7 +44,7 @@
idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power
active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power
power_channel = EQUIP //drains power from the EQUIPMENT channel
- req_one_access = list(access_security, access_heads)
+ req_one_access = list(ACCESS_SECURITY, ACCESS_HEADS)
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
var/raised = FALSE //if the turret cover is "open" and the turret is raised
@@ -97,7 +97,7 @@
var/can_salvage = TRUE // If false, salvaging doesn't give you anything.
/obj/machinery/porta_turret/crescent
- req_one_access = list(access_cent_specops)
+ req_one_access = list(ACCESS_CENT_SPECOPS)
enabled = FALSE
ailock = TRUE
check_synth = FALSE
@@ -121,7 +121,7 @@
installation = /obj/item/gun/energy/laser
/obj/machinery/porta_turret/stationary/syndie // Generic turrets for POIs that need to not shoot their buddies.
- req_one_access = list(access_syndicate)
+ req_one_access = list(ACCESS_SYNDICATE)
enabled = TRUE
check_all = TRUE
faction = FACTION_SYNDICATE // Make sure this equals the faction that the mobs in the POI have or they will fight each other.
@@ -129,7 +129,7 @@
/obj/machinery/porta_turret/ai_defense
name = "defense turret"
desc = "This variant appears to be much more durable."
- req_one_access = list(access_synth) // Just in case.
+ req_one_access = list(ACCESS_SYNTH) // Just in case.
installation = /obj/item/gun/energy/xray // For the armor pen.
health = 250 // Since lasers do 40 each.
maxhealth = 250
@@ -151,7 +151,7 @@
desc = "A very tough looking turret made by alien hands."
catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_turret)
icon_state = "turret_cover_alien"
- req_one_access = list(access_alien)
+ req_one_access = list(ACCESS_ALIEN)
installation = /obj/item/gun/energy/alien
enabled = TRUE
lethal = TRUE
@@ -171,7 +171,7 @@
/obj/machinery/porta_turret/industrial
name = "industrial turret"
desc = "This variant appears to be much more rugged."
- req_one_access = list(access_heads)
+ req_one_access = list(ACCESS_HEADS)
icon_state = "turret_cover_industrial"
installation = /obj/item/gun/energy/locked/phasegun/unlocked
health = 200
@@ -197,7 +197,7 @@
/obj/machinery/porta_turret/industrial/teleport_defense
name = "defense turret"
desc = "This variant appears to be much more durable, with a rugged outer coating."
- req_one_access = list(access_heads)
+ req_one_access = list(ACCESS_HEADS)
installation = /obj/item/gun/energy/gun/burst
health = 250
maxhealth = 250
diff --git a/code/game/machinery/portable_turret_vr.dm b/code/game/machinery/portable_turret_vr.dm
index 1c213d0ad7..3660b9fffe 100644
--- a/code/game/machinery/portable_turret_vr.dm
+++ b/code/game/machinery/portable_turret_vr.dm
@@ -1,7 +1,7 @@
/obj/machinery/porta_turret/stationary/CIWS
name = "CIWS turret"
desc = "A ship weapons turret designed for light defense."
- req_one_access = list(access_cent_general)
+ req_one_access = list(ACCESS_CENT_GENERAL)
health = 200
maxhealth = 200
enabled = TRUE
@@ -12,7 +12,7 @@
/obj/machinery/porta_turret/stationary/syndie/CIWS
name = "mercenary CIWS turret"
desc = "A ship weapons turret designed for light defense."
- req_one_access = list(access_syndicate)
+ req_one_access = list(ACCESS_SYNDICATE)
health = 200
maxhealth = 200
enabled = TRUE
@@ -23,7 +23,7 @@
/obj/machinery/porta_turret/industrial/military
name = "military CIWS turret"
desc = "A ship weapons turret designed for anti-fighter defense."
- req_one_access = list(access_cent_general)
+ req_one_access = list(ACCESS_CENT_GENERAL)
installation = /obj/item/gun/energy/pulse_rifle/destroyer
health = 500
maxhealth = 500
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index fe712f6612..2ebf45fbcc 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -259,7 +259,7 @@ GLOBAL_LIST_EMPTY_TYPED(allConsoles, /obj/machinery/requests_console)
SStgui.update_uis(src)
if(screen == RCS_ANNOUNCE)
var/obj/item/card/id/ID = O
- if(access_RC_announce in ID.GetAccess())
+ if(ACCESS_RC_ANNOUNCE in ID.GetAccess())
announceAuth = 1
announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name
else
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index ec8ae422d8..7a17654cb3 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -34,7 +34,7 @@
var/index2
var/picture = null
- var/frequency = 1435 // radio frequency
+ var/frequency = DISPLAY_FREQ // radio frequency
var/friendc = 0 // track if Friend Computer mode
var/ignore_friendc = 0
diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm
index 583d6ea8ee..1e2bd9dd04 100644
--- a/code/game/machinery/suit_storage/suit_cycler.dm
+++ b/code/game/machinery/suit_storage/suit_cycler.dm
@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache)
icon = 'icons/obj/suit_cycler.dmi'
icon_state = "suit_cycler"
- req_access = list(access_captain,access_heads)
+ req_access = list(ACCESS_CAPTAIN,ACCESS_HEADS)
var/active = 0 // PLEASE HOLD.
var/safeties = 1 // The cycler won't start with a living thing inside it unless safeties are off.
diff --git a/code/game/machinery/suit_storage/suit_cycler_units.dm b/code/game/machinery/suit_storage/suit_cycler_units.dm
index f77cb6d4d1..b21c5d7daa 100644
--- a/code/game/machinery/suit_storage/suit_cycler_units.dm
+++ b/code/game/machinery/suit_storage/suit_cycler_units.dm
@@ -11,7 +11,7 @@
name = "Engineering suit cycler"
model_text = "Engineering"
icon_state = "engi_cycler"
- req_access = list(access_construction)
+ req_access = list(ACCESS_CONSTRUCTION)
limit_departments = list(
/datum/suit_cycler_choice/department/eng
)
@@ -20,7 +20,7 @@
name = "Mining suit cycler"
model_text = "Mining"
icon_state = "industrial_cycler"
- req_access = list(access_mining)
+ req_access = list(ACCESS_MINING)
limit_departments = list(
/datum/suit_cycler_choice/department/crg
)
@@ -29,7 +29,7 @@
name = "Security suit cycler"
model_text = "Security"
icon_state = "sec_cycler"
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
limit_departments = list(
/datum/suit_cycler_choice/department/sec
)
@@ -38,7 +38,7 @@
name = "Medical suit cycler"
model_text = "Medical"
icon_state = "med_cycler"
- req_access = list(access_medical)
+ req_access = list(ACCESS_MEDICAL)
limit_departments = list(
/datum/suit_cycler_choice/department/med
)
@@ -47,7 +47,7 @@
name = "Nonstandard suit cycler"
model_text = "Nonstandard"
icon_state = "red_cycler"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
limit_departments = list(
/datum/suit_cycler_choice/department/emag
)
diff --git a/code/game/machinery/suit_storage/suit_cycler_units_vr.dm b/code/game/machinery/suit_storage/suit_cycler_units_vr.dm
index 604d6320bd..c7e2297bb3 100644
--- a/code/game/machinery/suit_storage/suit_cycler_units_vr.dm
+++ b/code/game/machinery/suit_storage/suit_cycler_units_vr.dm
@@ -1,70 +1,70 @@
// Old Exploration is too WIP to use right now
/obj/machinery/suit_cycler/exploration
req_access = null
- req_one_access = list(access_explorer,access_medical_equip) //CHOMP explo keep
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_MEDICAL_EQUIP)
/obj/machinery/suit_cycler/pilot
- req_access = list(access_pilot)
+ req_access = list(ACCESS_PILOT)
/obj/machinery/suit_cycler/captain
name = "Manager suit cycler"
model_text = "Manager"
icon_state = "cap_cycler"
- req_access = list(access_captain)
+ req_access = list(ACCESS_CAPTAIN)
departments = list(/datum/suit_cycler_choice/department/captain)
/obj/machinery/suit_cycler/prototype
name = "Prototype suit cycler"
model_text = "Prototype"
icon_state = "industrial_cycler"
- req_access = list(access_hos)
+ req_access = list(ACCESS_HOS)
departments = list(/datum/suit_cycler_choice/department/prototype)
/obj/machinery/suit_cycler/vintage/tcrew
name = "Talon crew suit cycler"
model_text = "Talon crew"
icon_state = "dark_cycler"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
departments = list(/datum/suit_cycler_choice/department/talon/crew)
/obj/machinery/suit_cycler/vintage/tpilot
name = "Talon pilot suit cycler"
model_text = "Talon pilot"
icon_state = "dark_cycler"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
departments = list(/datum/suit_cycler_choice/department/talon/pilot)
/obj/machinery/suit_cycler/vintage/tengi
name = "Talon engineer suit cycler"
model_text = "Talon engineer"
icon_state = "dark_cycler"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
departments = list(/datum/suit_cycler_choice/department/talon/eng)
/obj/machinery/suit_cycler/vintage/tguard
name = "Talon guard suit cycler"
model_text = "Talon guard"
icon_state = "dark_cycler"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
departments = list(/datum/suit_cycler_choice/department/talon/marine)
/obj/machinery/suit_cycler/vintage/tmedic
name = "Talon doctor suit cycler"
model_text = "Talon doctor"
icon_state = "dark_cycler"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
departments = list(/datum/suit_cycler_choice/department/talon/med)
/obj/machinery/suit_cycler/vintage/tcaptain
name = "Talon captain suit cycler"
model_text = "Talon captain"
icon_state = "dark_cycler"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
departments = list(/datum/suit_cycler_choice/department/talon/officer)
/obj/machinery/suit_cycler/vintage/tminer
name = "Talon miner suit cycler"
model_text = "Talon miner"
icon_state = "dark_cycler"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
departments = list(/datum/suit_cycler_choice/department/talon/miner)
diff --git a/code/game/machinery/suit_storage_unit_yw.dm b/code/game/machinery/suit_storage_unit_yw.dm
index 7100fae302..996774d7d5 100644
--- a/code/game/machinery/suit_storage_unit_yw.dm
+++ b/code/game/machinery/suit_storage_unit_yw.dm
@@ -1,2 +1,2 @@
/obj/machinery/suit_cycler/prototype
- req_access = list(access_hos)
+ req_access = list(ACCESS_HOS)
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index 704864c8c7..4bc122db31 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -17,7 +17,7 @@
var/universal_translate = 0 // set to 1 if it can translate nonhuman speech
- req_access = list(access_tcomsat)
+ req_access = list(ACCESS_TCOMSAT)
/obj/machinery/computer/telecomms/server/tgui_data(mob/user)
var/list/data = list()
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 72a3c0a5be..eca6ec4e31 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -226,7 +226,7 @@
change_frequency = newfreq
set_temp("-% New frequency to change to assigned: \"[newfreq] GHz\" %-", "average")
else
- change_frequency = 0
+ change_frequency = ZERO_FREQ
set_temp("-% Frequency changing deactivated %-", "average")
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index 4a52f022b8..0fa80cd2fa 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -464,7 +464,7 @@
machinetype = 2
circuit = /obj/item/circuitboard/telecomms/bus
netspeed = 40
- var/change_frequency = 0
+ var/change_frequency = ZERO_FREQ
/obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index 6b50bdc59b..9cc662b739 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -16,7 +16,7 @@
var/list/viewingcode = list()
var/obj/machinery/telecomms/server/SelectedServer
circuit = /obj/item/circuitboard/comm_traffic
- req_access = list(access_tcomsat)
+ req_access = list(ACCESS_TCOMSAT)
var/network = "NULL" // the network to probe
var/temp = "" // temporary feedback messages
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index 06566f2e2a..956fd67f1f 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -32,7 +32,8 @@
var/ailock = FALSE //Silicons cannot use this
var/syndicate = FALSE
- req_access = list(access_ai_upload)
+
+ req_access = list(ACCESS_AI_UPLOAD)
/obj/machinery/turretid/stun
enabled = TRUE
diff --git a/code/game/machinery/vending_yw.dm b/code/game/machinery/vending_yw.dm
index 4feb714428..99ab2e3ac1 100644
--- a/code/game/machinery/vending_yw.dm
+++ b/code/game/machinery/vending_yw.dm
@@ -26,9 +26,9 @@
desc = "A security equipment vendor."
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
icon_state = "sec"
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
products = list(/obj/item/handcuffs = 8,/obj/item/grenade/flashbang = 4,/obj/item/flash = 5,
/obj/item/reagent_containers/food/snacks/donut/plain = 12,/obj/item/storage/box/evidence = 6)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/box/donut = 2)
- req_log_access = access_armory
+ req_log_access = ACCESS_ARMORY
has_logs = 1
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index 4f0d724943..1cc9a92848 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -6,7 +6,7 @@
internal_damage_threshold = 50
maint_access = 0
//add_req_access = 0
- //operation_req_access = list(access_hos)
+ //operation_req_access = list(ACCESS_HOS)
var/am = "d3c2fbcadca903a41161ccc9df9cf948"
max_hull_equip = 2
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index 13106c7907..a6549708e9 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -10,7 +10,7 @@
deflect_chance = 25
max_temperature = 60000
infra_luminosity = 3
- operation_req_access = list(access_cent_specops)
+ operation_req_access = list(ACCESS_CENT_SPECOPS)
wreckage = /obj/effect/decal/mecha_wreckage/marauder
add_req_access = 0
internal_damage_threshold = 25
@@ -52,7 +52,7 @@
catalogue_data = list(/datum/category_item/catalogue/technology/seraph)
icon_state = "seraph"
initial_icon = "seraph"
- operation_req_access = list(access_cent_creed)
+ operation_req_access = list(ACCESS_CENT_CREED)
step_in = 3
health = 450
wreckage = /obj/effect/decal/mecha_wreckage/seraph
@@ -74,7 +74,7 @@
name = "Mauler"
icon_state = "mauler"
initial_icon = "mauler"
- operation_req_access = list(access_syndicate)
+ operation_req_access = list(ACCESS_SYNDICATE)
wreckage = /obj/effect/decal/mecha_wreckage/mauler
mech_faction = MECH_FACTION_SYNDI
diff --git a/code/game/mecha/mech_sensor.dm b/code/game/mecha/mech_sensor.dm
index 77a6a64575..088d102cae 100644
--- a/code/game/mecha/mech_sensor.dm
+++ b/code/game/mecha/mech_sensor.dm
@@ -12,7 +12,7 @@
var/on = 0
var/id_tag = null
- var/frequency = 1379
+ var/frequency = AIRLOCK_FREQ
var/datum/radio_frequency/radio_connection
/obj/machinery/mech_sensor/CanPass(atom/movable/mover, turf/target)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index cb06f152fa..adecd56942 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -69,7 +69,7 @@
var/internal_damage = 0 //Contains bitflags
var/list/operation_req_access = list() //Required access level for mecha operation
- var/list/internals_req_access = list(access_engine,access_robotics) //Required access level to open cell compartment
+ var/list/internals_req_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS) //Required access level to open cell compartment
var/wreckage
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 976ed9c647..8ab37b94fe 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -4,7 +4,7 @@
icon_keyboard = "rd_key"
icon_screen = "mecha"
light_color = "#a97faa"
- req_access = list(access_robotics)
+ req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/circuitboard/mecha_control
var/list/located = list()
var/screen = 0
diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm
index 445589a203..fcd0282ed1 100644
--- a/code/game/mecha/micro/micro.dm
+++ b/code/game/mecha/micro/micro.dm
@@ -17,7 +17,7 @@
max_micro_utility_equip = 1
max_micro_weapon_equip = 1
//add_req_access = 0
- //operation_req_access = list(access_hos)
+ //operation_req_access = list(ACCESS_HOS)
var/am = "d3c2fbcadca903a41161ccc9df9cf948"
damage_minimum = 0 //Incoming damage lower than this won't actually deal damage. Scrapes shouldn't be a real thing.
minimum_penetration = 0 //Incoming damage won't be fully applied if you don't have at least 20. Almost all AP clears this.
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index dd38831b03..f42b9bd025 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -68,7 +68,7 @@
switch(action)
if("wipe")
- msg_admin_attack("[key_name_admin(ui.user)] wiped [key_name_admin(AI)] with \the [src].")
+ msg_admin_attack("[key_name_admin(ui.user)] wiped [key_name_admin(AI_DEPT)] with \the [src].")
add_attack_logs(ui.user,carded_ai,"Purged from AI Card")
INVOKE_ASYNC(src, PROC_REF(wipe_ai))
if("radio")
@@ -170,15 +170,15 @@
rig.forced_move(direction, user)
/obj/item/aicard/proc/wipe_ai()
- var/mob/living/silicon/ai/AI = carded_ai
+ var/mob/living/silicon/ai/our_ai = carded_ai
flush = TRUE
- AI.suiciding = TRUE
- to_chat(AI, "Your power has been disabled!")
- while(AI && AI.stat != DEAD)
+ our_ai.suiciding = TRUE
+ to_chat(our_ai, "Your power has been disabled!")
+ while(our_ai && our_ai.stat != DEAD)
// This is absolutely evil and I love it.
- if(AI.deployed_shell && prob(AI.oxyloss)) //You feel it creeping? Eventually will reach 100, resulting in the second half of the AI's remaining life being lonely.
- AI.disconnect_shell("Disconnecting from remote shell due to insufficent power.")
- AI.adjustOxyLoss(2)
- AI.updatehealth()
+ if(our_ai.deployed_shell && prob(our_ai.oxyloss)) //You feel it creeping? Eventually will reach 100, resulting in the second half of the AI's remaining life being lonely.
+ our_ai.disconnect_shell("Disconnecting from remote shell due to insufficent power.")
+ our_ai.adjustOxyLoss(2)
+ our_ai.updatehealth()
sleep(10)
flush = FALSE
diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm
index d10632eaeb..d3abdf1049 100644
--- a/code/game/objects/items/devices/holowarrant.dm
+++ b/code/game/objects/items/devices/holowarrant.dm
@@ -42,7 +42,7 @@
/obj/item/holowarrant/attackby(obj/item/W, mob/user)
if(active)
var/obj/item/card/id/I = W.GetIdCard()
- if(access_hos in I.GetAccess()) // VOREStation edit
+ if(ACCESS_HOS in I.GetAccess()) // VOREStation edit
var/choice = tgui_alert(user, "Would you like to authorize this warrant?","Warrant authorization",list("Yes","No"))
if(choice == "Yes")
active.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]"
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 1613649bce..b503288fcd 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -504,7 +504,7 @@
if(has_channel_access(card.pai, internal_chan))
channels += ch_name
channels[ch_name] = 1
- secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
+ secure_radio_connections[ch_name] = SSradio.add_object(src, GLOB.radiochannels[ch_name], RADIO_CHAT)
/obj/item/paicard/typeb
name = "personal AI device"
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index ec099a8536..e07a5ef794 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -7,7 +7,7 @@
slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi',
)
item_state = "electropack"
- frequency = 1449
+ frequency = AMAG_ELE_FREQ
slot_flags = SLOT_BACK
w_class = ITEMSIZE_HUGE
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index e15e56facd..27e0bbf0a9 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -100,7 +100,7 @@
for(var/ch_name in channels)
- SSradio.remove_object(src, radiochannels[ch_name])
+ SSradio.remove_object(src, GLOB.radiochannels[ch_name])
secure_radio_connections[ch_name] = null
@@ -196,7 +196,7 @@
return
for (var/ch_name in channels)
- secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
+ secure_radio_connections[ch_name] = SSradio.add_object(src, GLOB.radiochannels[ch_name], RADIO_CHAT)
if(setDescription)
setupRadioDescription()
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index effe85ff39..2960fe66ce 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -85,7 +85,7 @@
/obj/item/radio/intercom/omni
name = "global announcer"
/obj/item/radio/intercom/omni/Initialize(mapload)
- channels = radiochannels.Copy()
+ channels = GLOB.radiochannels.Copy()
return ..()
/obj/item/radio/intercom/Initialize(mapload)
@@ -100,7 +100,7 @@
. = ..()
internal_channels = list(
num2text(PUB_FREQ) = list(),
- num2text(SEC_I_FREQ) = list(access_security)
+ num2text(SEC_I_FREQ) = list(ACCESS_SECURITY)
)
/obj/item/radio/intercom/entertainment/Initialize(mapload)
@@ -119,7 +119,7 @@
/obj/item/radio/intercom/syndicate/Initialize(mapload)
. = ..()
- internal_channels[num2text(SYND_FREQ)] = list(access_syndicate)
+ internal_channels[num2text(SYND_FREQ)] = list(ACCESS_SYNDICATE)
/obj/item/radio/intercom/raider
name = "illicit intercom"
@@ -130,7 +130,7 @@
/obj/item/radio/intercom/raider/Initialize(mapload)
. = ..()
- internal_channels[num2text(RAID_FREQ)] = list(access_syndicate)
+ internal_channels[num2text(RAID_FREQ)] = list(ACCESS_SYNDICATE)
/obj/item/radio/intercom/attack_ai(mob/user as mob)
src.add_fingerprint(user)
@@ -239,4 +239,4 @@
/obj/item/radio/intercom/locked/confessional
name = "confessional intercom"
- frequency = 1481
+ frequency = LOCKED_COM_FREQ
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 59e72b0b67..4586491040 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -57,7 +57,7 @@
set_frequency(frequency)
for (var/ch_name in channels)
- secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
+ secure_radio_connections[ch_name] = SSradio.add_object(src, GLOB.radiochannels[ch_name], RADIO_CHAT)
wires = new(src)
internal_channels = GLOB.default_internal_channels.Copy()
@@ -109,7 +109,7 @@
if(SSradio)
SSradio.remove_object(src, frequency)
for (var/ch_name in channels)
- SSradio.remove_object(src, radiochannels[ch_name])
+ SSradio.remove_object(src, GLOB.radiochannels[ch_name])
return ..()
/obj/item/radio/proc/recalculateChannels()
@@ -171,7 +171,7 @@
var/chan_stat = channels[ch_name]
var/listening = !!(chan_stat & FREQ_LISTENING) != 0
- dat.Add(list(list("chan" = ch_name, "display_name" = ch_name, "secure_channel" = 1, "sec_channel_listen" = !listening, "freq" = radiochannels[ch_name])))
+ dat.Add(list(list("chan" = ch_name, "display_name" = ch_name, "secure_channel" = 1, "sec_channel_listen" = !listening, "freq" = GLOB.radiochannels[ch_name])))
return dat
@@ -649,7 +649,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
for(var/ch_name in channels)
- SSradio.remove_object(src, radiochannels[ch_name])
+ SSradio.remove_object(src, GLOB.radiochannels[ch_name])
secure_radio_connections[ch_name] = null
@@ -714,17 +714,17 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
name = "broken radio headset"
return
for (var/ch_name in channels)
- secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
+ secure_radio_connections[ch_name] = SSradio.add_object(src, GLOB.radiochannels[ch_name], RADIO_CHAT)
/obj/item/radio/proc/config(op)
if(SSradio)
for (var/ch_name in channels)
- SSradio.remove_object(src, radiochannels[ch_name])
+ SSradio.remove_object(src, GLOB.radiochannels[ch_name])
secure_radio_connections = new
channels = op
if(SSradio)
for (var/ch_name in op)
- secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
+ secure_radio_connections[ch_name] = SSradio.add_object(src, GLOB.radiochannels[ch_name], RADIO_CHAT)
return
/obj/item/radio/off
diff --git a/code/game/objects/items/devices/scanners/guide.dm b/code/game/objects/items/devices/scanners/guide.dm
index 3ed7006154..3800a2c70d 100644
--- a/code/game/objects/items/devices/scanners/guide.dm
+++ b/code/game/objects/items/devices/scanners/guide.dm
@@ -18,10 +18,10 @@
var/obj/item/card/id/ourid = user?.GetIdCard()
if(!ourid)
return
- if(access_change_ids in ourid.GetAccess())
+ if(ACCESS_CHANGE_IDS in ourid.GetAccess())
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
return
- if(access_medical in ourid.GetAccess())
+ if(ACCESS_MEDICAL in ourid.GetAccess())
playsound(src, 'sound/effects/pop.ogg', 50, FALSE)
else
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm
index 295c7d7019..cca907c1be 100644
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -269,7 +269,7 @@
/* //These were originally supposed to have radios in them. Doesn't work.
/obj/item/radio/bug
listening = 0 //turn it on first
- frequency = 1359 //sec comms
+ frequency = SEC_FREQ //sec comms
broadcasting = 0
canhear_range = 1
name = "camera bug device"
diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm
index 60c0b72119..c6ae8ee2bc 100644
--- a/code/game/objects/items/devices/uplink.dm
+++ b/code/game/objects/items/devices/uplink.dm
@@ -235,7 +235,7 @@
hidden_uplink.trigger(user)
/obj/item/radio/headset/uplink
- traitor_frequency = 1445
+ traitor_frequency = BEACON_FREQ
/obj/item/radio/headset/uplink/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/weapons/circuitboards/computer/air_management.dm b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm
index 86dc77814a..55b4b8f712 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/air_management.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm
@@ -5,17 +5,17 @@
/obj/item/circuitboard/air_management
name = T_BOARD("atmosphere monitoring console")
build_path = /obj/machinery/computer/general_air_control
- var/frequency = 1439
+ var/frequency = PUMPS_FREQ
/obj/item/circuitboard/air_management/tank_control
name = T_BOARD("tank control")
build_path = /obj/machinery/computer/general_air_control/large_tank_control
- frequency = 1441
+ frequency = PUBLIC_LOW_FREQ
/obj/item/circuitboard/air_management/supermatter_core
name = T_BOARD("core control")
build_path = /obj/machinery/computer/general_air_control/supermatter_core
- frequency = 1433
+ frequency = ENGINE_FREQ
/obj/item/circuitboard/air_management/injector_control
name = T_BOARD("injector control")
diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
index 14e0f843e6..bec8448352 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
@@ -5,7 +5,7 @@
/obj/item/circuitboard/security
name = T_BOARD("security camera monitor")
build_path = /obj/machinery/computer/security
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
var/list/network
var/locked = 1
var/emagged = 0
@@ -30,7 +30,7 @@
/obj/item/circuitboard/security/mining
name = T_BOARD("mining camera monitor")
build_path = /obj/machinery/computer/security/mining
- network = list("Mining Outpost")
+ network = list(NETWORK_MINE)
req_access = list()
/obj/item/circuitboard/security/telescreen/entertainment
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm b/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm
index 0544193589..e1069a111c 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade_vr.dm
@@ -1,6 +1,6 @@
/obj/item/grenade/spawnergrenade/manhacks/station/locked
desc = "It is set to detonate in 5 seconds. It will deploy three weaponized survey drones. This one has a safety interlock that prevents release if used while in proximity to the facility."
- req_access = list(access_armory) //for toggling safety
+ req_access = list(ACCESS_ARMORY) //for toggling safety
var/locked = 1
/obj/item/grenade/spawnergrenade/manhacks/station/locked/detonate()
diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm
index a019e5d205..d871d73164 100644
--- a/code/game/objects/items/weapons/id cards/station_ids.dm
+++ b/code/game/objects/items/weapons/id cards/station_ids.dm
@@ -175,7 +175,7 @@
/obj/item/card/id/synthetic/Initialize(mapload)
. = ..()
- access = get_all_station_access().Copy() + access_synth
+ access = get_all_station_access().Copy() + ACCESS_SYNTH
/obj/item/card/id/lost
name = "\improper Unknown ID"
@@ -185,7 +185,7 @@
/obj/item/card/id/lost/Initialize(mapload)
. = ..()
- access += access_lost
+ access += ACCESS_LOST
/obj/item/card/id/platform
name = "\improper Support Platform ID"
@@ -194,9 +194,9 @@
item_state = "tdgreen"
assignment = "Synthetic"
access = list(
- access_synth, access_mining, access_mining_station, access_mining_office, access_research,
- access_xenoarch, access_xenobiology, access_external_airlocks, access_robotics, access_tox,
- access_tox_storage, access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot
+ ACCESS_SYNTH, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINING_OFFICE, ACCESS_RESEARCH,
+ ACCESS_XENOARCH, ACCESS_XENOBIOLOGY, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ROBOTICS, ACCESS_TOX,
+ ACCESS_TOX_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT
)
/obj/item/card/id/centcom
diff --git a/code/game/objects/items/weapons/id cards/syndicate_ids.dm b/code/game/objects/items/weapons/id cards/syndicate_ids.dm
index 89260717f5..2a86420566 100644
--- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm
+++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm
@@ -94,4 +94,4 @@
registered_name = "Operative"
assignment = "Operative Commander"
icon_state = "syndicate-id"
- access = list(access_syndicate, access_external_airlocks)
+ access = list(ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS)
diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm
index 1de659c7ff..a2d318fcf0 100644
--- a/code/game/objects/items/weapons/policetape.dm
+++ b/code/game/objects/items/weapons/policetape.dm
@@ -72,7 +72,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape/medical
name = "medical tape"
desc = "A length of medical tape. Do not cross."
- req_access = list(access_medical)
+ req_access = list(ACCESS_MEDICAL)
color = COLOR_WHITE
/obj/item/taperoll/police
@@ -84,7 +84,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape/police
name = "police tape"
desc = "A length of police tape. Do not cross."
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
color = COLOR_RED_LIGHT
/obj/item/taperoll/engineering
@@ -99,7 +99,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape/engineering
name = "engineering tape"
desc = "A length of engineering tape. Better not cross it."
- req_one_access = list(access_engine,access_atmospherics)
+ req_one_access = list(ACCESS_ENGINE,ACCESS_ATMOSPHERICS)
color = COLOR_YELLOW
/obj/item/taperoll/atmos
@@ -111,7 +111,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape/atmos
name = "atmospherics tape"
desc = "A length of atmospherics tape. Better not cross it."
- req_one_access = list(access_engine,access_atmospherics)
+ req_one_access = list(ACCESS_ENGINE,ACCESS_ATMOSPHERICS)
color = COLOR_DEEP_SKY_BLUE
/obj/item/taperoll/update_icon()
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 46a6c62696..c5c4839f34 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -505,7 +505,7 @@
can_hold = list(/obj/item/reagent_containers/glass/beaker/vial)
max_storage_space = ITEMSIZE_COST_SMALL * 6 //The sum of the w_classes of all the items in this storage item.
storage_slots = 6
- req_access = list(access_virology)
+ req_access = list(ACCESS_VIROLOGY)
/obj/item/storage/lockbox/vials/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 5f3bd8210f..628c7a9c24 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -8,7 +8,7 @@
w_class = ITEMSIZE_LARGE
max_w_class = ITEMSIZE_NORMAL
max_storage_space = ITEMSIZE_COST_NORMAL * 4 //The sum of the w_classes of all the items in this storage item.
- req_access = list(access_armory)
+ req_access = list(ACCESS_ARMORY)
preserve_item = 1
var/locked = 1
var/broken = 0
@@ -76,7 +76,7 @@
/obj/item/storage/lockbox/loyalty
name = "lockbox of loyalty implants"
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
starts_with = list(
/obj/item/implantcase/loyalty = 3,
/obj/item/implanter/loyalty
@@ -85,13 +85,13 @@
/obj/item/storage/lockbox/clusterbang
name = "lockbox of clusterbangs"
desc = "You have a bad feeling about opening this."
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
starts_with = list(/obj/item/grenade/flashbang/clusterbang)
/obj/item/storage/lockbox/medal
name = "lockbox of medals"
desc = "A lockbox filled with commemorative medals, it has the NanoTrasen logo stamped on it."
- req_access = list(access_heads)
+ req_access = list(ACCESS_HEADS)
storage_slots = 7
starts_with = list(
/obj/item/clothing/accessory/medal/conduct,
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index b92b8aa984..a1a5e1a86d 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -13,7 +13,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "locator"
var/temp = null
- var/frequency = 1451
+ var/frequency = TRACK_IMP_FREQ
var/broadcasting = null
var/listening = 1.0
w_class = ITEMSIZE_SMALL
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index 2551fabfeb..5122169fbe 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -355,7 +355,7 @@
desc = "For masterpieces hand-picked by the librarian."
desc_with_canvas = "A masterpiece hand-picked by the librarian, supposedly."
persistence_id = "library"
- req_one_access = list(access_library)
+ req_one_access = list(ACCESS_LIBRARY)
curator = JOB_LIBRARIAN
/obj/structure/sign/painting/chapel_secure
@@ -363,7 +363,7 @@
desc = "For masterpieces hand-picked by the chaplain."
desc_with_canvas = "A masterpiece hand-picked by the chaplain, supposedly."
persistence_id = "chapel"
- req_one_access = list(access_chapel_office)
+ req_one_access = list(ACCESS_CHAPEL_OFFICE)
curator = JOB_CHAPLAIN
/obj/structure/sign/painting/library_private // keep your smut away from prying eyes, or non-librarians at least
@@ -371,7 +371,7 @@
desc = "For art pieces deemed too subversive or too illegal to be shared outside of librarians."
desc_with_canvas = "A painting hung away from lesser minds."
persistence_id = "library_private"
- req_one_access = list(access_library)
+ req_one_access = list(ACCESS_LIBRARY)
curator = JOB_LIBRARIAN
/obj/structure/sign/painting/away_areas // for very hard-to-get-to areas
diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index 5498b68179..85d49c59ca 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -37,7 +37,7 @@
var/obj/item/card/id/card = I.GetID()
if(istype(card))
- if(access_bar in card.GetAccess())
+ if(ACCESS_BAR in card.GetAccess())
var/sign_type = tgui_input_list(user, "What would you like to change the barsign to?", "Bar Sign Choice", get_valid_states(0))
if(!sign_type)
return
diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
index 80efd6d235..613df97ab6 100644
--- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
@@ -17,14 +17,14 @@
*/
/obj/structure/closet/secure_closet/guncabinet/sidearm
name = "emergency weapon cabinet"
- req_one_access = list(access_armory,access_captain)
+ req_one_access = list(ACCESS_ARMORY,ACCESS_CAPTAIN)
starts_with = list(
/obj/item/gun/energy/gun = 4)
/obj/structure/closet/secure_closet/guncabinet/rifle
name = "rifle cabinet"
- req_one_access = list(access_explorer,access_brig) //CHOMP explo keep
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_BRIG) //CHOMP explo keep
starts_with = list(
/obj/item/ammo_magazine/clip/c762/hunter = 9,
@@ -39,7 +39,7 @@
/obj/structure/closet/secure_closet/guncabinet/phase
name = "explorer weapon cabinet" //CHOMP explo keep
- req_one_access = list(access_explorer,access_brig) //CHOMP explo keep
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_BRIG) //CHOMP explo keep
starts_with = list(
/obj/item/gun/energy/locked/phasegun = 2,
@@ -52,7 +52,7 @@
*/
/obj/structure/closet/secure_closet/explorer
name = "explorer locker" //CHOMP explo keep
- req_access = list(access_explorer) //CHOMP explo keep
+ req_access = list(ACCESS_EXPLORER)
closet_appearance = /decl/closet_appearance/secure_closet/expedition/explorer
starts_with = list(
@@ -93,7 +93,7 @@
*/
/obj/structure/closet/secure_closet/pathfinder
name = "pathfinder locker"
- req_access = list(access_pathfinder) //CHOMP explo keep
+ req_access = list(ACCESS_PATHFINDER) //CHOMP explo keep
closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder
starts_with = list(
@@ -141,7 +141,7 @@
/obj/structure/closet/secure_closet/sar
name = "field medic locker"
desc = "Supplies for a wilderness first responder."
- req_access = list(access_medical_equip)
+ req_access = list(ACCESS_MEDICAL_EQUIP)
closet_appearance = /decl/closet_appearance/secure_closet/expedition/sar
starts_with = list(
@@ -193,7 +193,7 @@
*/
/obj/structure/closet/secure_closet/pilot
name = "pilot locker"
- req_access = list(access_pilot)
+ req_access = list(ACCESS_PILOT)
closet_appearance = /decl/closet_appearance/secure_closet/expedition/pilot
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index 94b6086a06..e62545cb29 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/bar
name = "booze closet"
- req_access = list(access_bar)
+ req_access = list(ACCESS_BAR)
closet_appearance = /decl/closet_appearance/cabinet/secure
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index ac5db62f93..3e3d9cac5a 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/cargotech
name = "cargo technician's locker"
- req_access = list(access_cargo)
+ req_access = list(ACCESS_CARGO)
closet_appearance = /decl/closet_appearance/secure_closet/cargo
starts_with = list(
@@ -29,7 +29,7 @@
/obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker"
- req_access = list(access_qm)
+ req_access = list(ACCESS_QM)
closet_appearance = /decl/closet_appearance/secure_closet/cargo/qm
starts_with = list(
@@ -71,7 +71,7 @@
/obj/structure/closet/secure_closet/miner
name = "miner's equipment"
- req_access = list(access_mining)
+ req_access = list(ACCESS_MINING)
closet_appearance = /decl/closet_appearance/secure_closet/mining
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 95d1ccde55..a43fc70b4c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker"
- req_access = list(access_ce)
+ req_access = list(ACCESS_CE)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
starts_with = list(
@@ -53,7 +53,7 @@
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies"
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/electrical
starts_with = list(
@@ -71,7 +71,7 @@
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies"
- req_access = list(access_construction)
+ req_access = list(ACCESS_CONSTRUCTION)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/welding
starts_with = list(
@@ -89,7 +89,7 @@
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
closet_appearance = /decl/closet_appearance/secure_closet/engineering
starts_with = list(
@@ -123,7 +123,7 @@
/obj/structure/closet/secure_closet/atmos_personal
name = "technician's locker"
- req_access = list(access_atmospherics)
+ req_access = list(ACCESS_ATMOSPHERICS)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/atmos
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 451f30e574..4e52a43519 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -4,7 +4,7 @@
/obj/structure/closet/secure_closet/freezer/kitchen
name = "kitchen cabinet"
- req_access = list(access_kitchen)
+ req_access = list(ACCESS_KITCHEN)
starts_with = list(
/obj/item/reagent_containers/food/condiment/carton/flour = 6,
@@ -55,7 +55,7 @@
icon = 'icons/obj/closets/fridge.dmi'
icon_state = ""
closet_appearance = null
- req_access = list(access_heads_vault)
+ req_access = list(ACCESS_HEADS_VAULT)
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index 2e6503acd9..1747a3b2c3 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -2,7 +2,7 @@
name = "gun cabinet"
icon = 'icons/obj/guncabinet.dmi'
icon_state = "base"
- req_one_access = list(access_armory)
+ req_one_access = list(ACCESS_ARMORY)
closet_appearance = null
/obj/structure/closet/secure_closet/guncabinet/Initialize(mapload)
@@ -51,7 +51,7 @@
/obj/structure/closet/secure_closet/guncabinet/excursion
name = "expedition weaponry cabinet"
- req_one_access = list(access_explorer,access_armory) //CHOMP keep explo
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_ARMORY) //CHOMP keep explo
/obj/structure/closet/secure_closet/guncabinet/excursion/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index 064431c56e..95eb0793b4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/hydroponics
name = "botanist's locker"
- req_access = list(access_hydroponics)
+ req_access = list(ACCESS_HYDROPONICS)
closet_appearance = /decl/closet_appearance/secure_closet/hydroponics
starts_with = list(
@@ -32,7 +32,7 @@
/obj/structure/closet/secure_closet/hydroponics/sci
name = "xenoflorist's locker"
- req_access = list(access_xenobiology)
+ req_access = list(ACCESS_XENOBIOLOGY)
closet_appearance = /decl/closet_appearance/secure_closet/hydroponics/xenoflora
/obj/structure/closet/secure_closet/hydroponics/sci/Initialize(mapload)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 749f933fc2..b57d5150d6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/medical1
name = "medicine closet"
desc = "Filled with medical junk."
- req_access = list(access_medical)
+ req_access = list(ACCESS_MEDICAL)
closet_appearance = /decl/closet_appearance/secure_closet/medical/alt
starts_with = list(
@@ -15,7 +15,7 @@
/obj/structure/closet/secure_closet/medical2
name = "anesthetics closet"
desc = "Used to knock people out."
- req_access = list(access_surgery)
+ req_access = list(ACCESS_SURGERY)
closet_appearance = /decl/closet_appearance/secure_closet/medical
starts_with = list(
@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker"
- req_access = list(access_medical_equip)
+ req_access = list(ACCESS_MEDICAL_EQUIP)
closet_appearance = /decl/closet_appearance/secure_closet/medical/doctor
starts_with = list(
@@ -93,7 +93,7 @@
/obj/structure/closet/secure_closet/paramedic
name = "paramedic locker"
desc = "Supplies for a first responder."
- req_access = list(access_medical_equip)
+ req_access = list(ACCESS_MEDICAL_EQUIP)
closet_appearance = /decl/closet_appearance/secure_closet/medical/paramedic
starts_with = list(
@@ -125,9 +125,9 @@
/obj/item/clothing/accessory/storage/white_vest,
/obj/item/taperoll/medical)
-/obj/structure/closet/secure_closet/CMO
+/obj/structure/closet/secure_closet/chief_medical_officer
name = "chief medical officer's locker"
- req_access = list(access_cmo)
+ req_access = list(ACCESS_CMO)
closet_appearance = /decl/closet_appearance/secure_closet/cmo
starts_with = list(
@@ -164,7 +164,7 @@
/obj/item/storage/belt/medical,
/obj/item/personal_shield_generator/belt/medical/loaded)
-/obj/structure/closet/secure_closet/CMO/Initialize(mapload)
+/obj/structure/closet/secure_closet/chief_medical_officer/Initialize(mapload)
if(prob(50))
starts_with += /obj/item/storage/backpack/medic
else
@@ -192,7 +192,7 @@
/obj/structure/closet/secure_closet/animal
name = "animal control closet"
- req_access = list(access_surgery)
+ req_access = list(ACCESS_SURGERY)
starts_with = list(
/obj/item/assembly/signaler,
@@ -202,7 +202,7 @@
/obj/structure/closet/secure_closet/chemical
name = "chemical closet"
desc = "Store dangerous chemicals in here."
- req_access = list(access_chemistry)
+ req_access = list(ACCESS_CHEMISTRY)
closet_appearance = /decl/closet_appearance/secure_closet/medical/chemistry
starts_with = list(
@@ -219,7 +219,7 @@
/obj/structure/closet/secure_closet/psych
name = "psychiatric cabinet"
desc = "Store psychology tools and medicines in here."
- req_access = list(access_psychiatrist)
+ req_access = list(ACCESS_PSYCHIATRIST)
closet_appearance = /decl/closet_appearance/cabinet/secure
open_sound = 'sound/effects/wooden_closet_open.ogg'
@@ -250,7 +250,7 @@
density = FALSE
wall_mounted = 1
store_mobs = 0
- req_access = list(access_medical_equip)
+ req_access = list(ACCESS_MEDICAL_EQUIP)
closet_appearance = /decl/closet_appearance/wall/medical
/obj/structure/closet/secure_closet/medical_wall/pills
@@ -266,7 +266,7 @@
/obj/structure/closet/secure_closet/medical_wall/anesthetics
name = "anesthetics wall closet"
desc = "Used to knock people out."
- req_access = list(access_surgery)
+ req_access = list(ACCESS_SURGERY)
starts_with = list(
/obj/item/tank/anesthetic = 3,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 71cf1ffa05..8079757776 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/personal
name = "personal closet"
desc = "It's a secure locker for personnel. The first card swiped gains control."
- req_access = list(access_all_personal_lockers)
+ req_access = list(ACCESS_ALL_PERSONAL_LOCKERS)
var/registered_name = null
/* //VOREStation Removal
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index f01c4da79e..a3e0bc90fd 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/scientist
name = "scientist's locker"
- req_access = list(access_tox_storage)
+ req_access = list(ACCESS_TOX_STORAGE)
closet_appearance = /decl/closet_appearance/secure_closet/science
starts_with = list(
@@ -21,9 +21,9 @@
return ..()
-/obj/structure/closet/secure_closet/RD
+/obj/structure/closet/secure_closet/research_director
name = "research director's locker"
- req_access = list(access_rd)
+ req_access = list(ACCESS_RD)
closet_appearance = /decl/closet_appearance/secure_closet/science/rd
starts_with = list(
@@ -58,7 +58,7 @@
/obj/structure/closet/secure_closet/xenoarchaeologist
name = "Xenoarchaeologist Locker"
- req_access = list(access_tox_storage)
+ req_access = list(ACCESS_TOX_STORAGE)
closet_appearance = /decl/closet_appearance/secure_closet/science/xenoarch
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index c9a5cf8435..c8c09b74b3 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/captains
name = "site manager's locker"
- req_access = list(access_captain)
+ req_access = list(ACCESS_CAPTAIN)
closet_appearance = /decl/closet_appearance/secure_closet/command
starts_with = list(
@@ -20,7 +20,7 @@
/obj/structure/closet/secure_closet/hop
name = "head of personnel's locker"
- req_access = list(access_hop)
+ req_access = list(ACCESS_HOP)
closet_appearance = /decl/closet_appearance/secure_closet/command/hop
starts_with = list(
@@ -40,7 +40,7 @@
/obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire"
- req_access = list(access_hop)
+ req_access = list(ACCESS_HOP)
closet_appearance = /decl/closet_appearance/secure_closet/command/hop
starts_with = list(
@@ -79,8 +79,8 @@
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
- req_access = list(access_hos)
- storage_capacity = 2.5 * MOB_MEDIUM
+ req_access = list(ACCESS_HOS)
+ storage_capacity = 2.6 * MOB_MEDIUM
closet_appearance = /decl/closet_appearance/secure_closet/security/hos
starts_with = list(
@@ -136,7 +136,7 @@
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
storage_capacity = 42
- req_access = list(access_armory)
+ req_access = list(ACCESS_ARMORY)
closet_appearance = /decl/closet_appearance/secure_closet/security/warden
starts_with = list(
@@ -198,7 +198,7 @@
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
- req_access = list(access_brig)
+ req_access = list(ACCESS_BRIG)
closet_appearance = /decl/closet_appearance/secure_closet/security
starts_with = list(
@@ -269,7 +269,7 @@
/obj/structure/closet/secure_closet/detective
name = "detective's cabinet"
- req_access = list(access_forensics_lockers)
+ req_access = list(ACCESS_FORENSICS_LOCKERS)
closet_appearance = /decl/closet_appearance/cabinet/secure
open_sound = 'sound/effects/wooden_closet_open.ogg'
@@ -300,7 +300,7 @@
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
- req_access = list(access_captain)
+ req_access = list(ACCESS_CAPTAIN)
closet_appearance = /decl/closet_appearance/secure_closet/courtroom
starts_with = list(
@@ -310,7 +310,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/brig
name = "brig locker"
- req_access = list(access_brig)
+ req_access = list(ACCESS_BRIG)
closet_appearance = /decl/closet_appearance/secure_closet/brig
anchored = TRUE
var/id = null
@@ -321,7 +321,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/posters
name = "morale storage"
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
anchored = TRUE
starts_with = list(
@@ -333,7 +333,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/courtroom
name = "courtroom locker"
- req_access = list(access_lawyer)
+ req_access = list(ACCESS_LAWYER)
closet_appearance = /decl/closet_appearance/secure_closet/courtroom
starts_with = list(
@@ -347,7 +347,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/wall
name = "wall locker"
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
closet_appearance = /decl/closet_appearance/wall
density = TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
index 9823521b84..f2ae7c8a33 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/secure_closet/hos
name = "head of security's attire"
- req_access = list(access_hos)
+ req_access = list(ACCESS_HOS)
closet_appearance = /decl/closet_appearance/secure_closet/security/hos
storage_capacity = 2.5 * MOB_MEDIUM
@@ -46,7 +46,7 @@
/obj/structure/closet/secure_closet/hos2
name = "head of security's gear"
- req_access = list(access_hos)
+ req_access = list(ACCESS_HOS)
closet_appearance = /decl/closet_appearance/secure_closet/security/hos
storage_capacity = 2.5 * MOB_MEDIUM
@@ -79,7 +79,7 @@
//Custom NT Security Lockers, Only found at central command
/obj/structure/closet/secure_closet/nanotrasen_security
name = "NanoTrasen security officer's locker"
- req_access = list(access_brig)
+ req_access = list(ACCESS_BRIG)
closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/security
storage_capacity = 3.5 * MOB_MEDIUM
@@ -121,7 +121,7 @@
/obj/structure/closet/secure_closet/nanotrasen_commander
name = "NanoTrasen commander's locker"
- req_access = list(access_brig)
+ req_access = list(ACCESS_BRIG)
closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/commander
storage_capacity = 3.5 * MOB_MEDIUM
@@ -171,7 +171,7 @@
/obj/structure/closet/secure_closet/nanotrasen_warden
name = "NanoTrasen warden's locker"
- req_access = list(access_brig)
+ req_access = list(ACCESS_BRIG)
closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/warden
storage_capacity = 3.5 * MOB_MEDIUM
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index f37802ce35..a340cc6eb7 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -336,7 +336,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium)
desc = "Burn baby burn!"
icon = 'icons/obj/power.dmi'
icon_state = "crema_switch"
- req_access = list(access_crematorium)
+ req_access = list(ACCESS_CREMATORIUM)
id = 1
/obj/machinery/button/crematorium/attack_hand(mob/user as mob)
diff --git a/code/game/vehicles/vehicle.dm b/code/game/vehicles/vehicle.dm
index 52ff61257e..69a4716f47 100644
--- a/code/game/vehicles/vehicle.dm
+++ b/code/game/vehicles/vehicle.dm
@@ -42,7 +42,7 @@
var/internal_damage = 0 //contains bitflags
var/list/operation_req_access = list()//required access level for mecha operation
- var/list/internals_req_access = list(access_engine,access_robotics)//required access level to open cell compartment
+ var/list/internals_req_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)//required access level to open cell compartment
var/wreckage
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index db86fdabb6..7111267822 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -711,7 +711,7 @@ var/datum/announcement/minor/admin_min_announcer = new
set desc = "Send an intercom message, like an arrivals announcement."
if(!check_rights(0)) return
- var/channel = tgui_input_list(usr, "Channel for message:","Channel", radiochannels)
+ var/channel = tgui_input_list(usr, "Channel for message:","Channel", GLOB.radiochannels)
if(channel) //They picked a channel
var/sender = tgui_input_text(usr, "Name of sender (max 75):", "Announcement", "Announcement Computer")
@@ -740,7 +740,7 @@ var/datum/announcement/minor/admin_min_announcer = new
set waitfor = FALSE //Why bother? We have some sleeps. You can leave tho!
if(!check_rights(0)) return
- var/channel = tgui_input_list(usr, "Channel for message:","Channel", radiochannels)
+ var/channel = tgui_input_list(usr, "Channel for message:","Channel", GLOB.radiochannels)
if(!channel) //They picked a channel
return
diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index 8d69612bb5..d7327c6975 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/code/modules/admin/modify_robot.dm
@@ -93,7 +93,7 @@
for(var/channel in target.radio.channels)
radio_channels += channel
var/list/availalbe_channels = list()
- for(var/channel in (radiochannels - target.radio.channels))
+ for(var/channel in (GLOB.radiochannels - target.radio.channels))
availalbe_channels += channel
.["target"]["radio_channels"] = radio_channels
.["target"]["availalbe_channels"] = availalbe_channels
@@ -390,7 +390,7 @@
target.radio.syndie = 1
target.module.channels += list("[selected_radio_channel]" = 1)
target.radio.channels[selected_radio_channel] = target.module.channels[selected_radio_channel]
- target.radio.secure_radio_connections[selected_radio_channel] = SSradio.add_object(target.radio, radiochannels[selected_radio_channel], RADIO_CHAT)
+ target.radio.secure_radio_connections[selected_radio_channel] = SSradio.add_object(target.radio, GLOB.radiochannels[selected_radio_channel], RADIO_CHAT)
return TRUE
if("rem_channel")
var/selected_radio_channel = params["channel"]
@@ -404,7 +404,7 @@
target.radio.channels = list()
for(var/n_chan in target.module.channels)
target.radio.channels[n_chan] = target.module.channels[n_chan]
- SSradio.remove_object(target.radio, radiochannels[selected_radio_channel])
+ SSradio.remove_object(target.radio, GLOB.radiochannels[selected_radio_channel])
target.radio.secure_radio_connections -= selected_radio_channel
return TRUE
if("add_component")
@@ -482,11 +482,11 @@
return TRUE
if("add_station")
target.idcard.access |= get_all_station_access()
- target.idcard.access |= access_synth
+ target.idcard.access |= ACCESS_SYNTH
return TRUE
if("rem_station")
target.idcard.access -= get_all_station_access()
- target.idcard.access -= access_synth
+ target.idcard.access -= ACCESS_SYNTH
return TRUE
if("law_channel")
if(params["law_channel"] in target.law_channels())
@@ -580,8 +580,8 @@
to_chat(target, span_danger("Law Notice"))
target.laws.show_laws(target)
if(isAI(target))
- var/mob/living/silicon/ai/AI = target
- for(var/mob/living/silicon/robot/R in AI.connected_robots)
+ var/mob/living/silicon/ai/our_ai = target
+ for(var/mob/living/silicon/robot/R in our_ai.connected_robots)
to_chat(R, span_danger("Law Notice"))
R.laws.show_laws(R)
if(ui.user != target)
diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm
index 1b12176fe3..2bcd256447 100644
--- a/code/modules/admin/verbs/secrets.dm
+++ b/code/modules/admin/verbs/secrets.dm
@@ -118,7 +118,7 @@ ADMIN_VERB(secrets, R_HOLDER, "Secrets", "Abuse harder than you ever have before
if(H.wear_id)
var/obj/item/card/id/id = H.get_idcard()
for(var/A in id.GetAccess())
- if(A == access_security)
+ if(A == ACCESS_SECURITY)
security++
if(!security)
//strip their stuff before they teleport into a cell :downs:
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index a220b49d07..2dfcc7a450 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -10,7 +10,7 @@
secured = TRUE
var/code = 30
- var/frequency = 1457
+ var/frequency = RSD_FREQ
var/delay = 0
var/airlock_wire = null
var/datum/wires/connected = null
@@ -166,5 +166,5 @@
/obj/item/assembly/signaler/Destroy()
if(SSradio)
SSradio.remove_object(src,frequency)
- frequency = 0
+ frequency = ZERO_FREQ
. = ..()
diff --git a/code/modules/awaymissions/exile.dm b/code/modules/awaymissions/exile.dm
index 87099706b9..1e13b565e1 100644
--- a/code/modules/awaymissions/exile.dm
+++ b/code/modules/awaymissions/exile.dm
@@ -34,5 +34,5 @@
/obj/structure/closet/secure_closet/exile
name = "Exile Implants"
- req_access = list(access_hos)
+ req_access = list(ACCESS_HOS)
starts_with = list(/obj/item/implanter/exile = 1, /obj/item/implantcase/exile = 5)
diff --git a/code/modules/casino/premium_vendors.dm b/code/modules/casino/premium_vendors.dm
index bbcdff8635..119dcfe0e1 100644
--- a/code/modules/casino/premium_vendors.dm
+++ b/code/modules/casino/premium_vendors.dm
@@ -80,8 +80,8 @@
contraband = list()
vend_delay = 15
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
- req_access = list(access_bar)
- req_log_access = access_bar
+ req_access = list(ACCESS_BAR)
+ req_log_access = ACCESS_BAR
has_logs = 1
/obj/machinery/vending/deluxe_dinner
@@ -155,8 +155,8 @@
contraband = list()
vend_delay = 15
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
- req_access = list(access_bar)
- req_log_access = access_bar
+ req_access = list(ACCESS_BAR)
+ req_log_access = ACCESS_BAR
has_logs = 1
vending_sound = "machines/vending/vending_cans.ogg"
@@ -177,8 +177,8 @@
contraband = list()
vend_delay = 15
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
- req_access = list(access_bar)
- req_log_access = access_bar
+ req_access = list(ACCESS_BAR)
+ req_log_access = ACCESS_BAR
has_logs = 1
vending_sound = "machines/vending/vending_cans.ogg"
diff --git a/code/modules/clothing/accessories/accessory_vr.dm b/code/modules/clothing/accessories/accessory_vr.dm
index 3719aead48..633e87a856 100644
--- a/code/modules/clothing/accessories/accessory_vr.dm
+++ b/code/modules/clothing/accessories/accessory_vr.dm
@@ -141,7 +141,7 @@
item_state = "collar_shk"
overlay_state = "collar_shk"
var/on = FALSE // 0 for off, 1 for on, starts off to encourage people to set non-default frequencies and codes.
- var/frequency = 1449
+ var/frequency = AMAG_ELE_FREQ
var/code = 2
var/datum/radio_frequency/radio_connection
diff --git a/code/modules/clothing/accessories/badges.dm b/code/modules/clothing/accessories/badges.dm
index ce151b35a1..a6bb3886d9 100644
--- a/code/modules/clothing/accessories/badges.dm
+++ b/code/modules/clothing/accessories/badges.dm
@@ -80,7 +80,7 @@
desc = "This glowing blue badge marks the holder as THE LAW."
icon_state = "holobadge"
var/emagged //Emagging removes Sec check.
- var/valid_access = list(access_security) //Default access is security, to be overriden or expanded as desired
+ var/valid_access = list(ACCESS_SECURITY) //Default access is security, to be overriden or expanded as desired
/obj/item/clothing/accessory/badge/holo/cord
icon_state = "holobadge-cord"
@@ -162,7 +162,7 @@
desc = "This badge marks the holder as an investigative agent."
icon_state = "invbadge"
badge_string = "Corporate Investigator"
- valid_access = list(access_security, access_lawyer) //Permitting both sec and IAA!
+ valid_access = list(ACCESS_SECURITY, ACCESS_LAWYER) //Permitting both sec and IAA!
slot_flags = SLOT_TIE | SLOT_BELT
/obj/item/clothing/accessory/badge/holo/sheriff
diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm
index 023d16a80f..9465850005 100644
--- a/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm
@@ -101,7 +101,7 @@
armor = list(melee = 60, bullet = 50, laser = 40, energy = 15, bomb = 30, bio = 100, rad = 50)
emp_protection = 40 //change this to 30 if too high.
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
cell_type = /obj/item/cell/hyper
@@ -121,7 +121,7 @@
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50)
emp_protection = 40 //change this to 30 if too high.
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
cell_type = /obj/item/cell/hyper
diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm
index be3a3752b9..155ff41b69 100644
--- a/code/modules/clothing/spacesuits/rig/suits/ert.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm
@@ -10,7 +10,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/ert
- req_access = list(access_cent_specops)
+ req_access = list(ACCESS_CENT_SPECOPS)
siemens_coefficient= 0.5
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
index 8749d2f323..faa83db119 100644
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -39,7 +39,7 @@
desc = "An advanced powered armour suit with many cyberwarfare enhancements. Comes with built-in insulated gloves for safely tampering with electronics."
icon_state = "hacker_rig"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
airtight = 1
seal_delay = 5 //Being straight out of a cyberpunk space movie has its perks.
@@ -90,7 +90,7 @@
boot_type = /obj/item/clothing/shoes/magboots/rig/light/ninja
cell_type = /obj/item/cell/hyper
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
initial_modules = list(
/obj/item/rig_module/teleporter,
@@ -123,7 +123,7 @@
desc = "A highly advanced and expensive suit designed for covert operations."
icon_state = "stealth_rig"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
initial_modules = list(
/obj/item/rig_module/stealth_field,
diff --git a/code/modules/clothing/spacesuits/rig/suits/pmc.dm b/code/modules/clothing/spacesuits/rig/suits/pmc.dm
index e9a8670ff1..f748d5cfe1 100644
--- a/code/modules/clothing/spacesuits/rig/suits/pmc.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/pmc.dm
@@ -9,7 +9,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/pmc
- req_access = list(access_cent_specops)
+ req_access = list(ACCESS_CENT_SPECOPS)
armor = list(melee = 60, bullet = 50, laser = 35,energy = 15, bomb = 30, bio = 100, rad = 95)
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
index 4421eda2e7..c36de13df1 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -42,7 +42,7 @@
/obj/item/rig/internalaffairs/equipped
- req_access = list(access_lawyer)
+ req_access = list(ACCESS_LAWYER)
initial_modules = list(
/obj/item/rig_module/ai_container,
@@ -115,7 +115,7 @@
/obj/item/rig/eva/equipped
- req_access = list(access_engine)
+ req_access = list(ACCESS_ENGINE)
initial_modules = list(
/obj/item/rig_module/device/plasmacutter,
@@ -165,7 +165,7 @@
/obj/item/rig/ce/equipped
- req_access = list(access_ce)
+ req_access = list(ACCESS_CE)
initial_modules = list(
/obj/item/rig_module/ai_container,
@@ -210,7 +210,7 @@
/obj/item/rig/hazmat/equipped
- req_access = list(access_rd)
+ req_access = list(ACCESS_RD)
initial_modules = list(
/obj/item/rig_module/ai_container,
@@ -240,7 +240,7 @@
//Access restriction and seal delay, plus pat_module and rescue_pharm for medical suit
/obj/item/rig/medical/equipped
- req_access = list(access_medical)
+ req_access = list(ACCESS_MEDICAL)
seal_delay = 5
initial_modules = list(
diff --git a/code/modules/clothing/spacesuits/rig/suits/station_ch.dm b/code/modules/clothing/spacesuits/rig/suits/station_ch.dm
index 5809a68402..85250efe5c 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station_ch.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station_ch.dm
@@ -52,7 +52,7 @@
/obj/item/storage/backpack,
)
- req_access = list(access_hos)
+ req_access = list(ACCESS_HOS)
req_one_access = list()
/obj/item/rig/ch/pursuit/equipped
diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm
index 1d0c06ac9e..80a629e47e 100644
--- a/code/modules/economy/Accounts_DB.dm
+++ b/code/modules/economy/Accounts_DB.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/computer.dmi'
icon_state = "account_computer"
density = TRUE
- req_one_access = list(access_hop, access_captain, access_cent_captain)
+ req_one_access = list(ACCESS_HOP, ACCESS_CAPTAIN, ACCESS_CENT_CAPTAIN)
anchored = TRUE
var/receipt_num
var/machine_id = ""
@@ -17,9 +17,9 @@
/obj/machinery/account_database/proc/get_access_level()
if(!held_card)
return 0
- if(access_cent_captain in held_card.access)
+ if(ACCESS_CENT_CAPTAIN in held_card.access)
return 2
- else if((access_hop in held_card.access) || (access_captain in held_card.access))
+ else if((ACCESS_HOP in held_card.access) || (ACCESS_CAPTAIN in held_card.access))
return 1
/obj/machinery/account_database/proc/create_transation(target, reason, amount)
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index dd945c002e..50feeb5c85 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -210,7 +210,7 @@
var/obj/item/I = usr.get_active_hand()
if (istype(I, /obj/item/card))
var/obj/item/card/id/C = I
- if((access_cent_captain in C.access) || (access_hop in C.access) || (access_captain in C.access))
+ if((ACCESS_CENT_CAPTAIN in C.access) || (ACCESS_HOP in C.access) || (ACCESS_CAPTAIN in C.access))
access_code = 0
to_chat(usr, "[icon2html(src, usr.client)]" + span_info("Access code reset to 0."))
else if (istype(I, /obj/item/card/emag))
diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm
index 07de327c08..4b49c7e963 100644
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -14,7 +14,7 @@
throw_range = 2
w_class = ITEMSIZE_SMALL
var/access = list()
- access = access_crate_cash
+ access = ACCESS_CRATE_CASH
var/worth = 0
drop_sound = 'sound/items/drop/paper.ogg'
pickup_sound = 'sound/items/pickup/paper.ogg'
diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm
index 1800fe5627..9159ee9a7a 100644
--- a/code/modules/economy/cash_register.dm
+++ b/code/modules/economy/cash_register.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "register_idle"
flags = NOBLUDGEON
- req_access = list(access_heads)
+ req_access = list(ACCESS_HEADS)
anchored = TRUE
var/locked = 1
diff --git a/code/modules/economy/casinocash.dm b/code/modules/economy/casinocash.dm
index b198d61087..2fa8d58ae5 100644
--- a/code/modules/economy/casinocash.dm
+++ b/code/modules/economy/casinocash.dm
@@ -49,7 +49,7 @@
throw_range = 2
w_class = ITEMSIZE_SMALL
var/access = list()
- access = access_crate_cash
+ access = ACCESS_CRATE_CASH
var/worth = 0
/obj/item/spacecasinocash/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm
index 28f4451a1e..7d016725b5 100644
--- a/code/modules/economy/retail_scanner.dm
+++ b/code/modules/economy/retail_scanner.dm
@@ -5,7 +5,7 @@
icon_state = "retail_idle"
flags = NOBLUDGEON
slot_flags = SLOT_BELT
- req_access = list(access_heads)
+ req_access = list(ACCESS_HEADS)
w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1)
diff --git a/code/modules/economy/vending.dm b/code/modules/economy/vending.dm
index 508432ef0f..0dcc699d5e 100644
--- a/code/modules/economy/vending.dm
+++ b/code/modules/economy/vending.dm
@@ -76,7 +76,7 @@
var/datum/wires/vending/wires = null
var/list/log = list()
- var/req_log_access = access_cargo //default access for checking logs is cargo
+ var/req_log_access = ACCESS_CARGO //default access for checking logs is cargo
var/has_logs = 0 //defaults to 0, set to anything else for vendor to have logs
var/can_rotate = 1 //Defaults to yes, can be set to 0 for vendors without or with unwanted directionals.
diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm
index 197111b6b1..6ad6dbcf7c 100644
--- a/code/modules/economy/vending_machines.dm
+++ b/code/modules/economy/vending_machines.dm
@@ -115,8 +115,8 @@
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
- req_access = list(access_bar)
- req_log_access = access_bar
+ req_access = list(ACCESS_BAR)
+ req_log_access = ACCESS_BAR
has_logs = 1
vending_sound = "machines/vending/vending_cans.ogg"
@@ -373,11 +373,11 @@
desc = "Cartridges for PDAs."
product_slogans = "Carts to go!"
icon_state = "cart"
- req_access = list(access_hop)
+ req_access = list(ACCESS_HOP)
products = list(/obj/item/cartridge/medical = 10,/obj/item/cartridge/engineering = 10,/obj/item/cartridge/security = 10,
/obj/item/cartridge/janitor = 10,/obj/item/cartridge/signal/science = 10,/obj/item/pda/heads = 10,
/obj/item/cartridge/captain = 3,/obj/item/cartridge/quartermaster = 10)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/cigarette
@@ -452,7 +452,7 @@
description_fluff = "NanoMed is NanoTrasen's medical science division, and provides almost all of the modern medbay essentials in-house at no extra charge. By using this vending machine, employees accept liability for products that may or may not be temporarily replaced by placebos or experimental treatments."
icon_state = "med"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
- req_access = list(access_medical)
+ req_access = list(ACCESS_MEDICAL)
products = list(/obj/item/reagent_containers/glass/bottle/antitoxin = 4,
/obj/item/reagent_containers/glass/bottle/inaprovaline = 4,
/obj/item/reagent_containers/glass/bottle/stoxin = 4,
@@ -477,7 +477,7 @@
/obj/item/reagent_containers/pill/stox = 4,
/obj/item/reagent_containers/pill/antitox = 6)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
- req_log_access = access_cmo
+ req_log_access = ACCESS_CMO
has_logs = 1
/obj/machinery/vending/phoronresearch
@@ -491,7 +491,7 @@
/obj/item/assembly/signaler = 6,
/obj/item/assembly/prox_sensor = 6,
/obj/item/assembly/igniter = 6)
- req_log_access = access_rd
+ req_log_access = ACCESS_RD
has_logs = 1
/obj/machinery/vending/wallmed1
@@ -510,7 +510,7 @@
contraband = list(/obj/item/reagent_containers/syringe/antitoxin = 4,
/obj/item/reagent_containers/syringe/antiviral = 4,
/obj/item/reagent_containers/pill/tox = 1)
- req_log_access = access_cmo
+ req_log_access = ACCESS_CMO
has_logs = 1
can_rotate = 0
@@ -528,7 +528,7 @@
/obj/item/healthanalyzer = 3,
/obj/item/bodybag/cryobag = 3)
contraband = list(/obj/item/reagent_containers/pill/tox = 3)
- req_log_access = access_cmo
+ req_log_access = ACCESS_CMO
has_logs = 1
can_rotate = 0
@@ -545,7 +545,7 @@
description_fluff = "Security vending is kindly provided by the Lawson Arms company, Hephaestus Industries' law enforcement division."
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
icon_state = "sec"
- req_access = list(access_security)
+ req_access = list(ACCESS_SECURITY)
products = list(/obj/item/handcuffs = 8,
/obj/item/grenade/flashbang = 4,
/obj/item/flash = 5,
@@ -561,7 +561,7 @@
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
/obj/item/storage/box/donut = 2,
/obj/item/implanter/compliance = 1)
- req_log_access = access_armory
+ req_log_access = ACCESS_ARMORY
has_logs = 1
/obj/machinery/vending/hydronutrients
@@ -710,7 +710,7 @@
name = "YouTool"
desc = "Tools for tools."
icon_state = "tool"
- //req_access = list(access_maint_tunnels) //Maintenance access
+ //req_access = list(ACCESS_MAINT_TUNNELS) //Maintenance access
products = list(/obj/item/stack/cable_coil/random = 10,
/obj/item/tool/crowbar = 5,
/obj/item/weldingtool = 3,
@@ -729,14 +729,14 @@
contraband = list(/obj/item/weldingtool/hugetank = 2,
/obj/item/clothing/gloves/fyellow = 2)
premium = list(/obj/item/clothing/gloves/heavy_engineer = 1) //VOREStation Edit - yellow gloves are common in engineering, let's make "premium" actually mean something
- req_log_access = access_ce
+ req_log_access = ACCESS_CE
has_logs = 1
/obj/machinery/vending/engivend
name = "Engi-Vend"
desc = "Spare tool vending. What? Did you expect some witty description?"
icon_state = "engivend"
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
products = list(/obj/item/geiger = 4,
/obj/item/clothing/glasses/meson = 2,
/obj/item/multitool = 4,
@@ -775,14 +775,14 @@
/obj/item/rms = 5)
premium = list(/obj/item/storage/belt/utility = 3)
product_records = list()
- req_log_access = access_ce
+ req_log_access = ACCESS_CE
has_logs = 1
/obj/machinery/vending/engineering
name = "Robco Tool Maker"
desc = "Everything you need for do-it-yourself station repair."
icon_state = "engi"
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
products = list(/obj/item/clothing/under/rank/chief_engineer = 4,
/obj/item/clothing/under/rank/engineer = 4,
/obj/item/clothing/shoes/orange = 4,
@@ -808,14 +808,14 @@
/obj/item/stock_parts/matter_bin = 5,
/obj/item/stock_parts/manipulator = 5,
/obj/item/stock_parts/console_screen = 5)
- req_log_access = access_ce
+ req_log_access = ACCESS_CE
has_logs = 1
/obj/machinery/vending/robotics
name = "Robotech Deluxe"
desc = "All the tools you need to create your own robot army."
icon_state = "robotics"
- req_access = list(access_robotics)
+ req_access = list(ACCESS_ROBOTICS)
products = list(/obj/item/clothing/suit/storage/toggle/labcoat = 4,
/obj/item/clothing/under/rank/roboticist = 4,
/obj/item/stack/cable_coil = 4,
@@ -830,7 +830,7 @@
/obj/item/clothing/mask/breath/medical = 5,
/obj/item/tool/screwdriver = 5,
/obj/item/tool/crowbar = 5)
- req_log_access = access_rd
+ req_log_access = ACCESS_RD
has_logs = 1
/obj/machinery/vending/giftvendor
@@ -1304,7 +1304,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "bardrobe"
- req_access = list(access_bar)
+ req_access = list(ACCESS_BAR)
products = list(
/obj/item/clothing/under/rank/bartender = 5,
/obj/item/clothing/under/rank/bartender/skirt = 5,
@@ -1317,7 +1317,7 @@
/obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep = 5,
/obj/item/clothing/accessory/permit/gun/bar = 1
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/secdrobe
@@ -1325,7 +1325,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "secdrobe"
- req_access = list(access_brig)
+ req_access = list(ACCESS_BRIG)
products = list(
/obj/item/clothing/under/rank/security = 5,
/obj/item/clothing/under/rank/security2 = 5,
@@ -1376,7 +1376,7 @@
/obj/item/clothing/accessory/holster/leg/black = 2,
/obj/item/clothing/accessory/holster/waist/lanyard = 2
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/chefdrobe
@@ -1384,7 +1384,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "chefdrobe"
- req_access = list(access_kitchen)
+ req_access = list(ACCESS_KITCHEN)
products = list(
/obj/item/clothing/under/rank/chef = 5,
/obj/item/clothing/shoes/black = 5,
@@ -1399,7 +1399,7 @@
/obj/item/clothing/under/waiter = 5,
/obj/item/clothing/under/sundress = 1
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/medidrobe
@@ -1407,7 +1407,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "medidrobe"
- req_access = list(access_medical_equip)
+ req_access = list(ACCESS_MEDICAL_EQUIP)
products = list(
/obj/item/clothing/under/rank/medical = 5,
/obj/item/clothing/under/rank/medical/skirt = 5,
@@ -1449,7 +1449,7 @@
/obj/item/clothing/shoes/boots/winter/medical = 5,
/obj/item/clothing/head/beret/medical = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/chemdrobe
@@ -1457,7 +1457,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "chemdrobe"
- req_access = list(access_chemistry)
+ req_access = list(ACCESS_CHEMISTRY)
products = list(
/obj/item/clothing/under/rank/chemist = 5,
/obj/item/clothing/under/rank/chemist/skirt = 5,
@@ -1474,7 +1474,7 @@
/obj/item/storage/backpack/satchel/chem = 5,
/obj/item/storage/bag/chemistry = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/genedrobe
@@ -1482,7 +1482,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "genedrobe"
- req_access = list(access_genetics)
+ req_access = list(ACCESS_GENETICS)
products = list(
/obj/item/clothing/under/rank/geneticist = 5,
/obj/item/clothing/under/rank/geneticist/skirt = 5,
@@ -1493,7 +1493,7 @@
/obj/item/storage/backpack/genetics = 5,
/obj/item/storage/backpack/satchel/gen = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/virodrobe
@@ -1501,7 +1501,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "virodrobe"
- req_access = list(access_virology)
+ req_access = list(ACCESS_VIROLOGY)
products = list(
/obj/item/clothing/under/rank/virologist = 5,
/obj/item/clothing/under/rank/virologist/skirt = 5,
@@ -1516,7 +1516,7 @@
/obj/item/storage/backpack/virology = 5,
/obj/item/storage/backpack/satchel/vir = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/scidrobe
@@ -1524,7 +1524,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "scidrobe"
- req_access = list(access_research)
+ req_access = list(ACCESS_RESEARCH)
products = list(
/obj/item/clothing/under/rank/scientist = 5,
/obj/item/clothing/under/rank/scientist/skirt = 5,
@@ -1546,7 +1546,7 @@
/obj/item/storage/backpack/toxins = 5,
/obj/item/storage/backpack/satchel/tox = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/robodrobe
@@ -1554,7 +1554,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "robodrobe"
- req_access = list(access_robotics)
+ req_access = list(ACCESS_ROBOTICS)
products = list(
/obj/item/clothing/under/rank/roboticist = 5,
/obj/item/clothing/suit/storage/toggle/labcoat/roboticist = 5,
@@ -1572,7 +1572,7 @@
contraband = list(
/obj/item/clothing/suit/storage/hooded/techpriest = 2
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/chapdrobe
@@ -1580,7 +1580,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "chapdrobe"
- req_access = list(access_chapel_office)
+ req_access = list(ACCESS_CHAPEL_OFFICE)
products = list(
/obj/item/clothing/under/rank/chaplain = 5,
/obj/item/clothing/shoes/black = 5,
@@ -1599,7 +1599,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/ratvar = 1,
/obj/item/clothing/suit/storage/hooded/wintercoat/narsie = 1
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/engidrobe
@@ -1607,7 +1607,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "engidrobe"
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
products = list(
/obj/item/clothing/under/rank/engineer = 5,
/obj/item/clothing/under/rank/engineer/skirt = 5,
@@ -1625,7 +1625,7 @@
/obj/item/clothing/shoes/boots/winter/engineering = 5,
/obj/item/clothing/shoes/boots/workboots = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/atmosdrobe
@@ -1633,7 +1633,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "atmosdrobe"
- req_access = list(access_atmospherics)
+ req_access = list(ACCESS_ATMOSPHERICS)
products = list(
/obj/item/clothing/under/rank/atmospheric_technician = 5,
/obj/item/clothing/under/rank/atmospheric_technician/skirt = 5,
@@ -1647,7 +1647,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos = 5,
/obj/item/clothing/shoes/boots/winter/atmos = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/hydrobe
@@ -1655,7 +1655,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "hydrobe"
- req_access = list(access_hydroponics)
+ req_access = list(ACCESS_HYDROPONICS)
products = list(
/obj/item/clothing/under/rank/hydroponics = 5,
/obj/item/analyzer/plant_analyzer = 5,
@@ -1667,7 +1667,7 @@
/obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep = 5,
/obj/item/clothing/shoes/boots/winter/hydro = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/cargodrobe
@@ -1675,7 +1675,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "cargodrobe"
- req_access = list(access_cargo)
+ req_access = list(ACCESS_CARGO)
products = list(
/obj/item/clothing/under/rank/cargotech = 5,
/obj/item/clothing/under/rank/cargotech/skirt = 5,
@@ -1702,7 +1702,7 @@
/obj/item/clothing/gloves/fingerless = 5,
/obj/item/clothing/head/soft = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/*
@@ -1713,7 +1713,7 @@
icon_state = "curadrobe"
req_access = list()
products = list()
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
*/
@@ -1723,7 +1723,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "janidrobe"
- req_access = list(access_janitor)
+ req_access = list(ACCESS_JANITOR)
products = list(
/obj/item/clothing/head/soft/purple = 5,
/obj/item/clothing/head/beret/purple = 5,
@@ -1741,7 +1741,7 @@
/obj/item/clothing/glasses/hud/janitor = 5,
/obj/item/cartridge/janitor = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/lawdrobe
@@ -1749,7 +1749,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "lawdrobe"
- req_access = list(access_lawyer)
+ req_access = list(ACCESS_LAWYER)
products = list(
/obj/item/clothing/under/lawyer/female = 5,
/obj/item/clothing/under/lawyer/black = 5,
@@ -1773,7 +1773,7 @@
/obj/item/clothing/under/lawyer/blue/skirt = 5,
/obj/item/rectape/random = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/detdrobe
@@ -1781,7 +1781,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Want to do your job? Sure you do!"
icon_state = "detdrobe"
- req_access = list(access_forensics_lockers)
+ req_access = list(ACCESS_FORENSICS_LOCKERS)
products = list(
/obj/item/clothing/head/det = 5,
/obj/item/clothing/head/det/grey = 5,
@@ -1800,7 +1800,7 @@
/obj/item/clothing/suit/storage/forensics/blue = 5,
/obj/item/clothing/suit/storage/forensics/red = 5
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/mimedrobe
@@ -1808,7 +1808,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "..."
icon_state = "mimedrobe"
- req_access = list(access_mime)
+ req_access = list(ACCESS_MIME)
products = list(
/obj/item/clothing/under/mime = 1,
/obj/item/clothing/under/sexymime = 1,
@@ -1820,7 +1820,7 @@
/obj/item/clothing/suit/suspenders = 1,
/obj/item/clothing/shoes/mime = 1
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
/obj/machinery/vending/wardrobe/clowndrobe
@@ -1828,7 +1828,7 @@
desc = "All the things you need to perform your job! Why didn't you already have them?"
product_slogans = "Honk!"
icon_state = "clowndrobe"
- req_access = list(access_clown)
+ req_access = list(ACCESS_CLOWN)
products = list(
/obj/item/clothing/under/rank/clown = 1,
/obj/item/clothing/under/sexyclown = 1,
@@ -1847,5 +1847,5 @@
contraband = list(
/obj/item/clothing/under/clown/rainbow = 1
)
- req_log_access = access_hop
+ req_log_access = ACCESS_HOP
has_logs = 1
diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm
index 0ed3a9f867..b607e25ae8 100644
--- a/code/modules/economy/vending_machines_vr.dm
+++ b/code/modules/economy/vending_machines_vr.dm
@@ -221,13 +221,13 @@
icon_state = "blood"
vend_delay = 7
idle_power_usage = 211
- req_access = list(access_medical)
+ req_access = list(ACCESS_MEDICAL)
products = list(/obj/item/reagent_containers/blood/prelabeled/APlus = 3,/obj/item/reagent_containers/blood/prelabeled/AMinus = 3,
/obj/item/reagent_containers/blood/prelabeled/BPlus = 3,/obj/item/reagent_containers/blood/prelabeled/BMinus = 3,
/obj/item/reagent_containers/blood/prelabeled/OPlus = 2,/obj/item/reagent_containers/blood/prelabeled/OMinus = 5,
/obj/item/reagent_containers/blood/empty = 5)
contraband = list(/obj/item/reagent_containers/glass/bottle/stoxin = 2)
- req_log_access = access_cmo
+ req_log_access = ACCESS_CMO
has_logs = 1
//Airlock antitox vendor
@@ -238,7 +238,7 @@
density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
products = list(/obj/item/reagent_containers/pill/airlock = 20)
contraband = list(/obj/item/reagent_containers/pill/tox = 2)
- req_log_access = access_cmo
+ req_log_access = ACCESS_CMO
has_logs = 1
/obj/machinery/seed_storage/brig
diff --git a/code/modules/events/atmos_leak.dm b/code/modules/events/atmos_leak.dm
index 64825b4d72..907aaa6202 100644
--- a/code/modules/events/atmos_leak.dm
+++ b/code/modules/events/atmos_leak.dm
@@ -14,7 +14,46 @@
/area/shuttle,
/area/crew_quarters,
/area/holodeck,
- /area/engineering/engine_room
+ /area/engineering/engine_room,
+
+ // Groundbase
+ /area/groundbase/level1/centsquare,
+ /area/groundbase/level1/eastspur,
+ /area/groundbase/level1/northspur,
+ /area/groundbase/level1/southeastspur,
+ /area/groundbase/level1/southwestspur,
+ /area/groundbase/level1/westspur,
+ /area/maintenance/groundbase/level1/netunnel,
+ /area/maintenance/groundbase/level1/nwtunnel,
+ /area/maintenance/groundbase/level1/stunnel,
+ /area/maintenance/groundbase/level1/setunnel,
+ /area/maintenance/groundbase/level1/swtunnel,
+ /area/groundbase/level2/ne,
+ /area/groundbase/level2/nw,
+ /area/groundbase/level2/se,
+ /area/groundbase/level2/sw,
+ /area/groundbase/level3/ne,
+ /area/groundbase/level3/nw,
+ /area/groundbase/level3/se,
+ /area/groundbase/level3/sw,
+ /area/groundbase/level2/northspur,
+ /area/groundbase/level2/eastspur,
+ /area/groundbase/level2/westspur,
+ /area/groundbase/level2/southeastspur,
+ /area/groundbase/level2/southwestspur,
+ /area/groundbase/level3/ne/open,
+ /area/groundbase/level3/nw/open,
+ /area/groundbase/level3/se/open,
+ /area/groundbase/level3/sw/open,
+ /area/groundbase/level3/escapepad,
+
+ // Tether
+ /area/tether/surfacebase/tram,
+ /area/tether/surfacebase/surface_one_hall,
+ /area/tether/surfacebase/surface_two_hall,
+ /area/tether/surfacebase/surface_three_hall,
+ /area/teleporter/departing,
+ /area/hallway/station/upper,
)
// Decide which area will be targeted!
diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/kitchen/gibber.dm
index b728866aa4..a6dd2df7ef 100644
--- a/code/modules/food/kitchen/gibber.dm
+++ b/code/modules/food/kitchen/gibber.dm
@@ -7,7 +7,7 @@
density = TRUE
anchored = TRUE
unacidable = TRUE
- req_access = list(access_kitchen,access_morgue)
+ req_access = list(ACCESS_KITCHEN,ACCESS_MORGUE)
var/operating = 0 //Is it on?
var/dirty = 0 // Does it need cleaning?
diff --git a/code/modules/food/kitchen/smartfridge/medical.dm b/code/modules/food/kitchen/smartfridge/medical.dm
index a2d96e46e6..8aaf3eba94 100644
--- a/code/modules/food/kitchen/smartfridge/medical.dm
+++ b/code/modules/food/kitchen/smartfridge/medical.dm
@@ -17,7 +17,7 @@
name = "\improper Refrigerated Medicine Storage"
desc = "A refrigerated storage unit for storing medicine and chemicals."
icon_contents = "chem"
- req_one_access = list(access_medical,access_chemistry)
+ req_one_access = list(ACCESS_MEDICAL,ACCESS_CHEMISTRY)
/obj/machinery/smartfridge/secure/medbay/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
@@ -45,7 +45,7 @@
name = "\improper Refrigerated Virus Storage"
desc = "A refrigerated storage unit for securely storing viral material."
icon_contents = "viro"
- req_access = list(access_virology)
+ req_access = list(ACCESS_VIROLOGY)
/obj/machinery/smartfridge/secure/virology/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
@@ -61,7 +61,7 @@
name = "\improper Smart Chemical Storage"
desc = "A refrigerated storage unit for storing medicine and chemicals."
icon_contents = "chem"
- req_one_access = list(access_chemistry)
+ req_one_access = list(ACCESS_CHEMISTRY)
/obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
@@ -74,7 +74,7 @@
name = "\improper Smart Chemical Storage"
desc = "A refrigerated storage unit for securely storing medicine and chemicals."
icon_contents = "chem"
- req_one_access = list(access_chemistry)
+ req_one_access = list(ACCESS_CHEMISTRY)
/obj/machinery/smartfridge/secure/chemistry/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
diff --git a/code/modules/food/kitchen/smartfridge/research.dm b/code/modules/food/kitchen/smartfridge/research.dm
index 623100b7af..2c2bf201f4 100644
--- a/code/modules/food/kitchen/smartfridge/research.dm
+++ b/code/modules/food/kitchen/smartfridge/research.dm
@@ -5,7 +5,7 @@
name = "\improper Biological Sample Storage"
desc = "A refrigerated storage unit for xenobiological samples."
icon_contents = "slime"
- req_access = list(access_research)
+ req_access = list(ACCESS_RESEARCH)
/obj/machinery/smartfridge/secure/extract/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/slime_extract) || istype(O, /obj/item/slimepotion))
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index 4efca25cf8..5c228280d1 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -413,7 +413,7 @@
power_draw_idle = 5
power_draw_per_use = 40
- var/frequency = 1457
+ var/frequency = RSD_FREQ
var/code = 30
var/datum/radio_frequency/radio_connection
@@ -426,7 +426,7 @@
/obj/item/integrated_circuit/input/signaler/Destroy()
if(SSradio)
SSradio.remove_object(src,frequency)
- frequency = 0
+ frequency = ZERO_FREQ
. = ..()
/obj/item/integrated_circuit/input/signaler/on_data_written()
@@ -810,13 +810,13 @@
complexity = 9
inputs = list()
outputs = list(
- "pressure" = IC_PINTYPE_NUMBER,
- "temperature" = IC_PINTYPE_NUMBER,
- GAS_O2 = IC_PINTYPE_NUMBER,
- GAS_N2 = IC_PINTYPE_NUMBER,
- "carbon dioxide" = IC_PINTYPE_NUMBER,
- GAS_PHORON = IC_PINTYPE_NUMBER,
- "other" = IC_PINTYPE_NUMBER
+ "pressure" = IC_PINTYPE_NUMBER,
+ "temperature" = IC_PINTYPE_NUMBER,
+ GAS_O2 = IC_PINTYPE_NUMBER,
+ GAS_N2 = IC_PINTYPE_NUMBER,
+ GAS_CO2 = IC_PINTYPE_NUMBER,
+ GAS_PHORON = IC_PINTYPE_NUMBER,
+ "other" = IC_PINTYPE_NUMBER
)
activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
spawn_flags = IC_SPAWN_RESEARCH
diff --git a/code/modules/maint_recycler/code/vendor_datums/entries/bling_entries.dm b/code/modules/maint_recycler/code/vendor_datums/entries/bling_entries.dm
index f19dec0f74..1e88da18c6 100644
--- a/code/modules/maint_recycler/code/vendor_datums/entries/bling_entries.dm
+++ b/code/modules/maint_recycler/code/vendor_datums/entries/bling_entries.dm
@@ -9,7 +9,7 @@
per_round_cap = 3 //limited supply!
object_type_to_spawn = /obj/item/healthanalyzer/bling
icon_state = "scamalyzer"
- required_access = list(access_medical)
+ required_access = list(ACCESS_MEDICAL)
vendor_category = MAINTVENDOR_SWAG
/datum/maint_recycler_vendor_entry/bling_wrench
@@ -17,7 +17,7 @@
ad_message = "Bust Nuts in Style!"
desc = "*a distinct CuZn of ACTUAL gold, this wrench is sure to at least look KIND of gold! Robotics & Engineering ONLY!"
object_type_to_spawn = /obj/item/tool/wrench/brass
- required_access = list(access_engine,access_robotics)
+ required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)
item_cost = 30 //not actual gold
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
@@ -32,7 +32,7 @@
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
icon_state="goldscrew"
- required_access = list(access_engine,access_robotics)
+ required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)
/datum/maint_recycler_vendor_entry/bling_crowbar
name = "Gold Crowbar"
@@ -43,7 +43,7 @@
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
icon_state="goldcrow"
- required_access = list(access_engine,access_robotics,access_medical) //for paramedics
+ required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS,ACCESS_MEDICAL) //for paramedics
@@ -56,7 +56,7 @@
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
icon_state="goldcutters"
- required_access = list(access_engine,access_robotics)
+ required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)
/datum/maint_recycler_vendor_entry/bling_welder
name = "Golden Welder"
@@ -67,4 +67,4 @@
per_person_cap = 1
vendor_category = MAINTVENDOR_SWAG
icon_state="goldweld"
- required_access = list(access_engine,access_robotics)
+ required_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)
diff --git a/code/modules/maint_recycler/code/vendor_datums/entries/weapons_and_arms.dm b/code/modules/maint_recycler/code/vendor_datums/entries/weapons_and_arms.dm
index 68c10c980b..c3b921d67a 100644
--- a/code/modules/maint_recycler/code/vendor_datums/entries/weapons_and_arms.dm
+++ b/code/modules/maint_recycler/code/vendor_datums/entries/weapons_and_arms.dm
@@ -7,7 +7,7 @@
tagline = "clean and effective as fuck! OnlySec!"
per_person_cap = 1
per_round_cap = 1 //limited supply!
- required_access = list(access_security)
+ required_access = list(ACCESS_SECURITY)
vendor_category = MAINTVENDOR_WEAPONS
/datum/maint_recycler_vendor_entry/foamforce_ammo //fun!
diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm
index d59d321ed9..b93f801f10 100644
--- a/code/modules/mining/machinery/machine_processing.dm
+++ b/code/modules/mining/machinery/machine_processing.dm
@@ -124,7 +124,7 @@
. = TRUE
if("claim")
if(istype(inserted_id))
- if(access_mining_station in inserted_id.GetAccess())
+ if(ACCESS_MINING_STATION in inserted_id.GetAccess())
inserted_id.adjust_mining_points(machine.points)
machine.points = 0
else
diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm
index ef271f8f65..69a41457b5 100644
--- a/code/modules/mob/living/bot/SLed209bot.dm
+++ b/code/modules/mob/living/bot/SLed209bot.dm
@@ -19,8 +19,8 @@
stun_strength = 10
xeno_harm_strength = 9
- req_one_access = list(access_research, access_robotics)
- botcard_access = list(access_research, access_robotics, access_xenobiology, access_xenoarch, access_tox, access_tox_storage, access_maint_tunnels)
+ req_one_access = list(ACCESS_RESEARCH, ACCESS_ROBOTICS)
+ botcard_access = list(ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_MAINT_TUNNELS)
retaliates = FALSE
var/xeno_stun_strength = 6
diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm
index b4ae7e16f0..be21ba4ecb 100644
--- a/code/modules/mob/living/bot/cleanbot.dm
+++ b/code/modules/mob/living/bot/cleanbot.dm
@@ -2,8 +2,8 @@
name = "Cleanbot"
desc = "A little cleaning robot, it looks so excited!"
icon_state = "cleanbot0"
- req_one_access = list(access_robotics, access_janitor)
- botcard_access = list(access_janitor)
+ req_one_access = list(ACCESS_ROBOTICS, ACCESS_JANITOR)
+ botcard_access = list(ACCESS_JANITOR)
pass_flags = PASSTABLE
max_frustration = 12 //CHOMPEdit
diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm
index 7c354204f3..7fedd5332d 100644
--- a/code/modules/mob/living/bot/edCLNbot.dm
+++ b/code/modules/mob/living/bot/edCLNbot.dm
@@ -2,8 +2,8 @@
name = "ED-CLN Cleaning Robot"
desc = "A large cleaning robot. It looks rather efficient."
icon_state = "edCLN0"
- req_one_access = list(access_robotics, access_janitor)
- botcard_access = list(access_janitor)
+ req_one_access = list(ACCESS_ROBOTICS, ACCESS_JANITOR)
+ botcard_access = list(ACCESS_JANITOR)
locked = 0 // Start unlocked so roboticist can set them to patrol.
wait_if_pulled = 0 // One big boi.
diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm
index b657134d0d..8df34a82e5 100644
--- a/code/modules/mob/living/bot/farmbot.dm
+++ b/code/modules/mob/living/bot/farmbot.dm
@@ -10,7 +10,7 @@
icon_state = "farmbot0"
health = 50
maxHealth = 50
- req_one_access = list(access_robotics, access_hydroponics, access_xenobiology)
+ req_one_access = list(ACCESS_ROBOTICS, ACCESS_HYDROPONICS, ACCESS_XENOBIOLOGY)
var/action = "" // Used to update icon
var/waters_trays = 1
diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm
index d15e4c7ada..d674ff95e6 100644
--- a/code/modules/mob/living/bot/floorbot.dm
+++ b/code/modules/mob/living/bot/floorbot.dm
@@ -8,7 +8,7 @@
name = "Floorbot"
desc = "A little floor repairing robot, it looks so excited!"
icon_state = "floorbot0"
- req_one_access = list(access_robotics, access_construction)
+ req_one_access = list(ACCESS_ROBOTICS, ACCESS_CONSTRUCTION)
wait_if_pulled = 1
min_target_dist = 0
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index a514fb4074..7026bca930 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -17,9 +17,9 @@
name = "Medibot"
desc = "A little medical robot. He looks somewhat underwhelmed."
icon_state = "medibot0"
- req_one_access = list(access_robotics, access_medical)
- botcard_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
- max_frustration = 7 //CHOMPEdit
+ req_one_access = list(ACCESS_ROBOTICS, ACCESS_MEDICAL)
+ botcard_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
+ max_frustration = 7 // CHOMPAdd
var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm
index 2626b2c802..7c8bfde4e9 100644
--- a/code/modules/mob/living/bot/mulebot.dm
+++ b/code/modules/mob/living/bot/mulebot.dm
@@ -21,7 +21,7 @@
max_target_dist = 250
target_speed = 3
max_frustration = 5
- botcard_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station)
+ botcard_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION)
var/atom/movable/load
diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm
index 8824553480..1cf046ba05 100644
--- a/code/modules/mob/living/bot/secbot.dm
+++ b/code/modules/mob/living/bot/secbot.dm
@@ -8,8 +8,8 @@
icon_state = "secbot0"
maxHealth = 100
health = 100
- req_one_access = list(access_security, access_forensics_lockers)
- botcard_access = list(access_security, access_sec_doors, access_forensics_lockers, access_maint_tunnels)
+ req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS)
+ botcard_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MAINT_TUNNELS)
patrol_speed = 2
target_speed = 3
max_frustration = 7 //CHOMPEdit
@@ -69,8 +69,8 @@
xeno_harm_strength = 9 // Weaker than regular slimesky but they can stun.
baton_glow = "#33CCFF"
- req_one_access = list(access_research, access_robotics)
- botcard_access = list(access_research, access_robotics, access_xenobiology, access_xenoarch, access_tox, access_tox_storage, access_maint_tunnels)
+ req_one_access = list(ACCESS_RESEARCH, ACCESS_ROBOTICS)
+ botcard_access = list(ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_MAINT_TUNNELS)
used_weapon = /obj/item/melee/baton/slime
var/xeno_stun_strength = 5 // How hard to slimebatoned()'d naughty slimes. 5 works out to 2 discipline and 5 weaken.
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 5bdefb6455..945a3ed373 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -9,7 +9,7 @@
can_speak = 1
origin_tech = list(TECH_BIO = 3)
- req_access = list(access_robotics)
+ req_access = list(ACCESS_ROBOTICS)
//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
@@ -180,7 +180,7 @@
/obj/item/mmi/digital
var/searching = 0
var/askDelay = 10 * 60 * 1
- req_access = list(access_robotics)
+ req_access = list(ACCESS_ROBOTICS)
locked = 0
mecha = null//This does not appear to be used outside of reference in mecha.dm.
var/ghost_query_type = null
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 5fedacac01..8d48176be5 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -8,7 +8,7 @@
var/searching = 0
var/askDelay = 10 * 60 * 1
- req_access = list(access_robotics)
+ req_access = list(ACCESS_ROBOTICS)
locked = 0
mecha = null//This does not appear to be used outside of reference in mecha.dm.
diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
index 614bef32ee..82493331b6 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
@@ -544,7 +544,7 @@
"dullahanmetal",
"dullahanmetal2"
)
- if(mind.assigned_role in command_positions)
+ if(mind.assigned_role in GLOB.command_positions)
dullahanmetal_styles.Add("dullahancommand")
var/list/dullahaneyes_styles = list(
"dullahaneyes"
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 7775d77aa0..e3d6f5bdba 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -1436,11 +1436,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
apply_layer(VORE_TAIL_LAYER)
/mob/living/carbon/human/proc/get_vore_tail_image()
- if(tail_style && istaurtail(tail_style) && tail_style:vore_tail_sprite_variant)
+ if(tail_style && istaurtail(tail_style) && tail_style.vore_tail_sprite_variant)
var/vs_fullness = vore_fullness_ex["taur belly"]
- var/loaf_alt = lying && tail_style:belly_variant_when_loaf
+ var/loaf_alt = lying && tail_style.belly_variant_when_loaf
var/fullness_icons = min(tail_style.fullness_icons, vs_fullness)
- var/icon/vorebelly_s = new/icon(icon = tail_style.bellies_icon_path, icon_state = "Taur[tail_style:vore_tail_sprite_variant]-Belly-[fullness_icons][loaf_alt ? " loaf" : (struggle_anim_taur ? "" : " idle")]")
+ var/icon/vorebelly_s = new/icon(icon = tail_style.bellies_icon_path, icon_state = "Taur[tail_style.vore_tail_sprite_variant]-Belly-[fullness_icons][loaf_alt ? " loaf" : (struggle_anim_taur ? "" : " idle")]")
vorebelly_s.Blend(vore_sprite_color["taur belly"], vore_sprite_multiply["taur belly"] ? ICON_MULTIPLY : ICON_ADD)
var/image/working = image(vorebelly_s)
working.pixel_x = -16
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 49017b4665..9dfa8f615a 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -33,7 +33,7 @@ var/list/mob_hat_cache = list()
braintype = "Drone"
lawupdate = 0
density = TRUE
- req_access = list(access_engine, access_robotics)
+ req_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS)
integrated_light_power = 3
local_transmit = 1
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index 3ab6def649..a615e79984 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -3,7 +3,7 @@
desc = "Used to monitor the station's drone population and the assembler that services them."
icon_keyboard = "power_key"
icon_screen = "generic" //VOREStation Edit
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
circuit = /obj/item/circuitboard/drone_control
//Used when pinging drones.
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index d9d6529aaf..2c7fefcd2a 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -88,7 +88,7 @@
var/wiresexposed = 0
var/locked = 1
var/has_power = 1
- var/list/req_access = list(access_robotics)
+ var/list/req_access = list(ACCESS_ROBOTICS)
var/ident = 0
//var/list/laws = list()
var/viewalerts = 0
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index 7145e4d25d..8bd29ac556 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -24,11 +24,11 @@
dummy_card_type = /obj/item/card/id/syndicate/dummy_cyborg
/obj/item/card/id/science/roboticist/dummy_cyborg
- access = list(access_robotics)
+ access = list(ACCESS_ROBOTICS)
/obj/item/card/id/syndicate/dummy_cyborg/Initialize(mapload)
. = ..()
- access |= access_robotics
+ access |= ACCESS_ROBOTICS
//A harvest item for serviceborgs.
/obj/item/robot_harvester
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
index d034b7d9c1..82596d58ad 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
@@ -488,7 +488,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/engislug)
holder_type = /obj/item/holder/catslug/custom/engislug
say_list_type = /datum/say_list/catslug/custom/engislug
- myid_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_construction, access_atmospherics)
+ myid_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS)
siemens_coefficient = 0 //Noodly fella's gone and built up an immunity from many small shocks
minbodytemp = 200
@@ -603,7 +603,7 @@
"bio" = 0,
"rad" = 0
) //Similarly, \some\ armour values for a smidge more survivability compared to other catslugs.
- myid_access = list(access_security, access_sec_doors, access_forensics_lockers, access_maint_tunnels)
+ myid_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MAINT_TUNNELS)
/datum/say_list/catslug/custom/gatslug
speak = list("Have any flashbangs?", "Valids!", "Heard spiders?", "What is that?", "Freeze!", "What are you doing?", "How did you get here?", "Red alert means big bangsticks.", "No being naughty now.", "WAOW!", "Who ate all the donuts?")
@@ -640,7 +640,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/medislug)
holder_type = /obj/item/holder/catslug/custom/medislug
say_list_type = /datum/say_list/catslug/custom/medislug
- myid_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
+ myid_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
/datum/say_list/catslug/custom/medislug
speak = list("Have any osteodaxon?", "What is that?", "Suit sensors!", "What are you doing?", "How did you get here?", "Put a mask on!", "No smoking!", "WAOW!", "Stop getting blood everywhere!", "WHERE IN MAINT?")
@@ -676,7 +676,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/scienceslug)
holder_type = /obj/item/holder/catslug/custom/scienceslug
say_list_type = /datum/say_list/catslug/custom/scienceslug
- myid_access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch)
+ myid_access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH)
/datum/say_list/catslug/custom/scienceslug
@@ -714,7 +714,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/cargoslug)
holder_type = /obj/item/holder/catslug/custom/cargoslug
say_list_type = /datum/say_list/catslug/custom/cargoslug
- myid_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station)
+ myid_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
/datum/say_list/catslug/custom/cargoslug
speak = list("Disposals is not for slip and slide.", "What is that?", "Stamp those manifests!", "What are you doing?", "How did you get here?", "Can order pizza crate?", "WAOW!", "Where are all of our materials?", "Got glubbs?")
@@ -753,7 +753,7 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/capslug)
holder_type = /obj/item/holder/catslug/custom/capslug
say_list_type = /datum/say_list/catslug/custom/capslug
- myid_access = list(access_heads, access_keycard_auth) //Same access as a bridge secretary.
+ myid_access = list(ACCESS_HEADS, ACCESS_KEYCARD_AUTH) //Same access as a bridge secretary.
/datum/say_list/catslug/custom/capslug
speak = list("How open big glass box with shiny inside?.", "What is that?", "Respect my authority!", "What are you doing?", "How did you get here?", "Fax for yellow-shirts!", "WAOW!", "Why is that console blinking and clicking?", "Do we need to call for ERT?", "Have been called comdom before, not sure why they thought I was a balloon.")
@@ -784,7 +784,7 @@
icon_dead = "deathslug_dead"
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug) //So they don't get the spaceslug's cataloguer entry
say_list_type = /datum/say_list/catslug //Similarly, so they don't get the spaceslug's speech lines.
- myid_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
+ myid_access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
maxHealth = 100 //Tough noodles
health = 100
taser_kill = 0
@@ -822,7 +822,7 @@
icon_dead = "syndislug_dead"
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug)
say_list_type = /datum/say_list/catslug
- myid_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks)
+ myid_access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS)
faction = FACTION_SYNDICATE
maxHealth = 100 //Tough noodles
health = 100
@@ -867,7 +867,7 @@
icon_dead = "responseslug_dead"
catalogue_data = list(/datum/category_item/catalogue/fauna/catslug)
say_list_type = /datum/say_list/catslug
- myid_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
+ myid_access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
maxHealth = 100 //Tough noodles
health = 100
taser_kill = 0
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
index 033d1e3206..b969d9a8ad 100644
--- a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
+++ b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
@@ -16,7 +16,7 @@
var/progress = 0
var/target_progress = 300
var/datum/access/target_access = null
- var/list/restricted_access_codes = list(access_change_ids, access_network) // access codes that are not hackable due to balance reasons
+ var/list/restricted_access_codes = list(ACCESS_CHANGE_IDS, ACCESS_NETWORK) // access codes that are not hackable due to balance reasons
/datum/computer_file/program/access_decrypter/kill_program(var/forced)
reset()
diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm
index 722face19e..4be97441b3 100644
--- a/code/modules/modular_computers/file_system/programs/command/card.dm
+++ b/code/modules/modular_computers/file_system/programs/command/card.dm
@@ -6,7 +6,7 @@
program_key_state = "id_key"
program_menu_icon = "key"
extended_desc = "Program for programming crew ID cards."
- required_access = access_change_ids
+ required_access = ACCESS_CHANGE_IDS
requires_ntnet = FALSE
size = 8
category = PROG_COMMAND
diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm
index 9f76388c42..81275f956e 100644
--- a/code/modules/modular_computers/file_system/programs/command/comm.dm
+++ b/code/modules/modular_computers/file_system/programs/command/comm.dm
@@ -6,7 +6,7 @@
program_menu_icon = "flag"
tguimodule_path = /datum/tgui_module/communications/ntos
extended_desc = "Used to command and control. Can relay long-range communications. This program can not be run on tablet computers."
- required_access = access_heads
+ required_access = ACCESS_HEADS
requires_ntnet = TRUE
size = 12
usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP
diff --git a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm
index 8dd86e2baf..a22d3ca217 100644
--- a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm
@@ -7,7 +7,7 @@
program_key_state = "atmos_key"
program_menu_icon = "alert"
extended_desc = "This program provides visual interface for the engineering alarm system."
- required_access = access_engine
+ required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "alarm monitoring network"
size = 5
diff --git a/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm b/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm
index 9fc593249f..a70238b48c 100644
--- a/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm
@@ -6,7 +6,7 @@
program_key_state = "atmos_key"
program_menu_icon = "shuffle"
extended_desc = "This program allows remote control of air alarms. This program can not be run on tablet computers."
- required_access = access_atmospherics
+ required_access = ACCESS_ATMOSPHERICS
requires_ntnet = TRUE
network_destination = "atmospheric control system"
requires_ntnet_feature = NTNET_SYSTEMCONTROL
diff --git a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm
index 7c3de1ef10..9a0d19b65f 100644
--- a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm
@@ -7,7 +7,7 @@
program_menu_icon = "battery-3"
extended_desc = "This program connects to sensors to provide information about electrical systems"
ui_header = "power_norm.gif"
- required_access = access_engine
+ required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "power monitoring system"
size = 9
diff --git a/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm b/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm
index 1ff068b90a..8b3d9661ca 100644
--- a/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm
@@ -6,7 +6,7 @@
program_key_state = "rd_key"
program_menu_icon = "power"
extended_desc = "This program allows remote control of power distribution systems. This program can not be run on tablet computers."
- required_access = access_engine
+ required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "RCON remote control system"
requires_ntnet_feature = NTNET_SYSTEMCONTROL
diff --git a/code/modules/modular_computers/file_system/programs/engineering/shutoff_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/shutoff_monitor.dm
index 70027b69e6..83593b6093 100644
--- a/code/modules/modular_computers/file_system/programs/engineering/shutoff_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering/shutoff_monitor.dm
@@ -6,7 +6,7 @@
program_key_state = "atmos_key"
program_menu_icon = "wrench"
extended_desc = "This program allows for remote monitoring and control of emergency shutoff valves."
- required_access = access_engine
+ required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "shutoff valve control computer"
size = 5
diff --git a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm
index eafa7308fa..c5048c98f5 100644
--- a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm
@@ -7,7 +7,7 @@
program_menu_icon = "notice"
extended_desc = "This program connects to specially calibrated supermatter sensors to provide information on the status of supermatter-based engines."
ui_header = "smmon_0.gif"
- required_access = access_engine
+ required_access = ACCESS_ENGINE
requires_ntnet = TRUE
network_destination = "supermatter monitoring system"
size = 5
diff --git a/code/modules/modular_computers/file_system/programs/generic/camera.dm b/code/modules/modular_computers/file_system/programs/generic/camera.dm
index d7ed210e78..2a0ee74dad 100644
--- a/code/modules/modular_computers/file_system/programs/generic/camera.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/camera.dm
@@ -10,22 +10,22 @@
if(NETWORK_THUNDER)
return 0
if(NETWORK_ENGINE,NETWORK_ENGINEERING,NETWORK_ALARM_ATMOS,NETWORK_ALARM_FIRE,NETWORK_ALARM_POWER)
- return access_engine
+ return ACCESS_ENGINE
if(NETWORK_CIRCUITS)
- return access_research
+ return ACCESS_RESEARCH
if(NETWORK_MINE)
- return access_qm
+ return ACCESS_QM
if(NETWORK_ERT)
- return access_cent_specops
+ return ACCESS_CENT_SPECOPS
//VOREStation Add Start
if(NETWORK_TALON_SHIP)
- return access_talon
+ return ACCESS_TALON
if(NETWORK_TALON_HELMETS)
- return access_talon
+ return ACCESS_TALON
//VOREStation Add End
if(network in using_map.station_networks)
- return access_security // Default for all other station networks
+ return ACCESS_SECURITY // Default for all other station networks
else
return 999 //Inaccessible if not a station network and not mentioned above
diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm
index b1a6578f03..84f3a7c008 100644
--- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm
@@ -84,7 +84,7 @@
if(channel)
channel.remove_client(src) // We shouldn't be in channel's user list, but just in case...
return TRUE
- if(isliving(ui.user) && can_run(ui.user, TRUE, access_network))
+ if(isliving(ui.user) && can_run(ui.user, TRUE, ACCESS_NETWORK))
for(var/datum/ntnet_conversation/chan as anything in ntnet_global.chat_channels)
chan.remove_client(src)
netadmin_mode = TRUE
@@ -169,7 +169,7 @@
/datum/computer_file/program/chatclient/tgui_static_data(mob/user)
var/list/data = list()
- data["can_admin"] = can_run(user, FALSE, access_network)
+ data["can_admin"] = can_run(user, FALSE, ACCESS_NETWORK)
return data
/datum/computer_file/program/chatclient/tgui_data(mob/user)
diff --git a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
index f536770859..4c28aeb9f0 100644
--- a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
+++ b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm
@@ -6,7 +6,7 @@
program_key_state = "med_key"
program_menu_icon = "heart"
extended_desc = "This program connects to life signs monitoring system to provide basic information on crew health."
- required_access = access_medical
+ required_access = ACCESS_MEDICAL
requires_ntnet = TRUE
network_destination = "crew lifesigns monitoring system"
size = 11
diff --git a/code/modules/modular_computers/file_system/programs/research/email_administration.dm b/code/modules/modular_computers/file_system/programs/research/email_administration.dm
index 1f76ac3193..4132a5cf9e 100644
--- a/code/modules/modular_computers/file_system/programs/research/email_administration.dm
+++ b/code/modules/modular_computers/file_system/programs/research/email_administration.dm
@@ -9,7 +9,7 @@
requires_ntnet = TRUE
available_on_ntnet = TRUE
tgui_id = "NtosEmailAdministration"
- required_access = access_network
+ required_access = ACCESS_NETWORK
category = PROG_ADMIN
var/datum/computer_file/data/email_account/current_account = null
@@ -67,7 +67,7 @@
// High security - can only be operated when the user has an ID with access on them.
var/obj/item/card/id/I = ui.user.GetIdCard()
- if(!istype(I) || !(access_network in I.GetAccess()))
+ if(!istype(I) || !(ACCESS_NETWORK in I.GetAccess()))
return TRUE
switch(action)
diff --git a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm
index 3508922335..30aa3b9216 100644
--- a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm
@@ -7,7 +7,7 @@
extended_desc = "This program monitors the local NTNet network, provides access to logging systems, and allows for configuration changes"
size = 12
requires_ntnet = TRUE
- required_access = access_network
+ required_access = ACCESS_NETWORK
available_on_ntnet = TRUE
tgui_id = "NtosNetMonitor"
category = PROG_ADMIN
diff --git a/code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm b/code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm
index fceca427cb..576ecd3f52 100644
--- a/code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/security/alarm_monitor.dm
@@ -3,4 +3,4 @@
filedesc = "Alarm Monitoring (Security)"
extended_desc = "This program provides visual interface for the security alarm system."
tguimodule_path = /datum/tgui_module/alarm_monitor/security/ntos
- required_access = access_security
+ required_access = ACCESS_SECURITY
diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
index d08946ead5..8237d8a44a 100644
--- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
+++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
@@ -19,7 +19,7 @@ var/warrant_uid = 0
program_menu_icon = "star"
requires_ntnet = TRUE
available_on_ntnet = TRUE
- required_access = access_security
+ required_access = ACCESS_SECURITY
usage_flags = PROGRAM_ALL
tgui_id = "NtosDigitalWarrant"
category = PROG_SEC
@@ -73,7 +73,7 @@ var/warrant_uid = 0
// which also use RFID scanning to allow or disallow access to some functions. Anyone can view warrants, editing requires ID. This also prevents situations where you show a tablet
// to someone who is to be arrested, which allows them to change the stuff there.
var/obj/item/card/id/I = ui.user.GetIdCard()
- if(!istype(I) || !I.registered_name || !(access_security in I.GetAccess()))
+ if(!istype(I) || !I.registered_name || !(ACCESS_SECURITY in I.GetAccess()))
to_chat(ui.user, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
return
@@ -136,7 +136,7 @@ var/warrant_uid = 0
if("editwarrantauth")
. = TRUE
- if(!(access_hos in I.GetAccess())) // VOREStation edit begin
+ if(!(ACCESS_HOS in I.GetAccess())) // VOREStation edit begin
to_chat(ui.user, span_warning("You don't have the access to do this!"))
return // VOREStation edit end
activewarrant.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]"
diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm
index d64e547c49..8a87d14d91 100644
--- a/code/modules/nifsoft/software/01_vision.dm
+++ b/code/modules/nifsoft/software/01_vision.dm
@@ -15,7 +15,7 @@
desc = "Like the civilian model, but provides medical records access and virus database lookup."
list_pos = NIF_MEDICAL_AR
cost = 375
- access = access_medical
+ access = ACCESS_MEDICAL
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_MEDICAL)
@@ -26,7 +26,7 @@
desc = "Like the civilian model, but provides access to arrest status and security records."
list_pos = NIF_SECURITY_AR
cost = 375
- access = access_security
+ access = ACCESS_SECURITY
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_WANTED,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_SECURITY)
@@ -37,7 +37,7 @@
desc = "Like the civilian model, but provides ... well, nothing. For now."
list_pos = NIF_ENGINE_AR
cost = 250
- access = access_engine
+ access = ACCESS_ENGINE
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_ENGINE)
@@ -48,7 +48,7 @@
desc = "Like the civilian model, but provides ... well, nothing. For now."
list_pos = NIF_SCIENCE_AR
cost = 250
- access = access_research
+ access = ACCESS_RESEARCH
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_SCIENCE)
@@ -59,7 +59,7 @@
desc = "Like the civilian model, but provides most of the features of the medical and security overlays as well."
list_pos = NIF_OMNI_AR
cost = 375
- access = access_captain
+ access = ACCESS_CAPTAIN
a_drain = 0.01
planes_enabled = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_CH_WANTED,VIS_AUGMENTED)
vision_flags = (NIF_V_AR_OMNI)
@@ -88,7 +88,7 @@
desc = "Enables a high-speed shielding response to intense light, such as flashes, to block them."
list_pos = NIF_FLASHPROT
cost = 300
- access = access_security
+ access = ACCESS_SECURITY
a_drain = 0.05
vision_flags = (NIF_V_FLASHPROT)
@@ -100,7 +100,7 @@
list_pos = NIF_MESONS
cost = 500
a_drain = 0.1
- access = access_engine
+ access = ACCESS_ENGINE
tick_flags = NIF_ACTIVETICK
planes_enabled = list(VIS_FULLBRIGHT, VIS_MESONS)
vision_flags = (NIF_V_MESONS)
@@ -120,7 +120,7 @@
list_pos = NIF_MATERIAL
cost = 500
a_drain = 0.1
- access = access_research
+ access = ACCESS_RESEARCH
tick_flags = NIF_ACTIVETICK
planes_enabled = list(VIS_FULLBRIGHT)
vision_flags = (NIF_V_MATERIAL)
@@ -161,7 +161,7 @@
list_pos = NIF_NIGHTVIS
cost = 500
a_drain = 0.1
- access = access_security
+ access = ACCESS_SECURITY
tick_flags = NIF_ACTIVETICK
planes_enabled = list(VIS_FULLBRIGHT)
vision_flags = (NIF_V_NIGHTVIS)
diff --git a/code/modules/nifsoft/software/06_screens.dm b/code/modules/nifsoft/software/06_screens.dm
index 3d20514074..5affb8595e 100644
--- a/code/modules/nifsoft/software/06_screens.dm
+++ b/code/modules/nifsoft/software/06_screens.dm
@@ -2,7 +2,7 @@
name = "Crew Monitor"
desc = "A link to the local crew monitor sensors. Useful for finding people in trouble."
list_pos = NIF_MEDMONITOR
- access = access_medical
+ access = ACCESS_MEDICAL
cost = 625
p_drain = 0.025
var/datum/tgui_module/crew_monitor/nif/arscreen
@@ -31,7 +31,7 @@
name = "Alarm Monitor"
desc = "A link to the local alarm monitors. Useful for detecting alarms in a pinch."
list_pos = NIF_ENGMONITOR
- access = access_engine
+ access = ACCESS_ENGINE
cost = 625
p_drain = 0.025
var/datum/tgui_module/alarm_monitor/engineering/nif/tgarscreen
diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
index 8e02ea8c14..86e738e925 100644
--- a/code/modules/overmap/ships/computers/helm.dm
+++ b/code/modules/overmap/ships/computers/helm.dm
@@ -27,8 +27,8 @@ GLOBAL_LIST_EMPTY(all_waypoints)
var/dy //coordinates
var/speedlimit = 1/(20 SECONDS) //top speed for autopilot, 5
var/accellimit = 0.001 //manual limiter for acceleration
- //req_one_access = list(access_pilot) //VOREStation Edit //CHOMPstation edit, removed hard access locks.
- ai_control = FALSE //VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help // Chompstation Edit - Not an issue on this server, use of shuttles is extremely rare also . //Chompeditedit - No
+ //req_one_access = list(ACCESS_PILOT) //VOREStation Edit // CHOMPRemove, removed hard access locks.
+ ai_control = FALSE //VOREStation Edit - AI/Borgs shouldn't really be flying off in ships without crew help
// fancy sprite
/obj/machinery/computer/ship/helm/adv
diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm
index 2db4492475..637181179f 100644
--- a/code/modules/pda/radio.dm
+++ b/code/modules/pda/radio.dm
@@ -97,7 +97,7 @@
* Radio Cartridge, essentially a signaler.
*/
/obj/item/radio/integrated/signal
- frequency = 1457
+ frequency = RSD_FREQ
var/code = 30.0
/obj/item/radio/integrated/signal/Destroy()
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 3f9c5bc7ff..4cf8c32272 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -86,7 +86,7 @@ GLOBAL_LIST_EMPTY(apcs)
pixel_y = (dir & 3) ? (dir == 1 ? 20 : -20) : 0
/obj/machinery/power/apc/hyper/graveyard
- req_access = list(access_lost)
+ req_access = list(ACCESS_LOST)
alarms_hidden = TRUE
/obj/machinery/power/apc
@@ -99,7 +99,7 @@ GLOBAL_LIST_EMPTY(apcs)
unacidable = TRUE
use_power = USE_POWER_OFF
clicksound = "switch"
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
blocks_emissive = FALSE
vis_flags = VIS_HIDE // They have an emissive that looks bad in openspace due to their wall-mounted nature
var/area/area
diff --git a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm
index 0ef353691c..410e6f9d16 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm
@@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
icon_state = "injector0"
density = TRUE
anchored = FALSE
- req_access = list(access_engine)
+ req_access = list(ACCESS_ENGINE)
use_power = USE_POWER_IDLE
idle_power_usage = 10
active_power_usage = 500
diff --git a/code/modules/power/fusion/gyrotron/gyrotron.dm b/code/modules/power/fusion/gyrotron/gyrotron.dm
index d97fa448e7..1e2784ecfe 100644
--- a/code/modules/power/fusion/gyrotron/gyrotron.dm
+++ b/code/modules/power/fusion/gyrotron/gyrotron.dm
@@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(gyrotrons)
icon = 'icons/obj/machines/power/fusion.dmi'
desc = "It is a heavy duty industrial gyrotron suited for powering fusion reactors."
icon_state = "emitter-off"
- req_access = list(access_engine)
+ req_access = list(ACCESS_ENGINE)
use_power = USE_POWER_IDLE
active_power_usage = 50000
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 060860240a..345cb0ccb5 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -6,7 +6,7 @@
icon_state = "ca"
anchored = FALSE
density = TRUE
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
// use_power = 0
var/obj/item/tank/phoron/P = null
var/last_power = 0
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 616e942e0e..b68c0c2a00 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -6,7 +6,7 @@
anchored = FALSE
density = TRUE
unacidable = TRUE
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
var/id = null
use_power = USE_POWER_OFF //uses powernet power, not APC power
diff --git a/code/modules/projectiles/guns/energy/protector_vr.dm b/code/modules/projectiles/guns/energy/protector_vr.dm
index 28d542ff7a..99c04238a5 100644
--- a/code/modules/projectiles/guns/energy/protector_vr.dm
+++ b/code/modules/projectiles/guns/energy/protector_vr.dm
@@ -134,7 +134,7 @@
list(mode_name="electrode", projectile_type=/obj/item/projectile/energy/electrode/strong, modifystate="zap", charge_cost = 800),
)
- req_access = list(access_armory) //for toggling safety
+ req_access = list(ACCESS_ARMORY) //for toggling safety
var/locked = 1
var/lockable = 1
diff --git a/code/modules/projectiles/guns/energy/pump.dm b/code/modules/projectiles/guns/energy/pump.dm
index 5cabe8aef4..4616133803 100644
--- a/code/modules/projectiles/guns/energy/pump.dm
+++ b/code/modules/projectiles/guns/energy/pump.dm
@@ -15,7 +15,7 @@
* Gun Locking Mechanism
*/
/obj/item/gun/energy/locked
- req_access = list(access_armory) //for toggling safety
+ req_access = list(ACCESS_ARMORY) //for toggling safety
var/locked = 1
var/lockable = 1
diff --git a/code/modules/projectiles/guns/energy/pump_ch.dm b/code/modules/projectiles/guns/energy/pump_ch.dm
index b61b94e733..414c3c3da6 100644
--- a/code/modules/projectiles/guns/energy/pump_ch.dm
+++ b/code/modules/projectiles/guns/energy/pump_ch.dm
@@ -82,7 +82,7 @@
//Gun Locking Mechanism
/obj/item/gun/energy/locked
- req_access = list(access_armory) //for toggling safety
+ req_access = list(ACCESS_ARMORY) //for toggling safety
var/locked = 1
var/lockable = 1
diff --git a/code/modules/reagents/machinery/dispenser/supply.dm b/code/modules/reagents/machinery/dispenser/supply.dm
index e13cca8c12..e54e783479 100644
--- a/code/modules/reagents/machinery/dispenser/supply.dm
+++ b/code/modules/reagents/machinery/dispenser/supply.dm
@@ -78,7 +78,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
containername = "chemical crate"
- access = list(access_chemistry)
+ access = list(ACCESS_CHEMISTRY)
group = "Reagents"
/datum/supply_pack/alcohol_reagents
@@ -109,7 +109,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "alcoholic drinks crate"
- access = list(access_bar)
+ access = list(ACCESS_BAR)
group = "Reagents"
/datum/supply_pack/softdrink_reagents
@@ -241,43 +241,43 @@
// Chemistry-restricted (raw reagents excluding sugar/water)
// Datum path Contents type Supply pack name Container name Cost Container access
-SEC_PACK(hydrogen, /obj/item/reagent_containers/chem_disp_cartridge/hydrogen, "Reagent refill - Hydrogen", "hydrogen reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(lithium, /obj/item/reagent_containers/chem_disp_cartridge/lithium, "Reagent refill - Lithium", "lithium reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(carbon, /obj/item/reagent_containers/chem_disp_cartridge/carbon, "Reagent refill - Carbon", "carbon reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(nitrogen, /obj/item/reagent_containers/chem_disp_cartridge/nitrogen, "Reagent refill - Nitrogen", "nitrogen reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(oxygen, /obj/item/reagent_containers/chem_disp_cartridge/oxygen, "Reagent refill - Oxygen", "oxygen reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(fluorine, /obj/item/reagent_containers/chem_disp_cartridge/fluorine, "Reagent refill - Fluorine", "fluorine reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(sodium, /obj/item/reagent_containers/chem_disp_cartridge/sodium, "Reagent refill - Sodium", "sodium reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(aluminium, /obj/item/reagent_containers/chem_disp_cartridge/aluminum, "Reagent refill - Aluminum", "aluminum reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(silicon, /obj/item/reagent_containers/chem_disp_cartridge/silicon, "Reagent refill - Silicon", "silicon reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(phosphorus,/obj/item/reagent_containers/chem_disp_cartridge/phosphorus, "Reagent refill - Phosphorus", "phosphorus reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(sulfur, /obj/item/reagent_containers/chem_disp_cartridge/sulfur, "Reagent refill - Sulfur", "sulfur reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(chlorine, /obj/item/reagent_containers/chem_disp_cartridge/chlorine, "Reagent refill - Chlorine", "chlorine reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(potassium, /obj/item/reagent_containers/chem_disp_cartridge/potassium, "Reagent refill - Potassium", "potassium reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(iron, /obj/item/reagent_containers/chem_disp_cartridge/iron, "Reagent refill - Iron", "iron reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(copper, /obj/item/reagent_containers/chem_disp_cartridge/copper, "Reagent refill - Copper", "copper reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(mercury, /obj/item/reagent_containers/chem_disp_cartridge/mercury, "Reagent refill - Mercury", "mercury reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(radium, /obj/item/reagent_containers/chem_disp_cartridge/radium, "Reagent refill - Radium", "radium reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(ethanol, /obj/item/reagent_containers/chem_disp_cartridge/ethanol, "Reagent refill - Ethanol", "ethanol reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(sacid, /obj/item/reagent_containers/chem_disp_cartridge/sacid, "Reagent refill - Sulfuric Acid", "sulfuric acid reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(tungsten, /obj/item/reagent_containers/chem_disp_cartridge/tungsten, "Reagent refill - Tungsten", "tungsten reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(calcium, /obj/item/reagent_containers/chem_disp_cartridge/calcium, "Reagent refill - Calcium", "calcium reagent cartridge crate", 15, access_chemistry)
+SEC_PACK(hydrogen, /obj/item/reagent_containers/chem_disp_cartridge/hydrogen, "Reagent refill - Hydrogen", "hydrogen reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(lithium, /obj/item/reagent_containers/chem_disp_cartridge/lithium, "Reagent refill - Lithium", "lithium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(carbon, /obj/item/reagent_containers/chem_disp_cartridge/carbon, "Reagent refill - Carbon", "carbon reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(nitrogen, /obj/item/reagent_containers/chem_disp_cartridge/nitrogen, "Reagent refill - Nitrogen", "nitrogen reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(oxygen, /obj/item/reagent_containers/chem_disp_cartridge/oxygen, "Reagent refill - Oxygen", "oxygen reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(fluorine, /obj/item/reagent_containers/chem_disp_cartridge/fluorine, "Reagent refill - Fluorine", "fluorine reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(sodium, /obj/item/reagent_containers/chem_disp_cartridge/sodium, "Reagent refill - Sodium", "sodium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(aluminium, /obj/item/reagent_containers/chem_disp_cartridge/aluminum, "Reagent refill - Aluminum", "aluminum reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(silicon, /obj/item/reagent_containers/chem_disp_cartridge/silicon, "Reagent refill - Silicon", "silicon reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(phosphorus,/obj/item/reagent_containers/chem_disp_cartridge/phosphorus, "Reagent refill - Phosphorus", "phosphorus reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(sulfur, /obj/item/reagent_containers/chem_disp_cartridge/sulfur, "Reagent refill - Sulfur", "sulfur reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(chlorine, /obj/item/reagent_containers/chem_disp_cartridge/chlorine, "Reagent refill - Chlorine", "chlorine reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(potassium, /obj/item/reagent_containers/chem_disp_cartridge/potassium, "Reagent refill - Potassium", "potassium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(iron, /obj/item/reagent_containers/chem_disp_cartridge/iron, "Reagent refill - Iron", "iron reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(copper, /obj/item/reagent_containers/chem_disp_cartridge/copper, "Reagent refill - Copper", "copper reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(mercury, /obj/item/reagent_containers/chem_disp_cartridge/mercury, "Reagent refill - Mercury", "mercury reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(radium, /obj/item/reagent_containers/chem_disp_cartridge/radium, "Reagent refill - Radium", "radium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(ethanol, /obj/item/reagent_containers/chem_disp_cartridge/ethanol, "Reagent refill - Ethanol", "ethanol reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(sacid, /obj/item/reagent_containers/chem_disp_cartridge/sacid, "Reagent refill - Sulfuric Acid", "sulfuric acid reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(tungsten, /obj/item/reagent_containers/chem_disp_cartridge/tungsten, "Reagent refill - Tungsten", "tungsten reagent cartridge crate", 15, ACCESS_CHEMISTRY)
+SEC_PACK(calcium, /obj/item/reagent_containers/chem_disp_cartridge/calcium, "Reagent refill - Calcium", "calcium reagent cartridge crate", 15, ACCESS_CHEMISTRY)
// Bar-restricted (alcoholic drinks)
// Datum path Contents type Supply pack name Container name Cost Container access
-SEC_PACK(beer, /obj/item/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, access_bar)
-SEC_PACK(kahlua, /obj/item/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, access_bar)
-SEC_PACK(whiskey, /obj/item/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, access_bar)
-SEC_PACK(rwine, /obj/item/reagent_containers/chem_disp_cartridge/redwine, "Reagent refill - Red Wine", "red wine reagent cartridge crate", 15, access_bar)
-SEC_PACK(wwine, /obj/item/reagent_containers/chem_disp_cartridge/whitewine, "Reagent refill - White Wine", "white wine reagent cartridge crate", 15, access_bar)
-SEC_PACK(vodka, /obj/item/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, access_bar)
-SEC_PACK(gin, /obj/item/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, access_bar)
-SEC_PACK(rum, /obj/item/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, access_bar)
-SEC_PACK(tequila, /obj/item/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, access_bar)
-SEC_PACK(vermouth, /obj/item/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, access_bar)
-SEC_PACK(cognac, /obj/item/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, access_bar)
-SEC_PACK(ale, /obj/item/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, access_bar)
-SEC_PACK(mead, /obj/item/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, access_bar)
+SEC_PACK(beer, /obj/item/reagent_containers/chem_disp_cartridge/beer, "Reagent refill - Beer", "beer reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(kahlua, /obj/item/reagent_containers/chem_disp_cartridge/kahlua, "Reagent refill - Kahlua", "kahlua reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(whiskey, /obj/item/reagent_containers/chem_disp_cartridge/whiskey, "Reagent refill - Whiskey", "whiskey reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(rwine, /obj/item/reagent_containers/chem_disp_cartridge/redwine, "Reagent refill - Red Wine", "red wine reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(wwine, /obj/item/reagent_containers/chem_disp_cartridge/whitewine, "Reagent refill - White Wine", "white wine reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(vodka, /obj/item/reagent_containers/chem_disp_cartridge/vodka, "Reagent refill - Vodka", "vodka reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(gin, /obj/item/reagent_containers/chem_disp_cartridge/gin, "Reagent refill - Gin", "gin reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(rum, /obj/item/reagent_containers/chem_disp_cartridge/rum, "Reagent refill - Rum", "rum reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(tequila, /obj/item/reagent_containers/chem_disp_cartridge/tequila, "Reagent refill - Tequila", "tequila reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(vermouth, /obj/item/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(cognac, /obj/item/reagent_containers/chem_disp_cartridge/cognac, "Reagent refill - Cognac", "cognac reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(ale, /obj/item/reagent_containers/chem_disp_cartridge/ale, "Reagent refill - Ale", "ale reagent cartridge crate", 15, ACCESS_BAR)
+SEC_PACK(mead, /obj/item/reagent_containers/chem_disp_cartridge/mead, "Reagent refill - Mead", "mead reagent cartridge crate", 15, ACCESS_BAR)
// Unrestricted (water, sugar, non-alcoholic drinks)
// Datum path Contents type Supply pack name Container name Cost
diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm
index ce98a2ff69..31db5d167c 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -53,13 +53,13 @@
// Special distilling conditions must be met, each object has different vars to meet it though.
if(istype(holder.my_atom,/obj/distilling_tester))
// Unit test needs some special handholding
- var/obj/distilling_tester/DD = holder.my_atom
- if(DD.current_temp < temp_range[1] || DD.current_temp > temp_range[2])
+ var/obj/distilling_tester/distillery_tester = holder.my_atom
+ if(distillery_tester.current_temp < temp_range[1] || distillery_tester.current_temp > temp_range[2])
return FALSE
else if(istype(holder.my_atom,/obj/machinery/portable_atmospherics/powered/reagent_distillery))
// Super special temperature check.
- var/obj/machinery/portable_atmospherics/powered/reagent_distillery/RD = holder.my_atom
- if(RD.current_temp < temp_range[1] || RD.current_temp > temp_range[2])
+ var/obj/machinery/portable_atmospherics/powered/reagent_distillery/reagent_distillery = holder.my_atom
+ if(reagent_distillery.current_temp < temp_range[1] || reagent_distillery.current_temp > temp_range[2])
return FALSE
else if(istype(holder.my_atom, /obj/machinery/reagent_refinery/reactor))
// Check gas temp for refinery
@@ -80,8 +80,8 @@
return
// Special handling for this
if(istype(holder.my_atom,/obj/machinery/portable_atmospherics/powered/reagent_distillery))
- var/obj/machinery/portable_atmospherics/powered/reagent_distillery/RD = holder.my_atom
- RD.current_temp += temp_shift
+ var/obj/machinery/portable_atmospherics/powered/reagent_distillery/reagent_distillery = holder.my_atom
+ reagent_distillery.current_temp += temp_shift
return
// Change gas temps
if(!GM)
diff --git a/code/modules/research/tg/machinery/mech_fabricator.dm b/code/modules/research/tg/machinery/mech_fabricator.dm
index 318e53ce83..0b2d24bd9b 100644
--- a/code/modules/research/tg/machinery/mech_fabricator.dm
+++ b/code/modules/research/tg/machinery/mech_fabricator.dm
@@ -5,7 +5,7 @@
desc = "Nothing is being built."
anchored = TRUE
density = TRUE
- req_access = list(access_robotics)
+ req_access = list(ACCESS_ROBOTICS)
circuit = /obj/item/circuitboard/mechfab
speed_process = TRUE
diff --git a/code/modules/research/tg/rdconsole.dm b/code/modules/research/tg/rdconsole.dm
index 1b57130ccc..f6072a9846 100644
--- a/code/modules/research/tg/rdconsole.dm
+++ b/code/modules/research/tg/rdconsole.dm
@@ -22,7 +22,7 @@ Nothing else in the console has ID requirements.
icon_screen = "rdcomp"
icon_keyboard = "rd_key"
circuit = /obj/item/circuitboard/rdconsole
- req_access = list(access_research) // Locking and unlocking the console requires research access
+ req_access = list(ACCESS_RESEARCH) // Locking and unlocking the console requires research access
/// Reference to global science techweb
var/datum/techweb/stored_research
/// The stored technology disk, if present
diff --git a/code/modules/research/tg/server.dm b/code/modules/research/tg/server.dm
index 25cd94b0e6..d07cd7c2ce 100644
--- a/code/modules/research/tg/server.dm
+++ b/code/modules/research/tg/server.dm
@@ -7,7 +7,7 @@
icon_state = "RD-server-on"
var/base_icon_state = "RD-server"
circuit = /obj/item/circuitboard/machine/rdserver
- req_access = list(access_rd)
+ req_access = list(ACCESS_RD)
/// if TRUE, we are currently operational and giving out research points.
var/working = TRUE
diff --git a/code/modules/research/tg/server_control.dm b/code/modules/research/tg/server_control.dm
index b6583b1dcf..1b8c9eaa56 100644
--- a/code/modules/research/tg/server_control.dm
+++ b/code/modules/research/tg/server_control.dm
@@ -4,7 +4,7 @@
icon_screen = "rdcomp"
icon_keyboard = "rd_key"
circuit = /obj/item/circuitboard/rdservercontrol
- req_access = list(access_rd)
+ req_access = list(ACCESS_RD)
///Connected techweb node the server is connected to.
var/datum/techweb/stored_research
diff --git a/code/modules/research/tg/techwebs/_techweb.dm b/code/modules/research/tg/techwebs/_techweb.dm
index d04d1daf85..5e64e229da 100644
--- a/code/modules/research/tg/techwebs/_techweb.dm
+++ b/code/modules/research/tg/techwebs/_techweb.dm
@@ -332,7 +332,7 @@
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/human_user = user
var/list/access = human_user.wear_id?.GetAccess()
- if(access_rd in access)
+ if(ACCESS_RD in access)
queue_first = TRUE
if(id in research_queue_nodes)
diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm
index b95d1f985f..2bd70a4c60 100644
--- a/code/modules/resleeving/computers.dm
+++ b/code/modules/resleeving/computers.dm
@@ -10,7 +10,7 @@
light_color = "#315ab4"
bubble_icon = "medical"
circuit = /obj/item/circuitboard/resleeving_control
- req_access = list(access_heads) //Only used for record deletion right now.
+ req_access = list(ACCESS_HEADS) //Only used for record deletion right now.
var/list/pods = null //Linked grower pods.
var/list/spods = null
var/list/sleevers = null //Linked resleeving booths.
diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm
index 96b39af2a3..01fb212f02 100644
--- a/code/modules/resleeving/designer.dm
+++ b/code/modules/resleeving/designer.dm
@@ -13,7 +13,7 @@
icon_screen = "explosive"
light_color = "#315ab4"
circuit = /obj/item/circuitboard/body_designer
- req_access = list(access_medical) // Used for loading people's designs
+ req_access = list(ACCESS_MEDICAL) // Used for loading people's designs
var/datum/tgui_module/appearance_changer/body_designer/designer_gui
var/obj/item/disk/body_record/disk = null
var/selected_record = FALSE
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 0c2a113cd4..19150ba2de 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -32,7 +32,7 @@
return
if(istype(W,/obj/item/card/id))
var/obj/item/card/id/ID = W
- if(access_keycard_auth in ID.GetAccess())
+ if(ACCESS_KEYCARD_AUTH in ID.GetAccess())
if(active == 1)
//This is not the device that made the initial request. It is the device confirming the request.
if(event_source)
@@ -198,6 +198,6 @@ var/global/maint_all_access = 0
to_world(span_alert(span_red("The maintenance access requirement has been readded on all maintenance airlocks.")))
/obj/machinery/door/airlock/allowed(mob/M)
- if(maint_all_access && src.check_access_list(list(access_maint_tunnels)))
+ if(maint_all_access && src.check_access_list(list(ACCESS_MAINT_TUNNELS)))
return 1
return ..(M)
diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm
index 0a36d3f4e5..e278475b0e 100644
--- a/code/modules/shieldgen/emergency_shield.dm
+++ b/code/modules/shieldgen/emergency_shield.dm
@@ -124,7 +124,7 @@
opacity = 0
anchored = FALSE
pressure_resistance = 2*ONE_ATMOSPHERE
- req_access = list(access_engine)
+ req_access = list(ACCESS_ENGINE)
var/const/max_health = 100
var/health = max_health
var/active = 0
diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm
index b7791ef2c0..f0f0101913 100644
--- a/code/modules/shieldgen/sheldwallgen.dm
+++ b/code/modules/shieldgen/sheldwallgen.dm
@@ -6,7 +6,7 @@
icon_state = "Shield_Gen"
anchored = FALSE
density = TRUE
- req_access = list(access_engine_equip)
+ req_access = list(ACCESS_ENGINE_EQUIP)
var/active = 0
var/power = 0
var/state = 0
diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm
index 09eaa6cf28..22c56efaf8 100644
--- a/code/modules/shieldgen/shield_capacitor.dm
+++ b/code/modules/shieldgen/shield_capacitor.dm
@@ -44,7 +44,7 @@
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
- if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess()))
+ if((ACCESS_CAPTAIN in C.GetAccess()) || (ACCESS_SECURITY in C.GetAccess()) || (ACCESS_ENGINE in C.GetAccess()))
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
updateDialog()
diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm
index 3108b0ef1d..49851bca28 100644
--- a/code/modules/shieldgen/shield_gen.dm
+++ b/code/modules/shieldgen/shield_gen.dm
@@ -64,7 +64,7 @@
/obj/machinery/shield_gen/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
- if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess()))
+ if((ACCESS_CAPTAIN in C.GetAccess()) || (ACCESS_SECURITY in C.GetAccess()) || (ACCESS_ENGINE in C.GetAccess()))
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
updateDialog()
diff --git a/code/modules/shuttles/antagonist.dm b/code/modules/shuttles/antagonist.dm
index 0dd3af6083..9882b4dbda 100644
--- a/code/modules/shuttles/antagonist.dm
+++ b/code/modules/shuttles/antagonist.dm
@@ -1,9 +1,9 @@
/obj/machinery/computer/shuttle_control/multi/skipjack
name = "skipjack control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Skipjack"
/obj/machinery/computer/shuttle_control/multi/syndicate
name = "mercenary shuttle control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Mercenary"
diff --git a/code/modules/shuttles/departmental.dm b/code/modules/shuttles/departmental.dm
index df1f851cb8..be06cf5b19 100644
--- a/code/modules/shuttles/departmental.dm
+++ b/code/modules/shuttles/departmental.dm
@@ -1,17 +1,17 @@
/obj/machinery/computer/shuttle_control/mining
name = "mining shuttle control console"
shuttle_tag = "Mining"
- //req_access = list(access_mining)
+ //req_access = list(ACCESS_MINING)
circuit = /obj/item/circuitboard/mining_shuttle
/obj/machinery/computer/shuttle_control/engineering
name = "engineering shuttle control console"
shuttle_tag = "Engineering"
- //req_one_access = list(access_engine_equip,access_atmospherics)
+ //req_one_access = list(ACCESS_ENGINE_EQUIP,ACCESS_ATMOSPHERICS)
circuit = /obj/item/circuitboard/engineering_shuttle
/obj/machinery/computer/shuttle_control/research
name = "research shuttle control console"
shuttle_tag = "Research"
- //req_access = list(access_research)
+ //req_access = list(ACCESS_RESEARCH)
circuit = /obj/item/circuitboard/research_shuttle
diff --git a/code/modules/shuttles/shuttle_arrivals.dm b/code/modules/shuttles/shuttle_arrivals.dm
index 3c0da724cc..c0c914d74f 100644
--- a/code/modules/shuttles/shuttle_arrivals.dm
+++ b/code/modules/shuttles/shuttle_arrivals.dm
@@ -17,7 +17,7 @@
// For debugging.
/obj/machinery/computer/shuttle_control/arrivals
name = "shuttle control console"
- req_access = list(access_cent_general)
+ req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Arrivals"
// Unlike most shuttles, the arrivals shuttle is completely automated, so we need to put some additional code here.
diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm
index 5ed45f35d1..ebf3891388 100644
--- a/code/modules/shuttles/shuttle_emergency.dm
+++ b/code/modules/shuttles/shuttle_emergency.dm
@@ -1,7 +1,7 @@
// Formerly /datum/shuttle/ferry/emergency
/datum/shuttle/autodock/ferry/emergency
category = /datum/shuttle/autodock/ferry/emergency
- var/frequency = 1381 // Why this frequency? BECAUSE! Thats what someone decided once.
+ var/frequency = AUTODOCK_FREQ // Why this frequency? BECAUSE! Thats what someone decided once.
var/datum/radio_frequency/radio_connection
/datum/shuttle/autodock/ferry/emergency/New()
@@ -163,7 +163,7 @@
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
return 0
- if (!(access_heads in access))
+ if (!(ACCESS_HEADS in access))
src.visible_message("\The [src] buzzes, rejecting [ident].")
playsound(src, 'sound/machines/deniedbeep.ogg', 50, 0)
return 0
diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm
index 9dae0934d9..69709afd8e 100644
--- a/code/modules/shuttles/shuttle_specops.dm
+++ b/code/modules/shuttles/shuttle_specops.dm
@@ -1,7 +1,7 @@
/obj/machinery/computer/shuttle_control/specops
name = "special operations shuttle console"
shuttle_tag = "Special Operations"
- req_access = list(access_cent_specops)
+ req_access = list(ACCESS_CENT_SPECOPS)
/obj/machinery/computer/shuttle_control/specops/attack_ai(user as mob)
to_chat(user, span_warning("Access Denied."))
diff --git a/code/modules/shuttles/shuttles_vr.dm b/code/modules/shuttles/shuttles_vr.dm
index 5eba70d046..227d254b43 100644
--- a/code/modules/shuttles/shuttles_vr.dm
+++ b/code/modules/shuttles/shuttles_vr.dm
@@ -22,17 +22,17 @@
/obj/machinery/computer/shuttle_control/multi/admin
name = "centcom shuttle control console"
- req_access = list(access_cent_general)
+ req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Administration"
/obj/machinery/computer/shuttle_control/multi/awaymission
name = "exploration shuttle control console"
- req_access = list(access_gateway)
+ req_access = list(ACCESS_GATEWAY)
shuttle_tag = "AwayMission"
/obj/machinery/computer/shuttle_control/belter
name = "belter control console"
- req_one_access = list(access_mining, access_medical_equip) //Allows xenoarch, miners AND doctors to use it.
+ req_one_access = list(ACCESS_MINING, ACCESS_MEDICAL_EQUIP) //Allows xenoarch, miners AND doctors to use it.
shuttle_tag = "Belter" //The scanning console needs to enable/disable this at will.
ai_control = TRUE
diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm
index 6669baab14..4ad6c64d57 100644
--- a/code/modules/tgui/modules/atmos_control.dm
+++ b/code/modules/tgui/modules/atmos_control.dm
@@ -100,7 +100,7 @@
return STATUS_UPDATE
/datum/tgui_state/air_alarm_remote/proc/has_access(var/mob/user)
- return user && (isAI(user) || atmos_control.access.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO) || (access_ce in user.GetAccess()))
+ return user && (isAI(user) || atmos_control.access.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO) || (ACCESS_CE in user.GetAccess()))
/datum/tgui_state/air_alarm_remote/Destroy()
atmos_control = null
diff --git a/code/modules/tgui/modules/camera.dm b/code/modules/tgui/modules/camera.dm
index 619860d1fe..cc4b342f37 100644
--- a/code/modules/tgui/modules/camera.dm
+++ b/code/modules/tgui/modules/camera.dm
@@ -244,10 +244,10 @@
// Access Based
if(access_based)
for(var/network in using_map.station_networks)
- if(can_access_network(user, get_camera_access(network), 1))
+ if(can_ACCESS_NETWORK(user, get_camera_access(network), 1))
all_networks.Add(network)
for(var/network in using_map.secondary_networks)
- if(can_access_network(user, get_camera_access(network), 0))
+ if(can_ACCESS_NETWORK(user, get_camera_access(network), 0))
all_networks.Add(network)
// Network Based
else
@@ -269,13 +269,13 @@
D["[ckey(C.c_tag)]"] = C
return D
-/datum/tgui_module/camera/proc/can_access_network(mob/user, network_access, station_network = 0)
+/datum/tgui_module/camera/proc/can_ACCESS_NETWORK(mob/user, network_access, station_network = 0)
// No access passed, or 0 which is considered no access requirement. Allow it.
if(!network_access)
return 1
if(station_network)
- return check_access(user, network_access) || check_access(user, access_security) || check_access(user, access_heads)
+ return check_access(user, network_access) || check_access(user, ACCESS_SECURITY) || check_access(user, ACCESS_HEADS)
else
return check_access(user, network_access)
diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm
index bcc9c006d2..1bf9ebf056 100644
--- a/code/modules/tgui/modules/communications.dm
+++ b/code/modules/tgui/modules/communications.dm
@@ -215,9 +215,9 @@
setMenuState(ui.user, COMM_SCREEN_MAIN)
return
// Login function.
- if(check_access(ui.user, access_heads))
+ if(check_access(ui.user, ACCESS_HEADS))
authenticated = COMM_AUTHENTICATION_MIN
- if(check_access(ui.user, access_captain))
+ if(check_access(ui.user, ACCESS_CAPTAIN))
authenticated = COMM_AUTHENTICATION_MAX
var/obj/item/card/id = ui.user.GetIdCard()
if(istype(id))
diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm
index 89e58ad929..22848ceb92 100644
--- a/code/modules/turbolift/turbolift_console.dm
+++ b/code/modules/turbolift/turbolift_console.dm
@@ -54,7 +54,7 @@
desc = "A call button for an elevator. Be sure to hit it three hundred times."
icon_state = "button"
var/light_up = FALSE
- req_access = list(access_eva)
+ req_access = list(ACCESS_EVA)
var/datum/turbolift_floor/floor
/obj/structure/lift/button/Destroy()
@@ -118,8 +118,8 @@
name = "elevator control panel"
desc = "A control panel for moving the elevator. There's a slot for swiping IDs to enable additional controls."
icon_state = "panel"
- req_access = list(access_eva)
- req_one_access = list(access_heads, access_atmospherics, access_medical)
+ req_access = list(ACCESS_EVA)
+ req_one_access = list(ACCESS_HEADS, ACCESS_ATMOSPHERICS, ACCESS_MEDICAL)
// Hit it with a PDA or ID to enable priority call mode
/obj/structure/lift/panel/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/code/modules/turbolift/turbolift_door.dm b/code/modules/turbolift/turbolift_door.dm
index 535574b464..5bdac3746f 100644
--- a/code/modules/turbolift/turbolift_door.dm
+++ b/code/modules/turbolift/turbolift_door.dm
@@ -1,7 +1,7 @@
/obj/machinery/door/airlock/lift
name = "Elevator Door"
desc = "Ding."
- req_access = list(access_maint_tunnels)
+ req_access = list(ACCESS_MAINT_TUNNELS)
unacidable = TRUE
opacity = 0
autoclose = 0
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index f6292e0f47..ffc88c455e 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -876,7 +876,7 @@
icon_state = "centcom"
registered_name = "Amy Lessen"
assignment = "Xenobiology Director"
- access = list(access_cent_general,access_cent_thunder,access_cent_medical,access_cent_living,access_cent_storage,access_cent_teleporter,access_research,access_xenobiology,access_maint_tunnels,access_xenoarch,access_robotics,access_tox_storage,access_tox) //Yes, this looks awful. I tried calling both central and resarch access but it didn't work.
+ access = list(ACCESS_CENT_GENERAL,ACCESS_CENT_THUNDER,ACCESS_CENT_MEDICAL,ACCESS_CENT_LIVING,ACCESS_CENT_STORAGE,ACCESS_CENT_TELEPORTER,ACCESS_RESEARCH,ACCESS_XENOBIOLOGY,ACCESS_MAINT_TUNNELS,ACCESS_XENOARCH,ACCESS_ROBOTICS,ACCESS_TOX_STORAGE,ACCESS_TOX) //Yes, this looks awful. I tried calling both central and resarch access but it didn't work.
age = 39
blood_type = "O-"
sex = "Female"
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index 9312a37333..bfad0f6bf8 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -128,12 +128,12 @@
var/datum/species/S = H.species
special_x = S.icon_scale_x
special_y = S.icon_scale_y
- if(fuzzy || offset_override) //CHOMPEdit Start
+ if(fuzzy || offset_override)
center_offset = 0
else
center_offset = S.center_offset
resize.Scale(new_size * icon_scale_x * special_x, new_size * icon_scale_y * special_y) //Change the size of the matrix
- resize.Translate(center_offset * size_multiplier * icon_scale_x * special_x, (vis_height/2) * (new_size - 1)) //Move the player up in the tile so their feet align with the bottom //CHOMPEdit End
+ resize.Translate(center_offset * size_multiplier * icon_scale_x * special_x, (vis_height/2) * (new_size - 1)) //Move the player up in the tile so their feet align with the bottom
animate(src, transform = resize, time = duration) //Animate the player resizing
if(aura_animation)
@@ -179,10 +179,10 @@
var/new_size = tgui_input_number(src, nagmessage, "Pick a Size", default, 600, 1)
if(size_range_check(new_size))
resize(new_size/100, uncapped = has_large_resize_bounds(), ignore_prefs = TRUE)
- if(temporary_form) //CHOMPEdit - resizing both our forms
+ if(temporary_form)
var/mob/living/L = temporary_form
L.resize(new_size/100, uncapped = has_large_resize_bounds(), ignore_prefs = TRUE)
- //CHOMPEDIT - I don't need to be informed every time a prommie changes sizes
+ // log_admin("[key_name(src)] used the resize command in-game to be [new_size]% size. [src ? ADMIN_JMP(src) : "null"]") // CHOMPRemove
/**
* Attempt to scoop up this mob up into M's hands, if the size difference is large enough.
diff --git a/code/modules/xenoarcheaology/misc.dm b/code/modules/xenoarcheaology/misc.dm
index 2510ff9f86..4072bf04af 100644
--- a/code/modules/xenoarcheaology/misc.dm
+++ b/code/modules/xenoarcheaology/misc.dm
@@ -12,7 +12,7 @@
update_icon()
/obj/machinery/alarm/isolation
- req_one_access = list(access_research, access_atmospherics, access_engine_equip)
+ req_one_access = list(ACCESS_RESEARCH, ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP)
/obj/machinery/alarm/monitor/isolation
- req_one_access = list(access_research, access_atmospherics, access_engine_equip)
+ req_one_access = list(ACCESS_RESEARCH, ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP)
diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm
index fb5707feb5..77b46c6ede 100644
--- a/code/modules/xenoarcheaology/tools/suspension_generator.dm
+++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "suspension"
density = 1
- req_access = list(access_research)
+ req_access = list(ACCESS_RESEARCH)
var/obj/item/cell/cell
var/obj/item/card/id/auth_card
var/locked = 1
diff --git a/config/example/access levels.txt b/config/example/access levels.txt
index e6c0519069..6184395594 100644
--- a/config/example/access levels.txt
+++ b/config/example/access levels.txt
@@ -16,64 +16,64 @@ For example, a brig door would have it be "2" while a door that requires you hav
Here is a list of the permissions and their numbers (this may be out of date, see code/game/access.dm for an updated version):
-access_security = 1
-access_brig = 2
-access_armory = 3
-access_forensics_lockers= 4
-access_medical = 5
-access_morgue = 6
-access_tox = 7
-access_tox_storage = 8
-access_genetics = 9
-access_engine = 10
-access_engine_equip= 11
-access_maint_tunnels = 12
-access_external_airlocks = 13
-access_emergency_storage = 14
-access_change_ids = 15
-access_ai_upload = 16
-access_teleporter = 17
-access_eva = 18
-access_heads = 19
-access_captain = 20
-access_all_personal_lockers = 21
-access_chapel_office = 22
-access_tech_storage = 23
-access_atmospherics = 24
-access_bar = 25
-access_janitor = 26
-access_crematorium = 27
-access_kitchen = 28
-access_robotics = 29
-access_rd = 30
-access_cargo = 31
-access_construction = 32
-access_chemistry = 33
-access_cargo_bot = 34
-access_hydroponics = 35
-access_manufacturing = 36
-access_library = 37
-access_lawyer = 38
-access_virology = 39
-access_cmo = 40
-access_qm = 41
-access_court = 42
-access_clown = 43
-access_mime = 44
-access_surgery = 45
-access_theatre = 46
-access_research = 47
-access_mining = 48
-access_mining_office = 49 //not in use
-access_mailsorting = 50
-access_mint = 51
-access_mint_vault = 52
-access_heads_vault = 53
-access_mining_station = 54
-access_xenobiology = 55
-access_ce = 56
-access_hop = 57
-access_hos = 58
-access_RC_announce = 59 //Request console announcements
-access_keycard_auth = 60 //Used for events which require at least two people to confirm them
-access_tcomsat = 61 // has access to the entire telecomms satellite / machinery
\ No newline at end of file
+ACCESS_SECURITY = 1
+ACCESS_BRIG = 2
+ACCESS_ARMORY = 3
+ACCESS_FORENSICS_LOCKERS= 4
+ACCESS_MEDICAL = 5
+ACCESS_MORGUE = 6
+ACCESS_TOX = 7
+ACCESS_TOX_STORAGE = 8
+ACCESS_GENETICS = 9
+ACCESS_ENGINE = 10
+ACCESS_ENGINE_EQUIP= 11
+ACCESS_MAINT_TUNNELS = 12
+ACCESS_EXTERNAL_AIRLOCKS = 13
+ACCESS_EMERGENCY_STORAGE = 14
+ACCESS_CHANGE_IDS = 15
+ACCESS_AI_UPLOAD = 16
+ACCESS_TELEPORTER = 17
+ACCESS_EVA = 18
+ACCESS_HEADS = 19
+ACCESS_CAPTAIN = 20
+ACCESS_ALL_PERSONAL_LOCKERS = 21
+ACCESS_CHAPEL_OFFICE = 22
+ACCESS_TECH_STORAGE = 23
+ACCESS_ATMOSPHERICS = 24
+ACCESS_BAR = 25
+ACCESS_JANITOR = 26
+ACCESS_CREMATORIUM = 27
+ACCESS_KITCHEN = 28
+ACCESS_ROBOTICS = 29
+ACCESS_RD = 30
+ACCESS_CARGO = 31
+ACCESS_CONSTRUCTION = 32
+ACCESS_CHEMISTRY = 33
+ACCESS_CARGO_BOT = 34
+ACCESS_HYDROPONICS = 35
+ACCESS_MANUFACTURING = 36
+ACCESS_LIBRARY = 37
+ACCESS_LAWYER = 38
+ACCESS_VIROLOGY = 39
+ACCESS_CMO = 40
+ACCESS_QM = 41
+ACCESS_NETWORK = 42
+ACCESS_CLOWN = 43
+ACCESS_MIME = 44
+ACCESS_SURGERY = 45
+UNUSED = 46
+ACCESS_RESEARCH = 47
+ACCESS_MINING = 48
+ACCESS_MINING_OFFICE = 49 //not in use
+ACCESS_MAILSORTING = 50
+UNUSED = 51
+UNUSED = 52
+ACCESS_HEADS_VAULT = 53
+ACCESS_MINING_STATION = 54
+ACCESS_XENOBIOLOGY = 55
+ACCESS_CE = 56
+ACCESS_HOP = 57
+ACCESS_HOS = 58
+ACCESS_RC_ANNOUNCE = 59 //Request console announcements
+ACCESS_KEYCARD_AUTH = 60 //Used for events which require at least two people to confirm them
+ACCESS_TCOMSAT = 61 // has access to the entire telecomms satellite / machinery
diff --git a/guides/Overmap Ships and Places - What's Needed.md b/guides/Overmap Ships and Places - What's Needed.md
index d39af9b91b..de8ffbbde1 100644
--- a/guides/Overmap Ships and Places - What's Needed.md
+++ b/guides/Overmap Ships and Places - What's Needed.md
@@ -41,7 +41,7 @@ For now, just use this as reference for what is needed for Overmap ships + locat
/obj/machinery/computer/shuttle_control/explore/SHIPNAME
name = "short jump console"
shuttle_tag = "[Name]" // Direct reference to above shuttle. MUST be the same as name.
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
```
**OVERMAP SHIP CREATION INSTRUCTIONS:**
diff --git a/maps/common/common_defines.dm b/maps/common/common_defines.dm
index d00064bff1..9e63e2fa43 100644
--- a/maps/common/common_defines.dm
+++ b/maps/common/common_defines.dm
@@ -105,11 +105,6 @@
#define Z_NAME_REDGATE_JUNGLE "Redgate - Jungle"
#define Z_NAME_REDGATE_FACILITY "Redgate - Facility"
-//Camera networks
-#define NETWORK_TETHER "Tether"
-#define NETWORK_OUTSIDE "Outside"
-#define NETWORK_HALLS "Halls"
-
/obj/effect/landmark/map_data/groundbase
height = 3
diff --git a/maps/common/common_shuttles.dm b/maps/common/common_shuttles.dm
index f63459d562..98f226c5f8 100644
--- a/maps/common/common_shuttles.dm
+++ b/maps/common/common_shuttles.dm
@@ -3,7 +3,7 @@
/obj/machinery/computer/shuttle_control/explore/ccboat
name = "Virgo Flyer control console"
shuttle_tag = "Virgo Flyer"
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
/obj/effect/overmap/visitable/ship/landable/ccboat
name = "NTV Virgo Flyer"
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 869dd1b167..f65e436030 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -17402,7 +17402,7 @@
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/triage)
"Wy" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/item/aicard,
/obj/item/clothing/glasses/omnihud/rnd,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index 289efd8a7f..8f4dafc6eb 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -823,7 +823,7 @@
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/patient3)
"nC" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/item/storage/belt/medical,
/obj/item/flashlight/pen,
/obj/item/clothing/accessory/stethoscope,
diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm
index 208df42bc3..3b997ead07 100644
--- a/maps/groundbase/groundbase_areas.dm
+++ b/maps/groundbase/groundbase_areas.dm
@@ -542,39 +542,6 @@
/area/groundbase/mining/explored
icon_state = "blublacir"
-// Exclude some more areas from the atmos leak event since its outside.
-/datum/event/atmos_leak/setup()
- excluded |= /area/groundbase/level1/centsquare
- excluded |= /area/groundbase/level1/eastspur
- excluded |= /area/groundbase/level1/northspur
- excluded |= /area/groundbase/level1/southeastspur
- excluded |= /area/groundbase/level1/southwestspur
- excluded |= /area/groundbase/level1/westspur
- excluded |= /area/maintenance/groundbase/level1/netunnel
- excluded |= /area/maintenance/groundbase/level1/nwtunnel
- excluded |= /area/maintenance/groundbase/level1/stunnel
- excluded |= /area/maintenance/groundbase/level1/setunnel
- excluded |= /area/maintenance/groundbase/level1/swtunnel
- excluded |= /area/groundbase/level2/ne
- excluded |= /area/groundbase/level2/nw
- excluded |= /area/groundbase/level2/se
- excluded |= /area/groundbase/level2/sw
- excluded |= /area/groundbase/level3/ne
- excluded |= /area/groundbase/level3/nw
- excluded |= /area/groundbase/level3/se
- excluded |= /area/groundbase/level3/sw
- excluded |= /area/groundbase/level2/northspur
- excluded |= /area/groundbase/level2/eastspur
- excluded |= /area/groundbase/level2/westspur
- excluded |= /area/groundbase/level2/southeastspur
- excluded |= /area/groundbase/level2/southwestspur
- excluded |= /area/groundbase/level3/ne/open
- excluded |= /area/groundbase/level3/nw/open
- excluded |= /area/groundbase/level3/se/open
- excluded |= /area/groundbase/level3/sw/open
- excluded |= /area/groundbase/level3/escapepad
- ..()
-
/area/gb_mine/
ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg')
base_turf = /turf/simulated/mineral/floor
diff --git a/maps/groundbase/groundbase_shuttle_defs.dm b/maps/groundbase/groundbase_shuttle_defs.dm
index 54ef51cb6f..8ed0f21039 100644
--- a/maps/groundbase/groundbase_shuttle_defs.dm
+++ b/maps/groundbase/groundbase_shuttle_defs.dm
@@ -3,7 +3,7 @@
/obj/machinery/computer/shuttle_control/explore/gbexplo
name = "short jump console"
shuttle_tag = "Exploration Shuttle"
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
/obj/effect/overmap/visitable/ship/landable/gbexplo
name = "Exploration Shuttle"
diff --git a/maps/groundbase/groundbase_telecomms.dm b/maps/groundbase/groundbase_telecomms.dm
index 2381b863f6..037fe5c8ed 100644
--- a/maps/groundbase/groundbase_telecomms.dm
+++ b/maps/groundbase/groundbase_telecomms.dm
@@ -8,19 +8,19 @@
/datum/map/groundbase/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
- num2text(AI_FREQ) = list(access_synth),
+ num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
- num2text(ERT_FREQ) = list(access_cent_specops),
- num2text(COMM_FREQ)= list(access_heads),
- num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
- num2text(MED_FREQ) = list(access_medical_equip),
- num2text(MED_I_FREQ)=list(access_medical_equip),
- num2text(SEC_FREQ) = list(access_security),
- num2text(SEC_I_FREQ)=list(access_security),
- num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
- num2text(SUP_FREQ) = list(access_cargo),
- num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
- num2text(EXP_FREQ) = list(access_explorer)
+ num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
+ num2text(COMM_FREQ)= list(ACCESS_HEADS),
+ num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
+ num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
+ num2text(MED_I_FREQ)=list(ACCESS_MEDICAL_EQUIP),
+ num2text(SEC_FREQ) = list(ACCESS_SECURITY),
+ num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
+ num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
+ num2text(SUP_FREQ) = list(ACCESS_CARGO),
+ num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
+ num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
)
/obj/item/multitool/station_buffered
diff --git a/maps/offmap_vr/om_ships/aro.dm b/maps/offmap_vr/om_ships/aro.dm
index b6f7dfa3de..2b1f343301 100644
--- a/maps/offmap_vr/om_ships/aro.dm
+++ b/maps/offmap_vr/om_ships/aro.dm
@@ -59,7 +59,7 @@
/obj/machinery/computer/shuttle_control/explore/aroboat
name = "boat control console"
shuttle_tag = "Aro's Ship's Boat"
- req_one_access = list(access_cent_general)
+ req_one_access = list(ACCESS_CENT_GENERAL)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/aroboat
diff --git a/maps/offmap_vr/om_ships/aro2.dm b/maps/offmap_vr/om_ships/aro2.dm
index ffd6acc4b0..82b33154b1 100644
--- a/maps/offmap_vr/om_ships/aro2.dm
+++ b/maps/offmap_vr/om_ships/aro2.dm
@@ -82,7 +82,7 @@
/obj/machinery/computer/shuttle_control/explore/aroboat2
name = "boat control console"
shuttle_tag = "Aro's Boat"
- req_one_access = list(access_cent_general)
+ req_one_access = list(ACCESS_CENT_GENERAL)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/aroboat2
diff --git a/maps/offmap_vr/om_ships/aro3.dm b/maps/offmap_vr/om_ships/aro3.dm
index c423ed2b82..4c49829e61 100644
--- a/maps/offmap_vr/om_ships/aro3.dm
+++ b/maps/offmap_vr/om_ships/aro3.dm
@@ -103,7 +103,7 @@
/obj/machinery/computer/shuttle_control/explore/aroboat3
name = "boat control console"
shuttle_tag = "Aro's Boat"
- req_one_access = list(access_cent_general)
+ req_one_access = list(ACCESS_CENT_GENERAL)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/aroboat3
diff --git a/maps/offmap_vr/om_ships/cruiser.dmm b/maps/offmap_vr/om_ships/cruiser.dmm
index 4ec5483edd..02750e3c6d 100644
--- a/maps/offmap_vr/om_ships/cruiser.dmm
+++ b/maps/offmap_vr/om_ships/cruiser.dmm
@@ -5283,7 +5283,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/mothership/warden)
"lh" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/turf/simulated/floor/tiled/white,
/area/mothership/medical)
"li" = (
@@ -6241,7 +6241,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/mothership/rnd)
"nh" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/turf/simulated/floor/tiled/steel_grid,
/area/mothership/rnd)
"ni" = (
diff --git a/maps/offmap_vr/om_ships/generic_shuttle.dm b/maps/offmap_vr/om_ships/generic_shuttle.dm
index cb09b1eb8e..4143fa42a2 100644
--- a/maps/offmap_vr/om_ships/generic_shuttle.dm
+++ b/maps/offmap_vr/om_ships/generic_shuttle.dm
@@ -25,7 +25,7 @@
/obj/machinery/computer/shuttle_control/explore/generic_shuttle
name = "short jump console"
shuttle_tag = "Private Vessel"
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/generic_shuttle
diff --git a/maps/offmap_vr/om_ships/hybridshuttle.dm b/maps/offmap_vr/om_ships/hybridshuttle.dm
index 3fba1efbdb..9915c82757 100644
--- a/maps/offmap_vr/om_ships/hybridshuttle.dm
+++ b/maps/offmap_vr/om_ships/hybridshuttle.dm
@@ -20,7 +20,7 @@
/obj/machinery/computer/shuttle_control/explore/hybridshuttle
name = "short jump console"
shuttle_tag = "XN-29 Prototype Shuttle"
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/hybridshuttle
diff --git a/maps/offmap_vr/om_ships/screebarge.dm b/maps/offmap_vr/om_ships/screebarge.dm
index dcc665e66f..942f0a3920 100644
--- a/maps/offmap_vr/om_ships/screebarge.dm
+++ b/maps/offmap_vr/om_ships/screebarge.dm
@@ -25,7 +25,7 @@
/obj/machinery/computer/shuttle_control/explore/screebarge
name = "short jump console"
shuttle_tag = "XN-29 Prototype Shuttle"
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/screebarge
diff --git a/maps/offmap_vr/om_ships/shelter_6.dm b/maps/offmap_vr/om_ships/shelter_6.dm
index 0d1ae38bb2..74fe0c7b85 100644
--- a/maps/offmap_vr/om_ships/shelter_6.dm
+++ b/maps/offmap_vr/om_ships/shelter_6.dm
@@ -21,7 +21,7 @@
/obj/machinery/computer/shuttle_control/explore/tabiranth
name = "short jump console"
shuttle_tag = "NDV Tabiranth"
- req_one_access = list(access_cent_general)
+ req_one_access = list(ACCESS_CENT_GENERAL)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/tabiranth
diff --git a/maps/offmap_vr/om_ships/vespa.dm b/maps/offmap_vr/om_ships/vespa.dm
index f2c5e0af04..1aaf2c368e 100644
--- a/maps/offmap_vr/om_ships/vespa.dm
+++ b/maps/offmap_vr/om_ships/vespa.dm
@@ -141,7 +141,7 @@
// /obj/machinery/computer/shuttle_control/explore/vespaboat
//name = "Vespa's Shuttle control console"
//shuttle_tag = "Vespa's Ship's Boat"
- //req_one_access = list(access_pilot)
+ //req_one_access = list(ACCESS_PILOT)
// A shuttle lateloader landmark
// /obj/effect/shuttle_landmark/shuttle_initializer/vespaboat
diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm
index 75983bad97..091b52f59c 100644
--- a/maps/offmap_vr/talon/talon_v2.dm
+++ b/maps/offmap_vr/talon/talon_v2.dm
@@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(latejoin_talon)
/obj/machinery/computer/shuttle_control/explore/talonboat
name = "shuttle control console"
shuttle_tag = "Talon's Shuttle"
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
/obj/effect/overmap/visitable/ship/landable/talon_boat
name = "ITV Talon Shuttle"
@@ -104,7 +104,7 @@ GLOBAL_LIST_EMPTY(latejoin_talon)
/obj/machinery/computer/shuttle_control/explore/talon_escape
name = "shuttle control console"
shuttle_tag = "Talon's Escape Pod"
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
/obj/effect/overmap/visitable/ship/landable/talon_pod
name = "ITV Talon Escape Pod"
@@ -282,7 +282,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/item/card/id/synthetic/talon/Initialize(mapload)
. = ..()
- access = list(access_talon, access_synth)
+ access = list(ACCESS_TALON, ACCESS_SYNTH)
/obj/machinery/power/smes/buildable/offmap_spawn/Initialize(mapload)
. = ..()
@@ -294,18 +294,18 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/machinery/power/apc/talon
req_access = list()
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
/obj/machinery/power/apc/talon/hyper
cell_type = /obj/item/cell/hyper
/obj/machinery/alarm/talon
req_access = list()
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
/obj/machinery/door/firedoor/glass/talon
req_access = list()
- req_one_access = list(access_talon)
+ req_one_access = list(ACCESS_TALON)
/obj/machinery/door/firedoor/glass/talon/hidden
name = "\improper Emergency Shutter System"
@@ -371,7 +371,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_captain
name = "talon captain's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/captain
starts_with = list(
@@ -389,7 +389,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_guard
name = "talon guard's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/guard
starts_with = list(
@@ -416,7 +416,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_doctor
name = "talon doctor's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/doctor
starts_with = list(
@@ -436,7 +436,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_engineer
name = "talon engineer's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/engineer
starts_with = list(
@@ -458,7 +458,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_pilot
name = "talon pilot's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/pilot
starts_with = list(
@@ -485,7 +485,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/structure/closet/secure_closet/talon_miner
name = "talon miner's locker"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/miner
starts_with = list(
@@ -511,7 +511,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
desc = "Medical drug dispenser."
icon_state = "med"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
- req_access = list(access_talon)
+ req_access = list(ACCESS_TALON)
products = list(/obj/item/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/reagent_containers/glass/bottle/inaprovaline = 4,
/obj/item/reagent_containers/glass/bottle/stoxin = 4,/obj/item/reagent_containers/glass/bottle/toxin = 4,
/obj/item/reagent_containers/syringe/antiviral = 4,/obj/item/reagent_containers/syringe = 12,
@@ -521,7 +521,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/obj/item/glasses_kit = 1, /obj/item/storage/quickdraw/syringe_case = 4)
contraband = list(/obj/item/reagent_containers/pill/tox = 3,/obj/item/reagent_containers/pill/stox = 4,/obj/item/reagent_containers/pill/antitox = 6)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
- req_log_access = access_talon
+ req_log_access = ACCESS_TALON
has_logs = 1
///////////////////////////
@@ -533,7 +533,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
extended_desc = "This program allows remote access to Talon helmet camera systems."
size = 4 //Smaller because limited scope
tguimodule_path = /datum/tgui_module/camera/ntos/talon_helmet
- required_access = access_talon
+ required_access = ACCESS_TALON
// Talon ship cameras
/datum/computer_file/program/camera_monitor/talon_ship
@@ -542,7 +542,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
extended_desc = "This program allows remote access to the Talon's camera system."
size = 10 //Smaller because limited scope
tguimodule_path = /datum/tgui_module/camera/ntos/talon_ship
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/tgui_module/camera/ntos/talon_ship
name = "Talon Ship Camera Monitor"
@@ -557,23 +557,23 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/datum/computer_file/program/power_monitor/talon
filename = "tpowermonitor"
filedesc = "Power Monitoring (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/computer_file/program/alarm_monitor/talon
filename = "talarmmonitoreng"
filedesc = "Alarm Monitoring (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/computer_file/program/rcon_console/talon
filename = "trconconsole"
filedesc = "RCON Remote Control (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/computer_file/program/atmos_control/talon
filename = "tatmoscontrol"
filedesc = "Atmosphere Control (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
/datum/computer_file/program/suit_sensors/talon
filename = "tsensormonitor"
filedesc = "Suit Sensors Monitoring (Talon)"
- required_access = access_talon
+ required_access = ACCESS_TALON
// Modular computer/console presets
/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot
diff --git a/maps/stellar_delight/stellar_delight3.dmm b/maps/stellar_delight/stellar_delight3.dmm
index ec8411659a..4acf2031ba 100644
--- a/maps/stellar_delight/stellar_delight3.dmm
+++ b/maps/stellar_delight/stellar_delight3.dmm
@@ -13687,7 +13687,7 @@
name = "Station Intercom (General)";
pixel_y = 24
},
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/item/clothing/accessory/stethoscope,
/obj/item/flashlight/pen,
/obj/item/storage/belt/medical,
@@ -14145,7 +14145,7 @@
name = "Station Intercom (General)";
pixel_y = 24
},
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/item/aicard,
/obj/item/clothing/glasses/omnihud/rnd,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
diff --git a/maps/stellar_delight/stellar_delight_shuttle_defs.dm b/maps/stellar_delight/stellar_delight_shuttle_defs.dm
index 16d6bbb53a..23d381be65 100644
--- a/maps/stellar_delight/stellar_delight_shuttle_defs.dm
+++ b/maps/stellar_delight/stellar_delight_shuttle_defs.dm
@@ -37,7 +37,7 @@
/obj/machinery/computer/shuttle_control/explore/sdboat
name = "Starstuff control console"
shuttle_tag = "Starstuff"
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
/obj/effect/overmap/visitable/ship/landable/sd_boat
name = "NTV Starstuff"
diff --git a/maps/stellar_delight/stellar_delight_telecomms.dm b/maps/stellar_delight/stellar_delight_telecomms.dm
index 9d7990fdb1..b580412434 100644
--- a/maps/stellar_delight/stellar_delight_telecomms.dm
+++ b/maps/stellar_delight/stellar_delight_telecomms.dm
@@ -8,19 +8,19 @@
/datum/map/sd/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
- num2text(AI_FREQ) = list(access_synth),
+ num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
- num2text(ERT_FREQ) = list(access_cent_specops),
- num2text(COMM_FREQ)= list(access_heads),
- num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
- num2text(MED_FREQ) = list(access_medical_equip),
- num2text(MED_I_FREQ)=list(access_medical_equip),
- num2text(SEC_FREQ) = list(access_security),
- num2text(SEC_I_FREQ)=list(access_security),
- num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
- num2text(SUP_FREQ) = list(access_cargo),
- num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
- num2text(EXP_FREQ) = list(access_explorer)
+ num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
+ num2text(COMM_FREQ)= list(ACCESS_HEADS),
+ num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
+ num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
+ num2text(MED_I_FREQ)=list(ACCESS_MEDICAL_EQUIP),
+ num2text(SEC_FREQ) = list(ACCESS_SECURITY),
+ num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
+ num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
+ num2text(SUP_FREQ) = list(ACCESS_CARGO),
+ num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
+ num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
)
/obj/item/multitool/station_buffered
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 6b23a64c11..dce97764a4 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -3203,7 +3203,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/patient_c)
"afc" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/item/storage/belt/medical,
/obj/item/flashlight/pen,
/obj/item/clothing/accessory/stethoscope,
@@ -19565,7 +19565,7 @@
/turf/simulated/floor/plating,
/area/rnd/rdoffice)
"aJk" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/item/aicard,
/obj/item/clothing/glasses/omnihud/rnd,
/obj/effect/floor_decal/borderfloor{
diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm
index 2d50ba721d..eb8b78c03c 100644
--- a/maps/tether/tether_areas.dm
+++ b/maps/tether/tether_areas.dm
@@ -1577,13 +1577,3 @@
name = "\improper docked with Tether"
icon_state = "shuttle"
dynamic_lighting = 0
-
-// Exclude some more areas from the atmos leak event so people don't get trapped when spawning.
-/datum/event/atmos_leak/setup()
- excluded |= /area/tether/surfacebase/tram
- excluded |= /area/tether/surfacebase/surface_one_hall
- excluded |= /area/tether/surfacebase/surface_two_hall
- excluded |= /area/tether/surfacebase/surface_three_hall
- excluded |= /area/teleporter/departing
- excluded |= /area/hallway/station/upper
- ..()
diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm
index fa881d2f35..245bae3553 100644
--- a/maps/tether/tether_jobs.dm
+++ b/maps/tether/tether_jobs.dm
@@ -30,8 +30,8 @@
pto_type = PTO_TALON
timeoff_factor = 1
dept_time_required = 60
- access = list(access_talon)
- minimal_access = list(access_talon)
+ access = list(ACCESS_TALON)
+ minimal_access = list(ACCESS_TALON)
alt_titles = list(JOB_ALT_TALON_COMMANDER = /datum/alt_title/talon_commander)
/datum/alt_title/talon_commander
@@ -56,8 +56,8 @@
playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
- access = list(access_talon)
- minimal_access = list(access_talon)
+ access = list(ACCESS_TALON)
+ minimal_access = list(ACCESS_TALON)
alt_titles = list(JOB_ALT_TALON_MEDIC = /datum/alt_title/talon_medic)
/datum/alt_title/talon_medic
@@ -83,8 +83,8 @@
playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
- access = list(access_talon)
- minimal_access = list(access_talon)
+ access = list(ACCESS_TALON)
+ minimal_access = list(ACCESS_TALON)
alt_titles = list(JOB_ALT_TALON_TECHNICIAN = /datum/alt_title/talon_tech)
/datum/alt_title/talon_tech
@@ -110,8 +110,8 @@
playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
- access = list(access_talon)
- minimal_access = list(access_talon)
+ access = list(ACCESS_TALON)
+ minimal_access = list(ACCESS_TALON)
alt_titles = list(JOB_ALT_TALON_HELMSMAN = /datum/alt_title/talon_helmsman)
/datum/alt_title/talon_helmsman
@@ -137,8 +137,8 @@
playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
- access = list(access_talon)
- minimal_access = list(access_talon)
+ access = list(ACCESS_TALON)
+ minimal_access = list(ACCESS_TALON)
alt_titles = list(JOB_ALT_TALON_SECURITY = /datum/alt_title/talon_security)
/datum/alt_title/talon_security
@@ -163,8 +163,8 @@
playtime_only = TRUE
pto_type = PTO_TALON
timeoff_factor = 1
- access = list(access_talon)
- minimal_access = list(access_talon)
+ access = list(ACCESS_TALON)
+ minimal_access = list(ACCESS_TALON)
alt_titles = list(JOB_ALT_TALON_EXCAVATOR = /datum/alt_title/talon_excavator)
/datum/alt_title/talon_excavator
diff --git a/maps/tether/tether_phoronlock.dm b/maps/tether/tether_phoronlock.dm
index 929e045910..ff80b95b9b 100644
--- a/maps/tether/tether_phoronlock.dm
+++ b/maps/tether/tether_phoronlock.dm
@@ -9,8 +9,8 @@
// Interior doors: (obj/machinery/door/airlock), id_tag = "[base]_inner"
// Exterior access button: (obj/machinery/access_button/airlock_exterior), master_tag = "[base]"
// Interior access button: (obj/machinery/access_button/airlock_interior), master_tag = "[base]"
-// Srubbers: (obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary), frequency = "1379", scrub_id = "[base]_scrubber"
-// Pumps: (obj/machinery/atmospherics/unary/vent_pump/high_volume), frequency = 1379 id_tag = "[base]_pump"
+// Srubbers: (obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary), frequency = AIRLOCK_FREQ, scrub_id = "[base]_scrubber"
+// Pumps: (obj/machinery/atmospherics/unary/vent_pump/high_volume), frequency = AIRLOCK_FREQ id_tag = "[base]_pump"
//
/obj/machinery/airlock_sensor/phoron
@@ -47,7 +47,7 @@
// Radio remote control
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary
- var/frequency = 0
+ var/frequency = ZERO_FREQ
var/datum/radio_frequency/radio_connection
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize(mapload)
diff --git a/maps/tether/tether_shuttle_defs.dm b/maps/tether/tether_shuttle_defs.dm
index f1889bad87..fee408b055 100644
--- a/maps/tether/tether_shuttle_defs.dm
+++ b/maps/tether/tether_shuttle_defs.dm
@@ -11,7 +11,7 @@
/obj/machinery/computer/shuttle_control/multi/mercenary
name = "vessel control console"
shuttle_tag = "Mercenary"
- req_one_access = list(access_syndicate)
+ req_one_access = list(ACCESS_SYNDICATE)
/obj/machinery/computer/shuttle_control/multi/ninja
name = "vessel control console"
@@ -21,17 +21,17 @@
/obj/machinery/computer/shuttle_control/multi/specops
name = "vessel control console"
shuttle_tag = "NDV Phantom"
- req_one_access = list(access_cent_specops)
+ req_one_access = list(ACCESS_CENT_SPECOPS)
/obj/machinery/computer/shuttle_control/multi/trade
name = "vessel control console"
shuttle_tag = "Trade"
- req_one_access = list(access_trader)
+ req_one_access = list(ACCESS_TRADER)
/obj/machinery/computer/shuttle_control/surface_mining_outpost
name = "surface mining outpost shuttle control console"
shuttle_tag = "Mining Outpost"
- req_one_access = list(access_mining)
+ req_one_access = list(ACCESS_MINING)
ai_control = TRUE
////////////////////////////////////////
@@ -49,7 +49,7 @@
/obj/machinery/computer/shuttle_control/explore/excursion
name = "short jump console"
shuttle_tag = "Excursion Shuttle"
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
////////////////////////////////////////
//////// Tour Bus /////////////
@@ -66,7 +66,7 @@
/obj/machinery/computer/shuttle_control/explore/tourbus
name = "short jump console"
shuttle_tag = "Tour Bus"
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
////////////////////////////////////////
//////// Medivac /////////////
diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm
index b9b2f1c682..ac2a2fbc3a 100644
--- a/maps/tether/tether_telecomms.dm
+++ b/maps/tether/tether_telecomms.dm
@@ -8,19 +8,19 @@
/datum/map/tether/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
- num2text(AI_FREQ) = list(access_synth),
+ num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
- num2text(ERT_FREQ) = list(access_cent_specops),
- num2text(COMM_FREQ)= list(access_heads),
- num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
- num2text(MED_FREQ) = list(access_medical_equip),
- num2text(MED_I_FREQ)=list(access_medical_equip),
- num2text(SEC_FREQ) = list(access_security),
- num2text(SEC_I_FREQ)=list(access_security),
- num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
- num2text(SUP_FREQ) = list(access_cargo),
- num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
- num2text(EXP_FREQ) = list(access_explorer)
+ num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
+ num2text(COMM_FREQ)= list(ACCESS_HEADS),
+ num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
+ num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
+ num2text(MED_I_FREQ)=list(ACCESS_MEDICAL_EQUIP),
+ num2text(SEC_FREQ) = list(ACCESS_SECURITY),
+ num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
+ num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
+ num2text(SUP_FREQ) = list(ACCESS_CARGO),
+ num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
+ num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
)
/obj/item/multitool/station_buffered
diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm
index 62cc62cb88..a6b4bba2e4 100644
--- a/maps/~map_system/maps.dm
+++ b/maps/~map_system/maps.dm
@@ -277,20 +277,20 @@ var/list/all_maps = list()
// This list needs to be purged but people insist on adding more cruft to the radio.
/datum/map/proc/default_internal_channels()
return list(
- num2text(PUB_FREQ) = list(),
- num2text(AI_FREQ) = list(access_synth),
- num2text(ENT_FREQ) = list(),
- num2text(ERT_FREQ) = list(access_cent_specops),
- num2text(COMM_FREQ) = list(access_heads),
- num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
- num2text(MED_FREQ) = list(access_medical_equip),
- num2text(MED_I_FREQ) = list(access_medical_equip),
- num2text(BDCM_FREQ) = list(access_security), // CHOMPEdit
- num2text(SEC_FREQ) = list(access_security),
- num2text(SEC_I_FREQ) = list(access_security),
- num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
- num2text(SUP_FREQ) = list(access_cargo),
- num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
+ num2text(PUB_FREQ) = list(),
+ num2text(AI_FREQ) = list(ACCESS_SYNTH),
+ num2text(ENT_FREQ) = list(),
+ num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
+ num2text(COMM_FREQ) = list(ACCESS_HEADS),
+ num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
+ num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
+ num2text(MED_I_FREQ)= list(ACCESS_MEDICAL_EQUIP),
+ num2text(BDCM_FREQ) = list(ACCESS_SECURITY), // CHOMPAdd
+ num2text(SEC_FREQ) = list(ACCESS_SECURITY),
+ num2text(SEC_I_FREQ)= list(ACCESS_SECURITY),
+ num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
+ num2text(SUP_FREQ) = list(ACCESS_CARGO),
+ num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
)
/datum/map/proc/get_skybox_datum(z)
diff --git a/modular_chomp/code/game/machinery/turrets.dm b/modular_chomp/code/game/machinery/turrets.dm
index 66f5aed283..2916b246d8 100644
--- a/modular_chomp/code/game/machinery/turrets.dm
+++ b/modular_chomp/code/game/machinery/turrets.dm
@@ -18,7 +18,7 @@
/obj/machinery/porta_turret/industrial/teleport_defense
name = "defense turret"
desc = "This variant appears to be much more durable, with a rugged outer coating."
- req_one_access = list(access_heads)
+ req_one_access = list(ACCESS_HEADS)
installation = /obj/item/gun/energy/gun/burst
health = 125
maxhealth = 125
@@ -45,7 +45,7 @@
idle_power_usage = 50000 //when inactive, this turret takes up constant 50 Equipment power
active_power_usage = 150000 //when active, this turret takes up constant 300 Equipment power
power_channel = EQUIP //drains power from the EQUIPMENT channel
- req_one_access = list(access_heads)
+ req_one_access = list(ACCESS_HEADS)
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
diff --git a/modular_chomp/code/game/machinery/vending.dm b/modular_chomp/code/game/machinery/vending.dm
index 54d7d2bbfe..12ac66ba3d 100644
--- a/modular_chomp/code/game/machinery/vending.dm
+++ b/modular_chomp/code/game/machinery/vending.dm
@@ -7,7 +7,7 @@
desc = "A large vending machine stocked with surplus uniforms, armor and pouches for exploration members."
vend_delay = 1
icon_state = "sec" // Placeholder
- req_one_access = list(access_explorer,access_pilot,access_medical_equip)
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_PILOT,ACCESS_MEDICAL_EQUIP)
products = list(
// Clothing
/obj/item/clothing/under/explorer = 10,
@@ -37,7 +37,7 @@
desc = "A large vending machine stocked with surplus phase, laser and ballistic weaponry for exploration members."
vend_delay = 1
icon_state = "sec" // Placeholder
- req_one_access = list(access_explorer,access_pilot,access_medical_equip)
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_PILOT,ACCESS_MEDICAL_EQUIP)
products = list(
// Phase
/obj/item/gun/energy/locked/phasegun/pistol = 10,
@@ -66,7 +66,7 @@
desc = "A large vending machine stocked with an assortment of miscellaneous equipment handy for explorers."
vend_delay = 1
icon_state = "sec" // Placeholder
- req_one_access = list(access_explorer,access_pilot,access_medical_equip)
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_PILOT,ACCESS_MEDICAL_EQUIP)
products = list(
/obj/item/cataloguer = 10,
/obj/item/cell/device = 10,
@@ -84,7 +84,7 @@
desc = "A large vending machine stocked with surplus uniforms and equipment for pilots."
vend_delay = 1
icon_state = "sec" // Placeholder
- req_access = list(access_pilot)
+ req_access = list(ACCESS_PILOT)
products = list(
// Clothing
/obj/item/clothing/under/rank/pilot1 = 5,
@@ -103,7 +103,7 @@
desc = "A large vending machine stocked with surplus uniforms and equipment for field medics."
vend_delay = 1
icon_state = "sec" // Placeholder
- req_access = list(access_medical_equip)
+ req_access = list(ACCESS_MEDICAL_EQUIP)
products = list(
// Clothing
/obj/item/clothing/under/explorer = 5,
@@ -202,5 +202,5 @@
//Some stuff to let sec do things
/obj/machinery/vending/nifsoft_shop
- req_log_access = access_security
+ req_log_access = ACCESS_SECURITY
has_logs = 1
diff --git a/modular_chomp/code/modules/clothing/spacesuits/rig/suits/alien.dm b/modular_chomp/code/modules/clothing/spacesuits/rig/suits/alien.dm
index 0e1b516feb..6c35267a56 100644
--- a/modular_chomp/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ b/modular_chomp/code/modules/clothing/spacesuits/rig/suits/alien.dm
@@ -42,7 +42,7 @@
rigsuit_min_pressure = 0 // Min pressure the rig protects against when sealed
req_one_access = list()
- req_access = list(access_engine)
+ req_access = list(ACCESS_ENGINE)
allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS, POCKET_SECURITY, POCKET_SUIT_REGULATORS)
offline_vision_restriction = 1
diff --git a/modular_chomp/code/modules/datums/supplypacks/engineering.dm b/modular_chomp/code/modules/datums/supplypacks/engineering.dm
index 9e1354e676..a0c90192ac 100644
--- a/modular_chomp/code/modules/datums/supplypacks/engineering.dm
+++ b/modular_chomp/code/modules/datums/supplypacks/engineering.dm
@@ -3,4 +3,4 @@
name = "c-type rotary electric generator board"
containertype = /obj/structure/closet/crate/focalpoint
containername = "c-type rotary board crate"
- access = access_engine
+ access = ACCESS_ENGINE
diff --git a/modular_chomp/code/modules/datums/supplypacks/hydrophonic.dm b/modular_chomp/code/modules/datums/supplypacks/hydrophonic.dm
index 434365974e..7b4d409e17 100644
--- a/modular_chomp/code/modules/datums/supplypacks/hydrophonic.dm
+++ b/modular_chomp/code/modules/datums/supplypacks/hydrophonic.dm
@@ -9,7 +9,7 @@
cost = 25
containertype = /obj/structure/largecrate/animal/sheep
containername = "Goat crate"
- access = access_hydroponics
+ access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/woofdog
name = "Dog crate"
diff --git a/modular_chomp/code/modules/datums/supplypacks/munitions.dm b/modular_chomp/code/modules/datums/supplypacks/munitions.dm
index 8559633d1f..97eeef7c68 100644
--- a/modular_chomp/code/modules/datums/supplypacks/munitions.dm
+++ b/modular_chomp/code/modules/datums/supplypacks/munitions.dm
@@ -11,5 +11,5 @@
cost = 134 // yee haw, also damn you serdy for making me want to add this.
containertype = /obj/structure/closet/crate/secure
containername = "Cowboy Crate"
- access = access_armory
+ access = ACCESS_ARMORY
contraband = 1
diff --git a/modular_chomp/code/modules/datums/supplypacks/science.dm b/modular_chomp/code/modules/datums/supplypacks/science.dm
index 493d500d99..cd16b94f63 100644
--- a/modular_chomp/code/modules/datums/supplypacks/science.dm
+++ b/modular_chomp/code/modules/datums/supplypacks/science.dm
@@ -4,4 +4,4 @@
containertype = /obj/structure/largecrate/animal/bugsect
containername = "EXTREMELY Dangerous Bug crate"
contraband = 1
- access = access_xenobiology
+ access = ACCESS_XENOBIOLOGY
diff --git a/modular_chomp/maps/common/common_machinery.dm b/modular_chomp/maps/common/common_machinery.dm
index e38ac6336b..ba8b56b03f 100644
--- a/modular_chomp/maps/common/common_machinery.dm
+++ b/modular_chomp/maps/common/common_machinery.dm
@@ -32,10 +32,10 @@
/obj/machinery/suit_cycler/exploration
name = "Explorer suit cycler"
model_text = "Exploration"
- req_one_access = list(access_pilot,access_explorer)
+ req_one_access = list(ACCESS_PILOT,ACCESS_EXPLORER)
/obj/machinery/suit_cycler/pilot
name = "Pilot suit cycler"
model_text = "Pilot"
req_access = null
- req_one_access = list(access_pilot,access_explorer)
+ req_one_access = list(ACCESS_PILOT,ACCESS_EXPLORER)
diff --git a/modular_chomp/maps/common/common_munitions.dm b/modular_chomp/maps/common/common_munitions.dm
index 78ba0a4577..413e1444de 100644
--- a/modular_chomp/maps/common/common_munitions.dm
+++ b/modular_chomp/maps/common/common_munitions.dm
@@ -12,7 +12,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/hedberg
containername = "Hunting Rifle crate"
- access = access_explorer
+ access = ACCESS_EXPLORER
/datum/supply_pack/munitions/phase_carbines_explorer
name = "Weapons - Surplus Phase Carbines"
@@ -22,7 +22,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/ward
containername = "Phase Carbine crate"
- access = access_explorer
+ access = ACCESS_EXPLORER
/datum/supply_pack/munitions/phase_rifles_explorer
name = "Weapons - Phase Rifles"
@@ -32,4 +32,4 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/ward
containername = "Phase Rifle crate"
- access = access_explorer
+ access = ACCESS_EXPLORER
diff --git a/modular_chomp/maps/common/common_presets.dm b/modular_chomp/maps/common/common_presets.dm
index cc455036ce..ffdfa91185 100644
--- a/modular_chomp/maps/common/common_presets.dm
+++ b/modular_chomp/maps/common/common_presets.dm
@@ -99,18 +99,18 @@
/datum/map/southern_cross/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
- num2text(AI_FREQ) = list(access_synth),
+ num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
- num2text(ERT_FREQ) = list(access_cent_specops),
- num2text(COMM_FREQ)= list(access_heads),
- num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
- num2text(MED_FREQ) = list(access_medical_equip),
- num2text(MED_I_FREQ)=list(access_medical_equip),
- num2text(BDCM_FREQ) =list(access_security),
- num2text(SEC_FREQ) = list(access_security),
- num2text(SEC_I_FREQ)=list(access_security),
- num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
- num2text(SUP_FREQ) = list(access_cargo),
- num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
- num2text(EXP_FREQ) = list(access_explorer)
+ num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
+ num2text(COMM_FREQ)= list(ACCESS_HEADS),
+ num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
+ num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
+ num2text(MED_I_FREQ)=list(ACCESS_MEDICAL_EQUIP),
+ num2text(BDCM_FREQ) =list(ACCESS_SECURITY),
+ num2text(SEC_FREQ) = list(ACCESS_SECURITY),
+ num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
+ num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
+ num2text(SUP_FREQ) = list(ACCESS_CARGO, ACCESS_MINING_STATION),
+ num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_LIBRARY, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN),
+ num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
)
diff --git a/modular_chomp/maps/common/common_shuttles.dm b/modular_chomp/maps/common/common_shuttles.dm
index 6ee28d585d..0be5b2c968 100644
--- a/modular_chomp/maps/common/common_shuttles.dm
+++ b/modular_chomp/maps/common/common_shuttles.dm
@@ -17,7 +17,7 @@
//Admin
/obj/machinery/computer/shuttle_control/multi/administration
name = "shuttle control console"
- req_access = list(access_cent_general)
+ req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Administration Shuttle"
/datum/shuttle/autodock/multi/administration
@@ -47,7 +47,7 @@
/obj/machinery/computer/shuttle_control/multi/centcom
name = "shuttle control console"
- req_access = list(access_cent_general)
+ req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Centcom Transport Shuttle"
/datum/shuttle/autodock/multi/centcom
diff --git a/modular_chomp/maps/common/common_shuttles_ert.dm b/modular_chomp/maps/common/common_shuttles_ert.dm
index 3a9393c3ee..395a26f218 100644
--- a/modular_chomp/maps/common/common_shuttles_ert.dm
+++ b/modular_chomp/maps/common/common_shuttles_ert.dm
@@ -1,7 +1,7 @@
// ERT Shuttles
/obj/machinery/computer/shuttle_control/multi/ert
name = "response shuttle control console"
- req_access = list(access_cent_specops)
+ req_access = list(ACCESS_CENT_SPECOPS)
shuttle_tag = "Response Operations Shuttle"
/datum/shuttle/autodock/multi/ert
diff --git a/modular_chomp/maps/common/common_shuttles_heist.dm b/modular_chomp/maps/common/common_shuttles_heist.dm
index 09ec87ac60..0d757dba6e 100644
--- a/modular_chomp/maps/common/common_shuttles_heist.dm
+++ b/modular_chomp/maps/common/common_shuttles_heist.dm
@@ -1,7 +1,7 @@
// Heist shuttles
/obj/machinery/computer/shuttle_control/multi/heist
name = "skipjack control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Skipjack"
/datum/shuttle/autodock/multi/heist
diff --git a/modular_chomp/maps/common/common_shuttles_merc.dm b/modular_chomp/maps/common/common_shuttles_merc.dm
index 104a0f891c..4226fd6e4d 100644
--- a/modular_chomp/maps/common/common_shuttles_merc.dm
+++ b/modular_chomp/maps/common/common_shuttles_merc.dm
@@ -1,7 +1,7 @@
// Merc shuttles
/obj/machinery/computer/shuttle_control/multi/syndicate
name = "mercenary shuttle control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Mercenary Ship"
/datum/shuttle/autodock/multi/syndicate
diff --git a/modular_chomp/maps/common/common_shuttles_ninja.dm b/modular_chomp/maps/common/common_shuttles_ninja.dm
index fe336eca4f..d3436831c1 100644
--- a/modular_chomp/maps/common/common_shuttles_ninja.dm
+++ b/modular_chomp/maps/common/common_shuttles_ninja.dm
@@ -1,7 +1,7 @@
// Ninja shuttles
/obj/machinery/computer/shuttle_control/multi/ninja
name = "stealth shuttle control console"
- req_access = list(access_syndicate)
+ req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Ninja Shuttle"
/datum/shuttle/autodock/multi/ninja
diff --git a/modular_chomp/maps/overmap/om_ships/cruiser.dmm b/modular_chomp/maps/overmap/om_ships/cruiser.dmm
index 0b144d0914..ff42d37614 100644
--- a/modular_chomp/maps/overmap/om_ships/cruiser.dmm
+++ b/modular_chomp/maps/overmap/om_ships/cruiser.dmm
@@ -5281,7 +5281,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/mothership/warden)
"lh" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/turf/simulated/floor/tiled/white,
/area/mothership/medical)
"li" = (
@@ -6232,7 +6232,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/mothership/rnd)
"nh" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/turf/simulated/floor/tiled/steel_grid,
/area/mothership/rnd)
"ni" = (
diff --git a/modular_chomp/maps/overmap/om_ships/generic_shuttle.dm b/modular_chomp/maps/overmap/om_ships/generic_shuttle.dm
index 8b233d7a2d..59a850034b 100644
--- a/modular_chomp/maps/overmap/om_ships/generic_shuttle.dm
+++ b/modular_chomp/maps/overmap/om_ships/generic_shuttle.dm
@@ -27,7 +27,7 @@
/obj/machinery/computer/shuttle_control/explore/generic_shuttle
name = "short jump console"
shuttle_tag = "Private Vessel" //These names must match
- req_one_access = list(access_pilot)
+ req_one_access = list(ACCESS_PILOT)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/generic_shuttle
diff --git a/modular_chomp/maps/overmap/om_ships/shelter_6.dm b/modular_chomp/maps/overmap/om_ships/shelter_6.dm
index d700cae170..409253ab46 100644
--- a/modular_chomp/maps/overmap/om_ships/shelter_6.dm
+++ b/modular_chomp/maps/overmap/om_ships/shelter_6.dm
@@ -21,7 +21,7 @@
/obj/machinery/computer/shuttle_control/explore/tabiranth
name = "short jump console"
shuttle_tag = "NDV Tabiranth"
- req_one_access = list(access_cent_general)
+ req_one_access = list(ACCESS_CENT_GENERAL)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/tabiranth
diff --git a/modular_chomp/maps/relic_base/relicbase-3.dmm b/modular_chomp/maps/relic_base/relicbase-3.dmm
index f922b61fc1..78354eba18 100644
--- a/modular_chomp/maps/relic_base/relicbase-3.dmm
+++ b/modular_chomp/maps/relic_base/relicbase-3.dmm
@@ -28096,7 +28096,7 @@
/turf/simulated/floor/tiled/steel_dirty,
/area/surface/outpost/wall/checkpoint)
"mkY" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/machinery/firealarm{
pixel_y = 24
},
@@ -34235,7 +34235,7 @@
/turf/simulated/floor/outdoors/grass/heavy,
/area/surface/outside/plains/outpost)
"paK" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm
index b5acf313d0..08741ca5cc 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm
@@ -44492,7 +44492,7 @@
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/Chapel_Lobby)
"cXZ" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/random_multi/single_item/hand_tele,
/obj/machinery/firealarm{
pixel_y = 25
@@ -79754,7 +79754,7 @@
/turf/simulated/floor/plating,
/area/maintenance/Deck2_Civilian_PortChamber2)
"mAU" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/item/defib_kit/compact/combat/loaded,
/obj/item/cmo_disk_holder,
/obj/item/denecrotizer/medical,
diff --git a/modular_chomp/maps/southern_cross/southern_cross-3.dmm b/modular_chomp/maps/southern_cross/southern_cross-3.dmm
index 1e89b1ce5f..4946a8f2d5 100644
--- a/modular_chomp/maps/southern_cross/southern_cross-3.dmm
+++ b/modular_chomp/maps/southern_cross/southern_cross-3.dmm
@@ -27225,7 +27225,7 @@
/turf/simulated/floor/plating,
/area/maintenance/substation/medical)
"bIJ" = (
-/obj/structure/closet/secure_closet/CMO,
+/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/machinery/ai_status_display{
pixel_x = -32
},
@@ -40506,7 +40506,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/sc/hor)
"cCK" = (
-/obj/structure/closet/secure_closet/RD,
+/obj/structure/closet/secure_closet/research_director,
/obj/machinery/firealarm{
pixel_y = 24
},
diff --git a/modular_chomp/maps/southern_cross/southern_cross_overrides.dm b/modular_chomp/maps/southern_cross/southern_cross_overrides.dm
index 6e408953c5..7145a5d28e 100644
--- a/modular_chomp/maps/southern_cross/southern_cross_overrides.dm
+++ b/modular_chomp/maps/southern_cross/southern_cross_overrides.dm
@@ -1,13 +1,8 @@
/mob/living/silicon/robot/platform/explorer
- req_access = list(access_explorer)
+ req_access = list(ACCESS_EXPLORER)
/mob/living/silicon/robot/platform/cargo
- req_access = list(access_cargo_bot)
-
-/obj/item/card/id/platform/Initialize(mapload)
- . = ..()
- // access |= access_explorer
- // access |= access_pilot
+ req_access = list(ACCESS_CARGO_BOT)
/obj/structure/dark_portal/hub
destination_station_areas = list(/area/hallway/primary/firstdeck/elevator)
diff --git a/modular_chomp/maps/southern_cross/structures/closets/engineering.dm b/modular_chomp/maps/southern_cross/structures/closets/engineering.dm
index e66c96ff9d..766e1ad5c2 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/engineering.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/engineering.dm
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/engineering_chief_wardrobe
name = "chief engineer's wardrobe"
- req_access = list(access_ce)
+ req_access = list(ACCESS_CE)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
starts_with = list(
diff --git a/modular_chomp/maps/southern_cross/structures/closets/medical.dm b/modular_chomp/maps/southern_cross/structures/closets/medical.dm
index 3c5a9c5634..284fdafdeb 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/medical.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/medical.dm
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/CMO_wardrobe
name = "chief medical officer's locker"
- req_access = list(access_cmo)
+ req_access = list(ACCESS_CMO)
closet_appearance = /decl/closet_appearance/secure_closet/cmo
starts_with = list(
diff --git a/modular_chomp/maps/southern_cross/structures/closets/misc.dm b/modular_chomp/maps/southern_cross/structures/closets/misc.dm
index 32afda29ef..6b08f18925 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/misc.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/misc.dm
@@ -2,7 +2,7 @@
/obj/structure/closet/secure_closet/guncabinet/sidearm
name = "emergency weapon cabinet"
- req_one_access = list(access_armory,access_captain)
+ req_one_access = list(ACCESS_ARMORY,ACCESS_CAPTAIN)
starts_with = list(
/obj/item/gun/energy/gun = 4)
@@ -10,7 +10,7 @@
/obj/structure/closet/secure_closet/guncabinet/rifle
name = "rifle cabinet"
- req_one_access = list(access_explorer,access_brig)
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_BRIG)
starts_with = list(
/obj/item/ammo_magazine/clip/c762/hunter = 9,
@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/guncabinet/phase
name = "explorer weapon cabinet"
- req_one_access = list(access_explorer,access_brig)
+ req_one_access = list(ACCESS_EXPLORER,ACCESS_BRIG)
starts_with = list(
/obj/item/gun/energy/locked/phasegun = 2,
@@ -37,7 +37,7 @@
/obj/structure/closet/secure_closet/explorer
name = "explorer locker"
- req_access = list(access_explorer)
+ req_access = list(ACCESS_EXPLORER)
starts_with = list(
/obj/item/clothing/under/explorer,
@@ -77,7 +77,7 @@
/obj/structure/closet/secure_closet/sar
name = "search and rescue locker"
desc = "Supplies for a wilderness first responder."
- req_access = list(access_medical_equip)
+ req_access = list(ACCESS_MEDICAL_EQUIP)
closet_appearance = /decl/closet_appearance/secure_closet/medical
starts_with = list(
@@ -111,7 +111,7 @@
/obj/structure/closet/secure_closet/pilot
name = "pilot locker"
- req_access = list(access_pilot)
+ req_access = list(ACCESS_PILOT)
starts_with = list(
/obj/item/storage/backpack/parachute,
diff --git a/modular_chomp/maps/southern_cross/structures/closets/research.dm b/modular_chomp/maps/southern_cross/structures/closets/research.dm
index a279eeef77..9e53887578 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/research.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/research.dm
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/RD_wardrobe
name = "research director's locker"
- req_access = list(access_rd)
+ req_access = list(ACCESS_RD)
closet_appearance = /decl/closet_appearance/secure_closet/science/rd
starts_with = list(
diff --git a/modular_chomp/maps/southern_cross/structures/closets/security.dm b/modular_chomp/maps/southern_cross/structures/closets/security.dm
index 9d0d8c31c1..a05afdc65f 100644
--- a/modular_chomp/maps/southern_cross/structures/closets/security.dm
+++ b/modular_chomp/maps/southern_cross/structures/closets/security.dm
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/hos_wardrobe
name = "head of security's locker"
- req_access = list(access_hos)
+ req_access = list(ACCESS_HOS)
closet_appearance = /decl/closet_appearance/secure_closet/security/hos
starts_with = list(
diff --git a/modular_chomp/maps/~map_system/maps.dm b/modular_chomp/maps/~map_system/maps.dm
index 5fcf2765c2..108e9551f4 100644
--- a/modular_chomp/maps/~map_system/maps.dm
+++ b/modular_chomp/maps/~map_system/maps.dm
@@ -277,19 +277,20 @@ var/list/all_maps = list()
/datum/map/proc/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
- num2text(AI_FREQ) = list(access_synth),
+ num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
- num2text(ERT_FREQ) = list(access_cent_specops),
- num2text(COMM_FREQ) = list(access_heads),
- num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
- num2text(MED_FREQ) = list(access_medical_equip),
- num2text(MED_I_FREQ) = list(access_medical_equip),
- num2text(BDCM_FREQ) = list(access_security), // CHOMPEdit
- num2text(SEC_FREQ) = list(access_security),
- num2text(SEC_I_FREQ) = list(access_security),
- num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
- num2text(SUP_FREQ) = list(access_cargo),
- num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
+ num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
+ num2text(COMM_FREQ)= list(ACCESS_HEADS),
+ num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
+ num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
+ num2text(MED_I_FREQ)=list(ACCESS_MEDICAL_EQUIP),
+ num2text(BDCM_FREQ) =list(ACCESS_SECURITY),
+ num2text(SEC_FREQ) = list(ACCESS_SECURITY),
+ num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
+ num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
+ num2text(SUP_FREQ) = list(ACCESS_CARGO, ACCESS_MINING_STATION),
+ num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_LIBRARY, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN),
+ num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
)
/datum/map/proc/get_skybox_datum(z)
diff --git a/tgui/packages/tgui/interfaces/VorePanel/index.tsx b/tgui/packages/tgui/interfaces/VorePanel/index.tsx
index d1075fab6c..ba17de5bc5 100644
--- a/tgui/packages/tgui/interfaces/VorePanel/index.tsx
+++ b/tgui/packages/tgui/interfaces/VorePanel/index.tsx
@@ -13,143 +13,11 @@ import { VoreUserPreferences } from './VorePanelMainTabs/VoreUserPreferences';
/**
* There are three main sections to this UI.
* - The Inside Panel, where all relevant data for interacting with a belly you're in is located.
+ * - The soulcatcher, which allows to capture prey after digestion to entrap them.
* - The Belly Selection Panel, where you can select what belly people will go into and customize the active one.
* - User Preferences, where you can adjust all of your vore preferences on the fly.
*/
-/**
- * CHOMPedits specified here. Read ALL of this if conflicts happen, I can't find a way to add comments line by line.
- *
- * Under VoreSelectedBelly the following strings have been added to const{}:
- * show_liq, liq_interacts, liq_reagent_gen, liq_reagent_type, liq_reagent_name,
- * liq_reagent_transfer_verb, liq_reagent_nutri_rate, liq_reagent_capacity, liq_sloshing, liq_reagent_addons,
- * show_liq_fullness, liq_messages, liq_msg_toggle1, liq_msg_toggle2, liq_msg_toggle3, liq_msg_toggle4,
- * liq_msg_toggle5, liq_msg1, liq_msg2, liq_msg3, liq_msg4, liq_msg5, sound_volume, egg_name, recycling, storing_nutrition, entrance_logs, item_digest_logs, noise_freq,
- * custom_reagentcolor, custom_reagentalpha, liquid_overlay, max_liquid_level, mush_overlay, reagent_touches, mush_color, mush_alpha, max_mush, min_mush, item_mush_val,
- * metabolism_overlay, metabolism_mush_ratio, max_ingested, custom_ingested_color, custom_ingested_alpha
- *
- * To the tabs section of VoreSelectedBelly return
- * setTabIndex(5)}>
- * Liquid Options
- *
- * setTabIndex(6)}>
- * Liquid Messages
- *
- *
- * All of the content for tabIndex === 5 and tabIndex === 6
- *
- * Under VoreUserPreferences the following strings have been added to const{}:
- * liq_rec, liq_giv,
- *
- * To VoreUserPreferences return
- *
- *
- *
- *
- *
- *
- *
- * NEW EDITS 2/25/21: COLORED BELLY OVERLAYS
- * LINE 5:
- *import { Box, Button, ByondUi, Stack, Collapsible, Icon, LabeledList, NoticeBox, Section, Tabs } from "../components";
- *
- * LINE 172 -
- *
- * LINE 301 - belly_fullscreen_color,
- * mapRef,
- *
- * LINE 604 -
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- * Belly styles:
- *
- * {Object.keys(possible_fullscreens).map(key => (
- *
- * ))}
- *
- *
- *
- * LINE 900 - const [tabIndex, setTabIndex] = useLocalState('tabIndex', 0);
- *
- * return tabIndex===4 ? null : (
- *
- * New preference added, noisy_full
- * noisy_full enables belching when nutrition exceeds 500, very similar to the noisy preference.
- *
- * That's everything so far.
- *
- */
-
export const VorePanel = () => {
const { act, data } = useBackend();
diff --git a/vorestation.dme b/vorestation.dme
index 05af4ca16f..aff48c2dff 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -39,6 +39,7 @@
#include "code\__defines\_reagents.dm"
#include "code\__defines\_reagents_ch.dm"
#include "code\__defines\_tick.dm"
+#include "code\__defines\access.dm"
#include "code\__defines\action.dm"
#include "code\__defines\addictions.dm"
#include "code\__defines\admin.dm"
@@ -63,6 +64,7 @@
#include "code\__defines\chemistry_vr.dm"
#include "code\__defines\circuitboard.dm"
#include "code\__defines\cleaning.dm"
+#include "code\__defines\click.dm"
#include "code\__defines\client.dm"
#include "code\__defines\cloning.dm"
#include "code\__defines\clothing.dm"