diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 30a2e2eed65..15f33c8905e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -75936,8 +75936,7 @@ /obj/machinery/door/airlock/glass_medical{ id_tag = "CloningDoor"; name = "Cloning Lab"; - req_access_txt = "0"; - req_one_access_txt = "5" + req_access_txt = "5; 68" }, /turf/open/floor/plasteel/whiteblue, /area/medical/genetics_cloning) @@ -75985,7 +75984,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_research{ name = "Genetics Lab"; - req_access_txt = "5;9" + req_access_txt = "5; 9; 68" }, /obj/structure/cable/yellow{ d1 = 4; diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 906e2668059..f0f81d38139 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -31507,7 +31507,7 @@ /obj/machinery/door/airlock/glass_medical{ id_tag = "GeneticsDoor"; name = "Genetics"; - req_access_txt = "5; 9" + req_access_txt = "5; 68" }, /turf/open/floor/plasteel/white, /area/medical/genetics) @@ -32995,7 +32995,7 @@ "bvt" = ( /obj/machinery/door/airlock/glass_research{ name = "Genetics Research"; - req_access_txt = "5; 9" + req_access_txt = "5; 9; 68" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 0442fc28b76..6697aed5263 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -14,7 +14,7 @@ density = 1 icon = 'icons/obj/cloning.dmi' icon_state = "pod_0" - req_access = list(access_genetics) //For premature unlocking. + req_access = list(access_cloning) //For premature unlocking. verb_say = "states" var/heal_level = 90 //The clone is released once its health reaches this level. var/locked = FALSE diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 49f47a2d493..1ed7452b1fe 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -65,6 +65,7 @@ /var/const/access_minisat = 65 /var/const/access_weapons = 66 //Weapon authorization for secbots /var/const/access_network = 67 +/var/const/access_cloning = 68 //Cloning room //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. @@ -243,7 +244,7 @@ access_hydroponics, access_library, access_lawyer, access_virology, access_cmo, access_qm, access_surgery, access_theatre, access_research, access_mining, access_mailsorting, access_weapons, access_heads_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_keycard_auth, access_tcomsat, access_gateway, access_mineral_storeroom, access_minisat, access_network, access_cloning) /proc/get_all_centcom_access() return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_captain) @@ -271,7 +272,7 @@ if(2) //security return list(access_sec_doors, access_weapons, access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_hos) if(3) //medbay - return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo) + return list(access_medical, access_genetics, access_cloning, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo) if(4) //research return list(access_research, access_tox, access_tox_storage, access_genetics, access_robotics, access_xenobiology, access_minisat, access_rd, access_network) if(5) //engineering and maintenance @@ -432,6 +433,8 @@ return "Weapon Permit" if(access_network) return "Network Access" + if(access_cloning) + return "Cloning Room" /proc/get_centcom_access_desc(A) switch(A) diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm index 1e1b2d71311..3444fe97b2c 100644 --- a/code/modules/jobs/job_types/medical.dm +++ b/code/modules/jobs/job_types/medical.dm @@ -16,10 +16,10 @@ Chief Medical Officer outfit = /datum/outfit/job/cmo - access = list(access_medical, access_morgue, access_genetics, access_heads, access_mineral_storeroom, + access = list(access_medical, access_morgue, access_genetics, access_cloning, access_heads, access_mineral_storeroom, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_sec_doors, access_maint_tunnels) - minimal_access = list(access_medical, access_morgue, access_genetics, access_heads, access_mineral_storeroom, + minimal_access = list(access_medical, access_morgue, access_genetics, access_cloning, access_heads, access_mineral_storeroom, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_sec_doors, access_maint_tunnels) @@ -64,8 +64,8 @@ Medical Doctor outfit = /datum/outfit/job/doctor - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) - minimal_access = list(access_medical, access_morgue, access_surgery) + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_cloning, access_mineral_storeroom) + minimal_access = list(access_medical, access_morgue, access_surgery, access_cloning) /datum/outfit/job/doctor name = "Medical Doctor" @@ -98,7 +98,7 @@ Chemist outfit = /datum/outfit/job/chemist - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_cloning, access_mineral_storeroom) minimal_access = list(access_medical, access_chemistry, access_mineral_storeroom) /datum/outfit/job/chemist @@ -131,8 +131,8 @@ Geneticist outfit = /datum/outfit/job/geneticist - access = list(access_medical, access_morgue, access_chemistry, access_virology, access_genetics, access_research, access_xenobiology, access_robotics, access_mineral_storeroom, access_tech_storage) - minimal_access = list(access_medical, access_morgue, access_genetics, access_research) + access = list(access_medical, access_morgue, access_chemistry, access_virology, access_genetics, access_cloning, access_research, access_xenobiology, access_robotics, access_mineral_storeroom, access_tech_storage) + minimal_access = list(access_medical, access_morgue, access_genetics, access_cloning, access_research) /datum/outfit/job/geneticist name = "Geneticist" @@ -164,7 +164,7 @@ Virologist outfit = /datum/outfit/job/virologist - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_cloning, access_mineral_storeroom) minimal_access = list(access_medical, access_virology, access_mineral_storeroom) /datum/outfit/job/virologist