diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 2b7dd18425..2860b218f5 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -6,6 +6,8 @@ #define JOB_CHIEF_ENGINEER "Chief Engineer" #define JOB_RESEARCH_DIRECTOR "Research Director" #define JOB_CHIEF_MEDICAL_OFFICER "Chief Medical Officer" +#define JOB_QUARTERMASTER "Quartermaster" +#define JOB_PATHFINDER "Away Team Leader" // was Pathfinder // Station Security jobs #define JOB_WARDEN "Warden" @@ -19,10 +21,23 @@ // Station Medical jobs #define JOB_CHEMIST "Chemist" #define JOB_MEDICAL_DOCTOR "Medical Doctor" +#define JOB_PARAMEDIC "Paramedic" +#define JOB_PSYCHIATRIST "Psychiatrist" +#define JOB_GENETICIST "Geneticist" //Disabled atm +// Station Science jobs +#define JOB_ROBOTICIST "Roboticist" +#define JOB_SCIENTIST "Scientist" +#define JOB_XENOBIOLOGIST "Xenobiologist" +#define JOB_XENOBOTANIST "Xenobotanist" - +// Station Cargo jobs #define JOB_SHAFT_MINER "Shaft Miner" +#define JOB_CARGO_TECHNICIAN "Cargo Technician" + +// Section Explo jobs +#define JOB_EXPLORER "Away Team" // was Explorer +#define JOB_FIELD_MEDIC "Away Team Medic" // was Field Medic // Security alt titles diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 554666cbca..d93415da23 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -108,7 +108,7 @@ pda_type = /obj/item/device/pda/chaplain /decl/hierarchy/outfit/job/explorer - name = OUTFIT_JOB_NAME("Explorer") + name = OUTFIT_JOB_NAME(JOB_EXPLORER) shoes = /obj/item/clothing/shoes/boots/winter/explorer uniform = /obj/item/clothing/under/explorer mask = /obj/item/clothing/mask/gas/explorer @@ -120,4 +120,4 @@ pda_slot = slot_belt pda_type = /obj/item/device/pda/cargo // Brown looks more rugged r_pocket = /obj/item/device/gps/explorer - id_pda_assignment = "Explorer" + id_pda_assignment = JOB_EXPLORER diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm index 720c45556c..2344d7c62b 100644 --- a/code/datums/outfits/jobs/medical.dm +++ b/code/datums/outfits/jobs/medical.dm @@ -70,7 +70,7 @@ pda_type = /obj/item/device/pda/chemist /decl/hierarchy/outfit/job/medical/geneticist - name = OUTFIT_JOB_NAME("Geneticist") + name = OUTFIT_JOB_NAME(JOB_GENETICIST) uniform = /obj/item/clothing/under/rank/geneticist suit = /obj/item/clothing/suit/storage/toggle/labcoat/genetics backpack = /obj/item/weapon/storage/backpack/genetics @@ -80,7 +80,7 @@ pda_type = /obj/item/device/pda/geneticist /decl/hierarchy/outfit/job/medical/psychiatrist - name = OUTFIT_JOB_NAME("Psychiatrist") + name = OUTFIT_JOB_NAME(JOB_PSYCHIATRIST) uniform = /obj/item/clothing/under/rank/psych suit = /obj/item/clothing/suit/storage/toggle/labcoat shoes = /obj/item/clothing/shoes/laceup @@ -91,7 +91,7 @@ uniform = /obj/item/clothing/under/rank/psych/turtleneck /decl/hierarchy/outfit/job/medical/paramedic - name = OUTFIT_JOB_NAME("Paramedic") + name = OUTFIT_JOB_NAME(JOB_PARAMEDIC) uniform = /obj/item/clothing/under/rank/medical/paramedic suit = /obj/item/clothing/suit/storage/toggle/fr_jacket shoes = /obj/item/clothing/shoes/boots/jackboots diff --git a/code/datums/outfits/jobs/science.dm b/code/datums/outfits/jobs/science.dm index fcccfb8f8c..af8307cc3f 100644 --- a/code/datums/outfits/jobs/science.dm +++ b/code/datums/outfits/jobs/science.dm @@ -19,19 +19,19 @@ pda_type = /obj/item/device/pda/heads/rd /decl/hierarchy/outfit/job/science/scientist - name = OUTFIT_JOB_NAME("Scientist") + name = OUTFIT_JOB_NAME(JOB_SCIENTIST) uniform = /obj/item/clothing/under/rank/scientist id_type = /obj/item/weapon/card/id/science suit = /obj/item/clothing/suit/storage/toggle/labcoat/science /decl/hierarchy/outfit/job/science/xenobiologist - name = OUTFIT_JOB_NAME("Xenobiologist") + name = OUTFIT_JOB_NAME(JOB_XENOBIOLOGIST) uniform = /obj/item/clothing/under/rank/scientist id_type = /obj/item/weapon/card/id/science suit = /obj/item/clothing/suit/storage/toggle/labcoat/science /decl/hierarchy/outfit/job/science/roboticist - name = OUTFIT_JOB_NAME("Roboticist") + name = OUTFIT_JOB_NAME(JOB_ROBOTICIST) uniform = /obj/item/clothing/under/rank/roboticist shoes = /obj/item/clothing/shoes/black belt = /obj/item/weapon/storage/belt/utility/full/multitool @@ -40,4 +40,4 @@ pda_type = /obj/item/device/pda/roboticist backpack = /obj/item/weapon/storage/backpack satchel_one = /obj/item/weapon/storage/backpack/satchel/norm - suit = /obj/item/clothing/suit/storage/toggle/labcoat/roboticist \ No newline at end of file + suit = /obj/item/clothing/suit/storage/toggle/labcoat/roboticist diff --git a/code/datums/outfits/jobs/science_vr.dm b/code/datums/outfits/jobs/science_vr.dm index cf0e9e4b3a..21a6bf43f0 100644 --- a/code/datums/outfits/jobs/science_vr.dm +++ b/code/datums/outfits/jobs/science_vr.dm @@ -2,7 +2,7 @@ id_type = /obj/item/weapon/card/id/science/xenobiologist /decl/hierarchy/outfit/job/science/xenobotanist - name = OUTFIT_JOB_NAME("Xenobotanist") + name = OUTFIT_JOB_NAME(JOB_XENOBOTANIST) uniform = /obj/item/clothing/under/rank/scientist id_type = /obj/item/weapon/card/id/science/xenobotanist - suit = /obj/item/clothing/suit/storage/toggle/labcoat/science \ No newline at end of file + suit = /obj/item/clothing/suit/storage/toggle/labcoat/science diff --git a/code/datums/outfits/outfit_vr.dm b/code/datums/outfits/outfit_vr.dm index 9f0b3c1380..c630b5134a 100644 --- a/code/datums/outfits/outfit_vr.dm +++ b/code/datums/outfits/outfit_vr.dm @@ -109,7 +109,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go /decl/hierarchy/outfit/job/explorer2 - name = OUTFIT_JOB_NAME("Explorer") + name = OUTFIT_JOB_NAME(JOB_EXPLORER) shoes = /obj/item/clothing/shoes/boots/winter/explorer uniform = /obj/item/clothing/under/explorer l_ear = /obj/item/device/radio/headset/explorer @@ -117,7 +117,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go pda_slot = slot_l_store pda_type = /obj/item/device/pda/explorer id_type = /obj/item/weapon/card/id/exploration - id_pda_assignment = "Explorer" + id_pda_assignment = JOB_EXPLORER backpack = /obj/item/weapon/storage/backpack/explorer satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer @@ -140,7 +140,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/medical/sar - name = OUTFIT_JOB_NAME("Field Medic") + name = OUTFIT_JOB_NAME(JOB_FIELD_MEDIC) uniform = /obj/item/clothing/under/utility/blue //suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar shoes = /obj/item/clothing/shoes/boots/winter/explorer @@ -150,14 +150,14 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go pda_slot = slot_l_store pda_type = /obj/item/device/pda/sar id_type = /obj/item/weapon/card/id/exploration/fm - id_pda_assignment = "Field Medic" + id_pda_assignment = JOB_FIELD_MEDIC backpack = /obj/item/weapon/storage/backpack/explorer satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/pathfinder - name = OUTFIT_JOB_NAME("Pathfinder") + name = OUTFIT_JOB_NAME(JOB_PATHFINDER) shoes = /obj/item/clothing/shoes/boots/winter/explorer uniform = /obj/item/clothing/under/explorer //TODO: Uniforms. l_ear = /obj/item/device/radio/headset/pathfinder @@ -165,7 +165,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go pda_slot = slot_l_store pda_type = /obj/item/device/pda/pathfinder id_type = /obj/item/weapon/card/id/exploration/head - id_pda_assignment = "Pathfinder" + id_pda_assignment = JOB_PATHFINDER flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/assistant/explorer diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm index d7f6ac8016..8c14f0b888 100644 --- a/code/datums/supplypacks/medical.dm +++ b/code/datums/supplypacks/medical.dm @@ -191,7 +191,7 @@ access = access_chemistry /datum/supply_pack/med/paramedicgear - name = "Paramedic equipment" + name = JOB_PARAMEDIC + " equipment" contains = list( /obj/item/weapon/storage/belt/medical/emt, /obj/item/device/radio/headset/headset_med, @@ -215,11 +215,11 @@ ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanomed - containername = "Paramedic equipment" + containername = JOB_PARAMEDIC + " equipment" access = access_medical_equip /datum/supply_pack/med/psychiatristgear - name = "Psychiatrist equipment" + name = JOB_PSYCHIATRIST + " equipment" contains = list( /obj/item/clothing/under/rank/psych, /obj/item/device/radio/headset/headset_med, @@ -234,7 +234,7 @@ ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanomed - containername = "Psychiatrist equipment" + containername = JOB_PSYCHIATRIST + " equipment" access = access_psychiatrist /datum/supply_pack/med/medicalscrubs diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index 6d6734b261..71010494d5 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -233,7 +233,7 @@ one_access = TRUE /datum/supply_pack/randomised/misc/explorer_shield - name = "Away Team shield" + name = JOB_EXPLORER + " shield" num_contained = 2 contains = list( /obj/item/weapon/shield/riot/explorer, diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 091bb16d8a..b855cf8830 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -157,7 +157,7 @@ cost = 15 /datum/supply_pack/explorergear - name="Away Team gear" + name= JOB_EXPLORER + " gear" contains = list ( /obj/item/device/cataloguer, /obj/item/device/geiger, @@ -179,7 +179,7 @@ ) cost=25 containertype = /obj/structure/closet/crate/secure/xion - containername = "Away Team equipment" + containername = JOB_EXPLORER + " equipment" access = list(access_eva, access_explorer) /datum/supply_pack/pilotgear @@ -216,7 +216,7 @@ containername = "food cubes" /datum/supply_pack/pathfindergear - name="Away Team Leader gear" + name= JOB_PATHFINDER + " gear" contains = list ( /obj/item/device/cataloguer/compact/pathfinder, /obj/item/device/geiger, @@ -240,5 +240,5 @@ ) cost = 75 containertype = /obj/structure/closet/crate/secure/xion - containername = "Away Team Leader equipment" + containername = JOB_PATHFINDER + " equipment" access = list(access_explorer) diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm index d9768b3de0..9c36a19001 100644 --- a/code/datums/supplypacks/voidsuits.dm +++ b/code/datums/supplypacks/voidsuits.dm @@ -237,7 +237,7 @@ access = null /datum/supply_pack/voidsuits/explorer - name = "Away Team voidsuits" + name = JOB_EXPLORER + " voidsuits" contains = list( /obj/item/clothing/suit/space/void/exploration = 2, /obj/item/clothing/head/helmet/space/void/exploration = 2, @@ -247,11 +247,11 @@ ) cost = 45 containertype = /obj/structure/closet/crate/secure - containername = "Away Team voidsuit crate" + containername = JOB_EXPLORER + "voidsuit crate" access = list(access_eva, access_explorer) /datum/supply_pack/voidsuits/explorer_medic - name = "Away Team Medic voidsuits" + name = JOB_FIELD_MEDIC + " voidsuits" contains = list( /obj/item/clothing/suit/space/void/exploration = 2, /obj/item/clothing/head/helmet/space/void/exploration = 2, @@ -261,7 +261,7 @@ ) cost = 45 containertype = /obj/structure/closet/crate/secure - containername = "Away Team Medic voidsuit crate" + containername = JOB_FIELD_MEDIC + " voidsuit crate" access = access_medical /datum/supply_pack/voidsuits/pilot diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 111467b40b..200041c02d 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -638,7 +638,7 @@ var/global/list/all_objectives = list() return /datum/objective/heist/kidnap/choose_target() - var/list/roles = list(JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR,"Roboticist",JOB_CHEMIST,JOB_ENGINEER) + var/list/roles = list(JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST,JOB_CHEMIST,JOB_ENGINEER) var/list/possible_targets = list() var/list/priority_targets = list() diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 7d71b5b03e..7d261c9aec 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -253,7 +253,7 @@ /var/const/access_qm = 41 /datum/access/qm id = access_qm - desc = "Quartermaster" + desc = JOB_QUARTERMASTER region = ACCESS_REGION_SUPPLY /var/const/access_network = 42 @@ -265,13 +265,13 @@ var/const/access_explorer = 43 /datum/access/explorer id = access_explorer - desc = "Away Team" + desc = JOB_EXPLORER region = ACCESS_REGION_GENERAL /* /var/const/access_pathfinder = 44 /datum/access/pathfinder id = access_pathfinder - desc = "Pathfinder" + desc = JOB_PATHFINDER region = ACCESS_REGION_GENERAL */ @@ -379,7 +379,7 @@ var/const/access_explorer = 43 /var/const/access_psychiatrist = 64 // Psychiatrist's office /datum/access/psychiatrist id = access_psychiatrist - desc = "Psychiatrist's Office" + desc = JOB_PSYCHIATRIST + "'s Office" region = ACCESS_REGION_MEDBAY /var/const/access_xenoarch = 65 diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index 3b5183f7fa..995783448b 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -42,8 +42,8 @@ /datum/alt_title/intern_sci title = "Research Intern" - title_blurb = "A Research Intern attempts to provide whatever the Research department needs. They are not proper Scientists, and are \ - often in training to become a Scientist. A Research Intern has no real authority." + title_blurb = "A Research Intern attempts to provide whatever the Research department needs. They are not proper " + JOB_SCIENTIST + "s, and are \ + often in training to become a " + JOB_SCIENTIST + ". A Research Intern has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/scientist /datum/alt_title/intern_sec @@ -55,13 +55,13 @@ /datum/alt_title/intern_crg title = "Jr. Cargo Tech" title_blurb = "A Jr. Cargo Tech attempts to provide whatever the Cargo department needs. They are not proper Cargo Technicians, and are \ - often in training to become a Cargo Technician. A Jr. Cargo Tech has no real authority." + often in training to become a " + JOB_CARGO_TECHNICIAN + ". A Jr. Cargo Tech has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/cargo /* /datum/alt_title/intern_exp - title = "Jr. Explorer" - title_blurb = "A Jr. Explorer attempts to provide whatever the Exploration department needs. They are not proper Explorers, and are \ - often in training to become an Explorer. A Jr. Explorer has no real authority." + title = "Jr. " + JOB_EXPLORER + "" + title_blurb = "A Jr. " + JOB_EXPLORER + " attempts to provide whatever the Exploration department needs. They are not proper " + JOB_EXPLORER + "s, and are \ + often in training to become an " + JOB_EXPLORER + ". A Jr. " + JOB_EXPLORER + " has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/explorer */ /datum/alt_title/server diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 89a5ac06be..64c75487c8 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -77,7 +77,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) outfit_type = /decl/hierarchy/outfit/job/hop job_description = "The " + JOB_HEAD_OF_PERSONNEL + " manages the Service department, the Exploration team, and most other civilians. They also \ - manage the Supply department, through the Quartermaster. In addition, the " + JOB_HEAD_OF_PERSONNEL + " oversees the personal accounts \ + manage the Supply department, through the " + JOB_QUARTERMASTER + ". In addition, the " + JOB_HEAD_OF_PERSONNEL + " oversees the personal accounts \ of the crew, including their money and access. If necessary, the " + JOB_HEAD_OF_PERSONNEL + " is first in line to assume Acting Command." alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 806a521c4d..a78727eabf 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -85,7 +85,7 @@ // Quartermaster ////////////////////////////////// /datum/job/qm - title = "Quartermaster" + title = JOB_QUARTERMASTER flag = QUARTERMASTER departments = list(DEPARTMENT_CARGO) sorting_order = 1 // QM is above the cargo techs, but below the HoP. @@ -104,7 +104,7 @@ ideal_character_age = 40 outfit_type = /decl/hierarchy/outfit/job/cargo/qm - job_description = "The Quartermaster manages the Supply department, checking cargo orders and ensuring supplies get to where they are needed." + job_description = "The " + JOB_QUARTERMASTER + " manages the Supply department, checking cargo orders and ensuring supplies get to where they are needed." alt_titles = list("Supply Chief" = /datum/alt_title/supply_chief) // Quartermaster Alt Titles @@ -115,20 +115,20 @@ // Cargo Tech ////////////////////////////////// /datum/job/cargo_tech - title = "Cargo Technician" + title = JOB_CARGO_TECHNICIAN flag = CARGOTECH departments = list(DEPARTMENT_CARGO) department_flag = CIVILIAN faction = FACTION_STATION total_positions = 2 spawn_positions = 2 - supervisors = "the Quartermaster and the " + JOB_HEAD_OF_PERSONNEL + 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) outfit_type = /decl/hierarchy/outfit/job/cargo/cargo_tech - job_description = "A Cargo Technician fills and delivers cargo orders. They are encouraged to return delivered crates to the Cargo Shuttle, \ + job_description = "A " + JOB_CARGO_TECHNICIAN + " fills and delivers cargo orders. They are encouraged to return delivered crates to the Cargo Shuttle, \ because Central Command gives a partial refund." ////////////////////////////////// @@ -143,7 +143,7 @@ faction = FACTION_STATION total_positions = 3 spawn_positions = 3 - supervisors = "the Quartermaster and the " + JOB_HEAD_OF_PERSONNEL + 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) diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index d68308c576..e10be1bffc 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -1,6 +1,6 @@ /obj/item/weapon/card/id/medical/sar - assignment = "Field Medic" - rank = "Field Medic" + assignment = JOB_FIELD_MEDIC + rank = JOB_FIELD_MEDIC icon_state = "cyan" primary_color = rgb(47,189,189) secondary_color = rgb(127,223,223) @@ -11,6 +11,7 @@ icon_state = "cyan" primary_color = rgb(47,189,189) secondary_color = rgb(127,223,223) + rank = JOB_EXPLORER /obj/item/weapon/card/id/explorer/head name = "identification card" @@ -18,6 +19,7 @@ icon_state = "cyanGold" primary_color = rgb(47,189,189) secondary_color = rgb(127,223,223) + rank = JOB_PATHFINDER /datum/department/planetside name = DEPARTMENT_PLANET @@ -27,7 +29,7 @@ /datum/job/pathfinder - title = "Pathfinder" + title = JOB_PATHFINDER flag = PATHFINDER departments = list(DEPARTMENT_PLANET) departments_managed = list(DEPARTMENT_PLANET) @@ -46,7 +48,7 @@ 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 Pathfinder's job is to lead and manage expeditions, and is the primary authority on all off-station expeditions." + 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("Expedition Lead" = /datum/alt_title/expedition_lead, "Exploration Manager" = /datum/alt_title/exploration_manager) /datum/alt_title/expedition_lead @@ -59,21 +61,21 @@ return list("Training crew") /datum/job/explorer - title = "Explorer" + title = JOB_EXPLORER flag = EXPLORER departments = list(DEPARTMENT_PLANET) department_flag = MEDSCI faction = FACTION_STATION total_positions = 3 spawn_positions = 3 - supervisors = "the Pathfinder and the " + JOB_HEAD_OF_PERSONNEL + supervisors = "the " + JOB_PATHFINDER + " and the " + JOB_HEAD_OF_PERSONNEL 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) outfit_type = /decl/hierarchy/outfit/job/explorer2 - job_description = "An Explorer searches for interesting things, and returns them to the station." + job_description = "An " + JOB_EXPLORER + " searches for interesting things, and returns them to the station." alt_titles = list("Surveyor" = /datum/alt_title/surveyor, "Offsite Scout" = /datum/alt_title/offsite_scout) /datum/alt_title/surveyor @@ -84,14 +86,14 @@ /datum/job/sar - title = "Field Medic" + title = JOB_FIELD_MEDIC flag = SAR departments = list(DEPARTMENT_PLANET, DEPARTMENT_MEDICAL) department_flag = MEDSCI faction = FACTION_STATION total_positions = 2 spawn_positions = 2 - supervisors = "the Pathfinder and the " + JOB_CHIEF_MEDICAL_OFFICER + supervisors = "the " + JOB_PATHFINDER + " and the " + JOB_CHIEF_MEDICAL_OFFICER selection_color = "#999440" economic_modifier = 6 minimal_player_age = 3 @@ -99,7 +101,7 @@ access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks, access_pilot) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_pilot) outfit_type = /decl/hierarchy/outfit/job/medical/sar - job_description = "A Field medic works as the field doctor of expedition teams." + job_description = "A " + JOB_FIELD_MEDIC + " works as the field doctor of expedition teams." alt_titles = list("Expedition Medic" = /datum/alt_title/expedition_medic, "Offsite Medic" = /datum/alt_title/offsite_medic) /datum/alt_title/expedition_medic diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index b1deec226e..c79890ea15 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -125,7 +125,7 @@ // Geneticist ////////////////////////////////// /datum/job/geneticist - title = "Geneticist" + title = JOB_GENETICIST flag = GENETICIST departments = list(DEPARTMENT_MEDICAL, DEPARTMENT_RESEARCH) department_flag = MEDSCI @@ -139,7 +139,7 @@ minimal_access = list(access_medical, access_morgue, access_genetics, access_research) outfit_type = /decl/hierarchy/outfit/job/medical/geneticist - job_description = "A Geneticist operates genetic manipulation equipment to repair any genetic defects encountered in crew, from cloning or radiation as examples. \ + job_description = "A " + JOB_GENETICIST + " operates genetic manipulation equipment to repair any genetic defects encountered in crew, from cloning or radiation as examples. \ When required, geneticists have the skills to clone, and are the superior choice when available for doing so." */ @@ -147,7 +147,7 @@ // Psychiatrist ////////////////////////////////// /datum/job/psychiatrist - title = "Psychiatrist" + title = JOB_PSYCHIATRIST flag = PSYCHIATRIST departments = list(DEPARTMENT_MEDICAL) department_flag = MEDSCI @@ -160,7 +160,7 @@ 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 Psychiatrist provides mental health services to crew members in need. They may also be called upon to determine whatever \ + 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." alt_titles = list("Psychologist" = /datum/alt_title/psychologist) banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_DIONA) @@ -176,7 +176,7 @@ // Paramedic ////////////////////////////////// /datum/job/paramedic - title = "Paramedic" + title = JOB_PARAMEDIC flag = PARAMEDIC departments = list(DEPARTMENT_MEDICAL) department_flag = MEDSCI @@ -189,7 +189,7 @@ 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 Paramedic is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their own. \ + 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." alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt) banned_job_species = list(SPECIES_DIONA) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 48ff69ea81..92d0ee53b6 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -47,7 +47,7 @@ // Scientist ////////////////////////////////// /datum/job/scientist - title = "Scientist" + title = JOB_SCIENTIST flag = SCIENTIST departments = list(DEPARTMENT_RESEARCH) department_flag = MEDSCI @@ -65,7 +65,7 @@ minimal_player_age = 14 outfit_type = /decl/hierarchy/outfit/job/science/scientist - job_description = "A Scientist is a generalist working in the Research department, with general knowledge of the scientific process, as well as \ + job_description = "A " + JOB_SCIENTIST + " is a generalist working in the Research department, with general knowledge of the scientific process, as well as \ the principles and requirements of Research and Development. They may also formulate experiments of their own devising, if \ they find an appropriate topic." alt_titles = list("Xenoarchaeologist" = /datum/alt_title/xenoarch, "Anomalist" = /datum/alt_title/anomalist, \ @@ -79,7 +79,7 @@ /datum/alt_title/anomalist title = "Anomalist" - title_blurb = "An Anomalist is a Scientist whose expertise is analyzing alien artifacts. They are familar with the most common methods of testing artifact \ + title_blurb = "An Anomalist is a " + JOB_SCIENTIST + " whose expertise is analyzing alien artifacts. They are familar with the most common methods of testing artifact \ function. They work closely with Xenoarchaeologists, or Miners, if either role is present." /datum/alt_title/phoron_research @@ -92,7 +92,7 @@ // Xenobiologist ////////////////////////////////// /datum/job/xenobiologist - title = "Xenobiologist" + title = JOB_XENOBIOLOGIST flag = XENOBIOLOGIST departments = list(DEPARTMENT_RESEARCH) department_flag = MEDSCI @@ -110,15 +110,15 @@ min_age_by_species = list(SPECIES_PROMETHEAN = 2) outfit_type = /decl/hierarchy/outfit/job/science/xenobiologist - job_description = "A Xenobiologist studies esoteric lifeforms, usually in the relative safety of their lab. They attempt to find ways to benefit \ + job_description = "A " + JOB_XENOBIOLOGIST + " studies esoteric lifeforms, usually in the relative safety of their lab. They attempt to find ways to benefit \ from the byproducts of these lifeforms, and their main subject at present is the Giant Slime." /*VR edit start - alt_titles = list("Xenobotanist" = /datum/alt_title/xenobot) + alt_titles = list(JOB_XENOBOTANIST = /datum/alt_title/xenobot) Xenibiologist Alt Titles /datum/alt_title/xenobot - title = "Xenobotanist" - title_blurb = "A Xenobotanist grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \ + title = JOB_XENOBOTANIST + title_blurb = "A " + JOB_XENOBOTANIST + " grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \ is both safe and beneficial to the station, they may choose to introduce it to the rest of the crew." VR edit end*/ @@ -126,7 +126,7 @@ VR edit end*/ // Roboticist ////////////////////////////////// /datum/job/roboticist - title = "Roboticist" + title = JOB_ROBOTICIST flag = ROBOTICIST departments = list(DEPARTMENT_RESEARCH) department_flag = MEDSCI @@ -143,7 +143,7 @@ VR edit end*/ banned_job_species = list("digital") outfit_type = /decl/hierarchy/outfit/job/science/roboticist - job_description = "A Roboticist maintains and repairs the station's synthetics, including crew with prosthetic limbs. \ + job_description = "A " + JOB_ROBOTICIST + " maintains and repairs the station's synthetics, including crew with prosthetic limbs. \ They can also assist the station by producing simple robots and even pilotable exosuits." alt_titles = list("Biomechanical Engineer" = /datum/alt_title/biomech, "Mechatronic Engineer" = /datum/alt_title/mech_tech) diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index e793503fd7..4134c0a94f 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -59,12 +59,12 @@ /datum/alt_title/circuit_designer title = "Circuit Designer" - title_blurb = "A Circuit Designer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ + title_blurb = "A Circuit Designer is a " + JOB_SCIENTIST + " whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ They work to create various useful devices using the capabilities of integrated circuitry." /datum/alt_title/circuit_programmer title = "Circuit Programmer" - title_blurb = "A Circuit Programmer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ + title_blurb = "A Circuit Programmer is a " + JOB_SCIENTIST + " whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ They work to create various useful devices using the capabilities of integrated circuitry." /datum/job/scientist/get_request_reasons() @@ -98,7 +98,7 @@ // Xenobotanist ////////////////////////////////// /datum/job/xenobotanist - title = "Xenobotanist" + title = JOB_XENOBOTANIST flag = XENOBOTANIST departments = list(DEPARTMENT_RESEARCH) department_flag = MEDSCI @@ -115,7 +115,7 @@ minimal_player_age = 14 outfit_type = /decl/hierarchy/outfit/job/science/xenobiologist - job_description = "A Xenobotanist grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \ + job_description = "A " + JOB_XENOBOTANIST + " grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \ are both safe and beneficial to the station, they may choose to introduce it to the rest of the crew." alt_titles = list("Xenohydroponicist" = /datum/alt_title/xenohydroponicist, "Xenoflorist" = /datum/alt_title/xenoflorist) diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index e410ecc816..8f91ad56b8 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -513,7 +513,7 @@ var/list/dispenser_presets = list() req_one_access = list(access_atmospherics) /datum/gear_disp/voidsuit/station/paramedic - name = "Paramedic (Voidsuit)" + 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 diff --git a/code/game/machinery/suit_storage/suit_cycler_units.dm b/code/game/machinery/suit_storage/suit_cycler_units.dm index 82134bc94b..f77cb6d4d1 100644 --- a/code/game/machinery/suit_storage/suit_cycler_units.dm +++ b/code/game/machinery/suit_storage/suit_cycler_units.dm @@ -109,4 +109,4 @@ model_text = "Vintage Master" limit_departments = list( /datum/suit_cycler_choice/department/vintage - ) \ No newline at end of file + ) diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 24214b771f..9d9a8e5d41 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -25,32 +25,32 @@ /obj/effect/landmark/start/medical name = JOB_MEDICAL_DOCTOR /obj/effect/landmark/start/paramedic - name = "Paramedic" + name = JOB_PARAMEDIC /obj/effect/landmark/start/psych - name = "Psychiatrist" + name = JOB_PSYCHIATRIST /obj/effect/landmark/start/rd name = JOB_RESEARCH_DIRECTOR /obj/effect/landmark/start/roboticist - name = "Roboticist" + name = JOB_ROBOTICIST /obj/effect/landmark/start/scientist - name = "Scientist" + name = JOB_SCIENTIST /obj/effect/landmark/start/xenobio - name = "Xenobiologist" + name = JOB_XENOBIOLOGIST /obj/effect/landmark/start/xenobot - name = "Xenobotanist" + name = JOB_XENOBOTANIST /obj/effect/landmark/start/qm - name = "Quartermaster" + name = JOB_QUARTERMASTER /obj/effect/landmark/start/cargo - name = "Cargo Technician" + name = JOB_CARGO_TECHNICIAN /obj/effect/landmark/start/miner name = JOB_SHAFT_MINER /* //VOREStation Removal /obj/effect/landmark/start/pf - name = "Pathfinder" + name = JOB_PATHFINDER /obj/effect/landmark/start/explorer - name = "Explorer" + name = JOB_EXPLORER /obj/effect/landmark/start/fieldmedic - name = "Field Medic" + name = JOB_FIELD_MEDIC */ /obj/effect/landmark/start/bartender name = "Bartender" diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 65c3236d66..43234e7660 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -353,8 +353,8 @@ toysay = "How do I open this display case?" /obj/item/toy/figure/cargotech - name = "Cargo Technician action figure" - desc = "A \"Space Life\" brand Cargo Technician action figure." + name = JOB_CARGO_TECHNICIAN + " action figure" + desc = "A \"Space Life\" brand " + JOB_CARGO_TECHNICIAN + " action figure." icon_state = "cargotech" toysay = "For Cargonia!" @@ -413,8 +413,8 @@ toysay = "Oh god, the engine is gonna go!" /obj/item/toy/figure/geneticist - name = "Geneticist action figure" - desc = "A \"Space Life\" brand Geneticist action figure, which was recently dicontinued." + name = JOB_GENETICIST + " action figure" + desc = "A \"Space Life\" brand " + JOB_GENETICIST + " action figure, which was recently dicontinued." icon_state = "geneticist" toysay = "I'm not qualified for this job." @@ -431,8 +431,8 @@ toysay = "I'm here to win, anything else is secondary." /obj/item/toy/figure/qm - name = "Quartermaster action figure" - desc = "A \"Space Life\" brand Quartermaster action figure." + name = JOB_QUARTERMASTER + " action figure" + desc = "A \"Space Life\" brand " + JOB_QUARTERMASTER + " action figure." icon_state = "qm" toysay = "Hail Cargonia!" @@ -491,14 +491,14 @@ toysay = "Blowing all of the borgs!" /obj/item/toy/figure/roboticist - name = "Roboticist action figure" - desc = "A \"Space Life\" brand Roboticist action figure." + name = JOB_ROBOTICIST + " action figure" + desc = "A \"Space Life\" brand " + JOB_ROBOTICIST + " action figure." icon_state = "roboticist" toysay = "He asked to be borged!" /obj/item/toy/figure/scientist - name = "Scientist action figure" - desc = "A \"Space Life\" brand Scientist action figure." + name = JOB_SCIENTIST + " action figure" + desc = "A \"Space Life\" brand " + JOB_SCIENTIST + " action figure." icon_state = "scientist" toysay = "Someone else must have made those bombs!" @@ -533,8 +533,8 @@ toysay = "The analyzer says you're fine!" /obj/item/toy/figure/paramedic - name = "Paramedic action figure" - desc = "A \"Space Life\" brand Paramedic action figure." + name = JOB_PARAMEDIC + " action figure" + desc = "A \"Space Life\" brand " + JOB_PARAMEDIC + " action figure." icon_state = "paramedic" toysay = "WHERE ARE YOU??" diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index 919809687c..facd4bcebd 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -74,6 +74,7 @@ /obj/item/weapon/card/id/gold/captain name = "Captain's ID" initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold") + rank = JOB_SITE_MANAGER /obj/item/weapon/card/id/gold/captain/spare name = "Spare ID" @@ -93,12 +94,14 @@ rank = JOB_CHEMIST /obj/item/weapon/card/id/medical/geneticist - name = "Geneticist's ID" + name = JOB_GENETICIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-purple") + rank = JOB_GENETICIST /obj/item/weapon/card/id/medical/psych name = "Psychologist's ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-brown") + rank = JOB_PSYCHIATRIST /obj/item/weapon/card/id/medical/virologist name = "Virologist's ID" @@ -107,6 +110,7 @@ /obj/item/weapon/card/id/medical/emt name = "Emergency Medical Technician's ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue") + rank = JOB_PARAMEDIC /obj/item/weapon/card/id/medical/head name = JOB_CHIEF_MEDICAL_OFFICER + "'s ID" @@ -157,18 +161,22 @@ /obj/item/weapon/card/id/science name = "Science ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n") + rank = JOB_SCIENTIST /obj/item/weapon/card/id/science/roboticist - name = "Roboticist's ID" + name = JOB_ROBOTICIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-brown") + rank = JOB_ROBOTICIST /obj/item/weapon/card/id/science/xenobiologist - name = "Xenobiologist's ID" + name = JOB_XENOBIOLOGIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-orange") + rank = JOB_XENOBIOLOGIST /obj/item/weapon/card/id/science/xenobotanist - name = "Xenobotanist's ID" + name = JOB_XENOBOTANIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-green") + rank = JOB_XENOBOTANIST /obj/item/weapon/card/id/science/head name = JOB_RESEARCH_DIRECTOR + "'s ID" @@ -180,6 +188,7 @@ /obj/item/weapon/card/id/cargo name = "Cargo ID" initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n") + rank = JOB_CARGO_TECHNICIAN /obj/item/weapon/card/id/cargo/miner name = "Miner's ID" @@ -187,8 +196,9 @@ rank = JOB_SHAFT_MINER /obj/item/weapon/card/id/cargo/head - name = "Quartermaster's ID" + name = JOB_QUARTERMASTER + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-brown", "stamp-n", "pips-white") + rank = JOB_QUARTERMASTER //Civilian @@ -255,14 +265,17 @@ /obj/item/weapon/card/id/exploration name = "Exploration ID" initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n") + rank = JOB_EXPLORER /obj/item/weapon/card/id/exploration/fm - name = "Field Medic's ID" + name = JOB_FIELD_MEDIC + "'s ID" initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n", "stripe-medblu") + rank = JOB_FIELD_MEDIC /obj/item/weapon/card/id/exploration/head - name = "Pathfinder's ID" + name = JOB_PATHFINDER + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white") + rank = JOB_PATHFINDER //Talon 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 193adcabf9..f2fc4ebe84 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -294,8 +294,8 @@ desc = "A card which represents service and planning." primary_color = rgb(142,94,0) secondary_color = rgb(255,223,127) - assignment = "Quartermaster" - rank = "Quartermaster" + assignment = JOB_QUARTERMASTER + rank = JOB_QUARTERMASTER /obj/item/weapon/card/id/assistant assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant @@ -524,8 +524,8 @@ var/list/jobs_to_icon = list( //ITG only has a few kinds of icons so we have to group them up! "Pilot" = "itg", "Visitor" = "itg", - "Quartermaster" = "itg", - "Cargo Technician" = "itg", + JOB_QUARTERMASTER = "itg", + JOB_CARGO_TECHNICIAN = "itg", JOB_SHAFT_MINER = "itg", "Intern" = "itg", "Talon Pilot" = "itg", @@ -542,17 +542,17 @@ JOB_DETECTIVE = "itg_red", JOB_SECURITY_OFFICER = "itg_red", "Talon Guard" = "itg_red", - "Roboticist" = "itg_purple", - "Scientist" = "itg_purple", - "Xenobiologist" = "itg_purple", - "Xenobotanist" = "itg_purple", - "Pathfinder" = "itg_purple", - "Explorer" = "itg_purple", + JOB_ROBOTICIST = "itg_purple", + JOB_SCIENTIST = "itg_purple", + JOB_XENOBIOLOGIST = "itg_purple", + JOB_XENOBOTANIST = "itg_purple", + JOB_PATHFINDER = "itg_purple", + JOB_EXPLORER = "itg_purple", JOB_CHEMIST = "itg_white", JOB_MEDICAL_DOCTOR = "itg_white", - "Paramedic" = "itg_white", - "Psychiatrist" = "itg_white", - "Field Medic" = "itg_white", + JOB_PARAMEDIC = "itg_white", + JOB_PSYCHIATRIST = "itg_white", + JOB_FIELD_MEDIC = "itg_white", "Talon Doctor" = "itg_white", JOB_ATMOSPHERIC_TECHNICIAN = "itg_orange", JOB_ENGINEER = "itg_orange", diff --git a/code/game/objects/structures/props/swarm.dm b/code/game/objects/structures/props/swarm.dm index 0498674a6f..dd44aad2aa 100644 --- a/code/game/objects/structures/props/swarm.dm +++ b/code/game/objects/structures/props/swarm.dm @@ -14,11 +14,11 @@ /obj/structure/cult/pylon/swarm/CanPass(atom/movable/mover, turf/target) if(istype(mover, /mob/living)) var/mob/living/L = mover - if(L.faction == "swarmer") + if(L.faction == FACTION_SWARMER) return TRUE else if(istype(mover, /obj/item/projectile)) var/obj/item/projectile/P = mover - if(istype(P.firer) && P.firer.faction == "swarmer") + if(istype(P.firer) && P.firer.faction == FACTION_SWARMER) return TRUE return ..() diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index 0fe23f6117..09135d9465 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -100,13 +100,13 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == RANK_RESEARCH) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Scientist") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_SCIENTIST) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_GENETICIST) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) return 1 if(rank == RANK_MEDICAL) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_GENETICIST) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_MEDICAL_DOCTOR) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHEMIST) @@ -132,7 +132,7 @@ var/savefile/Banlistjob if(rank == RANK_GENETIST_RD_CMO) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_GENETICIST) return 1 if(rank == RANK_MD_CMO) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) @@ -140,7 +140,7 @@ var/savefile/Banlistjob return 1 if(rank == RANK_SCIENTIST_RD) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Scientist") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_SCIENTIST) return 1 if(rank == RANK_AI_CYBORG) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 26d8f9549d..ad01729a91 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -193,15 +193,15 @@ corpseidaccess = "Clown" /obj/effect/landmark/corpse/scientist - name = "Scientist" + name = JOB_SCIENTIST corpseradio = /obj/item/device/radio/headset/headset_sci corpseuniform = /obj/item/clothing/under/rank/scientist corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat/science corpseback = /obj/item/weapon/storage/backpack corpseshoes = /obj/item/clothing/shoes/white corpseid = 1 - corpseidjob = "Scientist" - corpseidaccess = "Scientist" + corpseidjob = JOB_SCIENTIST + corpseidaccess = JOB_SCIENTIST /obj/effect/landmark/corpse/security name = JOB_SECURITY_OFFICER diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 8674cc7a95..2703eab5dc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -250,7 +250,7 @@ /datum/gear/accessory/stethoscope display_name = "stethoscope" path = /obj/item/clothing/accessory/stethoscope - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic","Talon Doctor") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC,"Talon Doctor") /datum/gear/accessory/locket display_name = "locket" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 3695a1c5c7..5fc1db4360 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -91,7 +91,7 @@ display_name = "Medical HUD selector" description = "Select from a range of Medical HUD eyepieces that can display the health status of people in line of sight." path = /obj/item/clothing/glasses/hud/health - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) /datum/gear/eyes/medical/New() ..() @@ -117,7 +117,7 @@ display_name = "Optical Meson Scanners selection" description = "Select from a range of meson-projection eyewear. Note: not all of these items are atmospherically sealed." path = /obj/item/clothing/glasses/meson - allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, "Scientist", JOB_RESEARCH_DIRECTOR) + allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, JOB_SCIENTIST, JOB_RESEARCH_DIRECTOR) /datum/gear/eyes/meson/New() ..() @@ -133,7 +133,7 @@ /datum/gear/eyes/material display_name = "Optical Material Scanners" path = /obj/item/clothing/glasses/material - allowed_roles = list(JOB_SHAFT_MINER,"Quartermaster") + allowed_roles = list(JOB_SHAFT_MINER,JOB_QUARTERMASTER) /datum/gear/eyes/glasses/fakesun display_name = "Sunglasses, stylish" @@ -147,7 +147,7 @@ display_name = "functional sunglasses selector" description = "Select from a range of polarized sunglasses that can block flashes whilst still looking classy." path = /obj/item/clothing/glasses/sunglasses - allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,"Quartermaster","Internal Affairs Agent",JOB_DETECTIVE) + allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_QUARTERMASTER,"Internal Affairs Agent",JOB_DETECTIVE) /datum/gear/eyes/sun/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index 6cff06216d..b8d8a09518 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -1,5 +1,5 @@ /datum/gear/eyes/medical - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) /datum/gear/eyes/arglasses display_name = "AR glasses" @@ -24,7 +24,7 @@ /datum/gear/eyes/arglasses/sci display_name = "AR-Research glasses" path = /obj/item/clothing/glasses/omnihud/rnd - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist","Xenobiologist","Xenobotanist","Roboticist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ROBOTICIST) /datum/gear/eyes/arglasses/eng display_name = "AR-Engineering glasses" @@ -34,7 +34,7 @@ /datum/gear/eyes/arglasses/med display_name = "AR-Medical glasses" path = /obj/item/clothing/glasses/omnihud/med - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) /datum/gear/eyes/arglasses/all display_name = "AR-Command glasses" diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 5ea00ebb42..b5c3c8731a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -449,7 +449,7 @@ slot = slot_wear_suit ckeywhitelist = list("flaktual") character_name = list("Yikatihaki") - allowed_roles = list("Explorer") + allowed_roles = list(JOB_EXPLORER) /datum/gear/fluff/suit/storage/flintlock path = /obj/item/clothing/suit/storage/flintlock @@ -777,7 +777,7 @@ display_name = "Kenzie's Hypospray" ckeywhitelist = list("lm40") character_name = list("Kenzie Houser") - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC) /datum/gear/fluff/brianna_backpack path = /obj/item/weapon/storage/backpack/messenger/black/fluff/briana @@ -792,7 +792,7 @@ description = "A Hull Systems Omni-Tool capable of temporarily shrinking to handheld sizes for even the most delicate work." ckeywhitelist = list("lewzharri") character_name = list ("Kovgam Zharri") - allowed_roles = list("Roboticist",JOB_ENGINEER,"Scientist","Xenobiologist","Xenobotanist",JOB_RESEARCH_DIRECTOR) + allowed_roles = list(JOB_ROBOTICIST,JOB_ENGINEER,JOB_SCIENTIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_RESEARCH_DIRECTOR) // M CKEYS /datum/gear/fluff/phi_box @@ -1007,7 +1007,7 @@ display_name = "Tiemli's Welding Goggles" ckeywhitelist = list("radiantaurora") character_name = list("Tiemli Kroto") - allowed_roles = list("Roboticist") + allowed_roles = list(JOB_ROBOTICIST) /datum/gear/fluff/clara_flask path = /obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask @@ -1297,7 +1297,7 @@ /datum/gear/fluff/lovec_gasmask path = /obj/item/clothing/mask/gas/explorer - display_name = "Explorer's Gas Mask" + display_name = JOB_EXPLORER + "'s Gas Mask" ckeywhitelist = list("thenewmeta") character_name = list("Lovec") @@ -1505,7 +1505,7 @@ slot = slot_glasses ckeywhitelist = list("wickedtemp") character_name = list("Chakat Tempest Venosare") - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic", "Off-duty Medic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, "Off-duty Medic") /datum/gear/fluff/tempest_hypospray path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest @@ -1513,7 +1513,7 @@ slot = slot_belt ckeywhitelist = list("wickedtemp") character_name = list("Chakat Tempest Venosare") - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic", "Off-duty Medic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, "Off-duty Medic") /datum/gear/fluff/tempest_backpack path = /obj/item/weapon/storage/backpack/saddlebag/tempest diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index b5587490fd..ef8cc30cac 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -288,7 +288,7 @@ description = "Select from a range of welding masks (engineering crew/roboticists only)" path = /obj/item/clothing/head/welding cost = 2 - allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_RESEARCH_DIRECTOR,"Roboticist") + allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST) /datum/gear/head/welding/New() ..() @@ -394,7 +394,7 @@ /datum/gear/head/med_hat_selector display_name = "Medical - Basic Headwear" description = "Select from a range of hats available to all Medical personnel." - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC) path = /obj/item/clothing/head/soft/med /datum/gear/head/med_hat_selector/New() diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 41fdf40698..9ec7bce52a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -228,7 +228,7 @@ /datum/gear/shoes/boots/winter/medical display_name = "medical winter boots" path = /obj/item/clothing/shoes/boots/winter/medical - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) /datum/gear/shoes/boots/winter/mining display_name = "mining winter boots" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index b717692ea5..14067920d2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -159,7 +159,7 @@ /datum/gear/suit/labcoat_emt display_name = "labcoat, EMT" path = /obj/item/clothing/suit/storage/toggle/labcoat/emt - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) /datum/gear/suit/labcoat_rd display_name = "labcoat, research director" @@ -284,7 +284,7 @@ /datum/gear/suit/roles/cloak_qm display_name = "cloak, quartermaster" path = /obj/item/clothing/accessory/poncho/roles/cloak/qm - allowed_roles = list("Quartermaster") + allowed_roles = list(JOB_QUARTERMASTER) show_roles = FALSE cost = 1 @@ -380,13 +380,13 @@ /datum/gear/suit/qm_coat display_name = "coat, quartermaster" path = /obj/item/clothing/suit/storage/qm - allowed_roles = list("Quartermaster") + allowed_roles = list(JOB_QUARTERMASTER) show_roles = FALSE /datum/gear/suit/cargo_coat display_name = "coat, cargo tech" path = /obj/item/clothing/suit/storage/cargo - allowed_roles = list("Quartermaster",JOB_SHAFT_MINER,"Cargo Technician",JOB_HEAD_OF_PERSONNEL) + allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER,JOB_CARGO_TECHNICIAN,JOB_HEAD_OF_PERSONNEL) show_roles = FALSE // winter coats go here @@ -421,13 +421,13 @@ /datum/gear/suit/wintercoat/medical display_name = "winter coat, medical" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) show_roles = FALSE /datum/gear/suit/wintercoat/medical/alt display_name = "winter coat, medical alt" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) show_roles = FALSE /datum/gear/suit/wintercoat/medical/viro @@ -439,7 +439,7 @@ /datum/gear/suit/wintercoat/medical/para display_name = "winter coat, paramedic" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/para - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,"Paramedic") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC) show_roles = FALSE /datum/gear/suit/wintercoat/medical/chemist @@ -457,19 +457,19 @@ /datum/gear/suit/wintercoat/medical/sar display_name = "winter coat, search and rescue" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC) show_roles = FALSE /datum/gear/suit/wintercoat/science display_name = "winter coat, science" path = /obj/item/clothing/suit/storage/hooded/wintercoat/science - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST) show_roles = FALSE /datum/gear/suit/wintercoat/science/robotics display_name = "winter coat, robotics" path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics - allowed_roles = list(JOB_RESEARCH_DIRECTOR, "Roboticist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR, JOB_ROBOTICIST) show_roles = FALSE /datum/gear/suit/wintercoat/science/rd @@ -499,13 +499,13 @@ /datum/gear/suit/wintercoat/hydro display_name = "winter coat, hydroponics" path = /obj/item/clothing/suit/storage/hooded/wintercoat/hydro - allowed_roles = list("Botanist", "Xenobotanist") + allowed_roles = list("Botanist", JOB_XENOBOTANIST) show_roles = FALSE /datum/gear/suit/wintercoat/cargo display_name = "winter coat, cargo" path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo - allowed_roles = list("Quartermaster","Cargo Technician") + allowed_roles = list(JOB_QUARTERMASTER,JOB_CARGO_TECHNICIAN) show_roles = FALSE /datum/gear/suit/wintercoat/miner @@ -517,7 +517,7 @@ /datum/gear/suit/wintercoat/cargo/qm display_name = "winter coat, quartermaster" path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo/qm - allowed_roles = list("Quartermaster") + allowed_roles = list(JOB_QUARTERMASTER) show_roles = FALSE /datum/gear/suit/wintercoat/bar @@ -668,13 +668,13 @@ /datum/gear/suit/snowsuit/medical display_name = "snowsuit, medical" path = /obj/item/clothing/suit/storage/snowsuit/medical - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist", "Search and Rescue") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST, "Search and Rescue") show_roles = FALSE /datum/gear/suit/snowsuit/science display_name = "snowsuit, science" path = /obj/item/clothing/suit/storage/snowsuit/science - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST) show_roles = FALSE /datum/gear/suit/snowsuit/engineering @@ -686,7 +686,7 @@ /datum/gear/suit/snowsuit/cargo display_name = "snowsuit, supply" path = /obj/item/clothing/suit/storage/snowsuit/cargo - allowed_roles = list("Quartermaster",JOB_SHAFT_MINER,"Cargo Technician",JOB_HEAD_OF_PERSONNEL) + allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER,JOB_CARGO_TECHNICIAN,JOB_HEAD_OF_PERSONNEL) show_roles = FALSE /datum/gear/suit/miscellaneous/cardigan diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 3e169a37bb..8d84ba744c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -1,5 +1,5 @@ /datum/gear/suit/snowsuit/medical - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) /datum/gear/suit/labcoat_colorable display_name = "labcoat, colorable" @@ -73,7 +73,7 @@ /datum/gear/suit/paramedic_coat display_name = "paramedic outerwear selection" path = /obj/item/clothing/suit/storage/toggle/fr_jacket - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Paramedic",JOB_MEDICAL_DOCTOR) + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC,JOB_MEDICAL_DOCTOR) /datum/gear/suit/paramedic_coat/New() ..() @@ -112,12 +112,12 @@ Talon winter coat /datum/gear/suit/armor/combat/crusader_explo display_name = "knight, explo" path = /obj/item/clothing/suit/armor/combat/crusader_explo - //allowed_roles = list("Explorer","Pathfinder") + //allowed_roles = list(JOB_EXPLORER,JOB_PATHFINDER) /datum/gear/suit/armor/combat/crusader_explo/FM display_name = "knight, Field Medic" path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM - allowed_roles = list ("Paramedic") + allowed_roles = list (JOB_PARAMEDIC) //Long fur coat /datum/gear/suit/russofurcoat diff --git a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm index e4562e5e74..203033d4e8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm @@ -313,9 +313,9 @@ //Cargo /datum/gear/uniform/quartermaster_selector - display_name = "Cargo - Quartermaster's Uniforms" - description = "Select from a range of outfits available to all Quartermasters." - allowed_roles = list("Quartermaster") + display_name = "Cargo - " + JOB_QUARTERMASTER + "'s Uniforms" + description = "Select from a range of outfits available to all " + JOB_QUARTERMASTER + "s." + allowed_roles = list(JOB_QUARTERMASTER) show_roles = FALSE path = /obj/item/clothing/under/rank/cargo/jeans sort_category = "Uniforms" @@ -347,7 +347,7 @@ /datum/gear/uniform/cargo_general_selector display_name = "Cargo - Basic Uniforms" description = "Select from a range of outfits available to all Cargo personnel." - allowed_roles = list("Cargo Technician",JOB_SHAFT_MINER,"Quartermaster") + allowed_roles = list(JOB_CARGO_TECHNICIAN,JOB_SHAFT_MINER,JOB_QUARTERMASTER) show_roles = FALSE path = /obj/item/clothing/under/rank/cargotech/jeans sort_category = "Uniforms" @@ -376,7 +376,7 @@ /datum/gear/uniform/cargo_miner_selector display_name = "Cargo - Miner's Uniforms" description = "Select from a range of outfits available to all Mining personnel." - allowed_roles = list(JOB_SHAFT_MINER,"Quartermaster","Talon Miner") + allowed_roles = list(JOB_SHAFT_MINER,JOB_QUARTERMASTER,"Talon Miner") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_miner sort_category = "Uniforms" @@ -468,7 +468,7 @@ /datum/gear/uniform/medical_selector display_name = "Medical - Basic Uniforms" description = "Select from a range of outfits available to all Medical personnel." - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic","Talon Doctor") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC,"Talon Doctor") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_med sort_category = "Uniforms" @@ -519,9 +519,9 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/uniform/paramedic_selector - display_name = "Medical - Paramedic's Uniforms" - description = "Select from a range of outfits available to all Paramedics." - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,"Paramedic","Talon Doctor") + display_name = "Medical - " + JOB_PARAMEDIC + "'s Uniforms" + description = "Select from a range of outfits available to all " + JOB_PARAMEDIC + "s." + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC,"Talon Doctor") show_roles = FALSE path = /obj/item/clothing/under/rank/paramedunidark sort_category = "Uniforms" @@ -599,7 +599,7 @@ /datum/gear/uniform/science_dept_selector display_name = "Science - Basic Uniforms" description = "Select from a range of outfits available to all Science personnel." - allowed_roles = list("Scientist",JOB_RESEARCH_DIRECTOR,"Roboticist","Xenobiologist","Xenobotanist") + allowed_roles = list(JOB_SCIENTIST,JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST) show_roles = FALSE path = /obj/item/clothing/under/rank/neo_science sort_category = "Uniforms" @@ -622,9 +622,9 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/uniform/science_robotics_selector - display_name = "Science - Roboticist's Uniforms" - description = "Select from a range of outfits available to all Roboticists." - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Roboticist") + display_name = "Science - " + JOB_ROBOTICIST + "'s Uniforms" + description = "Select from a range of outfits available to all " + JOB_ROBOTICIST + "s." + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST) show_roles = FALSE path = /obj/item/clothing/under/rank/neo_robo sort_category = "Uniforms" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 4b6ba95411..d40ea6cf6e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -20,7 +20,7 @@ /datum/gear/suit/job_fed/medsci display_name = "fed uniform, med/sci" path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Paramedic","Geneticist",JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist","Xenobotanist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST,JOB_XENOBOTANIST) /datum/gear/suit/job_fed/eng display_name = "fed uniform, eng" @@ -32,8 +32,8 @@ display_name = "DS9 Overcoat (use uniform)" path = /obj/item/clothing/suit/storage/trek/ds9 allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR, - JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Paramedic","Geneticist", - "Scientist","Roboticist","Xenobiologist","Xenobotanist",JOB_ATMOSPHERIC_TECHNICIAN, + JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, + JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) /* diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index 90910a1b74..4fcb85c9a8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -35,7 +35,7 @@ /datum/gear/utility/dufflebag/med display_name = "medical dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/med - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist","Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_PSYCHIATRIST) /datum/gear/utility/dufflebag/med/emt display_name = "EMT dufflebag" @@ -54,7 +54,7 @@ /datum/gear/utility/dufflebag/sci display_name = "science dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/sci - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist","Roboticist","Xenobiologist","Xenobotanist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST) /datum/gear/utility/dufflebag/explorer display_name = "away team dufflebag" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 33b8f97882..198992d855 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -199,17 +199,17 @@ /datum/gear/uniform/dept/undercoat/qm display_name = "quartermaster undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/qm - allowed_roles = list("Quartermaster") + allowed_roles = list(JOB_QUARTERMASTER) /datum/gear/uniform/dept/undercoat/cargo display_name = "cargo undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/cargo - allowed_roles = list("Cargo Technician","Quartermaster",JOB_SHAFT_MINER) + allowed_roles = list(JOB_CARGO_TECHNICIAN,JOB_QUARTERMASTER,JOB_SHAFT_MINER) /datum/gear/uniform/dept/undercoat/mining display_name = "mining undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/mining - allowed_roles = list("Quartermaster",JOB_SHAFT_MINER) + allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER) /datum/gear/uniform/dept/undercoat/security display_name = "security undercoat (Teshari)" @@ -234,17 +234,17 @@ /datum/gear/uniform/dept/undercoat/research display_name = "scientist undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/sci - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST) /datum/gear/uniform/dept/undercoat/robo display_name = "roboticist undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/robo - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Roboticist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST) /datum/gear/uniform/dept/undercoat/medical display_name = "medical undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/medical - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Paramedic","Geneticist","Psychiatrist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_PSYCHIATRIST) /datum/gear/uniform/dept/undercoat/chemistry display_name = "chemist undercoat (Teshari)" @@ -259,12 +259,12 @@ /datum/gear/uniform/dept/undercoat/psych display_name = "psychiatrist undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/psych - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Psychiatrist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PSYCHIATRIST) /datum/gear/uniform/dept/undercoat/paramedic display_name = "paramedic undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/para - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC) /datum/gear/uniform/dept/undercoat/iaa display_name = "internal affairs undercoat (Teshari)" @@ -345,7 +345,7 @@ /datum/gear/suit/dept/cloak/cargo display_name = "cargo cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo - allowed_roles = list("Quartermaster",JOB_SHAFT_MINER,"Cargo Technician") + allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER,JOB_CARGO_TECHNICIAN) /datum/gear/suit/dept/cloak/cargo/New() ..() @@ -358,7 +358,7 @@ /datum/gear/suit/dept/cloak/mining display_name = "mining cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/mining - allowed_roles = list("Quartermaster",JOB_SHAFT_MINER) + allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER) /datum/gear/suit/dept/cloak/mining/New() ..() @@ -423,7 +423,7 @@ /datum/gear/suit/dept/cloak/research display_name = "scientist cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sci - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist","Roboticist","Xenobiologist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST) /datum/gear/suit/dept/cloak/research/New() ..() @@ -436,7 +436,7 @@ /datum/gear/suit/dept/cloak/robo display_name = "roboticist cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/robo - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Roboticist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST) /datum/gear/suit/dept/cloak/robo/New() ..() @@ -449,7 +449,7 @@ /datum/gear/suit/dept/cloak/medical display_name = "medical cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/medical - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST) /datum/gear/suit/dept/cloak/medical/New() ..() @@ -488,12 +488,12 @@ /datum/gear/suit/dept/cloak/psych display_name = "psychiatrist cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/psych - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Psychiatrist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PSYCHIATRIST) /datum/gear/suit/dept/cloak/paramedic display_name = "paramedic cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/para - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC) /datum/gear/suit/dept/cloak/paramedic/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm index 20a440ab15..3fdf1ec61f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -2,10 +2,10 @@ ///// /datum/gear/suit/dept/cloak/research - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST) /datum/gear/uniform/dept/undercoat/research - allowed_roles = list(JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") + allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST) ///// diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 92c9d44eed..7c5983b979 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -380,7 +380,7 @@ /obj/item/clothing/suit/space/void/exploration name = "exploration voidsuit" - desc = "A hazard and radiation resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments." + desc = "A hazard and radiation resistant voidsuit, featuring the " + JOB_EXPLORER + " emblem on its chest plate. Designed for exploring unknown planetary environments." icon_state = "void_explorer" item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black") armor = list(melee = 50, bullet = 15, laser = 35, energy = 25, bomb = 30, bio = 100, rad = 70) @@ -402,7 +402,7 @@ /obj/item/clothing/suit/space/void/expedition_medical name = "field medic voidsuit" - desc = "A hazard and radiation resistant voidsuit, featuring the Explorer emblem and a green cross on its chest plate. Seems to be a little lighter and more flexible than the regular explorer issue." + desc = "A hazard and radiation resistant voidsuit, featuring the " + JOB_EXPLORER + " emblem and a green cross on its chest plate. Seems to be a little lighter and more flexible than the regular explorer issue." icon_state = "void_exp_medic" item_state_slots = list(slot_r_hand_str = "skrell_suit_black", slot_l_hand_str = "skrell_suit_black") armor = list(melee = 50, bullet = 15, laser = 25, energy = 15, bomb = 30, bio = 100, rad = 90) diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm index f2908427dd..323ac8d690 100644 --- a/code/modules/clothing/suits/aliens/teshari.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -114,7 +114,7 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/qm name = "quartermaster cloak" - desc = "A soft Teshari cloak made for the Quartermaster" + desc = "A soft Teshari cloak made for the " + JOB_QUARTERMASTER icon_state = "tesh_cloak_qm" /obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo @@ -168,12 +168,12 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/para name = "paramedic cloak" - desc = "A soft Teshari cloak made for the Paramedic" + desc = "A soft Teshari cloak made for the " + JOB_PARAMEDIC icon_state = "tesh_cloak_para" /obj/item/clothing/suit/storage/teshari/cloak/jobs/psych name = " psychiatrist cloak" - desc = "A soft Teshari cloak made for the Psychiatrist" + desc = "A soft Teshari cloak made for the " + JOB_PSYCHIATRIST icon_state = "tesh_cloak_psych" //Science @@ -190,7 +190,7 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/robo name = "roboticist cloak" - desc = "A soft Teshari cloak made for the Roboticist" + desc = "A soft Teshari cloak made for the " + JOB_ROBOTICIST icon_state = "tesh_cloak_robo" //Security @@ -659,7 +659,7 @@ /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/para name = "paramedic belted cloak" - desc = "A soft Teshari cloak made for the Paramedic" + desc = "A soft Teshari cloak made for the " + JOB_PARAMEDIC icon_state = "tesh_beltcloak_para" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sci @@ -669,7 +669,7 @@ /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/robo name = "roboticist belted cloak" - desc = "A soft Teshari cloak made for the Roboticist" + desc = "A soft Teshari cloak made for the " + JOB_ROBOTICIST icon_state = "tesh_beltcloak_robo" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sec @@ -679,7 +679,7 @@ /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/qm name = "quartermaster belted cloak" - desc = "A soft Teshari cloak made for the Quartermaster" + desc = "A soft Teshari cloak made for the " + JOB_QUARTERMASTER icon_state = "tesh_beltcloak_qm" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/service diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 5d92e3ebfc..47ab702f48 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -70,7 +70,7 @@ item_state_slots = list(slot_r_hand_str = "cmo_labcoat", slot_l_hand_str = "cmo_labcoat") /obj/item/clothing/suit/storage/toggle/labcoat/genetics - name = "Geneticist labcoat" + name = JOB_GENETICIST + " labcoat" desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." icon_state = "labcoat_gen" item_state_slots = list(slot_r_hand_str = "genetics_labcoat", slot_l_hand_str = "genetics_labcoat") @@ -89,13 +89,13 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0) /obj/item/clothing/suit/storage/toggle/labcoat/roboticist - name = "Roboticist labcoat" + name = JOB_ROBOTICIST + " labcoat" desc = "More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads." icon_state = "labcoat_robo" item_state_slots = list(slot_r_hand_str = "labcoat", slot_l_hand_str = "labcoat") /obj/item/clothing/suit/storage/toggle/labcoat/science - name = "Scientist labcoat" + name = JOB_SCIENTIST + " labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." icon_state = "labcoat_tox" item_state_slots = list(slot_r_hand_str = "science_labcoat", slot_l_hand_str = "science_labcoat") diff --git a/code/modules/clothing/under/xenos/teshari.dm b/code/modules/clothing/under/xenos/teshari.dm index 4cabe3d2c9..88f1de2fc0 100644 --- a/code/modules/clothing/under/xenos/teshari.dm +++ b/code/modules/clothing/under/xenos/teshari.dm @@ -262,7 +262,7 @@ /obj/item/clothing/under/teshari/undercoat/jobs/qm name = "quartermaster undercoat" - desc = "A traditional Teshari garb made for the Quartermaster" + desc = "A traditional Teshari garb made for the " + JOB_QUARTERMASTER icon_state = "tesh_uniform_qm" /obj/item/clothing/under/teshari/undercoat/jobs/cargo @@ -292,12 +292,12 @@ /obj/item/clothing/under/teshari/undercoat/jobs/psych name = "psychiatrist undercoat" - desc = "A traditional Teshari garb made for the Psychiatrist" + desc = "A traditional Teshari garb made for the " + JOB_PSYCHIATRIST icon_state = "tesh_uniform_psych" /obj/item/clothing/under/teshari/undercoat/jobs/para name = "paramedic undercoat" - desc = "A traditional Teshari garb made for the Paramedic" + desc = "A traditional Teshari garb made for the " + JOB_PARAMEDIC icon_state = "tesh_uniform_para" /obj/item/clothing/under/teshari/undercoat/jobs/sci @@ -307,7 +307,7 @@ /obj/item/clothing/under/teshari/undercoat/jobs/robo name = "roboticist undercoat" - desc = "A traditional Teshari garb made for the Roboticist" + desc = "A traditional Teshari garb made for the " + JOB_ROBOTICIST icon_state = "tesh_uniform_robo" /obj/item/clothing/under/teshari/undercoat/jobs/sec diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index e1f0f18c48..98f2a66802 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -62,8 +62,8 @@ var/list/event_last_fired = list() possibleEvents[/datum/event/rogue_drone] = 5 + 25 * active_with_role[JOB_ENGINEER] + 25 * active_with_role["Security"] possibleEvents[/datum/event/infestation] = 100 + 100 * active_with_role["Janitor"] - possibleEvents[/datum/event/communications_blackout] = 50 + 25 * active_with_role["AI"] + active_with_role["Scientist"] * 25 - possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role[JOB_ENGINEER] * 10 + active_with_role["Scientist"] * 5 + possibleEvents[/datum/event/communications_blackout] = 50 + 25 * active_with_role["AI"] + active_with_role[JOB_SCIENTIST] * 25 + possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role[JOB_ENGINEER] * 10 + active_with_role[JOB_SCIENTIST] * 5 possibleEvents[/datum/event/grid_check] = 25 + 10 * active_with_role[JOB_ENGINEER] possibleEvents[/datum/event/electrical_storm] = 15 * active_with_role["Janitor"] + 5 * active_with_role[JOB_ENGINEER] possibleEvents[/datum/event/wallrot] = 30 * active_with_role[JOB_ENGINEER] + 50 * active_with_role["Gardener"] @@ -182,7 +182,7 @@ var/list/event_last_fired = list() active_with_role[JOB_ENGINEER] = 0 active_with_role["Medical"] = 0 active_with_role["Security"] = 0 - active_with_role["Scientist"] = 0 + active_with_role[JOB_SCIENTIST] = 0 active_with_role["AI"] = 0 active_with_role["Cyborg"] = 0 active_with_role["Janitor"] = 0 @@ -204,7 +204,7 @@ var/list/event_last_fired = list() else if(istype(R.module, /obj/item/weapon/robot_module/robot/medical)) active_with_role["Medical"]++ else if(istype(R.module, /obj/item/weapon/robot_module/robot/research)) - active_with_role["Scientist"]++ + active_with_role[JOB_SCIENTIST]++ else if(istype(R.module, /obj/item/weapon/robot_module/robot/janitor)) active_with_role["Janitor"]++ else if(istype(R.module, /obj/item/weapon/robot_module/robot/clerical/butler)) @@ -220,7 +220,7 @@ var/list/event_last_fired = list() active_with_role["Security"]++ if(M.mind.assigned_role in SSjob.get_job_titles_in_department(DEPARTMENT_RESEARCH)) - active_with_role["Scientist"]++ + active_with_role[JOB_SCIENTIST]++ if(M.mind.assigned_role == "AI") active_with_role["AI"]++ diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 802235b18b..6402a20f94 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -8,8 +8,8 @@ var/list/dreams = list( "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", "the " + JOB_HEAD_OF_PERSONNEL,"the " + JOB_HEAD_OF_SECURITY,"the " + JOB_CHIEF_ENGINEER,"the " + JOB_RESEARCH_DIRECTOR,"the " + JOB_CHIEF_MEDICAL_OFFICER, "the " + JOB_DETECTIVE,"the " + JOB_WARDEN,"an Internal Affairs Agent","an " + JOB_ENGINEER,"the Janitor","the " + JOB_ATMOSPHERIC_TECHNICIAN, - "the Quartermaster","a Cargo Technician","the Botanist","a " + JOB_SHAFT_MINER,"the Psychologist","the " + JOB_CHEMIST,"a Geneticist", - "the Virologist","the Roboticist","the Chef","the Bartender","the Chaplain","the Librarian","a mouse","an ERT member", + "the " +JOB_QUARTERMASTER,"a " + JOB_CARGO_TECHNICIAN,"the Botanist","a " + JOB_SHAFT_MINER,"the Psychologist","the " + JOB_CHEMIST,"a " + JOB_GENETICIST, + "the Virologist","the " + JOB_ROBOTICIST,"the Chef","the Bartender","the Chaplain","the Librarian","a mouse","an ERT member", "a beach","the holodeck","a smoky room","a voice","the cold","a mouse","an operating table","the bar","the rain","a Skrell", "an Unathi","a Tajaran","the Station Intelligence core","the mining station","the research station","a beaker of strange liquid", "a Teshari", "a Diona nymph","the supermatter","Major Bill","a Morpheus ship with a ridiculous name","the Exodus","a star", diff --git a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm index ee7c4becf3..e979297755 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm @@ -6,7 +6,7 @@ /obj/machinery/smartfridge/seeds expert_job = "Botanist" /obj/machinery/smartfridge/secure/extract - expert_job = "Xenobiologist" + expert_job = JOB_XENOBIOLOGIST /obj/machinery/smartfridge/secure/medbay expert_job = JOB_CHEMIST /obj/machinery/smartfridge/secure/chemistry diff --git a/code/modules/games/cah_white_cards.dm b/code/modules/games/cah_white_cards.dm index 85269ba2c9..9333ea6aee 100644 --- a/code/modules/games/cah_white_cards.dm +++ b/code/modules/games/cah_white_cards.dm @@ -65,7 +65,7 @@ "Waking up naked in the maintenance tunnels", "Horrible cloning accidents", "Licking the supermatter due to a dare", - "A Quartermaster who WON'T STOP ordering guns", + "A " + JOB_QUARTERMASTER + " who WON'T STOP ordering guns", "Teaching a synthetic the Birds and the Bees", "Unnecessary surgery", "My addiction to spiders", diff --git a/code/modules/lore_codex/legal_code_data/sif_law.dm b/code/modules/lore_codex/legal_code_data/sif_law.dm index 24fa475f3f..cea1401378 100644 --- a/code/modules/lore_codex/legal_code_data/sif_law.dm +++ b/code/modules/lore_codex/legal_code_data/sif_law.dm @@ -93,7 +93,7 @@ suggested_punishments = "200 thaler fine. Give Drone a temporary paper stating that it is a drone, if the ID was lost. Fax VirGov. Inform owner of \ Drone if possible. Instruct Drone to obtain new ID at its earliest opportunity, if it was lost." notes = "This is only applicable to Drone intelligences which possess autonomous capability. It must be proven that the offender is a Drone, which can be \ - accomplished in various ways, generally with the expertise of a Roboticist. Lawbound synthetics, maintenance drones, and \ + accomplished in various ways, generally with the expertise of a " + JOB_ROBOTICIST + ". Lawbound synthetics, maintenance drones, and \ simple bots do not require an ID card. No fine or VirGov fax should be sent if the Drone's ID was lost due to theft and the ID is able to be recovered." mandated = TRUE @@ -205,7 +205,7 @@ definition = "Creating an intelligence from an codeline that has not been registered with, or audited by, the Emergent Intelligence Oversight (EIO)." suggested_punishments = "Decommissioning of the newly created Drone. Investigation of Drone to determine level of intelligence, if possible. \ Hold until Transfer for the creator." - notes = "It must be proven that the Drone is in fact a Drone, which can be accomplished in various ways, generally with the expertise of a Roboticist. \ + notes = "It must be proven that the Drone is in fact a Drone, which can be accomplished in various ways, generally with the expertise of a " + JOB_ROBOTICIST + ". \ It must also be proven that the Drone's codeline is also unregistered. Intelligences produced from a Maintenance Drone Fabricator, \ the Research department, and through other regular means are by default already registered. Very simple machines such as securitrons do not require registration.\

\ diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm index 5267ceb348..47c99f1b4f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm @@ -893,7 +893,7 @@ I think I covered everything. /mob/living/simple_mob/vore/bigdragon/do_tame(var/obj/O, var/mob/user) if(!user) return - if(faction == "neutral") + if(faction == FACTION_NEUTRAL) return //We're already friendly if(enraged || notame) say("NO FORGIVENESS") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm index c39c62e4a6..392fba99fd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm @@ -238,7 +238,7 @@ // Override stuff for holodeck carp to make them not digest when set to safe! /mob/living/simple_mob/animal/space/carp/holographic/init_vore() . = ..() - var/safe = (faction == "neutral") + var/safe = (faction == FACTION_NEUTRAL) for(var/obj/belly/B as anything in vore_organs) B.digest_mode = safe ? DM_HOLD : vore_default_mode diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm index 18453e9252..e779ed04b2 100644 --- a/code/modules/mob/new_player/skill.dm +++ b/code/modules/mob/new_player/skill.dm @@ -17,7 +17,7 @@ var/list/SKILL_ENGINEER = list("field" = "Engineering", "EVA" = SKILL_BASIC, "co var/list/SKILL_ORGAN_ROBOTICIST = list("field" = "Science", "devices" = SKILL_ADEPT, "electrical" = SKILL_BASIC, "computer" = SKILL_ADEPT, "anatomy" = SKILL_BASIC) var/list/SKILL_SECURITY_OFFICER = list("field" = "Security", "combat" = SKILL_BASIC, "weapons" = SKILL_ADEPT, "law" = SKILL_ADEPT, "forensics" = SKILL_BASIC) var/list/SKILL_CHEMIST = list("field" = "Science", "chemistry" = SKILL_ADEPT, "science" = SKILL_ADEPT, "medical" = SKILL_BASIC, "devices" = SKILL_BASIC) -var/global/list/SKILL_PRE = list(JOB_ENGINEER = SKILL_ENGINEER, "Roboticist" = SKILL_ORGAN_ROBOTICIST, JOB_SECURITY_OFFICER = SKILL_SECURITY_OFFICER, JOB_CHEMIST = SKILL_CHEMIST) +var/global/list/SKILL_PRE = list(JOB_ENGINEER = SKILL_ENGINEER, JOB_ROBOTICIST = SKILL_ORGAN_ROBOTICIST, JOB_SECURITY_OFFICER = SKILL_SECURITY_OFFICER, JOB_CHEMIST = SKILL_CHEMIST) /datum/skill/management ID = "management" diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm index 2dfd77cb2d..6213e5aae2 100644 --- a/code/modules/pda/cart.dm +++ b/code/modules/pda/cart.dm @@ -167,7 +167,7 @@ var/list/civilian_cartridges = list( /obj/item/weapon/cartridge/quartermaster name = "\improper Space Parts & Space Vendors cartridge" - desc = "Perfect for the Quartermaster on the go!" + desc = "Perfect for the " + JOB_QUARTERMASTER + " on the go!" icon_state = "cart-q" programs = list( new/datum/data/pda/app/supply) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index fab16424b9..76785d1a4a 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -1145,7 +1145,7 @@ //KiwiDaNinja: Chakat Taiga /obj/item/clothing/under/fluff/taiga name = "Taiga's F.D Uniform" - desc = "This uniform - consisting of only the uniform shirt, and built out of a soft fleece - dons the badge of Amistad Fire and Rescuse on both shoulders. The badges denote the wearer as a FF/Paramedic, and their name is embroidered in a gold thread on their right breast; Chakat Taiga! An 'official' badge is pinned to their left breast." //A walking advertisement? + desc = "This uniform - consisting of only the uniform shirt, and built out of a soft fleece - dons the badge of Amistad Fire and Rescuse on both shoulders. The badges denote the wearer as a FF/" + JOB_PARAMEDIC + ", and their name is embroidered in a gold thread on their right breast; Chakat Taiga! An 'official' badge is pinned to their left breast." //A walking advertisement? icon = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "taigaff_on" diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm index 90012d7548..d823572ca6 100644 --- a/code/modules/xenobio/items/slime_objects.dm +++ b/code/modules/xenobio/items/slime_objects.dm @@ -115,7 +115,7 @@ // Very filling food. /obj/item/weapon/reagent_containers/food/snacks/slime name = "slimy clump" - desc = "A glob of slime that is thick as honey. For the brave Xenobiologist." + desc = "A glob of slime that is thick as honey. For the brave " + JOB_XENOBIOLOGIST + "." icon_state = "honeycomb" filling_color = "#FFBB00" center_of_mass = list("x"=17, "y"=10) @@ -215,4 +215,4 @@ description = "A slimy liquid, with very compelling smell. Extremely nutritious." color = "#FABA3A" nutriment_factor = 30 - taste_description = "slimy nectar" \ No newline at end of file + taste_description = "slimy nectar" diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index 9e0dadcbd6..4604d6354d 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -1,32 +1,32 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_PARAMEDIC,JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/black_vest display_name = "webbing, black" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_PARAMEDIC,JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/white_vest display_name = "webbing, white" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_PARAMEDIC,JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_PARAMEDIC,JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_PARAMEDIC,JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_PARAMEDIC,JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)"