diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 3956409040b4..6e764a1e3577 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -26650,8 +26650,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ name = "Service Hall"; - req_access_txt = "35"; - req_one_access_txt = "0" + req_access_txt = "35;79" }, /turf/open/floor/wood, /area/hallway/secondary/service) @@ -68477,7 +68476,7 @@ }, /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38;36" + req_access_txt = "79" }, /obj/structure/cable{ icon_state = "4-8" diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 7bfdda23342b..303f7210878f 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -1534,7 +1534,7 @@ }, /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38;36" + req_access_txt = "79" }, /obj/machinery/door/firedoor/border_only{ dir = 4 diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 54a6a13ab256..27f29f874710 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -39487,7 +39487,7 @@ "toK" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38;36" + req_access_txt = "79" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -42719,7 +42719,7 @@ "uWk" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38" + req_access_txt = "79" }, /obj/machinery/door/firedoor/border_only{ dir = 8 diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 41bee5866aa2..5bd955804ff8 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -10734,7 +10734,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38" + req_access_txt = "79" }, /turf/open/floor/plasteel, /area/hallway/secondary/service) @@ -29891,7 +29891,7 @@ "iMH" = ( /obj/machinery/door/airlock/medical/glass{ name = "Service Door"; - req_one_access_txt = "35;28" + req_access_txt = "35;79" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -43420,7 +43420,7 @@ "mDl" = ( /obj/machinery/door/airlock{ name = "Kitchen"; - req_access_txt = "28" + req_access_txt = "28;79" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -48046,7 +48046,7 @@ "nRB" = ( /obj/machinery/door/airlock{ name = "Bar Storage"; - req_access_txt = "25" + req_access_txt = "25;79" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 8b217280c836..bff1ce11264d 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -23005,7 +23005,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "25;26;35;28;46;37;38" + req_access_txt = "79" }, /obj/structure/cable{ icon_state = "1-2" @@ -53016,7 +53016,7 @@ "qpF" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38;36" + req_access_txt = "79" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index f00b5431db9c..fd42046c46a9 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -92,6 +92,7 @@ #define ACCESS_SECURE_TECH_STORAGE 76 // Creating this to cleanly fix door remote bug will be equivalent to ACCESS_AI_UPLOAD for Cap and RD #define ACCESS_PSYCH 77 // For the psych's back office area with the flashes/chem machines #define ACCESS_RND 78 //rnd console +#define ACCESS_SERVHALL 79 //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index ebe1c7120a3d..e8934128e90f 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -151,7 +151,7 @@ ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_RND, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING, ACCESS_BRIG_PHYS, ACCESS_PSYCH) //YOGS - yogs jobs + ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING, ACCESS_BRIG_PHYS, ACCESS_PSYCH, ACCESS_SERVHALL) //YOGS - yogs jobs /// Gets all centcom accesses /proc/get_all_centcom_access() @@ -185,7 +185,7 @@ if(0) return get_all_accesses() if(1) //station general - return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_MANUFACTURING) + return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_MANUFACTURING, ACCESS_SERVHALL) if(2) //security return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) if(3) //medbay @@ -377,6 +377,8 @@ return "Freeminer Engineer" if(ACCESS_FREEMINER_CAPTAIN) return "Freeminer Captain" + if(ACCESS_SERVHALL) + return "Service Hall" // yogs end /// Get descriptions for centcom accesses diff --git a/code/modules/jobs/job_types/artist.dm b/code/modules/jobs/job_types/artist.dm index 28dfe08cc02e..b41f9b9e8530 100644 --- a/code/modules/jobs/job_types/artist.dm +++ b/code/modules/jobs/job_types/artist.dm @@ -11,7 +11,7 @@ outfit = /datum/outfit/job/artist alt_titles = list("Painter", "Composer", "Artisan") added_access = list() - base_access = list() + base_access = list(ACCESS_SERVHALL) paycheck = PAYCHECK_ASSISTANT paycheck_department = ACCOUNT_CIV diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index eca2c26c67e6..84f45d0a6562 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/bartender added_access = list(ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_MORGUE) - base_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) + base_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BARTENDER diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index b63b4e969c52..beafe3e56a34 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -13,7 +13,7 @@ alt_titles = list("Ecologist", "Agriculturist", "Botany Greenhorn", "Hydroponicist", "Gardener") added_access = list(ACCESS_BAR, ACCESS_KITCHEN) - base_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BOTANIST diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 42a2cb83d797..2361a7dcd37f 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -14,7 +14,7 @@ alt_titles = list("Priest", "Preacher", "Cleric", "Exorcist", "Vicar") added_access = list() - base_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE) + base_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index 308d4c0d253a..225f7a816685 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -13,7 +13,7 @@ alt_titles = list("Entertainer", "Comedian", "Jester", "Improv Artist") added_access = list() - base_access = list(ACCESS_THEATRE) + base_access = list(ACCESS_THEATRE, ACCESS_SERVHALL) paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index 3100197198af..adc8ae47282d 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -14,7 +14,7 @@ alt_titles = list("Chef", "Hash Slinger", "Sous-chef", "Culinary Artist", "Culinarian") added_access = list(ACCESS_HYDROPONICS, ACCESS_BAR) - base_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index 5d8e15bc38ec..cf16f7dd7e2e 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -14,7 +14,7 @@ alt_titles = list("Librarian", "Journalist", "Archivist", "Cartographer", "Space Archaeologist") added_access = list() - base_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION) + base_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_BLOODSUCKER_HUNTER) diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 681574e1cfaf..234d9841c94b 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -26,7 +26,7 @@ ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MANUFACTURING) //yogs - added ACCESS_MANUFACTURING as it's the clerk's + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MANUFACTURING, ACCESS_SERVHALL) //yogs - added ACCESS_MANUFACTURING as it's the clerk's paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index a14f9ee38454..42d2d7257536 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -13,7 +13,7 @@ alt_titles = list("Custodian", "Sanitation Worker", "Cleaner", "Caretaker", "Maid") added_access = list() - base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_RESEARCH, ACCESS_MEDICAL) + base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index edcce8838c85..14067f910fee 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/lawyer added_access = list() - base_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS) + base_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index b7cb4af69188..8b1137fc7b09 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -13,7 +13,7 @@ alt_titles = list("Mute Entertainer", "Silent Jokester", "Pantomimist") added_access = list() - base_access = list(ACCESS_THEATRE) + base_access = list(ACCESS_THEATRE, ACCESS_SERVHALL) paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV