diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 32002394656..90504ba974c 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -345,7 +345,7 @@ var/datum/subsystem/job/SSjob if(job.req_admin_notify) H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." if(config.minimal_access_threshold) - H << "As this station was initially staffed with a [config.jobs_have_minimal_access ? "full crew, only your job's necessities" : "skeleton crew, additional access"] have been added to your ID card." + H << "As this station was initially staffed with a [config.jobs_have_minimal_access ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card." H.update_hud() // Tmp fix for Github issue 1006. TODO: make all procs in update_icons.dm do client.screen |= equipment no matter what. return 1 diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 6eeded8c1ba..f94c21e1d2f 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -70,7 +70,7 @@ Head of Personnel default_pda = /obj/item/device/pda/heads/hop default_headset = /obj/item/device/radio/headset/heads/hop - access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, access_weapons, + access = list(access_security, access_sec_doors, access_court, access_weapons, 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, diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 836dca7e32e..3d420b39d51 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -67,7 +67,7 @@ Cook default_pda = /obj/item/device/pda/cook default_headset = /obj/item/device/radio/headset/headset_srv - access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) + access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_mineral_storeroom) minimal_access = list(access_kitchen, access_morgue) /datum/job/cook/equip_items(var/mob/living/carbon/human/H) @@ -100,7 +100,7 @@ Botanist default_pda = /obj/item/device/pda/botanist default_headset = /obj/item/device/radio/headset/headset_srv - access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. + access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_mineral_storeroom) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. minimal_access = list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. /datum/job/hydro/equip_items(var/mob/living/carbon/human/H) @@ -127,7 +127,7 @@ Clown default_pda = /obj/item/device/pda/clown default_backpack = /obj/item/weapon/storage/backpack/clown - access = list(access_theatre, access_maint_tunnels) + access = list(access_theatre) minimal_access = list(access_theatre) /datum/job/clown/equip_backpack(var/mob/living/carbon/human/H) @@ -169,7 +169,7 @@ Mime default_pda = /obj/item/device/pda/mime default_backpack = /obj/item/weapon/storage/backpack/mime - access = list(access_theatre, access_maint_tunnels) + access = list(access_theatre) minimal_access = list(access_theatre) /datum/job/mime/equip_backpack(var/mob/living/carbon/human/H) @@ -236,7 +236,7 @@ Librarian default_pda = /obj/item/device/pda/librarian - access = list(access_library, access_maint_tunnels) + access = list(access_library) minimal_access = list(access_library) /datum/job/librarian/equip_items(var/mob/living/carbon/human/H) @@ -264,7 +264,7 @@ Lawyer default_pda = /obj/item/device/pda/lawyer default_headset = /obj/item/device/radio/headset/headset_sec - access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels) + access = list(access_lawyer, access_court, access_sec_doors) minimal_access = list(access_lawyer, access_court, access_sec_doors) /datum/job/lawyer/equip_items(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index b68e514ef6e..26225a71971 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -15,7 +15,7 @@ Chaplain default_pda = /obj/item/device/pda/chaplain - access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels) + access = list(access_morgue, access_chapel_office, access_crematorium) minimal_access = list(access_morgue, access_chapel_office, access_crematorium) //Pretty bible names diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index d58aff0ac06..0136e52eb28 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -63,7 +63,7 @@ Station Engineer default_satchel = /obj/item/weapon/storage/backpack/satchel_eng default_storagebox = /obj/item/weapon/storage/box/engineer - access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, + access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_tcomsat) minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_tcomsat) @@ -94,7 +94,7 @@ Atmospheric Technician default_headset = /obj/item/device/radio/headset/headset_eng default_storagebox = /obj/item/weapon/storage/box/engineer - access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, + access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics) minimal_access = list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 5c2d1ecff74..6e11a228224 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -57,7 +57,7 @@ Medical Doctor default_backpack = /obj/item/weapon/storage/backpack/medic default_satchel = /obj/item/weapon/storage/backpack/satchel_med - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) + 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) /datum/job/doctor/equip_items(var/mob/living/carbon/human/H) @@ -109,7 +109,7 @@ Geneticist default_pda = /obj/item/device/pda/geneticist default_headset = /obj/item/device/radio/headset/headset_medsci - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research) + 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) /datum/job/geneticist/equip_items(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 99908da4248..1d0f43c62e3 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -57,7 +57,7 @@ Scientist default_pda = /obj/item/device/pda/toxins default_headset = /obj/item/device/radio/headset/headset_sci - access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom) + access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom, access_tech_storage, access_genetics) minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_mineral_storeroom) /datum/job/scientist/equip_items(var/mob/living/carbon/human/H) @@ -82,7 +82,7 @@ Roboticist default_pda = /obj/item/device/pda/roboticist default_headset = /obj/item/device/radio/headset/headset_sci - access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research, access_mineral_storeroom) + access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research, access_mineral_storeroom, access_xenobiology, access_genetics) minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research, access_mineral_storeroom) /datum/job/roboticist/equip_items(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index a5323296e6b..d704935fca8 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -75,7 +75,7 @@ Warden default_backpack = /obj/item/weapon/storage/backpack/security default_satchel = /obj/item/weapon/storage/backpack/satchel_sec - access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons) + access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers) minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_weapons) //See /datum/job/warden/get_access() /datum/job/warden/equip_items(var/mob/living/carbon/human/H) @@ -121,7 +121,7 @@ Detective default_pda = /obj/item/device/pda/detective default_headset = /obj/item/device/radio/headset/headset_sec - access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons) + access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons, access_brig, access_security) minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons) /datum/job/detective/equip_items(var/mob/living/carbon/human/H) @@ -171,7 +171,7 @@ Security Officer default_backpack = /obj/item/weapon/storage/backpack/security default_satchel = /obj/item/weapon/storage/backpack/satchel_sec - access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_weapons) + access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers) minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_weapons) //But see /datum/job/warden/get_access() /datum/job/officer/equip_items(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/supply.dm b/code/game/jobs/job/supply.dm index 38710b0738e..f61b4a08f74 100644 --- a/code/game/jobs/job/supply.dm +++ b/code/game/jobs/job/supply.dm @@ -15,8 +15,8 @@ Quartermaster default_pda = /obj/item/device/pda/quartermaster default_headset = /obj/item/device/radio/headset/headset_cargo - access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom) - minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) + minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) /datum/job/qm/equip_items(var/mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform) @@ -41,7 +41,7 @@ Cargo Technician default_pda = /obj/item/device/pda/cargo default_headset = /obj/item/device/radio/headset/headset_cargo - access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting) /datum/job/cargo_tech/equip_items(var/mob/living/carbon/human/H) @@ -68,8 +68,8 @@ Shaft Miner default_satchel = /obj/item/weapon/storage/backpack/satchel_eng default_storagebox = /obj/item/weapon/storage/box/engineer - access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom) - minimal_access = list(access_mining, access_mint, access_mining_station, access_mailsorting, access_mineral_storeroom) + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) + minimal_access = list(access_mining, access_mining_station, access_mailsorting, access_mineral_storeroom) /datum/job/mining/equip_items(var/mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform)